diff --git a/base/static/css/main.css b/base/static/css/main.css
index 74e4488..c6146bc 100644
--- a/base/static/css/main.css
+++ b/base/static/css/main.css
@@ -17,7 +17,7 @@ form a[role="button"] {
width: 100%;
}
-i.owner, .gold {
+i.owner {
color: var(--pico-color-amber-200);
}
@@ -25,7 +25,7 @@ i.owner, .gold {
display: none;
}
-a.group, a.running {
+a.group {
text-decoration: none;
}
@@ -77,6 +77,11 @@ article.message {
}
#hero {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
background: radial-gradient(
circle 50vh at calc(100vw - 4rem) 50%,
var(--pico-primary-background),
@@ -85,41 +90,19 @@ article.message {
color-mix(in hsl, var(--pico-primary-background) 30%, var(--pico-background-color)) 60%,
color-mix(in hsl, var(--pico-primary-background) 10%, var(--pico-background-color)) 80%,
var(--pico-background-color));
- position: absolute;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- height: 100%;
- overflow-y: auto;
+ display: grid;
+ grid-template-rows: 1fr min-content;
+ align-items: center;
padding: 4rem;
- main {
- display: contents;
+ .big-logo {
+ font-size: 8rem;
}
- section {
- max-width: 20rem;
+
+ h1 {
+ font-size: 4rem;
}
}
-.full-page {
- height: 100%;
- display: grid;
- grid-template-rows: 1fr;
- align-items: center;
- margin-bottom: 4rem;
-
- &.r {
- -ms-grid-column-align: end;
- }
- .big-logo {
- font-size: 8rem;
- }
-
- h1 {
- font-size: 4rem;
- }
-}
-
h1,
h2,
@@ -134,9 +117,6 @@ h6,
i.i {
margin-right: .5em;
}
-i.hl, .me {
- color: var(--pico-primary);
-}
footer {
text-align: center;
@@ -150,75 +130,3 @@ td.c, th.c {
margin: 0;
}
}
-
-table select {
- margin-bottom: 0;
-}
-
-.podium {
- > :first-child {
- font-weight: 900;
- font-size: 1.25em;
- &::marker {
- color: var(--pico-color-amber-200);
- }
- }
- > :nth-child(2) {
- font-weight: 800;
- font-size: 1.1em;
- &::marker {
- color: var(--pico-color-grey-300);
- }
- }
- > :nth-child(3) {
- font-weight: 600;
- font-size: 1.1em;
- &::marker {
- color: var(--pico-color-sand-300);
- }
- }
- .score {
- margin-left: .5em;
- }
-}
-
-
-.score {
- font-weight: 900;
- color: var(--pico-color-zinc-500);
-}
-.correct {
- .score, i {
- color: var(--pico-color-lime-200);}
-}
-.wrong {
- .score, i {
- color: var(--pico-color-red-500);}
-}
-
-table.results, table.musics {
- white-space: nowrap;
-}
-.sc i {
- margin-right: .5em;
-}
-
-@media (width < 576px) {
- [role="group"] {
- display: grid;
- & > :first-child {
- border-radius: var(--pico-border-radius) var(--pico-border-radius) 0 0 !important;
- }
- & > :not(:first-child) {
- margin-left: 0 !important;
- margin-top: calc(var(--pico-border-width) * -1);
- }
- & > :last-child {
- border-radius: 0 0 var(--pico-border-radius) var(--pico-border-radius) !important;
- }
- }
-}
-
-.brand-name {
- color: var(--pico-primary);
-}
diff --git a/base/static/favicon/apple-touch-icon.png b/base/static/favicon/apple-touch-icon.png
deleted file mode 100644
index abb8a48..0000000
Binary files a/base/static/favicon/apple-touch-icon.png and /dev/null differ
diff --git a/base/static/favicon/favicon-96x96.png b/base/static/favicon/favicon-96x96.png
deleted file mode 100644
index beab288..0000000
Binary files a/base/static/favicon/favicon-96x96.png and /dev/null differ
diff --git a/base/static/favicon/favicon.ico b/base/static/favicon/favicon.ico
deleted file mode 100644
index 178d60c..0000000
Binary files a/base/static/favicon/favicon.ico and /dev/null differ
diff --git a/base/static/favicon/favicon.svg b/base/static/favicon/favicon.svg
deleted file mode 100644
index 63c10e0..0000000
--- a/base/static/favicon/favicon.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/base/static/favicon/site.webmanifest b/base/static/favicon/site.webmanifest
deleted file mode 100644
index af6d059..0000000
--- a/base/static/favicon/site.webmanifest
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name": "MyWebSite",
- "short_name": "MySite",
- "icons": [
- {
- "src": "/web-app-manifest-192x192.png",
- "sizes": "192x192",
- "type": "image/png",
- "purpose": "maskable"
- },
- {
- "src": "/web-app-manifest-512x512.png",
- "sizes": "512x512",
- "type": "image/png",
- "purpose": "maskable"
- }
- ],
- "theme_color": "#aa40bf",
- "background_color": "#ffffff",
- "display": "standalone"
-}
diff --git a/base/static/favicon/web-app-manifest-192x192.png b/base/static/favicon/web-app-manifest-192x192.png
deleted file mode 100644
index f7f97da..0000000
Binary files a/base/static/favicon/web-app-manifest-192x192.png and /dev/null differ
diff --git a/base/static/favicon/web-app-manifest-512x512.png b/base/static/favicon/web-app-manifest-512x512.png
deleted file mode 100644
index 9e4e381..0000000
Binary files a/base/static/favicon/web-app-manifest-512x512.png and /dev/null differ
diff --git a/base/templates/auth/user_form.html b/base/templates/auth/user_form.html
index c895f16..20c40a8 100644
--- a/base/templates/auth/user_form.html
+++ b/base/templates/auth/user_form.html
@@ -1,24 +1,6 @@
{% extends "base.html" %}
{% load form %}
{% block content %}
-
Créer mon compte
- {% for error in form.non_field_errors %}{{ error }} {% endfor %}
-
-{% endblock content %}
+ Créer un compte
+ {% form form submit="Créer mon compte" %}
+ {% endblock content %}
diff --git a/base/templates/base.html b/base/templates/base.html
index 504228f..16be674 100644
--- a/base/templates/base.html
+++ b/base/templates/base.html
@@ -11,7 +11,7 @@
Musik
{% endblock title %}
- {% include "favicon.html" %}
+
-
-
-
-
-
-
diff --git a/base/templates/footer.html b/base/templates/footer.html
index 6c57641..52895f6 100644
--- a/base/templates/footer.html
+++ b/base/templates/footer.html
@@ -1 +1 @@
-Musik {{ VERSION }} – © Edgar P. Burkhart – Mentions légales et confidentialité
+Musik {{ VERSION }} – © Edgar P. Burkhart – Mentions légales
diff --git a/base/templates/hero.html b/base/templates/hero.html
index 813c011..04c2aee 100644
--- a/base/templates/hero.html
+++ b/base/templates/hero.html
@@ -1,25 +1,11 @@
{% load static %}
-
-
-
-
- Musik Le jeu où ta playlist devient ton arme secrète !
-
-
- Invite ta bande, ajoute tes sons fétiches, et c’est parti ! Une playlist Youtube apparaît, mélangeant les coups de cœur de tout le monde. Le jeu ? Écoute, devine qui a choisi quoi, et découvre les secrets musicaux de tes potes. Entre pièges, révélations et fous rires, Musik c’est le jeu parfait pour tester vos oreilles… et vos amitiés. Prêt à jouer le DJ incognito ?
-
-
-
+
+ Musik
+
+ Jouer
+
{% include "footer.html" %}
diff --git a/base/templates/privacy.html b/base/templates/privacy.html
index 1549403..8e78465 100644
--- a/base/templates/privacy.html
+++ b/base/templates/privacy.html
@@ -16,7 +16,6 @@
Youtube est une marque de Google LLC.
- Les données saisies dans Musik (groupes créés, listes de musiques) sont conservées jusqu'à demande de suppression. La suppression du compte entraîne la suppression de l'ensemble des données qui y sont liées.
- La suppression du compte peut être demandée dans les paramètres du compte. La suppression des données est immédiate et définitive.
+ 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/templates/registration/login.html b/base/templates/registration/login.html
index 4e0394e..8bbb8fd 100644
--- a/base/templates/registration/login.html
+++ b/base/templates/registration/login.html
@@ -5,9 +5,9 @@
{% endblock content %}
diff --git a/compose.yaml b/compose.yaml
index a6ee8b3..04838ec 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -32,12 +32,10 @@ services:
rabbitmq:
image: rabbitmq
container_name: musik_rabbitmq
- restart: unless-stopped
postgres:
image: postgres:17
container_name: musik_postgres
- restart: unless-stopped
env_file: stack.env
volumes:
- /docker/musik/postgres:/var/lib/postgresql/data
diff --git a/game/forms.py b/game/forms.py
index a548455..76dec01 100644
--- a/game/forms.py
+++ b/game/forms.py
@@ -39,23 +39,3 @@ class MusikGameForm(forms.ModelForm):
kwargs["initial"].setdefault("players", players)
super().__init__(*args, **kwargs)
self.fields["players"].queryset = players
-
-
-class AnswerForm(forms.Form):
- def __init__(self, *args, **kwargs):
- game = kwargs.pop("game")
- user = kwargs.pop("user")
- super().__init__(*args, **kwargs)
-
- for music in game.musicgameorder_set.all():
- self.fields[f"answer-{music.order}"] = forms.ChoiceField(
- choices=[("", "")]
- + list(game.players.all().values_list("id", "username")),
- required=False,
- label=music.order,
- initial=ma.answer.id
- if (ma := music.musicgameanswer_set.filter(player=user).first())
- and ma.answer
- else "",
- disabled=game.over,
- )
diff --git a/game/migrations/0018_musicgameanswer.py b/game/migrations/0018_musicgameanswer.py
deleted file mode 100644
index 1f760be..0000000
--- a/game/migrations/0018_musicgameanswer.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# Generated by Django 5.2.3 on 2025-06-15 10:36
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ("game", "0017_youtubecredentials_title"),
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
-
- operations = [
- migrations.CreateModel(
- name="MusicGameAnswer",
- fields=[
- (
- "id",
- models.BigAutoField(
- auto_created=True,
- primary_key=True,
- serialize=False,
- verbose_name="ID",
- ),
- ),
- (
- "answer",
- models.ForeignKey(
- null=True,
- on_delete=django.db.models.deletion.SET_NULL,
- related_name="+",
- to=settings.AUTH_USER_MODEL,
- ),
- ),
- (
- "game",
- models.ForeignKey(
- on_delete=django.db.models.deletion.CASCADE,
- to="game.musicgameorder",
- ),
- ),
- (
- "player",
- models.ForeignKey(
- on_delete=django.db.models.deletion.CASCADE,
- to=settings.AUTH_USER_MODEL,
- ),
- ),
- ],
- options={
- "ordering": ["game"],
- "constraints": [
- models.UniqueConstraint(
- fields=("game", "player"), name="unique_answer"
- )
- ],
- },
- ),
- ]
diff --git a/game/migrations/0019_alter_musikgame_options_musikgame_over.py b/game/migrations/0019_alter_musikgame_options_musikgame_over.py
deleted file mode 100644
index f5e4489..0000000
--- a/game/migrations/0019_alter_musikgame_options_musikgame_over.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Generated by Django 5.2.3 on 2025-06-15 10:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ("game", "0018_musicgameanswer"),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name="musikgame",
- options={"ordering": ["-over", "-date"]},
- ),
- migrations.AddField(
- model_name="musikgame",
- name="over",
- field=models.BooleanField(default=False),
- ),
- ]
diff --git a/game/migrations/0020_alter_musikgame_options_musicgameresults.py b/game/migrations/0020_alter_musikgame_options_musicgameresults.py
deleted file mode 100644
index 3af5916..0000000
--- a/game/migrations/0020_alter_musikgame_options_musicgameresults.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# Generated by Django 5.2.3 on 2025-06-15 11:23
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ("game", "0019_alter_musikgame_options_musikgame_over"),
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name="musikgame",
- options={"ordering": ["over", "-date"]},
- ),
- migrations.CreateModel(
- name="MusicGameResults",
- fields=[
- (
- "id",
- models.BigAutoField(
- auto_created=True,
- primary_key=True,
- serialize=False,
- verbose_name="ID",
- ),
- ),
- ("score", models.PositiveIntegerField(default=0)),
- (
- "game",
- models.ForeignKey(
- on_delete=django.db.models.deletion.CASCADE, to="game.musikgame"
- ),
- ),
- (
- "player",
- models.ForeignKey(
- on_delete=django.db.models.deletion.CASCADE,
- to=settings.AUTH_USER_MODEL,
- ),
- ),
- ],
- options={
- "ordering": ["-score"],
- "constraints": [
- models.UniqueConstraint(
- fields=("game", "player"), name="unique_result"
- )
- ],
- },
- ),
- ]
diff --git a/game/migrations/0021_alter_musicgameresults_score.py b/game/migrations/0021_alter_musicgameresults_score.py
deleted file mode 100644
index 3166d4d..0000000
--- a/game/migrations/0021_alter_musicgameresults_score.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 5.2.3 on 2025-06-15 11:33
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ("game", "0020_alter_musikgame_options_musicgameresults"),
- ]
-
- operations = [
- migrations.AlterField(
- model_name="musicgameresults",
- name="score",
- field=models.IntegerField(default=0),
- ),
- ]
diff --git a/game/migrations/0022_musicgameorder_value.py b/game/migrations/0022_musicgameorder_value.py
deleted file mode 100644
index 712353c..0000000
--- a/game/migrations/0022_musicgameorder_value.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by Django 5.2.3 on 2025-06-15 12:49
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ("game", "0021_alter_musicgameresults_score"),
- ]
-
- operations = [
- migrations.AddField(
- model_name="musicgameorder",
- name="value",
- field=models.PositiveIntegerField(default=0),
- ),
- ]
diff --git a/game/migrations/0023_alter_musicvideo_options.py b/game/migrations/0023_alter_musicvideo_options.py
deleted file mode 100644
index ee96adb..0000000
--- a/game/migrations/0023_alter_musicvideo_options.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated by Django 5.2.3 on 2025-06-15 14:19
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ("game", "0022_musicgameorder_value"),
- ]
-
- operations = [
- migrations.AlterModelOptions(
- name="musicvideo",
- options={"ordering": ["blacklisted", "-date_added"]},
- ),
- ]
diff --git a/game/models.py b/game/models.py
index 153583f..1f8ce2f 100644
--- a/game/models.py
+++ b/game/models.py
@@ -1,6 +1,5 @@
from django.contrib.auth.models import User
from django.db import models
-from django.db.models import F
from django.db.models.functions import Lower
from django.db.models.signals import post_delete, post_save
from django.dispatch import receiver
@@ -66,12 +65,6 @@ class MusicVideo(models.Model):
fields=("yt_id", "owner", "group"), name="unique_music_in_group"
)
]
- ordering = ["blacklisted", "-date_added"]
-
-
-class GameManager(models.Manager):
- def playing(self):
- return self.filter(over=False)
class MusikGame(models.Model):
@@ -81,16 +74,10 @@ class MusikGame(models.Model):
players = models.ManyToManyField(User, verbose_name="Joueurs")
playlist = models.CharField(blank=True, verbose_name="Playlist YouTube")
playlist_loading = models.BooleanField(default=False)
- over = models.BooleanField(default=False)
-
- objects = GameManager()
def get_absolute_url(self):
return reverse("game_detail", kwargs={"pk": self.pk})
- class Meta:
- ordering = ["over", "-date"]
-
@receiver(post_save, sender=MusikGame)
def generateYoutubePlaylist(sender, instance, created, **kwargs):
@@ -99,9 +86,6 @@ def generateYoutubePlaylist(sender, instance, created, **kwargs):
if creds := instance.group.owner.youtubecredentials:
tasks.generate_playlist.delay_on_commit(creds.credentials, instance.pk)
- else:
- instance.playlist_loading = False
- instance.save()
@receiver(post_delete, sender=MusikGame)
@@ -118,14 +102,6 @@ class MusicGameOrder(models.Model):
player = models.ForeignKey(User, on_delete=models.CASCADE)
music_video = models.ForeignKey(MusicVideo, on_delete=models.CASCADE)
order = models.PositiveIntegerField()
- value = models.PositiveIntegerField(default=0)
-
- def update_value(self):
- x = self.musicgameanswer_set.filter(game__player=F("answer")).count()
- n = self.game.players.count()
- n = max(3, n)
- self.value = 1000 * 2 ** (-(x - 2) / (n - 2))
- self.save()
class Meta:
constraints = [
@@ -135,44 +111,3 @@ class MusicGameOrder(models.Model):
models.UniqueConstraint(fields=("game", "order"), name="unique_order"),
]
ordering = ["order"]
-
-
-class AnswerManager(models.Manager):
- def score(self, game, player):
- qs = self.filter(game__game=game, player=player)
- return (
- qs.exclude(game__player=player)
- .filter(game__player=F("answer"))
- .aggregate(score=models.Sum("game__value", default=0))
- .get("score")
- - 500
- * qs.filter(game__player=player).exclude(game__player=F("answer")).count()
- )
-
-
-class MusicGameAnswer(models.Model):
- game = models.ForeignKey(MusicGameOrder, on_delete=models.CASCADE)
- player = models.ForeignKey(User, on_delete=models.CASCADE)
- answer = models.ForeignKey(
- User, on_delete=models.SET_NULL, null=True, related_name="+"
- )
-
- objects = AnswerManager()
-
- class Meta:
- constraints = [
- models.UniqueConstraint(fields=("game", "player"), name="unique_answer"),
- ]
- ordering = ["game"]
-
-
-class MusicGameResults(models.Model):
- game = models.ForeignKey(MusikGame, on_delete=models.CASCADE)
- player = models.ForeignKey(User, on_delete=models.CASCADE)
- score = models.IntegerField(default=0)
-
- class Meta:
- constraints = [
- models.UniqueConstraint(fields=("game", "player"), name="unique_result")
- ]
- ordering = ["-score"]
diff --git a/game/tasks.py b/game/tasks.py
index 61937d0..22a7dc0 100644
--- a/game/tasks.py
+++ b/game/tasks.py
@@ -18,7 +18,7 @@ def generate_playlist(creds, game_pk):
"description": "Playlist générée par Musik",
},
"status": {
- "privacyStatus": "unlisted",
+ "privacyStatus": "private",
},
},
)
diff --git a/game/templates/game/group_detail.html b/game/templates/game/group_detail.html
index 90e9901..d523f29 100644
--- a/game/templates/game/group_detail.html
+++ b/game/templates/game/group_detail.html
@@ -10,7 +10,115 @@
{{ group.name }}
{% include "game/include/group_buttons.html" %}
- {% include "game/include/group_games.html" %}
+ {% if group.musikgame_set.exists %}
+
+ Parties
+
+
+ {% endif %}
{% include "game/include/group_members.html" %}
- {% include "game/include/group_musics.html" %}
+
+ Mes musiques {{ musics.count }}
+
+
+
+ Liste des musiques
+
+
+
+
{% endblock content %}
diff --git a/game/templates/game/include/game_results.html b/game/templates/game/include/game_results.html
deleted file mode 100644
index ca2821c..0000000
--- a/game/templates/game/include/game_results.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{% load game %}
-{% if musikgame.over %}
-
- Résultats
-
-
-
- Résultats
-
-
-
-
-
-
-
-
-
- Musique
-
-
- Joueur
-
- {% for player in musikgame.musicgameresults_set.all %}
- {{ player.player.username }}
-
- {% if forloop.first %} {% endif %}
- {{ player.score }}
-
- {% endfor %}
-
-
-
- {% for music in musikgame.musicgameorder_set.all %}
-
- {{ music.order }}
-
- {{ music.music_video.title }}
-
- {{ music.player }}
- {% for player in musikgame.musicgameresults_set.all %}
- {% answer player music %}
- {% endfor %}
-
- {% endfor %}
-
-
-
-
-{% endif %}
diff --git a/game/templates/game/include/group_games.html b/game/templates/game/include/group_games.html
deleted file mode 100644
index 15016fb..0000000
--- a/game/templates/game/include/group_games.html
+++ /dev/null
@@ -1,62 +0,0 @@
-{% load form youtube %}
-{% if group.musikgame_set.exists %}
- {% for game in group.musikgame_set.playing %}
-
- {{ game.date }}
-
- {% endfor %}
-
- Parties
-
-
-{% endif %}
diff --git a/game/templates/game/include/group_members.html b/game/templates/game/include/group_members.html
index daf3059..3b668e5 100644
--- a/game/templates/game/include/group_members.html
+++ b/game/templates/game/include/group_members.html
@@ -12,7 +12,7 @@
-
+
diff --git a/game/templates/game/include/group_musics.html b/game/templates/game/include/group_musics.html
deleted file mode 100644
index 56117cf..0000000
--- a/game/templates/game/include/group_musics.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
- Mes musiques {{ musics.count }}
-
-
-
- Liste des musiques
-
-
-
-
diff --git a/game/templates/game/musikgame_answer.html b/game/templates/game/musikgame_answer.html
deleted file mode 100644
index f947802..0000000
--- a/game/templates/game/musikgame_answer.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends "base.html" %}
-{% block content %}
- Mes réponses
-
- {% csrf_token %}
-
-
-
-
-
-
- Réponse
-
-
-
- {% for field in form %}
-
- {{ field.label }}
- {{ field }}
-
- {% endfor %}
-
-
- {% if not musikgame.over %}Sauvegarder mes réponses {% endif %}
-
-{% endblock content %}
diff --git a/game/templates/game/musikgame_detail.html b/game/templates/game/musikgame_detail.html
index 66708c0..444c7f1 100644
--- a/game/templates/game/musikgame_detail.html
+++ b/game/templates/game/musikgame_detail.html
@@ -2,52 +2,20 @@
{% load youtube %}
{% block content %}
- {% if musikgame.over %}
-
- {% else %}
-
- {% endif %}
- {{ musikgame.date }}
+ {{ musikgame.date }}
-
- {% csrf_token %}
-
- {% if musikgame.playlist or musikgame.playlist_loading %}
- Playlist
- {% endif %}
- {% if musikgame.over %}
- Mes réponses
- {% else %}
- Répondre
- {% endif %}
-
- {% if is_leader and not musikgame.over %}
-
-
- Finir la partie
-
-
- {% endif %}
-
+ {% if musikgame.playlist or musikgame.playlist_loading %}
+
+ Playlist
+
+ {% endif %}
Joueurs
- {% if musikgame.over %}
-
- {% for player in musikgame.musicgameresults_set.all %}
-
- {{ player.player.username }} {{ player.score }}
-
- {% endfor %}
-
- {% else %}
- {{ musikgame.players.all|join:", " }}
- {% endif %}
+ {{ musikgame.players.all|join:", " }}
Musiques
@@ -63,5 +31,38 @@
{% endfor %}
- {% include "game/include/game_results.html" %}
+
+ Résultats
+
+
+
+ Résultats
+
+
+
+
+
+
+
+
+ Musique
+
+
+ Joueur
+
+
+
+
+ {% for music in musikgame.musicgameorder_set.all %}
+
+ {{ music.order }}
+
+ {{ music.music_video.title }}
+
+ {{ music.player }}
+
+ {% endfor %}
+
+
+
{% endblock content %}
diff --git a/game/templates/game/musikgame_form.html b/game/templates/game/musikgame_form.html
index 655723a..38ed5b6 100644
--- a/game/templates/game/musikgame_form.html
+++ b/game/templates/game/musikgame_form.html
@@ -5,12 +5,10 @@
{{ group.name }}
- {% if group.owner.youtubecredentials.credentials %}
- Une playlist sera générée automatiquement sur le compte Youtube de {{ group.owner }} ({{ group.owner.youtubecredentials.title }} ).
- {% elif user == group.owner %}
- Connecter mon compte Youtube
+ {% if not user.youtubecredentials.credentials %}
+ Me connecter au compte Youtube
{% else %}
- Aucune playlist Youtube ne sera générée car {{ group.owner }} n'a pas lié son compte Youtube.
+ Une playlist sera générée automatiquement sur le compte Youtube {{ user.youtubecredentials.title }} .
{% endif %}
{% form form %}
diff --git a/game/templates/tags/game/answer.html b/game/templates/tags/game/answer.html
deleted file mode 100644
index bfdeba5..0000000
--- a/game/templates/tags/game/answer.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% if empty %}
-
-
- {{ score }}
-
-{% elif correct %}
- {{ answer }}
-
- {{ score }}
-
-{% else %}
- {{ answer }}
-
- {{ score }}
-
-{% endif %}
diff --git a/game/templatetags/game.py b/game/templatetags/game.py
deleted file mode 100644
index eec1bd0..0000000
--- a/game/templatetags/game.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from django import template
-
-from .. import models
-
-register = template.Library()
-
-
-@register.inclusion_tag("tags/game/answer.html")
-def answer(player, music):
- res = {
- "answer": "",
- "correct": False,
- "score": 0,
- "empty": False,
- }
-
- answer = models.MusicGameAnswer.objects.filter(
- player=player.player, game=music
- ).first()
- if answer:
- res["answer"] = answer.answer
- res["correct"] = answer.answer == music.player
- if music.player == player.player:
- res["score"] = 0 if res["correct"] else "−500"
- else:
- res["score"] = music.value if res["correct"] else 0
- else:
- res["empty"] = True
-
- return res
diff --git a/game/urls.py b/game/urls.py
index 927dc79..6ec4cfa 100644
--- a/game/urls.py
+++ b/game/urls.py
@@ -63,10 +63,4 @@ urlpatterns = [
views.GroupClearBlacklistView.as_view(),
name="group_clear_blacklist",
),
- path(
- "group/game//answer/",
- views.GameAnswerView.as_view(),
- name="game_answer",
- ),
- path("group/game//end/", views.GameEndView.as_view(), name="game_end"),
]
diff --git a/game/views.py b/game/views.py
index 45685aa..3716424 100644
--- a/game/views.py
+++ b/game/views.py
@@ -104,31 +104,28 @@ class GroupAddMusicView(MemberFilterMixin, SingleObjectMixin, View):
def post(self, request, pk):
group = self.get_object()
- ids = request.POST.get("yt_id")
- for yt_id in ids.split():
- if not yt_id:
- messages.add_message(request, messages.ERROR, "Aucun identifiant donné")
- return redirect(group)
- yt_id = utils.parse_musik(yt_id)
+ yt_id = request.POST.get("yt_id")
+ if not yt_id:
+ messages.add_message(request, messages.ERROR, "Aucun identifiant donné")
+ return redirect(group)
+ yt_id = utils.parse_musik(yt_id)
- title = utils.get_yt_title(yt_id)
- if not title:
- messages.add_message(
- request, messages.ERROR, f"Vidéo Youtube invalide : {yt_id}"
- )
- else:
- try:
- group.musicvideo_set.create(
- yt_id=yt_id, title=title, owner=request.user
- )
- except IntegrityError:
- messages.add_message(
- request, messages.ERROR, f"Vidéo Youtube déjà ajoutée : {yt_id}"
- )
+ title = utils.get_yt_title(yt_id)
+ if not title:
+ messages.add_message(
+ request, messages.ERROR, f"Vidéo Youtube invalide : {yt_id}"
+ )
+ return redirect(group)
+ try:
+ group.musicvideo_set.create(yt_id=yt_id, title=title, owner=request.user)
+ except IntegrityError:
+ messages.add_message(
+ request, messages.ERROR, f"Vidéo Youtube déjà ajoutée : {yt_id}"
+ )
- messages.add_message(
- request, messages.SUCCESS, f"Vidéo Youtube ajoutée : {yt_id}"
- )
+ messages.add_message(
+ request, messages.SUCCESS, f"Vidéo Youtube ajoutée : {yt_id}"
+ )
return redirect(group)
@@ -139,24 +136,19 @@ class GroupAddMemberView(MemberFilterMixin, SingleObjectMixin, View):
group = self.get_object()
if not group.is_leader(request.user):
raise PermissionDenied()
- usernames = request.POST.get("username")
- for username in usernames.split():
- user = User.objects.filter(username=username).first()
- if not user:
- messages.add_message(
- request, messages.ERROR, f"{username} n'existe pas."
- )
- elif user == group.owner:
- messages.add_message(
- request, messages.WARNING, f"{user} est le propriétaire du groupe."
- )
- elif user in group.members.all():
- messages.add_message(
- request, messages.WARNING, f"{user} est déjà membre du groupe."
- )
- else:
- group.members.add(user)
+ username = request.POST.get("username")
+ user = User.objects.get(username=username)
+ if user == group.owner:
+ messages.add_message(
+ request, messages.WARNING, f"{user} est le propriétaire du groupe."
+ )
+ return redirect(group)
+ if user in group.members.all():
+ messages.add_message(
+ request, messages.WARNING, f"{user} est déjà membre du groupe."
+ )
+ group.members.add(user)
return redirect(group)
@@ -327,12 +319,15 @@ class GameCreateView(LoginRequiredMixin, CreateView):
pm_list = list(zip(players, musics))
random.shuffle(pm_list)
for (player, music), order in zip(pm_list, range(1, len(pm_list) + 1)):
+ music.blacklisted = True
+ music.save()
models.MusicGameOrder.objects.create(
game=form.instance, player=player, music_video=music, order=order
)
- form.instance.playlist_loading = True
- form.instance.save()
+ if models.YoutubeCredentials.objects.filter(user=self.request.user).exists():
+ form.instance.playlist_loading = True
+ form.instance.save()
return res
@@ -349,12 +344,6 @@ class GameDetailView(LoginRequiredMixin, DetailView):
.distinct()
)
- def get_context_data(self, **kwargs):
- data = super().get_context_data(**kwargs)
- data["is_leader"] = data["musikgame"].group.is_leader(self.request.user)
- data["is_owner"] = data["musikgame"].group.is_owner(self.request.user)
- return data
-
class YoutubeCallbackView(LoginRequiredMixin, View):
def get(self, request):
@@ -432,64 +421,3 @@ class GroupClearBlacklistView(MemberFilterMixin, SingleObjectMixin, View):
group.musicvideo_set.filter(blacklisted=True).update(blacklisted=False)
messages.add_message(request, messages.SUCCESS, "La blacklist a été effacée.")
return redirect(group)
-
-
-class GameAnswerView(LoginRequiredMixin, DetailView):
- model = models.MusikGame
- template_name = "game/musikgame_answer.html"
-
- def get_queryset(self):
- return super().get_queryset().filter(players=self.request.user)
-
- def get_context_data(self, **kwargs):
- return super().get_context_data(**kwargs) | {
- "form": forms.AnswerForm(game=self.object, user=self.request.user)
- }
-
- def post(self, request, pk):
- game = self.get_object()
- if game.over:
- raise PermissionDenied()
- for music in game.musicgameorder_set.all():
- answer = request.POST.get(f"answer-{music.order}")
- if answer:
- models.MusicGameAnswer.objects.update_or_create(
- game=music,
- player=request.user,
- defaults={"answer": game.players.get(pk=answer)},
- )
- else:
- models.MusicGameAnswer.objects.update_or_create(
- game=music,
- player=request.user,
- defaults={"answer": None},
- )
- return redirect("game_answer", pk)
-
-
-class GameEndView(LoginRequiredMixin, SingleObjectMixin, View):
- model = models.MusikGame
-
- def get_queryset(self):
- return super().get_queryset().filter(over=False)
-
- def post(self, request, pk):
- game = self.get_object()
- if not game.group.is_leader(request.user):
- raise PermissionDenied()
- game.over = True
- models.MusicVideo.objects.filter(musicgameorder__game=game).update(
- blacklisted=True
- )
-
- for go in game.musicgameorder_set.all():
- go.update_value()
-
- for player in game.players.all():
- score = player.musicgameanswer_set.score(game, player)
- models.MusicGameResults.objects.create(
- game=game, player=player, score=score
- )
-
- game.save()
- return redirect("game_detail", pk)
diff --git a/musik/settings.py b/musik/settings.py
index 0f097d7..764863f 100644
--- a/musik/settings.py
+++ b/musik/settings.py
@@ -13,7 +13,7 @@ https://docs.djangoproject.com/en/5.2/ref/settings/
import os
from pathlib import Path
-VERSION = "0.4.4"
+VERSION = "0.2.0"
# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent
diff --git a/pyproject.toml b/pyproject.toml
index 0be7cd8..d29d983 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[project]
name = "musik"
-version = "0.4.4"
+version = "0.2.0"
description = "Le jeu de Musik."
readme = "README.md"
requires-python = ">=3.12"
diff --git a/uv.lock b/uv.lock
index 21e0387..e30935f 100644
--- a/uv.lock
+++ b/uv.lock
@@ -423,7 +423,7 @@ wheels = [
[[package]]
name = "musik"
-version = "0.4.4"
+version = "0.2.0"
source = { virtual = "." }
dependencies = [
{ name = "celery" },