From 252ac0ef7b141d5b51c68406c471a9702cc692aa Mon Sep 17 00:00:00 2001
From: Fay Arnold <fay.arno001@gmail.com>
Date: Thu, 1 Apr 2021 16:20:17 +0100
Subject: [PATCH] git ignore and minor webpush fix

---
 .gitignore                                    |   4 +-
 example-settings.yml                          |  35 ++++++++++++++++++
 .../__pycache__/0001_initial.cpython-39.pyc   | Bin 1151 -> 1159 bytes
 .../0002_auto_20210315_1108.cpython-39.pyc    | Bin 595 -> 603 bytes
 .../0003_delete_todo.cpython-39.pyc           | Bin 513 -> 521 bytes
 .../__pycache__/__init__.cpython-39.pyc       | Bin 178 -> 186 bytes
 server/views.py                               |   6 +--
 7 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 example-settings.yml

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 3223ca9c0b147bb4c71d526dac5a23a2d016807a..af2ad0853d694cc764196fdfcaa731c3566c9118 100644
GIT binary patch
delta 173
zcmey*(ay=8$ji&c00a}yq;BNaWMqumY|7Zd$S6E{A5#OP{A7D(cON~VbP<U7m8_qU
zpPQ<mmROlsl$UQ{V5nbEl%JKFTvDuGo?n!$UtE${RFavOl#^e9%+`g9=clDjKE>Q<
mq5(3H1!gMPXb7PX6uZS?lbfGXnv-hB4CEDqlnF3$FarP?GcPp&

delta 143
zcmZqY{LjIi$ji&c00hM{vKzTI85wVFHf8K!WE7dakEwxCVX{55yNf<hx(G!4iq_A_
z&rQ`&Nli}8D=A9MF)U8iFV8Q^)=w-g$<NEr%}mxWE=epZ$;?a2$*<7Qt;|U&C{8UZ
bOD&pwiMdfq6J!tz%rvl(5W-+`E{hZZTj(fZ

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 72cf4a65bfcb7274e533a0d1b851a98484d91d83..c9321a721ffead2a3dc3a23cac9922be6e276a42 100644
GIT binary patch
delta 91
zcmcc2a+`%ak(ZZ?0SG3ZN!`d@&*+q=pOK%Ns-KovnOKyUZ(v}kUr>~vm6}{qtY4mA
el&xP}l2}xdnU|E4UxCclg^K5=rA<D<*be}3ry(u?

delta 83
zcmcc3a+!rYk(ZZ?0SHu#{5NvfGg_tTXXNLm>Zhb8r{<LuCFU3wr|OsI7iH@wmX_q_
l<>zK5>lc?K7L{b?CFSH-=;v1Eq!bjV7L}zIO+Lfe4*)lV9X<d6

diff --git a/server/migrations/__pycache__/0003_delete_todo.cpython-39.pyc b/server/migrations/__pycache__/0003_delete_todo.cpython-39.pyc
index 39d23377c0ed5719e44e15ce1e6d0ce2db25e7d1..8fe62bacb6b6ece1d4a4d4744abd18a12fa43dc3 100644
GIT binary patch
delta 171
zcmZo<>15$f<mKgJ0D_5UQYUh+m%1fxU|?VrpIBOwA8%w}WN2V)Xc}*5Xkc+`;+13{
zKA^%P5b-NrKO;XkRX;7UGO;Kx-@w37zn~~TD>b>KSid~KC|kd{B(bO@GcPG8zXF-9
q3l+~#OPgHH7^eX@5Nv7@KhWq~95%W6DWy57cFaItF%yvBVFmzV4l!o{

delta 143
zcmeBVX=LF}<mKgJ00LfP|B2k|rJ}?Q3=E9o6H80-<BbfA3=ND8P2&v>4J@K2UP*T0
z0V*s45x?T~GxBp&^;1%lQ}arS5_1fTQ}xU9i?a1WI`i^#Gn4g;OA?DpGV_vh@+<Un
eD|1o`ic^cqQi~=xGsX$P4Fa21#5?&TqXYmI5-D*2

diff --git a/server/migrations/__pycache__/__init__.cpython-39.pyc b/server/migrations/__pycache__/__init__.cpython-39.pyc
index 6a40b741bb4bcc08dd84756b598554ab4d8d6bfa..56863a5b53cfbe4b6f1737f6082c6d5ef6eed641 100644
GIT binary patch
delta 89
zcmdnQxQmfHk(ZZ?0SG3ZNu9`T;}ox-k)NBYpO#peSd^D<U|^_UP?VpQnp{$>U!Gr-
ctzTS{SX7dkmz0xVfy~y0isz@LO>8s-01+4;&j0`b

delta 81
zcmdnRxQUTFk(ZZ?0SJm^WG8alScU6n<maa9r=%vQ=9LsB<`@>I>X+viW$P!FmgMK<
j=Vm7B7ndX!m1O26<>XiB=T_#V6cncxm8BL<>@)-b<scj8

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"})