Change Allowed Hosts

.gitignore

@@ -4,5 +4,3 @@ 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 static/css/t-input.css -o static/css/t-style.css --watch --minify
+tailwindcss -i core/static/homepage/t-input.css -o core/static/homepage/t-style.css --watch --minify
 
-# unter Windows mit NPM (in bash mit '/' statt '\'):
+# unter Windows mit NPM:
-npx @tailwindcss/cli -i .\static\css\t-input.css -o .\static\css\t-style.css --watch --minify
+npx @tailwindcss/cli -i .\core\static\homepage\t-input.css -o .\core\static\homepage\t-style.css --watch --minify
 ```
 
 ## Issue - Merge Request - Merge

core/accounts/views.py

@@ -1,6 +1,5 @@
 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.
@@ -12,9 +11,8 @@ def register(response):
     if response.method == "POST":
         form = RegisterForm(response.POST)
         if form.is_valid():
-            user=form.save()
+            form.save()
-            login(response, user) #automatischer Login nach Registrierung 
+            return redirect("home")
-            return redirect("accounts:home")
     else:
         form = RegisterForm()
 

core/chat/consumers.py

@@ -0,0 +1,40 @@
+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

@@ -0,0 +1,8 @@
+# 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

@@ -0,0 +1,9 @@
+# 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

@@ -0,0 +1,8 @@
+# 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

@@ -0,0 +1,34 @@
+"""
+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/core/settings.py

@@ -25,17 +25,19 @@ 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', '*']
+ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '*', '172.22.10.111']
 
 
 # Application definition
 
 INSTALLED_APPS = [
+    'daphne',
+    'chat',
     'library.apps.LibraryConfig',
     'homepage.apps.HomepageConfig',
     'components.apps.ComponentsConfig',
     'accounts.apps.AccountsConfig',
-    'play',
+    'play.apps.PlayConfig',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -129,7 +131,17 @@ STATICFILES_DIRS = [BASE_DIR / 'static']
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 LOGIN_URL = '/account/login/'
-import os
 
-MEDIA_URL = '/media/'  # URL, um auf Medien-Dateien zuzugreifen
+# Daphne
-MEDIA_ROOT = os.path.join(BASE_DIR, 'media')  # Speicherort für hochgeladene Dateien
+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)],
+        },
+    },
+}

core/core/urls.py

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

core/library/admin.py

@@ -6,6 +6,7 @@ class QivipQuizAdmin(admin.ModelAdmin):
     list_display = ('name', 'user_id', 'status', 'category', 'creation_date', 'update_date')  # Welche Felder sollen in der Übersicht angezeigt werden
     search_fields = ('name', 'user_id__username', 'category__name')  # Suchfelder
     list_filter = ('status', 'category')  # Filteroptionen
+
 # Für das QivipQuestion Modell
 class QivipQuestionAdmin(admin.ModelAdmin):
     list_display = ('quiz_id', 'data', 'creation_date', 'update_date')

core/library/forms.py

@@ -0,0 +1,12 @@
+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/library/models.py

@@ -2,13 +2,12 @@ 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 = {
-        "öffentlich": "Öffentlich",
+        "public": "Öffentlich",
-        "versteckt": "Versteckt",
+        "hidden": "Versteckt",
-        "privat": "Privat",
+        "private": "Privat",
     }
     DIFFICULTY_VALUES = {
         "1": "1",
@@ -16,34 +15,25 @@ class QivipQuiz(models.Model):
         "3": "3",
         "4": "4",
         "5": "5",
-        "nicht gesetzt":"nicht gesetzt",
+        "not defined":"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')
-    #creator = models.ForeignKey(User, on_delete=models.SET_NULL,blank=True, null=True, related_name='creator_quiz')
-    base_quiz = models.ForeignKey('self', on_delete=models.SET_NULL,blank=True, null=True, related_name='child_quizzes')
     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="öffentlich")
+    status = models.CharField(max_length=10, choices=list(STATUS_VALUES.items()), default="public")
     category = models.ForeignKey('QuizCategory', related_name='quiz', on_delete=models.CASCADE)
     tags = models.ManyToManyField('Tag', blank=True)
-    name = models.CharField(max_length=75)
+    name = models.CharField(max_length=255)
-    description = models.TextField(validators=[validate_description],max_length=200,blank=False, default="In dem Quiz geht es um ...")
+    description = models.TextField(blank=True, null=True, 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")
+    difficulty= models.CharField(max_length=11, choices=list(DIFFICULTY_VALUES.items()), default="not defined", help_text="1: niedrigste Schwierigkeit und 5: höchste Schwierigkeit")
-    credits=models.TextField(blank=True, editable=True)
+
     def __str__(self):
-
         return self.name
 
 
-
 # Create your models here.
 class QivipQuestion(models.Model):
     uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)

core/library/urls.py

@@ -1,8 +1,6 @@
 from django.urls import path
-
-from django.conf import settings
 from . import views
-from django.conf.urls.static import static
+
 app_name = 'library'
 
 urlpatterns = [
@@ -14,8 +12,4 @@ 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'),
-    path('detail/copy/<int:pk>/', views.copy_quiz, name='copy_quiz'),
+]
-
-]# Nur für die Entwicklungsumgebung
-if settings.DEBUG:
-    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

core/library/views.py

@@ -1,4 +1,3 @@
-import uuid
 from django.shortcuts import render, redirect, get_object_or_404
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
@@ -7,96 +6,24 @@ 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)
-    #Filter
+    return render(request, 'library/overview_quiz.html', {'quizzes': quizzes})
-    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
-        
-
-
-        filter_other_quizzes = filter_other_quizzes.filter(max_amout_questions__gte=1).filter(status='öffentlich')
-       
-        context = {
-            'show_search': True,
-            'filter_my_quizzes': filter_my_quizzes.order_by('-creation_date'),
-            'filter_other_quizzes': filter_other_quizzes.order_by('-creation_date'),
-            '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, request.FILES)
+        form = QuizForm(request.POST)
         if form.is_valid():
             quiz = form.save(commit=False)
             quiz.user_id = request.user
-            quiz.creator = request.user
             quiz.save()
             form.save_m2m()  # Speichert die Many-to-Many Beziehungen (Tags)
-            return redirect('library:detail_quiz', pk=quiz.pk)
+            return redirect('library:edit_quiz', pk=quiz.pk)
-            
     else:
         form = QuizForm()
     return render(request, 'library/form.html', {'form': form})
@@ -106,13 +33,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, files=request.FILES) 
+        form = QuizForm(request.POST, instance=quiz)
         if form.is_valid():
-           
             form.save()
-            return redirect('library:detail_quiz', pk=pk)
+            return redirect('library:overview_quiz')
-            #return modified(request, pk)
-            
     else:
         form = QuizForm(instance=quiz)
     return render(request, 'library/form.html', {'form': form})
@@ -127,9 +51,9 @@ def delete_quiz(request, pk):
     return render(request, 'library/delete_confirmation.html', {'object': quiz})
 
 # Quiz anzeigen
+@login_required
 def detail_quiz(request, pk):
-    #quiz = get_object_or_404(QivipQuiz, pk=pk, user_id=request.user)
+    quiz = get_object_or_404(QivipQuiz, pk=pk, user_id=request.user)
-    quiz = get_object_or_404(QivipQuiz, pk=pk)
     questions = QivipQuestion.objects.filter(quiz_id=quiz)
     
     # Parse JSON data for each question
@@ -142,63 +66,6 @@ def detail_quiz(request, pk):
         'questions': questions
     }
     return render(request, 'library/detail_quiz.html', context)
-"""
-def modified(request, pk):
-
-        original_quiz = get_object_or_404(QivipQuiz, pk=pk)           
-        words=original_quiz.modified_description.split()
-        word_exist=0
-        print(original_quiz.creator.username)
-        print(request.user.username)
-       
-        for word in words:
-            
-            if word==request.user.username or word+","==request.user.username:
-                word_exist=1
-
-
-        if word_exist==0 and len(words)!=0 and request.user.username!=original_quiz.creator.username:
-                    original_quiz.modified_description  +=", "+ request.user.username
-                    
-                   
-        elif word_exist==0 and request.user.username!=original_quiz.creator.username:
-                original_quiz.modified_description  +=" "+ request.user.username
-                    
-        original_quiz.save()
-      
-        return redirect('library:detail_quiz', pk=pk)
-        
-"""
-
-@login_required
-def copy_quiz(request, pk):
-    original_quiz = get_object_or_404(QivipQuiz, pk=pk)
-    
-    
-    # Quiz kopieren (ohne ID, damit ein neues Objekt erstellt wird)
- 
-        # Quiz kopieren (ohne ID, damit ein neues Objekt erstellt wird)
-
-    new_quiz = original_quiz     # Kopie erstellen (aber Achtung: Noch gleiche Referenz!)
-    new_quiz.pk = None  # Setzt die ID auf None, damit Django es als neues Objekt erkennt
-    new_quiz.uuid = uuid.uuid4()  # Neue UUID generieren
-    new_quiz.user_id = request.user  # Neuer Besitzer ist der aktuelle User
-    new_quiz.name += " - Kopie"  # Optional: Name anpassen
-    new_quiz.base_quiz_id = pk
-    #new_quiz.creator = original_quiz.creator or request.user
-    new_quiz.save()  # Speichern als neues Objekt 
-   # Optional: Beschreibung anpassen
-    # Alle zugehörigen Fragen kopieren
-    questions = QivipQuestion.objects.filter(quiz_id=pk)
-    for question in questions:
-        question.uuid = uuid.uuid4()
-        question.pk = None  # Setze pk auf None, damit es als neues Objekt gespeichert wird
-        question.quiz_id = original_quiz  # Verknüpfe mit dem neuen Quiz
-        question.data = question.data  # `data`-Feld wird explizit übernommen # Verknüpfe mit dem neuen Quiz
-        question.save()
-    
-    return redirect('library:detail_quiz', pk=new_quiz.pk)
-
 
 # Übersicht aller Fragen
 @login_required
@@ -274,7 +141,6 @@ def new_question(request):
         question.data = json.dumps(json_data)
         question.quiz_id = quiz
         question.save()
-        #return modified(request, pk=quiz.pk)
         return redirect('library:detail_quiz', pk=quiz.pk)
     else:
         # Initialize empty question data for new questions
@@ -403,9 +269,7 @@ def edit_question(request, pk):
             
         question.data = json.dumps(json_data)
         question.save()
-        #return modified(request, question.quiz_id.pk)
         return redirect('library:detail_quiz', pk=question.quiz_id.pk)
-        
     else:
         template_name = f'library/question/question_{question_type}.html'
         context = {
@@ -416,7 +280,6 @@ def edit_question(request, pk):
         
         return render(request, template_name, context)
 
-
 # Frage löschen
 @login_required
 def delete_question(request, pk):

core/play/admin.py

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

core/play/models.py

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

core/play/urls.py

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,27 @@
+<!-- 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

@@ -0,0 +1,50 @@
+<!-- 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/components/answer.html

@@ -2,7 +2,7 @@
 {% load static %}
 {% block title %}Antwort{% endblock %}
 {% block content %}
-<link rel="stylesheet" href="{% static 'css/t-style.css' %}">
+<link rel="stylesheet" href="{% static 'homepage/t-style.css' %}">
 
  <!-- TODO Bedingung festlegen: Quiztyp unterscheiden % if <Bedingung> % -->
   {% if user.is_authenticated %}

core/templates/components/ranking.html

@@ -1,5 +1,5 @@
 {% load static %}
-<link rel="stylesheet" href="{% static 'css/t-style.css' %}">
+<link rel="stylesheet" href="{% static 'homepage/t-style.css' %}">
 <!doctype html>
 <html class="h-full">
   <head>

core/templates/homepage/home.html

@@ -0,0 +1,15 @@
+{% 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

@@ -0,0 +1,22 @@
+{% 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

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

core/templates/library/detail_quiz.html

@@ -1,53 +1,32 @@
 {% extends 'base.html' %}
 
 {% block content %}
-
-
 <div class="container mx-auto px-4">
     <div class="flex justify-between items-center mb-6">
         <h1 class="text-2xl font-bold">{{ quiz.name }}</h1>
         <div class="flex space-x-2">
-            {% if quiz.user_id == request.user %}
+            <a href="{% url 'library:edit_quiz' quiz.id %}" class="bg-green-500 text-white px-4 py-2 rounded-md text-sm lg:text-lg hover:bg-green-600 transition-colors">Quiz bearbeiten</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="bg-red-500 text-white px-4 py-2 rounded-md text-sm lg:text-lg hover:bg-red-600 transition-colors">Quiz löschen</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>
-            {% endif %}
-            <a href="{% url 'library:copy_quiz' quiz.id %}" class="flex items-center qp-a-button-small border-2 border-blue-600 text-gray-600  font-bold  drop-shadow-lg custom-outline">Quiz kopieren</a>
-
         </div>
     </div>
 
     {% if quiz.description %}
-    <p class="text-gray-600 mb-4">{{ quiz.description }}</p>
+    <p class="text-gray-600 mb-8">{{ quiz.description }}</p>
     {% endif %}
 
-
-
     <div class="bg-white rounded-lg shadow-md border-blue-600 border-2 rounded-xl shadow-md">
         <div class="border-b border-gray-200 p-4">
             <div class="flex justify-between items-center">
                 <h2 class="text-xl font-semibold">Fragen</h2>
                 <div class="flex space-x-2">
-                    {% if quiz.user_id == request.user %}
                     <a href="{% url 'library:new_question' %}?type=multiple_choice&quiz_id={{ quiz.id }}" 
                        class="bg-blue-100 text-blue-800 px-4 py-2 rounded-md text-xs lg:text-lg hover:border-blue-600 border-2">
                         Multiple Choice
                     </a>
-                    {% endif %}
-                    {% if quiz.user_id == request.user %}
                     <a href="{% url 'library:new_question' %}?type=true_false&quiz_id={{ quiz.id }}" 
                        class="bg-purple-100 text-purple-800 px-4 py-2 rounded-md text-xs lg:text-lg  hover:border-blue-600 border-2">
                         Wahr/Falsch
                     </a>
-                    {% endif %}
                 </div>
             </div>
         </div>
@@ -58,7 +37,7 @@
                 {% for question in questions %}
                 
                     <div class="w-full rounded-xl p-4 hover:bg-gray-50">
-                        {% if quiz.user_id == request.user %} <a class="block flex h-full w-full" href="{% url 'library:edit_question' question.id %}" > {% endif %}
+                        <a class="block flex h-full w-full" href="{% url 'library:edit_question' question.id %}" >
                         <div class="flex justify-between items-start">
                             
                             <div class="flex-grow">
@@ -70,7 +49,7 @@
                                 </div>
                                 <div class="mt-2">
                                     {% if question.data.type == 'multiple_choice' %}
-                                        <ul class="space-y-1 ">
+                                        <ul class="space-y-1">
                                             {% for option in question.data.options %}
                                                 <li class="flex items-center text-sm">
                                                     {% if option.is_correct %}
@@ -101,15 +80,17 @@
                             </div>
                             
                             <div class="flex h-full space-x-2 ml-4 items-center">
+                                <!--
+                                <a href="{% url 'library:edit_question' question.id %}" 
+                                   class="bg-gray-100 text-gray-700 px-3 py-1 rounded hover:bg-gray-200 transition-colors">
+                                    Bearbeiten
+                                </a>
+                                -->
                                 
                                 <a href=" {% url 'library:delete_question' question.id %}" 
                 class="  text-red-700 px-4 py-1 rounded hover:scale-110 ">
-                {% if quiz.user_id == request.user %}
+                &#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">
+             </a>
-                    <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>
-                  {% endif %}
-                  </a>
                             
                             </div>
                         </div>
@@ -129,23 +110,5 @@
             </div>
         {% endif %}
     </div>
-
-<div class="flex justify-end">   
-{% if quiz.base_quiz %}
-<p class="text-gray-600 mt-2 ">Kopie von: <a href="{% url 'library:detail_quiz' quiz.base_quiz.id %}"><span class="font-bold">{{ quiz.base_quiz}}</span></a></p>
-{% endif %}
-</div>
-<div class="flex justify-end">  
-    {% if quiz.base_quiz %}
-    <p class="text-gray-600 mb-2">Autor:<span class="font-bold"> {{ quiz.base_quiz.user_id}}</span></p>
-    {% endif %}
-</div>
-
-<div class="flex justify-end">  
-    {% if quiz.credits %}
-    <p class="text-gray-600 mb-2">Credits:<span class="font-bold"> {{ quiz.credits }}</span></p>
-    {% endif %}
-</div>
-
 </div>
 {% endblock %}

core/templates/library/form.html

@@ -1,8 +1,10 @@
 {% extends 'base.html' %}
 
 {% block content %}
-<div class="input-group  border-blue-600 border-2 rounded-xl shadow-md mt-12">
+<h1>Formular</h1>
-    <form method="post" enctype="multipart/form-data">
+<h2>{{ form.name.value }}</h2>
+<div class="input-group  border-blue-600 border-2 rounded-xl shadow-md">
+    <form method="post">
         {% csrf_token %}
         {{ form.as_p }}
         <button type="submit">Speichern</button>

core/templates/library/overview_quiz.html

@@ -0,0 +1,28 @@
+{% 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/library/question/question_multiple_choice.html

@@ -10,7 +10,7 @@
         </a>
     </div>
 
-    <div class="bg-white rounded-lg shadow-md p-6 border-blue-600 border-2 rounded-xl shadow-md">
+    <div class="bg-white rounded-lg shadow-md p-6">
         <form method="post" class="space-y-6">
             {% csrf_token %}
             

core/templates/library/question/question_true_false.html

@@ -10,7 +10,7 @@
         </a>
     </div>
 
-    <div class="bg-white rounded-lg shadow-md p-6 border-blue-600 border-2 rounded-xl shadow-md">
+    <div class="bg-white rounded-lg shadow-md p-6">
         <form method="post" class="space-y-6">
             {% csrf_token %}
             

core/templates/partials/_nav.html

@@ -0,0 +1,15 @@
+<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/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="123456" maxlength="6" 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>
+                <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>
                 <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">
@@ -21,7 +21,7 @@
             const button = document.querySelector('button[type="submit"]');
             
             input.addEventListener('input', function(e) {
-                button.disabled = !this.value.match(/^[0-9]{6}$/);
+                button.disabled = !this.value.match(/^[A-Z0-9]{3}-[A-Z0-9]{3}$/);
             });
 
             input.addEventListener('keypress', function(e) {

core/templates/play/lobby.html

@@ -0,0 +1,15 @@
+{% 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/core/asgi.py

@@ -1,16 +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 django.core.asgi import get_asgi_application
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings')
-
-application = get_asgi_application()

django/library/forms.py

@@ -1,31 +0,0 @@
-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","credits"]
-
-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

@@ -1,18 +0,0 @@
-# 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),
-        ),
-    ]