From d32dcc701b73ce685a47f3b68943f32e950214a9 Mon Sep 17 00:00:00 2001 From: Nathan Woodburn Date: Thu, 2 Nov 2023 20:45:36 +1100 Subject: [PATCH] fix: Update some routes --- server.py | 36 +++++++++++++++++- templates/assets/img/favicon.ico | Bin 0 -> 4286 bytes templates/info.html | 63 ------------------------------- templates/projects.html | 2 +- templates/sitemap.xml | 3 -- 5 files changed, 35 insertions(+), 69 deletions(-) create mode 100644 templates/assets/img/favicon.ico delete mode 100644 templates/info.html diff --git a/server.py b/server.py index 7cbb0ba..5bcbb69 100644 --- a/server.py +++ b/server.py @@ -5,24 +5,56 @@ import dotenv app = Flask(__name__) dotenv.load_dotenv() +#Assets routes @app.route('/assets/') def send_report(path): return send_from_directory('templates/assets', path) +# Special routes +@app.route('/links') +def links(): + return render_template('link.html') + +@app.route('/sitemap') +@app.route('/sitemap.xml') +def sitemap(): + # Remove all .html from sitemap + with open('templates/sitemap.xml') as file: + sitemap = file.read() + + sitemap = sitemap.replace('.html', '') + return make_response(sitemap, 200, {'Content-Type': 'application/xml'}) + +@app.route('/favicon.png') +def faviconPNG(): + return send_from_directory('templates/assets/img', 'android-chrome-512x512.png') + +@app.route('/favicon.ico') +def favicon(): + return send_from_directory('templates/assets/img', 'favicon.ico') + +@app.route('/favicon.svg') +def faviconSVG(): + return send_from_directory('templates/assets/img', 'favicon.svg') + + +# Main routes + @app.route('/') def index(): handshake_scripts = "" # If localhost, don't load handshake - if request.host == "localhost:5000" or request.host == "127.0.0.1:5000": + if request.host == "localhost:5000" or request.host == "127.0.0.1:5000" or os.getenv('dev') == "true": handshake_scripts = "" return render_template('index.html', handshake_scripts=handshake_scripts) + @app.route('/') def catch_all(path): handshake_scripts = "" # If localhost, don't load handshake - if request.host == "localhost:5000" or request.host == "127.0.0.1:5000": + if request.host == "localhost:5000" or request.host == "127.0.0.1:5000" or os.getenv('dev') == "true": handshake_scripts = "" # If file exists, load it if os.path.isfile('templates/' + path): diff --git a/templates/assets/img/favicon.ico b/templates/assets/img/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..90450500037af6d3b2c1540361a976d3ff2d7f69 GIT binary patch literal 4286 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 P3jkY(03N>q@Y(+W&wEGN literal 0 HcmV?d00001 diff --git a/templates/info.html b/templates/info.html deleted file mode 100644 index 9bb8e32..0000000 --- a/templates/info.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - Nathan.Woodburn/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-

Docker Status

-

Docker status

-

Uptime

-

0:00

-

0% RAM Used

-

0% CPU Used

-

0% Disk Used

-
-
- - - - - - \ No newline at end of file diff --git a/templates/projects.html b/templates/projects.html index b7946ed..f401c4f 100644 --- a/templates/projects.html +++ b/templates/projects.html @@ -70,7 +70,7 @@ height="0" width="0" style="display:none;visibility:hidden">
-

Check out my Github for all my projects

+

Check out my Git for all my projects

diff --git a/templates/sitemap.xml b/templates/sitemap.xml index 7146aed..6e0cb1d 100644 --- a/templates/sitemap.xml +++ b/templates/sitemap.xml @@ -12,9 +12,6 @@ https://nathan.woodburn.au/ - - https://nathan.woodburn.au/info.html - https://nathan.woodburn.au/link.html