Skip to content

Commit 609e183

Browse files
Revert "merge main into issue-69 to prepare for sparkle PR"
This reverts commit adbedec.
1 parent 582f32e commit 609e183

39 files changed

Lines changed: 395 additions & 1503 deletions

client/documentation/admin-dashboard/members.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

client/package-lock.json

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

client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
"@tanstack/react-query": "^5.80.7",
2323
"@tanstack/react-query-devtools": "^5.80.7",
2424
"autoprefixer": "^10.4.21",
25-
"axios": "^1.13.5",
25+
"axios": "^1.12.0",
2626
"class-variance-authority": "^0.7.1",
2727
"clsx": "^2.1.1",
2828
"framer-motion": "^12.23.24",
2929
"is-inside-container": "^1.0.0",
3030
"lucide-react": "^0.516.0",
31-
"next": "15.5.10",
31+
"next": "15.4.11",
3232
"react": "19.1.0",
3333
"react-dom": "19.1.0",
3434
"react-social-icons": "^6.25.0",

client/public/frame.svg

Lines changed: 9 additions & 0 deletions
Loading

client/public/pixel-art-frame.svg

Lines changed: 0 additions & 9 deletions
This file was deleted.

client/src/components/main/MemberProfile.tsx

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"use client";
22

33
import Image from "next/image";
4-
import { SocialIcon } from "react-social-icons";
54

65
// unused atm, as the member isnt linked a project on the backend
76
/* export type MemberProfileProject = {
@@ -16,11 +15,6 @@ export type MemberProfileData = {
1615
about: string;
1716
pronouns?: string;
1817
profile_picture?: string;
19-
social_media?: {
20-
link: string;
21-
socialMediaUserName: string;
22-
}[];
23-
pk: number;
2418
};
2519

2620
type MemberProfileProps = {
@@ -60,49 +54,19 @@ export function MemberProfile({ member }: MemberProfileProps) {
6054
)}
6155
</div>
6256
<Image
63-
src="/pixel-art-frame.svg"
57+
src="/frame.svg"
6458
alt="golden pixel art frame around profile picture"
65-
width={200}
66-
height={200}
67-
className="z-10"
59+
width={176}
60+
height={192}
61+
className="z-0 h-48 w-44"
6862
/>
6963
</div>
7064
<div className="flex w-4/5 flex-col gap-2 rounded-md p-2.5 font-firaCode">
7165
<div className="flex">
7266
<p className="min-w-fit font-jersey10 text-4xl">{member.name}</p>
7367
<hr className="ml-5 hidden w-full self-center border-light_2 lg:flex" />
7468
</div>
75-
<div className="flex items-center gap-2">
76-
{member.social_media && member.social_media.length > 0 && (
77-
<div className="w-full">
78-
<div className="mt-2 flex flex-wrap items-center gap-2">
79-
{member.social_media.map((sm) => (
80-
<span
81-
key={sm.link}
82-
className="ml-2 flex items-center gap-1"
83-
>
84-
<SocialIcon
85-
url={sm.link}
86-
style={{ height: 24, width: 24 }}
87-
/>
88-
<a
89-
href={sm.link}
90-
target="_blank"
91-
rel="noopener noreferrer"
92-
className="font-firaCode text-base underline hover:text-primary"
93-
>
94-
{sm.socialMediaUserName}
95-
</a>
96-
</span>
97-
))}
98-
</div>
99-
</div>
100-
)}
101-
</div>
102-
<div className="flex items-center gap-2">
103-
<p className="text-lg">{member.pronouns}</p>
104-
</div>
105-
69+
<p className="text-lg">{member.pronouns}</p>
10670
<p>{member.about}</p>
10771
</div>
10872
</div>

client/src/components/ui/GameEmbed.tsx

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)