Adapting header to the new structure

Packages/ohif-user-management/client/active-entry/index.js

@@ -0,0 +1,3 @@
+import './activeEntry.styl';
+import './activeEntry.js';
+import './activeEntrySignIn.js';

Packages/ohif-user-management/client/components/index.js

@@ -0,0 +1,15 @@
+import './emailVerification/emailVerification.html';
+import './emailVerification/emailVerification.styl';
+import './emailVerification/emailVerification.js';
+
+import './hipaaLogPage/hipaaLogPage.styl';
+import './hipaaLogPage/hipaaLogPage.js';
+
+import './lastLoginModal/lastLoginModal.html';
+
+import './timeoutCountdownDialog/timeoutCountdownDialog.html';
+import './timeoutCountdownDialog/timeoutCountdownDialog.js';
+
+import './userAccountMenu/userAccountMenu.html';
+import './userAccountMenu/userAccountMenu.styl';
+import './userAccountMenu/userAccountMenu.js';

Packages/ohif-user-management/client/index.js

@@ -0,0 +1,4 @@
+import './active-entry';
+import './components';
+import './lib';
+import './subscriptions';

Packages/ohif-user-management/client/lib/audit.js

@@ -0,0 +1,6 @@
+import { Router } from 'meteor/iron:router';
+import { OHIF } from 'meteor/ohif:core';
+
+OHIF.user.audit = () => {
+    Router.go('/audit');
+};

Packages/ohif-user-management/client/lib/changePassword.js

@@ -0,0 +1,6 @@
+import { Router } from 'meteor/iron:router';
+import { OHIF } from 'meteor/ohif:core';
+
+OHIF.user.changePassword = () => {
+    Router.go('/changePassword');
+};

Packages/ohif-user-management/client/lib/getName.js

@@ -0,0 +1,9 @@
+import { Meteor } from 'meteor/meteor';
+import { OHIF } from 'meteor/ohif:core';
+
+OHIF.user.getName = () => {
+    const nameSplit = Meteor.user().profile.fullName.split(' ');
+    const lastName = nameSplit[nameSplit.length - 1];
+    nameSplit[nameSplit.length - 1] = lastName.substr(0, 1) + '.';
+    return nameSplit.join(' ');
+};

Packages/ohif-user-management/client/lib/index.js

@@ -0,0 +1,4 @@
+import './audit';
+import './changePassword';
+import './getName';
+import './logout';

Packages/ohif-user-management/client/lib/logout.js

@@ -0,0 +1,9 @@
+import { Meteor } from 'meteor/meteor';
+import { Router } from 'meteor/iron:router';
+import { OHIF } from 'meteor/ohif:core';
+
+OHIF.user.logout = () => {
+    Meteor.logout(function() {
+        Router.go('/entrySignIn');
+    });
+};

Packages/ohif-user-management/main.js

@@ -0,0 +1,10 @@
+import { OHIF } from 'meteor/ohif:core';
+
+/*
+ * Defines the base OHIF user object
+ */
+const user = {};
+
+OHIF.user = user;
+
+export { user };

Packages/ohif-user-management/package.js

@@ -25,33 +25,17 @@ Package.onUse(function(api) {
     api.use('ohif:core');
     api.use('ohif:study-list');
 
+    // Main module
+    api.mainModule('main.js', ['client', 'server']);
+
     // Load icons
     api.addAssets('assets/user-menu-icons.svg', 'client');
 
     api.addFiles('both/collections.js', ['client', 'server']);
     //api.addFiles('both/schema/reviewers.js', ['client', 'server']);
 
-    api.addFiles('client/components/userAccountMenu/userAccountMenu.html', 'client');
-    api.addFiles('client/components/userAccountMenu/userAccountMenu.styl', 'client');
-    api.addFiles('client/components/userAccountMenu/userAccountMenu.js', 'client');
-
-    api.addFiles('client/active-entry/activeEntry.styl', 'client');
-    api.addFiles('client/active-entry/activeEntry.js', 'client');
-    api.addFiles('client/active-entry/activeEntrySignIn.js', 'client');
-
-    api.addFiles('client/subscriptions.js', 'client');
-
-    api.addFiles('client/components/emailVerification/emailVerification.html', 'client');
-    api.addFiles('client/components/emailVerification/emailVerification.styl', 'client');
-    api.addFiles('client/components/emailVerification/emailVerification.js', 'client');
-
-    api.addFiles('client/components/hipaaLogPage/hipaaLogPage.styl', 'client');
-    api.addFiles('client/components/hipaaLogPage/hipaaLogPage.js', 'client');
-
-    api.addFiles('client/components/timeoutCountdownDialog/timeoutCountdownDialog.html', 'client');
-    api.addFiles('client/components/timeoutCountdownDialog/timeoutCountdownDialog.js', 'client');
-
-    api.addFiles('client/components/lastLoginModal/lastLoginModal.html', 'client');
+    // Client imports
+    api.addFiles('client/index.js', 'client');
 
     api.addFiles('server/createDemoUser.js', [ 'server' ]);
     api.addFiles('server/reviewers.js', [ 'server' ]);