From ddae9bd1b5a725c9e0cae417e077bc19533cc6e7 Mon Sep 17 00:00:00 2001
From: joshuasilva414 <joshuasilva414@gmail.com>
Date: Sun, 27 Jul 2025 16:01:03 -0500
Subject: [PATCH 1/3] correct suspense check

---
 apps/web/src/app/dash/schedule/page.tsx               | 8 +-------
 apps/web/src/app/dash/schedule/schedule-timeline.tsx  | 2 +-
 apps/web/src/app/schedule/page.tsx                    | 8 +-------
 apps/web/src/components/events/admin/EventDetails.tsx | 3 +--
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/apps/web/src/app/dash/schedule/page.tsx b/apps/web/src/app/dash/schedule/page.tsx
index 972a8ec3..1185bf63 100644
--- a/apps/web/src/app/dash/schedule/page.tsx
+++ b/apps/web/src/app/dash/schedule/page.tsx
@@ -1,7 +1,4 @@
-import { Suspense } from "react";
-import UserScheduleView from "@/components/schedule/UserScheduleView";
 import ScheduleTimeline from "./schedule-timeline";
-import Loading from "@/components/shared/Loading";
 import { getAllEvents } from "db/functions";
 import { getClientTimeZone } from "@/lib/utils/client/shared";
 import { getRequestContext } from "@cloudflare/next-on-pages";
@@ -13,10 +10,7 @@ export default async function Page() {
 	return (
 		<>
 			<h1 className="mx-auto my-8 w-3/4 text-8xl font-black">Schedule</h1>
-			<Suspense fallback={<Loading />}>
-				{/* <UserScheduleView /> */}
-				<ScheduleTimeline schedule={sched} timezone={userTimeZone} />
-			</Suspense>
+			<ScheduleTimeline schedule={sched} timezone={userTimeZone} />
 		</>
 	);
 }
diff --git a/apps/web/src/app/dash/schedule/schedule-timeline.tsx b/apps/web/src/app/dash/schedule/schedule-timeline.tsx
index 6737ad25..c356b76a 100644
--- a/apps/web/src/app/dash/schedule/schedule-timeline.tsx
+++ b/apps/web/src/app/dash/schedule/schedule-timeline.tsx
@@ -1,4 +1,3 @@
-"use client";
 import { Badge } from "@/components/shadcn/ui/badge";
 import { type EventType as Event } from "@/lib/types/events";
 import { cn } from "@/lib/utils/client/cn";
@@ -34,6 +33,7 @@ type ScheduleTimelineProps = {
 	schedule: Event[];
 	timezone: string;
 };
+
 export default function ScheduleTimeline({
 	schedule,
 	timezone,
diff --git a/apps/web/src/app/schedule/page.tsx b/apps/web/src/app/schedule/page.tsx
index be54015e..380b51c3 100644
--- a/apps/web/src/app/schedule/page.tsx
+++ b/apps/web/src/app/schedule/page.tsx
@@ -1,7 +1,4 @@
-import { Suspense } from "react";
-import UserScheduleView from "@/components/schedule/UserScheduleView";
 import ScheduleTimeline from "../dash/schedule/schedule-timeline";
-import Loading from "@/components/shared/Loading";
 import { getAllEvents } from "db/functions";
 import { getClientTimeZone } from "@/lib/utils/client/shared";
 import { getRequestContext } from "@cloudflare/next-on-pages";
@@ -13,10 +10,7 @@ export default async function Page() {
 	return (
 		<>
 			<h1 className="mx-auto my-8 w-3/4 text-8xl font-black">Schedule</h1>
-			<Suspense fallback={<Loading />}>
-				{/* <UserScheduleView /> */}
-				<ScheduleTimeline schedule={sched} timezone={userTimeZone} />
-			</Suspense>
+			<ScheduleTimeline schedule={sched} timezone={userTimeZone} />
 		</>
 	);
 }
diff --git a/apps/web/src/components/events/admin/EventDetails.tsx b/apps/web/src/components/events/admin/EventDetails.tsx
index 76c2c5d3..1868da3a 100644
--- a/apps/web/src/components/events/admin/EventDetails.tsx
+++ b/apps/web/src/components/events/admin/EventDetails.tsx
@@ -3,7 +3,6 @@ import { Badge } from "@/components/shadcn/ui/badge";
 import Balancer from "react-wrap-balancer";
 import { formatInTimeZone } from "date-fns-tz";
 import { Event } from "db/types";
-import { headers } from "next/headers";
 import { getClientTimeZone } from "@/lib/utils/client/shared";
 import { getRequestContext } from "@cloudflare/next-on-pages";
 export default function EventFull({ event }: { event: Event }) {
@@ -21,7 +20,7 @@ export default function EventFull({ event }: { event: Event }) {
 						c.eventTypes.Other
 					}, transparent)`,
 				}}
-			/>
+			/>x
 			<div className="relative z-10 mx-auto min-h-[calc(100vh-7rem)] w-full max-w-3xl p-2 pt-[15vh]">
 				<div className="mb-2 flex items-center gap-x-2">
 					<Badge

From 35e762512267f4443e9f51467018ae7065072ceb Mon Sep 17 00:00:00 2001
From: joshuasilva414 <joshuasilva414@gmail.com>
Date: Sun, 27 Jul 2025 17:16:01 -0500
Subject: [PATCH 2/3] Replace admin loading fallback

---
 apps/web/src/app/admin/loading.tsx | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 apps/web/src/app/admin/loading.tsx

diff --git a/apps/web/src/app/admin/loading.tsx b/apps/web/src/app/admin/loading.tsx
new file mode 100644
index 00000000..13d21fd5
--- /dev/null
+++ b/apps/web/src/app/admin/loading.tsx
@@ -0,0 +1,9 @@
+import Loading from "@/components/shared/Loading";
+
+export default function AdminLoading() {
+	return (
+		<div className="flex h-screen w-screen items-center justify-center">
+			<Loading />
+		</div>
+	);
+}

From 5a508a21efc0f7b0a64a8ad6892359b1586d4722 Mon Sep 17 00:00:00 2001
From: joshuasilva414 <joshuasilva414@gmail.com>
Date: Thu, 14 Aug 2025 12:56:33 -0500
Subject: [PATCH 3/3] fix typo

---
 apps/web/src/components/events/admin/EventDetails.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/components/events/admin/EventDetails.tsx b/apps/web/src/components/events/admin/EventDetails.tsx
index 1868da3a..df0e4599 100644
--- a/apps/web/src/components/events/admin/EventDetails.tsx
+++ b/apps/web/src/components/events/admin/EventDetails.tsx
@@ -20,7 +20,7 @@ export default function EventFull({ event }: { event: Event }) {
 						c.eventTypes.Other
 					}, transparent)`,
 				}}
-			/>x
+			/>
 			<div className="relative z-10 mx-auto min-h-[calc(100vh-7rem)] w-full max-w-3xl p-2 pt-[15vh]">
 				<div className="mb-2 flex items-center gap-x-2">
 					<Badge