Update askama

crates/frontend/src/routes/addressbook.rs

@@ -1,10 +1,9 @@
 use actix_web::{
     http::{header, StatusCode},
-    web::{self, Data, Path},
+    web::{self, Data, Html, Path},
     HttpRequest, HttpResponse, Responder,
 };
 use askama::Template;
-use askama_actix::TemplateToResponse;
 use rustical_store::{auth::User, Addressbook, AddressbookStore};
 
 #[derive(Template)]
@@ -17,15 +16,21 @@ pub async fn route_addressbook<AS: AddressbookStore>(
     path: Path<(String, String)>,
     store: Data<AS>,
     user: User,
+    req: HttpRequest,
 ) -> Result<impl Responder, rustical_store::Error> {
     let (owner, addrbook_id) = path.into_inner();
     if !user.is_principal(&owner) {
         return Ok(HttpResponse::Unauthorized().body("Unauthorized"));
     }
-    Ok(AddressbookPage {
-        addressbook: store.get_addressbook(&owner, &addrbook_id).await?,
-    }
-    .to_response())
+    Ok(Html::new(
+        AddressbookPage {
+            addressbook: store.get_addressbook(&owner, &addrbook_id).await?,
+        }
+        .render()
+        .unwrap(),
+    )
+    .respond_to(&req)
+    .map_into_boxed_body())
 }
 
 pub async fn route_addressbook_restore<AS: AddressbookStore>(

crates/frontend/src/routes/calendar.rs

@@ -1,10 +1,9 @@
 use actix_web::{
     http::{header, StatusCode},
-    web::{self, Data, Path},
+    web::{self, Data, Html, Path},
     HttpRequest, HttpResponse, Responder,
 };
 use askama::Template;
-use askama_actix::TemplateToResponse;
 use rustical_store::{auth::User, Calendar, CalendarStore};
 
 #[derive(Template)]
@@ -17,15 +16,21 @@ pub async fn route_calendar<C: CalendarStore>(
     path: Path<(String, String)>,
     store: Data<C>,
     user: User,
+    req: HttpRequest,
 ) -> Result<impl Responder, rustical_store::Error> {
     let (owner, cal_id) = path.into_inner();
     if !user.is_principal(&owner) {
         return Ok(HttpResponse::Unauthorized().body("Unauthorized"));
     }
-    Ok(CalendarPage {
-        calendar: store.get_calendar(&owner, &cal_id).await?,
-    }
-    .to_response())
+    Ok(Html::new(
+        CalendarPage {
+            calendar: store.get_calendar(&owner, &cal_id).await?,
+        }
+        .render()
+        .unwrap(),
+    )
+    .respond_to(&req)
+    .map_into_boxed_body())
 }
 
 pub async fn route_calendar_restore<CS: CalendarStore>(

crates/frontend/src/routes/login.rs

@@ -1,7 +1,7 @@
 use actix_session::Session;
 use actix_web::{
     error::ErrorUnauthorized,
-    web::{Data, Form, Redirect},
+    web::{Data, Form, Html, Redirect},
     HttpRequest, HttpResponse, Responder,
 };
 use askama::Template;
@@ -12,8 +12,10 @@ use serde::Deserialize;
 #[template(path = "pages/login.html")]
 struct LoginPage;
 
-pub async fn route_get_login() -> impl Responder {
-    LoginPage
+pub async fn route_get_login(req: HttpRequest) -> impl Responder {
+    Html::new(LoginPage.render().unwrap())
+        .respond_to(&req)
+        .map_into_boxed_body()
 }
 
 #[derive(Deserialize)]