Reorganized component folder

Author: tonyito

src/actions/actionCreators.ts

@@ -4,7 +4,7 @@ import {
   PropInt,
   ChildInt,
   Action,
-} from '../utils/Interfaces';
+} from '../intefaces/Interfaces';
 
 import {
   LOAD_INIT_DATA,

src/components/AddChildProps.tsx renamed to src/components/bottom/AddChildProps.tsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { addProp, deleteProp } from '../actions/actionCreators';
+import { addProp, deleteProp } from '../../actions/actionCreators';
 import MaterialTable from 'material-table';
 
 const mapDispatchToProps = (dispatch: any) => ({

src/components/BottomPanel.tsx renamed to src/components/bottom/BottomPanel.tsx

@@ -1,8 +1,8 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { handleClose, deleteProp, addProp } from '../actions/actionCreators';
+import { handleClose, deleteProp, addProp } from '../../actions/actionCreators';
 import BottomTabs from './BottomTabs';
-import { PropsInt, PropInt } from '../utils/Interfaces';
+import { PropsInt, PropInt } from '../../intefaces/Interfaces';
 
 const IPC = require('electron').ipcRenderer;
 

src/components/BottomTabs.tsx renamed to src/components/bottom/BottomTabs.tsx

@@ -8,11 +8,10 @@ import Props from './Props';
 import HtmlAttr from './HtmlAttr';
 import CodePreview from './CodePreview';
 import {
-  ComponentInt,
   ComponentsInt,
   PropInt,
   PropsInt
-} from '../utils/Interfaces';
+} from '../../intefaces/Interfaces';
 
 interface BottomTabsPropsInt extends PropsInt {
   deleteProp(id: number): void;

src/components/CodePreview.tsx renamed to src/components/bottom/CodePreview.tsx

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { format } from 'prettier';
-import componentRender from '../utils/componentRender.util';
-import { ComponentInt, ComponentsInt } from '../utils/Interfaces';
+import componentRender from '../../utils/componentRender.util';
+import { ComponentInt, ComponentsInt } from '../../intefaces/Interfaces';
 /** **   SortCHildren will be fixed , dont XXX the file  *** */
 // import SortChildren from './SortChildren.tsx';
 import SyntaxHighlighter from 'react-syntax-highlighter';

src/components/DataTable.tsx renamed to src/components/bottom/DataTable.tsx

@@ -9,9 +9,9 @@ import Paper from '@material-ui/core/Paper';
 import Select from '@material-ui/core/Select';
 import Fab from '@material-ui/core/Fab';
 import InputLabel from '@material-ui/core/InputLabel';
-import { updateHtmlAttr } from '../actions/actionCreators';
-import { HTMLelements } from '../utils/htmlElements.util';
-import { PropsInt, PropInt } from '../utils/Interfaces';
+import { updateHtmlAttr } from '../../actions/actionCreators';
+import { HTMLelements } from '../../utils/htmlElements.util';
+import { PropsInt, PropInt } from '../../intefaces/Interfaces';
 
 interface HTMLAttrPropsInt extends PropsInt {
   updateHtmlAttr(arg: { attr: string; value: string }): void;

src/components/HtmlAttr.tsx renamed to src/components/bottom/HtmlAttr.tsx

@@ -7,9 +7,9 @@ import TextField from '@material-ui/core/TextField';
 import Button from '@material-ui/core/Button';
 import Select from '@material-ui/core/Select';
 import InputLabel from '@material-ui/core/InputLabel';
-import { addProp, deleteProp } from '../actions/actionCreators';
+import { addProp, deleteProp } from '../../actions/actionCreators';
 import DataTable from './DataTable';
-import { PropInt, PropsInt } from '../utils/Interfaces';
+import { PropInt, PropsInt } from '../../intefaces/Interfaces';
 
 interface PropsPropsInt extends PropsInt {
   classes: any;

src/components/Props.tsx renamed to src/components/bottom/Props.tsx

@@ -14,7 +14,7 @@ import Tooltip from '@material-ui/core/Tooltip';
 import Collapse from '@material-ui/core/Collapse';
 import Switch from '@material-ui/core/Switch'; // for state/class toggling
 import InputLabel from '@material-ui/core/InputLabel'; // labeling of state/class toggles
-import { ComponentInt, ComponentsInt, PropsInt } from '../utils/Interfaces'; // unused
+import { ComponentInt, ComponentsInt, PropsInt } from '../../intefaces/Interfaces'; // unused
 interface LeftColExpPanPropsInt extends PropsInt {
   classes: any;
   id?: number;

src/components/SortChildren.tsx renamed to src/components/bottom/SortChildren.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import SimpleModal from '../components/SimpleModal';
+import SimpleModal from './SimpleModal';
 
 type Props = {
   closeModal: any;

src/components/HTMLComponentPanel.tsx renamed to src/components/left/HTMLComponentPanel.tsx

@@ -5,7 +5,7 @@ import {
   ComponentInt,
   ChildInt,
   PropsInt,
-} from '../utils/Interfaces';
+} from '../../intefaces/Interfaces';
 
 //////////////////////////////////////////////////////////////////////////////
 /////Logic in this component is mainly the same as Rectangle.tsx./////////////

src/components/LeftColExpansionPanel.tsx renamed to src/components/left/LeftColExpansionPanel.tsx

@@ -5,9 +5,9 @@ import React, { Component } from 'react';
 import { Stage, Layer, Line } from 'react-konva';
 import Konva from 'konva';
 import Rectangle from './Rectangle';
-import cloneDeep from '../utils/cloneDeep';
-import { ComponentInt, ChildInt, PropsInt } from '../utils/Interfaces';
-import isEmpty from '../utils/isEmpty';
+import cloneDeep from '../../helperFunctions/cloneDeep';
+import { ComponentInt, ChildInt, PropsInt } from '../../intefaces/Interfaces';
+import isEmpty from '../../helperFunctions/isEmpty';
 // import BottomPan from './BottomPanel';
 
 interface KonvaStagePropsInt extends PropsInt {

src/components/SimpleModal.tsx renamed to src/components/left/SimpleModal.tsx

@@ -3,7 +3,7 @@ import Konva from 'konva';
 import { Rect, Group, Label, Text } from 'react-konva';
 import TransformerComponent from './TransformerComponent';
 import GrandchildRectangle from './GrandchildRectangle';
-import { ComponentInt, PropsInt, ChildInt } from '../utils/Interfaces';
+import { ComponentInt, PropsInt, ChildInt } from '../../intefaces/Interfaces';
 
 interface RectanglePorpsInt extends PropsInt {
   x: number;

src/utils/createModal.util.tsx renamed to src/components/left/createModal.tsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Transformer } from 'react-konva';
-import { ChildInt } from '../utils/Interfaces';
+import { ChildInt } from '../../intefaces/Interfaces';
 import Konva from 'konva';
 
 interface TCompPropsInt {

src/components/GrandchildRectangle.tsx renamed to src/components/main/GrandchildRectangle.tsx

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import Backdrop from '@material-ui/core/Backdrop';
 import Modal from '@material-ui/core/Modal';
 import Fade from '@material-ui/core/Fade';
-import theme from '../components/theme';
+import theme from '../../theme';
 import Button from '@material-ui/core/Button';
 
 interface Props {

src/components/KonvaStage.tsx renamed to src/components/main/KonvaStage.tsx

@@ -2,15 +2,15 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { MuiThemeProvider } from '@material-ui/core/styles';
 import LinearProgress from '@material-ui/core/LinearProgress';
-import Tutorial from '../components/Tutorial';
+import Tutorial from '../components/main/Tutorial';
 import LeftContainer from './LeftContainer';
 import MainContainer from './MainContainer';
-import theme from '../components/theme';
+import theme from '../theme';
 import {
   ComponentInt,
   ComponentsInt,
   ApplicationStateInt,
-} from '../utils/Interfaces';
+} from '../intefaces/Interfaces';
 import * as actions from '../actions/actionCreators';
 
 // ** Used with electron to render

src/components/Rectangle.tsx renamed to src/components/main/Rectangle.tsx

@@ -11,12 +11,12 @@ import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
 import ListItemText from '@material-ui/core/ListItemText';
 import Fab from '@material-ui/core/Fab';
-import LeftColExpansionPanel from '../components/LeftColExpansionPanel';
-import HTMLComponentPanel from '../components/HTMLComponentPanel';
+import LeftColExpansionPanel from '../components/left/LeftColExpansionPanel';
+import HTMLComponentPanel from '../components/left/HTMLComponentPanel';
 import * as actions from '../actions/actionCreators';
-import { ComponentInt, ComponentsInt, PropsInt } from '../utils/Interfaces';
-import createModal from '../utils/createModal.util';
-import cloneDeep from '../utils/cloneDeep';
+import { ComponentInt, ComponentsInt, PropsInt } from '../intefaces/Interfaces';
+import createModal from '../components/left/createModal';
+import cloneDeep from '../helperFunctions/cloneDeep';
 
 const IPC = require('electron').ipcRenderer;
 

src/components/TransformerComponent.tsx renamed to src/components/main/TransformerComponent.tsx

@@ -4,17 +4,17 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { MuiThemeProvider } from '@material-ui/core/styles';
-import BottomPanel from '../components/BottomPanel';
-import theme from '../components/theme';
+import BottomPanel from '../components/bottom/BottomPanel';
+import theme from '../theme';
 import {
   handleTransform,
   changeFocusChild,
   changeComponentFocusChild,
   deleteChild,
   changeFocusComponent
 } from '../actions/actionCreators';
-import KonvaStage from '../components/KonvaStage';
-import { PropsInt, ApplicationStateInt } from '../utils/Interfaces';
+import KonvaStage from '../components/main/KonvaStage';
+import { PropsInt, ApplicationStateInt } from '../intefaces/Interfaces';
 
 interface MainContPropsInt extends PropsInt {
   image: HTMLImageElement | null;

src/components/Tutorial.tsx renamed to src/components/main/Tutorial.tsx

@@ -1,4 +1,4 @@
-import { ApplicationStateInt } from './Interfaces';
+import { ApplicationStateInt } from '../intefaces/Interfaces';
 import cloneDeep from './cloneDeep';
 
 /*Helper function that copies the state to be added on to the history

src/containers/AppContainer.tsx

@@ -1,4 +1,4 @@
-import { ComponentInt, ComponentsInt, ChildInt } from './Interfaces';
+import { ComponentInt, ComponentsInt, ChildInt } from '../intefaces/Interfaces';
 
 interface getSelectableInt {
   [key: string]: Array<number>;

src/containers/LeftContainer.tsx

@@ -1,5 +1,5 @@
 import localforage from 'localforage';
-import { ApplicationStateInt } from './utils/Interfaces';
+import { ApplicationStateInt } from './intefaces/Interfaces';
 
 export const saveState = (state: ApplicationStateInt) =>
   localforage.setItem('state-v1.0.1', state);

src/containers/MainContainer.tsx

@@ -3,7 +3,7 @@ import {
   ChildInt,
   ApplicationStateInt,
   Action,
-} from '../utils/Interfaces';
+} from '../intefaces/Interfaces';
 
 import {
   LOAD_INIT_DATA,
@@ -63,7 +63,7 @@ import {
   undo,
   redo
 } from '../utils/componentReducer.util';
-import cloneDeep from '../utils/cloneDeep';
+import cloneDeep from '../helperFunctions/cloneDeep';
 
 const appComponent: ComponentInt = {
   id: 1,

src/utils/cloneDeep.ts renamed to src/helperFunctions/cloneDeep.ts

@@ -1,16 +1,16 @@
-import getSelectable from './getSelectable.util';
-import getColor from './colors.util';
+import getSelectable from '../helperFunctions/getSelectable';
+import getColor from '../helperFunctions/colors';
 import { getSize } from './htmlElements.util';
-import cloneDeep from './cloneDeep';
+import cloneDeep from '../helperFunctions/cloneDeep';
 import {
   ComponentInt,
   ApplicationStateInt,
   //ChildrenInt, //unused import//
   ChildInt,
   ComponentsInt,
   PropInt,
-} from './Interfaces';
-import { createHistory } from './helperFunctions';
+} from '../intefaces/Interfaces';
+import { createHistory } from '../helperFunctions/createHistory';
 
 //this is the default values for any component added to the app.
 

src/utils/colors.util.ts renamed to src/helperFunctions/colors.ts

@@ -4,8 +4,8 @@ import {
   ChildInt,
   ChildrenInt,
   PropInt
-} from './Interfaces';
-import cloneDeep from './cloneDeep';
+} from '../intefaces/Interfaces';
+import cloneDeep from '../helperFunctions/cloneDeep';
 
 const componentRender = (
   component: ComponentInt,