complete delete project functionality, server reintegration

Author: andrewjcho84

app/src/components/right/DeleteProjects.tsx

@@ -17,6 +17,7 @@ import {
 } from '../../helperFunctions/projectGetSaveDel';
 import localforage from 'localforage';
 import { stateContext } from '../../context/context';
+import initialState from '../../context/initialState';
 
 export interface ProjectDialogProps {
   open: boolean;
@@ -44,7 +45,7 @@ function ProjectsDialog(props: ProjectDialogProps) {
     console.log('selectedProject is', selectedProject);
     deleteProject(selectedProject);
     localforage.clear();
-    dispatch({ type: 'RESET STATE', payload: {} });
+    dispatch({ type: 'SET INITIAL STATE', payload: initialState });
     onClose();
   };
 

app/src/reducers/componentReducer.ts

@@ -324,7 +324,6 @@ const reducer = (state: State, action: Action) => {
     }
     // Reset all component data back to their initial state but maintain the user's project name and log-in status
     case 'RESET STATE': {
-      const name = '';
       const nextChildId = 1;
       const rootComponents = [1];
       const nextComponentId = 2;
@@ -342,7 +341,6 @@ const reducer = (state: State, action: Action) => {
       const components = [rootComponent];
       return {
         ...state,
-        name,
         nextChildId,
         rootComponents,
         nextComponentId,

package.json

@@ -114,12 +114,9 @@
     "immutable": "^4.0.0-rc.12",
     "js-cookie": "^2.2.1",
     "localforage": "^1.7.2",
-<<<<<<< HEAD
     "passport": "^0.4.1",
     "passport-github2": "^0.1.12",
-=======
     "node-fetch": "^2.6.0",
->>>>>>> master
     "prettier": "^1.19.1",
     "prop-types": "^15.6.2",
     "react": "^16.13.0",