base/static/css/main.css

@@ -19,21 +19,3 @@ i.owner {
 .template {
     display: none;
 }
-
-a.group {
-    text-decoration: none;
-}
-
-.group-owner, .group i {
-    margin-left: .5em;
-}
-
-.group-owner {
-    color: var(--pico-color-zinc-500);
-}
-
-.music-count {
-    font-weight: 900;
-    color: var(--pico-color-zinc-500);
-    margin-left: .5em;
-}

game/templates/game/group_detail.html

@@ -2,12 +2,7 @@
 {% load form %}
 {% block content %}
     <h1>
-        {% if group.owner == user %}
+        <i class="ri-group-2-fill"></i> {{ group.name }}
-            <i class="ri-vip-crown-fill owner"></i>
-        {% else %}
-            <i class="ri-group-2-fill"></i>
-        {% endif %}
-        {{ group.name }}
     </h1>
     {% if group.owner == user %}
         <p>
@@ -26,11 +21,9 @@
             <thead>
                 <th>Date</th>
                 <th>Joueurs</th>
-                {% if group.owner == user %}
+                <th>
-                    <th>
+                    <i class="ri-delete-bin-fill"></i>
-                        <i class="ri-delete-bin-fill"></i>
+                </th>
-                    </th>
-                {% endif %}
             </thead>
             <tbody>
                 {% for game in group.musikgame_set.all %}
@@ -39,11 +32,9 @@
                             <a href="{% url "game_detail" pk=game.pk %}">{{ game.date }}</a>
                         </td>
                         <td>{{ game.players.all|join:", " }}</td>
-                        {% if group.owner == user %}
+                        <td>
-                            <td>
+                            <a href="{% url "group_remove_game" pk=game.pk %}"><i class="ri-close-fill" alt="Supprimer"></i></a>
-                                <a href="{% url "group_remove_game" pk=game.pk %}"><i class="ri-close-fill" alt="Supprimer"></i></a>
+                        </td>
-                            </td>
-                        {% endif %}
                     </tr>
                 {% endfor %}
             </tbody>
@@ -52,6 +43,11 @@
     <h2>
         <i class="ri-group-2-fill"></i> Membres
     </h2>
+    {% if group.owner == user %}
+        <p>
+            <a href="{% url "group_edit_members" pk=group.pk %}" role="button"><i class="ri-user-add-fill"></i> Modifier les membres</a>
+        </p>
+    {% endif %}
     <table>
         <thead>
             <tr>
@@ -62,11 +58,9 @@
                 <th>
                     <i class="ri-mv-line"></i>
                 </th>
-                {% if group.owner == user %}
+                <th>
-                    <th>
+                    <i class="ri-delete-bin-fill"></i>
-                        <i class="ri-delete-bin-fill"></i>
+                </th>
-                    </th>
-                {% endif %}
             </tr>
         </thead>
         <tbody>
@@ -76,39 +70,35 @@
                     <i class="ri-vip-crown-fill owner"></i>
                 </td>
                 <td>{{ owner_count }}</td>
-                {% if group.owner == user %}<td></td>{% endif %}
+                <td></td>
             </tr>
             {% for member in members.all %}
                 <tr>
                     <td>{{ member }}</td>
                     <td></td>
                     <td>{{ member.count }}</td>
-                    {% if group.owner == user %}
+                    <td>
-                        <td>
+                        <a href="{% url "group_remove_member" pk=group.pk user_pk=member.pk %}">
-                            <a href="{% url "group_remove_member" pk=group.pk user_pk=member.pk %}">
+                            <i class="ri-close-fill" alt="Supprimer"></i>
-                                <i class="ri-close-fill" alt="Supprimer"></i>
+                        </a>
-                            </a>
+                    </td>
-                        </td>
-                    {% endif %}
                 </tr>
             {% endfor %}
         </tbody>
     </table>
-    {% if group.owner == user %}
+    <form method="post" action="{% url "group_add_member" pk=group.pk %}">
-        <form method="post" action="{% url "group_add_member" pk=group.pk %}">
+        {% csrf_token %}
-            {% csrf_token %}
+        <fieldset role="group">
-            <fieldset role="group">
+            <input type="string"
-                <input type="string"
+                   name="username"
-                       name="username"
+                   id="username"
-                       id="username"
+                   placeholder="Membre"
-                       placeholder="Membre"
+                   required>
-                       required>
+            <button type="submit">Ajouter</button>
-                <button type="submit">Ajouter</button>
+        </fieldset>
-            </fieldset>
+    </form>
-        </form>
-    {% endif %}
     <h2>
-        <i class="ri-music-2-fill"></i> Mes musiques <span class="music-count">{{ musics.count }}</span>
+        <i class="ri-music-2-fill"></i> Mes musiques ({{ musics.count }})
     </h2>
     <details>
         <summary role="button">

game/templates/game/home.html

@@ -7,18 +7,16 @@
     {% endif %}
 </p>
 {% if user.owned_group_set.exists or user.group_set.exists %}
-    {% for group in user.owned_group_set.all %}
+    <ul>
-        <a class="group" href="{{ group.get_absolute_url }}">
+        {% for group in user.owned_group_set.all %}
-            <article>
+            <li>
-                {{ group.name }} <i class="ri-vip-crown-fill owner"></i>
+                <a href="{{ group.get_absolute_url }}">{{ group.name }}</a> <i class="ri-vip-crown-fill owner"></i>
-            </article>
+            </li>
-        </a>
+        {% endfor %}
-    {% endfor %}
+        {% for group in user.group_set.all %}
-    {% for group in user.group_set.all %}
+            <li>
-        <a class="group" href="{{ group.get_absolute_url }}">
+                <a href="{{ group.get_absolute_url }}">{{ group.name }}</a>
-            <article>
+            </li>
-                {{ group.name }} <span class="group-owner">{{ group.owner }}</span>
+        {% endfor %}
-            </article>
+    </ul>
-        </a>
-    {% endfor %}
 {% endif %}

game/templates/game/musikgame_detail.html

@@ -13,7 +13,9 @@
     <h2>
         <i class="ri-group-2-fill"></i> Joueurs
     </h2>
-    <p>{{ musikgame.players.all|join:", " }}</p>
+    <ul>
+        {% for member in musikgame.players.all %}<li>{{ member }}</li>{% endfor %}
+    </ul>
     <h2>
         <i class="ri-music-2-fill"></i> Musiques
     </h2>

game/urls.py

@@ -10,6 +10,11 @@ urlpatterns = [
     path(
         "group/<int:pk>/delete/", views.GroupDeleteView.as_view(), name="group_delete"
     ),
+    path(
+        "group/<int:pk>/edit_members/",
+        views.GroupAddMembersView.as_view(),
+        name="group_edit_members",
+    ),
     path("group/<int:pk>/", views.GroupDetailView.as_view(), name="group_detail"),
     path(
         "group/<int:pk>/add_music/",

game/views.py

@@ -70,6 +70,11 @@ class GroupDetailView(MemberFilterMixin, GroupMixin, DetailView):
         return data
 
 
+class GroupAddMembersView(OwnerFilterMixin, GroupMixin, UpdateView):
+    fields = None
+    form_class = forms.GroupAddMembersForm
+
+
 class GroupAddMusicView(MemberFilterMixin, SingleObjectMixin, View):
     model = models.Group
 
@@ -113,12 +118,8 @@ class GroupRemoveMusicView(OwnerFilterMixin, SingleObjectMixin, View):
 class GroupRemoveMemberView(View):
     def get(self, request, pk, user_pk):
         relation = get_object_or_404(
-            models.Group.members.through,
+            models.Group.members.through, group_id=pk, user_id=user_pk
-            group_id=pk,
-            user_id=user_pk,
-            group__owner=request.user,
         )
-
         group = relation.group
         relation.delete()
         return redirect(group)
@@ -219,14 +220,7 @@ class GameDetailView(LoginRequiredMixin, DetailView):
     model = models.MusikGame
 
     def get_queryset(self):
-        return (
+        return super().get_queryset().filter(group__owner=self.request.user)
-            super()
-            .get_queryset()
-            .filter(
-                Q(group__members=self.request.user) | Q(group__owner=self.request.user)
-            )
-            .distinct()
-        )
 
 
 class YoutubeLoginView(LoginRequiredMixin, View):