From 222ee70f8770fde9b7bbb415992b4bb51a3fbd45 Mon Sep 17 00:00:00 2001
From: M M <cosmicray23@hotmail.com>
Date: Sun, 9 Jun 2024 23:37:47 -0700
Subject: [PATCH 1/6] Implemented the integrations page.

---
 Client/package-lock.json                     | 18 --------
 Client/src/Components/Integrations/index.jsx |  4 +-
 Client/src/Pages/Integrations/index.jsx      | 43 +++++++++++++++++---
 3 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/Client/package-lock.json b/Client/package-lock.json
index 26b303991..c33093918 100644
--- a/Client/package-lock.json
+++ b/Client/package-lock.json
@@ -1424,15 +1424,9 @@
       }
     },
     "node_modules/@mui/x-charts": {
-<<<<<<< HEAD
       "version": "7.6.1",
       "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-7.6.1.tgz",
       "integrity": "sha512-LuAVQX4lzhmsqk2NRdWCP+aQZ8kRwG7KOy8ulf8hR5NI5J1VsiOtH41J+qgV3uAC6hDMWL7fTgffrRDFTMci/g==",
-=======
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-7.6.2.tgz",
-      "integrity": "sha512-oG22NRno1+HSLV/9jVLThnHAKN4g+MXOO6GqaQxN9LM0hjt1tgRsrNAlfcJndmj/dVwqFtynkFB5qWnTEBZs7Q==",
->>>>>>> 3f41db916efdd46069589e91f5886a4a01d11896
       "dependencies": {
         "@babel/runtime": "^7.24.6",
         "@mui/base": "^5.0.0-beta.40",
@@ -2436,15 +2430,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-<<<<<<< HEAD
       "version": "1.0.30001628",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001628.tgz",
       "integrity": "sha512-S3BnR4Kh26TBxbi5t5kpbcUlLJb9lhtDXISDPwOfI+JoC+ik0QksvkZtUVyikw3hjnkgkMPSJ8oIM9yMm9vflA==",
-=======
-      "version": "1.0.30001629",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001629.tgz",
-      "integrity": "sha512-c3dl911slnQhmxUIT4HhYzT7wnBK/XYpGnYLOj4nJBaRiw52Ibe7YxlDaAeRECvA786zCuExhxIUJ2K7nHMrBw==",
->>>>>>> 3f41db916efdd46069589e91f5886a4a01d11896
       "dev": true,
       "funding": [
         {
@@ -2848,15 +2836,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-<<<<<<< HEAD
       "version": "1.4.790",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.790.tgz",
       "integrity": "sha512-eVGeQxpaBYbomDBa/Mehrs28MdvCXfJmEFzaMFsv8jH/MJDLIylJN81eTJ5kvx7B7p18OiPK0BkC06lydEy63A==",
-=======
-      "version": "1.4.792",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.792.tgz",
-      "integrity": "sha512-rkg5/N3L+Y844JyfgPUyuKK0Hk0efo3JNxUDKvz3HgP6EmN4rNGhr2D8boLsfTV/hGo7ZGAL8djw+jlg99zQyA==",
->>>>>>> 3f41db916efdd46069589e91f5886a4a01d11896
       "dev": true
     },
     "node_modules/error-ex": {
diff --git a/Client/src/Components/Integrations/index.jsx b/Client/src/Components/Integrations/index.jsx
index b0e00bdfe..7d7ae96c4 100644
--- a/Client/src/Components/Integrations/index.jsx
+++ b/Client/src/Components/Integrations/index.jsx
@@ -5,7 +5,7 @@ import Button from '../Button';
  * Integrations component
  * @returns {JSX.Element}
  */
-const Integrations = () => {
+const IntegrationsComponent = () => {
   const theme = useTheme();
 
   return (
@@ -53,4 +53,4 @@ const Integrations = () => {
   );
 };
 
-export default Integrations;
+export default IntegrationsComponent;
diff --git a/Client/src/Pages/Integrations/index.jsx b/Client/src/Pages/Integrations/index.jsx
index 1df87ee52..ca90e79ef 100644
--- a/Client/src/Pages/Integrations/index.jsx
+++ b/Client/src/Pages/Integrations/index.jsx
@@ -1,9 +1,40 @@
-import React from 'react'
+import IntegrationsComponent from '../../Components/Integrations';
+import { Box, Typography, useTheme } from '@mui/material';
 
+/**
+ * Integrations Page Component
+ * @returns {JSX.Element}
+ */
 const Integrations = () => {
+    const theme = useTheme();
+  
     return (
-        <div>Integrations</div>
-    )
-}
-
-export default Integrations
\ No newline at end of file
+      <Box 
+        display="flex"
+        flexDirection="column"
+        alignItems="flex-start"
+        justifyContent="flex-start"
+        height="100vh"
+        p={theme.spacing(4)}
+        mt={theme.spacing(8)} 
+      >
+        <Typography variant="h4" component="h1" gutterBottom>
+          Integrations
+        </Typography>
+        <Typography variant="h6" component="h2" gutterBottom>
+          Connect Uptime Genie to your favorite service
+        </Typography>
+        <Box 
+          display="flex" 
+          flexWrap="wrap" 
+          gap={theme.spacing(4)}
+        >
+          <IntegrationsComponent />
+          <IntegrationsComponent />
+          <IntegrationsComponent />
+        </Box>
+      </Box>
+    );
+  };
+  
+  export default Integrations;

From 91891b1a90d850dba7ec6e41fbdee8a7012e1a45 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 10 Jun 2024 10:38:00 -0700
Subject: [PATCH 2/6] Added async thunk

---
 Client/src/Features/Auth/authSlice.js |  4 ++
 Client/src/Pages/Login/index.jsx      | 53 ++++++++++++++++++++++-----
 Client/src/Validation/validation.js   | 18 ++++++++-
 3 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/Client/src/Features/Auth/authSlice.js b/Client/src/Features/Auth/authSlice.js
index f8bc106e5..d361ffa05 100644
--- a/Client/src/Features/Auth/authSlice.js
+++ b/Client/src/Features/Auth/authSlice.js
@@ -22,6 +22,10 @@ export const register = createAsyncThunk(
   }
 );
 
+export const login = createAsyncThunk("auth/login", async (form, thunkApi) => {
+  console.log(form);
+});
+
 const authSlice = createSlice({
   name: "auth",
   initialState,
diff --git a/Client/src/Pages/Login/index.jsx b/Client/src/Pages/Login/index.jsx
index 19edcf6f0..3732e52c8 100644
--- a/Client/src/Pages/Login/index.jsx
+++ b/Client/src/Pages/Login/index.jsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import "./index.css";
 import BackgroundPattern from "../../Components/BackgroundPattern/BackgroundPattern";
 import Logomark from "../../assets/Images/Logomark.png";
@@ -8,23 +8,51 @@ import Button from "../../Components/Button";
 import Google from "../../assets/Images/Google.png";
 import PasswordTextField from "../../Components/TextFields/Password/PasswordTextField";
 
+import { loginValidation } from "../../Validation/validation";
+import { login } from "../../Features/Auth/authSlice";
+import { useDispatch } from "react-redux";
+
 const Login = () => {
+  const dispatch = useDispatch();
+
   const idMap = {
     "login-email-input": "email",
     "login-password-input": "password",
   };
 
+  const [errors, setErrors] = useState({});
+
   const [form, setForm] = useState({
     email: "",
     password: "",
   });
 
-  const handleInput = (e) => {
-    const fieldName = idMap[e.target.id];
-    setForm({
-      ...form,
-      [fieldName]: e.target.value,
+  useEffect(() => {
+    const { error } = loginValidation.validate(form, {
+      abortEarly: false,
     });
+
+    if (error) {
+      // Creates an error object in the format { field: message }
+      const validationErrors = error.details.reduce((acc, err) => {
+        return { ...acc, [err.path[0]]: err.message };
+      }, {});
+      setErrors(validationErrors);
+    }
+  }, []);
+
+  const handleSubmit = async () => {
+    try {
+      await loginValidation.validateAsync(form, { abortEarly: false });
+      dispatch(login(form));
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
+  const handleInput = (e) => {
+    const newForm = { ...form, [idMap[e.target.id]]: e.target.value };
+    setForm(newForm);
   };
 
   return (
@@ -44,14 +72,16 @@ const Login = () => {
         <div className="login-form-inputs">
           <EmailTextField
             onChange={handleInput}
-            error={false}
+            error={errors.email ? true : false}
+            helperText={errors.email ? errors.email : ""}
             placeholder="Enter your email"
             id="login-email-input"
           />
           <div className="login-form-v2-spacing" />
           <PasswordTextField
             onChange={handleInput}
-            error={false}
+            error={errors.password ? true : false}
+            helperText={errors.password ? errors.password : ""}
             placeholder="Password"
             id="login-password-input"
           />
@@ -63,7 +93,12 @@ const Login = () => {
         </div>
         <div className="login-form-v3-spacing" />
         <div className="login-form-actions">
-          <Button level="primary" label="Sign in" sx={{ width: "100%" }} />
+          <Button
+            level="primary"
+            label="Sign in"
+            sx={{ width: "100%" }}
+            onClick={handleSubmit}
+          />
           <div className="login-form-v-spacing" />
           <Button
             level="secondary"
diff --git a/Client/src/Validation/validation.js b/Client/src/Validation/validation.js
index 170bbd612..997fd1c16 100644
--- a/Client/src/Validation/validation.js
+++ b/Client/src/Validation/validation.js
@@ -24,4 +24,20 @@ const registerValidation = joi.object({
   }),
 });
 
-export { registerValidation };
+const loginValidation = joi.object({
+  email: joi
+    .string()
+    .email({ tlds: { allow: false } })
+    .required()
+    .messages({
+      "string.email": "Email must be a valid email",
+      "string.empty": "Email is required",
+    }),
+
+  password: joi.string().min(8).required().messages({
+    "string.min": "Password must be at least 8 characters",
+    "string.empty": "Password is required",
+  }),
+});
+
+export { registerValidation, loginValidation };

From 9beebd90a1a299af20d4963265516889e4f4fb29 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 10 Jun 2024 11:53:10 -0700
Subject: [PATCH 3/6] Connected login to backend

---
 Client/src/Features/Auth/authSlice.js | 25 ++++++++++++++++-
 Client/src/Pages/Login/index.jsx      | 39 +++++++++++++++++++++++++--
 Client/src/Pages/Register/index.jsx   |  9 +++++++
 3 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/Client/src/Features/Auth/authSlice.js b/Client/src/Features/Auth/authSlice.js
index d361ffa05..bef6e8630 100644
--- a/Client/src/Features/Auth/authSlice.js
+++ b/Client/src/Features/Auth/authSlice.js
@@ -23,7 +23,12 @@ export const register = createAsyncThunk(
 );
 
 export const login = createAsyncThunk("auth/login", async (form, thunkApi) => {
-  console.log(form);
+  try {
+    const res = await axios.post(`${BASE_URL}/auth/login`, form);
+    return res.data;
+  } catch (error) {
+    return thunkApi.rejectWithValue(error.response.data);
+  }
 });
 
 const authSlice = createSlice({
@@ -32,6 +37,7 @@ const authSlice = createSlice({
   reducers: {},
   extraReducers: (builder) => {
     builder
+      // Register thunk
       .addCase(register.pending, (state, action) => {
         state.isLoading = true;
       })
@@ -47,6 +53,23 @@ const authSlice = createSlice({
         state.isLoading = false;
         state.success = action.payload.success;
         state.msg = action.payload.msg;
+      })
+      // Login thunk
+      .addCase(login.pending, (state, action) => {
+        state.isLoading = true;
+      })
+      .addCase(login.fulfilled, (state, action) => {
+        state.isLoading = false;
+        state.success = action.payload.success;
+        state.msg = action.payload.msg;
+        const decodedToken = jwtDecode(action.payload.data);
+        const user = { ...decodedToken };
+        state.user = user;
+      })
+      .addCase(login.rejected, (state, action) => {
+        state.isLoading = false;
+        state.success = action.payload.success;
+        state.msg = action.payload.msg;
       });
   },
 });
diff --git a/Client/src/Pages/Login/index.jsx b/Client/src/Pages/Login/index.jsx
index 3732e52c8..593f5aee1 100644
--- a/Client/src/Pages/Login/index.jsx
+++ b/Client/src/Pages/Login/index.jsx
@@ -1,4 +1,6 @@
 import { useState, useEffect } from "react";
+import { useNavigate } from "react-router-dom";
+
 import "./index.css";
 import BackgroundPattern from "../../Components/BackgroundPattern/BackgroundPattern";
 import Logomark from "../../assets/Images/Logomark.png";
@@ -14,6 +16,7 @@ import { useDispatch } from "react-redux";
 
 const Login = () => {
   const dispatch = useDispatch();
+  const navigate = useNavigate();
 
   const idMap = {
     "login-email-input": "email",
@@ -38,19 +41,51 @@ const Login = () => {
         return { ...acc, [err.path[0]]: err.message };
       }, {});
       setErrors(validationErrors);
+    } else {
+      setErrors({});
     }
   }, []);
 
   const handleSubmit = async () => {
     try {
       await loginValidation.validateAsync(form, { abortEarly: false });
-      dispatch(login(form));
+      const action = await dispatch(login(form));
+      if (action.meta.requestStatus === "fulfilled") {
+        const token = action.payload.data;
+        localStorage.setItem("token", token);
+        navigate("/");
+      }
+      if (action.meta.requestStatus === "rejected") {
+        const error = new Error("Request rejected");
+        error.response = action.payload;
+        throw error;
+      }
     } catch (error) {
-      console.log(error);
+      if (error.name === "ValidationError") {
+        // TODO Handle validation errors
+        console.log(error.details);
+        alert("Invalid input");
+      } else if (error.response) {
+        // TODO handle dispatch errors
+        alert(error.response.msg);
+      } else {
+        // TODO handle unknown errors
+        console.log(error);
+        alert("Unknown error");
+      }
     }
   };
 
   const handleInput = (e) => {
+    const fieldName = idMap[e.target.id];
+    // Extract and validate individual fields as input changes
+    const fieldSchema = loginValidation.extract(fieldName);
+    const { error } = fieldSchema.validate(e.target.value);
+    let errMsg = "";
+    if (error) {
+      errMsg = error.message;
+    }
+    setErrors({ ...errors, [fieldName]: errMsg });
     const newForm = { ...form, [idMap[e.target.id]]: e.target.value };
     setForm(newForm);
   };
diff --git a/Client/src/Pages/Register/index.jsx b/Client/src/Pages/Register/index.jsx
index bd1b63760..8a7200599 100644
--- a/Client/src/Pages/Register/index.jsx
+++ b/Client/src/Pages/Register/index.jsx
@@ -54,6 +54,15 @@ const Register = () => {
   }, []);
 
   const handleInput = (e) => {
+    const fieldName = idMap[e.target.id];
+    // Extract and validate individual fields as input changes
+    const fieldSchema = registerValidation.extract(fieldName);
+    const { error } = fieldSchema.validate(e.target.value);
+    let errMsg = "";
+    if (error) {
+      errMsg = error.message;
+    }
+    setErrors({ ...errors, [fieldName]: errMsg });
     const newForm = { ...form, [idMap[e.target.id]]: e.target.value };
     setForm(newForm);
   };

From 4c84978e5278bf0b6238acee45bb60a1663a2ce1 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 10 Jun 2024 11:58:48 -0700
Subject: [PATCH 4/6] Added error alert for validation error

---
 Client/package-lock.json            | 54 +++++++++++------------------
 Client/src/Pages/Login/index.jsx    |  2 +-
 Client/src/Pages/Register/index.jsx |  2 +-
 3 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/Client/package-lock.json b/Client/package-lock.json
index 26b303991..0002aa572 100644
--- a/Client/package-lock.json
+++ b/Client/package-lock.json
@@ -1089,6 +1089,7 @@
       "version": "0.11.14",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
       "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "deprecated": "Use @eslint/config-array instead",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1118,6 +1119,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
       "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
+      "deprecated": "Use @eslint/object-schema instead",
       "dev": true,
       "license": "BSD-3-Clause"
     },
@@ -1424,15 +1426,10 @@
       }
     },
     "node_modules/@mui/x-charts": {
-<<<<<<< HEAD
-      "version": "7.6.1",
-      "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-7.6.1.tgz",
-      "integrity": "sha512-LuAVQX4lzhmsqk2NRdWCP+aQZ8kRwG7KOy8ulf8hR5NI5J1VsiOtH41J+qgV3uAC6hDMWL7fTgffrRDFTMci/g==",
-=======
       "version": "7.6.2",
       "resolved": "https://registry.npmjs.org/@mui/x-charts/-/x-charts-7.6.2.tgz",
       "integrity": "sha512-oG22NRno1+HSLV/9jVLThnHAKN4g+MXOO6GqaQxN9LM0hjt1tgRsrNAlfcJndmj/dVwqFtynkFB5qWnTEBZs7Q==",
->>>>>>> 3f41db916efdd46069589e91f5886a4a01d11896
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.24.6",
         "@mui/base": "^5.0.0-beta.40",
@@ -2069,9 +2066,9 @@
       "license": "ISC"
     },
     "node_modules/@vitejs/plugin-react": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.0.tgz",
-      "integrity": "sha512-KcEbMsn4Dpk+LIbHMj7gDPRKaTMStxxWRkRmxsg/jVdFdJCZWt1SchZcf0M4t8lIKdwwMsEyzhrcOXRrDPtOBw==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.1.tgz",
+      "integrity": "sha512-m/V2syj5CuVnaxcUJOQRel/Wr31FFXRFlnOoq1TVtkCxsY5veGMTEmpWHndrhB2U8ScHtCQB1e+4hWYExQc6Lg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2374,9 +2371,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.23.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-      "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
+      "version": "4.23.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz",
+      "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==",
       "dev": true,
       "funding": [
         {
@@ -2394,10 +2391,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001587",
-        "electron-to-chromium": "^1.4.668",
+        "caniuse-lite": "^1.0.30001629",
+        "electron-to-chromium": "^1.4.796",
         "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.13"
+        "update-browserslist-db": "^1.0.16"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -2436,15 +2433,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-<<<<<<< HEAD
-      "version": "1.0.30001628",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001628.tgz",
-      "integrity": "sha512-S3BnR4Kh26TBxbi5t5kpbcUlLJb9lhtDXISDPwOfI+JoC+ik0QksvkZtUVyikw3hjnkgkMPSJ8oIM9yMm9vflA==",
-=======
-      "version": "1.0.30001629",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001629.tgz",
-      "integrity": "sha512-c3dl911slnQhmxUIT4HhYzT7wnBK/XYpGnYLOj4nJBaRiw52Ibe7YxlDaAeRECvA786zCuExhxIUJ2K7nHMrBw==",
->>>>>>> 3f41db916efdd46069589e91f5886a4a01d11896
+      "version": "1.0.30001632",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001632.tgz",
+      "integrity": "sha512-udx3o7yHJfUxMLkGohMlVHCvFvWmirKh9JAH/d7WOLPetlH+LTL5cocMZ0t7oZx/mdlOWXti97xLZWc8uURRHg==",
       "dev": true,
       "funding": [
         {
@@ -2848,16 +2839,11 @@
       }
     },
     "node_modules/electron-to-chromium": {
-<<<<<<< HEAD
-      "version": "1.4.790",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.790.tgz",
-      "integrity": "sha512-eVGeQxpaBYbomDBa/Mehrs28MdvCXfJmEFzaMFsv8jH/MJDLIylJN81eTJ5kvx7B7p18OiPK0BkC06lydEy63A==",
-=======
-      "version": "1.4.792",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.792.tgz",
-      "integrity": "sha512-rkg5/N3L+Y844JyfgPUyuKK0Hk0efo3JNxUDKvz3HgP6EmN4rNGhr2D8boLsfTV/hGo7ZGAL8djw+jlg99zQyA==",
->>>>>>> 3f41db916efdd46069589e91f5886a4a01d11896
-      "dev": true
+      "version": "1.4.796",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.796.tgz",
+      "integrity": "sha512-NglN/xprcM+SHD2XCli4oC6bWe6kHoytcyLKCWXmRL854F0qhPhaYgUswUsglnPxYaNQIg2uMY4BvaomIf3kLA==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/error-ex": {
       "version": "1.3.2",
diff --git a/Client/src/Pages/Login/index.jsx b/Client/src/Pages/Login/index.jsx
index 593f5aee1..01cce9ded 100644
--- a/Client/src/Pages/Login/index.jsx
+++ b/Client/src/Pages/Login/index.jsx
@@ -64,7 +64,7 @@ const Login = () => {
       if (error.name === "ValidationError") {
         // TODO Handle validation errors
         console.log(error.details);
-        alert("Invalid input");
+        alert(error);
       } else if (error.response) {
         // TODO handle dispatch errors
         alert(error.response.msg);
diff --git a/Client/src/Pages/Register/index.jsx b/Client/src/Pages/Register/index.jsx
index 8a7200599..4bea1332d 100644
--- a/Client/src/Pages/Register/index.jsx
+++ b/Client/src/Pages/Register/index.jsx
@@ -87,7 +87,7 @@ const Register = () => {
       if (error.name === "ValidationError") {
         // TODO Handle validation errors
         console.log(error);
-        alert("Invalid input");
+        alert(error);
       } else if (error.response) {
         // TODO handle dispatch errors
         alert(error.response.msg);

From 44c9659b1d8f1a1ff44a382aaefd1a8afd9cb27c Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 10 Jun 2024 12:24:17 -0700
Subject: [PATCH 5/6] Refactored actions

---
 Client/src/Features/Auth/authSlice.js | 44 +++++++++++----------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/Client/src/Features/Auth/authSlice.js b/Client/src/Features/Auth/authSlice.js
index bef6e8630..2182acef5 100644
--- a/Client/src/Features/Auth/authSlice.js
+++ b/Client/src/Features/Auth/authSlice.js
@@ -31,6 +31,20 @@ export const login = createAsyncThunk("auth/login", async (form, thunkApi) => {
   }
 });
 
+const handleAuthFulfilled = (state, action) => {
+  state.isLoading = false;
+  state.success = action.payload.success;
+  state.msg = action.payload.msg;
+  const decodedToken = jwtDecode(action.payload.data);
+  const user = { ...decodedToken };
+  state.user = user;
+};
+const handleAuthRejected = (state, action) => {
+  state.isLoading = false;
+  state.success = action.payload.success;
+  state.msg = action.payload.msg;
+};
+
 const authSlice = createSlice({
   name: "auth",
   initialState,
@@ -41,36 +55,14 @@ const authSlice = createSlice({
       .addCase(register.pending, (state, action) => {
         state.isLoading = true;
       })
-      .addCase(register.fulfilled, (state, action) => {
-        state.isLoading = false;
-        state.success = action.payload.success;
-        state.msg = action.payload.msg;
-        const decodedToken = jwtDecode(action.payload.data);
-        const user = { ...decodedToken };
-        state.user = user;
-      })
-      .addCase(register.rejected, (state, action) => {
-        state.isLoading = false;
-        state.success = action.payload.success;
-        state.msg = action.payload.msg;
-      })
+      .addCase(register.fulfilled, handleAuthFulfilled)
+      .addCase(register.rejected, handleAuthRejected)
       // Login thunk
       .addCase(login.pending, (state, action) => {
         state.isLoading = true;
       })
-      .addCase(login.fulfilled, (state, action) => {
-        state.isLoading = false;
-        state.success = action.payload.success;
-        state.msg = action.payload.msg;
-        const decodedToken = jwtDecode(action.payload.data);
-        const user = { ...decodedToken };
-        state.user = user;
-      })
-      .addCase(login.rejected, (state, action) => {
-        state.isLoading = false;
-        state.success = action.payload.success;
-        state.msg = action.payload.msg;
-      });
+      .addCase(login.fulfilled, handleAuthFulfilled)
+      .addCase(login.rejected, handleAuthRejected);
   },
 });
 

From a12e200e332c3bfd792cda5f9cff2648c9b117db Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 10 Jun 2024 14:28:31 -0700
Subject: [PATCH 6/6] Removed log statement, saved authToken to auth state

---
 Client/src/Features/Auth/authSlice.js   | 2 ++
 Client/src/Layouts/HomeLayout/index.jsx | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Client/src/Features/Auth/authSlice.js b/Client/src/Features/Auth/authSlice.js
index 2182acef5..ebf8eb7bd 100644
--- a/Client/src/Features/Auth/authSlice.js
+++ b/Client/src/Features/Auth/authSlice.js
@@ -5,6 +5,7 @@ const BASE_URL = import.meta.env.VITE_APP_API_BASE_URL;
 
 const initialState = {
   isLoading: false,
+  authToken: "",
   user: "",
   success: null,
   msg: null,
@@ -35,6 +36,7 @@ const handleAuthFulfilled = (state, action) => {
   state.isLoading = false;
   state.success = action.payload.success;
   state.msg = action.payload.msg;
+  state.authToken = action.payload.data;
   const decodedToken = jwtDecode(action.payload.data);
   const user = { ...decodedToken };
   state.user = user;
diff --git a/Client/src/Layouts/HomeLayout/index.jsx b/Client/src/Layouts/HomeLayout/index.jsx
index d7a7c2977..963c0d0a7 100644
--- a/Client/src/Layouts/HomeLayout/index.jsx
+++ b/Client/src/Layouts/HomeLayout/index.jsx
@@ -10,7 +10,6 @@ import { useSelector } from "react-redux";
 const HomeLayout = () => {
   const authState = useSelector((state) => state.auth);
   const { user, msg } = authState;
-  console.log(user, msg);
   return (
     <div className="home-layout">
       <DashboardSidebar />