From 1c97c3785047d50fd5500f99457a254e0f95aefe Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 10 Jan 2023 09:01:48 +0100 Subject: listing and style improved --- src/frontend/pages/mod.rs | 3 +-- src/frontend/pages/node.rs | 14 +++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'src/frontend/pages') diff --git a/src/frontend/pages/mod.rs b/src/frontend/pages/mod.rs index 6e7bd87..6145886 100644 --- a/src/frontend/pages/mod.rs +++ b/src/frontend/pages/mod.rs @@ -1,5 +1,3 @@ -use std::{error::Error, fmt::Display}; - use actix_web::{ body::BoxBody, http::{ @@ -8,6 +6,7 @@ use actix_web::{ }, HttpResponseBuilder, Responder, }; +use std::fmt::Display; pub mod home; pub mod layout; diff --git a/src/frontend/pages/node.rs b/src/frontend/pages/node.rs index c3f7791..b956d3e 100644 --- a/src/frontend/pages/node.rs +++ b/src/frontend/pages/node.rs @@ -1,6 +1,6 @@ use super::layout::Layout; use crate::{ - frontend::pages::{HtmlTemplate, MyError, MyResult}, + frontend::pages::MyResult, library::{LibDirectory, LibItem, LibNode}, AppState, }; @@ -20,10 +20,7 @@ pub async fn page_library_node( let mut out = String::new(); match node.deref() { LibNode::Directory(dir) => Layout { - title: format!( - "{} - Library", - dir.path.file_name().unwrap().to_str().unwrap() - ), + title: format!("{} - Library", node.title()), main: Directory { dir: dir.clone() }, } .render(&mut out)?, @@ -39,6 +36,13 @@ pub async fn page_library_node( markup::define! { Directory(dir: Arc) { h1 { @dir.data.name } + ul.directorylisting { + @for el in &dir.child_nodes().unwrap() { + li { + span.title { @el.title() } + } + } + } } Item(item: Arc) { h1 { "thats an item" } -- cgit v1.2.3-70-g09d2