From ad09cd71f5348cc571d1380cb16b3f54459fc74d Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Fri, 2 Mar 2018 10:57:21 -0500
Subject: [PATCH] 404, 500 pages

---
 app/static/app/img/404.png   | Bin 0 -> 3573 bytes
 app/static/app/img/500.png   | Bin 0 -> 1429 bytes
 app/templates/app/404.html   |  11 +++++++++++
 app/templates/app/500.html   |  11 +++++++++++
 app/templates/app/index.html |   5 -----
 app/urls.py                  |   5 +++++
 app/views/app.py             |   7 +++++++
 7 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 app/static/app/img/404.png
 create mode 100644 app/static/app/img/500.png
 create mode 100644 app/templates/app/404.html
 create mode 100644 app/templates/app/500.html
 delete mode 100644 app/templates/app/index.html

diff --git a/app/static/app/img/404.png b/app/static/app/img/404.png
new file mode 100644
index 0000000000000000000000000000000000000000..eece9762aeb1d66e7b60f500d49fc16d8e13002c
GIT binary patch
literal 3573
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

literal 0
HcmV?d00001

diff --git a/app/static/app/img/500.png b/app/static/app/img/500.png
new file mode 100644
index 0000000000000000000000000000000000000000..b94a00aa740bd610662bb31bbfe076d8f0bf6858
GIT binary patch
literal 1429
zcmV;G1#0?<P)<h;3K|Lk000e1NJLTq002e+003MF1^@s6(__PV00004b3#c}2nYxW
zd<bNS00009a7bBm000KM000KM0VqQ$4FCWD8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11rkX_K~#90?VLeuR7Dua|KH4eyA>-IBWjBT#WcHOxVRUMX)K9p
zsJrtT#U-sC1>?oD2NOaxUbyJda4_MbfdyLj?LtDL!FVD@NJJBs8q&llAqJ(CZg=T2
zp9l6e>!XG3w%hH_&hIquoA=Fp`R_MxX5M@I2z4+#JiOU;-EGlm^tVhVGgpsKyF>My
zq?8&1@C|^w0ImQy4`9Og{Zmbht)+;1PV#;KTgP#p7DDU>@HG)V4&asMhGwy}6Lno<
zR)SLM1c2*O%0m+q6I0FZZ?%xk?jRnI3jpsj^QW;`?1ldR{$D01C;x4BzbmEb858uA
zN~KanbO6AX-rnAAhYuf~U!%U;0!pP){jCndVzG2K>2$j3v*p96YfG?}96WeXluD)V
zl~NzKGLDx2GGWf0JIC>OyaM2hSS+@!udnaS)YOz->p0eG9kXnb$>e|#VgkVVa=Dy7
zd-m+?TK2#0hEhO2pZ^iSYXD-ANaXca$FuGj931Rwbqp4Z#bU8o8piXyx0O;yo6+{V
zUEtNp?*QIPrBd&$cEjs#ue2Nrg~Ih%Eani=fp|QAq);fV+P0zHGX`B<U7rKErnUZZ
zHQQ}_VKSM_9RT}@D3VU6Bdw0dVzF2(7K_EwB!-8FH+r78yHWqPU->SDlyZofPYewW
zJ=%!BvBD71X#gCJMw5;B8!L?O`$Yh!0ld?Qzp=tpISwG%$Z#@Rm~y$C2XM5zyL)4+
zW3gB)7K_DVv9y@BeiFGHlu{qX<MHW2p>Sid`cx`)b;ph!w=ZA5d=W5wOAz8St@X~O
zDv9X1N~LljIPN52rmO$uTnZwhXM%%H6Q(C@92gkr4a!911m%tqhKO!5^ZzntY;5e+
zo}Qk+lu`@;TI+=u!aGJ7068MMRBO0(>(-04$3#S)=VbuEL5GmdW)Cf5-X1ncDL(`{
zD`W0MO1Up6YpwSY(fs)M_zj@Lg<<B+L0JefB&A%q5O=yTR8vj{*#dO9Fhrzl${T9y
zjJ)_NrLGXsc4iL$@C1MXfQUF$PvH}dLMe3}z*CL*I*#+?`1trg0Pa)N1RetbDdi0S
zryR$5UrPD>%*>4I`#wdZ(LGB!Rw|WKp668n12bmt-o0<m&CTVB=wddTeYv*I^Sm?6
z{Llyei9|vgmodkV9XnkuJ{zvnTE9_G8y7BIC>tkC05f-oZA8TN_!3dc$XTh13jpbK
zdP}KP`UJoT>YRm{d6#k57yt-%%Z)-rTZ|h@qobpPD{Z4#EY2Dy%<Sy!k(IWwY15|L
z#tFmBb<I3WK}0%}$=o$gm|QM5={U|n*iJ+<sBQ-yM6j_mPM9iJ!UksknVF~S@cjcY
zRG4D1SP7Zf_x)XwNM!$lfqBvF5kfox7%GhGx_baXYrWI=ee!)@0KmzUCy&<%vglXU
zwAS5#p|>3Xd<6hR^qo?wi-=qz5?X5pPz11nh#vTFI3pK$p6A_RX17uQL?R)L6bARc
zw|A3>9>KjKGY8;rX8wtp59RauUxO2sQqur}w>lXB2_arGbtrKzmwV9T*ackIRrB-n
zKLCK%8bSz2DMwAsm}OD3x2gbegb?SAoRu1dnI!;dt^2Gn_Xuu~2P0^!6$St^-}gB=
zD+~Z3#I<TMSpQY5FaWaI?AAmgA${K$)!UzBXQdFyWO7~zA#BEk5JLRP%w&ZLA*K94
j2(hAj#>O%-GIHrZKD~rTmv@_*00000NkvXXu0mjfF;km>

literal 0
HcmV?d00001

diff --git a/app/templates/app/404.html b/app/templates/app/404.html
new file mode 100644
index 00000000..530268a0
--- /dev/null
+++ b/app/templates/app/404.html
@@ -0,0 +1,11 @@
+{% extends "app/base.html" %}
+{% load settings %}
+{% block page-wrapper %}
+<div style="text-align: center;">
+    <h3>404 Page Not Found</h3>
+    <h5>Are you sure the address is correct?</h5>
+    <img src="/static/app/img/404.png" alt="404"/>
+</div>
+
+{{ SETTINGS.theme.html_after_header|safe }}
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/app/500.html b/app/templates/app/500.html
new file mode 100644
index 00000000..eec99017
--- /dev/null
+++ b/app/templates/app/500.html
@@ -0,0 +1,11 @@
+{% extends "app/base.html" %}
+{% load settings %}
+{% block page-wrapper %}
+<div style="text-align: center;">
+    <h3>500 Internal Server Error</h3>
+    <h5>Something happened. The server logs contain more information.</h5>
+    <img src="/static/app/img/500.png" alt="500"/>
+</div>
+
+{{ SETTINGS.theme.html_after_header|safe }}
+{% endblock %}
\ No newline at end of file
diff --git a/app/templates/app/index.html b/app/templates/app/index.html
deleted file mode 100644
index 70f30a4b..00000000
--- a/app/templates/app/index.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "app/base.html" %}
-
-{% block content %}
-{{ hello }}
-{% endblock %}
diff --git a/app/urls.py b/app/urls.py
index 4f759d9a..248e80e3 100644
--- a/app/urls.py
+++ b/app/urls.py
@@ -1,5 +1,7 @@
 import sys
 from django.conf.urls import url, include
+from django.shortcuts import render_to_response
+from django.template import RequestContext
 
 from .views import app as app_views, public as public_views
 from .plugins import get_url_patterns
@@ -30,6 +32,9 @@ urlpatterns = [
 # into the static build directories and let nginx serve them?
 urlpatterns += get_url_patterns()
 
+handler404 = app_views.handler404
+handler500 = app_views.handler500
+
 # Test cases call boot() independently
 # Also don't execute boot with celery workers
 if not settings.WORKER_RUNNING and not settings.TESTING:
diff --git a/app/views/app.py b/app/views/app.py
index dd168e55..d456fc7f 100644
--- a/app/views/app.py
+++ b/app/views/app.py
@@ -134,3 +134,10 @@ def welcome(request):
                       'title': 'Welcome',
                       'firstuserform': fuf
                   })
+
+
+def handler404(request):
+    return render(request, '404.html', status=404)
+
+def handler500(request):
+    return render(request, '500.html', status=500)
\ No newline at end of file