nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-15 05:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update askama

Browse Source
This commit is contained in:
Lennart
2025-04-05 14:02:30 +02:00
parent 2f110b0f14
commit 6e03d58457
11 changed files with 79 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/frontend/src/lib.rs
View File

@@ -6,11 +6,10 @@ use actix_web::{
dev::ServiceResponse,
http::{Method, StatusCode},
middleware::{ErrorHandlerResponse, ErrorHandlers},
web::{self, Data, Path},
web::{self, Data, Html, Path},
HttpRequest, HttpResponse, Responder,
};
use askama::Template;
use askama_actix::TemplateToResponse;
use assets::{Assets, EmbedService};
use routes::{
addressbook::{route_addressbook, route_addressbook_restore},
@@ -44,6 +43,7 @@ async fn route_user<CS: CalendarStore, AS: AddressbookStore>(
cal_store: Data<CS>,
addr_store: Data<AS>,
user: User,
req: HttpRequest,
) -> impl Responder {
// TODO: Check for authorization
let user_id = path.into_inner();
@@ -51,14 +51,19 @@ async fn route_user<CS: CalendarStore, AS: AddressbookStore>(
return actix_web::HttpResponse::Unauthorized().body("Unauthorized");
}
UserPage {
calendars: cal_store.get_calendars(&user.id).await.unwrap(),
deleted_calendars: cal_store.get_deleted_calendars(&user.id).await.unwrap(),
addressbooks: addr_store.get_addressbooks(&user.id).await.unwrap(),
deleted_addressbooks: addr_store.get_deleted_addressbooks(&user.id).await.unwrap(),
user_id: user.id,
}
.to_response()
Html::new(
UserPage {
calendars: cal_store.get_calendars(&user.id).await.unwrap(),
deleted_calendars: cal_store.get_deleted_calendars(&user.id).await.unwrap(),
addressbooks: addr_store.get_addressbooks(&user.id).await.unwrap(),
deleted_addressbooks: addr_store.get_deleted_addressbooks(&user.id).await.unwrap(),
user_id: user.id,
}
.render()
.unwrap(),
)
.respond_to(&req)
.map_into_boxed_body()
}
async fn route_root(user: Option<User>, req: HttpRequest) -> impl Responder {