From bb27a9f49fec773ff9d4ee682b1ae05ffa395cef Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 24 Jun 2024 13:51:11 -0700
Subject: [PATCH] NavBar now shows correct name on login, sign up redirect
 functional

---
 Client/src/Components/NavBar/index.jsx |  7 +++++--
 Client/src/Pages/Login/index.jsx       | 12 +++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Client/src/Components/NavBar/index.jsx b/Client/src/Components/NavBar/index.jsx
index a568b229d..c3ef60091 100644
--- a/Client/src/Components/NavBar/index.jsx
+++ b/Client/src/Components/NavBar/index.jsx
@@ -16,7 +16,7 @@ import ChevronDown from "../../assets/Images/Icon-chevron-down.png";
 import { clearAuthState } from "../../Features/Auth/authSlice";
 import { clearMonitorState } from "../../Features/Monitors/monitorsSlice";
 
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { useNavigate } from "react-router-dom";
 
 const settings = ["Profile", "Team", "Invite Colleagues", "Logout"];
@@ -37,6 +37,7 @@ function NavBar() {
   const [anchorElUser, setAnchorElUser] = useState(null);
   const dispatch = useDispatch();
   const navigate = useNavigate();
+  const authState = useSelector((state) => state.auth);
 
   /**
    * Handles opening the user menu.
@@ -156,7 +157,9 @@ function NavBar() {
                     className="icon-button-avatar"
                     style={{ width: "25px", height: "25px" }}
                   />
-                  <div className="icon-button-toggle-title">Jackie Dawn</div>
+                  <div className="icon-button-toggle-title">
+                    {authState.user.firstname} {authState.user.lastname}
+                  </div>
                   <img
                     className="icon-button-toggle-pic"
                     src={ChevronDown}
diff --git a/Client/src/Pages/Login/index.jsx b/Client/src/Pages/Login/index.jsx
index 18bca8a05..519114eb3 100644
--- a/Client/src/Pages/Login/index.jsx
+++ b/Client/src/Pages/Login/index.jsx
@@ -80,6 +80,9 @@ const Login = () => {
     setForm(newForm);
   };
 
+  const handleSignupClick = () => {
+    navigate("/register");
+  };
   return (
     <div className="login-page">
       <BackgroundPattern></BackgroundPattern>
@@ -137,7 +140,14 @@ const Login = () => {
         <div className="login-form-v3-spacing" />
         <div className="new-account-option">
           Don’t have an account?
-          <span className="new-account-option-span">Sign up</span>
+          <span
+            onClick={() => {
+              navigate("/register");
+            }}
+            className="new-account-option-span"
+          >
+            Sign up
+          </span>
         </div>
       </form>
     </div>