From 8ef2c6c310066b7367bd82b720ac7186a44bb234 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 17:43:22 +0200 Subject: [PATCH 01/59] Add postgres to celery service dependencies in Docker Compose --- compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yaml b/compose.yaml index 06e1702..f0df675 100644 --- a/compose.yaml +++ b/compose.yaml @@ -15,6 +15,7 @@ services: depends_on: - rabbitmq - celery + - postgres celery: image: code.edgarpierre.fr/edpibu/musik From fc2cd08b266e5fcb155f134328bf2c454f2ed2ea Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 17:50:03 +0200 Subject: [PATCH 02/59] Add env_file configuration for celery service in Docker Compose --- compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yaml b/compose.yaml index f0df675..ab50ecb 100644 --- a/compose.yaml +++ b/compose.yaml @@ -24,6 +24,7 @@ services: command: uv run celery -A musik worker environment: CELERY_BROKER_URL: amqp://rabbitmq:5672// + env_file: stack.env depends_on: - rabbitmq From 3c401d4f7c08491dae049e300473d7aac8c1033a Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 17:53:35 +0200 Subject: [PATCH 03/59] Add print statement to output DATABASES configuration for debugging --- musik/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/musik/settings.py b/musik/settings.py index f608bb0..3ec7bc7 100644 --- a/musik/settings.py +++ b/musik/settings.py @@ -91,7 +91,7 @@ DATABASES = { "PASSWORD": os.getenv("POSTGRES_PASSWORD"), } } - +print(DATABASES) # Password validation # https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators From d8f60f40179c2972d784c18df9601acd697ffdaf Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 18:03:35 +0200 Subject: [PATCH 04/59] Remove print statement from DATABASES configuration and ensure POSTGRES_HOST is set in celery service --- compose.yaml | 1 + musik/settings.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index ab50ecb..0510259 100644 --- a/compose.yaml +++ b/compose.yaml @@ -24,6 +24,7 @@ services: command: uv run celery -A musik worker environment: CELERY_BROKER_URL: amqp://rabbitmq:5672// + POSTGRES_HOST: postgres env_file: stack.env depends_on: - rabbitmq diff --git a/musik/settings.py b/musik/settings.py index 3ec7bc7..b12b987 100644 --- a/musik/settings.py +++ b/musik/settings.py @@ -91,7 +91,6 @@ DATABASES = { "PASSWORD": os.getenv("POSTGRES_PASSWORD"), } } -print(DATABASES) # Password validation # https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators From bf8161a7fbfc022b0cd87214345c5826c1da4e22 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 18:11:58 +0200 Subject: [PATCH 05/59] Add volume configuration for PostgreSQL service in Docker Compose --- compose.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compose.yaml b/compose.yaml index 0510259..04838ec 100644 --- a/compose.yaml +++ b/compose.yaml @@ -37,3 +37,5 @@ services: image: postgres:17 container_name: musik_postgres env_file: stack.env + volumes: + - /docker/musik/postgres:/var/lib/postgresql/data From 3069aab3f97b7ded13ed437012c736549c3074f5 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 18:14:33 +0200 Subject: [PATCH 06/59] Add delete group link to group detail page and update group creation header --- game/templates/game/group_detail.html | 4 ++++ game/templates/game/group_form.html | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/game/templates/game/group_detail.html b/game/templates/game/group_detail.html index 9931d35..b6f48d8 100644 --- a/game/templates/game/group_detail.html +++ b/game/templates/game/group_detail.html @@ -25,6 +25,10 @@ formaction="{% url "group_clear_blacklist" pk=group.pk %}"> Effacer la blacklist + + Supprimer

diff --git a/game/templates/game/group_form.html b/game/templates/game/group_form.html index 72ae8d9..ef6da8c 100644 --- a/game/templates/game/group_form.html +++ b/game/templates/game/group_form.html @@ -5,9 +5,6 @@

{{ group.name }}

-

- Supprimer le groupe -

{% else %}

Créer un groupe

{% endif %} From fbe24915fe4e5b6b7a46eacb3e1637a57b7f9208 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 18:25:24 +0200 Subject: [PATCH 07/59] Update signup view to use reverse_lazy for success URL --- base/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/views.py b/base/views.py index e3618a0..29eb8b3 100644 --- a/base/views.py +++ b/base/views.py @@ -1,5 +1,6 @@ from django.contrib.auth.models import User from django.contrib.messages.views import SuccessMessageMixin +from django.urls import reverse_lazy from django.views.generic.base import TemplateView from django.views.generic.edit import CreateView @@ -13,5 +14,5 @@ class HomePageView(TemplateView): class SignupView(SuccessMessageMixin, CreateView): model = User form_class = forms.UserSignupForm - success_url = "/" + success_url = reverse_lazy("login") success_message = "Le compte %(username)s a été créé avec succès." From ac07607dd0208a932b0b96af7537d771d15d6886 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 19:00:01 +0200 Subject: [PATCH 08/59] Add privacy policy page and update URLs configuration --- base/templates/privacy.html | 21 +++++++++++++++++++++ base/urls.py | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 base/templates/privacy.html diff --git a/base/templates/privacy.html b/base/templates/privacy.html new file mode 100644 index 0000000..8e78465 --- /dev/null +++ b/base/templates/privacy.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} +{% block content %} +

Mentions légales

+

Éditeur

+

+ Ce site est réalisé et hébergé par Edgar P. Burkhart. +

+

Données Personnelles

+

+ Dans le cadre de la création d'un compte, un nom d'utilisateur, une adresse email et un mot de passe sont requis. + Ces données sont stockées dans le seul but de permettre la connexion et la réinitialisation du mot de passe de l'utilisateur (dans le cas de l'adresse mail). +

+

+ La connexion à un compte Youtube est utilisée pour permettre la génération automatique de playlists, et sa suppression le cas échéant. + Elle n'est pas requise pour l'utilisation de Musik. + Youtube est une marque de Google LLC. +

+

+ La suppression des données stockée par le service Musik pour son utilisation peut être demandée par email à Edgar P. Burkhart. +

+{% endblock content %} diff --git a/base/urls.py b/base/urls.py index 2a6b2d5..e46107f 100644 --- a/base/urls.py +++ b/base/urls.py @@ -1,4 +1,5 @@ from django.urls import include, path +from django.views.generic import TemplateView from . import views @@ -6,4 +7,5 @@ urlpatterns = [ path("", views.HomePageView.as_view(), name="index"), path("accounts/signup/", views.SignupView.as_view(), name="signup"), path("accounts/", include("django.contrib.auth.urls")), + path("legal/", TemplateView.as_view(template_name="privacy.html")), ] From 5c99306f7429fcdd3fe5a5dc30dd75b9a8aad60f Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 19:05:53 +0200 Subject: [PATCH 09/59] Add footer template and include it in base and hero templates; update legal URL path Signed-off-by: Edgar P. Burkhart --- base/static/css/main.css | 6 ++++++ base/templates/base.html | 3 +++ base/templates/footer.html | 1 + base/templates/hero.html | 7 +++++-- base/urls.py | 2 +- 5 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 base/templates/footer.html diff --git a/base/static/css/main.css b/base/static/css/main.css index c329a18..99b0900 100644 --- a/base/static/css/main.css +++ b/base/static/css/main.css @@ -91,6 +91,7 @@ article.message { color-mix(in hsl, var(--pico-primary-background) 10%, var(--pico-background-color)) 80%, var(--pico-background-color)); display: grid; + grid-template-rows: 1fr min-content; align-items: center; padding: 4rem; @@ -116,3 +117,8 @@ h6, i.i { margin-right: .5em; } + +footer { + text-align: center; + font-weight: 350; +} diff --git a/base/templates/base.html b/base/templates/base.html index 8e677eb..8c84913 100644 --- a/base/templates/base.html +++ b/base/templates/base.html @@ -68,6 +68,9 @@ {% block content %} {% endblock content %} +
+ {% include "footer.html" %} +
{% endblock body %} diff --git a/base/templates/footer.html b/base/templates/footer.html new file mode 100644 index 0000000..552662c --- /dev/null +++ b/base/templates/footer.html @@ -0,0 +1 @@ +© Edgar P. Burkhart – Mentions légales diff --git a/base/templates/hero.html b/base/templates/hero.html index 7dcdbe0..34591ba 100644 --- a/base/templates/hero.html +++ b/base/templates/hero.html @@ -1,10 +1,13 @@ {% load static %}
-
+

Musik

Jouer

-
+ +
+ {% include "footer.html" %} +
diff --git a/base/urls.py b/base/urls.py index e46107f..ea1f6ba 100644 --- a/base/urls.py +++ b/base/urls.py @@ -7,5 +7,5 @@ urlpatterns = [ path("", views.HomePageView.as_view(), name="index"), path("accounts/signup/", views.SignupView.as_view(), name="signup"), path("accounts/", include("django.contrib.auth.urls")), - path("legal/", TemplateView.as_view(template_name="privacy.html")), + path("legal/", TemplateView.as_view(template_name="privacy.html"), name="legal"), ] From 6cd9c0c8414ee1854753304ab6e6b1ef40bea755 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 19:06:19 +0200 Subject: [PATCH 10/59] Bump version to 0.1.1 in pyproject.toml Signed-off-by: Edgar P. Burkhart --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7656e66..ca9f4df 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "musik" -version = "0.1.0" +version = "0.1.1" description = "Le jeu de Musik." readme = "README.md" requires-python = ">=3.12" From 7409b4cd8fe08fcd8a6ee285163604e5d82c67bb Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 21:58:33 +0200 Subject: [PATCH 11/59] Add group leader functionality and update group member management - Create GroupLeader model and migration - Alter GroupLeader member field to include related_name - Implement is_leader and is_owner methods in Group model - Update GroupDetailView to pass leader and owner status to template - Refactor group buttons and members display into separate templates - Add view and URL for setting group leaders - Update permissions for adding/removing members and clearing blacklist - Bump version to 0.1.1 in uv.lock --- base/static/css/main.css | 8 ++ game/migrations/0015_groupleader.py | 35 ++++++++ .../0016_alter_groupleader_member.py | 22 +++++ game/models.py | 21 +++++ game/templates/game/group_detail.html | 88 +------------------ .../templates/game/include/group_buttons.html | 28 ++++++ .../templates/game/include/group_members.html | 79 +++++++++++++++++ game/urls.py | 5 ++ game/views.py | 57 +++++++++--- uv.lock | 2 +- 10 files changed, 244 insertions(+), 101 deletions(-) create mode 100644 game/migrations/0015_groupleader.py create mode 100644 game/migrations/0016_alter_groupleader_member.py create mode 100644 game/templates/game/include/group_buttons.html create mode 100644 game/templates/game/include/group_members.html diff --git a/base/static/css/main.css b/base/static/css/main.css index 99b0900..c6146bc 100644 --- a/base/static/css/main.css +++ b/base/static/css/main.css @@ -122,3 +122,11 @@ footer { text-align: center; font-weight: 350; } + +td.c, th.c { + text-align: center; + + input { + margin: 0; + } +} diff --git a/game/migrations/0015_groupleader.py b/game/migrations/0015_groupleader.py new file mode 100644 index 0000000..a9e5dc2 --- /dev/null +++ b/game/migrations/0015_groupleader.py @@ -0,0 +1,35 @@ +# Generated by Django 5.2.3 on 2025-06-14 18:50 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("game", "0014_musikgame_playlist_loading"), + ] + + operations = [ + migrations.CreateModel( + name="GroupLeader", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("is_leader", models.BooleanField(default=False)), + ( + "member", + models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + to="game.group_members", + ), + ), + ], + ), + ] diff --git a/game/migrations/0016_alter_groupleader_member.py b/game/migrations/0016_alter_groupleader_member.py new file mode 100644 index 0000000..1561a34 --- /dev/null +++ b/game/migrations/0016_alter_groupleader_member.py @@ -0,0 +1,22 @@ +# Generated by Django 5.2.3 on 2025-06-14 18:50 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("game", "0015_groupleader"), + ] + + operations = [ + migrations.AlterField( + model_name="groupleader", + name="member", + field=models.OneToOneField( + on_delete=django.db.models.deletion.CASCADE, + related_name="lead", + to="game.group_members", + ), + ), + ] diff --git a/game/models.py b/game/models.py index 88fe6cc..a3f104d 100644 --- a/game/models.py +++ b/game/models.py @@ -23,12 +23,33 @@ class Group(models.Model): def get_absolute_url(self): return reverse("group_detail", kwargs={"pk": self.pk}) + def is_owner(self, user): + return user == self.owner + + def is_leader(self, user): + return ( + self.is_owner(user) + or self.members.through.objects.filter( + lead__is_leader=True, user=user + ).exists() + ) + + def is_member(self, user): + return self.is_owner(user) or self.members.filter(user=user).exists() + class Meta: constraints = [ models.UniqueConstraint(Lower("name"), "owner", name="unique_group_name") ] +class GroupLeader(models.Model): + member = models.OneToOneField( + Group.members.through, on_delete=models.CASCADE, related_name="lead" + ) + is_leader = models.BooleanField(default=False) + + class MusicVideo(models.Model): yt_id = models.CharField(max_length=16) title = models.CharField(blank=True) diff --git a/game/templates/game/group_detail.html b/game/templates/game/group_detail.html index b6f48d8..d523f29 100644 --- a/game/templates/game/group_detail.html +++ b/game/templates/game/group_detail.html @@ -9,30 +9,7 @@ {% endif %} {{ group.name }} - {% if group.owner == user %} -

-

- {% csrf_token %} -

- Jouer -

-
- Renommer - - - Supprimer -
-
-

- {% endif %} + {% include "game/include/group_buttons.html" %} {% if group.musikgame_set.exists %}

Parties @@ -79,68 +56,7 @@ {% endif %} {% endif %} -

- Membres -

-
- {% csrf_token %} - - - - {% if group.owner == user %}{% endif %} - - - - - - - - {% if group.owner == user %}{% endif %} - - - - - {% for member in members.all %} - - {% if group.owner == user %} - - {% endif %} - - - - - {% endfor %} - -
Membre - - - -
{{ group.owner }} - - {{ owner_count }}
- - {{ member }}{{ member.count }}
- {% if group.owner == user %} - - {% endif %} -
- {% if group.owner == user %} -
- {% csrf_token %} -
- - -
-
- {% endif %} + {% include "game/include/group_members.html" %}

Mes musiques {{ musics.count }}

diff --git a/game/templates/game/include/group_buttons.html b/game/templates/game/include/group_buttons.html new file mode 100644 index 0000000..065545f --- /dev/null +++ b/game/templates/game/include/group_buttons.html @@ -0,0 +1,28 @@ +{% if is_leader %} +

+

+ {% csrf_token %} +

+ Jouer +

+
+ {% if is_owner %} + Renommer + {% endif %} + + {% if is_owner %} + + Supprimer + {% endif %} +
+
+

+{% endif %} diff --git a/game/templates/game/include/group_members.html b/game/templates/game/include/group_members.html new file mode 100644 index 0000000..f49131c --- /dev/null +++ b/game/templates/game/include/group_members.html @@ -0,0 +1,79 @@ +

+ Membres +

+
+ {% csrf_token %} + + + + {% if is_leader %}{% endif %} + + + + + + + + {% if is_leader %}{% endif %} + + + + + {% for member in members.all %} + + {% if is_leader %} + + {% endif %} + + + + + {% endfor %} + +
Membre + + + +
{{ group.owner }} + + {{ owner_count }}
+ + {{ member.user }} + {% if is_owner %} + + {% endif %} + {{ member.count }}
+ {% if is_leader %} +
+ {% if is_owner %} + + {% endif %} + +
+ {% endif %} +
+{% if is_leader %} +
+ {% csrf_token %} +
+ + +
+
+{% endif %} diff --git a/game/urls.py b/game/urls.py index 763d277..2f4c3fa 100644 --- a/game/urls.py +++ b/game/urls.py @@ -41,6 +41,11 @@ urlpatterns = [ views.GroupRemoveMemberView.as_view(), name="group_remove_member", ), + path( + "group//set_leader/", + views.GroupSetLead.as_view(), + name="group_set_leader", + ), path( "group//start_game/", views.GameCreateView.as_view(), name="start_game" ), diff --git a/game/views.py b/game/views.py index f6632f0..ef10245 100644 --- a/game/views.py +++ b/game/views.py @@ -6,6 +6,7 @@ from django.contrib import messages from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.models import User from django.contrib.messages.views import SuccessMessageMixin +from django.core.exceptions import PermissionDenied from django.db import IntegrityError from django.db.models import Count, Q from django.shortcuts import get_object_or_404, redirect @@ -70,14 +71,17 @@ class GroupDetailView(MemberFilterMixin, GroupMixin, DetailView): .musicvideo_set.filter(owner=data["group"].owner, blacklisted=False) .count() ) - data["members"] = data["group"].members.annotate( + data["members"] = data["group"].members.through.objects.annotate( count=Count( - "musicvideo", + "user__musicvideo", filter=Q( - musicvideo__group=data["group"], musicvideo__blacklisted=False + user__musicvideo__group=data["group"], + user__musicvideo__blacklisted=False, ), ) ) + data["is_leader"] = data["group"].is_leader(self.request.user) + data["is_owner"] = data["group"].is_owner(self.request.user) return data @@ -112,11 +116,13 @@ class GroupAddMusicView(MemberFilterMixin, SingleObjectMixin, View): return redirect(group) -class GroupAddMemberView(OwnerFilterMixin, SingleObjectMixin, View): +class GroupAddMemberView(MemberFilterMixin, SingleObjectMixin, View): model = models.Group def post(self, request, pk): group = self.get_object() + if not group.is_leader(request.user): + raise PermissionDenied() username = request.POST.get("username") user = User.objects.get(username=username) if user == group.owner: @@ -180,14 +186,16 @@ class GroupUnblacklistMusicView(MemberFilterMixin, SingleObjectMixin, View): return redirect(group) -class GroupRemoveMemberView(OwnerFilterMixin, SingleObjectMixin, View): +class GroupRemoveMemberView(MemberFilterMixin, SingleObjectMixin, View): model = models.Group def post(self, request, pk): group = self.get_object() + if not group.is_leader(request.user): + raise PermissionDenied() relations = models.Group.members.through.objects.filter( - group=group, user__id__in=request.POST.getlist("member") + group=group, pk__in=request.POST.getlist("member") ) if relations.count() == 0: messages.add_message(request, messages.INFO, "Aucun membre supprimé.") @@ -210,6 +218,25 @@ class GroupRemoveMemberView(OwnerFilterMixin, SingleObjectMixin, View): return redirect(group) +class GroupSetLead(OwnerFilterMixin, SingleObjectMixin, View): + model = models.Group + + def post(self, request, pk): + group = self.get_object() + + members = models.Group.members.through.objects.filter(group=group) + for member in members.filter(pk__in=request.POST.getlist("leader")): + models.GroupLeader.objects.update_or_create( + member=member, defaults={"is_leader": True} + ) + for member in members.exclude(pk__in=request.POST.getlist("leader")): + models.GroupLeader.objects.update_or_create( + member=member, defaults={"is_leader": False} + ) + + return redirect(group) + + class GroupRemoveGameView(OwnerFilterMixin, SingleObjectMixin, View): model = models.Group @@ -250,15 +277,15 @@ class GameCreateView(LoginRequiredMixin, CreateView): def get_context_data(self, **kwargs): data = super().get_context_data(**kwargs) - data["group"] = get_object_or_404( - models.Group, owner=self.request.user, pk=self.kwargs["pk"] - ) + data["group"] = get_object_or_404(models.Group, pk=self.kwargs["pk"]) + if not data["group"].is_leader(self.request.user): + raise PermissionDenied() return data def form_valid(self, form): - group = get_object_or_404( - models.Group, owner=self.request.user, pk=self.kwargs["pk"] - ) + group = get_object_or_404(models.Group, pk=self.kwargs["pk"]) + if not group.is_leader(self.request.user): + return super().form_invalid(form) form.instance.group = group res = super().form_valid(form) players = [] @@ -285,7 +312,7 @@ class GameCreateView(LoginRequiredMixin, CreateView): game=form.instance, player=player, music_video=music, order=order ) - if self.request.user.youtubecredentials: + if models.YoutubeCredentials.objects.filter(user=self.request.user).exists(): form.instance.playlist_loading = True form.instance.save() return res @@ -358,11 +385,13 @@ class YoutubeLoginView(LoginRequiredMixin, View): return redirect(auth_url) -class GroupClearBlacklistView(OwnerFilterMixin, SingleObjectMixin, View): +class GroupClearBlacklistView(MemberFilterMixin, SingleObjectMixin, View): model = models.Group def post(self, request, pk): group = self.get_object() + if not group.is_leader(request.user): + raise PermissionDenied() group.musicvideo_set.filter(blacklisted=True).update(blacklisted=False) messages.add_message(request, messages.SUCCESS, "La blacklist a été effacée.") return redirect(group) diff --git a/uv.lock b/uv.lock index ce6f258..72a1f51 100644 --- a/uv.lock +++ b/uv.lock @@ -423,7 +423,7 @@ wheels = [ [[package]] name = "musik" -version = "0.1.0" +version = "0.1.1" source = { virtual = "." } dependencies = [ { name = "celery" }, From caaf704bd9f7cd376dd9b49c5d8f6a032f16af2c Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 21:58:52 +0200 Subject: [PATCH 12/59] Bump version to 0.1.2 in pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ca9f4df..4a7ce47 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "musik" -version = "0.1.1" +version = "0.1.2" description = "Le jeu de Musik." readme = "README.md" requires-python = ">=3.12" From a6a8249d4ed70ba1ae40533c295f7b65b3181087 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 22:00:48 +0200 Subject: [PATCH 13/59] Add visual indicator for group leader status in member list --- game/templates/game/include/group_members.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/game/templates/game/include/group_members.html b/game/templates/game/include/group_members.html index f49131c..3b668e5 100644 --- a/game/templates/game/include/group_members.html +++ b/game/templates/game/include/group_members.html @@ -40,6 +40,8 @@ value="{{ member.pk }}" role="switch" {% if member.lead.is_leader %}checked{% endif %}> + {% elif member.lead.is_leader %} + {% endif %} {{ member.count }} From 60de28464e837ffd76a27bd035857267b0854a94 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 22:00:59 +0200 Subject: [PATCH 14/59] Bump version to 0.1.3 in pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4a7ce47..fea27c6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "musik" -version = "0.1.2" +version = "0.1.3" description = "Le jeu de Musik." readme = "README.md" requires-python = ">=3.12" From f3e914aed8451cb9a7d220ce3d2e3533689f96b0 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sat, 14 Jun 2025 22:04:39 +0200 Subject: [PATCH 15/59] Bump version to 0.1.4 in pyproject.toml and uv.lock --- pyproject.toml | 2 +- uv.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index fea27c6..0b7faaa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "musik" -version = "0.1.3" +version = "0.1.4" description = "Le jeu de Musik." readme = "README.md" requires-python = ">=3.12" diff --git a/uv.lock b/uv.lock index 72a1f51..0f40f57 100644 --- a/uv.lock +++ b/uv.lock @@ -423,7 +423,7 @@ wheels = [ [[package]] name = "musik" -version = "0.1.1" +version = "0.1.4" source = { virtual = "." } dependencies = [ { name = "celery" }, From 088bb52c07c869310b6094ede232bfd394bdacd6 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Sun, 15 Jun 2025 09:56:08 +0200 Subject: [PATCH 16/59] Implement group management features and update templates for improved navigation --- base/templates/base/inline_form.html | 11 ++++++ base/templates/hero.html | 2 +- base/templates/index.html | 9 +---- base/templatetags/form.py | 11 ++++-- base/views.py | 6 +++ game/forms.py | 10 +++++ game/templates/game/home.html | 57 ++++++++++++++++------------ game/urls.py | 1 + game/views.py | 10 +++++ 9 files changed, 80 insertions(+), 37 deletions(-) create mode 100644 base/templates/base/inline_form.html diff --git a/base/templates/base/inline_form.html b/base/templates/base/inline_form.html new file mode 100644 index 0000000..75769ae --- /dev/null +++ b/base/templates/base/inline_form.html @@ -0,0 +1,11 @@ +{% for error in form.non_field_errors %}
{{ error }}
{% endfor %} +
+ {% csrf_token %} +
+ {% for field in form %}{{ field }}{% endfor %} + + {% if field.errors %} + {{ field.errors|join:", " }} + {% endif %} +
+
diff --git a/base/templates/hero.html b/base/templates/hero.html index 34591ba..04c2aee 100644 --- a/base/templates/hero.html +++ b/base/templates/hero.html @@ -4,7 +4,7 @@

Musik

- Jouer + Jouer