From 63c16f411df9bd65a870934fe264dd521f5ad8b2 Mon Sep 17 00:00:00 2001
From: Lennart <18233294+lennart-k@users.noreply.github.com>
Date: Sat, 12 Apr 2025 13:13:16 +0200
Subject: [PATCH] frontend: Show group calendars
---
Cargo.lock | 27 +++----------------
Cargo.toml | 2 --
.../frontend/public/templates/pages/user.html | 12 ++++++---
crates/frontend/src/lib.rs | 8 +++++-
crates/store/src/auth/user.rs | 8 +++---
5 files changed, 22 insertions(+), 35 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 1e0095d..e8a35b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -868,20 +868,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "dashmap"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
[[package]]
name = "der"
version = "0.7.9"
@@ -1278,12 +1264,6 @@ dependencies = [
"tracing",
]
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
[[package]]
name = "hashbrown"
version = "0.15.2"
@@ -1301,7 +1281,7 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
dependencies = [
- "hashbrown 0.15.2",
+ "hashbrown",
]
[[package]]
@@ -1653,7 +1633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
dependencies = [
"equivalent",
- "hashbrown 0.15.2",
+ "hashbrown",
]
[[package]]
@@ -2742,7 +2722,6 @@ dependencies = [
"argon2",
"async-trait",
"clap",
- "dashmap",
"figment",
"opentelemetry",
"opentelemetry-otlp",
@@ -3215,7 +3194,7 @@ dependencies = [
"futures-intrusive",
"futures-io",
"futures-util",
- "hashbrown 0.15.2",
+ "hashbrown",
"hashlink",
"indexmap",
"log",
diff --git a/Cargo.toml b/Cargo.toml
index 8f41a80..ca51c9b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -110,7 +110,6 @@ reqwest = { version = "0.12", features = [
"charset",
"http2",
], default-features = false }
-dashmap = "6.1"
[dependencies]
rustical_store = { workspace = true }
@@ -129,7 +128,6 @@ sqlx = { workspace = true }
async-trait = { workspace = true }
tracing-actix-web = { workspace = true }
uuid.workspace = true
-dashmap.workspace = true
opentelemetry = { version = "0.29", optional = true }
opentelemetry-otlp = { version = "0.29", optional = true }
diff --git a/crates/frontend/public/templates/pages/user.html b/crates/frontend/public/templates/pages/user.html
index 67264fc..83cffee 100644
--- a/crates/frontend/public/templates/pages/user.html
+++ b/crates/frontend/public/templates/pages/user.html
@@ -60,7 +60,7 @@ li.collection-list-item {
{% for calendar in calendars %}
{% let color = calendar.color.to_owned().unwrap_or("red".to_owned()) %}
-
+
{{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
{% if let Some(description) = calendar.description %}{{ description }}{% endif %}
@@ -71,6 +71,8 @@ li.collection-list-item {
+ {% else %}
+ You do not have any calendars yet
{% endfor %}
{%if !deleted_calendars.is_empty() %}
@@ -79,7 +81,7 @@ li.collection-list-item {
{% for calendar in deleted_calendars %}
{% let color = calendar.color.to_owned().unwrap_or("red".to_owned()) %}
-
+
{{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
{% if let Some(description) = calendar.description %}{{ description }}{% endif %}
@@ -98,13 +100,15 @@ li.collection-list-item {
{%if !deleted_addressbooks.is_empty() %}
@@ -112,7 +116,7 @@ li.collection-list-item {
{% for addressbook in deleted_addressbooks %}
-
-
+
{{ addressbook.displayname.to_owned().unwrap_or(addressbook.id.to_owned()) }}
{% if let Some(description) = addressbook.description %}{{ description }}{% endif %}
diff --git a/crates/frontend/src/lib.rs b/crates/frontend/src/lib.rs
index 5d74a13..746a9a4 100644
--- a/crates/frontend/src/lib.rs
+++ b/crates/frontend/src/lib.rs
@@ -51,9 +51,15 @@ async fn route_user(
if user_id != user.id {
return actix_web::HttpResponse::Unauthorized().body("Unauthorized");
}
+ dbg!(&user);
+
+ let mut calendars = vec![];
+ for group in user.memberships() {
+ calendars.extend(cal_store.get_calendars(group).await.unwrap());
+ }
UserPage {
- calendars: cal_store.get_calendars(&user.id).await.unwrap(),
+ calendars,
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(),
diff --git a/crates/store/src/auth/user.rs b/crates/store/src/auth/user.rs
index d53bcb6..4e88abf 100644
--- a/crates/store/src/auth/user.rs
+++ b/crates/store/src/auth/user.rs
@@ -1,13 +1,13 @@
use actix_web::{
- body::BoxBody,
- http::{header, StatusCode},
FromRequest, HttpMessage, HttpResponse, ResponseError,
+ body::BoxBody,
+ http::{StatusCode, header},
};
use chrono::{DateTime, Utc};
use derive_more::Display;
use rustical_xml::ValueSerialize;
use serde::{Deserialize, Serialize};
-use std::future::{ready, Ready};
+use std::future::{Ready, ready};
/// https://datatracker.ietf.org/doc/html/rfc5545#section-3.2.3
#[derive(Debug, Clone, Deserialize, Serialize, Default, PartialEq)]
@@ -54,7 +54,7 @@ pub struct User {
#[serde(default)]
pub app_tokens: Vec,
#[serde(default)]
- pub memberships: Vec,
+ memberships: Vec,
}
impl User {