diff --git a/client/src/assets/logo/frosh-hard-hat-white.png b/client/src/assets/logo/frosh-hard-hat-white.png new file mode 100644 index 00000000..862b9ebd Binary files /dev/null and b/client/src/assets/logo/frosh-hard-hat-white.png differ diff --git a/client/src/components/Navbar/NavbarStorybook.jsx b/client/src/components/Navbar/NavbarStorybook.jsx index d0a57530..ee4c1882 100644 --- a/client/src/components/Navbar/NavbarStorybook.jsx +++ b/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: [ diff --git a/client/src/pages/EmailConfirmed/EmailConfirmed.jsx b/client/src/pages/EmailConfirmed/EmailConfirmed.jsx index c91f4262..a39d296d 100644 --- a/client/src/pages/EmailConfirmed/EmailConfirmed.jsx +++ b/client/src/pages/EmailConfirmed/EmailConfirmed.jsx @@ -24,8 +24,8 @@ const PageEmailConfirmed = () => { {validEmailToken ? (
-

Perfect!

-

Your email is now verified. Head to the login page to get started!

+

PERFECT!

+

Your email is now verified. Head to the login page to get started!

diff --git a/client/src/pages/PasswordReset/PasswordReset.jsx b/client/src/pages/PasswordReset/PasswordReset.jsx index 3fec91a4..b87b0e2f 100644 --- a/client/src/pages/PasswordReset/PasswordReset.jsx +++ b/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'; diff --git a/client/src/pages/RegistrationSuccess/RegistrationSuccess.jsx b/client/src/pages/RegistrationSuccess/RegistrationSuccess.jsx index 9ed4b674..7932fbda 100644 --- a/client/src/pages/RegistrationSuccess/RegistrationSuccess.jsx +++ b/client/src/pages/RegistrationSuccess/RegistrationSuccess.jsx @@ -61,11 +61,10 @@ const PageRegistrationSuccess = () => {

FOR F!ROSH WEEK 2T4

- {`${ - user.preferredName === '' || !user.preferredName + {`${user.preferredName === '' || !user.preferredName ? user.firstName : user.preferredName - }, YOUR F!ROSH GROUP IS...`} + }, your F!rosh group is`}

@@ -81,7 +80,7 @@ const PageRegistrationSuccess = () => {
-

{user.froshGroup.toUpperCase + '!'}

+

{user.froshGroup.toUpperCase() + '!'}

@@ -91,9 +90,9 @@ const PageRegistrationSuccess = () => {
{ className={`sign-up-success ${pageState === 'success' ? 'sign-up-success-appear' : ''}`} >
-

{`Thank you for creating an account, ${ +

{`Thank you for creating an account, ${ accountObj['preferredName'] === null || accountObj['preferredName'] === undefined || accountObj['preferredName'] === '' @@ -250,15 +250,15 @@ const PageSignUp = () => { : accountObj['preferredName'] }.`}

{accountObj['leadur'] === true ? ( -

- Check your inbox for a link to verify your email. Your account will be reviewed and +

+ Check your inbox for an email from tech@orientation.skule.ca for a link to verify your email. Your account will be reviewed and shortly become an official Leedur account.

) : ( <> -

You aren't done just yet!

-

- Check your inbox for a link to verify your email. You still need to register and +

You aren't done just yet!

+

+ Check your inbox for an email from tech@orientation.skule.cafor a link to verify your email. You still need to register and pay for the F!rosh Week event.

diff --git a/server/src/services/emailAssets/frosh-hard-hat-white.png b/server/src/services/emailAssets/frosh-hard-hat-white.png index 318efd64..862b9ebd 100644 Binary files a/server/src/services/emailAssets/frosh-hard-hat-white.png and b/server/src/services/emailAssets/frosh-hard-hat-white.png differ diff --git a/server/src/services/emailAssets/frosh-main-logo-outline.png b/server/src/services/emailAssets/frosh-main-logo-outline.png index 4179a26b..a14ed6a4 100644 Binary files a/server/src/services/emailAssets/frosh-main-logo-outline.png and b/server/src/services/emailAssets/frosh-main-logo-outline.png differ diff --git a/server/src/services/emailAssets/registrationEmail.html b/server/src/services/emailAssets/registrationEmail.html index 6b38887a..a25c582b 100644 --- a/server/src/services/emailAssets/registrationEmail.html +++ b/server/src/services/emailAssets/registrationEmail.html @@ -64,10 +64,10 @@ -
+
client\src\assets\logo\main-logo.png
- frosh logo + frosh logo

Hi ${},

Thank you for registering for F!rosh Week 2T4!!!