refactor modules

This commit is contained in:
2024-08-07 13:18:13 +02:00
parent 6dc6a581e3
commit 5365cb5409
24 changed files with 139 additions and 130 deletions

View File

@ -2,36 +2,35 @@ use askama::Template;
use axum::http::StatusCode;
use tokio::try_join;
use crate::filters;
use crate::{
blog_posts::{
blog_post_model::BlogPostMetadata, featured_blog_posts::get_featured_blog_posts,
tag_list::get_popular_blog_tags,
},
components::{
site_footer::{render_site_footer, SiteFooter},
site_header::HeaderProps,
},
featured_posts::get_featured_posts,
featured_projects::get_featured_projects,
post_parser::ParseResult,
tag_list::get_popular_blog_tags,
filters,
post_utils::post_parser::ParseResult,
projects::{featured_projects::get_featured_projects, project_model::ProjectMetadata},
};
use super::post::PostMetadata;
use super::project::ProjectMetadata;
#[derive(Template)]
#[template(path = "index.html")]
pub struct IndexTemplate {
site_footer: SiteFooter,
header_props: HeaderProps,
blog_tags: Vec<String>,
featured_posts: Vec<ParseResult<PostMetadata>>,
featured_blog_posts: Vec<ParseResult<BlogPostMetadata>>,
featured_projects: Vec<ParseResult<ProjectMetadata>>,
}
pub async fn render_index() -> Result<IndexTemplate, StatusCode> {
let (site_footer, blog_tags, featured_posts, featured_projects) = try_join!(
let (site_footer, blog_tags, featured_blog_posts, featured_projects) = try_join!(
render_site_footer(),
get_popular_blog_tags(),
get_featured_posts(),
get_featured_blog_posts(),
get_featured_projects()
)?;
@ -39,7 +38,7 @@ pub async fn render_index() -> Result<IndexTemplate, StatusCode> {
site_footer,
header_props: HeaderProps::default(),
blog_tags,
featured_posts,
featured_blog_posts,
featured_projects,
})
}