Ensure majors list has at least one major (#48)

* validate that majors aren't empty * add 'Engineering Undeclared' option to dropdown * fix linting and prettier * add block I * fix lint * fix
acm-uiuc · Sep 15, 2024 · 37ef275 · 37ef275
1 parent 5828309
commit 37ef275
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 8 deletions.
diff --git a/api/util/structs.py b/api/util/structs.py
@@ -1,5 +1,5 @@
 from typing import List, Literal, Optional
-from pydantic import BaseModel, ConfigDict, EmailStr, AnyUrl, Field, HttpUrl, validator
+from pydantic import BaseModel, ConfigDict, EmailStr, AnyUrl, Field, HttpUrl
 from .oai import LENGTH_LIMIT
 
 class DegreeListing(BaseModel):
@@ -8,7 +8,7 @@ class DegreeListing(BaseModel):
     yearStarted: int
     yearEnded: Optional[int] = None
     institution: str
-    major: List[str]
+    major: List[str] = Field(min_length=1)
     minor: List[str]
     gpa: float
 

diff --git a/clientv2/.eslintrc.cjs b/clientv2/.eslintrc.cjs
@@ -1,5 +1,5 @@
 module.exports = {
-    extends: ['mantine'],
+    extends: ['mantine', 'prettier'],
     parserOptions: {
       project: './tsconfig.json',
     },

diff --git a/clientv2/package.json b/clientv2/package.json
@@ -28,6 +28,7 @@
     "@ungap/with-resolvers": "^0.1.0",
     "axios": "^1.7.2",
     "dotenv": "^16.4.5",
+    "eslint-config-prettier": "^9.1.0",
     "file-saver": "^2.0.5",
     "jszip": "^3.10.1",
     "pdfjs-dist": "^4.5.136",

diff --git a/clientv2/src/blockI.png b/clientv2/src/blockI.png
diff --git a/clientv2/src/components/LoginComponent/AcmLoginButton.tsx b/clientv2/src/components/LoginComponent/AcmLoginButton.tsx
@@ -1,15 +1,21 @@
-import { Button, ButtonProps } from '@mantine/core';
+import { Button, ButtonProps, Image } from '@mantine/core';
 import { useMsal } from '@azure/msal-react';
 import { InteractionStatus } from '@azure/msal-browser';
 import { useAuth } from '../AuthContext';
+import blockI from '@/blockI.png';
 
 export function AcmLoginButton(props: ButtonProps & React.ComponentPropsWithoutRef<'button'>) {
   const { loginMsal } = useAuth();
   const { inProgress } = useMsal();
   return (
     <Button
       disabled={inProgress === InteractionStatus.Login}
-      leftSection={null}
+      leftSection={
+        <Image
+          src={blockI}
+          style={{ height: '1.5em', width: 'auto', paddingRight: '0.8em' }}
+        ></Image>
+      }
       color="#FF5F05"
       variant="filled"
       {...props}

diff --git a/clientv2/src/components/LoginComponent/index.tsx b/clientv2/src/components/LoginComponent/index.tsx
@@ -29,7 +29,7 @@ export function LoginComponent(props: PaperProps) {
       <Divider label="Student Login" labelPosition="center" my="md" size="lg" />
 
       <Group grow mb="md" mt="md">
-        <AcmLoginButton radius="xl">Sign in with Illinois NetID</AcmLoginButton>
+        <AcmLoginButton radius="lg">Sign in with Illinois NetID</AcmLoginButton>
       </Group>
       <Alert
         title={<Title order={5}>Paid ACM@UIUC Members Only</Title>}
@@ -45,7 +45,7 @@ export function LoginComponent(props: PaperProps) {
       </Alert>
       <Divider label="Recruiter Login" labelPosition="center" my="md" size="lg" />
       <Group grow mb="md" mt="md">
-        <PartnerLoginButton radius="xl">ACM@UIUC Partner Login</PartnerLoginButton>
+        <PartnerLoginButton radius="lg">ACM@UIUC Partner Login</PartnerLoginButton>
       </Group>
     </Paper>
   );

diff --git a/clientv2/src/components/ProfileViewer/options.ts b/clientv2/src/components/ProfileViewer/options.ts
@@ -165,6 +165,7 @@ export const otherMajors = [
   'Theatre',
   'Urban Planning',
   'Writing Studies',
+  'Engineering Undeclared',
 ];
 
 export const degreeOptions = [

diff --git a/clientv2/src/pages/student/StudentProfile.page.tsx b/clientv2/src/pages/student/StudentProfile.page.tsx
@@ -214,6 +214,12 @@ export function StudentHomePage() {
     if (studentData.degrees.length === 0) {
       return showErrorSaveNotification('You must specify at least one degree.');
     }
+    for (let i = 0; i < studentData.degrees.length; i++) {
+      const item = studentData.degrees[i];
+      if (item.major.length === 0) {
+        return showErrorSaveNotification(`Degree ${i + 1} does not have a major.`);
+      }
+    }
     try {
       if (file && file.size !== 0) {
         setLoading(true);
@@ -251,7 +257,9 @@ export function StudentHomePage() {
         });
         setEditToggle(false);
       } else if (response.status && response.status === 403) {
-        showErrorSaveNotification('Failed to validate form.');
+        showErrorSaveNotification(
+          'Failed to validate profile. Please ensure all fields are valid and try again.'
+        );
       } else {
         showErrorSaveNotification();
       }

diff --git a/clientv2/yarn.lock b/clientv2/yarn.lock
@@ -3439,6 +3439,7 @@ __metadata:
     eslint-config-airbnb: "npm:19.0.4"
     eslint-config-airbnb-typescript: "npm:^18.0.0"
     eslint-config-mantine: "npm:^3.2.0"
+    eslint-config-prettier: "npm:^9.1.0"
     eslint-plugin-import: "npm:^2.29.1"
     eslint-plugin-jsx-a11y: "npm:^6.9.0"
     eslint-plugin-react: "npm:^7.34.3"
@@ -5242,6 +5243,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-config-prettier@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "eslint-config-prettier@npm:9.1.0"
+  peerDependencies:
+    eslint: ">=7.0.0"
+  bin:
+    eslint-config-prettier: bin/cli.js
+  checksum: 10c0/6d332694b36bc9ac6fdb18d3ca2f6ac42afa2ad61f0493e89226950a7091e38981b66bac2b47ba39d15b73fff2cd32c78b850a9cf9eed9ca9a96bfb2f3a2f10d
+  languageName: node
+  linkType: hard
+
 "eslint-import-resolver-node@npm:^0.3.9":
   version: 0.3.9
   resolution: "eslint-import-resolver-node@npm:0.3.9"