From ee9a0179ceb259b6a8c2531e80d1b584d727ef29 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 02:42:19 +1000 Subject: [PATCH 01/26] removed stats card --- frontend/src/components/Landing/index.tsx | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/frontend/src/components/Landing/index.tsx b/frontend/src/components/Landing/index.tsx index b663e97..47720b0 100644 --- a/frontend/src/components/Landing/index.tsx +++ b/frontend/src/components/Landing/index.tsx @@ -25,22 +25,6 @@ const Landing = () => {

{''}

-
-

STATS

-
-
-

323,000

-

Members

-
-
-

300

-

Team Members

-
-
-

52

-

Events held

-
-
); From 5a03a62e854998e65bd0a6d1c51121a613c6eac8 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 02:52:48 +1000 Subject: [PATCH 02/26] added description --- frontend/src/components/About/index.tsx | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/About/index.tsx b/frontend/src/components/About/index.tsx index 04e0353..bf9c382 100644 --- a/frontend/src/components/About/index.tsx +++ b/frontend/src/components/About/index.tsx @@ -44,7 +44,28 @@ const About = () => {

csesoc/README.md

-

Lorem Ipsum

+

+ We're UNSW's Computer Science and Engineering (CSE) Society. We meet the social, personal, and professional needs of CSE students, and promote computing by: +

+
Pinned From ba2d84a6cffe5dacde8cc5929e7b0e6503056377 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 02:53:45 +1000 Subject: [PATCH 03/26] changed events to upcomming events --- frontend/src/components/Event/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Event/index.tsx b/frontend/src/components/Event/index.tsx index b9911cd..20e6dd4 100644 --- a/frontend/src/components/Event/index.tsx +++ b/frontend/src/components/Event/index.tsx @@ -3,7 +3,7 @@ const Event = () => {

02

-

EVENTS

+

UPCOMING EVENTS

From 3467cb33310fca0c5e0265994b4872e93139f260 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 02:57:30 +1000 Subject: [PATCH 04/26] removed resources and contacts completely to remove redunancy (it is exactly the same component at ./resources --- frontend/src/pages/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/index.tsx b/frontend/src/pages/index.tsx index 61f190d..f105e7f 100644 --- a/frontend/src/pages/index.tsx +++ b/frontend/src/pages/index.tsx @@ -3,6 +3,7 @@ import Sponsors from '@/components/Sponsors/index'; import About from '@/components/About'; import Event from '@/components/Event'; import ResourcesAndContacts from '@/components/ResourcesAndContacts'; +import ResourcesPage from './resources'; export default function Home() { return ( @@ -10,7 +11,6 @@ export default function Home() { -

); From b642d0316fa22b76d528a626a5905a9691bdcc65 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 02:57:41 +1000 Subject: [PATCH 05/26] removed imports --- frontend/src/pages/index.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/pages/index.tsx b/frontend/src/pages/index.tsx index f105e7f..3379421 100644 --- a/frontend/src/pages/index.tsx +++ b/frontend/src/pages/index.tsx @@ -2,8 +2,6 @@ import Landing from '@/components/Landing'; import Sponsors from '@/components/Sponsors/index'; import About from '@/components/About'; import Event from '@/components/Event'; -import ResourcesAndContacts from '@/components/ResourcesAndContacts'; -import ResourcesPage from './resources'; export default function Home() { return ( From cd5f2748978e6912ba83f2e776e89c70cf0b6429 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 02:58:10 +1000 Subject: [PATCH 06/26] changed 04 to 03 to compensate for removed resources --- frontend/src/components/Sponsors/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Sponsors/index.tsx b/frontend/src/components/Sponsors/index.tsx index e31290a..9d1e0ff 100644 --- a/frontend/src/components/Sponsors/index.tsx +++ b/frontend/src/components/Sponsors/index.tsx @@ -13,7 +13,7 @@ const Sponsors = () => { id="sponsors" >
-

04

+

03

SUPPORT CSESOC

From 60de01877ed558cefa135faeb7f3dc27f474ed6a Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 19:31:10 +1000 Subject: [PATCH 07/26] removed numbers from navbar --- frontend/src/components/Navbar.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx index feb71d3..db99fda 100644 --- a/frontend/src/components/Navbar.tsx +++ b/frontend/src/components/Navbar.tsx @@ -26,19 +26,15 @@ const Navbar = () => {
-

01

{'//'} about us
-

02

{'//'} events
-

03

{'//'} resources
-

04

{'//'} sponsors
From cdc995b5636e223a9d92138faa4e3b0232af90ae Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 19:32:54 +1000 Subject: [PATCH 08/26] halved space between navbar components --- frontend/src/components/Navbar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx index db99fda..640a156 100644 --- a/frontend/src/components/Navbar.tsx +++ b/frontend/src/components/Navbar.tsx @@ -24,7 +24,7 @@ const Navbar = () => {

C:\INTERNAL STRUCTURE\{path}

-
+
{'//'} about us
From b913aa60d4258eec4ae5ecf138734692fb5b1264 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 19:35:14 +1000 Subject: [PATCH 09/26] shortened about section --- frontend/src/components/About/index.tsx | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/frontend/src/components/About/index.tsx b/frontend/src/components/About/index.tsx index bf9c382..4500dac 100644 --- a/frontend/src/components/About/index.tsx +++ b/frontend/src/components/About/index.tsx @@ -45,27 +45,8 @@ const About = () => { csesoc/README.md

- We're UNSW's Computer Science and Engineering (CSE) Society. We meet the social, personal, and professional needs of CSE students, and promote computing by: + We're UNSW's Computer Science and Engineering (CSE) Society. We meet the social, personal, and professional needs of CSE students, and promote computing as a whole!

-
    -
  • - - Runing weekly events, like trivia, movies, board - games nights, LAN parties, workshops, coding competitions, tech talks, and our free weekly BBQ. -
    • -
  • - - Create Podcasts, articles, YouTube videos, - and live streams -
    • -
  • - - Run events like First Year Camp and Peer Mentoring programs. -
    • -
  • - - Engage students with our industry sponsors and representatives. -
    • -
  • - - Develop open-source projects to learn and give to our community. -
    • -
Pinned From 6ef6abea572caa881f82084a2efe5e07f9ae8372 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 19:39:49 +1000 Subject: [PATCH 10/26] added button for events component --- frontend/src/components/Event/index.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/src/components/Event/index.tsx b/frontend/src/components/Event/index.tsx index 20e6dd4..4ef7a97 100644 --- a/frontend/src/components/Event/index.tsx +++ b/frontend/src/components/Event/index.tsx @@ -6,10 +6,17 @@ const Event = () => {

UPCOMING 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!

+ + + +
Placeholder
From 3cd3231cdafc022851986f16eca7eaef01b74743 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 22:13:14 +1000 Subject: [PATCH 11/26] removing numbers --- frontend/src/components/About/index.tsx | 1 - frontend/src/components/Navbar.tsx | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/frontend/src/components/About/index.tsx b/frontend/src/components/About/index.tsx index 4500dac..f9d341e 100644 --- a/frontend/src/components/About/index.tsx +++ b/frontend/src/components/About/index.tsx @@ -4,7 +4,6 @@ const About = () => { return (
-

01

ABOUT

diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx index 640a156..656022e 100644 --- a/frontend/src/components/Navbar.tsx +++ b/frontend/src/components/Navbar.tsx @@ -26,16 +26,16 @@ const Navbar = () => {
-
{'//'} about us
+
{'//'} about us
-
{'//'} events
+
{'//'} events
-
{'//'} resources
+
{'//'} resources
-
{'//'} sponsors
+
{'//'} sponsors
From 194affa53d5880df2b3fac3494e9c254691618d1 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 22:14:50 +1000 Subject: [PATCH 12/26] removing numbers --- frontend/src/components/Event/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/components/Event/index.tsx b/frontend/src/components/Event/index.tsx index 4ef7a97..e0e729b 100644 --- a/frontend/src/components/Event/index.tsx +++ b/frontend/src/components/Event/index.tsx @@ -2,7 +2,6 @@ const Event = () => { return (
-

02

UPCOMING EVENTS

From e8e91bda2cc0ad4e8f52dc74c903e39ade5b5c11 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 22:15:10 +1000 Subject: [PATCH 13/26] removing numbers --- frontend/src/components/ResourcesAndContacts/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/components/ResourcesAndContacts/index.tsx b/frontend/src/components/ResourcesAndContacts/index.tsx index 549bcfe..d827ce8 100644 --- a/frontend/src/components/ResourcesAndContacts/index.tsx +++ b/frontend/src/components/ResourcesAndContacts/index.tsx @@ -15,7 +15,6 @@ const ResourcesAndContacts = () => { Background
-

03

RESOURCES & CONTACTS

From c9601a080e45bac256ff2aaca6cdfb92b2c2371a Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 27 Jun 2024 22:16:34 +1000 Subject: [PATCH 14/26] removing numbers --- frontend/src/components/Sponsors/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/components/Sponsors/index.tsx b/frontend/src/components/Sponsors/index.tsx index 9d1e0ff..f3217f1 100644 --- a/frontend/src/components/Sponsors/index.tsx +++ b/frontend/src/components/Sponsors/index.tsx @@ -13,7 +13,6 @@ const Sponsors = () => { id="sponsors" >
-

03

SUPPORT CSESOC

From b70b4f5bf4fb957fae4775c8c1ad3201a86f3b79 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:01:35 +1000 Subject: [PATCH 15/26] removed number for resources (sorry trolling) --- frontend/src/components/Resources/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/components/Resources/index.tsx b/frontend/src/components/Resources/index.tsx index a6fbd63..f14d761 100644 --- a/frontend/src/components/Resources/index.tsx +++ b/frontend/src/components/Resources/index.tsx @@ -14,7 +14,6 @@ const Resources = () => { Background
-

03

RESOURCES

From 37891ed9ed0465f7dae1b4c8367e2b8d20448f0d Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:02:42 +1000 Subject: [PATCH 16/26] removed numbers for contact us --- frontend/src/pages/contact-us.tsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/frontend/src/pages/contact-us.tsx b/frontend/src/pages/contact-us.tsx index 8c5c3da..ef95158 100644 --- a/frontend/src/pages/contact-us.tsx +++ b/frontend/src/pages/contact-us.tsx @@ -8,7 +8,6 @@ export default function ContactUs() {
-

05

CONTACT US

@@ -54,10 +53,6 @@ export default function ContactUs() { .

- {/* */} From 7ea1a2ed17a62ce18006b41ec4dde8cf8a876198 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:07:45 +1000 Subject: [PATCH 17/26] made button smaller and allign to center --- frontend/src/components/Event/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/Event/index.tsx b/frontend/src/components/Event/index.tsx index e0e729b..b9b1a0c 100644 --- a/frontend/src/components/Event/index.tsx +++ b/frontend/src/components/Event/index.tsx @@ -5,13 +5,13 @@ const Event = () => {

UPCOMING 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!

- From b4b60de32ee9140190d6d06c82810f5199ce4a0c Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:17:37 +1000 Subject: [PATCH 18/26] added AboutHomepage and removed pinned. Replaced About with AboutHomepage in index.tsx --- .../src/components/About/AboutHomepage.tsx | 59 +++++++++++++++++++ frontend/src/components/Resources/index.tsx | 31 +++++++--- frontend/src/pages/index.tsx | 4 +- 3 files changed, 85 insertions(+), 9 deletions(-) create mode 100644 frontend/src/components/About/AboutHomepage.tsx diff --git a/frontend/src/components/About/AboutHomepage.tsx b/frontend/src/components/About/AboutHomepage.tsx new file mode 100644 index 0000000..1d0a55c --- /dev/null +++ b/frontend/src/components/About/AboutHomepage.tsx @@ -0,0 +1,59 @@ +import Link from "next/link"; +import Image from "next/image"; +export default function AboutHomePage() { + 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. +

+
+ +
+
+
+
+ ); +} \ No newline at end of file diff --git a/frontend/src/components/Resources/index.tsx b/frontend/src/components/Resources/index.tsx index f14d761..8d2a0b0 100644 --- a/frontend/src/components/Resources/index.tsx +++ b/frontend/src/components/Resources/index.tsx @@ -12,14 +12,12 @@ const Resources = () => {
Background -

RESOURCES

- {stage1.map((item: resourceCards) => { return ( { className={`col-span-4 p-5 ${boxStyling} flex`} >
- {item.alt} + {item.alt}

{item.title}

@@ -47,8 +51,14 @@ const Resources = () => { target="_blank" className={`xl:col-span-1 col-span-4 p-5 ${boxStyling}`} > -
- {item.alt} +
+ {item.alt}

{item.title}

@@ -66,8 +76,15 @@ const Resources = () => { target="_blank" className={`md:col-span-2 col-span-4 p-5 ${boxStyling} flex`} > -
- {item.alt} +
+ {item.alt}

{item.title}

diff --git a/frontend/src/pages/index.tsx b/frontend/src/pages/index.tsx index 3379421..e4620c2 100644 --- a/frontend/src/pages/index.tsx +++ b/frontend/src/pages/index.tsx @@ -1,13 +1,13 @@ import Landing from '@/components/Landing'; import Sponsors from '@/components/Sponsors/index'; -import About from '@/components/About'; import Event from '@/components/Event'; +import AboutHomePage from '@/components/About/AboutHomepage'; export default function Home() { return (
- +
From 01cf7a9822b6458e22933c044f5e3a6804abd257 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:23:29 +1000 Subject: [PATCH 19/26] balanced left side to match right side --- .../src/components/About/AboutHomepage.tsx | 27 ++++--------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/frontend/src/components/About/AboutHomepage.tsx b/frontend/src/components/About/AboutHomepage.tsx index 1d0a55c..c8cbb76 100644 --- a/frontend/src/components/About/AboutHomepage.tsx +++ b/frontend/src/components/About/AboutHomepage.tsx @@ -13,27 +13,8 @@ export default function AboutHomePage() {
CSESoc Icon
-

CSESoc

-

unsw-computer-science-engineering-society

+

CSESoc

-

- 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 */} -
From 36db75e3ac686e639b95f09cc331dee0912c6315 Mon Sep 17 00:00:00 2001 From: QuadAces <107918856+QuadAces@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:30:56 +1000 Subject: [PATCH 20/26] added Navbar + Footer + 404 page component --- frontend/src/pages/404.tsx | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 frontend/src/pages/404.tsx diff --git a/frontend/src/pages/404.tsx b/frontend/src/pages/404.tsx new file mode 100644 index 0000000..2f73889 --- /dev/null +++ b/frontend/src/pages/404.tsx @@ -0,0 +1,11 @@ +import Footer from "@/components/Footer"; +import Navbar from "@/components/Navbar"; + +export default function Custom404() { + return ( + <> + +