{% block title required %}{% endblock %}

From 1864fc0aaf7d6dba2e730cf74a5e154df4e6d18d Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Tue, 23 Aug 2022 11:16:33 +0200 Subject: add navigation bar to web UI --- src/hydrilla/proxy/web_ui/packages.py | 6 +- src/hydrilla/proxy/web_ui/root.py | 11 +- .../proxy/web_ui/templates/base.html.jinja | 127 +++++++++++++++------ .../templates/packages__load_from_disk.html.jinja | 8 +- .../proxy/web_ui/templates/root.html.jinja | 6 +- 5 files changed, 111 insertions(+), 47 deletions(-) diff --git a/src/hydrilla/proxy/web_ui/packages.py b/src/hydrilla/proxy/web_ui/packages.py index d4146a5..336c2ce 100644 --- a/src/hydrilla/proxy/web_ui/packages.py +++ b/src/hydrilla/proxy/web_ui/packages.py @@ -51,10 +51,10 @@ class InvalidUploadedMalcontent(HaketiloException): super().__init__(_('err.proxy.uploaded_malcontent_invalid')) -bp = flask.Blueprint('load_packages', __package__) +bp = flask.Blueprint('packages', __package__) @bp.route('/packages/load_from_disk', methods=['GET']) -def load_from_disk_get() -> werkzeug.Response: +def load_from_disk() -> werkzeug.Response: html = flask.render_template('packages__load_from_disk.html.jinja') return flask.make_response(html, 200) @@ -62,7 +62,7 @@ def load_from_disk_get() -> werkzeug.Response: def load_from_disk_post() -> werkzeug.Response: zip_file_storage = flask.request.files.get('packages_zipfile') if zip_file_storage is None: - return load_from_disk_get() + return load_from_disk() with tempfile.TemporaryDirectory() as tmpdir_str: tmpdir = Path(tmpdir_str) diff --git a/src/hydrilla/proxy/web_ui/root.py b/src/hydrilla/proxy/web_ui/root.py index 67cf6ba..1fcba9f 100644 --- a/src/hydrilla/proxy/web_ui/root.py +++ b/src/hydrilla/proxy/web_ui/root.py @@ -60,6 +60,12 @@ def authenticate_by_referrer() -> t.Optional[werkzeug.Response]: flask.abort(403) +def get_current_endpoint() -> t.Optional[str]: + endpoint = flask.request.endpoint + assert endpoint is not None + return endpoint + + class WebUIAppImpl(_app.WebUIApp): def __init__(self): super().__init__(__name__) @@ -74,7 +80,8 @@ class WebUIAppImpl(_app.WebUIApp): ] } - self.jinja_env.globals['versions'] = versions + self.jinja_env.globals['versions'] = versions + self.jinja_env.globals['get_current_endpoint'] = get_current_endpoint self.before_request(authenticate_by_referrer) @@ -89,7 +96,7 @@ app_lock = Lock() @app.route('/') -def respond() -> str: +def home() -> str: return flask.render_template('root.html.jinja') diff --git a/src/hydrilla/proxy/web_ui/templates/base.html.jinja b/src/hydrilla/proxy/web_ui/templates/base.html.jinja index c7a0c15..eb9680f 100644 --- a/src/hydrilla/proxy/web_ui/templates/base.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/base.html.jinja @@ -18,47 +18,104 @@ You can choose to use either of these licenses or both. I, Wojtek Kosior, thereby promise not to sue for violation of this file's licenses. Although I request that you do not make use this code in a proprietary work, I am not going to enforce this in court. -#} +-#} - {% block head %} - {% block title required %}{% endblock %} - Haketilo proxy - - {% endblock %} + {%- endblock %} + {%- set active_endpoint = get_current_endpoint() %} + {%- + set navigation_bar = [ + ('home', _('web_ui.base.nav.home')), + ('packages.packages', _('web_ui.base.nav.packages')), + ('repos.repos', _('web_ui.base.nav.repos')), + ('packages.load_from_disk', _('web_ui.base.nav.load')) + ] + -%} +

{{ label }}
{{ label }}

{% block main required %}{% endblock %}

diff --git a/src/hydrilla/proxy/web_ui/templates/packages__load_from_disk.html.jinja b/src/hydrilla/proxy/web_ui/templates/packages__load_from_disk.html.jinja index 33a99f4..0eb5149 100644 --- a/src/hydrilla/proxy/web_ui/templates/packages__load_from_disk.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/packages__load_from_disk.html.jinja @@ -19,13 +19,13 @@ I, Wojtek Kosior, thereby promise not to sue for violation of this file's licenses. Although I request that you do not make use this code in a proprietary work, I am not going to enforce this in court. #} -{% extends "base.html.jinja" %} +{%- extends "base.html.jinja" %} {% block title %} {{ _('web_ui.packages.load_from_disk.title') }} {% endblock %} {% block main %} -{% endblock %} +{%- endblock %} diff --git a/src/hydrilla/proxy/web_ui/templates/root.html.jinja b/src/hydrilla/proxy/web_ui/templates/root.html.jinja index f1e3500..62c2b45 100644 --- a/src/hydrilla/proxy/web_ui/templates/root.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/root.html.jinja @@ -19,8 +19,8 @@ I, Wojtek Kosior, thereby promise not to sue for violation of this file's licenses. Although I request that you do not make use this code in a proprietary work, I am not going to enforce this in court. #} -{% extends "base.html.jinja" %} -{% block title %}Home{% endblock %} +{%- extends "base.html.jinja" %} +{% block title %} {{ _('web_ui.home.title') }} {% endblock %} {% block main %} - load packages from disk + {{ _('web_ui.home.welcome_to_haketilo') }} {% endblock %} -- cgit v1.2.3