From 99fe1e25ce8afd97590818482c2406dbf2505183 Mon Sep 17 00:00:00 2001 From: Oskar Date: Mon, 7 Dec 2020 21:37:41 +0100 Subject: [PATCH] Enable dev and domain independent serving, add favicon --- fs-quiz-tool-db/__main__.py | 9 +++++++++ fs-quiz-tool-db/app.py | 4 ++-- web/favicon.ico | Bin 0 -> 4166 bytes web/main.js | 6 +++--- 4 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 web/favicon.ico diff --git a/fs-quiz-tool-db/__main__.py b/fs-quiz-tool-db/__main__.py index 00fe5f1..0df5575 100644 --- a/fs-quiz-tool-db/__main__.py +++ b/fs-quiz-tool-db/__main__.py @@ -1,7 +1,16 @@ from .app import app +from flask import send_from_directory if __name__ == "__main__": + @app.route('/') + def get_root(): + return send_from_directory('../web', 'index.html') + + @app.route('/') + def get_path(path): + return send_from_directory('../web', path) + @app.after_request def add_headers(response): response.headers['Access-Control-Allow-Origin'] = '*' diff --git a/fs-quiz-tool-db/app.py b/fs-quiz-tool-db/app.py index 11c19a6..0f90345 100644 --- a/fs-quiz-tool-db/app.py +++ b/fs-quiz-tool-db/app.py @@ -22,7 +22,7 @@ def startup(): pass -@app.route('/', methods = ['GET']) +@app.route('/db/', methods = ['GET']) def get(id): return data[id] if id in data else ('Error: Not found', 404) @@ -38,7 +38,7 @@ def generateNewKey(): return id -@app.route('/', methods = ['POST']) +@app.route('/db', methods = ['POST']) def post(): id = generateNewKey() diff --git a/web/favicon.ico b/web/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..59693fd65844e127c4d227fa3674af98196d3217 GIT binary patch literal 4166 zcmeHJJB}1F5cTW|O@PD_LD(r00o=fI31W`YKFZvHBWx$+8$jM6VF!!U8uhe!uRgYW zKq7;ry_&XPy>hu+Rkk;T1O8IFlm6rD5Z;6k-r<+dv4{CUDY{bQJ2))ca$v0=mv*LB* zDGc9_(KMx7j#Jm-^QQ*%bZj22<2-Jg{Nv@ehJ)E#3ZI`hDMn=77qsTeJNWQ1+QfR z(9WlQS%c!MV^(VRL_n|%jC@nZeza?@MOJhgj^7w657#gj9t{^C1Vzw_*&vl>F^ zUWh}6!K>%9Mi9JK(5xvyq%BRoIQbL3X96UUmSBe=Sch4gnNlDWP z_J+6sTY+3)dqE{&-yPKk;LlY*;{<37Tz1-A(k}gvJ