Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions apps/web/src/app/admin/loading.tsx
Original file line number Diff line number Diff line change
@@ -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>
);
}
8 changes: 1 addition & 7 deletions apps/web/src/app/dash/schedule/page.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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} />
</>
);
}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/app/dash/schedule/schedule-timeline.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -34,6 +33,7 @@ type ScheduleTimelineProps = {
schedule: Event[];
timezone: string;
};

export default function ScheduleTimeline({
schedule,
timezone,
Expand Down
8 changes: 1 addition & 7 deletions apps/web/src/app/schedule/page.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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} />
</>
);
}
Expand Down
1 change: 0 additions & 1 deletion apps/web/src/components/events/admin/EventDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) {
Expand Down