Merge pull request #29 from calebwharton/minor-fixes

fix logout on nav
calebwharton · Jul 13, 2024 · 18d9256 · 18d9256
2 parents 62aecb5 + ce7220c
commit 18d9256
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/web/src/components/NavBarProfile.tsx b/web/src/components/NavBarProfile.tsx
@@ -4,7 +4,7 @@ import "../styles/Navbar.css";
 
 export default function NavBar() {
   const navigate = useNavigate();
-  // utils/auth.ts
+
   const getUserID = (): string | null => {
     return localStorage.getItem("user_id");
   };
@@ -35,15 +35,17 @@ export default function NavBar() {
             <span className="menu-item text-offwhite text-lg">LEADERBOARD</span>
           </Link>
         </div>
-        <div>
+        <div className="flex items-center">
           {isUserLoggedIn() && (
-            <Link to="/profile" className="text-offwhite menu-icon">
-              <LogoutIcon fontSize="large" />
-            </Link>
+            <>
+              <button onClick={handleLogOut} className="menu-icon">
+                <LogoutIcon fontSize="large" className="text-offwhite" />
+              </button>
+              <button onClick={handleLogOut} className="text-primary ml-2">
+                LOGOUT
+              </button>
+            </>
           )}
-          <button onClick={handleLogOut} className="text-primary ml-2">
-            LOGOUT
-          </button>
         </div>
       </nav>
     </div>

diff --git a/web/src/pages/Profile.tsx b/web/src/pages/Profile.tsx
@@ -14,7 +14,7 @@ interface User {
     points: number;
     email: string;
     phoneNumber: string;
-    eventsAttended: string[];
+    eventsAttended: { name: string; date: string; location: string }[];
     eventsCreated: string[];
 }
 export default function Profile() {