Skip to content

Commit

Permalink
Merge pull request #15 from icssc/events-update
Browse files Browse the repository at this point in the history
feat: add event descriptions
  • Loading branch information
jeffreymeng authored Nov 13, 2023
2 parents 2ba6222 + de32a8d commit 8dd0ce7
Show file tree
Hide file tree
Showing 4 changed files with 803 additions and 13 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
.idea/


# dependencies
/node_modules
Expand Down
22 changes: 11 additions & 11 deletions assets/events.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
"logo": "/favicon.ico",
"location": "DBH 3011",
"date": "2023-11-13",
"desc": "",
"desc": "Come out to our opening ceremony to learn about the schedule, rules, and resources for WebJam! As part of opening ceremony, we'll also be having a social where you can meet other WebJam participants and also meet teammates if you're looking for a team!",
"rsvp": "",
"recording": ""
},
},
{
"title":"Intro to HTML/CSS",
"time":"7PM",
"club": "Hack at UCI",
"logo": "/assets/img/clubs/hack.png",
"location": "DBH 3011",
"date": "2023-11-13",
"desc": "",
"desc": "Interested in learning about web development but don't know where to start? Join HackUCI for our to learn about basic web development in HTML/CSS!",
"rsvp": "",
"recording": ""
},
Expand All @@ -29,7 +29,7 @@
"logo": "/assets/img/clubs/ctc.svg",
"location": "DBH 3011",
"date": "2023-11-14",
"desc": "",
"desc": "Interested in learning how to make informed decisions about the languages and technology stacks for your projects? Curious about adapting your project scope as you make progress? Join us for the CTC Project Planning and Adaptation Workshop!",
"rsvp": "",
"recording": ""
},
Expand All @@ -40,7 +40,7 @@
"logo": "/favicon.ico",
"location": "DBH 3011",
"date": "2023-11-14",
"desc": "",
"desc": "This is dedicated time for you to work on your projects with your team! You can work on your project anytime throughout the week as your schedule allows, but we'll be providing a friendly space, tasty snacks, and wise mentors during these specific times to help you with your projects!",
"rsvp": "",
"recording": ""
},
Expand All @@ -51,7 +51,7 @@
"logo": "/assets/img/clubs/design.webp",
"location": "DBH 6011",
"date": "2023-11-15",
"desc": "",
"desc": "Dive into the depths of what makes a visually captivating website! Join Design@UCI as we discuss the core principles of web design, from mastering user-friendly interfaces, to creating capitvating layouts that engage your audience. We will cover design fundamentals, color theory, and typography. This workshop is perfect for elevating your project to the next level of an engaging website.",
"rsvp": "",
"recording": ""
},
Expand All @@ -62,7 +62,7 @@
"logo": "/favicon.ico",
"location": "DBH 6011",
"date": "2023-11-15",
"desc": "",
"desc": "More time to work with your team!",
"rsvp": "",
"recording": ""
},
Expand All @@ -73,7 +73,7 @@
"logo": "/icssc_logo.svg",
"location": "DBH 4011",
"date": "2023-11-16",
"desc": "",
"desc": "Building a better web means ensuring people from all walks of life and abilities can participate. Learn why web accessibility is important and what it entails.",
"rsvp": "",
"recording": ""
},
Expand All @@ -84,18 +84,18 @@
"logo": "/favicon.ico",
"location": "DBH 4011",
"date": "2023-11-16",
"desc": "",
"desc": "This is our last work time session of the week, but you can still keep working on your projects afterwards up until the final submission deadline at 5:30pm on Friday!",
"rsvp": "",
"recording": ""
},
{
"title":"Closing Ceremony",
"time":"6:30PM",
"time":"6PM",
"club": "",
"logo": "/favicon.ico",
"location": "DBH 6011",
"date": "2023-11-17",
"desc": "",
"desc": "WebJam comes to a close with our prize ceremony! Dinner will be provided at 6pm, and then starting 6:30pm present your projects in front of our esteemed professor judges and audience, then the winning teams will be announced and presented with some cool prizes!",
"rsvp": "",
"recording": ""
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/events/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default function EventsSection() {

{date.map((event) => (
<div
className="flex w-[100%] flex-col lg:flex-row lg:items-center lg:justify-between lg:gap-0"
className="flex w-[100%] flex-col lg:flex-row lg:items-center lg:justify-between lg:gap-0 pt-4 pb-8"
key={event.title + event.time}
>
<div className="mb-6 flex items-start gap-6 align-top lg:h-[100%]">
Expand All @@ -74,7 +74,7 @@ export default function EventsSection() {

<div className="flex flex-col gap-4">
<div>
<div className="flex text-3xl md:w-[28rem] md:text-4xl lg:w-[20rem] xl:w-[28rem]">
<div className="flex text-3xl md:w-[28rem] md:text-4xl lg:w-[20rem] xl:w-[22rem]">
{event.title}
</div>
<div className="text-lg md:text-xl">
Expand Down
Loading

0 comments on commit 8dd0ce7

Please sign in to comment.