Merge branch '21-host-und-spiel-app-erstellen-und-grundlegende-templates-erstellen' into 'master'

Resolve "Host und Spiel App erstellen und Grundlegende Templates erstellen"

Closes #21

See merge request enrichment-2024/qivip!9

core/core/settings.py

@@ -35,7 +35,7 @@ INSTALLED_APPS = [
     'homepage.apps.HomepageConfig',
     'components.apps.ComponentsConfig',
     'accounts.apps.AccountsConfig',
-    'play.apps.PlayConfig',
+    'play',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',

core/play/admin.py

@@ -1,3 +1,6 @@
 from django.contrib import admin
+from .models import QuizGame, QuizGameParticipant
 
 # Register your models here.
+admin.site.register(QuizGame)
+admin.site.register(QuizGameParticipant)

core/play/migrations/0001_initial.py

@@ -0,0 +1,37 @@
+# Generated by Django 5.1.7 on 2025-03-15 13:48
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('library', '0015_alter_qivipquiz_difficulty'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='QuizGame',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('join_code', models.CharField(max_length=6, unique=True)),
+                ('host_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='host_user', to=settings.AUTH_USER_MODEL)),
+                ('quiz_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='library.qivipquiz')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='QuizGameParticipant',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('display_name', models.CharField(max_length=15, verbose_name='Anzeigename')),
+                ('score', models.IntegerField(max_length=10, verbose_name='Punkte')),
+                ('avatar', models.CharField(max_length=200)),
+                ('quiz_game', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='participant', to='play.quizgame')),
+            ],
+        ),
+    ]

core/play/migrations/0002_alter_quizgame_join_code.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-03-15 13:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('play', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='quizgame',
+            name='join_code',
+            field=models.CharField(blank=True, max_length=6, unique=True),
+        ),
+    ]

core/play/models.py

@@ -1,3 +1,27 @@
 from django.db import models
+from django.contrib.auth.models import User
+from library.models import QivipQuiz
+import random, string
 
 # Create your models here.
+class QuizGame(models.Model):
+    host_user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='host_user')
+    join_code = models.CharField(max_length=6, unique=True, blank=True)
+    quiz_id = models.ForeignKey(QivipQuiz, on_delete=models.CASCADE)
+
+    def save(self, *args, **kwargs):
+        if not self.join_code:
+            self.join_code = self.generate_unique_code()
+        super().save(*args, **kwargs)
+
+    def generate_unique_code(self):
+        for i in range(10):
+            new_code = ''.join(random.choices(string.ascii_letters + string.digits, k=6))
+            if not QuizGame.objects.filter(join_code=new_code).exists():
+                return new_code
+
+class QuizGameParticipant(models.Model):
+    display_name = models.CharField(verbose_name="Anzeigename", max_length=15)
+    quiz_game = models.ForeignKey(QuizGame, on_delete=models.CASCADE, related_name="participant")
+    score = models.IntegerField(verbose_name="Punkte", max_length=10)
+    avatar = models.CharField(max_length=200)

core/play/urls.py

@@ -4,6 +4,6 @@ from . import views
 app_name = 'play'
 
 urlpatterns = [
-    path('lobby', views.lobby, name='lobby'),
+    path('lobby/<str:join_code>', views.lobby, name='lobby'),
     path('join', views.join_game, name='join_game'),
 ]

core/play/views.py

@@ -1,8 +1,20 @@
 from django.shortcuts import render
+from django.shortcuts import render, redirect, get_object_or_404
+from play.models import QuizGame
+from library.models import QivipQuiz
 
 # Create your views here.
-def lobby(request):
+def lobby(request, join_code):
-    return render(request, 'play/lobby.html')
+    quiz_game = get_object_or_404(QuizGame, join_code=join_code)
+    return render(request, 'play/lobby.html', {'debug': "test"})
 
 def join_game(request):
+    if request.method == 'POST':
+        join_code = request.POST.get('game_code')
+        try:
+            quiz = QuizGame.objects.get(join_code=join_code)
+            return redirect('play:lobby', join_code=join_code)
+        except QuizGame.DoesNotExist:
+            # TODO: Mit message eine Fehlermeldung weitergeben (und im entsprechenden Template Designen)
+            pass
     return render(request, 'play/join_game.html')

core/templates/play/game/score_overview.html

@@ -0,0 +1,5 @@
+<!--> 
+    Spieler sehen ihre Punktzahl, Platzierung und Richtig/Falsch
+
+    Host: Scoreboard, Button: 'Weiter'
+</!-->

core/templates/play/game/wait_for_other_players.html

@@ -0,0 +1,5 @@
+<!--> 
+    Spieler: Countdown, automatische Weiterleitung
+
+    (Host: Frage)
+</!-->

core/templates/play/join_game.html

@@ -7,7 +7,7 @@
         <form action="{% url 'play:join_game' %}" method="post" class="flex flex-col gap-4">
             {% csrf_token %}
             <div class="flex gap-3 items-center justify-center">
-                <input type="text" name="game_code" placeholder="XXX-XXX" maxlength="7" pattern="[A-Za-z0-9]{3}-[A-Za-z0-9]{3}" class="w-32 p-3 rounded-full bg-gray-200 focus:scale-105 transition duration-200 font-black focus:outline-none focus:ring-2 focus:ring-blue-400 focus:bg-blue-100 text-center uppercase tracking-wider" oninput="let v = this.value.replace(/[^A-Za-z0-9]/g, '').slice(0,6).toUpperCase(); this.value = v.length > 3 ? v.slice(0,3) + '-' + v.slice(3) : v;" autofocus>
+                <input type="text" name="game_code" placeholder="XXX-XXX" maxlength="7" class="w-32 p-3 rounded-full bg-gray-200 focus:scale-105 transition duration-200 font-black focus:outline-none focus:ring-2 focus:ring-blue-400 focus:bg-blue-100 text-center tracking-wider"  autofocus>
                 <button type="submit" class="h-12 px-6 rounded-full bg-blue-600 text-white font-black hover:scale-105 transition duration-200 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed hover:bg-blue-700 active:scale-95 group" disabled>
                     <span class="hidden sm:block">Beitreten</span>
                     <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="w-5 h-5 transition-transform group-hover:translate-x-1">

core/templates/play/lobby.html

@@ -9,6 +9,7 @@
             <li>Spieler 2</li>
             <li>Spieler 3</li>
         </ul>
+        {{debug}}
     </div>
     <button class="w-full p-3 rounded-full bg-blue-600 text-white font-black hover:scale-105 transition duration-200" type="submit">Starten</button>
 </div>