From 31a3e25a16bd7ced9ee3575d2b79a046c961b551 Mon Sep 17 00:00:00 2001 From: Daniel Dolezal Date: Sat, 25 Oct 2025 14:20:12 +0200 Subject: [PATCH] move template page files into a better structure --- my_modules/EdgeDB.py | 2 +- routes/side/main.py | 16 ++-- templates/side/views/webpage/access/list.htm | 76 +++++++++++++++++++ .../{files_list.htm => files/list.htm} | 0 .../side/views/webpage/{ => files}/upload.htm | 0 5 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 templates/side/views/webpage/access/list.htm rename templates/side/views/webpage/{files_list.htm => files/list.htm} (100%) rename templates/side/views/webpage/{ => files}/upload.htm (100%) diff --git a/my_modules/EdgeDB.py b/my_modules/EdgeDB.py index b4826b0..df94fc0 100644 --- a/my_modules/EdgeDB.py +++ b/my_modules/EdgeDB.py @@ -266,7 +266,7 @@ class EdgeDB: value }, at - } + } order by .at desc """ ) return [{ diff --git a/routes/side/main.py b/routes/side/main.py index e17478f..05b198e 100644 --- a/routes/side/main.py +++ b/routes/side/main.py @@ -13,26 +13,32 @@ side_main_bp = Blueprint('side_main', __name__) @LIMITER.limit("10 per minute;50 per hour") async def index(): if session.get("user") is not None: - return await render_template("views/webpage/upload.htm") + return await render_template("views/webpage/files/upload.htm") return await render_template("views/webpage/index.htm") +@side_main_bp.route('/access') +@login_required +async def access_list(user): + access_data = await current_app.edgedb.get_all_file_access() + return await render_template("views/webpage/access/list.htm", access_logs=access_data) + @side_main_bp.route('/files') @login_required -async def files(user): +async def files_list(user): files_data = await current_app.edgedb.get_files(current_datetime=datetime.now(timezone.utc), user_id=user['sub']) - return await render_template("views/webpage/files_list.htm", files=files_data) + return await render_template("views/webpage/files/list.htm", files=files_data) @side_main_bp.route('/files//info') @login_required async def file_info(file_id, user): files_data = await current_app.edgedb.get_files(user_id=user['sub']) - return await render_template("views/webpage/file_info.htm", files=files_data) + return await render_template("views/webpage/files/info.htm", files=files_data) @side_main_bp.route('/files//edit') @login_required async def file_edit(file_id, user): files_data = await current_app.edgedb.get_files(user_id=user['sub']) - return await render_template("views/webpage/file_edit.htm", files=files_data) + return await render_template("views/webpage/files/edit.htm", files=files_data) @side_main_bp.route("/-") @LIMITER.limit("10 per minute;500 per hour;") diff --git a/templates/side/views/webpage/access/list.htm b/templates/side/views/webpage/access/list.htm new file mode 100644 index 0000000..2b55b0b --- /dev/null +++ b/templates/side/views/webpage/access/list.htm @@ -0,0 +1,76 @@ +{% extends "base.htm" %} + +{% block title %}NanoShare - Accesslog{% endblock %} + +{% block meta %} + + + +{% endblock %} + +{% block content %} +
+
+

Accesslog

+

Your uploaded files at a glance. Click a filename to open, or use the actions on the right.

+ +
+ + + + + + + + + + + {% for access in access_logs %} + + + + + + + {% endfor %} + +
Accessed AtStatusIP AddressUser Agent
{{ access.status }}{{ access.ip }}{{ access.user_agent }}
+
+
+
+ + +{% endblock %} diff --git a/templates/side/views/webpage/files_list.htm b/templates/side/views/webpage/files/list.htm similarity index 100% rename from templates/side/views/webpage/files_list.htm rename to templates/side/views/webpage/files/list.htm diff --git a/templates/side/views/webpage/upload.htm b/templates/side/views/webpage/files/upload.htm similarity index 100% rename from templates/side/views/webpage/upload.htm rename to templates/side/views/webpage/files/upload.htm