From ec76bbe5398f51ffa55bfd315b30c0a07245d4e6 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 22 Jan 2023 13:56:06 +0100 Subject: this is *horrible* --- server/src/routes/ui/home.rs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'server/src/routes/ui/home.rs') diff --git a/server/src/routes/ui/home.rs b/server/src/routes/ui/home.rs index 04a4c7d..88c6cfb 100644 --- a/server/src/routes/ui/home.rs +++ b/server/src/routes/ui/home.rs @@ -1,15 +1,17 @@ -use crate::routes::ui::node::NodePage; +use super::account::session::Session; +use super::layout::LayoutPage; +use crate::routes::ui::layout::DynLayoutPage; use crate::CONF; -use crate::{routes::ui::HtmlTemplate, AppState}; +use crate::{library::Library, routes::ui::node::NodePage}; use rocket::{get, State}; #[get("/")] -pub async fn r_home(state: &State) -> HtmlTemplate { - HtmlTemplate( - "Home".to_string(), - markup::new! { +pub async fn r_home(_sess: Session, library: &State) -> LayoutPage { + LayoutPage { + title: "Home".to_string(), + content: markup::new! { p { "Welcome to " @CONF.brand } - @NodePage { node: state.library.root.clone() } + @NodePage { node: library.root.clone() } }, - ) + } } -- cgit v1.2.3-70-g09d2