Merge branch 'dev' into prod

UofT-Frosh-Orientation · Aug 26, 2024 · 7f5c445 · 7f5c445
2 parents 59eee3c + 6fd088a
commit 7f5c445
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/client/src/pages/Registration/RegistrationFields.jsx b/client/src/pages/Registration/RegistrationFields.jsx
@@ -53,7 +53,7 @@ export const fields = {
       placeholder: '[email protected]',
       label: 'Email',
       isRequiredInput: true,
-      noEdit: true,
+      noEdit: false,
     },
     firstName: {
       type: 'text',
@@ -183,7 +183,7 @@ export const fields = {
       className: 'half-width-input',
       initialSelectedIndex: 0,
       isRequiredInput: true,
-      noEdit: true,
+      noEdit: false,
       localStorageKey: 'registration-discipline',
     },
     phoneNumberLabel: {
@@ -417,7 +417,7 @@ export const fields = {
       initialSelectedIndex: 1,
       className: 'half-width-input',
       isRequiredInput: true,
-      noEdit: true,
+      noEdit: false,
       localStorageKey: 'registration-shirtSize',
     },
     attendingScunt: {
@@ -515,13 +515,13 @@ export const fields = {
       noEdit: false,
       localStorageKey: 'registration-marketingMore',
       isDisabled: true, // to initially set to disabled until 'Other' is clicked
-      validation: (value) => {
-        if (value.length > 100) {
-          return 'Please use less than 100 characters';
-        } else {
-          return true;
-        }
-      },
+      // validation: (value) => {
+      //   if (value.length > 100) {
+      //     return 'Please use less than 100 characters';
+      //   } else {
+      //     return true;
+      //   }
+      // },
     },
   },
 };

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 
 services:
   mongodb-test:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 
 services:
   mongodb: