From 162e46ed2d1e0c61bac5c8dbc77f89473261aa86 Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 11:13:37 -0800
Subject: [PATCH 01/16] setup: get user identity utility

---
 apps/site/src/lib/utils/getUserIdentity.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 apps/site/src/lib/utils/getUserIdentity.ts

diff --git a/apps/site/src/lib/utils/getUserIdentity.ts b/apps/site/src/lib/utils/getUserIdentity.ts
new file mode 100644
index 00000000..69c07548
--- /dev/null
+++ b/apps/site/src/lib/utils/getUserIdentity.ts
@@ -0,0 +1,12 @@
+import api from "./api";
+
+export interface Identity {
+    uid: string | null;
+    role: string | null;
+    status: string | null;
+}
+
+export default async function getUserIdentity() {
+    const identity = await api.get<Identity>("/user/me");
+    return identity?.data;
+}
\ No newline at end of file

From ff4d8642018113698b63208df90fd2a7be9e874b Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 11:13:49 -0800
Subject: [PATCH 02/16] feat: integrate user identity with navbar

---
 apps/site/src/app/layout.tsx                  |  4 +--
 .../site/src/lib/components/Navbar/Navbar.tsx | 29 ++++++++++++-------
 .../lib/components/Navbar/NavbarParent.tsx    | 13 +++++++++
 3 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 apps/site/src/lib/components/Navbar/NavbarParent.tsx

diff --git a/apps/site/src/app/layout.tsx b/apps/site/src/app/layout.tsx
index 206395c0..d6ab1778 100644
--- a/apps/site/src/app/layout.tsx
+++ b/apps/site/src/app/layout.tsx
@@ -4,7 +4,7 @@ import Footer from "@/lib/components/Footer/Footer";
 import "./globals.css";
 
 import { Layout } from "@/components/dom/Layout";
-import Navbar from "@/lib/components/Navbar/Navbar";
+import NavbarParent from "@/lib/components/Navbar/NavbarParent";
 
 export const metadata: Metadata = {
 	title: "IrvineHacks 2024",
@@ -26,7 +26,7 @@ export default function RootLayout({
 				className="overflow-x-hidden bg-top bg-repeat-y bg-[length:100%]"
 			>
 				{/* reference: https://github.com/pmndrs/react-three-next */}
-				<Navbar/>
+				<NavbarParent />
 				<Layout>{children}</Layout>
 				<Footer />
 			</body>
diff --git a/apps/site/src/lib/components/Navbar/Navbar.tsx b/apps/site/src/lib/components/Navbar/Navbar.tsx
index 2a17ac4e..0cf6b95a 100644
--- a/apps/site/src/lib/components/Navbar/Navbar.tsx
+++ b/apps/site/src/lib/components/Navbar/Navbar.tsx
@@ -1,19 +1,25 @@
 "use client";
 
+import Image from "next/image";
+import React, { useState, useEffect } from "react";
 import * as NavMenu from "@radix-ui/react-navigation-menu";
 
-import styles from "./Navbar.module.scss";
-import React from "react";
-import { useState, useEffect } from "react";
-
 import NavLinkItem from "./NavbarHelpers";
 import Button from "@/lib/components/Button/Button";
 import HackLogo from "@/lib/components/HackLogo/HackLogo";
 
 import hamburger from "@/assets/icons/navigation-icon.svg";
-import Image from "next/image";
+import { Identity } from "@/lib/utils/getUserIdentity";
+
+import styles from "./Navbar.module.scss";
+
+interface NavbarProps {
+	identity: Identity
+}
+
+function Navbar({ identity }: NavbarProps) {
+	const { uid, role, status } = identity;
 
-function Navbar() {
 	const [listShown, setListShown] = useState(false);
 	const [hasScrolled, setHasScrolled] = useState(false);
 	const [hidden, setHidden] = useState(true);
@@ -27,9 +33,8 @@ function Navbar() {
 
 	return (
 		<NavMenu.Root
-			className={`${
-				hasScrolled ? "md:bg-opacity-50" : ""
-			} transition-colors duration-0 md:duration-700 ease-out w-full z-10 flex flex-col fixed bg-black bg-opacity-0 md:flex-row md:items-center`}
+			className={`${hasScrolled ? "md:bg-opacity-50" : ""
+				} transition-colors duration-0 md:duration-700 ease-out w-full z-10 flex flex-col fixed bg-black bg-opacity-0 md:flex-row md:items-center`}
 		>
 			<NavMenu.List className="bg-black bg-opacity-50 md:bg-opacity-0 flex p-3">
 				<NavLinkItem href="/">
@@ -66,7 +71,11 @@ function Navbar() {
 					<NavLinkItem href="/">Schedule</NavLinkItem>
 					<NavLinkItem href="/">Resources</NavLinkItem>
 					<NavLinkItem href="/">Stage</NavLinkItem> */}
-					<Button text="Login" href="/login" isLightVersion />
+					{!status && <NavLinkItem href="/apply">Apply</NavLinkItem>}
+					{status !== null && <NavLinkItem href="/portal">Portal</NavLinkItem>}
+					{uid === null ?
+						<Button text="Login" href="/login" isLightVersion />
+						: <Button text="Logout" href="/api/user/logout" isLightVersion />}
 				</NavMenu.List>
 			</div>
 		</NavMenu.Root>
diff --git a/apps/site/src/lib/components/Navbar/NavbarParent.tsx b/apps/site/src/lib/components/Navbar/NavbarParent.tsx
new file mode 100644
index 00000000..776598a4
--- /dev/null
+++ b/apps/site/src/lib/components/Navbar/NavbarParent.tsx
@@ -0,0 +1,13 @@
+import getUserIdentity from "@/lib/utils/getUserIdentity";
+import Navbar from "./Navbar";
+export interface Identity {
+    uid: string | null;
+    role: string | null;
+    status: string | null;
+}
+
+export default async function NavbarParent() {
+    const identity = await getUserIdentity();
+
+    return <><Navbar identity={identity} /></>
+}
\ No newline at end of file

From 5cb429b97ac6fc4595414fd7d9f786067b5efc62 Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 11:19:48 -0800
Subject: [PATCH 03/16] fix: formatting

---
 apps/site/src/lib/components/Navbar/Navbar.tsx | 16 ++++++++++++----
 apps/site/src/lib/utils/getUserIdentity.ts     | 12 ++++++------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/apps/site/src/lib/components/Navbar/Navbar.tsx b/apps/site/src/lib/components/Navbar/Navbar.tsx
index 0cf6b95a..45173e2a 100644
--- a/apps/site/src/lib/components/Navbar/Navbar.tsx
+++ b/apps/site/src/lib/components/Navbar/Navbar.tsx
@@ -14,7 +14,7 @@ import { Identity } from "@/lib/utils/getUserIdentity";
 import styles from "./Navbar.module.scss";
 
 interface NavbarProps {
-	identity: Identity
+	identity: Identity;
 }
 
 function Navbar({ identity }: NavbarProps) {
@@ -72,10 +72,18 @@ function Navbar({ identity }: NavbarProps) {
 					<NavLinkItem href="/">Resources</NavLinkItem>
 					<NavLinkItem href="/">Stage</NavLinkItem> */}
 					{!status && <NavLinkItem href="/apply">Apply</NavLinkItem>}
-					{status !== null && <NavLinkItem href="/portal">Portal</NavLinkItem>}
-					{uid === null ?
+					{status !== null && (
+						<NavLinkItem href="/portal">Portal</NavLinkItem>
+					)}
+					{uid === null ? (
 						<Button text="Login" href="/login" isLightVersion />
-						: <Button text="Logout" href="/api/user/logout" isLightVersion />}
+					) : (
+						<Button
+							text="Logout"
+							href="/api/user/logout"
+							isLightVersion
+						/>
+					)}
 				</NavMenu.List>
 			</div>
 		</NavMenu.Root>
diff --git a/apps/site/src/lib/utils/getUserIdentity.ts b/apps/site/src/lib/utils/getUserIdentity.ts
index 69c07548..7a1ccc7e 100644
--- a/apps/site/src/lib/utils/getUserIdentity.ts
+++ b/apps/site/src/lib/utils/getUserIdentity.ts
@@ -1,12 +1,12 @@
 import api from "./api";
 
 export interface Identity {
-    uid: string | null;
-    role: string | null;
-    status: string | null;
+	uid: string | null;
+	role: string | null;
+	status: string | null;
 }
 
 export default async function getUserIdentity() {
-    const identity = await api.get<Identity>("/user/me");
-    return identity?.data;
-}
\ No newline at end of file
+	const identity = await api.get<Identity>("/user/me");
+	return identity.data;
+}

From 5c5ae295508fed7e0783a6486b1ea4e289b04257 Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 11:36:47 -0800
Subject: [PATCH 04/16] fix: remove duplicate Identity declaration

---
 apps/site/src/lib/components/Navbar/NavbarParent.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apps/site/src/lib/components/Navbar/NavbarParent.tsx b/apps/site/src/lib/components/Navbar/NavbarParent.tsx
index 776598a4..703b92ff 100644
--- a/apps/site/src/lib/components/Navbar/NavbarParent.tsx
+++ b/apps/site/src/lib/components/Navbar/NavbarParent.tsx
@@ -1,10 +1,5 @@
 import getUserIdentity from "@/lib/utils/getUserIdentity";
 import Navbar from "./Navbar";
-export interface Identity {
-    uid: string | null;
-    role: string | null;
-    status: string | null;
-}
 
 export default async function NavbarParent() {
     const identity = await getUserIdentity();

From e4f47c5dd7c89de26e180c544e168baabe15ff0c Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 11:44:13 -0800
Subject: [PATCH 05/16] fix: disable prefetch for logout route

---
 apps/site/src/lib/components/Button/Button.tsx | 4 ++++
 apps/site/src/lib/components/Navbar/Navbar.tsx | 1 +
 2 files changed, 5 insertions(+)

diff --git a/apps/site/src/lib/components/Button/Button.tsx b/apps/site/src/lib/components/Button/Button.tsx
index 0bd8a668..f1227395 100644
--- a/apps/site/src/lib/components/Button/Button.tsx
+++ b/apps/site/src/lib/components/Button/Button.tsx
@@ -2,12 +2,14 @@ import type { ComponentProps } from "react";
 import Link from "next/link";
 import styles from "./Button.module.css";
 import clsx from "clsx";
+import { disableInstantTransitions } from "framer-motion";
 
 interface ButtonProps {
 	text: string;
 	className?: string;
 	href?: ComponentProps<typeof Link>["href"];
 	isLightVersion?: boolean;
+	usePrefetch?: boolean;
 }
 
 const Button: React.FC<ButtonProps> = ({
@@ -15,6 +17,7 @@ const Button: React.FC<ButtonProps> = ({
 	href,
 	className,
 	isLightVersion,
+	usePrefetch
 }) => {
 	if (href) {
 		return (
@@ -22,6 +25,7 @@ const Button: React.FC<ButtonProps> = ({
 				href={href}
 				target={isLightVersion ? "" : "_blank"}
 				rel="noopener noreferrer"
+				prefetch={usePrefetch}
 				className={clsx(
 					styles.button,
 					isLightVersion && styles.lightButton,
diff --git a/apps/site/src/lib/components/Navbar/Navbar.tsx b/apps/site/src/lib/components/Navbar/Navbar.tsx
index 45173e2a..78af520a 100644
--- a/apps/site/src/lib/components/Navbar/Navbar.tsx
+++ b/apps/site/src/lib/components/Navbar/Navbar.tsx
@@ -81,6 +81,7 @@ function Navbar({ identity }: NavbarProps) {
 						<Button
 							text="Logout"
 							href="/api/user/logout"
+							usePrefetch={false}
 							isLightVersion
 						/>
 					)}

From 5bd2075c6e40da5e25452e133c8240149e220762 Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 12:09:50 -0800
Subject: [PATCH 06/16] feat: logout rewrite

---
 apps/site/next.config.js                             | 4 ++++
 apps/site/src/lib/components/Button/Button.tsx       | 2 +-
 apps/site/src/lib/components/Navbar/Navbar.tsx       | 5 +++--
 apps/site/src/lib/components/Navbar/NavbarParent.tsx | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/site/next.config.js b/apps/site/next.config.js
index 11dafae3..2f889d02 100644
--- a/apps/site/next.config.js
+++ b/apps/site/next.config.js
@@ -18,6 +18,10 @@ const nextConfig = {
 						? `${LOCAL_API_URL}/:path*`
 						: VERCEL_API_PATH,
 			},
+			{
+				source: "/logout",
+				destination: "/api/saml/logout",
+			},
 		];
 	},
 	async redirects() {
diff --git a/apps/site/src/lib/components/Button/Button.tsx b/apps/site/src/lib/components/Button/Button.tsx
index f1227395..698f9a67 100644
--- a/apps/site/src/lib/components/Button/Button.tsx
+++ b/apps/site/src/lib/components/Button/Button.tsx
@@ -17,7 +17,7 @@ const Button: React.FC<ButtonProps> = ({
 	href,
 	className,
 	isLightVersion,
-	usePrefetch
+	usePrefetch,
 }) => {
 	if (href) {
 		return (
diff --git a/apps/site/src/lib/components/Navbar/Navbar.tsx b/apps/site/src/lib/components/Navbar/Navbar.tsx
index 78af520a..7c603038 100644
--- a/apps/site/src/lib/components/Navbar/Navbar.tsx
+++ b/apps/site/src/lib/components/Navbar/Navbar.tsx
@@ -19,6 +19,7 @@ interface NavbarProps {
 
 function Navbar({ identity }: NavbarProps) {
 	const { uid, role, status } = identity;
+	const isLoggedIn = uid === null;
 
 	const [listShown, setListShown] = useState(false);
 	const [hasScrolled, setHasScrolled] = useState(false);
@@ -75,12 +76,12 @@ function Navbar({ identity }: NavbarProps) {
 					{status !== null && (
 						<NavLinkItem href="/portal">Portal</NavLinkItem>
 					)}
-					{uid === null ? (
+					{isLoggedIn ? (
 						<Button text="Login" href="/login" isLightVersion />
 					) : (
 						<Button
 							text="Logout"
-							href="/api/user/logout"
+							href="/logout"
 							usePrefetch={false}
 							isLightVersion
 						/>
diff --git a/apps/site/src/lib/components/Navbar/NavbarParent.tsx b/apps/site/src/lib/components/Navbar/NavbarParent.tsx
index 703b92ff..07a12391 100644
--- a/apps/site/src/lib/components/Navbar/NavbarParent.tsx
+++ b/apps/site/src/lib/components/Navbar/NavbarParent.tsx
@@ -4,5 +4,5 @@ import Navbar from "./Navbar";
 export default async function NavbarParent() {
     const identity = await getUserIdentity();
 
-    return <><Navbar identity={identity} /></>
+    return <Navbar identity={identity} />;
 }
\ No newline at end of file

From e476aac2c09b7f210508de301cf14e946caf1f5a Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 12:39:14 -0800
Subject: [PATCH 07/16] feat: server side redirect for logout

---
 apps/site/next.config.js                       | 4 ----
 apps/site/src/app/logout/page.tsx              | 7 +++++++
 apps/site/src/lib/components/Button/Button.tsx | 1 -
 apps/site/src/lib/components/Navbar/Navbar.tsx | 7 ++++---
 4 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 apps/site/src/app/logout/page.tsx

diff --git a/apps/site/next.config.js b/apps/site/next.config.js
index 2f889d02..11dafae3 100644
--- a/apps/site/next.config.js
+++ b/apps/site/next.config.js
@@ -18,10 +18,6 @@ const nextConfig = {
 						? `${LOCAL_API_URL}/:path*`
 						: VERCEL_API_PATH,
 			},
-			{
-				source: "/logout",
-				destination: "/api/saml/logout",
-			},
 		];
 	},
 	async redirects() {
diff --git a/apps/site/src/app/logout/page.tsx b/apps/site/src/app/logout/page.tsx
new file mode 100644
index 00000000..af2895e4
--- /dev/null
+++ b/apps/site/src/app/logout/page.tsx
@@ -0,0 +1,7 @@
+import { redirect } from "next/navigation";
+import api from "@/lib/utils/api";
+
+export default async function Logout() {
+	await api.get<string>("/user/logout");
+	redirect("/");
+}
diff --git a/apps/site/src/lib/components/Button/Button.tsx b/apps/site/src/lib/components/Button/Button.tsx
index 698f9a67..e96b4ab7 100644
--- a/apps/site/src/lib/components/Button/Button.tsx
+++ b/apps/site/src/lib/components/Button/Button.tsx
@@ -2,7 +2,6 @@ import type { ComponentProps } from "react";
 import Link from "next/link";
 import styles from "./Button.module.css";
 import clsx from "clsx";
-import { disableInstantTransitions } from "framer-motion";
 
 interface ButtonProps {
 	text: string;
diff --git a/apps/site/src/lib/components/Navbar/Navbar.tsx b/apps/site/src/lib/components/Navbar/Navbar.tsx
index 7c603038..6ca89aa4 100644
--- a/apps/site/src/lib/components/Navbar/Navbar.tsx
+++ b/apps/site/src/lib/components/Navbar/Navbar.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import Image from "next/image";
-import React, { useState, useEffect } from "react";
+import { useState, useEffect } from "react";
 import * as NavMenu from "@radix-ui/react-navigation-menu";
 
 import NavLinkItem from "./NavbarHelpers";
@@ -34,8 +34,9 @@ function Navbar({ identity }: NavbarProps) {
 
 	return (
 		<NavMenu.Root
-			className={`${hasScrolled ? "md:bg-opacity-50" : ""
-				} transition-colors duration-0 md:duration-700 ease-out w-full z-10 flex flex-col fixed bg-black bg-opacity-0 md:flex-row md:items-center`}
+			className={`${
+				hasScrolled ? "md:bg-opacity-50" : ""
+			} transition-colors duration-0 md:duration-700 ease-out w-full z-10 flex flex-col fixed bg-black bg-opacity-0 md:flex-row md:items-center`}
 		>
 			<NavMenu.List className="bg-black bg-opacity-50 md:bg-opacity-0 flex p-3">
 				<NavLinkItem href="/">

From 0c80a0bee6bd33bb2a51667fa5431089008138d4 Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 12:53:21 -0800
Subject: [PATCH 08/16] fix: restore logout next rewrite

---
 apps/site/next.config.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/site/next.config.js b/apps/site/next.config.js
index 11dafae3..e85a6915 100644
--- a/apps/site/next.config.js
+++ b/apps/site/next.config.js
@@ -18,6 +18,10 @@ const nextConfig = {
 						? `${LOCAL_API_URL}/:path*`
 						: VERCEL_API_PATH,
 			},
+			{
+				source: "/logout",
+				destination: "/api/user/logout",
+			},
 		];
 	},
 	async redirects() {

From da3674f956e1ae654b67b9854df4640214a702dc Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 12:58:27 -0800
Subject: [PATCH 09/16] fix: prefetch on login route

---
 apps/site/src/lib/components/Navbar/Navbar.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/site/src/lib/components/Navbar/Navbar.tsx b/apps/site/src/lib/components/Navbar/Navbar.tsx
index 6ca89aa4..5252bc9f 100644
--- a/apps/site/src/lib/components/Navbar/Navbar.tsx
+++ b/apps/site/src/lib/components/Navbar/Navbar.tsx
@@ -78,7 +78,12 @@ function Navbar({ identity }: NavbarProps) {
 						<NavLinkItem href="/portal">Portal</NavLinkItem>
 					)}
 					{isLoggedIn ? (
-						<Button text="Login" href="/login" isLightVersion />
+						<Button
+							text="Login"
+							href="/login"
+							usePrefetch={false}
+							isLightVersion
+						/>
 					) : (
 						<Button
 							text="Logout"

From 97388d50cf736ef49d914526dae777ea27d0d234 Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 13:17:15 -0800
Subject: [PATCH 10/16] replace next link with a tag

---
 apps/site/src/lib/components/Button/Button.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/site/src/lib/components/Button/Button.tsx b/apps/site/src/lib/components/Button/Button.tsx
index e96b4ab7..5a5eba63 100644
--- a/apps/site/src/lib/components/Button/Button.tsx
+++ b/apps/site/src/lib/components/Button/Button.tsx
@@ -6,7 +6,7 @@ import clsx from "clsx";
 interface ButtonProps {
 	text: string;
 	className?: string;
-	href?: ComponentProps<typeof Link>["href"];
+	href: string;
 	isLightVersion?: boolean;
 	usePrefetch?: boolean;
 }
@@ -20,11 +20,10 @@ const Button: React.FC<ButtonProps> = ({
 }) => {
 	if (href) {
 		return (
-			<Link
+			<a
 				href={href}
 				target={isLightVersion ? "" : "_blank"}
 				rel="noopener noreferrer"
-				prefetch={usePrefetch}
 				className={clsx(
 					styles.button,
 					isLightVersion && styles.lightButton,
@@ -33,7 +32,7 @@ const Button: React.FC<ButtonProps> = ({
 				)}
 			>
 				{text}
-			</Link>
+			</a>
 		);
 	}
 	return (

From 92feaadcb68ee0caea07a6992a56252505fc2bf6 Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 13:38:14 -0800
Subject: [PATCH 11/16] fix: redirect instead of rewrite

---
 apps/site/next.config.js                       | 9 +++++----
 apps/site/src/app/logout/page.tsx              | 7 -------
 apps/site/src/lib/components/Button/Button.tsx | 7 ++++---
 3 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 apps/site/src/app/logout/page.tsx

diff --git a/apps/site/next.config.js b/apps/site/next.config.js
index e85a6915..2baeacd0 100644
--- a/apps/site/next.config.js
+++ b/apps/site/next.config.js
@@ -18,10 +18,6 @@ const nextConfig = {
 						? `${LOCAL_API_URL}/:path*`
 						: VERCEL_API_PATH,
 			},
-			{
-				source: "/logout",
-				destination: "/api/user/logout",
-			},
 		];
 	},
 	async redirects() {
@@ -36,6 +32,11 @@ const nextConfig = {
 				destination: "https://forms.gle/erpJjErKLJkEZMw48",
 				permanent: true,
 			},
+			{
+				source: "/logout",
+				destination: "/api/user/logout",
+				permanent: true,
+			},
 		];
 	},
 };
diff --git a/apps/site/src/app/logout/page.tsx b/apps/site/src/app/logout/page.tsx
deleted file mode 100644
index af2895e4..00000000
--- a/apps/site/src/app/logout/page.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import { redirect } from "next/navigation";
-import api from "@/lib/utils/api";
-
-export default async function Logout() {
-	await api.get<string>("/user/logout");
-	redirect("/");
-}
diff --git a/apps/site/src/lib/components/Button/Button.tsx b/apps/site/src/lib/components/Button/Button.tsx
index 5a5eba63..e96b4ab7 100644
--- a/apps/site/src/lib/components/Button/Button.tsx
+++ b/apps/site/src/lib/components/Button/Button.tsx
@@ -6,7 +6,7 @@ import clsx from "clsx";
 interface ButtonProps {
 	text: string;
 	className?: string;
-	href: string;
+	href?: ComponentProps<typeof Link>["href"];
 	isLightVersion?: boolean;
 	usePrefetch?: boolean;
 }
@@ -20,10 +20,11 @@ const Button: React.FC<ButtonProps> = ({
 }) => {
 	if (href) {
 		return (
-			<a
+			<Link
 				href={href}
 				target={isLightVersion ? "" : "_blank"}
 				rel="noopener noreferrer"
+				prefetch={usePrefetch}
 				className={clsx(
 					styles.button,
 					isLightVersion && styles.lightButton,
@@ -32,7 +33,7 @@ const Button: React.FC<ButtonProps> = ({
 				)}
 			>
 				{text}
-			</a>
+			</Link>
 		);
 	}
 	return (

From 488366240ee88bfed284873c9305d50de2cb0b76 Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 13:53:18 -0800
Subject: [PATCH 12/16] fix: remove redirect caching

---
 apps/site/next.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/site/next.config.js b/apps/site/next.config.js
index 2baeacd0..ee9aac5e 100644
--- a/apps/site/next.config.js
+++ b/apps/site/next.config.js
@@ -35,7 +35,7 @@ const nextConfig = {
 			{
 				source: "/logout",
 				destination: "/api/user/logout",
-				permanent: true,
+				permanent: false,
 			},
 		];
 	},

From b5c360a7792d1ba4a70a1ab0a64041a588b90708 Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 14:38:55 -0800
Subject: [PATCH 13/16] fix: replace next/link with

---
 .../src/app/(home)/sections/MentorVolunteer/Stand.tsx    | 3 +--
 apps/site/src/lib/components/Button/Button.tsx           | 9 +++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/apps/site/src/app/(home)/sections/MentorVolunteer/Stand.tsx b/apps/site/src/app/(home)/sections/MentorVolunteer/Stand.tsx
index aaa9b68c..5f11cf10 100644
--- a/apps/site/src/app/(home)/sections/MentorVolunteer/Stand.tsx
+++ b/apps/site/src/app/(home)/sections/MentorVolunteer/Stand.tsx
@@ -1,6 +1,5 @@
 import type { ComponentProps } from "react";
 import Image from "next/image";
-import Link from "next/link";
 import Button from "@/lib/components/Button/Button";
 import standBottom from "./stand-bottom.png";
 
@@ -9,7 +8,7 @@ interface StandProps {
 	header: string;
 	description: string;
 	buttonText: string;
-	buttonHref: ComponentProps<typeof Link>["href"];
+	buttonHref: string;
 }
 
 const Stand: React.FC<StandProps> = ({
diff --git a/apps/site/src/lib/components/Button/Button.tsx b/apps/site/src/lib/components/Button/Button.tsx
index e96b4ab7..3c255c5b 100644
--- a/apps/site/src/lib/components/Button/Button.tsx
+++ b/apps/site/src/lib/components/Button/Button.tsx
@@ -1,12 +1,11 @@
 import type { ComponentProps } from "react";
-import Link from "next/link";
 import styles from "./Button.module.css";
 import clsx from "clsx";
 
 interface ButtonProps {
 	text: string;
 	className?: string;
-	href?: ComponentProps<typeof Link>["href"];
+	href?: string;
 	isLightVersion?: boolean;
 	usePrefetch?: boolean;
 }
@@ -16,15 +15,13 @@ const Button: React.FC<ButtonProps> = ({
 	href,
 	className,
 	isLightVersion,
-	usePrefetch,
 }) => {
 	if (href) {
 		return (
-			<Link
+			<a
 				href={href}
 				target={isLightVersion ? "" : "_blank"}
 				rel="noopener noreferrer"
-				prefetch={usePrefetch}
 				className={clsx(
 					styles.button,
 					isLightVersion && styles.lightButton,
@@ -33,7 +30,7 @@ const Button: React.FC<ButtonProps> = ({
 				)}
 			>
 				{text}
-			</Link>
+			</a>
 		);
 	}
 	return (

From e72bb25eff492870753d63b3e02115345ca724e9 Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 14:45:37 -0800
Subject: [PATCH 14/16] fix: error handling for identity fetch

---
 apps/site/src/lib/utils/getUserIdentity.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/site/src/lib/utils/getUserIdentity.ts b/apps/site/src/lib/utils/getUserIdentity.ts
index 7a1ccc7e..e2ad30de 100644
--- a/apps/site/src/lib/utils/getUserIdentity.ts
+++ b/apps/site/src/lib/utils/getUserIdentity.ts
@@ -7,6 +7,9 @@ export interface Identity {
 }
 
 export default async function getUserIdentity() {
-	const identity = await api.get<Identity>("/user/me");
+	const identity = await api.get<Identity>("/user/me").catch((err) => {
+		console.log(err);
+		return { data: { uid: null, role: null, status: null } };
+	});
 	return identity.data;
 }

From c99d34e39e6d1e15f82d2b2fd197b7927644b50e Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 15:28:34 -0800
Subject: [PATCH 15/16] fix: logout page with redirect

---
 apps/site/next.config.js          | 5 -----
 apps/site/src/app/logout/page.tsx | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 apps/site/src/app/logout/page.tsx

diff --git a/apps/site/next.config.js b/apps/site/next.config.js
index ee9aac5e..11dafae3 100644
--- a/apps/site/next.config.js
+++ b/apps/site/next.config.js
@@ -32,11 +32,6 @@ const nextConfig = {
 				destination: "https://forms.gle/erpJjErKLJkEZMw48",
 				permanent: true,
 			},
-			{
-				source: "/logout",
-				destination: "/api/user/logout",
-				permanent: false,
-			},
 		];
 	},
 };
diff --git a/apps/site/src/app/logout/page.tsx b/apps/site/src/app/logout/page.tsx
new file mode 100644
index 00000000..fd080690
--- /dev/null
+++ b/apps/site/src/app/logout/page.tsx
@@ -0,0 +1,5 @@
+import Router from "next/router";
+
+export default function Logout() {
+	Router.push("/api/user/logout");
+}

From df07b750e180c85a1600106c3709f9173b682972 Mon Sep 17 00:00:00 2001
From: Sam Der <sder@uci.edu>
Date: Sat, 16 Dec 2023 15:31:28 -0800
Subject: [PATCH 16/16] fix: use redirect next/navigation

---
 apps/site/src/app/logout/page.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/site/src/app/logout/page.tsx b/apps/site/src/app/logout/page.tsx
index fd080690..0b76b9eb 100644
--- a/apps/site/src/app/logout/page.tsx
+++ b/apps/site/src/app/logout/page.tsx
@@ -1,5 +1,5 @@
-import Router from "next/router";
+import { redirect } from "next/navigation";
 
 export default function Logout() {
-	Router.push("/api/user/logout");
+	redirect("/api/user/logout");
 }