Cargo.lock

@@ -2469,7 +2469,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "letterbox"
-version = "0.0.47"
+version = "0.0.46"
 dependencies = [
  "build-info",
  "build-info-build",
@@ -2988,7 +2988,7 @@ dependencies = [
 
 [[package]]
 name = "notmuch"
-version = "0.0.47"
+version = "0.0.46"
 dependencies = [
  "itertools 0.10.5",
  "log",
@@ -3625,7 +3625,7 @@ dependencies = [
 
 [[package]]
 name = "procmail2notmuch"
-version = "0.0.47"
+version = "0.0.46"
 dependencies = [
  "anyhow",
 ]
@@ -4547,7 +4547,7 @@ dependencies = [
 
 [[package]]
 name = "server"
-version = "0.0.47"
+version = "0.0.46"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -4646,7 +4646,7 @@ dependencies = [
 
 [[package]]
 name = "shared"
-version = "0.0.47"
+version = "0.0.46"
 dependencies = [
  "build-info",
  "notmuch",

notmuch/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "notmuch"
-version = "0.0.47"
+version = "0.0.46"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

procmail2notmuch/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "procmail2notmuch"
-version = "0.0.47"
+version = "0.0.46"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "server"
-version = "0.0.47"
+version = "0.0.46"
 edition = "2021"
 default-run = "server"
 

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shared"
-version = "0.0.47"
+version = "0.0.46"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

web/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-version = "0.0.47"
+version = "0.0.46"
 name = "letterbox"
 repository = "https://github.com/seed-rs/seed-quickstart"
 authors = ["Bill Thiede <git@xinu.tv>"]

web/src/view/mod.rs

@@ -375,35 +375,7 @@ fn has_unread(tags: &[String]) -> bool {
     tags.contains(&String::from("unread"))
 }
 
-fn render_avatar(avatar: Option<String>, from: &str, big: bool) -> Node<Msg> {
-    let initials: String = from
-        .to_lowercase()
-        .trim()
-        .split(" ")
-        .map(|word| word.chars().next().unwrap())
-        .filter(|c| c.is_alphanumeric())
-        // Limit to 2 characters because more characters don't fit in the box
-        .take(2)
-        .collect();
-    let from_color = compute_color(from);
-    let size = if big {
-        C!["w-16", "h-16", "text-5xl"]
-    } else {
-        C!["w-8", "h-8", "text-xl"]
-    };
-    div![
-        C![
-            "font-extrabold",
-            "grid",
-            "place-content-center",
-            "uppercase"
-        ],
-        size,
-        style! {St::BackgroundColor=>from_color},
-        span![initials]
-    ]
-}
-fn render_svg_avatar(avatar: Option<String>, from: &str) -> Node<Msg> {
+fn render_avatar(avatar: Option<String>, from: &str) -> Node<Msg> {
     let initials: String = from
         .to_lowercase()
         .trim()
@@ -484,14 +456,14 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
     //let avatar: Option<String> = Some(String::from("https://bulma.io/images/placeholders/64x64.png"));
     let id = msg.id.clone();
     let is_unread = has_unread(&msg.tags);
-    let avatar = render_avatar(avatar, &from, true);
+    let img = render_avatar(avatar, &from);
     let unknown = "UNKNOWN".to_string();
     div![figure![
         C!["flex"],
-        div![avatar],
+        div![C!["w-16", "h-16", "h-auto"], &img],
         div![
             C!["px-4", "mr-auto"],
-            span![C!["font-semibold", "text-sm"], &from],
+            span![C!["font-semibold"], &from],
             " ",
             from_detail.as_ref().map(|text| copy_text_widget(&text)),
             IF!(!msg.to.is_empty() =>div![
@@ -542,14 +514,11 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
                     })
                 ]
             ]),
+            msg.timestamp.map(|ts| span![C!["header"], human_age(ts)]),
         ],
         span![
-            C!["text-right"],
-            msg.timestamp
-                .map(|ts| div![C!["text-xs", "text-nowrap"], human_age(ts)]),
+            C!["m-4", "read-status"],
             i![C![
-                "mx-4",
-                "read-status",
                 "far",
                 if is_unread {
                     "fa-envelope"
@@ -557,10 +526,14 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
                     "fa-envelope-open"
                 },
             ]],
-            ev(Ev::Click, move |e| {
-                e.stop_propagation();
-                Msg::SetUnread(id, !is_unread)
-            }),
+            {
+                // TODO remove clone and code block when removing article![] below
+                let id = id.clone();
+                ev(Ev::Click, move |e| {
+                    e.stop_propagation();
+                    Msg::SetUnread(id, !is_unread)
+                })
+            }
         ]
     ]]
 }
@@ -580,16 +553,16 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
     //let avatar: Option<String> = Some(String::from("https://bulma.io/images/placeholders/64x64.png"));
     let id = msg.id.clone();
     let is_unread = has_unread(&msg.tags);
-    let avatar = render_avatar(avatar, &from, false);
+    let img = render_avatar(avatar, &from);
     let unknown = "UNKNOWN".to_string();
     div![figure![
         C!["flex"],
-        div![avatar],
+        div![C!["w-16", "h-16", "h-auto"], &img],
         div![
             C!["px-4", "mr-auto"],
-            div![C!["font-semibold", "text-sm"], &from],
+            span![C!["font-semibold"], &from],
             " ",
-            IF!(!msg.to.is_empty() => span![
+            IF!(!msg.to.is_empty() =>div![
                 C!["text-xs"],
                 span![
                     C!["font-semibold"],
@@ -603,10 +576,9 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                             name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown))
                         ]
                     })
-                ],
-                " "
+                ]
             ]),
-            IF!(!msg.cc.is_empty() => span![
+            IF!(!msg.cc.is_empty() =>div![
                 C!["text-xs"],
                 span![
                     C!["font-semibold"],
@@ -621,26 +593,29 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                         ]
                     })
                 ]
-            ])
+            ]),
+            msg.timestamp.map(|ts| span![C!["header"], human_age(ts)]),
         ],
         span![
-            C!["text-right"],
-            msg.timestamp
-                .map(|ts| div![C!["text-xs", "text-nowrap"], human_age(ts)]),
-            i![C![
-                "mx-4",
-                "read-status",
-                "far",
-                if is_unread {
-                    "fa-envelope"
-                } else {
-                    "fa-envelope-open"
-                },
-            ]],
-            ev(Ev::Click, move |e| {
-                e.stop_propagation();
-                Msg::SetUnread(id, !is_unread)
-            }),
+            C!["m-4", "read-status"],
+            i![
+                C![
+                    "far",
+                    if is_unread {
+                        "fa-envelope"
+                    } else {
+                        "fa-envelope-open"
+                    },
+                ],
+                {
+                    // TODO remove clone and code block when removing article![] below
+                    let id = id.clone();
+                    ev(Ev::Click, move |e| {
+                        e.stop_propagation();
+                        Msg::SetUnread(id, !is_unread)
+                    })
+                }
+            ]
         ]
     ]]
 }
@@ -1100,7 +1075,7 @@ fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg>
     //let avatar: Option<String> = Some(String::from("https://bulma.io/images/placeholders/64x64.png"));
     let id = post.thread_id.clone();
     let is_unread = !post.is_read;
-    let img = render_avatar(avatar, &from, true);
+    let img = render_avatar(avatar, &from);
     article![
         C!["media"],
         figure![C!["media-left"], p![C!["image", "is-64x64"], img]],