Merge branch 'staging' into staging

Author: jzuniga206

.gitignore

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

src/actionTypes/index.js

@@ -0,0 +1,32 @@
+export const LOAD_INIT_DATA: string = 'LOAD_INIT_DATA';
+export const ADD_COMPONENT: string = 'ADD_COMPONENT';
+export const ADD_CHILD: string = 'ADD_CHILD';
+export const DELETE_CHILD: string = 'DELETE_CHILD';
+export const UPDATE_COMPONENT: string = 'UPDATE_COMPONENT';
+export const DELETE_COMPONENT: string = 'DELETE_COMPONENT';
+export const CHANGE_FOCUS_COMPONENT: string = 'CHANGE_FOCUS_COMPONENT';
+export const CHANGE_COMPONENT_FOCUS_CHILD: string = 'CHANGE_COMPONENT_FOCUS_CHILD';
+export const CHANGE_FOCUS_CHILD: string = 'CHANGE_FOCUS_CHILD';
+export const UPDATE_CHILDREN: string = 'UPDATE_CHILDREN';
+export const REASSIGN_PARENT: string = 'REASSIGN_PARENT';
+export const SET_SELECTABLE_PARENTS: string = 'SET_SELECTABLE_PARENTS';
+export const EXPORT_FILES: string = 'EXPORT_FILES';
+export const EXPORT_FILES_SUCCESS: string = 'EXPORT_FILES_SUCCESS';
+export const EXPORT_FILES_ERROR: string = 'EXPORT_FILES_ERROR';
+export const HANDLE_CLOSE: string = 'HANDLE_CLOSE';
+export const HANDLE_TRANSFORM: string = 'HANDLE_TRANSFORM';
+export const CREATE_APPLICATION: string = 'CREATE_APPLICATION';
+export const CREATE_APPLICATION_SUCCESS: string = 'CREATE_APPLICATION_SUCCESS';
+export const CREATE_APPLICATION_ERROR: string = 'CREATE_APPLICATION_ERROR';
+export const MOVE_TO_BOTTOM: string = 'MOVE_TO_BOTTOM';
+export const MOVE_TO_TOP: string = 'MOVE_TO_TOP';
+export const OPEN_EXPANSION_PANEL: string = 'OPEN_EXPANSION_PANEL';
+export const DELETE_PROP: string = 'DELETE_PROP';
+export const ADD_PROP: string = 'ADD_PROP';
+export const DELETE_ALL_DATA: string = 'DELETE_ALL_DATA';
+export const CHANGE_IMAGE_PATH: string = 'CHANGE_IMAGE_PATH';
+export const UPDATE_HTML_ATTR: string = 'UPDATE_HTML_ATTR';
+export const UPDATE_CHILDREN_SORT: string = 'UPDATE_CHILDREN_SORT';
+export const CHANGE_IMAGE_SOURCE: string = 'CHANGE_IMAGE_SOURCE';
+export const DELETE_IMAGE: string = 'DELETE_IMAGE';
+export const TOGGLE_STATE: string = 'TOGGLE_STATE';

src/actionTypes/index.ts

@@ -1,4 +1,6 @@
-import { ComponentInt, ComponentsInt, PropInt, ChildInt } from '../utils/Interfaces.ts';
+import {
+  ComponentInt, ComponentsInt, PropInt, ChildInt, Action, ApplicationStateInt
+} from '../utils/Interfaces.ts';
 
 import {
   LOAD_INIT_DATA,
@@ -26,29 +28,29 @@ import {
   UPDATE_CHILDREN_SORT,
   CHANGE_IMAGE_SOURCE,
   DELETE_IMAGE
-} from '../actionTypes/index.js';
+} from '../actionTypes/index.ts';
 
 import { loadState } from '../localStorage';
 import createFiles from '../utils/createFiles.util.ts';
 import createApplicationUtil from '../utils/createApplication.util.ts';
 
 export const changeImagePath = (imageSource: string) => ({
   type: CHANGE_IMAGE_SOURCE,
-  payload: imageSource
-});
+  payload: { imageSource },
+})
 
-export const loadInitData = () => (dispatch: any) => {
-  loadState().then((data: any) =>
+export const loadInitData = () => (dispatch: (arg: Action) => void) => {
+  loadState().then((data: ApplicationStateInt) => {
     dispatch({
-      type: LOAD_INIT_DATA,
-      payload: {
-        data: data ? data.workspace : {}
-      }
-    })
-  );
+    type: LOAD_INIT_DATA,
+    payload: {
+      data: data ? data.workspace : {},
+    },
+  });
+});
 };
 
-export const addComponent = ({ title }: { title: string }) => (dispatch: any) => {
+export const addComponent = ({ title }: { title: string }) => (dispatch: (arg: Action) => void) => {
   dispatch({ type: ADD_COMPONENT, payload: { title } });
 };
 
@@ -57,14 +59,14 @@ export const addChild = ({
   childType,
   HTMLInfo
 }: {
-  title: string;
-  childType: string;
-  HTMLInfo: object;
-}) => (dispatch: any) => {
+title: string;
+childType: string;
+HTMLInfo: object;
+}) => (dispatch: (arg: Action) => void) => {
   dispatch({ type: ADD_CHILD, payload: { title, childType, HTMLInfo } });
 };
 
-export const deleteChild = ({}) => (dispatch: any) => {
+export const deleteChild = ({}) => (dispatch: (arg: Action) => void) => {
   // with no payload, it will delete focusd child
   dispatch({ type: DELETE_CHILD, payload: {} });
 };
@@ -73,9 +75,9 @@ export const deleteComponent = ({
   componentId,
   stateComponents
 }: {
-  componentId: number;
-  stateComponents: ComponentsInt;
-}) => (dispatch: any) => {
+componentId: number;
+stateComponents: ComponentsInt;
+}) => (dispatch: (arg: Action) => void) => {
   // find all places where the "to be deleted" is a child and do what u gotta do
   stateComponents.forEach((parent: ComponentInt) => {
     parent.childrenArray
@@ -98,44 +100,43 @@ export const deleteComponent = ({
   dispatch({ type: DELETE_COMPONENT, payload: { componentId } });
 };
 
-export const changeFocusComponent = ({ title }: { title: string }) => (dispatch: any) => {
+export const changeFocusComponent = ({ title }: { title: string }) => (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: any) => {
+export const changeFocusChild = ({ childId }: { childId: number }) => (dispatch: (arg: Action) => void) => {
   dispatch({ type: CHANGE_FOCUS_CHILD, payload: { childId } });
 };
 
 export const changeComponentFocusChild = ({
   componentId,
   childId
 }: {
-  componentId: number;
-  childId: number;
-}) => (dispatch: any) => {
+componentId: number;
+childId: number;
+}) => (dispatch: (arg: Action) => void) => {
   dispatch({
     type: CHANGE_COMPONENT_FOCUS_CHILD,
     payload: { componentId, childId }
   });
 };
 
 export const deleteImage = () => ({
-  type: DELETE_IMAGE,
-  payload: ''
-});
+  type: DELETE_IMAGE
+})
 
 export const exportFiles = ({
   components,
   path,
   appName,
   exportAppBool
 }: {
-  components: ComponentsInt;
-  path: string;
-  appName: string;
-  exportAppBool: boolean;
-}) => (dispatch: any) => {
+components: ComponentsInt;
+path: string;
+appName: string;
+exportAppBool: boolean;
+}) => (dispatch: (arg: Action) => void) => {
   // this dispatch sets the global state property 'loading' to true until the createFiles call resolves below
   dispatch({
     type: EXPORT_FILES
@@ -184,12 +185,12 @@ export const createApplication = ({
   appName = 'reactype_app',
   exportAppBool
 }: {
-  path: string;
-  components: ComponentsInt;
-  genOption: number;
-  appName: string;
-  exportAppBool: boolean;
-}) => (dispatch: any) => {
+path: string;
+components: ComponentsInt;
+genOption: number;
+appName: string;
+exportAppBool: boolean;
+}) => (dispatch: (arg: Action) => void) => {
   if (genOption === 0) {
     exportAppBool = false;
     dispatch(
@@ -208,8 +209,7 @@ export const createApplication = ({
     createApplicationUtil({
       path,
       appName,
-      genOption
-      // exportAppBool
+      genOption,
     })
       .then(() => {
         dispatch({
@@ -242,7 +242,7 @@ export const deleteAllData = () => ({
   type: DELETE_ALL_DATA
 });
 
-export const deleteProp = (propId: number) => (dispatch: any) => {
+export const deleteProp = (propId: number) => (dispatch: (arg: Action) => void) => {
   dispatch({ type: DELETE_PROP, payload: propId });
 };
 
@@ -256,19 +256,20 @@ export const addProp = (prop: PropInt) => ({
 });
 
 export const updateHtmlAttr = ({ attr, value }: { attr: string; value: string }) => (
-  dispatch: any
+  dispatch: (arg: Action) => void,
 ) => {
   dispatch({
     type: UPDATE_HTML_ATTR,
     payload: { attr, value }
   });
 };
 
-export const updateChildrenSort = ({ newSortValues }: { newSortValues: any }) => (
-  dispatch: any
-) => {
-  dispatch({
-    type: UPDATE_CHILDREN_SORT,
-    payload: { newSortValues }
-  });
-};
+//Action reserved for SortChildren component not written yet
+// export const updateChildrenSort = ({ newSortValues }: { newSortValues: any }) => (
+//   dispatch: (arg: Action) => void,
+// ) => {
+//   dispatch({
+//     type: UPDATE_CHILDREN_SORT,
+//     payload: { newSortValues },
+//   });
+// };

src/actions/components.ts

@@ -3,7 +3,7 @@ import { format } from 'prettier';
 import componentRender from '../utils/componentRender.util';
 import { ComponentInt, ComponentsInt } from '../utils/Interfaces';
 /** **   SortCHildren will be fixed , dont XXX the file  *** */
-// import SortChildren from './SortChildren.jsx';
+// import SortChildren from './SortChildren.tsx';
 import SyntaxHighlighter from 'react-syntax-highlighter';
 import { hybrid } from 'react-syntax-highlighter/dist/styles/hljs/';