aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/client-scripts/src/log_live.ts4
-rw-r--r--ui/src/components/admin_log.rs (renamed from ui/src/old/admin/log.rs)20
-rw-r--r--ui/src/components/mod.rs1
-rw-r--r--ui/src/lib.rs5
-rw-r--r--ui/src/scaffold.rs4
5 files changed, 14 insertions, 20 deletions
diff --git a/ui/client-scripts/src/log_live.ts b/ui/client-scripts/src/log_live.ts
index b8af11e..d16553c 100644
--- a/ui/client-scripts/src/log_live.ts
+++ b/ui/client-scripts/src/log_live.ts
@@ -5,8 +5,8 @@
*/
/// <reference lib="dom" />
globalThis.addEventListener("DOMContentLoaded", () => {
- if (!document.body.classList.contains("admin_log")) return
- const log = document.getElementById("log")!
+ const log = document.getElementById("log")
+ if (!log) return
const warnonly = new URL(globalThis.location.href).searchParams.get("warnonly") == "true"
const ws = new WebSocket(`/admin/log?stream&warnonly=${warnonly}&html=true`)
diff --git a/ui/src/old/admin/log.rs b/ui/src/components/admin_log.rs
index 637158f..abec7fe 100644
--- a/ui/src/old/admin/log.rs
+++ b/ui/src/components/admin_log.rs
@@ -4,23 +4,13 @@
Copyright (C) 2026 metamuffin <metamuffin.org>
*/
-use crate::Page;
-use jellycommon::routes::u_admin_log;
+use jellycommon::{
+ internal::{LogLevel, LogLine},
+ routes::u_admin_log,
+};
use markup::raw;
use std::fmt::Write;
-impl Page for ServerLogPage<'_> {
- fn title(&self) -> String {
- "Server Log".to_string()
- }
- fn class(&self) -> Option<&'static str> {
- Some("admin_log")
- }
- fn to_render(&self) -> markup::DynRender<'_> {
- markup::new!(@self)
- }
-}
-
markup::define! {
ServerLogPage<'a>(warnonly: bool, messages: &'a [String]) {
h1 { "Server Log" }
@@ -33,7 +23,7 @@ markup::define! {
}
ServerLogLine<'a>(e: &'a LogLine) {
tr[class=format!("level-{}", e.level).to_ascii_lowercase()] {
- td.time { @e.time.to_rfc3339() }
+ td.time { @e.time }
td.loglevel { @format_level(e.level) }
td.module { @e.module }
td { @markup::raw(vt100_to_html(&e.message)) }
diff --git a/ui/src/components/mod.rs b/ui/src/components/mod.rs
index c3ba9b0..15b2ae2 100644
--- a/ui/src/components/mod.rs
+++ b/ui/src/components/mod.rs
@@ -12,6 +12,7 @@ pub mod node_list;
pub mod node_page;
pub mod props;
pub mod stats;
+pub mod admin_log;
use crate::{
RenderInfo,
diff --git a/ui/src/lib.rs b/ui/src/lib.rs
index 63a2d07..f32657d 100644
--- a/ui/src/lib.rs
+++ b/ui/src/lib.rs
@@ -10,9 +10,12 @@ mod scaffold;
pub use jellyui_client_scripts::*;
pub use jellyui_client_style::*;
+pub use components::admin_log::ServerLogPage;
+pub use components::admin_log::render_log_line;
pub use jellyui_locale::tr;
+pub use scaffold::Scaffold;
-use crate::{components::View, scaffold::Scaffold};
+use crate::components::View;
use jellycommon::{jellyobject::Object, *};
use serde::{Deserialize, Serialize};
diff --git a/ui/src/scaffold.rs b/ui/src/scaffold.rs
index 5a70460..f24550d 100644
--- a/ui/src/scaffold.rs
+++ b/ui/src/scaffold.rs
@@ -7,8 +7,8 @@
use crate::RenderInfo;
use jellycommon::{
routes::{
- u_account_login, u_account_logout, u_account_register, u_account_settings,
- u_admin_dashboard, u_home, u_items, u_node_slug, u_search, u_stats,
+ u_account_login, u_account_logout, u_account_settings, u_admin_dashboard, u_home, u_items,
+ u_node_slug, u_search, u_stats,
},
user::{USER_ADMIN, USER_NAME},
};