From e06878d461464d547f29edd529206043a710e31d Mon Sep 17 00:00:00 2001 From: Derek Xu Date: Thu, 4 Jul 2024 17:21:46 +1000 Subject: [PATCH 01/12] Fix logos not showing up --- frontend/public/data/data.ts | 52 +++++++++++++++--------------- frontend/src/components/Footer.tsx | 4 +-- frontend/src/pages/resources.tsx | 1 - 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/frontend/public/data/data.ts b/frontend/public/data/data.ts index c1f714d..93d339d 100644 --- a/frontend/public/data/data.ts +++ b/frontend/public/data/data.ts @@ -14,13 +14,13 @@ export type socialInfo = { export const diamondLinks: sponsorInfo[] = [ { href: 'https://www.janestreet.com/', - svg: 'assets/janestreet_logo.svg', + svg: '/assets/janestreet_logo.svg', alt: 'Janestreet logo', description: "Jane Street is a research-driven trading firm where curious people work together on deep problems", }, { href: 'https://www.tiktok.com/en/', - svg: 'assets/tiktok_logo.svg', + svg: '/assets/tiktok_logo.svg', alt: 'Tiktok logo', description: "TikTok is a social media platform for creating, sharing and discovering short videos", @@ -30,34 +30,34 @@ export const diamondLinks: sponsorInfo[] = [ export const goldLinks: sponsorInfo[] = [ { href: 'https://www.atlassian.com/', - svg: 'assets/atlassian_logo.svg', + svg: '/assets/atlassian_logo.svg', alt: 'Atlassian logo', description: "Atlassian Corporation is an Australian-American software company that develops products for software developers, and project managers among other groups", }, { href: 'https://www.citadel.com/', - svg: 'assets/citadel_logo.svg', + svg: '/assets/citadel_logo.svg', alt: 'Citadel logo', description: "We are an alternative investment manager working on behalf of the world's preeminent institutions. Discover our work, teams, careers and more", }, { href: 'https://www.imc.com/ap/', - svg: 'assets/imc_logo.svg', + svg: '/assets/imc_logo.svg', alt: 'IMC logo', description: "For three decades IMC has provided liquidity to the financial markets globally. Specialised in algorithmic trading and advanced technology, we set the pace for the evolution of market making.", }, { href: 'https://neara.com/', - svg: 'assets/neara_logo.svg', + svg: '/assets/neara_logo.svg', alt: 'Neara logo', - description: "Neara electric utility software is a physics-enabled platform that builds 3D interactive models of critical infrastructure networks and assets.", + description: "Neara electric utility software is a physics-enabled platform that builds 3D interactive models of critical infrastructure networks and /assets.", }, { href: 'https://safetyculture.com/', - svg: 'assets/safetyculture_logo.svg', + svg: '/assets/safetyculture_logo.svg', alt: 'SafetyCulture logo', description: "Get to the root cause of workplace trends with total visibility across your organization. Use data from completed inspections, reported incidents, sensors, and asset history to keep workers safe, and prevent things from happening in the first place" } @@ -66,68 +66,68 @@ export const goldLinks: sponsorInfo[] = [ export const silverLinks: sponsorInfo[] = [ { href: 'https://appian.com/', - svg: 'assets/appian_logo.svg', + svg: '/assets/appian_logo.svg', alt: 'Appian logo', description: "Appian Corporation is an American cloud computing and enterprise software company headquartered in McLean, Virginia, part of the Dulles Technology Corridor. The company sells a platform as a service for building enterprise software applications", }, { href: 'https://www.flowtraders.com/', - svg: 'assets/flowtraders_logo.svg', + svg: '/assets/flowtraders_logo.svg', alt: 'FlowTraders logo', description: "Flow Traders is a proprietary trading firm. A market maker, it provides liquidity in the securities market by using high frequency and quantitative trading strategies", }, { href: 'https://www.macquarie.com.au/', - svg: 'assets/macquarie_logo.svg', + svg: '/assets/macquarie_logo.svg', alt: 'Macquarie logo', description: "Macquarie Bank offers transaction accounts, home loans, credit cards, online banking, business banking and more" }, { href: 'https://optiver.com/', - svg: 'assets/optiver_logo.svg', + svg: '/assets/optiver_logo.svg', alt: 'Optiver logo', description: "Optiver is a global market maker. As one of the oldest market making firms in the world, Optiver has been improving financial markets since 1986" }, { href: 'https://quantium.com/', - svg: 'assets/quantium_logo.svg', + svg: '/assets/quantium_logo.svg', alt: 'Quantium logo', description: "Quantium has developed a world-class data science and AI solution that has transformed the accuracy of Walmart's prediction of customers' needs at scale" }, { href: 'https://quickli.com.au/', - svg: 'assets/quickli_logo.svg', + svg: '/assets/quickli_logo.svg', alt: 'Quickli logo', description: "Bringing 30+ lender calcs into one, easy-to-use interface delivering accurate results and relevant policy insights for even the most complex scenarios." }, { href: 'https://www.revolutionise.com.au/', - svg: 'assets/revsport_logo.svg', + svg: '/assets/revsport_logo.svg', alt: 'RevolutioniseSport logo', description: "revolutioniseSPORT is an online management platform for sports of all shapes and sizes" }, { href: 'https://www.recordpoint.com/', - svg: 'assets/recordpoint_logo.svg', + svg: '/assets/recordpoint_logo.svg', alt: 'RecordPoint logo', description: "Manage all your data and records in one central place – without moving them", }, { href: 'https://sig.com/', - svg: 'assets/susquehanna_logo.svg', + svg: '/assets/susquehanna_logo.svg', alt: 'Susquehanna logo', description: "Discover Susquehanna, a global quantitative trading firm built on a rigorous, analytical foundation in financial markets." }, { href: 'https://zip.co/au', - svg: 'assets/zip_logo.svg', + svg: '/assets/zip_logo.svg', alt: 'Zip logo', description: "Zip Co Limited is a global 'buy now pay later' financial technology company with operations in Australia, New Zealand and the USA", }, { href: 'https://www.canva.com/en_au/', - svg: 'assets/canva_logo.svg', + svg: '/assets/canva_logo.svg', alt: 'Canva logo', description: "Canva is a free-to-use online graphic design tool. Use it to create social media posts, presentations, posters, videos, logos and more." } @@ -136,37 +136,37 @@ export const silverLinks: sponsorInfo[] = [ export const socialLinks: socialInfo[] = [ { href: 'https://bit.ly/CSESocDiscord', - src: 'assets/discord_logo.svg', + src: '/assets/discord_logo.svg', alt: 'Discord' }, { href: 'https://www.facebook.com/csesoc/', - src: 'assets/fb_logo.svg', + src: '/assets/fb_logo.svg', alt: 'Facebook' }, { href: 'https://twitter.com/csesoc?lang=en', - src: 'assets/x_twitter_icon.svg', + src: '/assets/x_twitter_icon.svg', alt: 'X/Twitter' }, { href: 'https://www.youtube.com/@CSESocUNSW', - src: 'assets/youtube_logo.svg', + src: '/assets/youtube_logo.svg', alt: 'Youtube' }, { href: 'https://www.instagram.com/csesoc_unsw/?hl=en', - src: 'assets/instagram_logo.svg', + src: '/assets/instagram_logo.svg', alt: 'Instagram' }, { href: 'https://www.tiktok.com/@csesoc?lang=en', - src: 'assets/tiktok_logo.svg', + src: '/assets/tiktok_logo.svg', alt: 'TikTok' }, { href: 'https://www.linkedin.com/company/csesoc?originalSubdomain=au', - src: 'assets/linkedin_logo.svg', + src: '/assets/linkedin_logo.svg', alt: 'LinkedIn' } ]; diff --git a/frontend/src/components/Footer.tsx b/frontend/src/components/Footer.tsx index 44c8d51..1a61bf5 100644 --- a/frontend/src/components/Footer.tsx +++ b/frontend/src/components/Footer.tsx @@ -9,7 +9,7 @@ const Footer = () => {
- CSESoc Logo + CSESoc Logo Ollie {
Sponsors backdrop Date: Thu, 4 Jul 2024 17:27:09 +1000 Subject: [PATCH 02/12] refactor data.ts --- frontend/public/data/socialInfos.ts | 43 +++++++++++++++++ .../public/data/{data.ts => sponsorInfos.ts} | 48 +------------------ frontend/src/components/Footer.tsx | 2 +- .../src/components/Sponsors/SponsorLinks.tsx | 4 +- .../src/components/Sponsors/SponsorModal.tsx | 3 +- 5 files changed, 48 insertions(+), 52 deletions(-) create mode 100644 frontend/public/data/socialInfos.ts rename frontend/public/data/{data.ts => sponsorInfos.ts} (84%) diff --git a/frontend/public/data/socialInfos.ts b/frontend/public/data/socialInfos.ts new file mode 100644 index 0000000..8614619 --- /dev/null +++ b/frontend/public/data/socialInfos.ts @@ -0,0 +1,43 @@ +export type socialInfo = { + href: string; + src: string; + alt: string; +}; + +export const socialLinks: socialInfo[] = [ + { + href: 'https://bit.ly/CSESocDiscord', + src: '/assets/discord_logo.svg', + alt: 'Discord' + }, + { + href: 'https://www.facebook.com/csesoc/', + src: '/assets/fb_logo.svg', + alt: 'Facebook' + }, + { + href: 'https://twitter.com/csesoc?lang=en', + src: '/assets/x_twitter_icon.svg', + alt: 'X/Twitter' + }, + { + href: 'https://www.youtube.com/@CSESocUNSW', + src: '/assets/youtube_logo.svg', + alt: 'Youtube' + }, + { + href: 'https://www.instagram.com/csesoc_unsw/?hl=en', + src: '/assets/instagram_logo.svg', + alt: 'Instagram' + }, + { + href: 'https://www.tiktok.com/@csesoc?lang=en', + src: '/assets/tiktok_logo.svg', + alt: 'TikTok' + }, + { + href: 'https://www.linkedin.com/company/csesoc?originalSubdomain=au', + src: '/assets/linkedin_logo.svg', + alt: 'LinkedIn' + } +]; diff --git a/frontend/public/data/data.ts b/frontend/public/data/sponsorInfos.ts similarity index 84% rename from frontend/public/data/data.ts rename to frontend/public/data/sponsorInfos.ts index 93d339d..25f1a73 100644 --- a/frontend/public/data/data.ts +++ b/frontend/public/data/sponsorInfos.ts @@ -5,12 +5,6 @@ export type sponsorInfo = { description: string; }; -export type socialInfo = { - href: string; - src: string; - alt: string; -}; - export const diamondLinks: sponsorInfo[] = [ { href: 'https://www.janestreet.com/', @@ -23,7 +17,6 @@ export const diamondLinks: sponsorInfo[] = [ svg: '/assets/tiktok_logo.svg', alt: 'Tiktok logo', description: "TikTok is a social media platform for creating, sharing and discovering short videos", - } ]; @@ -33,7 +26,6 @@ export const goldLinks: sponsorInfo[] = [ svg: '/assets/atlassian_logo.svg', alt: 'Atlassian logo', description: "Atlassian Corporation is an Australian-American software company that develops products for software developers, and project managers among other groups", - }, { href: 'https://www.citadel.com/', @@ -131,42 +123,4 @@ export const silverLinks: sponsorInfo[] = [ alt: 'Canva logo', description: "Canva is a free-to-use online graphic design tool. Use it to create social media posts, presentations, posters, videos, logos and more." } -]; - -export const socialLinks: socialInfo[] = [ - { - href: 'https://bit.ly/CSESocDiscord', - src: '/assets/discord_logo.svg', - alt: 'Discord' - }, - { - href: 'https://www.facebook.com/csesoc/', - src: '/assets/fb_logo.svg', - alt: 'Facebook' - }, - { - href: 'https://twitter.com/csesoc?lang=en', - src: '/assets/x_twitter_icon.svg', - alt: 'X/Twitter' - }, - { - href: 'https://www.youtube.com/@CSESocUNSW', - src: '/assets/youtube_logo.svg', - alt: 'Youtube' - }, - { - href: 'https://www.instagram.com/csesoc_unsw/?hl=en', - src: '/assets/instagram_logo.svg', - alt: 'Instagram' - }, - { - href: 'https://www.tiktok.com/@csesoc?lang=en', - src: '/assets/tiktok_logo.svg', - alt: 'TikTok' - }, - { - href: 'https://www.linkedin.com/company/csesoc?originalSubdomain=au', - src: '/assets/linkedin_logo.svg', - alt: 'LinkedIn' - } -]; +]; \ No newline at end of file diff --git a/frontend/src/components/Footer.tsx b/frontend/src/components/Footer.tsx index 1a61bf5..4dff494 100644 --- a/frontend/src/components/Footer.tsx +++ b/frontend/src/components/Footer.tsx @@ -1,6 +1,6 @@ import Image from 'next/image'; import Link from 'next/link'; -import { socialLinks } from '@/../public/data/data'; +import { socialLinks } from '@/../public/data/socialInfos'; const Footer = () => { return ( diff --git a/frontend/src/components/Sponsors/SponsorLinks.tsx b/frontend/src/components/Sponsors/SponsorLinks.tsx index 7928200..6b38a17 100644 --- a/frontend/src/components/Sponsors/SponsorLinks.tsx +++ b/frontend/src/components/Sponsors/SponsorLinks.tsx @@ -1,12 +1,10 @@ import { useState } from 'react'; -import { diamondLinks, goldLinks, silverLinks, sponsorInfo } from '../../../public/data/data'; +import { diamondLinks, goldLinks, silverLinks, sponsorInfo } from '../../../public/data/sponsorInfos'; import SponsorModal from './SponsorModal'; -//import '/styles/sponsorLinks.module.css'; const logostyle = 'grow-on-hover cursor-pointer transform transition-transform duration-300 hover:scale-105'; const logodiv = 'block gap-y-8 h-14'; const background = 'rgba(57, 119, 248, 0.6)'; -// const outer = 'rounded-[4rem] w-[90rem] flex flex-col pl-14 py-14 gap-16'; function SponsorLinks() { const [showModal, setShowModal] = useState(false); diff --git a/frontend/src/components/Sponsors/SponsorModal.tsx b/frontend/src/components/Sponsors/SponsorModal.tsx index b6e0b29..e361d4c 100644 --- a/frontend/src/components/Sponsors/SponsorModal.tsx +++ b/frontend/src/components/Sponsors/SponsorModal.tsx @@ -1,5 +1,6 @@ -import { sponsorInfo } from '../../../public/data/data'; +import { sponsorInfo } from '../../../public/data/sponsorInfos'; import {motion} from 'framer-motion' + export default function SponsorModal(props: { sponsorInfo: sponsorInfo | null; setFalse: () => void }) { if (props.sponsorInfo === null) { return ( From e6e16732f9e26623f70ad1d5cb6e0e526c5f6f57 Mon Sep 17 00:00:00 2001 From: Derek Xu Date: Thu, 4 Jul 2024 17:33:02 +1000 Subject: [PATCH 03/12] refactor animation of sponsor modal --- frontend/src/components/Resources/index.tsx | 4 +--- .../src/components/Sponsors/SponsorLinks.tsx | 2 +- .../src/components/Sponsors/SponsorModal.tsx | 19 +++++++++---------- frontend/src/styles/sponsorLinks.module.css | 16 ---------------- 4 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 frontend/src/styles/sponsorLinks.module.css diff --git a/frontend/src/components/Resources/index.tsx b/frontend/src/components/Resources/index.tsx index 8d2a0b0..0fa7f0e 100644 --- a/frontend/src/components/Resources/index.tsx +++ b/frontend/src/components/Resources/index.tsx @@ -1,10 +1,8 @@ import Image from 'next/image'; -import { resourceCards, stage1, stage2, stage3 } from '../../../public/data/resourceCards'; +import { resourceCards, stage1, stage2, stage3 } from '@/../public/data/resourceCards'; const boxStyling = 'border border-[#595F6D] rounded-lg hover:border-[#788093] hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300'; -const socialsBoxStyling = - 'xl:col-span-1 col-span-3 flex justify-center pt-2 pb-2 border border-[#595F6D] hover:border-[#788093] rounded-lg hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300'; const Resources = () => { return ( diff --git a/frontend/src/components/Sponsors/SponsorLinks.tsx b/frontend/src/components/Sponsors/SponsorLinks.tsx index 6b38a17..8243a3e 100644 --- a/frontend/src/components/Sponsors/SponsorLinks.tsx +++ b/frontend/src/components/Sponsors/SponsorLinks.tsx @@ -1,5 +1,5 @@ import { useState } from 'react'; -import { diamondLinks, goldLinks, silverLinks, sponsorInfo } from '../../../public/data/sponsorInfos'; +import { diamondLinks, goldLinks, silverLinks, sponsorInfo } from '@/../public/data/sponsorInfos'; import SponsorModal from './SponsorModal'; const logostyle = 'grow-on-hover cursor-pointer transform transition-transform duration-300 hover:scale-105'; diff --git a/frontend/src/components/Sponsors/SponsorModal.tsx b/frontend/src/components/Sponsors/SponsorModal.tsx index e361d4c..fd25c6f 100644 --- a/frontend/src/components/Sponsors/SponsorModal.tsx +++ b/frontend/src/components/Sponsors/SponsorModal.tsx @@ -1,5 +1,4 @@ -import { sponsorInfo } from '../../../public/data/sponsorInfos'; -import {motion} from 'framer-motion' +import { sponsorInfo } from '@/../public/data/sponsorInfos'; export default function SponsorModal(props: { sponsorInfo: sponsorInfo | null; setFalse: () => void }) { if (props.sponsorInfo === null) { @@ -18,17 +17,17 @@ export default function SponsorModal(props: { sponsorInfo: sponsorInfo | null; s >
- - {props.sponsorInfo.alt} - + {props.sponsorInfo.alt} +

{props.sponsorInfo.description}

-

B03 CSE Building K17, UNSW csesoc@csesoc.org.au

+

+

B03 CSE Building K17, UNSW

+ csesoc@csesoc.org.au +

© 2024 — CSESoc UNSW

From 105f4e1155f18aeaae9d4047ae73f7abde651e55 Mon Sep 17 00:00:00 2001 From: Derek Xu Date: Thu, 4 Jul 2024 22:38:31 +1000 Subject: [PATCH 06/12] Use layout component --- frontend/src/components/Layout.tsx | 14 +++ frontend/src/components/Navbar.tsx | 2 +- frontend/src/components/Resources/index.tsx | 102 ----------------- .../src/components/Sponsors/SponsorLinks.tsx | 89 --------------- frontend/src/pages/contact-us.tsx | 9 +- frontend/src/pages/events.tsx | 9 +- frontend/src/pages/resources.tsx | 106 ++++++++++++++++-- frontend/src/pages/sponsors.tsx | 93 +++++++++++++-- 8 files changed, 204 insertions(+), 220 deletions(-) create mode 100644 frontend/src/components/Layout.tsx delete mode 100644 frontend/src/components/Resources/index.tsx delete mode 100644 frontend/src/components/Sponsors/SponsorLinks.tsx diff --git a/frontend/src/components/Layout.tsx b/frontend/src/components/Layout.tsx new file mode 100644 index 0000000..66f4bf5 --- /dev/null +++ b/frontend/src/components/Layout.tsx @@ -0,0 +1,14 @@ +import Navbar from './Navbar'; +import Footer from './Footer'; + +const Layout = ({ children }: { children: React.ReactNode }) => { + return ( +
+ + {children} +
+
+ ); +}; + +export default Layout; diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx index ef72700..2e4b43c 100644 --- a/frontend/src/components/Navbar.tsx +++ b/frontend/src/components/Navbar.tsx @@ -21,7 +21,7 @@ const Navbar = () => { height={200} draggable={false} /> -

+

csesoc@unsw : ~{path.map(segment => '/' + segment.toLowerCase())} diff --git a/frontend/src/components/Resources/index.tsx b/frontend/src/components/Resources/index.tsx deleted file mode 100644 index 0fa7f0e..0000000 --- a/frontend/src/components/Resources/index.tsx +++ /dev/null @@ -1,102 +0,0 @@ -import Image from 'next/image'; -import { resourceCards, stage1, stage2, stage3 } from '@/../public/data/resourceCards'; - -const boxStyling = - 'border border-[#595F6D] rounded-lg hover:border-[#788093] hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300'; - -const Resources = () => { - return ( -

-
-
- Background -
-

RESOURCES

-
- -
-
- {stage1.map((item: resourceCards) => { - return ( - -
- {item.alt} -
-
-

{item.title}

-

{item.desc}

-
- - ); - })} - - {stage2.map((item: resourceCards) => { - return ( - -
- {item.alt} -
-
-

{item.title}

-

{item.desc}

-
- - ); - })} - - {stage3.map((item: resourceCards) => { - return ( - -
- {item.alt} -
-
-

{item.title}

-

{item.desc}

-
- - ); - })} -
-
-
-
-
- ); -}; - -export default Resources; diff --git a/frontend/src/components/Sponsors/SponsorLinks.tsx b/frontend/src/components/Sponsors/SponsorLinks.tsx deleted file mode 100644 index 8243a3e..0000000 --- a/frontend/src/components/Sponsors/SponsorLinks.tsx +++ /dev/null @@ -1,89 +0,0 @@ -import { useState } from 'react'; -import { diamondLinks, goldLinks, silverLinks, sponsorInfo } from '@/../public/data/sponsorInfos'; -import SponsorModal from './SponsorModal'; - -const logostyle = 'grow-on-hover cursor-pointer transform transition-transform duration-300 hover:scale-105'; -const logodiv = 'block gap-y-8 h-14'; -const background = 'rgba(57, 119, 248, 0.6)'; - -function SponsorLinks() { - const [showModal, setShowModal] = useState(false); - const [information, setInformation] = useState(null); - - return ( -
-
- {showModal && ( - { - setShowModal(false); - }} - /> - )} -
-

Diamond Sponsors

- {diamondLinks.map((item, index) => { - return ( -
{ - setInformation(item); - setShowModal(true); - }} - > - {item.alt} -
- ); - })} -
-
-

Gold Sponsors

- {goldLinks.map((item, index) => { - return ( -
{ - setInformation(item); - setShowModal(true); - }} - > - {item.alt} -
- ); - })} -
-
-

Silver Sponsors

- {silverLinks.map((item, index) => { - return ( -
{ - setInformation(item); - setShowModal(true); - }} - > - {item.alt} -
- ); - })} -
-
-
- ); -} - -export default SponsorLinks; diff --git a/frontend/src/pages/contact-us.tsx b/frontend/src/pages/contact-us.tsx index ef95158..3c9bebf 100644 --- a/frontend/src/pages/contact-us.tsx +++ b/frontend/src/pages/contact-us.tsx @@ -1,11 +1,9 @@ import Contacts from '@/components/Contacts'; -import Footer from '@/components/Footer'; -import Navbar from '@/components/Navbar'; +import Layout from '@/components/Layout'; export default function ContactUs() { return ( -
- +

CONTACT US

@@ -66,7 +64,6 @@ export default function ContactUs() {
-
-
+ ); } diff --git a/frontend/src/pages/events.tsx b/frontend/src/pages/events.tsx index 3e95480..8b8fc92 100644 --- a/frontend/src/pages/events.tsx +++ b/frontend/src/pages/events.tsx @@ -1,5 +1,4 @@ -import Navbar from '@/components/Navbar'; -import Footer from '@/components/Footer'; +import Layout from '@/components/Layout'; import axios from 'axios'; export default function EventsPage() { @@ -13,10 +12,8 @@ export default function EventsPage() { }; return ( -
- + -
-
+ ); } diff --git a/frontend/src/pages/resources.tsx b/frontend/src/pages/resources.tsx index 2c792a6..40c05c5 100644 --- a/frontend/src/pages/resources.tsx +++ b/frontend/src/pages/resources.tsx @@ -1,13 +1,103 @@ -import Navbar from '@/components/Navbar'; -import Footer from '@/components/Footer'; -import Resources from '@/components/Resources'; +import Layout from '@/components/Layout'; +import Image from 'next/image'; +import { resourceCards, stage1, stage2, stage3 } from '@/../public/data/resourceCards'; export default function ResourcesPage() { + const boxStyling = + 'border border-[#595F6D] rounded-lg hover:border-[#788093] hover:bg-[#070034] hover:bg-opacity-75 transition-all duration-300'; + return ( -
- - -
-
+ +
+
+
+ Background +
+

RESOURCES

+
+ +
+
+ {stage1.map((item: resourceCards) => { + return ( + +
+ {item.alt} +
+
+

{item.title}

+

{item.desc}

+
+ + ); + })} + + {stage2.map((item: resourceCards) => { + return ( + +
+ {item.alt} +
+
+

{item.title}

+

{item.desc}

+
+ + ); + })} + + {stage3.map((item: resourceCards) => { + return ( + +
+ {item.alt} +
+
+

{item.title}

+

{item.desc}

+
+ + ); + })} +
+
+
+
+
+ ); } diff --git a/frontend/src/pages/sponsors.tsx b/frontend/src/pages/sponsors.tsx index fd97023..4ce4147 100644 --- a/frontend/src/pages/sponsors.tsx +++ b/frontend/src/pages/sponsors.tsx @@ -1,13 +1,90 @@ -import Navbar from '@/components/Navbar'; -import Footer from '@/components/Footer'; -import SponsorLinks from '@/components/Sponsors/SponsorLinks'; +import Layout from '@/components/Layout'; +import { useState } from 'react'; +import { diamondLinks, goldLinks, silverLinks, sponsorInfo } from '@/../public/data/sponsorInfos'; +import SponsorModal from '@/components/Sponsors/SponsorModal'; export default function SponsorsPage() { + const logostyle = 'grow-on-hover cursor-pointer transform transition-transform duration-300 hover:scale-105'; + const logodiv = 'block gap-y-8 h-14'; + const background = 'rgba(57, 119, 248, 0.6)'; + + const [showModal, setShowModal] = useState(false); + const [information, setInformation] = useState(null); + return ( -
- - -
-
+ +
+
+ {showModal && ( + { + setShowModal(false); + }} + /> + )} +
+

Diamond Sponsors

+ {diamondLinks.map((item, index) => { + return ( +
{ + setInformation(item); + setShowModal(true); + }} + > + {item.alt} +
+ ); + })} +
+
+

Gold Sponsors

+ {goldLinks.map((item, index) => { + return ( +
{ + setInformation(item); + setShowModal(true); + }} + > + {item.alt} +
+ ); + })} +
+
+

Silver Sponsors

+ {silverLinks.map((item, index) => { + return ( +
{ + setInformation(item); + setShowModal(true); + }} + > + {item.alt} +
+ ); + })} +
+
+
+ ); } From 1473b807e901010b52e7cc725a107e122b831175 Mon Sep 17 00:00:00 2001 From: Derek Xu Date: Thu, 4 Jul 2024 22:48:21 +1000 Subject: [PATCH 07/12] Convert all pages to layout component --- .../src/components/About/AboutHomepage.tsx | 2 +- frontend/src/components/About/index.tsx | 124 ----------------- frontend/src/components/Footer.tsx | 6 +- frontend/src/pages/about/constitution.tsx | 97 +++++++------ frontend/src/pages/about/election-guide.tsx | 9 +- .../pages/about/execs-directors-subcoms.tsx | 11 +- frontend/src/pages/about/faqs.tsx | 9 +- frontend/src/pages/about/index.tsx | 128 ++++++++++++++++-- frontend/src/pages/contact-us.tsx | 2 +- frontend/src/pages/index.tsx | 2 +- 10 files changed, 183 insertions(+), 207 deletions(-) delete mode 100644 frontend/src/components/About/index.tsx diff --git a/frontend/src/components/About/AboutHomepage.tsx b/frontend/src/components/About/AboutHomepage.tsx index 2e208fc..31975b4 100644 --- a/frontend/src/components/About/AboutHomepage.tsx +++ b/frontend/src/components/About/AboutHomepage.tsx @@ -30,7 +30,7 @@ export default function AboutHomePage() { We are here to fulfil the social, personal and professional needs of CSE students, and promote computing through a variety of forms.

- Learn more about us! + Learn more about us!

diff --git a/frontend/src/components/About/index.tsx b/frontend/src/components/About/index.tsx deleted file mode 100644 index 99056a6..0000000 --- a/frontend/src/components/About/index.tsx +++ /dev/null @@ -1,124 +0,0 @@ -import Image from 'next/image'; -import Link from 'next/link'; - -const About = () => { - return ( -
-
-

ABOUT

-
-
-
- {/* LEFT SIDE */} -
-
- CSESoc Icon -
-

CSESoc

-

unsw-computer-science-engineering-society

- -

- CSESoc is the principal representative body for UNSW computing students. -

-
- People -
- 432 members · 342{' '} - subcom -
-
-
- Location - Sydney, Australia -
-
- Mail - info@csesoc.org.au -
-
- {/* RIGHT SIDE */} -
-
-

- csesoc/README.md -

-

- CSESoc is one of the biggest and most active societies at UNSW, catering to over 3500 CSE - students spanning across degrees in Computer Science, Software Engineering, - Bioinformatics and Computer Engineering. -

- We are here to fulfil the social, personal and - professional needs of CSE students, and promote computing through a variety of forms. -

-
-
- Pinned - {/* TODO: refactor all of this */} -
-
-
- Book - - execs-directors-subcoms - -
-
CSESoc's execs, directors, subcommittees
-
-
-
-
- Book - - constitution - -
-
Current and past constitutions
-
-
-
-
-
-
- Book - - our-history - -
-
Dive into CSESoc's history
-
-
-
-
- Book - - faqs - -
-
Frequently asked questions
-
-
-
-
-
-
- Book - - election-guide - -
-
Our election nomination guide
-
-
-
-
-
-
-
-
- ); -}; - -export default About; diff --git a/frontend/src/components/Footer.tsx b/frontend/src/components/Footer.tsx index be9bbb2..961e173 100644 --- a/frontend/src/components/Footer.tsx +++ b/frontend/src/components/Footer.tsx @@ -37,10 +37,10 @@ const Footer = () => {
-

-

B03 CSE Building K17, UNSW

+
+
B03 CSE Building K17, UNSW
csesoc@csesoc.org.au -

+

© 2024 — CSESoc UNSW

diff --git a/frontend/src/pages/about/constitution.tsx b/frontend/src/pages/about/constitution.tsx index bdd112b..446adc5 100644 --- a/frontend/src/pages/about/constitution.tsx +++ b/frontend/src/pages/about/constitution.tsx @@ -1,57 +1,54 @@ -import Navbar from '@/components/Navbar'; -import Footer from '@/components/Footer'; +import Layout from "@/components/Layout"; export default function Constitution() { return ( -
- -
-
-

CONSTITUTION

-
+ +
+
+

CONSTITUTION

+
-
-

- Since the end of 2013, the constitution has been hosted on Github. The constitution by which CSESoc runs can be found here: -

- +
+

+ Since the end of 2013, the constitution has been hosted on Github. The constitution by which CSESoc runs can be found here: +

+ -

Previous iterations of the constitution can be found here:

- -
-
-
-
+

Previous iterations of the constitution can be found here:

+ + +
+ ); } diff --git a/frontend/src/pages/about/election-guide.tsx b/frontend/src/pages/about/election-guide.tsx index 28b465d..c8c55ba 100644 --- a/frontend/src/pages/about/election-guide.tsx +++ b/frontend/src/pages/about/election-guide.tsx @@ -1,10 +1,8 @@ -import Navbar from "@/components/Navbar"; -import Footer from "@/components/Footer"; +import Layout from "@/components/Layout"; const ElectionGuide = () => { return ( -
- +

ELECTION NOMINATION GUIDE

@@ -111,8 +109,7 @@ const ElectionGuide = () => {
-
-
+ ); }; diff --git a/frontend/src/pages/about/execs-directors-subcoms.tsx b/frontend/src/pages/about/execs-directors-subcoms.tsx index 78a7a67..848f424 100644 --- a/frontend/src/pages/about/execs-directors-subcoms.tsx +++ b/frontend/src/pages/about/execs-directors-subcoms.tsx @@ -1,10 +1,8 @@ -import Navbar from '@/components/Navbar'; -import Footer from '@/components/Footer'; +import Layout from "@/components/Layout"; const ExecsDirectorsSubcommittees = () => { return ( -
- +

EXECS, DIRECTORS & SUBCOMMITTEES

@@ -245,10 +243,9 @@ const ExecsDirectorsSubcommittees = () => { Organises approachable events targeted towards building an inclusive and welcoming community, to help build long-lasting friendships!

- +
-
-
+ ); } diff --git a/frontend/src/pages/about/faqs.tsx b/frontend/src/pages/about/faqs.tsx index 95b4fb2..65c51b5 100644 --- a/frontend/src/pages/about/faqs.tsx +++ b/frontend/src/pages/about/faqs.tsx @@ -1,10 +1,8 @@ -import Navbar from '@/components/Navbar'; -import Footer from '@/components/Footer'; +import Layout from "@/components/Layout"; const Faqs = () => { return ( -
- +

FREQUENTLY ASKED QUESTIONS

@@ -53,8 +51,7 @@ const Faqs = () => {

-
-
+ ); }; diff --git a/frontend/src/pages/about/index.tsx b/frontend/src/pages/about/index.tsx index a3ac9e6..bbac5d7 100644 --- a/frontend/src/pages/about/index.tsx +++ b/frontend/src/pages/about/index.tsx @@ -1,13 +1,125 @@ -import Navbar from '@/components/Navbar'; -import Footer from '@/components/Footer'; -import About from '@/components/About'; +import Layout from "@/components/Layout"; +import Image from 'next/image'; +import Link from 'next/link'; export default function AboutPage() { return ( -
- - -
-
+ +
+
+

ABOUT US

+
+
+
+ {/* LEFT SIDE */} +
+
+ CSESoc Icon +
+

CSESoc

+

unsw-computer-science-engineering-society

+ +

+ CSESoc is the principal representative body for UNSW computing students. +

+
+ People +
+ 432 members · 342{' '} + subcom +
+
+
+ Location + Sydney, Australia +
+
+ Mail + info@csesoc.org.au +
+
+ {/* RIGHT SIDE */} +
+
+

+ csesoc/README.md +

+

+ CSESoc is one of the biggest and most active societies at UNSW, catering to over 3500 CSE + students spanning across degrees in Computer Science, Software Engineering, + Bioinformatics and Computer Engineering. +

+ We are here to fulfil the social, personal and + professional needs of CSE students, and promote computing through a variety of forms. +

+
+
+ Pinned + {/* TODO: refactor all of this */} +
+
+
+ Book + + execs-directors-subcoms + +
+
CSESoc's execs, directors, subcommittees
+
+
+
+
+ Book + + constitution + +
+
Current and past constitutions
+
+
+
+
+
+
+ Book + + our-history + +
+
Dive into CSESoc's history
+
+
+
+
+ Book + + faqs + +
+
Frequently asked questions
+
+
+
+
+
+
+ Book + + election-guide + +
+
Our election nomination guide
+
+
+
+
+
+
+
+
+ ); } diff --git a/frontend/src/pages/contact-us.tsx b/frontend/src/pages/contact-us.tsx index 3c9bebf..6f1799e 100644 --- a/frontend/src/pages/contact-us.tsx +++ b/frontend/src/pages/contact-us.tsx @@ -1,7 +1,7 @@ import Contacts from '@/components/Contacts'; import Layout from '@/components/Layout'; -export default function ContactUs() { +export default function ContactUsPage() { return (
diff --git a/frontend/src/pages/index.tsx b/frontend/src/pages/index.tsx index e4620c2..8fe672b 100644 --- a/frontend/src/pages/index.tsx +++ b/frontend/src/pages/index.tsx @@ -3,7 +3,7 @@ import Sponsors from '@/components/Sponsors/index'; import Event from '@/components/Event'; import AboutHomePage from '@/components/About/AboutHomepage'; -export default function Home() { +export default function HomePage() { return (
From 4947e78b056d57fe2b9200f7b43b8f9f3748ca1d Mon Sep 17 00:00:00 2001 From: Derek Xu Date: Thu, 4 Jul 2024 23:29:53 +1000 Subject: [PATCH 08/12] PageBody and PageTitle components --- frontend/src/components/Layout.tsx | 1 + frontend/src/components/PageBody.tsx | 13 ++ frontend/src/components/PageTitle.tsx | 9 ++ frontend/src/pages/about/constitution.tsx | 15 +- frontend/src/pages/about/election-guide.tsx | 15 +- .../pages/about/execs-directors-subcoms.tsx | 15 +- frontend/src/pages/about/faqs.tsx | 15 +- frontend/src/pages/about/index.tsx | 7 +- frontend/src/pages/about/our-history.tsx | 26 ++-- frontend/src/pages/contact-us.tsx | 12 +- frontend/src/pages/events.tsx | 2 + frontend/src/pages/resources.tsx | 6 +- frontend/src/pages/sponsors.tsx | 145 +++++++++--------- 13 files changed, 152 insertions(+), 129 deletions(-) create mode 100644 frontend/src/components/PageBody.tsx create mode 100644 frontend/src/components/PageTitle.tsx diff --git a/frontend/src/components/Layout.tsx b/frontend/src/components/Layout.tsx index 66f4bf5..3f25de9 100644 --- a/frontend/src/components/Layout.tsx +++ b/frontend/src/components/Layout.tsx @@ -1,5 +1,6 @@ import Navbar from './Navbar'; import Footer from './Footer'; +import React from 'react'; const Layout = ({ children }: { children: React.ReactNode }) => { return ( diff --git a/frontend/src/components/PageBody.tsx b/frontend/src/components/PageBody.tsx new file mode 100644 index 0000000..e63d960 --- /dev/null +++ b/frontend/src/components/PageBody.tsx @@ -0,0 +1,13 @@ +import React from "react"; + +const PageBody = ({ children }: { children: React.ReactNode }) => { + return ( +
+
+ {children} +
+
+ ); +} + +export default PageBody; diff --git a/frontend/src/components/PageTitle.tsx b/frontend/src/components/PageTitle.tsx new file mode 100644 index 0000000..0ea158f --- /dev/null +++ b/frontend/src/components/PageTitle.tsx @@ -0,0 +1,9 @@ +const PageTitle = ({ title }: { title: string }) => { + return ( +
+

{title}

+
+ ) +} + +export default PageTitle; \ No newline at end of file diff --git a/frontend/src/pages/about/constitution.tsx b/frontend/src/pages/about/constitution.tsx index 446adc5..9306c30 100644 --- a/frontend/src/pages/about/constitution.tsx +++ b/frontend/src/pages/about/constitution.tsx @@ -1,13 +1,12 @@ import Layout from "@/components/Layout"; +import PageBody from "@/components/PageBody"; +import PageTitle from "@/components/PageTitle"; -export default function Constitution() { +const ConstitutionPage = () => { return ( -
-
-

CONSTITUTION

-
- + +

Since the end of 2013, the constitution has been hosted on Github. The constitution by which CSESoc runs can be found here: @@ -48,7 +47,9 @@ export default function Constitution() {

-
+ ); } + +export default ConstitutionPage; \ No newline at end of file diff --git a/frontend/src/pages/about/election-guide.tsx b/frontend/src/pages/about/election-guide.tsx index c8c55ba..205b558 100644 --- a/frontend/src/pages/about/election-guide.tsx +++ b/frontend/src/pages/about/election-guide.tsx @@ -1,13 +1,12 @@ import Layout from "@/components/Layout"; +import PageBody from "@/components/PageBody"; +import PageTitle from "@/components/PageTitle"; -const ElectionGuide = () => { +const ElectionGuidePage = () => { return ( -
-
-

ELECTION NOMINATION GUIDE

-
- + +

Before considering any executive position for CSESoc, it @@ -108,9 +107,9 @@ const ElectionGuide = () => {

-
+ ); }; -export default ElectionGuide; \ No newline at end of file +export default ElectionGuidePage; \ No newline at end of file diff --git a/frontend/src/pages/about/execs-directors-subcoms.tsx b/frontend/src/pages/about/execs-directors-subcoms.tsx index 848f424..598b480 100644 --- a/frontend/src/pages/about/execs-directors-subcoms.tsx +++ b/frontend/src/pages/about/execs-directors-subcoms.tsx @@ -1,13 +1,12 @@ import Layout from "@/components/Layout"; +import PageBody from "@/components/PageBody"; +import PageTitle from "@/components/PageTitle"; -const ExecsDirectorsSubcommittees = () => { +const ExecsDirectorsSubcommitteesPage = () => { return ( -
-
-

EXECS, DIRECTORS & SUBCOMMITTEES

-
- + + {/* CSESOC TEAM */}

@@ -244,9 +243,9 @@ const ExecsDirectorsSubcommittees = () => {

-
+ ); } -export default ExecsDirectorsSubcommittees; \ No newline at end of file +export default ExecsDirectorsSubcommitteesPage; \ No newline at end of file diff --git a/frontend/src/pages/about/faqs.tsx b/frontend/src/pages/about/faqs.tsx index 65c51b5..1c4654e 100644 --- a/frontend/src/pages/about/faqs.tsx +++ b/frontend/src/pages/about/faqs.tsx @@ -1,13 +1,12 @@ import Layout from "@/components/Layout"; +import PageBody from "@/components/PageBody"; +import PageTitle from "@/components/PageTitle"; -const Faqs = () => { +const FaqsPage = () => { return ( -
-
-

FREQUENTLY ASKED QUESTIONS

-
- + +

What is CSESoc? @@ -50,9 +49,9 @@ const Faqs = () => { subcommittee. Subcommittee recruitment opens during T1 of each year.

-
+ ); }; -export default Faqs; \ No newline at end of file +export default FaqsPage; \ No newline at end of file diff --git a/frontend/src/pages/about/index.tsx b/frontend/src/pages/about/index.tsx index bbac5d7..691dbae 100644 --- a/frontend/src/pages/about/index.tsx +++ b/frontend/src/pages/about/index.tsx @@ -1,14 +1,13 @@ import Layout from "@/components/Layout"; +import PageTitle from "@/components/PageTitle"; import Image from 'next/image'; import Link from 'next/link'; export default function AboutPage() { return ( -
-
-

ABOUT US

-
+ +
{/* LEFT SIDE */} diff --git a/frontend/src/pages/about/our-history.tsx b/frontend/src/pages/about/our-history.tsx index 53a9d23..5088ca8 100644 --- a/frontend/src/pages/about/our-history.tsx +++ b/frontend/src/pages/about/our-history.tsx @@ -1,18 +1,15 @@ -import Navbar from "@/components/Navbar"; -import Footer from "@/components/Footer"; +import Layout from "@/components/Layout"; +import PageBody from "@/components/PageBody"; +import PageTitle from "@/components/PageTitle"; -const OurHistory = () => { +const OurHistoryPage = () => { // Years from 2020 to 2007 const years: number[] = Array.from({ length: 14 }, (_, i) => 2020 - i); return ( -
- -
-
-

OUR HISTORY

-
- + + +

CSESoc was formed in October 2006 from the old CompSoc and SESoc societies. @@ -50,10 +47,9 @@ const OurHistory = () => {

))} -
-
-
- ) + + + ); } -export default OurHistory; +export default OurHistoryPage; diff --git a/frontend/src/pages/contact-us.tsx b/frontend/src/pages/contact-us.tsx index 6f1799e..005d23f 100644 --- a/frontend/src/pages/contact-us.tsx +++ b/frontend/src/pages/contact-us.tsx @@ -1,14 +1,14 @@ import Contacts from '@/components/Contacts'; import Layout from '@/components/Layout'; +import PageBody from '@/components/PageBody'; +import PageTitle from '@/components/PageTitle'; export default function ContactUsPage() { return ( -
-
-

CONTACT US

-
- + + +

  • @@ -63,7 +63,7 @@ export default function ContactUsPage() { -

+ ); } diff --git a/frontend/src/pages/events.tsx b/frontend/src/pages/events.tsx index 8b8fc92..130a8f7 100644 --- a/frontend/src/pages/events.tsx +++ b/frontend/src/pages/events.tsx @@ -1,4 +1,5 @@ import Layout from '@/components/Layout'; +import PageTitle from '@/components/PageTitle'; import axios from 'axios'; export default function EventsPage() { @@ -13,6 +14,7 @@ export default function EventsPage() { return ( + ); diff --git a/frontend/src/pages/resources.tsx b/frontend/src/pages/resources.tsx index 40c05c5..cbb6c56 100644 --- a/frontend/src/pages/resources.tsx +++ b/frontend/src/pages/resources.tsx @@ -1,6 +1,7 @@ import Layout from '@/components/Layout'; import Image from 'next/image'; import { resourceCards, stage1, stage2, stage3 } from '@/../public/data/resourceCards'; +import PageTitle from '@/components/PageTitle'; export default function ResourcesPage() { const boxStyling = @@ -8,13 +9,12 @@ export default function ResourcesPage() { return ( + +
Background -
-

RESOURCES

-
diff --git a/frontend/src/pages/sponsors.tsx b/frontend/src/pages/sponsors.tsx index 4ce4147..ae83c8a 100644 --- a/frontend/src/pages/sponsors.tsx +++ b/frontend/src/pages/sponsors.tsx @@ -2,6 +2,7 @@ import Layout from '@/components/Layout'; import { useState } from 'react'; import { diamondLinks, goldLinks, silverLinks, sponsorInfo } from '@/../public/data/sponsorInfos'; import SponsorModal from '@/components/Sponsors/SponsorModal'; +import PageTitle from '@/components/PageTitle'; export default function SponsorsPage() { const logostyle = 'grow-on-hover cursor-pointer transform transition-transform duration-300 hover:scale-105'; @@ -13,78 +14,82 @@ export default function SponsorsPage() { return ( -
-
- {showModal && ( - { - setShowModal(false); - }} - /> - )} -
-

Diamond Sponsors

- {diamondLinks.map((item, index) => { - return ( -
{ - setInformation(item); - setShowModal(true); - }} - > - {item.alt} -
- ); - })} -
-
-

Gold Sponsors

- {goldLinks.map((item, index) => { - return ( -
{ - setInformation(item); - setShowModal(true); - }} - > - {item.alt} -
- ); - })} -
-
-

Silver Sponsors

- {silverLinks.map((item, index) => { - return ( -
{ - setInformation(item); - setShowModal(true); - }} - > - {item.alt} -
- ); - })} + + +
+
+
+ {showModal && ( + { + setShowModal(false); + }} + /> + )} +
+

Diamond Sponsors

+ {diamondLinks.map((item, index) => { + return ( +
{ + setInformation(item); + setShowModal(true); + }} + > + {item.alt} +
+ ); + })} +
+
+

Gold Sponsors

+ {goldLinks.map((item, index) => { + return ( +
{ + setInformation(item); + setShowModal(true); + }} + > + {item.alt} +
+ ); + })} +
+
+

Silver Sponsors

+ {silverLinks.map((item, index) => { + return ( +
{ + setInformation(item); + setShowModal(true); + }} + > + {item.alt} +
+ ); + })} +
-
+
); } From 1b11a00166732e48f742df33bb7d25353ed12d22 Mon Sep 17 00:00:00 2001 From: Derek Xu Date: Thu, 11 Jul 2024 18:58:26 +1000 Subject: [PATCH 09/12] fix hamburger --- frontend/src/components/Hamburger.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/Hamburger.tsx b/frontend/src/components/Hamburger.tsx index 401f4c5..57b877d 100644 --- a/frontend/src/components/Hamburger.tsx +++ b/frontend/src/components/Hamburger.tsx @@ -36,19 +36,19 @@ export default function Hamburger() { >
  • - About Us + About Us
  • - Events + Events
  • - Resources + Resources
  • - Sponsors + Sponsors
  • - Contact Us + Contact Us
From dcb3e690320f895497e70cf58ef5a31b49b55557 Mon Sep 17 00:00:00 2001 From: Derek Xu Date: Thu, 11 Jul 2024 18:59:33 +1000 Subject: [PATCH 10/12] fix pages --- frontend/src/pages/about/index.tsx | 6 ++++-- frontend/src/pages/contact-us.tsx | 24 +++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/frontend/src/pages/about/index.tsx b/frontend/src/pages/about/index.tsx index 691dbae..25c0862 100644 --- a/frontend/src/pages/about/index.tsx +++ b/frontend/src/pages/about/index.tsx @@ -17,7 +17,9 @@ export default function AboutPage() {

CSESoc

unsw-computer-science-engineering-society

- + + +

CSESoc is the principal representative body for UNSW computing students.

@@ -34,7 +36,7 @@ export default function AboutPage() {
Mail - info@csesoc.org.au + info@csesoc.org.au
{/* RIGHT SIDE */} diff --git a/frontend/src/pages/contact-us.tsx b/frontend/src/pages/contact-us.tsx index 005d23f..a56ee61 100644 --- a/frontend/src/pages/contact-us.tsx +++ b/frontend/src/pages/contact-us.tsx @@ -7,7 +7,7 @@ export default function ContactUsPage() { return ( - + @@ -59,9 +59,7 @@ export default function ContactUsPage() { And be sure to follow us on social media to be notified of upcoming events and opportunities!

-
- -
+ From 0d5213471ecc8f6f8d81ab0c30bc77c72d30c351 Mon Sep 17 00:00:00 2001 From: Derek Xu Date: Thu, 18 Jul 2024 18:46:16 +1000 Subject: [PATCH 11/12] Long about us desc --- frontend/src/pages/about/index.tsx | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/frontend/src/pages/about/index.tsx b/frontend/src/pages/about/index.tsx index 25c0862..63274d6 100644 --- a/frontend/src/pages/about/index.tsx +++ b/frontend/src/pages/about/index.tsx @@ -46,12 +46,22 @@ export default function AboutPage() { csesoc/README.md

- CSESoc is one of the biggest and most active societies at UNSW, catering to over 3500 CSE - students spanning across degrees in Computer Science, Software Engineering, - Bioinformatics and Computer Engineering. + CSESoc is the official representative body of computing students at UNSW. We are one of the + largest and most active societies at UNSW, and the largest computing society in the southern hemisphere. + CSESoc comprises ~10k members spanning across degrees in Computer Science, Software Engineering, + Bioinformatics and Computer Engineering. We are here to fulfil the social, personal and professional + needs of CSE students, and promote computing through a variety of forms.

- We are here to fulfil the social, personal and - professional needs of CSE students, and promote computing through a variety of forms. + We are a society for the students, by the students. Here’s an overview of what we do: + +

    +
  • Run weekly social and educational events, including trivia, movie, boardgames nights, LAN parties, workshops, coding competitions, tech talks, and our famous free weekly BBQ
    • +
  • Create original media content, including Podcasts, articles, YouTube videos, and live streams
    • +
  • Run a highly successful First Year Camp and Peer Mentoring program, offering new CSE students (both undergraduate and postgraduate) a chance to meet and mingle with other newcomers
    • +
  • Engage students with industry sponsors and representatives to develop their professional capacity and curiosity
    • +
  • Develop our own open-source projects for students to get learn new skills and develop tools for our community
    • +
  • Facilitate an online community of ~8k Discord users, ~9.5k Facebook followers, ~1.9k YouTube subs, and ~7.7k Instagram followers
    • +

From 31d76a0926715f3f441cbba1572bbd25282d93e2 Mon Sep 17 00:00:00 2001 From: Derek Xu Date: Thu, 18 Jul 2024 18:46:38 +1000 Subject: [PATCH 12/12] center execs and directors --- .../pages/about/execs-directors-subcoms.tsx | 85 ++++++++++--------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/frontend/src/pages/about/execs-directors-subcoms.tsx b/frontend/src/pages/about/execs-directors-subcoms.tsx index 598b480..d769da6 100644 --- a/frontend/src/pages/about/execs-directors-subcoms.tsx +++ b/frontend/src/pages/about/execs-directors-subcoms.tsx @@ -19,134 +19,137 @@ const ExecsDirectorsSubcommitteesPage = () => {
CSESoc Team 2024
+
-
-
-

Execs

-
    -
  • Elizabeth Zhu Chan - Co-President
    • -
  • Lesley Lu - Co-President
    • -
  • Ivan Chan - Secretary
    • -
  • Justin Son - Treasurer
    • -
  • Sophie Khov - Arc Delegate
    • -
  • Catherine Kim - Grievance, Equity, Diversity and Inclusion Officer
    • -
  • Amy Liu - Vice President (Internals)
    • -
  • Nicole Jiang - Vice President (Externals)
    • -
  • Matthew Lim - Vice President (Technicals)
    • -
+
+

Execs

+
+
    +
  • Elizabeth Zhu Chan - Co-President
    • +
  • Lesley Lu - Co-President
    • +
  • Ivan Chan - Secretary
    • +
  • Justin Son - Treasurer
    • +
  • Sophie Khov - Arc Delegate
    • +
  • Catherine Kim - Grievance, Equity, Diversity and Inclusion Officer
    • +
  • Amy Liu - Vice President (Internals)
    • +
  • Nicole Jiang - Vice President (Externals)
    • +
  • Matthew Lim - Vice President (Technicals)
    • +
+
-
+
+

Careers

-
    +
    • Eric Kang
    • Jasmine Xian
    • Max Lee
-
+

Competitions

-
    +
    • Aliff Azlan
    • Haibing Wang
    • Diego Untalan
-
+

Creative

-
    +
    • Anna Wang
    • Jordan Djamaan
    • Shabinda Sarkaria
-
+

Education

-
    +
    • Alina Jin
    • JJ Roberts-White
    • Liam Smith
-
+

Events

-
    +
    • Emma Nguyen
    • Jalaj Jain
    • Jenny Lee
-
+

HR

-
    +
    • Aryan Chauhan
    • Edwin Tang
    • Jasmine Guan
-
+

IT

-
    +
    • Derek Xu
    • Dominic Cheung
-
+

Marketing

-
    +
    • Aaron Lee
    • Lisa Lin
    • Zitian Qin
-
+

Media

-
    +
    • Dylan Hu
    • Gloria Xi
    • Leo Ng Maisnam
-
+

Online

-
    +
    • Amy Tian
    • Brandon Tan
-
+

Outreach

-
    +
    • Joyce He
    • Sapphire Wildie
-
+

Socials

-
    +
    • Davis Lim
    • Jennifer Yu
    • Susie Xia
-
-

- Get to know them better here! +

+ Get to know them better here!

+
{/* PORTFOLIOS */}