Compare commits

..

No commits in common. "c7aa32b9225bec4d26a23b9ec7f9b9d2bfe67d96" and "66c299bc4c2960770e615a860d8da2f578b210e6" have entirely different histories.

7 changed files with 21 additions and 42 deletions

10
Cargo.lock generated
View File

@ -2910,7 +2910,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]] [[package]]
name = "letterbox" name = "letterbox"
version = "0.0.119" version = "0.0.118"
dependencies = [ dependencies = [
"build-info", "build-info",
"build-info-build", "build-info-build",
@ -2936,7 +2936,7 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-server" name = "letterbox-server"
version = "0.0.119" version = "0.0.118"
dependencies = [ dependencies = [
"ammonia", "ammonia",
"anyhow", "anyhow",
@ -3455,7 +3455,7 @@ dependencies = [
[[package]] [[package]]
name = "notmuch" name = "notmuch"
version = "0.0.119" version = "0.0.118"
dependencies = [ dependencies = [
"itertools 0.10.5", "itertools 0.10.5",
"log", "log",
@ -4250,7 +4250,7 @@ dependencies = [
[[package]] [[package]]
name = "procmail2notmuch" name = "procmail2notmuch"
version = "0.0.119" version = "0.0.118"
dependencies = [ dependencies = [
"anyhow", "anyhow",
] ]
@ -5329,7 +5329,7 @@ dependencies = [
[[package]] [[package]]
name = "shared" name = "shared"
version = "0.0.119" version = "0.0.118"
dependencies = [ dependencies = [
"build-info", "build-info",
"notmuch", "notmuch",

View File

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

View File

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

View File

@ -1,6 +1,6 @@
[package] [package]
name = "letterbox-server" name = "letterbox-server"
version = "0.0.119" version = "0.0.118"
edition = "2021" edition = "2021"
default-run = "letterbox-server" default-run = "letterbox-server"

View File

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

View File

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

View File

@ -91,7 +91,7 @@ pub fn view(model: &Model) -> Node<Msg> {
"flex-wrap-reverse", "flex-wrap-reverse",
"bg-black", "bg-black",
"text-white", "text-white",
"lg:flex-nowrap", "lg:flex-nowrap"
], ],
div![ div![
C!["w-full", "lg:w-48", "flex-none", "flex", "flex-col"], C!["w-full", "lg:w-48", "flex-none", "flex", "flex-col"],
@ -917,7 +917,7 @@ fn thread(
C![&tw_classes::BUTTON, "rounded-r-none"], C![&tw_classes::BUTTON, "rounded-r-none"],
attrs! {At::Title => "Mark as read"}, attrs! {At::Title => "Mark as read"},
span![i![C!["far", "fa-envelope-open"]]], span![i![C!["far", "fa-envelope-open"]]],
span![C!["pl-2"], "Read"], span![C!["pl-2", "hidden", "md:inline"], "Read"],
ev(Ev::Click, move |_| Msg::MultiMsg(vec![ ev(Ev::Click, move |_| Msg::MultiMsg(vec![
Msg::SetUnread(read_thread_id, false), Msg::SetUnread(read_thread_id, false),
Msg::GoToSearchResults Msg::GoToSearchResults
@ -927,7 +927,7 @@ fn thread(
C![&tw_classes::BUTTON, "rounded-l-none"], C![&tw_classes::BUTTON, "rounded-l-none"],
attrs! {At::Title => "Mark as unread"}, attrs! {At::Title => "Mark as unread"},
span![i![C!["far", "fa-envelope"]]], span![i![C!["far", "fa-envelope"]]],
span![C!["pl-2"], "Unread"], span![C!["pl-2", "hidden", "md:inline"], "Unread"],
ev(Ev::Click, move |_| Msg::MultiMsg(vec![ ev(Ev::Click, move |_| Msg::MultiMsg(vec![
Msg::SetUnread(unread_thread_id, true), Msg::SetUnread(unread_thread_id, true),
Msg::GoToSearchResults Msg::GoToSearchResults
@ -938,7 +938,7 @@ fn thread(
C![&tw_classes::BUTTON, "text-red-500"], C![&tw_classes::BUTTON, "text-red-500"],
attrs! {At::Title => "Spam"}, attrs! {At::Title => "Spam"},
span![i![C!["far", "fa-hand"]]], span![i![C!["far", "fa-hand"]]],
span![C!["pl-2"], "Spam"], span![C!["pl-2", "hidden", "md:inline"], "Spam"],
ev(Ev::Click, move |_| Msg::MultiMsg(vec![ ev(Ev::Click, move |_| Msg::MultiMsg(vec![
Msg::AddTag(spam_add_thread_id, "Spam".to_string()), Msg::AddTag(spam_add_thread_id, "Spam".to_string()),
Msg::SetUnread(spam_unread_thread_id, false), Msg::SetUnread(spam_unread_thread_id, false),
@ -1191,7 +1191,7 @@ fn news_post(post: &ShowThreadQueryThreadOnNewsPost, content_el: &ElRef<HtmlElem
C![&tw_classes::BUTTON, "rounded-r-none"], C![&tw_classes::BUTTON, "rounded-r-none"],
attrs! {At::Title => "Mark as read"}, attrs! {At::Title => "Mark as read"},
span![i![C!["far", "fa-envelope-open"]]], span![i![C!["far", "fa-envelope-open"]]],
span![C!["pl-2"], "Read"], span![C!["pl-2", "hidden", "md:inline"], "Read"],
ev(Ev::Click, move |_| Msg::MultiMsg(vec![ ev(Ev::Click, move |_| Msg::MultiMsg(vec![
Msg::SetUnread(read_thread_id, false), Msg::SetUnread(read_thread_id, false),
Msg::GoToSearchResults Msg::GoToSearchResults
@ -1201,7 +1201,7 @@ fn news_post(post: &ShowThreadQueryThreadOnNewsPost, content_el: &ElRef<HtmlElem
C![&tw_classes::BUTTON, "rounded-l-none"], C![&tw_classes::BUTTON, "rounded-l-none"],
attrs! {At::Title => "Mark as unread"}, attrs! {At::Title => "Mark as unread"},
span![i![C!["far", "fa-envelope"]]], span![i![C!["far", "fa-envelope"]]],
span![C!["pl-2"], "Unread"], span![C!["pl-2", "hidden", "md:inline"], "Unread"],
ev(Ev::Click, move |_| Msg::MultiMsg(vec![ ev(Ev::Click, move |_| Msg::MultiMsg(vec![
Msg::SetUnread(unread_thread_id, true), Msg::SetUnread(unread_thread_id, true),
Msg::GoToSearchResults Msg::GoToSearchResults
@ -1245,8 +1245,6 @@ fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg>
.map(|(idx, _)| idx) .map(|(idx, _)| idx)
.unwrap_or(url.len()); .unwrap_or(url.len());
let domain = &url[..idx]; let domain = &url[..idx];
let add_archive_url = format!("https://archive.is/?url={url}");
let view_archive_url = format!("https://archive.is/newest/{url}");
let favicon = div![ let favicon = div![
C![ C![
"w-16", "w-16",
@ -1269,36 +1267,17 @@ fn render_news_post_header(post: &ShowThreadQueryThreadOnNewsPost) -> Node<Msg>
div![ div![
C!["px-4", "mr-auto"], C!["px-4", "mr-auto"],
div![ div![
div![C!["font-semibold", "text-sm"], from], span![C!["font-semibold", "text-sm"], from],
div![ div![
C!["flex", "gap-2", "pt-2", "text-sm"], C!["text-xs"],
a![ small![a![
C![&tw_classes::BUTTON],
attrs! { attrs! {
At::Href => post.url, At::Href => post.url,
At::Target => "_blank", At::Target => "_blank",
}, },
span![C!["hidden", "md:inline"], "Source "], "Source ",
i![C!["fas", "fa-up-right-from-square"]], i![C!["fas", "fa-up-right-from-square"]],
], ]]
a![
C![&tw_classes::BUTTON],
attrs! {
At::Href => add_archive_url,
At::Target => "_blank",
},
span![C!["hidden", "md:inline"], "Archive "],
i![C!["fas", "fa-plus"]],
],
a![
C![&tw_classes::BUTTON],
attrs! {
At::Href => view_archive_url,
At::Target => "_blank",
},
span![C!["hidden", "md:inline"], "Archive "],
i![C!["fas", "fa-magnifying-glass"]],
]
] ]
] ]
], ],