diff --git a/apps/web/src/app/admin/events/new/page.tsx b/apps/web/src/app/admin/events/new/page.tsx index 6a11aa99..0050480d 100644 --- a/apps/web/src/app/admin/events/new/page.tsx +++ b/apps/web/src/app/admin/events/new/page.tsx @@ -1,4 +1,4 @@ -import NewEventForm from "@/components/admin/events/NewEventForm"; +import NewEventForm from "@/components/events/admin/NewEventForm"; export default function Page() { const defaultDate = new Date(); diff --git a/apps/web/src/app/admin/events/page.tsx b/apps/web/src/app/admin/events/page.tsx index 2a9d0ae1..980d2fcf 100644 --- a/apps/web/src/app/admin/events/page.tsx +++ b/apps/web/src/app/admin/events/page.tsx @@ -1,12 +1,11 @@ -import { db } from "db"; -import { DataTable } from "@/components/admin/events/EventDataTable"; -import { columns } from "@/components/admin/events/EventColumns"; +import { EventDataTable } from "@/components/events/shared/EventDataTable"; +import { columns } from "@/components/events/shared/EventColumns"; import { Button } from "@/components/shadcn/ui/button"; import { PlusCircle } from "lucide-react"; import Link from "next/link"; - +import { getAllEvents } from "db/functions"; export default async function Page() { - const events = await db.query.events.findMany(); + const events = await getAllEvents(); return (
- {events.length} Event{events.length != 1 ? "s" : ""} + {events.length} Event{events.length != 1 && "s"}
{`${formatInTimeZone( event.startTime, - c.hackathonTimezone, + userTimeZone, "EEEE MMMM do", )}, ${formatInTimeZone( event.startTime, - c.hackathonTimezone, + userTimeZone, "h:mm a", - )} - ${formatInTimeZone(event.endTime, c.hackathonTimezone, "h:mm a")}`}
+ )} - ${formatInTimeZone(event.endTime, userTimeZone, "h:mm a")}`}
- Creating Event
{`${formatInTimeZone( - event.startTime, - c.hackathonTimezone, - "h:mm a", - )} - ${formatInTimeZone(event.endTime, c.hackathonTimezone, "h:mm a")}`}
-{event.type}
+{`${startTimeFormatted} - ${endTimeFormatted}`}
+