merge from dev

ocadotechnology · Oct 3, 2024 · 94be57c · 94be57c
2 parents 6fa3893 + 7a50db4
commit 94be57c
Show file tree

Hide file tree

Showing 3 changed files with 777 additions and 780 deletions.
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "✅ Do add `devDependencies` below that are `peerDependencies` in the CFL package."
   ],
   "dependencies": {
-    "codeforlife": "github:ocadotechnology/codeforlife-package-javascript#portal-frontend-53",
+    "codeforlife": "github:ocadotechnology/codeforlife-package-javascript#v2.3.8",
     "crypto-js": "^4.2.0"
   },
   "devDependencies": {

diff --git a/src/pages/teacherDashboard/classes/releaseStudents/ReleaseStudentsForm.tsx b/src/pages/teacherDashboard/classes/releaseStudents/ReleaseStudentsForm.tsx
@@ -82,54 +82,55 @@ const ReleaseStudentsForm: FC<ReleaseStudentsFormProps> = ({
         },
       })}
     >
-      {studentUsers.map(studentUser => (
-        <Stack key={`user-${studentUser.id}`} gap={2}>
-          <Stack direction="row" gap={2}>
-            <forms.FirstNameField
-              disabled
-              name={`${studentUser.student.id}.user.original_first_name`}
-              label="Original student name"
-              sx={{ backgroundColor: "info.main" }}
-            />
-            <forms.FirstNameField
-              required
-              name={`${studentUser.student.id}.user.first_name`}
-              label="New student name"
-              placeholder="Enter student address"
-            />
-          </Stack>
-          <Stack direction="row" gap={2}>
-            <forms.EmailField
-              required
-              name={`${studentUser.student.id}.user.email`}
-              label="New email address"
-              placeholder="Enter email address"
-            />
-            <forms.RepeatField
-              name={`${studentUser.student.id}.user.email`}
-              label="Repeat email address"
-              placeholder="Repeat email address"
-              InputProps={{
-                endAdornment: (
-                  <InputAdornment position="end">
-                    <EmailOutlinedIcon />
-                  </InputAdornment>
-                ),
-              }}
-            />
+      <Stack gap={6}>
+        {studentUsers.map(studentUser => (
+          <Stack key={`user-${studentUser.id}`} gap={2}>
+            <Stack direction="row" gap={2}>
+              <forms.FirstNameField
+                disabled
+                name={`${studentUser.student.id}.user.original_first_name`}
+                label="Original student name"
+              />
+              <forms.FirstNameField
+                required
+                name={`${studentUser.student.id}.user.first_name`}
+                label="New student name"
+                placeholder="Enter student address"
+              />
+            </Stack>
+            <Stack direction="row" gap={2}>
+              <forms.EmailField
+                required
+                name={`${studentUser.student.id}.user.email`}
+                label="New email address"
+                placeholder="Enter email address"
+              />
+              <forms.RepeatField
+                name={`${studentUser.student.id}.user.email`}
+                label="Repeat email address"
+                placeholder="Repeat email address"
+                InputProps={{
+                  endAdornment: (
+                    <InputAdornment position="end">
+                      <EmailOutlinedIcon />
+                    </InputAdornment>
+                  ),
+                }}
+              />
+            </Stack>
           </Stack>
+        ))}
+        <Stack direction="row" gap={2}>
+          <LinkButton to={classPath} variant="outlined">
+            Cancel
+          </LinkButton>
+          <forms.SubmitButton
+            className="alert"
+            endIcon={<PersonRemoveAlt1OutlinedIcon />}
+          >
+            Remove students
+          </forms.SubmitButton>
         </Stack>
-      ))}
-      <Stack direction="row" gap={2}>
-        <LinkButton to={classPath} variant="outlined">
-          Cancel
-        </LinkButton>
-        <forms.SubmitButton
-          className="alert"
-          endIcon={<PersonRemoveAlt1OutlinedIcon />}
-        >
-          Remove students
-        </forms.SubmitButton>
       </Stack>
     </forms.Form>
   )