From 1913c92e7e5910d73ce10865704f8b69fd152015 Mon Sep 17 00:00:00 2001 From: Alyssa Xia Date: Thu, 13 Jun 2024 15:16:21 +1000 Subject: [PATCH 01/10] Update FYG link --- frontend/src/components/ResourcesAndContacts/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/ResourcesAndContacts/index.tsx b/frontend/src/components/ResourcesAndContacts/index.tsx index 459abbe..bdd81f0 100644 --- a/frontend/src/components/ResourcesAndContacts/index.tsx +++ b/frontend/src/components/ResourcesAndContacts/index.tsx @@ -97,7 +97,7 @@ const ResourcesAndContacts = () => { From 3d3dc27a2a0f4c938d78057142aebb27a217a86f Mon Sep 17 00:00:00 2001 From: Alyssa Xia Date: Thu, 13 Jun 2024 15:32:58 +1000 Subject: [PATCH 02/10] changing compclub to csesoc learn --- frontend/src/components/ResourcesAndContacts/index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/ResourcesAndContacts/index.tsx b/frontend/src/components/ResourcesAndContacts/index.tsx index bdd81f0..6fe9346 100644 --- a/frontend/src/components/ResourcesAndContacts/index.tsx +++ b/frontend/src/components/ResourcesAndContacts/index.tsx @@ -78,13 +78,13 @@ const ResourcesAndContacts = () => { -

CompClub

+

CSESoc Learn

-

Promoting computing to high school students

+

Your learning outside the classroom starts here

 Date: Tue, 18 Jun 2024 23:25:22 +1000 Subject: [PATCH 03/10] structural changes --- .eslintrc.json | 3 +- components/ResourcesAndContacts/index.tsx | 148 ++++++++-------------- public/assets/circles_logo.svg | 74 +++++++++++ public/assets/compclub_logo.svg | 9 ++ public/assets/csesocmedia_logo.svg | 9 ++ public/assets/enrolmentguide.svg | 9 ++ public/assets/firstyearguide.svg | 9 ++ public/assets/jobsboard_logo.svg | 9 ++ public/assets/notangles_logo.svg | 9 ++ public/assets/structs_logo.svg | 9 ++ public/assets/unilectives_logo.svg | 9 ++ public/data/resourceCards.ts | 99 +++++++++++++++ 12 files changed, 301 insertions(+), 95 deletions(-) create mode 100644 public/assets/circles_logo.svg create mode 100644 public/assets/compclub_logo.svg create mode 100644 public/assets/csesocmedia_logo.svg create mode 100644 public/assets/enrolmentguide.svg create mode 100644 public/assets/firstyearguide.svg create mode 100644 public/assets/jobsboard_logo.svg create mode 100644 public/assets/notangles_logo.svg create mode 100644 public/assets/structs_logo.svg create mode 100644 public/assets/unilectives_logo.svg create mode 100644 public/data/resourceCards.ts diff --git a/.eslintrc.json b/.eslintrc.json index 1939b1b..5f24b63 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -7,6 +7,7 @@ "parser": "@typescript-eslint/parser", "plugins": ["@typescript-eslint"], "rules": { - "prettier/prettier": ["error", { "endOfLine": "auto" }] + "prettier/prettier": ["error", { "endOfLine": "auto" }], + "react/jsx-key": [1, { "checkFragmentShorthand": true }] } } diff --git a/components/ResourcesAndContacts/index.tsx b/components/ResourcesAndContacts/index.tsx index 459abbe..f17cb8a 100644 --- a/components/ResourcesAndContacts/index.tsx +++ b/components/ResourcesAndContacts/index.tsx @@ -1,5 +1,6 @@ // import DiscordLogo from "@/public/assets/discord_logo.svg" import Image from 'next/image'; +import { 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'; @@ -20,101 +21,60 @@ const ResourcesAndContacts = () => {
- -

Circles

-

- A UNSW degree planner where you can explore and validate your degree structure. -

- - -

Structs.sh

-

- An educational data structures and algorithms platform. -

- - - -

Jobs Board

-

- A place where CSESoc students can look for relevant job opportunities. -

- - - -

Notangles

- -

- Trimester timetabling tool - no more timetable tangles! -

- - - -

Uni-lectives

- -

- Read course electives to help you pick your electives or even write your own! -

- - - -

CompClub

- -

Promoting computing to high school students

- - - -

CSESoc Media

-

All things content

- - - -

First Year Guide

-

- The ultimate guide to conquering your first year at CSE -

- - - -

Enrolment Guide

-

Learn how to get a headstart on uni

- + {stage1.map((item, index) => { + return ( + +
+ {item.alt} +
+
+

{item.title}

+

{item.desc}

+
+ + ); + })} + + {stage2.map((item, index) => { + return ( + +
+ {item.alt} +
+
+

{item.title}

+

{item.desc}

+
+ + ); + })} + + {stage3.map((item, index) => { + return ( + +
+ {item.alt} +
+
+

{item.title}

+

{item.desc}

+
+ + ); + })}
diff --git a/public/assets/circles_logo.svg b/public/assets/circles_logo.svg new file mode 100644 index 0000000..1064c35 --- /dev/null +++ b/public/assets/circles_logo.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/compclub_logo.svg b/public/assets/compclub_logo.svg new file mode 100644 index 0000000..c3516c1 --- /dev/null +++ b/public/assets/compclub_logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/csesocmedia_logo.svg b/public/assets/csesocmedia_logo.svg new file mode 100644 index 0000000..2686f73 --- /dev/null +++ b/public/assets/csesocmedia_logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/enrolmentguide.svg b/public/assets/enrolmentguide.svg new file mode 100644 index 0000000..74b4113 --- /dev/null +++ b/public/assets/enrolmentguide.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/firstyearguide.svg b/public/assets/firstyearguide.svg new file mode 100644 index 0000000..061c3e0 --- /dev/null +++ b/public/assets/firstyearguide.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/jobsboard_logo.svg b/public/assets/jobsboard_logo.svg new file mode 100644 index 0000000..1f8cd29 --- /dev/null +++ b/public/assets/jobsboard_logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/notangles_logo.svg b/public/assets/notangles_logo.svg new file mode 100644 index 0000000..fd38800 --- /dev/null +++ b/public/assets/notangles_logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/structs_logo.svg b/public/assets/structs_logo.svg new file mode 100644 index 0000000..188e5f6 --- /dev/null +++ b/public/assets/structs_logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/unilectives_logo.svg b/public/assets/unilectives_logo.svg new file mode 100644 index 0000000..7289821 --- /dev/null +++ b/public/assets/unilectives_logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/data/resourceCards.ts b/public/data/resourceCards.ts new file mode 100644 index 0000000..52c0b8d --- /dev/null +++ b/public/data/resourceCards.ts @@ -0,0 +1,99 @@ +export type resourceCards = { + href: string; + svg: string; + alt: string; + title: string; + desc: string; + width: number; + height: number; +}; + +export const stage1: resourceCards[] = [ + { + href: 'https://circles.csesoc.app/course-selector', + svg: '/assets/circles_logo.svg', + alt: 'Circles', + title: 'Circles', + desc: 'A UNSW degree planner where you can explore and validate your degree structure.', + width: 60, + height: 60 + } +]; + +export const stage2: resourceCards[] = [ + { + href: 'https://structs.sh/', + svg: '/assets/structs_logo.svg', + alt: 'Structs', + title: 'Structs', + desc: 'An educational data structures and algorithms platform', + width: 60, + height: 60 + }, + { + href: 'https://jobsboard.csesoc.unsw.edu.au/', + svg: '/assets/jobsboard_logo.svg', + alt: 'JobsBoard', + title: 'Jobs Board', + desc: 'A place where CSESoc students can look for relevant job opportunities.', + width: 60, + height: 60 + }, + { + href: 'https://notangles.csesoc.app/', + svg: '/assets/notangles_logo.svg', + alt: 'Notangles', + title: 'Notangles', + desc: 'Trimester timetabling tool - no more timetable tangles!', + width: 60, + height: 60 + }, + { + href: 'https://unilectives.csesoc.app/', + svg: '/assets/unilectives_logo.svg', + alt: 'Uni-lectives', + title: 'Uni-lectives', + desc: 'Read course electives to help you pick your electives or even write your own!', + width: 60, + height: 60 + } +]; + +export const stage3: resourceCards[] = [ + { + href: 'https://compclub.org/', + svg: '/assets/compclub_logo.svg', + alt: 'CompClub', + title: 'CompClub', + desc: 'Promoting computing to high school students', + width: 60, + height: 60 + }, + { + href: 'https://media.csesoc.org.au/', + svg: '/assets/csesocmedia_logo.svg', + alt: 'CSESoc Media', + title: 'CSESoc Media', + desc: 'All things content', + width: 60, + height: 60 + }, + { + href: 'https://media.csesoc.org.au/first-year-guide-2024/', + svg: '/assets/firstyearguide.svg', + alt: 'First Year Guide', + title: 'First Year Guide', + desc: 'The ultimate guide to conquering your first year at CSE', + width: 60, + height: 60 + }, + { + href: 'https://media.csesoc.org.au/cse-enrol/', + svg: '/assets/enrolmentguide.svg', + alt: 'Enrolment Guide', + title: 'Enrolment Guide', + desc: 'Learn how to get a headstart on uni', + width: 60, + height: 60 + } +]; \ No newline at end of file From 6094fceb53e408022bf7a1eaec2e9b6c394e7b59 Mon Sep 17 00:00:00 2001 From: Saucy_Salad Date: Tue, 18 Jun 2024 23:35:09 +1000 Subject: [PATCH 04/10] logo sizes and lint fixes --- components/ResourcesAndContacts/index.tsx | 4 ++-- public/data/resourceCards.ts | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/ResourcesAndContacts/index.tsx b/components/ResourcesAndContacts/index.tsx index f17cb8a..47e1815 100644 --- a/components/ResourcesAndContacts/index.tsx +++ b/components/ResourcesAndContacts/index.tsx @@ -29,7 +29,7 @@ const ResourcesAndContacts = () => { target="_blank" className={`col-span-4 p-5 ${boxStyling} flex`} > -
+
{item.alt}
@@ -65,7 +65,7 @@ const ResourcesAndContacts = () => { target="_blank" className={`md:col-span-2 col-span-4 p-5 ${boxStyling} flex`} > -
+
{item.alt}
diff --git a/public/data/resourceCards.ts b/public/data/resourceCards.ts index 52c0b8d..7f92e7d 100644 --- a/public/data/resourceCards.ts +++ b/public/data/resourceCards.ts @@ -27,8 +27,8 @@ export const stage2: resourceCards[] = [ alt: 'Structs', title: 'Structs', desc: 'An educational data structures and algorithms platform', - width: 60, - height: 60 + width: 70, + height: 70 }, { href: 'https://jobsboard.csesoc.unsw.edu.au/', @@ -45,8 +45,8 @@ export const stage2: resourceCards[] = [ alt: 'Notangles', title: 'Notangles', desc: 'Trimester timetabling tool - no more timetable tangles!', - width: 60, - height: 60 + width: 70, + height: 70 }, { href: 'https://unilectives.csesoc.app/', @@ -54,8 +54,8 @@ export const stage2: resourceCards[] = [ alt: 'Uni-lectives', title: 'Uni-lectives', desc: 'Read course electives to help you pick your electives or even write your own!', - width: 60, - height: 60 + width: 80, + height: 80 } ]; @@ -96,4 +96,4 @@ export const stage3: resourceCards[] = [ width: 60, height: 60 } -]; \ No newline at end of file +]; From 796acd0b5b74577e0f25b98950a20cd9d41c8ded Mon Sep 17 00:00:00 2001 From: Saucy_Salad Date: Tue, 18 Jun 2024 23:25:22 +1000 Subject: [PATCH 05/10] structural changes --- .eslintrc.json | 13 ++ .../components/ResourcesAndContacts/index.tsx | 148 +++++++----------- public/assets/circles_logo.svg | 74 +++++++++ public/assets/compclub_logo.svg | 9 ++ public/assets/csesocmedia_logo.svg | 9 ++ public/assets/enrolmentguide.svg | 9 ++ public/assets/firstyearguide.svg | 9 ++ public/assets/jobsboard_logo.svg | 9 ++ public/assets/notangles_logo.svg | 9 ++ public/assets/structs_logo.svg | 9 ++ public/assets/unilectives_logo.svg | 9 ++ public/data/resourceCards.ts | 99 ++++++++++++ 12 files changed, 312 insertions(+), 94 deletions(-) create mode 100644 .eslintrc.json create mode 100644 public/assets/circles_logo.svg create mode 100644 public/assets/compclub_logo.svg create mode 100644 public/assets/csesocmedia_logo.svg create mode 100644 public/assets/enrolmentguide.svg create mode 100644 public/assets/firstyearguide.svg create mode 100644 public/assets/jobsboard_logo.svg create mode 100644 public/assets/notangles_logo.svg create mode 100644 public/assets/structs_logo.svg create mode 100644 public/assets/unilectives_logo.svg create mode 100644 public/data/resourceCards.ts diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..5f24b63 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,13 @@ +{ + "extends": [ + "next/core-web-vitals", + "plugin:@typescript-eslint/recommended", + "plugin:prettier/recommended" + ], + "parser": "@typescript-eslint/parser", + "plugins": ["@typescript-eslint"], + "rules": { + "prettier/prettier": ["error", { "endOfLine": "auto" }], + "react/jsx-key": [1, { "checkFragmentShorthand": true }] + } +} diff --git a/frontend/src/components/ResourcesAndContacts/index.tsx b/frontend/src/components/ResourcesAndContacts/index.tsx index 6fe9346..c66a3b4 100644 --- a/frontend/src/components/ResourcesAndContacts/index.tsx +++ b/frontend/src/components/ResourcesAndContacts/index.tsx @@ -1,5 +1,6 @@ // import DiscordLogo from "@/public/assets/discord_logo.svg" import Image from 'next/image'; +import { 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'; @@ -20,101 +21,60 @@ const ResourcesAndContacts = () => {
- -

Circles

-

- A UNSW degree planner where you can explore and validate your degree structure. -

- - -

Structs.sh

-

- An educational data structures and algorithms platform. -

- - - -

Jobs Board

-

- A place where CSESoc students can look for relevant job opportunities. -

- - - -

Notangles

- -

- Trimester timetabling tool - no more timetable tangles! -

- - - -

Uni-lectives

- -

- Read course electives to help you pick your electives or even write your own! -

- - - -

CSESoc Learn

- -

Your learning outside the classroom starts here

- - - -

CSESoc Media

-

All things content

- - - -

First Year Guide

-

- The ultimate guide to conquering your first year at CSE -

- - - -

Enrolment Guide

-

Learn how to get a headstart on uni

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

{item.title}

+

{item.desc}

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

{item.title}

+

{item.desc}

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

{item.title}

+

{item.desc}

+
+ + ); + })}
diff --git a/public/assets/circles_logo.svg b/public/assets/circles_logo.svg new file mode 100644 index 0000000..1064c35 --- /dev/null +++ b/public/assets/circles_logo.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/assets/compclub_logo.svg b/public/assets/compclub_logo.svg new file mode 100644 index 0000000..c3516c1 --- /dev/null +++ b/public/assets/compclub_logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/csesocmedia_logo.svg b/public/assets/csesocmedia_logo.svg new file mode 100644 index 0000000..2686f73 --- /dev/null +++ b/public/assets/csesocmedia_logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/enrolmentguide.svg b/public/assets/enrolmentguide.svg new file mode 100644 index 0000000..74b4113 --- /dev/null +++ b/public/assets/enrolmentguide.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/firstyearguide.svg b/public/assets/firstyearguide.svg new file mode 100644 index 0000000..061c3e0 --- /dev/null +++ b/public/assets/firstyearguide.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/jobsboard_logo.svg b/public/assets/jobsboard_logo.svg new file mode 100644 index 0000000..1f8cd29 --- /dev/null +++ b/public/assets/jobsboard_logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/notangles_logo.svg b/public/assets/notangles_logo.svg new file mode 100644 index 0000000..fd38800 --- /dev/null +++ b/public/assets/notangles_logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/structs_logo.svg b/public/assets/structs_logo.svg new file mode 100644 index 0000000..188e5f6 --- /dev/null +++ b/public/assets/structs_logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/assets/unilectives_logo.svg b/public/assets/unilectives_logo.svg new file mode 100644 index 0000000..7289821 --- /dev/null +++ b/public/assets/unilectives_logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/data/resourceCards.ts b/public/data/resourceCards.ts new file mode 100644 index 0000000..52c0b8d --- /dev/null +++ b/public/data/resourceCards.ts @@ -0,0 +1,99 @@ +export type resourceCards = { + href: string; + svg: string; + alt: string; + title: string; + desc: string; + width: number; + height: number; +}; + +export const stage1: resourceCards[] = [ + { + href: 'https://circles.csesoc.app/course-selector', + svg: '/assets/circles_logo.svg', + alt: 'Circles', + title: 'Circles', + desc: 'A UNSW degree planner where you can explore and validate your degree structure.', + width: 60, + height: 60 + } +]; + +export const stage2: resourceCards[] = [ + { + href: 'https://structs.sh/', + svg: '/assets/structs_logo.svg', + alt: 'Structs', + title: 'Structs', + desc: 'An educational data structures and algorithms platform', + width: 60, + height: 60 + }, + { + href: 'https://jobsboard.csesoc.unsw.edu.au/', + svg: '/assets/jobsboard_logo.svg', + alt: 'JobsBoard', + title: 'Jobs Board', + desc: 'A place where CSESoc students can look for relevant job opportunities.', + width: 60, + height: 60 + }, + { + href: 'https://notangles.csesoc.app/', + svg: '/assets/notangles_logo.svg', + alt: 'Notangles', + title: 'Notangles', + desc: 'Trimester timetabling tool - no more timetable tangles!', + width: 60, + height: 60 + }, + { + href: 'https://unilectives.csesoc.app/', + svg: '/assets/unilectives_logo.svg', + alt: 'Uni-lectives', + title: 'Uni-lectives', + desc: 'Read course electives to help you pick your electives or even write your own!', + width: 60, + height: 60 + } +]; + +export const stage3: resourceCards[] = [ + { + href: 'https://compclub.org/', + svg: '/assets/compclub_logo.svg', + alt: 'CompClub', + title: 'CompClub', + desc: 'Promoting computing to high school students', + width: 60, + height: 60 + }, + { + href: 'https://media.csesoc.org.au/', + svg: '/assets/csesocmedia_logo.svg', + alt: 'CSESoc Media', + title: 'CSESoc Media', + desc: 'All things content', + width: 60, + height: 60 + }, + { + href: 'https://media.csesoc.org.au/first-year-guide-2024/', + svg: '/assets/firstyearguide.svg', + alt: 'First Year Guide', + title: 'First Year Guide', + desc: 'The ultimate guide to conquering your first year at CSE', + width: 60, + height: 60 + }, + { + href: 'https://media.csesoc.org.au/cse-enrol/', + svg: '/assets/enrolmentguide.svg', + alt: 'Enrolment Guide', + title: 'Enrolment Guide', + desc: 'Learn how to get a headstart on uni', + width: 60, + height: 60 + } +]; \ No newline at end of file From 50f116ad81172e6e0921ac72535d9a01df9726a1 Mon Sep 17 00:00:00 2001 From: Saucy_Salad Date: Tue, 18 Jun 2024 23:35:09 +1000 Subject: [PATCH 06/10] logo sizes and lint fixes --- .../src/components/ResourcesAndContacts/index.tsx | 4 ++-- public/data/resourceCards.ts | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/ResourcesAndContacts/index.tsx b/frontend/src/components/ResourcesAndContacts/index.tsx index c66a3b4..a5cbf89 100644 --- a/frontend/src/components/ResourcesAndContacts/index.tsx +++ b/frontend/src/components/ResourcesAndContacts/index.tsx @@ -29,7 +29,7 @@ const ResourcesAndContacts = () => { target="_blank" className={`col-span-4 p-5 ${boxStyling} flex`} > -
+
{item.alt}
@@ -65,7 +65,7 @@ const ResourcesAndContacts = () => { target="_blank" className={`md:col-span-2 col-span-4 p-5 ${boxStyling} flex`} > -
+
{item.alt}
diff --git a/public/data/resourceCards.ts b/public/data/resourceCards.ts index 52c0b8d..7f92e7d 100644 --- a/public/data/resourceCards.ts +++ b/public/data/resourceCards.ts @@ -27,8 +27,8 @@ export const stage2: resourceCards[] = [ alt: 'Structs', title: 'Structs', desc: 'An educational data structures and algorithms platform', - width: 60, - height: 60 + width: 70, + height: 70 }, { href: 'https://jobsboard.csesoc.unsw.edu.au/', @@ -45,8 +45,8 @@ export const stage2: resourceCards[] = [ alt: 'Notangles', title: 'Notangles', desc: 'Trimester timetabling tool - no more timetable tangles!', - width: 60, - height: 60 + width: 70, + height: 70 }, { href: 'https://unilectives.csesoc.app/', @@ -54,8 +54,8 @@ export const stage2: resourceCards[] = [ alt: 'Uni-lectives', title: 'Uni-lectives', desc: 'Read course electives to help you pick your electives or even write your own!', - width: 60, - height: 60 + width: 80, + height: 80 } ]; @@ -96,4 +96,4 @@ export const stage3: resourceCards[] = [ width: 60, height: 60 } -]; \ No newline at end of file +]; From 4f21d74aca6e56a210d151ad97aa8af563d960d2 Mon Sep 17 00:00:00 2001 From: Saucy_Salad Date: Mon, 24 Jun 2024 01:02:24 +1000 Subject: [PATCH 07/10] fixes --- frontend/public/data/resourceCards.ts | 10 ++++++++++ .../components/ResourcesAndContacts/index.tsx | 19 +++++++------------ package-lock.json | 6 ++++++ 3 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 package-lock.json diff --git a/frontend/public/data/resourceCards.ts b/frontend/public/data/resourceCards.ts index 7f92e7d..c7208ab 100644 --- a/frontend/public/data/resourceCards.ts +++ b/frontend/public/data/resourceCards.ts @@ -1,4 +1,5 @@ export type resourceCards = { + id: string; href: string; svg: string; alt: string; @@ -10,6 +11,7 @@ export type resourceCards = { export const stage1: resourceCards[] = [ { + id: 's1-1', href: 'https://circles.csesoc.app/course-selector', svg: '/assets/circles_logo.svg', alt: 'Circles', @@ -22,6 +24,7 @@ export const stage1: resourceCards[] = [ export const stage2: resourceCards[] = [ { + id: 's2-1', href: 'https://structs.sh/', svg: '/assets/structs_logo.svg', alt: 'Structs', @@ -31,6 +34,7 @@ export const stage2: resourceCards[] = [ height: 70 }, { + id: 's2-2', href: 'https://jobsboard.csesoc.unsw.edu.au/', svg: '/assets/jobsboard_logo.svg', alt: 'JobsBoard', @@ -40,6 +44,7 @@ export const stage2: resourceCards[] = [ height: 60 }, { + id: 's2-3', href: 'https://notangles.csesoc.app/', svg: '/assets/notangles_logo.svg', alt: 'Notangles', @@ -49,6 +54,7 @@ export const stage2: resourceCards[] = [ height: 70 }, { + id: 's2-4', href: 'https://unilectives.csesoc.app/', svg: '/assets/unilectives_logo.svg', alt: 'Uni-lectives', @@ -61,6 +67,7 @@ export const stage2: resourceCards[] = [ export const stage3: resourceCards[] = [ { + id: 's3-1', href: 'https://compclub.org/', svg: '/assets/compclub_logo.svg', alt: 'CompClub', @@ -70,6 +77,7 @@ export const stage3: resourceCards[] = [ height: 60 }, { + id: 's3-2', href: 'https://media.csesoc.org.au/', svg: '/assets/csesocmedia_logo.svg', alt: 'CSESoc Media', @@ -79,6 +87,7 @@ export const stage3: resourceCards[] = [ height: 60 }, { + id: 's3-3', href: 'https://media.csesoc.org.au/first-year-guide-2024/', svg: '/assets/firstyearguide.svg', alt: 'First Year Guide', @@ -88,6 +97,7 @@ export const stage3: resourceCards[] = [ height: 60 }, { + id: 's3-4', href: 'https://media.csesoc.org.au/cse-enrol/', svg: '/assets/enrolmentguide.svg', alt: 'Enrolment Guide', diff --git a/frontend/src/components/ResourcesAndContacts/index.tsx b/frontend/src/components/ResourcesAndContacts/index.tsx index d03684f..5d07e49 100644 --- a/frontend/src/components/ResourcesAndContacts/index.tsx +++ b/frontend/src/components/ResourcesAndContacts/index.tsx @@ -1,6 +1,6 @@ // import DiscordLogo from "@/public/assets/discord_logo.svg" import Image from 'next/image'; -import { stage1, stage2, stage3 } from '../../public/data/resourceCards'; +import { 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'; @@ -22,9 +22,10 @@ const ResourcesAndContacts = () => {
- {stage1.map((item) => { + {stage1.map((item: any) => { return ( { ); })} -<<<<<<< HEAD:frontend/src/components/ResourcesAndContacts/index.tsx - {stage2.map((item) => { -======= - {stage2.map((item, index) => { ->>>>>>> 6094fceb53e408022bf7a1eaec2e9b6c394e7b59:components/ResourcesAndContacts/index.tsx + {stage2.map((item: any) => { return ( { ); })} -<<<<<<< HEAD:frontend/src/components/ResourcesAndContacts/index.tsx - {stage3.map((item) => { -======= - {stage3.map((item, index) => { ->>>>>>> 6094fceb53e408022bf7a1eaec2e9b6c394e7b59:components/ResourcesAndContacts/index.tsx + {stage3.map((item: any) => { return ( Date: Mon, 24 Jun 2024 01:23:57 +1000 Subject: [PATCH 08/10] logo fix --- frontend/public/assets/csesoclearn_logo.svg | 3 +++ frontend/public/data/resourceCards.ts | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 frontend/public/assets/csesoclearn_logo.svg diff --git a/frontend/public/assets/csesoclearn_logo.svg b/frontend/public/assets/csesoclearn_logo.svg new file mode 100644 index 0000000..d1d4fb7 --- /dev/null +++ b/frontend/public/assets/csesoclearn_logo.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/public/data/resourceCards.ts b/frontend/public/data/resourceCards.ts index c7208ab..abef610 100644 --- a/frontend/public/data/resourceCards.ts +++ b/frontend/public/data/resourceCards.ts @@ -27,9 +27,9 @@ export const stage2: resourceCards[] = [ id: 's2-1', href: 'https://structs.sh/', svg: '/assets/structs_logo.svg', - alt: 'Structs', - title: 'Structs', - desc: 'An educational data structures and algorithms platform', + alt: 'Structs.sh', + title: 'Structs.sh', + desc: 'An educational data structures and algorithms platform.', width: 70, height: 70 }, @@ -68,13 +68,13 @@ export const stage2: resourceCards[] = [ export const stage3: resourceCards[] = [ { id: 's3-1', - href: 'https://compclub.org/', - svg: '/assets/compclub_logo.svg', - alt: 'CompClub', - title: 'CompClub', - desc: 'Promoting computing to high school students', - width: 60, - height: 60 + href: 'https://learn.csesoc.org.au/', + svg: '/assets/csesoclearn_logo.svg', + alt: 'CSESoc Learn', + title: 'CSESoc Learn', + desc: 'Your learning outside the classroom starts here', + width: 50, + height: 50 }, { id: 's3-2', From d5a71d298c3d162bafafcfaa8ed134309d237ebf Mon Sep 17 00:00:00 2001 From: Saucy_Salad Date: Mon, 24 Jun 2024 01:31:25 +1000 Subject: [PATCH 09/10] lint and type checks --- frontend/.eslintrc.json | 7 ++++--- frontend/src/components/ResourcesAndContacts/index.tsx | 2 +- frontend/src/components/Sponsors/index.tsx | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json index c42238a..88b2186 100644 --- a/frontend/.eslintrc.json +++ b/frontend/.eslintrc.json @@ -5,8 +5,9 @@ // "plugin:prettier/recommended" ], "parser": "@typescript-eslint/parser", - "plugins": ["@typescript-eslint"] - // "rules": { + "plugins": ["@typescript-eslint"], + "rules": { + "@typescript-eslint/no-explicit-any": "off" // "prettier/prettier": ["error", { "endOfLine": "auto" }] - // } + } } diff --git a/frontend/src/components/ResourcesAndContacts/index.tsx b/frontend/src/components/ResourcesAndContacts/index.tsx index 5d07e49..0ca3c10 100644 --- a/frontend/src/components/ResourcesAndContacts/index.tsx +++ b/frontend/src/components/ResourcesAndContacts/index.tsx @@ -1,6 +1,6 @@ // import DiscordLogo from "@/public/assets/discord_logo.svg" import Image from 'next/image'; -import { stage1, stage2, stage3 } from '/public/data/resourceCards'; +import { 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'; diff --git a/frontend/src/components/Sponsors/index.tsx b/frontend/src/components/Sponsors/index.tsx index a40b6eb..e31290a 100644 --- a/frontend/src/components/Sponsors/index.tsx +++ b/frontend/src/components/Sponsors/index.tsx @@ -1,4 +1,3 @@ -import Link from 'next/link'; import React from 'react'; import Footer from '@/components/Footer'; From af2761250b2fdc936c5ef373e169492dc23ac0a2 Mon Sep 17 00:00:00 2001 From: Saucy_Salad Date: Mon, 24 Jun 2024 20:20:37 +1000 Subject: [PATCH 10/10] merge fixes --- frontend/.eslintrc.json | 1 - frontend/src/components/ResourcesAndContacts/index.tsx | 8 ++++---- package-lock.json | 6 ------ 3 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 package-lock.json diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json index 88b2186..ecb4897 100644 --- a/frontend/.eslintrc.json +++ b/frontend/.eslintrc.json @@ -7,7 +7,6 @@ "parser": "@typescript-eslint/parser", "plugins": ["@typescript-eslint"], "rules": { - "@typescript-eslint/no-explicit-any": "off" // "prettier/prettier": ["error", { "endOfLine": "auto" }] } } diff --git a/frontend/src/components/ResourcesAndContacts/index.tsx b/frontend/src/components/ResourcesAndContacts/index.tsx index 0ca3c10..549bcfe 100644 --- a/frontend/src/components/ResourcesAndContacts/index.tsx +++ b/frontend/src/components/ResourcesAndContacts/index.tsx @@ -1,6 +1,6 @@ // import DiscordLogo from "@/public/assets/discord_logo.svg" import Image from 'next/image'; -import { 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'; @@ -22,7 +22,7 @@ const ResourcesAndContacts = () => {