showcase page

axum_server/src/pages/mod.rs

@@ -3,3 +3,4 @@ pub mod blog_post_list;
 pub mod blog_post_page;
 pub mod contact;
 pub mod index;
+pub mod project_list;

axum_server/src/pages/project_list.rs

@@ -0,0 +1,29 @@
+use askama::Template;
+use axum::http::StatusCode;
+
+use crate::{
+    components::site_header::HeaderProps,
+    post_utils::{post_listing::get_post_list, post_parser::ParseResult},
+    projects::project_model::ProjectMetadata,
+};
+
+#[derive(Template)]
+#[template(path = "project_list.html")]
+pub struct ProjectListTemplate {
+    pub title: String,
+    pub project_list: Vec<ParseResult<ProjectMetadata>>,
+    pub header_props: HeaderProps,
+}
+
+pub async fn render_projects_list() -> Result<ProjectListTemplate, StatusCode> {
+    let mut project_list = get_post_list::<ProjectMetadata>("../_projects").await?;
+
+    project_list.retain(|project| project.metadata.displayed);
+    project_list.reverse();
+
+    Ok(ProjectListTemplate {
+        title: "Showcase".to_owned(),
+        header_props: HeaderProps::default(),
+        project_list,
+    })
+}

axum_server/src/post_utils/post_parser.rs

@@ -1,3 +1,4 @@
+use core::panic;
 use std::path::Path;
 
 use axum::http::StatusCode;
@@ -9,7 +10,7 @@ use pulldown_cmark::{CodeBlockKind, Event, Options, Parser, Tag, TagEnd};
 use serde::{de::DeserializeOwned, Deserialize, Deserializer};
 use syntect::{highlighting::ThemeSet, html::highlighted_html_for_string, parsing::SyntaxSet};
 use tokio::fs;
-use tracing::debug;
+use tracing::{debug, error, info};
 
 use crate::picture_generator::{
     picture_markup_generator::generate_picture_markup, resolutions::get_max_resolution,
@@ -89,6 +90,7 @@ pub fn parse_html(markdown: &str, generate_images: bool) -> String {
     let syntax_set = SyntaxSet::load_defaults_newlines();
     let theme_set = ThemeSet::load_defaults();
     let theme = theme_set.themes.get("InspiredGitHub").unwrap();
+    let mut heading_ended: Option<bool> = None;
 
     let parser = Parser::new_ext(markdown, options).map(|event| match event {
         /*
@@ -181,14 +183,24 @@ pub fn parse_html(markdown: &str, generate_images: bool) -> String {
                     text.to_lowercase()
                         .replace(|c: char| !c.is_alphanumeric(), "-")
                 });
-                Event::Html(
-                    formatdoc!(
-                        r##"id="{heading_id}">
-                            {text}
-                        "##
-                    )
-                    .into(),
-                )
+                debug!("heading_id: {}", heading_id.clone());
+                match heading_ended {
+                    None => {
+                        error!("Heading should have set state");
+                        panic!("Heading should have set state");
+                    }
+                    Some(true) => Event::Html(text),
+                    Some(false) => {
+                        heading_ended = Some(true);
+                        Event::Html(
+                            formatdoc!(
+                                r##"id="{heading_id}">
+                            {text}"##
+                            )
+                            .into(),
+                        )
+                    }
+                }
             }
             _ => Event::Text(text),
         },
@@ -199,7 +211,9 @@ pub fn parse_html(markdown: &str, generate_images: bool) -> String {
             attrs: _,
         }) => {
             let id_str = id.map(|id| id.to_string());
+            debug!("heading_start: {:?}, level: {}", &id_str, level);
             text_kind = TextKind::Heading(id_str);
+            heading_ended = Some(false);
             Event::Html(format!("<{level} ").into())
         }
         Event::Start(_) => event,
@@ -210,6 +224,7 @@ pub fn parse_html(markdown: &str, generate_images: bool) -> String {
         }
         Event::End(TagEnd::Heading(heading_level)) => {
             text_kind = TextKind::Text;
+            heading_ended = None;
             Event::End(TagEnd::Heading(heading_level))
         }
         _ => event,

axum_server/src/projects/featured_projects.rs

@@ -1,9 +1,6 @@
 use axum::http::StatusCode;
 
-use crate::post_utils::{
-    post_listing::get_post_list,
-    post_parser::{parse_html, ParseResult},
-};
+use crate::post_utils::{post_listing::get_post_list, post_parser::ParseResult};
 
 use super::project_model::ProjectMetadata;
 
@@ -13,10 +10,6 @@ pub async fn get_featured_projects() -> Result<Vec<ParseResult<ProjectMetadata>>
     let featured_projects = project_list
         .into_iter()
         .filter(|post| post.metadata.featured)
-        .map(|mut post| {
-            post.metadata.description = parse_html(&post.metadata.description, false);
-            post
-        })
         .collect();
 
     Ok(featured_projects)

axum_server/src/projects/project_model.rs

@@ -3,7 +3,6 @@ use serde::Deserialize;
 #[derive(Deserialize, Debug)]
 pub struct ProjectMetadata {
     pub title: String,
-    pub description: String,
     pub classification: String,
     pub displayed: bool,
     pub cover_image: Option<String>,
@@ -18,6 +17,7 @@ pub fn translate_classification(classification: &str) -> &str {
         "website" => "Web site",
         "presentation" => "Presentation",
         "videogame" => "Video game",
+        "embedded" => "Embedded system",
         any => any,
     }
 }

axum_server/src/router.rs

@@ -3,6 +3,7 @@ use crate::{
     pages::{
         admin::render_admin, blog_post_list::render_blog_post_list,
         blog_post_page::render_blog_post, contact::render_contact, index::render_index,
+        project_list::render_projects_list,
     },
 };
 use axum::{extract::MatchedPath, http::Request, routing::get, Router};
@@ -16,6 +17,7 @@ pub fn get_router() -> Router {
         .route("/blog/tags/:tag", get(render_blog_post_list))
         .route("/blog/:post_id", get(render_blog_post))
         .route("/contact", get(render_contact))
+        .route("/showcase", get(render_projects_list))
         .route("/admin", get(render_admin))
         .route("/feed.xml", get(render_rss_feed))
         .layer(