From 571e6d53bf106a2b0f187532807ae3a325bddb04 Mon Sep 17 00:00:00 2001 From: Fedor Borshev Date: Sun, 14 Jan 2024 11:13:33 +0300 Subject: [PATCH] Web image fix --- src/templates/html/confirmation_failure.html | 2 +- src/templates/html/confirmation_ok.html | 2 +- src/templates/html/ok.html | 1 + src/web.py | 8 ++++---- 4 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 src/templates/html/ok.html diff --git a/src/templates/html/confirmation_failure.html b/src/templates/html/confirmation_failure.html index a4e3b49..160c981 100644 --- a/src/templates/html/confirmation_failure.html +++ b/src/templates/html/confirmation_failure.html @@ -1,4 +1,4 @@ -{% extends 'html/base.html' %} +{% extends 'base.html' %} {% block title %}Email confirmation failure{% endblock %} {% block content %}

diff --git a/src/templates/html/confirmation_ok.html b/src/templates/html/confirmation_ok.html index 122b577..1c9b5aa 100644 --- a/src/templates/html/confirmation_ok.html +++ b/src/templates/html/confirmation_ok.html @@ -1,4 +1,4 @@ -{% extends 'html/base.html' %} +{% extends 'base.html' %} {% block title %}Email confirmation ok{% endblock %} {% block content %}
diff --git a/src/templates/html/ok.html b/src/templates/html/ok.html new file mode 100644 index 0000000..9766475 --- /dev/null +++ b/src/templates/html/ok.html @@ -0,0 +1 @@ +ok diff --git a/src/web.py b/src/web.py index 7842c33..5f44c39 100644 --- a/src/web.py +++ b/src/web.py @@ -9,7 +9,7 @@ load_dotenv() -app = Flask("confirmation_webapp") +app = Flask("confirmation_webapp", template_folder="src/templates/html") init_sentry() @@ -19,16 +19,16 @@ def confirm(key: str) -> str: user = get_user_by_confirmation_link(key) if user is None: - return render_template("html/confirmation_failure.html") + return render_template("confirmation_failure.html") user.is_confirmed = True user.save() - return render_template("html/confirmation_ok.html") + return render_template("confirmation_ok.html") @app.route("/healthcheck/") def healthcheck() -> str: with kombu.Connection(os.getenv("CELERY_BROKER_URL")) as connection: connection.connect() - return "ok" + return render_template("ok.html")