Move university dropdown to application form (#70)

* Move university dropdown to application form

and fix "Required" error not showing for file upload

* move san diego universities on top, fix register form width

client/src/app/register/page.module.scss

@@ -9,6 +9,7 @@
 
   .register {
     margin: 0 auto;
+    width: 100%;
     max-width: 646px;
   }
 

client/src/app/register/page.tsx

@@ -6,7 +6,6 @@ import TextField from '@/components/TextField';
 import Dropdown from '@/components/Dropdown';
 import Button from '@/components/Button';
 import Typography from '@/components/Typography';
-import universities from '@/lib/constants/universities';
 import { AuthManager } from '@/lib/managers';
 import type { UserRegistration } from '@/lib/types/apiRequests';
 import type { PrivateProfile } from '@/lib/types/apiResponses';
@@ -23,7 +22,6 @@ interface RegisterFormValues {
   email: string;
   password: string;
   confirmPassword: string;
-  university: string;
 }
 
 export default function RegisterPage() {
@@ -33,11 +31,7 @@ export default function RegisterPage() {
     handleSubmit,
     getValues,
     formState: { errors },
-  } = useForm<RegisterFormValues>({
-    defaultValues: {
-      university: '',
-    },
-  });
+  } = useForm<RegisterFormValues>();
 
   const router = useRouter();
 
@@ -126,21 +120,6 @@ export default function RegisterPage() {
             type="password"
             autoComplete="new-password"
           />
-          <Controller
-            name="university"
-            control={control}
-            render={({ field }) => (
-              <Dropdown
-                name="universityOptions"
-                ariaLabel="Select an university"
-                options={universities}
-                value={field.value}
-                onChange={field.onChange}
-                className={styles.dropdown}
-                placeholder="Select"
-              />
-            )}
-          />
           <Button variant="primary" onClick={handleSubmit(onSubmit)}>
             Sign Up
           </Button>

client/src/components/ApplicationReview/index.tsx

@@ -68,7 +68,7 @@ const ApplicationReview = ({
           pronouns: responses.pronouns,
           orientation: responses.orientation,
           ethnicity: responses.ethnicity,
-          dietary: responses.dietary,
+          dietary: ['Will be answered in follow-up form.'],
           interests: responses.interests,
           major: responses.major,
           referrer: responses.referrer,

client/src/components/ApplicationStep/style.module.scss

@@ -61,7 +61,7 @@
   gap: 0.5rem;
   color: vars.$error;
 }
-:user-invalid + .error,
+:user-invalid ~ .error,
 .multipleChoice:has(:user-invalid) .error {
   display: flex;
 }

client/src/components/FileSelect/index.tsx

@@ -25,22 +25,22 @@ const FileSelect = ({
 
   return (
     <>
+      <input
+        type="file"
+        accept={fileTypes.join(',')}
+        name={name}
+        id={id}
+        required={required && !defaultFile}
+        className="accessible-but-hidden"
+        disabled={disabled}
+        onChange={e => {
+          if (e.currentTarget.files?.[0]) {
+            setSelected(e.currentTarget.files[0]);
+          }
+        }}
+      />
       <div className={styles.wrapper}>
         {selected?.name}
-        <input
-          type="file"
-          accept={fileTypes.join(',')}
-          name={name}
-          id={id}
-          required={required && !defaultFile}
-          className="accessible-but-hidden"
-          disabled={disabled}
-          onChange={e => {
-            if (e.currentTarget.files?.[0]) {
-              setSelected(e.currentTarget.files[0]);
-            }
-          }}
-        />
         <Button variant="secondary" for={id}>
           Upload New
         </Button>

client/src/config.tsx

@@ -3,6 +3,7 @@ import { FAQQuestion } from './components/FAQAccordion';
 import { Deadlines } from './components/Dashboard';
 import { Step } from './components/ApplicationStep';
 import { countries } from './lib/constants/countries';
+import universities from './lib/constants/universities';
 
 export const FAQ_QUESTIONS: FAQQuestion[] = [
   {
@@ -86,6 +87,12 @@ export const appQuestions: Step[] = [
       //   choices: ['2025', '2026', '2027', '2028'],
       //   other: true,
       // },
+      {
+        type: 'dropdown',
+        id: 'university',
+        question: <>University</>,
+        choices: universities,
+      },
       {
         type: 'select-one',
         id: 'levelOfStudy',

client/src/lib/constants/universities.ts

@@ -1,5 +1,11 @@
 const universities = [
   'University of California, San Diego',
+  'San Diego State University',
+  'University of San Diego',
+  'California College San Diego',
+  'California School of Professional Psychology - San Diego',
+  'Design Institute of San Diego',
+  'San Diego University for Integrative Studies',
   'University of California, Berkeley',
   'University of California, Davis',
   'University of California, Hastings College of Law',
@@ -239,7 +245,6 @@ const universities = [
   'California College for Health Sciences',
   'California College of Arts and Crafts',
   'California College of Podiatric Medicine',
-  'California College San Diego',
   'California Institute of Integral Studies',
   'California Institute of Technology',
   'California Institute of the Arts',
@@ -249,7 +254,6 @@ const universities = [
   'California School of Professional Psychology - Berkley/Alameda',
   'California School of Professional Psychology - Fresno',
   'California School of Professional Psychology - Los Angels',
-  'California School of Professional Psychology - San Diego',
   'California State Polytechnic University - Pomona',
   'California State University, Bakersfield',
   'California State University, Channel Islands',
@@ -471,7 +475,6 @@ const universities = [
   'DePaul University',
   'DePauw University',
   'DeSales University',
-  'Design Institute of San Diego',
   'Detroit College of Business',
   'Detroit College of Business - Flint',
   'Detroit College of Business - Warren',
@@ -1357,8 +1360,6 @@ const universities = [
   'Samford University',
   'Sam Houston State University',
   'Samuel Merritt College',
-  'San Diego State University',
-  'San Diego University for Integrative Studies',
   'Sanford-Brown Institute',
   'San Francisco Art Institute',
   'San Francisco Conservatory of Music',
@@ -1842,7 +1843,6 @@ const universities = [
   'University of Richmond',
   'University of Rio Grande',
   'University of Rochester',
-  'University of San Diego',
   'University of San Francisco',
   'University of Science and Arts of Oklahoma',
   'University of Scranton',