Merge pull request #88 from oslabs-beta/37staging

37staging

Author: mjmiguel

httpserver.js

@@ -45,16 +45,16 @@ const { ApolloLink } = require("apollo-link");
 const { introspectionQuery } = require("graphql");
 
 // proto-parser func for parsing .proto files
-const protoParserFunc = require("./protoParser.js");
+const protoParserFunc = require("./main_process/protoParser.js");
 
 // require menu file
 require("./menu/mainMenu");
 // require http controller file
-require("./main_httpController.js")();
+require("./main_process/main_httpController.js")();
 // require grpc controller file
-require("./main_grpcController.js")();
+require("./main_process/main_grpcController.js")();
 // require ws controller
-require("./main_wsController.js")();
+require("./main_process/main_wsController.js")();
 
 // configure logging
 autoUpdater.logger = log;
@@ -156,7 +156,7 @@ function createWindow() {
   mainWindow.loadURL(indexPath);
 
   // give our new window the earlier created touchbar
-  const { touchBar } = require("./main_touchbar.js");
+  const { touchBar } = require("./main_process/main_touchbar.js");
   mainWindow.setTouchBar(touchBar);
 
   // prevent webpack-dev-server from setting new title
@@ -367,7 +367,6 @@ ipcMain.on("import-collection", (event, args) => {
 
       // send data to chromium for state update
       // ipcMain.send("add-collection", { data });
-      console.log("before add-collection in import", data);
       // mainWindow.webContents.send('add-collection', {data});
       event.sender.send("add-collection", { data });
     });
@@ -386,7 +385,6 @@ ipcMain.on("confirm-clear-history", (event) => {
   dialog
     .showMessageBox(null, opts)
     .then((response) => {
-      console.log("response to clear-history : ", response);
       mainWindow.webContents.send("clear-history-response", response);
     })
     .catch((err) => console.log(`Error on 'confirm-clear-history': ${err}`));
@@ -397,7 +395,6 @@ ipcMain.on("confirm-clear-history", (event) => {
 // import-proto
 
 ipcMain.on("import-proto", (event) => {
-  console.log("import-proto event fired!!");
   let importedProto;
   dialog
     .showOpenDialog({

main.js

@@ -134,6 +134,31 @@
       "name": "Stephanie Wood",
       "email": "[email protected]",
       "url": "https://github.com/StephWood"
+    },
+    {
+      "name": "Wyatt Bell",
+      "email": "www.linkedin.com/in/wyatt-bell1",
+      "url": "https://github.com/wcbell51"
+    },
+    {
+      "name": "Grace Kim",
+      "email": "https://www.linkedin.com/in/gracekiim/",
+      "url": "https://github.com/gracekiim"
+    },
+    {
+      "name": "John Madrigal",
+      "email": "www.linkedin.com/in/john-r-madrigal",
+      "url": "https://github.com/johnmadrigal "
+    },
+    {
+      "name": "Michael Miller",
+      "email": "https://www.linkedin.com/in/migueljmiller/",
+      "url": "https://github.com/mjmiguel"
+    },
+    {
+      "name": "Alex Sanhueza",
+      "email": "https://www.linkedin.com/in/alex-sanhueza/",
+      "url": "https://github.com/alexsanhueza"
     }
   ],
   "build": {
@@ -151,14 +176,13 @@
       "menu/mainMenu.js",
       "package.json",
       "main.js",
-      "httpserver.js",
-      "src/client/protoParser.js",
-      "main_grpcController.js",
-      "main_httpController.js",
-      "SSEController.js",
-      "preload.js",
-      "main_touchbar.js",
-      "main_wsController.js"
+      "main_process/protoParser.js",
+      "main_process/main_grpcController.js",
+      "main_process/main_httpController.js",
+      "main_process/main_wsController.js",
+      "main_process/main_touchbar.js",
+      "main_process/SSEController.js",
+      "preload.js"
     ],
     "nodeVersion": "12.14.1",
     "nsis": {
@@ -245,7 +269,6 @@
     "highland": "^2.13.5",
     "http": "0.0.1-security",
     "identity-obj-proxy": "^3.0.0",
-    "isomorphic-fetch": "^2.2.1",
     "mali": "^0.21.0",
     "mongoose": "^5.9.29",
     "node-fetch": "^2.6.0",

SSEController.js renamed to main_process/SSEController.js

@@ -23,6 +23,6 @@
     /* Advanced Options */
     "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
   },
-  "include": ["./src/", "protoParser.js"],
+  "include": ["./src/", "main_process/protoParser.js"],
   "exclude": ["node_modules", "dist", "build", "coverage", "mocks"]
 }