- {member.name} {member.pronouns} + {member.pk === 0 ? ( + <>{member.name}> + ) : ( + {member.name} + )} + {member.pronouns}
{roleOrder[idx]} @@ -150,22 +166,23 @@ export default function AboutPage() { key={`bottom-${idx}`} className="flex flex-col items-start gap-0" > -
- {member.name} {member.pronouns} + {member.pk === 0 ? ( + <>{member.name}> + ) : ( + {member.name} + )} + {member.pronouns}
{roleOrder[4 + idx]} diff --git a/server/game_dev/serializers.py b/server/game_dev/serializers.py index 4d278157..386ea930 100644 --- a/server/game_dev/serializers.py +++ b/server/game_dev/serializers.py @@ -103,4 +103,5 @@ class Meta: "about", "pronouns", "social_media", + "pk" ] diff --git a/server/game_dev/views.py b/server/game_dev/views.py index 40ea5457..086119cf 100644 --- a/server/game_dev/views.py +++ b/server/game_dev/views.py @@ -85,7 +85,7 @@ 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": ""} + "about": "", "pronouns": "", "pk": 0} for i in roleOrder: try: cur = Committee.objects.get(role=i).id