From a93b5b7cf0539f6f0c8697b9b518ab3f900b5468 Mon Sep 17 00:00:00 2001 From: Evie Viau Date: Sat, 4 Feb 2023 19:24:12 -0800 Subject: [PATCH] Show when a post or page is a draft --- src/routes/mod.rs | 6 +++++- src/routes/page_resolver.rs | 1 + templates/page.html | 6 +++++- templates/post.html | 6 ++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/routes/mod.rs b/src/routes/mod.rs index 66f11bc..572d697 100644 --- a/src/routes/mod.rs +++ b/src/routes/mod.rs @@ -7,6 +7,7 @@ use crate::{block_types::BlockTypes, AppState}; #[derive(Template)] #[template(path = "page.html")] pub(crate) struct PageTemplate { + draft: bool, title: String, description: Option, show_title: bool, @@ -17,6 +18,7 @@ pub(crate) struct PageTemplate { #[derive(Template)] #[template(path = "post.html")] pub(crate) struct PostTemplate { + draft: bool, title: String, summary: Option, publish_date: String, @@ -42,6 +44,7 @@ use sea_orm::*; #[derive(Template)] #[template(path = "page.html")] pub(crate) struct HomeSpecialTemplate { + draft: bool, title: String, description: Option, show_title: bool, @@ -91,6 +94,7 @@ pub(crate) async fn root( description: page_meta.clone().description, show_title: page_meta.clone().show_title, content_blocks, - year: "2023".to_string() + year: "2023".to_string(), + draft: false, } } \ No newline at end of file diff --git a/src/routes/page_resolver.rs b/src/routes/page_resolver.rs index d5221a5..e24c0c6 100644 --- a/src/routes/page_resolver.rs +++ b/src/routes/page_resolver.rs @@ -58,6 +58,7 @@ pub(crate) async fn resolver( ).collect(); (StatusCode::FOUND, PageTemplate { + draft: page_meta.clone().draft, title: page_meta.clone().title, description: page_meta.clone().description, show_title: page_meta.clone().show_title, diff --git a/templates/page.html b/templates/page.html index 81572c5..7c72606 100644 --- a/templates/page.html +++ b/templates/page.html @@ -12,6 +12,11 @@ {% endblock %} {% block content %} + {% if draft == true -%} +
+ ⚠️ This page is marked as a draft! It may not yet be complete! +
+ {% endif -%} {% if show_title == true -%}

{{ title }}

@@ -31,5 +36,4 @@ UNSUPPORTED block type here! {% endmatch %} {% endfor %} - {% endblock %} diff --git a/templates/post.html b/templates/post.html index 9ab5f50..ccbe449 100644 --- a/templates/post.html +++ b/templates/post.html @@ -12,6 +12,12 @@ {% endblock %} {% block content %} + {% if draft == true -%} +
+ ⚠️ This post is marked as a draft! It may not yet be complete! +
+ {% endif -%} +

{{ title }}

{% match summary %} {% when Some with (summary_content) %}