diff --git a/.gitignore b/.gitignore index b6edfe9..aa6d288 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -/static/ +settings.yml +static/ +server/__pycache__ diff --git a/example-settings.yml b/example-settings.yml new file mode 100644 index 0000000..6a0653a --- /dev/null +++ b/example-settings.yml @@ -0,0 +1,35 @@ +dependencies: + - djangoldp_account + - djangoldp_notification + - django-webpush + +ldppackages: + - djangoldp_account + - djangoldp_notification + +server: + DEBUG: true + ALLOWED_HOSTS: + - "*" + SECRET_KEY: "ak$t4x@9pcs$ypwt_m38)vcg^m=q@j7*2rs2gu7%h0wwcv)(y2" + DATABASES: + default: + ENGINE: django.db.backends.postgresql_psycopg2 + NAME: djangoldp + USER: postgres + LDP_RDF_CONTEXT: https://cdn.happy-dev.fr/owl/hdcontext.jsonld + ROOT_URLCONF: server.urls + STATIC_ROOT: static + # STATIC_URL: = '/static/' + # STATICFILES_DIRS: = '/Users/trav/Documents/gitnsurge/autonomic/startinblox/startinblox-startinoff' + MEDIA_ROOT: media + INSTALLED_APPS: + - server + - djangoldp_crypto # only needed by decentral1se for #236 + - webpush + + + WEBPUSH_SETTINGS: + VAPID_PUBLIC_KEY: "BIDVJ0sd4Cyycf_aGCxhQ_SmXBneWboI3wGO-Iyj3ofeGkvYyNp5o6W9eTf13YkJSz6NlRwiCHA08m8e82n5WXI" + VAPID_PRIVATE_KEY: "zQ-Apj3yLGvcq-l_YNFMFgNVBxQ5_JYEsUbZA36Yhes" + VAPID_ADMIN_EMAIL: "trav@teafry.me" diff --git a/server/migrations/__pycache__/0001_initial.cpython-39.pyc b/server/migrations/__pycache__/0001_initial.cpython-39.pyc index 3223ca9..af2ad08 100644 Binary files a/server/migrations/__pycache__/0001_initial.cpython-39.pyc and b/server/migrations/__pycache__/0001_initial.cpython-39.pyc differ diff --git a/server/migrations/__pycache__/0002_auto_20210315_1108.cpython-39.pyc b/server/migrations/__pycache__/0002_auto_20210315_1108.cpython-39.pyc index 72cf4a6..c9321a7 100644 Binary files a/server/migrations/__pycache__/0002_auto_20210315_1108.cpython-39.pyc and b/server/migrations/__pycache__/0002_auto_20210315_1108.cpython-39.pyc differ diff --git a/server/migrations/__pycache__/0003_delete_todo.cpython-39.pyc b/server/migrations/__pycache__/0003_delete_todo.cpython-39.pyc index 39d2337..8fe62ba 100644 Binary files a/server/migrations/__pycache__/0003_delete_todo.cpython-39.pyc and b/server/migrations/__pycache__/0003_delete_todo.cpython-39.pyc differ diff --git a/server/migrations/__pycache__/__init__.cpython-39.pyc b/server/migrations/__pycache__/__init__.cpython-39.pyc index 6a40b74..56863a5 100644 Binary files a/server/migrations/__pycache__/__init__.cpython-39.pyc and b/server/migrations/__pycache__/__init__.cpython-39.pyc differ diff --git a/server/views.py b/server/views.py index 2a434f6..c51797f 100644 --- a/server/views.py +++ b/server/views.py @@ -3,7 +3,7 @@ from django.views.decorators.http import require_GET from django.http.response import JsonResponse, HttpResponse from django.views.decorators.http import require_GET, require_POST from django.shortcuts import render, get_object_or_404 -from django.contrib.auth.models import User +from djangoldp_account.models import LDPUser from django.views.decorators.csrf import csrf_exempt from webpush import send_user_notification from django.conf import settings @@ -27,10 +27,10 @@ def send_push(request): return JsonResponse(status=400, data={"message": "Invalid data format"}) user_id = data['id'] - user = get_object_or_404(User, pk=user_id) + user = get_object_or_404(LDPUser, pk=user_id) payload = {'head': data['head'], 'body': data['body']} send_user_notification(user=user, payload=payload, ttl=1000) return JsonResponse(status=200, data={"message": "Web push successful"}) except TypeError: - return JsonResponse(status=500, data={"message": "An error occurred"}) \ No newline at end of file + return JsonResponse(status=500, data={"message": "An error occurred"})