From 679adc506a254a8e1f7410525e9562216c889a5a Mon Sep 17 00:00:00 2001 From: Lucie Mermod Date: Thu, 12 Mar 2026 15:49:11 +0100 Subject: [PATCH 1/3] feat: use event location field --- directus-config | 2 +- src/actions/common-client.tsx | 3 +-- src/app/[eventSlug]/page.tsx | 9 +++++---- src/components/forms/BasicForm.tsx | 10 ++-------- src/components/forms/FacultyDinnerForm.tsx | 4 +--- src/components/forms/HelloWorldForm.tsx | 10 ++-------- 6 files changed, 12 insertions(+), 26 deletions(-) diff --git a/directus-config b/directus-config index 793e148..2ba1c26 160000 --- a/directus-config +++ b/directus-config @@ -1 +1 @@ -Subproject commit 793e1488034da14386330b4d82bf4369c6a780e1 +Subproject commit 2ba1c26b12d968bf8e3b7565f25eb9c7ba2a3c05 diff --git a/src/actions/common-client.tsx b/src/actions/common-client.tsx index 791546e..f942754 100644 --- a/src/actions/common-client.tsx +++ b/src/actions/common-client.tsx @@ -193,12 +193,11 @@ export function formatTime(time: string) { export function makeInfoItems( event: Event, - location: string, isDeposit: boolean = false ): [ElementType, ReactNode][] { return [ [CalendarIcon, formatDate(event)], - [MapPinIcon, location], + [MapPinIcon, event.location], [PriceIcon, isDeposit ? formatDeposit(event) : formatPrice(event)], ]; } diff --git a/src/app/[eventSlug]/page.tsx b/src/app/[eventSlug]/page.tsx index 5eae397..dbdbc88 100644 --- a/src/app/[eventSlug]/page.tsx +++ b/src/app/[eventSlug]/page.tsx @@ -31,7 +31,8 @@ export default async function Home({ params }) { 'confirmation_text', 'background_color', 'icbd_event', - //@ts-expect-error + 'location', + //@ts-expect-error { translations: ['*'] }, ], filter: { @@ -54,14 +55,14 @@ export default async function Home({ params }) { return ; case 'faculty_dinner': return ( - + ); case 'hello_world': - return ; + return ; case 'faculty_clothes_sale': return ; default: - return ; + return ; } } diff --git a/src/components/forms/BasicForm.tsx b/src/components/forms/BasicForm.tsx index ec1a8c1..13352fa 100644 --- a/src/components/forms/BasicForm.tsx +++ b/src/components/forms/BasicForm.tsx @@ -51,15 +51,9 @@ async function validateValues(s: State, eventId: number) { return null; } -export default function BasicForm({ - event, - location, -}: { - event: Event; - location: string; -}) { +export default function BasicForm({ event }: { event: Event }) { // Info items - const infoItems: [ElementType, ReactNode][] = makeInfoItems(event, location); + const infoItems: [ElementType, ReactNode][] = makeInfoItems(event); // Define initial state const initialState: State = { diff --git a/src/components/forms/FacultyDinnerForm.tsx b/src/components/forms/FacultyDinnerForm.tsx index 045f866..31a0580 100644 --- a/src/components/forms/FacultyDinnerForm.tsx +++ b/src/components/forms/FacultyDinnerForm.tsx @@ -82,15 +82,13 @@ async function validateValues(s: State, eventId: number, guest: boolean) { export default function FacultyDinnerForm({ event, - location, guest = false, }: { event: Event; - location: string; guest: boolean; }) { // Info items - const infoItems: [ElementType, ReactNode][] = makeInfoItems(event, location); + const infoItems: [ElementType, ReactNode][] = makeInfoItems(event); const meals: Meal[] = event.meals as Meal[]; diff --git a/src/components/forms/HelloWorldForm.tsx b/src/components/forms/HelloWorldForm.tsx index 08a6560..2521ae4 100644 --- a/src/components/forms/HelloWorldForm.tsx +++ b/src/components/forms/HelloWorldForm.tsx @@ -70,15 +70,9 @@ async function validateValues(s: State, eventId: number) { return null; } -export default function HelloWorldForm({ - event, - location, -}: { - event: Event; - location: string; -}) { +export default function HelloWorldForm({ event }: { event: Event }) { // Info items - const infoItems: [ElementType, ReactNode][] = makeInfoItems(event, location); + const infoItems: [ElementType, ReactNode][] = makeInfoItems(event); // Define initial state const initialState: State = { From 63d46d52d565fc4cd7743584c2f0c73a57d59be3 Mon Sep 17 00:00:00 2001 From: Lucie Mermod Date: Fri, 13 Mar 2026 07:18:03 +0100 Subject: [PATCH 2/3] fix: location field in guest forms --- src/app/[eventSlug]/guest/page.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/[eventSlug]/guest/page.tsx b/src/app/[eventSlug]/guest/page.tsx index d1a1976..d7421c4 100644 --- a/src/app/[eventSlug]/guest/page.tsx +++ b/src/app/[eventSlug]/guest/page.tsx @@ -23,6 +23,7 @@ export default async function GuestForm({ params }) { 'meals', 'price', 'opened', + 'location', //@ts-expect-error { translations: ['*'] }, ], @@ -44,7 +45,7 @@ export default async function GuestForm({ params }) { switch (event.type) { case 'faculty_dinner': return ( - + ); default: return notFound(); From 63c8f21f293418c90704722fc6e4a2576d0f6f41 Mon Sep 17 00:00:00 2001 From: Lucie Mermod Date: Fri, 13 Mar 2026 07:20:19 +0100 Subject: [PATCH 3/3] fix: remove extra location args --- src/components/forms/ICBDForm.tsx | 1 - src/components/forms/PullFacForm.tsx | 1 - 2 files changed, 2 deletions(-) diff --git a/src/components/forms/ICBDForm.tsx b/src/components/forms/ICBDForm.tsx index 992c8ef..27b244d 100644 --- a/src/components/forms/ICBDForm.tsx +++ b/src/components/forms/ICBDForm.tsx @@ -110,7 +110,6 @@ export default function ICBDForm({ // Info items const infoItems: [ElementType, ReactNode][] = makeInfoItems( event, - location, true ); diff --git a/src/components/forms/PullFacForm.tsx b/src/components/forms/PullFacForm.tsx index 4247493..ec7281f 100644 --- a/src/components/forms/PullFacForm.tsx +++ b/src/components/forms/PullFacForm.tsx @@ -97,7 +97,6 @@ export default function FacultyClothesForm({ // Skip the date, since this is just an order const infoItems: [ElementType, ReactNode][] = makeInfoItems( event, - location ).slice(1); // Define initial state