Convert rocketchat-ui-login to main module structure (#12861)

RocketChat · Dec 6, 2018 · 95f97fb · 95f97fb
1 parent 7c26f30
commit 95f97fb
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 28 deletions.
diff --git a/packages/rocketchat-ui-login/client/index.js b/packages/rocketchat-ui-login/client/index.js
@@ -0,0 +1,19 @@
+import './routes';
+import './reset-password/resetPassword.html';
+import './reset-password/resetPassword';
+import './login/footer.html';
+import './login/form.html';
+import './login/header.html';
+import './login/layout.html';
+import './login/layout';
+import './login/services.html';
+import './login/social.html';
+import './username/layout.html';
+import './username/username.html';
+import './login/footer';
+import './login/form';
+import './login/header';
+import './login/services';
+import './login/social';
+import './username/layout';
+import './username/username';
diff --git a/packages/rocketchat-ui-login/client/login/footer.js b/packages/rocketchat-ui-login/client/login/footer.js
@@ -1,6 +1,7 @@
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/tap:i18n';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Template.loginFooter.onCreated(function() {
 	this.suggestedLanguage = new ReactiveVar();

diff --git a/packages/rocketchat-ui-login/client/login/form.js b/packages/rocketchat-ui-login/client/login/form.js
@@ -5,6 +5,8 @@ import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
+import { RocketChat, handleError } from 'meteor/rocketchat:lib';
+import { t } from 'meteor/rocketchat:ui';
 import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';

diff --git a/packages/rocketchat-ui-login/client/login/header.js b/packages/rocketchat-ui-login/client/login/header.js
@@ -1,4 +1,5 @@
 import { Template } from 'meteor/templating';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Template.loginHeader.helpers({
 	logoUrl() {

diff --git a/packages/rocketchat-ui-login/client/login/layout.js b/packages/rocketchat-ui-login/client/login/layout.js
@@ -1,4 +1,5 @@
 import { Template } from 'meteor/templating';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Template.loginLayout.onRendered(function() {
 	$('#initial-page-loading').remove();

diff --git a/packages/rocketchat-ui-login/client/login/services.js b/packages/rocketchat-ui-login/client/login/services.js
@@ -1,6 +1,7 @@
-/* globals CustomOAuth */
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
+import { ServiceConfiguration } from 'meteor/service-configuration';
+import { CustomOAuth } from 'meteor/rocketchat:custom-oauth';
 import s from 'underscore.string';
 import toastr from 'toastr';
 

diff --git a/packages/rocketchat-ui-login/client/reset-password/resetPassword.js b/packages/rocketchat-ui-login/client/reset-password/resetPassword.js
@@ -2,6 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
+import { t, modal } from 'meteor/rocketchat:ui';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import toastr from 'toastr';
 
 Template.resetPassword.helpers({

diff --git a/packages/rocketchat-ui-login/client/username/layout.js b/packages/rocketchat-ui-login/client/username/layout.js
@@ -1,4 +1,5 @@
 import { Template } from 'meteor/templating';
+import { RocketChat } from 'meteor/rocketchat:lib';
 
 Template.usernameLayout.helpers({
 	backgroundUrl() {

diff --git a/packages/rocketchat-ui-login/client/username/username.js b/packages/rocketchat-ui-login/client/username/username.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Template } from 'meteor/templating';
+import { RocketChat } from 'meteor/rocketchat:lib';
 import _ from 'underscore';
 
 Template.username.onCreated(function() {

diff --git a/packages/rocketchat-ui-login/package.js b/packages/rocketchat-ui-login/package.js
@@ -15,34 +15,11 @@ Package.onUse(function(api) {
 		'ecmascript',
 		'templating',
 		'rocketchat:lib',
+		'rocketchat:ui',
 		'rocketchat:assets',
 		'rocketchat:2fa',
+		'kadira:flow-router',
+		'kadira:blaze-layout',
 	]);
-
-	api.use('kadira:flow-router', 'client');
-	api.use('kadira:blaze-layout', 'client');
-
-	api.addFiles('client/routes.js', 'client');
-
-	api.addFiles('client/reset-password/resetPassword.html', 'client');
-	api.addFiles('client/reset-password/resetPassword.js', 'client');
-
-	api.addFiles('client/login/footer.html', 'client');
-	api.addFiles('client/login/form.html', 'client');
-	api.addFiles('client/login/header.html', 'client');
-	api.addFiles('client/login/layout.html', 'client');
-	api.addFiles('client/login/layout.js', 'client');
-	api.addFiles('client/login/services.html', 'client');
-	api.addFiles('client/login/social.html', 'client');
-
-	api.addFiles('client/username/layout.html', 'client');
-	api.addFiles('client/username/username.html', 'client');
-
-	api.addFiles('client/login/footer.js', 'client');
-	api.addFiles('client/login/form.js', 'client');
-	api.addFiles('client/login/header.js', 'client');
-	api.addFiles('client/login/services.js', 'client');
-	api.addFiles('client/login/social.js', 'client');
-	api.addFiles('client/username/layout.js', 'client');
-	api.addFiles('client/username/username.js', 'client');
+	api.mainModule('client/index.js', 'client');
 });