Finalized dependency injections schema

Co-authored-by: Alexander Holden <[email protected]>
Co-authored-by: William Owen <[email protected]>
Co-authored-by: Jessica Lee <[email protected]>'

Author: 3 people

test_users.json renamed to __tests__2022/routes/dashboard.test.ts

@@ -1 +1 @@
-{"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}
+{"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"}

__tests__2022/routes/data.test.ts

@@ -0,0 +1 @@
+{"[email protected]":{"email":"[email protected]","username":"me","password":"1234","admin":true,"awaitingApproval":false},"[email protected]":{"email":"[email protected]","username":"you","password":"1234","admin":false,"awaitingApproval":false}}

__tests__2022/routes/users.test.ts

@@ -14,12 +14,8 @@ const CreateAdmin = React.memo(() => {
     const password = inputFields[2].value;
 
     const validSignUp = ipcRenderer.sendSync('addUser', { email, username, password });
-    if (validSignUp) {
-      window.alert(
-        'Your admin account has been created. Use this account to approve other accounts.'
-      );
-      updateLandingPage('login');
-    } else window.alert('Sorry your sign up cannot be completed at this time. Please try again.');
+    if (validSignUp) updateLandingPage('login');
+    else window.alert('Sorry your sign up cannot be completed at this time. Please try again.');
   };
 
   return (

test_settings.json renamed to __tests__2022/test_settings.json

@@ -11,7 +11,7 @@ import fs from 'fs';
 // Loads existing settings JSON and update settings to include new services entered by the user on 'submit' request
 let settingsLocation;
 if (process.env.NODE_ENV === 'development')
-  settingsLocation = path.resolve(__dirname, '../../test_settings.json');
+  settingsLocation = path.resolve(__dirname, '../../__tests__2022/test_settings.json');
 else settingsLocation = path.resolve(__dirname, '../../settings.json');
 ipcMain.on('addApp', (message: IpcMainEvent, application: any) => {
   // Retrieves file contents from settings.json

__tests__2022/test_users.json

@@ -24,7 +24,7 @@ let currentDatabaseType: string;
  */
 let settingsLocation;
 if (process.env.NODE_ENV === 'development')
-  settingsLocation = path.resolve(__dirname, '../../test_settings.json');
+  settingsLocation = path.resolve(__dirname, '../../__tests__2022/test_settings.json');
 else settingsLocation = path.resolve(__dirname, '../../settings.json');
 ipcMain.on('connect', async (message: Electron.IpcMainEvent, index: number) => {
   try {

app/components/CreateAdmin.tsx

@@ -1,8 +1,6 @@
 import { ipcMain, IpcMainEvent } from 'electron';
 import path from 'path';
 import fs from 'fs';
-
-require('dotenv').config();
 /**
  * @event   addApp
  * @desc    Adds an application to the user's list in the settings.json with the provided fields
@@ -13,8 +11,8 @@ let settingsLocation;
 let usersLocation;
 
 if (process.env.NODE_ENV === 'development') {
-  settingsLocation = path.resolve(__dirname, '../../test_settings.json');
-  usersLocation = path.resolve(__dirname, '../../test_users.json');
+  settingsLocation = path.resolve(__dirname, '../../__tests__2022/test_settings.json');
+  usersLocation = path.resolve(__dirname, '../../__tests__2022/test_users.json');
 } else {
   settingsLocation = path.resolve(__dirname, '../../settings.json');
   usersLocation = path.resolve(__dirname, '../../users.json');

electron/routes/dashboard.ts

@@ -8,7 +8,7 @@
     "start": "webpack serve",
     "nodemon": "nodemon server/server.js",
     "electron": "electron .",
-    "electronTest": "cross-env NODE_ENV=devleopment electron .",
+    "electronTest": "cross-env NODE_ENV=development electron .",
     "electron:wsl": "electron . --no-sandbox",
     "test": "jest ./__tests__2022/*",
     "test:watch": "jest --watch",