crates/app/src/lib.rs

@@ -3,7 +3,8 @@ mod templates;
 
 use std::path::Path;
 
-use askama_axum::Template;
+use askama::Template;
+use askama_axum::IntoResponse;
 use axum::http::{StatusCode, Uri};
 use tower_http::services::ServeDir;
 
@@ -13,10 +14,10 @@ async fn fallback(uri: Uri) -> (StatusCode, String) {
 
 #[derive(Template)]
 #[template(path = "index.html")]
-pub struct GetIndexTemplate;
+pub struct GetIndexResponse;
 
-async fn root() -> GetIndexTemplate {
+async fn root() -> impl IntoResponse {
-    GetIndexTemplate {}
+    GetIndexResponse {}.into_response()
 }
 
 pub fn get_router(assets_path: &Path) -> axum::Router {

crates/app/src/pages/cps.rs

@@ -1,9 +1,10 @@
-use askama_axum::Template;
+use askama::Template;
+use askama_axum::IntoResponse;
 
 #[derive(Template)]
 #[template(path = "pages/cps.html")]
-pub struct CpsTemplate;
+struct CpsResponse;
 
-pub async fn cps() -> CpsTemplate {
+pub async fn cps() -> impl IntoResponse {
-    CpsTemplate
+    CpsResponse.into_response()
 }

crates/app/src/pages/home.rs

@@ -1,9 +1,10 @@
-use askama_axum::Template;
+use askama::Template;
+use askama_axum::IntoResponse;
 
 #[derive(Template)]
 #[template(path = "pages/home.html")]
-pub struct HomeTemplate;
+struct HomeResponse;
 
-pub async fn home() -> HomeTemplate {
+pub async fn home() -> impl IntoResponse {
-    HomeTemplate
+    HomeResponse.into_response()
 }

crates/app/src/templates/hello.rs

@@ -1,16 +1,18 @@
-use askama_axum::Template;
+use askama::Template;
+use askama_axum::IntoResponse;
 use axum::{routing, Router};
 
 #[derive(Template)]
 #[template(path = "hello.html")]
-struct HelloTemplate {
+struct HelloResponse {
     pub name: String,
 }
 
-async fn hello() -> HelloTemplate {
+async fn hello() -> impl IntoResponse {
-    HelloTemplate {
+    HelloResponse {
         name: "Theo".to_string(),
     }
+    .into_response()
 }
 
 pub fn get_routes() -> Router {

crates/app/src/templates/nav.rs

@@ -1,4 +1,5 @@
-use askama_axum::Template;
+use askama::Template;
+use askama_axum::IntoResponse;
 use axum::{extract::Query, routing, Router};
 use serde::Deserialize;
 
@@ -15,12 +16,12 @@ struct MenuParameters {
 
 #[derive(Template)]
 #[template(path = "layout/nav/nav-menu-items.html")]
-struct MenuTemplate {
+struct MenuResponse {
     mobile: bool,
     items: Vec<MenuItem>,
 }
 
-impl MenuTemplate {
+impl MenuResponse {
     fn get_classes(&self, is_current_item: &bool) -> String {
         let common_classes = match self.mobile {
             true => "block border-l-4 py-2 pl-3 pr-4 text-base font-medium".to_string(),
@@ -37,8 +38,8 @@ impl MenuTemplate {
     }
 }
 
-async fn menu(Query(params): Query<MenuParameters>) -> MenuTemplate {
+async fn menu(Query(params): Query<MenuParameters>) -> impl IntoResponse {
-    MenuTemplate {
+    MenuResponse {
         mobile: params.mobile,
         items: vec![
             MenuItem {
@@ -53,6 +54,7 @@ async fn menu(Query(params): Query<MenuParameters>) -> MenuTemplate {
             },
         ],
     }
+    .into_response()
 }
 
 pub fn get_routes() -> Router {

crates/app/src/templates/profile.rs

@@ -1,4 +1,5 @@
-use askama_axum::Template;
+use askama::Template;
+use askama_axum::IntoResponse;
 use axum::{extract::Query, routing, Router};
 use serde::Deserialize;
 
@@ -15,12 +16,12 @@ struct MenuParameters {
 
 #[derive(Template)]
 #[template(path = "layout/nav/profile-menu-items.html")]
-struct MenuTemplate {
+struct MenuResponse {
     mobile: bool,
     items: Vec<MenuItem>,
 }
 
-impl MenuTemplate {
+impl MenuResponse {
     fn get_classes(&self, is_current_item: &bool) -> String {
         let common_classes = match self.mobile {
             true => "block px-4 py-2 text-base font-medium text-gray-500 hover:bg-gray-100 hover:text-gray-800".to_string(),
@@ -35,8 +36,8 @@ impl MenuTemplate {
     }
 }
 
-async fn menu(Query(params): Query<MenuParameters>) -> MenuTemplate {
+async fn menu(Query(params): Query<MenuParameters>) -> impl IntoResponse {
-    MenuTemplate {
+    MenuResponse {
         mobile: params.mobile,
         items: vec![
             MenuItem {
@@ -56,6 +57,7 @@ async fn menu(Query(params): Query<MenuParameters>) -> MenuTemplate {
             },
         ],
     }
+    .into_response()
 }
 
 pub fn get_routes() -> Router {