Skip to content

Commit

Permalink
Merge pull request #842 from UofT-Frosh-Orientation/dev
Browse files Browse the repository at this point in the history 
test pre olympiks and skunt
  • Loading branch information
@ashleyleal
ashleyleal authored Aug 22, 2024
2 parents eb11941 + 2f66155 commit 85577c5
Show file tree
Hide file tree
Showing 18 changed files with 341 additions and 169 deletions.
139 changes: 99 additions & 40 deletions client/src/assets/schedule/data.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4485,31 +4485,40 @@ export const dataZeta = {
export const data = {
'MONDAY AUGUST 26': [
{
'Event Name': 'REGISTRATION + MEET YOUR F!ROSH GROUP',
'Start Time': '8:00 AM',
'End Time': '9:00 AM',
'Event Name': 'CHECK-IN AND MEET WITH GROUP',
'Start Time': '7:30 AM',
'Event Location': 'GB Front Steps',
'End Time': '8:30 AM',
Color: 'purple',
},
{
'Event Name': 'MATRICULATION',
'Event Location': 'CONVOCATION HALL',
'Event Description':
'Our kickoff to F!rosh Week, and an introduction to all things Skule! Hear from clubs, design teams, and other student groups about all the amazing opportunities waiting for you here at UofT Engineering, while also learning about some of our many Skule traditions!',
'Start Time': '9:00 AM',
'End Time': '11:00 AM',
'Start Time': '8:30 AM',
'End Time': '10:30 AM',
Color: 'yellow',
},
{
'Event Name': 'F!ROSH GAMES + D!YE STATION',
'Event Description':
'Frosh Games: Compete against other frosh groups in the craziest competitions imaginable.\nDye: When I say purple you say purple! Where F!rosh and Leedurs alike dye their bodies (or parts thereof) purple. The colour purple represents great significance in the traditions of engineering schools across Canada.',
'Start Time': '10:30 AM',
'End Time': '12:30 PM',
Color: 'purple',
},
{
'Event Name': 'LUNCH',
'Start Time': '11:00 AM',
'End Time': '12:00 PM',
'Start Time': '12:30 PM',
'End Time': '1:30 PM',
Color: 'green',
},
{
'Event Name': 'F!ROSH GAMES + D!YE STATION',
'Event Description':
'Frosh Games: Compete against other frosh groups in the craziest competitions imaginable.\nDye: When I say purple you say purple! Where F!rosh and Leedurs alike dye their bodies (or parts thereof) purple. The colour purple represents great significance in the traditions of engineering schools across Canada.',
'Start Time': '12:00 PM',
'Start Time': '1:30 AM',
'End Time': '3:00 PM',
Color: 'purple',
},
Expand All @@ -4522,63 +4531,85 @@ export const data = {
Color: 'green',
},
{
'Event Name': 'NITELIFE & ****',
'Event Description':
'You thought F!rosh Week ended at 6:00pm? Think again! We have activities the Monday, Tuesday, and Friday of F!rosh Week for you to keep the hype going all week long!',
'Start Time': '7:00 PM',
'End Time': 'Late',
'Event Name': 'UNWIND NIGHT',
'Event Location': 'GB303',
'Start Time': '6:00 PM',
'End Time': '9:00 PM',
Color: 'dark-purple',
},
{
'Event Name': '****',
'Event Location': 'The Pit',
'Start Time': '6:00 PM',
'End Time': '11:00 PM',
Color: 'dark-purple',
},
],
'TUESDAY AUGUST 27': [
{
'Event Name': 'ARRIVE FOR CONSENT SEMINAR',
'Start Time': '8:30 AM',
'End Time': '9:30 AM',
'Event Description':
'If you attend the consent workshop, you can be entered to win amazing prizes, ranging from $50 to $1000, including a tablet and a laptop!',
Color: 'gray',
},
{
'Event Name': 'CONSENT WORKSHOP',
'Start Time': '8:00 AM',
'End Time': '10:00 AM',
'Start Time': '9:30 AM',
'End Time': '10:30 AM',
'Event Description':
'If you attend the consent workshop, you can be entered to win amazing prizes, ranging from $50 to $1000, including a tablet and a laptop!',
Color: 'gray',
},
{
'Event Name': 'CAMPUS TOUR & BUILD BATTLE',
'Event Description':
"Campus Tour: Be guided by your F!rosh Leedurs on a tour of our gorgeous campus, showing you all the best places to study, grab food, participate in extracurriculars, and nap! \nBuild Battle: Your first of many design challenges at UofT Engineering, except its probably the one of the coolest ones you do! Work with your frosh group to tackle your piece of the puzzle for this year's unique design challenge, coming together to build something truly amazing as a 2T8 class!",
'Start Time': '10:00 AM',
'End Time': '12:00 PM',
'Start Time': '11:00 AM',
'End Time': '12:10 PM',
Color: 'yellow',
},
{
'Event Name': 'LUNCH',
'Start Time': '12:00 PM',
'End Time': '1:00 PM',
'Start Time': '12:30 PM',
'End Time': '1:30 PM',
Color: 'green',
},
{
'Event Name': 'ACADEMIC SUCCESS SEMINAR',
'Event Description':
"Learn from some of your amazing new TA's about all the strategies you need to know for success here at UofT Engineering!",
'Start Time': '1:00 PM',
'End Time': '2:00 PM',
'Start Time': '1:30 PM',
'End Time': '3:00 PM',
Color: 'gray',
},
{
'Event Name': 'CAMPUS TOUR & BUILD BATTLE',
'Event Description':
"Campus Tour: Be guided by your F!rosh Leedurs on a tour of our gorgeous campus, showing you all the best places to study, grab food, participate in extracurriculars, and nap! \nBuild Battle: Your first of many design challenges at UofT Engineering, except its probably the one of the coolest ones you do! Work with your frosh group to tackle your piece of the puzzle for this year's unique design challenge, coming together to build something truly amazing as a 2T8 class!",
'Start Time': '2:00 PM',
'End Time': '5:00 PM',
'Start Time': '3:00 PM',
'End Time': '6:00 PM',
Color: 'yellow',
},
{
'Event Name': 'CHEER OFF',
'Start Time': '5:00 PM',
'End Time': '6:00 PM',
'Start Time': '6:00 PM',
'End Time': '6:30 PM',
Color: 'purple',
},
{
'Event Name': 'NITELIFE & ****',
'Event Description':
'You thought F!rosh Week ended at 6:00pm? Think again! We have activities the Monday, Tuesday, and Friday of F!rosh Week for you to keep the hype going all week long!',
'Event Name': 'TOTES & TRIVIA',
'Event Location': 'GB303',
'Start Time': '7:00 PM',
'End Time': 'Late',
'End Time': '9:00 PM',
Color: 'dark-purple',
},
{
'Event Name': '****',
'Event Location': 'The Pit',
'Start Time': '6:00 PM',
'End Time': '11:00 PM',
Color: 'dark-purple',
},
],
Expand All @@ -4593,8 +4624,15 @@ export const data = {
'Event Name': 'SKULE™ HUNT',
'Event Description':
'SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!',
'Start Time': '5:00 PM',
'End Time': '11:00 PM',
Color: 'dark-purple',
},
{
'Event Name': '****',
'Event Location': 'The Pit',
'Start Time': '6:00 PM',
'End Time': 'Late',
'End Time': '11:00 PM',
Color: 'dark-purple',
},
],
Expand All @@ -4606,27 +4644,48 @@ export const data = {
Color: 'gray',
},
{
'Event Name': 'NITELIFE & ****',
'Event Name': 'CLUBS FAIR',
'Event Location': 'Bahen Lobby',
'Event Description':
'You thought F!rosh Week ended at 6:00pm? Think again! We have activities the Monday, Tuesday, and Friday of F!rosh Week for you to keep the hype going all week long!',
'Start Time': '7:00 PM',
'End Time': 'Late',
'Interested in joining a club, intramural sport or getting involved with the Engineering Society (EngSoc)? Attend the Engineering Clubs Fair to learn more about the 100+ ways you can get involved.</a>.',
'Start Time': '11:00 AM',
'End Time': '2:00 PM',
Color: 'yellow',
},
{
'Event Name': 'COMMON ROOM GAME NIGHT',
'Event Location': 'MB225',
'Start Time': '6:00 PM',
'End Time': '9:00 PM',
Color: 'dark-purple',
},
{
'Event Name': '****',
'Event Location': 'The Pit',
'Start Time': '6:00 PM',
'End Time': '11:00 PM',
Color: 'dark-purple',
},
],
'FRIDAY AUGUST 30': [
{
'Event Name': 'F!ROSH OLYMPIKS',
'Start Time': '9:00 AM',
'Start Time': '10:00 AM',
'End Time': '5:00 PM',
Color: 'gray',
},
{
'Event Name': 'NITELIFE & ****',
'Event Description':
'You thought F!rosh Week ended at 6:00pm? Think again! We have activities the Monday, Tuesday, and Friday of F!rosh Week for you to keep the hype going all week long!',
'Start Time': '7:00 PM',
'End Time': 'Late',
'Event Name': 'SKULE’S GOT TALENT',
'Event Location': 'GB Front Steps',
'Start Time': '6:00 PM',
'End Time': '9:00 PM',
Color: 'dark-purple',
},
{
'Event Name': '****',
'Event Location': 'The Pit',
'Start Time': '6:00 PM',
'End Time': '11:00 PM',
Color: 'dark-purple',
},
],
Expand Down
5 changes: 5 additions & 0 deletions client/src/components/profile/ProfilePageSchedule/ProfilePageSchedule.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ export const ProfilePageSchedule = () => {
>
<h2 className="profile-page-section-header profile-page-section-header-schedule">
SCHEDULE
<h3 className="profile-page-sesction-header profile-page-section-header-schedule-note">
*Once you have arrived to F!rosh Week on Monday and Tuesday you do not need to worry
about the schedule as it is your head leedurs’ responsibility to keep track of the
schedule of events.
</h3>
</h2>
</div>
<div className="profile-page-schedule-content">
Expand Down
6 changes: 6 additions & 0 deletions client/src/components/profile/ProfilePageSchedule/ProfilePageSchedule.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@

.profile-page-section-header-schedule {
padding-bottom: 15px;

.profile-page-section-header-schedule-note {
font-size: 16px;
padding-bottom: 5px;
font-family: 'Nunito', sans-serif;
}
}

.profile-page-schedule-content {
Expand Down
12 changes: 6 additions & 6 deletions client/src/pages/FAQ/functions.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ export async function getQuestions(setSnackbar) {
lastUpdated: '2:00 pm',
category: 'General',
},
{
question: "What if I can't afford the ticket for F!rosh Week?",
answer: 'That’s okay! You can apply for a bursary when you sign up for F!rosh Week!',
lastUpdated: '12:17pm, Jun 22, 2024',
category: 'General',
},
// {
// question: "What if I can't afford the ticket for F!rosh Week?",
// answer: 'That’s okay! You can apply for a bursary when you sign up for F!rosh Week!',
// lastUpdated: '12:17pm, Jun 22, 2024',
// category: 'General',
// },
{
question: 'What should I bring on the first day?',
answer:
Expand Down
14 changes: 6 additions & 8 deletions client/src/pages/FroshRetreat/FroshRetreat.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ export const FroshRetreat = () => {
</Header>
<div style={{ height: '20px' }} />
<h3 style={{ color: 'var(--white)', margin: '20px 0', textAlign: 'center' }}>
SEE THIS VIDEO OF RETREAT 2T0 FOR A SENSE OF THE TRIP!
SEE THIS VIDEO OF LEEDUR RETREAT 2T4 FOR A SENSE OF THE TRIP!
</h3>
<iframe
className="frosh-retreat-video"
src="https://www.youtube.com/embed/eGwsNvgroCI?autoplay=1"
src="https://drive.google.com/file/d/1_lpjxS90MrYfqsgOosCd1gRf2xd7phoY/view?usp=sharing"
title="F!rosh Retreat Info"
frameBorder="0"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
Expand Down Expand Up @@ -131,12 +131,11 @@ const retreatFAQs = [
],
},
{
title:
'What time does the bus leave?',
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 = () => {
Expand All @@ -155,9 +154,7 @@ const FroshRetreatFAQ = () => {
}}
>
<img src={dragon} style={{ width: '350px', margin: '20px' }}></img>
<h2 style={{ marginBottom: '20px' }}>
FAQS: PREPARE FOR A GOOD TIME DOWN ON THE FARM!
</h2>
<h2 style={{ marginBottom: '20px' }}>FAQS: PREPARE FOR A GOOD TIME DOWN ON THE FARM!</h2>
{retreatFAQs.map((item, index) => {
const [isOpen, setIsOpen] = useState(false);
return (
Expand Down Expand Up @@ -219,6 +216,7 @@ const RetreatRegistration = () => {
const { setSnackbar } = useContext(SnackbarContext);
const { axios } = useAxios();
const isRetreat = user?.isRetreat === true;
console.log(isRetreat);
const isWaiverUploaded = user?.waiver?.filename !== undefined;

const [file, setFile] = useState(null);
Expand Down
18 changes: 9 additions & 9 deletions client/src/pages/Registration/RegistrationFields.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,15 +480,15 @@ export const fields = {
label: 'The price of one Frosh Week ticket is 130 CAD.',
isBold: true,
},
bursaryRequested: {
type: 'radio',
label: 'Do you require any bursary or financial aid for your Frosh Week ticket?',
values: ['Yes', 'No'],
initialSelectedIndex: 0,
isRequiredInput: false,
noEdit: false,
localStorageKey: 'registration-bursary',
},
// bursaryRequested: {
// type: 'radio',
// label: 'Do you require any bursary or financial aid for your Frosh Week ticket?',
// values: ['Yes', 'No'],
// initialSelectedIndex: 0,
// isRequiredInput: false,
// noEdit: false,
// localStorageKey: 'registration-bursary',
// },
marketing: {
type: 'checkbox',
label: 'How did you hear about F!rosh Week?',
Expand Down
5 changes: 3 additions & 2 deletions client/src/pages/Registration/RegistrationForm.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const PageRegistrationForm = ({ editFieldsPage, initialValues, onEditSubmit }) =
// } else if (convertedFroshObject.summerLocationQuery === 'No') {
// convertedFroshObject.summerLocationQuery = false;
// }

let formData = new FormData();
for (const [key, value] of Object.entries(froshObject)) {
if (value === undefined) continue;
Expand Down Expand Up @@ -462,7 +462,8 @@ const PageRegistrationForm = ({ editFieldsPage, initialValues, onEditSubmit }) =
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.
partial to complete settlement of the ticket price. Bursary applications are
now closed.
</p>
</div>
),
Expand Down
Loading

0 comments on commit 85577c5

Please sign in to comment.