frontend: some changes

Cargo.lock

@@ -407,6 +407,8 @@ dependencies = [
  "num-traits",
  "percent-encoding",
  "serde",
+ "serde_json",
+ "serde_yaml",
 ]
 
 [[package]]
@@ -2673,6 +2675,19 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_yaml"
+version = "0.9.34+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+dependencies = [
+ "indexmap 2.6.0",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -3476,6 +3491,12 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+
 [[package]]
 name = "url"
 version = "2.5.2"

Cargo.toml

@@ -39,19 +39,19 @@ rstest = "0.23"
 rstest_reuse = "0.7"
 sha2 = "0.10"
 tokio = { version = "1", features = [
-    "net",
+  "net",
-    "tracing",
+  "tracing",
-    "macros",
+  "macros",
-    "rt-multi-thread",
+  "rt-multi-thread",
-    "full",
+  "full",
 ] }
 url = "2.5"
 base64 = "0.22"
 thiserror = "1.0"
 quick-xml = { version = "0.37", features = [
-    "serde",
+  "serde",
-    "serde-types",
+  "serde-types",
-    "serialize",
+  "serialize",
 ] }
 rust-embed = "8.5"
 futures-core = "0.3.31"
@@ -61,21 +61,26 @@ itertools = "0.13"
 log = "0.4"
 strum = { version = "0.26", features = ["strum_macros", "derive"] }
 derive_more = { version = "1.0", features = [
-    "from",
+  "from",
-    "try_into",
+  "try_into",
-    "into",
+  "into",
-    "deref",
+  "deref",
+] }
+askama = { version = "0.12", features = [
+  "serde",
+  "with-actix-web",
+  "serde-json",
+  "serde-yaml",
 ] }
-askama = { version = "0.12", features = ["serde", "with-actix-web"] }
 askama_actix = "0.14"
 sqlx = { version = "0.8", default-features = false, features = [
-    "sqlx-sqlite",
+  "sqlx-sqlite",
-    "uuid",
+  "uuid",
-    "chrono",
+  "chrono",
-    "sqlite",
+  "sqlite",
-    "runtime-tokio",
+  "runtime-tokio",
-    "macros",
+  "macros",
-    "migrate",
+  "migrate",
 ] }
 ical = { version = "0.11", features = ["generator", "serde"] }
 toml = "0.8"
@@ -115,9 +120,9 @@ opentelemetry_sdk = { version = "0.26", features = ["rt-tokio"] }
 opentelemetry-semantic-conventions = "0.26"
 tracing-opentelemetry = "0.27"
 tracing-subscriber = { version = "0.3", features = [
-    "env-filter",
+  "env-filter",
-    "fmt",
+  "fmt",
-    "registry",
+  "registry",
 ] }
 
 rand.workspace = true

crates/frontend/Cargo.toml

@@ -7,7 +7,7 @@ repository.workspace = true
 publish = false
 
 [dependencies]
-askama = { workspace = true }
+askama.workspace = true
 askama_actix = { workspace = true }
 actix-session = { workspace = true }
 serde = { workspace = true }

crates/frontend/public/assets/style.css

@@ -0,0 +1,3 @@
+body {
+  font-family: sans-serif;
+}

crates/frontend/public/templates/layouts/default.html

@@ -5,6 +5,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>{% block title %}RustiCal{% endblock %}</title>
+  <link rel="stylesheet" href="/frontend/assets/style.css" />
   <style>
     * {
       box-sizing: border-box;

crates/frontend/public/templates/pages/addressbook.html

@@ -4,6 +4,11 @@
 {% endblock %}
 
 {% block content %}
-<h1>Test</h1>
+{% let name = addressbook.displayname.to_owned().unwrap_or(addressbook.id.to_owned()) %}
-<a href="/frontend/user/{{ owner }}">Back</a>
+<h1>{{ name }}</h1>
+{% if let Some(description) = addressbook.description %}<p>{{ description }}</p>{% endif%}
+
+<pre>{{ addressbook|yaml }}</pre>
+
+<a href="/frontend/user/{{ addressbook.principal }}">Back</a>
 {% endblock %}

crates/frontend/public/templates/pages/calendar.html

@@ -4,6 +4,11 @@
 {% endblock %}
 
 {% block content %}
-<h1>Test</h1>
+{% let name = calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) %}
+<h1>{{ name }}</h1>
+{% if let Some(description) = calendar.description %}<p>{{ description }}</p>{% endif%}
+
+<pre>{{ calendar|yaml }}</pre>
+
 <a href="/frontend/user/{{ calendar.principal }}">Back</a>
 {% endblock %}

crates/frontend/public/templates/pages/user.html

@@ -48,6 +48,23 @@ li.collection-list-item {
   </li>
   {% endfor %}
 </ul>
+{%if !deleted_calendars.is_empty() %}
+<h3>Deleted Calendars</h3>
+<ul>
+  {% for calendar in deleted_calendars %}
+  {% let color = calendar.color.to_owned().unwrap_or("red".to_owned()) %}
+  <li class="collection-list-item" style="--color: {{ color }}">
+    <a href="/frontend/user/{{ user_id }}/calendar/{{ calendar.id}}">
+      <span class="title">{{ calendar.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}</span>
+      <span class="description">
+      {% if let Some(description) = calendar.description %}{{ description }}{% endif %}
+      </span>
+      <div class="color-chip"></div>
+    </a>
+  </li>
+  {% endfor %}
+</ul>
+{% endif %}
 
 <h2>Addressbooks</h2>
 <ul>
@@ -62,5 +79,20 @@ li.collection-list-item {
   </li>
   {% endfor %}
 </ul>
+{%if !deleted_addressbooks.is_empty() %}
+<h3>Deleted Addressbooks</h3>
+<ul>
+  {% for addressbook in deleted_addressbooks %}
+  <li class="collection-list-item">
+    <a href="/frontend/user/{{ user_id }}/addressbook/{{ addressbook.id}}">
+      <span class="title">{{ addressbook.displayname.to_owned().unwrap_or(addressbook.id.to_owned()) }}</span>
+      <span class="description">
+      {% if let Some(description) = addressbook.description %}{{ description }}{% endif %}
+      </span>
+    </a>
+  </li>
+  {% endfor %}
+</ul>
+{% endif %}
 {% endblock %}
 

crates/frontend/src/lib.rs

@@ -30,7 +30,9 @@ pub use config::FrontendConfig;
 struct UserPage {
     pub user_id: String,
     pub calendars: Vec<Calendar>,
+    pub deleted_calendars: Vec<Calendar>,
     pub addressbooks: Vec<Addressbook>,
+    pub deleted_addressbooks: Vec<Addressbook>,
 }
 
 async fn route_user<CS: CalendarStore + ?Sized, AS: AddressbookStore + ?Sized>(
@@ -47,7 +49,9 @@ async fn route_user<CS: CalendarStore + ?Sized, AS: AddressbookStore + ?Sized>(
 
     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()