Skip to content

Commit 4b2513c

Browse files
committed
Merge remote-tracking branch 'origin/main' into issue-81-Art_in_Gameshowcase_GameSerializer_Data
2 parents e5fd5fc + 4c05c72 commit 4b2513c

41 files changed

Lines changed: 1920 additions & 140 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,5 +293,6 @@ dist
293293

294294
# misc
295295
.DS_Store
296+
.cursor/
296297

297298
opt/
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
## Member Profiles
2+
3+
Profiles of club members can be added and edited at the row 'Member' of the GAME_DEV section on the main admin page.
4+
5+
### Fields
6+
7+
**Name:** Required field for the member's name. A character field (includes letters, numbers and symbols) of maximum length 200 characters.
8+
9+
**Active:** Checkbox to represent whether a member is an active participant in the club. If the checkbox is not ticked then the member's profile will not be displayed on the website.
10+
11+
**Profile Picture:** Optional field to upload a profile picture. Must be an image file, and will display best if the image is at least 128 by 128 px in size. If no profile picture is provided then the member's initials will be displayed instead.
12+
13+
**About:** Optional field for a bio. A character field of maximum length 256 characters.
14+
15+
**Pronouns:** Optional field for the member's pronouns. A character field of maximum length 20 characters.
16+
17+
**Social media links:** Optional section to display links to the member's social media profiles. Requires a link to the profile (character field of maximum length 2083) and, optionally, the profile username (character field of maximum length 200). If a username is not supplied then only a social media icon will be displayed with the link attached, otherwise the username will be placed next to the relevant icon. The type of icon to be displayed (e.g. instagram, linkedin, generic link) is inferred from the social media link provided.

client/package-lock.json

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

client/public/sfx/xplsion_0.mp3

83.4 KB
Binary file not shown.

client/public/sfx/xplsion_1.mp3

166 KB
Binary file not shown.

client/public/sfx/xplsion_2.mp3

128 KB
Binary file not shown.

client/public/sfx/xplsion_3.mp3

122 KB
Binary file not shown.

client/scripts/open-when-ready.js

Whitespace-only changes.

client/src/components/main/MemberProfile.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export type MemberProfileData = {
2020
link: string;
2121
socialMediaUserName: string;
2222
}[];
23+
pk: number;
2324
};
2425

2526
type MemberProfileProps = {

0 commit comments

Comments
 (0)