Merge pull request #66 from oslabs-beta/staging-faast

Bug fixes and cleanup

Author: andrewjcho84

app/src/components/right/DeleteProjects.tsx

@@ -44,7 +44,7 @@ function ProjectsDialog(props: ProjectDialogProps) {
     )[0];
     console.log('selectedProject is', selectedProject);
     deleteProject(selectedProject);
-    localforage.clear();
+    localforage.removeItem(window.localStorage.getItem('ssid'));
     dispatch({ type: 'SET INITIAL STATE', payload: initialState });
     onClose();
   };

package.json

@@ -27,7 +27,7 @@
   "scripts": {
     "postinstall": "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",
-    "dev": "concurrently --success first \"npm run dev-server\" \"cross-env NODE_ENV=development electron .\" \"npm run server\" -k",
+    "dev": "concurrently --success first \"npm run dev-server\" \"cross-env NODE_ENV=development electron .\" \"cross-env NODE_ENV=development npm run server\" -k",
     "prod-build": "cross-env NODE_ENV=production npx webpack --mode=production --config ./webpack.production.js",
     "prod": "npm run prod-build && electron .",
     "pack": "electron-builder --dir",

server/controllers/projectController.js

@@ -21,8 +21,8 @@ projectController.saveProject = (req, res, next) => {
         return next({
           log: `Error in projectController.saveProject: ${err}`,
           message: {
-            err: `Error in projectController.saveProject, check server logs for details`,
-          },
+            err: `Error in projectController.saveProject, check server logs for details`
+          }
         });
       } else {
         res.locals.savedProject = result;
@@ -41,12 +41,12 @@ projectController.getProjects = (req, res, next) => {
       return next({
         log: `Error in projectController.getProjects: ${err}`,
         message: {
-          err: `Error in projectController.getProjects, check server logs for details`,
-        },
+          err: `Error in projectController.getProjects, check server logs for details`
+        }
       });
     } else {
       // so it returns each project like it is in state, not the whole object in DB
-      res.locals.projects = projects.map((elem) => elem.project);
+      res.locals.projects = projects.map(elem => elem.project);
       return next();
     }
   });
@@ -58,18 +58,16 @@ projectController.deleteProject = (req, res, next) => {
   console.log('In delete projects controller');
   // pull project name and userId from req.body
   const { name, userId } = req.body;
-  console.log('name and userId in delete', name, userId);
   Projects.findOneAndDelete({ name, userId }, (err, deleted) => {
     if (err) {
       return next({
         log: `Error in projectController.deleteProject: ${err}`,
         message: {
-          err: `Error in projectController.deleteProject, check server logs for details`,
-        },
+          err: `Error in projectController.deleteProject, check server logs for details`
+        }
       });
     } else {
       res.locals.deleted = deleted;
-      console.log('Successful deleteProjects, deleted', deleted);
       return next();
     }
   });