Co-authored-by: Bryan Chau <https://github.com/bchauu>

Co-authored-by: Abeer Faizan <https://github.com/abeer-f>
Co-authored-by: Ulrich Neujahr <https://github.com/nobrackets>
Co-authored-by: Stephen Kim <https://github.com/stephenkim612>

Author: abeer-f

app/electron/main.js

@@ -1,4 +1,3 @@
-
 const electron = require('electron');
 
 /*
@@ -15,9 +14,6 @@ const {
   session,
   ipcMain,
 } = require('electron');
-
-
-
 // The splash screen is what appears while the app is loading
 // const { initSplashScreen, OfficeTemplate } = require('electron-splashscreen');
 const { resolve } = require('app-root-path');
@@ -48,11 +44,9 @@ let menuBuilder;
 // this function will be called when Electron has initialized itself
 async function createWindow() {
   // install react dev tools if we are in development mode
-  if (isDev) {
-  } else {
     // this will happen before creating the browser window. it returns a Boolean whether the protocol of scheme 'app://' was successfully registered and a file (index-prod.html) was sent as the response
     protocol.registerBufferProtocol(Protocol.scheme, Protocol.requestHandler);
-  }
+  
   // Create the browser window.
   win = new BrowserWindow({
     // full screen

app/electron/menu.js

@@ -1,15 +1,9 @@
 const { Menu } = require('electron');
 const { BrowserWindow } = require('electron');
-const fs = require('fs');
-const path = require('path');
 const isMac = process.platform === 'darwin';
-const port = 5000;
 const Protocol = require('./protocol');
-const tutorialRoute = `http://localhost:${port}/tutorial`;
-
 /* 
 DESCRIPTION: This file generates an array containing a menu based on the operating system the user is running.
-
 menuBuilder: The entire file is encompassed in menuBuilder. Ultimately, menuBuilder returns a function called
   buildMenu that uses defaultTemplate to construct a menu at the top of the application (as invoked in main.js)
 

app/setupTests.ts

@@ -6,7 +6,6 @@ import {
   RouteComponentProps
 } from 'react-router-dom';
 import { sessionIsCreated } from '../../helperFunctions/auth';
-import FacebookLogin from 'react-facebook-login';
 import Avatar from '@material-ui/core/Avatar';
 import Button from '@material-ui/core/Button';
 import CssBaseline from '@material-ui/core/CssBaseline';
@@ -16,7 +15,6 @@ import Box from '@material-ui/core/Box';
 import Typography from '@material-ui/core/Typography';
 import { makeStyles } from '@material-ui/core/styles';
 import Container from '@material-ui/core/Container';
-import GitHubIcon from '@material-ui/icons/GitHub';
 import LockOutlinedIcon from '@material-ui/icons/LockOutlined';
 import { newUserIsCreated } from '../../helperFunctions/auth';
 import randomPassword from '../../helperFunctions/randomPassword';
@@ -67,7 +65,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
   const [invalidPassMsg, setInvalidPassMsg] = useState('');
   const [invalidUser, setInvalidUser] = useState(false);
   const [invalidPass, setInvalidPass] = useState(false);
-  const FBAPPID = process.env.REACT_APP_FB_APP_ID;
+
 
   useEffect(() => {
     const githubCookie = setInterval(() => {

app/src/components/login/SignIn.tsx

@@ -1,13 +1,9 @@
-// Future developers: This file needs to move to right folder: src/components/right
-
 import React, { useContext } from 'react';
 import StateContext from '../../context/context';
 import Grid from '@material-ui/core/Grid';
 import ComponentPanelItem from './ComponentPanelItem';
 import ComponentPanelRoutingItem from './ComponentPanelRoutingItem';
 import { makeStyles } from '@material-ui/core/styles';
-
-
 // The component panel section of the left panel displays all components and has the ability to add new components
 const ComponentDrag = ({isThemeLight}): JSX.Element => {
   const classes = useStyles();

app/src/components/right/ComponentDrag.tsx

@@ -1,6 +1,4 @@
-
 import React, { ReactNode, useState } from 'react';
-import { useTheme } from '@material-ui/core/styles';
 import { makeStyles, Theme } from '@material-ui/core/styles';
 import AppBar from '@material-ui/core/AppBar';
 import Tabs from '@material-ui/core/Tabs';
@@ -13,7 +11,6 @@ interface TabPanelProps {
   value: any;
 }
 const TabPanelItem = (props: TabPanelProps): JSX.Element => {
-  const theme = useTheme();
   const { children, index, value, ...other } = props;
   return (
     <div

app/src/components/right/TabPanel.tsx

@@ -3,7 +3,6 @@ import React, {
   useContext,
   useEffect,
   useMemo,
-  useRef,
   useCallback
 } from 'react';
 import { makeStyles } from '@material-ui/core/styles';
@@ -19,16 +18,11 @@ import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
 import ListItemText from '@material-ui/core/ListItemText';
 import createModal from '../components/right/createModal';
-import ComponentPanel from '../components/right/ComponentPanel';
-import UndoIcon from '@material-ui/icons/Undo';
-import RedoIcon from '@material-ui/icons/Redo';
-import TabPanel from '../components/right/TabPanel';
 import { styleContext } from './AppContainer';
 import ErrorMessages from '../constants/ErrorMessages';
 import ProjectManager from '../components/right/ProjectManager';
 import StateContext from '../context/context';
 import FormSelector from '../components/form/Selector';
-import { config } from 'ace-builds';
 import UseStateModal from '../components/bottom/UseStateModal';
 // Previously named rightContainer, Renamed to Customizationpanel this now hangs on BottomTabs
 // need to pass in props to use the useHistory feature of react router

app/src/containers/CustomizationPanel.tsx

@@ -40,7 +40,7 @@ export interface Component {
   stateProps: StateProp[]; // state: [ { id, key, value, type }, ...]
   annotations?: string;
   useStateCodes: string[];
-  useContext?: object // structure --> {providerId: {attribute: stateId, ....}, ...}
+  useContext?: object 
 }
 export interface StateProp {
   key: string;

app/src/context/themeContext 2.ts

@@ -5,13 +5,10 @@ const rootReducer = (state = initialState, action) => {
       return { ...state, code: action.payload };
     case 'ADD_CHILD':
       return { ...state, child: action.payload };
-      case 'CHANGE_FOCUS':
-        return { ...state, focus: action.payload };
         case 'RESET_STATE':
         return {...state, code: {} }
     default:
       return state;
   }
 };
-
 export default rootReducer;

app/src/helperFunctions/gitHubOauth.ts

@@ -45,13 +45,7 @@ const reducer = (state: State, action: Action) => {
     // if no search is found return -1
     return { directParent: null, childIndexValue: null };
   };
-  const deleteChild = (component: Component, currentChildId: number) => {
-    const { directParent, childIndexValue } = findParent(
-      component,
-      currentChildId
-    );
-    directParent.children.splice(childIndexValue, 1);
-  };
+
   // determine if there's a child of a given type in a component
   const childTypeExists = (
     type: string,

app/src/interfaces/Interfaces.ts

@@ -33,7 +33,6 @@ module.exports = {
     "/node_modules/",
     "enzyme.js"
   ],
-  setupFilesAfterEnv: ["<rootDir>/enzyme.js"],
   coverageReporters: [
     "json",
     "lcov",

app/src/reducers.js

@@ -53,9 +53,7 @@
   "scripts": {
     "postinstall": "set ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true electron-builder install-app-deps",
     "dev-server": "cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js",
-    "start": "concurrently --success first \"cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js\" \"cross-env NODE_ENV=development electron .\" \"npm run server\" -k",
     "dev": "concurrently --success first \"cross-env NODE_ENV=development webpack-dev-server --config ./webpack.development.js\" \"cross-env NODE_ENV=development electron .\" \"npm run server\" -k",
-    "p": "concurrently --success first \"npm run dev-server\" \"cross-env NODE_ENV=production electron .\" \"nodemon server/server.js\" -k",
     "prod-build": "cross-env NODE_ENV=production npx webpack --mode=production --config ./webpack.production.js",
     "prod": "npm run prod-build && electron . --no-sandbox",
     "pack": "electron-builder --dir",
@@ -73,7 +71,7 @@
   },
   "keywords": [
     "electron",
-    "prototying",
+    "prototyping",
     "react",
     "next.js"
   ],
@@ -102,9 +100,6 @@
         "diagnostics": false
       }
     },
-    "setupFilesAfterEnv": [
-      "<rootDir>/app/setupTests.ts"
-    ],
     "snapshotSerializers": [
       "enzyme-to-json/serializer"
     ]

app/src/reducers/componentReducer.ts

@@ -3,7 +3,6 @@ const { Projects, Comments } = require('../../models/reactypeModels');
 // Link to Apollo Query Types:
 // https://www.apollographql.com/docs/apollo-server/data/resolvers/#defining-a-resolver
 
-
 const Project = {
   getProject: async (parent, { projId }) => {
     const resp = await Projects.findOne({ _id: projId });

app/src/utils/createTestSuiteNext.util.ts

@@ -7,7 +7,6 @@ const nonce = require('./app/src/utils/createNonce')();
 
 // merges webpack.config.js with production specific configs
 module.exports = merge(base, {
-  // enables optimizations for production mode
   // sets process.env.NODE_ENV to 'production'
   mode: 'production',
   plugins: [