From 2a752dd390582efad8d0fa5fd59c36ba7218cc14 Mon Sep 17 00:00:00 2001 From: Devin Matte Date: Sun, 8 Mar 2020 20:27:06 -0400 Subject: [PATCH 1/2] Adding 500 and 404 pages --- frontend/scss/components/code.scss | 3 +++ frontend/scss/packet.scss | 1 + packet/routes/shared.py | 14 ++++++++++++++ packet/templates/error.html | 20 ++++++++++++++++++++ packet/templates/not_found.html | 17 +++++++++++++++++ requirements.txt | 2 +- 6 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 frontend/scss/components/code.scss create mode 100644 packet/templates/error.html create mode 100644 packet/templates/not_found.html diff --git a/frontend/scss/components/code.scss b/frontend/scss/components/code.scss new file mode 100644 index 00000000..b082276f --- /dev/null +++ b/frontend/scss/components/code.scss @@ -0,0 +1,3 @@ +pre{ + white-space: pre-wrap; +} diff --git a/frontend/scss/packet.scss b/frontend/scss/packet.scss index d89fc83f..193e09fa 100644 --- a/frontend/scss/packet.scss +++ b/frontend/scss/packet.scss @@ -7,3 +7,4 @@ $csh-pink: #b0197e; @import "components/buttons"; @import "components/signatures"; @import "components/badges"; +@import "components/code"; diff --git a/packet/routes/shared.py b/packet/routes/shared.py index bebb4cae..3fd42b07 100644 --- a/packet/routes/shared.py +++ b/packet/routes/shared.py @@ -80,3 +80,17 @@ def service_worker(): @app.route('/OneSignalSDKUpdaterWorker.js', methods=['GET']) def update_service_worker(): return app.send_static_file('js/update-sw.js') + + +@app.errorhandler(404) +@packet_auth +@before_request +def not_found(e, info=None): + return render_template("not_found.html", info=info), 404 + + +@app.errorhandler(500) +@packet_auth +@before_request +def error(e, info=None): + return render_template("error.html", e=e, info=info), 500 diff --git a/packet/templates/error.html b/packet/templates/error.html new file mode 100644 index 00000000..de33536b --- /dev/null +++ b/packet/templates/error.html @@ -0,0 +1,20 @@ +{% extends 'extend/base.html' %} + +{% block body %} +
+

Oops!

+
+
+
+ I guess this is what you get when you trust a bunch of college kids. +
+

+ 

{{ e }}
+

+
+ Do us a favor, try again. If you end up here on the second try, shoot us an email. +
+
+
+
+{% endblock %} diff --git a/packet/templates/not_found.html b/packet/templates/not_found.html new file mode 100644 index 00000000..e7cd8765 --- /dev/null +++ b/packet/templates/not_found.html @@ -0,0 +1,17 @@ +{% extends 'extend/base.html' %} + +{% block body %} +
+

Page Not Found

+
+
+

+ Not sure what you're looking for, but it's not here. +

+
+ Do us a favor, check your spelling. If you can't find what you're looking for, shoot us an email. +
+
+
+
+{% endblock %} diff --git a/requirements.txt b/requirements.txt index 77e5d980..d97e06f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,4 +10,4 @@ gunicorn~=19.7.1 csh_ldap~=2.1.0 onesignal-sdk~=1.0.0 pylint-quotes~=0.2.1 -sentry-sdk==0.13.1 +sentry-sdk~=0.14.2 From d8244e338e969a653a353c31d67f04b671ce78d1 Mon Sep 17 00:00:00 2001 From: Devin Matte Date: Sun, 8 Mar 2020 20:32:56 -0400 Subject: [PATCH 2/2] Fixing linting issues --- packet/routes/shared.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packet/routes/shared.py b/packet/routes/shared.py index 3fd42b07..97241815 100644 --- a/packet/routes/shared.py +++ b/packet/routes/shared.py @@ -86,11 +86,11 @@ def update_service_worker(): @packet_auth @before_request def not_found(e, info=None): - return render_template("not_found.html", info=info), 404 + return render_template('not_found.html', e=e, info=info), 404 @app.errorhandler(500) @packet_auth @before_request def error(e, info=None): - return render_template("error.html", e=e, info=info), 500 + return render_template('error.html', e=e, info=info), 500