feat(client_web): add messages on points gains
This commit is contained in:
parent
3c28eb465e
commit
3b9a1277d8
9 changed files with 320 additions and 161 deletions
|
|
@ -1,10 +1,10 @@
|
|||
use leptos::prelude::*;
|
||||
use trictrac_store::{CheckerMove, Jan};
|
||||
use trictrac_store::Jan;
|
||||
|
||||
use crate::i18n::*;
|
||||
use crate::trictrac::types::{JanEntry, PlayerScore};
|
||||
use crate::trictrac::types::PlayerScore;
|
||||
|
||||
fn jan_label(jan: &Jan) -> String {
|
||||
pub fn jan_label(jan: &Jan) -> String {
|
||||
let i18n = use_i18n();
|
||||
match jan {
|
||||
Jan::FilledQuarter => t_string!(i18n, jan_filled_quarter).to_owned(),
|
||||
|
|
@ -23,89 +23,8 @@ fn jan_label(jan: &Jan) -> String {
|
|||
}
|
||||
}
|
||||
|
||||
fn format_move_pair(m1: CheckerMove, m2: CheckerMove) -> String {
|
||||
let fmt = |m: CheckerMove| -> String {
|
||||
let (f, t) = (m.get_from(), m.get_to());
|
||||
if f == 0 && t == 0 {
|
||||
"—".to_string()
|
||||
} else if t == 0 {
|
||||
format!("{f}↑")
|
||||
} else {
|
||||
format!("{f}→{t}")
|
||||
}
|
||||
};
|
||||
format!("{} & {}", fmt(m1), fmt(m2))
|
||||
}
|
||||
|
||||
fn jan_row(idx: usize, entry: JanEntry, expanded: RwSignal<Option<usize>>) -> impl IntoView {
|
||||
let i18n = use_i18n();
|
||||
let row_class = if entry.total >= 0 {
|
||||
"jan-row jan-expandable jan-positive"
|
||||
} else {
|
||||
"jan-row jan-expandable jan-negative"
|
||||
};
|
||||
let label = jan_label(&entry.jan);
|
||||
let double_tag = if entry.is_double {
|
||||
t_string!(i18n, jan_double).to_owned()
|
||||
} else {
|
||||
t_string!(i18n, jan_simple).to_owned()
|
||||
};
|
||||
let ways_tag = format!("×{}", entry.ways);
|
||||
let pts_str = if entry.total >= 0 {
|
||||
format!("+{}", entry.total)
|
||||
} else {
|
||||
format!("{}", entry.total)
|
||||
};
|
||||
|
||||
let moves = entry.moves.clone();
|
||||
let moves_hover = entry.moves.clone();
|
||||
// RwSignal is Copy so it can be captured by both closures independently.
|
||||
let hovered = use_context::<RwSignal<Vec<(CheckerMove, CheckerMove)>>>();
|
||||
|
||||
view! {
|
||||
<div>
|
||||
<div
|
||||
class=row_class
|
||||
on:click=move |_| {
|
||||
expanded.update(|s| {
|
||||
*s = if *s == Some(idx) { None } else { Some(idx) };
|
||||
});
|
||||
}
|
||||
on:mouseenter=move |_| {
|
||||
if let Some(h) = hovered {
|
||||
h.set(moves_hover.clone());
|
||||
}
|
||||
}
|
||||
on:mouseleave=move |_| {
|
||||
if let Some(h) = hovered {
|
||||
h.set(vec![]);
|
||||
}
|
||||
}
|
||||
>
|
||||
<span class="jan-label">{label}</span>
|
||||
<span class="jan-tag">{double_tag}</span>
|
||||
<span class="jan-tag">{ways_tag}</span>
|
||||
<span class="jan-pts">{pts_str}</span>
|
||||
</div>
|
||||
{
|
||||
let move_lines: Vec<_> = moves.iter()
|
||||
.map(|&(m1, m2)| {
|
||||
let text = format_move_pair(m1, m2);
|
||||
view! { <div class="jan-move-line">{text}</div> }
|
||||
})
|
||||
.collect();
|
||||
view! {
|
||||
<div class="jan-moves" class:hidden=move || expanded.get() != Some(idx)>
|
||||
{move_lines}
|
||||
</div>
|
||||
}
|
||||
}
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
#[component]
|
||||
pub fn PlayerScorePanel(score: PlayerScore, jans: Vec<JanEntry>, is_you: bool) -> impl IntoView {
|
||||
pub fn PlayerScorePanel(score: PlayerScore, is_you: bool) -> impl IntoView {
|
||||
let i18n = use_i18n();
|
||||
|
||||
let points_pct = format!("{}%", (score.points as u32 * 100 / 12).min(100));
|
||||
|
|
@ -114,13 +33,6 @@ pub fn PlayerScorePanel(score: PlayerScore, jans: Vec<JanEntry>, is_you: bool) -
|
|||
let holes_val = format!("{}/12", score.holes);
|
||||
let can_bredouille = score.can_bredouille;
|
||||
|
||||
let expanded: RwSignal<Option<usize>> = RwSignal::new(None);
|
||||
let jan_rows: Vec<_> = jans
|
||||
.into_iter()
|
||||
.enumerate()
|
||||
.map(|(i, entry)| jan_row(i, entry, expanded))
|
||||
.collect();
|
||||
|
||||
view! {
|
||||
<div class="player-score-panel">
|
||||
<div class="player-score-header">
|
||||
|
|
@ -148,9 +60,6 @@ pub fn PlayerScorePanel(score: PlayerScore, jans: Vec<JanEntry>, is_you: bool) -
|
|||
<span class="score-bar-value">{holes_val}</span>
|
||||
</div>
|
||||
</div>
|
||||
{(!jan_rows.is_empty()).then(|| view! {
|
||||
<div class="player-jans">{jan_rows}</div>
|
||||
})}
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue