Compare commits
56 Commits
feature_5_
...
30-chat-ap
| Author | SHA1 | Date | |
|---|---|---|---|
| 9b13749a29 | |||
|
|
b6831616cc | ||
| 889134784a | |||
| ab6e27f80e | |||
| 35617470c4 | |||
|
|
b6991c2cbd | ||
|
|
a0e31d77f2 | ||
|
|
434d1f63e3 | ||
|
|
e3bd3c8579 | ||
|
|
7e66868a7d | ||
|
|
b306321565 | ||
|
|
3a099945b5 | ||
|
|
9f6c1cc33c | ||
|
|
13cbaaa6dc | ||
|
|
46634b1e1c | ||
|
|
3508b8e341 | ||
|
|
039e3ea0cb | ||
| 90d7a3ea94 | |||
| c348734ff4 | |||
| 35da688b1e | |||
|
|
089abfc598 | ||
| f732d8305e | |||
|
|
7a4caf7191 | ||
| 213b4cfd77 | |||
|
|
1f55ad8247 | ||
|
|
53ffe3822a | ||
|
|
71d8deab5b | ||
|
|
2173d7f928 | ||
|
|
eddab4a298 | ||
|
|
2ea2c03c67 | ||
|
|
0775710102 | ||
|
|
ba77d72091 | ||
|
|
47beb3a8e7 | ||
|
|
0eaac8c2f0 | ||
| 266cf4dbba | |||
| 5a63584a17 | |||
|
|
37ffbebc67 | ||
| 9fdbaf7b23 | |||
|
|
adb208a56a | ||
| e09410d38a | |||
|
|
9e510fa090 | ||
|
|
c0ade602b5 | ||
| 9e3317274f | |||
| 16f489c91b | |||
|
|
fa260ee4ff | ||
|
|
cc6ace3798 | ||
|
|
4d213db5c9 | ||
|
|
44822b9a11 | ||
|
|
7a59998cff | ||
|
|
83335fd07a | ||
| 7113cc197f | |||
| d8fcfeb0c0 | |||
|
|
31cc63250c | ||
|
|
53c2a13923 | ||
| 4afeb40dca | |||
| 27274582c5 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -2,3 +2,5 @@ __pycache__
|
|||||||
.venv
|
.venv
|
||||||
db.sqlite3
|
db.sqlite3
|
||||||
tailwindcss.exe
|
tailwindcss.exe
|
||||||
|
t-style.css
|
||||||
|
dump.rdb
|
||||||
|
|||||||
21
README.md
21
README.md
@@ -6,6 +6,7 @@
|
|||||||
2. [Starten des Servers](#starten-des-servers)
|
2. [Starten des Servers](#starten-des-servers)
|
||||||
3. [Superuser erstellen](#superuser-erstellen)
|
3. [Superuser erstellen](#superuser-erstellen)
|
||||||
4. [Tailwind-Nutzung](#tailwind-nutzung)
|
4. [Tailwind-Nutzung](#tailwind-nutzung)
|
||||||
|
5. [Issue - Merge Request - Merge](#issue-mergerequest-merge)
|
||||||
|
|
||||||
## Initialisierung des Projekts
|
## Initialisierung des Projekts
|
||||||
|
|
||||||
@@ -83,7 +84,11 @@ npm install tailwindcss @tailwindcss/cli
|
|||||||
### Datei generieren
|
### Datei generieren
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
|
# Bei Verwendung der Binärdatei:
|
||||||
tailwindcss -i <INPUT-DATEI> -o <OUTPUT-DATEI> --watch --minify
|
tailwindcss -i <INPUT-DATEI> -o <OUTPUT-DATEI> --watch --minify
|
||||||
|
|
||||||
|
# Bei Verwendung von NPM:
|
||||||
|
npx @tailwindcss/cli -i <INPUT-DATEI> -o <OUTPUT-DATEI> --watch --minify
|
||||||
```
|
```
|
||||||
|
|
||||||
- INPUT-DATEI: CSS Datei, welche die Einbindung und Konfiguration von Tailwind enthält
|
- INPUT-DATEI: CSS Datei, welche die Einbindung und Konfiguration von Tailwind enthält
|
||||||
@@ -94,5 +99,19 @@ tailwindcss -i <INPUT-DATEI> -o <OUTPUT-DATEI> --watch --minify
|
|||||||
**Beispiel:**
|
**Beispiel:**
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
tailwindcss -i core/homepage/static/homepage/t-input.css -o core/homepage/static/homepage/t-style.css --watch --minify
|
# unter Linux mit Tailwind Binärdatei:
|
||||||
|
tailwindcss -i core/static/homepage/t-input.css -o core/static/homepage/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
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Issue - Merge Request - Merge
|
||||||
|
|
||||||
|
Hier der vereinbarte Arbeitsablauf:
|
||||||
|
|
||||||
|
1. Issue erstellen - das geht am einfachsten über die Webseite. Der Titel beschreibt kurz und klar, was angestrebt wird.
|
||||||
|
|
||||||
|
2. Merge Request anlegen - dadurch wird der Bransch automatisch angelegt. Dieser kann mit `git pull` geholt und mit `git checkout <branch>` bearbeitet werden.
|
||||||
|
|
||||||
|
3. Nach dem Hochladen kann der Merge in den Master durchgeführt werden.
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
/*color vars*/
|
|
||||||
:root {
|
|
||||||
--main_bg: #1e1e1e;
|
|
||||||
--main_text_color: #d3d3d3;
|
|
||||||
--main_color: #3399cc;
|
|
||||||
--hover_main_color: #3399ccb0;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
body {
|
|
||||||
background-color: var(--main_bg);
|
|
||||||
color: var(--main_text_color);
|
|
||||||
font-family: Arial, sans-serif;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
height: 100vh;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
@@ -1,128 +0,0 @@
|
|||||||
|
|
||||||
.register_link {
|
|
||||||
color:var(--main_text_color);
|
|
||||||
background-color: #2e2e2e;
|
|
||||||
}
|
|
||||||
|
|
||||||
.register_button {
|
|
||||||
color:var(--main_text_color);
|
|
||||||
background-color: #2e2e2e;
|
|
||||||
border-radius: 5px;
|
|
||||||
border:none;
|
|
||||||
margin-top: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.login-container {
|
|
||||||
background-color: #2e2e2e;
|
|
||||||
padding: 30px;
|
|
||||||
border-radius: 15px;
|
|
||||||
width: 400px;
|
|
||||||
box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.5);
|
|
||||||
text-align: center;
|
|
||||||
border: 2px solid var(--main_color);
|
|
||||||
}
|
|
||||||
|
|
||||||
.login-header {
|
|
||||||
color: var(--main_text_color);
|
|
||||||
font-size: 24px;
|
|
||||||
margin-bottom: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.input-group {
|
|
||||||
width: 350px;
|
|
||||||
margin-bottom: 15px;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
padding-left: 25px;
|
|
||||||
padding-right: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.input-group input {
|
|
||||||
width: 100%;
|
|
||||||
padding: 10px;
|
|
||||||
border: 1px solid #555;
|
|
||||||
border-radius: 15px;
|
|
||||||
background-color: #4a4a4a;
|
|
||||||
color: var(--main_text_color);
|
|
||||||
outline: none;
|
|
||||||
transition: transform 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.input-group input:focus {
|
|
||||||
transform: scale(1.06);
|
|
||||||
border-color: var(--main_color);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.login-button {
|
|
||||||
width: 50%;
|
|
||||||
padding: 13px;
|
|
||||||
background-color: var(--main_color);
|
|
||||||
color: var(--main_text_color);
|
|
||||||
border: none;
|
|
||||||
border-radius: 15px;
|
|
||||||
cursor: pointer;
|
|
||||||
transition: background-color 0.3s ease;
|
|
||||||
font-size: 20px;
|
|
||||||
font-weight: bold;
|
|
||||||
margin-top: 10px;
|
|
||||||
transition: transform 0.2s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.login-button:hover {
|
|
||||||
background-color: var(--hover_main_color);
|
|
||||||
transform: scale(1.06);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.login-logo {
|
|
||||||
width: 400px;
|
|
||||||
height: auto;
|
|
||||||
margin-bottom: 20px;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
border-radius: 10px;
|
|
||||||
}
|
|
||||||
.login-logo-mobile {
|
|
||||||
width: 150px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.login-container {
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* MOBILE DEVICES */
|
|
||||||
@media (max-width: 768px) {
|
|
||||||
.login-container {
|
|
||||||
width: 250px;
|
|
||||||
padding: 10px;
|
|
||||||
}
|
|
||||||
.input-group {
|
|
||||||
width: 200px;
|
|
||||||
}
|
|
||||||
.login-logo {
|
|
||||||
display:none;
|
|
||||||
}
|
|
||||||
.login-button {
|
|
||||||
height: auto;
|
|
||||||
}
|
|
||||||
.login-form {
|
|
||||||
padding-bottom: 12px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* DESKTOP DEVICES*/
|
|
||||||
@media (min-width: 768px) {
|
|
||||||
.login-logo-mobile {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
{% load static %}
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="de">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>{% block title %}{% endblock %}</title>
|
|
||||||
<link rel="stylesheet" href="{% static 'homepage/t-style.css' %}">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
{% include 'homepage/partials/_nav.html' %}
|
|
||||||
{% block content %}
|
|
||||||
{% endblock %}
|
|
||||||
{% include 'homepage/partials/_footer.html' %}
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{% extends 'accounts/base.html'%}
|
|
||||||
{% block title %}Home{% endblock %}
|
|
||||||
{% block content %}
|
|
||||||
<div class="grid place-content-center h-120">
|
|
||||||
<h1 class="text-center m-4 text-6xl">Moin moin!</h1>
|
|
||||||
<form action="{% url 'accounts:logout' %}" method="post">
|
|
||||||
{% csrf_token %}
|
|
||||||
<button class="bg-red-600 text-white p-3 rounded-full font-black" type="submit">Abmelden</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
@@ -1,12 +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="#">qivip</a></h2>
|
|
||||||
</div>
|
|
||||||
<div class="flex items-center">
|
|
||||||
<ul class="flex space-x-4 qp-nav-list">
|
|
||||||
<li><a href="#">Start</a></li>
|
|
||||||
<li><a href="#">Bibliothek</a></li>
|
|
||||||
<li><a href="{% url 'login' %}">Konto</a></li> <!--Hier ist der Link erstmal auf das alte Login-Formular gesetzt! Zum Testen!-->
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
0
core/chat/__init__.py
Normal file
0
core/chat/__init__.py
Normal file
40
core/chat/consumers.py
Normal file
40
core/chat/consumers.py
Normal file
@@ -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}))
|
||||||
0
core/chat/migrations/__init__.py
Normal file
0
core/chat/migrations/__init__.py
Normal file
8
core/chat/routing.py
Normal file
8
core/chat/routing.py
Normal file
@@ -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()),
|
||||||
|
]
|
||||||
9
core/chat/urls.py
Normal file
9
core/chat/urls.py
Normal file
@@ -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"),
|
||||||
|
]
|
||||||
8
core/chat/views.py
Normal file
8
core/chat/views.py
Normal file
@@ -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})
|
||||||
@@ -9,8 +9,26 @@ https://docs.djangoproject.com/en/5.1/howto/deployment/asgi/
|
|||||||
|
|
||||||
import os
|
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 django.core.asgi import get_asgi_application
|
||||||
|
from channels.routing import ProtocolTypeRouter
|
||||||
|
|
||||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings')
|
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings')
|
||||||
|
|
||||||
application = get_asgi_application()
|
#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))
|
||||||
|
),
|
||||||
|
}
|
||||||
|
)
|
||||||
@@ -25,16 +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!
|
# SECURITY WARNING: don't run with debug turned on in production!
|
||||||
DEBUG = True
|
DEBUG = True
|
||||||
|
|
||||||
ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '*']
|
ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '*', '172.22.10.111']
|
||||||
|
|
||||||
|
|
||||||
# Application definition
|
# Application definition
|
||||||
|
|
||||||
INSTALLED_APPS = [
|
INSTALLED_APPS = [
|
||||||
|
'daphne',
|
||||||
|
'chat',
|
||||||
'library.apps.LibraryConfig',
|
'library.apps.LibraryConfig',
|
||||||
'homepage.apps.HomepageConfig',
|
'homepage.apps.HomepageConfig',
|
||||||
'components.apps.ComponentsConfig',
|
'components.apps.ComponentsConfig',
|
||||||
'accounts.apps.AccountsConfig',
|
'accounts.apps.AccountsConfig',
|
||||||
|
'play.apps.PlayConfig',
|
||||||
'django.contrib.admin',
|
'django.contrib.admin',
|
||||||
'django.contrib.auth',
|
'django.contrib.auth',
|
||||||
'django.contrib.contenttypes',
|
'django.contrib.contenttypes',
|
||||||
@@ -58,7 +61,7 @@ ROOT_URLCONF = 'core.urls'
|
|||||||
TEMPLATES = [
|
TEMPLATES = [
|
||||||
{
|
{
|
||||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||||
'DIRS': [],
|
'DIRS': [BASE_DIR / 'templates'],
|
||||||
'APP_DIRS': True,
|
'APP_DIRS': True,
|
||||||
'OPTIONS': {
|
'OPTIONS': {
|
||||||
'context_processors': [
|
'context_processors': [
|
||||||
@@ -120,11 +123,25 @@ USE_TZ = True
|
|||||||
# https://docs.djangoproject.com/en/5.1/howto/static-files/
|
# https://docs.djangoproject.com/en/5.1/howto/static-files/
|
||||||
|
|
||||||
STATIC_URL = '/static/'
|
STATIC_URL = '/static/'
|
||||||
BASE_DIR='static' #von ben8 hinzugefügt
|
STATICFILES_DIRS = [BASE_DIR / 'static']
|
||||||
|
|
||||||
# Default primary key field type
|
# Default primary key field type
|
||||||
# https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field
|
# https://docs.djangoproject.com/en/5.1/ref/settings/#default-auto-field
|
||||||
|
|
||||||
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
||||||
|
|
||||||
LOGIN_URL = '/login/'
|
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)],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
@@ -21,6 +21,7 @@ urlpatterns = [
|
|||||||
path('admin/', admin.site.urls),
|
path('admin/', admin.site.urls),
|
||||||
path('account/', include('accounts.urls')),
|
path('account/', include('accounts.urls')),
|
||||||
path('', include('homepage.urls')),
|
path('', include('homepage.urls')),
|
||||||
path('play/', include('components.urls')),
|
path('play/', include('play.urls')),
|
||||||
path('library/', include('library.urls')),
|
path('library/', include('library.urls')),
|
||||||
|
path('chat/', include('chat.urls')),
|
||||||
]
|
]
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,15 +0,0 @@
|
|||||||
{% load static %}
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="de">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<link rel="stylesheet" href="{% static 'homepage/t-style.css' %}">
|
|
||||||
<title>qivip</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
{% include 'homepage/partials/_nav.html' %}
|
|
||||||
{% block content%}{% endblock %}
|
|
||||||
{% include 'homepage/partials/_footer.html' %}
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<div class="grid place-content-center gap-2 w-full mt-4">
|
|
||||||
<div class="flex space-x-2 pb-4">
|
|
||||||
<p class="text-sm font-extralight"><a href="#">Impressum</a></p>
|
|
||||||
<p class="text-sm font-extralight"><a href="#">Datenschutz</a></p>
|
|
||||||
<p class="text-sm font-extralight"><a href="#">Repository</a></p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@@ -5,4 +5,6 @@ app_name = 'homepage' # Verhindert Konflikt mit anderen Apps
|
|||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('', views.home, name="home"),
|
path('', views.home, name="home"),
|
||||||
|
path('impress', views.impress, name="impress"),
|
||||||
|
path('privacy', views.privacy, name="privacy"),
|
||||||
]
|
]
|
||||||
@@ -2,3 +2,8 @@ from django.shortcuts import render, redirect
|
|||||||
|
|
||||||
def home(request):
|
def home(request):
|
||||||
return render(request, 'homepage/home.html')
|
return render(request, 'homepage/home.html')
|
||||||
|
|
||||||
|
def impress(request):
|
||||||
|
return render(request, 'homepage/impress.html')
|
||||||
|
def privacy(request):
|
||||||
|
return render(request, 'homepage/privacy.html')
|
||||||
@@ -4,7 +4,7 @@ from .models import QivipQuiz, QivipQuestion
|
|||||||
class QuizForm(forms.ModelForm):
|
class QuizForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = QivipQuiz
|
model = QivipQuiz
|
||||||
fields = ['name', 'description', 'status', 'category', 'tags']
|
fields = ['name', 'description', 'status', 'category', 'tags',"difficulty"]
|
||||||
|
|
||||||
class QuestionForm(forms.ModelForm):
|
class QuestionForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|||||||
18
core/library/migrations/0002_alter_qivipquiz_status.py
Normal file
18
core/library/migrations/0002_alter_qivipquiz_status.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-03-08 13:14
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0001_initial'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='status',
|
||||||
|
field=models.CharField(choices=[('public', 'Öffentlich'), ('hidden', 'Versteckt'), ('private', 'Privat')], default='private', max_length=10),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
core/library/migrations/0003_alter_qivipquiz_status.py
Normal file
18
core/library/migrations/0003_alter_qivipquiz_status.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-03-08 13:16
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0002_alter_qivipquiz_status'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='status',
|
||||||
|
field=models.CharField(choices=[('public', 'Öffentlich'), ('hidden', 'Versteckt'), ('private', 'Privat')], default='Privat', max_length=10),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
core/library/migrations/0004_alter_qivipquiz_status.py
Normal file
18
core/library/migrations/0004_alter_qivipquiz_status.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-03-08 13:18
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0003_alter_qivipquiz_status'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='status',
|
||||||
|
field=models.CharField(choices=[('public', 'Öffentlich'), ('hidden', 'Versteckt'), ('private', 'Privat')], default='private', max_length=10),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
core/library/migrations/0005_alter_qivipquiz_status.py
Normal file
18
core/library/migrations/0005_alter_qivipquiz_status.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-03-08 13:23
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0004_alter_qivipquiz_status'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='status',
|
||||||
|
field=models.CharField(choices=[('public', 'Öffentlich'), ('hidden', 'Versteckt'), ('private', 'Privat')], default='public', max_length=10),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
core/library/migrations/0006_alter_qivipquiz_description.py
Normal file
18
core/library/migrations/0006_alter_qivipquiz_description.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-03-08 13:30
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0005_alter_qivipquiz_status'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='description',
|
||||||
|
field=models.TextField(blank=True, default='In dem Quiz geht es um ...', null=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
core/library/migrations/0007_alter_qivipquiz_description.py
Normal file
18
core/library/migrations/0007_alter_qivipquiz_description.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-03-08 13:31
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0006_alter_qivipquiz_description'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='description',
|
||||||
|
field=models.TextField(blank=True, default='Das Quiz ist ein ... Quiz. In dem Quiz geht es um ...', null=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
core/library/migrations/0008_alter_qivipquiz_description.py
Normal file
18
core/library/migrations/0008_alter_qivipquiz_description.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-03-08 13:32
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0007_alter_qivipquiz_description'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='description',
|
||||||
|
field=models.TextField(blank=True, default='Das Quiz ist ein ... Quiz. \n In dem Quiz geht es um ...', null=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
core/library/migrations/0009_alter_qivipquiz_description.py
Normal file
18
core/library/migrations/0009_alter_qivipquiz_description.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-03-08 13:32
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0008_alter_qivipquiz_description'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='description',
|
||||||
|
field=models.TextField(blank=True, default='Das Quiz ist ein ... Quiz. \nIn dem Quiz geht es um ...', null=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
core/library/migrations/0010_alter_qivipquiz_description.py
Normal file
18
core/library/migrations/0010_alter_qivipquiz_description.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-03-08 13:33
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0009_alter_qivipquiz_description'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='description',
|
||||||
|
field=models.TextField(blank=True, default='In dem Quiz geht es um ...', null=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
core/library/migrations/0011_qivipquiz_difficulty.py
Normal file
18
core/library/migrations/0011_qivipquiz_difficulty.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-03-08 13:37
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0010_alter_qivipquiz_description'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='difficulty',
|
||||||
|
field=models.CharField(choices=[('public', 'Öffentlich'), ('hidden', 'Versteckt'), ('private', 'Privat')], default='public', max_length=10),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
core/library/migrations/0012_alter_qivipquiz_difficulty.py
Normal file
18
core/library/migrations/0012_alter_qivipquiz_difficulty.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-03-08 13:39
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0011_qivipquiz_difficulty'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='difficulty',
|
||||||
|
field=models.CharField(choices=[('public', 'Öffentlich'), ('hidden', 'Versteckt'), ('private', 'Privat')], default='not defined', max_length=10),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
core/library/migrations/0013_alter_qivipquiz_difficulty.py
Normal file
18
core/library/migrations/0013_alter_qivipquiz_difficulty.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-03-08 13:40
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0012_alter_qivipquiz_difficulty'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='difficulty',
|
||||||
|
field=models.CharField(choices=[('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('not defined', 'nicht gesetzt')], default='not defined', max_length=11),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
core/library/migrations/0014_alter_qivipquiz_difficulty.py
Normal file
18
core/library/migrations/0014_alter_qivipquiz_difficulty.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-03-08 13:43
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0013_alter_qivipquiz_difficulty'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='difficulty',
|
||||||
|
field=models.CharField(choices=[('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('not defined', 'nicht gesetzt')], default='not defined', help_text='1: niedrigste Schwierigkeit, 2: höchste Schwierigkeit', max_length=11),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
core/library/migrations/0015_alter_qivipquiz_difficulty.py
Normal file
18
core/library/migrations/0015_alter_qivipquiz_difficulty.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.3 on 2025-03-08 13:44
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0014_alter_qivipquiz_difficulty'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='difficulty',
|
||||||
|
field=models.CharField(choices=[('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('not defined', 'nicht gesetzt')], default='not defined', help_text='1: niedrigste Schwierigkeit und 5: höchste Schwierigkeit', max_length=11),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -9,16 +9,26 @@ class QivipQuiz(models.Model):
|
|||||||
"hidden": "Versteckt",
|
"hidden": "Versteckt",
|
||||||
"private": "Privat",
|
"private": "Privat",
|
||||||
}
|
}
|
||||||
|
DIFFICULTY_VALUES = {
|
||||||
|
"1": "1",
|
||||||
|
"2": "2",
|
||||||
|
"3": "3",
|
||||||
|
"4": "4",
|
||||||
|
"5": "5",
|
||||||
|
"not defined":"nicht gesetzt",
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
|
uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
|
||||||
user_id = models.ForeignKey(User, on_delete=models.CASCADE, related_name='quiz')
|
user_id = models.ForeignKey(User, on_delete=models.CASCADE, related_name='quiz')
|
||||||
creation_date = models.DateTimeField(auto_now_add=True)
|
creation_date = models.DateTimeField(auto_now_add=True)
|
||||||
update_date = models.DateTimeField(auto_now=True)
|
update_date = models.DateTimeField(auto_now=True)
|
||||||
status = models.CharField(max_length=10, choices=STATUS_VALUES.items())
|
status = models.CharField(max_length=10, choices=list(STATUS_VALUES.items()), default="public")
|
||||||
category = models.ForeignKey('QuizCategory', related_name='quiz', on_delete=models.CASCADE)
|
category = models.ForeignKey('QuizCategory', related_name='quiz', on_delete=models.CASCADE)
|
||||||
tags = models.ManyToManyField('Tag', blank=True)
|
tags = models.ManyToManyField('Tag', blank=True)
|
||||||
name = models.CharField(max_length=255)
|
name = models.CharField(max_length=255)
|
||||||
description = models.TextField(blank=True, null=True)
|
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):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
{% load static %}
|
|
||||||
<!DOCTYPE html>
|
|
||||||
<html lang="de">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<link rel="stylesheet" href="{% static 'homepage/t-style.css' %}">
|
|
||||||
<title>qivip</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
{% include 'homepage/partials/_nav.html' %}
|
|
||||||
<div class="max-w-screen-lg mx-auto">
|
|
||||||
{% block content%}{% endblock %}
|
|
||||||
</div>
|
|
||||||
{% include 'homepage/partials/_footer.html' %}
|
|
||||||
{% block extra_js %}{% endblock %}
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
{% extends 'library/base.html' %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<h1>Übersicht</h1>
|
|
||||||
<div class="flex justify-end">
|
|
||||||
<a href="{% url 'library:new_quiz' %}" class="bg-blue-500 text-white px-4 py-2 rounded-md">Neues Quiz erstellen</a>
|
|
||||||
</div>
|
|
||||||
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
|
|
||||||
{% for quiz in quizzes %}
|
|
||||||
<div class="bg-white rounded-lg p-4 shadow-md">
|
|
||||||
<h2 class="text-lg font-bold"><a href="{% url 'library:detail_quiz' quiz.id %}">{{ quiz.name }}</a></h2>
|
|
||||||
<p class="text-sm text-gray-600">{{ quiz.description }}</p>
|
|
||||||
<a href="#">Spiel starten</a>
|
|
||||||
<a href="{% url 'library:edit_quiz' quiz.id %}">Bearbeiten</a>
|
|
||||||
<a href="{% url 'library:delete_quiz' quiz.id %}">Löschen</a>
|
|
||||||
</div>
|
|
||||||
{% endfor %}
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
@@ -100,7 +100,7 @@ def new_question(request):
|
|||||||
return redirect(f'{base_url}?type=multiple_choice&quiz_id={quiz_id}')
|
return redirect(f'{base_url}?type=multiple_choice&quiz_id={quiz_id}')
|
||||||
|
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
question_text = request.POST.get('question')
|
question_text = request.POST.get('question', '')
|
||||||
|
|
||||||
# Handle different question types
|
# Handle different question types
|
||||||
if question_type == 'true_false':
|
if question_type == 'true_false':
|
||||||
@@ -140,27 +140,28 @@ def new_question(request):
|
|||||||
question = QivipQuestion()
|
question = QivipQuestion()
|
||||||
question.data = json.dumps(json_data)
|
question.data = json.dumps(json_data)
|
||||||
question.quiz_id = quiz
|
question.quiz_id = quiz
|
||||||
question.type = question_type
|
|
||||||
question.question = question_text
|
|
||||||
question.save()
|
question.save()
|
||||||
return redirect('library:detail_quiz', pk=quiz.pk)
|
return redirect('library:detail_quiz', pk=quiz.pk)
|
||||||
else:
|
else:
|
||||||
# Initialize empty question data for new questions
|
# Initialize empty question data for new questions
|
||||||
question_data = {
|
|
||||||
'type': question_type,
|
|
||||||
'question': '',
|
|
||||||
'options': []
|
|
||||||
}
|
|
||||||
if question_type == 'true_false':
|
if question_type == 'true_false':
|
||||||
question_data['options'] = [
|
question_data = {
|
||||||
{'value': 'Wahr', 'is_correct': True},
|
'type': question_type,
|
||||||
{'value': 'Falsch', 'is_correct': False}
|
'question': '',
|
||||||
]
|
'options': [
|
||||||
|
{'value': 'Wahr', 'is_correct': True},
|
||||||
|
{'value': 'Falsch', 'is_correct': False}
|
||||||
|
]
|
||||||
|
}
|
||||||
elif question_type == 'multiple_choice':
|
elif question_type == 'multiple_choice':
|
||||||
question_data['options'] = [
|
question_data = {
|
||||||
{'value': '', 'is_correct': False},
|
'type': question_type,
|
||||||
{'value': '', 'is_correct': False}
|
'question': '',
|
||||||
]
|
'options': [
|
||||||
|
{'value': '', 'is_correct': False},
|
||||||
|
{'value': '', 'is_correct': False}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
template_name = f'library/question/question_{question_type}.html'
|
template_name = f'library/question/question_{question_type}.html'
|
||||||
context = {
|
context = {
|
||||||
@@ -179,11 +180,53 @@ def edit_question(request, pk):
|
|||||||
return redirect('library:question_list')
|
return redirect('library:question_list')
|
||||||
|
|
||||||
# Parse the existing JSON data
|
# Parse the existing JSON data
|
||||||
question_data = json.loads(question.data) if question.data else {}
|
try:
|
||||||
question_type = question_data.get('type', 'multiple_choice')
|
question_data = json.loads(question.data) if question.data else {}
|
||||||
|
question_type = question_data.get('type', 'multiple_choice')
|
||||||
|
|
||||||
|
# For true/false questions, get the correct answer from the options
|
||||||
|
if question_type == 'true_false':
|
||||||
|
# Default to true if no options exist
|
||||||
|
correct_answer = True
|
||||||
|
if question_data.get('options'):
|
||||||
|
correct_answer = question_data['options'][0].get('is_correct', True)
|
||||||
|
question_data = {
|
||||||
|
'type': question_type,
|
||||||
|
'question': question_data.get('question', ''),
|
||||||
|
'correct_answer': correct_answer, # Add this for template compatibility
|
||||||
|
'options': [
|
||||||
|
{'value': 'Wahr', 'is_correct': correct_answer},
|
||||||
|
{'value': 'Falsch', 'is_correct': not correct_answer}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
else:
|
||||||
|
# For multiple choice questions
|
||||||
|
question_data.setdefault('type', question_type)
|
||||||
|
question_data.setdefault('question', '')
|
||||||
|
question_data.setdefault('options', [])
|
||||||
|
|
||||||
|
except (json.JSONDecodeError, AttributeError):
|
||||||
|
# Handle invalid JSON or None data
|
||||||
|
question_type = question_data.get('type', 'multiple_choice')
|
||||||
|
if question_type == 'true_false':
|
||||||
|
question_data = {
|
||||||
|
'type': question_type,
|
||||||
|
'question': '',
|
||||||
|
'correct_answer': True, # Default to true for new questions
|
||||||
|
'options': [
|
||||||
|
{'value': 'Wahr', 'is_correct': True},
|
||||||
|
{'value': 'Falsch', 'is_correct': False}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
else:
|
||||||
|
question_data = {
|
||||||
|
'type': question_type,
|
||||||
|
'question': '',
|
||||||
|
'options': []
|
||||||
|
}
|
||||||
|
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
question_text = request.POST.get('question')
|
question_text = request.POST.get('question', '')
|
||||||
|
|
||||||
# Handle different question types
|
# Handle different question types
|
||||||
if question_type == 'true_false':
|
if question_type == 'true_false':
|
||||||
@@ -191,7 +234,6 @@ def edit_question(request, pk):
|
|||||||
json_data = {
|
json_data = {
|
||||||
'type': question_type,
|
'type': question_type,
|
||||||
'question': question_text,
|
'question': question_text,
|
||||||
'correct_answer': correct_answer,
|
|
||||||
'options': [
|
'options': [
|
||||||
{'value': 'Wahr', 'is_correct': correct_answer},
|
{'value': 'Wahr', 'is_correct': correct_answer},
|
||||||
{'value': 'Falsch', 'is_correct': not correct_answer}
|
{'value': 'Falsch', 'is_correct': not correct_answer}
|
||||||
@@ -205,7 +247,7 @@ def edit_question(request, pk):
|
|||||||
options.append({
|
options.append({
|
||||||
'order': i,
|
'order': i,
|
||||||
'value': request.POST.get(f'option_{i}'),
|
'value': request.POST.get(f'option_{i}'),
|
||||||
'is_correct': int(request.POST.get(f'correct_{i}', 0))
|
'is_correct': request.POST.get(f'correct_{i}') == '1'
|
||||||
})
|
})
|
||||||
i += 1
|
i += 1
|
||||||
|
|
||||||
@@ -225,22 +267,18 @@ def edit_question(request, pk):
|
|||||||
'options': options
|
'options': options
|
||||||
}
|
}
|
||||||
|
|
||||||
question.question = question_text
|
|
||||||
question.type = question_type
|
|
||||||
question.data = json.dumps(json_data)
|
question.data = json.dumps(json_data)
|
||||||
question.save()
|
question.save()
|
||||||
return redirect('library:detail_quiz', pk=question.quiz_id.pk)
|
return redirect('library:detail_quiz', pk=question.quiz_id.pk)
|
||||||
else:
|
else:
|
||||||
question_data = json.loads(question.data) if question.data else {}
|
template_name = f'library/question/question_{question_type}.html'
|
||||||
|
context = {
|
||||||
|
'question': {'data': question_data}, # Wrap in data structure expected by template
|
||||||
|
'quiz_id': question.quiz_id.pk,
|
||||||
|
'quiz': question.quiz_id
|
||||||
|
}
|
||||||
|
|
||||||
template_name = f'library/question/question_{question_type}.html'
|
return render(request, template_name, context)
|
||||||
context = {
|
|
||||||
'question': question_data,
|
|
||||||
'quiz_id': question.quiz_id.pk,
|
|
||||||
'quiz': question.quiz_id
|
|
||||||
}
|
|
||||||
|
|
||||||
return render(request, template_name, context)
|
|
||||||
|
|
||||||
# Frage löschen
|
# Frage löschen
|
||||||
@login_required
|
@login_required
|
||||||
|
|||||||
0
core/play/__init__.py
Normal file
0
core/play/__init__.py
Normal file
3
core/play/admin.py
Normal file
3
core/play/admin.py
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
from django.contrib import admin
|
||||||
|
|
||||||
|
# Register your models here.
|
||||||
6
core/play/apps.py
Normal file
6
core/play/apps.py
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
from django.apps import AppConfig
|
||||||
|
|
||||||
|
|
||||||
|
class PlayConfig(AppConfig):
|
||||||
|
default_auto_field = 'django.db.models.BigAutoField'
|
||||||
|
name = 'play'
|
||||||
0
core/play/migrations/__init__.py
Normal file
0
core/play/migrations/__init__.py
Normal file
3
core/play/models.py
Normal file
3
core/play/models.py
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
from django.db import models
|
||||||
|
|
||||||
|
# Create your models here.
|
||||||
3
core/play/tests.py
Normal file
3
core/play/tests.py
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
from django.test import TestCase
|
||||||
|
|
||||||
|
# Create your tests here.
|
||||||
9
core/play/urls.py
Normal file
9
core/play/urls.py
Normal file
@@ -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'),
|
||||||
|
]
|
||||||
8
core/play/views.py
Normal file
8
core/play/views.py
Normal file
@@ -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')
|
||||||
@@ -1,5 +1,9 @@
|
|||||||
@import 'tailwindcss';
|
@import 'tailwindcss';
|
||||||
|
|
||||||
|
qp-container {
|
||||||
|
@apply max-w-xl w-full mx-auto;
|
||||||
|
}
|
||||||
|
|
||||||
nav div ul.qp-nav-list li {
|
nav div ul.qp-nav-list li {
|
||||||
@apply text-white hover:scale-110 hover:border-b-2 hover:border-white transition duration-200;
|
@apply text-white hover:scale-110 hover:border-b-2 hover:border-white transition duration-200;
|
||||||
}
|
}
|
||||||
@@ -7,7 +11,10 @@ nav div ul.qp-nav-list li {
|
|||||||
a.qp-a-button {
|
a.qp-a-button {
|
||||||
@apply p-6 rounded-md font-extrabold hover:scale-105 transition duration-300 shadow-md;
|
@apply p-6 rounded-md font-extrabold hover:scale-105 transition duration-300 shadow-md;
|
||||||
}
|
}
|
||||||
.register input{@apply p-3 rounded-full bg-gray-200 focus:scale-105 transition duration-200 font-black;}
|
a.qp-a-button-small {
|
||||||
|
@apply p-1 rounded-md hover:scale-105 transition duration-300 shadow-md;
|
||||||
|
}
|
||||||
|
.register input{@apply p-3 rounded-full bg-gray-200 focus:scale-105 transition duration-200 font-black w-full;}
|
||||||
|
|
||||||
.input-group {
|
.input-group {
|
||||||
@apply flex flex-col gap-4 max-w-md mx-auto p-6 bg-white rounded-xl shadow-lg;
|
@apply flex flex-col gap-4 max-w-md mx-auto p-6 bg-white rounded-xl shadow-lg;
|
||||||
BIN
core/static/icons/favicon.png
Normal file
BIN
core/static/icons/favicon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.7 KiB |
25
core/templates/accounts/home.html
Normal file
25
core/templates/accounts/home.html
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
{% extends 'base.html'%}
|
||||||
|
{% block title %}Home{% endblock %}
|
||||||
|
{% block content %}
|
||||||
|
|
||||||
|
|
||||||
|
<div class="flex justify-center items-center mt-12 ">
|
||||||
|
<div class="input-group p-4 m-2 border-blue-600 border-2 rounded-xl shadow-md">
|
||||||
|
<div class="grid place-content-center h-120">
|
||||||
|
|
||||||
|
<h1 class="text-center m-4 text-3xl lg:text-6xl">Willkommen, <b>{{ request.user.username }}</b>!</h1>
|
||||||
|
|
||||||
|
<form action="{% url 'accounts:logout' %}" method="post">
|
||||||
|
{% csrf_token %}
|
||||||
|
<button class="bg-blue-600 text-white p-3 rounded-full font-black" type="submit">Abmelden</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<div class="flex justify-end">
|
||||||
|
<span class="text-[clamp(0.6rem,5vw,1rem)] font-black overflow-x-auto mt-1 ml-0.75 text-blue-600 p-0.75 bg-white">qivip
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
{% endblock %}
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
{% extends 'accounts/base.html' %}
|
{% extends 'base.html' %}
|
||||||
{% load static %}
|
{% load static %}
|
||||||
{% block title %}Anmeldung{% endblock %}
|
{% block title %}Anmeldung{% endblock %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="grid place-content-center h-120">
|
<div class="grid place-content-center h-120 mt-12 mb-12 ">
|
||||||
<div class="p-4 m-2 border-blue-600 border-2 rounded-xl shadow-md">
|
<div class="w-80 p-4 m-2 border-blue-600 border-2 rounded-xl shadow-md lg:w-90">
|
||||||
<h2 class="text-2xl text-center p-4 font-black">Anmeldung</h2>
|
<h2 class="text-2xl text-center p-4 font-black">Anmeldung</h2>
|
||||||
<form class="space-y-4" method="post">
|
<form class="space-y-4" method="post">
|
||||||
{% if form.errors %}
|
{% if form.errors %}
|
||||||
<div class="text-red-600 font-black overflow-x-auto break-words text-center">
|
<div class=" items-center text-red-600 font-black overflow-x-auto break-words text-center">
|
||||||
<ul>
|
<ul>
|
||||||
{% for field, errors in form.errors.items %}
|
{% for field, errors in form.errors.items %}
|
||||||
{% for error in errors %}
|
{% for error in errors %}
|
||||||
@@ -18,11 +18,11 @@
|
|||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
<div class="">
|
<div class="items-center w-full">
|
||||||
<input class="p-3 rounded-full bg-gray-200 focus:scale-105 transition duration-200 font-black" type="text" name="username" id="username" required placeholder="BENUTZERNAME">
|
<input class=" w-full p-3 rounded-full bg-gray-200 focus:scale-105 transition duration-200 font-black" type="text" name="username" id="username" required placeholder="BENUTZERNAME">
|
||||||
</div>
|
</div>
|
||||||
<div class="">
|
<div class="items-center w-full">
|
||||||
<input class="p-3 rounded-full bg-gray-200 focus:scale-105 transition duration-200 font-black" type="password" name="password" id="password" required placeholder="PASSWORT">
|
<input class=" w-full p-3 rounded-full bg-gray-200 focus:scale-105 transition duration-200 font-black" type="password" name="password" id="password" required placeholder="PASSWORT">
|
||||||
</div>
|
</div>
|
||||||
<button class="w-full p-3 rounded-full bg-blue-600 text-white font-black hover:scale-105 transition duration-200" type="submit" class="login-button">Anmelden</button>
|
<button class="w-full p-3 rounded-full bg-blue-600 text-white font-black hover:scale-105 transition duration-200" type="submit" class="login-button">Anmelden</button>
|
||||||
</form>
|
</form>
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
{% extends 'accounts/base.html' %}
|
{% extends 'base.html' %}
|
||||||
{% block title %}Registrierung{% endblock %}
|
{% block title %}Registrierung{% endblock %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="grid place-content-center h-120">
|
<div class="grid place-content-center h-120 mt-12 mb-12">
|
||||||
<div class=" p-4 m-2 border-blue-600 border-2 rounded-xl shadow-md">
|
|
||||||
|
<div class="w-80 p-4 m-2 border-blue-600 border-2 rounded-xl shadow-md lg:w-90">
|
||||||
<h2 class="text-2xl text-center p-4 font-black">Registrieren</h2>
|
<h2 class="text-2xl text-center p-4 font-black">Registrieren</h2>
|
||||||
|
|
||||||
<form class=" space-y-4" method="post">
|
<form class=" space-y-4" method="post">
|
||||||
17
core/templates/base.html
Normal file
17
core/templates/base.html
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
{% load static %}
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="de">
|
||||||
|
<head>
|
||||||
|
<link rel="icon" type="image/png" href="{% static 'icons/favicon.png' %}">
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<link rel="stylesheet" href="{% static 'css/t-style.css' %}">
|
||||||
|
<title>qivip</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
{% include 'partials/_nav.html' %}
|
||||||
|
{% block content%}{% endblock %}
|
||||||
|
{% include 'partials/_footer.html' %}
|
||||||
|
{% block extra_js %}{% endblock %}
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
27
core/templates/chat/index.html
Normal file
27
core/templates/chat/index.html
Normal file
@@ -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>
|
||||||
50
core/templates/chat/room.html
Normal file
50
core/templates/chat/room.html
Normal file
@@ -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>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{% extends 'homepage/base.html' %}
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="grid place-content-center md:h-screen h-150 w-full -z-50 top-0 p-4">
|
<div class="grid place-content-center md:h-screen h-150 w-full -z-50 top-0 p-4">
|
||||||
22
core/templates/homepage/impress.html
Normal file
22
core/templates/homepage/impress.html
Normal file
@@ -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>
|
||||||
13
core/templates/homepage/privacy.html
Normal file
13
core/templates/homepage/privacy.html
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
|
{% block content%}
|
||||||
|
<div>
|
||||||
|
<p>
|
||||||
|
Hallo, ich bin die Datenschutzerklärung!
|
||||||
|
</p>
|
||||||
|
</div
|
||||||
|
{% endblock %}
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
{% extends 'library/base.html' %}
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="container mx-auto px-4">
|
<div class="container mx-auto px-4">
|
||||||
<div class="max-w-lg mx-auto mt-10">
|
<div class="max-w-lg mx-auto mt-10">
|
||||||
<div class="bg-white rounded-lg shadow-md p-6">
|
<div class="bg-white rounded-lg shadow-md p-6 border-blue-600 border-2 rounded-xl shadow-md">
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
<svg class="mx-auto h-12 w-12 text-red-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
<svg class="mx-auto h-12 w-12 text-red-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"/>
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"/>
|
||||||
@@ -1,12 +1,12 @@
|
|||||||
{% extends 'library/base.html' %}
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="container mx-auto px-4">
|
<div class="container mx-auto px-4">
|
||||||
<div class="flex justify-between items-center mb-6">
|
<div class="flex justify-between items-center mb-6">
|
||||||
<h1 class="text-2xl font-bold">{{ quiz.name }}</h1>
|
<h1 class="text-2xl font-bold">{{ quiz.name }}</h1>
|
||||||
<div class="flex space-x-2">
|
<div class="flex space-x-2">
|
||||||
<a href="{% url 'library:edit_quiz' quiz.id %}" class="bg-blue-500 text-white px-4 py-2 rounded-md hover:bg-blue-600 transition-colors">Bearbeiten</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 hover:bg-red-600 transition-colors">Löschen</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>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -14,17 +14,17 @@
|
|||||||
<p class="text-gray-600 mb-8">{{ quiz.description }}</p>
|
<p class="text-gray-600 mb-8">{{ quiz.description }}</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<div class="bg-white rounded-lg shadow-md">
|
<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="border-b border-gray-200 p-4">
|
||||||
<div class="flex justify-between items-center">
|
<div class="flex justify-between items-center">
|
||||||
<h2 class="text-xl font-semibold">Fragen</h2>
|
<h2 class="text-xl font-semibold">Fragen</h2>
|
||||||
<div class="flex space-x-2">
|
<div class="flex space-x-2">
|
||||||
<a href="{% url 'library:new_question' %}?type=multiple_choice&quiz_id={{ quiz.id }}"
|
<a href="{% url 'library:new_question' %}?type=multiple_choice&quiz_id={{ quiz.id }}"
|
||||||
class="bg-green-500 text-white px-4 py-2 rounded-md hover:bg-green-600 transition-colors">
|
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
|
Multiple Choice
|
||||||
</a>
|
</a>
|
||||||
<a href="{% url 'library:new_question' %}?type=true_false&quiz_id={{ quiz.id }}"
|
<a href="{% url 'library:new_question' %}?type=true_false&quiz_id={{ quiz.id }}"
|
||||||
class="bg-green-500 text-white px-4 py-2 rounded-md hover:bg-green-600 transition-colors">
|
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
|
Wahr/Falsch
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
@@ -32,10 +32,14 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% if questions %}
|
{% if questions %}
|
||||||
|
|
||||||
<div class="divide-y divide-gray-200">
|
<div class="divide-y divide-gray-200">
|
||||||
{% for question in questions %}
|
{% for question in questions %}
|
||||||
<div class="p-4 hover:bg-gray-50">
|
|
||||||
|
<div class="w-full rounded-xl p-4 hover:bg-gray-50">
|
||||||
|
<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 justify-between items-start">
|
||||||
|
|
||||||
<div class="flex-grow">
|
<div class="flex-grow">
|
||||||
<p class="font-medium">{{ question.data.question }}</p>
|
<p class="font-medium">{{ question.data.question }}</p>
|
||||||
<div class="mt-1">
|
<div class="mt-1">
|
||||||
@@ -63,30 +67,41 @@
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
{% else %}
|
{% else %}
|
||||||
|
{% for option in question.data.options %}
|
||||||
|
{% if option.is_correct %}
|
||||||
<p class="text-sm">
|
<p class="text-sm">
|
||||||
<span class="text-gray-500">Richtige Antwort:</span>
|
<span class="text-gray-500">Richtige Antwort:</span>
|
||||||
<span class="ml-1 font-medium {% if question.data.correct_answer %}text-green-700{% else %}text-red-700{% endif %}">
|
<span class="ml-1 font-medium {% if option.value == "Wahr" %} text-green-700 {% else %}text-red-700{% endif %}">{{ option.value }}</span>
|
||||||
{% if question.data.correct_answer %}Wahr{% else %}Falsch{% endif %}
|
</p>
|
||||||
</span>
|
{% endif %}
|
||||||
</p>
|
{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex space-x-2 ml-4">
|
|
||||||
|
<div class="flex h-full space-x-2 ml-4 items-center">
|
||||||
|
<!--
|
||||||
<a href="{% url 'library:edit_question' question.id %}"
|
<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">
|
class="bg-gray-100 text-gray-700 px-3 py-1 rounded hover:bg-gray-200 transition-colors">
|
||||||
Bearbeiten
|
Bearbeiten
|
||||||
</a>
|
</a>
|
||||||
<a href="{% url 'library:delete_question' question.id %}"
|
-->
|
||||||
class="bg-red-100 text-red-700 px-3 py-1 rounded hover:bg-red-200 transition-colors">
|
|
||||||
Löschen
|
<a href=" {% url 'library:delete_question' question.id %}"
|
||||||
</a>
|
class=" text-red-700 px-4 py-1 rounded hover:scale-110 ">
|
||||||
|
🗑
|
||||||
|
</a>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</a>
|
||||||
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
||||||
<div class="p-8 text-center">
|
<div class="p-8 text-center">
|
||||||
<svg class="mx-auto h-12 w-12 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
<svg class="mx-auto h-12 w-12 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2"/>
|
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2"/>
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
{% extends 'library/base.html' %}
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1>Formular</h1>
|
<h1>Formular</h1>
|
||||||
<h2>{{ form.name.value }}</h2>
|
<h2>{{ form.name.value }}</h2>
|
||||||
<div class="input-group">
|
<div class="input-group border-blue-600 border-2 rounded-xl shadow-md">
|
||||||
<form method="post">
|
<form method="post">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{{ form.as_p }}
|
{{ form.as_p }}
|
||||||
28
core/templates/library/overview_quiz.html
Normal file
28
core/templates/library/overview_quiz.html
Normal file
@@ -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">✏</a>
|
||||||
|
<a href="{% url 'library:delete_quiz' quiz.id %}" class="qp-a-button-small border-2 border-blue-600 text-white">🗑</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endfor %}
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{% extends 'library/base.html' %}
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="container mx-auto px-4">
|
<div class="container mx-auto px-4">
|
||||||
@@ -18,9 +18,9 @@
|
|||||||
<div>
|
<div>
|
||||||
<label for="question" class="block text-sm font-medium text-gray-700">Frage</label>
|
<label for="question" class="block text-sm font-medium text-gray-700">Frage</label>
|
||||||
<div class="mt-1">
|
<div class="mt-1">
|
||||||
<input type="text" name="question" id="question"
|
<textarea name="question" id="question" rows="4"
|
||||||
class="shadow-sm focus:ring-blue-500 focus:border-blue-500 block w-full sm:text-sm border-gray-300 rounded-md"
|
class="shadow-sm focus:ring-blue-500 focus:border-blue-500 block w-full sm:text-sm border-gray-300 rounded-md"
|
||||||
value="{{ question.data.question|default:'' }}" required>
|
required>{{ question.data.question|default:'' }}</textarea>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -31,9 +31,9 @@
|
|||||||
{% if question and question.data.options %}
|
{% if question and question.data.options %}
|
||||||
{% for option in question.data.options %}
|
{% for option in question.data.options %}
|
||||||
<div class="flex items-center space-x-3">
|
<div class="flex items-center space-x-3">
|
||||||
<input type="text" name="option_{{ forloop.counter }}"
|
<textarea name="option_{{ forloop.counter }}" rows="2"
|
||||||
class="shadow-sm focus:ring-blue-500 focus:border-blue-500 flex-grow sm:text-sm border-gray-300 rounded-md"
|
class="shadow-sm focus:ring-blue-500 focus:border-blue-500 flex-grow sm:text-sm border-gray-300 rounded-md"
|
||||||
value="{{ option.value }}" required>
|
required>{{ option.value }}</textarea>
|
||||||
<label class="inline-flex items-center">
|
<label class="inline-flex items-center">
|
||||||
<input type="checkbox" name="correct_{{ forloop.counter }}" value="1"
|
<input type="checkbox" name="correct_{{ forloop.counter }}" value="1"
|
||||||
class="focus:ring-blue-500 h-4 w-4 text-blue-600 border-gray-300 rounded"
|
class="focus:ring-blue-500 h-4 w-4 text-blue-600 border-gray-300 rounded"
|
||||||
@@ -50,9 +50,9 @@
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="flex items-center space-x-3">
|
<div class="flex items-center space-x-3">
|
||||||
<input type="text" name="option_1"
|
<textarea name="option_1" rows="2"
|
||||||
class="shadow-sm focus:ring-blue-500 focus:border-blue-500 flex-grow sm:text-sm border-gray-300 rounded-md"
|
class="shadow-sm focus:ring-blue-500 focus:border-blue-500 flex-grow sm:text-sm border-gray-300 rounded-md"
|
||||||
required>
|
required></textarea>
|
||||||
<label class="inline-flex items-center">
|
<label class="inline-flex items-center">
|
||||||
<input type="checkbox" name="correct_1" value="1"
|
<input type="checkbox" name="correct_1" value="1"
|
||||||
class="focus:ring-blue-500 h-4 w-4 text-blue-600 border-gray-300 rounded">
|
class="focus:ring-blue-500 h-4 w-4 text-blue-600 border-gray-300 rounded">
|
||||||
@@ -66,9 +66,9 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center space-x-3">
|
<div class="flex items-center space-x-3">
|
||||||
<input type="text" name="option_2"
|
<textarea name="option_2" rows="2"
|
||||||
class="shadow-sm focus:ring-blue-500 focus:border-blue-500 flex-grow sm:text-sm border-gray-300 rounded-md"
|
class="shadow-sm focus:ring-blue-500 focus:border-blue-500 flex-grow sm:text-sm border-gray-300 rounded-md"
|
||||||
required>
|
required></textarea>
|
||||||
<label class="inline-flex items-center">
|
<label class="inline-flex items-center">
|
||||||
<input type="checkbox" name="correct_2" value="1"
|
<input type="checkbox" name="correct_2" value="1"
|
||||||
class="focus:ring-blue-500 h-4 w-4 text-blue-600 border-gray-300 rounded">
|
class="focus:ring-blue-500 h-4 w-4 text-blue-600 border-gray-300 rounded">
|
||||||
@@ -119,9 +119,9 @@ function addOption() {
|
|||||||
const div = document.createElement('div');
|
const div = document.createElement('div');
|
||||||
div.className = 'flex items-center space-x-3';
|
div.className = 'flex items-center space-x-3';
|
||||||
div.innerHTML = `
|
div.innerHTML = `
|
||||||
<input type="text" name="option_${optionCount}"
|
<textarea name="option_${optionCount}" rows="2"
|
||||||
class="shadow-sm focus:ring-blue-500 focus:border-blue-500 flex-grow sm:text-sm border-gray-300 rounded-md"
|
class="shadow-sm focus:ring-blue-500 focus:border-blue-500 flex-grow sm:text-sm border-gray-300 rounded-md"
|
||||||
required>
|
required></textarea>
|
||||||
<label class="inline-flex items-center">
|
<label class="inline-flex items-center">
|
||||||
<input type="checkbox" name="correct_${optionCount}" value="1"
|
<input type="checkbox" name="correct_${optionCount}" value="1"
|
||||||
class="focus:ring-blue-500 h-4 w-4 text-blue-600 border-gray-300 rounded">
|
class="focus:ring-blue-500 h-4 w-4 text-blue-600 border-gray-300 rounded">
|
||||||
@@ -153,7 +153,7 @@ function updateOptionNumbers() {
|
|||||||
const options = container.children;
|
const options = container.children;
|
||||||
Array.from(options).forEach((option, index) => {
|
Array.from(options).forEach((option, index) => {
|
||||||
const number = index + 1;
|
const number = index + 1;
|
||||||
const textInput = option.querySelector('input[type="text"]');
|
const textInput = option.querySelector('textarea');
|
||||||
const checkbox = option.querySelector('input[type="checkbox"]');
|
const checkbox = option.querySelector('input[type="checkbox"]');
|
||||||
|
|
||||||
textInput.name = `option_${number}`;
|
textInput.name = `option_${number}`;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{% extends 'library/base.html' %}
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="container mx-auto px-4">
|
<div class="container mx-auto px-4">
|
||||||
@@ -18,9 +18,9 @@
|
|||||||
<div>
|
<div>
|
||||||
<label for="question" class="block text-sm font-medium text-gray-700">Frage</label>
|
<label for="question" class="block text-sm font-medium text-gray-700">Frage</label>
|
||||||
<div class="mt-1">
|
<div class="mt-1">
|
||||||
<input type="text" name="question" id="question"
|
<textarea name="question" id="question" rows="4"
|
||||||
class="shadow-sm focus:ring-blue-500 focus:border-blue-500 block w-full sm:text-sm border-gray-300 rounded-md"
|
class="shadow-sm focus:ring-blue-500 focus:border-blue-500 block w-full sm:text-sm border-gray-300 rounded-md"
|
||||||
value="{{ question.question|default:'' }}" required>
|
required>{{ question.data.question }}</textarea>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -31,13 +31,13 @@
|
|||||||
<label class="inline-flex items-center">
|
<label class="inline-flex items-center">
|
||||||
<input type="radio" name="correct_answer" value="true"
|
<input type="radio" name="correct_answer" value="true"
|
||||||
class="focus:ring-blue-500 h-4 w-4 text-blue-600 border-gray-300"
|
class="focus:ring-blue-500 h-4 w-4 text-blue-600 border-gray-300"
|
||||||
{% if question.correct_answer %}checked{% endif %}>
|
{% if question.data.correct_answer %}checked{% endif %}>
|
||||||
<span class="ml-2 text-sm text-gray-600">Wahr</span>
|
<span class="ml-2 text-sm text-gray-600">Wahr</span>
|
||||||
</label>
|
</label>
|
||||||
<label class="inline-flex items-center">
|
<label class="inline-flex items-center">
|
||||||
<input type="radio" name="correct_answer" value="false"
|
<input type="radio" name="correct_answer" value="false"
|
||||||
class="focus:ring-blue-500 h-4 w-4 text-blue-600 border-gray-300"
|
class="focus:ring-blue-500 h-4 w-4 text-blue-600 border-gray-300"
|
||||||
{% if not question.correct_answer %}checked{% endif %}>
|
{% if not question.data.correct_answer %}checked{% endif %}>
|
||||||
<span class="ml-2 text-sm text-gray-600">Falsch</span>
|
<span class="ml-2 text-sm text-gray-600">Falsch</span>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
7
core/templates/partials/_footer.html
Normal file
7
core/templates/partials/_footer.html
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
<div class="grid place-content-center gap-2 w-full mt-4">
|
||||||
|
<div class="flex space-x-2 pb-4">
|
||||||
|
<p class="text-sm font-extralight"><a href="/impress">Impressum</a></p>
|
||||||
|
<p class="text-sm font-extralight"><a href="/privacy">Datenschutz</a></p>
|
||||||
|
<p class="text-sm font-extralight"><a href="https://edugit.org/enrichment-2024/qivip">Repository</a></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
0
core/templates/play/game/score_overview.html
Normal file
0
core/templates/play/game/score_overview.html
Normal file
35
core/templates/play/join_game.html
Normal file
35
core/templates/play/join_game.html
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
<div class="grid place-items-center min-h-[calc(100vh-5rem)] py-6 m-2">
|
||||||
|
<div class="max-w-md w-full p-8 rounded-2xl border-2 border-blue-400 bg-white">
|
||||||
|
<h1 class="text-2xl text-center font-bold mb-4">Spiel beitreten</h1>
|
||||||
|
<form action="{% url 'play:join_game' %}" method="post" class="flex flex-col gap-4">
|
||||||
|
{% csrf_token %}
|
||||||
|
<div class="flex gap-3 items-center justify-center">
|
||||||
|
<input type="text" name="game_code" placeholder="XXX-XXX" maxlength="7" pattern="[A-Za-z0-9]{3}-[A-Za-z0-9]{3}" class="w-32 p-3 rounded-full bg-gray-200 focus:scale-105 transition duration-200 font-black focus:outline-none focus:ring-2 focus:ring-blue-400 focus:bg-blue-100 text-center uppercase tracking-wider" oninput="let v = this.value.replace(/[^A-Za-z0-9]/g, '').slice(0,6).toUpperCase(); this.value = v.length > 3 ? v.slice(0,3) + '-' + v.slice(3) : v;" autofocus>
|
||||||
|
<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">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M13.5 4.5L21 12m0 0l-7.5 7.5M21 12H3" />
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
<script>
|
||||||
|
const input = document.querySelector('input[name="game_code"]');
|
||||||
|
const button = document.querySelector('button[type="submit"]');
|
||||||
|
|
||||||
|
input.addEventListener('input', function(e) {
|
||||||
|
button.disabled = !this.value.match(/^[A-Z0-9]{3}-[A-Z0-9]{3}$/);
|
||||||
|
});
|
||||||
|
|
||||||
|
input.addEventListener('keypress', function(e) {
|
||||||
|
if (e.key === 'Enter' && !button.disabled) {
|
||||||
|
button.click();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{% endblock %}
|
||||||
15
core/templates/play/lobby.html
Normal file
15
core/templates/play/lobby.html
Normal file
@@ -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 %}
|
||||||
@@ -1 +1,4 @@
|
|||||||
django~=5.1.4
|
django~=5.1.4
|
||||||
|
channels~=4.2.0
|
||||||
|
daphne~=4.1.2
|
||||||
|
channels_redis
|
||||||
Reference in New Issue
Block a user