Skip to content

Commit

Permalink
#102 port to geppetto-client 2.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
filippomc committed Feb 17, 2020
1 parent 28b721c commit b9393be
Show file tree
Hide file tree
Showing 74 changed files with 4,170 additions and 4,177 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
*.DS_Store
.DS_Store
node_modules
build
geppetto-client
.idea/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ script:
- docker build -t="geppetto-neuron_pip" https://github.com/MetaCell/NEURON-UI.git#interface:Dockerfile_pip/
- echo "Current time :$(date +"%T")"
- docker build -t="geppetto-neuron" https://github.com/MetaCell/NEURON-UI.git#interface:Dockerfile/
- echo "Current time :$(date +"%T")"
- echo "Current time :$(date +"%T")"
108 changes: 54 additions & 54 deletions ComponentsInitialization.js
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
define(function (require) {
return function (GEPPETTO) {
var ReactDOM = require('react-dom');
var React = require('react');
var getMuiTheme = require('material-ui/styles/getMuiTheme').default;
var MuiThemeProvider = require('material-ui/styles/MuiThemeProvider').default;
var NetPyNE = require('./NetPyNE').default;
var injectTapEventPlugin = require('react-tap-event-plugin');
return function (GEPPETTO) {
var ReactDOM = require('react-dom');
var React = require('react');
var getMuiTheme = require('material-ui/styles/getMuiTheme').default;
var MuiThemeProvider = require('material-ui/styles/MuiThemeProvider').default;
var NetPyNE = require('./NetPyNE').default;
var injectTapEventPlugin = require('react-tap-event-plugin');

var Utils = require('./Utils').default;
var Console = require('../../js/components/interface/console/Console');
var TabbedDrawer = require('../../js/components/interface/drawer/TabbedDrawer');
var PythonConsole = require('../../js/components/interface/pythonConsole/PythonConsole');
var Utils = require('./Utils').default;
var Console = require('../../js/components/interface/console/Console');
var TabbedDrawer = require('../../js/components/interface/drawer/TabbedDrawer');
var PythonConsole = require('../../js/components/interface/pythonConsole/PythonConsole');

require('./css/netpyne.less');
require('./css/material.less');
require('./css/traceback.less');
require('./css/netpyne.less');
require('./css/material.less');
require('./css/traceback.less');

injectTapEventPlugin();
injectTapEventPlugin();

const customTheme = {
palette: {
primary1Color: '#543a73',
primary2Color: '#eb557a',
primary3Color: '#ebd07a'
}
};
const customTheme = {
palette: {
primary1Color: '#543a73',
primary2Color: '#eb557a',
primary3Color: '#ebd07a'
}
};

const theme = getMuiTheme(customTheme);
const theme = getMuiTheme(customTheme);

function App(data = {}) {
return (
<div>
<MuiThemeProvider muiTheme={theme}>
<NetPyNE {...data}></NetPyNE>
</MuiThemeProvider>
function App (data = {}) {
return (
<div>
<MuiThemeProvider muiTheme={theme}>
<NetPyNE {...data}></NetPyNE>
</MuiThemeProvider>

<div id="footer">
<div id="footerHeader">
<TabbedDrawer 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 id="footer">
<div id="footerHeader">
<TabbedDrawer 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'));

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.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) => {
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");
})
});
};
GEPPETTO.on('jupyter_geppetto_extension_ready', data => {
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");
})
});
};
});
Loading

0 comments on commit b9393be

Please sign in to comment.