feedback

ocadotechnology · Jun 19, 2024 · c1ccf7e · c1ccf7e
1 parent 5e8c040
commit c1ccf7e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/src/app/schemas.ts b/src/app/schemas.ts
@@ -2,7 +2,7 @@ import * as yup from "yup"
 
 export const classIdSchema = yup
   .string()
-  .matches(/^[A-Z0-9]{5}$/, "Invalid access code")
+  .matches(/^[A-Z0-9]{5}$/, "Invalid class code")
 
 const passwordSchema = yup.string().required("required")
 
@@ -23,7 +23,6 @@ export const studentPasswordSchema = passwordSchema.test({
   test: password => password.length >= 6,
 })
 
-// TODO: make indy password schema the same as teacher's.
 export const indyPasswordSchema = passwordSchema.test({
   message: "too-weak",
   test: password =>

diff --git a/src/pages/login/studentForms/Class.tsx b/src/pages/login/studentForms/Class.tsx
@@ -71,8 +71,8 @@ const Class: FC<ClassProps> = () => {
         >
           <form.TextField
             name="classId"
-            label="Access code"
-            placeholder="Enter your access code"
+            label="Class code"
+            placeholder="Enter your class code"
             schema={classIdSchema}
             required
           />

diff --git a/src/pages/login/studentForms/FirstName.tsx b/src/pages/login/studentForms/FirstName.tsx
@@ -33,7 +33,7 @@ const FirstName: FC<FirstNameProps> = () => {
             {
               props: {
                 error: true,
-                children: "Please provide a valid access code for your class.",
+                children: "Please provide the correct code for your class.",
               },
             },
           ],
@@ -60,11 +60,7 @@ const FirstName: FC<FirstNameProps> = () => {
             },
           })}
         >
-          <form.FirstNameField
-            label="Username"
-            placeholder="Enter your username"
-            required
-          />
+          <form.FirstNameField required />
           <form.PasswordField required />
           <Stack alignItems="end">
             <form.SubmitButton endIcon={<ChevronRightIcon />}>

diff --git a/src/pages/login/teacherForms/OtpBypassToken.tsx b/src/pages/login/teacherForms/OtpBypassToken.tsx
@@ -21,7 +21,7 @@ const OtpBypassToken: FC<OtpBypassTokenProps> = () => {
   return useSession(
     <BaseForm
       themedBoxProps={{ userType: "teacher" }}
-      header="Login as a teacher"
+      header="Welcome"
       initialValues={{ token: "" }}
       onSubmit={submitForm(loginWithOtpBypassToken, {
         then: () => {
@@ -34,7 +34,6 @@ const OtpBypassToken: FC<OtpBypassTokenProps> = () => {
         have been generated for you to print and keep safe. Please enter one of
         these backup tokens to login to your account.
       </Typography>
-      <Typography fontWeight="bold">Token:</Typography>
       <form.TextField
         name="token"
         label="OTP-bypass token"