From b157bcbc246bfe7a4a6da8306554cdcb79e51855 Mon Sep 17 00:00:00 2001 From: Derek Xu Date: Thu, 13 Jun 2024 23:59:13 +1000 Subject: [PATCH 01/15] add fake event data --- frontend/public/data/data.ts | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/frontend/public/data/data.ts b/frontend/public/data/data.ts index 2fbdffe..949ffc7 100644 --- a/frontend/public/data/data.ts +++ b/frontend/public/data/data.ts @@ -10,6 +10,16 @@ export type socialInfo = { alt: string; }; +export type eventInfo = { + title: string; + startTime: string; + endTime: string; + location: string; + description: string; + image: string; + link: string; +}; + export const diamondLinks: sponsorInfo[] = [ { href: 'https://www.janestreet.com/', @@ -151,3 +161,24 @@ export const socialLinks: socialInfo[] = [ alt: 'LinkedIn' } ]; + +export const events: eventInfo[] = [ + { + title: 'Rookie Code Rumble - Capture The Flag (CTF) Competition', + startTime: 'Wednesday, 19 June 2024 16:00:00', + endTime: '23:45 22 June 2024', + location: 'Columbo Theatre A, UNSW', + description: 'Want to learn how to hack the mainframe❓ Want to explore security❓ Join us for the Rookie Code Rumble Capture The Flag on June 19th‼️ 🚀\nWin prizes from a $450 Prize Pool🏆 Teams of up to 3 allowed. Beginners welcomed, no prior experience required and students who haven\'t done security courses are especially welcomed.', + image: 'https://scontent.fsyd10-1.fna.fbcdn.net/v/t39.30808-6/448249337_964318925477719_4689171588021736660_n.jpg?_nc_cat=100&ccb=1-7&_nc_sid=5f2048&_nc_ohc=f7DlIly-QDgQ7kNvgHT9Fw9&_nc_ht=scontent.fsyd10-1.fna&oh=00_AYDFXHym0otALqZ18_Rxfvm2eLtQ4E8MgmojLxFhsG_H4w&oe=6670BC75', + link: 'https://www.facebook.com/events/427443166914907', + }, + { + title: 'Open Dev Workshop 1', + startTime: 'Thursday, 13 June 2024 14:00:00', + endTime: 'Thursday, 13 June 2024 16:00:00', + location: 'Civil Engineering Building 102, UNSW', + description: 'Feeling the FOMO to start your own side projects😖?? But don\'t know where or how to start??🧐 We have the solution for you: Open Dev Workshop!! 💻\nOpen Dev Workshop is an introductory workshop focusing on HTML/CSS and Javascript. With no prior knowledge required, bring your laptop and an eagerness to learn.❤️‍🔥\nDon\'t miss out on this exciting opportunity and let\'s turn your ideas into reality, one line at a time!! 🔥', + image: 'https://scontent.fsyd10-2.fna.fbcdn.net/v/t39.30808-6/446935726_959621305947481_1708375961476055751_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=5f2048&_nc_ohc=Eb--uYtnevgQ7kNvgEtNpvA&_nc_ht=scontent.fsyd10-2.fna&oh=00_AYA3B55iger5ZGu1aa1gvZHfLKrfk7YZ2g7QxaqSZf9q2A&oe=6670DED6', + link: 'https://www.facebook.com/events/1020624239688532', + } +]; \ No newline at end of file From b0d426dde23d8541a8f7d4acf19ffc5fb73e4b71 Mon Sep 17 00:00:00 2001 From: Ming Xuan Yong Date: Tue, 15 Oct 2024 12:57:34 +1100 Subject: [PATCH 02/15] Created two carousels for past events and current events with an overlay for location and start dates --- frontend/public/data/data.ts | 61 +++++++++++++- frontend/src/components/Event/carousel.tsx | 94 ++++++++++++++++++++++ frontend/src/components/Event/index.tsx | 20 +++-- 3 files changed, 168 insertions(+), 7 deletions(-) create mode 100644 frontend/src/components/Event/carousel.tsx diff --git a/frontend/public/data/data.ts b/frontend/public/data/data.ts index 949ffc7..64c9bc2 100644 --- a/frontend/public/data/data.ts +++ b/frontend/public/data/data.ts @@ -169,7 +169,7 @@ export const events: eventInfo[] = [ endTime: '23:45 22 June 2024', location: 'Columbo Theatre A, UNSW', description: 'Want to learn how to hack the mainframe❓ Want to explore security❓ Join us for the Rookie Code Rumble Capture The Flag on June 19th‼️ 🚀\nWin prizes from a $450 Prize Pool🏆 Teams of up to 3 allowed. Beginners welcomed, no prior experience required and students who haven\'t done security courses are especially welcomed.', - image: 'https://scontent.fsyd10-1.fna.fbcdn.net/v/t39.30808-6/448249337_964318925477719_4689171588021736660_n.jpg?_nc_cat=100&ccb=1-7&_nc_sid=5f2048&_nc_ohc=f7DlIly-QDgQ7kNvgHT9Fw9&_nc_ht=scontent.fsyd10-1.fna&oh=00_AYDFXHym0otALqZ18_Rxfvm2eLtQ4E8MgmojLxFhsG_H4w&oe=6670BC75', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/448249337_964318925477719_4689171588021736660_n.jpg?_nc_cat=100&ccb=1-7&_nc_sid=75d36f&_nc_ohc=ORdXB7beljwQ7kNvgGK3EgT&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AJPQZFI3KDjqlUXpEXj0g4n&oh=00_AYCqsRE9By_qBvBJ5bRLKnci9t6gSiHUGfmIkSQS4WG2LA&oe=67135575', link: 'https://www.facebook.com/events/427443166914907', }, { @@ -178,7 +178,64 @@ export const events: eventInfo[] = [ endTime: 'Thursday, 13 June 2024 16:00:00', location: 'Civil Engineering Building 102, UNSW', description: 'Feeling the FOMO to start your own side projects😖?? But don\'t know where or how to start??🧐 We have the solution for you: Open Dev Workshop!! 💻\nOpen Dev Workshop is an introductory workshop focusing on HTML/CSS and Javascript. With no prior knowledge required, bring your laptop and an eagerness to learn.❤️‍🔥\nDon\'t miss out on this exciting opportunity and let\'s turn your ideas into reality, one line at a time!! 🔥', - image: 'https://scontent.fsyd10-2.fna.fbcdn.net/v/t39.30808-6/446935726_959621305947481_1708375961476055751_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=5f2048&_nc_ohc=Eb--uYtnevgQ7kNvgEtNpvA&_nc_ht=scontent.fsyd10-2.fna&oh=00_AYA3B55iger5ZGu1aa1gvZHfLKrfk7YZ2g7QxaqSZf9q2A&oe=6670DED6', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/446935726_959621305947481_1708375961476055751_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=75d36f&_nc_ohc=Y8wgeRzW8DkQ7kNvgEllCg0&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AemXrjsPaAsS0Jo7t3wNPst&oh=00_AYCFB70t_M0h8epdZ7UKq8LVWL4vqtGIkSC9kGUes1ssvQ&oe=671377D6', link: 'https://www.facebook.com/events/1020624239688532', + }, + { + title: '2024 FMAA STEM Alternative Pathways Evening', + startTime: 'Wednesday, 9 Oct 2024 18:15:00', + endTime: 'Wednesday, 9 Oct 2024 20:30:00', + location: 'Roundhouse Room 3 & 4, UNSW', + description: 'Join us for an engaging panel discussion featuring representatives from Australia’s top firms across industries such as quantitative trading, management consulting, investment banking, asset management, and professional services. Gain valuable insights into how a STEM background can open doors to a variety of business and finance careers, and develop meaningful connections with industry professionals.', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/461261086_540208508398572_4261296480620587383_n.jpg?stp=dst-jpg_s960x960&_nc_cat=103&ccb=1-7&_nc_sid=75d36f&_nc_ohc=vf3IPe3_NPEQ7kNvgG_SxLX&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=ALtMsUxDU2QhcP8A5cS-tr7&oh=00_AYADt5ngFtSJsaT3YgKGjUHU8PHudDTb8eMHRu9JKuWuCw&oe=6713857F', + link: 'https://www.facebook.com/events/428430126479506', + }, + { + title: 'Cultural Sweet Treats', + startTime: 'Wednesday, 9 Oct 2024 13:00:00', + endTime: 'Wednesday, 9 Oct 2024 15:00:00', + location: 'UNSW Quadrangle', + description: 'Looking for a creative way to celebrate diversity?🤔🌟 Come along for an afternoon of fun where you’ll get to design and decorate your own gift box 🎁 filled with cultural sweets from around the world!🌏 Try new flavours and treats as you craft your masterpiece for a friend, family member or yourself 😋', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/461677000_1040949901147954_3024711492723797720_n.jpg?stp=dst-jpg_s960x960&_nc_cat=100&ccb=1-7&_nc_sid=75d36f&_nc_ohc=zY_RqNGeg50Q7kNvgH4izQ8&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AEzNe6W68jyyD37bJY9us2s&oh=00_AYAwuI1WXfZjhpeWSbHT1clhl05xVZdo0E-3nMCXo-Ndkw&oe=67139F71', + link: 'https://www.facebook.com/events/9261495757199727', + } +]; + +export const previousEvents: eventInfo[] = [ + { + title: 'COMP1521 Revision Session', + startTime: 'Wednesday, 31 July 2024 16:00:00', + endTime: 'Wednesday, 31 July 2024 18:00:00', + location: 'UNSW Colombo Theatre B', + description: 'PSST 🤫 Think a pipe is what Mario goes down? ⬇️ Still think threads are for clothes? 🪡 Whether you’re seven weeks behind (😣) on lectures 👩‍🏫, or super on top of it (🤯), get ready to BYTE 👾 into a world of MIPS and files and numbers 📣 at our COMP1521 Revision Session to learn and/or reinforce your knowledge from the beginning to the end 🏁💪🏻🧠 Make no MIPStake, with bits of free food for you to byte into 🤤 our 1521 Revision Session is just for you ‼️', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/452409402_989988656244079_1650487011875279290_n.jpg?stp=dst-jpg_s960x960&_nc_cat=111&ccb=1-7&_nc_sid=75d36f&_nc_ohc=ht74Cur7JP4Q7kNvgGspvAQ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APUh-KsjJ_dRpSnbr0TYkXd&oh=00_AYAu-LeWj1k53uhaQe6BMnCdQiDRUmguc0R4gt93VnxsRA&oe=6713A488', + link: 'https://www.facebook.com/events/1911189126010096', + }, + { + title: 'IMC Coding Competition', + startTime: 'Wednesday, 13 March 2024 15:00:00', + endTime: 'Wednesday, 13 March 2024 18:00:00', + location: 'Mathews Theatre B, UNSW', + description: 'Get those fingers 👐moving, as you’ll need to team up in groups of 3️⃣to be able to face 🗣️some of the problems thrown your way.To reward your diligence, you’ll be able to grab a free BYTE as finger food is provided 😈 Gaining coding experience and free food, what else could someone even ask for??? 😣', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429779953_899425045300441_8341318489109234227_n.jpg?stp=dst-jpg_s960x960&_nc_cat=108&ccb=1-7&_nc_sid=75d36f&_nc_ohc=GY9LwEPT93gQ7kNvgHltEQe&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APnYFltr29MYoFJQyVlY7HF&oh=00_AYBAaye3BXFt34mnbEi4ERpy1XmUYCTEbpzSqL1xa_xLsA&oe=6713AF65', + link: 'https://www.facebook.com/events/1106870833796065', + }, + { + title: 'Cultural BBQ', + startTime: 'Wednesday, 17 July 2024 12:00:00', + endTime: 'Wednesday, 17 July 2024 14:00:00', + location: 'Globe Lawn', + description: 'Tired of eating the same food every week? 😔 Looking to expand your horizons and try some cultural food? 🥘 BROKE AND NEED SOMETHING TO EAT ⁉️⁉️ Well CSESoc has you covered with an upgrade to our weekly bbq🍖🌟', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/450318124_983296013580010_564345365632281594_n.jpg?stp=dst-jpg_s960x960&_nc_cat=109&ccb=1-7&_nc_sid=75d36f&_nc_ohc=bpVcbawdlHUQ7kNvgFOoHVZ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AHXSpjSIF8pprA1p1Ogqi34&oh=00_AYD1_PrwM7LTFVCvhXIQ3kubwhhYkBOmIO49Gpy4bvTdEg&oe=67139777', + link: 'https://www.facebook.com/events/871196261705246', + }, + { + title: 'CSESOC Boardgames Night', + startTime: 'Thursday, 7 March 2024 17:00:00', + endTime: 'Thursday, 7 March 2024 19:00:00', + location: 'Design Next Studio, Level 5, J17, UNSW', + description: 'The whirlwind of uni got u overwhelmed 😣? Come down to the Design Studio, and chill out with us 🧘‍♀️ as we play board games and indulge in free pizza 🍕!', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429667295_896623802247232_669736057716718914_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=75d36f&_nc_ohc=Ayn7Skl-pFAQ7kNvgES7wuB&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AsnAjGmOe-G8q1L6qZb9G3U&oh=00_AYDpfvDY6DpKeydN99VCHujemmm0gZwL7_O1HjXHvwiPsw&oe=671383B1', + link: 'https://www.facebook.com/events/322704110303236', } ]; \ No newline at end of file diff --git a/frontend/src/components/Event/carousel.tsx b/frontend/src/components/Event/carousel.tsx new file mode 100644 index 0000000..d10017e --- /dev/null +++ b/frontend/src/components/Event/carousel.tsx @@ -0,0 +1,94 @@ +import React, { useState } from 'react'; +import { eventInfo } from '../../../public/data/data'; + +interface CarouselProps { + events: eventInfo[]; +} + +const Carousel: React.FC = ({ events }) => { + const [currentIndex, setCurrentIndex] = useState(0); + + const prevSlide = () => { + setCurrentIndex((prevIndex) => + prevIndex === 0 ? events.length - 1 : prevIndex - 1 + ); + }; + + const nextSlide = () => { + setCurrentIndex((prevIndex) => + prevIndex === events.length - 1 ? 0 : prevIndex + 1 + ); + }; + + return ( +
+
+ + {events[currentIndex].title} +
+
+

{events[currentIndex].title}

+

{events[currentIndex].location}

+

+ {new Date(events[currentIndex].startTime).toLocaleDateString()} -{" "} + {new Date(events[currentIndex].endTime).toLocaleDateString()} +

+
+
+ + {/*
+

{events[currentIndex].title}

+

{events[currentIndex].description}

+

Location: {events[currentIndex].location}

+

+ Start Time: {new Date(events[currentIndex].startTime).toLocaleString()} +

+

+ End Time: {new Date(events[currentIndex].endTime).toLocaleString()} +

+ + Event Link + +
*/} +
+ + {/* Left and right buttons */} + + + + {/* Dots indicator */} +
+ {events.map((_, index) => ( + setCurrentIndex(index)} + > + ))} +
+
+ ); +}; + +export default Carousel; \ No newline at end of file diff --git a/frontend/src/components/Event/index.tsx b/frontend/src/components/Event/index.tsx index b9911cd..9a60612 100644 --- a/frontend/src/components/Event/index.tsx +++ b/frontend/src/components/Event/index.tsx @@ -1,3 +1,7 @@ +import React from 'react'; +import Carousel from './carousel'; +import { events, previousEvents } from '../../../public/data/data'; + const Event = () => { return (
@@ -5,13 +9,19 @@ const Event = () => {

02

EVENTS

-
-

- We run a wide-variety of events for fun, learning new skills and careers. For full - listings, check out the CSESoc Discord or our Facebook page! +

+

+ Explore upcoming events +

+ {/*
Placeholder
*/} +
+ +
+

+ Previous events

-
Placeholder
+
); }; From f277d05cb128edd4e47969c874448b189f5b8cfe Mon Sep 17 00:00:00 2001 From: Ming Xuan Yong Date: Tue, 15 Oct 2024 13:13:22 +1100 Subject: [PATCH 03/15] Edited events page such that it can be visible when events is clicked --- frontend/src/pages/events.tsx | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/frontend/src/pages/events.tsx b/frontend/src/pages/events.tsx index 3e95480..a1aadb5 100644 --- a/frontend/src/pages/events.tsx +++ b/frontend/src/pages/events.tsx @@ -1,22 +1,14 @@ import Navbar from '@/components/Navbar'; import Footer from '@/components/Footer'; -import axios from 'axios'; +// import axios from 'axios'; +import Events from '@/components/Event'; export default function EventsPage() { - const pingBackend = async () => { - axios - .get( - `http://${process.env.NEXT_PUBLIC_BACKEND_HOST}:${process.env.NEXT_PUBLIC_BACKEND_PORT}/ping` - ) - .then((resp) => console.log(resp.data)) - .catch((error) => console.log(error.message)); - }; - return (
- +
); -} +} \ No newline at end of file From 77a3747fe32f0800fb73184fd9a0d37ffe0826f7 Mon Sep 17 00:00:00 2001 From: Ming Xuan Yong Date: Thu, 17 Oct 2024 07:14:24 +1100 Subject: [PATCH 04/15] Added in automatic slide feature as well as fixed the dates --- frontend/src/components/Event/carousel.tsx | 70 ++++++++++++---------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/frontend/src/components/Event/carousel.tsx b/frontend/src/components/Event/carousel.tsx index d10017e..03e0fff 100644 --- a/frontend/src/components/Event/carousel.tsx +++ b/frontend/src/components/Event/carousel.tsx @@ -1,4 +1,4 @@ -import React, { useState } from 'react'; +import React, { useState, useEffect } from 'react'; import { eventInfo } from '../../../public/data/data'; interface CarouselProps { @@ -7,23 +7,39 @@ interface CarouselProps { const Carousel: React.FC = ({ events }) => { const [currentIndex, setCurrentIndex] = useState(0); + const [isFading, setIsFading] = useState(false); + + useEffect(() => { + const intervalId = setInterval(() => { + fadeToNextSlide(); + }, 3000); + + return () => clearInterval(intervalId); + }, [events.length]); + + const fadeToNextSlide = () => { + setIsFading(true); + + setTimeout(() => { + setCurrentIndex((prevIndex) => (prevIndex === events.length - 1 ? 0 : prevIndex + 1)); + setIsFading(false); + }, 300); + }; const prevSlide = () => { - setCurrentIndex((prevIndex) => - prevIndex === 0 ? events.length - 1 : prevIndex - 1 - ); + setCurrentIndex((prevIndex) => (prevIndex === 0 ? events.length - 1 : prevIndex - 1)); }; const nextSlide = () => { - setCurrentIndex((prevIndex) => - prevIndex === events.length - 1 ? 0 : prevIndex + 1 - ); + fadeToNextSlide(); }; return ( - {/*
-

{events[currentIndex].title}

-

{events[currentIndex].description}

-

Location: {events[currentIndex].location}

-

- Start Time: {new Date(events[currentIndex].startTime).toLocaleString()} -

-

- End Time: {new Date(events[currentIndex].endTime).toLocaleString()} -

- - Event Link - -
*/} - {/* Left and right buttons */} - {/* Dots indicator */}
{events.map((_, index) => ( = ({ events }) => { ); }; +const formatEventDate = (startTime: string, endTime: string): string => { + const startDate = new Date(startTime); + const endDate = new Date(endTime); + + const sameDay = startDate.toDateString() === endDate.toDateString(); + + if (sameDay) { + return startDate.toLocaleDateString(); + } else { + return `${startDate.toLocaleDateString()} - ${endDate.toLocaleDateString()}`; + } +}; + + export default Carousel; \ No newline at end of file From 11aed9f4deefce01a3b26c6842d1805cab47a8b4 Mon Sep 17 00:00:00 2001 From: Wolfdragon24 Date: Fri, 18 Oct 2024 19:31:54 +1100 Subject: [PATCH 05/15] Reduce carousel speed and append no event message --- frontend/src/components/Event/carousel.tsx | 2 +- frontend/src/components/Event/index.tsx | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Event/carousel.tsx b/frontend/src/components/Event/carousel.tsx index 03e0fff..b44310a 100644 --- a/frontend/src/components/Event/carousel.tsx +++ b/frontend/src/components/Event/carousel.tsx @@ -12,7 +12,7 @@ const Carousel: React.FC = ({ events }) => { useEffect(() => { const intervalId = setInterval(() => { fadeToNextSlide(); - }, 3000); + }, 6000); return () => clearInterval(intervalId); }, [events.length]); diff --git a/frontend/src/components/Event/index.tsx b/frontend/src/components/Event/index.tsx index 9a60612..fa643d0 100644 --- a/frontend/src/components/Event/index.tsx +++ b/frontend/src/components/Event/index.tsx @@ -15,7 +15,12 @@ const Event = () => {

{/*
Placeholder
*/}
- + {events.length !== 0 ? + : +
+

No upcoming events... check back here later!

+
+ }

Previous events From 7492572e76aede358bf927e1a99b733e9aa29d93 Mon Sep 17 00:00:00 2001 From: Wolfdragon24 Date: Fri, 18 Oct 2024 19:37:37 +1100 Subject: [PATCH 06/15] Move events information from data to events file --- frontend/public/data/events.ts | 88 ++++++++++++++++++++++ frontend/src/components/Event/carousel.tsx | 2 +- frontend/src/components/Event/index.tsx | 2 +- 3 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 frontend/public/data/events.ts diff --git a/frontend/public/data/events.ts b/frontend/public/data/events.ts new file mode 100644 index 0000000..6341c53 --- /dev/null +++ b/frontend/public/data/events.ts @@ -0,0 +1,88 @@ + +export type eventInfo = { + title: string; + startTime: string; + endTime: string; + location: string; + description: string; + image: string; + link: string; +}; + +export const events: eventInfo[] = [ + { + title: 'Rookie Code Rumble - Capture The Flag (CTF) Competition', + startTime: 'Wednesday, 19 June 2024 16:00:00', + endTime: '23:45 22 June 2024', + location: 'Columbo Theatre A, UNSW', + description: 'Want to learn how to hack the mainframe❓ Want to explore security❓ Join us for the Rookie Code Rumble Capture The Flag on June 19th‼️ 🚀\nWin prizes from a $450 Prize Pool🏆 Teams of up to 3 allowed. Beginners welcomed, no prior experience required and students who haven\'t done security courses are especially welcomed.', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/448249337_964318925477719_4689171588021736660_n.jpg?_nc_cat=100&ccb=1-7&_nc_sid=75d36f&_nc_ohc=ORdXB7beljwQ7kNvgGK3EgT&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AJPQZFI3KDjqlUXpEXj0g4n&oh=00_AYCqsRE9By_qBvBJ5bRLKnci9t6gSiHUGfmIkSQS4WG2LA&oe=67135575', + link: 'https://www.facebook.com/events/427443166914907', + }, + { + title: 'Open Dev Workshop 1', + startTime: 'Thursday, 13 June 2024 14:00:00', + endTime: 'Thursday, 13 June 2024 16:00:00', + location: 'Civil Engineering Building 102, UNSW', + description: 'Feeling the FOMO to start your own side projects😖?? But don\'t know where or how to start??🧐 We have the solution for you: Open Dev Workshop!! 💻\nOpen Dev Workshop is an introductory workshop focusing on HTML/CSS and Javascript. With no prior knowledge required, bring your laptop and an eagerness to learn.❤️‍🔥\nDon\'t miss out on this exciting opportunity and let\'s turn your ideas into reality, one line at a time!! 🔥', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/446935726_959621305947481_1708375961476055751_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=75d36f&_nc_ohc=Y8wgeRzW8DkQ7kNvgEllCg0&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AemXrjsPaAsS0Jo7t3wNPst&oh=00_AYCFB70t_M0h8epdZ7UKq8LVWL4vqtGIkSC9kGUes1ssvQ&oe=671377D6', + link: 'https://www.facebook.com/events/1020624239688532', + }, + { + title: '2024 FMAA STEM Alternative Pathways Evening', + startTime: 'Wednesday, 9 Oct 2024 18:15:00', + endTime: 'Wednesday, 9 Oct 2024 20:30:00', + location: 'Roundhouse Room 3 & 4, UNSW', + description: 'Join us for an engaging panel discussion featuring representatives from Australia’s top firms across industries such as quantitative trading, management consulting, investment banking, asset management, and professional services. Gain valuable insights into how a STEM background can open doors to a variety of business and finance careers, and develop meaningful connections with industry professionals.', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/461261086_540208508398572_4261296480620587383_n.jpg?stp=dst-jpg_s960x960&_nc_cat=103&ccb=1-7&_nc_sid=75d36f&_nc_ohc=vf3IPe3_NPEQ7kNvgG_SxLX&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=ALtMsUxDU2QhcP8A5cS-tr7&oh=00_AYADt5ngFtSJsaT3YgKGjUHU8PHudDTb8eMHRu9JKuWuCw&oe=6713857F', + link: 'https://www.facebook.com/events/428430126479506', + }, + { + title: 'Cultural Sweet Treats', + startTime: 'Wednesday, 9 Oct 2024 13:00:00', + endTime: 'Wednesday, 9 Oct 2024 15:00:00', + location: 'UNSW Quadrangle', + description: 'Looking for a creative way to celebrate diversity?🤔🌟 Come along for an afternoon of fun where you’ll get to design and decorate your own gift box 🎁 filled with cultural sweets from around the world!🌏 Try new flavours and treats as you craft your masterpiece for a friend, family member or yourself 😋', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/461677000_1040949901147954_3024711492723797720_n.jpg?stp=dst-jpg_s960x960&_nc_cat=100&ccb=1-7&_nc_sid=75d36f&_nc_ohc=zY_RqNGeg50Q7kNvgH4izQ8&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AEzNe6W68jyyD37bJY9us2s&oh=00_AYAwuI1WXfZjhpeWSbHT1clhl05xVZdo0E-3nMCXo-Ndkw&oe=67139F71', + link: 'https://www.facebook.com/events/9261495757199727', + } +]; + +export const previousEvents: eventInfo[] = [ + { + title: 'COMP1521 Revision Session', + startTime: 'Wednesday, 31 July 2024 16:00:00', + endTime: 'Wednesday, 31 July 2024 18:00:00', + location: 'UNSW Colombo Theatre B', + description: 'PSST 🤫 Think a pipe is what Mario goes down? ⬇️ Still think threads are for clothes? 🪡 Whether you’re seven weeks behind (😣) on lectures 👩‍🏫, or super on top of it (🤯), get ready to BYTE 👾 into a world of MIPS and files and numbers 📣 at our COMP1521 Revision Session to learn and/or reinforce your knowledge from the beginning to the end 🏁💪🏻🧠 Make no MIPStake, with bits of free food for you to byte into 🤤 our 1521 Revision Session is just for you ‼️', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/452409402_989988656244079_1650487011875279290_n.jpg?stp=dst-jpg_s960x960&_nc_cat=111&ccb=1-7&_nc_sid=75d36f&_nc_ohc=ht74Cur7JP4Q7kNvgGspvAQ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APUh-KsjJ_dRpSnbr0TYkXd&oh=00_AYAu-LeWj1k53uhaQe6BMnCdQiDRUmguc0R4gt93VnxsRA&oe=6713A488', + link: 'https://www.facebook.com/events/1911189126010096', + }, + { + title: 'IMC Coding Competition', + startTime: 'Wednesday, 13 March 2024 15:00:00', + endTime: 'Wednesday, 13 March 2024 18:00:00', + location: 'Mathews Theatre B, UNSW', + description: 'Get those fingers 👐moving, as you’ll need to team up in groups of 3️⃣to be able to face 🗣️some of the problems thrown your way.To reward your diligence, you’ll be able to grab a free BYTE as finger food is provided 😈 Gaining coding experience and free food, what else could someone even ask for??? 😣', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429779953_899425045300441_8341318489109234227_n.jpg?stp=dst-jpg_s960x960&_nc_cat=108&ccb=1-7&_nc_sid=75d36f&_nc_ohc=GY9LwEPT93gQ7kNvgHltEQe&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APnYFltr29MYoFJQyVlY7HF&oh=00_AYBAaye3BXFt34mnbEi4ERpy1XmUYCTEbpzSqL1xa_xLsA&oe=6713AF65', + link: 'https://www.facebook.com/events/1106870833796065', + }, + { + title: 'Cultural BBQ', + startTime: 'Wednesday, 17 July 2024 12:00:00', + endTime: 'Wednesday, 17 July 2024 14:00:00', + location: 'Globe Lawn', + description: 'Tired of eating the same food every week? 😔 Looking to expand your horizons and try some cultural food? 🥘 BROKE AND NEED SOMETHING TO EAT ⁉️⁉️ Well CSESoc has you covered with an upgrade to our weekly bbq🍖🌟', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/450318124_983296013580010_564345365632281594_n.jpg?stp=dst-jpg_s960x960&_nc_cat=109&ccb=1-7&_nc_sid=75d36f&_nc_ohc=bpVcbawdlHUQ7kNvgFOoHVZ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AHXSpjSIF8pprA1p1Ogqi34&oh=00_AYD1_PrwM7LTFVCvhXIQ3kubwhhYkBOmIO49Gpy4bvTdEg&oe=67139777', + link: 'https://www.facebook.com/events/871196261705246', + }, + { + title: 'CSESOC Boardgames Night', + startTime: 'Thursday, 7 March 2024 17:00:00', + endTime: 'Thursday, 7 March 2024 19:00:00', + location: 'Design Next Studio, Level 5, J17, UNSW', + description: 'The whirlwind of uni got u overwhelmed 😣? Come down to the Design Studio, and chill out with us 🧘‍♀️ as we play board games and indulge in free pizza 🍕!', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429667295_896623802247232_669736057716718914_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=75d36f&_nc_ohc=Ayn7Skl-pFAQ7kNvgES7wuB&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AsnAjGmOe-G8q1L6qZb9G3U&oh=00_AYDpfvDY6DpKeydN99VCHujemmm0gZwL7_O1HjXHvwiPsw&oe=671383B1', + link: 'https://www.facebook.com/events/322704110303236', + } +]; diff --git a/frontend/src/components/Event/carousel.tsx b/frontend/src/components/Event/carousel.tsx index b44310a..9ef30db 100644 --- a/frontend/src/components/Event/carousel.tsx +++ b/frontend/src/components/Event/carousel.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react'; -import { eventInfo } from '../../../public/data/data'; +import { eventInfo } from '../../../public/data/events'; interface CarouselProps { events: eventInfo[]; diff --git a/frontend/src/components/Event/index.tsx b/frontend/src/components/Event/index.tsx index ec0fd05..0a3e6e9 100644 --- a/frontend/src/components/Event/index.tsx +++ b/frontend/src/components/Event/index.tsx @@ -1,6 +1,6 @@ import React from 'react'; import Carousel from './carousel'; -import { events, previousEvents } from '../../../public/data/data'; +import { events, previousEvents } from '../../../public/data/events'; const Event = () => { return ( From 7f9d64785b8632350da4a57606f6ecbaa81ab842 Mon Sep 17 00:00:00 2001 From: Wolfdragon24 Date: Fri, 18 Oct 2024 20:43:35 +1100 Subject: [PATCH 07/15] Replace previous events carousel with gallery, remove previous events from home page and switch to multi-carousel --- frontend/package-lock.json | 9 ++ frontend/package.json | 1 + frontend/src/components/Event/EventsBrief.tsx | 28 +++++ .../src/components/Event/EventsCarousel.tsx | 72 +++++++++++++ .../src/components/Event/EventsGallery.tsx | 46 ++++++++ frontend/src/components/Event/carousel.tsx | 102 ------------------ frontend/src/components/Event/index.tsx | 16 ++- frontend/src/pages/index.tsx | 4 +- 8 files changed, 169 insertions(+), 109 deletions(-) create mode 100644 frontend/src/components/Event/EventsBrief.tsx create mode 100644 frontend/src/components/Event/EventsCarousel.tsx create mode 100644 frontend/src/components/Event/EventsGallery.tsx delete mode 100644 frontend/src/components/Event/carousel.tsx diff --git a/frontend/package-lock.json b/frontend/package-lock.json index c67a2eb..8190e40 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -20,6 +20,7 @@ "postcss": "8.4.29", "react": "18.2.0", "react-dom": "18.2.0", + "react-grid-gallery": "^1.0.1", "react-multi-carousel": "^2.8.5", "tailwindcss": "3.3.3", "typescript": "5.1" @@ -4127,6 +4128,14 @@ "react": "^18.2.0" } }, + "node_modules/react-grid-gallery": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/react-grid-gallery/-/react-grid-gallery-1.0.1.tgz", + "integrity": "sha512-+fVd6fH9tm0W+UMgzRHET/gmzSs2/l2sGOuELLaHXMto6UhuZdscj9ILHOYe7hn0GBRUJiczMllsEs7OJz9uPA==", + "peerDependencies": { + "react": ">=16.14.0" + } + }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", diff --git a/frontend/package.json b/frontend/package.json index 1da8df9..5aed6f2 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -25,6 +25,7 @@ "postcss": "8.4.29", "react": "18.2.0", "react-dom": "18.2.0", + "react-grid-gallery": "^1.0.1", "react-multi-carousel": "^2.8.5", "tailwindcss": "3.3.3", "typescript": "5.1" diff --git a/frontend/src/components/Event/EventsBrief.tsx b/frontend/src/components/Event/EventsBrief.tsx new file mode 100644 index 0000000..ee63395 --- /dev/null +++ b/frontend/src/components/Event/EventsBrief.tsx @@ -0,0 +1,28 @@ +import React from 'react'; +import { events } from '../../../public/data/events'; +import EventsCarousel from './EventsCarousel'; + +const EventBrief = () => { + return ( +

+
+

UPCOMING EVENTS

+
+ {events.length !== 0 ? + : +
+

No upcoming events... check back here later!

+
+ } + +
+ ); +}; + +export default EventBrief; diff --git a/frontend/src/components/Event/EventsCarousel.tsx b/frontend/src/components/Event/EventsCarousel.tsx new file mode 100644 index 0000000..6dcc428 --- /dev/null +++ b/frontend/src/components/Event/EventsCarousel.tsx @@ -0,0 +1,72 @@ +import { events } from '@/../public/data/events'; +import Carousel from 'react-multi-carousel'; +import 'react-multi-carousel/lib/styles.css'; + +export default function EventsCarousel() { + const responsive = { + superLargeDesktop: { + breakpoint: { max: 4000, min: 1024 }, + items: 3, + }, + desktop: { + breakpoint: { max: 1024, min: 768 }, + items: 3, + }, + tablet: { + breakpoint: { max: 768, min: 464 }, + items: 2, + }, + mobile: { + breakpoint: { max: 464, min: 0 }, + items: 1, + }, + }; + + return ( + + {events.map((event, index) => ( + + ))} + + ); +} + +const formatEventDate = (startTime: string, endTime: string): string => { + const startDate = new Date(startTime); + const endDate = new Date(endTime); + + const sameDay = startDate.toDateString() === endDate.toDateString(); + + if (sameDay) { + return startDate.toLocaleDateString(); + } else { + return `${startDate.toLocaleDateString()} - ${endDate.toLocaleDateString()}`; + } +}; \ No newline at end of file diff --git a/frontend/src/components/Event/EventsGallery.tsx b/frontend/src/components/Event/EventsGallery.tsx new file mode 100644 index 0000000..a8d1e64 --- /dev/null +++ b/frontend/src/components/Event/EventsGallery.tsx @@ -0,0 +1,46 @@ +import React from 'react'; +import { previousEvents } from '../../../public/data/events'; +import { Gallery } from "react-grid-gallery"; + +const EventGallery = () => { + const formattedEvents = previousEvents.map((event) => { + return { + src: event.image, + height: 256, + width: 500, + customOverlay: ( +
+
+

{event.title}

+

{event.location}

+

+ {formatEventDate(event.startTime, event.endTime)} +

+
+
+ ), + }; + }); + + return ( + + ); +}; + +export default EventGallery; + +const formatEventDate = (startTime: string, endTime: string): string => { + const startDate = new Date(startTime); + const endDate = new Date(endTime); + + const sameDay = startDate.toDateString() === endDate.toDateString(); + + if (sameDay) { + return startDate.toLocaleDateString(); + } else { + return `${startDate.toLocaleDateString()} - ${endDate.toLocaleDateString()}`; + } +}; \ No newline at end of file diff --git a/frontend/src/components/Event/carousel.tsx b/frontend/src/components/Event/carousel.tsx deleted file mode 100644 index 9ef30db..0000000 --- a/frontend/src/components/Event/carousel.tsx +++ /dev/null @@ -1,102 +0,0 @@ -import React, { useState, useEffect } from 'react'; -import { eventInfo } from '../../../public/data/events'; - -interface CarouselProps { - events: eventInfo[]; -} - -const Carousel: React.FC = ({ events }) => { - const [currentIndex, setCurrentIndex] = useState(0); - const [isFading, setIsFading] = useState(false); - - useEffect(() => { - const intervalId = setInterval(() => { - fadeToNextSlide(); - }, 6000); - - return () => clearInterval(intervalId); - }, [events.length]); - - const fadeToNextSlide = () => { - setIsFading(true); - - setTimeout(() => { - setCurrentIndex((prevIndex) => (prevIndex === events.length - 1 ? 0 : prevIndex + 1)); - setIsFading(false); - }, 300); - }; - - const prevSlide = () => { - setCurrentIndex((prevIndex) => (prevIndex === 0 ? events.length - 1 : prevIndex - 1)); - }; - - const nextSlide = () => { - fadeToNextSlide(); - }; - - return ( - - ); -}; - -const formatEventDate = (startTime: string, endTime: string): string => { - const startDate = new Date(startTime); - const endDate = new Date(endTime); - - const sameDay = startDate.toDateString() === endDate.toDateString(); - - if (sameDay) { - return startDate.toLocaleDateString(); - } else { - return `${startDate.toLocaleDateString()} - ${endDate.toLocaleDateString()}`; - } -}; - - -export default Carousel; \ No newline at end of file diff --git a/frontend/src/components/Event/index.tsx b/frontend/src/components/Event/index.tsx index 0a3e6e9..8cc0163 100644 --- a/frontend/src/components/Event/index.tsx +++ b/frontend/src/components/Event/index.tsx @@ -1,12 +1,13 @@ import React from 'react'; -import Carousel from './carousel'; -import { events, previousEvents } from '../../../public/data/events'; +import { events } from '../../../public/data/events'; +import EventsCarousel from './EventsCarousel'; +import EventGallery from './EventsGallery'; const Event = () => { return (
-

UPCOMING EVENTS

+

EVENTS

@@ -22,8 +23,13 @@ const Event = () => {
Placeholder
+
+

+ Explore upcoming events +

+
{events.length !== 0 ? - : + :

No upcoming events... check back here later!

@@ -33,7 +39,7 @@ const Event = () => { Previous events

- + ); }; diff --git a/frontend/src/pages/index.tsx b/frontend/src/pages/index.tsx index 8fe672b..821be72 100644 --- a/frontend/src/pages/index.tsx +++ b/frontend/src/pages/index.tsx @@ -1,14 +1,14 @@ import Landing from '@/components/Landing'; import Sponsors from '@/components/Sponsors/index'; -import Event from '@/components/Event'; import AboutHomePage from '@/components/About/AboutHomepage'; +import EventsBrief from '@/components/Event/EventsBrief'; export default function HomePage() { return (
- +
); From 91a1b1013ae944c7e4779930518751c969084570 Mon Sep 17 00:00:00 2001 From: Wolfdragon24 Date: Fri, 18 Oct 2024 20:52:35 +1100 Subject: [PATCH 08/15] Formatting fix --- .../src/components/Event/EventsCarousel.tsx | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/frontend/src/components/Event/EventsCarousel.tsx b/frontend/src/components/Event/EventsCarousel.tsx index 6dcc428..d8acbe0 100644 --- a/frontend/src/components/Event/EventsCarousel.tsx +++ b/frontend/src/components/Event/EventsCarousel.tsx @@ -36,22 +36,22 @@ export default function EventsCarousel() { > {events.map((event, index) => (
- - {event.title} - ))} From 6ee8463231464e23e64e2255d5fddf1a20dcbe3d Mon Sep 17 00:00:00 2001 From: Wolfdragon24 Date: Fri, 18 Oct 2024 20:57:32 +1100 Subject: [PATCH 09/15] Reduce width of gallery items --- frontend/src/components/Event/EventsGallery.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Event/EventsGallery.tsx b/frontend/src/components/Event/EventsGallery.tsx index a8d1e64..18c51e8 100644 --- a/frontend/src/components/Event/EventsGallery.tsx +++ b/frontend/src/components/Event/EventsGallery.tsx @@ -7,7 +7,7 @@ const EventGallery = () => { return { src: event.image, height: 256, - width: 500, + width: 400, customOverlay: (
From 6f5018a654bb3a819d012d4db378224d990852ae Mon Sep 17 00:00:00 2001 From: Wolfdragon24 Date: Fri, 18 Oct 2024 21:24:29 +1100 Subject: [PATCH 10/15] Replace gallery library --- frontend/package-lock.json | 27 +++-- frontend/package.json | 2 +- frontend/public/data/events.ts | 108 ++++++++++++++++++ .../src/components/Event/EventsGallery.tsx | 34 +++--- 4 files changed, 145 insertions(+), 26 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 8190e40..91e25af 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -20,8 +20,8 @@ "postcss": "8.4.29", "react": "18.2.0", "react-dom": "18.2.0", - "react-grid-gallery": "^1.0.1", "react-multi-carousel": "^2.8.5", + "react-photo-album": "^3.0.2", "tailwindcss": "3.3.3", "typescript": "5.1" }, @@ -4128,14 +4128,6 @@ "react": "^18.2.0" } }, - "node_modules/react-grid-gallery": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/react-grid-gallery/-/react-grid-gallery-1.0.1.tgz", - "integrity": "sha512-+fVd6fH9tm0W+UMgzRHET/gmzSs2/l2sGOuELLaHXMto6UhuZdscj9ILHOYe7hn0GBRUJiczMllsEs7OJz9uPA==", - "peerDependencies": { - "react": ">=16.14.0" - } - }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -4159,6 +4151,23 @@ "node": ">=8" } }, + "node_modules/react-photo-album": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/react-photo-album/-/react-photo-album-3.0.2.tgz", + "integrity": "sha512-w3+8i6aj9l1jRfcubgVbAlBGSdtiXcqWdcwZcH4/Bavc+v7X7h+S3TkQ723pvDABjhaaxS168g9ECEBP6xnKrQ==", + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@types/react": ">=18", + "react": ">=18" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index 5aed6f2..40b8bf6 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -25,8 +25,8 @@ "postcss": "8.4.29", "react": "18.2.0", "react-dom": "18.2.0", - "react-grid-gallery": "^1.0.1", "react-multi-carousel": "^2.8.5", + "react-photo-album": "^3.0.2", "tailwindcss": "3.3.3", "typescript": "5.1" }, diff --git a/frontend/public/data/events.ts b/frontend/public/data/events.ts index 6341c53..4a4720a 100644 --- a/frontend/public/data/events.ts +++ b/frontend/public/data/events.ts @@ -49,6 +49,114 @@ export const events: eventInfo[] = [ ]; export const previousEvents: eventInfo[] = [ + { + title: 'COMP1521 Revision Session', + startTime: 'Wednesday, 31 July 2024 16:00:00', + endTime: 'Wednesday, 31 July 2024 18:00:00', + location: 'UNSW Colombo Theatre B', + description: 'PSST 🤫 Think a pipe is what Mario goes down? ⬇️ Still think threads are for clothes? 🪡 Whether you’re seven weeks behind (😣) on lectures 👩‍🏫, or super on top of it (🤯), get ready to BYTE 👾 into a world of MIPS and files and numbers 📣 at our COMP1521 Revision Session to learn and/or reinforce your knowledge from the beginning to the end 🏁💪🏻🧠 Make no MIPStake, with bits of free food for you to byte into 🤤 our 1521 Revision Session is just for you ‼️', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/452409402_989988656244079_1650487011875279290_n.jpg?stp=dst-jpg_s960x960&_nc_cat=111&ccb=1-7&_nc_sid=75d36f&_nc_ohc=ht74Cur7JP4Q7kNvgGspvAQ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APUh-KsjJ_dRpSnbr0TYkXd&oh=00_AYAu-LeWj1k53uhaQe6BMnCdQiDRUmguc0R4gt93VnxsRA&oe=6713A488', + link: 'https://www.facebook.com/events/1911189126010096', + }, + { + title: 'IMC Coding Competition', + startTime: 'Wednesday, 13 March 2024 15:00:00', + endTime: 'Wednesday, 13 March 2024 18:00:00', + location: 'Mathews Theatre B, UNSW', + description: 'Get those fingers 👐moving, as you’ll need to team up in groups of 3️⃣to be able to face 🗣️some of the problems thrown your way.To reward your diligence, you’ll be able to grab a free BYTE as finger food is provided 😈 Gaining coding experience and free food, what else could someone even ask for??? 😣', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429779953_899425045300441_8341318489109234227_n.jpg?stp=dst-jpg_s960x960&_nc_cat=108&ccb=1-7&_nc_sid=75d36f&_nc_ohc=GY9LwEPT93gQ7kNvgHltEQe&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APnYFltr29MYoFJQyVlY7HF&oh=00_AYBAaye3BXFt34mnbEi4ERpy1XmUYCTEbpzSqL1xa_xLsA&oe=6713AF65', + link: 'https://www.facebook.com/events/1106870833796065', + }, + { + title: 'Cultural BBQ', + startTime: 'Wednesday, 17 July 2024 12:00:00', + endTime: 'Wednesday, 17 July 2024 14:00:00', + location: 'Globe Lawn', + description: 'Tired of eating the same food every week? 😔 Looking to expand your horizons and try some cultural food? 🥘 BROKE AND NEED SOMETHING TO EAT ⁉️⁉️ Well CSESoc has you covered with an upgrade to our weekly bbq🍖🌟', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/450318124_983296013580010_564345365632281594_n.jpg?stp=dst-jpg_s960x960&_nc_cat=109&ccb=1-7&_nc_sid=75d36f&_nc_ohc=bpVcbawdlHUQ7kNvgFOoHVZ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AHXSpjSIF8pprA1p1Ogqi34&oh=00_AYD1_PrwM7LTFVCvhXIQ3kubwhhYkBOmIO49Gpy4bvTdEg&oe=67139777', + link: 'https://www.facebook.com/events/871196261705246', + }, + { + title: 'CSESOC Boardgames Night', + startTime: 'Thursday, 7 March 2024 17:00:00', + endTime: 'Thursday, 7 March 2024 19:00:00', + location: 'Design Next Studio, Level 5, J17, UNSW', + description: 'The whirlwind of uni got u overwhelmed 😣? Come down to the Design Studio, and chill out with us 🧘‍♀️ as we play board games and indulge in free pizza 🍕!', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429667295_896623802247232_669736057716718914_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=75d36f&_nc_ohc=Ayn7Skl-pFAQ7kNvgES7wuB&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AsnAjGmOe-G8q1L6qZb9G3U&oh=00_AYDpfvDY6DpKeydN99VCHujemmm0gZwL7_O1HjXHvwiPsw&oe=671383B1', + link: 'https://www.facebook.com/events/322704110303236', + }, + { + title: 'COMP1521 Revision Session', + startTime: 'Wednesday, 31 July 2024 16:00:00', + endTime: 'Wednesday, 31 July 2024 18:00:00', + location: 'UNSW Colombo Theatre B', + description: 'PSST 🤫 Think a pipe is what Mario goes down? ⬇️ Still think threads are for clothes? 🪡 Whether you’re seven weeks behind (😣) on lectures 👩‍🏫, or super on top of it (🤯), get ready to BYTE 👾 into a world of MIPS and files and numbers 📣 at our COMP1521 Revision Session to learn and/or reinforce your knowledge from the beginning to the end 🏁💪🏻🧠 Make no MIPStake, with bits of free food for you to byte into 🤤 our 1521 Revision Session is just for you ‼️', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/452409402_989988656244079_1650487011875279290_n.jpg?stp=dst-jpg_s960x960&_nc_cat=111&ccb=1-7&_nc_sid=75d36f&_nc_ohc=ht74Cur7JP4Q7kNvgGspvAQ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APUh-KsjJ_dRpSnbr0TYkXd&oh=00_AYAu-LeWj1k53uhaQe6BMnCdQiDRUmguc0R4gt93VnxsRA&oe=6713A488', + link: 'https://www.facebook.com/events/1911189126010096', + }, + { + title: 'IMC Coding Competition', + startTime: 'Wednesday, 13 March 2024 15:00:00', + endTime: 'Wednesday, 13 March 2024 18:00:00', + location: 'Mathews Theatre B, UNSW', + description: 'Get those fingers 👐moving, as you’ll need to team up in groups of 3️⃣to be able to face 🗣️some of the problems thrown your way.To reward your diligence, you’ll be able to grab a free BYTE as finger food is provided 😈 Gaining coding experience and free food, what else could someone even ask for??? 😣', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429779953_899425045300441_8341318489109234227_n.jpg?stp=dst-jpg_s960x960&_nc_cat=108&ccb=1-7&_nc_sid=75d36f&_nc_ohc=GY9LwEPT93gQ7kNvgHltEQe&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APnYFltr29MYoFJQyVlY7HF&oh=00_AYBAaye3BXFt34mnbEi4ERpy1XmUYCTEbpzSqL1xa_xLsA&oe=6713AF65', + link: 'https://www.facebook.com/events/1106870833796065', + }, + { + title: 'Cultural BBQ', + startTime: 'Wednesday, 17 July 2024 12:00:00', + endTime: 'Wednesday, 17 July 2024 14:00:00', + location: 'Globe Lawn', + description: 'Tired of eating the same food every week? 😔 Looking to expand your horizons and try some cultural food? 🥘 BROKE AND NEED SOMETHING TO EAT ⁉️⁉️ Well CSESoc has you covered with an upgrade to our weekly bbq🍖🌟', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/450318124_983296013580010_564345365632281594_n.jpg?stp=dst-jpg_s960x960&_nc_cat=109&ccb=1-7&_nc_sid=75d36f&_nc_ohc=bpVcbawdlHUQ7kNvgFOoHVZ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AHXSpjSIF8pprA1p1Ogqi34&oh=00_AYD1_PrwM7LTFVCvhXIQ3kubwhhYkBOmIO49Gpy4bvTdEg&oe=67139777', + link: 'https://www.facebook.com/events/871196261705246', + }, + { + title: 'CSESOC Boardgames Night', + startTime: 'Thursday, 7 March 2024 17:00:00', + endTime: 'Thursday, 7 March 2024 19:00:00', + location: 'Design Next Studio, Level 5, J17, UNSW', + description: 'The whirlwind of uni got u overwhelmed 😣? Come down to the Design Studio, and chill out with us 🧘‍♀️ as we play board games and indulge in free pizza 🍕!', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429667295_896623802247232_669736057716718914_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=75d36f&_nc_ohc=Ayn7Skl-pFAQ7kNvgES7wuB&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AsnAjGmOe-G8q1L6qZb9G3U&oh=00_AYDpfvDY6DpKeydN99VCHujemmm0gZwL7_O1HjXHvwiPsw&oe=671383B1', + link: 'https://www.facebook.com/events/322704110303236', + }, + { + title: 'COMP1521 Revision Session', + startTime: 'Wednesday, 31 July 2024 16:00:00', + endTime: 'Wednesday, 31 July 2024 18:00:00', + location: 'UNSW Colombo Theatre B', + description: 'PSST 🤫 Think a pipe is what Mario goes down? ⬇️ Still think threads are for clothes? 🪡 Whether you’re seven weeks behind (😣) on lectures 👩‍🏫, or super on top of it (🤯), get ready to BYTE 👾 into a world of MIPS and files and numbers 📣 at our COMP1521 Revision Session to learn and/or reinforce your knowledge from the beginning to the end 🏁💪🏻🧠 Make no MIPStake, with bits of free food for you to byte into 🤤 our 1521 Revision Session is just for you ‼️', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/452409402_989988656244079_1650487011875279290_n.jpg?stp=dst-jpg_s960x960&_nc_cat=111&ccb=1-7&_nc_sid=75d36f&_nc_ohc=ht74Cur7JP4Q7kNvgGspvAQ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APUh-KsjJ_dRpSnbr0TYkXd&oh=00_AYAu-LeWj1k53uhaQe6BMnCdQiDRUmguc0R4gt93VnxsRA&oe=6713A488', + link: 'https://www.facebook.com/events/1911189126010096', + }, + { + title: 'IMC Coding Competition', + startTime: 'Wednesday, 13 March 2024 15:00:00', + endTime: 'Wednesday, 13 March 2024 18:00:00', + location: 'Mathews Theatre B, UNSW', + description: 'Get those fingers 👐moving, as you’ll need to team up in groups of 3️⃣to be able to face 🗣️some of the problems thrown your way.To reward your diligence, you’ll be able to grab a free BYTE as finger food is provided 😈 Gaining coding experience and free food, what else could someone even ask for??? 😣', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429779953_899425045300441_8341318489109234227_n.jpg?stp=dst-jpg_s960x960&_nc_cat=108&ccb=1-7&_nc_sid=75d36f&_nc_ohc=GY9LwEPT93gQ7kNvgHltEQe&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APnYFltr29MYoFJQyVlY7HF&oh=00_AYBAaye3BXFt34mnbEi4ERpy1XmUYCTEbpzSqL1xa_xLsA&oe=6713AF65', + link: 'https://www.facebook.com/events/1106870833796065', + }, + { + title: 'Cultural BBQ', + startTime: 'Wednesday, 17 July 2024 12:00:00', + endTime: 'Wednesday, 17 July 2024 14:00:00', + location: 'Globe Lawn', + description: 'Tired of eating the same food every week? 😔 Looking to expand your horizons and try some cultural food? 🥘 BROKE AND NEED SOMETHING TO EAT ⁉️⁉️ Well CSESoc has you covered with an upgrade to our weekly bbq🍖🌟', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/450318124_983296013580010_564345365632281594_n.jpg?stp=dst-jpg_s960x960&_nc_cat=109&ccb=1-7&_nc_sid=75d36f&_nc_ohc=bpVcbawdlHUQ7kNvgFOoHVZ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AHXSpjSIF8pprA1p1Ogqi34&oh=00_AYD1_PrwM7LTFVCvhXIQ3kubwhhYkBOmIO49Gpy4bvTdEg&oe=67139777', + link: 'https://www.facebook.com/events/871196261705246', + }, + { + title: 'CSESOC Boardgames Night', + startTime: 'Thursday, 7 March 2024 17:00:00', + endTime: 'Thursday, 7 March 2024 19:00:00', + location: 'Design Next Studio, Level 5, J17, UNSW', + description: 'The whirlwind of uni got u overwhelmed 😣? Come down to the Design Studio, and chill out with us 🧘‍♀️ as we play board games and indulge in free pizza 🍕!', + image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429667295_896623802247232_669736057716718914_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=75d36f&_nc_ohc=Ayn7Skl-pFAQ7kNvgES7wuB&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AsnAjGmOe-G8q1L6qZb9G3U&oh=00_AYDpfvDY6DpKeydN99VCHujemmm0gZwL7_O1HjXHvwiPsw&oe=671383B1', + link: 'https://www.facebook.com/events/322704110303236', + }, { title: 'COMP1521 Revision Session', startTime: 'Wednesday, 31 July 2024 16:00:00', diff --git a/frontend/src/components/Event/EventsGallery.tsx b/frontend/src/components/Event/EventsGallery.tsx index 18c51e8..7c9bdf0 100644 --- a/frontend/src/components/Event/EventsGallery.tsx +++ b/frontend/src/components/Event/EventsGallery.tsx @@ -1,31 +1,33 @@ import React from 'react'; import { previousEvents } from '../../../public/data/events'; -import { Gallery } from "react-grid-gallery"; +import { RowsPhotoAlbum } from "react-photo-album"; +import "react-photo-album/rows.css"; const EventGallery = () => { const formattedEvents = previousEvents.map((event) => { return { src: event.image, - height: 256, - width: 400, - customOverlay: ( -
+ height: 80, + width: 120, + }; + }); + + return ( + ( +
-

{event.title}

-

{event.location}

+

{previousEvents[index].title}

+

{previousEvents[index].location}

- {formatEventDate(event.startTime, event.endTime)} + {formatEventDate(previousEvents[index].startTime, previousEvents[index].endTime)}

- ), - }; - }); - - return ( - ); }; From a17ddc381eaa7da0bf55185cb6fc6cf1f6828dcc Mon Sep 17 00:00:00 2001 From: Wolfdragon24 Date: Fri, 18 Oct 2024 21:31:14 +1100 Subject: [PATCH 11/15] Minor modifications to text sizing --- frontend/src/components/Event/EventsBrief.tsx | 2 +- frontend/src/components/Event/index.tsx | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/Event/EventsBrief.tsx b/frontend/src/components/Event/EventsBrief.tsx index ee63395..a225e04 100644 --- a/frontend/src/components/Event/EventsBrief.tsx +++ b/frontend/src/components/Event/EventsBrief.tsx @@ -11,7 +11,7 @@ const EventBrief = () => { {events.length !== 0 ? :
-

No upcoming events... check back here later!

+

No upcoming events... check back here later!

}
diff --git a/frontend/src/components/Event/index.tsx b/frontend/src/components/Event/index.tsx index 8cc0163..a527853 100644 --- a/frontend/src/components/Event/index.tsx +++ b/frontend/src/components/Event/index.tsx @@ -21,21 +21,20 @@ const Event = () => {
-
Placeholder
-

+

Explore upcoming events

{events.length !== 0 ? :
-

No upcoming events... check back here later!

+

No upcoming events... check back here later!

}
-

+

Previous events

From 3f29431e276f20e0cacc478fea5dfc1feed6f1be Mon Sep 17 00:00:00 2001 From: Wolfdragon24 Date: Fri, 18 Oct 2024 22:13:17 +1100 Subject: [PATCH 12/15] Remove photo album and use grid format --- frontend/package-lock.json | 24 ++------- frontend/package.json | 1 - frontend/public/data/events.ts | 36 -------------- .../src/components/Event/EventsCarousel.tsx | 2 +- .../src/components/Event/EventsGallery.tsx | 49 ++++++++++--------- frontend/src/components/Event/index.tsx | 25 ++++++---- 6 files changed, 45 insertions(+), 92 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 91e25af..a151f23 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -21,7 +21,6 @@ "react": "18.2.0", "react-dom": "18.2.0", "react-multi-carousel": "^2.8.5", - "react-photo-album": "^3.0.2", "tailwindcss": "3.3.3", "typescript": "5.1" }, @@ -56,9 +55,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.24.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.4.tgz", - "integrity": "sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz", + "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", "dev": true, "dependencies": { "regenerator-runtime": "^0.14.0" @@ -4151,23 +4150,6 @@ "node": ">=8" } }, - "node_modules/react-photo-album": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/react-photo-album/-/react-photo-album-3.0.2.tgz", - "integrity": "sha512-w3+8i6aj9l1jRfcubgVbAlBGSdtiXcqWdcwZcH4/Bavc+v7X7h+S3TkQ723pvDABjhaaxS168g9ECEBP6xnKrQ==", - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@types/react": ">=18", - "react": ">=18" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index 40b8bf6..1da8df9 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -26,7 +26,6 @@ "react": "18.2.0", "react-dom": "18.2.0", "react-multi-carousel": "^2.8.5", - "react-photo-album": "^3.0.2", "tailwindcss": "3.3.3", "typescript": "5.1" }, diff --git a/frontend/public/data/events.ts b/frontend/public/data/events.ts index 4a4720a..16b12eb 100644 --- a/frontend/public/data/events.ts +++ b/frontend/public/data/events.ts @@ -157,40 +157,4 @@ export const previousEvents: eventInfo[] = [ image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429667295_896623802247232_669736057716718914_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=75d36f&_nc_ohc=Ayn7Skl-pFAQ7kNvgES7wuB&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AsnAjGmOe-G8q1L6qZb9G3U&oh=00_AYDpfvDY6DpKeydN99VCHujemmm0gZwL7_O1HjXHvwiPsw&oe=671383B1', link: 'https://www.facebook.com/events/322704110303236', }, - { - title: 'COMP1521 Revision Session', - startTime: 'Wednesday, 31 July 2024 16:00:00', - endTime: 'Wednesday, 31 July 2024 18:00:00', - location: 'UNSW Colombo Theatre B', - description: 'PSST 🤫 Think a pipe is what Mario goes down? ⬇️ Still think threads are for clothes? 🪡 Whether you’re seven weeks behind (😣) on lectures 👩‍🏫, or super on top of it (🤯), get ready to BYTE 👾 into a world of MIPS and files and numbers 📣 at our COMP1521 Revision Session to learn and/or reinforce your knowledge from the beginning to the end 🏁💪🏻🧠 Make no MIPStake, with bits of free food for you to byte into 🤤 our 1521 Revision Session is just for you ‼️', - image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/452409402_989988656244079_1650487011875279290_n.jpg?stp=dst-jpg_s960x960&_nc_cat=111&ccb=1-7&_nc_sid=75d36f&_nc_ohc=ht74Cur7JP4Q7kNvgGspvAQ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APUh-KsjJ_dRpSnbr0TYkXd&oh=00_AYAu-LeWj1k53uhaQe6BMnCdQiDRUmguc0R4gt93VnxsRA&oe=6713A488', - link: 'https://www.facebook.com/events/1911189126010096', - }, - { - title: 'IMC Coding Competition', - startTime: 'Wednesday, 13 March 2024 15:00:00', - endTime: 'Wednesday, 13 March 2024 18:00:00', - location: 'Mathews Theatre B, UNSW', - description: 'Get those fingers 👐moving, as you’ll need to team up in groups of 3️⃣to be able to face 🗣️some of the problems thrown your way.To reward your diligence, you’ll be able to grab a free BYTE as finger food is provided 😈 Gaining coding experience and free food, what else could someone even ask for??? 😣', - image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429779953_899425045300441_8341318489109234227_n.jpg?stp=dst-jpg_s960x960&_nc_cat=108&ccb=1-7&_nc_sid=75d36f&_nc_ohc=GY9LwEPT93gQ7kNvgHltEQe&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APnYFltr29MYoFJQyVlY7HF&oh=00_AYBAaye3BXFt34mnbEi4ERpy1XmUYCTEbpzSqL1xa_xLsA&oe=6713AF65', - link: 'https://www.facebook.com/events/1106870833796065', - }, - { - title: 'Cultural BBQ', - startTime: 'Wednesday, 17 July 2024 12:00:00', - endTime: 'Wednesday, 17 July 2024 14:00:00', - location: 'Globe Lawn', - description: 'Tired of eating the same food every week? 😔 Looking to expand your horizons and try some cultural food? 🥘 BROKE AND NEED SOMETHING TO EAT ⁉️⁉️ Well CSESoc has you covered with an upgrade to our weekly bbq🍖🌟', - image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/450318124_983296013580010_564345365632281594_n.jpg?stp=dst-jpg_s960x960&_nc_cat=109&ccb=1-7&_nc_sid=75d36f&_nc_ohc=bpVcbawdlHUQ7kNvgFOoHVZ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AHXSpjSIF8pprA1p1Ogqi34&oh=00_AYD1_PrwM7LTFVCvhXIQ3kubwhhYkBOmIO49Gpy4bvTdEg&oe=67139777', - link: 'https://www.facebook.com/events/871196261705246', - }, - { - title: 'CSESOC Boardgames Night', - startTime: 'Thursday, 7 March 2024 17:00:00', - endTime: 'Thursday, 7 March 2024 19:00:00', - location: 'Design Next Studio, Level 5, J17, UNSW', - description: 'The whirlwind of uni got u overwhelmed 😣? Come down to the Design Studio, and chill out with us 🧘‍♀️ as we play board games and indulge in free pizza 🍕!', - image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429667295_896623802247232_669736057716718914_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=75d36f&_nc_ohc=Ayn7Skl-pFAQ7kNvgES7wuB&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AsnAjGmOe-G8q1L6qZb9G3U&oh=00_AYDpfvDY6DpKeydN99VCHujemmm0gZwL7_O1HjXHvwiPsw&oe=671383B1', - link: 'https://www.facebook.com/events/322704110303236', - } ]; diff --git a/frontend/src/components/Event/EventsCarousel.tsx b/frontend/src/components/Event/EventsCarousel.tsx index d8acbe0..32a7268 100644 --- a/frontend/src/components/Event/EventsCarousel.tsx +++ b/frontend/src/components/Event/EventsCarousel.tsx @@ -35,7 +35,7 @@ export default function EventsCarousel() { containerClass="carousel-container my-8" > {events.map((event, index) => ( -
+
{ - const formattedEvents = previousEvents.map((event) => { - return { - src: event.image, - height: 80, - width: 120, - }; - }); return ( - ( -
- ); }; diff --git a/frontend/src/components/Event/index.tsx b/frontend/src/components/Event/index.tsx index a527853..f69908a 100644 --- a/frontend/src/components/Event/index.tsx +++ b/frontend/src/components/Event/index.tsx @@ -11,15 +11,22 @@ const Event = () => {
-

- We run a wide-variety of events for fun, learning new skills and careers. For full - listings, check out the CSESoc Discord or our Facebook page! -

- - - +

+ We run a wide-variety of events for fun, learning new skills and careers. For full + listings, check out the CSESoc Discord or our Facebook page! +

+
From c240cd6e5d8a3117e983e0655899b297d6016234 Mon Sep 17 00:00:00 2001 From: Wolfdragon24 Date: Fri, 18 Oct 2024 22:15:13 +1100 Subject: [PATCH 13/15] Minor formatting adjustments and reverting events data test --- frontend/public/data/events.ts | 72 ------------------- .../src/components/Event/EventsGallery.tsx | 4 +- frontend/src/components/Event/index.tsx | 2 +- 3 files changed, 3 insertions(+), 75 deletions(-) diff --git a/frontend/public/data/events.ts b/frontend/public/data/events.ts index 16b12eb..d670d1d 100644 --- a/frontend/public/data/events.ts +++ b/frontend/public/data/events.ts @@ -85,76 +85,4 @@ export const previousEvents: eventInfo[] = [ image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429667295_896623802247232_669736057716718914_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=75d36f&_nc_ohc=Ayn7Skl-pFAQ7kNvgES7wuB&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AsnAjGmOe-G8q1L6qZb9G3U&oh=00_AYDpfvDY6DpKeydN99VCHujemmm0gZwL7_O1HjXHvwiPsw&oe=671383B1', link: 'https://www.facebook.com/events/322704110303236', }, - { - title: 'COMP1521 Revision Session', - startTime: 'Wednesday, 31 July 2024 16:00:00', - endTime: 'Wednesday, 31 July 2024 18:00:00', - location: 'UNSW Colombo Theatre B', - description: 'PSST 🤫 Think a pipe is what Mario goes down? ⬇️ Still think threads are for clothes? 🪡 Whether you’re seven weeks behind (😣) on lectures 👩‍🏫, or super on top of it (🤯), get ready to BYTE 👾 into a world of MIPS and files and numbers 📣 at our COMP1521 Revision Session to learn and/or reinforce your knowledge from the beginning to the end 🏁💪🏻🧠 Make no MIPStake, with bits of free food for you to byte into 🤤 our 1521 Revision Session is just for you ‼️', - image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/452409402_989988656244079_1650487011875279290_n.jpg?stp=dst-jpg_s960x960&_nc_cat=111&ccb=1-7&_nc_sid=75d36f&_nc_ohc=ht74Cur7JP4Q7kNvgGspvAQ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APUh-KsjJ_dRpSnbr0TYkXd&oh=00_AYAu-LeWj1k53uhaQe6BMnCdQiDRUmguc0R4gt93VnxsRA&oe=6713A488', - link: 'https://www.facebook.com/events/1911189126010096', - }, - { - title: 'IMC Coding Competition', - startTime: 'Wednesday, 13 March 2024 15:00:00', - endTime: 'Wednesday, 13 March 2024 18:00:00', - location: 'Mathews Theatre B, UNSW', - description: 'Get those fingers 👐moving, as you’ll need to team up in groups of 3️⃣to be able to face 🗣️some of the problems thrown your way.To reward your diligence, you’ll be able to grab a free BYTE as finger food is provided 😈 Gaining coding experience and free food, what else could someone even ask for??? 😣', - image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429779953_899425045300441_8341318489109234227_n.jpg?stp=dst-jpg_s960x960&_nc_cat=108&ccb=1-7&_nc_sid=75d36f&_nc_ohc=GY9LwEPT93gQ7kNvgHltEQe&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APnYFltr29MYoFJQyVlY7HF&oh=00_AYBAaye3BXFt34mnbEi4ERpy1XmUYCTEbpzSqL1xa_xLsA&oe=6713AF65', - link: 'https://www.facebook.com/events/1106870833796065', - }, - { - title: 'Cultural BBQ', - startTime: 'Wednesday, 17 July 2024 12:00:00', - endTime: 'Wednesday, 17 July 2024 14:00:00', - location: 'Globe Lawn', - description: 'Tired of eating the same food every week? 😔 Looking to expand your horizons and try some cultural food? 🥘 BROKE AND NEED SOMETHING TO EAT ⁉️⁉️ Well CSESoc has you covered with an upgrade to our weekly bbq🍖🌟', - image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/450318124_983296013580010_564345365632281594_n.jpg?stp=dst-jpg_s960x960&_nc_cat=109&ccb=1-7&_nc_sid=75d36f&_nc_ohc=bpVcbawdlHUQ7kNvgFOoHVZ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AHXSpjSIF8pprA1p1Ogqi34&oh=00_AYD1_PrwM7LTFVCvhXIQ3kubwhhYkBOmIO49Gpy4bvTdEg&oe=67139777', - link: 'https://www.facebook.com/events/871196261705246', - }, - { - title: 'CSESOC Boardgames Night', - startTime: 'Thursday, 7 March 2024 17:00:00', - endTime: 'Thursday, 7 March 2024 19:00:00', - location: 'Design Next Studio, Level 5, J17, UNSW', - description: 'The whirlwind of uni got u overwhelmed 😣? Come down to the Design Studio, and chill out with us 🧘‍♀️ as we play board games and indulge in free pizza 🍕!', - image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429667295_896623802247232_669736057716718914_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=75d36f&_nc_ohc=Ayn7Skl-pFAQ7kNvgES7wuB&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AsnAjGmOe-G8q1L6qZb9G3U&oh=00_AYDpfvDY6DpKeydN99VCHujemmm0gZwL7_O1HjXHvwiPsw&oe=671383B1', - link: 'https://www.facebook.com/events/322704110303236', - }, - { - title: 'COMP1521 Revision Session', - startTime: 'Wednesday, 31 July 2024 16:00:00', - endTime: 'Wednesday, 31 July 2024 18:00:00', - location: 'UNSW Colombo Theatre B', - description: 'PSST 🤫 Think a pipe is what Mario goes down? ⬇️ Still think threads are for clothes? 🪡 Whether you’re seven weeks behind (😣) on lectures 👩‍🏫, or super on top of it (🤯), get ready to BYTE 👾 into a world of MIPS and files and numbers 📣 at our COMP1521 Revision Session to learn and/or reinforce your knowledge from the beginning to the end 🏁💪🏻🧠 Make no MIPStake, with bits of free food for you to byte into 🤤 our 1521 Revision Session is just for you ‼️', - image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/452409402_989988656244079_1650487011875279290_n.jpg?stp=dst-jpg_s960x960&_nc_cat=111&ccb=1-7&_nc_sid=75d36f&_nc_ohc=ht74Cur7JP4Q7kNvgGspvAQ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APUh-KsjJ_dRpSnbr0TYkXd&oh=00_AYAu-LeWj1k53uhaQe6BMnCdQiDRUmguc0R4gt93VnxsRA&oe=6713A488', - link: 'https://www.facebook.com/events/1911189126010096', - }, - { - title: 'IMC Coding Competition', - startTime: 'Wednesday, 13 March 2024 15:00:00', - endTime: 'Wednesday, 13 March 2024 18:00:00', - location: 'Mathews Theatre B, UNSW', - description: 'Get those fingers 👐moving, as you’ll need to team up in groups of 3️⃣to be able to face 🗣️some of the problems thrown your way.To reward your diligence, you’ll be able to grab a free BYTE as finger food is provided 😈 Gaining coding experience and free food, what else could someone even ask for??? 😣', - image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429779953_899425045300441_8341318489109234227_n.jpg?stp=dst-jpg_s960x960&_nc_cat=108&ccb=1-7&_nc_sid=75d36f&_nc_ohc=GY9LwEPT93gQ7kNvgHltEQe&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=APnYFltr29MYoFJQyVlY7HF&oh=00_AYBAaye3BXFt34mnbEi4ERpy1XmUYCTEbpzSqL1xa_xLsA&oe=6713AF65', - link: 'https://www.facebook.com/events/1106870833796065', - }, - { - title: 'Cultural BBQ', - startTime: 'Wednesday, 17 July 2024 12:00:00', - endTime: 'Wednesday, 17 July 2024 14:00:00', - location: 'Globe Lawn', - description: 'Tired of eating the same food every week? 😔 Looking to expand your horizons and try some cultural food? 🥘 BROKE AND NEED SOMETHING TO EAT ⁉️⁉️ Well CSESoc has you covered with an upgrade to our weekly bbq🍖🌟', - image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/450318124_983296013580010_564345365632281594_n.jpg?stp=dst-jpg_s960x960&_nc_cat=109&ccb=1-7&_nc_sid=75d36f&_nc_ohc=bpVcbawdlHUQ7kNvgFOoHVZ&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AHXSpjSIF8pprA1p1Ogqi34&oh=00_AYD1_PrwM7LTFVCvhXIQ3kubwhhYkBOmIO49Gpy4bvTdEg&oe=67139777', - link: 'https://www.facebook.com/events/871196261705246', - }, - { - title: 'CSESOC Boardgames Night', - startTime: 'Thursday, 7 March 2024 17:00:00', - endTime: 'Thursday, 7 March 2024 19:00:00', - location: 'Design Next Studio, Level 5, J17, UNSW', - description: 'The whirlwind of uni got u overwhelmed 😣? Come down to the Design Studio, and chill out with us 🧘‍♀️ as we play board games and indulge in free pizza 🍕!', - image: 'https://scontent.fsyd14-1.fna.fbcdn.net/v/t39.30808-6/429667295_896623802247232_669736057716718914_n.jpg?stp=dst-jpg_s960x960&_nc_cat=102&ccb=1-7&_nc_sid=75d36f&_nc_ohc=Ayn7Skl-pFAQ7kNvgES7wuB&_nc_zt=23&_nc_ht=scontent.fsyd14-1.fna&_nc_gid=AsnAjGmOe-G8q1L6qZb9G3U&oh=00_AYDpfvDY6DpKeydN99VCHujemmm0gZwL7_O1HjXHvwiPsw&oe=671383B1', - link: 'https://www.facebook.com/events/322704110303236', - }, ]; diff --git a/frontend/src/components/Event/EventsGallery.tsx b/frontend/src/components/Event/EventsGallery.tsx index b6da5ed..15be686 100644 --- a/frontend/src/components/Event/EventsGallery.tsx +++ b/frontend/src/components/Event/EventsGallery.tsx @@ -7,8 +7,8 @@ const EventGallery = () => {
{previousEvents.map((event, index) => { return ( -
-
+
+ }
-

+

Previous events

From a20cec84669ac216138dd03402f9f0f6494e8f8c Mon Sep 17 00:00:00 2001 From: Wolfdragon24 Date: Fri, 18 Oct 2024 22:25:20 +1100 Subject: [PATCH 14/15] Further minor formatting adjustments --- frontend/src/components/Event/index.tsx | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/frontend/src/components/Event/index.tsx b/frontend/src/components/Event/index.tsx index f0c3a8c..5f5fc6f 100644 --- a/frontend/src/components/Event/index.tsx +++ b/frontend/src/components/Event/index.tsx @@ -13,23 +13,15 @@ const Event = () => {
-
+

Explore upcoming events

@@ -40,7 +32,7 @@ const Event = () => {

No upcoming events... check back here later!

} -
+

Previous events

From 8fb3b4d5bd77807d19eaab8fac93b1d799334b97 Mon Sep 17 00:00:00 2001 From: Derek Xu Date: Fri, 18 Oct 2024 22:39:52 +1100 Subject: [PATCH 15/15] alter styling --- frontend/src/components/Event/EventsGallery.tsx | 13 ++++++------- frontend/src/components/Event/index.tsx | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/Event/EventsGallery.tsx b/frontend/src/components/Event/EventsGallery.tsx index 15be686..83738be 100644 --- a/frontend/src/components/Event/EventsGallery.tsx +++ b/frontend/src/components/Event/EventsGallery.tsx @@ -1,21 +1,20 @@ import React from 'react'; -import { previousEvents } from '../../../public/data/events'; +import { previousEvents } from '@/../public/data/events'; const EventGallery = () => { - return ( -