Merge pull request #487 from iShafayet/sprint-0.1.0

Sprint 0.1.0
anvilglobaldynamics · Nov 8, 2018 · f802b4c · f802b4c
2 parents 7914760 + 167c204
commit f802b4c
Show file tree

Hide file tree

Showing 186 changed files with 12,413 additions and 4,040 deletions.
diff --git a/admin-client/package-lock.json b/admin-client/package-lock.json
diff --git a/admin-client/src/page-manage-organization.html b/admin-client/src/page-manage-organization.html
diff --git a/admin-client/src/torque-app.html b/admin-client/src/torque-app.html
@@ -167,7 +167,7 @@
           <a href="[[authorWebsite]]">[[authorName]]</a> All Rights Reserved.
           <br>
           <span class="extra-small">admin build
-            <span id="build-number">10</span>
+            <span id="build-number">15</span>
           </span>
         </div>
       </app-header-layout>

diff --git a/admin-client/src/torque-common-behavior.html b/admin-client/src/torque-common-behavior.html
@@ -94,7 +94,7 @@
 
       checkPrivilege(privilege) {
         if (!(privilege in this.app.organization.employment.privileges)) {
-          throw new Error(`No such privilege ""${privilege}.`);
+          throw new Error(`No such privilege "${privilege}".`);
         }
         return this.app.organization.employment.privileges[privilege];
       }

diff --git a/admin-client/src/torque-http-behavior.html b/admin-client/src/torque-http-behavior.html
@@ -137,7 +137,7 @@
           this.callCombinedJsonApi('admin-set-outgoing-sms-status', data, cbfn);
         }
 
-        callGetOrganizationApi(data, cbfn) {
+        callAdminGetOrganizationApi(data, cbfn) {
           if (!this._applyApiKey(data)) return;
           this.callCombinedJsonApi('admin-get-organization', data, cbfn);
         }
@@ -157,6 +157,21 @@
           this.callCombinedJsonApi('admin-assign-package-to-organization', data, cbfn);
         }
 
+        callAdminGetModuleListApi(data, cbfn) {
+          if (!this._applyApiKey(data)) return;
+          this.callCombinedJsonApi('admin-get-module-list', data, cbfn);
+        }
+
+        callAdminListOrganizationModulesApi(data, cbfn) {
+          if (!this._applyApiKey(data)) return;
+          this.callCombinedJsonApi('admin-list-organization-modules', data, cbfn);
+        }
+
+        callAdminSetModuleActivationStatusApi(data, cbfn) {
+          if (!this._applyApiKey(data)) return;
+          this.callCombinedJsonApi('admin-set-module-activation-status', data, cbfn);
+        }
+
       }
     }
 

diff --git a/...ct-category-instruction/instruction-1.png → ...t-blueprint-instruction/instruction-1.png b/...ct-category-instruction/instruction-1.png → ...t-blueprint-instruction/instruction-1.png
diff --git a/...ct-category-instruction/instruction-2.png → ...t-blueprint-instruction/instruction-2.png b/...ct-category-instruction/instruction-2.png → ...t-blueprint-instruction/instruction-2.png
diff --git a/...ct-category-instruction/instruction-3.png → ...t-blueprint-instruction/instruction-3.png b/...ct-category-instruction/instruction-3.png → ...t-blueprint-instruction/instruction-3.png
diff --git a/...ct-category-instruction/instruction-4.png → ...t-blueprint-instruction/instruction-4.png b/...ct-category-instruction/instruction-4.png → ...t-blueprint-instruction/instruction-4.png
diff --git a/...ct-category-instruction/instruction-5.png → ...t-blueprint-instruction/instruction-5.png b/...ct-category-instruction/instruction-5.png → ...t-blueprint-instruction/instruction-5.png
diff --git a/...ct-category-instruction/instruction-6.png → ...t-blueprint-instruction/instruction-6.png b/...ct-category-instruction/instruction-6.png → ...t-blueprint-instruction/instruction-6.png
diff --git a/...ct-category-instruction/instruction-7.png → ...t-blueprint-instruction/instruction-7.png b/...ct-category-instruction/instruction-7.png → ...t-blueprint-instruction/instruction-7.png
diff --git a/client/images/icons/support.png b/client/images/icons/support.png