Merge branch 'master' into csweaver/api-v2-init

server/app/app.py

@@ -13,7 +13,7 @@ from .web import webapp
 
 REACTIVE_LIMIT = 1_000_000
 
-app = Flask(__name__)
+app = Flask(__name__, static_folder="web/static")
 cache = Cache(app, config={"CACHE_TYPE": "simple", "CACHE_DEFAULT_TIMEOUT": 860000})
 Compress(app)
 CORS(app)

server/app/web/webapp.py

@@ -1,7 +1,9 @@
+import os
 from flask import (
-    Blueprint, render_template, url_for, current_app
+    Blueprint, render_template, send_from_directory, current_app
 )
 
+
 bp = Blueprint("webapp", __name__, template_folder="templates")
 
 
@@ -21,4 +23,4 @@ def swag():
 # renders swagger documentation
 @bp.route("/favicon.png")
 def favicon():
-    return url_for("static", filename="img/favicon.png")
+    return send_from_directory(os.path.join(bp.root_path, "static/img/"), "favicon.png")