merged dev

Author: GP3-RS

.gitignore

@@ -1,14 +1,13 @@
 # JS Project-Specific #
 #######################
 # node_modules
-dist
-build
+/dist
+/build
 release-builds
 coverage
 __tests__/**/__snapshots__
 .env
-users.json
-test_users.json
+databases.txt
 
 # Compiled source #
 ###################
@@ -48,3 +47,5 @@ test_users.json
 ehthumbs.db
 Thumbs.db
 node_modules
+
+out/

.vscode/launch.json

@@ -1,6 +1,15 @@
 {
     "version": "0.2.0",
     "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "File",
+            "skipFiles": [
+                "<node_internals>/**",
+            ],
+            "program": "${file}"
+        },
         {
             "type": "node",
             "request": "launch",

__tests__/test_settings.json

@@ -1 +1,14 @@
-{"setupRequired":false,"services":[["chronosDB","MongoDB","mongodb+srv://jj289:[email protected]/chronosDB?retryWrites=true&w=majority","","Dec 13, 2022 2:58 PM"],["test","MongoDB","mongodb+srv://troyprejusa:[email protected]/test?retryWrites=true&w=majority","","Dec 13, 2022 5:14 PM"]],"mode":"light mode","splash":true,"landingPage":"dashBoard"}
+{
+	"services": [
+		[
+			"chronosDB",
+			"MongoDB",
+			"mongodb+srv://troyprejusa:[email protected]/test?retryWrites=true&w=majority",
+			"",
+			"Dec 19, 2022 4:50 PM"
+		]
+	],
+	"mode": "light",
+	"splash": true,
+	"landingPage": "dashBoard"
+}

app/App.tsx

@@ -4,7 +4,13 @@ import DashboardContainer from './containers/DashboardContainer';
 import './stylesheets/scrollBar.scss';
 
 const App: React.FC = React.memo(() => {
-  return <DashboardContainer />;
+  return (
+    <>
+      <Splash />
+      <DashboardContainer />
+    </>
+
+  )
 });
 
 export default App;

app/charts/RouteChart.jsx

@@ -160,7 +160,7 @@ const RouteChart = React.memo(() => {
   //   },
   // };
 
-  if (communicationsData[0].endpoint !== '/') {
+  if (communicationsData.length > 0 && communicationsData[0].endpoint !== '/') {
     return (
       <div className="traceContainer">
         <span id="tracesTitle">Route Traces</span>

app/components/About.tsx

@@ -7,7 +7,7 @@ const About: React.FC = React.memo(() => {
   const { mode } = useContext(DashboardContext.DashboardContext);
 
   const currentMode =
-    mode === 'light mode' ? lightAndDark.lightModeText : lightAndDark.darkModeText;
+    mode === 'light' ? lightAndDark.lightModeText : lightAndDark.darkModeText;
 
   return (
     <div className="about">

app/components/Contact.tsx

@@ -8,7 +8,7 @@ const Contact = React.memo(() => {
   const { mode } = useContext(DashboardContext);
 
   const currentMode =
-    mode === 'light mode' ? lightAndDark.lightModeText : lightAndDark.darkModeText;
+    mode === 'light' ? lightAndDark.lightModeText : lightAndDark.darkModeText;
 
   return (
     <div className="contact">

app/components/Copyright.tsx

@@ -5,7 +5,7 @@ import '../stylesheets/Applications.scss';
 
 export interface CopyrightProps {}
 
-const Copyright: React.SFC = React.memo(() => {
+const Copyright: React.FC = React.memo(() => {
   const useStyles = makeStyles(theme => ({
     copyright: {
       fontFamily: 'Roboto',

app/components/Header.tsx

@@ -58,7 +58,7 @@ const Header: React.FC<HeaderProps> = React.memo(({ app, service, setLive, live
   };
 
   const currentModeCSS =
-    mode === 'light mode' ? lightAndDark.lightModeHeader : lightAndDark.darkModeHeader;
+    mode === 'light' ? lightAndDark.lightModeHeader : lightAndDark.darkModeHeader;
 
   return (
     <div className="microservice-header" style={currentModeCSS} data-testid="Header">

app/components/Login.tsx

@@ -7,7 +7,7 @@ const { ipcRenderer } = window.require('electron');
 
 const Login = React.memo(() => {
   const navigate = useNavigate();
-  const { updateLandingPage, setAuth, setUser } = useContext(DashboardContext);
+  const { setUser, setMode } = useContext(DashboardContext);
   const [failedAuth, setFailedAuthState] = useState<JSX.Element>(<></>);
 
   /** From Version 5.2 Team:
@@ -18,26 +18,18 @@ const Login = React.memo(() => {
   const handleSubmit = (e: any) => {
     e.preventDefault();
     const inputFields: HTMLInputElement[] = e.currentTarget.querySelectorAll('input');
-    const email = inputFields[0].value;
+    const username = inputFields[0].value;
     const password = inputFields[1].value;
     // eslint-disable-next-line no-return-assign
     inputFields.forEach(input => (input.value = ''));
-    const validLogin:
-      | boolean
-      | string
-      | {
-          email: string;
-          username: string;
-          password: string;
-          admin: boolean;
-          awaitingApproval: boolean;
-        } = ipcRenderer.sendSync('verifyUser', { email, password });
-    if (typeof validLogin === 'object') {
-      setUser(validLogin);
-      setAuth(true);
-      navigate('/applications');
-    } else if (validLogin === 'awaitingApproval') navigate('/awaitingApproval');
-    else setFailedAuthState(<p>Sorry your authentication failed please try again.</p>);
+    const response: boolean | string = ipcRenderer.sendSync('login', { username, password });
+    if (typeof(response) === 'string') {
+      setUser(username);
+      setMode(response);
+      navigate('/');
+    } else {
+      setFailedAuthState(<p>Sorry your authentication failed please try again.</p>);
+    }
   };
 
   return (
@@ -46,17 +38,17 @@ const Login = React.memo(() => {
         <h1>Welcome to Chronos!</h1>
         <h2>Please enter your credentials to login.</h2>
         <form className="form" onSubmit={handleSubmit}>
-          <label className="email">
-            <input type="email" name="email" id="email" placeholder="[email protected]" />
+          <label htmlFor='username'>
+            <input type="text" name="username" id="username" placeholder="username" />
           </label>
-          <label className="password">
-            <input type="password" name="password" id="password" placeholder="enter password" />
+          <label htmlFor='password'>
+            <input type="password" name="password" id="password" placeholder="password" />
           </label>
           {failedAuth}
           <button className="link" id="submitBtn" type="submit">
             Login
           </button>
-          <button className="link needAccount" onClick={() => updateLandingPage('signUp')}>
+          <button className="link needAccount" onClick={() => navigate('/signup')}>
             Need an account?
           </button>
         </form>