Update to Axum 0.8

backend/src/services/mod.rs

@@ -3,13 +3,14 @@ use axum::{
     extract::{Extension, Request, State},
     http::{header, StatusCode},
     middleware::Next,
-    response::{IntoResponse, Response, Result},
+    response::{Html, IntoResponse, Response},
 };
+use rinja::Template;
 
 use crate::{
     data::{db, model},
     html_templates::*,
-    ron_utils, translation,
+    ron_utils, translation, Result,
 };
 
 pub mod fragments;
@@ -31,12 +32,15 @@ pub async fn ron_error_to_html(
                 Ok(bytes) => String::from_utf8(bytes.to_vec()).unwrap_or_default(),
                 Err(error) => error.to_string(),
             };
-            return Ok(MessageTemplate {
-                user: None,
-                message: &message,
-                as_code: true,
-                tr,
-            }
+            return Ok(Html(
+                MessageTemplate {
+                    user: None,
+                    message: &message,
+                    as_code: true,
+                    tr,
+                }
+                .render()?,
+            )
             .into_response());
         }
     }
@@ -66,7 +70,7 @@ pub async fn home_page(
         current_id: None,
     };
 
-    Ok(HomeTemplate { user, recipes, tr })
+    Ok(Html(HomeTemplate { user, recipes, tr }.render()?))
 }
 
 ///// 404 /////
@@ -75,9 +79,9 @@ pub async fn home_page(
 pub async fn not_found(
     Extension(user): Extension<Option<model::User>>,
     Extension(tr): Extension<translation::Tr>,
-) -> impl IntoResponse {
-    (
+) -> Result<impl IntoResponse> {
+    Ok((
         StatusCode::NOT_FOUND,
-        MessageTemplate::new_with_user("404: Not found", tr, user),
-    )
+        Html(MessageTemplate::new_with_user("404: Not found", tr, user).render()?),
+    ))
 }