1 files changed, 40 insertions, 33 deletions

diff --git a/ui/src/scaffold.rs b/ui/src/scaffold.rs
index 4f1bc8b..0962f6e 100644
--- a/ui/src/scaffold.rs
+++ b/ui/src/scaffold.rs
@@ -6,21 +6,24 @@
 
 use crate::{
     CONF, FlashM,
-    locale::{Language, escape, tr, trs},
+    locale::{escape, tr, trs},
 };
-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,
+use jellycommon::{
+    jellyobject::{Object, Tag},
+    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,
+    },
 };
 use markup::{Render, raw};
 use std::sync::LazyLock;
 
 static LOGO_ENABLED: LazyLock<bool> = LazyLock::new(|| CONF.asset_path.join("logo.svg").exists());
 
-pub struct RenderInfo {
-    pub session: Option<SessionInfo>,
-    pub lang: Language,
-    pub importing: bool,
+pub struct RenderInfo<'a> {
+    pub user: Option<Object<'a>>,
+    pub lang: Tag,
+    pub status_message: Option<&'a str>,
 }
 
 pub struct SessionInfo {
@@ -28,7 +31,7 @@ pub struct SessionInfo {
 }
 
 markup::define! {
-    Scaffold<'a, Main: Render>(title: String, main: Main, class: &'a str, renderinfo: RenderInfo, lang: Language) {
+    Scaffold<'a, Main: Render>(ri: &'a RenderInfo<'a>, title: String, main: Main, class: &'a str) {
         @markup::doctype()
         html {
             head {
@@ -38,29 +41,7 @@ markup::define! {
                 script[src="/assets/bundle.js"] {}
             }
             body[class=class] {
-                nav {
-                    h1 { a[href=if renderinfo.session.is_some() {u_home()} else {"/".to_string()}] { @if *LOGO_ENABLED { img.logo[src="/assets/logo.svg"]; } else { @CONF.brand } } } " "
-                    @if let Some(_) = &renderinfo.session {
-                        a.library[href=u_node_slug("library")] { @trs(lang, "nav.root") } " "
-                        a.library[href=u_items()] { @trs(lang, "nav.all") } " "
-                        a.library[href=u_search()] { @trs(lang, "nav.search") } " "
-                        a.library[href=u_stats()] { @trs(lang, "nav.stats") } " "
-                        @if renderinfo.importing { span.warn { @trs(lang, "nav.importing") } }
-                    }
-                    div.account {
-                        @if let Some(session) = &renderinfo.session {
-                            span { @raw(tr(*lang, "nav.username").replace("{name}", &format!("<b class=\"username\">{}</b>", escape(&session.user.display_name)))) } " "
-                            @if session.user.admin {
-                                a.admin.hybrid_button[href=u_admin_dashboard()] { p {@trs(lang, "nav.admin")} } " "
-                            }
-                            a.settings.hybrid_button[href=u_account_settings()] { p {@trs(lang, "nav.settings")} } " "
-                            a.logout.hybrid_button[href=u_account_logout()] { p {@trs(lang, "nav.logout")} }
-                        } else {
-                            a.register.hybrid_button[href=u_account_register()] { p {@trs(lang, "nav.register")} } " "
-                            a.login.hybrid_button[href=u_account_login()] { p {@trs(lang, "nav.login")} }
-                        }
-                    }
-                }
+                @Navbar { ri }
                 #main { @main }
                 footer {
                     p { @CONF.brand " - " @CONF.slogan " | powered by " a[href="https://codeberg.org/metamuffin/jellything"]{"Jellything"} }
@@ -69,8 +50,34 @@ markup::define! {
         }
     }
 
+    Navbar<'a>(ri: &'a RenderInfo<'a>) {
+        nav {
+            h1 { a[href=if ri.user.is_some() {u_home()} else {"/".to_string()}] { @if *LOGO_ENABLED { img.logo[src="/assets/logo.svg"]; } else { @CONF.brand } } } " "
+            @if ri.user.is_some() {
+                a.library[href=u_node_slug("library")] { @trs(lang, "nav.root") } " "
+                a.library[href=u_items()] { @trs(lang, "nav.all") } " "
+                a.library[href=u_search()] { @trs(lang, "nav.search") } " "
+                a.library[href=u_stats()] { @trs(lang, "nav.stats") } " "
+                @if renderinfo.importing { span.warn { @trs(lang, "nav.importing") } }
+            }
+            div.account {
+                @if let Some(user) = &ri.user {
+                    span { @raw(tr(*lang, "nav.username").replace("{name}", &format!("<b class=\"username\">{}</b>", escape(&session.user.display_name)))) } " "
+                    @if session.user.admin {
+                        a.admin.hybrid_button[href=u_admin_dashboard()] { p {@trs(lang, "nav.admin")} } " "
+                    }
+                    a.settings.hybrid_button[href=u_account_settings()] { p {@trs(lang, "nav.settings")} } " "
+                    a.logout.hybrid_button[href=u_account_logout()] { p {@trs(lang, "nav.logout")} }
+                } else {
+                    a.register.hybrid_button[href=u_account_register()] { p {@trs(lang, "nav.register")} } " "
+                    a.login.hybrid_button[href=u_account_login()] { p {@trs(lang, "nav.login")} }
+                }
+            }
+        }
+    }
+
     FlashDisplay<'a>(flash: &'a FlashM) {
-        @if let Some((kind,message)) = &flash {
+        @if let Some((kind, message)) = &flash {
             @match kind.as_str() {
                 "success" => { section.message { p.success { @message } } }
                 "error" => { section.message { p.error { @message } } }