move ui code around

1 files changed, 5 insertions, 25 deletions

diff --git a/ui/src/scaffold.rs b/ui/src/scaffold.rs
index 82d6d5e..fee311a 100644
--- a/ui/src/scaffold.rs
+++ b/ui/src/scaffold.rs
@@ -5,11 +5,10 @@
 */
 
 use crate::{
-    CONF, FlashM,
+    RenderInfo,
     locale::{escape, tr},
 };
 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,
@@ -17,22 +16,13 @@ use jellycommon::{
     user::{USER_ADMIN, USER_NAME},
 };
 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<'a> {
-    pub user: Option<Object<'a>>,
-    pub lang: Tag,
-    pub status_message: Option<&'a str>,
-}
 
 markup::define! {
-    Scaffold<'a, Main: Render>(ri: &'a RenderInfo<'a>, title: String, main: Main, class: &'a str) {
+    Scaffold<'a, Main: Render>(ri: &'a RenderInfo<'a>, title: &'a str, main: Main, class: &'a str) {
         @markup::doctype()
         html {
             head {
-                title { @title " - " @CONF.brand }
+                title { @title " - " @ri.config.brand }
                 meta[name="viewport", content="width=device-width, initial-scale=1.0"];
                 link[rel="stylesheet", href="/assets/style.css"];
                 script[src="/assets/bundle.js"] {}
@@ -41,7 +31,7 @@ markup::define! {
                 @Navbar { ri }
                 #main { @main }
                 footer {
-                    p { @CONF.brand " - " @CONF.slogan " | powered by " a[href="https://codeberg.org/metamuffin/jellything"]{"Jellything"} }
+                    p { @ri.config.brand " - " @ri.config.slogan " | powered by " a[href="https://codeberg.org/metamuffin/jellything"]{"Jellything"} }
                 }
             }
         }
@@ -49,7 +39,7 @@ 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 } } } " "
+            h1 { a[href=if ri.user.is_some() {u_home()} else {"/".to_string()}] { @if ri.config.logo { img.logo[src="/assets/logo.svg"]; } else { @ri.config.brand } } } " "
             @if ri.user.is_some() {
                 a.library[href=u_node_slug("library")] { @tr(ri.lang, "nav.root") } " "
                 a.library[href=u_items()] { @tr(ri.lang, "nav.all") } " "
@@ -72,14 +62,4 @@ markup::define! {
             }
         }
     }
-
-    FlashDisplay<'a>(flash: &'a FlashM) {
-        @if let Some((kind, message)) = &flash {
-            @match kind.as_str() {
-                "success" => { section.message { p.success { @message } } }
-                "error" => { section.message { p.error { @message } } }
-                _ => { section.message { p { @message } } }
-            }
-        }
-    }
 }