yes

1 files changed, 15 insertions, 29 deletions

diff --git a/ui/src/scaffold.rs b/ui/src/scaffold.rs
index cc5886b..bcff54c 100644
--- a/ui/src/scaffold.rs
+++ b/ui/src/scaffold.rs
@@ -5,7 +5,11 @@
 */
 
 use crate::locale::{Language, escape, tr, trs};
-use markup::{DynRender, Render, raw};
+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 markup::{Render, raw};
 use std::sync::LazyLock;
 
 static LOGO_ENABLED: LazyLock<bool> = LazyLock::new(|| CONF.asset_path.join("logo.svg").exists());
@@ -22,25 +26,25 @@ markup::define! {
             }
             body[class=class] {
                 nav {
-                    h1 { a[href=if session.is_some() {"/home"} else {"/"}] { @if *LOGO_ENABLED { img.logo[src="/assets/logo.svg"]; } else { @CONF.brand } } } " "
+                    h1 { a[href=if session.is_some() {u_home()} else {"/".to_string()}] { @if *LOGO_ENABLED { img.logo[src="/assets/logo.svg"]; } else { @CONF.brand } } } " "
                     @if let Some(_) = session {
-                        a.library[href=uri!(r_library_node("library"))] { @trs(lang, "nav.root") } " "
-                        a.library[href=uri!(r_all_items())] { @trs(lang, "nav.all") } " "
-                        a.library[href=uri!(r_search(None::<&'static str>, None::<usize>))] { @trs(lang, "nav.search") } " "
-                        a.library[href=uri!(r_stats())] { @trs(lang, "nav.stats") } " "
+                        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 is_importing() { span.warn { "Library database is updating..." } }
                     div.account {
                         @if let Some(session) = 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=uri!(r_admin_dashboard())] { p {@trs(lang, "nav.admin")} } " "
+                                a.admin.hybrid_button[href=u_admin_dashboard()] { p {@trs(lang, "nav.admin")} } " "
                             }
-                            a.settings.hybrid_button[href=uri!(r_account_settings())] { p {@trs(lang, "nav.settings")} } " "
-                            a.logout.hybrid_button[href=uri!(r_account_logout())] { p {@trs(lang, "nav.logout")} }
+                            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=uri!(r_account_register())] { p {@trs(lang, "nav.register")} } " "
-                            a.login.hybrid_button[href=uri!(r_account_login())] { p {@trs(lang, "nav.login")} }
+                            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")} }
                         }
                     }
                 }
@@ -61,21 +65,3 @@ markup::define! {
         }
     }
 }
-
-pub type DynLayoutPage<'a> = LayoutPage<DynRender<'a>>;
-
-pub struct LayoutPage<T> {
-    pub title: String,
-    pub class: Option<&'static str>,
-    pub content: T,
-}
-
-impl Default for LayoutPage<DynRender<'_>> {
-    fn default() -> Self {
-        Self {
-            class: None,
-            content: markup::new!(),
-            title: String::new(),
-        }
-    }
-}