Change Allowed Hosts

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,3 +131,17 @@ STATICFILES_DIRS = [BASE_DIR / 'static']
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 LOGIN_URL = '/account/login/'
+
+# 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)],
+        },
+    },
+}

core/core/urls.py

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

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",
-        "versteckt": "Versteckt",
-        "privat": "Privat",
+        "public": "Öffentlich",
+        "hidden": "Versteckt",
+        "private": "Privat",
     }
     DIFFICULTY_VALUES = {
         "1": "1",
@@ -16,25 +15,20 @@ 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.")
-
-
     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="ö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)
-    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")
+    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")
 
     def __str__(self):
         return self.name

core/library/views.py

@@ -6,18 +6,12 @@ from django.contrib import messages
 from .models import QivipQuiz, QivipQuestion
 from .forms import QuizForm, QuestionForm
 import json
-from django.core.paginator import Paginator
+
 # Übersicht aller Quizze
-
+@login_required
 def overview_quiz(request):
-    try:
-        quizzes = QivipQuiz.objects.filter(user_id=request.user)
-        all_quizzes = QivipQuiz.objects.filter(status='öffentlich').exclude(user_id=request.user).filter(question__isnull=False).distinct()
-        return render(request, 'library/overview_quiz.html', {'quizzes': quizzes, 'all_quizzes': all_quizzes})
-
-    except:
-        all_quizzes = QivipQuiz.objects.filter(status='öffentlich').filter(question__isnull=False).distinct()
-        return render(request, 'library/overview_quiz.html', {'quizzes': None, 'all_quizzes': all_quizzes})
+    quizzes = QivipQuiz.objects.filter(user_id=request.user)
+    return render(request, 'library/overview_quiz.html', {'quizzes': quizzes})
 
 # Neues Quiz erstellen
 @login_required

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/homepage/home.html

@@ -7,9 +7,9 @@
         <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="{% url 'play:join_game' %}">Teilnehmen</a>
+        <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="{% url 'library:new_quiz' %}">Erstellen</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

@@ -5,8 +5,8 @@
     <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: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>
+            <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: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>
         </div>
     </div>
 
@@ -49,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 %}

core/templates/library/form.html

@@ -1,7 +1,9 @@
 {% extends 'base.html' %}
 
 {% block content %}
-<div class="input-group  border-blue-600 border-2 rounded-xl shadow-md mt-12">
+<h1>Formular</h1>
+<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 }}

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

django/library/migrations/0017_alter_qivipquiz_difficulty.py

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

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

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