From af5116d93125016c940befda34d473f2444cce47 Mon Sep 17 00:00:00 2001 From: Alfie King Date: Sun, 29 Mar 2026 15:50:47 +0100 Subject: [PATCH] update idk --- src/dynamic_routes.py | 15 ++++----------- src/errors.py | 14 ++++---------- src/main.py | 8 +++----- src/name.py | 5 ----- static/js/furnix_widget.js | 16 +++++----------- templates/bases/base.html | 16 ++++++++-------- templates/bases/directory.html | 2 +- templates/bases/md.html | 2 +- templates/index.html | 12 ++++++++++-- templates/pages/events/crittersmk.html | 2 +- templates/pages/events/paws-n-pistons.html | 2 +- templates/toaster.html | 6 +++--- 12 files changed, 41 insertions(+), 59 deletions(-) delete mode 100644 src/name.py diff --git a/src/dynamic_routes.py b/src/dynamic_routes.py index cc99d18..3df4cc1 100644 --- a/src/dynamic_routes.py +++ b/src/dynamic_routes.py @@ -2,11 +2,6 @@ from flask import Blueprint, render_template, abort, request import os, markdown -try: - from src.name import get_name -except ImportError: - from name import get_name - # Create blueprint bp = Blueprint('dynamic_routes', __name__) @@ -38,22 +33,20 @@ def catch_all(filename): return render_template( 'bases/directory.html', directory=filename + "/" if not filename.endswith('/') else filename, - pages=ListFiles(filename), - name=get_name(request) + pages=ListFiles(filename) ) - return render_template(f'pages/{filename}', name=get_name(request)) + return render_template(f'pages/{filename}') elif os.path.exists(get_path(filename + '.html')): - return render_template(f'pages/{filename}.html', name=get_name(request)) + return render_template(f'pages/{filename}.html') elif os.path.exists(get_path(filename + '.md')): output = markdown.markdown(open(get_path(filename + '.md'), "r").read()) return render_template( f'bases/md.html', title = filename.split("/")[-1], - markdown = output, - name=get_name(request) + markdown = output ) else: diff --git a/src/errors.py b/src/errors.py index 6e25401..9a4b948 100644 --- a/src/errors.py +++ b/src/errors.py @@ -1,11 +1,6 @@ -from flask import Blueprint, render_template, request +from flask import Blueprint, render_template from werkzeug.exceptions import HTTPException -try: - from src.name import get_name -except ImportError: - from name import get_name - bp = Blueprint("errors", __name__) @@ -13,19 +8,19 @@ bp = Blueprint("errors", __name__) @bp.route('/500') @bp.app_errorhandler(500) def internal_server_error(error:HTTPException=None): - return render_template('errors/500.html', error=error, name=get_name(request)), 500 + return render_template('errors/500.html', error=error), 500 @bp.route('/404') @bp.app_errorhandler(404) def not_found(error:HTTPException=None): - return render_template('errors/404.html', error=error, name=get_name(request)), 404 + return render_template('errors/404.html', error=error), 404 @bp.route('/400') @bp.app_errorhandler(400) def bad_request(error:HTTPException=None): - return render_template('errors/400.html', error=error, name=get_name(request)), 400 + return render_template('errors/400.html', error=error), 400 @bp.route('/idk') @@ -40,5 +35,4 @@ def idk(error:HTTPException=None): code = error.code, description = error.description, err_name = error.name, - name=get_name(request) ), error.code \ No newline at end of file diff --git a/src/main.py b/src/main.py index 47f1cde..8e0fdf4 100644 --- a/src/main.py +++ b/src/main.py @@ -7,10 +7,8 @@ try: import src.dynamic_routes as dynamic_routes import src.errors as errors import src.pg_log as pg_log - from src.name import get_name except ImportError: import dynamic_routes, errors, pg_log - from name import get_name from dotenv import load_dotenv load_dotenv() @@ -62,15 +60,15 @@ log.info("Blueprints registered.") # ROUTES @app.route("/") def index(): - return render_template("index.html", name=get_name(request)) + return render_template("index.html") @app.route("/toaster") def toaster(): - return render_template("toaster.html", name=get_name(request)) + return render_template("toaster.html") @app.route("/terminal") def terminal(): - return render_template("terminal.html", name=get_name(request)) + return render_template("terminal.html") diff --git a/src/name.py b/src/name.py deleted file mode 100644 index d80b035..0000000 --- a/src/name.py +++ /dev/null @@ -1,5 +0,0 @@ -def get_name(req): - if req.headers.get("Host") == "proot.uk": - return "Toaster" - else: - return "Alfie King" \ No newline at end of file diff --git a/static/js/furnix_widget.js b/static/js/furnix_widget.js index 2b49a3c..6ee5765 100644 --- a/static/js/furnix_widget.js +++ b/static/js/furnix_widget.js @@ -58,19 +58,13 @@ else { randomText = `random | `; } + tag.classList = "webring"; + //this is the code that displays the widget - EDIT THIS if you want to change the structure tag.insertAdjacentHTML('afterbegin', ` - - - - - - -
prevThis site is part of the ${ringName} webring 😸
- - ${randomText} - ${indexText} - onionring		next
+ ${ringName}
+ <-- + --> `); } diff --git a/templates/bases/base.html b/templates/bases/base.html index 4736b49..dd60c76 100644 --- a/templates/bases/base.html +++ b/templates/bases/base.html @@ -3,19 +3,19 @@ - {% block title %}{{ name }}'s basement{% endblock %} - + {% block title %}Toasters's basement{% endblock %} + - + - - + + - + {% block head %} {% endblock %} @@ -100,9 +100,9 @@
- +
-

{{ name }}

+

Toaster

server backend survivor

diff --git a/templates/bases/directory.html b/templates/bases/directory.html index d30688e..165d2ff 100644 --- a/templates/bases/directory.html +++ b/templates/bases/directory.html @@ -1,6 +1,6 @@ {% extends "bases/base.html" %} -{% block title %}/{{ directory }} - Alfie's basement{% endblock %} +{% block title %}/{{ directory }} - Toaster's basement{% endblock %} {% block description %}server backend survivor{% endblock %} {% block head %} diff --git a/templates/bases/md.html b/templates/bases/md.html index 5570c9c..2d67a58 100644 --- a/templates/bases/md.html +++ b/templates/bases/md.html @@ -1,6 +1,6 @@ {% extends "bases/base.html" %} -{% block title %}{{ title }} - Alfie's basement{% endblock %} +{% block title %}{{ title }} - Toaster's basement{% endblock %} {% block description %}server backend survivor{% endblock %} {% block content %} diff --git a/templates/index.html b/templates/index.html index 68807c4..f4b59fa 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,6 +1,6 @@ {% extends "bases/base.html" %} -{% block title %}Home - {{ name }}'s basement{% endblock %} +{% block title %}Home - Toaster's basement{% endblock %} {% block description %}server backend survivor{% endblock %} {% block head %} @@ -65,7 +65,7 @@
- Try going to the Terminal for more information + Try going to the Terminal for more information
@@ -110,6 +110,14 @@

Some News

(dont expect this to be updated often tho :P)
    +
  • +

    28-03-2026

    + [insert a few hours later meme here]
    + Ok so it has been a "while", I recently got the domain proot.uk, so if you are accessing this site from there then all of the content relating to my name and + the tv head guy is replaced with toaster. I was too indicisive on what to do with the domain since I wanted to keep the old one but the new domain is now the + "main site". As I was typing this I realised that it would prob be better to just redirect the old domain to + the new one and remove the complicated name system, so I will do that. And yes im leaving this in, cus I find it funny. +

  • 05-03-2026

    diff --git a/templates/pages/events/crittersmk.html b/templates/pages/events/crittersmk.html index 60e29d5..731e390 100644 --- a/templates/pages/events/crittersmk.html +++ b/templates/pages/events/crittersmk.html @@ -1,6 +1,6 @@ {% extends "bases/base.html" %} -{% block title %}Critters MK - {{ name }}'s basement{% endblock %} +{% block title %}Critters MK - Toaster's basement{% endblock %} {% block description %}furry corner{% endblock %} {% block og_image %}/static/content/Toaster_v1.0_Dark.png{% endblock %} {% block keywords %} diff --git a/templates/pages/events/paws-n-pistons.html b/templates/pages/events/paws-n-pistons.html index 62cc808..18e385d 100644 --- a/templates/pages/events/paws-n-pistons.html +++ b/templates/pages/events/paws-n-pistons.html @@ -1,6 +1,6 @@ {% extends "bases/base.html" %} -{% block title %}Paws'N'Pistons - {{ name }}'s basement{% endblock %} +{% block title %}Paws'N'Pistons - Toaster's basement{% endblock %} {% block description %}furry corner{% endblock %} {% block og_image %}/static/content/Toaster_v1.0_Dark.png{% endblock %} {% block keywords %} diff --git a/templates/toaster.html b/templates/toaster.html index 8a9265b..5c9ac80 100644 --- a/templates/toaster.html +++ b/templates/toaster.html @@ -1,6 +1,6 @@ {% extends "bases/base.html" %} -{% block title %}Toaster - {{ name }}'s basement{% endblock %} +{% block title %}Toaster - Toaster's basement{% endblock %} {% block description %}furry corner{% endblock %} {% block og_image %}/static/content/Toaster_v1.0_Dark.png{% endblock %} {% block keywords %} @@ -52,9 +52,9 @@ protogen v1.0, toaster v1.0

toaster -
+

- NEW AND IMPROVED! Toaster v1.0 is here! + NEW AND IMPROVED! Toaster v1.0 is here!

Toaster v1.0 is the first version of Toaster that I have drawn that I am actually happy with. Im still working on the design, so it may change in the future, but I think I like this enough to keep it for now.