Merge pull request #805 from UofT-Frosh-Orientation/fontchangesandbugs

Fixed registration success bug and added in font family changes

client/src/App.scss

@@ -198,3 +198,7 @@ a:hover {
     display: none;
   }
 }
+
+.proxima-nova-text {
+  font-family: 'Proxima Nova', sans-serif;
+}

client/src/components/Navbar/NavbarStorybook.jsx

@@ -9,7 +9,7 @@ import MessageIconPurple from '../../assets/navbar/message-solid-purple.svg';
 import HomeIconGrey from '../../assets/navbar/house-solid-grey.svg';
 import AboutIconGrey from '../../assets/navbar/circle-info-solid-grey.svg';
 import MessageIconGrey from '../../assets/navbar/message-solid-grey.svg';
-import MainFroshLogo from '../../assets/logo/frosh-main-logo.svg';
+import MainFroshLogo from '../../assets/logo/main-logo.png';
 
 const pages = {
   main: [

client/src/pages/EmailConfirmed/EmailConfirmed.jsx

@@ -24,8 +24,8 @@ const PageEmailConfirmed = () => {
       {validEmailToken ? (
         <div className="email-confirmed-page">
           <div className="email-confirmed-container">
-            <h1>Perfect!</h1>
-            <h2>Your email is now verified. Head to the login page to get started!</h2>
+            <h1>PERFECT!</h1>
+            <h2 style="font-family: 'Proxima Nova', sans-serif;">Your email is now verified. Head to the login page to get started!</h2>
             <Link to={'/login'} style={{ textDecoration: 'none' }} className={'no-link-style'}>
               <Button label="Login Page" />
             </Link>

client/src/pages/Home/Home.jsx

@@ -77,21 +77,21 @@ const HomeHeaderButton = () => {
             <Button
               label={loggedIn ? 'View Profile' : 'Register Now!'}
               isSecondary
+              // style={{
+              //   margin: '0px',
+              //   height: '100%',
+              //   fontSize: 'unset',
+              //   display: 'flex',
+              //   justifyContent: 'center',
+              //   alignItems: 'center',
+              // }}
+              // hidden button xD
               style={{
-                margin: '0px',
-                height: '100%',
-                fontSize: 'unset',
-                display: 'flex',
-                justifyContent: 'center',
-                alignItems: 'center',
+              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">

client/src/pages/PasswordReset/PasswordReset.jsx

@@ -2,7 +2,7 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { Link, useParams } from 'react-router-dom';
 
 import './PasswordReset.scss';
-import MainFroshLogo from '../../assets/logo/frosh-main-logo-with-bg.svg';
+import MainFroshLogo from '../../assets/logo/main-logo.png';
 import { TextInput } from '../../components/input/TextInput/TextInput';
 import { validateEmail, validatePassword, validatePasswordLength } from '../SignUp/functions';
 import { Button } from '../../components/button/Button/Button';

client/src/pages/RegistrationSuccess/RegistrationSuccess.jsx

@@ -61,11 +61,10 @@ const PageRegistrationSuccess = () => {
                 <div className="registration-success-page-step1-2-disappear">
                   <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.preferredName === '' || !user.preferredName
                         ? user.firstName
                         : user.preferredName
-                    }, YOUR F!ROSH GROUP IS...`}
+                      }, your F!rosh group is`}
                   </p>
                 </div>
               </div>
@@ -81,7 +80,7 @@ const PageRegistrationSuccess = () => {
                   </text>
                 </svg>
                 <div className="registration-success-page-step4">
-                  <h2 style={{ color: 'var(--black)' }}>{user.froshGroup.toUpperCase + '!'}</h2>
+                  <h2 style={{ color: 'var(--black)' }}>{user.froshGroup.toUpperCase() + '!'}</h2>
                 </div>
                 <div className="registration-success-page-step5">
                   <Link to={'/profile'} className="no-link-style">
@@ -91,9 +90,9 @@ const PageRegistrationSuccess = () => {
                 <div className="registration-success-page-step6">
                   <Link
                     state={{
-                      name: user.name.toUpperCase(),
-                      froshGroup: user.froshGroup.toUpperCase(),
-                      froshGroupIcon: user.froshGroupIcon.toUpperCase(),
+                      name: user.name,
+                      froshGroup: user.froshGroup,
+                      froshGroupIcon: user.froshGroupIcon,
                     }}
                     to={'/registration-success'}
                     className="no-link-style"

client/src/pages/SignUp/SignUp.jsx

@@ -242,23 +242,23 @@ const PageSignUp = () => {
           className={`sign-up-success ${pageState === 'success' ? 'sign-up-success-appear' : ''}`}
         >
           <div style={{ margin: 'auto auto' }}>
-            <h2>{`Thank you for creating an account, ${
+            <h2 class="proxima-nova-text">{`Thank you for creating an account, ${
               accountObj['preferredName'] === null ||
               accountObj['preferredName'] === undefined ||
               accountObj['preferredName'] === ''
                 ? accountObj['firstName']
                 : accountObj['preferredName']
             }.`}</h2>
             {accountObj['leadur'] === true ? (
-              <h3>
-                Check your inbox for a link to verify your email. Your account will be reviewed and
+              <h3 class="proxima-nova-text">
+                Check your inbox for an email from [email protected] for a link to verify your email. Your account will be reviewed and
                 shortly become an official Leedur account.
               </h3>
             ) : (
               <>
-                <h1>You aren&apos;t done just yet!</h1>
-                <h3>
-                  Check your inbox for a link to verify your email. You still need to register and
+                <h1 class="proxima-nova-text">You aren&apos;t done just yet!</h1>
+                <h3 class="proxima-nova-text">
+                  Check your inbox for an email from [email protected] a link to verify your email. You still need to register and
                   pay for the F!rosh Week event.
                 </h3>
               </>

server/src/services/emailAssets/registrationEmail.html

@@ -64,10 +64,10 @@
     </style>
   </head>
   <body>
-    <header></header>
+    <header></header>client\src\assets\logo\main-logo.png
     <div class="space-bar"></div>
     <div class="content">
-      <img class="frosh-logo-main" src="./frosh-main-logo-outline.png" alt="frosh logo" />
+      <img class="frosh-logo-main" src="../../../../client/src/assets/logo/main-logo.png" alt="frosh logo" />
       <div class="text-container">
         <h1>Hi ${},</h1>
         <p><b>Thank you for registering for F!rosh Week 2T4!!!</b></p>