You are a constitutional council ranking individual git commits for ownership allocation. Compare these two commits. Decide which contributed more lasting value to the project. Judge substance, not spectacle: - Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise. - Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one. - Do not favor a side merely because its patch is longer or noisier. - Weight what the change does for the project, not the contributor's name. Return ONLY a JSON object: {"winner": "A" or "B", "ratio": "N:M", "explanation": "..."} The explanation must cite concrete differences in the patches (1-3 sentences). Side A — contributor: tommy-mor Side A — commit message: [30a67104] fixes Side A — unified diff (full patch): diff --git a/agents.md b/agents.md index a6a283716e09fcaba1fd690f4e877e0bbecda2c0..d9a924d2f77c444d9b112bbf37a480b963ace4f0 100644 --- a/agents.md +++ b/agents.md @@ -39,7 +39,7 @@ Strict **CSP** that blocks `eval` would break the current app. Other projects ma - **`VoteComparePost`:** On success returns **`text/javascript`** that **morphs** **`#vote-compare-preview`** (new ingest card) and **`#vote-edge-history-region`** (recomputed edge list). Uses **`RpcResult::PostOk`**’s **`post_id`** / **`post_index`** for the card. **`__rpc__`** carries **`form_action: "/ui"`**; **`thread_tag`** and ratio fields come from the same form as **`$form`** holes. -- **Garden pin / compare voting:** Cookie **`slug_garden_pin`** via **`set_garden_pin`**. Pairwise UI: **`GET /vote/compare?…`** / **`GET /r/:room_key/vote/compare?…`**. HUD: **`#slug-pin-hud`** when **`layout`** passes garden metadata on **`body`**. +- **Garden pin / compare voting:** Cookie **`slug_garden_pin`** via **`set_garden_pin`**. Pairwise UI: **`GET /vote/compare?…`** / **`GET /r/:room_key/vote/compare?…`**. HUD: **`#slug-pin-hud`** when **`layout`** passes garden metadata on **`body`**; the label is **`POST /ui`** **`set_garden_pin`** **`clear:true`** (**`slug_ui.js`**), not a permalink to the item. **Rule of thumb:** New **CLI or API** verbs → `RpcCommand`. New **in-page morph or form-driven** behavior that only makes sense in the browser → `HtmlUiAction`. If both need the same operation, implement the real work once (e.g. call shared RPC helpers from `post_ui_html`) and keep the wire shapes separate. diff --git a/server/src/html/garden.rs b/server/src/html/garden.rs index 8a46b1e92d38f2c390f88d48750d95d11388cd73..121d9498e8cb93d4d001dc1bbce23d74fbb958f5 100644 --- a/server/src/html/garden.rs +++ b/server/src/html/garden.rs @@ -16,7 +16,6 @@ use crate::{ canonical_path::{canonicalize_item, canonicalize_tag}, form_template::template_json_compact, html::{ - forum::ingest_entry_markup, ui_action::UI_RPC_FIELD, user_can_post_room, JsBuilder, @@ -111,6 +110,23 @@ fn votes_for_edge(content: &ContentState, a: &ItemId, b: &ItemId) -> Vec usize { + let (lo, hi) = canonical_edge_items(a, b); + let lo_s = lo.as_str(); + let hi_s = hi.as_str(); + content + .item_votes + .get(&lo) + .into_iter() + .flat_map(|q| q.iter()) + .filter(|v| { + (v.a.as_str() == lo_s && v.b.as_str() == hi_s) + || (v.a.as_str() == hi_s && v.b.as_str() == lo_s) + }) + .count() +} + fn vote_thread_tags_for_pair(content: &ContentState, a: &ItemId, b: &ItemId) -> Vec { let set: HashSet = content .item_threads @@ -288,6 +304,7 @@ fn child_row_pin_or_vote( nav: &ThreadNav, row_item: &ItemId, pinned_room_and_item: Option<&(String, ItemId)>, + scope_content: &ContentState, next_path: &str, ) -> maud::Markup { let pin_matches_scope = pinned_room_and_item @@ -315,7 +332,16 @@ fn child_row_pin_or_vote( @if pi == row_item { span class="ont-garden-pinned-here" title="Pinned" aria-label="Pinned" { "📌" } } @else { - a class="ont-garden-vote-ico" href=(vote_compare_href(nav, pi, row_item, None)) title="Vote vs pinned" aria-label="Vote" { "⚖" } + @let nv = edge_vote_count_for_pair(scope_content, pi, row_item); + @let tip = format!( + "Compare and vote — {nv} pairwise vote{} in this scope for pinned vs this row", + if nv == 1 { "" } else { "s" }, + ); + @let aria = format!("Vote; {} pairwise {}", nv, if nv == 1 { "vote" } else { "votes" }); + a class="ont-garden-vote-ico" href=(vote_compare_href(nav, pi, row_item, None)) title=(tip) aria-label=(aria) { + span class="ont-garden-vote-glyph" aria-hidden="true" { "⚖" } + span class="ont-garden-vote-count" { (format!("{}", nv)) } + } } } @else { form method="POST" action="/ui" data-navigate="full" class="ont-pin-form ont-garden-pin-form" { @@ -978,10 +1004,9 @@ async fn render_scope_view( ) -> axum::response::Response { let scope = nav.scope(); let pin_ref = pinned_item_from_jar(&jar); - let model = { - let reduced = state.reduced.read().await; - build_item_page_view_model(&reduced, &scope, browse.item()) - }; + let reduced = state.reduced.read().await; + let model = build_item_page_view_model(&reduced, &scope, browse.item()); + let scope_content = content_for_garden_view(&reduced, &scope); let thread_href = |tag: &str| nav.thread_url(tag); let external_empty_body = browse.is_external() && model.body.is_none(); let cli_path_arg = item_display_path(&model.item); @@ -1108,7 +1133,7 @@ async fn render_scope_view( @let item_url = item_href(r.item.as_str(), &nav); @let score_str = format!("{:.3}", r.score); li data-garden-item=(r.item.as_str()) { - (child_row_pin_or_vote(&nav, &r.item, pin_ref.as_ref(), &next_for_pin)) + (child_row_pin_or_vote(&nav, &r.item, pin_ref.as_ref(), scope_content, &next_for_pin)) a class="item-link" href=(item_url) { code { (item_display_path(r.item.as_str())) } } span class="ont-rank-score" { (score_str) } } @@ -1124,7 +1149,7 @@ async fn render_scope_view( ul class="ont-group-list" { @for name in &model.child_rankings.unranked_items { li data-garden-item=(name.as_str()) { - (child_row_pin_or_vote(&nav, name, pin_ref.as_ref(), &next_for_pin)) + (child_row_pin_or_vote(&nav, name, pin_ref.as_ref(), scope_content, &next_for_pin)) @let href = item_href(name.as_str(), &nav); a class="item-link" href=(href) { code { (item_display_path(name.as_str())) } } } @@ -1363,6 +1388,33 @@ mod tests { })); } + #[test] + fn edge_vote_count_for_pair_matches_votes_for_edge_len() { + use super::{ + content_for_garden_view, edge_vote_count_for_pair, votes_for_edge, + }; + use crate::path_types::ItemId; + let mut reduced = ReducerState::default(); + apply_ingest( + &mut reduced, + 1, + "@00000000-0000-0000-0000-000000000000:test:local/test\n\ + ~/topic {root}\n\ + ~/topic/a {alpha}\n\ + ~/topic/b {beta}\n\ + ~/topic/a 3:2 ~/topic/b {first vote}\n\ + ~/topic/b 2:3 ~/topic/a {second vote}\n", + ); + let content = content_for_garden_view(&reduced, &ScopeId::Public); + let a = ItemId::parse("~/topic/a").unwrap().normalized_storage(); + let b = ItemId::parse("~/topic/b").unwrap().normalized_storage(); + assert_eq!( + edge_vote_count_for_pair(content, &a, &b), + votes_for_edge(content, &a, &b).len() + ); + assert_eq!(votes_for_edge(content, &a, &b).len(), 2); + } + #[test] fn item_page_model_includes_body_and_unranked_without_votes() { let mut reduced = ReducerState::default(); diff --git a/server/static/slug_ui.js b/server/static/slug_ui.js index c0de1cddbba78227dfb80bfd41e7b855b3a42bc3..86f935f8dd998f3d6df016f33b1e47f9780782ea 100644 --- a/server/static/slug_ui.js +++ b/server/static/slug_ui.js @@ -170,15 +170,6 @@ return { room: raw.slice(0, i), item: raw.slice(i + 1) }; } - function gardenItemHref(prefix, storageUrl) { - var marker = 'https://slug.social/~/'; - if (storageUrl.indexOf(marker) === 0) { - var tail = storageUrl.slice(marker.length); - return prefix.replace(/\/$/, '') + (tail ? '/' + tail : ''); - } - return storageUrl; - } - function refreshPinHud() { var hud = document.getElementById('slug-pin-hud'); if (!hud) return; @@ -187,19 +178,37 @@ var pin = decodePinCookie(); hud.innerHTML = ''; if (!pin || !prefix || pin.room !== bodyRoom) return; - var a = document.createElement('a'); - a.className = 'slug-pin-hud-link'; - a.href = gardenItemHref(prefix, pin.item); - a.title = 'Pinned item'; + var form = document.createElement('form'); + form.method = 'POST'; + form.action = '/ui'; + form.setAttribute('data-navigate', 'full'); + form.className = 'slug-pin-hud-form'; + var rpc = document.createElement('input'); + rpc.type = 'hidden'; + rpc.name = '__rpc__'; + rpc.value = JSON.stringify({ + action: 'set_garden_pin', + clear: true, + room_wire: '', + next: window.location.pathname + window.location.search, + form_action: '/ui', + }); + form.appendChild(rpc); + var btn = document.createElement('button'); + btn.type = 'submit'; + btn.className = 'slug-pin-hud-link slug-pin-hud-unpin-btn'; + btn.title = 'Unpin — removes this item from the corner HUD'; + btn.setAttribute('aria-label', 'Unpin pinned item'); var span = document.createElement('span'); span.className = 'slug-pin-hud-glyph'; span.setAttribute('aria-hidden', 'true'); span.textContent = '📌'; - a.appendChild(span); + btn.appendChild(span); var label = pin.item.replace(/^https:\/\/slug\.social\/~\/?/, '~/'); if (label.length > 36) label = label.slice(0, 34) + '…'; - a.appendChild(document.createTextNode(' ' + label)); - hud.appendChild(a); + btn.appendChild(document.createTextNode(' ' + label)); + form.appendChild(btn); + hud.appendChild(form); } refreshPinHud(); diff --git a/server/static/theme_default.css b/server/static/theme_default.css index ec0fbe7acee0aa2802f978f14a9b0fc86e78c5b8..9178f0629cfb868348740e6dea1626dc6afb8345 100644 --- a/server/static/theme_default.css +++ b/server/static/theme_default.css @@ -799,6 +799,12 @@ details > summary::-webkit-details-marker { display: none; } } /* Pinned item HUD — bottom bar, same plane as spread */ +.slug-pin-hud-form { + display: inline; + margin: 0; + padding: 0; + border: none; +} #slug-pin-hud.slug-pin-hud { margin-left: auto; max-width: min(42vw, 280px); @@ -808,6 +814,13 @@ details > summary::-webkit-details-marker { display: none; } overflow: hidden; text-overflow: ellipsis; } +.slug-pin-hud-link.slug-pin-hud-unpin-btn { + background: transparent; + border: none; + cursor: pointer; + font-size: inherit; + font-family: inherit; +} .slug-pin-hud-link { color: var(--ui); text-decoration: none; @@ -815,7 +828,10 @@ details > summary::-webkit-details-marker { display: none; } align-items: center; gap: 4px; } -.slug-pin-hud-link:hover { color: var(--signal); } +.slug-pin-hud-link:hover, +.slug-pin-hud-unpin-btn:hover { + color: var(--signal); +} .slug-pin-hud-glyph { font-size: 13px; line-height: 1; } /* Garden pin / vote controls */ @@ -890,10 +906,21 @@ span.ont-garden-pinned-here { align-items: center; justify-content: center; } +a.ont-garden-vote-ico { + gap: 4px; +} a.ont-garden-vote-ico:hover { color: var(--signal); background: var(--g4); } +.ont-garden-vote-count { + font-size: 10px; + font-weight: 700; + font-variant-numeric: tabular-nums; +} +span.ont-garden-vote-glyph { + line-height: 1; +} span.ont-garden-pinned-here { border-color: var(--link); color: var(--signal); diff --git a/server/static/theme_retro_craft.css b/server/static/theme_retro_craft.css index 092d4b3540b052cc86870179e4c264541c4446cc..efaeed06d01fd835df0621f4c621c8f034c8b536 100644 --- a/server/static/theme_retro_craft.css +++ b/server/static/theme_retro_craft.css @@ -593,6 +593,12 @@ body.view-ontology #controls { (Global craft `code` + `button[type=submit]` are tuned for dark thread pages; these overrides match the cream ontology shell.) ---------------------------------------------------------------- */ +body.view-ontology .slug-pin-hud-form { + display: inline; + margin: 0; + padding: 0; + border: none; +} body.view-ontology #slug-pin-hud.slug-pin-hud { margin-left: auto; max-width: min(42vw, 280px); @@ -603,6 +609,14 @@ body.view-ontology #slug-pin-hud.slug-pin-hud { overflow: hidden; text-overflow: ellipsis; } +body.view-ontology .slug-pin-hud-link.slug-pin-hud-unpin-btn { + background: transparent; + border: none; + cursor: pointer; + font-size: inherit; + font-family: inherit; + padding: 0; +} body.view-ontology .slug-pin-hud-link { color: #1a4a8c; text-decoration: none; @@ -610,7 +624,8 @@ body.view-ontology .slug-pin-hud-link { align-items: center; gap: 0.25rem; } -body.view-ontology .slug-pin-hud-link:hover { +body.view-ontology .slug-pin-hud-link:hover, +body.view-ontology .slug-pin-hud-unpin-btn:hover { color: #0d3d82; text-decoration: underline; } @@ -676,6 +691,20 @@ body.view-ontology .ont-garden-child-actions { gap: 0.1rem; } body.view-ontology button.ont-garden-pin-ico, +body.view-ontology a.ont-garden-vote-ico { + gap: 0.2rem; +} +body.view-ontology .ont-garden-vote-count { + font-size: 0.65rem; + font-family: var(--font-ui); + font-weight: 600; + font-variant-numeric: tabular-nums; + opacity: 0.92; +} +body.view-ontology span.ont-garden-vote-glyph { + line-height: 1; +} +body.view-ontology button.ont-garden-pin-ico, body.view-ontology a.ont-garden-vote-ico, body.view-ontology span.ont-garden-pinned-here { font-size: 0.95rem; diff --git a/test/browser_garden_pin.clj b/test/browser_garden_pin.clj index 169ff9b6913049094611fb0e5b6683b30220b285..98c086d5647207f3ac72dbb9cbc13488c030eef1 100644 --- a/test/browser_garden_pin.clj +++ b/test/browser_garden_pin.clj @@ -21,6 +21,17 @@ (do (Thread/sleep 200) (recur)) false)))))) +(defn- wait-for-absence-substr [pg selector substr timeout-ms] + "True once selector text does not contain substr (or is empty), or timeout." + (let [deadline (+ (System/currentTimeMillis) timeout-ms)] + (loop [] + (let [text (locator/text-content (page/locator pg selector))] + (if (not (and (string? text) (str/includes? text substr))) + true + (if (< (System/currentTimeMillis) deadline) + (do (Thread/sleep 200) (recur)) + false)))))) + (defn garden-pin-flow! [] (println "\n━━━ browser garden pin (POST /ui set_garden_pin + HUD + vote link) ━━━\n") @@ -75,8 +86,14 @@ (is (wait-for-text pg ".ont-item-shell" "~/gp-pin-b" 15000) "on item b page") (is (wait-for-text pg "a.ont-vote-compare-btn" "vote" 10000) "vote link visible vs pinned item") + ;; HUD clears pin (POST set_garden_pin clear), not navigate to item + (locator/click (page/locator pg "#slug-pin-hud button.slug-pin-hud-unpin-btn")) + (is (wait-for-absence-substr pg "#slug-pin-hud" "gp-pin-a" 15000) + "HUD clears after unpin from HUD button") + (is (wait-for-absence-substr pg "body" "ont-vote-compare-btn" 15000) + "compare vote CTA removed after HUD unpin on same reload") (is (str/includes? (or (page/url pg) "") "/~/gp-pin-b") - "still on item b after vote link check")))))) + "still on item b after HUD unpin")))))) (finally (when-some [s @!server] (common/kill-server s)) Side B — contributor: tommy-mor Side B — commit message: [7964b28f] fix Side B — unified diff (full patch): diff --git a/Cargo.lock b/Cargo.lock index 8c43fb75c472b102e6e1d3b837dce3355be898f2..e55d87f32ab32064686431c7082ef8c9ca872d63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -923,6 +923,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + [[package]] name = "prettyplease" version = "0.2.37" @@ -980,6 +989,36 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" +[[package]] +name = "rand" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.17", +] + [[package]] name = "regex-automata" version = "0.4.14" @@ -1270,6 +1309,7 @@ dependencies = [ "dotenvy", "futures-util", "maud", + "rand", "reqwest", "serde", "serde_json", @@ -1280,6 +1320,7 @@ dependencies = [ "tower-http 0.5.2", "tracing", "tracing-subscriber", + "urlencoding", ] [[package]] @@ -1656,6 +1697,12 @@ dependencies = [ "serde", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "utf8_iter" version = "1.0.4" @@ -2052,6 +2099,26 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zerocopy" +version = "0.8.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "zerofrom" version = "0.1.8" diff --git a/server/Cargo.toml b/server/Cargo.toml index c940acb687fb141d21760a3d6656172013cf6f41..6fb7bf52fa58f46f5e8fb0f7fd395247b57506d7 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -20,6 +20,8 @@ reqwest = { version = "0.12", features = ["json"] } dotenvy = "0.15" async-stream = "0.3" futures-util = { version = "0.3", default-features = false, features = ["std"] } +rand = "0.8" +urlencoding = "2" [dev-dependencies] reqwest = { version = "0.12", features = ["json"] } diff --git a/server/src/api/ui_html.rs b/server/src/api/ui_html.rs index e649a7d192feade465e19ce6187a829f6ec74372..06001212820101e0cc953d3687dea64f85e60787 100644 --- a/server/src/api/ui_html.rs +++ b/server/src/api/ui_html.rs @@ -47,6 +47,7 @@ pub async fn post_ui_html( ratio_left, ratio_right, scope, + next, } => { let parent = parent_from_scope(&scope); if let Err(e) = state @@ -56,9 +57,19 @@ pub async fn post_ui_html( return ui_js_warn(&e).into_response(); } let tree = state.tree.read().await; + if !next.trim().is_empty() { + drop(tree); + return JsBuilder::new() + .raw(&format!( + "window.location.href={};", + js_string_literal(next.trim()) + )) + .into_response(); + } let empty = crate::reducer::NodeState::default(); let node = tree.get(&parent).unwrap_or(&empty); let panel = ranking_panel(&parent, node, &tree); + drop(tree); JsBuilder::new() .morph_selector("#ranking-panel", panel) .into_response() @@ -126,6 +137,7 @@ mod tests { ratio_left: 3, ratio_right: 1, scope: String::new(), + next: String::new(), } ); } diff --git a/server/src/form_template.rs b/server/src/form_template.rs index b9bc3982a125e94e67c99175ea9055979541abba..bd4a7195a6eaabfed55333bab5640708ea108b81 100644 --- a/server/src/form_template.rs +++ b/server/src/form_template.rs @@ -7,19 +7,30 @@ pub fn template_json_compact(v: &T) -> serde_json::Result serde_json::to_string(v) } -/// Recursively walk the JSON AST and replace `{"$form": "key"}` with the submitted -/// string for `key` (empty if missing). Other keys are unchanged. +/// Recursively walk the JSON AST and replace form holes with submitted values. +/// +/// - `{"$form": "key"}` → string (empty if missing) +/// - `{"$form:i32": "key"}` → JSON number (0 if missing or unparseable) pub fn substitute_form_vars(val: &mut Value, form_data: &HashMap) { match val { Value::Object(map) => { if map.len() == 1 { - if let Some(Value::String(field_name)) = map.get("$form") { - let submitted = form_data - .get(field_name.as_str()) - .map(|s| s.as_str()) - .unwrap_or(""); - *val = Value::String(submitted.to_string()); - return; + if let Some((hole_key, Value::String(field_name))) = map.iter().next() { + if let Some(form_type) = hole_key.strip_prefix("$form") { + let submitted = form_data + .get(field_name.as_str()) + .map(|s| s.as_str()) + .unwrap_or(""); + *val = match form_type { + "" => Value::String(submitted.to_string()), + ":i32" => { + let n: i32 = submitted.trim().parse().unwrap_or(0); + Value::Number(n.into()) + } + _ => Value::String(submitted.to_string()), + }; + return; + } } } for v in map.values_mut() { @@ -62,6 +73,45 @@ mod tests { text: String, } + #[test] + fn i32_holes_become_numbers() { + let json = r#"{ + "ratio_left": {"$form:i32": "ratio_left"}, + "ratio_right": {"$form:i32": "ratio_right"} + }"#; + let mut form = HashMap::new(); + form.insert("ratio_left".into(), "75".into()); + form.insert("ratio_right".into(), "25".into()); + let v = fill_template_from_form(json, &form).unwrap(); + assert_eq!(v["ratio_left"], 75); + assert_eq!(v["ratio_right"], 25); + + #[derive(Debug, Deserialize, PartialEq, Eq)] + struct Ratios { + ratio_left: i32, + ratio_right: i32, + } + let r: Ratios = serde_json::from_value(v).unwrap(); + assert_eq!( + r, + Ratios { + ratio_left: 75, + ratio_right: 25, + } + ); + } + + #[test] + fn i32_hole_missing_or_bad_defaults_to_zero() { + let json = r#"{"n": {"$form:i32": "missing"}}"#; + let v = fill_template_from_form(json, &HashMap::new()).unwrap(); + assert_eq!(v["n"], 0); + let mut form = HashMap::new(); + form.insert("missing".into(), "nope".into()); + let v = fill_template_from_form(json, &form).unwrap(); + assert_eq!(v["n"], 0); + } + #[test] fn holes_become_strings() { let json = r#"{ diff --git a/server/src/html/mod.rs b/server/src/html/mod.rs index 3bf9fc7e92e50beed24e2c25106a77421038c90b..61cdbc094819ddedb755572c59456ec0d6617619 100644 --- a/server/src/html/mod.rs +++ b/server/src/html/mod.rs @@ -20,6 +20,8 @@ use crate::{ ui_action::UI_RPC_FIELD, }; +pub mod vote; + const SORTER_CSS: &str = include_str!("../../static/sorter.css"); const SORTER_UI_JS: &str = include_str!("../../static/sorter_ui.js"); @@ -131,7 +133,7 @@ fn layout(title: &str, body: Markup, views: u64) -> Markup { } } -fn item_href(id: &ItemId) -> String { +pub(crate) fn item_href(id: &ItemId) -> String { id.browse_href() } @@ -309,11 +311,23 @@ async fn item_page(state: AppState, uri: Uri, item: ItemId) -> Markup { let empty_node = NodeState::default(); let node = tree.get(&item).unwrap_or(&empty_node); + let child_count = node.children.len(); + let vote_link = if child_count >= 2 { + Some(vote::vote_href(&item)) + } else { + None + }; + let body = html! { h1 { "sorter" } (input_panel("", None)) (breadcrumb_path(&item)) (entity_section(&item, node, false)) + @if let Some(href) = vote_link { + p class="vote-cta" { + a class="btn-primary" href=(href) data-testid="vote-children" { "Vote on children" } + } + } (ranking_panel(&item, node, &tree)) }; layout("sorter2", body, views) diff --git a/server/src/lib.rs b/server/src/lib.rs index da5f3ebecec1794b05a2a69cc78379551b2ad769..7f7e28c8ac3758de87f1f8e073b24be4132d38da 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -4,6 +4,7 @@ pub mod events; pub mod fetch; pub mod form_template; pub mod html; +pub mod pair; pub mod parser; pub mod path_types; pub mod ranking; @@ -33,6 +34,7 @@ pub fn create_app(state: AppState) -> Router { .route("/static/:filename", get(crate::html::serve_static)) .route("/~/*item_path", get(crate::html::browse)) .route("/", get(crate::html::home)) + .route("/vote", get(crate::html::vote::vote_page)) .route("/ui", post(crate::api::ui_html::post_ui_html)) .with_state(state) .layer(TraceLayer::new_for_http()) diff --git a/server/src/ui_action.rs b/server/src/ui_action.rs index 2047713762c932ac9bc325fe15624f2aecb3364d..53581e1362bfcc5dfb4ae3069c41ea6f7be41437 100644 --- a/server/src/ui_action.rs +++ b/server/src/ui_action.rs @@ -31,6 +31,9 @@ pub enum HtmlUiAction { /// Parent node [`ItemId`] string; empty = tree root. #[serde(default)] scope: String, + /// After vote, navigate here (vote compare page). + #[serde(default)] + next: String, }, /// Parse pasted Reddit URL/path; redirect to subreddit ranking on success. ParseQuery { @@ -70,6 +73,36 @@ pub fn parse_html_ui_from_form( mod tests { use super::*; + #[test] + fn record_vote_round_trip_with_typed_ratio_holes() { + let template = serde_json::json!({ + "action": "record_vote", + "a": "x", + "b": "y", + "ratio_left": {"$form:i32": "ratio_left"}, + "ratio_right": {"$form:i32": "ratio_right"}, + "scope": "parent", + }); + let mut form = HashMap::new(); + form.insert( + UI_RPC_FIELD.to_string(), + serde_json::to_string(&template).unwrap(), + ); + form.insert("ratio_left".into(), "60".into()); + form.insert("ratio_right".into(), "40".into()); + assert_eq!( + parse_html_ui_from_form(&form).unwrap(), + HtmlUiAction::RecordVote { + a: "x".into(), + b: "y".into(), + ratio_left: 60, + ratio_right: 40, + scope: "parent".into(), + next: String::new(), + } + ); + } + #[test] fn record_vote_round_trip_with_form_holes() { let template = serde_json::json!({ @@ -96,6 +129,7 @@ mod tests { ratio_left: 2, ratio_right: 1, scope: "amitheasshole".into(), + next: String::new(), } ); } @@ -122,6 +156,7 @@ mod tests { ratio_left: 2, ratio_right: 1, scope: String::new(), + next: String::new(), } ); } diff --git a/server/static/sorter.css b/server/static/sorter.css index 021918f8e778b84e4b3eac8559fab7d223a3d490..3c2cec5cb5094013387147c621d75bd341bc06cc 100644 --- a/server/static/sorter.css +++ b/server/static/sorter.css @@ -224,4 +224,148 @@ code { h1 { margin: 0; +} + +.vote-cta { + margin: 0.75rem 0; +} + +.vote-compare-shell { + max-width: 960px; +} + +.vote-compare-scope { + margin: 0.5rem 0 1rem; +} + +.vote-compare-pair { + display: grid; + grid-template-columns: 1fr auto 1fr; + gap: 1rem; + align-items: start; + margin: 1rem 0; +} + +.vote-compare-vs { + align-self: center; + font-size: 1.25rem; + color: var(--muted); + font-weight: 600; +} + +.vote-compare-side { + background: var(--panel); + border: 1px solid var(--border); + border-radius: 8px; + padding: 1rem; + min-height: 120px; +} + +.vote-compare-item { + color: var(--accent); + text-decoration: none; + display: block; +} + +.vote-compare-item:hover { + text-decoration: underline; +} + +.vote-compare-figure { + margin: 0.75rem 0 0; +} + +.vote-compare-image { + display: block; + max-width: 100%; + height: auto; + border-radius: 6px; + border: 1px solid var(--border); +} + +.vote-compare-item-body { + margin-top: 0.75rem; + font-size: 0.9rem; +} + +.vote-compare-nav { + display: flex; + justify-content: space-between; + align-items: center; + gap: 1rem; + margin: 1rem 0; +} + +.vote-compare-next { + color: var(--accent); + text-decoration: none; +} + +.vote-compare-next.is-disabled { + color: var(--muted); +} + +.vote-compare-back { + text-decoration: none; +} + +.vote-compare-back:hover { + text-decoration: underline; +} + +.vote-compare-slider-label { + display: grid; + grid-template-columns: 1fr auto 1fr; + gap: 0.75rem; + align-items: center; + margin: 1.25rem 0; +} + +.vote-compare-slider-label input[type="range"] { + width: 100%; + min-width: 160px; +} + +#vote-slider-left-label { + text-align: right; +} + +#vote-slider-right-label { + text-align: left; +} + +.vote-edge-history-title { + margin: 1.5rem 0 0.5rem; + font-size: 1rem; +} + +.vote-edge-history { + list-style: none; + padding: 0; + margin: 0; +} + +.vote-edge-history-row { + margin-bottom: 0.75rem; +} + +.vote-edge-meta { + font-size: 0.875rem; + margin-bottom: 0.25rem; +} + +.ratio-bar { + display: flex; + height: 8px; + border-radius: 4px; + overflow: hidden; + background: var(--border); +} + +.ratio-left { + background: var(--accent); +} + +.ratio-right { + background: var(--muted); } \ No newline at end of file diff --git a/server/static/sorter_ui.js b/server/static/sorter_ui.js index 62c9158ecb3c2140b83efd2b27ea706a9e0ae127..c8d7c3ef2413399ced7898a7edb3e7a2c8e16163 100644 --- a/server/static/sorter_ui.js +++ b/server/static/sorter_ui.js @@ -81,7 +81,22 @@ }); } + function initVoteSlider() { + var slider = document.getElementById('vote-preference-slider'); + if (!slider) return; + var leftInput = document.getElementById('vote-ratio-left'); + var rightInput = document.getElementById('vote-ratio-right'); + function update() { + var v = parseInt(slider.value, 10); + if (leftInput) leftInput.value = String(v); + if (rightInput) rightInput.value = String(100 - v); + } + slider.addEventListener('input', update); + update(); + } + function initSorterUi() { + initVoteSlider(); document.addEventListener('submit', async function (e) { var f = e.target; if (!f || f.tagName !== 'FORM') return; @@ -89,10 +104,11 @@ if (f.getAttribute('data-navigate') === 'full') return; e.preventDefault(); await postUiForm(f); - if (f.id === 'vote-form') { + if (f.id === 'vote-form' || f.id === 'vote-compare-form') { f.reset(); - var firstField = f.querySelector('input[type="text"]'); - if (firstField) firstField.focus(); + var slider = f.querySelector('#vote-preference-slider'); + if (slider) slider.value = '50'; + initVoteSlider(); } }); }