Footer immer Unten

Resolve "Quiz Fragen Templates erstellen"

Closes #48

See merge request enrichment-2024/qivip!15

django/library/admin.py

@@ -9,7 +9,7 @@ class QivipQuizAdmin(admin.ModelAdmin):
 
 # Für das QivipQuestion Modell
 class QivipQuestionAdmin(admin.ModelAdmin):
-    list_display = ('quiz_id', 'data', 'creation_date', 'update_date')
+    list_display = ('id', 'quiz_id', 'data', 'creation_date', 'update_date')
     search_fields = ('data',)
     list_filter = ('quiz_id',)
 

django/library/views.py

@@ -69,7 +69,7 @@ def overview_quiz(request):
         
             # Anzahl der Quiz pro Seite für Swiper
 
-
+        print("kein Filter ,form_valid")
         context = {
             'show_search': True,
             'filter_my_quizzes': filter_my_quizzes,
@@ -82,28 +82,6 @@ def overview_quiz(request):
 
       
 
-
-    try:
-        filter_my_quizzes = QivipQuiz.objects.filter(user_id=request.user)
-        filter_other_quizzes = QivipQuiz.objects.filter(status='öffentlich').exclude(user_id=request.user).filter(question__isnull=False).distinct()
-        context = {
-            'show_search': True,
-            'filter_my_quizzes': filter_my_quizzes,
-            'filter_other_quizzes': filter_other_quizzes,
-            'form': form,
-        }
-        return render(request, 'library/overview_quiz.html', context)
-
-    except:
-        filter_other_quizzes = QivipQuiz.objects.filter(status='öffentlich').filter(question__isnull=False).distinct()
-        context = {
-            'show_search': True,
-            'filter_my_quizzes': None,
-            'filter_other_quizzes': filter_other_quizzes,
-            'form': form,
-        }
-        return render(request, 'library/overview_quiz.html', context)
-    
     
 # Neues Quiz erstellen
 @login_required

django/play/urls.py

@@ -4,7 +4,9 @@ from . import views
 app_name = 'play'
 
 urlpatterns = [
-    path('lobby/<str:join_code>', views.lobby, name='lobby'),
+    path('game/<str:join_code>', views.lobby, name='lobby'),
-    path('lobby/<str:join_code>/participate', views.create_participant, name='create_participant'),
+    path('game/<str:join_code>/participate', views.create_participant, name='create_participant'),
     path('join', views.join_game, name='join_game'),
+    path('game/<str:join_code>/<int:question_id>', views.question, name='question'),
+        path('game/<str:join_code>/<int:question_id>/participant', views.question_participant, name='question_participant'),
 ]

django/play/views.py

@@ -1,9 +1,11 @@
 from django.shortcuts import render
 from django.shortcuts import render, redirect, get_object_or_404, reverse
 from play.models import QuizGame, QuizGameParticipant
-from library.models import QivipQuiz
+from library.models import QivipQuiz, QivipQuestion
 from django.http import HttpResponseRedirect
 
+import json
+
 # Create your views here.
 def lobby(request, join_code):
     if not "participant_id" in request.COOKIES:
@@ -57,4 +59,28 @@ def join_game(request):
         except QuizGame.DoesNotExist:
             # TODO: Mit message eine Fehlermeldung weitergeben (und im entsprechenden Template Designen)
             pass
-    return render(request, 'play/join_game.html')
+    return render(request, 'play/join_game.html')
+
+def question(request, join_code, question_id):
+    question = get_object_or_404(QivipQuestion, pk=question_id)
+
+    if question.data:
+            question.data = json.loads(question.data)
+
+    context = {
+        'question': question,
+    }
+
+    return render(request, 'play/game/question_host.html', {'question': question, 'debug': "debug"})
+
+def question_participant(request, join_code, question_id):
+    question = get_object_or_404(QivipQuestion, pk=question_id)
+
+    if question.data:
+            question.data = json.loads(question.data)
+
+    context = {
+        'question': question,
+    }
+
+    return render(request, 'play/game/question_participant.html', {'question': question, 'debug': "debug"})

django/static/css/t-input.css

@@ -50,4 +50,61 @@ a.qp-a-button-small {
 .input-group form p button {
     @apply p-3 rounded-full bg-indigo-500 hover:bg-indigo-600 text-white focus:scale-105 
     transition duration-200 font-black shadow-md hover:shadow-lg;
+}
+
+
+
+
+
+
+
+
+
+
+
+div.qp-answer-container {
+    @apply grid grid-cols-2 h-screen;
+}
+
+div.qp-answer-container div {
+    @apply grid place-content-center rounded-xl m-2 place-self-stretch text-white transition duration-300;
+    @apply nth-1:bg-green-500 hover:nth-1:bg-green-600;
+    @apply nth-2:bg-red-500 hover:nth-2:bg-red-600;
+    @apply nth-3:bg-blue-500 hover:nth-3:bg-blue-600;
+    @apply nth-4:bg-yellow-500 hover:nth-4:bg-yellow-600;
+    @apply nth-5:bg-purple-500 hover:nth-5:bg-purple-600;
+    @apply nth-6:bg-black hover:nth-6:bg-slate-800;
+}
+
+div.qp-answer-container div p {
+    @apply font-black text-xl sm:text-2xl md:text-4xl;
+}
+
+
+
+
+div.qp-answer-container-host {
+    @apply grid grid-cols-2 absolute bottom-0 w-screen xl:px-20 xl:pb-10;
+}
+
+div.qp-answer-container-host div {
+    @apply grid place-content-center rounded-xl m-1 place-self-stretch text-white transition duration-300;
+    @apply nth-1:bg-green-500 hover:nth-1:bg-green-600;
+    @apply nth-2:bg-red-500 hover:nth-2:bg-red-600;
+    @apply nth-3:bg-blue-500 hover:nth-3:bg-blue-600;
+    @apply nth-4:bg-yellow-500 hover:nth-4:bg-yellow-600;
+    @apply nth-5:bg-purple-500 hover:nth-5:bg-purple-600;
+    @apply nth-6:bg-black hover:nth-6:bg-slate-800;
+}
+
+div.qp-answer-container-host div p {
+    @apply font-black text-xl p-4;
+}
+
+div.qp-question-container {
+    @apply text-center text-3xl px-4 py-9 h-screen;
+}
+
+div.qp-question-container img {
+    @apply max-w-[50vw] max-h-[40vh] mx-auto;
 }

django/templates/base.html

@@ -10,8 +10,13 @@
 </head>
 <body>
     {% include 'partials/_nav.html' %}
-    {% block content%}{% endblock %}
+    <div class="flex flex-col h-screen overflow-x-hidden">
-    {% include 'partials/_footer.html' %}
+            {% block content%}{% endblock %}
+            <div class="fixed bottom-0 w-full">
+                {% include 'partials/_footer.html' %}
+            </div>
+    </div>
+
     {% block extra_js %}{% endblock %}
 </body>
 </html>

django/templates/library/detail_quiz.html

@@ -5,8 +5,17 @@
     <div class="flex justify-between items-center mb-6">
         <h1 class="text-2xl font-bold">{{ quiz.name }}</h1>
         <div class="flex space-x-2">
-            <a href="{% url 'library:edit_quiz' quiz.id %}" class=" text-white px-4 py-2 rounded-md text-sm lg:text-lg hover:scale-110 transition-colors">&#x270F</a>
+            <a href="{% url 'library:edit_quiz' quiz.id %}" class=" text-white px-4 py-2 rounded-md text-sm lg:text-lg hover:scale-110 transition-colors">
-            <a href="{% url 'library:delete_quiz' quiz.id %}" class=" text-white px-4 py-2 rounded-md text-sm lg:text-lg hover:scale-110 transition-colors">&#x1F5D1</a>
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-7 text-gray-600">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10" />
+                  </svg>
+                  
+            </a>
+            <a href="{% url 'library:delete_quiz' quiz.id %}" class=" text-white px-4 py-2 rounded-md text-sm lg:text-lg hover:scale-110 transition-colors">
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-7 text-gray-600">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
+                  </svg>
+            </a>
         </div>
     </div>
 
@@ -89,7 +98,10 @@
                                 
                                 <a href=" {% url 'library:delete_question' question.id %}" 
                 class="  text-red-700 px-4 py-1 rounded hover:scale-110 ">
-                &#x1F5D1
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-7 text-gray-600">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
+                  </svg>
+                  
              </a>
                             
                             </div>

django/templates/library/overview_quiz.html

@@ -3,7 +3,6 @@
 {% load static %}
 <head>
   <meta charset="utf-8" />
-  <title>Swiper Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <link rel="stylesheet" href="{% static 'swiper/swiper-bundle.min.css' %}">
   <style>
@@ -75,8 +74,18 @@
         <div class="flex justify-between items-center gap-2 ">
           <a href="#" class="qp-a-button-small border-2 border-blue-600 text-white font-bold text-white drop-shadow-lg custom-outline">Spiel starten</a>
           <div class="flex gap-2">
-            <a href="{% url 'library:detail_quiz' quiz.id %}" class="qp-a-button-small border-2 border-blue-600 text-white text-white font-bold text-white drop-shadow-lg custom-outline">&#x270F;</a>
+            <a href="{% url 'library:detail_quiz' quiz.id %}" class="qp-a-button-small border-2 border-blue-600 text-white text-white font-bold text-white drop-shadow-lg custom-outline">
-            <a href="{% url 'library:delete_quiz' quiz.id %}" class="qp-a-button-small border-2 border-blue-600 text-white text-white font-bold text-white drop-shadow-lg custom-outline">&#x1F5D1;</a>
+              <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-7">
+                <path stroke-linecap="round" stroke-linejoin="round" d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10" />
+              </svg>
+              </a>
+            <a href="{% url 'library:delete_quiz' quiz.id %}" class="qp-a-button-small border-2 border-blue-600 text-white text-white font-bold text-white drop-shadow-lg custom-outline">
+             
+              <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-7">
+                <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
+              </svg>
+              
+            </a>
           </div>
         </div>
     
@@ -121,7 +130,12 @@
       <!-- Buttons bleiben am unteren Rand -->
       <div class="flex justify-between items-center gap-2 ">
         <a href="#" class="qp-a-button-small border-2 border-blue-600 text-white font-bold text-white drop-shadow-lg custom-outline">Spiel starten</a>
-        <a href="{% url 'library:detail_quiz' quiz.id %}" class="qp-a-button-small border-2 border-blue-600 text-white text-white font-bold text-white drop-shadow-lg custom-outline">&#x270F;</a>
+        <a href="{% url 'library:detail_quiz' quiz.id %}" class="qp-a-button-small border-2 border-blue-600 text-white text-white font-bold text-white drop-shadow-lg custom-outline">
+          <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-7">
+            <path stroke-linecap="round" stroke-linejoin="round" d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
+          </svg>
+
+        </a>
         <div class="flex gap-2">
           <a href="{% url 'library:overview_quiz' %}?user={{ quiz.user_id }}" class="text-gray-600 text-sm">
           <button type="submit" class=" text-sm py-1 text-white font-bold text-white drop-shadow-lg custom-outline hover:text-gray-300"> Quiz von {{ quiz.user_id }}</button>

django/templates/partials/_nav.html

@@ -10,7 +10,9 @@
         <input type="text" name="search" placeholder="Suche ..." value="{{ request.GET.search }}"
             class="w-full px-3 py-1 text-black bg-transparent focus:outline-none">
         <button type="submit" class=" py-1 text-blue-600">
-            🔍
+            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+                <path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
+              </svg>              
         </button>
     </form>
     {% endif %}

django/templates/play/game/question_host.html

@@ -0,0 +1,35 @@
+{% load static %}
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="{% static 'css/t-style.css' %}">
+    <title>qivip</title>
+</head>
+<body>
+    <div>
+        <div  class="qp-question-container">
+            <p class="text-gray-700 font-bold text-xl uppercase">Frage X</p>
+            <img src="integral.png">
+            <h1>Frage: {{ question.data.question }}</h1>
+            <div>
+                <div class="p-4">
+                    <p class="text-blue-500 text-xl">Verbleibende Zeit:</p>
+                    <p id="remaining_time" class="text-6xl">36</p>
+                </div>
+                <div class="p-4">
+                    <p class="text-blue-500 text-xl">7/14 Antworten</p>
+                </div>
+            </div>
+        </div>
+        <div class="qp-answer-container-host" id="qp-answer-container-host">
+            {% for option in question.data.options %}
+                <div>
+                    <p>{{ option.value }}</p>
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+</body>
+</html>

django/templates/play/game/question_participant.html

@@ -0,0 +1,19 @@
+{% load static %}
+<!DOCTYPE html>
+<html lang="de">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="{% static 'css/t-style.css' %}">
+    <title>qivip</title>
+</head>
+<body>
+    <div class="qp-answer-container" id="qp-answer-container">
+        {% for option in question.data.options %}
+                <div>
+                    <p>{{ option.value }}</p>
+                </div>
+        {% endfor %}
+    </div>
+</body>
+</html>