From e5fb6f7e62933b898d4780513f1dbbf2c40c1dcc Mon Sep 17 00:00:00 2001
From: Peyton-McKee <mckee.p@northeastern.edu>
Date: Wed, 22 Jan 2025 20:07:07 -0500
Subject: [PATCH] Fix Logout

---
 src/frontend/src/layouts/PageTitle/NavUserMenu.tsx    |  9 ++++++++-
 src/frontend/src/pages/LoginPage/LoginDev.tsx         |  2 ++
 .../src/pages/SettingsPage/SettingsPreferences.tsx    | 11 ++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/frontend/src/layouts/PageTitle/NavUserMenu.tsx b/src/frontend/src/layouts/PageTitle/NavUserMenu.tsx
index 526871aa54..4ef7ab2bd8 100644
--- a/src/frontend/src/layouts/PageTitle/NavUserMenu.tsx
+++ b/src/frontend/src/layouts/PageTitle/NavUserMenu.tsx
@@ -41,7 +41,14 @@ const NavUserMenu: React.FC<NavUserMenuProps> = ({ open }) => {
   };
 
   const ProdLogout = () => (
-    <MenuItem component="div" sx={{ py: 0 }} onClick={googleLogout}>
+    <MenuItem
+      component="div"
+      sx={{ py: 0 }}
+      onClick={() => {
+        googleLogout();
+        history.push('/');
+      }}
+    >
       <ListItemIcon>
         <LogoutIcon fontSize="small" />
       </ListItemIcon>
diff --git a/src/frontend/src/pages/LoginPage/LoginDev.tsx b/src/frontend/src/pages/LoginPage/LoginDev.tsx
index 304899e752..4e1ad33d0b 100644
--- a/src/frontend/src/pages/LoginPage/LoginDev.tsx
+++ b/src/frontend/src/pages/LoginPage/LoginDev.tsx
@@ -61,6 +61,8 @@ const LoginDev: React.FC<LoginDevProps> = ({ devSetUser, devFormSubmit }) => {
           ))}
         </Select>
       </FormControl>
+      <label htmlFor="anId">label</label>
+      <input id="anId" type='date' value="2011-11-22"></input>
     </form>
   );
 };
diff --git a/src/frontend/src/pages/SettingsPage/SettingsPreferences.tsx b/src/frontend/src/pages/SettingsPage/SettingsPreferences.tsx
index cd64c3631d..c8b84533cb 100644
--- a/src/frontend/src/pages/SettingsPage/SettingsPreferences.tsx
+++ b/src/frontend/src/pages/SettingsPage/SettingsPreferences.tsx
@@ -10,6 +10,7 @@ import { useState } from 'react';
 import UserSecureSettings from './UserSecureSettings/UserSecureSettings';
 import UserScheduleSettings from './UserScheduleSettings/UserScheduleSettings';
 import { Box } from '@mui/system';
+import { useHistory } from 'react-router-dom';
 
 const NERSwitch = styled((props: SwitchProps) => (
   <Switch focusVisibleClassName=".Mui-focusVisible" disableRipple {...props} />
@@ -62,6 +63,7 @@ const NERSwitch = styled((props: SwitchProps) => (
 const SettingsPreferences: React.FC = () => {
   const auth = useAuth();
   const user = useCurrentUser();
+  const history = useHistory();
   const [showAlert, setShowAlert] = useState(false);
   const {
     isLoading: settingsIsLoading,
@@ -129,7 +131,14 @@ const SettingsPreferences: React.FC = () => {
                 import.meta.env.MODE === 'development' ? (
                   <NERSwitch id="trick-switch" sx={{ m: 1 }} onClick={logout} />
                 ) : (
-                  <NERSwitch id="trick-switch" sx={{ m: 1 }} onClick={googleLogout} />
+                  <NERSwitch
+                    id="trick-switch"
+                    sx={{ m: 1 }}
+                    onClick={() => {
+                      googleLogout();
+                      history.push('/');
+                    }}
+                  />
                 )
               }
             />