reset without edit func

.gitignore

@@ -106,3 +106,6 @@ venv.bak/
 
 # vscode
 .vscode/
+
+# merge orig files
+*.orig

http-server

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+#coding=utf-8
 
 from http import server
 from urllib import parse

news/news/routing.py

@@ -0,0 +1,17 @@
+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 = [
+    re_path(r'^events/',
+            AuthMiddlewareStack(URLRouter(django_eventstream.routing.urlpatterns)),
+            {'channels': ['notice']}),
+    re_path(r'', AsgiHandler),
+]
+
+application = ProtocolTypeRouter({
+    'http': URLRouter(urlpatterns),
+})

news/news/settings.py

@@ -32,12 +32,15 @@ ALLOWED_HOSTS = []
 
 INSTALLED_APPS = [
     'posts.apps.PostsConfig',
+    'rest_framework',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'channels',
+    'django_eventstream',
 ]
 
 MIDDLEWARE = [
@@ -48,6 +51,8 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django_grip.GripMiddleware',
+    'django.middleware.security.SecurityMiddleware',
 ]
 
 ROOT_URLCONF = 'news.urls'
@@ -71,6 +76,7 @@ TEMPLATES = [
 ]
 
 WSGI_APPLICATION = 'news.wsgi.application'
+ASGI_APPLICATION = 'news.routing.application'
 
 
 # Database

news/posts/forms.py

@@ -0,0 +1,13 @@
+from django import forms
+import datetime
+
+class NoticeForm(forms.Form):
+    date_formats = ['%d.%m.%Y', '%d.%m.%y']
+    title = forms.CharField(label='Titel', max_length=80)
+    text = forms.CharField(label='Text', max_length=400)
+    start = forms.DateField(label='Von',
+                            input_formats=date_formats,
+                            initial=datetime.date.today)
+    end = forms.DateField(label='Bis',
+                          input_formats=date_formats,
+                          initial=datetime.datetime.today() + datetime.timedelta(days=1))

news/posts/serializers.py

@@ -0,0 +1,8 @@
+from rest_framework import serializers
+from .models import Notice
+
+class NoticeSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Notice
+        fields = ('id', 'notice_title', 'notice_text', 'pub_start', 'pub_end')
+    

news/posts/urls.py

@@ -2,5 +2,10 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
-    path('', views.index, name='posts')
+    path('', views.index, name='posts'),
+    path('new', views.new, name='new'),
+    path('delete/<int:deleteId>', views.delete, name='delete'),
+
+    path('notices/', views.notice_list),
+    path('notices/<int:id>/', views.notice_detail),
 ]

news/posts/views.py

@@ -1,24 +1,105 @@
-from django.shortcuts import render
-from django.http import HttpResponse
-from  .models import Notice
-from django.utils import timezone
 import logging
 
+from django.shortcuts import render, redirect, render_to_response
+from django.http import HttpResponse, JsonResponse
+from django.utils import timezone
+from django.contrib import messages
+from django.views.decorators.csrf import csrf_exempt
+from django_eventstream import send_event
+
+from rest_framework.renderers import JSONRenderer
+from rest_framework.parsers import JSONParser
+
+from .models import Notice
+from .forms import NoticeForm
+from .serializers import NoticeSerializer
+
 logger = None
 
-def init_loger():
+def init_loger(logger_type):
     global logger
     if logger == None:
-        logger = logging.getLogger('django.db.backends')
+        logger = logging.getLogger()
         logger.setLevel(logging.DEBUG)
         logger.addHandler(logging.StreamHandler())
 
 # Create your views here.
 def index(request):
-    init_loger()
+    init_loger('django.db.backends')
     notices = Notice.objects.all()
     notices = Notice.objects.filter(pub_start__lte=timezone.now(), pub_end__gte=timezone.now())
+    message = ""
+
     context = {
         "notices": notices,
+        'message': message,
     }
     return render(request, 'posts/index.html', context)
+
+#@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'])
+            newNotice.save()
+            send_event('notice', 'message', newNotice.id)
+            return redirect('posts')
+    
+    context = {'form' : NoticeForm()}
+    return render(request, 'posts/edit.html', context)
+
+def delete(request, deleteId=None):
+    init_loger(__name__)
+    logger.info(deleteId)
+    message = ""
+    if deleteId:
+        delNotice = Notice.objects.get(id=deleteId)
+        if delNotice:
+            delNotice.delete()
+            message = "Notice has been deleted."
+            send_event('notice', 'message', "Notice has been deleted.")
+    return redirect('posts')
+
+
+@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().parse(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)

news/templates/base.html

@@ -7,6 +7,11 @@
         <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
         <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+        
+        {% load static %}
+        <script src="{% static 'django_eventstream/eventsource.min.js' %}"></script>
+        <script src="{% static 'django_eventstream/reconnecting-eventsource.js' %}"></script>
+              
     </head>
     <body>
         {% include 'navbar.html' %}

news/templates/posts/edit.html

@@ -0,0 +1,18 @@
+{% extends 'base.html' %}
+
+{% block title %}
+Index
+{% endblock %}
+
+{% block content %}
+<div class=container>
+    <h1 class="display-4">New Message</h1>
+
+    <form method="POST">
+        <div class="form-group">
+            {% csrf_token %}{{ form.as_p }}
+        </div>
+        <button type="submit" class="save btn btn-default">Speichern</button>
+    </form>
+</div>
+{% endblock %}

news/templates/posts/index.html

@@ -5,14 +5,34 @@ Index
 {% endblock %}
 
 {% block content %}
-<div class="jumbotron">
-    <h1 class="display-4">Index of News App</h1>
+
+<script>
+    var es = new ReconnectingEventSource('/events/');
+    es.addEventListener('message', function (e) {console.log(e.data); location.reload();});
+</script>
+
+<div class=container>
+    <h1 class="display-4">Your Posts</h1>
 
     <div class=container>
         {% for notice in notices %}
-        <h3>{{ notice.notice_title }}</h3>
-        <p>{{ notice.notice_text }}</p>
+        <div class="jumbotron">
+            <h3>{{ notice.notice_title }}</h3>
+            <p>{{ notice.notice_text }}</p>
+            <p>
+                <a href="{% url 'delete' deleteId=notice.id %}" class="btn btn-danger" role="button">Delete</a>
+            </p>
+            {% if message %}
+            <script>
+                alert('{{ message }}');
+            </script>
+            {% endif %}
+        </div>
         {% endfor %}
+
+        <div class=container>
+            <p><a href="{% url 'new' %}" class="btn btn-info" role="button">Neue Nachricht</a></p>
+        </div>
     </div>
 
     <!--p class="lead">Some placeholder Text</p-->