src/pages/blog_post_page.rs

@@ -3,9 +3,7 @@ use axum::extract::OriginalUri;
 use axum::{extract::Path, http::StatusCode};
 use chrono::{DateTime, Utc};
 
-use crate::blog_posts::blog_post_model::{Segment, BLOG_POST_PATH};
+use crate::blog_posts::blog_post_model::BLOG_POST_PATH;
-use crate::post_utils::post_listing::get_post_list;
-use crate::post_utils::post_parser::ParseResult;
 use crate::{
     blog_posts::blog_post_model::BlogPostMetadata, components::site_header::Link, filters,
     post_utils::post_parser::parse_post,
@@ -20,11 +18,10 @@ pub struct BlogPostTemplate {
     pub body: String,
     pub date: DateTime<Utc>,
     pub tags: Vec<String>,
-    pub segment: Segment,
+    pub segment: String,
     pub header_props: HeaderProps,
     pub slug: String,
     pub thumbnail: Option<String>,
-    pub recommended_posts: Vec<ParseResult<BlogPostMetadata>>,
 }
 
 pub async fn render_blog_post(
@@ -32,27 +29,22 @@ pub async fn render_blog_post(
     OriginalUri(original_uri): OriginalUri,
 ) -> Result<BlogPostTemplate, StatusCode> {
     let path = format!("{}/{}.md", BLOG_POST_PATH, post_id);
-    let post = parse_post::<BlogPostMetadata>(&path).await?;
+    let parse_post = parse_post::<BlogPostMetadata>(&path);
+    let parsed = parse_post.await?;
     let segment = if original_uri.to_string().starts_with("/blog") {
-        Segment::Blog
+        "blog"
     } else if original_uri.to_string().starts_with("/broadcasts") {
-        Segment::Broadcasts
+        "broadcasts"
     } else {
-        Segment::Blog
+        "blog"
     };
 
-    let mut recommended_posts = get_recommended_posts(&segment, &post.metadata.tags).await?;
-    recommended_posts.retain(|post| post.slug != post_id);
-    recommended_posts.sort_by_key(|post| post.slug.to_string());
-    recommended_posts.reverse();
-    let recommended_posts = recommended_posts.into_iter().take(2).collect::<Vec<_>>();
-
     let header_props = match segment {
-        Segment::Blog => HeaderProps::with_back_link(Link {
+        "blog" => HeaderProps::with_back_link(Link {
             href: "/blog".to_string(),
             label: "All posts".to_string(),
         }),
-        Segment::Broadcasts => HeaderProps::with_back_link(Link {
+        "broadcasts" => HeaderProps::with_back_link(Link {
             href: "/broadcasts".to_string(),
             label: "All broadcasts".to_string(),
         }),
@@ -60,40 +52,13 @@ pub async fn render_blog_post(
     };
 
     Ok(BlogPostTemplate {
-        title: post.metadata.title,
+        title: parsed.metadata.title,
-        date: post.metadata.date,
+        date: parsed.metadata.date,
-        tags: post.metadata.tags,
+        tags: parsed.metadata.tags,
-        body: post.body,
+        body: parsed.body,
-        slug: post.slug,
+        slug: parsed.slug,
-        segment,
+        segment: segment.to_string(),
-        thumbnail: post.metadata.thumbnail,
+        thumbnail: parsed.metadata.thumbnail,
         header_props,
-        recommended_posts,
     })
 }
-
-async fn get_recommended_posts(
-    segment: &Segment,
-    tags: &[String],
-) -> Result<Vec<ParseResult<BlogPostMetadata>>, StatusCode> {
-    let posts = get_post_list::<BlogPostMetadata>(BLOG_POST_PATH).await?;
-
-    let recommended_posts = posts
-        .into_iter()
-        .filter(|post| {
-            let is_same_segment = post
-                .metadata
-                .segments
-                .iter()
-                .any(|post_segment| post_segment == segment);
-            let has_same_tags = post
-                .metadata
-                .tags
-                .iter()
-                .any(|post_tag| tags.contains(post_tag));
-            is_same_segment && has_same_tags
-        })
-        .collect::<Vec<_>>();
-
-    Ok(recommended_posts)
-}

styles/output.css

@@ -756,10 +756,6 @@ video {
   margin-top: 1rem;
 }
 
-.mb-10 {
-  margin-bottom: 2.5rem;
-}
-
 .block {
   display: block;
 }
@@ -808,10 +804,6 @@ video {
   height: auto;
 }
 
-.h-full {
-  height: 100%;
-}
-
 .max-h-\[236px\] {
   max-height: 236px;
 }
@@ -840,10 +832,6 @@ video {
   width: 320px;
 }
 
-.w-0 {
-  width: 0px;
-}
-
 .max-w-\[24rem\] {
   max-width: 24rem;
 }
@@ -974,10 +962,6 @@ video {
   border-width: 2px;
 }
 
-.border-l {
-  border-left-width: 1px;
-}
-
 .border-blue-300 {
   --tw-border-opacity: 1;
   border-color: rgb(130 195 247 / var(--tw-border-opacity, 1));
@@ -998,11 +982,6 @@ video {
   border-color: rgb(203 213 225 / var(--tw-border-opacity, 1));
 }
 
-.border-l-slate-300 {
-  --tw-border-opacity: 1;
-  border-left-color: rgb(203 213 225 / var(--tw-border-opacity, 1));
-}
-
 .bg-blue-100 {
   --tw-bg-opacity: 1;
   background-color: rgb(225 239 253 / var(--tw-bg-opacity, 1));
@@ -2014,10 +1993,6 @@ article a:visited {
 
 /* } */
 
-.first\:border-l-0:first-child {
-  border-left-width: 0px;
-}
-
 .visited\:text-blue-950:visited {
   color: rgb(11 39 70 );
 }
@@ -2211,14 +2186,6 @@ article a:visited {
     margin-top: 5rem;
   }
 
-  .lg\:mt-8 {
-    margin-top: 2rem;
-  }
-
-  .lg\:mb-10 {
-    margin-bottom: 2.5rem;
-  }
-
   .lg\:block {
     display: block;
   }
@@ -2261,11 +2228,6 @@ article a:visited {
     font-size: 1.125rem;
     line-height: 1.75rem;
   }
-
-  .lg\:text-4xl {
-    font-size: 2.25rem;
-    line-height: 2.5rem;
-  }
 }
 
 @media (min-width: 1280px) {
@@ -2297,30 +2259,10 @@ article a:visited {
     display: block;
   }
 
-  .xl\:flex {
-    display: flex;
-  }
-
   .xl\:grid {
     display: grid;
   }
 
-  .xl\:hidden {
-    display: none;
-  }
-
-  .xl\:auto-cols-auto {
-    grid-auto-columns: auto;
-  }
-
-  .xl\:auto-cols-fr {
-    grid-auto-columns: minmax(0, 1fr);
-  }
-
-  .xl\:grid-flow-col {
-    grid-auto-flow: column;
-  }
-
   .xl\:grid-cols-3 {
     grid-template-columns: repeat(3, minmax(0, 1fr));
   }
@@ -2329,36 +2271,15 @@ article a:visited {
     grid-template-columns: 1fr 2fr;
   }
 
-  .xl\:justify-start {
-    justify-content: flex-start;
-  }
-
   .xl\:gap-8 {
     gap: 2rem;
   }
 
-  .xl\:gap-5 {
-    gap: 1.25rem;
-  }
-
-  .xl\:gap-10 {
-    gap: 2.5rem;
-  }
-
   .xl\:gap-x-32 {
     -moz-column-gap: 8rem;
          column-gap: 8rem;
   }
 
-  .xl\:border-l {
-    border-left-width: 1px;
-  }
-
-  .xl\:border-slate-300 {
-    --tw-border-opacity: 1;
-    border-color: rgb(203 213 225 / var(--tw-border-opacity, 1));
-  }
-
   .xl\:text-4xl {
     font-size: 2.25rem;
     line-height: 2.5rem;
@@ -2372,10 +2293,6 @@ article a:visited {
   .xl\:font-medium {
     font-weight: 500;
   }
-
-  .xl\:first\:border-l-0:first-child {
-    border-left-width: 0px;
-  }
 }
 
 @media print {

templates/blog_post.html

@@ -33,32 +33,7 @@
 </article>
 
 <!-- TODO: Next recommendations for reading -->
-<!-- TODO: Back to all posts -->
+<!-- TODO: Bact to all posts -->
 
-<footer class="max-w-maxindex mx-auto">
+{# footer #}
-
-{% if recommended_posts.len() > 0 %}
-<section id="recommended-articles">
-  <hr class="border-slate-300 m-5 md:my-8">
-
-  <h2 class="m-5 text-2xl md:text-2xl lg:text-4xl lg:mt-8 text-blue-900 lg:mb-10 font-bold">Further reading</h2>
-  <ul class="mx-5 xl:flex xl:justify-start xl:gap-10">
-    {% for post in recommended_posts %}
-    <li class="flex-1">
-      {% include "components/blog_post_preview.html" %}
-      <hr class="border-slate-300 my-5 md:my-8 xl:hidden">
-    </li>
-    {% if !loop.last %}
-      <div class="h-auto w-0 border-l border-slate-300 hidden xl:block"></div>
-    {% endif %}
-    {% endfor %}
-  </ul>
-</section>
-{% endif %}
-
-<section class="text-center my-3 md:text-lg">
- <a href="/blog">see all blog posts</a> 
-</section>
-</footer>
 {% endblock %}
- <!-- xl:border-l xl:border-slate-300 xl:first:border-l-0 xl: -->