Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
66f1c0d
feat: add Art model
Karl-Sue Nov 25, 2025
ddbf780
refactor: keep model register minimal
Karl-Sue Nov 26, 2025
b26d12d
Add ArtContributor model with API endpoints
DDuu123321 Nov 28, 2025
8ac4927
art-page-frontend
hanminh1203 Dec 5, 2025
8b98a06
art-page-frontend
hanminh1203 Dec 5, 2025
67ba4d8
Merge branch 'issue-8/art-page' of https://github.com/codersforcauses…
hanminh1203 Dec 6, 2025
7f91e0b
refactor: keep admin register simple
Karl-Sue Dec 6, 2025
aeedeec
fix: space error
Karl-Sue Dec 6, 2025
31954af
Load arts from backend
hanminh1203 Dec 10, 2025
9e67fa6
Change field name style
hanminh1203 Dec 10, 2025
c955b14
Readd art field to create data
hanminh1203 Dec 10, 2025
c10ee23
Make the image height corresponding to the text
hanminh1203 Dec 10, 2025
9af2dc9
Filter on backend + include contributors into art
hanminh1203 Dec 10, 2025
1f2ce0c
Add Pagination on backend
hanminh1203 Dec 10, 2025
eed05ce
Improve frontend to support responsive
hanminh1203 Dec 10, 2025
a1371d6
Improve resize image
hanminh1203 Dec 10, 2025
1f1958c
Back button padding
hanminh1203 Dec 10, 2025
f4d442a
feature: improve responsive layout
Karl-Sue Dec 13, 2025
ac79752
fix: resolve merge conflicts in artwork pages
Karl-Sue Dec 13, 2025
3b5607e
feat: add Art hook
Karl-Sue Dec 13, 2025
2e9ef67
feat: add Artwork hook
Karl-Sue Dec 13, 2025
3d38119
feat: add placeholder art
Karl-Sue Dec 13, 2025
0b4164d
Fix flake8
hanminh1203 Dec 13, 2025
45afd6d
fix: match Prettier code style
Karl-Sue Dec 13, 2025
b7273d5
Fix flake8
hanminh1203 Dec 13, 2025
fd90b63
Merge pull request #37 from codersforcauses/issue-8-resolve-merge-con…
Karl-Sue Dec 13, 2025
53e30c3
Refactor code for reuseability
hanminh1203 Dec 20, 2025
b234e60
Error message
hanminh1203 Dec 20, 2025
cc4ac45
Remove mock data on Frontend
hanminh1203 Dec 20, 2025
fb3f1c9
Merge remote-tracking branch 'origin/main' into issue-8-Individual_ar…
hanminh1203 Dec 20, 2025
f0c5e4c
Solve conflict and adapt code
hanminh1203 Dec 20, 2025
08f0865
fix flake8 on backend
hanminh1203 Dec 20, 2025
23b65ea
Fix Prettier and type check
hanminh1203 Dec 20, 2025
6cc9d1c
Correct django-filter version
hanminh1203 Dec 20, 2025
39306ef
Commit poetry.lock
hanminh1203 Dec 20, 2025
d564d05
Commit poetry.lock
hanminh1203 Dec 20, 2025
b0a3062
Correct script order
hanminh1203 Dec 20, 2025
d1c5ee9
Correct script order
hanminh1203 Dec 20, 2025
c820c7d
feat: implement individual art pages with full functionality
DDuu123321 Jan 6, 2026
2112171
fix: remove null=True from URLField to pass flake8
DDuu123321 Jan 6, 2026
6640e7f
style: fix prettier formatting in error-modal.tsx
DDuu123321 Jan 6, 2026
f77d7a7
Remove the import and then add the icon import: Discord and Instagram
DDuu123321 Jan 7, 2026
4277b4d
Fix import formatting in [id].tsx
DDuu123321 Jan 7, 2026
959c3e1
feature: add mock data for dev
Karl-Sue Jan 9, 2026
6a7a5e0
chore: update migrations and frontend components
DDuu123321 Jan 9, 2026
e971856
style: fix prettier formatting issues in [id].tsx
DDuu123321 Jan 9, 2026
24965ba
feature: add link to button
Karl-Sue Jan 14, 2026
27777e2
merge: resolve merge conflict between local and remote branch
Karl-Sue Jan 14, 2026
4c5c1ba
Refactor: Move social links from ArtContributor to Member model and r…
DDuu123321 Jan 14, 2026
2951ead
Fix: Remove hardcoded social media fields to comply with schema design
DDuu123321 Jan 16, 2026
1138ccb
Resolve merge conflict in Navbar: keep z-100 from main
DDuu123321 Jan 16, 2026
6df9c3d
Fix: Remove django_filters import and usage from views.py
DDuu123321 Jan 16, 2026
8e9de27
Update views.py
DDuu123321 Jan 16, 2026
85ea95d
Fix: Add newline at end of views.py
DDuu123321 Jan 16, 2026
163cc05
refactor: remove pagination
Karl-Sue Jan 17, 2026
57a7a84
refactor: change from viewset to a standard RetrieveAPIView
Karl-Sue Jan 17, 2026
752ed72
bug: remove leftover code:
Karl-Sue Jan 17, 2026
ec5f54a
Create backend model and API to retrieve featured art pieces.
hanminh1203 Jan 10, 2026
2a1cea8
refactor: remove redundant file
Karl-Sue Jan 17, 2026
7afaaa9
bug: fix the unused components error
Karl-Sue Jan 17, 2026
1900c91
Merge branch 'main' into issue-8-Individual_art_pages
Karl-Sue Jan 17, 2026
255583e
Merge branch 'main' into issue-8-feature
Karl-Sue Jan 17, 2026
1a41234
Merge branch 'main' into issue-8-Individual_art_pages
SafetyInObscurity Jan 17, 2026
60c5243
Merge branch 'main' into issue-8-Individual_art_pages
SafetyInObscurity Jan 17, 2026
cfda27b
Merge branch 'main' into issue-8-Individual_art_pages
DDuu123321 Jan 21, 2026
665ac3d
refactor: redesign artshowcase
Karl-Sue Jan 21, 2026
387fbf0
fix: styling
Karl-Sue Jan 21, 2026
c487a57
feat: add interactive artwork cards with flip animation and responsiv…
Karl-Sue Jan 24, 2026
8d20e20
Merge branch 'issue-8-feature' into issue-8-Individual_art_pages
Karl-Sue Jan 24, 2026
5deca41
merge: resolve merge conflict when merging main
Karl-Sue Jan 24, 2026
ab4a7ee
refactor: remove discord + insta url for frontend
Karl-Sue Jan 24, 2026
0a6c08c
refactor: remove basedto + page-reponse
Karl-Sue Jan 24, 2026
08b4de6
styling: using font-sans instead of font-jersey10
Karl-Sue Jan 24, 2026
ca9ec39
Fix: Remove deprecated social media fields and unify font usage
DDuu123321 Jan 27, 2026
d455d9c
Merge branch 'main' into issue-8-Individual_art_pages
DDuu123321 Jan 30, 2026
1f56957
Merge conflicting migrations
DDuu123321 Jan 30, 2026
fd39a11
Fix flake8 formatting error
DDuu123321 Jan 30, 2026
76e5048
conflict: merge main
Karl-Sue Jan 31, 2026
bd8ad2b
add: migration
Karl-Sue Jan 31, 2026
46bb94c
merge: issue 40
Karl-Sue Jan 31, 2026
7b047ef
Fix API response for featured arts
DDuu123321 Feb 2, 2026
ae42906
merge: issue-40/backend
Karl-Sue Feb 4, 2026
fb56dfc
add: migration
Karl-Sue Feb 4, 2026
2f50442
refactor: change api response
Karl-Sue Feb 4, 2026
c84e9dc
merge: main + resolve conflict
Karl-Sue Feb 4, 2026
0aa032d
added source_game fields to the API
DDuu123321 Feb 4, 2026
7793066
add: migration
Karl-Sue Feb 4, 2026
7ac5eeb
fix: eslint type
Karl-Sue Feb 4, 2026
e130d81
refactor: use svgs instead of inline declaration
Karl-Sue Feb 7, 2026
8853c77
refactor: using AddConstraint in migration instead of AlterConstraint
Karl-Sue Feb 7, 2026
f82e5e2
Merge remote-tracking branch 'origin/issue-40/backend' into issue-8-m…
Karl-Sue Feb 7, 2026
a12b072
feature: connect frontend + backend
Karl-Sue Feb 7, 2026
626ac05
feature: add tests for art model
Karl-Sue Feb 7, 2026
319b1a2
feature: add fallback when server fail
Karl-Sue Feb 7, 2026
1246ac5
feature: add api endpoint /api/arts/[id]
Karl-Sue Feb 11, 2026
f72ee8a
fix: eslint error
Karl-Sue Feb 11, 2026
0e2e2b4
add art doc
Karl-Sue Feb 13, 2026
03f7e1a
fix: art documentation - provide more details
Karl-Sue Feb 14, 2026
e99cb33
refactor: move file location to /client, next to src and public
Karl-Sue Feb 14, 2026
7e445c9
refactor: Art class for consistency with Game team issue #81
Karl-Sue Feb 14, 2026
5ca579c
merge: resolve merge conflict with main branch
Karl-Sue Feb 18, 2026
cfe92cb
Reworked how pronouns and names are arranged
Games4Doritos Feb 18, 2026
ab66a47
Undid ternary logic for pronouns
Games4Doritos Feb 19, 2026
6030880
changed the python version constraints in the pyproject.toml to avoid…
samjjacko Feb 21, 2026
a38fe17
linked landing page buttons to game and art showcase respectively
Feb 20, 2026
c8854b2
Added member profile documentation
Feb 14, 2026
ba34f30
Added social media link information to the member profile documentation
Feb 20, 2026
7952656
404 page stuffs
saltyypringle Jan 28, 2026
21ec32f
fixed small styling
saltyypringle Jan 31, 2026
5b81c47
typo
saltyypringle Jan 31, 2026
981ffc8
moved the trivia to a json file
saltyypringle Feb 7, 2026
f9ede4f
prettier
saltyypringle Feb 7, 2026
efdee09
Update client/src/pages/404.tsx
saltyypringle Feb 7, 2026
da1caa5
Update client/src/pages/404.tsx
saltyypringle Feb 21, 2026
544b666
fixed styling for mobile view
saltyypringle Feb 21, 2026
5d5df64
resolve conflict between remote and local branch
Karl-Sue Feb 21, 2026
98880aa
fix: remove unnecessary test
Karl-Sue Feb 21, 2026
876d7cd
fix: formatting
Karl-Sue Feb 21, 2026
29babd8
delete: placeholder image that is no longer needed
Karl-Sue Feb 21, 2026
120cb70
delete: redundant comment
Karl-Sue Feb 21, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions client/documentation/admin-dashboard/members.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
## Member Profiles

Profiles of club members can be added and edited at the row 'Member' of the GAME_DEV section on the main admin page.

### Fields

**Name:** Required field for the member's name. A character field (includes letters, numbers and symbols) of maximum length 200 characters.

**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.

**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.

**About:** Optional field for a bio. A character field of maximum length 256 characters.

**Pronouns:** Optional field for the member's pronouns. A character field of maximum length 20 characters.

**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.
10 changes: 2 additions & 8 deletions client/next.config.mjs
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
// import os from "node:os";
// import isInsideContainer from "is-inside-container";

// const isWindowsDevContainer = () =>
// os.release().toLowerCase().includes("microsoft") && isInsideContainer();

/** @type {import('next').NextConfig} */

const config = {
const nextConfig = {
reactStrictMode: true,
turbopack: {
root: import.meta.dirname,
Expand All @@ -27,4 +21,4 @@ const config = {
// : undefined,
};

export default config;
export default nextConfig;
10 changes: 10 additions & 0 deletions client/public/go-back-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions client/public/placeholder-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
59 changes: 59 additions & 0 deletions client/src/components/ui/ContributorsList.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import Link from "next/link";

import { ArtContributor } from "@/types/art-contributor";

interface ContributorsListProps {
contributors: ArtContributor[];
}

export default function ContributorsList({
contributors,
}: ContributorsListProps) {
if (contributors.length === 0) {
return null;
}

return (
<div
data-layer="Artwork Details"
className="ArtworkDetails flex flex-col justify-start gap-2.5 py-5"
>
<div
data-layer="Contributors Section"
className="ContributorsSection relative"
>
<div
data-layer="Contributors"
className="ArtName text-light_3 justify-start font-jersey10 text-6xl font-normal leading-[76px] tracking-wide text-accent"
>
Contributors
</div>
</div>
<div
data-layer="Contributors List"
className="ContributorsList relative flex flex-col gap-3 p-3"
>
<div className="mt-auto">
<div className="space-y-2.5">
{contributors.map((contributor) => (
<div
key={contributor.id}
className="mb-2 font-sans text-xl font-normal leading-8 tracking-wide text-light_1"
>
<Link
href={`/members/${contributor.member_id}`}
className="text-accent hover:underline"
onClick={(e) => e.stopPropagation()}
>
{contributor.member_name}
</Link>
{" - "}
<span>{contributor.role}</span>
</div>
))}
</div>
</div>
</div>
</div>
);
}
30 changes: 30 additions & 0 deletions client/src/components/ui/GoBackButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import Image from "next/image";
import Link from "next/link";

interface GoBackButtonProps {
url: string;
label: string;
}
const GoBackButton = ({ url, label }: GoBackButtonProps) => {
return (
<Link href={url} aria-label="Go back to gallery">
<button
className="text-light_3 group relative mb-10 h-14 w-48 rounded-2xl bg-neutral_1 text-center text-xl font-semibold"
type="button"
>
<div className="absolute left-1 top-[4px] z-10 flex h-12 w-1/4 items-center justify-center rounded-xl bg-light_2 duration-500 group-hover:w-[184px]">
<Image
src="/go-back-icon.svg"
alt=""
width={25}
height={25}
aria-hidden="true"
/>
</div>
<p className="translate-x-2">{label}</p>
</button>
</Link>
);
};

export default GoBackButton;
111 changes: 111 additions & 0 deletions client/src/components/ui/ImageCard.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
import Image from "next/image";
import { useRouter } from "next/router";
import React from "react";

interface ImageCardProps {
imageSrc?: string;
imageAlt?: string;
children?: React.ReactNode;
backContent?: React.ReactNode;
href?: string;
disableFlip?: boolean;
placeholder?: React.ReactNode;
}

const ImageCard = ({
imageSrc,
imageAlt = "Image",
children,
backContent,
href,
disableFlip = false,
placeholder,
}: ImageCardProps) => {
const router = useRouter();
const [isFlipped, setIsFlipped] = React.useState(false);
const [isMobile, setIsMobile] = React.useState(false);
const [hasImageError, setHasImageError] = React.useState(false);

React.useEffect(() => {
const checkMobile = () => {
setIsMobile(window.innerWidth < 768);
};

checkMobile();
window.addEventListener("resize", checkMobile);
return () => window.removeEventListener("resize", checkMobile);
}, []);

const handleClick = () => {
// On mobile, navigate directly if href is provided
if (isMobile && href) {
router.push(href);
} else if (backContent && !disableFlip && !hasImageError) {
// On desktop, toggle flip state
setIsFlipped(!isFlipped);
}
};

return (
<div className="p-4" style={{ perspective: "1200px" }}>
<div
className={`relative h-[30rem] w-full max-w-[20rem] select-none rounded-[10px] shadow-[12px_17px_51px_rgba(0,0,0,0.22)] transition-transform duration-500 ${
(isMobile && href) || (backContent && !disableFlip && !hasImageError)
? "cursor-pointer"
: "cursor-default"
}`}
style={{
transformStyle: "preserve-3d",
transform: isFlipped ? "rotateY(180deg)" : "rotateY(0deg)",
}}
onClick={handleClick}
>
<div
className="absolute inset-0 overflow-hidden rounded-[10px] border border-white bg-dark_alt backdrop-blur-md"
style={{ backfaceVisibility: "hidden" }}
>
{imageSrc && !hasImageError ? (
<>
<Image
src={imageSrc}
alt={imageAlt}
width={400}
height={600}
className="h-full w-full object-cover"
onError={() => {
setHasImageError(true);
setIsFlipped(false);
}}
/>
{children && (
<div className="bg-dark_1/40 absolute inset-0 flex items-center justify-center text-light_1">
{children}
</div>
)}
</>
) : (
<div className="bg-dark_alt/60 flex h-full w-full items-center justify-center text-light_1">
{placeholder || children || (
<span className="font-bold">No Image</span>
)}
</div>
)}
</div>

{backContent && (
<div
className="absolute inset-0 flex flex-col overflow-y-auto rounded-[10px] border border-white bg-dark_3 p-6 text-light_1"
style={{
backfaceVisibility: "hidden",
transform: "rotateY(180deg)",
}}
>
{backContent}
</div>
)}
</div>
</div>
);
};

export default ImageCard;
21 changes: 21 additions & 0 deletions client/src/components/ui/image-placeholder.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import Image from "next/image";
import React from "react";

const ImagePlaceholder = () => {
return (
<div
data-layer="Placeholder image"
className="PlaceholderImage bg-light-2 flex h-[500px] w-[500px] items-center justify-center rounded-[10px]"
>
<div data-svg-wrapper data-layer="Vector" className="Vector">
<Image
src="/placeholder-icon.svg"
alt="Placeholder icon"
width={96}
height={96}
/>
</div>
</div>
);
};
export default ImagePlaceholder;
45 changes: 45 additions & 0 deletions client/src/components/ui/modal/error-modal.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import React, { useState } from "react";

interface ErrorModalProps {
message: string | null;
onClose: () => void;
}

const ErrorModal = ({ message, onClose = () => {} }: ErrorModalProps) => {
const [isVisible, setIsVisible] = useState(true);
if (!isVisible || !message) {
return null;
}

function onModalClose() {
setIsVisible(false);
onClose();
}

return (
// Backdrop overlay
<div
className="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-50 backdrop-blur-sm"
onClick={onModalClose} // Close when clicking outside the modal
>
{/* Modal content container */}
<div
className="relative m-auto flex w-full max-w-md flex-col rounded bg-white p-6 text-black"
onClick={(e) => e.stopPropagation()} // Prevent closing when clicking inside the modal
>
<h2 className="text-xl font-bold md:leading-loose">Error</h2>
<p className="leading-normal">{message}</p>
<div className="mt-8 inline-flex justify-end">
<button
className="text-grey-darkest bg-error flex-1 rounded px-4 py-2 text-white md:flex-none"
onClick={onModalClose}
>
Close
</button>
</div>
</div>
</div>
);
};

export default ErrorModal;
62 changes: 62 additions & 0 deletions client/src/hooks/use-artwork-data.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import { Art } from "@/types/art";

export const generateMockArtworks = (count: number): Art[] => {
const artworks: Art[] = [];
for (let i = 1; i <= count; i++) {
artworks.push({
art_id: i,
name: `Artwork ${i}`,
description: "Mock artwork description",
media: `http://localhost:8000/media/art/mock_artwork_${i}.png`,
active: true,
source_game_id: null,
source_game_name: null,
contributors: [
{
id: i * 10 + 1,
member_id: i * 10 + 1,
member_name: "Contributor 1",
role: "artist",
},
{
id: i * 10 + 2,
member_id: i * 10 + 2,
member_name: "Contributor 2",
role: "designer",
},
],
showcase_description: `Showcase description for artwork ${i}`,
isMock: true,
});
}
return artworks;
};

export const generateMockArtwork = (id: string): Art => {
return {
art_id: Number(id),
name: "Mock Artwork Title",
description:
"Lorem ipsum dolor sit amet. Non numquam dicta nam autem dicta 33 error molestias et repellat consequatur eum iste expedita est dolorem libero et quas provident!",
media: `http://localhost:8000/media/art/mock_artwork_${id}.png`,
active: true,
source_game_id: null,
source_game_name: null,
contributors: [
{
id: 1,
member_id: 1,
member_name: "Contributor 1",
role: "user1",
},
{
id: 2,
member_id: 2,
member_name: "Contributor 2",
role: "user2",
},
],
showcase_description: "Featured artwork showcase description",
isMock: true,
};
};
Loading
Loading