edit school error msg

hack4impact-upenn · Dec 6, 2023 · e74d316 · e74d316
2 parents ed7a76a + 50b6d4b
commit e74d316
Show file tree

Hide file tree

Showing 67 changed files with 15,758 additions and 12,943 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,5 +10,5 @@ yarn.lock
 .env.test.local
 .env.production.local
 
+.vscode
 .tool-versions
-.vscode
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,35 +1,35 @@
 {
-    "[javascript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.formatOnSave": false
-      },
-      "[javascriptreact]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.formatOnSave": false
-      },
-      "[typescript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.formatOnSave": false
-      },
-      "[typescriptreact]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.formatOnSave": false
-      },
-      "eslint.autoFixOnSave": true,
-      "eslint.validate": [
-        "javascript",
-        "javascriptreact",
-        {
-          "autoFix": true,
-          "language": "typescript"
-        },
-        {
-          "autoFix": true,
-          "language": "typescriptreact"
-        }
-      ],
-    "prettier.eslintIntegration": true,
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": false
+  },
+  "[javascriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": false
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": false
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": false
+  },
+  "eslint.autoFixOnSave": true,
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    {
+      "autoFix": true,
+      "language": "typescript"
     },
-}
+    {
+      "autoFix": true,
+      "language": "typescriptreact"
+    }
+  ],
+  "prettier.eslintIntegration": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  }
+}
diff --git a/client/public/first_session.svg b/client/public/first_session.svg
diff --git a/client/public/ten_sessions.svg b/client/public/ten_sessions.svg
diff --git a/client/public/vowels.svg b/client/public/vowels.svg
diff --git a/client/src/Admin/AdminAddBlockPage.tsx b/client/src/Admin/AdminAddBlockPage.tsx
@@ -34,6 +34,8 @@ interface submitState {
   startTime: string;
   endTime: string;
   zoom: string;
+  absenceNotification: string;
+  exitTicket: string;
   teacher: IUser | null;
   pairs: [IUser | null, IStudent | null][];
   coachesInBlock: string[];
@@ -47,6 +49,8 @@ export function submitError({
   startTime,
   endTime,
   zoom,
+  absenceNotification,
+  exitTicket,
   teacher,
   pairs,
   coachesInBlock,
@@ -59,6 +63,8 @@ export function submitError({
     startTime === '' ||
     endTime === '' ||
     zoom === '' ||
+    absenceNotification === '' ||
+    exitTicket === '' ||
     teacher === null
   ) {
     return 'Please fill out all fields';
@@ -119,6 +125,8 @@ function AdminAddBlockPage() {
   const [startTime, setStartTime] = useState('');
   const [endTime, setEndTime] = useState('');
   const [zoom, setZoom] = useState('');
+  const [absenceNotification, setAbsenceNotification] = useState('');
+  const [exitTicket, setExitTicket] = useState('');
   const [teachers, setTeachers] = useState<IUser[]>([]);
   const [coaches, setCoaches] = useState([]);
   const [students, setStudents] = useState<IStudent[]>([]);
@@ -130,6 +138,7 @@ function AdminAddBlockPage() {
   ]);
 
   const [error, setError] = useState('');
+  const [nameError, setNameError] = useState('');
 
   const users = useData('admin/all');
   const studentList = useData('student/all');
@@ -187,7 +196,14 @@ function AdminAddBlockPage() {
   const handleNameChange = (
     event: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>,
   ) => {
-    setName(event.target.value as string);
+    const newName = event.target.value;
+
+    if (newName.length <= 26) {
+      setName(newName);
+      setNameError('');
+    } else {
+      setNameError('Name cannot exceed 26 characters');
+    }
   };
 
   const handleStartTimeChange = (
@@ -207,6 +223,16 @@ function AdminAddBlockPage() {
   ) => {
     setZoom(event.target.value as string);
   };
+  const handleAbsenceNotiChange = (
+    event: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>,
+  ) => {
+    setAbsenceNotification(event.target.value as string);
+  };
+  const handleExitTicketChange = (
+    event: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>,
+  ) => {
+    setExitTicket(event.target.value as string);
+  };
 
   const displayName = (user: IUser | null) => {
     if (user === null) {
@@ -238,6 +264,8 @@ function AdminAddBlockPage() {
     setTeacher(null);
     setPairs([[null, null]]);
     setZoom('');
+    setAbsenceNotification('');
+    setExitTicket('');
   };
 
   const handleSubmit = () => {
@@ -247,6 +275,8 @@ function AdminAddBlockPage() {
       startTime,
       endTime,
       zoom,
+      absenceNotification,
+      exitTicket,
       teacher,
       pairs,
       coachesInBlock,
@@ -264,6 +294,8 @@ function AdminAddBlockPage() {
       startTime,
       endTime,
       zoom,
+      absenceNotification,
+      exitTicket,
       pairs,
     });
     setAlert('Added block successfully!', AlertType.SUCCESS);
@@ -312,6 +344,11 @@ function AdminAddBlockPage() {
                 variant="standard"
                 placeholder="Name"
               />
+              {nameError && (
+                <Typography justifyContent="center" color="red">
+                  {nameError}
+                </Typography>
+              )}
             </Grid>
             <Grid item width="1">
               <Typography variant="subtitle1">Start Time</Typography>
@@ -343,6 +380,26 @@ function AdminAddBlockPage() {
                 placeholder="Zoom link"
               />
             </Grid>
+            <Grid item width="1">
+              <TextField
+                fullWidth
+                value={absenceNotification}
+                onChange={handleAbsenceNotiChange}
+                label="Absence Notification Link"
+                variant="standard"
+                placeholder="Absence notification link"
+              />
+            </Grid>
+            <Grid item width="1">
+              <TextField
+                fullWidth
+                value={exitTicket}
+                onChange={handleExitTicketChange}
+                label="Exit Ticket Link"
+                variant="standard"
+                placeholder="Exit Ticket link"
+              />
+            </Grid>
             <Grid item width="1" marginBottom="1">
               <Autocomplete
                 disablePortal
@@ -478,7 +535,11 @@ function AdminAddBlockPage() {
             </Grid>
             {error && (
               <Grid item container justifyContent="center">
-                <Typography justifyContent="center" color="red">
+                <Typography
+                  justifyContent="center"
+                  color="red"
+                  style={{ paddingBottom: '20px' }}
+                >
                   {error}
                 </Typography>
               </Grid>