Compare commits
5
Commits
9b3eb7090a
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7dac572f9d | ||
|
|
6ef1c46b6b | ||
|
|
8af5a0bcf2 | ||
|
|
fb4f003f39 | ||
|
|
b8ec68ddea
|
No files matched your search
@@ -1,4 +1,5 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
|
#coding=utf-8
|
||||||
|
|
||||||
from http import server
|
from http import server
|
||||||
from urllib import parse
|
from urllib import parse
|
||||||
|
|||||||
@@ -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),
|
||||||
|
})
|
||||||
@@ -39,6 +39,8 @@ INSTALLED_APPS = [
|
|||||||
'django.contrib.sessions',
|
'django.contrib.sessions',
|
||||||
'django.contrib.messages',
|
'django.contrib.messages',
|
||||||
'django.contrib.staticfiles',
|
'django.contrib.staticfiles',
|
||||||
|
'channels',
|
||||||
|
'django_eventstream',
|
||||||
]
|
]
|
||||||
|
|
||||||
MIDDLEWARE = [
|
MIDDLEWARE = [
|
||||||
@@ -49,6 +51,8 @@ MIDDLEWARE = [
|
|||||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||||
'django.contrib.messages.middleware.MessageMiddleware',
|
'django.contrib.messages.middleware.MessageMiddleware',
|
||||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||||
|
'django_grip.GripMiddleware',
|
||||||
|
'django.middleware.security.SecurityMiddleware',
|
||||||
]
|
]
|
||||||
|
|
||||||
ROOT_URLCONF = 'news.urls'
|
ROOT_URLCONF = 'news.urls'
|
||||||
@@ -72,6 +76,7 @@ TEMPLATES = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
WSGI_APPLICATION = 'news.wsgi.application'
|
WSGI_APPLICATION = 'news.wsgi.application'
|
||||||
|
ASGI_APPLICATION = 'news.routing.application'
|
||||||
|
|
||||||
|
|
||||||
# Database
|
# Database
|
||||||
|
|||||||
+1
-1
@@ -10,4 +10,4 @@ class NoticeForm(forms.Form):
|
|||||||
initial=datetime.date.today)
|
initial=datetime.date.today)
|
||||||
end = forms.DateField(label='Bis',
|
end = forms.DateField(label='Bis',
|
||||||
input_formats=date_formats,
|
input_formats=date_formats,
|
||||||
initial=datetime.date.today)
|
initial=datetime.datetime.today() + datetime.timedelta(days=1))
|
||||||
+7
-3
@@ -5,6 +5,7 @@ from django.http import HttpResponse, JsonResponse
|
|||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.views.decorators.csrf import csrf_exempt
|
from django.views.decorators.csrf import csrf_exempt
|
||||||
|
from django_eventstream import send_event
|
||||||
|
|
||||||
from rest_framework.renderers import JSONRenderer
|
from rest_framework.renderers import JSONRenderer
|
||||||
from rest_framework.parsers import JSONParser
|
from rest_framework.parsers import JSONParser
|
||||||
@@ -35,6 +36,7 @@ def index(request):
|
|||||||
}
|
}
|
||||||
return render(request, 'posts/index.html', context)
|
return render(request, 'posts/index.html', context)
|
||||||
|
|
||||||
|
#@login_required
|
||||||
def new(request):
|
def new(request):
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
form = NoticeForm(request.POST)
|
form = NoticeForm(request.POST)
|
||||||
@@ -44,6 +46,7 @@ def new(request):
|
|||||||
pub_start=form.cleaned_data['start'],
|
pub_start=form.cleaned_data['start'],
|
||||||
pub_end=form.cleaned_data['end'])
|
pub_end=form.cleaned_data['end'])
|
||||||
newNotice.save()
|
newNotice.save()
|
||||||
|
send_event('notice', 'message', newNotice.id)
|
||||||
return redirect('posts')
|
return redirect('posts')
|
||||||
|
|
||||||
context = {'form' : NoticeForm()}
|
context = {'form' : NoticeForm()}
|
||||||
@@ -58,9 +61,10 @@ def delete(request, deleteId=None):
|
|||||||
if delNotice:
|
if delNotice:
|
||||||
delNotice.delete()
|
delNotice.delete()
|
||||||
message = "Notice has been deleted."
|
message = "Notice has been deleted."
|
||||||
|
send_event('notice', 'message', "Notice has been deleted.")
|
||||||
return redirect('posts')
|
return redirect('posts')
|
||||||
|
|
||||||
|
|
||||||
@csrf_exempt
|
@csrf_exempt
|
||||||
def notice_list(request):
|
def notice_list(request):
|
||||||
if request.method == 'GET':
|
if request.method == 'GET':
|
||||||
@@ -98,4 +102,4 @@ def notice_detail(request, id):
|
|||||||
|
|
||||||
elif request.method == 'DELETE':
|
elif request.method == 'DELETE':
|
||||||
notice.delete()
|
notice.delete()
|
||||||
return HttpResponse(status=204)
|
return HttpResponse(status=204)
|
||||||
@@ -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://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://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>
|
<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>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
{% include 'navbar.html' %}
|
{% include 'navbar.html' %}
|
||||||
|
|||||||
@@ -5,6 +5,12 @@ Index
|
|||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
|
||||||
|
<script>
|
||||||
|
var es = new ReconnectingEventSource('/events/');
|
||||||
|
es.addEventListener('message', function (e) {console.log(e.data); location.reload();});
|
||||||
|
</script>
|
||||||
|
|
||||||
<div class=container>
|
<div class=container>
|
||||||
<h1 class="display-4">Your Posts</h1>
|
<h1 class="display-4">Your Posts</h1>
|
||||||
|
|
||||||
@@ -13,7 +19,9 @@ Index
|
|||||||
<div class="jumbotron">
|
<div class="jumbotron">
|
||||||
<h3>{{ notice.notice_title }}</h3>
|
<h3>{{ notice.notice_title }}</h3>
|
||||||
<p>{{ notice.notice_text }}</p>
|
<p>{{ notice.notice_text }}</p>
|
||||||
<p><a href="{% url 'delete' deleteId=notice.id %}" class="btn btn-danger" role="button">Delete</a></p>
|
<p>
|
||||||
|
<a href="{% url 'delete' deleteId=notice.id %}" class="btn btn-danger" role="button">Delete</a>
|
||||||
|
</p>
|
||||||
{% if message %}
|
{% if message %}
|
||||||
<script>
|
<script>
|
||||||
alert('{{ message }}');
|
alert('{{ message }}');
|
||||||
|
|||||||
Reference in new issue
Block a user