replace "First name" and "Surname" input fields with a single "Full N…

…ame" field (#1084) * replace "First name" and "Surname" input fields with a single "Fullname" field * replace surname and firstname with name * name contains at least two characters
codu-code · Oct 9, 2024 · 751a74a · 751a74a
1 parent f45f7b4
commit 751a74a
Show file tree

Hide file tree

Showing 8 changed files with 1,257 additions and 47 deletions.
diff --git a/app/(app)/alpha/additional-details/_actions.ts b/app/(app)/alpha/additional-details/_actions.ts
@@ -23,14 +23,12 @@ export async function slideOneSubmitAction(dataInput: TypeSlideOneSchema) {
   }
 
   try {
-    const { firstName, surname, username, location } =
-      slideOneSchema.parse(dataInput);
+    const { name, username, location } = slideOneSchema.parse(dataInput);
 
     await db
       .update(user)
       .set({
-        firstName,
-        surname,
+        name,
         username,
         location,
       })

diff --git a/app/(app)/alpha/additional-details/_client.tsx b/app/(app)/alpha/additional-details/_client.tsx
@@ -42,8 +42,7 @@ import { Divider } from "@/components/ui-components/divider";
 
 type UserDetails = {
   username: string;
-  firstName: string;
-  surname: string;
+  name: string;
   gender: string;
   dateOfBirth: string;
   location: string;
@@ -63,8 +62,7 @@ export default function AdditionalSignUpDetails({
   const searchParams = useSearchParams();
 
   const {
-    surname,
-    firstName,
+    name,
     username,
     location,
     dateOfBirth,
@@ -75,7 +73,7 @@ export default function AdditionalSignUpDetails({
   let slide: number;
   if (searchParams.get("slide")) {
     slide = Number(searchParams.get("slide"));
-  } else if (!surname || !firstName || !username || !location) {
+  } else if (!name || !username || !location) {
     slide = 1;
   } else if (!dateOfBirth || !gender) {
     slide = 2;
@@ -102,15 +100,15 @@ export default function AdditionalSignUpDetails({
 function SlideOne({ details }: { details: UserDetails }) {
   const router = useRouter();
 
-  const { username, firstName, surname, location } = details;
+  const { username, name, location } = details;
 
   const {
     register,
     handleSubmit,
     formState: { errors, isSubmitting },
   } = useForm<TypeSlideOneSchema>({
     resolver: zodResolver(slideOneSchema),
-    defaultValues: { username, firstName, surname, location },
+    defaultValues: { username, name, location },
   });
 
   const onFormSubmit = async (data: TypeSlideOneSchema) => {
@@ -139,33 +137,16 @@ function SlideOne({ details }: { details: UserDetails }) {
         <Divider className="my-4 mt-4" />
         <div className="mx-4">
           <Field>
-            <Label>First Name</Label>
+            <Label>Full Name</Label>
             <Input
-              id="first-name"
-              placeholder="Enter first name"
-              invalid={!!errors?.firstName}
-              {...register("firstName")}
+              id="full-name"
+              placeholder="Enter full name"
+              invalid={!!errors?.name}
+              {...register("name")}
             />
-            {errors?.firstName && (
+            {errors?.name && (
               <ErrorMessage className="text-red-500">
-                {errors.firstName.message}
-              </ErrorMessage>
-            )}
-          </Field>
-        </div>
-
-        <div className="mx-4 mt-4">
-          <Field>
-            <Label>Surname</Label>
-            <Input
-              id="surname"
-              placeholder="Enter surname"
-              invalid={!!errors?.surname}
-              {...register("surname")}
-            />
-            {errors?.surname && (
-              <ErrorMessage className="text-red-500">
-                {errors.surname.message}
+                {errors.name.message}
               </ErrorMessage>
             )}
           </Field>

diff --git a/app/(app)/alpha/additional-details/page.tsx b/app/(app)/alpha/additional-details/page.tsx
@@ -13,8 +13,7 @@ export default async function Page() {
   const details = await db.query.user.findFirst({
     columns: {
       username: true,
-      firstName: true,
-      surname: true,
+      name: true,
       gender: true,
       dateOfBirth: true,
       location: true,
@@ -29,8 +28,7 @@ export default async function Page() {
 
   const detailsWithNullsRemoved = {
     username: details?.username || "",
-    firstName: details?.firstName || "",
-    surname: details?.surname || "",
+    name: details?.name || "",
     gender: details?.gender || "",
     dateOfBirth: details?.dateOfBirth || "",
     location: details?.location || "",

diff --git a/drizzle/0008_remove_firstName_and_surname.sql b/drizzle/0008_remove_firstName_and_surname.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "user" DROP COLUMN IF EXISTS "firstName";--> statement-breakpoint
+ALTER TABLE "user" DROP COLUMN IF EXISTS "surname";