Skip to content

Commit eca0c3d

Browse files
committed
changed schedule styling more + added new event descriptions
1 parent 3a244c4 commit eca0c3d

18 files changed

Lines changed: 141 additions & 84 deletions

File tree

16.5 MB
Loading
63.7 KB
Loading
1.68 KB
Loading
1.71 KB
Loading

client/src/assets/misc/loc.svg

Lines changed: 1 addition & 0 deletions
Loading

client/src/assets/misc/locdark.svg

Lines changed: 1 addition & 0 deletions
Loading

client/src/assets/schedule/data.jsx

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4645,7 +4645,7 @@ export const dataZeta = {
46454645

46464646
// for home page
46474647
export const data = {
4648-
'MONDAY AUGUST 25': [
4648+
'Monday August 25': [
46494649
{
46504650
'Event Name': 'Meet your F!rosh Group',
46514651
'Start Time': '8:00 AM',
@@ -4657,7 +4657,7 @@ export const data = {
46574657
'Event Name': 'Matriculation',
46584658
'Event Location': 'Convocation Hall',
46594659
'Event Description':
4660-
'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!',
4660+
'F!rosh Week Level 1, your introduction to all things Skule™. The Frosh, faculty, and upper years all gather in Convocation Hall for the Frosh’s teaser trailer at the community and all of the traditions, culture and opportunities offered at UofT Engineering.',
46614661
'Start Time': '9:00 AM',
46624662
'End Time': '11:00 AM',
46634663
Color: 'long',
@@ -4671,15 +4671,15 @@ export const data = {
46714671
{
46724672
'Event Name': 'F!rosh Games + D!ye Station',
46734673
'Event Description':
4674-
'<b>F!rosh Games:</b> Compete against other frosh groups in the craziest competitions imaginable.<br /><b>D!ye:</b> 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.',
4674+
'<b>F!rosh Games:</b> A series of fun, physical challenges that allows students to let loose, compete against other F!rosh groups and get to know each other in a dynamic fashion. These competitions can range from an obstacle course to a classic sport with an engineering twist.<br /><b>D!ye:</b> A 40+ year tradition where F!rosh and Leedurs dye their bodies purple. This player cosmetic represents great significance in the traditions of engineering schools across Canada, as it honours the engineers that came before us.',
46754675
'Start Time': '12:00 PM',
46764676
'End Time': '3:00 PM',
46774677
Color: 'long',
46784678
},
46794679
{
46804680
'Event Name': 'Downtown Walkaround',
46814681
'Event Description':
4682-
'Join us for a lovely tour of Toronto’s downtown with 1000 of your newest friends and classmates!',
4682+
'A tour of downtown Toronto where thousands of students display their Skule™ spirit by parading and emoting from the St. George campus to Nathan Phillips Square.',
46834683
'Start Time': '3:00 PM',
46844684
'End Time': '5:00 PM',
46854685
Color: 'long',
@@ -4693,13 +4693,15 @@ export const data = {
46934693
},
46944694
{
46954695
'Event Name': 'Nitelife',
4696+
'Event Description':
4697+
'F!rosh Week goes dark mode with various games and activities run in the evening hours to continue the fun, offering Frosh more experiences to connect. Activities are high and low energy.',
46964698
'Event Location': 'The Pit',
46974699
'Start Time': '6:00 PM',
46984700
'End Time': 'Late',
46994701
Color: 'night',
47004702
},
47014703
],
4702-
'TUESDAY AUGUST 26': [
4704+
'Tuesday August 26': [
47034705
{
47044706
'Event Name': 'Academic Success Seminar',
47054707
// 'Event Location': 'Front Campus',
@@ -4712,7 +4714,7 @@ export const data = {
47124714
{
47134715
'Event Name': 'Campus Tours + Build Battle',
47144716
'Event Description':
4715-
"<b>Campus Tour:</b> 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! <br /><b>Build Battle:</b> 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 2T9 class!",
4717+
'<b>Campus Tour:</b> F!rosh Leedurs guide Frosh through a tour of campus to find the best places to study, socialize and share stories about their time across campus. Take your minimap into the real world and find those secret levels. <br /><b>Build Battle:</b> First we mine, now you CRAFT! Put your skills to the test with a *POWER DRILL* *WOOD* *MARKERS* and whatever scraps your inventory picked up to create an epic build!',
47164718
'Start Time': '10:00 AM',
47174719
'End Time': '12:00 PM',
47184720
Color: 'long',
@@ -4726,13 +4728,14 @@ export const data = {
47264728
{
47274729
'Event Name': 'Campus Tours + Build Battle',
47284730
'Event Description':
4729-
"<b>Campus Tour:</b> 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! <br /><b>Build Battle:</b> 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 2T9 class!",
4731+
'<b>Campus Tour:</b> F!rosh Leedurs guide Frosh through a tour of campus to find the best places to study, socialize and share stories about their time across campus. Take your minimap into the real world and find those secret levels. <br /><b>Build Battle:</b> First we mine, now you CRAFT! Put your skills to the test with a *POWER DRILL* *WOOD* *MARKERS* and whatever scraps your inventory picked up to create an epic build!',
47304732
'Start Time': '1:00 PM',
47314733
'End Time': '5:00 PM',
47324734
Color: 'long',
47334735
},
47344736
{
47354737
'Event Name': 'Cheer-Off!',
4738+
'Event Description': 'The Final Boss: AHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH',
47364739
'Start Time': '5:00 PM',
47374740
'End Time': '6:00 PM',
47384741
Color: 'general',
@@ -4746,13 +4749,15 @@ export const data = {
47464749
},
47474750
{
47484751
'Event Name': 'Nitelife',
4752+
'Event Description':
4753+
'F!rosh Week goes dark mode with various games and activities run in the evening hours to continue the fun, offering Frosh more experiences to connect. Activities are high and low energy.',
47494754
'Event Location': 'The Pit',
47504755
'Start Time': '7:00 PM',
47514756
'End Time': 'Late',
47524757
Color: 'night',
47534758
},
47544759
],
4755-
'WEDNESDAY AUGUST 27': [
4760+
'Wednesday August 27': [
47564761
{
47574762
'Event Name': 'Consent Seminar',
47584763
'Event Description': `Attend the consent workshop and be entered to win some amazing prizes!`,
@@ -4779,29 +4784,31 @@ export const data = {
47794784
{
47804785
'Event Name': 'Skule™ Hunt',
47814786
'Event Description':
4782-
'SKULE™ HUNT: The longest items list you’ve ever seen. Join us for a full fledged scavenger hunt all over the city of Toronto!',
4787+
'The Skule™ twist on a traditional Scavenger Hunt, where students search for unique items and hidden easter eggs, collect powerups and points through side quests all across the city of Toronto to bring your team to the top of the leaderboard. The world is your arcade!',
47834788
'Start Time': '6:00 PM',
47844789
'End Time': 'Late',
47854790
Color: 'night',
47864791
},
47874792
],
4788-
'THURSDAY AUGUST 28': [
4793+
'Thursday August 28': [
47894794
{
47904795
'Event Name': 'Faculty Events',
4791-
'Event Description': `Check out more information about Faculty Events here: <a href='https://undergrad.engineering.utoronto.ca/event/faculty-orientation-events/'>Faculty Events</a>`,
4796+
'Event Description': `More information on Faculty Events will be added soon!`,
47924797
'Start Time': '9:00 AM',
47934798
'End Time': '5:00 PM',
47944799
Color: 'other',
47954800
},
47964801
{
47974802
'Event Name': 'Nitelife',
4803+
'Event Description':
4804+
'F!rosh Week goes dark mode with various games and activities run in the evening hours to continue the fun, offering Frosh more experiences to connect. Activities are high and low energy.',
47984805
'Event Location': 'The Pit',
47994806
'Start Time': '6:00 PM',
48004807
'End Time': 'Late',
48014808
Color: 'night',
48024809
},
48034810
],
4804-
'FRIDAY AUGUST 29': [
4811+
'Friday August 29': [
48054812
{
48064813
'Event Name': 'F!rosh Olympiks',
48074814
'Start Time': '10:00 AM',
@@ -4810,29 +4817,31 @@ export const data = {
48104817
},
48114818
{
48124819
'Event Name': 'Nitelife',
4820+
'Event Description':
4821+
'F!rosh Week goes dark mode with various games and activities run in the evening hours to continue the fun, offering Frosh more experiences to connect. Activities are high and low energy.',
48134822
'Event Location': 'The Pit',
48144823
'Start Time': '6:00 PM',
48154824
'End Time': 'Late',
48164825
Color: 'night',
48174826
},
48184827
],
4819-
'SATURDAY AUGUST 30': [
4828+
'Saturday August 30': [
48204829
{
48214830
'Event Name': 'F!rosh Retreat',
48224831
'Event Location': 'Hart House Farm',
48234832
'Event Description':
4824-
'Come with us out of the concrete jungle to enjoy a weekend of camp nostalgia, filled with swimming, games, campfires and more!',
4833+
'F!rosh can join Leedurs for a weekend camping trip to touch grass that caps off F!rosh Week, full of swimming, campfires, games, and other fun activities to connect F!rosh.',
48254834
'Start Time': '10:00 AM',
48264835
'End Time': 'Late',
48274836
Color: 'long',
48284837
},
48294838
],
4830-
'SUNDAY AUGUST 31': [
4839+
'Sunday August 31': [
48314840
{
48324841
'Event Name': 'F!rosh Retreat',
48334842
'Event Location': 'Hart House Farm',
48344843
'Event Description':
4835-
'Come with us out of the concrete jungle to enjoy a weekend of camp nostalgia, filled with swimming, games, campfires and more!',
4844+
'F!rosh can join Leedurs for a weekend camping trip to touch grass that caps off F!rosh Week, full of swimming, campfires, games, and other fun activities to connect F!rosh.',
48364845
'Start Time': 'Early',
48374846
'End Time': '2:00 PM',
48384847
Color: 'long',

client/src/components/OtherEventsCard/EventCard.jsx

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,23 @@ import React from 'react';
22
import './EventCard.scss';
33
import PropTypes from 'prop-types';
44

5-
const EventCard = ({ title, content, photoUrl, bgColorClass, textColorClass }) => {
5+
const EventCard = ({ title, content, photoUrl, bgColorClass, textColorClass, link }) => {
6+
console.log('textColorClass:', textColorClass);
67
return (
78
<div className={`event-card ${bgColorClass} ${textColorClass}`}>
89
<div className="card-content">
910
<div className="text-section">
1011
<h2>{title}</h2>
1112
<p>{content}</p>
12-
<button
13-
className={`learn-more-btn ${
14-
textColorClass == 'bg-white' ? 'button-white' : 'button-black'
15-
}`}
16-
>
17-
Learn More
18-
</button>
13+
<a href={link} target="_blank" rel="noopener noreferrer" className="no-link-style">
14+
<button
15+
className={`learn-more-btn ${
16+
textColorClass == 'text-white' ? 'button-white' : 'button-black'
17+
}`}
18+
>
19+
Learn More
20+
</button>
21+
</a>
1922
</div>
2023
<div className="triangle" />
2124
<div className="image-section">
@@ -34,6 +37,7 @@ EventCard.propTypes = {
3437
photoUrl: PropTypes.string.isRequired,
3538
bgColorClass: PropTypes.string,
3639
textColorClass: PropTypes.string,
40+
link: PropTypes.string,
3741
};
3842

3943
// EventCard.defaultProps = {

client/src/components/OtherEventsCard/EventCard.scss

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
@import '../../scssStyles/mixins';
22
@import url('https://fonts.googleapis.com/css2?family=Jersey+10&family=Jersey+15&family=Jersey+20&family=Jersey+25&display=swap');
33

4+
a.no-link-style {
5+
all: unset;
6+
display: inline-block;
7+
}
8+
49
.event-card {
5-
border-radius: 12px;
10+
border-radius: 20px;
611
overflow: hidden;
712
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
8-
margin: 1rem;
13+
margin: 1rem 1rem;
914
padding: 0;
1015

1116
.card-content {
@@ -25,6 +30,10 @@
2530
flex: 1;
2631
z-index: 2;
2732

33+
@media (max-width: 1000px) {
34+
padding-bottom: 5%;
35+
}
36+
2837
h2 {
2938
font-size: 48px;
3039
width: 80%;
@@ -33,20 +42,25 @@
3342
}
3443

3544
p {
36-
font-size: 1rem;
37-
margin-bottom: 1rem;
45+
font-size: 18px;
46+
margin-bottom: 40px;
3847
line-height: 1.5;
48+
width: 80%;
49+
50+
@media (max-width: 1000px) {
51+
width: 100%;
52+
margin-bottom: 20px;
53+
}
3954
}
4055

4156
.learn-more-btn {
4257
background-color: transparent;
4358
// color: var(--text-primary);
44-
border: none;
4559
padding: 0.6rem 1.2rem;
46-
border: var(--text-primary) 2px solid;
60+
// border: var(--text-primary) 2px solid;
4761
border-radius: 25px;
4862
font-weight: bold;
49-
cursor: url('../assets/cursor/pointer.png');
63+
cursor: url('../../../assets/cursor/pointer.png'), auto;
5064
transition: all 150ms ease-in-out;
5165

5266
&:hover {
@@ -55,11 +69,21 @@
5569
scale: 103%;
5670
}
5771
}
72+
73+
.button-white {
74+
border: white 2px solid;
75+
color: white;
76+
}
77+
78+
.button-black {
79+
border: black 2px solid;
80+
color: black;
81+
}
5882
}
5983

6084
.image-section {
6185
position: relative;
62-
width: 300px;
86+
width: 40%;
6387
flex-shrink: 0;
6488
overflow: hidden;
6589

@@ -69,9 +93,13 @@
6993
object-fit: cover;
7094
}
7195

72-
@media (max-width: 768px) {
73-
width: 100%;
96+
@media (max-width: 1000px) {
97+
width: 0%;
7498
}
99+
100+
// @media (max-width: 800px) {
101+
// width: 100%;
102+
// }
75103
}
76104

77105
// .triangle {
@@ -103,13 +131,3 @@
103131
.text-white {
104132
color: white;
105133
}
106-
107-
.button-white {
108-
border: white 2px solid;
109-
color: white;
110-
}
111-
112-
.button-black {
113-
border: black 2px solid;
114-
color: black;
115-
}

client/src/components/schedule/ScheduleHome/ScheduleHome.jsx

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import { ButtonSelector } from '../../buttonSelector/buttonSelector/ButtonSelect
44
import { SingleAccordion } from '../../text/Accordion/SingleAccordion/SingleAccordion';
55
import './ScheduleHome.scss';
66
import { data } from '../../../assets/schedule/data';
7-
import location from '../../../assets/misc/location.png';
7+
import location from '../../../assets/misc/loc.svg';
8+
import locationdark from '../../../assets/misc/locdark.svg';
89
import { DarkModeContext } from '../../../util/DarkModeProvider';
910
import LilyDesign from '../../../assets/schedule/lily.svg';
1011

@@ -34,9 +35,9 @@ const ScheduleComponent = () => {
3435

3536
return (
3637
<div className="schedule-container">
37-
<div className="schedule-left-container desktop-only">
38-
{/* <img src={LilyDesign} alt="Lily Design" className="lily-design" /> */}
39-
</div>
38+
{/* <div className="schedule-left-container desktop-only">
39+
<img src={LilyDesign} alt="Lily Design" className="lily-design" />
40+
</div> */}
4041
<div className="schedule-middle-container">
4142
<div className="mobile-only">
4243
<ButtonSelector
@@ -132,8 +133,12 @@ export const ScheduleComponentAccordion = ({ scheduleDay, closeAll }) => {
132133
{scheduleDay['Event Location'] ? (
133134
<div className="schedule-accordion-header-location-container">
134135
<img
135-
style={{ filter: darkMode ? 'invert(0.8)' : 'invert(0.6)' }}
136-
src={location}
136+
// style={{ filter: scheduleDay['Color'] == 'night' ? 'invert(1)' : '' }}
137+
src={
138+
scheduleDay['Color'] == 'night' || scheduleDay['Color'] == 'general'
139+
? locationdark
140+
: location
141+
}
137142
className="schedule-accordion-header-location-icon"
138143
></img>
139144
<h3 className="schedule-accordion-location">{scheduleDay['Event Location']}</h3>

0 commit comments

Comments
 (0)