Feature/136

.gitignore

@@ -18,3 +18,5 @@ Dockerfile_mini
 npm*
 .vscode
 app.log
+utilities/x86_64
+.idea

k8s/cf.yaml

@@ -60,8 +60,8 @@ steps:
 
           resources:
             requests:
-              cpu: 200m
-              memory: 512Mi
+              cpu: 100m
+              memory: 128Mi
 
           allowNamedServers: true
           namedServerLimitPerUser: 2
@@ -123,7 +123,7 @@ steps:
     environment:
       - CHART_NAME=jupyterhub
       - RELEASE_NAME=${{RELEASE_NAME}}
-      - KUBE_CONTEXT=geppetto-cluster@metacellllc
+      - KUBE_CONTEXT=${{CLUSTER_NAME}}
       - NAMESPACE=${{NAMESPACE}}
       - TILLER_NAMESPACE=kube-system
       - CHART_VERSION=0.9.0-beta.4

netpyne_ui/netpyne_geppetto.py

@@ -512,6 +512,8 @@ def deleteParam(self, model, label):
             return False
 
     def validateFunction(self, functionString):
+        if isinstance(functionString, (float, int)): 
+            return True
         return validateFunction(functionString, self.netParams.__dict__)
 
     def exportHLS(self, args):

netpyne_ui/netpyne_model_interpreter.py

@@ -6,9 +6,9 @@
 import pygeppetto.model as pygeppetto
 from pygeppetto.model.model_factory import GeppettoModelFactory
 from pygeppetto.model.values import Point, ArrayElement, ArrayValue
+from pygeppetto.services.model_interpreter import ModelInterpreter
 
-
-class NetPyNEModelInterpreter():
+class NetPyNEModelInterpreter(ModelInterpreter):
 
     def __init__(self):
         self.factory = GeppettoModelFactory()

webapp/Main.js

@@ -3,64 +3,38 @@ global.GEPPETTO_CONFIGURATION = require('./GeppettoConfiguration.json');
 
 jQuery(function () {
   require('geppetto-client-initialization');
-  var ReactDOM = require('react-dom');
-  var React = require('react');
-  var getMuiTheme = require('@material-ui/core/styles/createMuiTheme').default;
-  var MuiThemeProvider = require('@material-ui/core/styles').MuiThemeProvider;
-  var NetPyNE = require('./NetPyNE').default;
+  const ReactDOM = require('react-dom');
+  const React = require('react');
+  const MuiThemeProvider = require('@material-ui/core/styles').MuiThemeProvider;
+  const NetPyNE = require('./components').NetPyNE;
 
-
-  var Utils = require('./Utils').default;
-  var Console = require('geppetto-client/js/components/interface/console/Console');
-  var TabbedDrawer = require('geppetto-client/js/components/interface/drawer/TabbedDrawer');
-  var PythonConsole = require('geppetto-client/js/components/interface/pythonConsole/PythonConsole');
-  var theme = require('./Theme').default
+  const theme = require('./Theme').default
 
   const Provider = require("react-redux").Provider;
   const configureStore = require('./redux/store').default;
 
   require('./css/netpyne.less');
   require('./css/material.less');
   require('./css/traceback.less');
+  require('./css/flexlayout.less');
+  require('./css/tree.less');
 
   const store = configureStore();
 
-  function App (data = {}) {
-    return (
-      <div>
-        <MuiThemeProvider theme={theme}>
-          <Provider store={store}>
-            <NetPyNE {...data}></NetPyNE>
-          </Provider>
-        </MuiThemeProvider>
+  ReactDOM.render(
+    <div>
+      <MuiThemeProvider theme={theme}>
+        <Provider store={store}>
+          <NetPyNE ></NetPyNE>
+        </Provider>
+      </MuiThemeProvider>
 
-        <div id="footer">
-          <div id="footerHeader">
-            <TabbedDrawer anchor="appBar" labels={["Console", "Python"]} iconClass={["fa fa-terminal", "fa fa-flask"]} >
-              <Console />
-              <PythonConsole pythonNotebookPath={"notebooks/notebook.ipynb"} />
-            </TabbedDrawer>
-          </div>
-        </div>
-      </div>
-    );
-  }
-  ReactDOM.render(<App />, document.querySelector('#mainContainer'));
+    </div>, 
+    document.querySelector('#mainContainer')
+  );
 
   GEPPETTO.G.setIdleTimeOut(-1);
-  GEPPETTO.G.debug(false); // Change this to true to see messages on the Geppetto console while loading
   GEPPETTO.Resources.COLORS.DEFAULT = "#6f54aa";
   GEPPETTO.trigger(GEPPETTO.Events.Show_spinner, "Initialising NetPyNE");
-
-  GEPPETTO.on('jupyter_geppetto_extension_ready', data => {
-    let project = { id: 1, name: 'Project', experiments: [{ "id": 1, "name": 'Experiment', "status": 'DESIGN' }] }
-    GEPPETTO.Manager.loadProject(project, false);
-    GEPPETTO.Manager.loadExperiment(1, [], []);
-    Utils.execPythonMessage('from netpyne_ui.netpyne_geppetto import netpyne_geppetto');
-    Utils.evalPythonMessage('netpyne_geppetto.getData',[]).then(response => {
-      var data = Utils.convertToJSON(response)
-      ReactDOM.render(<App data={data} />, document.querySelector('#mainContainer'));
-      GEPPETTO.trigger("spinner:hide");
-    })
-  });
+
 });

webapp/Theme.js

@@ -1,13 +1,15 @@
 
 import createMuiTheme from '@material-ui/core/styles/createMuiTheme';
 import purple from '@material-ui/core/colors/purple';
-import pink from '@material-ui/core/colors/pink';
+import orange from '@material-ui/core/colors/orange';
 
-// pink
-const secondaryColor = pink['A200']
-// purple
-const primaryColor = 'rgb(84, 58, 115)'
+// orange
+const primaryColor = '#f67700'
+const secondaryColor = '#f67700'
 
+const bgLight = '#616161';
+const bgRegular = '#424242';
+const bgDark = '#212121';
 
 export default createMuiTheme({
   typography: {
@@ -21,25 +23,45 @@ export default createMuiTheme({
     }
   },
   palette: {
+    type: 'dark',
     primary: { main: primaryColor, },
-    secondary: { main: secondaryColor, }
+    secondary: { main: bgLight, },
   },
   overrides: {
     MuiInputLabel: { formControl: { top: '-6px' } },
     MuiInput: {
       input: {
         outline: 'none !important', 
         border: 'none !important', 
-        boxShadow: 'none !important' 
+        boxShadow: 'none !important',
       },
+      root:{ color: 'white' }
+
     },
     MuiSelect: {
       root: {
         outline: 'none !important', 
         border: 'none !important', 
         boxShadow: 'none !important'
       },
-      select: { "&:focus" :{ background: "none" } },
-    }
+      select: { "&:focus" :{ background: "none" }, paddingLeft: '4px' },
+    },
+    MuiCard: { root: { height: '100%', backgroundColor: bgRegular, overflowY: 'auto' } },
+    MuiBottomNavigation: { root: { backgroundColor: bgRegular } },
+    MuiPaper: { root: { color: 'inherit' } },
+    MuiBottomNavigationAction: { root: { color: 'white' } },
+    MuiFab:{ 
+      secondary: { color: 'white' },
+      primary: { color: 'white' } 
+    },
+    MuiButton: { 
+      containedSecondary: { color: 'white' },
+      containedPrimary: { color: 'white' },
+    },
+    MuiMenuItem: { root: { color: 'white' } },
+
+    MuiListItemText: { root: { color: 'white' } },
+    MuiDialogTitle: { root: { color: 'white' } }
+
   }
 });