aaron merge open projects bug fixed

Author: andrewjcho84

app/src/components/login/ProjectsFolder.tsx

@@ -18,8 +18,8 @@ import { stateContext } from '../../context/context';
 const useStyles = makeStyles({
   avatar: {
     backgroundColor: blue[100],
-    color: blue[600],
-  },
+    color: blue[600]
+  }
 });
 
 export interface ProjectDialogProps {
@@ -32,11 +32,12 @@ export interface ProjectDialogProps {
 function ProjectsDialog(props: ProjectDialogProps) {
   const classes = useStyles();
   const { onClose, open, projects } = props;
+  console.log('Inside projectsdialogbox projects is', projects);
   const [_, dispatch] = useContext(stateContext);
 
   useEffect(() => {
     console.log('state is', _);
-  }, [_])
+  }, [_]);
 
   // If no projects selected, keep the name of the current displayed
   const handleClose = () => {
@@ -47,18 +48,27 @@ function ProjectsDialog(props: ProjectDialogProps) {
 
   // If new project selected, close and set value to new project name
   const handleListItemClick = (value: string) => {
-    const selectedProject = projects.filter(project => project.name === value)[0].project;
-    console.log('project to open', selectedProject);
+    const selectedProject = projects.filter(
+      project => project.name === value
+    )[0];
     dispatch({ type: 'OPEN PROJECT', payload: selectedProject });
     onClose();
   };
 
   return (
-    <Dialog onClose={handleClose} aria-labelledby="project-dialog-title" open={open}>
+    <Dialog
+      onClose={handleClose}
+      aria-labelledby="project-dialog-title"
+      open={open}
+    >
       <DialogTitle id="project-dialog-title">Open Project</DialogTitle>
       <List>
         {projects.map((project, index) => (
-          <ListItem button onClick={() => handleListItemClick(project.name)} key={index}>
+          <ListItem
+            button
+            onClick={() => handleListItemClick(project.name)}
+            key={index}
+          >
             <ListItemAvatar>
               <Avatar className={classes.avatar}>
                 <FolderOpenIcon />
@@ -74,7 +84,7 @@ function ProjectsDialog(props: ProjectDialogProps) {
               <AddIcon />
             </Avatar>
           </ListItemAvatar>
-          <ListItemText primary="New Project"/>
+          <ListItemText primary="New Project" />
         </ListItem>
       </List>
     </Dialog>
@@ -83,15 +93,15 @@ function ProjectsDialog(props: ProjectDialogProps) {
 
 export default function ProjectsFolder() {
   const [open, setOpen] = useState(false);
-  const [projects, setProjects] = useState([{hello: 'cat'}]);
+  const [projects, setProjects] = useState([{ hello: 'cat' }]);
 
   const handleClickOpen = () => {
     getProjects().then(data => {
       setProjects(data);
       setOpen(true);
-    })
+    });
   };
-  
+
   const handleClose = () => {
     setOpen(false);
   };
@@ -101,7 +111,7 @@ export default function ProjectsFolder() {
       <Button variant="outlined" color="primary" onClick={handleClickOpen}>
         Open Project
       </Button>
-      <ProjectsDialog open={open} onClose={handleClose} projects={projects}/>
+      <ProjectsDialog open={open} onClose={handleClose} projects={projects} />
     </div>
   );
-}
+}

app/src/components/login/SignIn.tsx

@@ -202,8 +202,8 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
         >
           Sign In
         </Button>
-
-        <Button
+        {/* Hiding github oauth button as it's still buggy and not fully working */}
+        {/* <Button
           fullWidth
           variant="contained"
           color="default"
@@ -221,7 +221,7 @@ const SignIn: React.FC<LoginInt & RouteComponentProps> = props => {
           }}
         >
           <GitHubIcon />
-        </Button>
+        </Button> */}
 
         <Button
           fullWidth

app/src/containers/LeftContainer.tsx

@@ -54,6 +54,7 @@ const useStyles = makeStyles({
 // Left-hand portion of the app, where component options are displayed
 const LeftContainer = (): JSX.Element => {
   const [state, dispatch] = useContext(stateContext);
+
   const classes = useStyles();
   // state to keep track of how the user wants their components to be exported
   // genOption = 0 --> export only components

app/src/containers/RightContainer.tsx

@@ -232,6 +232,8 @@ const RightContainer = (props): JSX.Element => {
     console.log('Logout clicked, destroying cookie, redirect to login');
     // destroys "cookie" by clearing localStorage if guest
     window.localStorage.clear();
+    // destroy cookie on production when not seen by chromium browser using ipcrenderer
+    window.api.delCookie();
     // destroys cookie if user by backdating cookie expiration date
     document.cookie = 'ssid=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
     // uses useHistory to return to the login page
@@ -434,9 +436,9 @@ const RightContainer = (props): JSX.Element => {
         ''
       )}
       <div className={classes.logoutButton}>
-        <SaveProjectButton/>
-        <ProjectsFolder/>
-        <LoginButton/>
+        <SaveProjectButton />
+        <ProjectsFolder />
+        <LoginButton />
       </div>
     </div>
   );

app/src/reducers/componentReducer.ts

@@ -319,26 +319,18 @@ const reducer = (state: State, action: Action) => {
       return {
         ...state,
         name: projectName
-      }
+      };
     }
 
     case 'OPEN PROJECT': {
-      const { name, components, rootComponents, canvasFocus, nextComponentId, nextChildId } = action.payload;
-      console.log('triggered reducer');
       return {
-        ...state,
-        name: name,
-        components: components,
-        rootComponents: rootComponents,
-        nextComponentId: nextComponentId,
-        nextChildId: nextChildId,
-        canvasFocus: canvasFocus
-      }
+        ...action.payload
+      };
     }
 
     default:
       return state;
   }
 };
 
-export default reducer;
+export default reducer;