Merge pull request #43 from jinsoolim/revert

Revert

Author: diegovazquezny

app/electron/menu.js

@@ -17,7 +17,7 @@ var MenuBuilder = function(mainWindow, appName) {
 
   const openTutorial = () => {
     const tutorial = new BrowserWindow({
-      width: 800,
+      width: 1126,
       height: 900,
       minWidth: 661,
       title: 'Tutorial',
@@ -31,10 +31,9 @@ var MenuBuilder = function(mainWindow, appName) {
         devTools: false
       }
     });
-    console.log(process.env.NODE_ENV);
     if (process.env.NODE_ENV === 'development') {
       tutorial.loadURL(`http://localhost:8080/#/tutorial`);}
-    else {
+    else if (process.env.NODE_ENV === 'production'){
       tutorial.loadURL(`${Protocol.scheme}://rse/index-prod.html#/tutorial`);
     }
     tutorial.show();

app/src/reducers/componentReducer.ts

@@ -457,6 +457,7 @@ const reducer = (state: State, action: Action) => {
     case 'DELETE PAGE': {
       const id: number = state.canvasFocus.componentId;
       const name: string = state.components[id - 1].name;
+
       const components: Component[] = deleteById(id, name);
 
       // rebuild rootComponents with correct page IDs
@@ -467,6 +468,7 @@ const reducer = (state: State, action: Action) => {
     case 'DELETE REUSABLE COMPONENT': {
       const id: number = state.canvasFocus.componentId;
       const name: string = state.components[id - 1].name;
+
       // updated list of components after deleting a component
       const components: Component[] = deleteById(id, name);
       const rootComponents: number[] = updateRoots(components);
@@ -605,7 +607,6 @@ const reducer = (state: State, action: Action) => {
           state.HTMLTypes
         );
       })
-
       return {
         ...state,
         HTMLTypes,

package.json

@@ -32,6 +32,7 @@
     "postinstall": "ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true electron-builder install-app-deps",
     "dev-server": "cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js",
     "dev": "concurrently --success first \"npm run dev-server\" \"cross-env NODE_ENV=development electron .\" \"cross-env NODE_ENV=development npm run server\" -k",
+    "p": "concurrently --success first \"npm run dev-server\" \"cross-env NODE_ENV=production electron .\" \"cross-env NODE_ENV=production npm run server\" -k",
     "prod-build": "cross-env NODE_ENV=production npx webpack --mode=production --config ./webpack.production.js",
     "prod": "npm run prod-build && electron .",
     "pack": "electron-builder --dir",