Compare commits

..

No commits in common. "e0e627834fd6e87019879bc79b922b3c47bf5a3e" and "c2813d4033c468fbb33ec3a83847805bf18ad5fc" have entirely different histories.

5 changed files with 337 additions and 233 deletions

548
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -14,4 +14,4 @@ rand = { version = "0.8.5", default-features = false, features = ["alloc"] }
wasm-bindgen = "0.2.87" wasm-bindgen = "0.2.87"
wasm-logger = "0.2.0" wasm-logger = "0.2.0"
web-sys = "0.3.64" web-sys = "0.3.64"
yew = { version = "0.23.0", features = ["csr"] } yew = { version = "0.20.0", features = ["csr"] }

View File

@ -1,3 +1,4 @@
pub use use_board::use_board; pub use use_board::use_board;
pub use use_board::UseBoardHandle;
mod use_board; mod use_board;

View File

@ -1,4 +1,4 @@
use crate::consts::{AttemptField, Attempts, GameResult, Key, Status, VirtualKey, MAX_ATTEMPTS}; use crate::consts::{AttemptField, Attempts, GameResult, Key, VirtualKey, MAX_ATTEMPTS, Status};
use crate::services::words::{get_word_of_the_day, WORDS}; use crate::services::words::{get_word_of_the_day, WORDS};
use crate::utils::{evaluate_status, new_empty_virtual_keyboard}; use crate::utils::{evaluate_status, new_empty_virtual_keyboard};
use std::cell::RefCell; use std::cell::RefCell;
@ -64,8 +64,7 @@ impl UseBoardHandle {
char_field: att, char_field: att,
status, status,
} }
}) }).collect::<Vec<AttemptField>>();
.collect::<Vec<AttemptField>>();
new_attempts.fields.push(new_attempt_row.clone()); new_attempts.fields.push(new_attempt_row.clone());
let mut new_keyboard = (*self.virtual_keyboard).clone(); let mut new_keyboard = (*self.virtual_keyboard).clone();
@ -74,9 +73,7 @@ impl UseBoardHandle {
if key.key.cmp_char(&attempt_field.char_field) { if key.key.cmp_char(&attempt_field.char_field) {
if key.status.is_none() { if key.status.is_none() {
key.status = Some(attempt_field.status.clone()); key.status = Some(attempt_field.status.clone());
} else if key.status == Some(Status::Almost) } else if key.status == Some(Status::Almost) && attempt_field.status == Status::Found {
&& attempt_field.status == Status::Found
{
key.status = Some(Status::Found); key.status = Some(Status::Found);
} }
} }
@ -105,7 +102,7 @@ pub fn use_board() -> UseBoardHandle {
let current_attempt = use_state(String::new); let current_attempt = use_state(String::new);
let attempts: UseStateHandle<Attempts> = use_state(Attempts::new); let attempts: UseStateHandle<Attempts> = use_state(Attempts::new);
let attempt_index = use_mut_ref(|| 0usize); let attempt_index = use_mut_ref(|| 0usize);
let answer = use_memo("answer", |_| get_word_of_the_day()); let answer = use_memo(|_| get_word_of_the_day(), None::<()>);
let virtual_keyboard = use_state(|| new_empty_virtual_keyboard().into()); let virtual_keyboard = use_state(|| new_empty_virtual_keyboard().into());
let result = use_state(|| None::<GameResult>); let result = use_state(|| None::<GameResult>);

View File

@ -549,7 +549,6 @@ CRUZA
CRUZO CRUZO
CUAJA CUAJA
CUAJO CUAJO
CUBAS
CUBIL CUBIL
CUBRA CUBRA
CUBRO CUBRO
@ -566,9 +565,7 @@ CULPA
CULPO CULPO
CULTA CULTA
CULTO CULTO
CUNAS
CUNDE CUNDE
CUÑAS
CUOTA CUOTA
CURAN CURAN
CURAR CURAR
@ -813,7 +810,6 @@ FORMA
FORMO FORMO
FORRA FORRA
FORRO FORRO
FOSAS
FRASE FRASE
FRENA FRENA
FRENE FRENE
@ -830,7 +826,6 @@ FUERA
FUERO FUERO
FUESE FUESE
FUGAR FUGAR
FUGAS
FUGAZ FUGAZ
FULAR FULAR
FUNDA FUNDA
@ -1775,7 +1770,6 @@ RUINA
RUMBA RUMBA
RUMBO RUMBO
RUMOR RUMOR
RUNAS
RUPIA RUPIA
RURAL RURAL
RUSIA RUSIA
@ -2103,12 +2097,10 @@ TROVA
TROZO TROZO
TRUCO TRUCO
TRUFA TRUFA
TUCAN
TULIO TULIO
TUMBA TUMBA
TUMBO TUMBO
TUMOR TUMOR
TUNAS
TUNDA TUNDA
TUNDO TUNDO
TUPIR TUPIR