Merging oslabs-beta staging to feature

Author: jzuniga206

.gitignore

@@ -1,6 +1,7 @@
 # Created by https://www.gitignore.io/api/node,linux,macos,windows,visualstudio,yarn
 yarn.lock
 package-lock.json
+.prettierrc.json
 ### Linux ###
 *~
 

electron-builder.yml

@@ -7,7 +7,7 @@ linux:
   target:
     - AppImage
     - deb
-  maintainer: spincycle01@yahoo.com
+  maintainer: sean.sadykoff@gmail.com
 mac:
   category: public.app-category.developer-tools
   target: dmg
@@ -29,4 +29,4 @@ dmg:
       'y': 150
       type: link
       path: /Applications
-electronVersion: 2.0.7
+electronVersion: 3.0.0

main.js

@@ -41,6 +41,16 @@ function openFile() {
   mainWindow.webContents.send('new-file', file);
 }
 
+//functions to replace the default behavior of undo and redo
+function undo() {
+  mainWindow.webContents.send('undo');
+}
+
+function redo() {
+  mainWindow.webContents.send('redo');
+}
+
+
 function toggleTutorial() {
   mainWindow.webContents.send('tutorial_clicked');
 }
@@ -107,8 +117,20 @@ const createWindow = () => {
     {
       label: 'Edit',
       submenu: [
-        { role: 'undo' },
-        { role: 'redo' },
+        { 
+          label: 'Undo',
+          accelerator: process.platform === 'darwin' ? 'Cmd+Z' : 'Ctrl+Z',  //these hotkeys are a tad bit glitchy
+          click() {
+            undo();
+          }
+        },
+        { 
+          label: 'Redo',
+          accelerator: process.platform === 'darwin' ? 'Cmd+Shift+Z' : 'Ctrl+Shift+Z',
+          click() {
+            redo();
+          }
+        },
         { type: 'separator' },
         { role: 'cut' },
         { role: 'copy' },
@@ -216,7 +238,9 @@ const createWindow = () => {
   });
 
   // dev tools opened on every browser creation
-  mainWindow.webContents.openDevTools();
+  mainWindow.webContents.once('dom-ready', () => {
+    mainWindow.webContents.openDevTools();
+  });
 };
 
 // This method will be called when Electron has finished

package.json

@@ -30,7 +30,7 @@
         "AppImage",
         "deb"
       ],
-      "maintainer": "spincycle01@yahoo.com"
+      "maintainer": "sean.sadykoff@gmail.com"
     },
     "mac": {
       "category": "public.app-category.developer-tools",
@@ -90,8 +90,8 @@
     ]
   },
   "dependencies": {
-    "@material-ui/core": "^3.9.3",
-    "@material-ui/icons": "^2.0.0",
+    "@material-ui/core": "^4.2.1",
+    "@material-ui/icons": "^4.0.1",
     "@material-ui/styles": "^4.9.0",
     "@types/prettier": "^1.19.0",
     "@types/react": "^16.8.14",
@@ -103,12 +103,14 @@
     "classnames": "^2.2.6",
     "cli-spinner": "^0.2.8",
     "commander": "^2.17.1",
+    "concurrently": "^5.1.0",
     "d3": "^5.9.2",
     "electron-reload": "^1.4.0",
     "enzyme": "^3.4.1",
     "konva": "^4.1.6",
     "localforage": "^1.7.2",
     "lodash.throttle": "^4.1.1",
+    "material-table": "^1.25.2",
     "prettier": "^1.19.1",
     "prop-types": "^15.6.2",
     "react": "^16.13.0",
@@ -122,10 +124,12 @@
     "redux": "^4.0.0",
     "redux-devtools-extension": "^2.13.5",
     "redux-logger": "^3.0.6",
-    "redux-thunk": "^2.3.0"
+    "redux-thunk": "^2.3.0",
+    "redux-undo": "^1.0.1"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.3.3",
+    "@material-ui/styles": "^4.9.6",
     "awesome-typescript-loader": "^5.2.1",
     "babel-core": "^6.26.3",
     "babel-eslint": "^8.2.6",
@@ -134,11 +138,12 @@
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "clean-webpack-plugin": "^0.1.19",
+    "concurrently": "^5.1.0",
     "copy-webpack-plugin": "^4.5.2",
-    "cross-env": "^5.2.0",
+    "cross-env": "^5.2.1",
     "css-loader": "^0.28.11",
     "electron": "^2.0.7",
-    "electron-builder": "^20.28.1",
+    "electron-builder": "^20.44.4",
     "electron-devtools-installer": "^2.2.4",
     "electron-installer-dmg": "^2.0.0",
     "enzyme-adapter-react-16": "^1.2.0",
@@ -160,5 +165,11 @@
     "typescript": "^3.4.4",
     "webpack": "^4.42.0",
     "webpack-cli": "^3.3.11"
-  }
+  },
+  "browserslist": [
+    ">0.2%",
+    "not dead",
+    "not ie <= 11",
+    "not op_mini all"
+  ]
 }

src/actionTypes/index.ts

@@ -32,3 +32,5 @@ export const DELETE_IMAGE: string = 'DELETE_IMAGE';
 export const TOGGLE_STATE: string = 'TOGGLE_STATE';
 export const TOGGLE_CLASS: string = 'TOGGLE_CLASS';
 export const CHANGE_TUTORIAL: string = 'CHANGE_TUTORIAL';
+export const UNDO: string = 'UNDO';
+export const REDO: string = 'REDO';