Merge pull request #32 from jonocr/prod

Cleaning Comments/Console logs and update authors list

Author: xkevinpark

app/electron/main.js

@@ -73,7 +73,7 @@ async function createWindow() {
     webPreferences: {
       zoomFactor: 0.7,
       // enable devtools when in development mode 
-      devTools: true,
+      devTools: isDev,
       // crucial security feature - blocks rendering process from having access to node modules
       nodeIntegration: false,
       // web workers will not have access to node
@@ -91,7 +91,6 @@ async function createWindow() {
       nativeWindowOpen: true,
     },
   });
-  win.webContents.openDevTools();
 
   // Splash screen that appears while loading
   const hideSplashscreen = initSplashScreen({

app/src/Dashboard/ProjectContainer.tsx

@@ -42,7 +42,7 @@ const arrToComponent = arr => arr.map((proj, index) => <Project
                                         comments = {proj.comments}
                                       />);
 
-// Caret Start Pulled from materialUI to create a tab panel                                      
+// Start Pulled from materialUI to create a tab panel                                      
 const a11yProps = (index: any) => ({
   id: `vertical-tab-${index}`,
   'aria-controls': `vertical-tabpanel-${index}`,
@@ -95,7 +95,7 @@ const useStyles = makeStyles((theme) => ({
     borderRight: `1px solid ${theme.palette.divider}`,
   },
 }));
-// Caret End of prefab code to generate a tab panel
+// End of prefab code to generate a tab panel
 
 const ProjectContainer = (): JSX.Element => {
   const classes = useStyles();
@@ -105,7 +105,7 @@ const ProjectContainer = (): JSX.Element => {
     setValue(newValue);
   };
 
-  // Start Caret of old code from project container
+  // old code from project container
   const myVar = {};
   // Need this for the individual user dasboard, for now, dashboard shows all projects from all users
   const userSSID = window.localStorage.getItem('ssid') || 'unavailable';
@@ -165,7 +165,7 @@ const ProjectContainer = (): JSX.Element => {
   const userDisplay = arrToComponent(userProjects);
   // create an array of components Project that will be conditionally rendered
   const sortedDisplay = arrToComponent(sortedProjects);
-  // Caret End of old code from Project Container
+  // old code from Project Container
 
   return (
     <div className={classes.root}>

app/src/components/App.tsx

@@ -58,7 +58,7 @@ export const App = (): JSX.Element => {
       }
       }, []);
 
-  // Caret Start Updated save cycle     
+
   useEffect(() => {
     // provide config properties to legacy projects so new edits can be auto saved
     if (state.config === undefined) {
@@ -88,7 +88,6 @@ export const App = (): JSX.Element => {
       }, 15000);
     }
   }, [state])
-  // Caret End
 
 
   return (

app/src/components/bottom/StylesEditor.tsx

@@ -44,10 +44,6 @@ const StylesEditor: React.FC<{
   }
 
   const saveFile = () => {
-    console.log('saveFile: ', css);
-    // const myHeaders = new Headers({
-    //   headers: { 'Content-Type': 'application/json' },
-    // });
     fetch(`${serverURL}/user-styles/save`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },

app/src/components/form/Selector.tsx

@@ -1,4 +1,4 @@
-// 100% Caret
+
 import React from 'react';
 import FormControl from '@material-ui/core/FormControl';
 import Select from '@material-ui/core/Select';

app/src/components/left/DragDropPanel.tsx

@@ -40,7 +40,6 @@ const DragDropPanel = (props): JSX.Element => {
 
   // filter out separator so that it will not appear on the html panel
   const htmlTypesToRender = state.HTMLTypes.filter(type => type.name !== 'separator');
-  console.log('Types', htmlTypesToRender)
   return (
     <div className="HTMLItems">
       <div id="HTMLItemsTopHalf">

app/src/components/left/HTMLItem.tsx

@@ -119,7 +119,7 @@ const HTMLItem : React.FC<{
       })
     );
   };
-  // Caret updated the id's to reflect the new element types input and label
+  // updated the id's to reflect the new element types input and label
   return ( // HTML Elements
     <Grid item xs={5} key={`html-g${name}`}>
       { id <= 16 &&

app/src/components/login/SignIn.tsx

@@ -71,7 +71,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
 
   // this useEffect will check for cookies and set an item in localstorage for github Oauth session validation
 
-  // Caret start
+ 
   // Commented because window api is broken. Work in progress
   /* useEffect(() => {
     const githubCookie = setInterval(() => {
@@ -89,7 +89,6 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
       });
     }, 2000);
   }, []);*/
-  // Caret end
 
   const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     let inputVal = e.target.value;

app/src/components/main/Annotation.tsx

@@ -1,4 +1,4 @@
-// Caret Start
+
 import React, {
   useRef, useState, useContext, useEffect,
 } from 'react';
@@ -107,4 +107,3 @@ function Annotation({
 }
 
 export default Annotation;
-// Caret End

app/src/components/main/Canvas.tsx

@@ -59,22 +59,6 @@ function Canvas() {
           }
         });
       }
-      // Caret Start - This code is never used. Adding a new child element to an existing element
-      // or moving existing element to nest in another element is handled by DirectChildHTMLNestable
-      //
-      //if item is not a new instance, change position of element dragged inside div so that the div is the new parent
-      // else {
-      //   console.log("Changed Position, this is not doing shit");
-      //   dispatch({
-      //     type: 'CHANGE POSITION',
-      //     payload: {
-      //       // name: item.name,
-      //       currentChildId: item.childId,
-      //       newParentChildId: null
-      //     }
-      //   });
-      // }
-      // Caret End
     },
     collect: monitor => ({
       isOver: !!monitor.isOver()

app/src/components/main/DemoRender.tsx

@@ -1,4 +1,4 @@
-// 100% Caret
+
 import React, {
   useState, useCallback, useContext, useEffect,
 } from 'react';
@@ -20,7 +20,6 @@ const DemoRender = (props): JSX.Element => {
     const componentsToRender = [];
     for (const element of array) {
       if (element.name !== 'separator') {
-       // console.log('detail from children array', element);
         const elementType = element.name;
         const childId = element.childId;
         const elementStyle = element.style;
@@ -44,7 +43,6 @@ const DemoRender = (props): JSX.Element => {
   useEffect(() => {
     const focusIndex = state.canvasFocus.componentId - 1;
     const childrenArray = state.components[focusIndex].children;
-   //console.log('Refrenced Children in State!!!', childrenArray);
     const renderedComponents = componentBuilder(childrenArray);
     setComponents(renderedComponents);
   }, [state.components, state.canvasFocus]);

app/src/components/main/DirectChildHTML.tsx

@@ -8,7 +8,6 @@ import { ItemTypes } from '../../constants/ItemTypes';
 import StateContext from '../../context/context';
 import { combineStyles } from '../../helperFunctions/combineStyles';
 import globalDefaultStyle from '../../public/styles/globalDefaultStyles';
-// Caret
 import Annotation from './Annotation'
 
 function DirectChildHTML({
@@ -71,14 +70,12 @@ function DirectChildHTML({
   return (
     <div onClick={onClickHandler} style={combinedStyle} ref={drag} id={`canv${childId}`}>
       <strong>{HTMLType.placeHolderShort}</strong>      
-      {/* Caret start */}
       {`  (${childId})`}
       <Annotation
         id={childId}
         name={name}
         annotations={annotations}
       />
-      {/* Caret end */}
     </div>
   );
 }

app/src/components/main/DirectChildHTMLNestable.tsx

@@ -6,7 +6,6 @@ import StateContext from '../../context/context';
 import { combineStyles } from '../../helperFunctions/combineStyles';
 import globalDefaultStyle from '../../public/styles/globalDefaultStyles';
 import renderChildren from '../../helperFunctions/renderChildren';
-// Caret
 import Annotation from './Annotation'
 import validateNewParent from '../../helperFunctions/changePositionValidation'
 import componentNest from '../../helperFunctions/componentNestValidation'
@@ -84,7 +83,7 @@ const snapShotFunc = () => {
       }
       // if item is not a new instance, change position of element dragged inside div so that the div is the new parent
       else {
-        // Caret check to see if the selected child is trying to nest within itself
+        // check to see if the selected child is trying to nest within itself
         if (validateNewParent(state, item.childId, childId) === true) {
           dispatch({
             type: 'CHANGE POSITION',
@@ -136,15 +135,13 @@ const snapShotFunc = () => {
   return (
     <div onClick={onClickHandler} style={combinedStyle} ref={ref} id={`canv${childId}`}>
       <strong>{HTMLType.placeHolderShort}</strong>
-      {/* Caret start */}
       {`  ( ${childId} )`}
       <Annotation
         id={childId}
         name={name}
         annotations={annotations}
       />
       {renderChildren(children)}
-      {/* Caret end */}
     </div>
   );
 }

app/src/components/main/IndirectChild.tsx

@@ -28,14 +28,12 @@ function IndirectChild({ style, children, placeHolder, linkId, childId, name, an
 
   return (
     <div style={combinedStyle}>
-      {/* Caret start */}
       {`  ( ${childId} )`}
       <Annotation
         id={childId}
         name={name}
         annotations={annotations}
       />
-      {/* Caret end */}
       {linkId ? (
         <div onClick={onClickHandlerRoute}>{linkName}</div>
       ) : (

app/src/components/main/SeparatorChild.tsx

@@ -68,7 +68,7 @@ function DirectChildHTMLNestable({
       }
       // if item is not a new instance, change position of element dragged inside separator so that separator is new parent (until replacement)
       else {
-        // Caret check to see if the selected child is trying to nest within itself
+        // check to see if the selected child is trying to nest within itself
         if (validateNewParent(state, item.childId, childId) === true) {
           dispatch({
             type: 'CHANGE POSITION',

app/src/components/right/ComponentPanel.tsx

@@ -111,7 +111,6 @@ const ComponentPanel = ({isThemeLight}): JSX.Element => {
 
   const keyBindCreateComponent = useCallback((e) => {
 
-    // Caret
     if(e.key === 'Enter' && e.target.tagName !== "TEXTAREA") {
       e.preventDefault();
       document.getElementById('addComponentButton').click();
@@ -149,7 +148,7 @@ const ComponentPanel = ({isThemeLight}): JSX.Element => {
                     color={'primary'}
                     variant="outlined"
                     className={isThemeLight ? `${classes.inputField} ${classes.lightThemeFontColor}` : `${classes.inputField} ${classes.darkThemeFontColor}`}
-                    // Caret inputprops and helpertext must be lowercase
+                    // inputprops and helpertext must be lowercase
                     inputProps={{ className: classes.input }}
                     value={compName}
                     // Doesn't accept boolean value needs to be a string

app/src/components/right/StatePropsPanel.tsx

@@ -1,4 +1,4 @@
-// CARET
+
 import React, { useState, useContext, useCallback, useEffect } from "react";
 import {
   createStyles,
@@ -38,13 +38,6 @@ const StatePropsPanel = ({ isThemeLight }): JSX.Element => {
   const currentId = state.canvasFocus.componentId;
   const currentComponent = state.components[currentId - 1];
 
-  // debug console button for development purposes
-  const debug = () => {
-    console.log("currentComponent:", currentComponent);
-    console.log("currentComponent.stateProps:", currentComponent.stateProps);
-    console.log("currentComponent.useStateCodes:", currentComponent.useStateCodes);
-  };
-
   // convert value to correct type based on user input
   const typeConversion = (value, type) => {
     switch (type) {
@@ -174,10 +167,6 @@ const StatePropsPanel = ({ isThemeLight }): JSX.Element => {
             </Select>
             <FormHelperText>Required</FormHelperText>
           </FormControl>
-          {/* Commenting out the debug button for production */}
-          {/* <MyButton type="submit" onClick={debug}>
-            debug
-          </MyButton> */}
           <br></br>
           <MyButton type="submit" onClick={submitNewState}>
             Save
@@ -294,7 +283,6 @@ const useStyles = makeStyles((theme: Theme) =>
     darkThemeFontColor: {
       color: "#fff",
     },
-    // CARET
     formControl: {
       margin: theme.spacing(1),
       minWidth: 120,

app/src/components/right/TableStateProps.tsx

@@ -1,4 +1,4 @@
-// CARET
+
 import React, { useState, useContext, useEffect } from 'react';
 import {
   DataGrid,