Compare commits
No commits in common. "8d02ea1b6afcb2e0e47555a8c28b256e27242989" and "d521d69eac53c9ab1cfc6bacf258e73c8e537b1a" have entirely different histories.
8d02ea1b6a
...
d521d69eac
19
LICENSE.md
19
LICENSE.md
|
|
@ -1,19 +0,0 @@
|
|||
Copyright (c) 2023 Kirbylife <hola@kirbylife.dev>
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
23
README.md
23
README.md
|
|
@ -1,23 +0,0 @@
|
|||
## Worsdle
|
||||
|
||||
A simple [Wordle](https://es.wikipedia.org/wiki/Wordle) clone written in Rust and Yem with spanish words.
|
||||
|
||||
### Dependencies to build
|
||||
|
||||
- [Trunk](https://trunkrs.dev/)
|
||||
|
||||
### How to build to production
|
||||
|
||||
1. `cargo install --locked trunk`
|
||||
2. `git clone https://git.kirbylife.dev/kirbylife/worsdle`
|
||||
3. `cd worsdle`
|
||||
4. `trunk build --release`
|
||||
5. The build should be in the `dist/` folder.
|
||||
|
||||
### Run a dev server
|
||||
|
||||
1. `trunk serve`
|
||||
|
||||
### Contribute
|
||||
|
||||
If you want to add a new word to the list, you can pass it to me through any social network.
|
||||
|
|
@ -2,13 +2,12 @@
|
|||
<html lang="es">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta content="width=device-width, initial-scale=1.0" name="viewport"/>
|
||||
<title>Yew App</title>
|
||||
<link href="https://maxst.icons8.com/vue-static/landings/line-awesome/line-awesome/1.3.0/css/line-awesome.min.css"
|
||||
rel="stylesheet">
|
||||
<link data-trunk href="static/css/styles.css" rel="css"/>
|
||||
<link data-trunk href="static/css/normalize.css" rel="css"/>
|
||||
<link rel="stylesheet" href="https://maxst.icons8.com/vue-static/landings/line-awesome/line-awesome/1.3.0/css/line-awesome.min.css">
|
||||
<link data-trunk rel="css" href="static/css/styles.css" />
|
||||
<link data-trunk rel="css" href="static/css/normalize.css" />
|
||||
</head>
|
||||
<body>
|
||||
<h1>Hola mundo</h1>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
use crate::consts::{Key, KeyboardKeyType, VirtualKey, Status};
|
||||
use crate::consts::{Key, KeyboardKeyType, VirtualKey};
|
||||
use yew::prelude::*;
|
||||
|
||||
#[derive(Properties, PartialEq)]
|
||||
|
|
@ -21,19 +21,7 @@ pub fn Keyboard(props: &KeyboardProps) -> Html {
|
|||
<div class="keyboard"> {
|
||||
for (props.keyboard).iter().map(|vk: &VirtualKey| {
|
||||
match vk.key {
|
||||
KeyboardKeyType::CharKey(c) => html! {
|
||||
<button
|
||||
class={
|
||||
match vk.status {
|
||||
Some(Status::Found) => "correct",
|
||||
Some(Status::NotFound) => "missed",
|
||||
Some(Status::Almost) => "almost",
|
||||
None => ""
|
||||
}
|
||||
}
|
||||
onclick={ handle_click(Key::CharKey(c)) }
|
||||
> { c } </button>
|
||||
},
|
||||
KeyboardKeyType::CharKey(c) => html! { <button onclick={ handle_click(Key::CharKey(c)) }> { c } </button> },
|
||||
KeyboardKeyType::Backspace => html! { <button onclick={ handle_click(Key::Backspace) } class="key-big"><i class="las la-undo"></i></button> },
|
||||
KeyboardKeyType::Enter => html! { <button onclick={ handle_click(Key::Enter) } class="key-big"> { "Enviar" } </button> }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
use crate::consts::{GameResult, MAX_ATTEMPTS};
|
||||
use crate::consts::GameResult;
|
||||
use yew::prelude::*;
|
||||
use crate::consts::{Attempts, Status};
|
||||
|
||||
|
|
@ -14,26 +14,20 @@ pub fn ResultBoard(props: &ResultBoardProps) -> Html {
|
|||
} = props;
|
||||
|
||||
html! {
|
||||
<div class="result-board">
|
||||
<p>
|
||||
{ format!("Palabra encontrada en {}/{} intentos", attempts.fields.len(), MAX_ATTEMPTS) }
|
||||
</p><br/>
|
||||
<p> {
|
||||
<div class="result-board"> {
|
||||
for attempts.fields.iter().map(|attempt| {
|
||||
html_nested! {
|
||||
<> {
|
||||
<p class={ "result-board" }> {
|
||||
for attempt.iter().map(| att| {
|
||||
match att.status {
|
||||
Status::Found => html_nested! { <> { "🟩" } </> },
|
||||
Status::Almost => html_nested! { <>{ "🟨" }</> },
|
||||
Status::NotFound => html_nested! { <>{ "⬛" }</> }
|
||||
|
||||
Status::Almost => html_nested! { <span>{ "🟨" }</span> },
|
||||
Status::NotFound => html_nested! { <span>{ "⬜" }</span> }
|
||||
}
|
||||
})
|
||||
} <br/></>
|
||||
} </p>
|
||||
}
|
||||
})
|
||||
} </p>
|
||||
</div>
|
||||
} </div>
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,15 +10,6 @@ pub enum KeyboardKeyType {
|
|||
CharKey(char),
|
||||
}
|
||||
|
||||
impl KeyboardKeyType {
|
||||
pub fn cmp_char(&self, char_to_compare: &char) -> bool {
|
||||
match self {
|
||||
KeyboardKeyType::CharKey(ch) => ch == char_to_compare,
|
||||
_ => false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, PartialEq)]
|
||||
pub enum Status {
|
||||
NotFound,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
use crate::consts::{AttemptField, Attempts, GameResult, Key, VirtualKey, MAX_ATTEMPTS, Status};
|
||||
use crate::consts::{AttemptField, Attempts, GameResult, Key, VirtualKey, MAX_ATTEMPTS};
|
||||
use crate::services::words::{get_word_of_the_day, WORDS};
|
||||
use crate::utils::{evaluate_status, new_empty_virtual_keyboard};
|
||||
use std::cell::RefCell;
|
||||
|
|
@ -64,22 +64,8 @@ impl UseBoardHandle {
|
|||
char_field: att,
|
||||
status,
|
||||
}
|
||||
}).collect::<Vec<AttemptField>>();
|
||||
new_attempts.fields.push(new_attempt_row.clone());
|
||||
|
||||
let mut new_keyboard = (*self.virtual_keyboard).clone();
|
||||
for key in new_keyboard.iter_mut() {
|
||||
for attempt_field in new_attempt_row.iter() {
|
||||
if key.key.cmp_char(&attempt_field.char_field) {
|
||||
if key.status.is_none() {
|
||||
key.status = Some(attempt_field.status.clone());
|
||||
} else if key.status == Some(Status::Almost) && attempt_field.status == Status::Found {
|
||||
key.status = Some(Status::Found);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
self.virtual_keyboard.set(new_keyboard);
|
||||
}).collect();
|
||||
new_attempts.fields.push(new_attempt_row);
|
||||
|
||||
self.attempts.set(new_attempts);
|
||||
*self.attempt_index.borrow_mut() += 1;
|
||||
|
|
@ -102,7 +88,8 @@ pub fn use_board() -> UseBoardHandle {
|
|||
let current_attempt = use_state(|| "".to_string());
|
||||
let attempts: UseStateHandle<Attempts> = use_state(|| Attempts::new());
|
||||
let attempt_index = use_mut_ref(|| 0usize);
|
||||
let answer = use_memo(|_| get_word_of_the_day(), None::<()>);
|
||||
// let answer = use_memo(|_| get_word_of_the_day(), None::<()>);
|
||||
let answer = use_memo(|_| "ABEJA".to_owned(), None::<()>);
|
||||
let virtual_keyboard = use_state(|| new_empty_virtual_keyboard().into());
|
||||
let result = use_state(|| None::<GameResult>);
|
||||
|
||||
|
|
|
|||
15
src/main.rs
15
src/main.rs
|
|
@ -40,10 +40,7 @@ fn App() -> Html {
|
|||
|
||||
html! {
|
||||
<>
|
||||
<header>
|
||||
<h1>{ "Worsdle" }</h1>
|
||||
</header>
|
||||
<main>
|
||||
<h1>{ "Worsdle" }</h1>
|
||||
<Board
|
||||
attempts={ (*board.attempts).clone() }
|
||||
attempt_index={ *board.attempt_index.borrow() }
|
||||
|
|
@ -60,16 +57,6 @@ fn App() -> Html {
|
|||
}
|
||||
} </span>
|
||||
</div>
|
||||
</main>
|
||||
<footer>
|
||||
<small> {
|
||||
html_nested! {
|
||||
<>
|
||||
{ "Hecho por " } <a href={ "https://kirbylife.dev" }> { "kirbylife" } </a>
|
||||
</>
|
||||
}
|
||||
} </small>
|
||||
</footer>
|
||||
</>
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,40 +4,34 @@ body > * {
|
|||
|
||||
body {
|
||||
min-height: 99dvh;
|
||||
display: grid;
|
||||
grid-template-rows: auto 1fr auto;
|
||||
justify-items: center;
|
||||
gap: 5px;
|
||||
}
|
||||
|
||||
main {
|
||||
padding-left: 20px;
|
||||
padding-right: 20px;
|
||||
display: flex !important;
|
||||
flex-direction: column;
|
||||
margin-left: 150px;
|
||||
margin-right: 150px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.board {
|
||||
width: 25%;
|
||||
height: 25%;
|
||||
display: grid;
|
||||
width: min-content;
|
||||
grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
|
||||
justify-items: center;
|
||||
gap: 5px;
|
||||
justify-self: auto;
|
||||
gap: 10px;
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
|
||||
.board > p {
|
||||
display: flex;
|
||||
width: 50px;
|
||||
aspect-ratio: 1/1;
|
||||
width: 70px;
|
||||
height: 70px;
|
||||
border: 3px solid #444444;
|
||||
border-radius: 10px;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin: 0;
|
||||
font-size: 30px;
|
||||
font-size: 40px;
|
||||
}
|
||||
|
||||
.correct {
|
||||
|
|
@ -75,15 +69,18 @@ main {
|
|||
}
|
||||
|
||||
.result-board {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 5px;
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
|
||||
width: fit-content;
|
||||
gap: 2px;
|
||||
}
|
||||
|
||||
.result-board > p {
|
||||
.result-board > span {
|
||||
margin: 0;
|
||||
font-size: 20px;
|
||||
height: 20px;
|
||||
width: 20px;
|
||||
|
||||
}
|
||||
|
||||
.keyboard {
|
||||
|
|
@ -93,8 +90,6 @@ main {
|
|||
|
||||
.keyboard > button {
|
||||
grid-column: span 2;
|
||||
width: auto;
|
||||
height: 60px;
|
||||
}
|
||||
|
||||
.keyboard > button.key-big {
|
||||
|
|
|
|||
Loading…
Reference in New Issue