diff options
author | Wojtek Kosior <koszko@koszko.org> | 2022-08-23 13:59:14 +0200 |
---|---|---|
committer | Wojtek Kosior <koszko@koszko.org> | 2022-09-28 12:54:52 +0200 |
commit | 67c929d9c101ee79707c104ad08a78f8e0c04f64 (patch) | |
tree | f7d35a656a54b45ca965237d480b4929fb1f2927 | |
parent | e255c2f353ad16d3ed0460dabe84a11b119902da (diff) | |
download | haketilo-hydrilla-67c929d9c101ee79707c104ad08a78f8e0c04f64.tar.gz haketilo-hydrilla-67c929d9c101ee79707c104ad08a78f8e0c04f64.zip |
arrange web UI Jinja templates into multiple directories
-rw-r--r-- | src/hydrilla/proxy/web_ui/packages.py | 8 | ||||
-rw-r--r-- | src/hydrilla/proxy/web_ui/repos.py | 6 | ||||
-rw-r--r-- | src/hydrilla/proxy/web_ui/root.py | 2 | ||||
-rw-r--r-- | src/hydrilla/proxy/web_ui/templates/index.html.jinja (renamed from src/hydrilla/proxy/web_ui/templates/root.html.jinja) | 0 | ||||
-rw-r--r-- | src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja (renamed from src/hydrilla/proxy/web_ui/templates/packages.html.jinja) | 0 | ||||
-rw-r--r-- | src/hydrilla/proxy/web_ui/templates/packages/load_from_disk.html.jinja (renamed from src/hydrilla/proxy/web_ui/templates/packages__load_from_disk.html.jinja) | 0 | ||||
-rw-r--r-- | src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja (renamed from src/hydrilla/proxy/web_ui/templates/packages__show_single.html.jinja) | 0 | ||||
-rw-r--r-- | src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja (renamed from src/hydrilla/proxy/web_ui/templates/packages__show_single_version.html.jinja) | 0 | ||||
-rw-r--r-- | src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja (renamed from src/hydrilla/proxy/web_ui/templates/repos__add.html.jinja) | 0 | ||||
-rw-r--r-- | src/hydrilla/proxy/web_ui/templates/repos/index.html.jinja (renamed from src/hydrilla/proxy/web_ui/templates/repos.html.jinja) | 0 | ||||
-rw-r--r-- | src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja (renamed from src/hydrilla/proxy/web_ui/templates/repos__show_single.html.jinja) | 0 |
11 files changed, 8 insertions, 8 deletions
diff --git a/src/hydrilla/proxy/web_ui/packages.py b/src/hydrilla/proxy/web_ui/packages.py index 336c2ce..85e5d00 100644 --- a/src/hydrilla/proxy/web_ui/packages.py +++ b/src/hydrilla/proxy/web_ui/packages.py @@ -55,7 +55,7 @@ bp = flask.Blueprint('packages', __package__) @bp.route('/packages/load_from_disk', methods=['GET']) def load_from_disk() -> werkzeug.Response: - html = flask.render_template('packages__load_from_disk.html.jinja') + html = flask.render_template('packages/load_from_disk.html.jinja') return flask.make_response(html, 200) @bp.route('/packages/load_from_disk', methods=['POST']) @@ -97,7 +97,7 @@ def packages() -> werkzeug.Response: store = _app.get_haketilo_state().mapping_store() html = flask.render_template( - 'packages.html.jinja', + 'packages/index.html.jinja', display_infos = store.get_display_infos() ) return flask.make_response(html, 200) @@ -123,7 +123,7 @@ def show_package(mapping_id: str) -> werkzeug.Response: ) html = flask.render_template( - 'packages__show_single.html.jinja', + 'packages/show_single.html.jinja', display_info = display_info, version_display_infos = version_display_infos ) @@ -138,7 +138,7 @@ def show_package_version(mapping_version_id: str) -> werkzeug.Response: display_info = store.get(mapping_version_id).get_display_info() html = flask.render_template( - 'packages__show_single_version.html.jinja', + 'packages/show_single_version.html.jinja', display_info = display_info ) return flask.make_response(html, 200) diff --git a/src/hydrilla/proxy/web_ui/repos.py b/src/hydrilla/proxy/web_ui/repos.py index 629e399..8c69028 100644 --- a/src/hydrilla/proxy/web_ui/repos.py +++ b/src/hydrilla/proxy/web_ui/repos.py @@ -44,7 +44,7 @@ bp = flask.Blueprint('repos', __package__) @bp.route('/repos/add', methods=['GET']) def add_repo(errors: t.Mapping[str, bool] = {}) -> werkzeug.Response: - html = flask.render_template('repos__add.html.jinja', **errors) + html = flask.render_template('repos/add.html.jinja', **errors) return flask.make_response(html, 200) @bp.route('/repos/add', methods=['POST']) @@ -74,7 +74,7 @@ def repos() -> werkzeug.Response: local_semirepo_info, *repo_infos = repo_store.get_display_infos() html = flask.render_template( - 'repos.html.jinja', + 'repos/index.html.jinja', local_semirepo_info = local_semirepo_info, display_infos = repo_infos ) @@ -88,7 +88,7 @@ def show_repo(repo_id: str, errors: t.Mapping[str, bool] = {}) \ display_info = store.get(repo_id).get_display_info() html = flask.render_template( - 'repos__show_single.html.jinja', + 'repos/show_single.html.jinja', display_info = display_info, **errors ) diff --git a/src/hydrilla/proxy/web_ui/root.py b/src/hydrilla/proxy/web_ui/root.py index 1fcba9f..b2c1a43 100644 --- a/src/hydrilla/proxy/web_ui/root.py +++ b/src/hydrilla/proxy/web_ui/root.py @@ -97,7 +97,7 @@ app_lock = Lock() @app.route('/') def home() -> str: - return flask.render_template('root.html.jinja') + return flask.render_template('index.html.jinja') def process_request( diff --git a/src/hydrilla/proxy/web_ui/templates/root.html.jinja b/src/hydrilla/proxy/web_ui/templates/index.html.jinja index 62c2b45..62c2b45 100644 --- a/src/hydrilla/proxy/web_ui/templates/root.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/index.html.jinja diff --git a/src/hydrilla/proxy/web_ui/templates/packages.html.jinja b/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja index bac774e..bac774e 100644 --- a/src/hydrilla/proxy/web_ui/templates/packages.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja 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 1f3c246..1f3c246 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 diff --git a/src/hydrilla/proxy/web_ui/templates/packages__show_single.html.jinja b/src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja index 17f958c..17f958c 100644 --- a/src/hydrilla/proxy/web_ui/templates/packages__show_single.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja diff --git a/src/hydrilla/proxy/web_ui/templates/packages__show_single_version.html.jinja b/src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja index beedd43..beedd43 100644 --- a/src/hydrilla/proxy/web_ui/templates/packages__show_single_version.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja diff --git a/src/hydrilla/proxy/web_ui/templates/repos__add.html.jinja b/src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja index 3fdcbd3..3fdcbd3 100644 --- a/src/hydrilla/proxy/web_ui/templates/repos__add.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja diff --git a/src/hydrilla/proxy/web_ui/templates/repos.html.jinja b/src/hydrilla/proxy/web_ui/templates/repos/index.html.jinja index 54465a1..54465a1 100644 --- a/src/hydrilla/proxy/web_ui/templates/repos.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/repos/index.html.jinja diff --git a/src/hydrilla/proxy/web_ui/templates/repos__show_single.html.jinja b/src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja index 5783a20..5783a20 100644 --- a/src/hydrilla/proxy/web_ui/templates/repos__show_single.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja |