Merge pull request #107 from spincycle01/master

logo change and main.js change

Author: ChristianEdwardPadilla

.gitignore

@@ -480,7 +480,7 @@ ASALocalRun/
 .mfractor/
 
 # DMG File
-React-Proto.dmg
+reactype.dmg
 installers/
 
 # End of https://www.gitignore.io/api/node,linux,macos,windows,visualstudio,yarn

.npmignore

@@ -477,7 +477,7 @@ ASALocalRun/
 .mfractor/
 
 # DMG File
-React-Proto.dmg
+reactype.dmg
 installers/
 assets/
 .git/

main.js

@@ -1,9 +1,11 @@
+const path = require('path');
+
 const {
   app, BrowserWindow, Menu, shell, dialog, ipcMain,
 } = require('electron');
 
 // Uncomment below for hot reloading during development
-require('electron-reload')(__dirname);
+// require('electron-reload')(__dirname);
 
 // const isDev = true;
 const isDev = process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test';
@@ -65,6 +67,7 @@ const createWindow = () => {
       'node-Integration': false,
     },
     show: false,
+    icon: path.join(__dirname, '/src/public/icons/mac/icon.icns'),
   });
 
   // and load the index.html of the app.

src/actions/components.ts

@@ -1,8 +1,4 @@
-import {
-  ComponentInt,
-  ComponentsInt,
-  PropInt
-} from "../utils/interfaces";
+import { ComponentInt, ComponentsInt, PropInt } from '../utils/Interfaces.ts';
 
 import {
   LOAD_INIT_DATA,
@@ -26,38 +22,34 @@ import {
   ADD_PROP,
   DELETE_ALL_DATA,
   UPDATE_HTML_ATTR,
-  UPDATE_CHILDREN_SORT
-} from "../actionTypes/index";
+  UPDATE_CHILDREN_SORT,
+} from '../actionTypes/index.js';
 
-import { loadState } from "../localStorage";
-import createFiles from "../utils/createFiles.util";
-import createApplicationUtil from "../utils/createApplication.util";
+import { loadState } from '../localStorage';
+import createFiles from '../utils/createFiles.util.ts';
+import createApplicationUtil from '../utils/createApplication.util.ts';
 
 export const loadInitData = () => (dispatch: any) => {
-  loadState().then((data: any) =>
-    dispatch({
-      type: LOAD_INIT_DATA,
-      payload: {
-        data: data ? data.workspace : {}
-      }
-    })
-  );
+  loadState().then((data: any) => dispatch({
+    type: LOAD_INIT_DATA,
+    payload: {
+      data: data ? data.workspace : {},
+    },
+  }));
 };
 
-export const addComponent = ({ title }: { title: string }) => (
-  dispatch: any
-) => {
+export const addComponent = ({ title }: { title: string }) => (dispatch: any) => {
   dispatch({ type: ADD_COMPONENT, payload: { title } });
 };
 
 export const addChild = ({
   title,
   childType,
-  HTMLInfo
+  HTMLInfo,
 }: {
-  title: string;
-  childType: string;
-  HTMLInfo: object;
+title: string;
+childType: string;
+HTMLInfo: object;
 }) => (dispatch: any) => {
   dispatch({ type: ADD_CHILD, payload: { title, childType, HTMLInfo } });
 };
@@ -69,104 +61,91 @@ export const deleteChild = ({}) => (dispatch: any) => {
 
 export const deleteComponent = ({
   componentId,
-  stateComponents
+  stateComponents,
 }: {
-  componentId: number;
-  stateComponents: ComponentsInt;
+componentId: number;
+stateComponents: ComponentsInt;
 }) => (dispatch: any) => {
   // find all places where the "to be delted" is a child and do what u gotta do
-  stateComponents.forEach(parent => {
-    parent.childrenArray
-      .filter(child => child.childComponentId === componentId)
-      .forEach(child => {
-        dispatch({
-          type: DELETE_CHILD,
-          payload: {
-            parentId: parent.id,
-            childId: child.childId,
-            calledFromDeleteComponent: true
-          }
-        });
+  stateComponents.forEach((parent) => {
+    parent.childrenArray.filter(child => child.childComponentId === componentId).forEach((child) => {
+      dispatch({
+        type: DELETE_CHILD,
+        payload: {
+          parentId: parent.id,
+          childId: child.childId,
+          calledFromDeleteComponent: true,
+        },
       });
+    });
   });
 
   // change focus to APp
-  dispatch({ type: CHANGE_FOCUS_COMPONENT, payload: { title: "App" } });
+  dispatch({ type: CHANGE_FOCUS_COMPONENT, payload: { title: 'App' } });
   // after taking care of the children delete the component
   dispatch({ type: DELETE_COMPONENT, payload: { componentId } });
 };
 
-export const changeFocusComponent = ({ title }: { title: string }) => (
-  dispatch: any
-) => {
+export const changeFocusComponent = ({ title }: { title: string }) => (dispatch: any) => {
   dispatch({ type: CHANGE_FOCUS_COMPONENT, payload: { title } });
 };
 
 // make sure childId is being sent in
-export const changeFocusChild = ({ childId }: { childId: number }) => (
-  dispatch: any
-) => {
+export const changeFocusChild = ({ childId }: { childId: number }) => (dispatch: any) => {
   dispatch({ type: CHANGE_FOCUS_CHILD, payload: { childId } });
 };
 
 export const changeComponentFocusChild = ({
   componentId,
-  childId
+  childId,
 }: {
-  componentId: number;
-  childId: number;
+componentId: number;
+childId: number;
 }) => (dispatch: any) => {
   dispatch({
     type: CHANGE_COMPONENT_FOCUS_CHILD,
-    payload: { componentId, childId }
+    payload: { componentId, childId },
   });
 };
 
 export const exportFiles = ({
   components,
   path,
   appName,
-  exportAppBool
+  exportAppBool,
 }: {
-  components: ComponentsInt;
-  path: string;
-  appName: string;
-  exportAppBool: boolean;
+components: ComponentsInt;
+path: string;
+appName: string;
+exportAppBool: boolean;
 }) => (dispatch: any) => {
   // 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 =>
-      dispatch({
-        type: EXPORT_FILES_SUCCESS,
-        payload: { status: true, dir: dir[0] }
-      })
-    )
-    .catch(err =>
-      dispatch({
-        type: EXPORT_FILES_ERROR,
-        payload: { status: true, err }
-      })
-    );
+    .then(dir => dispatch({
+      type: EXPORT_FILES_SUCCESS,
+      payload: { status: true, dir: dir[0] },
+    }))
+    .catch(err => dispatch({
+      type: EXPORT_FILES_ERROR,
+      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: {
@@ -175,22 +154,22 @@ export const handleTransform = (
     x,
     y,
     width,
-    height
-  }
+    height,
+  },
 });
 
 export const createApplication = ({
   path,
   components = [],
   genOption,
-  appName = "reactype_app",
-  exportAppBool
+  appName = 'reactype_app',
+  exportAppBool,
 }: {
-  path: string;
-  components: ComponentsInt;
-  genOption: number;
-  appName: string;
-  exportAppBool: boolean;
+path: string;
+components: ComponentsInt;
+genOption: number;
+appName: string;
+exportAppBool: boolean;
 }) => (dispatch: any) => {
   if (genOption === 0) {
     exportAppBool = false;
@@ -199,49 +178,47 @@ 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,
       // exportAppBool
     })
       .then(() => {
         dispatch({
-          type: CREATE_APPLICATION_SUCCESS
+          type: CREATE_APPLICATION_SUCCESS,
         });
         dispatch(
           exportFiles({
             appName,
             path,
             components,
-            exportAppBool
-          })
+            exportAppBool,
+          }),
         );
       })
-      .catch(err =>
-        dispatch({
-          type: CREATE_APPLICATION_ERROR,
-          payload: { status: true, err }
-        })
-      );
+      .catch(err => dispatch({
+        type: CREATE_APPLICATION_ERROR,
+        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: any) => {
@@ -250,29 +227,23 @@ export const deleteProp = (propId: number) => (dispatch: any) => {
 
 export const addProp = (prop: PropInt) => ({
   type: ADD_PROP,
-  payload: { ...prop }
+  payload: { ...prop },
 });
 
-export const updateHtmlAttr = ({
-  attr,
-  value
-}: {
-  attr: string;
-  value: string;
-}) => (dispatch: any) => {
+export const updateHtmlAttr = ({ attr, value }: { attr: string; value: string }) => (
+  dispatch: any,
+) => {
   dispatch({
     type: UPDATE_HTML_ATTR,
-    payload: { attr, value }
+    payload: { attr, value },
   });
 };
 
-export const updateChildrenSort = ({
-  newSortValues
-}: {
-  newSortValues: any;
-}) => (dispatch: any) => {
+export const updateChildrenSort = ({ newSortValues }: { newSortValues: any }) => (
+  dispatch: any,
+) => {
   dispatch({
     type: UPDATE_CHILDREN_SORT,
-    payload: { newSortValues }
+    payload: { newSortValues },
   });
 };

src/components/App.tsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import '../public/styles/style.css';
-import AppContainer from '../containers/AppContainer';
+import AppContainer from '../containers/AppContainer.tsx';
 
 export const App: React.SFC = () => (
   <div className="app">
@@ -12,4 +12,3 @@ export const App: React.SFC = () => (
 );
 
 export default App;
-