From 11cc47f4014f0a16761f8418bfea7b1afa42819f Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Mon, 12 Aug 2024 12:46:12 +0100 Subject: [PATCH 1/3] update drizzle-kit --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 583d0ce9..d3dcfcc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17013,9 +17013,9 @@ } }, "node_modules/drizzle-kit": { - "version": "0.22.4", - "resolved": "https://registry.npmjs.org/drizzle-kit/-/drizzle-kit-0.22.4.tgz", - "integrity": "sha512-jsiYGqHsbsP/GtM26y/bGK7je1ja+1H/RniCt1ovg2E7tMNraw6XdqKcjxHhb8FonCfDDjvwFgouRsZS46vrmA==", + "version": "0.22.8", + "resolved": "https://registry.npmjs.org/drizzle-kit/-/drizzle-kit-0.22.8.tgz", + "integrity": "sha512-VjI4wsJjk3hSqHSa3TwBf+uvH6M6pRHyxyoVbt935GUzP9tUR/BRZ+MhEJNgryqbzN2Za1KP0eJMTgKEPsalYQ==", "dev": true, "dependencies": { "@esbuild-kit/esm-loader": "^2.5.5", From 4fa4321a12298e4bc5cac30d512e062ad18a45be Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:09:48 +0100 Subject: [PATCH 2/3] convert dateOfBirth to iso String --- app/(app)/alpha/additional-details/_actions.ts | 2 +- app/(app)/alpha/additional-details/_client.tsx | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/(app)/alpha/additional-details/_actions.ts b/app/(app)/alpha/additional-details/_actions.ts index cf2a81f5..4cb2b26c 100644 --- a/app/(app)/alpha/additional-details/_actions.ts +++ b/app/(app)/alpha/additional-details/_actions.ts @@ -59,7 +59,7 @@ export async function handleFormSlideTwoSubmit(dataInput: TypeSlideTwoSchema) { await db .update(user) .set({ - dateOfBirth, + dateOfBirth: dateOfBirth.toISOString(), gender, }) .where(eq(user.id, session.user.id)); diff --git a/app/(app)/alpha/additional-details/_client.tsx b/app/(app)/alpha/additional-details/_client.tsx index 260fa92f..a5994bcc 100644 --- a/app/(app)/alpha/additional-details/_client.tsx +++ b/app/(app)/alpha/additional-details/_client.tsx @@ -12,7 +12,7 @@ import { slideThreeSchema, } from "@/schema/additionalUserDetails"; import { zodResolver } from "@hookform/resolvers/zod"; -import { useForm, useFormContext } from "react-hook-form"; +import { useForm } from "react-hook-form"; import { toast } from "sonner"; import { @@ -236,13 +236,16 @@ function SlideTwo({ details }: { details: UserDetails }) { defaultValues: { dateOfBirth, gender }, }); + const parsedDateOfBirth = dateOfBirth ? new Date(dateOfBirth) : null; const [year, setYear] = useState( - dateOfBirth?.getFullYear(), + parsedDateOfBirth?.getFullYear(), ); const [month, setMonth] = useState( - dateOfBirth?.getMonth(), + parsedDateOfBirth?.getMonth(), + ); + const [day, setDay] = useState( + parsedDateOfBirth?.getDate(), ); - const [day, setDay] = useState(dateOfBirth?.getDate()); const [listOfDaysInSelectedMonth, setListOfDaysInSelectedMonth] = useState([ 0, From 316aa254436f1e77deef2549ceb724b2f6162f09 Mon Sep 17 00:00:00 2001 From: John Paul Larkin <107807466+John-Paul-Larkin@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:01:55 +0100 Subject: [PATCH 3/3] update Date object to String --- app/(app)/alpha/additional-details/_actions.ts | 2 +- app/(app)/alpha/additional-details/_client.tsx | 4 ++-- app/(app)/alpha/additional-details/page.tsx | 2 +- schema/additionalUserDetails.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/(app)/alpha/additional-details/_actions.ts b/app/(app)/alpha/additional-details/_actions.ts index 4cb2b26c..cf2a81f5 100644 --- a/app/(app)/alpha/additional-details/_actions.ts +++ b/app/(app)/alpha/additional-details/_actions.ts @@ -59,7 +59,7 @@ export async function handleFormSlideTwoSubmit(dataInput: TypeSlideTwoSchema) { await db .update(user) .set({ - dateOfBirth: dateOfBirth.toISOString(), + dateOfBirth, gender, }) .where(eq(user.id, session.user.id)); diff --git a/app/(app)/alpha/additional-details/_client.tsx b/app/(app)/alpha/additional-details/_client.tsx index a5994bcc..635742f3 100644 --- a/app/(app)/alpha/additional-details/_client.tsx +++ b/app/(app)/alpha/additional-details/_client.tsx @@ -33,7 +33,7 @@ type UserDetails = { firstName: string; surname: string; gender: string; - dateOfBirth: Date | undefined; + dateOfBirth: string; location: string; professionalOrStudent: string; course: string; @@ -274,7 +274,7 @@ function SlideTwo({ details }: { details: UserDetails }) { } else { selectedDate = new Date(year, month, day); } - setValue("dateOfBirth", selectedDate); + setValue("dateOfBirth", selectedDate.toISOString()); } }, [year, month, day]); diff --git a/app/(app)/alpha/additional-details/page.tsx b/app/(app)/alpha/additional-details/page.tsx index 706fb995..a9df96c6 100644 --- a/app/(app)/alpha/additional-details/page.tsx +++ b/app/(app)/alpha/additional-details/page.tsx @@ -32,7 +32,7 @@ export default async function Page() { firstName: details?.firstName || "", surname: details?.surname || "", gender: details?.gender || "", - dateOfBirth: details?.dateOfBirth || undefined, + dateOfBirth: details?.dateOfBirth || "", location: details?.location || "", professionalOrStudent: details?.professionalOrStudent || "", course: details?.course || "", diff --git a/schema/additionalUserDetails.ts b/schema/additionalUserDetails.ts index ef1e2290..a293c8ba 100644 --- a/schema/additionalUserDetails.ts +++ b/schema/additionalUserDetails.ts @@ -25,7 +25,7 @@ export const slideOneSchema = z.object({ export const slideTwoSchema = z.object({ gender: z.string().min(1, "Gender is required"), - dateOfBirth: z.date(), + dateOfBirth: z.string(), }); export const slideThreeSchema = z