Merge pull request #166 from swamphacks/fix/fix-application

Fix/fix application

Author: h1divp

apps/web/public/assets/majors.json

@@ -1,176 +1,176 @@
 [
-  "General Agriculture",
-  "Agriculture Production and Management",
-  "Agricultural Economics",
-  "Animal Sciences",
-  "Food Science",
-  "Plant Science and Agronomy",
-  "Soil Science",
-  "Miscellaneous Agriculture",
-  "Forestry",
-  "Natural Resources Management",
-  "Fine Arts",
-  "Drama and Theater Arts",
-  "Music",
-  "Visual and Performing Arts",
-  "Commercial Art and Graphic Design",
-  "Film Video and Photographic Arts",
-  "Studio Arts",
-  "Miscellaneous Fine Arts",
-  "Environmental Science",
-  "Biology",
-  "Biochemical Sciences",
-  "Botany",
-  "Molecular Biology",
-  "Ecology",
-  "Genetics",
-  "Microbiology",
-  "Pharmacology",
-  "Physiology",
-  "Zoology",
-  "Neuroscience",
-  "Miscellaneous Biology",
-  "Cognitive Science and Biopsychology",
-  "General Business",
   "Accounting",
   "Actuarial Science",
-  "Business Management and Administration",
-  "Operations Logistics and E-commerce",
-  "Business Economics",
-  "Marketing and Marketing Research",
-  "Finance",
-  "Human Resources and Personnel Management",
-  "International Business",
-  "Hospitality Management",
-  "Management Information Systems and Statistics",
-  "Miscellaneous Business & Medical Administration",
-  "Communications",
-  "Journalism",
-  "Mass Media",
   "Advertising and Public Relations",
-  "Communication Technologies",
-  "Computer and Information Systems",
-  "Computer Programming and Data Processing",
-  "Computer Science",
-  "Information Sciences",
-  "Computer Administration Management and Security",
-  "Computer Networking and Telecommunications",
-  "Mathematics",
+  "Aerospace Engineering",
+  "Agricultural Economics",
+  "Agriculture Production and Management",
+  "Animal Sciences",
+  "Anthropology and Archeology",
   "Applied Mathematics",
-  "Statistics and Decision Science",
-  "Mathematics and Computer Science",
-  "General Education",
-  "Educational Administration and Supervision",
-  "School Student Counseling",
-  "Elementary Education",
-  "Mathematics Teacher Education",
-  "Physical and Health Education Teaching",
-  "Early Childhood Education",
-  "Science and Computer Teacher Education",
-  "Secondary Teacher Education",
-  "Special Needs Education",
-  "Social Science Or History Teacher Education",
-  "Teacher Education: Multiple Levels",
-  "Language and Drama Education",
-  "Art and Music Education",
-  "Miscellaneous Education",
-  "Library Science",
+  "Architectural Engineering",
   "Architecture",
-  "General Engineering",
-  "Aerospace Engineering",
+  "Area Ethnic and Civilization Studies",
+  "Art and Music Education",
+  "Art History and Criticism",
+  "Astronomy and Astrophysics",
+  "Atmospheric Sciences and Meteorology",
+  "Biochemical Sciences",
   "Biological Engineering",
-  "Architectural Engineering",
+  "Biology",
   "Biomedical Engineering",
+  "Botany",
+  "Business Economics",
+  "Business Management and Administration",
   "Chemical Engineering",
+  "Chemistry",
   "Civil Engineering",
+  "Clinical Psychology",
+  "Cognitive Science and Biopsychology",
+  "Commercial Art and Graphic Design",
+  "Communication Disorders Sciences and Services",
+  "Communication Technologies",
+  "Communications",
+  "Community and Public Health",
+  "Composition and Rhetoric",
+  "Computer Administration Management and Security",
+  "Computer and Information Systems",
   "Computer Engineering",
+  "Computer Networking and Telecommunications",
+  "Computer Programming and Data Processing",
+  "Computer Science",
+  "Construction Services",
+  "Cosmetology Services and Culinary Arts",
+  "Counseling Psychology",
+  "Court Reporting",
+  "Criminal Justice and Fire Protection",
+  "Criminology",
+  "Drama and Theater Arts",
+  "Early Childhood Education",
+  "Ecology",
+  "Economics",
+  "Educational Administration and Supervision",
+  "Educational Psychology",
   "Electrical Engineering",
+  "Electrical Engineering Technology",
+  "Electrical, Mechanical, and Precision Technologies and Production",
+  "Elementary Education",
+  "Engineering and Industrial Management",
   "Engineering Mechanics Physics and Science",
+  "Engineering Technologies",
+  "English Language and Literature",
   "Environmental Engineering",
+  "Environmental Science",
+  "Family and Consumer Sciences",
+  "Film Video and Photographic Arts",
+  "Finance",
+  "Fine Arts",
+  "Food Science",
+  "Forestry",
+  "French German Latin and Other Common Foreign Language Studies",
+  "General Agriculture",
+  "General Business",
+  "General Education",
+  "General Engineering",
+  "General Medical and Health Services",
+  "General Social Sciences",
+  "Genetics",
+  "Geography",
   "Geological and Geophysical Engineering",
+  "Geology and Earth Science",
+  "Geosciences",
+  "Health and Medical Administrative Services",
+  "Health and Medical Preparatory Programs",
+  "History",
+  "Hospitality Management",
+  "Human Resources and Personnel Management",
+  "Human Services and Community Organization",
+  "Humanities",
   "Industrial and Manufacturing Engineering",
+  "Industrial and Organizational Psychology",
+  "Industrial Production Technologies",
+  "Information Sciences",
+  "Intercultural and International Studies",
+  "Interdisciplinary Social Sciences",
+  "International Business",
+  "International Relations",
+  "Journalism",
+  "Language and Drama Education",
+  "Liberal Arts",
+  "Library Science",
+  "Linguistics and Comparative Language and Literature",
+  "Management Information Systems and Statistics",
+  "Marketing and Marketing Research",
+  "Mass Media",
   "Materials Engineering and Materials Science",
+  "Materials Science",
+  "Mathematics",
+  "Mathematics and Computer Science",
+  "Mathematics Teacher Education",
   "Mechanical Engineering",
+  "Mechanical Engineering Related Technologies",
+  "Medical Assisting Services",
+  "Medical Technologies Technicians",
   "Metallurgical Engineering",
+  "Microbiology",
+  "Military Technologies",
   "Mining and Mineral Engineering",
-  "Naval Architecture and Marine Engineering",
-  "Nuclear Engineering",
-  "Petroleum Engineering",
+  "Miscellaneous Agriculture",
+  "Miscellaneous Biology",
+  "Miscellaneous Business & Medical Administration",
+  "Miscellaneous Education",
   "Miscellaneous Engineering",
-  "Engineering Technologies",
-  "Engineering and Industrial Management",
-  "Electrical Engineering Technology",
-  "Industrial Production Technologies",
-  "Mechanical Engineering Related Technologies",
   "Miscellaneous Engineering Technologies",
-  "Materials Science",
-  "Nutrition Sciences",
-  "General Medical and Health Services",
-  "Communication Disorders Sciences and Services",
-  "Health and Medical Administrative Services",
-  "Medical Assisting Services",
-  "Medical Technologies Technicians",
-  "Health and Medical Preparatory Programs",
-  "Nursing",
-  "Pharmacy Pharmaceutical Sciences and Administration",
-  "Treatment Therapy Professions",
-  "Community and Public Health",
+  "Miscellaneous Fine Arts",
   "Miscellaneous Health Medical Professions",
-  "Area Ethnic and Civilization Studies",
-  "Linguistics and Comparative Language and Literature",
-  "French German Latin and Other Common Foreign Language Studies",
+  "Miscellaneous Psychology",
+  "Miscellaneous Social Sciences",
+  "Molecular Biology",
+  "Multi-disciplinary Or General Science",
+  "Multi/interdisciplinary Studies",
+  "Music",
+  "N/a (less Than Bachelor's Degree)",
+  "Natural Resources Management",
+  "Naval Architecture and Marine Engineering",
+  "Neuroscience",
+  "Nuclear Engineering",
+  "Nuclear, Industrial Radiology, and Biological Technologies",
+  "Nursing",
+  "Nutrition Sciences",
+  "Oceanography",
+  "Operations Logistics and E-commerce",
   "Other Foreign Languages",
-  "English Language and Literature",
-  "Composition and Rhetoric",
-  "Liberal Arts",
-  "Humanities",
-  "Intercultural and International Studies",
+  "Petroleum Engineering",
+  "Pharmacology",
+  "Pharmacy Pharmaceutical Sciences and Administration",
   "Philosophy and Religious Studies",
-  "Theology and Religious Vocations",
-  "Anthropology and Archeology",
-  "Art History and Criticism",
-  "History",
-  "United States History",
-  "Cosmetology Services and Culinary Arts",
-  "Family and Consumer Sciences",
-  "Military Technologies",
+  "Physical and Health Education Teaching",
   "Physical Fitness Parks Recreation and Leisure",
-  "Construction Services",
-  "Electrical, Mechanical, and Precision Technologies and Production",
-  "Transportation Sciences and Technologies",
-  "Multi/interdisciplinary Studies",
-  "Court Reporting",
-  "Pre-law and Legal Studies",
-  "Criminal Justice and Fire Protection",
-  "Public Administration",
-  "Public Policy",
-  "N/a (less Than Bachelor's Degree)",
   "Physical Sciences",
-  "Astronomy and Astrophysics",
-  "Atmospheric Sciences and Meteorology",
-  "Chemistry",
-  "Geology and Earth Science",
-  "Geosciences",
-  "Oceanography",
   "Physics",
-  "Multi-disciplinary Or General Science",
-  "Nuclear, Industrial Radiology, and Biological Technologies",
+  "Physiology",
+  "Plant Science and Agronomy",
+  "Political Science and Government",
+  "Pre-law and Legal Studies",
   "Psychology",
-  "Educational Psychology",
-  "Clinical Psychology",
-  "Counseling Psychology",
-  "Industrial and Organizational Psychology",
+  "Public Administration",
+  "Public Policy",
+  "School Student Counseling",
+  "Science and Computer Teacher Education",
+  "Secondary Teacher Education",
   "Social Psychology",
-  "Miscellaneous Psychology",
-  "Human Services and Community Organization",
+  "Social Science Or History Teacher Education",
   "Social Work",
-  "Interdisciplinary Social Sciences",
-  "General Social Sciences",
-  "Economics",
-  "Criminology",
-  "Geography",
-  "International Relations",
-  "Political Science and Government",
   "Sociology",
-  "Miscellaneous Social Sciences"
+  "Soil Science",
+  "Special Needs Education",
+  "Statistics and Decision Science",
+  "Studio Arts",
+  "Teacher Education: Multiple Levels",
+  "Theology and Religious Vocations",
+  "Transportation Sciences and Technologies",
+  "Treatment Therapy Professions",
+  "United States History",
+  "Visual and Performing Arts",
+  "Zoology"
 ]

apps/web/src/components/Form/fields/UploadField.tsx

@@ -9,6 +9,9 @@ export default function UploadField(props: FileFieldProps) {
       onChange={(files) =>
         field.handleChange(files.length === 0 ? undefined : files)
       }
+      // TODO: fix the FileFieldProps type to handle "accept" prop
+      // @ts-ignore
+      accept={props.validation.validMimeTypes}
       {...props}
     />
   );

apps/web/src/components/ui/FileField/FileInput.tsx

@@ -199,6 +199,7 @@ export const FileInput = ({
           type="file"
           ref={inputRef}
           onChange={onChange}
+          accept={props.accept}
         />
       </DropZone>
 

apps/web/src/features/FormBuilder/questions/upload.ts

@@ -14,8 +14,8 @@ export const UploadQuestion = createQuestionItem({
         // Size are in megabytes
         minSize: z.number(),
         maxSize: z.number(),
-        validMimeTypes: z.array(z.string()),
-        invalidMimeTypes: z.array(z.string()),
+        validMimeTypes: z.string(),
+        invalidMimeTypes: z.string(),
       })
       .partial()
       .refine(