Merge branch '54-filter-fur-library' into 'master'

Resolve "Filter für library"

Closes #54

See merge request enrichment-2024/qivip!21

.gitignore

@@ -4,3 +4,5 @@ db.sqlite3
 tailwindcss.exe
 t-style.css
 dump.rdb
+media
+node_modules

README.md

@@ -100,10 +100,10 @@ npx @tailwindcss/cli -i <INPUT-DATEI> -o <OUTPUT-DATEI> --watch --minify
 
 ```sh
 # unter Linux mit Tailwind Binärdatei:
-tailwindcss -i core/static/homepage/t-input.css -o core/static/homepage/t-style.css --watch --minify
+tailwindcss -i static/css/t-input.css -o static/css/t-style.css --watch --minify
 
-# unter Windows mit NPM:
-npx @tailwindcss/cli -i .\core\static\homepage\t-input.css -o .\core\static\homepage\t-style.css --watch --minify
+# unter Windows mit NPM (in bash mit '/' statt '\'):
+npx @tailwindcss/cli -i .\static\css\t-input.css -o .\static\css\t-style.css --watch --minify
 ```
 
 ## Issue - Merge Request - Merge

core/chat/consumers.py

@@ -1,40 +0,0 @@
-import json
-
-from asgiref.sync import async_to_sync
-from channels.generic.websocket import WebsocketConsumer
-
-
-class ChatConsumer(WebsocketConsumer):
-    def connect(self):
-        self.room_name = self.scope["url_route"]["kwargs"]["room_name"]
-        self.room_group_name = f"chat_{self.room_name}"
-
-        # Join room group
-        async_to_sync(self.channel_layer.group_add)(
-            self.room_group_name, self.channel_name
-        )
-
-        self.accept()
-
-    def disconnect(self, close_code):
-        # Leave room group
-        async_to_sync(self.channel_layer.group_discard)(
-            self.room_group_name, self.channel_name
-        )
-
-    # Receive message from WebSocket
-    def receive(self, text_data):
-        text_data_json = json.loads(text_data)
-        message = text_data_json["message"]
-
-        # Send message to room group
-        async_to_sync(self.channel_layer.group_send)(
-            self.room_group_name, {"type": "chat.message", "message": message}
-        )
-
-    # Receive message from room group
-    def chat_message(self, event):
-        message = event["message"]
-
-        # Send message to WebSocket
-        self.send(text_data=json.dumps({"message": message}))

core/chat/routing.py

@@ -1,8 +0,0 @@
-# chat/routing.py
-from django.urls import re_path
-
-from . import consumers
-
-websocket_urlpatterns = [
-    re_path(r"ws/chat/(?P<room_name>\w+)/$", consumers.ChatConsumer.as_asgi()),
-]

core/chat/urls.py

@@ -1,9 +0,0 @@
-# chat/urls.py
-from django.urls import path
-
-from . import views
-
-urlpatterns = [
-    path("", views.index, name="index"),
-    path("<str:room_name>/", views.room, name="room"),
-]

core/chat/views.py

@@ -1,8 +0,0 @@
-# chat/views.py
-from django.shortcuts import render
-
-def index(request):
-    return render(request, "chat/index.html")
-
-def room(request, room_name):
-    return render(request, "chat/room.html", {"room_name": room_name})

core/core/asgi.py

@@ -1,34 +0,0 @@
-"""
-ASGI config for core project.
-
-It exposes the ASGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/5.1/howto/deployment/asgi/
-"""
-
-import os
-
-from channels.auth import AuthMiddlewareStack
-from channels.routing import ProtocolTypeRouter, URLRouter
-from channels.security.websocket import AllowedHostsOriginValidator
-from django.core.asgi import get_asgi_application
-from django.core.asgi import get_asgi_application
-from channels.routing import ProtocolTypeRouter
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings')
-
-#application = get_asgi_application()
-
-django_asgi_app = get_asgi_application()
-
-from chat.routing import websocket_urlpatterns
-
-application = ProtocolTypeRouter(
-    {
-        "http": django_asgi_app,
-        "websocket": AllowedHostsOriginValidator(
-            AuthMiddlewareStack(URLRouter(websocket_urlpatterns))
-        ),
-    }
-)

core/library/forms.py

@@ -1,12 +0,0 @@
-from django import forms
-from .models import QivipQuiz, QivipQuestion
-
-class QuizForm(forms.ModelForm):
-    class Meta:
-        model = QivipQuiz
-        fields = ['name', 'description', 'status', 'category', 'tags',"difficulty"]
-
-class QuestionForm(forms.ModelForm):
-    class Meta:
-        model = QivipQuestion
-        fields = ['quiz_id', 'data']

core/play/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

core/play/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

core/play/urls.py

@@ -1,9 +0,0 @@
-from django.urls import path
-from . import views
-
-app_name = 'play'
-
-urlpatterns = [
-    path('lobby', views.lobby, name='lobby'),
-    path('join', views.join_game, name='join_game'),
-]

core/play/views.py

@@ -1,8 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.
-def lobby(request):
-    return render(request, 'play/lobby.html')
-
-def join_game(request):
-    return render(request, 'play/join_game.html')

core/templates/chat/index.html

@@ -1,27 +0,0 @@
-<!-- chat/templates/chat/index.html -->
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8"/>
-    <title>Chat Rooms</title>
-</head>
-<body>
-    What chat room would you like to enter?<br>
-    <input id="room-name-input" type="text" size="100"><br>
-    <input id="room-name-submit" type="button" value="Enter">
-
-    <script>
-        document.querySelector('#room-name-input').focus();
-        document.querySelector('#room-name-input').onkeyup = function(e) {
-            if (e.key === 'Enter') {  // enter, return
-                document.querySelector('#room-name-submit').click();
-            }
-        };
-
-        document.querySelector('#room-name-submit').onclick = function(e) {
-            var roomName = document.querySelector('#room-name-input').value;
-            window.location.pathname = '/chat/' + roomName + '/';
-        };
-    </script>
-</body>
-</html>

core/templates/chat/room.html

@@ -1,50 +0,0 @@
-<!-- chat/templates/chat/room.html -->
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8"/>
-    <title>Chat Room</title>
-</head>
-<body>
-    <textarea id="chat-log" cols="100" rows="20"></textarea><br>
-    <input id="chat-message-input" type="text" size="100"><br>
-    <input id="chat-message-submit" type="button" value="Send">
-    {{ room_name|json_script:"room-name" }}
-    <script>
-        const roomName = JSON.parse(document.getElementById('room-name').textContent);
-
-        const chatSocket = new WebSocket(
-            'ws://'
-            + window.location.host
-            + '/ws/chat/'
-            + roomName
-            + '/'
-        );
-
-        chatSocket.onmessage = function(e) {
-            const data = JSON.parse(e.data);
-            document.querySelector('#chat-log').value += (data.message + '\n');
-        };
-
-        chatSocket.onclose = function(e) {
-            console.error('Chat socket closed unexpectedly');
-        };
-
-        document.querySelector('#chat-message-input').focus();
-        document.querySelector('#chat-message-input').onkeyup = function(e) {
-            if (e.key === 'Enter') {  // enter, return
-                document.querySelector('#chat-message-submit').click();
-            }
-        };
-
-        document.querySelector('#chat-message-submit').onclick = function(e) {
-            const messageInputDom = document.querySelector('#chat-message-input');
-            const message = messageInputDom.value;
-            chatSocket.send(JSON.stringify({
-                'message': message
-            }));
-            messageInputDom.value = '';
-        };
-    </script>
-</body>
-</html>

core/templates/homepage/home.html

@@ -1,15 +0,0 @@
-{% extends 'base.html' %}
-
-{% block content %}
-<div class="grid place-content-center md:h-screen h-150 w-full -z-50 top-0 p-4">
-    <div class="text-center">
-        <h2 class="font-bold md:text-8xl text-6xl md:mb-8 text-blue-600">qivip</h2>
-        <h3 class="italic font-extralight sm:text-2xl text-md">Interaktives Lernen neu definiert.</h3>
-    </div>
-    <div class="grid sm:grid-cols-3 place-items-stretch text-center mt-8 gap-4 p-4 border-3 bg-blue-100 border-blue-100 rounded-md">
-        <a class="qp-a-button bg-green-500 text-white" href="#">Teilnehmen</a>
-        <a class="qp-a-button bg-indigo-500 text-white" href="#">Moderieren</a>
-        <a class="qp-a-button bg-purple-500 text-white" href="#">Verwalten</a>
-    </div>
-</div>
-{% endblock %}

core/templates/homepage/impress.html

@@ -1,22 +0,0 @@
-{% extends 'base.html' %}
-    {% block content%}
-        <div>
-            <div>
-                <h1>Impressum</h1>
-            </div>
-            <div>
-                <div>
-                    <p>
-                        Katharineum zu Lübeck
-                    </p>
-                    <p>
-                        Königsstraße 27-31
-                    </p>
-                    <p>
-                        23552 Lübeck
-                    </p>
-                </div>
-        </div>
-    {% endblock %}
-</body>
-</html>

core/templates/homepage/privacy.html

@@ -1,13 +0,0 @@
-{% extends 'base.html' %}
-
-        {% block content%}
-            <div>
-                <p>
-                    Hallo, ich bin die Datenschutzerklärung!
-                </p>
-            </div
-        {% endblock %}
->
-    </div>
-</body>
-</html>

core/templates/library/overview_quiz.html

@@ -1,28 +0,0 @@
-{% extends 'base.html' %}
-
-{% block content %}
-<h1>Übersicht</h1>
-<div class="flex justify-end">
-    <a href="{% url 'library:new_quiz' %}" class="text-white bg-blue-500 px-4 py-2 rounded-md mb-12">Neues Quiz erstellen</a>
-</div>
-
-<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 px-4 place-items-center">
-    {% for quiz in quizzes %}
-    <div class="bg-white w-full max-w-md rounded-lg p-4 shadow-md border-blue-600 border-2 rounded-xl">
-        <h2 class="text-lg font-bold"><a href="{% url 'library:edit_quiz' quiz.id %}">{{ quiz.name }}</a></h2>
-        <p class="text-sm text-gray-600 py-12">{{ quiz.description }}</p>
-
-        <div>
-            <div class="flex justify-between items-center gap-2">
-                <a href="#" class="qp-a-button-small border-2 border-blue-600 text-black">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">&#x270F;</a>
-                    <a href="{% url 'library:delete_quiz' quiz.id %}" class="qp-a-button-small border-2 border-blue-600 text-white">&#x1F5D1;</a>
-                </div>
-            </div>
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endblock %}

core/templates/partials/_nav.html

@@ -1,15 +0,0 @@
-<nav class="flex justify-between bg-blue-600 h-12 px-4 sm:px-6 lg:px-8 rounded-lg m-2 shadow-md">
-    <div class="flex items-center">
-        <h2 class="text-xl font-bold text-white hover:scale-110 transition duration-200"><a href="{% url 'homepage:home' %}">qivip</a></h2>
-    </div>
-    <div class="flex items-center">
-        <ul class="flex space-x-4 qp-nav-list">
-            <li><a href="{% url 'library:overview_quiz' %}">Bibliothek</a></li>
-            {% if user.is_authenticated %}
-            <li><a href="{% url 'accounts:home' %}">Konto</a></li>
-            {% else %}
-            <li><a href="{% url 'accounts:login' %}">Anmelden</a></li>
-            {% endif %}
-        </ul>
-    </div>
-</nav>

core/templates/play/lobby.html

@@ -1,15 +0,0 @@
-{% extends 'base.html' %}
-
-{% block content %}
-<div class="container mx-auto px-4">
-    <h1>Bundeslaender Deutschland Quiz</h1>
-    <div id="player-list">
-        <ul>
-            <li>Spieler 1</li>
-            <li>Spieler 2</li>
-            <li>Spieler 3</li>
-        </ul>
-    </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>
-{% endblock %}

django/accounts/views.py

@@ -1,5 +1,6 @@
 from django.shortcuts import render, redirect
 from django.contrib.auth.decorators import login_required
+from django.contrib.auth import login, authenticate
 from .forms import RegisterForm
 
 # Create your views here.
@@ -11,8 +12,9 @@ def register(response):
     if response.method == "POST":
         form = RegisterForm(response.POST)
         if form.is_valid():
-            form.save()
-            return redirect("home")
+            user=form.save()
+            login(response, user) #automatischer Login nach Registrierung 
+            return redirect("accounts:home")
     else:
         form = RegisterForm()
 

django/core/asgi.py

@@ -0,0 +1,16 @@
+"""
+ASGI config for core project.
+
+It exposes the ASGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/5.1/howto/deployment/asgi/
+"""
+
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings')
+
+application = get_asgi_application()

django/core/settings.py

@@ -25,19 +25,17 @@ SECRET_KEY = 'django-insecure-#+s307$rxkts=8@+_^i)8)n1b4*y4za1xz!mvv(h@!+n9!mp9)
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '*', '172.22.10.111']
+ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '*']
 
 
 # Application definition
 
 INSTALLED_APPS = [
-    'daphne',
-    'chat',
     'library.apps.LibraryConfig',
     'homepage.apps.HomepageConfig',
     'components.apps.ComponentsConfig',
     'accounts.apps.AccountsConfig',
-    'play.apps.PlayConfig',
+    'play',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -131,17 +129,7 @@ STATICFILES_DIRS = [BASE_DIR / 'static']
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 LOGIN_URL = '/account/login/'
+import os
 
-# Daphne
-ASGI_APPLICATION = "core.asgi.application"
-
-# Channels
-ASGI_APPLICATION = "core.asgi.application"
-CHANNEL_LAYERS = {
-    "default": {
-        "BACKEND": "channels_redis.core.RedisChannelLayer",
-        "CONFIG": {
-            "hosts": [("127.0.0.1", 8000)],
-        },
-    },
-}
+MEDIA_URL = '/media/'  # URL, um auf Medien-Dateien zuzugreifen
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')  # Speicherort für hochgeladene Dateien

django/core/urls.py

@@ -23,5 +23,5 @@ urlpatterns = [
     path('', include('homepage.urls')),
     path('play/', include('play.urls')),
     path('library/', include('library.urls')),
-    path('chat/', include('chat.urls')),
+    path('components/', include('components.urls'))
 ]

django/library/forms.py

@@ -0,0 +1,31 @@
+from django import forms
+from .models import QivipQuiz, QivipQuestion
+
+class QuizForm(forms.ModelForm):
+    class Meta:
+        model = QivipQuiz
+        fields = ['name', 'description','image', 'status', 'category', 'tags',"difficulty"]
+
+class QuestionForm(forms.ModelForm):
+    class Meta:
+        model = QivipQuestion
+        fields = ['quiz_id', 'data']
+
+from django import forms
+
+class QuizFilterForm(forms.Form):
+    search = forms.CharField(required=False, label="Suche", widget=forms.TextInput(attrs={
+        'class': 'flex flex-grow rounded-lg p-2' ,'placeholder': 'Suche ...',
+    }))
+
+
+    min_amout_questions = forms.IntegerField(required=False, min_value=1,   label="Minimale Anzahl an Fragen", widget=forms.NumberInput(attrs={
+        'class': 'border-2 border-gray-300 rounded-lg p-2 w-full'
+    }))
+
+    max_amout_questions = forms.IntegerField(required=False, min_value=1,  label="Maximale Anzahl an Fragen", widget=forms.NumberInput(attrs={
+        'class': 'border-2 border-gray-300 rounded-lg p-2 w-full'
+    }))
+    user = forms.CharField(required=False, label="von User", widget=forms.TextInput(attrs={
+        'class': 'border-2 border-gray-300 rounded-lg p-2 w-full'
+    }))

django/library/migrations/0016_alter_qivipquiz_status.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-03-16 12:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0015_alter_qivipquiz_difficulty'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='qivipquiz',
+            name='status',
+            field=models.CharField(choices=[('öffentlich', 'Öffentlich'), ('versteckt', 'Versteckt'), ('privat', 'Privat')], default='öffentlich', max_length=10),
+        ),
+    ]

django/library/migrations/0017_alter_qivipquiz_difficulty.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-03-16 12:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0016_alter_qivipquiz_status'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='qivipquiz',
+            name='difficulty',
+            field=models.CharField(choices=[('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('nicht gesetzt', 'nicht gesetzt')], default='nicht gesetzt', help_text='1: niedrigste Schwierigkeit und 5: höchste Schwierigkeit', max_length=13),
+        ),
+    ]

django/library/migrations/0018_alter_qivipquiz_description.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-03-16 13:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0017_alter_qivipquiz_difficulty'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='qivipquiz',
+            name='description',
+            field=models.TextField(blank=True, default='In dem Quiz geht es um ...', max_length=150, null=True),
+        ),
+    ]

django/library/migrations/0019_alter_qivipquiz_description.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-03-16 13:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0018_alter_qivipquiz_description'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='qivipquiz',
+            name='description',
+            field=models.TextField(default='In dem Quiz geht es um ...', max_length=255, null=True),
+        ),
+    ]

django/library/migrations/0020_alter_qivipquiz_description.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.7 on 2025-03-16 13:08
+
+import library.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0019_alter_qivipquiz_description'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='qivipquiz',
+            name='description',
+            field=models.TextField(default='In dem Quiz geht es um ...', max_length=255, validators=[library.models.QivipQuiz.validate_description]),
+        ),
+    ]

django/library/migrations/0021_alter_qivipquiz_name.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-03-16 14:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0020_alter_qivipquiz_description'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='qivipquiz',
+            name='name',
+            field=models.CharField(max_length=100),
+        ),
+    ]

django/library/migrations/0022_alter_qivipquiz_description_alter_qivipquiz_name.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1.7 on 2025-03-16 14:35
+
+import library.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0021_alter_qivipquiz_name'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='qivipquiz',
+            name='description',
+            field=models.TextField(default='In dem Quiz geht es um ...', max_length=200, validators=[library.models.QivipQuiz.validate_description]),
+        ),
+        migrations.AlterField(
+            model_name='qivipquiz',
+            name='name',
+            field=models.CharField(max_length=75),
+        ),
+    ]

django/library/migrations/0023_qivipquiz_image.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-03-21 17:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0022_alter_qivipquiz_description_alter_qivipquiz_name'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='qivipquiz',
+            name='image',
+            field=models.ImageField(blank=True, null=True, upload_to='quiz_images/'),
+        ),
+    ]

django/library/migrations/0024_alter_qivipquiz_image.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-03-22 10:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0023_qivipquiz_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='qivipquiz',
+            name='image',
+            field=models.ImageField(blank=True, max_length=256, null=True, upload_to='quiz_images/'),
+        ),
+    ]

django/library/models.py

@@ -2,12 +2,13 @@ from django.db import models
 from django.contrib.auth.models import User
 from django.utils.text import slugify
 import uuid
+from django.core.exceptions import ValidationError
 
 class QivipQuiz(models.Model):
     STATUS_VALUES = {
-        "public": "Öffentlich",
-        "hidden": "Versteckt",
-        "private": "Privat",
+        "öffentlich": "Öffentlich",
+        "versteckt": "Versteckt",
+        "privat": "Privat",
     }
     DIFFICULTY_VALUES = {
         "1": "1",
@@ -15,20 +16,25 @@ class QivipQuiz(models.Model):
         "3": "3",
         "4": "4",
         "5": "5",
-        "not defined":"nicht gesetzt",
+        "nicht gesetzt":"nicht gesetzt",
 
     }
         
+    def validate_description(value):
+        if value.strip() == "In dem Quiz geht es um ...":
+            raise ValidationError("Bitte gib eine aussagekräftige Beschreibung ein.")
+
+    image = models.ImageField(max_length=256, upload_to='quiz_images/', blank=True, null=True)  # Bild speichern in media/quiz_images/
     uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
     user_id = models.ForeignKey(User, on_delete=models.CASCADE, related_name='quiz')
     creation_date = models.DateTimeField(auto_now_add=True)
     update_date = models.DateTimeField(auto_now=True)
-    status = models.CharField(max_length=10, choices=list(STATUS_VALUES.items()), default="public")
+    status = models.CharField(max_length=10, choices=list(STATUS_VALUES.items()), default="öffentlich")
     category = models.ForeignKey('QuizCategory', related_name='quiz', on_delete=models.CASCADE)
     tags = models.ManyToManyField('Tag', blank=True)
-    name = models.CharField(max_length=255)
-    description = models.TextField(blank=True, null=True, default="In dem Quiz geht es um ...")
-    difficulty= models.CharField(max_length=11, choices=list(DIFFICULTY_VALUES.items()), default="not defined", help_text="1: niedrigste Schwierigkeit und 5: höchste Schwierigkeit")
+    name = models.CharField(max_length=75)
+    description = models.TextField(validators=[validate_description],max_length=200,blank=False, default="In dem Quiz geht es um ...")
+    difficulty= models.CharField(max_length=13, choices=list(DIFFICULTY_VALUES.items()), default="nicht gesetzt", help_text="1: niedrigste Schwierigkeit und 5: höchste Schwierigkeit")
 
     def __str__(self):
         return self.name

django/library/urls.py

@@ -1,6 +1,8 @@
 from django.urls import path
-from . import views
 
+from django.conf import settings
+from . import views
+from django.conf.urls.static import static
 app_name = 'library'
 
 urlpatterns = [
@@ -12,4 +14,6 @@ urlpatterns = [
     path('question/new/', views.new_question, name='new_question'),
     path('question/edit/<int:pk>/', views.edit_question, name='edit_question'),
     path('question/delete/<int:pk>/', views.delete_question, name='delete_question'),
-]
+]# Nur für die Entwicklungsumgebung
+if settings.DEBUG:
+    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

django/library/views.py

@@ -6,24 +6,117 @@ from django.contrib import messages
 from .models import QivipQuiz, QivipQuestion
 from .forms import QuizForm, QuestionForm
 import json
-
+from django.core.paginator import Paginator
+from .models import QivipQuiz
+from .forms import QuizFilterForm
+from django.db.models import Count
+from django.contrib.auth.models import User
 # Übersicht aller Quizze
-@login_required
+
 def overview_quiz(request):
-    quizzes = QivipQuiz.objects.filter(user_id=request.user)
-    return render(request, 'library/overview_quiz.html', {'quizzes': quizzes})
+    
+    #Filter
+    form = QuizFilterForm(request.GET)
+
+
+    try:
+        
+         filter_my_quizzes = QivipQuiz.objects.filter(user_id=request.user).annotate(max_amout_questions=Count('question'))
+    except:
+        filter_my_quizzes = QivipQuiz.objects.none()
+  
+    filter_other_quizzes = QivipQuiz.objects.annotate(max_amout_questions=Count('question'))
+    
+       
+
+
+    if form.is_valid():
+        search = form.cleaned_data.get('search')
+        username= form.cleaned_data.get('user')
+        max_amout_questions= form.cleaned_data.get('max_amout_questions')
+        min_amout_questions= form.cleaned_data.get('min_amout_questions')
+        if search: # Suche nach Namen
+           filter_other_quizzes = filter_other_quizzes.filter(name__icontains=search)
+           filter_my_quizzes = filter_my_quizzes.filter(name__icontains=search)
+
+        if min_amout_questions:
+           filter_other_quizzes = filter_other_quizzes.filter(max_amout_questions__gte=min_amout_questions)
+           try:
+               filter_my_quizzes =filter_my_quizzes.filter(max_amout_questions__gte=min_amout_questions)
+           except:
+               filter_my_quizzes = QivipQuiz.objects.none()
+
+        if max_amout_questions:
+           filter_other_quizzes = filter_other_quizzes.filter(max_amout_questions__lte=max_amout_questions)
+           try:
+               filter_my_quizzes =filter_my_quizzes.filter(max_amout_questions__lte=max_amout_questions)
+           except:
+               filter_my_quizzes = QivipQuiz.objects.none()
+               
+        if username:
+            try:
+                user = User.objects.get(username=username)  # Benutzer anhand des Namens holen
+                filter_other_quizzes = filter_other_quizzes.filter(user_id=user.id)
+                filter_my_quizzes = filter_my_quizzes.filter(user_id=user.id)  # Nach der user_id filtern
+            except User.DoesNotExist:
+                filter_other_quizzes = QivipQuiz.objects.none()  # Falls User nicht existiert, leere Query zurückgeben
+                filter_my_quizzes = QivipQuiz.objects.none()
+                
+        try:
+           filter_other_quizzes=filter_other_quizzes.exclude(user_id=request.user)
+        except:
+            filter_other_quizzes=filter_other_quizzes
+        
+            # Anzahl der Quiz pro Seite für Swiper
+
+
+        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)
+
+      
+
+
+    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
 def new_quiz(request):
     if request.method == 'POST':
-        form = QuizForm(request.POST)
+        form = QuizForm(request.POST, request.FILES)
         if form.is_valid():
             quiz = form.save(commit=False)
             quiz.user_id = request.user
             quiz.save()
             form.save_m2m()  # Speichert die Many-to-Many Beziehungen (Tags)
-            return redirect('library:edit_quiz', pk=quiz.pk)
+            return redirect('library:detail_quiz', pk=quiz.pk)
+            
     else:
         form = QuizForm()
     return render(request, 'library/form.html', {'form': form})
@@ -33,10 +126,10 @@ def new_quiz(request):
 def edit_quiz(request, pk):
     quiz = get_object_or_404(QivipQuiz, pk=pk, user_id=request.user)
     if request.method == 'POST':
-        form = QuizForm(request.POST, instance=quiz)
+        form = QuizForm(request.POST, instance=quiz, files=request.FILES) 
         if form.is_valid():
             form.save()
-            return redirect('library:overview_quiz')
+            return redirect('library:detail_quiz', pk=quiz.pk)
     else:
         form = QuizForm(instance=quiz)
     return render(request, 'library/form.html', {'form': form})

django/package-lock.json

@@ -0,0 +1,35 @@
+{
+  "name": "django",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "django",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "swiper": "^11.2.6"
+      }
+    },
+    "node_modules/swiper": {
+      "version": "11.2.6",
+      "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.2.6.tgz",
+      "integrity": "sha512-8aXpYKtjy3DjcbzZfz+/OX/GhcU5h+looA6PbAzHMZT6ESSycSp9nAjPCenczgJyslV+rUGse64LMGpWE3PX9Q==",
+      "funding": [
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/swiperjs"
+        },
+        {
+          "type": "open_collective",
+          "url": "http://opencollective.com/swiper"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4.7.0"
+      }
+    }
+  }
+}

django/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "django",
+  "version": "1.0.0",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "description": "",
+  "dependencies": {
+    "swiper": "^11.2.6"
+  }
+}

django/play/admin.py

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

django/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')),
+            ],
+        ),
+    ]

django/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),
+        ),
+    ]

django/play/migrations/0003_quizgameparticipant_participant_id_and_more.py

@@ -0,0 +1,29 @@
+# Generated by Django 5.1.7 on 2025-03-15 19:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('play', '0002_alter_quizgame_join_code'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='quizgameparticipant',
+            name='participant_id',
+            field=models.CharField(default=1, max_length=200, unique=True),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='quizgameparticipant',
+            name='avatar',
+            field=models.CharField(blank=True, default='', max_length=200),
+        ),
+        migrations.AlterField(
+            model_name='quizgameparticipant',
+            name='score',
+            field=models.IntegerField(default=0, verbose_name='Punkte'),
+        ),
+    ]

django/play/models.py

@@ -0,0 +1,40 @@
+from django.db import models
+from django.contrib.auth.models import User
+from library.models import QivipQuiz
+from django.http import response
+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.digits, k=6))
+            if not QuizGame.objects.filter(join_code=new_code).exists():
+                return new_code
+
+class QuizGameParticipant(models.Model):
+    participant_id = models.CharField(max_length=200, unique=True)
+    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", default=0)
+    avatar = models.CharField(max_length=200, blank=True, default="")
+
+    def save(self, *args, **kwargs):
+        if not self.participant_id:
+            self.participant_id = self.generate_unique_id()
+        super().save(*args, **kwargs)
+
+    def generate_unique_id(self):
+        for i in range(10):
+            new_id = ''.join(random.choices(string.digits + string.ascii_lowercase, k=60))
+            if not QuizGameParticipant.objects.filter(participant_id=new_id).exists():
+                return new_id

django/play/urls.py

@@ -0,0 +1,10 @@
+from django.urls import path
+from . import views
+
+app_name = 'play'
+
+urlpatterns = [
+    path('lobby/<str:join_code>', views.lobby, name='lobby'),
+    path('lobby/<str:join_code>/participate', views.create_participant, name='create_participant'),
+    path('join', views.join_game, name='join_game'),
+]