Skip to content

Commit 4f21d74

Browse files
committed
fixes
1 parent 05530af commit 4f21d74

File tree

3 files changed

+23
-12
lines changed

3 files changed

+23
-12
lines changed

frontend/public/data/resourceCards.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export type resourceCards = {
2+
id: string;
23
href: string;
34
svg: string;
45
alt: string;
@@ -10,6 +11,7 @@ export type resourceCards = {
1011

1112
export const stage1: resourceCards[] = [
1213
{
14+
id: 's1-1',
1315
href: 'https://circles.csesoc.app/course-selector',
1416
svg: '/assets/circles_logo.svg',
1517
alt: 'Circles',
@@ -22,6 +24,7 @@ export const stage1: resourceCards[] = [
2224

2325
export const stage2: resourceCards[] = [
2426
{
27+
id: 's2-1',
2528
href: 'https://structs.sh/',
2629
svg: '/assets/structs_logo.svg',
2730
alt: 'Structs',
@@ -31,6 +34,7 @@ export const stage2: resourceCards[] = [
3134
height: 70
3235
},
3336
{
37+
id: 's2-2',
3438
href: 'https://jobsboard.csesoc.unsw.edu.au/',
3539
svg: '/assets/jobsboard_logo.svg',
3640
alt: 'JobsBoard',
@@ -40,6 +44,7 @@ export const stage2: resourceCards[] = [
4044
height: 60
4145
},
4246
{
47+
id: 's2-3',
4348
href: 'https://notangles.csesoc.app/',
4449
svg: '/assets/notangles_logo.svg',
4550
alt: 'Notangles',
@@ -49,6 +54,7 @@ export const stage2: resourceCards[] = [
4954
height: 70
5055
},
5156
{
57+
id: 's2-4',
5258
href: 'https://unilectives.csesoc.app/',
5359
svg: '/assets/unilectives_logo.svg',
5460
alt: 'Uni-lectives',
@@ -61,6 +67,7 @@ export const stage2: resourceCards[] = [
6167

6268
export const stage3: resourceCards[] = [
6369
{
70+
id: 's3-1',
6471
href: 'https://compclub.org/',
6572
svg: '/assets/compclub_logo.svg',
6673
alt: 'CompClub',
@@ -70,6 +77,7 @@ export const stage3: resourceCards[] = [
7077
height: 60
7178
},
7279
{
80+
id: 's3-2',
7381
href: 'https://media.csesoc.org.au/',
7482
svg: '/assets/csesocmedia_logo.svg',
7583
alt: 'CSESoc Media',
@@ -79,6 +87,7 @@ export const stage3: resourceCards[] = [
7987
height: 60
8088
},
8189
{
90+
id: 's3-3',
8291
href: 'https://media.csesoc.org.au/first-year-guide-2024/',
8392
svg: '/assets/firstyearguide.svg',
8493
alt: 'First Year Guide',
@@ -88,6 +97,7 @@ export const stage3: resourceCards[] = [
8897
height: 60
8998
},
9099
{
100+
id: 's3-4',
91101
href: 'https://media.csesoc.org.au/cse-enrol/',
92102
svg: '/assets/enrolmentguide.svg',
93103
alt: 'Enrolment Guide',

frontend/src/components/ResourcesAndContacts/index.tsx

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// import DiscordLogo from "@/public/assets/discord_logo.svg"
22
import Image from 'next/image';
3-
import { stage1, stage2, stage3 } from '../../public/data/resourceCards';
3+
import { stage1, stage2, stage3 } from '/public/data/resourceCards';
44

55
const boxStyling =
66
'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 = () => {
2222
<div className="py-8 bg-no-repeat bg-center">
2323
<div className="grid grid-cols-4 1 gap-x-9 gap-y-5">
2424

25-
{stage1.map((item) => {
25+
{stage1.map((item: any) => {
2626
return (
2727
<a
28+
key={item.id}
2829
href={item.href}
2930
target="_blank"
3031
className={`col-span-4 p-5 ${boxStyling} flex`}
@@ -40,13 +41,10 @@ const ResourcesAndContacts = () => {
4041
);
4142
})}
4243

43-
<<<<<<< HEAD:frontend/src/components/ResourcesAndContacts/index.tsx
44-
{stage2.map((item) => {
45-
=======
46-
{stage2.map((item, index) => {
47-
>>>>>>> 6094fceb53e408022bf7a1eaec2e9b6c394e7b59:components/ResourcesAndContacts/index.tsx
44+
{stage2.map((item: any) => {
4845
return (
4946
<a
47+
key={item.id}
5048
href={item.href}
5149
target="_blank"
5250
className={`xl:col-span-1 col-span-4 p-5 ${boxStyling}`}
@@ -62,13 +60,10 @@ const ResourcesAndContacts = () => {
6260
);
6361
})}
6462

65-
<<<<<<< HEAD:frontend/src/components/ResourcesAndContacts/index.tsx
66-
{stage3.map((item) => {
67-
=======
68-
{stage3.map((item, index) => {
69-
>>>>>>> 6094fceb53e408022bf7a1eaec2e9b6c394e7b59:components/ResourcesAndContacts/index.tsx
63+
{stage3.map((item: any) => {
7064
return (
7165
<a
66+
key={item.id}
7267
href={item.href}
7368
target="_blank"
7469
className={`md:col-span-2 col-span-4 p-5 ${boxStyling} flex`}

package-lock.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)