#142 Layout start refactoring

Author: filippomc

netpyne_ui/geppetto

@@ -0,0 +1 @@
+Subproject commit 7588ed3475f0da25e6caed3d48e43b86d1fb4fc4

package-lock.json

@@ -8,7 +8,7 @@ jQuery(function () {
   const MuiThemeProvider = require('@material-ui/core/styles').MuiThemeProvider;
   const NetPyNE = require('./components').NetPyNE;
 
-  const theme = require('./Theme').default
+  const theme = require('./theme').default
 
   const Provider = require("react-redux").Provider;
   const configureStore = require('./redux/store').default;

webapp/Main.js

@@ -185,32 +185,5 @@ const Utils = {
   evalPythonMessage: evalPythonMessage
 }
 
-/**
- * Deep object comparison
- * @param {*} a 
- * @param {*} b 
- */
-export function isEqual (a, b) {
-  if (a === b) {
-    return true;
-  }
-  if (a instanceof Date && b instanceof Date) {
-    return a.getTime() === b.getTime();
-  }
-  if (!a || !b || (typeof a !== 'object' && typeof b !== 'object')) {
-    return a === b;
-  }
-  if (a === null || a === undefined || b === null || b === undefined) {
-    return false;
-  }
-  if (a.prototype !== b.prototype) {
-    return false;
-  }
-  let keys = Object.keys(a);
-  if (keys.length !== Object.keys(b).length) {
-    return false;
-  }
-  return keys.every(k => isEqual(a[k], b[k]));
-}
 
 export default Utils

webapp/Utils.js

@@ -9,7 +9,7 @@ import {
   maximizeWidget,
   updateWidget,
   newWidget
-} from "../redux/actions/flexlayout";
+} from "../redux/actions/layout";
 import { openBackendErrorDialog, closeBackendErrorDialog } from '../redux/actions/errors';
 import {
   updateCards, editModel, simulateNetwork, createNetwork, 
@@ -92,7 +92,7 @@ export const NetPyNECellRule = connect((state, ownProps) => ({
 
 import _LayoutManager from "./layout/LayoutManager";
 export const LayoutManager = connect(
-  state => ({ ...state.flexlayout, editMode: state.general.editMode }),
+  state => ({ ...state.layout, editMode: state.general.editMode }),
   dispatch => ({
     updateWidget: widget => dispatch(updateWidget(widget)),
     minimizeWidget: id => dispatch(minimizeWidget(id)),