[proxy] refactor we UI library and package pages templates to avoid code repetition

1 files changed, 8 insertions, 8 deletions

diff --git a/src/hydrilla/proxy/web_ui/items.py b/src/hydrilla/proxy/web_ui/items.py
index 03f2f2d..c0e0e0d 100644
--- a/src/hydrilla/proxy/web_ui/items.py
+++ b/src/hydrilla/proxy/web_ui/items.py
@@ -54,14 +54,14 @@ class InvalidUploadedMalcontent(HaketiloException):
 
 bp = flask.Blueprint('items', __package__)
 
-@bp.route('/packages/load_from_disk', methods=['GET'])
+@bp.route('/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('items/load_from_disk.html.jinja')
     return flask.make_response(html, 200)
 
-@bp.route('/packages/load_from_disk', methods=['POST'])
+@bp.route('/load_from_disk', methods=['POST'])
 def load_from_disk_post() -> werkzeug.Response:
-    zip_file_storage = flask.request.files.get('packages_zipfile')
+    zip_file_storage = flask.request.files.get('items_zipfile')
     if zip_file_storage is None:
         return load_from_disk()
 
@@ -98,7 +98,7 @@ def packages() -> werkzeug.Response:
     store = _app.get_haketilo_state().mapping_store()
 
     html = flask.render_template(
-        'packages/index.html.jinja',
+        'items/packages.html.jinja',
         display_infos = store.get_display_infos()
     )
     return flask.make_response(html, 200)
@@ -108,7 +108,7 @@ def libraries() -> werkzeug.Response:
     store = _app.get_haketilo_state().resource_store()
 
     html = flask.render_template(
-        'libraries/index.html.jinja',
+        'items/libraries.html.jinja',
         display_infos = store.get_display_infos()
     )
     return flask.make_response(html, 200)
@@ -154,7 +154,7 @@ def show_item(item_id: str, item_type: item_infos.ItemType) \
             )
 
         html = flask.render_template(
-            f'{item_type.alt_name_plural}/show_single.html.jinja',
+            f'items/{item_type.alt_name}_view.html.jinja',
             display_info          = display_info,
             version_display_infos = version_display_infos
         )
@@ -207,7 +207,7 @@ def show_item_version(
         assert this_info is not None
 
         html = flask.render_template(
-            f'{item_type.alt_name_plural}/show_single_version.html.jinja',
+            f'items/{item_type.alt_name}_viewversion.html.jinja',
             display_info          = this_info,
             version_display_infos = other_infos,
             **errors