Compare commits
2 Commits
06bcbd1d4f
...
85576f05cc
Author | SHA1 | Date | |
---|---|---|---|
![]() |
85576f05cc | ||
![]() |
b9dfad7a72 |
18
PR/routing.py
Normal file
18
PR/routing.py
Normal file
@ -0,0 +1,18 @@
|
||||
from channels.routing import ProtocolTypeRouter, URLRouter
|
||||
from django.urls import re_path
|
||||
from channels.routing import URLRouter
|
||||
from channels.http import AsgiHandler
|
||||
from channels.auth import AuthMiddlewareStack
|
||||
import django_eventstream
|
||||
|
||||
urlpatterns = [
|
||||
#idz lt. URL ein Eventstream auszuliefern
|
||||
re_path(r'^events/',
|
||||
AuthMiddlewareStack(URLRouter(django_eventstream.routing.urlpatterns)),
|
||||
{'channels': ['notice']}),
|
||||
#bei allen anderen Anfragen werden die Standart-Router verwendet
|
||||
re_path(r'', AsgiHandler),
|
||||
]
|
||||
application = ProtocolTypeRouter({
|
||||
'http': URLRouter(urlpatterns)
|
||||
})
|
@ -38,6 +38,9 @@ INSTALLED_APPS = [
|
||||
'django.contrib.sessions',
|
||||
'django.contrib.messages',
|
||||
'django.contrib.staticfiles',
|
||||
'rest_framework',
|
||||
'channels',
|
||||
'django_eventstream',
|
||||
]
|
||||
|
||||
MIDDLEWARE = [
|
||||
@ -48,6 +51,9 @@ MIDDLEWARE = [
|
||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||
'django.contrib.messages.middleware.MessageMiddleware',
|
||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||
'django_grip.GripMiddleware',
|
||||
'django.middleware.security.SecurityMiddleware',
|
||||
|
||||
]
|
||||
|
||||
ROOT_URLCONF = 'PR.urls'
|
||||
@ -70,7 +76,7 @@ TEMPLATES = [
|
||||
]
|
||||
|
||||
WSGI_APPLICATION = 'PR.wsgi.application'
|
||||
|
||||
ASGI_APPLICATION = 'PR.routing.application'
|
||||
|
||||
# Database
|
||||
# https://docs.djangoproject.com/en/2.2/ref/settings/#databases
|
||||
|
24
polls/migrations/0001_initial.py
Normal file
24
polls/migrations/0001_initial.py
Normal file
@ -0,0 +1,24 @@
|
||||
# Generated by Django 2.2.7 on 2019-11-30 16:27
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Notice',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('notice_title', models.CharField(max_length=80)),
|
||||
('notice_text', models.CharField(max_length=400)),
|
||||
('pub_start', models.DateTimeField()),
|
||||
('pub_end', models.DateTimeField()),
|
||||
],
|
||||
),
|
||||
]
|
0
polls/migrations/__init__.py
Normal file
0
polls/migrations/__init__.py
Normal file
@ -5,4 +5,6 @@ class Notice(models.Model):
|
||||
notice_title = models.CharField(max_length=80)
|
||||
notice_text = models.CharField(max_length=400)
|
||||
pub_start = models.DateTimeField()
|
||||
pub_end = models.DateTimeField()
|
||||
pub_end = models.DateTimeField()
|
||||
|
||||
#neues model python migration
|
7
polls/serializers.py
Normal file
7
polls/serializers.py
Normal file
@ -0,0 +1,7 @@
|
||||
from rest_framework import serializers
|
||||
from .models import Notice
|
||||
|
||||
class NoticeSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = Notice
|
||||
fields = ('id', 'notice_title', 'pub_start', 'pub_end')
|
@ -19,13 +19,18 @@ from django.urls import path
|
||||
from polls import views
|
||||
|
||||
urlpatterns = [
|
||||
#path('', views.index , name='index'),
|
||||
path('', views.index , name='index'),
|
||||
path('new', views.new, name='new'),
|
||||
#path('index',views.index, name='index'),
|
||||
path('notice',views.index, name = 'index'),
|
||||
path('welcome', views.welcome_seite),
|
||||
path('home', views.welcome_seite),
|
||||
path('about', views.about_seite),
|
||||
path('delete/<int:deleteId>', views.delete, name ='delete')
|
||||
path('delete/<int:deleteId>', views.delete, name ='delete'),
|
||||
#url(r'^new', views.new, name='new'),
|
||||
path('notices/', views.notice_list),
|
||||
path('notices/<int:id>/', views.notice_detail),
|
||||
|
||||
|
||||
|
||||
]
|
||||
|
@ -1,9 +1,30 @@
|
||||
from django.http import HttpResponse
|
||||
from django.shortcuts import render,redirect
|
||||
from .models import Notice
|
||||
from django.utils import timezone
|
||||
import logging
|
||||
|
||||
#Pr8
|
||||
from django.views.decorators.csrf import csrf_exempt
|
||||
from django.http import HttpResponse,JsonResponse
|
||||
from polls.forms import NoticeForm
|
||||
from polls.models import Notice
|
||||
from polls.serializers import NoticeSerializer
|
||||
from rest_framework.parsers import JSONParser
|
||||
#XXXX
|
||||
from django.contrib.admin.views.decorators import staff_member_required
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.http import HttpResponse, JsonResponse
|
||||
from django.shortcuts import render, redirect
|
||||
from django.utils import timezone
|
||||
from django.views.decorators.csrf import csrf_exempt
|
||||
from django_eventstream import send_event
|
||||
from rest_framework.parsers import JSONParser
|
||||
|
||||
from polls.forms import NoticeForm
|
||||
from polls.models import Notice
|
||||
|
||||
# Create your views here.
|
||||
from polls.serializers import NoticeSerializer
|
||||
|
||||
# Create your views here.
|
||||
logger = None
|
||||
@ -28,21 +49,25 @@ def index(request):
|
||||
#context = {"notices" : notices}
|
||||
return render(request, 'polls/notice.html',{"notices" : notices})
|
||||
|
||||
#def new(request):
|
||||
# return render(request, 'polls/edit.html')
|
||||
|
||||
#login_required
|
||||
def new(request):
|
||||
if request.method == "POST":
|
||||
form = NoticeForm(request.POST)
|
||||
if form.is_valid():
|
||||
newNotice = Notice(notice_title=form.cleaned_data['title'],
|
||||
notice_text=form.cleaned_data['text'],
|
||||
pub_start=form.cleaned_data['start'],
|
||||
pub_end=form.cleaned_data['end'])
|
||||
notice_text=form.cleaned_data['text'],
|
||||
#pub_start=form.cleaned_data['start'],
|
||||
pub_start= timezone.now(),
|
||||
pub_end=form.cleaned_data['end'])
|
||||
newNotice.save()
|
||||
#Absetzen eines Events
|
||||
send_event('notice', 'message', newNotice.id)
|
||||
return redirect('index')
|
||||
context = {'form': NoticeForm()}
|
||||
return render(request, 'polls/edit.html', context)
|
||||
|
||||
#staff_member_required
|
||||
def delete(request, deleteId = None):
|
||||
if deleteId != None:
|
||||
delNotice = Notice.objects.get(id=deleteId)
|
||||
@ -54,4 +79,43 @@ def welcome_seite(request):
|
||||
return render(request, 'polls/index.html')
|
||||
|
||||
def about_seite(request):
|
||||
return render(request, 'polls/about.html')
|
||||
return render(request, 'polls/about.html')
|
||||
|
||||
#csrf_exempt
|
||||
def notice_list (request):
|
||||
if request.method == 'GET':
|
||||
notices = Notice.objects.all()
|
||||
serializer = NoticeSerializer(notices, many=True)
|
||||
return JsonResponse(serializer.data, safe=False)
|
||||
|
||||
elif request.method == 'POST':
|
||||
data = JSONParser().parser(request)
|
||||
serializer = NoticeSerializer(data=data)
|
||||
if serializer.is_valid():
|
||||
serializer.save()
|
||||
return JsonResponse(serializer.data, status=201)
|
||||
return JsonResponse(serializer.errors, status=400)
|
||||
|
||||
#csrf_exempt
|
||||
def notice_detail(request, id):
|
||||
try:
|
||||
notice = Notice.objects.get(id =id)
|
||||
except Notice.DoesNotExist:
|
||||
return HttpResponse(status=404)
|
||||
|
||||
if request.method == 'GET':
|
||||
serializer = NoticeSerializer(notice)
|
||||
return JsonResponse(serializer.data)
|
||||
|
||||
elif request.method == 'PUT':
|
||||
data = JSONParser().parse(request)
|
||||
serializer = NoticeSerializer(notice, data=data)
|
||||
if serializer.is_valid():
|
||||
serializer.save()
|
||||
return JsonResponse(serializer.data)
|
||||
return JsonResponse(serializer.errors, status=400)
|
||||
|
||||
elif request.method == 'DELETE':
|
||||
notice.delete()
|
||||
return HttpResponse(status=204)
|
||||
|
||||
|
@ -4,6 +4,10 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
|
||||
{% load static %}
|
||||
<script src="{% static 'django_eventstream/eventsource.min.js' %}"></script>
|
||||
<script src="{% static 'django_eventstream/reconnecting-eventsource.js' %}"></script>
|
||||
{# <link rel="stylesheet" href="/media/css/style.css" />#}
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.0/css/bootstrap.min.css">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
@ -1,6 +1,10 @@
|
||||
{% extends "base.html" %}
|
||||
{% block content %}
|
||||
|
||||
<script>
|
||||
var es = new ReconnectingEventSource('/events/');
|
||||
es.addEventListener('message', function (e) {console.log(e.data);location.reload();}, false);
|
||||
</script>
|
||||
<h2>Seite Infos</h2>
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user