diff --git a/.meteor/packages b/.meteor/packages
index 44cebd6e92f..44a8be3e83f 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -118,4 +118,6 @@ rocketchat:rocketchat-ui-sidenav
rocketchat:rocketchat-ui-account
rocketchat:rocketchat-ui-admin
rocketchat:rocketchat-ui-login
-rocketchat:rocketchat-ui-message-input
+rocketchat:rocketchat-ui-flextab
+rocketchat:rocketchat-ui-message
+rocketchat:rocketchat-ui-master
diff --git a/.meteor/versions b/.meteor/versions
index 72fbd13ca02..4d949732d9e 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -143,10 +143,12 @@ rocketchat:message-pin@0.0.1
rocketchat:message-star@0.0.1
rocketchat:oembed@0.0.1
rocketchat:rocketchat-ui@0.1.0
-rocketchat:rocketchat-ui-account@0.0.1
-rocketchat:rocketchat-ui-admin@0.0.1
-rocketchat:rocketchat-ui-login@0.0.1
-rocketchat:rocketchat-ui-message-input@0.1.0
+rocketchat:rocketchat-ui-account@0.1.0
+rocketchat:rocketchat-ui-admin@0.1.0
+rocketchat:rocketchat-ui-flextab@0.1.0
+rocketchat:rocketchat-ui-login@0.1.0
+rocketchat:rocketchat-ui-master@0.1.0
+rocketchat:rocketchat-ui-message@0.1.0
rocketchat:rocketchat-ui-sidenav@0.1.0
rocketchat:slashcommands-invite@0.0.1
rocketchat:slashcommands-join@0.0.1
diff --git a/packages/rocketchat-ui-account/package.js b/packages/rocketchat-ui-account/package.js
index e6f617f4ce9..5b2a9d5fe44 100644
--- a/packages/rocketchat-ui-account/package.js
+++ b/packages/rocketchat-ui-account/package.js
@@ -1,6 +1,6 @@
Package.describe({
name: 'rocketchat:rocketchat-ui-account',
- version: '0.0.1',
+ version: '0.1.0',
// Brief, one-line summary of the package.
summary: '',
// URL to the Git repository containing the source code for this package.
diff --git a/packages/rocketchat-ui-admin/package.js b/packages/rocketchat-ui-admin/package.js
index 22967b6a286..0dcf68ef2c6 100644
--- a/packages/rocketchat-ui-admin/package.js
+++ b/packages/rocketchat-ui-admin/package.js
@@ -1,6 +1,6 @@
Package.describe({
name: 'rocketchat:rocketchat-ui-admin',
- version: '0.0.1',
+ version: '0.1.0',
// Brief, one-line summary of the package.
summary: '',
// URL to the Git repository containing the source code for this package.
diff --git a/packages/rocketchat-ui-message-input/README.md b/packages/rocketchat-ui-flextab/README.md
similarity index 100%
rename from packages/rocketchat-ui-message-input/README.md
rename to packages/rocketchat-ui-flextab/README.md
diff --git a/packages/rocketchat-ui/views/app/flexTabBar.coffee b/packages/rocketchat-ui-flextab/flex-tab/flexTabBar.coffee
similarity index 100%
rename from packages/rocketchat-ui/views/app/flexTabBar.coffee
rename to packages/rocketchat-ui-flextab/flex-tab/flexTabBar.coffee
diff --git a/packages/rocketchat-ui/views/app/flexTabBar.html b/packages/rocketchat-ui-flextab/flex-tab/flexTabBar.html
similarity index 100%
rename from packages/rocketchat-ui/views/app/flexTabBar.html
rename to packages/rocketchat-ui-flextab/flex-tab/flexTabBar.html
diff --git a/packages/rocketchat-ui/views/app/tabBar/membersList.coffee b/packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.coffee
similarity index 100%
rename from packages/rocketchat-ui/views/app/tabBar/membersList.coffee
rename to packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.coffee
diff --git a/packages/rocketchat-ui/views/app/tabBar/membersList.html b/packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.html
similarity index 100%
rename from packages/rocketchat-ui/views/app/tabBar/membersList.html
rename to packages/rocketchat-ui-flextab/flex-tab/tabs/membersList.html
diff --git a/packages/rocketchat-ui/views/app/tabBar/messageSearch.coffee b/packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.coffee
similarity index 100%
rename from packages/rocketchat-ui/views/app/tabBar/messageSearch.coffee
rename to packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.coffee
diff --git a/packages/rocketchat-ui/views/app/tabBar/messageSearch.html b/packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.html
similarity index 100%
rename from packages/rocketchat-ui/views/app/tabBar/messageSearch.html
rename to packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.html
diff --git a/packages/rocketchat-ui/views/app/tabBar/uploadedFilesList.coffee b/packages/rocketchat-ui-flextab/flex-tab/tabs/uploadedFilesList.coffee
similarity index 100%
rename from packages/rocketchat-ui/views/app/tabBar/uploadedFilesList.coffee
rename to packages/rocketchat-ui-flextab/flex-tab/tabs/uploadedFilesList.coffee
diff --git a/packages/rocketchat-ui/views/app/tabBar/uploadedFilesList.html b/packages/rocketchat-ui-flextab/flex-tab/tabs/uploadedFilesList.html
similarity index 100%
rename from packages/rocketchat-ui/views/app/tabBar/uploadedFilesList.html
rename to packages/rocketchat-ui-flextab/flex-tab/tabs/uploadedFilesList.html
diff --git a/packages/rocketchat-ui/views/app/userInfo.coffee b/packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.coffee
similarity index 100%
rename from packages/rocketchat-ui/views/app/userInfo.coffee
rename to packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.coffee
diff --git a/packages/rocketchat-ui/views/app/userInfo.html b/packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.html
similarity index 100%
rename from packages/rocketchat-ui/views/app/userInfo.html
rename to packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.html
diff --git a/packages/rocketchat-ui-flextab/package.js b/packages/rocketchat-ui-flextab/package.js
new file mode 100644
index 00000000000..249d92acecc
--- /dev/null
+++ b/packages/rocketchat-ui-flextab/package.js
@@ -0,0 +1,37 @@
+Package.describe({
+ name: 'rocketchat:rocketchat-ui-flextab',
+ version: '0.1.0',
+ // Brief, one-line summary of the package.
+ summary: '',
+ // URL to the Git repository containing the source code for this package.
+ git: '',
+ // By default, Meteor will default to using README.md for documentation.
+ // To avoid submitting documentation, set this field to null.
+ documentation: 'README.md'
+});
+
+Package.onUse(function(api) {
+ api.versionsFrom('1.2.1');
+
+ api.use([
+ 'mongo',
+ 'ecmascript',
+ 'templating',
+ 'coffeescript',
+ 'underscore',
+ 'rocketchat:lib'
+ ]);
+
+ api.addFiles('flex-tab/flexTabBar.html', 'client');
+ api.addFiles('flex-tab/tabs/membersList.html', 'client');
+ api.addFiles('flex-tab/tabs/messageSearch.html', 'client');
+ api.addFiles('flex-tab/tabs/uploadedFilesList.html', 'client');
+ api.addFiles('flex-tab/tabs/userInfo.html', 'client');
+
+ api.addFiles('flex-tab/flexTabBar.coffee', 'client');
+ api.addFiles('flex-tab/tabs/membersList.coffee', 'client');
+ api.addFiles('flex-tab/tabs/messageSearch.coffee', 'client');
+ api.addFiles('flex-tab/tabs/uploadedFilesList.coffee', 'client');
+ api.addFiles('flex-tab/tabs/userInfo.coffee', 'client');
+
+});
diff --git a/packages/rocketchat-ui-login/package.js b/packages/rocketchat-ui-login/package.js
index 271e6de4e8d..382048964de 100644
--- a/packages/rocketchat-ui-login/package.js
+++ b/packages/rocketchat-ui-login/package.js
@@ -1,6 +1,6 @@
Package.describe({
name: 'rocketchat:rocketchat-ui-login',
- version: '0.0.1',
+ version: '0.1.0',
// Brief, one-line summary of the package.
summary: '',
// URL to the Git repository containing the source code for this package.
@@ -12,7 +12,6 @@ Package.describe({
Package.onUse(function(api) {
api.versionsFrom('1.2.1');
-
api.use([
'ecmascript',
'templating',
@@ -38,5 +37,4 @@ Package.onUse(function(api) {
api.addFiles('login/services.coffee', 'client');
api.addFiles('login/social.coffee', 'client');
api.addFiles('username/username.coffee', 'client');
-
});
\ No newline at end of file
diff --git a/packages/rocketchat-ui-master/README.md b/packages/rocketchat-ui-master/README.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/packages/rocketchat-ui-master/master/error.html b/packages/rocketchat-ui-master/master/error.html
new file mode 100644
index 00000000000..c818e16b9b9
--- /dev/null
+++ b/packages/rocketchat-ui-master/master/error.html
@@ -0,0 +1,12 @@
+
+
+
+
+
{{_ "Not_found_or_not_allowed"}}
+
+
+
diff --git a/packages/rocketchat-ui-master/master/loading.html b/packages/rocketchat-ui-master/master/loading.html
new file mode 100644
index 00000000000..91f1bf7aee0
--- /dev/null
+++ b/packages/rocketchat-ui-master/master/loading.html
@@ -0,0 +1,24 @@
+
+
+
diff --git a/packages/rocketchat-ui-master/master/main.coffee b/packages/rocketchat-ui-master/master/main.coffee
new file mode 100644
index 00000000000..e43df650fbd
--- /dev/null
+++ b/packages/rocketchat-ui-master/master/main.coffee
@@ -0,0 +1,216 @@
+Template.body.onRendered ->
+ $(document.body).on 'keydown', (e) ->
+ if e.keyCode is 80 and (e.ctrlKey is true or e.metaKey is true)
+ e.preventDefault()
+ e.stopPropagation()
+ spotlight.show()
+
+ if e.keyCode is 27
+ spotlight.hide()
+
+ unread = Session.get('unread')
+ if e.keyCode is 27 and e.shiftKey is true and unread? and unread isnt ''
+ e.preventDefault()
+ e.stopPropagation()
+ swal
+ title: t('Clear_all_unreads_question')
+ type: 'warning'
+ confirmButtonText: t('Yes_clear_all')
+ showCancelButton: true
+ cancelButtonText: t('Cancel')
+ confirmButtonColor: '#DD6B55'
+ , ->
+ subscriptions = ChatSubscription.find({open: true}, { fields: { unread: 1, alert: 1, rid: 1, t: 1, name: 1, ls: 1 } })
+ for subscription in subscriptions.fetch()
+ if subscription.alert or subscription.unread > 0
+ Meteor.call 'readMessages', subscription.rid
+
+
+ Tracker.autorun (c) ->
+ w = window
+ d = document
+ s = 'script'
+ l = 'dataLayer'
+ i = RocketChat.settings.get 'API_Analytics'
+ if Match.test(i, String) and i.trim() isnt ''
+ c.stop()
+ do (w,d,s,l,i) ->
+ w[l] = w[l] || []
+ w[l].push {'gtm.start': new Date().getTime(), event:'gtm.js'}
+ f = d.getElementsByTagName(s)[0]
+ j = d.createElement(s)
+ dl = if l isnt 'dataLayer' then '&l=' + l else ''
+ j.async = true
+ j.src = '//www.googletagmanager.com/gtm.js?id=' + i + dl
+ f.parentNode.insertBefore j, f
+
+ Tracker.autorun (c) ->
+ if RocketChat.settings.get 'Meta_language'
+ c.stop()
+
+ Meta.set
+ name: 'http-equiv'
+ property: 'content-language'
+ content: RocketChat.settings.get 'Meta_language'
+ Meta.set
+ name: 'name'
+ property: 'language'
+ content: RocketChat.settings.get 'Meta_language'
+
+ Tracker.autorun (c) ->
+ if RocketChat.settings.get 'Meta_fb_app_id'
+ c.stop()
+
+ Meta.set
+ name: 'property'
+ property: 'fb:app_id'
+ content: RocketChat.settings.get 'Meta_fb_app_id'
+
+ Tracker.autorun (c) ->
+ if RocketChat.settings.get 'Meta_robots'
+ c.stop()
+
+ Meta.set
+ name: 'name'
+ property: 'robots'
+ content: RocketChat.settings.get 'Meta_robots'
+
+ Tracker.autorun (c) ->
+ if RocketChat.settings.get 'Meta_google-site-verification'
+ c.stop()
+
+ Meta.set
+ name: 'name'
+ property: 'google-site-verification'
+ content: RocketChat.settings.get 'Meta_google-site-verification'
+
+ Tracker.autorun (c) ->
+ if RocketChat.settings.get 'Meta_msvalidate01'
+ c.stop()
+
+ Meta.set
+ name: 'name'
+ property: 'msvalidate.01'
+ content: RocketChat.settings.get 'Meta_msvalidate01'
+
+ Tracker.autorun (c) ->
+ c.stop()
+
+ Meta.set
+ name: 'name'
+ property: 'application-name'
+ content: RocketChat.settings.get 'Site_Name'
+
+ Meta.set
+ name: 'name'
+ property: 'apple-mobile-web-app-title'
+ content: RocketChat.settings.get 'Site_Name'
+
+ if Meteor.isCordova
+ $(document.body).addClass 'is-cordova'
+
+
+Template.main.helpers
+
+ siteName: ->
+ return RocketChat.settings.get 'Site_Name'
+
+ logged: ->
+ if Meteor.userId()?
+ $('html').addClass("noscroll").removeClass("scroll")
+ return true
+ else
+ $('html').addClass("scroll").removeClass("noscroll")
+ return false
+
+ subsReady: ->
+ return not Meteor.userId()? or (FlowRouter.subsReady('userData', 'activeUsers'))
+
+ hasUsername: ->
+ return Meteor.userId()? and Meteor.user().username?
+
+ flexOpened: ->
+ console.log 'layout.helpers flexOpened' if window.rocketDebug
+ return 'flex-opened' if RocketChat.TabBar.isFlexOpen()
+
+ flexOpenedRTC1: ->
+ console.log 'layout.helpers flexOpenedRTC1' if window.rocketDebug
+ return 'layout1' if Session.equals('rtcLayoutmode', 1)
+
+ flexOpenedRTC2: ->
+ console.log 'layout.helpers flexOpenedRTC2' if window.rocketDebug
+ return 'layout2' if (Session.get('rtcLayoutmode') > 1)
+
+
+Template.main.events
+
+ "click .burger": ->
+ console.log 'room click .burger' if window.rocketDebug
+ chatContainer = $("#rocket-chat")
+ menu.toggle()
+
+ 'touchstart': (e, t) ->
+ if document.body.clientWidth > 780
+ return
+
+ t.touchstartX = undefined
+ t.touchstartY = undefined
+ t.movestarted = false
+ t.blockmove = false
+ if $(e.currentTarget).closest('.main-content').length > 0
+ t.touchstartX = e.originalEvent.touches[0].clientX
+ t.touchstartY = e.originalEvent.touches[0].clientY
+ t.mainContent = $('.main-content')
+ t.wrapper = $('.messages-box > .wrapper')
+
+ 'touchmove': (e, t) ->
+ if t.touchstartX?
+ touch = e.originalEvent.touches[0]
+ diffX = t.touchstartX - touch.clientX
+ diffY = t.touchstartY - touch.clientY
+ absX = Math.abs(diffX)
+ absY = Math.abs(diffY)
+
+ if t.movestarted isnt true and t.blockmove isnt true and absY > 5
+ t.blockmove = true
+
+ if t.blockmove isnt true and (t.movestarted is true or absX > 5)
+ t.movestarted = true
+
+ if menu.isOpen()
+ t.left = 260 - diffX
+ else
+ t.left = -diffX
+
+ if t.left > 260
+ t.left = 260
+ if t.left < 0
+ t.left = 0
+
+ t.mainContent.addClass('notransition')
+ t.mainContent.css('transform', 'translate('+t.left+'px)')
+ t.wrapper.css('overflow', 'hidden')
+
+ 'touchend': (e, t) ->
+ if t.movestarted is true
+ t.mainContent.removeClass('notransition')
+ t.mainContent.css('transform', '');
+ t.wrapper.css('overflow', '')
+
+ if menu.isOpen()
+ if t.left >= 200
+ menu.open()
+ else
+ menu.close()
+ else
+ if t.left >= 60
+ menu.open()
+ else
+ menu.close()
+
+
+Template.main.onRendered ->
+
+ # RTL Support - Need config option on the UI
+ if isRtl localStorage.getItem "userLanguage"
+ $('html').addClass "rtl"
diff --git a/packages/rocketchat-ui-master/master/main.html b/packages/rocketchat-ui-master/master/main.html
new file mode 100644
index 00000000000..9eab99a5bec
--- /dev/null
+++ b/packages/rocketchat-ui-master/master/main.html
@@ -0,0 +1,70 @@
+
+ Rocket.Chat
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{#if subsReady}}
+ {{#unless logged}}
+ {{> loginLayout}}
+ {{else}}
+ {{#unless hasUsername}}
+ {{> username}}
+ {{else}}
+ {{> spotlight}}
+ {{> mobileMessageMenu}}
+ {{> videoCall overlay=true}}
+
+
+ {{> audioNotification }}
+ {{/unless}}
+ {{/unless}}
+ {{/if}}
+
diff --git a/packages/rocketchat-ui-master/package.js b/packages/rocketchat-ui-master/package.js
new file mode 100644
index 00000000000..15886dd5e64
--- /dev/null
+++ b/packages/rocketchat-ui-master/package.js
@@ -0,0 +1,30 @@
+Package.describe({
+ name: 'rocketchat:rocketchat-ui-master',
+ version: '0.1.0',
+ // Brief, one-line summary of the package.
+ summary: '',
+ // URL to the Git repository containing the source code for this package.
+ git: '',
+ // By default, Meteor will default to using README.md for documentation.
+ // To avoid submitting documentation, set this field to null.
+ documentation: 'README.md'
+});
+
+Package.onUse(function(api) {
+ api.versionsFrom('1.2.1');
+
+ api.use([
+ 'mongo',
+ 'ecmascript',
+ 'templating',
+ 'coffeescript',
+ 'underscore',
+ 'rocketchat:lib'
+ ]);
+
+ api.addFiles('master/main.html', 'client');
+ api.addFiles('master/loading.html', 'client');
+ api.addFiles('master/error.html', 'client');
+
+ api.addFiles('master/main.coffee', 'client');
+});
\ No newline at end of file
diff --git a/packages/rocketchat-ui-message-input/package.js b/packages/rocketchat-ui-message-input/package.js
deleted file mode 100644
index 68ac9348ad2..00000000000
--- a/packages/rocketchat-ui-message-input/package.js
+++ /dev/null
@@ -1,37 +0,0 @@
-Package.describe({
- name: 'rocketchat:rocketchat-ui-message-input',
- version: '0.1.0',
- // Brief, one-line summary of the package.
- summary: '',
- // URL to the Git repository containing the source code for this package.
- git: '',
- // By default, Meteor will default to using README.md for documentation.
- // To avoid submitting documentation, set this field to null.
- documentation: 'README.md'
-});
-
-Package.onUse(function(api) {
- api.versionsFrom('1.2.1');
-
- api.use([
- 'mongo',
- 'ecmascript',
- 'templating',
- 'coffeescript',
- 'underscore',
- 'rocketchat:lib@0.0.1'
- ]);
-
- api.addFiles("message-input/messagePopup.html", "client");
- api.addFiles("message-input/messagePopupChannel.html", "client");
- api.addFiles("message-input/messagePopupConfig.html", "client");
- api.addFiles("message-input/messagePopupEmoji.html", "client");
- api.addFiles("message-input/messagePopupSlashCommand.html", "client");
- api.addFiles("message-input/messagePopupUser.html", "client");
-
- api.addFiles("message-input/messagePopup.coffee", "client");
- api.addFiles("message-input/messagePopupConfig.coffee", "client");
- api.addFiles("message-input/messagePopupEmoji.coffee", "client");
-
-
-});
\ No newline at end of file
diff --git a/packages/rocketchat-ui-message/README.md b/packages/rocketchat-ui-message/README.md
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/packages/rocketchat-ui/views/app/message.coffee b/packages/rocketchat-ui-message/message/message.coffee
similarity index 100%
rename from packages/rocketchat-ui/views/app/message.coffee
rename to packages/rocketchat-ui-message/message/message.coffee
diff --git a/packages/rocketchat-ui/views/app/message.html b/packages/rocketchat-ui-message/message/message.html
similarity index 100%
rename from packages/rocketchat-ui/views/app/message.html
rename to packages/rocketchat-ui-message/message/message.html
diff --git a/packages/rocketchat-ui/views/app/messageBox.coffee b/packages/rocketchat-ui-message/message/messageBox.coffee
similarity index 100%
rename from packages/rocketchat-ui/views/app/messageBox.coffee
rename to packages/rocketchat-ui-message/message/messageBox.coffee
diff --git a/packages/rocketchat-ui/views/app/messageBox.html b/packages/rocketchat-ui-message/message/messageBox.html
similarity index 100%
rename from packages/rocketchat-ui/views/app/messageBox.html
rename to packages/rocketchat-ui-message/message/messageBox.html
diff --git a/packages/rocketchat-ui-message-input/message-input/messagePopup.coffee b/packages/rocketchat-ui-message/message/popup/messagePopup.coffee
similarity index 100%
rename from packages/rocketchat-ui-message-input/message-input/messagePopup.coffee
rename to packages/rocketchat-ui-message/message/popup/messagePopup.coffee
diff --git a/packages/rocketchat-ui-message-input/message-input/messagePopup.html b/packages/rocketchat-ui-message/message/popup/messagePopup.html
similarity index 100%
rename from packages/rocketchat-ui-message-input/message-input/messagePopup.html
rename to packages/rocketchat-ui-message/message/popup/messagePopup.html
diff --git a/packages/rocketchat-ui-message-input/message-input/messagePopupChannel.html b/packages/rocketchat-ui-message/message/popup/messagePopupChannel.html
similarity index 100%
rename from packages/rocketchat-ui-message-input/message-input/messagePopupChannel.html
rename to packages/rocketchat-ui-message/message/popup/messagePopupChannel.html
diff --git a/packages/rocketchat-ui-message-input/message-input/messagePopupConfig.coffee b/packages/rocketchat-ui-message/message/popup/messagePopupConfig.coffee
similarity index 100%
rename from packages/rocketchat-ui-message-input/message-input/messagePopupConfig.coffee
rename to packages/rocketchat-ui-message/message/popup/messagePopupConfig.coffee
diff --git a/packages/rocketchat-ui-message-input/message-input/messagePopupConfig.html b/packages/rocketchat-ui-message/message/popup/messagePopupConfig.html
similarity index 100%
rename from packages/rocketchat-ui-message-input/message-input/messagePopupConfig.html
rename to packages/rocketchat-ui-message/message/popup/messagePopupConfig.html
diff --git a/packages/rocketchat-ui-message-input/message-input/messagePopupEmoji.coffee b/packages/rocketchat-ui-message/message/popup/messagePopupEmoji.coffee
similarity index 100%
rename from packages/rocketchat-ui-message-input/message-input/messagePopupEmoji.coffee
rename to packages/rocketchat-ui-message/message/popup/messagePopupEmoji.coffee
diff --git a/packages/rocketchat-ui-message-input/message-input/messagePopupEmoji.html b/packages/rocketchat-ui-message/message/popup/messagePopupEmoji.html
similarity index 100%
rename from packages/rocketchat-ui-message-input/message-input/messagePopupEmoji.html
rename to packages/rocketchat-ui-message/message/popup/messagePopupEmoji.html
diff --git a/packages/rocketchat-ui-message-input/message-input/messagePopupSlashCommand.html b/packages/rocketchat-ui-message/message/popup/messagePopupSlashCommand.html
similarity index 100%
rename from packages/rocketchat-ui-message-input/message-input/messagePopupSlashCommand.html
rename to packages/rocketchat-ui-message/message/popup/messagePopupSlashCommand.html
diff --git a/packages/rocketchat-ui-message-input/message-input/messagePopupUser.html b/packages/rocketchat-ui-message/message/popup/messagePopupUser.html
similarity index 100%
rename from packages/rocketchat-ui-message-input/message-input/messagePopupUser.html
rename to packages/rocketchat-ui-message/message/popup/messagePopupUser.html
diff --git a/packages/rocketchat-ui-message/package.js b/packages/rocketchat-ui-message/package.js
new file mode 100644
index 00000000000..626bf9f5ced
--- /dev/null
+++ b/packages/rocketchat-ui-message/package.js
@@ -0,0 +1,41 @@
+Package.describe({
+ name: 'rocketchat:rocketchat-ui-message',
+ version: '0.1.0',
+ // Brief, one-line summary of the package.
+ summary: '',
+ // URL to the Git repository containing the source code for this package.
+ git: '',
+ // By default, Meteor will default to using README.md for documentation.
+ // To avoid submitting documentation, set this field to null.
+ documentation: 'README.md'
+});
+
+Package.onUse(function(api) {
+ api.versionsFrom('1.2.1');
+
+ api.use([
+ 'mongo',
+ 'ecmascript',
+ 'templating',
+ 'coffeescript',
+ 'underscore',
+ 'rocketchat:lib'
+ ]);
+
+ api.addFiles('message/message.html', 'client');
+ api.addFiles("message/messageBox.html", "client");
+ api.addFiles("message/popup/messagePopup.html", "client");
+ api.addFiles("message/popup/messagePopupChannel.html", "client");
+ api.addFiles("message/popup/messagePopupConfig.html", "client");
+ api.addFiles("message/popup/messagePopupEmoji.html", "client");
+ api.addFiles("message/popup/messagePopupSlashCommand.html", "client");
+ api.addFiles("message/popup/messagePopupUser.html", "client");
+
+ api.addFiles('message/message.coffee', 'client');
+ api.addFiles('message/messageBox.coffee', 'client');
+ api.addFiles("message/popup/messagePopup.coffee", "client");
+ api.addFiles("message/popup/messagePopupConfig.coffee", "client");
+ api.addFiles("message/popup/messagePopupEmoji.coffee", "client");
+
+
+});
\ No newline at end of file
diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
index ffbe92480bf..730b0d3e9de 100644
--- a/packages/rocketchat-ui/package.js
+++ b/packages/rocketchat-ui/package.js
@@ -66,50 +66,32 @@ Package.onUse(function(api) {
// TEMPLATE FILES
api.addFiles('views/cmsPage.html', 'client');
- api.addFiles('views/error.html', 'client');
api.addFiles('views/fxos.html', 'client');
- api.addFiles('views/loading.html', 'client');
- api.addFiles('views/main.html', 'client');
api.addFiles('views/modal.html', 'client');
api.addFiles('views/404/roomNotFound.html', 'client');
api.addFiles('views/app/audioNotification.html', 'client');
api.addFiles('views/app/burguer.html', 'client');
- api.addFiles('views/app/flexTabBar.html', 'client');
api.addFiles('views/app/home.html', 'client');
- api.addFiles('views/app/message.html', 'client');
api.addFiles('views/app/privateHistory.html', 'client');
api.addFiles('views/app/room.html', 'client');
api.addFiles('views/app/roomSearch.html', 'client');
- api.addFiles('views/app/userInfo.html', 'client');
api.addFiles('views/app/userSearch.html', 'client');
api.addFiles('views/app/spotlight/mobileMessageMenu.html', 'client');
api.addFiles('views/app/spotlight/spotlight.html', 'client');
- api.addFiles('views/app/tabBar/membersList.html', 'client');
- api.addFiles('views/app/tabBar/messageSearch.html', 'client');
- api.addFiles('views/app/tabBar/uploadedFilesList.html', 'client');
api.addFiles('views/app/videoCall/videoButtons.html', 'client');
api.addFiles('views/app/videoCall/videoCall.html', 'client');
- api.addFiles('views/app/messageBox.html', 'client');
api.addFiles('views/cmsPage.coffee', 'client');
api.addFiles('views/fxos.coffee', 'client');
- api.addFiles('views/main.coffee', 'client');
api.addFiles('views/modal.coffee', 'client');
api.addFiles('views/404/roomNotFound.coffee', 'client');
api.addFiles('views/app/burguer.coffee', 'client');
- api.addFiles('views/app/flexTabBar.coffee', 'client');
api.addFiles('views/app/home.coffee', 'client');
- api.addFiles('views/app/message.coffee', 'client');
api.addFiles('views/app/privateHistory.coffee', 'client');
api.addFiles('views/app/room.coffee', 'client');
api.addFiles('views/app/roomSearch.coffee', 'client');
- api.addFiles('views/app/userInfo.coffee', 'client');
api.addFiles('views/app/spotlight/mobileMessageMenu.coffee', 'client');
api.addFiles('views/app/spotlight/spotlight.coffee', 'client');
- api.addFiles('views/app/tabBar/membersList.coffee', 'client');
- api.addFiles('views/app/tabBar/messageSearch.coffee', 'client');
- api.addFiles('views/app/tabBar/uploadedFilesList.coffee', 'client');
api.addFiles('views/app/videoCall/videoButtons.coffee', 'client');
api.addFiles('views/app/videoCall/videoCall.coffee', 'client');
- api.addFiles('views/app/messageBox.coffee', 'client');
});
\ No newline at end of file