Compare commits
55 Commits
31-projekt
...
60-refacto
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8f4b5d581d | ||
|
|
809d857e94 | ||
|
|
98142c91f3 | ||
|
|
93b2675b9e | ||
|
|
157daae740 | ||
|
|
f6459965e0 | ||
|
|
a3331543f2 | ||
|
|
9d71f2bbf3 | ||
|
|
8cceecf1bd | ||
|
|
c330c4bc70 | ||
|
|
26bf2a2c55 | ||
|
|
86958c6d16 | ||
|
|
83a3d1584a | ||
|
|
a07c66ad1a | ||
|
|
956e69b56f | ||
|
|
526e486fd3 | ||
|
|
b149cbcfee | ||
|
|
12c5cec7a1 | ||
|
|
e0bfda0dee | ||
|
|
23675bc69e | ||
|
|
94659791e6 | ||
|
|
17cc0af02d | ||
|
|
f28878e1b0 | ||
|
|
2a8b0b813c | ||
|
|
f18ed83f9d | ||
|
|
d1cca38595 | ||
|
|
1f1344522f | ||
|
|
7cad46063e | ||
|
|
55750bcf1f | ||
|
|
230944cbcd | ||
|
|
2f47ff8523 | ||
|
|
3ef7d61da6 | ||
|
|
7fe29c5bd4 | ||
|
|
5775e53bb8 | ||
|
|
57682d4607 | ||
|
|
915552ac4a | ||
| 861e89ae4d | |||
| 97fd326561 | |||
|
|
34a9ab6a43 | ||
|
|
4c597473b7 | ||
|
|
8119f202d3 | ||
| 6beccc772a | |||
|
|
4797a74111 | ||
|
|
30b5cd9731 | ||
|
|
6b83f26fc0 | ||
|
|
346ac69046 | ||
|
|
838eaab9be | ||
|
|
eba34fa2d4 | ||
|
|
9f51def959 | ||
| c8bf38dd36 | |||
|
|
7120dcd317 | ||
|
|
da419533e9 | ||
|
|
bd0aa651af | ||
|
|
d1b11a0c51 | ||
|
|
5dc849f551 |
5
.gitignore
vendored
5
.gitignore
vendored
@@ -2,4 +2,7 @@ __pycache__
|
|||||||
.venv
|
.venv
|
||||||
db.sqlite3
|
db.sqlite3
|
||||||
tailwindcss.exe
|
tailwindcss.exe
|
||||||
t-style.css
|
t-style.css
|
||||||
|
dump.rdb
|
||||||
|
media
|
||||||
|
node_modules
|
||||||
@@ -100,10 +100,10 @@ npx @tailwindcss/cli -i <INPUT-DATEI> -o <OUTPUT-DATEI> --watch --minify
|
|||||||
|
|
||||||
```sh
|
```sh
|
||||||
# unter Linux mit Tailwind Binärdatei:
|
# unter Linux mit Tailwind Binärdatei:
|
||||||
tailwindcss -i core/static/homepage/t-input.css -o core/static/homepage/t-style.css --watch --minify
|
tailwindcss -i static/css/t-input.css -o static/css/t-style.css --watch --minify
|
||||||
|
|
||||||
# unter Windows mit NPM:
|
# unter Windows mit NPM (in bash mit '/' statt '\'):
|
||||||
npx @tailwindcss/cli -i .\core\static\homepage\t-input.css -o .\core\static\homepage\t-style.css --watch --minify
|
npx @tailwindcss/cli -i .\static\css\t-input.css -o .\static\css\t-style.css --watch --minify
|
||||||
```
|
```
|
||||||
|
|
||||||
## Issue - Merge Request - Merge
|
## Issue - Merge Request - Merge
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
from django import forms
|
|
||||||
from .models import QivipQuiz, QivipQuestion
|
|
||||||
|
|
||||||
class QuizForm(forms.ModelForm):
|
|
||||||
class Meta:
|
|
||||||
model = QivipQuiz
|
|
||||||
fields = ['name', 'description', 'status', 'category', 'tags',"difficulty"]
|
|
||||||
|
|
||||||
class QuestionForm(forms.ModelForm):
|
|
||||||
class Meta:
|
|
||||||
model = QivipQuestion
|
|
||||||
fields = ['quiz_id', 'data']
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
from django.contrib import admin
|
|
||||||
|
|
||||||
# Register your models here.
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
from django.db import models
|
|
||||||
|
|
||||||
# Create your models here.
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
from django.urls import path
|
|
||||||
from . import views
|
|
||||||
|
|
||||||
app_name = 'play'
|
|
||||||
|
|
||||||
urlpatterns = [
|
|
||||||
path('lobby', views.lobby, name='lobby'),
|
|
||||||
path('join', views.join_game, name='join_game'),
|
|
||||||
]
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
from django.shortcuts import render
|
|
||||||
|
|
||||||
# Create your views here.
|
|
||||||
def lobby(request):
|
|
||||||
return render(request, 'play/lobby.html')
|
|
||||||
|
|
||||||
def join_game(request):
|
|
||||||
return render(request, 'play/join_game.html')
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
{% extends 'base.html' %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="grid place-content-center md:h-screen h-150 w-full -z-50 top-0 p-4">
|
|
||||||
<div class="text-center">
|
|
||||||
<h2 class="font-bold md:text-8xl text-6xl md:mb-8 text-blue-600">qivip</h2>
|
|
||||||
<h3 class="italic font-extralight sm:text-2xl text-md">Interaktives Lernen neu definiert.</h3>
|
|
||||||
</div>
|
|
||||||
<div class="grid sm:grid-cols-3 place-items-stretch text-center mt-8 gap-4 p-4 border-3 bg-blue-100 border-blue-100 rounded-md">
|
|
||||||
<a class="qp-a-button bg-green-500 text-white" href="#">Teilnehmen</a>
|
|
||||||
<a class="qp-a-button bg-indigo-500 text-white" href="#">Moderieren</a>
|
|
||||||
<a class="qp-a-button bg-purple-500 text-white" href="#">Verwalten</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
{% extends 'base.html' %}
|
|
||||||
{% block content%}
|
|
||||||
<div>
|
|
||||||
<div>
|
|
||||||
<h1>Impressum</h1>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
Katharineum zu Lübeck
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
Königsstraße 27-31
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
23552 Lübeck
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
{% extends 'base.html' %}
|
|
||||||
|
|
||||||
{% block content%}
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
Hallo, ich bin die Datenschutzerklärung!
|
|
||||||
</p>
|
|
||||||
</div
|
|
||||||
{% endblock %}
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
{% extends 'base.html' %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<h1>Übersicht</h1>
|
|
||||||
<div class="flex justify-end">
|
|
||||||
<a href="{% url 'library:new_quiz' %}" class="text-white bg-blue-500 px-4 py-2 rounded-md mb-12">Neues Quiz erstellen</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 px-4 place-items-center">
|
|
||||||
{% for quiz in quizzes %}
|
|
||||||
<div class="bg-white w-full max-w-md rounded-lg p-4 shadow-md border-blue-600 border-2 rounded-xl">
|
|
||||||
<h2 class="text-lg font-bold"><a href="{% url 'library:edit_quiz' quiz.id %}">{{ quiz.name }}</a></h2>
|
|
||||||
<p class="text-sm text-gray-600 py-12">{{ quiz.description }}</p>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<div class="flex justify-between items-center gap-2">
|
|
||||||
<a href="#" class="qp-a-button-small border-2 border-blue-600 text-black">Spiel starten</a>
|
|
||||||
|
|
||||||
<div class="flex gap-2">
|
|
||||||
<a href="{% url 'library:detail_quiz' quiz.id %}" class="qp-a-button-small border-2 border-blue-600 text-white">✏</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,15 +0,0 @@
|
|||||||
<nav class="flex justify-between bg-blue-600 h-12 px-4 sm:px-6 lg:px-8 rounded-lg m-2 shadow-md">
|
|
||||||
<div class="flex items-center">
|
|
||||||
<h2 class="text-xl font-bold text-white hover:scale-110 transition duration-200"><a href="{% url 'homepage:home' %}">qivip</a></h2>
|
|
||||||
</div>
|
|
||||||
<div class="flex items-center">
|
|
||||||
<ul class="flex space-x-4 qp-nav-list">
|
|
||||||
<li><a href="{% url 'library:overview_quiz' %}">Bibliothek</a></li>
|
|
||||||
{% if user.is_authenticated %}
|
|
||||||
<li><a href="{% url 'accounts:home' %}">Konto</a></li>
|
|
||||||
{% else %}
|
|
||||||
<li><a href="{% url 'accounts:login' %}">Anmelden</a></li>
|
|
||||||
{% endif %}
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
{% extends 'base.html' %}
|
|
||||||
|
|
||||||
{% block content %}
|
|
||||||
<div class="container mx-auto px-4">
|
|
||||||
<h1>Bundeslaender Deutschland Quiz</h1>
|
|
||||||
<div id="player-list">
|
|
||||||
<ul>
|
|
||||||
<li>Spieler 1</li>
|
|
||||||
<li>Spieler 2</li>
|
|
||||||
<li>Spieler 3</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<button class="w-full p-3 rounded-full bg-blue-600 text-white font-black hover:scale-105 transition duration-200" type="submit">Starten</button>
|
|
||||||
</div>
|
|
||||||
{% endblock %}
|
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
from django.shortcuts import render, redirect
|
from django.shortcuts import render, redirect
|
||||||
from django.contrib.auth.decorators import login_required
|
from django.contrib.auth.decorators import login_required
|
||||||
|
from django.contrib.auth import login, authenticate
|
||||||
from .forms import RegisterForm
|
from .forms import RegisterForm
|
||||||
|
|
||||||
# Create your views here.
|
# Create your views here.
|
||||||
@@ -11,8 +12,9 @@ def register(response):
|
|||||||
if response.method == "POST":
|
if response.method == "POST":
|
||||||
form = RegisterForm(response.POST)
|
form = RegisterForm(response.POST)
|
||||||
if form.is_valid():
|
if form.is_valid():
|
||||||
form.save()
|
user=form.save()
|
||||||
return redirect("home")
|
login(response, user) #automatischer Login nach Registrierung
|
||||||
|
return redirect("accounts:home")
|
||||||
else:
|
else:
|
||||||
form = RegisterForm()
|
form = RegisterForm()
|
||||||
|
|
||||||
@@ -35,7 +35,7 @@ INSTALLED_APPS = [
|
|||||||
'homepage.apps.HomepageConfig',
|
'homepage.apps.HomepageConfig',
|
||||||
'components.apps.ComponentsConfig',
|
'components.apps.ComponentsConfig',
|
||||||
'accounts.apps.AccountsConfig',
|
'accounts.apps.AccountsConfig',
|
||||||
'play.apps.PlayConfig',
|
'play',
|
||||||
'django.contrib.admin',
|
'django.contrib.admin',
|
||||||
'django.contrib.auth',
|
'django.contrib.auth',
|
||||||
'django.contrib.contenttypes',
|
'django.contrib.contenttypes',
|
||||||
@@ -128,4 +128,8 @@ STATICFILES_DIRS = [BASE_DIR / 'static']
|
|||||||
|
|
||||||
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
||||||
|
|
||||||
LOGIN_URL = '/account/login/'
|
LOGIN_URL = '/account/login/'
|
||||||
|
import os
|
||||||
|
|
||||||
|
MEDIA_URL = '/media/' # URL, um auf Medien-Dateien zuzugreifen
|
||||||
|
MEDIA_ROOT = os.path.join(BASE_DIR, 'media') # Speicherort für hochgeladene Dateien
|
||||||
@@ -23,4 +23,5 @@ urlpatterns = [
|
|||||||
path('', include('homepage.urls')),
|
path('', include('homepage.urls')),
|
||||||
path('play/', include('play.urls')),
|
path('play/', include('play.urls')),
|
||||||
path('library/', include('library.urls')),
|
path('library/', include('library.urls')),
|
||||||
|
path('components/', include('components.urls'))
|
||||||
]
|
]
|
||||||
31
django/library/forms.py
Normal file
31
django/library/forms.py
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
from django import forms
|
||||||
|
from .models import QivipQuiz, QivipQuestion
|
||||||
|
|
||||||
|
class QuizForm(forms.ModelForm):
|
||||||
|
class Meta:
|
||||||
|
model = QivipQuiz
|
||||||
|
fields = ['name', 'description','image', 'status', 'category', 'tags',"difficulty"]
|
||||||
|
|
||||||
|
class QuestionForm(forms.ModelForm):
|
||||||
|
class Meta:
|
||||||
|
model = QivipQuestion
|
||||||
|
fields = ['quiz_id', 'data']
|
||||||
|
|
||||||
|
from django import forms
|
||||||
|
|
||||||
|
class QuizFilterForm(forms.Form):
|
||||||
|
search = forms.CharField(required=False, label="Suche", widget=forms.TextInput(attrs={
|
||||||
|
'class': 'flex flex-grow rounded-lg p-2' ,'placeholder': 'Suche ...',
|
||||||
|
}))
|
||||||
|
|
||||||
|
|
||||||
|
min_amout_questions = forms.IntegerField(required=False, min_value=1, label="Minimale Anzahl an Fragen", widget=forms.NumberInput(attrs={
|
||||||
|
'class': 'border-2 border-gray-300 rounded-lg p-2 w-full'
|
||||||
|
}))
|
||||||
|
|
||||||
|
max_amout_questions = forms.IntegerField(required=False, min_value=1, label="Maximale Anzahl an Fragen", widget=forms.NumberInput(attrs={
|
||||||
|
'class': 'border-2 border-gray-300 rounded-lg p-2 w-full'
|
||||||
|
}))
|
||||||
|
user = forms.CharField(required=False, label="von User", widget=forms.TextInput(attrs={
|
||||||
|
'class': 'border-2 border-gray-300 rounded-lg p-2 w-full'
|
||||||
|
}))
|
||||||
18
django/library/migrations/0016_alter_qivipquiz_status.py
Normal file
18
django/library/migrations/0016_alter_qivipquiz_status.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-16 12:53
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0015_alter_qivipquiz_difficulty'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='status',
|
||||||
|
field=models.CharField(choices=[('öffentlich', 'Öffentlich'), ('versteckt', 'Versteckt'), ('privat', 'Privat')], default='öffentlich', max_length=10),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
django/library/migrations/0017_alter_qivipquiz_difficulty.py
Normal file
18
django/library/migrations/0017_alter_qivipquiz_difficulty.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-16 12:54
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0016_alter_qivipquiz_status'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='difficulty',
|
||||||
|
field=models.CharField(choices=[('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('nicht gesetzt', 'nicht gesetzt')], default='nicht gesetzt', help_text='1: niedrigste Schwierigkeit und 5: höchste Schwierigkeit', max_length=13),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-16 13:03
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0017_alter_qivipquiz_difficulty'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='description',
|
||||||
|
field=models.TextField(blank=True, default='In dem Quiz geht es um ...', max_length=150, null=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-16 13:05
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0018_alter_qivipquiz_description'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='description',
|
||||||
|
field=models.TextField(default='In dem Quiz geht es um ...', max_length=255, null=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-16 13:08
|
||||||
|
|
||||||
|
import library.models
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0019_alter_qivipquiz_description'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='description',
|
||||||
|
field=models.TextField(default='In dem Quiz geht es um ...', max_length=255, validators=[library.models.QivipQuiz.validate_description]),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
django/library/migrations/0021_alter_qivipquiz_name.py
Normal file
18
django/library/migrations/0021_alter_qivipquiz_name.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-16 14:34
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0020_alter_qivipquiz_description'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='name',
|
||||||
|
field=models.CharField(max_length=100),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-16 14:35
|
||||||
|
|
||||||
|
import library.models
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0021_alter_qivipquiz_name'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='description',
|
||||||
|
field=models.TextField(default='In dem Quiz geht es um ...', max_length=200, validators=[library.models.QivipQuiz.validate_description]),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='name',
|
||||||
|
field=models.CharField(max_length=75),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
django/library/migrations/0023_qivipquiz_image.py
Normal file
18
django/library/migrations/0023_qivipquiz_image.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-21 17:24
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0022_alter_qivipquiz_description_alter_qivipquiz_name'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='image',
|
||||||
|
field=models.ImageField(blank=True, null=True, upload_to='quiz_images/'),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
django/library/migrations/0024_alter_qivipquiz_image.py
Normal file
18
django/library/migrations/0024_alter_qivipquiz_image.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-22 10:22
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0023_qivipquiz_image'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='qivipquiz',
|
||||||
|
name='image',
|
||||||
|
field=models.ImageField(blank=True, max_length=256, null=True, upload_to='quiz_images/'),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -2,12 +2,13 @@ from django.db import models
|
|||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.utils.text import slugify
|
from django.utils.text import slugify
|
||||||
import uuid
|
import uuid
|
||||||
|
from django.core.exceptions import ValidationError
|
||||||
|
|
||||||
class QivipQuiz(models.Model):
|
class QivipQuiz(models.Model):
|
||||||
STATUS_VALUES = {
|
STATUS_VALUES = {
|
||||||
"public": "Öffentlich",
|
"öffentlich": "Öffentlich",
|
||||||
"hidden": "Versteckt",
|
"versteckt": "Versteckt",
|
||||||
"private": "Privat",
|
"privat": "Privat",
|
||||||
}
|
}
|
||||||
DIFFICULTY_VALUES = {
|
DIFFICULTY_VALUES = {
|
||||||
"1": "1",
|
"1": "1",
|
||||||
@@ -15,20 +16,25 @@ class QivipQuiz(models.Model):
|
|||||||
"3": "3",
|
"3": "3",
|
||||||
"4": "4",
|
"4": "4",
|
||||||
"5": "5",
|
"5": "5",
|
||||||
"not defined":"nicht gesetzt",
|
"nicht gesetzt":"nicht gesetzt",
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def validate_description(value):
|
||||||
|
if value.strip() == "In dem Quiz geht es um ...":
|
||||||
|
raise ValidationError("Bitte gib eine aussagekräftige Beschreibung ein.")
|
||||||
|
|
||||||
|
image = models.ImageField(max_length=256, upload_to='quiz_images/', blank=True, null=True) # Bild speichern in media/quiz_images/
|
||||||
uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
|
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=list(STATUS_VALUES.items()), default="public")
|
status = models.CharField(max_length=10, choices=list(STATUS_VALUES.items()), default="öffentlich")
|
||||||
category = models.ForeignKey('QuizCategory', related_name='quiz', on_delete=models.CASCADE)
|
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=75)
|
||||||
description = models.TextField(blank=True, null=True, default="In dem Quiz geht es um ...")
|
description = models.TextField(validators=[validate_description],max_length=200,blank=False, 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")
|
difficulty= models.CharField(max_length=13, choices=list(DIFFICULTY_VALUES.items()), default="nicht gesetzt", help_text="1: niedrigste Schwierigkeit und 5: höchste Schwierigkeit")
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
from django.urls import path
|
from django.urls import path
|
||||||
from . import views
|
|
||||||
|
|
||||||
|
from django.conf import settings
|
||||||
|
from . import views
|
||||||
|
from django.conf.urls.static import static
|
||||||
app_name = 'library'
|
app_name = 'library'
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
@@ -12,4 +14,6 @@ urlpatterns = [
|
|||||||
path('question/new/', views.new_question, name='new_question'),
|
path('question/new/', views.new_question, name='new_question'),
|
||||||
path('question/edit/<int:pk>/', views.edit_question, name='edit_question'),
|
path('question/edit/<int:pk>/', views.edit_question, name='edit_question'),
|
||||||
path('question/delete/<int:pk>/', views.delete_question, name='delete_question'),
|
path('question/delete/<int:pk>/', views.delete_question, name='delete_question'),
|
||||||
]
|
]# Nur für die Entwicklungsumgebung
|
||||||
|
if settings.DEBUG:
|
||||||
|
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||||
@@ -6,24 +6,117 @@ from django.contrib import messages
|
|||||||
from .models import QivipQuiz, QivipQuestion
|
from .models import QivipQuiz, QivipQuestion
|
||||||
from .forms import QuizForm, QuestionForm
|
from .forms import QuizForm, QuestionForm
|
||||||
import json
|
import json
|
||||||
|
from django.core.paginator import Paginator
|
||||||
|
from .models import QivipQuiz
|
||||||
|
from .forms import QuizFilterForm
|
||||||
|
from django.db.models import Count
|
||||||
|
from django.contrib.auth.models import User
|
||||||
# Übersicht aller Quizze
|
# Übersicht aller Quizze
|
||||||
@login_required
|
|
||||||
def overview_quiz(request):
|
|
||||||
quizzes = QivipQuiz.objects.filter(user_id=request.user)
|
|
||||||
return render(request, 'library/overview_quiz.html', {'quizzes': quizzes})
|
|
||||||
|
|
||||||
|
def overview_quiz(request):
|
||||||
|
|
||||||
|
#Filter
|
||||||
|
form = QuizFilterForm(request.GET)
|
||||||
|
|
||||||
|
|
||||||
|
try:
|
||||||
|
|
||||||
|
filter_my_quizzes = QivipQuiz.objects.filter(user_id=request.user).annotate(max_amout_questions=Count('question'))
|
||||||
|
except:
|
||||||
|
filter_my_quizzes = QivipQuiz.objects.none()
|
||||||
|
|
||||||
|
filter_other_quizzes = QivipQuiz.objects.annotate(max_amout_questions=Count('question'))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if form.is_valid():
|
||||||
|
search = form.cleaned_data.get('search')
|
||||||
|
username= form.cleaned_data.get('user')
|
||||||
|
max_amout_questions= form.cleaned_data.get('max_amout_questions')
|
||||||
|
min_amout_questions= form.cleaned_data.get('min_amout_questions')
|
||||||
|
if search: # Suche nach Namen
|
||||||
|
filter_other_quizzes = filter_other_quizzes.filter(name__icontains=search)
|
||||||
|
filter_my_quizzes = filter_my_quizzes.filter(name__icontains=search)
|
||||||
|
|
||||||
|
if min_amout_questions:
|
||||||
|
filter_other_quizzes = filter_other_quizzes.filter(max_amout_questions__gte=min_amout_questions)
|
||||||
|
try:
|
||||||
|
filter_my_quizzes =filter_my_quizzes.filter(max_amout_questions__gte=min_amout_questions)
|
||||||
|
except:
|
||||||
|
filter_my_quizzes = QivipQuiz.objects.none()
|
||||||
|
|
||||||
|
if max_amout_questions:
|
||||||
|
filter_other_quizzes = filter_other_quizzes.filter(max_amout_questions__lte=max_amout_questions)
|
||||||
|
try:
|
||||||
|
filter_my_quizzes =filter_my_quizzes.filter(max_amout_questions__lte=max_amout_questions)
|
||||||
|
except:
|
||||||
|
filter_my_quizzes = QivipQuiz.objects.none()
|
||||||
|
|
||||||
|
if username:
|
||||||
|
try:
|
||||||
|
user = User.objects.get(username=username) # Benutzer anhand des Namens holen
|
||||||
|
filter_other_quizzes = filter_other_quizzes.filter(user_id=user.id)
|
||||||
|
filter_my_quizzes = filter_my_quizzes.filter(user_id=user.id) # Nach der user_id filtern
|
||||||
|
except User.DoesNotExist:
|
||||||
|
filter_other_quizzes = QivipQuiz.objects.none() # Falls User nicht existiert, leere Query zurückgeben
|
||||||
|
filter_my_quizzes = QivipQuiz.objects.none()
|
||||||
|
|
||||||
|
try:
|
||||||
|
filter_other_quizzes=filter_other_quizzes.exclude(user_id=request.user)
|
||||||
|
except:
|
||||||
|
filter_other_quizzes=filter_other_quizzes
|
||||||
|
|
||||||
|
# Anzahl der Quiz pro Seite für Swiper
|
||||||
|
|
||||||
|
|
||||||
|
context = {
|
||||||
|
'show_search': True,
|
||||||
|
'filter_my_quizzes': filter_my_quizzes,
|
||||||
|
'filter_other_quizzes': filter_other_quizzes,
|
||||||
|
'form': form,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
return render(request, 'library/overview_quiz.html', context)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
try:
|
||||||
|
filter_my_quizzes = QivipQuiz.objects.filter(user_id=request.user)
|
||||||
|
filter_other_quizzes = QivipQuiz.objects.filter(status='öffentlich').exclude(user_id=request.user).filter(question__isnull=False).distinct()
|
||||||
|
context = {
|
||||||
|
'show_search': True,
|
||||||
|
'filter_my_quizzes': filter_my_quizzes,
|
||||||
|
'filter_other_quizzes': filter_other_quizzes,
|
||||||
|
'form': form,
|
||||||
|
}
|
||||||
|
return render(request, 'library/overview_quiz.html', context)
|
||||||
|
|
||||||
|
except:
|
||||||
|
filter_other_quizzes = QivipQuiz.objects.filter(status='öffentlich').filter(question__isnull=False).distinct()
|
||||||
|
context = {
|
||||||
|
'show_search': True,
|
||||||
|
'filter_my_quizzes': None,
|
||||||
|
'filter_other_quizzes': filter_other_quizzes,
|
||||||
|
'form': form,
|
||||||
|
}
|
||||||
|
return render(request, 'library/overview_quiz.html', context)
|
||||||
|
|
||||||
|
|
||||||
# Neues Quiz erstellen
|
# Neues Quiz erstellen
|
||||||
@login_required
|
@login_required
|
||||||
def new_quiz(request):
|
def new_quiz(request):
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
form = QuizForm(request.POST)
|
form = QuizForm(request.POST, request.FILES)
|
||||||
if form.is_valid():
|
if form.is_valid():
|
||||||
quiz = form.save(commit=False)
|
quiz = form.save(commit=False)
|
||||||
quiz.user_id = request.user
|
quiz.user_id = request.user
|
||||||
quiz.save()
|
quiz.save()
|
||||||
form.save_m2m() # Speichert die Many-to-Many Beziehungen (Tags)
|
form.save_m2m() # Speichert die Many-to-Many Beziehungen (Tags)
|
||||||
return redirect('library:edit_quiz', pk=quiz.pk)
|
return redirect('library:detail_quiz', pk=quiz.pk)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
form = QuizForm()
|
form = QuizForm()
|
||||||
return render(request, 'library/form.html', {'form': form})
|
return render(request, 'library/form.html', {'form': form})
|
||||||
@@ -33,10 +126,10 @@ def new_quiz(request):
|
|||||||
def edit_quiz(request, pk):
|
def edit_quiz(request, pk):
|
||||||
quiz = get_object_or_404(QivipQuiz, pk=pk, user_id=request.user)
|
quiz = get_object_or_404(QivipQuiz, pk=pk, user_id=request.user)
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
form = QuizForm(request.POST, instance=quiz)
|
form = QuizForm(request.POST, instance=quiz, files=request.FILES)
|
||||||
if form.is_valid():
|
if form.is_valid():
|
||||||
form.save()
|
form.save()
|
||||||
return redirect('library:overview_quiz')
|
return redirect('library:detail_quiz', pk=quiz.pk)
|
||||||
else:
|
else:
|
||||||
form = QuizForm(instance=quiz)
|
form = QuizForm(instance=quiz)
|
||||||
return render(request, 'library/form.html', {'form': form})
|
return render(request, 'library/form.html', {'form': form})
|
||||||
35
django/package-lock.json
generated
Normal file
35
django/package-lock.json
generated
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
{
|
||||||
|
"name": "django",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"lockfileVersion": 3,
|
||||||
|
"requires": true,
|
||||||
|
"packages": {
|
||||||
|
"": {
|
||||||
|
"name": "django",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"swiper": "^11.2.6"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/swiper": {
|
||||||
|
"version": "11.2.6",
|
||||||
|
"resolved": "https://registry.npmjs.org/swiper/-/swiper-11.2.6.tgz",
|
||||||
|
"integrity": "sha512-8aXpYKtjy3DjcbzZfz+/OX/GhcU5h+looA6PbAzHMZT6ESSycSp9nAjPCenczgJyslV+rUGse64LMGpWE3PX9Q==",
|
||||||
|
"funding": [
|
||||||
|
{
|
||||||
|
"type": "patreon",
|
||||||
|
"url": "https://www.patreon.com/swiperjs"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "open_collective",
|
||||||
|
"url": "http://opencollective.com/swiper"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 4.7.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
15
django/package.json
Normal file
15
django/package.json
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"name": "django",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"main": "index.js",
|
||||||
|
"scripts": {
|
||||||
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
|
},
|
||||||
|
"keywords": [],
|
||||||
|
"author": "",
|
||||||
|
"license": "ISC",
|
||||||
|
"description": "",
|
||||||
|
"dependencies": {
|
||||||
|
"swiper": "^11.2.6"
|
||||||
|
}
|
||||||
|
}
|
||||||
6
django/play/admin.py
Normal file
6
django/play/admin.py
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
from django.contrib import admin
|
||||||
|
from .models import QuizGame, QuizGameParticipant
|
||||||
|
|
||||||
|
# Register your models here.
|
||||||
|
admin.site.register(QuizGame)
|
||||||
|
admin.site.register(QuizGameParticipant)
|
||||||
37
django/play/migrations/0001_initial.py
Normal file
37
django/play/migrations/0001_initial.py
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-15 13:48
|
||||||
|
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.conf import settings
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
initial = True
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('library', '0015_alter_qivipquiz_difficulty'),
|
||||||
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='QuizGame',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('join_code', models.CharField(max_length=6, unique=True)),
|
||||||
|
('host_user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='host_user', to=settings.AUTH_USER_MODEL)),
|
||||||
|
('quiz_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='library.qivipquiz')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='QuizGameParticipant',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('display_name', models.CharField(max_length=15, verbose_name='Anzeigename')),
|
||||||
|
('score', models.IntegerField(max_length=10, verbose_name='Punkte')),
|
||||||
|
('avatar', models.CharField(max_length=200)),
|
||||||
|
('quiz_game', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='participant', to='play.quizgame')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
]
|
||||||
18
django/play/migrations/0002_alter_quizgame_join_code.py
Normal file
18
django/play/migrations/0002_alter_quizgame_join_code.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-15 13:59
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('play', '0001_initial'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='quizgame',
|
||||||
|
name='join_code',
|
||||||
|
field=models.CharField(blank=True, max_length=6, unique=True),
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
# Generated by Django 5.1.7 on 2025-03-15 19:05
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('play', '0002_alter_quizgame_join_code'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='quizgameparticipant',
|
||||||
|
name='participant_id',
|
||||||
|
field=models.CharField(default=1, max_length=200, unique=True),
|
||||||
|
preserve_default=False,
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='quizgameparticipant',
|
||||||
|
name='avatar',
|
||||||
|
field=models.CharField(blank=True, default='', max_length=200),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='quizgameparticipant',
|
||||||
|
name='score',
|
||||||
|
field=models.IntegerField(default=0, verbose_name='Punkte'),
|
||||||
|
),
|
||||||
|
]
|
||||||
40
django/play/models.py
Normal file
40
django/play/models.py
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
from django.db import models
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
from library.models import QivipQuiz
|
||||||
|
from django.http import response
|
||||||
|
import random, string
|
||||||
|
|
||||||
|
# Create your models here.
|
||||||
|
class QuizGame(models.Model):
|
||||||
|
host_user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='host_user')
|
||||||
|
join_code = models.CharField(max_length=6, unique=True, blank=True)
|
||||||
|
quiz_id = models.ForeignKey(QivipQuiz, on_delete=models.CASCADE)
|
||||||
|
|
||||||
|
def save(self, *args, **kwargs):
|
||||||
|
if not self.join_code:
|
||||||
|
self.join_code = self.generate_unique_code()
|
||||||
|
super().save(*args, **kwargs)
|
||||||
|
|
||||||
|
def generate_unique_code(self):
|
||||||
|
for i in range(10):
|
||||||
|
new_code = ''.join(random.choices(string.digits, k=6))
|
||||||
|
if not QuizGame.objects.filter(join_code=new_code).exists():
|
||||||
|
return new_code
|
||||||
|
|
||||||
|
class QuizGameParticipant(models.Model):
|
||||||
|
participant_id = models.CharField(max_length=200, unique=True)
|
||||||
|
display_name = models.CharField(verbose_name="Anzeigename", max_length=15)
|
||||||
|
quiz_game = models.ForeignKey(QuizGame, on_delete=models.CASCADE, related_name="participant")
|
||||||
|
score = models.IntegerField(verbose_name="Punkte", default=0)
|
||||||
|
avatar = models.CharField(max_length=200, blank=True, default="")
|
||||||
|
|
||||||
|
def save(self, *args, **kwargs):
|
||||||
|
if not self.participant_id:
|
||||||
|
self.participant_id = self.generate_unique_id()
|
||||||
|
super().save(*args, **kwargs)
|
||||||
|
|
||||||
|
def generate_unique_id(self):
|
||||||
|
for i in range(10):
|
||||||
|
new_id = ''.join(random.choices(string.digits + string.ascii_lowercase, k=60))
|
||||||
|
if not QuizGameParticipant.objects.filter(participant_id=new_id).exists():
|
||||||
|
return new_id
|
||||||
10
django/play/urls.py
Normal file
10
django/play/urls.py
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
from django.urls import path
|
||||||
|
from . import views
|
||||||
|
|
||||||
|
app_name = 'play'
|
||||||
|
|
||||||
|
urlpatterns = [
|
||||||
|
path('lobby/<str:join_code>', views.lobby, name='lobby'),
|
||||||
|
path('lobby/<str:join_code>/participate', views.create_participant, name='create_participant'),
|
||||||
|
path('join', views.join_game, name='join_game'),
|
||||||
|
]
|
||||||
60
django/play/views.py
Normal file
60
django/play/views.py
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
from django.shortcuts import render
|
||||||
|
from django.shortcuts import render, redirect, get_object_or_404, reverse
|
||||||
|
from play.models import QuizGame, QuizGameParticipant
|
||||||
|
from library.models import QivipQuiz
|
||||||
|
from django.http import HttpResponseRedirect
|
||||||
|
|
||||||
|
# Create your views here.
|
||||||
|
def lobby(request, join_code):
|
||||||
|
if not "participant_id" in request.COOKIES:
|
||||||
|
return redirect('play:create_participant', join_code=join_code)
|
||||||
|
participant_id = request.COOKIES['participant_id']
|
||||||
|
quiz_game = get_object_or_404(QuizGame, join_code=join_code)
|
||||||
|
quiz = get_object_or_404(QivipQuiz, pk=quiz_game.quiz_id.id)
|
||||||
|
participant = get_object_or_404(QuizGameParticipant, participant_id=participant_id)
|
||||||
|
|
||||||
|
if not participant.quiz_game.join_code == join_code:
|
||||||
|
participant.quiz_game = quiz_game
|
||||||
|
participant.save()
|
||||||
|
|
||||||
|
context = {
|
||||||
|
'debug': "test",
|
||||||
|
'participant': participant,
|
||||||
|
'quiz': quiz,
|
||||||
|
}
|
||||||
|
|
||||||
|
return render(request, 'play/lobby.html', context=context)
|
||||||
|
|
||||||
|
def create_participant(request, join_code):
|
||||||
|
if "participant_id" in request.COOKIES: # Umleiten, falls Teilnehmer bereits erstellt
|
||||||
|
return redirect('play:lobby', join_code=join_code)
|
||||||
|
if request.method == 'POST':
|
||||||
|
display_name = request.POST.get('display_name')
|
||||||
|
join_code = request.POST.get('join_code')
|
||||||
|
try:
|
||||||
|
quiz = QuizGame.objects.get(join_code=join_code)
|
||||||
|
participant = QuizGameParticipant()
|
||||||
|
participant.display_name = display_name
|
||||||
|
participant.quiz_game = quiz
|
||||||
|
participant.save()
|
||||||
|
|
||||||
|
response = HttpResponseRedirect(reverse('play:lobby', kwargs={'join_code': join_code}))
|
||||||
|
response.set_cookie('participant_id', participant.participant_id, max_age=3600)
|
||||||
|
|
||||||
|
return response
|
||||||
|
except QuizGame.DoesNotExist:
|
||||||
|
# TODO: Fehlermeldung fuer nicht-existierendes Quiz
|
||||||
|
pass
|
||||||
|
|
||||||
|
return render(request, 'play/initialize_participant.html', {'join_code': join_code})
|
||||||
|
|
||||||
|
def join_game(request):
|
||||||
|
if request.method == 'POST':
|
||||||
|
join_code = request.POST.get('game_code')
|
||||||
|
try:
|
||||||
|
quiz = QuizGame.objects.get(join_code=join_code)
|
||||||
|
return redirect('play:lobby', join_code=join_code)
|
||||||
|
except QuizGame.DoesNotExist:
|
||||||
|
# TODO: Mit message eine Fehlermeldung weitergeben (und im entsprechenden Template Designen)
|
||||||
|
pass
|
||||||
|
return render(request, 'play/join_game.html')
|
||||||
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.7 KiB |
13
django/static/swiper/swiper-bundle.min.css
vendored
Normal file
13
django/static/swiper/swiper-bundle.min.css
vendored
Normal file
File diff suppressed because one or more lines are too long
14
django/static/swiper/swiper-bundle.min.js
vendored
Normal file
14
django/static/swiper/swiper-bundle.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user