migrate axum and askama

src/pages/admin.rs

@@ -1,9 +1,17 @@
 use askama::Template;
+use axum::{
+    http::StatusCode,
+    response::{Html, IntoResponse},
+};
 
 #[derive(Template)]
 #[template(path = "admin.html")]
 pub struct AdminPageTemplate {}
 
-pub async fn render_admin() -> AdminPageTemplate {
-    AdminPageTemplate {}
+pub async fn render_admin() -> Result<impl IntoResponse, StatusCode> {
+    Ok(Html(
+        AdminPageTemplate {}
+            .render()
+            .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR),
+    ))
 }

src/pages/animated_logo.rs

@@ -1,10 +1,13 @@
 use askama::Template;
-use axum::http::StatusCode;
+use axum::{
+    http::StatusCode,
+    response::{Html, IntoResponse},
+};
 
 #[derive(Template)]
 #[template(path = "assets/animated_logo.html")]
 pub struct AnimatedLogoTemplate {}
 
-pub async fn render_animated_logo() -> Result<AnimatedLogoTemplate, StatusCode> {
-    Ok(AnimatedLogoTemplate {})
+pub async fn render_animated_logo() -> Result<impl IntoResponse, StatusCode> {
+    Ok(Html(AnimatedLogoTemplate {}.render().unwrap()))
 }

src/pages/blog_post_list.rs

@@ -1,6 +1,8 @@
+use askama::Template;
 use axum::{
     extract::{OriginalUri, Path},
     http::StatusCode,
+    response::{Html, IntoResponse},
 };
 use tokio::try_join;
 use tracing::debug;
@@ -22,7 +24,7 @@ use super::post_list::PostListTemplate;
 pub async fn render_blog_post_list(
     tag: Option<Path<String>>,
     OriginalUri(original_uri): OriginalUri,
-) -> Result<PostListTemplate, StatusCode> {
+) -> Result<impl IntoResponse, StatusCode> {
     // I will forget what happens here in a week. But essentially it's pattern matching and shadowing
     let tag = tag.map(|Path(tag)| tag);
 
@@ -50,14 +52,18 @@ pub async fn render_blog_post_list(
         ("Blog posts".to_string(), "Blog posts".to_string())
     };
 
-    Ok(PostListTemplate {
-        title,
-        og_title,
-        segment: Segment::Blog,
-        posts,
-        header_props,
-        tags: blog_tags,
-        featured_projects,
-        current_url: original_uri.to_string(),
-    })
+    Ok(Html(
+        PostListTemplate {
+            title,
+            og_title,
+            segment: Segment::Blog,
+            posts,
+            header_props,
+            tags: blog_tags,
+            featured_projects,
+            current_url: original_uri.to_string(),
+        }
+        .render()
+        .unwrap(),
+    ))
 }

src/pages/blog_post_page.rs

@@ -1,5 +1,6 @@
 use askama::Template;
 use axum::extract::OriginalUri;
+use axum::response::{Html, IntoResponse};
 use axum::{extract::Path, http::StatusCode};
 use chrono::{DateTime, Utc};
 
@@ -30,7 +31,7 @@ pub struct BlogPostTemplate {
 pub async fn render_blog_post(
     Path(post_id): Path<String>,
     OriginalUri(original_uri): OriginalUri,
-) -> Result<BlogPostTemplate, StatusCode> {
+) -> Result<impl IntoResponse, StatusCode> {
     let path = format!("{}/{}.md", BLOG_POST_PATH, post_id);
     let post = parse_post::<BlogPostMetadata>(&path).await?;
     let segment = if original_uri.to_string().starts_with("/blog") {
@@ -59,17 +60,21 @@ pub async fn render_blog_post(
         _ => HeaderProps::default(),
     };
 
-    Ok(BlogPostTemplate {
-        title: post.metadata.title,
-        date: post.metadata.date,
-        tags: post.metadata.tags,
-        body: post.body,
-        slug: post.slug,
-        segment,
-        thumbnail: post.metadata.thumbnail,
-        header_props,
-        recommended_posts,
-    })
+    Ok(Html(
+        BlogPostTemplate {
+            title: post.metadata.title,
+            date: post.metadata.date,
+            tags: post.metadata.tags,
+            body: post.body,
+            slug: post.slug,
+            segment,
+            thumbnail: post.metadata.thumbnail,
+            header_props,
+            recommended_posts,
+        }
+        .render()
+        .unwrap(),
+    ))
 }
 
 async fn get_recommended_posts(

src/pages/broadcast_list.rs

@@ -1,6 +1,8 @@
+use askama::Template;
 use axum::{
     extract::{OriginalUri, Path},
     http::StatusCode,
+    response::{Html, IntoResponse},
 };
 use tokio::try_join;
 use tracing::debug;
@@ -21,7 +23,7 @@ use super::post_list::PostListTemplate;
 pub async fn render_broadcast_post_list(
     tag: Option<Path<String>>,
     OriginalUri(original_uri): OriginalUri,
-) -> Result<PostListTemplate, StatusCode> {
+) -> Result<impl IntoResponse, StatusCode> {
     // I will forget what happens here in a week. But essentially it's pattern matching and shadowing
     let tag = tag.map(|Path(tag)| tag);
 
@@ -50,14 +52,18 @@ pub async fn render_broadcast_post_list(
         "Broadcasts".to_string()
     };
 
-    Ok(PostListTemplate {
-        title: title.clone(),
-        og_title: title,
-        segment: Segment::Broadcasts,
-        posts,
-        header_props,
-        tags: popular_tags,
-        featured_projects,
-        current_url: original_uri.to_string(),
-    })
+    Ok(Html(
+        PostListTemplate {
+            title: title.clone(),
+            og_title: title,
+            segment: Segment::Broadcasts,
+            posts,
+            header_props,
+            tags: popular_tags,
+            featured_projects,
+            current_url: original_uri.to_string(),
+        }
+        .render()
+        .unwrap(),
+    ))
 }

src/pages/contact.rs

@@ -1,5 +1,8 @@
 use askama::Template;
-use axum::http::StatusCode;
+use axum::{
+    http::StatusCode,
+    response::{Html, IntoResponse},
+};
 
 use crate::components::site_header::HeaderProps;
 
@@ -18,7 +21,7 @@ pub struct ContactPageTemplate {
     pub links: Vec<ContactLink>,
 }
 
-pub async fn render_contact() -> Result<ContactPageTemplate, StatusCode> {
+pub async fn render_contact() -> Result<impl IntoResponse, StatusCode> {
     let links = vec![
         ContactLink {
             href: "mailto:michalvankosk@gmail.com".to_string(),
@@ -76,9 +79,13 @@ pub async fn render_contact() -> Result<ContactPageTemplate, StatusCode> {
         },
     ];
 
-    Ok(ContactPageTemplate {
-        title: "Contact".to_owned(),
-        header_props: HeaderProps::default(),
-        links,
-    })
+    Ok(Html(
+        ContactPageTemplate {
+            title: "Contact".to_owned(),
+            header_props: HeaderProps::default(),
+            links,
+        }
+        .render()
+        .unwrap(),
+    ))
 }

src/pages/index.rs

@@ -1,7 +1,10 @@
 use std::rc::Rc;
 
 use askama::Template;
-use axum::http::StatusCode;
+use axum::{
+    http::StatusCode,
+    response::{Html, IntoResponse},
+};
 use tokio::try_join;
 
 use crate::{
@@ -26,7 +29,7 @@ pub struct IndexTemplate {
     featured_broadcasts: Vec<Rc<ParseResult<BlogPostMetadata>>>,
 }
 
-pub async fn render_index() -> Result<IndexTemplate, StatusCode> {
+pub async fn render_index() -> Result<impl IntoResponse, StatusCode> {
     let (blog_tags, broadcasts_tags, all_posts, featured_projects) = try_join!(
         get_popular_tags(Some(Segment::Blog)),
         get_popular_tags(Some(Segment::Broadcasts)),
@@ -44,12 +47,16 @@ pub async fn render_index() -> Result<IndexTemplate, StatusCode> {
     let featured_broadcasts =
         ref_get_posts_by_segment(&all_posts_rc, &[Segment::Broadcasts, Segment::Featured]);
 
-    Ok(IndexTemplate {
-        header_props: HeaderProps::default(),
-        blog_tags,
-        broadcasts_tags,
-        featured_blog_posts,
-        featured_projects,
-        featured_broadcasts,
-    })
+    Ok(Html(
+        IndexTemplate {
+            header_props: HeaderProps::default(),
+            blog_tags,
+            broadcasts_tags,
+            featured_blog_posts,
+            featured_projects,
+            featured_broadcasts,
+        }
+        .render()
+        .unwrap(),
+    ))
 }

src/pages/not_found.rs

@@ -1,5 +1,9 @@
 use askama::Template;
-use axum::{extract::OriginalUri, http::StatusCode};
+use axum::{
+    extract::OriginalUri,
+    http::StatusCode,
+    response::{Html, IntoResponse},
+};
 use tracing::info;
 
 use crate::components::site_header::HeaderProps;
@@ -13,13 +17,17 @@ pub struct NotFoundPage {
 
 pub async fn render_not_found(
     OriginalUri(original_uri): OriginalUri,
-) -> Result<(StatusCode, NotFoundPage), StatusCode> {
+) -> Result<(StatusCode, impl IntoResponse), StatusCode> {
     info!("{original_uri} not found");
     Ok((
         StatusCode::NOT_FOUND,
-        NotFoundPage {
-            title: "This page does not exists".to_owned(),
-            header_props: HeaderProps::default(),
-        },
+        Html(
+            NotFoundPage {
+                title: "This page does not exists".to_owned(),
+                header_props: HeaderProps::default(),
+            }
+            .render()
+            .unwrap(),
+        ),
     ))
 }

src/pages/portfolio.rs

@@ -1,5 +1,8 @@
 use askama::Template;
-use axum::http::StatusCode;
+use axum::{
+    http::StatusCode,
+    response::{Html, IntoResponse},
+};
 use serde::Deserialize;
 
 use crate::{
@@ -50,7 +53,7 @@ pub struct PortfolioTemplate {
     pub technology_list: Vec<String>,
 }
 
-pub async fn render_portfolio() -> Result<PortfolioTemplate, StatusCode> {
+pub async fn render_portfolio() -> Result<impl IntoResponse, StatusCode> {
     let portfolio = parse_post::<PortfolioPageModel>("_pages/portfolio.md").await?;
 
     let mut project_list = get_post_list::<ProjectMetadata>("_projects").await?;
@@ -126,14 +129,18 @@ pub async fn render_portfolio() -> Result<PortfolioTemplate, StatusCode> {
     .map(|str| str.to_owned())
     .collect();
 
-    Ok(PortfolioTemplate {
-        title: "Portfolio".to_owned(),
-        body: portfolio.body,
-        header_props: HeaderProps::default(),
-        project_list,
-        workplace_list,
-        education_list,
-        contact_links,
-        technology_list,
-    })
+    Ok(Html(
+        PortfolioTemplate {
+            title: "Portfolio".to_owned(),
+            body: portfolio.body,
+            header_props: HeaderProps::default(),
+            project_list,
+            workplace_list,
+            education_list,
+            contact_links,
+            technology_list,
+        }
+        .render()
+        .unwrap(),
+    ))
 }

src/pages/project_list.rs

@@ -1,5 +1,8 @@
 use askama::Template;
-use axum::http::StatusCode;
+use axum::{
+    http::StatusCode,
+    response::{Html, IntoResponse},
+};
 
 use crate::{
     components::site_header::HeaderProps,
@@ -16,16 +19,20 @@ pub struct ProjectListTemplate {
     pub header_props: HeaderProps,
 }
 
-pub async fn render_projects_list() -> Result<ProjectListTemplate, StatusCode> {
+pub async fn render_projects_list() -> Result<impl IntoResponse, StatusCode> {
     let mut project_list = get_post_list::<ProjectMetadata>("_projects").await?;
 
     project_list.sort_by_key(|post| post.slug.to_string());
     project_list.retain(|project| project.metadata.displayed);
     project_list.reverse();
 
-    Ok(ProjectListTemplate {
-        title: "Showcase".to_owned(),
-        header_props: HeaderProps::default(),
-        project_list,
-    })
+    Ok(Html(
+        ProjectListTemplate {
+            title: "Showcase".to_owned(),
+            header_props: HeaderProps::default(),
+            project_list,
+        }
+        .render()
+        .unwrap(),
+    ))
 }

src/pages/showcase/egg_fetcher.rs

@@ -1,5 +1,8 @@
 use askama::Template;
-use axum::http::StatusCode;
+use axum::{
+    http::StatusCode,
+    response::{Html, IntoResponse},
+};
 
 use crate::components::site_header::HeaderProps;
 
@@ -9,8 +12,12 @@ pub struct EggFetcherShowcaseTemplate {
     header_props: HeaderProps,
 }
 
-pub async fn render_egg_fetcher() -> Result<EggFetcherShowcaseTemplate, StatusCode> {
-    Ok(EggFetcherShowcaseTemplate {
-        header_props: HeaderProps::default(),
-    })
+pub async fn render_egg_fetcher() -> Result<impl IntoResponse, StatusCode> {
+    Ok(Html(
+        EggFetcherShowcaseTemplate {
+            header_props: HeaderProps::default(),
+        }
+        .render()
+        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR),
+    ))
 }