Merge branch 'master' into kirk/backend_testing

Author: Justinlkirk

electron/routes/data.ts

@@ -170,7 +170,7 @@ ipcMain.on('healthRequest', async (message: Electron.IpcMainEvent, service: stri
           ORDER BY _id DESC
           LIMIT 50
           `;
-
+          
       // Execute query
       result = await pool.query(query);
       result = result.rows.reverse();

settings.json

@@ -1 +1,21 @@
-{"setupRequired":false,"services":[["myPostgres","SQL","postgres://zwezmnqm:[email protected]:5432/zwezmnqm","Online bookstore with that keeps track of orders and customers","Jun 28, 2020 4:58 PM"],["ToddDB","MongoDB","mongodb+srv://tdwolf6:[email protected]/Chronos?retryWrites=true&w=majority","Web app deployed on AWS","Jul 3, 2020 7:12AM"]],"mode":"dark mode","splash":true,"landingPage":"login"}
+{
+  "setupRequired": false,
+  "services": [
+    [
+      "myPostgres",
+      "SQL",
+      "postgres://zwezmnqm:[email protected]:5432/zwezmnqm",
+      "Online bookstore with that keeps track of orders and customers",
+      "Jun 28, 2020 4:58 PM"
+    ],
+    [
+      "ToddDB",
+      "MongoDB",
+      "mongodb+srv://tdwolf6:[email protected]/Chronos?retryWrites=true&w=majority",
+      "Web app deployed on AWS",
+      "Jul 3, 2020 7:12AM"
+    ]
+  ],
+  "mode": "dark mode",
+  "splash": true
+}