From 16c9123afd3f735003306517c6f1790ce0625b5e Mon Sep 17 00:00:00 2001 From: Carter LaVigne Date: Tue, 15 Apr 2025 14:43:52 -0500 Subject: [PATCH 1/5] add dates to checkins --- .../src/components/dash/shared/AddCheckinDialogue.tsx | 11 ++++++++--- apps/web/src/lib/queries/events.ts | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/web/src/components/dash/shared/AddCheckinDialogue.tsx b/apps/web/src/components/dash/shared/AddCheckinDialogue.tsx index 0e90d5c7..4ac6ed8f 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,13 @@ function AddCheckinDialogue({ eventList, ...props }: Props) { - {event.name} + className="w-full justify-between" + > +
+

{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..54f00723 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), }); }; From 867b802b20130df00250655780fa0c4b476bb4bf Mon Sep 17 00:00:00 2001 From: Carter LaVigne Date: Tue, 15 Apr 2025 14:48:17 -0500 Subject: [PATCH 2/5] prittier check --- .../components/dash/shared/AddCheckinDialogue.tsx | 15 ++++++++------- apps/web/src/lib/queries/events.ts | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/web/src/components/dash/shared/AddCheckinDialogue.tsx b/apps/web/src/components/dash/shared/AddCheckinDialogue.tsx index 4ac6ed8f..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; start: Date}[]; + eventList: { id: string; name: string; start: Date }[]; setOpen?: React.Dispatch>; default?: { eventID?: string; @@ -147,12 +147,13 @@ function AddCheckinDialogue({ eventList, ...props }: Props) { value={event.id} key={event.id} className="w-full justify-between" - > -
-

{event.name}

-

{event.start.toLocaleDateString()}

-
- + > +
+

{event.name}

+

+ {event.start.toLocaleDateString()} +

+
))} diff --git a/apps/web/src/lib/queries/events.ts b/apps/web/src/lib/queries/events.ts index 54f00723..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, start: true}, + columns: { id: true, name: true, start: true }, orderBy: desc(events.start), }); }; From c5b5665e5efc9c2605792b95f64abacaeb62b1b2 Mon Sep 17 00:00:00 2001 From: Carter LaVigne Date: Tue, 15 Apr 2025 15:19:04 -0500 Subject: [PATCH 3/5] added start to other pages utilizing addCheckin --- apps/web/src/app/admin/events/[id]/checkins/page.tsx | 2 +- apps/web/src/app/admin/events/columns.tsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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..8a84e057 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..ec253b46 100644 --- a/apps/web/src/app/admin/events/columns.tsx +++ b/apps/web/src/app/admin/events/columns.tsx @@ -267,6 +267,7 @@ function EventColumnActions({ { id, name, + start, }, ]} setOpen={setOpen} From 31242bea410a7fc1befc52a69a4133b0a43fce9f Mon Sep 17 00:00:00 2001 From: Carter LaVigne Date: Tue, 15 Apr 2025 15:25:26 -0500 Subject: [PATCH 4/5] fixed more errors --- apps/web/src/app/admin/events/columns.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/web/src/app/admin/events/columns.tsx b/apps/web/src/app/admin/events/columns.tsx index ec253b46..27f3a827 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 ; From 05528b19a8c16b01365cec3709b3a80b5715e006 Mon Sep 17 00:00:00 2001 From: Carter LaVigne Date: Tue, 15 Apr 2025 15:26:26 -0500 Subject: [PATCH 5/5] prittier check --- apps/web/src/app/admin/events/[id]/checkins/page.tsx | 2 +- apps/web/src/app/admin/events/columns.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 8a84e057..89c11998 100644 --- a/apps/web/src/app/admin/events/[id]/checkins/page.tsx +++ b/apps/web/src/app/admin/events/[id]/checkins/page.tsx @@ -21,7 +21,7 @@ export default async function EventCheckinsPage({ { id: event.id, name: event.name, - start: event.start + start: event.start, }, ]; diff --git a/apps/web/src/app/admin/events/columns.tsx b/apps/web/src/app/admin/events/columns.tsx index 27f3a827..ea8f06af 100644 --- a/apps/web/src/app/admin/events/columns.tsx +++ b/apps/web/src/app/admin/events/columns.tsx @@ -253,7 +253,7 @@ function EventColumnActions({ showDelete, id, name, - start + start, }: { setOpen: React.Dispatch>; showDelete: boolean;