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

use askama_web to make template responses more ergonomic

Browse Source
This commit is contained in:
Lennart
2025-04-12 12:15:50 +02:00
parent e2d423fdc2
commit 7b70b79bf0
7 changed files with 62 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Cargo.lock generated
View File

@@ -425,6 +425,28 @@ dependencies = [
"winnow", "winnow",
] ]
[[package]]
name = "askama_web"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b939333ab32b63d49be3a84492eefacff005ed369ac331e1597d1839e3c62f11"
dependencies = [
"actix-web",
"askama",
"askama_web_derive",
]
[[package]]
name = "askama_web_derive"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34921de3d57974069bad483fdfe0ec65d88c4ff892edd1ab4d8b03be0dda1b9b"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]] [[package]]
name = "async-trait" name = "async-trait"
version = "0.1.88" version = "0.1.88"
@@ -2828,6 +2850,7 @@ dependencies = [
"actix-session", "actix-session",
"actix-web", "actix-web",
"askama", "askama",
"askama_web",
"futures-core", "futures-core",
"hex", "hex",
"mime_guess", "mime_guess",

1
Cargo.toml
View File

@@ -74,6 +74,7 @@ derive_more = { version = "2.0", features = [
"constructor", "constructor",
] } ] }
askama = { version = "0.13", features = ["serde_json"] } askama = { version = "0.13", features = ["serde_json"] }
askama_web = { version = "0.13.0", features = ["actix-web-4"] }
sqlx = { version = "0.8", default-features = false, features = [ sqlx = { version = "0.8", default-features = false, features = [
"sqlx-sqlite", "sqlx-sqlite",
"uuid", "uuid",

1
crates/frontend/Cargo.toml
View File

@@ -8,6 +8,7 @@ publish = false
[dependencies] [dependencies]
askama.workspace = true askama.workspace = true
askama_web.workspace = true
actix-session = { workspace = true } actix-session = { workspace = true }
serde = { workspace = true } serde = { workspace = true }
thiserror = { workspace = true } thiserror = { workspace = true }

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

@@ -1,15 +1,16 @@
use actix_session::{ use actix_session::{
config::CookieContentSecurity, storage::CookieSessionStore, SessionMiddleware, SessionMiddleware, config::CookieContentSecurity, storage::CookieSessionStore,
}; };
use actix_web::{ use actix_web::{
HttpRequest, HttpResponse, Responder,
cookie::{Key, SameSite}, cookie::{Key, SameSite},
dev::ServiceResponse, dev::ServiceResponse,
http::{Method, StatusCode}, http::{Method, StatusCode},
middleware::{ErrorHandlerResponse, ErrorHandlers}, middleware::{ErrorHandlerResponse, ErrorHandlers},
web::{self, Data, Html, Path}, web::{self, Data, Path},
HttpRequest, HttpResponse, Responder,
}; };
use askama::Template; use askama::Template;
use askama_web::WebTemplate;
use assets::{Assets, EmbedService}; use assets::{Assets, EmbedService};
use routes::{ use routes::{
addressbook::{route_addressbook, route_addressbook_restore}, addressbook::{route_addressbook, route_addressbook_restore},
@@ -17,8 +18,8 @@ use routes::{
login::{route_get_login, route_post_login}, login::{route_get_login, route_post_login},
}; };
use rustical_store::{ use rustical_store::{
auth::{AuthenticationMiddleware, AuthenticationProvider, User},
Addressbook, AddressbookStore, Calendar, CalendarStore, Addressbook, AddressbookStore, Calendar, CalendarStore,
auth::{AuthenticationMiddleware, AuthenticationProvider, User},
}; };
use std::sync::Arc; use std::sync::Arc;
@@ -28,7 +29,7 @@ mod routes;
pub use config::FrontendConfig; pub use config::FrontendConfig;
#[derive(Template)] #[derive(Template, WebTemplate)]
#[template(path = "pages/user.html")] #[template(path = "pages/user.html")]
struct UserPage { struct UserPage {
pub user_id: String, pub user_id: String,
@@ -51,19 +52,14 @@ async fn route_user<CS: CalendarStore, AS: AddressbookStore>(
return actix_web::HttpResponse::Unauthorized().body("Unauthorized"); return actix_web::HttpResponse::Unauthorized().body("Unauthorized");
} }
Html::new( UserPage {
UserPage { calendars: cal_store.get_calendars(&user.id).await.unwrap(),
calendars: cal_store.get_calendars(&user.id).await.unwrap(), deleted_calendars: cal_store.get_deleted_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(),
addressbooks: addr_store.get_addressbooks(&user.id).await.unwrap(), deleted_addressbooks: addr_store.get_deleted_addressbooks(&user.id).await.unwrap(),
deleted_addressbooks: addr_store.get_deleted_addressbooks(&user.id).await.unwrap(), user_id: user.id,
user_id: user.id, }
}
.render()
.unwrap(),
)
.respond_to(&req) .respond_to(&req)
.map_into_boxed_body()
} }
async fn route_root(user: Option<User>, req: HttpRequest) -> impl Responder { async fn route_root(user: Option<User>, req: HttpRequest) -> impl Responder {

22
crates/frontend/src/routes/addressbook.rs
View File

@@ -1,12 +1,13 @@
use actix_web::{ use actix_web::{
http::{header, StatusCode},
web::{self, Data, Html, Path},
HttpRequest, HttpResponse, Responder, HttpRequest, HttpResponse, Responder,
http::{StatusCode, header},
web::{self, Data, Path},
}; };
use askama::Template; use askama::Template;
use rustical_store::{auth::User, Addressbook, AddressbookStore}; use askama_web::WebTemplate;
use rustical_store::{Addressbook, AddressbookStore, auth::User};
#[derive(Template)] #[derive(Template, WebTemplate)]
#[template(path = "pages/addressbook.html")] #[template(path = "pages/addressbook.html")]
struct AddressbookPage { struct AddressbookPage {
addressbook: Addressbook, addressbook: Addressbook,
@@ -22,15 +23,10 @@ pub async fn route_addressbook<AS: AddressbookStore>(
if !user.is_principal(&owner) { if !user.is_principal(&owner) {
return Ok(HttpResponse::Unauthorized().body("Unauthorized")); return Ok(HttpResponse::Unauthorized().body("Unauthorized"));
} }
Ok(Html::new( Ok(AddressbookPage {
AddressbookPage { addressbook: store.get_addressbook(&owner, &addrbook_id).await?,
addressbook: store.get_addressbook(&owner, &addrbook_id).await?, }
} .respond_to(&req))
.render()
.unwrap(),
)
.respond_to(&req)
.map_into_boxed_body())
} }
pub async fn route_addressbook_restore<AS: AddressbookStore>( pub async fn route_addressbook_restore<AS: AddressbookStore>(

22
crates/frontend/src/routes/calendar.rs
View File

@@ -1,12 +1,13 @@
use actix_web::{ use actix_web::{
http::{header, StatusCode},
web::{self, Data, Html, Path},
HttpRequest, HttpResponse, Responder, HttpRequest, HttpResponse, Responder,
http::{StatusCode, header},
web::{self, Data, Path},
}; };
use askama::Template; use askama::Template;
use rustical_store::{auth::User, Calendar, CalendarStore}; use askama_web::WebTemplate;
use rustical_store::{Calendar, CalendarStore, auth::User};
#[derive(Template)] #[derive(Template, WebTemplate)]
#[template(path = "pages/calendar.html")] #[template(path = "pages/calendar.html")]
struct CalendarPage { struct CalendarPage {
calendar: Calendar, calendar: Calendar,
@@ -22,15 +23,10 @@ pub async fn route_calendar<C: CalendarStore>(
if !user.is_principal(&owner) { if !user.is_principal(&owner) {
return Ok(HttpResponse::Unauthorized().body("Unauthorized")); return Ok(HttpResponse::Unauthorized().body("Unauthorized"));
} }
Ok(Html::new( Ok(CalendarPage {
CalendarPage { calendar: store.get_calendar(&owner, &cal_id).await?,
calendar: store.get_calendar(&owner, &cal_id).await?, }
} .respond_to(&req))
.render()
.unwrap(),
)
.respond_to(&req)
.map_into_boxed_body())
} }
pub async fn route_calendar_restore<CS: CalendarStore>( pub async fn route_calendar_restore<CS: CalendarStore>(

13
crates/frontend/src/routes/login.rs
View File

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