diff --git a/apps/web/src/app/admin/events/[id]/checkins/page.tsx b/apps/web/src/app/admin/events/[id]/checkins/page.tsx index b219426f..89c11998 100644 --- a/apps/web/src/app/admin/events/[id]/checkins/page.tsx +++ b/apps/web/src/app/admin/events/[id]/checkins/page.tsx @@ -1,6 +1,5 @@ import type { IDParamProp } from "@/lib/types/shared"; import { getCheckinLog } from "@/lib/queries/checkins"; -import { getEventList } from "@/lib/queries/events"; import { Suspense } from "react"; import { UserRoundPlus } from "lucide-react"; import AddCheckinDialogue from "@/components/dash/shared/AddCheckinDialogue"; @@ -22,6 +21,7 @@ export default async function EventCheckinsPage({ { id: event.id, name: event.name, + start: event.start, }, ]; diff --git a/apps/web/src/app/admin/events/columns.tsx b/apps/web/src/app/admin/events/columns.tsx index fd21d6d4..ea8f06af 100644 --- a/apps/web/src/app/admin/events/columns.tsx +++ b/apps/web/src/app/admin/events/columns.tsx @@ -240,6 +240,7 @@ export const columns: ColumnDef[] = [ showDelete={showDelete} id={row.original.id!} name={row.original.name!} + start={row.original.start!} /> ); @@ -252,11 +253,13 @@ function EventColumnActions({ showDelete, id, name, + start, }: { setOpen: React.Dispatch>; showDelete: boolean; id: string; name: string; + start: Date; }) { if (showDelete) { return ; @@ -267,6 +270,7 @@ function EventColumnActions({ { id, name, + start, }, ]} setOpen={setOpen} diff --git a/apps/web/src/components/dash/shared/AddCheckinDialogue.tsx b/apps/web/src/components/dash/shared/AddCheckinDialogue.tsx index 0e90d5c7..623a2b1e 100644 --- a/apps/web/src/components/dash/shared/AddCheckinDialogue.tsx +++ b/apps/web/src/components/dash/shared/AddCheckinDialogue.tsx @@ -37,7 +37,7 @@ import z from "zod"; import { useRouter } from "next/navigation"; type Props = { - eventList: { id: string; name: string }[]; + eventList: { id: string; name: string; start: Date }[]; setOpen?: React.Dispatch>; default?: { eventID?: string; @@ -146,8 +146,14 @@ function AddCheckinDialogue({ eventList, ...props }: Props) { - {event.name} +
+

{event.name}

+

+ {event.start.toLocaleDateString()} +

+
))} diff --git a/apps/web/src/lib/queries/events.ts b/apps/web/src/lib/queries/events.ts index 29486986..433bf4a3 100644 --- a/apps/web/src/lib/queries/events.ts +++ b/apps/web/src/lib/queries/events.ts @@ -121,7 +121,7 @@ export const getEventDetails = async (id: string) => { export const getEventList = async () => { return await db.query.events.findMany({ - columns: { id: true, name: true }, + columns: { id: true, name: true, start: true }, orderBy: desc(events.start), }); };