Merge pull request #817 from UofT-Frosh-Orientation/dev

push to prod
UofT-Frosh-Orientation · Jul 17, 2024 · 012d1b2 · 012d1b2
2 parents 8180a43 + 5d20979
commit 012d1b2
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/client/src/assets/about/execs/vedant_pfp.png b/client/src/assets/about/execs/vedant_pfp.png
diff --git a/client/src/assets/about/execs/vedant_pfp.webp b/client/src/assets/about/execs/vedant_pfp.webp
diff --git a/client/src/components/Navbar/Navbar.scss b/client/src/components/Navbar/Navbar.scss
@@ -29,7 +29,7 @@ li {
   position: fixed;
   background-color: var(--navbar-bg);
   width: 100%;
-  height: 60px;
+  height: 50px;
 
   filter: drop-shadow(0px -2px 5px rgba(0, 0, 0, 0.25));
 }

diff --git a/client/src/components/schedule/ScheduleHome/ScheduleHome.scss b/client/src/components/schedule/ScheduleHome/ScheduleHome.scss
@@ -99,7 +99,7 @@
   transition: transform 200ms, opacity 500ms;
   &:hover {
     transform: scale(1.03);
-    cursor: pointer;
+    cursor: url('../../../../assets/cursor/cursor-2t4.png'), auto; // Apply custom cursor here
   }
   h1 {
     font-size: 28px;

diff --git a/client/src/pages/Registration/RegistrationFields.jsx b/client/src/pages/Registration/RegistrationFields.jsx
@@ -467,6 +467,19 @@ export const fields = {
       noEdit: false,
       localStorageKey: 'registration-moveToToronto',
     },
+    photograph: {
+      type: 'radio',
+      label: 'Are you okay with being photographed during Frosh Week?',
+      values: ['Yes', 'No'],
+      initialSelectedIndex: 0,
+      noEdit: true,
+      localStorageKey: 'registration-photograph',
+    },
+    priceInfo: {
+      type: 'label',
+      label: 'The price of one Frosh Week ticket is 130 CAD.',
+      isBold: true,
+    },
     bursaryRequested: {
       type: 'radio',
       label: 'Do you require any bursary or financial aid for your Frosh Week ticket?',
@@ -476,24 +489,10 @@ export const fields = {
       noEdit: false,
       localStorageKey: 'registration-bursary',
     },
-    photograph: {
-      type: 'radio',
-      label: 'Are you okay with being photographed during Frosh Week?',
-      values: ['Yes', 'No'],
-      initialSelectedIndex: 0,
-      noEdit: true,
-      localStorageKey: 'registration-photograph',
-    },
     marketing: {
       type: 'checkbox',
       label: 'How did you hear about F!rosh Week?',
-      values: [
-        'Instagram',
-        'First Year News Feed',
-        'Word of Mouth',
-        'Discord',
-        'Other',
-      ],
+      values: ['Instagram', 'First Year News Feed', 'Word of Mouth', 'Discord', 'Other'],
       isRequiredInput: false,
       noEdit: false,
       localStorageKey: 'registration-marketing',
@@ -508,7 +507,8 @@ export const fields = {
     marketingOther: {
       type: 'text',
       inputType: 'textArea',
-      label: 'If you heard about F!rosh Week through a different method not listed above, please list it here.',
+      label:
+        'If you heard about F!rosh Week through a different method not listed above, please list it here.',
       placeholder: 'Facebook',
       hasRestrictedInput: true,
       isRequiredInput: false,

diff --git a/client/src/util/about/execs.jsx b/client/src/util/about/execs.jsx
@@ -1,5 +1,5 @@
 import oc1Photo from '../../assets/about/execs/Lily_pfp.png';
-import oc2Photo from '../../assets/about/execs/vedant_pfp.png';
+import oc2Photo from '../../assets/about/execs/vedant_pfp.webp';
 import vcFinance from '../../assets/about/execs/finance_pfp.png';
 import vcEvents1 from '../../assets/about/execs/vc-events_pfp.png';
 import vcEvents2 from '../../assets/about/execs/events_pfp.png';

diff --git a/server/src/controllers/UserController.js b/server/src/controllers/UserController.js
@@ -166,7 +166,7 @@ const UserController = {
       const { email, password, token } = req.body;
       const result = await UserServices.validatePasswordResetToken(token);
       const existingUser = await UserServices.getUserByEmail(email);
-      if (!existingUser || existingUser.email !== result.email) {
+      if (!existingUser || existingUser.email !== result.userEmail) {
         next(new Error('INVALID_PASSWORD_RESET_EMAIL'));
       } else {
         await UserServices.updatePassword(email, password);