store parent node and show "go up" button

3 files changed, 9 insertions, 6 deletions

diff --git a/server/src/routes/ui/account/session/guard.rs b/server/src/routes/ui/account/session/guard.rs
index 58dfe01..c6f5c29 100644
--- a/server/src/routes/ui/account/session/guard.rs
+++ b/server/src/routes/ui/account/session/guard.rs
@@ -3,7 +3,7 @@
     which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
     Copyright (C) 2023 metamuffin <metamuffin.org>
 */
-use super::{token, Session};
+use super::Session;
 use crate::{database::Database, routes::ui::error::MyError};
 use anyhow::anyhow;
 use log::warn;
@@ -25,7 +25,7 @@ impl Session {
                 .or(req.cookies().get("session").map(|cookie| cookie.value()))
                 .ok_or(anyhow!("not logged in"))?;
 
-            username = token::validate(token)?;
+            username = super::token::validate(token)?;
         };
 
         #[cfg(feature = "bypass-auth")]
diff --git a/server/src/routes/ui/home.rs b/server/src/routes/ui/home.rs
index 0b85e89..c4defd0 100644
--- a/server/src/routes/ui/home.rs
+++ b/server/src/routes/ui/home.rs
@@ -18,7 +18,10 @@ pub fn r_home(_sess: Session, _db: &State<Database>) -> DynLayoutPage {
         title: "Home".to_string(),
         content: markup::new! {
             p { "Welcome to " @CONF.brand  }
-            // @NodePage { node: &db }
+            p.error { "TODO: continue watching" }
+            p.error { "TODO: recently added" }
+            p.error { "TODO: best rating" }
+            p.error { "TODO: random" }
         },
         ..Default::default()
     }
diff --git a/server/src/routes/ui/node.rs b/server/src/routes/ui/node.rs
index 069f478..e4bf329 100644
--- a/server/src/routes/ui/node.rs
+++ b/server/src/routes/ui/node.rs
@@ -72,9 +72,9 @@ markup::define! {
     DirectoryPage<'a>(_id: &'a str, node: &'a Node, children: &'a Vec<(String,Node)>) {
         div.page.dir {
             h1 { @node.public.title }
-            // @if let Some(parent) = node.lib_path.parent() {
-            //     a.dirup[href=uri!(r_library_node(&parent))] { "Go up" }
-            // }
+            @if let Some(parent) = &node.public.parent {
+                a.dirup[href=uri!(r_library_node(parent))] { "Go up" }
+            }
             ul.directorylisting {
                 @for (id, node) in children.iter() {
                     li { @NodeCard { id, node } }