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

Fixed headings, changed 2t7 to 2t8, added bursary note, and changed scunt to scavenger hunt
UofT-Frosh-Orientation · Jul 5, 2024 · 6391975 · 6391975
2 parents 149987e + 36c8ef1
commit 6391975
Show file tree

Hide file tree

Showing 15 changed files with 86 additions and 113 deletions.
diff --git a/client/src/assets/schedule/data.jsx b/client/src/assets/schedule/data.jsx
diff --git a/client/src/components/footer/FooterStorybook.jsx b/client/src/components/footer/FooterStorybook.jsx
@@ -52,7 +52,7 @@ const FooterStorybook = () => {
           })}
           {/* <img className="svg-icons" alt="instagram" src={InstagramLogo}></img> */}
         </div>
-        <div className="footer-message">Made with 💜 by the F!rosh Week 2T3 Tech Team</div>
+        <div className="footer-message">Made with 💜 by the F!rosh Week 2T4 Tech Team</div>
       </div>
     </div>
   );

diff --git a/client/src/components/profile/ProfilePageResources/ProfilePageResources.jsx b/client/src/components/profile/ProfilePageResources/ProfilePageResources.jsx
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 export const ProfilePageResources = ({ froshObject }) => {
   return (
     <div className="profile-page-resources profile-page-side-section">
-      <h2>Resources</h2>
+      <h2>RESOURCES</h2>
       {resources.map((resource, index) => {
         return (
           <a

diff --git a/client/src/components/task/TaskAnnouncement/TaskAnnouncement.jsx b/client/src/components/task/TaskAnnouncement/TaskAnnouncement.jsx
@@ -8,7 +8,7 @@ const TaskAnnouncement = ({ tasks, onDone }) => {
   if (!tasks || tasks.length <= 0) {
     return (
       <div className="task-container">
-        <h2 className="nothing-here">There is nothing here yet!</h2>
+        <h2 className="nothing-here">THERE IS NOTHING HERE YET!</h2>
       </div>
     );
   }

diff --git a/client/src/pages/FroshRetreat/FroshRetreat.jsx b/client/src/pages/FroshRetreat/FroshRetreat.jsx
@@ -43,7 +43,7 @@ export const FroshRetreat = () => {
             Escape the city to the lovely Hart House Farms for a weekend of wholesome camp vibes!
           </h3>
           <p style={{ color: 'var(--white)' }}>
-            The retreat is taking place on September 9th and September 10th, 2023 at Hart House
+            The retreat is taking place on August 31st and September 1st, 2024 at Hart House
             Farm.
           </p>
           <p style={{ color: 'var(--white)' }}>

diff --git a/client/src/pages/Home/Home.jsx b/client/src/pages/Home/Home.jsx
@@ -85,13 +85,13 @@ const HomeHeaderButton = () => {
                 justifyContent: 'center',
                 alignItems: 'center',
               }}
-              // hidden button xD
-              // style={{
-              //   width: '0.px',
-              //   height: '0.px',
-              //   fontSize: '0px',
-              //   opacity: '0',
-              // }}
+            // hidden button xD
+            // style={{
+            //   width: '0.px',
+            //   height: '0.px',
+            //   fontSize: '0px',
+            //   opacity: '0',
+            // }}
             />
           </div>
           <div className="mobile-only">

diff --git a/client/src/pages/PasswordReset/PasswordReset.jsx b/client/src/pages/PasswordReset/PasswordReset.jsx
@@ -95,7 +95,7 @@ export const PasswordReset = () => {
         <div className={'password-reset-container'}>
           <img className={'password-reset-logo'} src={MainFroshLogo} alt={'Frosh week logo'} />
           <h1 style={{ color: 'var(--text-dynamic)' }}>Reset your password</h1>
-          <h3 style={{ color: 'var(--text-dynamic)' }}>For F!rosh Week 2T3, UofT Engineering</h3>
+          <h3 style={{ color: 'var(--text-dynamic)' }}>For F!rosh Week 2T4, UofT Engineering</h3>
           <div className={'full-width-input'}>
             <TextInput
               label={'Email'}

diff --git a/client/src/pages/Profile/PageProfileFrosh.jsx b/client/src/pages/Profile/PageProfileFrosh.jsx
@@ -240,8 +240,8 @@ const ProfilePageFroshHeader = ({ editButton }) => {
       {!isRegistered ? (
         <div className={'profile-not-registered'}>
           <h1>YOU ARE NOT REGISTERED!</h1>
-          {/* <h2>You will not be able to participate in F!rosh week events until you register.</h2> */}
-          <h2>Registration opens soon. Stay tuned!</h2>
+          {/* <h2>YOU WILL NOT BE ABLE TO PARTICIPATE IN F!ROSH WEEK EVENTS UNTIL YOU REGISTER.</h2> */}
+          <h2>REGISTRATION OPENS SOON. STAY TUNED!</h2>
           <Link
             key={'/registration'}
             to={'/registration'}
@@ -373,7 +373,7 @@ const ProfilePageAnnouncements = () => {
 
   return (
     <div className="profile-page-announcements">
-      <h2 className="profile-page-section-header">Tasks and Announcements</h2>
+      <h2 className="profile-page-section-header">TASKS AND ANNOUNCEMENTS</h2>
       {!user?.canEmail ? (
         <Link
           key={'/resubscribe'}

diff --git a/client/src/pages/Profile/PageProfileLeader.jsx b/client/src/pages/Profile/PageProfileLeader.jsx
@@ -101,7 +101,7 @@ export const ProfilePageLeaderScuntMessage = () => {
       <div className="frosh-instagram-container">
         <img src={ScuntIcon} alt="Scunt" style={{ filter: darkMode ? 'invert(1)' : 'unset' }} />
         <div>
-          <h2>Havenger Scunt!</h2>
+          <h2>SkavENGer Hunt!!</h2>
           <p>Find more information about Scunt by clicking here!</p>
         </div>
       </div>

diff --git a/client/src/pages/Registration/RegistrationFields.jsx b/client/src/pages/Registration/RegistrationFields.jsx
@@ -398,7 +398,7 @@ export const fields = {
     attendingScunt: {
       type: 'dropdown',
       label:
-        'Would you like to participate in Havenger Scunt? (It will take place on the evening of Wednesday, August 28th)',
+        'Would you like to participate in SkavENGer Hunt!? (It will take place on the evening of Wednesday, August 28th)',
       values: ['Yes', 'No'],
       initialSelectedIndex: 0,
       localStorageKey: 'registration-scunt',
@@ -408,7 +408,7 @@ export const fields = {
     scuntInfo: {
       type: 'label',
       label:
-        "What is Havenger Scunt? Havenger Scunt is a scavenger hunt around the city of Toronto! Don't miss out on one of the most popular f!rosh week events! Scunt is an exciting night of challenges for all comfort levels.",
+        "What is SkavENGer Hunt!? SkavENGer Hunt! is a scavenger hunt around the city of Toronto! Don't miss out on one of the most popular f!rosh week events! Hunt is an exciting night of challenges for all comfort levels.",
       isBold: true,
     },
     attendingNiteLifeCarnival: {
@@ -423,7 +423,7 @@ export const fields = {
     attendingRetreat: {
       type: 'dropdown',
       label:
-        'Would you like to attend an overnight retreat on September 9th-10th at Hart House Farms (at an additional cost)?',
+        'Would you like to attend an overnight retreat on August 31st-September 1st at Hart House Farms (at an additional cost)?',
       values: ['Yes', 'No'],
       initialSelectedIndex: 0,
       isRequiredInput: false,
@@ -451,28 +451,9 @@ export const fields = {
       noEdit: false,
       localStorageKey: 'registration-moveToToronto',
     },
-    commuterProgramQuery: {
-      type: 'dropdown',
-      label:
-        'Will you take part in the Commuter Program (you can still sign up via links on Instagram and Frosh week website)?',
-      values: ['Yes', 'No', 'Put me on the Waitlist'],
-      initialSelectedIndex: 0,
-      isRequiredInput: false,
-      noEdit: false,
-      localStorageKey: 'registration-commuterProgramQuery',
-    },
-    commuterChestnutQuery: {
-      type: 'dropdown',
-      label: 'Would you like to stay up at Chestnut during Frosh week with an additional cost?',
-      values: ['Yes', 'No'],
-      initialSelectedIndex: 0,
-      isRequiredInput: false,
-      noEdit: false,
-      localStorageKey: 'registration-commuterChestnutQuery',
-    },
     bursary: {
       type: 'dropdown',
-      label: 'Would you be interested in a bursary?',
+      label: 'Do you require any bursary or financial aid for your Frosh Week ticket?',
       values: ['Yes', 'No'],
       initialSelectedIndex: 0,
       isRequiredInput: false,

diff --git a/client/src/pages/Registration/RegistrationForm.jsx b/client/src/pages/Registration/RegistrationForm.jsx
@@ -279,11 +279,11 @@ const PageRegistrationForm = ({ editFieldsPage, initialValues, onEditSubmit }) =
                   initialSelectedIndices={
                     editFieldsPage === true
                       ? field.values.reduce((prev, curr, index) => {
-                          if (initialValues[key].includes(curr)) {
-                            prev.push(index);
-                          }
-                          return prev;
-                        }, [])
+                        if (initialValues[key].includes(curr)) {
+                          prev.push(index);
+                        }
+                        return prev;
+                      }, [])
                       : field.initialSelectedIndices
                   }
                   maxCanSelect={field.maxCanSelect}
@@ -317,8 +317,8 @@ const PageRegistrationForm = ({ editFieldsPage, initialValues, onEditSubmit }) =
                     <></>
                   )}
                   {field.isRequiredInput !== undefined &&
-                  field.isRequiredInput === true &&
-                  field.label !== undefined ? (
+                    field.isRequiredInput === true &&
+                    field.label !== undefined ? (
                     <p className="text-input-required-star">*</p>
                   ) : (
                     <></>
@@ -417,13 +417,13 @@ const PageRegistrationForm = ({ editFieldsPage, initialValues, onEditSubmit }) =
                         <img className="registration-icon-logo" src={MainFroshLogo}></img>
                         <div>
                           <h1 className="registration-first-step-title">
-                            {'Hello ' +
-                              (user?.preferredName === '' || !user?.preferredName
+                            {'HELLO ' +
+                              ((user?.preferredName === '' || !user?.preferredName
                                 ? user?.firstName
-                                : user?.preferredName)}
+                                : user?.preferredName).toUpperCase())}
                           </h1>
                           <h2 className="registration-first-step-subtitle">
-                            Let&apos;s register for UofT Engineering&apos;s F!rosh Week 2T3
+                            LET&apos;S REGISTER FOR UOFT ENGINEERING&apos;S F!ROSH WEEK 2T4
                           </h2>
                         </div>
                       </div>
@@ -458,15 +458,7 @@ const PageRegistrationForm = ({ editFieldsPage, initialValues, onEditSubmit }) =
                         isDisabled={!canRegister}
                       />
                       <p className="register-terms-of-service" style={{ marginTop: '20px' }}>
-                        If you&apos;re looking to apply for a bursary, click{' '}
-                        <a
-                          href="https://forms.gle/UFajTRoBF8iWah2MA"
-                          target="_blank"
-                          rel="noreferrer"
-                        >
-                          here
-                        </a>{' '}
-                        to submit in an application
+                        Note: We will be making bursary decisions after Frosh week and will refund the amount to the students after the decisions. Our team will reach out to you for more details regarding the bursary program. Bursaries range from partial to complete settlement of the ticket price.
                       </p>
                     </div>
                   ),

diff --git a/client/src/pages/RegistrationSuccess/RegistrationSuccess.jsx b/client/src/pages/RegistrationSuccess/RegistrationSuccess.jsx
@@ -56,22 +56,22 @@ const PageRegistrationSuccess = () => {
             <div className="registration-success-page-container">
               <div className="registration-success-page-step1">
                 <div className="registration-success-page-step1-1-disappear">
-                  <h1 style={{ color: 'var(--black)' }}>Thank you for Registering</h1>
+                  <h1 style={{ color: 'var(--black)' }}>THANK YOU FOR REGISTERING</h1>
                 </div>
                 <div className="registration-success-page-step1-2-disappear">
-                  <h2 style={{ color: 'var(--black)' }}>for F!rosh Week 2T3</h2>
+                  <h2 style={{ color: 'var(--black)' }}>FOR F!ROSH WEEK 2T4</h2>
                   <p style={{ color: 'var(--black)' }} className="registration-success-wait-msg">
                     {`${
                       user.preferredName === '' || !user.preferredName
                         ? user.firstName
                         : user.preferredName
-                    }, your F!rosh group is...`}
+                    }, YOUR F!ROSH GROUP IS...`}
                   </p>
                 </div>
               </div>
               <div className="registration-success-page-step2-disappear">
                 <div className="registration-success-page-step2">
-                  <h1 style={{ color: 'var(--black)' }}>Welcome to...</h1>
+                  <h1 style={{ color: 'var(--black)' }}>WELCOME TO...</h1>
                 </div>
               </div>
               <div className="registration-success-page-step3">
@@ -81,19 +81,19 @@ const PageRegistrationSuccess = () => {
                   </text>
                 </svg>
                 <div className="registration-success-page-step4">
-                  <h2 style={{ color: 'var(--black)' }}>{user.froshGroup + '!'}</h2>
+                  <h2 style={{ color: 'var(--black)' }}>{user.froshGroup.toUpperCase + '!'}</h2>
                 </div>
                 <div className="registration-success-page-step5">
                   <Link to={'/profile'} className="no-link-style">
-                    <Button label="View My F!rosh Profile" />
+                    <Button label="VIEW MY F!ROSH PROFILE" />
                   </Link>
                 </div>
                 <div className="registration-success-page-step6">
                   <Link
                     state={{
-                      name: user.name,
-                      froshGroup: user.froshGroup,
-                      froshGroupIcon: user.froshGroupIcon,
+                      name: user.name.toUpperCase(),
+                      froshGroup: user.froshGroup.toUpperCase(),
+                      froshGroupIcon: user.froshGroupIcon.toUpperCase(),
                     }}
                     to={'/registration-success'}
                     className="no-link-style"

diff --git a/client/src/util/scunt-constants.jsx b/client/src/util/scunt-constants.jsx
@@ -16,7 +16,7 @@ export const rules = {
       sub: 'To compete in the S!cavenger H!unt, one must be:',
       items: [
         'Human, or near human (Engineering Science students will be accepted).',
-        'A F!rosh (2T7!).',
+        'A F!rosh (2T8!).',
         'Currently enrolled within the Faculty of Applied Science and Engineering at the University of Toronto.',
         'Have officially registered for the event via F!rosh Week 2T3.',
       ],

diff --git a/server/src/services/emailAssets/registrationEmail.html b/server/src/services/emailAssets/registrationEmail.html
@@ -70,7 +70,7 @@
       <img class="frosh-logo-main" src="./frosh-main-logo-outline.png" alt="frosh logo" />
       <div class="text-container">
         <h1>Hi ${},</h1>
-        <p><b>Thank you for registering for F!rosh Week 2T3!!!</b></p>
+        <p><b>Thank you for registering for F!rosh Week 243!!!</b></p>
         <p>
           Please find attached your information PDF which includes a receipt of your data and your
           unique QR code that you will use for a variety of activities during F!rosh Week.

diff --git a/server/src/subscribers/newFroshSubscription.js b/server/src/subscribers/newFroshSubscription.js
@@ -87,7 +87,7 @@ newFroshSubscription.process((job, done) => {
             <br />
             <div class="text-container">
               <h1>Hi ${job.data.preferredName},</h1>
-              <p><b>Thank you for registering for F!rosh Week 2T3!!!</b></p>
+              <p><b>Thank you for registering for F!rosh Week 2T4!!!</b></p>
               <p>
                 Please find attached your information PDF which includes a receipt of your data and your
                 unique QR code that you will use for a variety of activities during F!rosh Week.