))}
diff --git a/client/src/pages/index.tsx b/client/src/pages/index.tsx
index 979246e2..bd1c2d0b 100644
--- a/client/src/pages/index.tsx
+++ b/client/src/pages/index.tsx
@@ -115,7 +115,7 @@ export default function Landing() {
eiusmod tempor incididunt ut labore et dolore magna aliqua.
-
+
More about us
diff --git a/client/src/pages/members/[id].tsx b/client/src/pages/members/[id].tsx
index 7b17438f..aa13ded1 100644
--- a/client/src/pages/members/[id].tsx
+++ b/client/src/pages/members/[id].tsx
@@ -1,8 +1,12 @@
+"use client";
+
+import Image from "next/image";
import { useRouter } from "next/router";
+import { SocialIcon } from "react-social-icons";
-import { MemberProfile } from "@/components/main/MemberProfile";
+import MemberProjectSection from "@/components/ui/MemberProjectSection";
+import { useContributor } from "@/hooks/useContributor";
import { useMember } from "@/hooks/useMember";
-
// hook assumes correct input, page sanitises to correct type
function normaliseId(id: string | string[] | number | undefined) {
if (typeof id === "number" && Number.isFinite(id)) {
@@ -17,6 +21,27 @@ function normaliseId(id: string | string[] | number | undefined) {
return undefined;
}
+export type MemberProfileData = {
+ name: string;
+ about: string;
+ pronouns?: string;
+ profile_picture?: string;
+ social_media?: {
+ link: string;
+ socialMediaUserName: string;
+ }[];
+ pk: number;
+};
+
+function initialsFromName(name: string) {
+ return name
+ .trim()
+ .split(/\s+/)
+ .slice(0, 2)
+ .map((part) => part[0]?.toUpperCase())
+ .join("");
+}
+
export default function MemberPage() {
const router = useRouter();
const id = normaliseId(router.query.id);
@@ -26,6 +51,11 @@ export default function MemberPage() {
isPending,
isError,
} = useMember(router.isReady ? id : undefined);
+ const { gamesRes, artRes } = useContributor(id);
+
+ if (!router.isReady || id === undefined) {
+ return null;
+ }
if (isPending) {
return null;
@@ -34,6 +64,96 @@ export default function MemberPage() {
if (isError || !member) {
return
Member not found
;
}
+ const games = gamesRes.data;
+ const art = artRes.data;
+ if (gamesRes.isError || !games || artRes.isError || !art) {
+ const errorMessage =
+ gamesRes.error?.response?.status === 404
+ ? "Games not found."
+ : "Failed to Load Games";
+ return (
+
+ );
+ }
+
+ const initials = initialsFromName(member.name);
+ return (
+ <>
+
+
+
+
+ {member.profile_picture ? (
+
+ ) : (
+
+ )}
+
+
+
+
+
+
+ {member.social_media && member.social_media.length > 0 && (
+
+ )}
+
+
- return
;
+
{member.about}
+
+
+
+
+
+
+ );
}
diff --git a/client/src/types/art-contributor.ts b/client/src/types/art-contributor.ts
new file mode 100644
index 00000000..27e97b40
--- /dev/null
+++ b/client/src/types/art-contributor.ts
@@ -0,0 +1,6 @@
+export interface ArtContributor {
+ id: number;
+ member_id: number;
+ member_name: string;
+ role: string;
+}
diff --git a/client/src/types/art.ts b/client/src/types/art.ts
new file mode 100644
index 00000000..79d6ef5e
--- /dev/null
+++ b/client/src/types/art.ts
@@ -0,0 +1,13 @@
+import { ArtContributor } from "./art-contributor";
+
+export interface Art {
+ art_id: number;
+ name: string;
+ description: string;
+ media: string;
+ active: boolean;
+ source_game_id: number | null;
+ source_game_name: string | null;
+ contributors: ArtContributor[];
+ showcase_description: string;
+}
diff --git a/client/tailwind.config.ts b/client/tailwind.config.ts
index 52306b8e..94e04170 100644
--- a/client/tailwind.config.ts
+++ b/client/tailwind.config.ts
@@ -70,6 +70,7 @@ const config = {
neutral_4: "var(--neutral-4)",
light_1: "var(--light-1)",
light_2: "var(--light-2)",
+ light_3: "var(--light-3)",
},
borderRadius: {
lg: "var(--radius)",
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 1aa4fe21..00000000
--- a/package-lock.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "name": "game-dev",
- "lockfileVersion": 3,
- "requires": true,
- "packages": {}
-}
diff --git a/server/game_dev/admin.py b/server/game_dev/admin.py
index 496d1122..01ff4f4b 100644
--- a/server/game_dev/admin.py
+++ b/server/game_dev/admin.py
@@ -1,5 +1,16 @@
from django.contrib import admin
-from .models import Member, Game, Event, GameContributor, GameShowcase, Committee, SocialMedia
+from .models import (
+ Art,
+ ArtContributor,
+ ArtShowcase,
+ Member,
+ Game,
+ Event,
+ GameContributor,
+ GameShowcase,
+ Committee,
+ SocialMedia,
+)
class SocialMediaInline(admin.TabularInline):
@@ -27,8 +38,19 @@ class GameShowcaseAdmin(admin.ModelAdmin):
class GamesAdmin(admin.ModelAdmin):
- list_display = ("id", "name", "description", "completion", "active", "hostURL", "itchEmbedID", "itchGamePlayableID", "itchGameWidth",
- "itchGameHeight", "thumbnail")
+ list_display = (
+ "id",
+ "name",
+ "description",
+ "completion",
+ "active",
+ "hostURL",
+ "itchEmbedID",
+ "itchGamePlayableID",
+ "itchGameWidth",
+ "itchGameHeight",
+ "thumbnail",
+ )
search_fields = ["name", "description"]
raw_id_fields = ["event"]
@@ -37,9 +59,21 @@ class CommitteeAdmin(admin.ModelAdmin):
raw_id_fields = ["id"]
+# from issue-8-merge-40 temp need changes
+class ArtContributorInline(admin.TabularInline):
+ model = ArtContributor
+ extra = 1
+
+
+class ArtAdmin(admin.ModelAdmin):
+ inlines = [ArtContributorInline]
+
+
admin.site.register(Member, MemberAdmin)
admin.site.register(Event, EventAdmin)
admin.site.register(Game, GamesAdmin)
admin.site.register(GameContributor, GameContributorAdmin)
admin.site.register(GameShowcase, GameShowcaseAdmin)
+admin.site.register(Art, ArtAdmin)
+admin.site.register(ArtShowcase)
admin.site.register(Committee, CommitteeAdmin)
diff --git a/server/game_dev/migrations/0031_art_artcontributor_artshowcase.py b/server/game_dev/migrations/0031_art_artcontributor_artshowcase.py
new file mode 100644
index 00000000..4a77bfbb
--- /dev/null
+++ b/server/game_dev/migrations/0031_art_artcontributor_artshowcase.py
@@ -0,0 +1,54 @@
+# Generated by Django 5.1.15 on 2026-07-11 08:49
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('game_dev', '0030_alter_game_itchgameheight_alter_game_itchgamewidth'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Art',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=200)),
+ ('description', models.CharField(max_length=200)),
+ ('media', models.ImageField(upload_to='art/')),
+ ('active', models.BooleanField(default=True)),
+ ('source_game', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='game_artwork', to='game_dev.game')),
+ ],
+ ),
+ migrations.CreateModel(
+ name='ArtContributor',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('role', models.CharField(max_length=100)),
+ ('art', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='contributors', to='game_dev.art')),
+ ('member', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='art_contributions', to='game_dev.member')),
+ ],
+ options={
+ 'verbose_name': 'Art Contributor',
+ 'verbose_name_plural': 'Art Contributors',
+ 'constraints': [models.UniqueConstraint(fields=('art', 'member'), name='unique_art_member')],
+ },
+ ),
+ migrations.CreateModel(
+ name='ArtShowcase',
+ fields=[
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('description', models.CharField(max_length=200)),
+ ('art', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='showcase', to='game_dev.art')),
+ ],
+ options={
+ 'constraints': [models.UniqueConstraint(
+ fields=('art',),
+ name='unique_artshowcase_per_art',
+ violation_error_message='Each art piece can only have one showcase.'
+ )],
+ },
+ ),
+ ]
diff --git a/server/game_dev/models.py b/server/game_dev/models.py
index 71d4d5ef..81a75ebd 100644
--- a/server/game_dev/models.py
+++ b/server/game_dev/models.py
@@ -28,12 +28,16 @@ def __str__(self):
# GameContributor table: links Game, Member, and role (composite PK)
class GameContributor(models.Model):
- game = models.ForeignKey('Game', on_delete=models.CASCADE, related_name='game_contributors')
- member = models.ForeignKey('Member', on_delete=models.CASCADE, related_name='member_games')
+ game = models.ForeignKey(
+ "Game", on_delete=models.CASCADE, related_name="game_contributors"
+ )
+ member = models.ForeignKey(
+ "Member", on_delete=models.CASCADE, related_name="member_games"
+ )
role = models.CharField(max_length=100)
class Meta:
- unique_together = (('game', 'member'),)
+ unique_together = (("game", "member"),)
def __str__(self):
return f"{self.member.name} ({self.role}) for {self.game.name}"
@@ -60,13 +64,13 @@ class CompletionStatus(models.IntegerChoices):
default=None,
null=True,
blank=True,
- help_text="If game is stored on itch.io, please enter the itchEmbedID, i.e., 1000200"
+ help_text="If game is stored on itch.io, please enter the itchEmbedID, i.e., 1000200",
)
itchGamePlayableID = models.PositiveBigIntegerField(
default=None,
null=True,
blank=True,
- help_text="If a game is playable and has a web demo stored on itch.io, please enter the embed developer ID"
+ help_text="If a game is playable and has a web demo stored on itch.io, please enter the embed developer ID",
)
itchGameWidth = models.PositiveBigIntegerField(
default=None,
@@ -89,22 +93,86 @@ def clean(self):
super().clean()
if self.itchGamePlayableID:
if not self.itchGameWidth:
- raise ValidationError({"itchGameWidth": "Game width is required if itchGamePlayableID is set."})
+ raise ValidationError(
+ {
+ "itchGameWidth": "Game width is required if itchGamePlayableID is set."
+ }
+ )
if not self.itchGameHeight:
- raise ValidationError({"itchGameHeight": "Game height is required if itchGamePlayableID is set."})
+ raise ValidationError(
+ {
+ "itchGameHeight": "Game height is required if itchGamePlayableID is set."
+ }
+ )
class GameShowcase(models.Model):
- game = models.OneToOneField('Game', on_delete=models.CASCADE, related_name='game_showcases')
+ game = models.OneToOneField(
+ "Game", on_delete=models.CASCADE, related_name="game_showcases"
+ )
description = models.TextField()
def __str__(self):
return f"{self.game.name}"
+class Art(models.Model):
+ name = models.CharField(null=False, max_length=200)
+ description = models.CharField(
+ max_length=200,
+ )
+ source_game = models.ForeignKey(
+ "Game", on_delete=models.CASCADE, related_name="game_artwork"
+ )
+ media = models.ImageField(upload_to="art/", null=False)
+ active = models.BooleanField(default=True)
+
+ def __str__(self):
+ return str(self.name)
+
+
+class ArtContributor(models.Model):
+ art = models.ForeignKey(
+ "Art", on_delete=models.CASCADE, related_name="contributors"
+ )
+ member = models.ForeignKey(
+ "Member", on_delete=models.CASCADE, related_name="art_contributions"
+ )
+ role = models.CharField(max_length=100)
+
+ class Meta:
+ constraints = [
+ models.UniqueConstraint(fields=["art", "member"], name="unique_art_member")
+ ]
+ verbose_name = "Art Contributor"
+ verbose_name_plural = "Art Contributors"
+
+ def __str__(self):
+ return f"{self.member.name} - {self.art.name} ({self.role})"
+
+
+class ArtShowcase(models.Model):
+ description = models.CharField(max_length=200)
+ art = models.ForeignKey(Art, on_delete=models.CASCADE, related_name="showcase")
+
+ class Meta:
+ constraints = [
+ models.UniqueConstraint(
+ fields=["art"],
+ name="unique_artshowcase_per_art",
+ violation_error_message="Each art piece can only have one showcase.",
+ )
+ ]
+
+ def __str__(self):
+ return f"ArtShowcase[Art={str(self.art.name)}, Description={self.description}]"
+
+
class SocialMedia(models.Model):
link = models.URLField(max_length=2083)
- member = models.ForeignKey('Member', on_delete=models.CASCADE, related_name='social_media_links')
+ member = models.ForeignKey(
+ "Member", on_delete=models.CASCADE, related_name="social_media_links"
+ )
socialMediaUserName = models.CharField(max_length=200, blank=True)
def __str__(self):
@@ -121,7 +189,7 @@ class Committee(models.Model):
"MARK": "Marketing",
"EV": "Events OCM",
"PRO": "Projects OCM",
- "FRE": "Fresher Rep"
+ "FRE": "Fresher Rep",
}
role = models.CharField(max_length=9, choices=roles, default="FRE", unique=True)
diff --git a/server/game_dev/serializers.py b/server/game_dev/serializers.py
index 97a9295e..d008a143 100644
--- a/server/game_dev/serializers.py
+++ b/server/game_dev/serializers.py
@@ -1,5 +1,15 @@
from rest_framework import serializers
-from .models import Event, Game, Member, GameShowcase, GameContributor, SocialMedia
+from .models import (
+ ArtShowcase,
+ Event,
+ Game,
+ Art,
+ ArtContributor,
+ Member,
+ GameShowcase,
+ GameContributor,
+ SocialMedia,
+)
class EventSerializer(serializers.ModelSerializer):
@@ -17,6 +27,60 @@ class Meta:
]
+########################################
+
+
+class ArtContributorSerializer(serializers.ModelSerializer):
+ art_id = serializers.IntegerField(source="art.id", read_only=True)
+ artwork_data = serializers.SerializerMethodField()
+ member_id = serializers.IntegerField(source="member.id", read_only=True)
+ member_name = serializers.CharField(source="member.name", read_only=True)
+
+ class Meta:
+ model = ArtContributor
+ fields = ["id", "role", "art_id", "member_id", "member_name", "artwork_data"]
+
+ def get_artwork_data(self, obj):
+ art = obj.art
+ request = self.context.get("request")
+ return {
+ "name": art.name,
+ "description": art.description,
+ "media": request.build_absolute_uri(art.media.url)
+ if art.media and request
+ else None,
+ }
+
+
+class ArtSerializer(serializers.ModelSerializer):
+ art_id = serializers.IntegerField(source="id", read_only=True)
+ source_game_id = serializers.IntegerField(source="source_game.id", read_only=True)
+ source_game_name = serializers.CharField(source="source_game.name", read_only=True)
+ contributors = ArtContributorSerializer(many=True, read_only=True)
+ showcase_description = serializers.SerializerMethodField()
+
+ class Meta:
+ model = Art
+ fields = [
+ "art_id",
+ "name",
+ "description",
+ "media",
+ "active",
+ "source_game_id",
+ "source_game_name",
+ "contributors",
+ "showcase_description",
+ ]
+
+ def get_showcase_description(self, obj):
+ showcase = obj.showcase.first()
+ return showcase.description if showcase else None
+
+
+########################################
+
+
# This is child serializer of GameSerializer
class GameContributorSerializer(serializers.ModelSerializer):
# to link contributors to their member/[id] page
@@ -33,10 +97,21 @@ def get_social_media(self, obj):
return SocialMediaSerializer(social_links, many=True).data
+# Copied ArtSerializer at kept data only needed instead of all of it
+class GameArtSerializer(serializers.ModelSerializer):
+ art_id = serializers.IntegerField(source="id", read_only=True)
+ source_game_id = serializers.IntegerField(source="source_game.id", read_only=True)
+
+ class Meta:
+ model = Art
+ fields = ["art_id", "name", "media", "active", "source_game_id"]
+
+
class GamesSerializer(serializers.ModelSerializer):
contributors = GameContributorSerializer(
many=True, source="game_contributors", read_only=True
)
+ artworks = GameArtSerializer(many=True, source="game_artwork", read_only=True)
class Meta:
model = Game
@@ -50,10 +125,11 @@ class Meta:
"itchEmbedID",
"thumbnail",
"event",
+ "contributors",
+ "artworks",
"itchGamePlayableID",
"itchGameWidth",
"itchGameHeight",
- "contributors",
)
@@ -83,6 +159,7 @@ class GameshowcaseSerializer(serializers.ModelSerializer):
source="game.thumbnail", read_only=True
)
contributors = serializers.SerializerMethodField()
+ artworks = serializers.SerializerMethodField()
class Meta:
model = GameShowcase
@@ -93,6 +170,7 @@ class Meta:
"description",
"contributors",
"game_cover_thumbnail",
+ "artworks",
)
def get_contributors(self, obj):
@@ -100,23 +178,45 @@ def get_contributors(self, obj):
contributors = GameContributor.objects.filter(game=obj.game)
return ShowcaseContributorSerializer(contributors, many=True).data
+ def get_artworks(self, obj: GameShowcase):
+ showcase_art = obj.game.game_artwork.all()
+ request = self.context.get("request")
+ return [
+ {
+ "art_id": art.id,
+ "name": art.name,
+ "active": art.active,
+ "source_game_id": art.source_game_id,
+ "description": art.description,
+ "media": request.build_absolute_uri(art.media.url)
+ if art.media and request
+ else None,
+ }
+ for art in showcase_art
+ ]
+
+ # def get_artworks(self, obj):
+ # return GameArtSerializer(obj.game.game_artwork.all(), many=True).data
+
class ContributorGameSerializer(serializers.ModelSerializer):
- game_id = serializers.IntegerField(source='game.id', read_only=True)
+ game_id = serializers.IntegerField(source="game.id", read_only=True)
role = serializers.CharField(read_only=True)
game_data = serializers.SerializerMethodField()
class Meta:
model = GameContributor
- fields = ['game_id', 'role', 'game_data']
+ fields = ["game_id", "role", "game_data"]
def get_game_data(self, obj):
game = obj.game
- request = self.context.get('request')
+ request = self.context.get("request")
return {
- 'name': game.name,
- 'description': game.description,
- 'thumbnail': request.build_absolute_uri(game.thumbnail.url) if game.thumbnail and request else None
+ "name": game.name,
+ "description": game.description,
+ "thumbnail": request.build_absolute_uri(game.thumbnail.url)
+ if game.thumbnail and request
+ else None,
}
@@ -137,3 +237,11 @@ class MemberSerializer(serializers.ModelSerializer):
class Meta:
model = Member
fields = ["name", "profile_picture", "about", "pronouns", "social_media", "pk"]
+
+
+class ArtShowcaseSerializer(serializers.ModelSerializer):
+ art_name = serializers.CharField(source="art.name", read_only=True)
+
+ class Meta:
+ model = ArtShowcase
+ fields = ["id", "description", "art", "art_name"]
diff --git a/server/game_dev/tests.py b/server/game_dev/tests.py
index 9b30e70a..06b6b219 100644
--- a/server/game_dev/tests.py
+++ b/server/game_dev/tests.py
@@ -1,5 +1,5 @@
from django.test import TestCase
-from .models import Member, Event, Committee
+from .models import Member, Event, Committee, Game, Art, ArtContributor, ArtShowcase
import datetime
from django.core.files.uploadedfile import SimpleUploadedFile
from django.utils import timezone
@@ -198,3 +198,208 @@ def test_default_is_upcoming(self):
def test_invalid_type(self):
res = self.client.get(self.url, {"type": "invalid"})
self.assertEqual(res.status_code, 400)
+
+
+class ArtModelTest(TestCase):
+ def setUp(self):
+ # Create a game for source_game foreign key
+ self.game = Game.objects.create(
+ name="Test Game",
+ description="A test game",
+ completion=Game.CompletionStatus.WIP,
+ hostURL="https://example.com",
+ )
+
+ # Create an art piece with media
+ image_file = SimpleUploadedFile(
+ "test_art.jpg",
+ b"dummy art image data",
+ content_type="image/jpeg",
+ )
+ self.art = Art.objects.create(
+ name="Test Artwork",
+ description="A beautiful test artwork",
+ source_game=self.game,
+ media=image_file,
+ )
+
+ def test_art_creation(self):
+ try:
+ Art.objects.get(name="Test Artwork")
+ except Art.DoesNotExist:
+ self.fail("Art was not properly created")
+
+ def test_art_is_active_by_default(self):
+ self.assertTrue(self.art.active)
+
+ def test_media_is_saved_in_correct_folder(self):
+ self.assertTrue(self.art.media.name.startswith("art/"))
+
+ def test_media_field_not_empty(self):
+ self.assertIsNotNone(self.art.media)
+
+ def test_source_game_relationship(self):
+ art = Art.objects.get(pk=self.art.pk)
+ self.assertEqual(art.source_game, self.game)
+
+ def test_cascade_from_game(self):
+ # When game is deleted, art should remain (SET_NULL behavior would be ideal, but currently CASCADE)
+ art_id = self.art.id
+ self.game.delete()
+ # Since source_game has CASCADE, the art should be deleted
+ with self.assertRaises(Art.DoesNotExist):
+ Art.objects.get(id=art_id)
+
+
+class ArtContributorModelTest(TestCase):
+ def setUp(self):
+ # Create member
+ self.member1 = Member.objects.create(
+ name="John Artist",
+ about="A talented artist",
+ pronouns="He/Him"
+ )
+ self.member2 = Member.objects.create(
+ name="Jane Designer",
+ about="A creative designer",
+ pronouns="She/Her"
+ )
+
+ self.game = Game.objects.create(name="Test Game")
+
+ # Create art
+ image_file = SimpleUploadedFile(
+ "test_art.jpg",
+ b"dummy art image data",
+ content_type="image/jpeg",
+ )
+ self.art = Art.objects.create(
+ name="Collaborative Artwork",
+ description="Art with multiple contributors",
+ media=image_file,
+ source_game=self.game,
+ )
+
+ # Create art contributor
+ self.art_contributor = ArtContributor.objects.create(
+ art=self.art,
+ member=self.member1,
+ role="Lead Artist"
+ )
+
+ def test_art_contributor_creation(self):
+ try:
+ ArtContributor.objects.get(art=self.art, member=self.member1)
+ except ArtContributor.DoesNotExist:
+ self.fail("ArtContributor was not properly created")
+
+ def test_art_contributor_unique_constraint(self):
+ # Try to create duplicate art-member pair
+ with self.assertRaises(IntegrityError):
+ ArtContributor.objects.create(
+ art=self.art,
+ member=self.member1,
+ role="Another Role"
+ )
+
+ def test_multiple_contributors_for_same_art(self):
+ # Should be able to add different members to same art
+ ArtContributor.objects.create(
+ art=self.art,
+ member=self.member2,
+ role="Character Designer"
+ )
+ contributors = ArtContributor.objects.filter(art=self.art)
+ self.assertEqual(contributors.count(), 2)
+
+ def test_cascade_from_art(self):
+ # When art is deleted, art contributors should be deleted
+ contributor_id = self.art_contributor.id
+ self.art.delete()
+ with self.assertRaises(ArtContributor.DoesNotExist):
+ ArtContributor.objects.get(id=contributor_id)
+
+ def test_cascade_from_member(self):
+ # When member is deleted, art contributors should be deleted
+ contributor_id = self.art_contributor.id
+ self.member1.delete()
+ with self.assertRaises(ArtContributor.DoesNotExist):
+ ArtContributor.objects.get(id=contributor_id)
+
+ def test_art_contributor_role(self):
+ contributor = ArtContributor.objects.get(pk=self.art_contributor.pk)
+ self.assertEqual(contributor.role, "Lead Artist")
+
+
+class ArtShowcaseModelTest(TestCase):
+ def setUp(self):
+ self.game = Game.objects.create(name="Test Game")
+
+ # Create art pieces
+ image_file1 = SimpleUploadedFile(
+ "test_art1.jpg",
+ b"dummy art image data",
+ content_type="image/jpeg",
+ )
+ self.art1 = Art.objects.create(
+ name="Showcased Artwork",
+ description="This art is showcased",
+ media=image_file1,
+ source_game=self.game,
+ )
+
+ image_file2 = SimpleUploadedFile(
+ "test_art2.jpg",
+ b"dummy art image data 2",
+ content_type="image/jpeg",
+ )
+ self.art2 = Art.objects.create(
+ name="Another Artwork",
+ description="This art is also showcased",
+ media=image_file2,
+ source_game=self.game,
+ )
+
+ # Create showcase
+ self.showcase = ArtShowcase.objects.create(
+ art=self.art1,
+ description="Featured artwork of the month"
+ )
+
+ def test_art_showcase_creation(self):
+ try:
+ ArtShowcase.objects.get(art=self.art1)
+ except ArtShowcase.DoesNotExist:
+ self.fail("ArtShowcase was not properly created")
+
+ def test_art_showcase_unique_constraint(self):
+ # Try to create another showcase for the same art
+ with self.assertRaises(IntegrityError):
+ ArtShowcase.objects.create(
+ art=self.art1,
+ description="Another showcase for same art"
+ )
+
+ def test_multiple_showcases_for_different_arts(self):
+ # Should be able to create showcases for different art pieces
+ ArtShowcase.objects.create(
+ art=self.art2,
+ description="Another featured artwork"
+ )
+ showcases = ArtShowcase.objects.all()
+ self.assertEqual(showcases.count(), 2)
+
+ def test_cascade_from_art(self):
+ # When art is deleted, its showcase should be deleted
+ showcase_id = self.showcase.id
+ self.art1.delete()
+ with self.assertRaises(ArtShowcase.DoesNotExist):
+ ArtShowcase.objects.get(id=showcase_id)
+
+ def test_showcase_description(self):
+ showcase = ArtShowcase.objects.get(pk=self.showcase.pk)
+ self.assertEqual(showcase.description, "Featured artwork of the month")
+
+ def test_art_showcase_relationship(self):
+ showcase = ArtShowcase.objects.get(pk=self.showcase.pk)
+ self.assertEqual(showcase.art, self.art1)
diff --git a/server/game_dev/urls.py b/server/game_dev/urls.py
index 7e103bf9..87299ad2 100644
--- a/server/game_dev/urls.py
+++ b/server/game_dev/urls.py
@@ -1,14 +1,18 @@
from django.urls import path
-from .views import ContributorGamesListAPIView, EventListAPIView, EventDetailAPIView
-from .views import GamesDetailAPIView, GameshowcaseAPIView, MemberAPIView, CommitteeAPIView
+from .views import (ContributorGamesListAPIView, EventListAPIView, EventDetailAPIView, GamesDetailAPIView,
+ GameshowcaseAPIView, MemberAPIView, CommitteeAPIView, ContributorArtListAPIView,
+ FeatureArtAPIView, ArtDetailAPIView)
+
urlpatterns = [
path("events/", EventListAPIView.as_view(), name="events-list"),
path("events/
/", EventDetailAPIView.as_view()),
+ path('arts/featured/', FeatureArtAPIView.as_view()),
+ path('arts//', ArtDetailAPIView.as_view(), name='art-detail'),
path("games//", GamesDetailAPIView.as_view()),
path("games/contributor//",
ContributorGamesListAPIView.as_view()),
- # Updated line for GameShowcase endpoint
+ path("arts/contributor//", ContributorArtListAPIView.as_view()),
path("gameshowcase/", GameshowcaseAPIView.as_view(), name="gameshowcase-api"),
path('members//', MemberAPIView.as_view()),
path("about/", CommitteeAPIView.as_view()),
diff --git a/server/game_dev/views.py b/server/game_dev/views.py
index 26f31bcd..eaba7718 100644
--- a/server/game_dev/views.py
+++ b/server/game_dev/views.py
@@ -1,6 +1,23 @@
from rest_framework import generics
-from .serializers import ContributorGameSerializer, GamesSerializer, GameshowcaseSerializer, EventSerializer, MemberSerializer
-from .models import Game, GameContributor, GameShowcase, Event, Member, Committee
+from .serializers import (
+ ContributorGameSerializer,
+ GamesSerializer,
+ GameshowcaseSerializer,
+ EventSerializer,
+ MemberSerializer,
+ ArtSerializer,
+ ArtContributorSerializer,
+)
+from .models import (
+ Game,
+ GameContributor,
+ GameShowcase,
+ Event,
+ Member,
+ Committee,
+ Art,
+ ArtContributor,
+)
from django.utils import timezone
from rest_framework.views import APIView
from rest_framework.response import Response
@@ -12,6 +29,7 @@ class GamesDetailAPIView(generics.RetrieveAPIView):
"""
GET /api/games//
"""
+
serializer_class = GamesSerializer
lookup_url_kwarg = "id"
@@ -30,6 +48,7 @@ class EventListAPIView(generics.ListAPIView):
GET /api/events/
Returns a paginated list of events (optionally filtered by time)
"""
+
serializer_class = EventSerializer
pagination_class = EventPagination
@@ -51,14 +70,14 @@ def get_queryset(self):
if type_param == "upcoming":
return qs.filter(date__gte=now).order_by("date")
- raise ValidationError(
- {"type": "Invalid value. Use 'past' or 'upcoming'."})
+ raise ValidationError({"type": "Invalid value. Use 'past' or 'upcoming'."})
class EventDetailAPIView(generics.RetrieveAPIView):
"""
GET /api/events//
"""
+
serializer_class = EventSerializer
lookup_url_kwarg = "id"
@@ -72,13 +91,18 @@ def get_object(self):
return queryset.get()
except Event.DoesNotExist:
from rest_framework.exceptions import NotFound
- raise NotFound(detail="The event is not yet published by admin or does not exist.")
+
+ raise NotFound(
+ detail="The event is not yet published by admin or does not exist."
+ )
class GameshowcaseAPIView(APIView):
def get(self, request):
showcases = GameShowcase.objects.all()
- serializer = GameshowcaseSerializer(showcases, many=True, context={'request': request})
+ serializer = GameshowcaseSerializer(
+ showcases, many=True, context={"request": request}
+ )
return Response(serializer.data)
@@ -90,6 +114,14 @@ def get_queryset(self):
return GameContributor.objects.filter(member=member_id)
+class ContributorArtListAPIView(generics.ListAPIView):
+ serializer_class = ArtContributorSerializer
+
+ def get_queryset(self):
+ member_id = self.kwargs.get("member")
+ return ArtContributor.objects.filter(member=member_id)
+
+
class MemberAPIView(generics.RetrieveAPIView):
serializer_class = MemberSerializer
lookup_field = "id"
@@ -104,8 +136,13 @@ class CommitteeAPIView(generics.ListAPIView):
def get_queryset(self):
outputList = []
roleOrder = ("P", "VP", "SEC", "TRE", "MARK", "EVE", "PRO", "FRE")
- placeholderMember = {"name": "Position not filled", "profile_picture": "url('/landing_placeholder.png')",
- "about": "", "pronouns": "", "pk": 0}
+ placeholderMember = {
+ "name": "Position not filled",
+ "profile_picture": "url('/landing_placeholder.png')",
+ "about": "",
+ "pronouns": "",
+ "pk": 0,
+ }
for i in roleOrder:
try:
cur = Committee.objects.get(role=i).id
@@ -116,3 +153,26 @@ def get_queryset(self):
except Committee.DoesNotExist:
outputList.append(placeholderMember)
return outputList
+
+
+class ArtDetailAPIView(generics.RetrieveAPIView):
+ """
+ GET /api/artworks//
+ """
+
+ serializer_class = ArtSerializer
+ lookup_url_kwarg = "id"
+
+ def get_queryset(self):
+ return Art.objects.filter(id=self.kwargs["id"])
+
+
+class FeatureArtAPIView(generics.ListAPIView):
+ """
+ GET /api/arts/featured/
+ """
+
+ serializer_class = ArtSerializer
+
+ def get_queryset(self):
+ return Art.objects.filter(showcase__isnull=False)