From a6c4e0d0ae7a04fdb66f79bdc28f6e66534c76c7 Mon Sep 17 00:00:00 2001 From: Asmita Chandra <105055090+asmita-chandra@users.noreply.github.com> Date: Sun, 30 Jun 2024 05:55:26 +0000 Subject: [PATCH 1/4] added the new fields as outlined in the spradhseet (commuteprogram queries, nite life carnival, changed all radio inputs to dropdowns, moved tshirt sizing below to (events)) --- .../pages/Registration/RegistrationFields.jsx | 107 ++++++++++-------- 1 file changed, 62 insertions(+), 45 deletions(-) diff --git a/client/src/pages/Registration/RegistrationFields.jsx b/client/src/pages/Registration/RegistrationFields.jsx index 61e7674f..22488c74 100644 --- a/client/src/pages/Registration/RegistrationFields.jsx +++ b/client/src/pages/Registration/RegistrationFields.jsx @@ -20,7 +20,7 @@ const textValidation = (value) => { return 'Please use Aa-Zz characters'; } } else { - return 'Please ensure that your full name is between 1 and 50 characters'; + return 'Please ensure that your name is between 1 and 50 characters'; } }; @@ -186,16 +186,6 @@ export const fields = { noEdit: true, localStorageKey: 'registration-discipline', }, - shirtSize: { - type: 'dropdown', - label: 'T-shirt Size', - values: ['S', 'M', 'L', 'XL', '2XL', '3XL'], - initialSelectedIndex: 1, - className: 'half-width-input', - isRequiredInput: true, - noEdit: true, - localStorageKey: 'registration-shirtSize', - }, phoneNumberLabel: { type: 'label', label: 'Phone Number', @@ -281,7 +271,7 @@ export const fields = { }, HealthSafety: { medicalInfo: { - type: 'radio', + type: 'dropdown', values: ['Yes', 'No'], initialSelectedIndex: 1, label: 'Medical Conditions', @@ -385,7 +375,7 @@ export const fields = { }, }, accommodation: { - type: 'radio', + type: 'dropdown', label: 'Would you like us to reach out to you about how we can best accommodate you?', values: ['Yes', 'No'], initialSelectedIndex: 0, @@ -395,10 +385,20 @@ export const fields = { }, }, ExtraEvents: { + shirtSize: { + type: 'dropdown', + label: 'T-shirt Size', + values: ['S', 'M', 'L', 'XL', '2XL', '3XL'], + initialSelectedIndex: 1, + className: 'half-width-input', + isRequiredInput: true, + noEdit: true, + localStorageKey: 'registration-shirtSize', + }, attendingScunt: { - type: 'radio', + type: 'dropdown', label: - 'Would you like to participate in Havenger Scunt? (It will take place on the evening of Wednesday, September 6th)', + 'Would you like to participate in Havenger Scunt? (It will take place on the evening of Wednesday, August 28th)', values: ['Yes', 'No'], initialSelectedIndex: 0, localStorageKey: 'registration-scunt', @@ -411,40 +411,38 @@ export const fields = { "What is Havenget 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.", 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', + label: + 'Would you like to attend an overnight retreat on September 9th-10th at Hart House Farms (at an additional cost)?', + values: ['Yes', 'No'], + initialSelectedIndex: 0, + isRequiredInput: false, + noEdit: false, + localStorageKey: 'registration-attendingRetreat', + }, summerLocationLabel: { type: 'label', label: 'Where will you be located for the majority of the summer?', }, - summerLocationCity: { - type: 'text', - inputType: 'text', - label: 'City', - placeholder: 'Toronto', - isRequiredInput: true, + summerLocationQuery: { + type: 'dropdown', + label: + 'Will you be based in Toronto or the GTA over the summer? (or would you be available for events)', + values: ['Yes', 'No'], + initialSelectedIndex: 0, + isRequiredInput: false, noEdit: false, - localStorageKey: 'registration-summerLocationCity', - errorMessage: 'Please enter your city', - className: 'half-width-input', - validation: textLengthValidation, - }, - summerLocationCountry: { - type: 'text', - inputType: 'text', - label: 'Country (2 character code)', - placeholder: 'CA', - hasRestrictedInput: true, - isRequiredInput: true, - noEdit: false, - localStorageKey: 'registration-summerLocationCountry', - errorMessage: 'Please enter your country', - className: 'half-width-input', - validation: (value) => { - if (/^[A-Z]*$/.test(value) && value.length === 2) { - return true; - } else { - return 'Please use the 2 letter country code'; - } - }, + localStorageKey: 'registration-summerLocationQuery', }, moveToToronto: { type: 'dropdown', @@ -456,8 +454,27 @@ 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', + }, photograph: { - type: 'radio', + type: 'dropdown', label: 'Are you okay with being photographed during Frosh Week?', values: ['Yes', 'No'], initialSelectedIndex: 0, From 9ec1ef3ffc8016398d3dd29af86fee29c7453f61 Mon Sep 17 00:00:00 2001 From: chocoboash Date: Mon, 1 Jul 2024 20:18:49 -0400 Subject: [PATCH 2/4] Changed registration form logo --- client/src/pages/Registration/RegistrationForm.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/pages/Registration/RegistrationForm.jsx b/client/src/pages/Registration/RegistrationForm.jsx index d22678e0..7f5a8fd6 100644 --- a/client/src/pages/Registration/RegistrationForm.jsx +++ b/client/src/pages/Registration/RegistrationForm.jsx @@ -8,7 +8,7 @@ import { Checkboxes } from '../../components/form/Checkboxes/Checkboxes'; import { Button } from '../../components/button/Button/Button'; import { Tabs } from '../../components/tabs/tabs'; import './RegistrationForm.scss'; -import MainFroshLogo from '../../assets/logo/frosh-main-logo-with-bg.svg'; +import MainFroshLogo from '../../assets/logo/main-logo.png'; import { ButtonOutlined } from '../../components/button/ButtonOutlined/ButtonOutlined'; import { Link, useNavigate } from 'react-router-dom'; import { PopupModal } from '../../components/popup/PopupModal'; From a04de21fed495a30e4fce7b0ab2ef16a5125b0dc Mon Sep 17 00:00:00 2001 From: Asmita Chandra <105055090+asmita-chandra@users.noreply.github.com> Date: Tue, 2 Jul 2024 01:58:12 +0000 Subject: [PATCH 3/4] Edited redundant label from last year --- .../src/pages/Registration/RegistrationFields.jsx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/client/src/pages/Registration/RegistrationFields.jsx b/client/src/pages/Registration/RegistrationFields.jsx index 22488c74..7eb12d41 100644 --- a/client/src/pages/Registration/RegistrationFields.jsx +++ b/client/src/pages/Registration/RegistrationFields.jsx @@ -430,10 +430,7 @@ export const fields = { noEdit: false, localStorageKey: 'registration-attendingRetreat', }, - summerLocationLabel: { - type: 'label', - label: 'Where will you be located for the majority of the summer?', - }, + summerLocationQuery: { type: 'dropdown', label: @@ -473,6 +470,15 @@ export const fields = { noEdit: false, localStorageKey: 'registration-commuterChestnutQuery', }, + bursary: { + type: 'dropdown', + label: 'Would you be interested in a bursary?', + values: ['Yes', 'No'], + initialSelectedIndex: 0, + isRequiredInput: false, + noEdit: false, + localStorageKey: 'registration-bursary', + }, photograph: { type: 'dropdown', label: 'Are you okay with being photographed during Frosh Week?', From a8219c8e14bb3eddef9cfc7ac5936c67b4a18aa4 Mon Sep 17 00:00:00 2001 From: chocoboash Date: Tue, 2 Jul 2024 14:12:56 -0400 Subject: [PATCH 4/4] dotenv --- package.json | 3 ++- yarn.lock | 15 ++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 6ffeefd6..91e07078 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,8 @@ }, "dependencies": { "concurrently": "^8.2.0", + "dotenv": "^16.4.5", "socket.io-client": "^4.5.2", "yarn": "^1.22.22" } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index bfc606bf..b865dace 100644 --- a/yarn.lock +++ b/yarn.lock @@ -63,6 +63,11 @@ braces@^3.0.2: dependencies: fill-range "^7.0.1" +chalk@5.2.0: + version "5.2.0" + resolved "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz" + integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA== + chalk@^4.1.2: version "4.1.2" resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" @@ -71,11 +76,6 @@ chalk@^4.1.2: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@5.2.0: - version "5.2.0" - resolved "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz" - integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA== - clean-stack@^2.0.0: version "2.2.0" resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz" @@ -173,6 +173,11 @@ debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: dependencies: ms "2.1.2" +dotenv@^16.4.5: + version "16.4.5" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f" + integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg== + eastasianwidth@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz"