diff --git a/client/src/assets/schedule/data.jsx b/client/src/assets/schedule/data.jsx index 553a4b3d..400dddda 100644 --- a/client/src/assets/schedule/data.jsx +++ b/client/src/assets/schedule/data.jsx @@ -164,9 +164,9 @@ Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -379,9 +379,9 @@ export const dataBeta = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -602,9 +602,9 @@ export const dataChi = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -825,9 +825,9 @@ export const dataDelta = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -1048,9 +1048,9 @@ export const dataGamma = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -1273,9 +1273,9 @@ export const dataIota = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -1498,9 +1498,9 @@ export const dataKappa = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -1723,9 +1723,9 @@ export const dataLambda = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -1948,9 +1948,9 @@ export const dataNu = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -2171,9 +2171,9 @@ export const dataOmega = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -2396,9 +2396,9 @@ export const dataOmicron = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -2619,9 +2619,9 @@ export const dataPhi = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -2844,9 +2844,9 @@ export const dataPi = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -3067,9 +3067,9 @@ export const dataPsi = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -3298,9 +3298,9 @@ export const dataRho = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -3529,9 +3529,9 @@ export const dataSigma = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -3760,9 +3760,9 @@ export const dataTau = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -3985,9 +3985,9 @@ export const dataTheta = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -4208,9 +4208,9 @@ export const dataUpsilon = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', @@ -4431,9 +4431,9 @@ export const dataZeta = { Color: 'yellow', }, { - 'Event Name': 'SkavENGer Hunt!', + 'Event Name': 'Skule Hunt!', 'Event Description': - "SkavENGer Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", + "Skule Hunt!: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!\nNitelife: You thought F!rosh week stopped at 6:00 pm? Think again we have activities every day of F!rosh Week for you to engage in! More details during the event on your Profile page.", 'Start Time': '18:00:00 a1/p1', 'End Time': 'Late', Color: 'dark-purple', diff --git a/client/src/pages/Profile/PageProfileFrosh.jsx b/client/src/pages/Profile/PageProfileFrosh.jsx index 6c612b82..fb18f995 100644 --- a/client/src/pages/Profile/PageProfileFrosh.jsx +++ b/client/src/pages/Profile/PageProfileFrosh.jsx @@ -175,7 +175,7 @@ const ProfilePageFroshScuntMessage = () => {
Scunt
-

SkavENGer Hunt!

+

Skule Hunt!

Find more information about The Hunt by clicking here!

diff --git a/client/src/pages/Profile/PageProfileLeader.jsx b/client/src/pages/Profile/PageProfileLeader.jsx index bf43e218..921ad7a2 100644 --- a/client/src/pages/Profile/PageProfileLeader.jsx +++ b/client/src/pages/Profile/PageProfileLeader.jsx @@ -101,7 +101,7 @@ export const ProfilePageLeaderScuntMessage = () => {
Scunt
-

SkavENGer Hunt!!

+

Skule Hunt!!

Find more information about Scunt by clicking here!

diff --git a/client/src/pages/Registration/RegistrationFields.jsx b/client/src/pages/Registration/RegistrationFields.jsx index 8c26abe8..5479b3f8 100644 --- a/client/src/pages/Registration/RegistrationFields.jsx +++ b/client/src/pages/Registration/RegistrationFields.jsx @@ -271,7 +271,7 @@ export const fields = { }, HealthSafety: { medicalInfo: { - type: 'dropdown', + type: 'radio', values: ['Yes', 'No'], initialSelectedIndex: 1, label: 'Medical Conditions', @@ -375,7 +375,7 @@ export const fields = { }, }, accommodation: { - type: 'dropdown', + type: 'radio', label: 'Would you like us to reach out to you about how we can best accommodate you?', values: ['Yes', 'No'], initialSelectedIndex: 0, @@ -396,9 +396,9 @@ export const fields = { localStorageKey: 'registration-shirtSize', }, attendingScunt: { - type: 'dropdown', + type: 'radio', label: - 'Would you like to participate in SkavENGer Hunt!? (It will take place on the evening of Wednesday, August 28th)', + 'Would you like to participate in Skule Hunt!? (It will take place on the evening of Wednesday, August 28th)', values: ['Yes', 'No'], initialSelectedIndex: 0, localStorageKey: 'registration-scunt', @@ -408,20 +408,11 @@ export const fields = { scuntInfo: { type: 'label', label: - "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.", + "What is Skule Hunt!? Skule 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: { - type: 'dropdown', - label: 'Would you be interested in attending a carnival with other UofT Departments?', - values: ['Yes', 'No'], - initialSelectedIndex: 0, - isRequiredInput: false, - noEdit: false, - localStorageKey: 'registration-attendingNiteLifeCarnival', - }, attendingRetreat: { - type: 'dropdown', + type: 'radio', label: 'Would you like to attend an overnight retreat on August 31st-September 1st at Hart House Farms (at an additional cost)?', values: ['Yes', 'No'], @@ -432,7 +423,7 @@ export const fields = { }, summerLocationQuery: { - type: 'dropdown', + type: 'radio', label: 'Will you be based in Toronto or the GTA over the summer? (or would you be available for events)', values: ['Yes', 'No'], @@ -451,8 +442,8 @@ export const fields = { noEdit: false, localStorageKey: 'registration-moveToToronto', }, - bursary: { - type: 'dropdown', + bursaryRequested: { + type: 'radio', label: 'Do you require any bursary or financial aid for your Frosh Week ticket?', values: ['Yes', 'No'], initialSelectedIndex: 0, @@ -461,7 +452,7 @@ export const fields = { localStorageKey: 'registration-bursary', }, photograph: { - type: 'dropdown', + type: 'radio', label: 'Are you okay with being photographed during Frosh Week?', values: ['Yes', 'No'], initialSelectedIndex: 0, diff --git a/client/src/pages/Registration/RegistrationForm.jsx b/client/src/pages/Registration/RegistrationForm.jsx index ec3e44fb..ef2452c2 100644 --- a/client/src/pages/Registration/RegistrationForm.jsx +++ b/client/src/pages/Registration/RegistrationForm.jsx @@ -48,46 +48,18 @@ const PageRegistrationForm = ({ editFieldsPage, initialValues, onEditSubmit }) = return setCanRegister(true); } else { try { - - const convertedFroshObject = { ...froshObject }; - - // Convert string values to booleans - if (convertedFroshObject.attendingScunt === 'Yes') { - convertedFroshObject.attendingScunt = true; - } else if (convertedFroshObject.attendingScunt === 'No') { - convertedFroshObject.attendingScunt = false; - } - - if (convertedFroshObject.photograph === 'Yes') { - convertedFroshObject.photograph = true; - } else if (convertedFroshObject.photograph === 'No') { - convertedFroshObject.photograph = false; - } - - if (convertedFroshObject.accommodation === 'Yes') { - convertedFroshObject.accommodation = true; - } else if (convertedFroshObject.accommodation === 'No') { - convertedFroshObject.accommodation = false; - } - - if (convertedFroshObject.summerLocationQuery === 'Yes') { - convertedFroshObject.summerLocationQuery = true; - } else if (convertedFroshObject.summerLocationQuery === 'No') { - convertedFroshObject.summerLocationQuery = false; - } - let formData = new FormData(); - for (const [key, value] of Object.entries(convertedFroshObject)) { + for (const [key, value] of Object.entries(froshObject)) { if (value === undefined) continue; formData.append(key, value); } // for (let [key, value] of formData.entries()) { // console.log(`${key}: ${value}`); // } - convertedFroshObject['id'] = user.id; + froshObject['id'] = user.id; const ReactPDF = await import('@react-pdf/renderer'); const { MakeReceipt } = await import('../../components/MakeReceipt/MakeReceipt'); - const dataReceipt = await ReactPDF.pdf(MakeReceipt(convertedFroshObject)).toBlob(); + const dataReceipt = await ReactPDF.pdf(MakeReceipt(froshObject)).toBlob(); formData.append('dataReceipt', dataReceipt); // console.log(formData) // console.log("form data executed") @@ -279,11 +251,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 +289,8 @@ const PageRegistrationForm = ({ editFieldsPage, initialValues, onEditSubmit }) = <> )} {field.isRequiredInput !== undefined && - field.isRequiredInput === true && - field.label !== undefined ? ( + field.isRequiredInput === true && + field.label !== undefined ? (

*

) : ( <> @@ -418,9 +390,11 @@ const PageRegistrationForm = ({ editFieldsPage, initialValues, onEditSubmit }) =

{'HELLO ' + - ((user?.preferredName === '' || !user?.preferredName - ? user?.firstName - : user?.preferredName).toUpperCase())} + (user && (user.preferredName === '' || !user.preferredName) + ? user.firstName + : user + ? user.preferredName.toUpperCase() + : '')}

LET'S REGISTER FOR UOFT ENGINEERING'S F!ROSH WEEK 2T4 @@ -458,7 +432,10 @@ const PageRegistrationForm = ({ editFieldsPage, initialValues, onEditSubmit }) = isDisabled={!canRegister} />

- 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. + 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.

), diff --git a/client/src/util/scunt-judges.jsx b/client/src/util/scunt-judges.jsx index 6e6a21c2..4060c79d 100644 --- a/client/src/util/scunt-judges.jsx +++ b/client/src/util/scunt-judges.jsx @@ -296,7 +296,7 @@ export const scuntJudges = [ 'Hay there! My name is Will I’m a chem 2T5 I’m one of the scunt co-chairs and I L O V E love animal facts', content: [ 'Get sturdy for me', - 'Get something new banded from the SUDS, the pit or SkavEnger Hunt’ that wasn’t banned before', + 'Get something new banded from the SUDS, the pit or Skule Hunt’ that wasn’t banned before', 'Make fan art of me and Tyler', 'Best performance of“Jamaica there trapped down in…”', 'Bring me a grocery store cake, I’ll pay you back', diff --git a/server/src/middlewares/errorResponseMiddleware.js b/server/src/middlewares/errorResponseMiddleware.js index e850948d..9cee940a 100644 --- a/server/src/middlewares/errorResponseMiddleware.js +++ b/server/src/middlewares/errorResponseMiddleware.js @@ -9,7 +9,7 @@ function errorResponseMiddleware(err, req, res, next) { } else if (err.errors) { // TODO: finish error handling when implementing proper backend validation statusCode = 400; - errorMessage = err.message; + errorMessage = 'Please provide your full name.'; } else if (err.message === 'INVALID_EMAIL') { statusCode = 400; errorMessage = 'Please submit a valid email address.'; diff --git a/server/src/models/FroshModel.js b/server/src/models/FroshModel.js index a4563802..b9de03bc 100644 --- a/server/src/models/FroshModel.js +++ b/server/src/models/FroshModel.js @@ -132,6 +132,10 @@ const FroshSchema = new mongoose.Schema( type: Boolean, // true is attending scunt, false is not attending required: true, }, + attendingRetreat: { + type: Boolean, // true is attending retreat, false is not attending + required: true, + }, summerLocationQuery: { type: Boolean, required: true,