Compare commits

..

2 Commits

Author SHA1 Message Date
e1a502ac4b chore: Release
All checks were successful
Continuous integration / Test Suite (push) Successful in 44s
Continuous integration / Check (push) Successful in 2m1s
Continuous integration / Trunk (push) Successful in 38s
Continuous integration / Rustfmt (push) Successful in 1m5s
Continuous integration / build (push) Successful in 50s
Continuous integration / Disallow unused dependencies (push) Successful in 2m38s
2025-02-24 14:56:17 -08:00
9346c46e62 web: change exit catchup behavior to view current message 2025-02-24 14:55:51 -08:00
7 changed files with 19 additions and 15 deletions

10
Cargo.lock generated
View File

@ -2965,7 +2965,7 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-notmuch" name = "letterbox-notmuch"
version = "0.9.0" version = "0.9.1"
dependencies = [ dependencies = [
"itertools 0.14.0", "itertools 0.14.0",
"log", "log",
@ -2980,14 +2980,14 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-procmail2notmuch" name = "letterbox-procmail2notmuch"
version = "0.9.0" version = "0.9.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
] ]
[[package]] [[package]]
name = "letterbox-server" name = "letterbox-server"
version = "0.9.0" version = "0.9.1"
dependencies = [ dependencies = [
"ammonia", "ammonia",
"anyhow", "anyhow",
@ -3030,7 +3030,7 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-shared" name = "letterbox-shared"
version = "0.9.0" version = "0.9.1"
dependencies = [ dependencies = [
"build-info", "build-info",
"letterbox-notmuch", "letterbox-notmuch",
@ -3039,7 +3039,7 @@ dependencies = [
[[package]] [[package]]
name = "letterbox-web" name = "letterbox-web"
version = "0.9.0" version = "0.9.1"
dependencies = [ dependencies = [
"build-info", "build-info",
"build-info-build", "build-info-build",

View File

@ -8,7 +8,7 @@ authors = ["Bill Thiede <git@xinu.tv>"]
edition = "2021" edition = "2021"
license = "UNLICENSED" license = "UNLICENSED"
publish = ["xinu"] publish = ["xinu"]
version = "0.9.0" version = "0.9.1"
repository = "https://git.z.xinu.tv/wathiede/letterbox" repository = "https://git.z.xinu.tv/wathiede/letterbox"
[profile.dev] [profile.dev]

View File

@ -48,8 +48,8 @@ urlencoding = "2.1.3"
#xtracing = { path = "../../xtracing" } #xtracing = { path = "../../xtracing" }
#xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" } #xtracing = { git = "http://git-private.h.xinu.tv/wathiede/xtracing.git" }
xtracing = { version = "0.3.0", registry = "xinu" } xtracing = { version = "0.3.0", registry = "xinu" }
letterbox-notmuch = { version = "0.9.0", path = "../notmuch", registry = "xinu" } letterbox-notmuch = { version = "0.9.1", path = "../notmuch", registry = "xinu" }
letterbox-shared = { version = "0.9.0", path = "../shared", registry = "xinu" } letterbox-shared = { version = "0.9.1", path = "../shared", registry = "xinu" }
[build-dependencies] [build-dependencies]
build-info-build = "0.0.39" build-info-build = "0.0.39"

View File

@ -12,5 +12,5 @@ version.workspace = true
[dependencies] [dependencies]
build-info = "0.0.39" build-info = "0.0.39"
letterbox-notmuch = { version = "0.9.0", path = "../notmuch", registry = "xinu" } letterbox-notmuch = { version = "0.9.1", path = "../notmuch", registry = "xinu" }
serde = { version = "1.0.147", features = ["derive"] } serde = { version = "1.0.147", features = ["derive"] }

View File

@ -33,8 +33,8 @@ wasm-bindgen = "=0.2.100"
uuid = { version = "1.13.1", features = [ uuid = { version = "1.13.1", features = [
"js", "js",
] } # direct dep to set js feature, prevents Rng issues ] } # direct dep to set js feature, prevents Rng issues
letterbox-shared = { version = "0.9.0", path = "../shared", registry = "xinu" } letterbox-shared = { version = "0.9.1", path = "../shared", registry = "xinu" }
letterbox-notmuch = { version = "0.9.0", path = "../notmuch", registry = "xinu" } letterbox-notmuch = { version = "0.9.1", path = "../notmuch", registry = "xinu" }
seed_hooks = { version = "0.4.0", registry = "xinu" } seed_hooks = { version = "0.4.0", registry = "xinu" }
[package.metadata.wasm-pack.profile.release] [package.metadata.wasm-pack.profile.release]

View File

@ -586,7 +586,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
model.versions.server = Some(version); model.versions.server = Some(version);
} }
Msg::StartCatchup => { Msg::CatchupStart => {
let query = if model.query.contains("is:unread") { let query = if model.query.contains("is:unread") {
model.query.to_string() model.query.to_string()
} else { } else {
@ -625,6 +625,9 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
return; return;
}; };
} }
Msg::CatchupExit => {
model.catchup = None;
}
} }
} }
@ -778,8 +781,9 @@ pub enum Msg {
SetProgress(f64), SetProgress(f64),
UpdateServerVersion(String), UpdateServerVersion(String),
StartCatchup, CatchupStart,
CatchupKeepUnread, CatchupKeepUnread,
CatchupMarkAsRead, CatchupMarkAsRead,
CatchupNext, CatchupNext,
CatchupExit,
} }

View File

@ -193,7 +193,7 @@ fn catchup_view(
div![ div![
C!["absolute", "right-4", "text-gray-500"], C!["absolute", "right-4", "text-gray-500"],
span![i![C!["fas", "fa-x"]]], span![i![C!["fas", "fa-x"]]],
ev(Ev::Click, move |_| Msg::GoToSearchResults) ev(Ev::Click, move |_| Msg::CatchupExit)
], ],
h1![ h1![
C!["text-center"], C!["text-center"],
@ -449,7 +449,7 @@ fn search_toolbar(
attrs! {At::Title => "Mark as read"}, attrs! {At::Title => "Mark as read"},
span![i![C!["far", "fa-eye"]]], span![i![C!["far", "fa-eye"]]],
span![C!["pl-2", "hidden", "md:inline"], "Catch-up"], span![C!["pl-2", "hidden", "md:inline"], "Catch-up"],
ev(Ev::Click, |_| Msg::StartCatchup) ev(Ev::Click, |_| Msg::CatchupStart)
]], ]],
], ],
div![ div![