From 07a150071a0e76d7d3e7ae6497fd6b42aaa8f139 Mon Sep 17 00:00:00 2001 From: asmita-chandra Date: Tue, 23 Jul 2024 16:30:50 -0400 Subject: [PATCH 01/13] add css styling for the back profile button (changed arrow to white with small purple circle) additionally fixed login svg(from few commits ago) --- .../darkmode/login/background-colour-dark.svg | 2 +- client/src/assets/login/background-colour.svg | 2 +- client/src/pages/ScuntHome/ScuntHome.jsx | 4 +-- client/src/pages/ScuntHome/ScuntHome.scss | 25 ++++++++++++++++--- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/client/src/assets/darkmode/login/background-colour-dark.svg b/client/src/assets/darkmode/login/background-colour-dark.svg index 6f2d695e..f4cea9a9 100644 --- a/client/src/assets/darkmode/login/background-colour-dark.svg +++ b/client/src/assets/darkmode/login/background-colour-dark.svg @@ -1,5 +1,5 @@ - +
Back ); diff --git a/client/src/pages/ScuntHome/ScuntHome.scss b/client/src/pages/ScuntHome/ScuntHome.scss index 6177ca4e..62aa6e18 100644 --- a/client/src/pages/ScuntHome/ScuntHome.scss +++ b/client/src/pages/ScuntHome/ScuntHome.scss @@ -132,11 +132,28 @@ top: 16px; left: 16px; display: inline-block; - background: none; + background: none; } .back-icon { - width: 24px; - height: 24px; + width: 20px; + height: 20px; fill: purple; -} \ No newline at end of file + filter: invert(1) opacity(100%); +} + +.back-button:hover .back-icon, +.back-button:active .back-icon { + filter: invert(1) opacity(50%); +} + +.circle { + position: absolute; + top: -0.5px; /* Adjust as needed */ + left: 50%; + transform: translateX(-52%); + width: 22px; /* Adjust size */ + height: 22px; + background-color: #a04fb9; /* Light purple */ + border-radius: 50%; +} From 3c630a9bdcd4ccbbb8461d4c163a5d966ea4d37d Mon Sep 17 00:00:00 2001 From: asmita-chandra Date: Tue, 23 Jul 2024 17:01:08 -0400 Subject: [PATCH 02/13] fixed the css styling to make it more adaptable for phone screens --- client/src/pages/ScuntHome/ScuntHome.jsx | 27 +++++++++-------------- client/src/pages/ScuntHome/ScuntHome.scss | 24 ++++++++++++++++++++ 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/client/src/pages/ScuntHome/ScuntHome.jsx b/client/src/pages/ScuntHome/ScuntHome.jsx index bf47a2d9..87f3fbc6 100644 --- a/client/src/pages/ScuntHome/ScuntHome.jsx +++ b/client/src/pages/ScuntHome/ScuntHome.jsx @@ -65,22 +65,17 @@ const AboutScunt = () => { {/*
*/} -
- -
-

THE HUNT

- Come participate in the most iconic event that is part of Frosh Week: Skule™ Hunt! -
-
- Skule™ Hunt takes place the night of Wednesday August 28th from 6PM to 11PM. It - is completely free, so hurry and sign up by clicking YES on your registration! -
-
- {/*
*/} - {/*

- CHECK THE RULES FOR MORE INFORMATION -

*/} -
+ + +
+

THE HUNT

+ Come participate in the most iconic event that is part of Frosh Week: Skule™ Hunt! +
+
+ Skule™ Hunt takes place the night of Wednesday August 28th from 6PM to 11PM. It + is completely free, so hurry and sign up by clicking YES on your registration! +
+
diff --git a/client/src/pages/ScuntHome/ScuntHome.scss b/client/src/pages/ScuntHome/ScuntHome.scss index 62aa6e18..3d6dfef6 100644 --- a/client/src/pages/ScuntHome/ScuntHome.scss +++ b/client/src/pages/ScuntHome/ScuntHome.scss @@ -60,6 +60,8 @@ .about-scunt-content { color: var(--text-white); width: 100%; + display: flex; + align-items: center; h4 { font-size: 22px; } @@ -67,6 +69,28 @@ color: var(--text-link-for-dark); } } + +.about-scunt-content img { + width: 300px; + margin: 20px; +} + +.about-scunt-content .text-content { + display: block; +} + +@media (max-width: 768px) { + .about-scunt-content { + flex-direction: column; + align-items: flex-start; + } + + .about-scunt-content img { + width: 100%; /* Adjust as needed */ + margin: 10px 0; + } +} + .about-scunt-token { padding: 20px; float: right; From 7abf5037a194e9987c205ebad6f80fcb6d2fc196 Mon Sep 17 00:00:00 2001 From: alissaxx Date: Tue, 23 Jul 2024 22:48:29 -0400 Subject: [PATCH 03/13] added new logo and waiver files --- client/src/assets/mascots/dragon-retreat.svg | 185 ++++++++++++++++++ .../frosh-retreat-2T4-waiver.pdf | Bin 0 -> 23915 bytes 2 files changed, 185 insertions(+) create mode 100644 client/src/assets/mascots/dragon-retreat.svg create mode 100644 client/src/assets/retreatWaiver/frosh-retreat-2T4-waiver.pdf diff --git a/client/src/assets/mascots/dragon-retreat.svg b/client/src/assets/mascots/dragon-retreat.svg new file mode 100644 index 00000000..e108bce4 --- /dev/null +++ b/client/src/assets/mascots/dragon-retreat.svg @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/client/src/assets/retreatWaiver/frosh-retreat-2T4-waiver.pdf b/client/src/assets/retreatWaiver/frosh-retreat-2T4-waiver.pdf new file mode 100644 index 0000000000000000000000000000000000000000..99313f737c5cea89e1e7e2853ab376c2f091adfc GIT binary patch literal 23915 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 Date: Tue, 23 Jul 2024 23:25:06 -0400 Subject: [PATCH 04/13] updated retreat page info --- client/src/pages/FroshRetreat/FroshRetreat.jsx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/client/src/pages/FroshRetreat/FroshRetreat.jsx b/client/src/pages/FroshRetreat/FroshRetreat.jsx index 0450ea2a..2dcbf586 100644 --- a/client/src/pages/FroshRetreat/FroshRetreat.jsx +++ b/client/src/pages/FroshRetreat/FroshRetreat.jsx @@ -9,10 +9,10 @@ import { useSelector } from 'react-redux'; import { RadioButtons } from '../../components/form/RadioButtons/RadioButtons'; import { ErrorSuccessBox } from '../../components/containers/ErrorSuccessBox/ErrorSuccessBox'; import { SnackbarContext } from '../../util/SnackbarProvider'; -import waiverPDF from '../../assets/retreatWaiver/frosh-retreat-2T3-waiver.pdf'; +import waiverPDF from '../../assets/retreatWaiver/frosh-retreat-2T4-waiver.pdf'; import useAxios from '../../hooks/useAxios'; import { SingleAccordion } from '../../components/text/Accordion/SingleAccordion/SingleAccordion'; -import egglinton from '../../assets/mascots/Egglinton-1.png'; +import dragon from '../../assets/mascots/dragon-retreat.svg'; export const FroshRetreat = () => { const [remainingTickets, setRemainingTickets] = useState(); @@ -43,8 +43,7 @@ export const FroshRetreat = () => { ESCAPE THE CITY TO THE LOVELY HART HOUSE FARMS FOR A WEEKEND OF WHOLESOME CAMP VIBES!

- The retreat is taking place on August 31st and September 1st, 2024 at Hart House - Farm. + The retreat is taking place on August 31st and September 1st, 2024 at Hart House Farm.

Due to limited spaces, we are selling a limited number of tickets so purchase yours @@ -130,7 +129,7 @@ const FroshRetreatFAQ = () => { alignSelf: 'center', }} > - +

GET MOO-VING WITH OUR FAQS: PREPARE FOR A GOOD TIME DOWN ON THE FARM!

@@ -188,7 +187,7 @@ const RetreatRegistration = () => { const [waiverValue, setWaiverValue] = useState(); const [buttonClicked, setButtonClicked] = useState(false); - const waiverLink = '../../assests/retreatWaiver/frosh-retreat-2T3-waiver.pdf'; + const waiverLink = '../../assests/retreatWaiver/frosh-retreat-2T4-waiver.pdf'; const { user } = useSelector(userSelector); const { setSnackbar } = useContext(SnackbarContext); From 50bff4d836211534e3142f8d4de67bfdf5d8bbf4 Mon Sep 17 00:00:00 2001 From: Gaurika Mahajan Date: Wed, 24 Jul 2024 00:55:11 -0400 Subject: [PATCH 05/13] Changed retreat price to be $103 --- client/src/pages/FroshRetreat/FroshRetreat.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/pages/FroshRetreat/FroshRetreat.jsx b/client/src/pages/FroshRetreat/FroshRetreat.jsx index 2dcbf586..8635f15b 100644 --- a/client/src/pages/FroshRetreat/FroshRetreat.jsx +++ b/client/src/pages/FroshRetreat/FroshRetreat.jsx @@ -50,7 +50,7 @@ export const FroshRetreat = () => { before they sell out!{' '}

- Tickets to Retreat are $95.00 (they include bus transportation; no tickets without + Tickets to Retreat are $103.00 (they include bus transportation; no tickets without bus transportation)

From 7ed43c4a382fa2c86358df03ce98cf05befac567 Mon Sep 17 00:00:00 2001 From: asmita-chandra Date: Wed, 24 Jul 2024 09:42:15 -0400 Subject: [PATCH 06/13] fixed the slider such that min and max percentage is accurately shown on site --- client/src/pages/ScuntJudgeForm/ScuntJudgeForm.jsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/src/pages/ScuntJudgeForm/ScuntJudgeForm.jsx b/client/src/pages/ScuntJudgeForm/ScuntJudgeForm.jsx index 40ce6da4..344de4cb 100644 --- a/client/src/pages/ScuntJudgeForm/ScuntJudgeForm.jsx +++ b/client/src/pages/ScuntJudgeForm/ScuntJudgeForm.jsx @@ -553,11 +553,12 @@ const ScuntMissionSelection = ({ missions, teams, teamObjs }) => { return; } const maxPoints = - parseInt(assignedMission?.points) + + //parseInt(assignedMission?.points) + parseInt(assignedMission?.points * maxAmountPointsPercent); const minPoints = - parseInt(assignedMission?.points) - + // parseInt(assignedMission?.points) - parseInt(assignedMission?.points * minAmountPointsPercent); + if (value === '' || value === undefined) { setAssignedPoints(assignedMission?.points); } else if (parseInt(value) >= maxPoints) { @@ -590,11 +591,11 @@ const ScuntMissionSelection = ({ missions, teams, teamObjs }) => { value={assignedPoints} defaultValue={parseInt(assignedMission?.points)} max={ - parseInt(assignedMission?.points) + + //parseInt(assignedMission?.points) + parseInt(assignedMission?.points * maxAmountPointsPercent) } min={ - parseInt(assignedMission?.points) - + //parseInt(assignedMission?.points) - parseInt(assignedMission?.points * minAmountPointsPercent) } className="horizontal-slider" From 6064007135db3c6a3e4c337e04158f2b553b24ed Mon Sep 17 00:00:00 2001 From: asmita-chandra Date: Wed, 24 Jul 2024 10:01:36 -0400 Subject: [PATCH 07/13] make the default settings 1.5 and 0.5 for max and min and add a decription explaining what max and min are --- .../pages/ScuntGameSettings/ScuntGameSettings.jsx | 12 ++++++------ server/src/models/ScuntGameSettingsModel.js | 8 ++++---- server/test/services/ScuntMissionServices.test.js | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/client/src/pages/ScuntGameSettings/ScuntGameSettings.jsx b/client/src/pages/ScuntGameSettings/ScuntGameSettings.jsx index f5d4c8ec..4b4a688d 100644 --- a/client/src/pages/ScuntGameSettings/ScuntGameSettings.jsx +++ b/client/src/pages/ScuntGameSettings/ScuntGameSettings.jsx @@ -43,15 +43,15 @@ const scuntSettingsInfo = [ parameter: 'Max Amount of Points', key: 'maxAmountPointsPercent', description: - 'The max amount of points allowed to be given out over the recommended amount for missions', - placeholder: 0.3, + 'The max percentage of points allowed to be given out (enter as decimal value: 1.5 = 150%)', + placeholder: 1.5, }, { parameter: 'Min Amount of Points', key: 'minAmountPointsPercent', description: - 'The min amount of points allowed to be given out over the recommended amount for missions', - placeholder: 0.3, + 'The min percentage of points allowed to be given out (enter as decimal value: 0.5 = 50%)', + placeholder: 0.5, }, ]; @@ -103,8 +103,8 @@ const ScuntGameSettings = () => { name: 'Scunt 2T3 Settings', amountOfTeams: 10, amountOfStarterBribePoints: 2500, - maxAmountPointsPercent: 0.3, - minAmountPointsPercent: 0.3, + maxAmountPointsPercent: 1.5, + minAmountPointsPercent: 0.5, revealJudgesAndBribes: true, revealTeams: true, showDiscordLink: true, diff --git a/server/src/models/ScuntGameSettingsModel.js b/server/src/models/ScuntGameSettingsModel.js index e439a02c..126a7a07 100644 --- a/server/src/models/ScuntGameSettingsModel.js +++ b/server/src/models/ScuntGameSettingsModel.js @@ -18,17 +18,17 @@ const ScuntGameSettingSchema = new mongoose.Schema({ required: false, default: 10000, }, - // The max amount of points allowed to be given out over the recommended amount for missions + // The max percentage of points allowed to be given out (enter as decimal value: 1.5 = 150) maxAmountPointsPercent: { type: Number, required: false, - default: 0.3, + default: 1.5, }, - // The min amount of points allowed to be given out over the recommended amount for missions + // The min percentage of points allowed to be given out (enter as decimal value: 0.5 = 50) minAmountPointsPercent: { type: Number, required: false, - default: 0.3, + default: 0.5, }, revealJudgesAndBribes: { type: Boolean, diff --git a/server/test/services/ScuntMissionServices.test.js b/server/test/services/ScuntMissionServices.test.js index 03c86aa7..44dfeeaf 100644 --- a/server/test/services/ScuntMissionServices.test.js +++ b/server/test/services/ScuntMissionServices.test.js @@ -61,8 +61,8 @@ describe('ScuntMissionServices', () => { name: 'Scunt 2T3 Settings', amountOfTeams: 10, amountOfStarterBribePoints: 10000, - maxAmountPointsPercent: 0.3, - minAmountPointsPercent: 0.3, + maxAmountPointsPercent: 1.5, + minAmountPointsPercent: 0.5, revealJudgesAndBribes: true, revealTeams: true, showDiscordLink: true, From 444f99fd98e72f040f397786628d70064b9aedd8 Mon Sep 17 00:00:00 2001 From: Gaurika Mahajan Date: Thu, 25 Jul 2024 00:43:07 -0400 Subject: [PATCH 08/13] Minor changes to retreat page --- client/src/pages/FroshRetreat/FroshRetreat.jsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/client/src/pages/FroshRetreat/FroshRetreat.jsx b/client/src/pages/FroshRetreat/FroshRetreat.jsx index 8635f15b..35d2c542 100644 --- a/client/src/pages/FroshRetreat/FroshRetreat.jsx +++ b/client/src/pages/FroshRetreat/FroshRetreat.jsx @@ -112,6 +112,13 @@ const retreatFAQs = [ '• Anything appropriate for a 36-hour camping trip on a farm!', ], }, + { + title: + 'What time does the bus leave?', + description: [ + 'The bus leaves from campus at 11:00am on August 31st and returns to campus at 1:00pm on September 1st.', + ], + } ]; const FroshRetreatFAQ = () => { @@ -131,7 +138,7 @@ const FroshRetreatFAQ = () => { >

- GET MOO-VING WITH OUR FAQS: PREPARE FOR A GOOD TIME DOWN ON THE FARM! + FAQS: PREPARE FOR A GOOD TIME DOWN ON THE FARM!

{retreatFAQs.map((item, index) => { const [isOpen, setIsOpen] = useState(false); From 3e771e04648c2c0337ebb23951abc6d3e770ca97 Mon Sep 17 00:00:00 2001 From: George Fan Date: Tue, 30 Jul 2024 13:31:38 -0400 Subject: [PATCH 09/13] Added FAQ about frosh deadline --- client/src/pages/FAQ/functions.jsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/client/src/pages/FAQ/functions.jsx b/client/src/pages/FAQ/functions.jsx index b16ac5fb..8d38f2b5 100644 --- a/client/src/pages/FAQ/functions.jsx +++ b/client/src/pages/FAQ/functions.jsx @@ -72,6 +72,13 @@ export async function getQuestions(setSnackbar) { lastUpdated: '12:30pm, Jun 22, 2024', category: 'Registration', }, + { + question: 'When is the deadline to register for F!rosh week?', + answer: + 'No deadline technically. But you should sign up before August 26th if they want to take part in all of the activities!', + lastUpdated: '13:30pm, Jun 30, 2024', + category: 'Registration', + }, /*{ question: 'What are in the F!rosh Kits?', answer: From 5b7242ff0512c180f998eb270d4342584874a46d Mon Sep 17 00:00:00 2001 From: chocoboash Date: Tue, 30 Jul 2024 19:56:05 -0400 Subject: [PATCH 10/13] set isViewed and isUploaded to true when file has already been uploaded into database, include message for pdf size limit --- client/src/pages/FroshRetreat/FroshRetreat.jsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/client/src/pages/FroshRetreat/FroshRetreat.jsx b/client/src/pages/FroshRetreat/FroshRetreat.jsx index 033673d9..43d5586b 100644 --- a/client/src/pages/FroshRetreat/FroshRetreat.jsx +++ b/client/src/pages/FroshRetreat/FroshRetreat.jsx @@ -227,6 +227,13 @@ const RetreatRegistration = () => { outOfTicketsSetter(); }, []); + useEffect(() => { + if (isWaiverUploaded) { + setViewedWaiver(true); + setIsUploaded(true); + } + }, [isWaiverUploaded]); + const handleFileChange = (event) => { setFile(event.target.files[0]); }; @@ -334,7 +341,7 @@ const RetreatRegistration = () => {

UPLOAD SIGNED WAIVER:

-

Only PDF files are accepted

+

Only PDF files under 1 MB are accepted

{viewedWaiver ? ( <> From 914006f94d0db92cdf0b19ab6f90923424878a1b Mon Sep 17 00:00:00 2001 From: Gaurika Mahajan Date: Tue, 30 Jul 2024 22:30:46 -0400 Subject: [PATCH 11/13] Removed qr code from email and edited frosh subscription / confirmation email contents --- .../components/MakeReceipt/MakeReceipt.jsx | 62 +++++++++---------- server/src/controllers/FroshController.js | 1 + .../emailAssets/registrationEmail.html | 23 +++---- .../src/subscribers/newFroshSubscription.js | 25 ++++---- 4 files changed, 57 insertions(+), 54 deletions(-) diff --git a/client/src/components/MakeReceipt/MakeReceipt.jsx b/client/src/components/MakeReceipt/MakeReceipt.jsx index 1962932c..e6886d27 100644 --- a/client/src/components/MakeReceipt/MakeReceipt.jsx +++ b/client/src/components/MakeReceipt/MakeReceipt.jsx @@ -9,42 +9,42 @@ const MakeReceipt = (froshObject) => { throw new Error('No ID provided to MakeReceipt.jsx'); } - const qr = ( - - ); + // const qr = ( + // + // ); - const qr64 = ReactDOMServer.renderToString(qr); + // const qr64 = ReactDOMServer.renderToString(qr); // create dummy element to hold the children const svgg = document.createElement('div'); - svgg.innerHTML = qr64; + // svgg.innerHTML = qr64; const svg = svgg.childNodes[0]; let currKey = 1, - t1 = [], + // t1 = [], t2 = []; - svg.childNodes.forEach((node, key, parent) => { - t1.push( - , - ); - currKey++; - }); + // svg.childNodes.forEach((node, key, parent) => { + // t1.push( + // , + // ); + // currKey++; + // }); // All nonintrusive displayable form information const irrelevantFields = [ @@ -84,7 +84,7 @@ const MakeReceipt = (froshObject) => { backgroundColor: '#E4E4E4', }} > - { > {t1} - + Your Unique QRCode - + */} Please check all of your information to ensure it is correct. If you need to make any diff --git a/server/src/controllers/FroshController.js b/server/src/controllers/FroshController.js index 53a9c1eb..6dc07426 100644 --- a/server/src/controllers/FroshController.js +++ b/server/src/controllers/FroshController.js @@ -32,6 +32,7 @@ const FroshController = { user: user.getResponseObject(), }); newFroshSubscription.add({ + firstName: user.firstName, preferredName: user.preferredName, email: user.email, file: req.file, diff --git a/server/src/services/emailAssets/registrationEmail.html b/server/src/services/emailAssets/registrationEmail.html index a25c582b..a7365977 100644 --- a/server/src/services/emailAssets/registrationEmail.html +++ b/server/src/services/emailAssets/registrationEmail.html @@ -49,6 +49,7 @@ .text-container p { font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif; font-size: 20px; + color: white; } a { color: #a77ad7; @@ -70,24 +71,26 @@ frosh logo

Hi ${},

-

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

+

Thank you for inputting your information on your Frosh Week 2T4 account!!

- 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. + This email is NOT A CONFIRMATION OF REGISTRATION. To confirm that you have registered (filled out your information AND paid the registration fee) + you will see your group name and a QR code on your profile when you login to your profile on orientation.skule.ca. + This QR code will be important for signing into numerous events during F!rosh Week.


-

We look forward to seeing you soon!

+

If you do not see these two items (group name and QR code), make sure you complete your payment to secure your spot at F!rosh Week 2T4! This can be found on the + payment page when you hit “Pay Now.” +


To keep up to date with all the info you need to know before you arrive here for orientation, and to learn more about our meetup events running over the summer make sure - to follow our Instagram page @froshweek or check us - out on our other social media platforms. + to follow our Instagram page @froshweek and join our Discord community!


If you have any questions or want to learn more feel free to email us at - orientation@skule.ca! + marketing@orientation.skule.ca!


With HYPE,
F!rosh Week Orientation Committee

@@ -103,11 +106,9 @@

Hi ${},

+ >
diff --git a/server/src/subscribers/newFroshSubscription.js b/server/src/subscribers/newFroshSubscription.js index 7b2136e7..4f5735a4 100644 --- a/server/src/subscribers/newFroshSubscription.js +++ b/server/src/subscribers/newFroshSubscription.js @@ -61,6 +61,7 @@ newFroshSubscription.process((job, done) => { .text-container p { font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif; font-size: 20px; + color: white; } a { color: #a77ad7; @@ -86,25 +87,27 @@ newFroshSubscription.process((job, done) => { />
-

Hi ${job.data.preferredName},

-

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

+

Hi ${job.data.preferredName ? job.data.preferredName : job.data.firstName},

+

Thank you for inputting your information on your Frosh Week 2T4 account!!

- 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. + This email is NOT A CONFIRMATION OF REGISTRATION. To confirm that you have registered (filled out your information AND paid the registration fee) + you will see your group name and a QR code on your profile when you login to your profile on orientation.skule.ca. + This QR code will be important for signing into numerous events during F!rosh Week.


-

We look forward to seeing you soon!

+

If you do not see these two items (group name and QR code), make sure you complete your payment to secure your spot at F!rosh Week 2T4! This can be found on the + payment page when you hit “Pay Now.” +


To keep up to date with all the info you need to know before you arrive here for orientation, and to learn more about our meetup events running over the summer make sure - to follow our Instagram page @froshweek or check us - out on our other social media platforms. + to follow our Instagram page @froshweek and join our Discord community!


If you have any questions or want to learn more feel free to email us at - orientation@skule.ca! + marketing@orientation.skule.ca!


With HYPE,
F!rosh Week Orientation Committee

@@ -123,11 +126,9 @@ newFroshSubscription.process((job, done) => { src="cid:instagrambrands" alt="instagram logo" class="social-icon" /> + >
Date: Tue, 30 Jul 2024 23:42:25 -0400 Subject: [PATCH 12/13] tweak grammar a bit --- client/src/pages/FAQ/functions.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/pages/FAQ/functions.jsx b/client/src/pages/FAQ/functions.jsx index 8d38f2b5..6f85a97b 100644 --- a/client/src/pages/FAQ/functions.jsx +++ b/client/src/pages/FAQ/functions.jsx @@ -75,7 +75,7 @@ export async function getQuestions(setSnackbar) { { question: 'When is the deadline to register for F!rosh week?', answer: - 'No deadline technically. But you should sign up before August 26th if they want to take part in all of the activities!', + 'No official deadline, but you should sign up before August 26th if you want to participate in all of the activities!', lastUpdated: '13:30pm, Jun 30, 2024', category: 'Registration', }, From cb21d9d6d5bbba7f55965e6458ee11d1fc4e690e Mon Sep 17 00:00:00 2001 From: Gaurika Mahajan Date: Tue, 30 Jul 2024 23:42:54 -0400 Subject: [PATCH 13/13] Unhiding retreat tab --- client/src/pages/Profile/PageProfileFrosh.jsx | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/client/src/pages/Profile/PageProfileFrosh.jsx b/client/src/pages/Profile/PageProfileFrosh.jsx index 6effa271..b5c23e9b 100644 --- a/client/src/pages/Profile/PageProfileFrosh.jsx +++ b/client/src/pages/Profile/PageProfileFrosh.jsx @@ -54,7 +54,7 @@ const PageProfileFrosh = () => {
{user?.attendingScunt === true ? : null} - {/* {isRegistered ? : null} */} + {/* */} @@ -88,7 +88,7 @@ const ProfilePageRetreat = () => { remainingTicketsSetter(); }, []); - if (!isRegistered || (remainingTickets <= 0 && !isRetreat)) { + if (remainingTickets <= 0 && !isRetreat) { return null; } return ( @@ -173,7 +173,11 @@ const ProfilePageFroshScuntMessage = () => { return (
- Skule™ Hunt + Skule™ Hunt

SKULE™ HUNT

Find more information about The Hunt by clicking here!

@@ -228,14 +232,17 @@ const ProfilePageFroshHeader = ({ editButton }) => {

{froshYear}

{editButton !== false ? ( - // {editButton !== false && isRegistered ? ( - + // {editButton !== false && isRegistered ? ( + {'edit'} - // - // {'edit'} - // - ) : null} + ) : // + // {'edit'} + // + null}