Merge pull request #45 from paulbreuler/develop

Major refactor and enhancements

.gitignore

@@ -25,7 +25,6 @@
 .env.test.local
 .env.production.local
 .vs
-.vscode
 yarn.lock
 package-lock.json
 

.vscode/launch.json

@@ -0,0 +1,30 @@
+{
+ // Use IntelliSense to learn about possible attributes.
+ // Hover to view descriptions of existing attributes.
+ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "type": "node",
+ "request": "launch",
+ "name": "Electron: Main",
+ "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
+ "program": "${workspaceFolder}/public/electron.js",
+ "runtimeArgs": ["."]
+ },
+ {
+ "name": "Electron: Renderer",
+ "type": "chrome",
+ "request": "attach",
+ "port": 9223,
+ "webRoot": "${workspaceFolder}",
+ "timeout": 30000
+ }
+ ],
+ "compounds": [
+ {
+ "name": "Electron: All",
+ "configurations": ["Electron: Main", "Electron: Renderer"]
+ }
+ ]
+}

.vscode/tasks.json

@@ -0,0 +1,21 @@
+{
+ // See https://go.microsoft.com/fwlink/?LinkId=733558
+ // for the documentation about the tasks.json format
+ "version": "2.0.0",
+ "tasks": [
+ {
+ "label": "electron-dev",
+ "type": "npm",
+ "script": "electron-dev",
+ "problemMatcher": [],
+ "group": {
+ "kind": "build",
+ "isDefault": true
+ }
+ },
+ {
+ "label": "Build",
+ "dependsOn": ["electron-dev"]
+ }
+ ]
+}

README.md

@@ -4,11 +4,21 @@ Dynamics 365 Solution Assistant is an Electron.js based app to provide a UI solu
 
 # Development Build
 
-Build command simplified from 2 steps to one. Now just run
-<code> npm run electron-dev </code>
+Simply run the following command.
+<code> npm run electron:dev </code>
 
 Note that your browser will display an error related to electron and will not display the site, only the Electron shell will display the application.
 
+To debug Electron run the command above and then launch the debugger via Visual Studio Code using the included launch settings.
+
+# Production Build
+
+Split production build into multiple steps due to errors when combining the steps as one script.
+
+<code> npm run webpack:Production </code>
+<code> npm run build </code>
+<code> npm run electron:pack </code>
+
 # Demo
-![Solution Assistant Demo](https://github.com/paulbreuler/SolutionAssistant/blob/master/github-wiki-media/sa_final_draft.gif)
 
+![Solution Assistant Demo](https://github.com/paulbreuler/SolutionAssistant/blob/master/github-wiki-media/sa_final_draft.gif)

package.json

@@ -1,6 +1,6 @@
 {
  "name": "solution-assistant",
- "version": "0.9.3",
+ "version": "0.9.65",
  "description": "PowerApps Solution Assistant.",
  "author": "Paul Breuler",
  "license": "MIT ",
@@ -33,29 +33,29 @@
  "@material-ui/icons": "^1.1.0",
  "chartist": "0.11.0",
  "classnames": "^2.2.6",
- "electron-is-dev": "^0.3.0",
- "electron-log": "^2.2.16",
+ "electron-is-dev": "^1.1.0",
+ "electron-log": "^4.0.4",
  "immutability-helper": "^2.8.0",
  "nedb": "^1.8.0",
- "perfect-scrollbar": "1.4.0",
- "react": "^16.11.0",
+ "perfect-scrollbar": "1.5.0",
+ "react": "^16.12.0",
  "react-chartist": "0.13.1",
- "react-dom": "^16.11.0",
+ "react-dom": "^16.12.0",
  "react-popper": "^0.10.4",
  "react-redux": "^5.1.2",
  "react-router-dom": "4.3.1",
  "react-split-pane": "^0.1.87",
  "react-swipeable-views": "0.12.14",
  "react-treeview": "^0.4.7",
  "recompose": "^0.30.0",
- "redux": "^4.0.1",
+ "redux": "^4.0.5",
  "redux-thunk": "^2.3.0",
  "simple-git": "^1.107.0",
  "xml2js": "^0.4.19"
  },
  "scripts": {
- "electron-dev": "npm run webpack:development && concurrently \"npm start\" \"wait-on http://localhost:3000 && electron .\"",
- "electron-pack": "electron-builder -c.extraMetadata.main=build/electron.js",
+ "electron:dev": "npm run webpack:development && concurrently \"npm start\" \"wait-on http://localhost:3000 && electron .\"",
+ "electron:pack": "electron-builder -c.extraMetadata.main=build/electron.js",
  "preelectron-pack": "yarn build",
  "webpack:development": "webpack --config ./webpack.development.config.js",
  "webpack:production": "webpack --config ./webpack.production.config.js",
@@ -67,6 +67,7 @@
  "electron": "electron ."
  },
  "devDependencies": {
+ "7zip": "0.0.6",
  "@types/react": "^16.9.19",
  "@types/react-dom": "^16.9.5",
  "concurrently": "^3.6.1",