From 415a862aa68bb966bb4ed1cc0e66894cec146184 Mon Sep 17 00:00:00 2001
From: Krish120003 <krish120003@gmail.com>
Date: Sat, 19 Oct 2024 15:23:12 -0400
Subject: [PATCH 1/4] feat: update form persist id

---
 src/pages/apply.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/apply.tsx b/src/pages/apply.tsx
index a3d5089e..dff13426 100644
--- a/src/pages/apply.tsx
+++ b/src/pages/apply.tsx
@@ -186,7 +186,7 @@ const ApplyForm = ({
     },
   });
 
-  useFormPersist(`applyForm:${persistId}`, {
+  useFormPersist(`dh11-applyForm:${persistId}`, {
     watch,
     setValue,
     storage: localStorage,

From 364c7b6995b185fbb15743504a23f9a57eb772b0 Mon Sep 17 00:00:00 2001
From: Krish120003 <krish120003@gmail.com>
Date: Sat, 19 Oct 2024 15:57:40 -0400
Subject: [PATCH 2/4] fix: optional fields, separate out MLH survey

---
 src/components/FormDivider.tsx |   2 +-
 src/pages/apply.tsx            | 100 ++++++++++++++++++---------------
 src/schemas/application.ts     |  12 ++--
 3 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/src/components/FormDivider.tsx b/src/components/FormDivider.tsx
index 0a458bc1..dec6354e 100644
--- a/src/components/FormDivider.tsx
+++ b/src/components/FormDivider.tsx
@@ -4,7 +4,7 @@ interface FormDividerProps {
 
 const FormDivider: React.FC<FormDividerProps> = ({ label }) => {
   return (
-    <span className="my-4 border-b-2 border-neutral-700  pb-2 text-xl font-semibold text-neutral-900 dark:text-neutral-400">
+    <span className="my-4 border-b-2 border-neutral-700 dark:border-neutral-300  pb-2 text-xl font-semibold text-neutral-900 dark:text-neutral-100">
       {label}
     </span>
   );
diff --git a/src/pages/apply.tsx b/src/pages/apply.tsx
index dff13426..ff19b4fc 100644
--- a/src/pages/apply.tsx
+++ b/src/pages/apply.tsx
@@ -196,7 +196,6 @@ const ApplyForm = ({
     console.log(data);
     console.log("validating");
     const processed = applicationSchema.parse(data);
-
     console.log("validated");
 
     await submitAppAsync(processed);
@@ -569,13 +568,54 @@ const ApplyForm = ({
           <span className="text-error">{errors.discoverdFrom.message}</span>
         )}
       </div>
+
+      <FormCheckbox
+        label="Do you already have a team?"
+        id="alreadyHaveTeam"
+        errors={errors.alreadyHaveTeam}
+        register={register}
+      />
+      <FormCheckbox
+        label="Would you like to be considered for a coffee chat with a sponsor?"
+        id="considerCoffee"
+        errors={errors.considerCoffee}
+        register={register}
+      />
+      <FormDivider label="Emergency Contact" />
+      <div className="flex flex-col md:flex-row md:items-end md:gap-4">
+        <FormInput
+          label="Name of Emergency Contact"
+          id="emergencyContactName"
+          errors={errors.emergencyContactName}
+          placeholder="James Doe"
+          register={register}
+        />
+        <FormInput
+          label="Relation to Emergency Contact"
+          id="emergencyContactRelation"
+          errors={errors.emergencyContactName}
+          placeholder="Parent / Guardian / Friend / Spouse"
+          register={register}
+        />
+      </div>
+      <FormInput
+        id="emergencyContactPhone"
+        label="Emergency Contact Phone Number"
+        errors={errors.emergencyContactPhone}
+        placeholder="000-000-0000"
+        register={register}
+      />
+      <FormDivider label="MLH Survey and Consent" />
       <div className="flex flex-col gap-2 pb-4">
         <label
           className="text-black dark:text-white"
           htmlFor="underrepresentedInput"
         >
           Do you identify as part of an underrepresented group in the technology
-          industry?
+          industry?{" "}
+          <span className="text-neutral-500 dark:text-neutral-400">
+            (Optional)
+          </span>
         </label>
 
         <Controller
@@ -591,13 +631,16 @@ const ApplyForm = ({
           )}
         />
 
-        {errors.gender && (
-          <span className="text-error">{errors.gender.message}</span>
+        {errors.underrepresented && (
+          <span className="text-error">{errors.underrepresented.message}</span>
         )}
       </div>
       <div className="flex flex-col gap-2 pb-4">
         <label className="text-black dark:text-white" htmlFor="genderInput">
-          Gender
+          What's your gender?{" "}
+          <span className="text-neutral-500 dark:text-neutral-400">
+            (Optional)
+          </span>
         </label>
 
         <Controller
@@ -622,7 +665,10 @@ const ApplyForm = ({
           className="text-black dark:text-white"
           htmlFor="orientationInput"
         >
-          Orientation
+          Do you consider yourself to be any of the following?{" "}
+          <span className="text-neutral-500 dark:text-neutral-400">
+            (Optional)
+          </span>
         </label>
 
         <Controller
@@ -644,7 +690,10 @@ const ApplyForm = ({
       </div>
       <div className="flex flex-col gap-2 pb-4">
         <label className="text-black dark:text-white" htmlFor="raceInput">
-          Race
+          Which ethnic background do you identify with?{" "}
+          <span className="text-neutral-500 dark:text-neutral-400">
+            (Optional)
+          </span>
         </label>
 
         <Controller
@@ -663,43 +712,6 @@ const ApplyForm = ({
           <span className="text-error">{errors.race.message}</span>
         )}
       </div>
-      <FormCheckbox
-        label="Do you already have a team?"
-        id="alreadyHaveTeam"
-        errors={errors.alreadyHaveTeam}
-        register={register}
-      />
-      <FormCheckbox
-        label="Would you like to be considered for a coffee chat with a sponsor?"
-        id="considerCoffee"
-        errors={errors.considerCoffee}
-        register={register}
-      />
-      <FormDivider label="Emergency Contact" />
-      <div className="flex flex-col md:flex-row md:items-end md:gap-4">
-        <FormInput
-          label="Name of Emergency Contact"
-          id="emergencyContactName"
-          errors={errors.emergencyContactName}
-          placeholder="James Doe"
-          register={register}
-        />
-        <FormInput
-          label="Relation to Emergency Contact"
-          id="emergencyContactRelation"
-          errors={errors.emergencyContactName}
-          placeholder="Parent / Guardian / Friend / Spouse"
-          register={register}
-        />
-      </div>
-      <FormInput
-        id="emergencyContactPhone"
-        label="Emergency Contact Phone Number"
-        errors={errors.emergencyContactPhone}
-        placeholder="000-000-0000"
-        register={register}
-      />
-      <FormDivider label="MLH Consent" />
       <FormCheckbox
         label="Agree to MLH Code of Conduct"
         id="agreeToMLHCodeOfConduct"
diff --git a/src/schemas/application.ts b/src/schemas/application.ts
index e0034539..aaef7273 100644
--- a/src/schemas/application.ts
+++ b/src/schemas/application.ts
@@ -103,7 +103,7 @@ const dh10schema = z.object({
     "Transgender",
     "Prefer not to say",
   ]),
-  race: z.string().min(1).max(255),
+  race: z.string().min(1).max(255).default("Prefer not to say"),
   emergencyContactName: z.string().min(1),
   emergencyContactPhone: z
     .string()
@@ -180,7 +180,7 @@ const dh11schema = z.object({
     })
     .transform((string) => (!!string ? string : null))
     .nullish(),
-  linkToResume: z.string().url().nullable(),
+  linkToResume: z.string().nullish(),
   tshirtSize: z.enum(["XS", "S", "M", "L", "XL"]),
   hackerKind: z.array(z.string()).min(1, "At least one selection is required"),
   alreadyHaveTeam: z.boolean(),
@@ -190,10 +190,10 @@ const dh11schema = z.object({
     .min(1, "At least one selection is required"),
   considerCoffee: z.boolean(),
   dietaryRestrictions: z.string().nullish(),
-  underrepresented: YesNoUnsure,
-  gender: z.string(),
-  race: z.string(),
-  orientation: z.string(),
+  underrepresented: YesNoUnsure.nullish().default("UNSURE"),
+  gender: z.string().nullish().default("Prefer not to say"),
+  race: z.string().nullish().default("Prefer not to say"),
+  orientation: z.string().nullish().default("Prefer not to say"),
   emergencyContactName: z.string().min(1, "This field is required"),
   emergencyContactPhone: z
     .string()

From 64039cb174e2f5c146bdcb6764054f11882ace98 Mon Sep 17 00:00:00 2001
From: Krish120003 <krish120003@gmail.com>
Date: Sat, 19 Oct 2024 16:16:50 -0400
Subject: [PATCH 3/4] fix: TS errors

---
 src/pages/apply.tsx        | 2 +-
 src/schemas/application.ts | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/apply.tsx b/src/pages/apply.tsx
index ff19b4fc..5e1c5462 100644
--- a/src/pages/apply.tsx
+++ b/src/pages/apply.tsx
@@ -637,7 +637,7 @@ const ApplyForm = ({
       </div>
       <div className="flex flex-col gap-2 pb-4">
         <label className="text-black dark:text-white" htmlFor="genderInput">
-          What's your gender?{" "}
+          What&apos;s your gender?{" "}
           <span className="text-neutral-500 dark:text-neutral-400">
             (Optional)
           </span>
diff --git a/src/schemas/application.ts b/src/schemas/application.ts
index aaef7273..a5982cac 100644
--- a/src/schemas/application.ts
+++ b/src/schemas/application.ts
@@ -190,10 +190,10 @@ const dh11schema = z.object({
     .min(1, "At least one selection is required"),
   considerCoffee: z.boolean(),
   dietaryRestrictions: z.string().nullish(),
-  underrepresented: YesNoUnsure.nullish().default("UNSURE"),
-  gender: z.string().nullish().default("Prefer not to say"),
-  race: z.string().nullish().default("Prefer not to say"),
-  orientation: z.string().nullish().default("Prefer not to say"),
+  underrepresented: YesNoUnsure.default("UNSURE"),
+  gender: z.string().default("Prefer not to say"),
+  race: z.string().default("Prefer not to say"),
+  orientation: z.string().default("Prefer not to say"),
   emergencyContactName: z.string().min(1, "This field is required"),
   emergencyContactPhone: z
     .string()

From 7f357b39a228326aa488d120c9dc88b134aeafea Mon Sep 17 00:00:00 2001
From: Krish120003 <krish120003@gmail.com>
Date: Sat, 19 Oct 2024 16:23:38 -0400
Subject: [PATCH 4/4] fix: correct error field

---
 src/pages/apply.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/apply.tsx b/src/pages/apply.tsx
index 5e1c5462..76fb367d 100644
--- a/src/pages/apply.tsx
+++ b/src/pages/apply.tsx
@@ -593,7 +593,7 @@ const ApplyForm = ({
         <FormInput
           label="Relation to Emergency Contact"
           id="emergencyContactRelation"
-          errors={errors.emergencyContactName}
+          errors={errors.emergencyContactRelation}
           placeholder="Parent / Guardian / Friend / Spouse"
           register={register}
         />