set new paths (first iteration)

openworm · Feb 19, 2019 · 99ecf38 · 99ecf38
1 parent dab7c4d
commit 99ecf38
Show file tree

Hide file tree

Showing 26 changed files with 214 additions and 127 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+**/*.min.js
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,112 @@
+/**
+|--------------------------------------------------
+| sudo npm install -g eslint@latest eslint-plugin-import@latest  babel-eslint
+|--------------------------------------------------
+*/
+module.exports = {
+  extends: [
+    "eslint:recommended",
+  ],
+  env: {
+    browser: true,
+    commonjs: true,
+    es6: true,
+    node: true,
+    jquery: true,
+    amd: true,
+    mocha: true,
+    jasmine: true,
+    phantomjs: true,
+    worker: true,
+    jest: true
+  },
+  parser: "babel-eslint",
+  parserOptions: {
+    "sourceType": "module", // import export syntax
+    "ecmaVersion": 2017 // async await syntax
+  },
+  rules: { // 0: allow, 1: warning, 2: error
+    "no-tabs": 2, // no tabs in code
+    "no-empty": 0,
+    'no-console': 0,
+    "curly": 2,
+    "no-global-assign": 0, // allow global variables to be modified
+    "no-constant-condition": 0, // allow:    while(true) { ... }
+    "no-control-regex": 0, // allow regex
+    "no-redeclare": 0, // allow redeclare a variable
+    "no-inner-declarations": 0, // allow define functions inside functions
+    "indent": ["error", 2,  {
+      "ObjectExpression": "first",
+      "ArrayExpression": "first"
+    }], // 2 spaces for indentation and consistent alignment
+    "arrow-spacing": 2,
+    "no-unused-vars": 0,
+    "keyword-spacing": 2,
+    "no-useless-escape": 0,
+    "brace-style": 2, // enforce open bracket in same line
+    "multiline-comment-style": [2, "starred-block"], // enforce commented block style
+    "object-curly-newline": [2, { "multiline": true }], // enforce  obj items identation
+    "operator-linebreak": [2, "before"], // break operator to new line
+    "space-infix-ops": 2, 
+    "no-multi-spaces": 2,
+    "no-unneeded-ternary": 2,
+    "no-multiple-empty-lines": 2,
+    "spaced-comment": [2, "always"],
+    "arrow-parens": [2, "as-needed"],
+    "arrow-body-style": [2, "as-needed"],
+    "object-curly-spacing": [2, "always"],
+    "template-curly-spacing": [2, "never"],
+    "space-before-function-paren": [1, "always"]
+  },
+  globals: {
+      "G": true,
+      "root": true,
+      "casper": true,
+      "message": true,
+      "endpoint": true,
+      "GEPPETTO": true,
+      "gepetto-client": true,
+      "Project": true,
+      "Instances": true,
+      "IPython": true,
+      "GEPPETTO_CONFIGURATION": true,
+      "MozWebSocket": true,
+      "panelComponent": true,
+      "Detector": true,
+      "THREE": true,
+      "VARS": true,
+      "Stats": true,
+      "geometry": true,
+      "aabbMin": true,
+      "aabbMax": true,
+      "bb": true,
+      "ClipboardModal": true,
+      "Store": true,
+      "olark": true,
+      "google": true,
+      "path": true,
+      "CodeMirror": true,
+      "Connectivity": true,
+      "π": true,
+      "τ": true,
+      "halfπ": true,
+      "dr": true,
+      "Model": true,
+      "Plot1": true,
+      "PIXI": true,
+      "stackViewerRequest": true,
+      "_": true,
+      "labelsInTV": true,
+      "Backbone": true,
+      "registeredEvents": true,
+      "Handlebars": true,
+      "ActiveXObject": true,
+      "jstestdriver": true,
+      "TestCase": true,
+      "EMBEDDED": true,
+      "EMBEDDERURL": true,
+      "handleRequest": true,
+      "_gaq": true,
+      "Canvas1": true
+  }
+};
diff --git a/.gitignore b/.gitignore
@@ -1,18 +1,6 @@
-*.class
 *.DS_Store
-META-INF
 node_modules/
 node/
-dashboard/api/session.json
-
-# Build js, css
-webapp/css/main.css
-webapp/js/extensions/*
-webapp/WEB-INF/web.xml
-!webapp/js/extensions/geppetto-default
-!js/extensions/extensions.js
-
-# Package Files #
 
 # Editor byproducts
 .idea/
@@ -25,8 +13,6 @@ webapp/WEB-INF/web.xml
 *~
 .imdone/
 /.externalToolBuilders/
-/.settings/*
-.classpath
 
 #WormSim specific stuff
 *.css-e

diff --git a/js/components/interface/3dCanvas/OBJLoader.js b/js/components/interface/3dCanvas/OBJLoader.js
@@ -438,7 +438,7 @@ THREE.OBJLoader.prototype = {
         var material = new THREE.PointsMaterial(
             {
                 size: 2,
-                map: textureLoader.load("geppetto/js/components/interface/3dCanvas/particle.png"),
+                map: textureLoader.load("geppetto/node_modules/@geppettoengine/geppetto-client/js/components/interface/3dCanvas/particle.png"),
                 blending: THREE.AdditiveBlending,
                 depthTest: false,
                 transparent: true,

diff --git a/js/components/interface/3dCanvas/ThreeDEngine.js b/js/components/interface/3dCanvas/ThreeDEngine.js
@@ -1039,7 +1039,7 @@ define(['jquery'], function () {
             var material = new THREE.PointsMaterial(
                 {
                     size: 2,
-                    map: textureLoader.load("geppetto/js/components/interface/3dCanvas/3dparticle.png"),
+                    map: textureLoader.load("geppetto/node_modules/@geppettoengine/geppetto-client/js/components/interface/3dCanvas/3dparticle.png"),
                     blending: THREE.NormalBlending,
                     depthTest: true,
                     transparent: true,

diff --git a/js/components/interface/controlPanel/controlpanel.js b/js/components/interface/controlPanel/controlpanel.js
@@ -10,7 +10,7 @@ define(function (require) {
         document.getElementsByTagName("head")[0].appendChild(link);
     }
 
-    loadCss("geppetto/js/components/interface/controlPanel/vendor/css/bootstrap-colorpicker.min.css");
+    loadCss("geppetto/node_modules/@geppettoengine/geppetto-client/js/components/interface/controlPanel/vendor/css/bootstrap-colorpicker.min.css");
 
     //require('./vendor/css/bootstrap-colorpicker.min.css'); Matteo: This require is not working?!?
     var React = require('react');

diff --git a/js/components/interface/tutorial/Tutorial.js b/js/components/interface/tutorial/Tutorial.js
@@ -321,7 +321,7 @@ define(function (require) {
 					} else {
 						//default tutorial when user doesn't specify one for this event
 						if (self.state.tutorialData == {}) {
-							self.setTutorial("/org.geppetto.frontend/geppetto/js/components/interface/tutorial/configuration/experiment_loaded_tutorial.json", "Geppetto tutorial");
+							self.setTutorial("/org.geppetto.frontend/geppetto/node_modules/@geppettoengine/geppetto-client/js/components/interface/tutorial/configuration/experiment_loaded_tutorial.json", "Geppetto tutorial");
 						}
 						else {
 							self.start();

diff --git a/js/components/widgets/connectivity/Connectivity.js b/js/components/widgets/connectivity/Connectivity.js
@@ -368,7 +368,7 @@ define(function (require) {
         createLayoutSelector: function() {
 
             function imgPath(path){
-                return 'geppetto/js/components/widgets/connectivity/images/' + path;
+                return 'geppetto/node_modules/@geppettoengine/geppetto-client/js/components/widgets/connectivity/images/' + path;
             }
 
             var layoutOptions = [

diff --git a/js/components/widgets/connectivity/controllers/ConnectivityController.js b/js/components/widgets/connectivity/controllers/ConnectivityController.js
@@ -59,7 +59,7 @@ define(function (require) {
                     GEPPETTO.WidgetsListener.subscribe(that, id);
 
                     //add commands help option
-                    GEPPETTO.CommandController.updateHelpCommand(cnt, id, that.getFileComments("geppetto/js/components/widgets/connectivity/Connectivity.js"));
+                    GEPPETTO.CommandController.updateHelpCommand(cnt, id, that.getFileComments("geppetto/node_modules/@geppettoengine/geppetto-client/js/components/widgets/connectivity/Connectivity.js"));
 
                     //update tags for autocompletion
                     GEPPETTO.CommandController.updateTags(cnt.getId(), cnt);

diff --git a/js/components/widgets/plot/controllers/PlotsController.js b/js/components/widgets/plot/controllers/PlotsController.js
@@ -56,7 +56,7 @@ define(function(require) {
                     GEPPETTO.WidgetsListener.subscribe(that, id);
 
                     //add commands to console autocomplete and help option
-                    GEPPETTO.CommandController.updateHelpCommand(p, id, that.getFileComments("geppetto/js/components/widgets/plot/Plot.js"));
+                    GEPPETTO.CommandController.updateHelpCommand(p, id, that.getFileComments("geppetto/node_modules/@geppettoengine/geppetto-client/js/components/widgets/plot/Plot.js"));
                     //update tags for autocompletion
                     GEPPETTO.CommandController.updateTags(p.getId(), p);
 

diff --git a/js/components/widgets/popup/controllers/PopupController.js b/js/components/widgets/popup/controllers/PopupController.js
@@ -57,7 +57,7 @@ define(function (require) {
                     GEPPETTO.WidgetsListener.subscribe(that, id);
 
                     //add commands to console autocomplete and help option
-                    GEPPETTO.CommandController.updateHelpCommand(p, id, that.getFileComments("geppetto/js/components/widgets/popup/Popup.js"));
+                    GEPPETTO.CommandController.updateHelpCommand(p, id, that.getFileComments("geppetto/node_modules/@geppettoengine/geppetto-client/js/components/widgets/popup/Popup.js"));
 
                     //update tags for autocompletion
                     GEPPETTO.CommandController.updateTags(p.getId(), p);

diff --git a/js/components/widgets/stackViewer/StackViewerComponent.js b/js/components/widgets/stackViewer/StackViewerComponent.js
@@ -327,7 +327,7 @@ define(function (require) {
                 }
             } else {
                 if (this.props.canvasRef != undefined && this.props.canvasRef != null) {
-                    this.state.stackViewerPlane = this.props.canvasRef.add3DPlane(this.state.plane[0], this.state.plane[1], this.state.plane[2], this.state.plane[3], this.state.plane[4], this.state.plane[5], this.state.plane[6], this.state.plane[7], this.state.plane[8], this.state.plane[9], this.state.plane[10], this.state.plane[11], "geppetto/js/components/widgets/stackViewer/images/glass.jpg");
+                    this.state.stackViewerPlane = this.props.canvasRef.add3DPlane(this.state.plane[0], this.state.plane[1], this.state.plane[2], this.state.plane[3], this.state.plane[4], this.state.plane[5], this.state.plane[6], this.state.plane[7], this.state.plane[8], this.state.plane[9], this.state.plane[10], this.state.plane[11], "geppetto/node_modules/@geppettoengine/geppetto-client/js/components/widgets/stackViewer/images/glass.jpg");
                 }
                 if (this.state.stackViewerPlane.visible) {
                     this.state.stackViewerPlane.visible = true;

diff --git a/js/components/widgets/stackViewer/controllers/StackViewerController.js b/js/components/widgets/stackViewer/controllers/StackViewerController.js
@@ -47,7 +47,7 @@ define(function (require) {
                     GEPPETTO.WidgetsListener.subscribe(that, id);
 
                     //updates help command options
-                    GEPPETTO.CommandController.updateHelpCommand(vv, id, that.getFileComments("geppetto/js/components/widgets/stackViewer/StackViewer.js"));
+                    GEPPETTO.CommandController.updateHelpCommand(vv, id, that.getFileComments("geppetto/node_modules/@geppettoengine/geppetto-client/js/components/widgets/stackViewer/StackViewer.js"));
 
                     //update tags for autocompletion
                     GEPPETTO.CommandController.updateTags(vv.getId(), vv);

diff --git a/...nents/widgets/treevisualiser/treevisualiserdat/controllers/TreeVisualiserControllerDAT.js b/...nents/widgets/treevisualiser/treevisualiserdat/controllers/TreeVisualiserControllerDAT.js
@@ -55,7 +55,7 @@ define(function (require) {
                     GEPPETTO.WidgetsListener.subscribe(that, id);
 
                     // updates helpc command output
-                    GEPPETTO.CommandController.updateHelpCommand(tvdat, id, that.getFileComments("geppetto/js/components/widgets/treevisualiser/treevisualiserdat/TreeVisualiserDAT.js"));
+                    GEPPETTO.CommandController.updateHelpCommand(tvdat, id, that.getFileComments("geppetto/node_modules/@geppettoengine/geppetto-client/js/components/widgets/treevisualiser/treevisualiserdat/TreeVisualiserDAT.js"));
                     //update tags for autocompletion
                     GEPPETTO.CommandController.updateTags(tvdat.getId(), tvdat);
 

diff --git a/js/components/widgets/variablevisualiser/controllers/VariableVisualiserController.js b/js/components/widgets/variablevisualiser/controllers/VariableVisualiserController.js
@@ -48,7 +48,7 @@ define(function (require) {
                     GEPPETTO.WidgetsListener.subscribe(that, id);
 
                     //updates help command options
-                    GEPPETTO.CommandController.updateHelpCommand(vv, id, that.getFileComments("geppetto/js/components/widgets/variablevisualiser/VariableVisualiser.js"));
+                    GEPPETTO.CommandController.updateHelpCommand(vv, id, that.getFileComments("geppetto/node_modules/@geppettoengine/geppetto-client/js/components/widgets/variablevisualiser/VariableVisualiser.js"));
                     //update tags for autocompletion
                     GEPPETTO.CommandController.updateTags(vv.getId(), vv);
                     resolve(vv);

diff --git a/js/geppettoProject/ExperimentsController.js b/js/geppettoProject/ExperimentsController.js
@@ -364,7 +364,7 @@ define(function (require) {
                         }
 
                         // create web worker
-                        this.worker = new Worker("geppetto/js/geppettoProject/ExperimentWorker.js");
+                        this.worker = new Worker("geppetto/node_modules/@geppettoengine/geppetto-client/js/geppettoProject/ExperimentWorker.js");
 
                         // tells worker to update each half a second
                         this.worker.postMessage([GEPPETTO.Events.Experiment_play, GEPPETTO.ExperimentsController.playTimerStep, this.playOptions.step]);

diff --git a/js/pages/admin/admin.ejs b/js/pages/admin/admin.ejs
@@ -3,14 +3,14 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <link rel="icon" type="image/png" href="./geppetto/images/favicon.png"/>
+    <link rel="icon" type="image/png" href="./geppetto/node_modules/@geppettoengine/geppetto-client/style/favicon.png"/>
     <title>Admin</title>
     <meta name="author" content="">
 
     <meta name="viewport" content="width=device-width,initial-scale=1">
 
-    <link rel="stylesheet" href="./geppetto/style/css/font-awesome.min.css"/>
-    <link rel="stylesheet" href="./geppetto/style/css/gpt-icons.css"/>
+    <link rel="stylesheet" href="./geppetto/node_modules/@geppettoengine/geppetto-client/style/css/font-awesome.min.css"/>
+    <link rel="stylesheet" href="./geppetto/node_modules/@geppettoengine/geppetto-client/style/css/gpt-icons.css"/>
 
 </head>
 <body>

diff --git a/js/pages/admin/admin.js b/js/pages/admin/admin.js
@@ -4,7 +4,7 @@
 define(function(require) {
 
 	window.$ = require('jquery');
-    global.GEPPETTO_CONFIGURATION = require('../../../GeppettoConfiguration.json');
+    global.GEPPETTO_CONFIGURATION = require('root/GeppettoConfiguration.json');
 	var React = require('react');
 	var ReactDOM = require('react-dom');
 	var adminPanel = React.createFactory(require('./AdminPanel'));

diff --git a/js/pages/dashboard/dashboard.ejs b/js/pages/dashboard/dashboard.ejs
@@ -3,21 +3,21 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <link rel="icon" type="image/png" href="./geppetto/style/favicon.png"/>
+    <link rel="icon" type="image/png" href="./geppetto/node_modules/@geppettoengine/geppetto-client/style/favicon.png"/>
     <title>geppetto's home</title>
     <meta name="description" content="geppetto .:dashboard:.">
 
     <meta name="viewport" content="width=device-width,initial-scale=1">
 
-    <link rel="stylesheet" href="./geppetto/js/pages/dashboard/css/styles.css">
-    <link rel="stylesheet" href="./geppetto/style/css/font-awesome.min.css"/>
+    <link rel="stylesheet" href="./geppetto/node_modules/@geppettoengine/geppetto-client/js/pages/dashboard/css/styles.css">
+    <link rel="stylesheet" href="./geppetto/node_modules/@geppettoengine/geppetto-client/style/css/font-awesome.min.css"/>
 
     <script>
         window.EMBEDDED = <%=htmlWebpackPlugin.options.GEPPETTO_CONFIGURATION.embedded%>;
         window.EMBEDDERURL = "<%=htmlWebpackPlugin.options.GEPPETTO_CONFIGURATION.embedderURL%>";
     </script>
 
-    <script data-main="geppetto/js/pages/dashboard/js/main" src="./geppetto/js/pages/dashboard/js/libs/require/require.js"></script>
+    <script data-main="geppetto/node_modules/@geppettoengine/geppetto-client/js/pages/dashboard/js/main" src="./geppetto/node_modules/@geppettoengine/geppetto-client/js/pages/dashboard/js/libs/require/require.js"></script>
 </head>
 <body>
 

diff --git a/js/pages/geppetto/G.js b/js/pages/geppetto/G.js
@@ -117,7 +117,7 @@ define(function (require) {
              * @returns {String} All commands and descriptions for G.
              */
             help: function () {
-                GEPPETTO.Utility.extractCommandsFromFile("geppetto/js/pages/geppetto/G.js", GEPPETTO.G, "G");
+                GEPPETTO.Utility.extractCommandsFromFile("geppetto/node_modules/@geppettoengine/geppetto-client/js/pages/geppetto/G.js", GEPPETTO.G, "G");
                 return this;
             },
 

diff --git a/js/pages/geppetto/GEPPETTO.Main.js b/js/pages/geppetto/GEPPETTO.Main.js
@@ -78,9 +78,9 @@ define(function (require) {
                     this.statusWorker.terminate();
                 }
                 if (GEPPETTO_CONFIGURATION.contextPath == "/") {
-                    this.statusWorker = new Worker("/geppetto/js/geppettoProject/PullStatusWorker.js");
+                    this.statusWorker = new Worker("/geppetto/node_modules/@geppettoengine/geppetto-client/js/geppettoProject/PullStatusWorker.js");
                 }else{
-                    this.statusWorker = new Worker("geppetto/js/geppettoProject/PullStatusWorker.js");
+                    this.statusWorker = new Worker("geppetto/node_modules/@geppettoengine/geppetto-client/js/geppettoProject/PullStatusWorker.js");
                 }
 
                 this.statusWorker.postMessage(2000);

diff --git a/js/pages/geppetto/geppetto.ejs b/js/pages/geppetto/geppetto.ejs
@@ -18,11 +18,11 @@
 	<% } %>
 
     <!-- CSS -->
-	<link rel="stylesheet" href="<%= cssPaths%>geppetto/style/css/custom-theme/jquery-ui-1.10.0.custom.css"/>
-	<link rel="stylesheet" href="<%= cssPaths%>geppetto/style/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="<%= cssPaths%>geppetto/style/css/codemirror.css"/>
-	<link rel="stylesheet" href="<%= cssPaths%>geppetto/style/css/lesser-dark.css"/>
-	<link rel="stylesheet" href="<%= cssPaths%>geppetto/style/css/gpt-icons.css"/>
+	<link rel="stylesheet" href="<%= cssPaths%>geppetto/node_modules/@geppettoengine/geppetto-client/style/css/custom-theme/jquery-ui-1.10.0.custom.css"/>
+	<link rel="stylesheet" href="<%= cssPaths%>geppetto/node_modules/@geppettoengine/geppetto-client/style/css/font-awesome.min.css"/>
+	<link rel="stylesheet" href="<%= cssPaths%>geppetto/node_modules/@geppettoengine/geppetto-client/style/css/codemirror.css"/>
+	<link rel="stylesheet" href="<%= cssPaths%>geppetto/node_modules/@geppettoengine/geppetto-client/style/css/lesser-dark.css"/>
+	<link rel="stylesheet" href="<%= cssPaths%>geppetto/node_modules/@geppettoengine/geppetto-client/style/css/gpt-icons.css"/>
 
 	<% if(htmlWebpackPlugin.options.GEPPETTO_CONFIGURATION.properties.icon.indexOf("http") !== -1){ %>
 		<link rel="icon" type="image/png" href="<%=htmlWebpackPlugin.options.GEPPETTO_CONFIGURATION.properties.icon%>"/>