-
-
Welcome {{ user.id }}!
-
-{% include "components/profile_section.html" %}
-{% include "components/calendars_section.html" %}
-{% include "components/addressbooks_section.html" %}
-
+{% block header_center %}
+
+{% endblock %}
+
+{% block content %}
+{{ section|safe }}
{% endblock %}
diff --git a/crates/frontend/src/lib.rs b/crates/frontend/src/lib.rs
index 8929bb4..5f94fca 100644
--- a/crates/frontend/src/lib.rs
+++ b/crates/frontend/src/lib.rs
@@ -8,6 +8,7 @@ use axum::{
};
use headers::{ContentType, HeaderMapExt};
use http::{Method, StatusCode};
+use routes::{addressbooks::route_addressbooks, calendars::route_calendars};
use rustical_oidc::{OidcConfig, OidcServiceConfig, route_get_oidc_callback, route_post_oidc};
use rustical_store::{
AddressbookStore, CalendarStore,
@@ -20,6 +21,7 @@ mod assets;
mod config;
pub mod nextcloud_login;
mod oidc_user_store;
+pub(crate) mod pages;
mod routes;
pub use config::FrontendConfig;
@@ -56,6 +58,7 @@ pub fn frontend_router
),
)
// Calendar
+ .route("/user/{user}/calendar", get(route_calendars::))
.route(
"/user/{user}/calendar/{calendar}",
get(route_calendar::),
@@ -65,6 +68,7 @@ pub fn frontend_router),
)
// Addressbook
+ .route("/user/{user}/addressbook", get(route_addressbooks::))
.route(
"/user/{user}/addressbook/{addressbook}",
get(route_addressbook::),
diff --git a/crates/frontend/src/pages/mod.rs b/crates/frontend/src/pages/mod.rs
new file mode 100644
index 0000000..22d12a3
--- /dev/null
+++ b/crates/frontend/src/pages/mod.rs
@@ -0,0 +1 @@
+pub mod user;
diff --git a/crates/frontend/src/pages/user.rs b/crates/frontend/src/pages/user.rs
new file mode 100644
index 0000000..e395ea0
--- /dev/null
+++ b/crates/frontend/src/pages/user.rs
@@ -0,0 +1,14 @@
+use askama::Template;
+use askama_web::WebTemplate;
+use rustical_store::auth::Principal;
+
+pub trait Section: Template {
+ fn name() -> &'static str;
+}
+
+#[derive(Template, WebTemplate)]
+#[template(path = "pages/user.html")]
+pub struct UserPage {
+ pub user: Principal,
+ pub section: S,
+}
diff --git a/crates/frontend/src/routes/addressbooks.rs b/crates/frontend/src/routes/addressbooks.rs
new file mode 100644
index 0000000..2e41a6f
--- /dev/null
+++ b/crates/frontend/src/routes/addressbooks.rs
@@ -0,0 +1,53 @@
+use std::sync::Arc;
+
+use askama::Template;
+use askama_web::WebTemplate;
+use axum::{Extension, extract::Path, response::IntoResponse};
+use http::StatusCode;
+use rustical_store::{Addressbook, AddressbookStore, auth::Principal};
+
+use crate::pages::user::{Section, UserPage};
+
+impl Section for AddressbooksSection {
+ fn name() -> &'static str {
+ "addressbooks"
+ }
+}
+
+#[derive(Template, WebTemplate)]
+#[template(path = "components/sections/addressbooks_section.html")]
+pub struct AddressbooksSection {
+ pub user: Principal,
+ pub addressbooks: Vec,
+ pub deleted_addressbooks: Vec,
+}
+
+pub async fn route_addressbooks(
+ Path(user_id): Path,
+ Extension(addr_store): Extension>,
+ user: Principal,
+) -> impl IntoResponse {
+ if user_id != user.id {
+ return StatusCode::UNAUTHORIZED.into_response();
+ }
+
+ let mut addressbooks = vec![];
+ for group in user.memberships() {
+ addressbooks.extend(addr_store.get_addressbooks(group).await.unwrap());
+ }
+
+ let mut deleted_addressbooks = vec![];
+ for group in user.memberships() {
+ deleted_addressbooks.extend(addr_store.get_deleted_addressbooks(group).await.unwrap());
+ }
+
+ UserPage {
+ section: AddressbooksSection {
+ user: user.clone(),
+ addressbooks,
+ deleted_addressbooks,
+ },
+ user,
+ }
+ .into_response()
+}
diff --git a/crates/frontend/src/routes/calendars.rs b/crates/frontend/src/routes/calendars.rs
new file mode 100644
index 0000000..7cebc29
--- /dev/null
+++ b/crates/frontend/src/routes/calendars.rs
@@ -0,0 +1,52 @@
+use std::sync::Arc;
+
+use crate::pages::user::{Section, UserPage};
+use askama::Template;
+use askama_web::WebTemplate;
+use axum::{Extension, extract::Path, response::IntoResponse};
+use http::StatusCode;
+use rustical_store::{Calendar, CalendarStore, auth::Principal};
+
+impl Section for CalendarsSection {
+ fn name() -> &'static str {
+ "calendars"
+ }
+}
+
+#[derive(Template, WebTemplate)]
+#[template(path = "components/sections/calendars_section.html")]
+pub struct CalendarsSection {
+ pub user: Principal,
+ pub calendars: Vec,
+ pub deleted_calendars: Vec,
+}
+
+pub async fn route_calendars(
+ Path(user_id): Path,
+ Extension(cal_store): Extension>,
+ user: Principal,
+) -> impl IntoResponse {
+ if user_id != user.id {
+ return StatusCode::UNAUTHORIZED.into_response();
+ }
+
+ let mut calendars = vec![];
+ for group in user.memberships() {
+ calendars.extend(cal_store.get_calendars(group).await.unwrap());
+ }
+
+ let mut deleted_calendars = vec![];
+ for group in user.memberships() {
+ deleted_calendars.extend(cal_store.get_deleted_calendars(group).await.unwrap());
+ }
+
+ UserPage {
+ section: CalendarsSection {
+ user: user.clone(),
+ calendars,
+ deleted_calendars,
+ },
+ user,
+ }
+ .into_response()
+}
diff --git a/crates/frontend/src/routes/mod.rs b/crates/frontend/src/routes/mod.rs
index e007c7c..f3ecc12 100644
--- a/crates/frontend/src/routes/mod.rs
+++ b/crates/frontend/src/routes/mod.rs
@@ -1,5 +1,7 @@
pub mod addressbook;
+pub mod addressbooks;
pub mod app_token;
pub mod calendar;
+pub mod calendars;
pub mod login;
pub mod user;
diff --git a/crates/frontend/src/routes/user.rs b/crates/frontend/src/routes/user.rs
index fb45cc8..c2bc7cb 100644
--- a/crates/frontend/src/routes/user.rs
+++ b/crates/frontend/src/routes/user.rs
@@ -11,19 +11,23 @@ use axum_extra::{TypedHeader, extract::Host};
use headers::UserAgent;
use http::StatusCode;
use rustical_store::{
- Addressbook, AddressbookStore, Calendar, CalendarStore,
+ AddressbookStore, CalendarStore,
auth::{AppToken, AuthenticationProvider, Principal},
};
+use crate::pages::user::{Section, UserPage};
+
+impl Section for ProfileSection {
+ fn name() -> &'static str {
+ "profile"
+ }
+}
+
#[derive(Template, WebTemplate)]
-#[template(path = "pages/user.html")]
-pub struct UserPage {
+#[template(path = "components/sections/profile_section.html")]
+pub struct ProfileSection {
pub user: Principal,
pub app_tokens: Vec,
- pub calendars: Vec,
- pub deleted_calendars: Vec,
- pub addressbooks: Vec,
- pub deleted_addressbooks: Vec,
pub is_apple: bool,
pub davx5_hostname: Option,
}
@@ -69,14 +73,13 @@ pub async fn route_user_named<
let davx5_hostname = user_agent.as_str().contains("Android").then_some(host);
UserPage {
- app_tokens: auth_provider.get_app_tokens(&user.id).await.unwrap(),
- calendars,
- deleted_calendars,
- addressbooks,
- deleted_addressbooks,
+ section: ProfileSection {
+ user: user.clone(),
+ app_tokens: auth_provider.get_app_tokens(&user.id).await.unwrap(),
+ is_apple,
+ davx5_hostname,
+ },
user,
- is_apple,
- davx5_hostname,
}
.into_response()
}