Add RequireJS (#73)

* session page working with requirejs

* track page working

* handsontable loading

* track page working with bootstrap

* all pages working with requirejs

* code cleanup and reorganizing dependencies

* cleaning up code

* reorganized to separate views and controllers

* added local copy of bootstrap

* removed extraneous folder '.idea'

* resolved all eslint errors, warnings still exist

* removed unnecessary commented out code

* Update ESLint rules, fix formatting and move files

Author: lucyq

.eslintignore

@@ -1,3 +1,4 @@
-shared/dist/*
-client/script/sheetjsw.js
-client/script/ResizeSensor.js
+client/app/helper/sheetjsw.js
+
+
+client/app/vendor/*

.eslintrc.json

@@ -8,10 +8,35 @@
     "eqeqeq": 2,
     "brace-style": 2,
     "curly": 2,
-    "quotes": [2, "single", { "avoidEscape": true }]
+    "quotes": [2, "single", { "avoidEscape": true }],
+    "no-trailing-spaces": 2,
+    "space-before-function-paren": [2, {
+      "anonymous": "always",
+      "named": "never",
+      "asyncArrow": "always"
+    }],
+    "space-before-blocks": [2, "always"],
+    "requirejs/no-invalid-define": 2,
+    "requirejs/no-multiple-define": 2,
+    "requirejs/no-named-define": 2,
+    "requirejs/no-commonjs-wrapper": 2,
+    "requirejs/no-object-define": 1
   },
   "env": {
     "browser": true,
-    "jquery": true
-  }
+    "jquery": true,
+    "node": true,
+    "amd":true,
+    "es6": true
+  },
+
+  "parserOptions":{
+    "ecmaVersion": 6,
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true
+    }
+  },
+  "plugins": [
+    "requirejs"
+  ]
 }

client/app/common.js

@@ -0,0 +1,30 @@
+require.config({
+  paths: {
+    jquery: 'vendor/jquery',
+    bootstrap: 'vendor/bootstrap.min',
+    Handsontable: 'vendor/handsontable',
+    filesaver: 'vendor/filesaver',
+    XLSX: 'vendor/xlsx',
+    spin: 'vendor/spin',
+    forge: 'vendor/forge',
+    Ladda: 'vendor/ladda',
+    qtip: 'vendor/jquery_qtip',
+    alertify: 'vendor/alertify',
+    alertify_defaults: 'helper/alertify_defaults',
+    DropSheet: 'helper/drop_sheet',
+    mpc: 'helper/mpc',
+    ResizeSensor: 'vendor/ResizeSensor'
+  },
+  shim: {
+    bootstrap: {
+      deps: ['jquery']
+    },
+    spin: {
+      exports: 'spin'
+    },
+    Ladda: {
+      deps: ['spin'],
+      exports: 'Ladda'
+    }
+  }
+});

client/scripts/analyst.js …ent/app/controllers/analystController.jsclient/scripts/analyst.js renamed to client/app/controllers/analystController.js client/scripts/analyst.js renamed to client/app/controllers/analystController.js

@@ -1,15 +1,15 @@
-/* global saveAs, Uint8Array */
-
-'use strict';
-
 /***************************************************************
  *
  * Interface for generating session key and initiating a new
  * session.
  *
  */
+/* global saveAs, Uint8Array */
+
+define(['filesaver'], function (filesaver) {
+
+  'use strict';
 
-var analyst = (function () {
 
   function checkStatus(session, password) {
     if (!session || session.trim() === '' || !password) {
@@ -139,10 +139,11 @@ var analyst = (function () {
             // TODO clean up how this workflow
             document.getElementById(linkID).innerHTML = 'tracking page';
             document.getElementById(linkID).href = '/track?session=' + rndSess;
-            saveAs(priBlob, 'Session_' + rndSess + '_private_key.pem');
+
+            filesaver.saveAs(priBlob, 'Session_' + rndSess + '_private_key.pem');
 
             var text = 'Session Key:\n' + rndSess + '\nPassword:\n' + password;
-            saveAs(new Blob([text], {type: 'text/plain;charset=utf-8'}), 'Session_' + rndSess + '_password.txt');
+            filesaver.saveAs(new Blob([text], {type: 'text/plain;charset=utf-8'}), 'Session_' + rndSess + '_password.txt');
           })
           .catch(function () {
             var errmsg = 'ERROR!!!: failed to load public key to server, please try again';
@@ -223,6 +224,7 @@ var analyst = (function () {
         }, 10000);
       },
       error: function (err) {
+        /* global errmsg */
         var errmsg = 'Error Connecting: Reconnect Attempt #' + counter.toString();
         if (err && err.hasOwnProperty('responseText') && err.responseText !== undefined) {
           errmsg = err.responseText;
@@ -244,6 +246,7 @@ var analyst = (function () {
     return results === null ? '' : decodeURIComponent(results[1].replace(/\+/g, ' '));
   }
 
+
   return {
     checkStatus: checkStatus,
     changeStatus: changeStatus,
@@ -255,6 +258,7 @@ var analyst = (function () {
     START: 'START',
     PAUSE: 'PAUSE',
     STOP: 'STOP'
-  };
-})();
 
+  }
+
+});