Merge pull request #10 from eapearson/master

refactoring, additional account management features, ui improvements
kbaseattic · Mar 29, 2017 · 7e63b48 · 7e63b48
2 parents df7027f + ec0af19
commit 7e63b48
Show file tree

Hide file tree

Showing 26 changed files with 6,877 additions and 409 deletions.
diff --git a/src/plugin/config.yml b/src/plugin/config.yml
@@ -51,12 +51,20 @@ install:
             module: signup
             id: auth2_signup
             type: factory
-    routes:
         -
-            path: ['auth2', 'info']
-            widget: auth2Info
-            queryParams:
-                nextrequest: {}
+            module: admin/panel
+            id: auth2_admin
+            type: factory
+        -
+            module: admin/user/panel
+            id: auth2_adminUser
+            type: factory
+    routes:
+        # -
+        #     path: ['auth2', 'info']
+        #     widget: auth2Info
+        #     queryParams:
+        #         nextrequest: {}
         -
             path: ['auth2', 'login']
             widget: auth2Login
@@ -84,29 +92,38 @@ install:
             queryParams:
                 in-process-link-token: {}
         -
-            path: ['auth2', 'signup']
+            path: ['auth2', 'signup', {type: param, name: step}]
             widget: auth2_signup
             queryParams: 
                 nextrequest: {}
-    menu:
         -
-            name: auth2info
-            menus: ['authenticated', 'unauthenticated']
-            definition:
-                path: ['auth2', 'info']
-                label: Auth2 Info
-                icon: flask                
-        -
-            name: auth2login
-            menus: ['authenticated', 'unauthenticated']
-            definition:
-                path: ['auth2', 'login']
-                label: Auth2 Login
-                icon: flask
-        -
-            name: auth2account
-            menus: ['authenticated', 'unathenticated']
-            definition: 
-                path: ['auth2', 'account']
-                label: Auth2 Account
-                icon: user-circle-o
+            path: ['auth2', 'admin']
+            widget: auth2_admin
+            authorization: true
+        -
+            path: ['auth2', 'admin', 'user', {type: param, name: username}]
+            widget: auth2_adminUser
+            authorization: true
+
+    menu:
+        # -
+        #     name: auth2info
+        #     menus: ['authenticated', 'unauthenticated']
+        #     definition:
+        #         path: ['auth2', 'info']
+        #         label: Auth2 Info
+        #         icon: flask                
+        # -
+        #     name: auth2login
+        #     menus: ['authenticated', 'unauthenticated']
+        #     definition:
+        #         path: ['auth2', 'login']
+        #         label: Auth2 Login
+        #         icon: flask
+        # -
+        #     name: auth2account
+        #     menus: ['authenticated', 'unathenticated']
+        #     definition: 
+        #         path: ['auth2', 'account']
+        #         label: Auth2 Account
+        #         icon: user-circle-o
diff --git a/src/plugin/modules/account/agreementsManager.js b/src/plugin/modules/account/agreementsManager.js
@@ -2,10 +2,12 @@
 define([
     'kb_common/html',
     'kb_common/domEvent2',
+    'kb_common/bootstrapUtils',
     '../userAgreements'
 ], function (
     html,
     DomEvents,
+    BS,
     UserAgreements
 ) {
     var // t = html.tagMaker(),
@@ -69,20 +71,23 @@ define([
                         id: vm.intro.id
                     }))
                 ]),
-                div({
-                    class: 'row'
-                }, [
-                    div({ class: 'col-md-3' }, [
-                        div({
-                            id: vm.agreements.id
-                        })
-                    ]),
-                    div({ class: 'col-md-9' }, [
-                        div({
-                            id: vm.agreement.id
-                        })
-                    ]),
-                ])
+                BS.buildPanel({
+                    title: 'Your Current Usage Agreements',
+                    body: div({
+                            class: 'row'
+                        }, [
+                            div({ class: 'col-md-3' }, [
+                                div({
+                                    id: vm.agreements.id
+                                })
+                            ]),
+                            div({ class: 'col-md-9' }, [
+                                div({
+                                    id: vm.agreement.id
+                                })
+                            ]),
+                        ])
+                })
             ]);
             bindVm();
         }
@@ -128,7 +133,7 @@ define([
             });
             vm.intro.node.innerHTML = div([
                 p([
-                    'Below are the User Policies you have agreed to during signup or signin to KBase'
+                    'Below are the Usage Policies you have agreed to during signup or signin to KBase.'
                 ])
             ]);
             events.attachEvents();