Merge pull request #62 from ChristianEdwardPadilla/development

cleanup

Author: ChristianEdwardPadilla

src/actions/components.js

@@ -26,23 +26,21 @@ import {
   ADD_PROP,
   DELETE_ALL_DATA,
   CHANGE_IMAGE_PATH,
-  UPDATE_HTML_ATTR
-} from "../actionTypes/index";
+  UPDATE_HTML_ATTR,
+} from '../actionTypes/index';
 
-import { loadState } from "../localStorage";
+import { loadState } from '../localStorage';
 
-import createFiles from "../utils/createFiles.util";
-import createApplicationUtil from "../utils/createApplication.util";
+import createFiles from '../utils/createFiles.util';
+import createApplicationUtil from '../utils/createApplication.util';
 
-export const loadInitData = () => dispatch => {
-  loadState().then(data =>
-    dispatch({
-      type: LOAD_INIT_DATA,
-      payload: {
-        data: data ? data.workspace : {}
-      }
-    })
-  );
+export const loadInitData = () => (dispatch) => {
+  loadState().then(data => dispatch({
+    type: LOAD_INIT_DATA,
+    payload: {
+      data: data ? data.workspace : {},
+    },
+  }));
 };
 
 // export const updateChildren = ({ parentIds, childIndex, childId }) => ({
@@ -63,47 +61,36 @@ export const loadInitData = () => dispatch => {
 //   },
 // });
 
-export const addComponent = ({ title }) => dispatch => {
+export const addComponent = ({ title }) => (dispatch) => {
   dispatch({ type: ADD_COMPONENT, payload: { title } });
 };
 
-export const addChild = ({ title, childType, HTMLInfo }) => dispatch => {
+export const addChild = ({ title, childType, HTMLInfo }) => (dispatch) => {
   dispatch({ type: ADD_CHILD, payload: { title, childType, HTMLInfo } });
 };
 
-export const deleteChild = ({}) => dispatch => {
+export const deleteChild = ({}) => (dispatch) => {
   // with no payload, it will delete focusd child
   dispatch({ type: DELETE_CHILD, payload: {} });
 };
 
-export const deleteComponent = ({
-  componentId,
-  stateComponents
-}) => dispatch => {
-  console.log(
-    "Hello from component.js delete component.componentId= ",
-    componentId
-  );
-
+export const deleteComponent = ({ componentId, stateComponents }) => (dispatch) => {
   // 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 => {
-        // console.log(`Should delete ${child.childId} from component id:${parent.id} ${parent.title}`)
-        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 } });
 };
@@ -139,143 +126,129 @@ export const deleteComponent = ({
 //   dispatch({ type: SET_SELECTABLE_PARENTS });
 // };
 
-export const changeFocusComponent = ({ title }) => dispatch => {
+export const changeFocusComponent = ({ title }) => (dispatch) => {
   dispatch({ type: CHANGE_FOCUS_COMPONENT, payload: { title } });
 };
 
 // make sure childId is being sent in
-export const changeFocusChild = ({ title, childId }) => dispatch => {
+export const changeFocusChild = ({ title, childId }) => (dispatch) => {
   dispatch({ type: CHANGE_FOCUS_CHILD, payload: { title, childId } });
 };
 
-export const changeComponentFocusChild = ({
-  componentId,
-  childId
-}) => dispatch => {
+export const changeComponentFocusChild = ({ componentId, childId }) => (dispatch) => {
   dispatch({
     type: CHANGE_COMPONENT_FOCUS_CHILD,
-    payload: { componentId, childId }
+    payload: { componentId, childId },
   });
 };
 
 export const exportFiles = ({
-  components,
-  path,
-  appName,
-  exportAppBool
-}) => dispatch => {
+  components, path, appName, exportAppBool,
+}) => (dispatch) => {
   // 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,
-  childId,
-  { x, y, width, height }
-) => ({
+export const handleTransform = (componentId, childId, {
+  x, y, width, height,
+}) => ({
   type: HANDLE_TRANSFORM,
   payload: {
     componentId,
     childId,
     x,
     y,
     width,
-    height
-  }
+    height,
+  },
 });
 
 export const createApplication = ({
   path,
   components = [],
   genOption,
-  appName = "reactype_app",
-  exportAppBool
-}) => dispatch => {
+  appName = 'reactype_app',
+  exportAppBool,
+}) => (dispatch) => {
   if (genOption === 0) {
     exportAppBool = false;
     dispatch(
       exportFiles({
         appName,
         path,
         components,
-        exportAppBool
-      })
+        exportAppBool,
+      }),
     );
   } else if (genOption) {
     exportAppBool = true;
     dispatch({
-      type: CREATE_APPLICATION
+      type: CREATE_APPLICATION,
     });
     createApplicationUtil({
       path,
       appName,
       genOption,
-      exportAppBool
+      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 => ({
   type: OPEN_EXPANSION_PANEL,
-  payload: { component }
+  payload: { component },
 });
 
 // export const deleteAllData = () => ({
 //   type: DELETE_ALL_DATA,
 // });
 
-export const deleteProp = propId => dispatch => {
+export const deleteProp = propId => (dispatch) => {
   dispatch({ type: DELETE_PROP, payload: propId });
 };
 
 export const addProp = prop => ({
   type: ADD_PROP,
-  payload: { ...prop }
+  payload: { ...prop },
 });
 
-export const updateHtmlAttr = ({ attr, value }) => dispatch => {
+export const updateHtmlAttr = ({ attr, value }) => (dispatch) => {
   dispatch({
     type: UPDATE_HTML_ATTR,
-    payload: { attr, value }
+    payload: { attr, value },
   });
 };

src/components/BottomPanel.jsx

@@ -1,27 +1,23 @@
-import React, { Component } from "react";
-import { connect } from "react-redux";
-import {
-  handleClose,
-  deleteCompProp,
-  addCompProp
-} from "../actions/components";
-import RightTabs from "./RightTabs.jsx";
-import { some } from "bluebird-lst";
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { some } from 'bluebird-lst';
+import { handleClose, deleteCompProp, addCompProp } from '../actions/components';
+import RightTabs from './RightTabs.jsx';
 
-const IPC = require("electron").ipcRenderer;
+const IPC = require('electron').ipcRenderer;
 
 const mapDispatchToProps = dispatch => ({
   handleNotificationClose: () => dispatch(handleClose()),
   deleteProp: ({ id, index }) => dispatch(deleteCompProp({ id, index })),
-  addProp: prop => dispatch(addCompProp(prop))
+  addProp: prop => dispatch(addCompProp(prop)),
 });
 
 const mapStateToProps = store => ({
   // successOpen: store.workspace.successOpen,
   // errorOpen: store.workspace.errorOpen,
   // appDir: store.workspace.appDir,
   focusChild: store.workspace.focusChild,
-  components: store.workspace.components
+  components: store.workspace.components,
 });
 
 class BottomPanel extends Component {
@@ -31,7 +27,7 @@ class BottomPanel extends Component {
   // };
 
   viewAppDir = () => {
-    IPC.send("view_app_dir", this.props.appDir);
+    IPC.send('view_app_dir', this.props.appDir);
   };
 
   render() {
@@ -44,14 +40,12 @@ class BottomPanel extends Component {
       focusComponent,
       deleteProp,
       addProp,
-      focusChild
+      focusChild,
       // rightColumnOpen
     } = this.props;
 
-    console.log(components);
-
     return (
-      <div className="bottom-panel" style={{ width: "100%" }}>
+      <div className="bottom-panel" style={{ width: '100%' }}>
         <RightTabs
           components={components}
           focusComponent={focusComponent}
@@ -74,5 +68,5 @@ class BottomPanel extends Component {
 
 export default connect(
   mapStateToProps,
-  mapDispatchToProps
+  mapDispatchToProps,
 )(BottomPanel);