diff --git a/src/app.py b/src/app.py index d8d5bb3..5677e19 100644 --- a/src/app.py +++ b/src/app.py @@ -44,36 +44,12 @@ def funcGen(pagename, pages): for i in pages: func = funcGen(i, pages) app.add_url_rule(pages[i]['canonical'], i, func) - - -# for i in pages: -# exec(f"@app.route(pages['{i}']['canonical'])\ndef {i}(): return flask.render_template('header.html', var=pages['{i}'])") - @app.route("/resume") @app.route("/Resume.pdf") def resume(): return flask.send_file("./static/Resume.pdf") -@app.route("/hotspots") -def hotspotsRIT(): - url = HotspotsURL - if flask.request.args.get("legend") == "false": - url += "?legend=false" - pagevars = { - "template": "iframe.html", - "title": f"Hotspots @ RIT", - "description": "Hotspots @ RIT by Andrew Simonson", - "canonical": "/hotspots", - } - return flask.render_template("iframe.html", url=url, var=pagevars) - -@app.route("/hotspots/") -def hotspotsProxy(path): - resp = flask.make_response(requests.get(f"{HotspotsURL}/{path}").content) - resp.headers['Access-Control-Allow-Origin'] = '*' # or restrict to your site's domain - return resp - @app.errorhandler(Exception) def page404(e): eCode = e.code diff --git a/src/config.py b/src/config.py index 1c932de..c5f3d7e 100644 --- a/src/config.py +++ b/src/config.py @@ -4,5 +4,3 @@ try: __import__('envs.py') except ImportError: pass - -HotspotsURL = env.get('HotspotsURL', 'https://asimonson.com/hotspots') \ No newline at end of file diff --git a/src/templates/header.html b/src/templates/header.html index 9661bdd..b98fe74 100644 --- a/src/templates/header.html +++ b/src/templates/header.html @@ -14,7 +14,7 @@ @@ -23,7 +23,7 @@ @@ -56,7 +56,7 @@ href="{{ url_for('static', filename='css/head.css') }}" /> - + @@ -65,7 +65,8 @@ {% block header %} - + +