From 1273a77f61d09190e2b3298c48ae87a50676423e Mon Sep 17 00:00:00 2001 From: Maciej Jur Date: Tue, 1 Oct 2024 01:04:12 +0200 Subject: [PATCH] refactor --- src/html/mod.rs | 9 +++++++-- src/main.rs | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/html/mod.rs b/src/html/mod.rs index 8100301..e858b3f 100644 --- a/src/html/mod.rs +++ b/src/html/mod.rs @@ -136,6 +136,7 @@ fn full<'s, 'p, 'html>( sack: &'s MySack, main: impl Renderable + 'p, title: String, + js: Option<&'s [String]>, ) -> Result where 's: 'html, @@ -143,7 +144,7 @@ where { let main = maud_move!((navbar())(main)); - bare(sack, main, title, None) + bare(sack, main, title, js) } fn page<'s, 'p, 'html>( @@ -181,7 +182,10 @@ pub(crate) fn to_list(sack: &MySack, list: Vec, title: String) -> Stri list::list(sack, &groups, title).unwrap().render().into() } -pub(crate) fn map<'s, 'html>(sack: &'s MySack) -> Result +pub(crate) fn map<'s, 'html>( + sack: &'s MySack, + js: Option<&'s [String]>, +) -> Result where 's: 'html, { @@ -195,6 +199,7 @@ where } ), String::from("Map"), + js, ) } diff --git a/src/main.rs b/src/main.rs index e3061af..be3b68e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -136,7 +136,11 @@ fn main() { .add_task(|sack| { vec![( "map/index.html".into(), - crate::html::map(&sack).unwrap().render().to_owned().into(), + crate::html::map(&sack, Some(&["photos".into()])) + .unwrap() + .render() + .to_owned() + .into(), )] }) // Task: generate search