Merge pull request #28 from sean1292/staging

Made changes so that the app can build without having  specific file path

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

package.json

@@ -30,7 +30,7 @@
         "AppImage",
         "deb"
       ],
-      "maintainer": "spincycle01@yahoo.com"
+      "maintainer": "sean.sadykoff@gmail.com"
     },
     "mac": {
       "category": "public.app-category.developer-tools",
@@ -73,7 +73,7 @@
     "build-bin": "electron-builder -mwl",
     "test": "cross-env NODE_ENV=test jest",
     "linter": "eslint src",
-    "develop": "concurrently \"yarn run dev\" \"yarn run electron\""
+    "develop": "concurrently \"npm run dev\" \"npm run electron\""
   },
   "bin": {
     "reactype": "./index.js"
@@ -92,7 +92,6 @@
   "dependencies": {
     "@material-ui/core": "^3.9.3",
     "@material-ui/icons": "^2.0.0",
-    "@material-ui/styles": "^4.9.0",
     "@types/prettier": "^1.19.0",
     "@types/react": "^16.8.14",
     "@types/react-dom": "^16.8.4",
@@ -103,6 +102,7 @@
     "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",
@@ -126,6 +126,7 @@
   },
   "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",
@@ -139,7 +140,7 @@
     "cross-env": "^5.2.0",
     "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",

src/actions/components.ts

@@ -1,4 +1,10 @@
-import { ComponentInt, ComponentsInt, PropInt, ChildInt, Action } from '../utils/Interfaces';
+import {
+  ComponentInt,
+  ComponentsInt,
+  PropInt,
+  ChildInt,
+  Action,
+} from '../utils/Interfaces';
 
 import {
   LOAD_INIT_DATA,
@@ -27,7 +33,7 @@ import {
   // UPDATE_CHILDREN_SORT, --The reason why this is commented out is because of the unused reducer of the same name, for the component that is unfinished with the same name. Check out the Sort Children component to see what it does.
   CHANGE_IMAGE_SOURCE,
   DELETE_IMAGE,
-  CHANGE_TUTORIAL
+  CHANGE_TUTORIAL,
 } from '../actionTypes/index';
 
 import { loadState } from '../localStorage'; //this is a warning from 'localStorage' being a .js file instead of .ts. Convert to .ts to remove this warning.
@@ -36,33 +42,35 @@ import createApplicationUtil from '../utils/createApplication.util';
 
 export const changeTutorial = (tutorial: number) => ({
   type: CHANGE_TUTORIAL,
-  payload: { tutorial }
+  payload: { tutorial },
 });
 
 export const changeImagePath = (imageSource: string) => ({
   type: CHANGE_IMAGE_SOURCE,
-  payload: { imageSource }
+  payload: { imageSource },
 });
 
 export const loadInitData = () => (dispatch: (arg: Action) => void) => {
   loadState().then((data: any) => {
     dispatch({
       type: LOAD_INIT_DATA,
       payload: {
-        data: data ? data.workspace : {}
-      }
+        data: data ? data.workspace : {},
+      },
     });
   });
 };
 
-export const addComponent = ({ title }: { title: string }) => (dispatch: (arg: Action) => void) => {
+export const addComponent = ({ title }: { title: string }) => (
+  dispatch: (arg: Action) => void,
+) => {
   dispatch({ type: ADD_COMPONENT, payload: { title } });
 };
 
 export const addChild = ({
   title,
   childType,
-  HTMLInfo
+  HTMLInfo,
 }: {
   title: string;
   childType: string;
@@ -78,7 +86,7 @@ export const deleteChild = ({}) => (dispatch: (arg: Action) => void) => {
 
 export const deleteComponent = ({
   componentId,
-  stateComponents
+  stateComponents,
 }: {
   componentId: number;
   stateComponents: ComponentsInt;
@@ -93,8 +101,8 @@ export const deleteComponent = ({
           payload: {
             parentId: parent.id,
             childId: child.childId,
-            calledFromDeleteComponent: true
-          }
+            calledFromDeleteComponent: true,
+          },
         });
       });
   });
@@ -106,40 +114,40 @@ export const deleteComponent = ({
 };
 
 export const changeFocusComponent = ({ title }: { title: string }) => (
-  dispatch: (arg: Action) => void
+  dispatch: (arg: Action) => void,
 ) => {
   dispatch({ type: CHANGE_FOCUS_COMPONENT, payload: { title } });
 };
 
 // make sure childId is being sent in
 export const changeFocusChild = ({ childId }: { childId: number }) => (
-  dispatch: (arg: Action) => void
+  dispatch: (arg: Action) => void,
 ) => {
   dispatch({ type: CHANGE_FOCUS_CHILD, payload: { childId } });
 };
 
 export const changeComponentFocusChild = ({
   componentId,
-  childId
+  childId,
 }: {
   componentId: number;
   childId: number;
 }) => (dispatch: (arg: Action) => void) => {
   dispatch({
     type: CHANGE_COMPONENT_FOCUS_CHILD,
-    payload: { componentId, childId }
+    payload: { componentId, childId },
   });
 };
 
 export const deleteImage = () => ({
-  type: DELETE_IMAGE
+  type: DELETE_IMAGE,
 });
 
 export const exportFiles = ({
   components,
   path,
   appName,
-  exportAppBool
+  exportAppBool,
 }: {
   components: ComponentsInt;
   path: string;
@@ -148,32 +156,37 @@ export const exportFiles = ({
 }) => (dispatch: (arg: Action) => void) => {
   // this dispatch sets the global state property 'loading' to true until the createFiles call resolves below
   dispatch({
-    type: EXPORT_FILES
+    type: EXPORT_FILES,
   });
   createFiles(components, path, appName, exportAppBool)
     .then((dir: any) =>
       dispatch({
         type: EXPORT_FILES_SUCCESS,
-        payload: { status: true, dir: dir[0] }
-      })
+        payload: { status: true, dir: dir[0] },
+      }),
     )
     .catch((err: string) =>
       dispatch({
         type: EXPORT_FILES_ERROR,
-        payload: { status: true, err }
-      })
+        payload: { status: true, err },
+      }),
     );
 };
 
 export const handleClose = () => ({
   type: HANDLE_CLOSE,
-  payload: false
+  payload: false,
 });
 
 export const handleTransform = (
   componentId: number,
   childId: number,
-  { x, y, width, height }: { x: number; y: number; width: number; height: number }
+  {
+    x,
+    y,
+    width,
+    height,
+  }: { x: number; y: number; width: number; height: number },
 ) => ({
   type: HANDLE_TRANSFORM,
   payload: {
@@ -182,16 +195,16 @@ export const handleTransform = (
     x,
     y,
     width,
-    height
-  }
+    height,
+  },
 });
 
 export const createApplication = ({
   path,
   components = [],
   genOption,
   appName = 'reactype_app',
-  exportAppBool
+  exportAppBool,
 }: {
   path: string;
   components: ComponentsInt;
@@ -206,73 +219,83 @@ export const createApplication = ({
         appName,
         path,
         components,
-        exportAppBool
-      })
+        exportAppBool,
+      }),
     );
   } else if (genOption) {
     exportAppBool = true;
     dispatch({
-      type: CREATE_APPLICATION
+      type: CREATE_APPLICATION,
     });
     createApplicationUtil({
       path,
       appName,
-      genOption
+      genOption,
     })
       .then(() => {
         dispatch({
-          type: CREATE_APPLICATION_SUCCESS
+          type: CREATE_APPLICATION_SUCCESS,
         });
         dispatch(
           exportFiles({
             appName,
             path,
             components,
-            exportAppBool
-          })
+            exportAppBool,
+          }),
         );
       })
       .catch((err: string) =>
         dispatch({
           type: CREATE_APPLICATION_ERROR,
-          payload: { status: true, err }
-        })
+          payload: { status: true, err },
+        }),
       );
   }
 };
 
 export const openExpansionPanel = (component: ComponentInt) => ({
   type: OPEN_EXPANSION_PANEL,
-  payload: { component }
+  payload: { component },
 });
 
 export const deleteAllData = () => ({
-  type: DELETE_ALL_DATA
+  type: DELETE_ALL_DATA,
 });
 
-export const deleteProp = (propId: number) => (dispatch: (arg: Action) => void) => {
+export const deleteProp = (propId: number) => (
+  dispatch: (arg: Action) => void,
+) => {
   dispatch({ type: DELETE_PROP, payload: propId });
 };
 
-export const toggleComponentState = (id: string) => (dispatch: (arg: Action) => void) => {
+export const toggleComponentState = (id: string) => (
+  dispatch: (arg: Action) => void,
+) => {
   dispatch({ type: TOGGLE_STATE, payload: id });
 };
 
-export const toggleComponentClass = (id: string) => (dispatch: (arg: Action) => void) => {
+export const toggleComponentClass = (id: string) => (
+  dispatch: (arg: Action) => void,
+) => {
   dispatch({ type: TOGGLE_CLASS, payload: id });
 };
 
 export const addProp = (prop: PropInt) => ({
   type: ADD_PROP,
-  payload: { ...prop }
+  payload: { ...prop },
 });
 
-export const updateHtmlAttr = ({ attr, value }: { attr: string; value: string }) => (
-  dispatch: (arg: Action) => void
-) => {
+export const updateHtmlAttr = ({
+  attr,
+  value,
+}: {
+  attr: string;
+  value: string;
+}) => (dispatch: (arg: Action) => void) => {
   dispatch({
     type: UPDATE_HTML_ATTR,
-    payload: { attr, value }
+    payload: { attr, value },
   });
 };