Skip to content

Commit 71c89db

Browse files
PatysonchickPatysonchick
committed
Форматирование и релиз 2.0.0-beta.2.
1 parent d2c8d16 commit 71c89db

File tree

5 files changed

+84
-42
lines changed

5 files changed

+84
-42
lines changed

‎src/about/mod.rs

+12-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@ use leptos::prelude::*;
33
#[component]
44
pub fn About() -> impl IntoView {
55
view! {
6-
<div class="panel flex-element"><img src="../public/icon.svg" alt="Icon" class="w-24 h-24" /></div>
7-
<div class="panel flex-element justify-around bg-red-700 font-bold">Данные проект несёт исключительно образовательней цели и вообще создаётся как портфолио.</div>
8-
<div class="panel flex-element justify-around">Первый SMS/звонки бомбер написанный на Rust</div>
9-
<div class="panel flex-element justify-around">Используемые технологии</div>
6+
<div class="panel flex-element">
7+
<img src="../public/icon.svg" alt="Icon" class="w-24 h-24" />
8+
</div>
9+
<div class="panel flex-element justify-around bg-red-700 font-bold">
10+
Данные проект несёт исключительно образовательней цели и вообще создаётся как портфолио.
11+
</div>
12+
<div class="panel flex-element justify-around">
13+
Первый SMS/звонки бомбер написанный на Rust
14+
</div>
15+
<div class="panel flex-element justify-around">
16+
Используемые технологии
17+
</div>
1018
<ul class="panel flex-element flex-auto justify-around">
1119
<li>Rust</li>
1220
<li>Tauri</li>

‎src/app.rs

+48-21
Original file line numberDiff line numberDiff line change
@@ -94,27 +94,54 @@ pub fn App() -> impl IntoView {
9494
view! {
9595
<Router>
9696
<Routes fallback=|| "Not found.">
97-
<Route path=path!("/") view=move || view! {
98-
<Titlebar title=title />
99-
<div class="panel flex-element w-full h-full center-elements">
100-
<div class="flex-element w-full center-elements">
101-
<div class="bg-black p-2 m-1 rounded-2xl">"Введите номер"</div>
102-
<form class="flex-element flex-row center-elements" on:submit=attack>
103-
<span class="panel bg-black">"🇷🇺"</span>
104-
<input type="tel" placeholder="+7 (9xx) xxx xx-xx" class="w-full button p-1 border-2 border-green-600 rounded-xl" on:input=move |ev| {
105-
let v = event_target_value(&ev);
106-
set_input_field.set(v);
107-
} />
108-
<input type="number" value="1" min="1" step="1" class="button w-14" on:input=move |ev| {
109-
let v = event_target_value(&ev);
110-
set_cycles.set(v.parse().unwrap());
111-
} />
112-
<button type="submit" class="button material-symbols-rounded">"send"</button>
113-
</form>
114-
</div>
115-
</div>
116-
<Footer />
117-
} />
97+
<Route
98+
path=path!("/")
99+
view=move || {
100+
view! {
101+
<Titlebar title=title />
102+
<div class="panel flex-element w-full h-full center-elements">
103+
<div class="flex-element w-full center-elements">
104+
<div class="bg-black p-2 m-1 rounded-2xl">
105+
"Введите номер"
106+
</div>
107+
<form
108+
class="flex-element flex-row center-elements"
109+
on:submit=attack
110+
>
111+
<span class="panel bg-black">"🇷🇺"</span>
112+
<input
113+
type="tel"
114+
placeholder="+7 (9xx) xxx xx-xx"
115+
class="w-full button p-1 border-2 border-green-600 rounded-xl"
116+
on:input=move |ev| {
117+
let v = event_target_value(&ev);
118+
set_input_field.set(v);
119+
}
120+
/>
121+
<input
122+
type="number"
123+
value="1"
124+
min="1"
125+
step="1"
126+
class="button w-14"
127+
on:input=move |ev| {
128+
let v = event_target_value(&ev);
129+
set_cycles.set(v.parse().unwrap());
130+
}
131+
/>
132+
<button
133+
type="submit"
134+
class="button material-symbols-rounded"
135+
>
136+
"send"
137+
</button>
138+
</form>
139+
</div>
140+
</div>
141+
<Footer />
142+
}
143+
}
144+
/>
118145
<Route path=path!("/about") view=About />
119146
</Routes>
120147
</Router>

‎src/footer/mod.rs

+13-6
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,24 @@ extern "C" {
1515
pub fn Footer() -> impl IntoView {
1616
view! {
1717
<div class="flex-element flex-row w-full justify-around">
18-
<a href="https://github.com/Patysonchick/pts_bomber" class="panel rounded-b-none" target="_blank">
18+
<a
19+
href="https://github.com/Patysonchick/pts_bomber"
20+
class="panel rounded-b-none"
21+
target="_blank"
22+
>
1923
<img src="../public/github-mark.svg" alt="GitHub" class="h-7" />
2024
</a>
2125
<a href="https://t.me/pts_bomber" class="panel rounded-b-none" target="_blank">
2226
<img src="../public/telegram.svg" alt="Telegram" class="h-7" />
2327
</a>
24-
<button class="panel rounded-b-none" on:click=move |_| {
25-
spawn_local(async move {
26-
invoke_without_args("show_about_window").await;
27-
});
28-
}>
28+
<button
29+
class="panel rounded-b-none"
30+
on:click=move |_| {
31+
spawn_local(async move {
32+
invoke_without_args("show_about_window").await;
33+
});
34+
}
35+
>
2936
<span class="material-symbols-rounded">"info"</span>
3037
</button>
3138
</div>

‎src/main.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ use leptos::prelude::*;
99
fn main() {
1010
console_error_panic_hook::set_once();
1111
mount_to_body(|| {
12-
view! {
13-
<App />
14-
}
12+
view! { <App /> }
1513
})
1614
}

‎src/titlebar/mod.rs

+10-8
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,21 @@ pub fn Titlebar(title: ReadSignal<Status>) -> impl IntoView {
2525

2626
view! {
2727
<div data-tauri-drag-region class="flex-element flex-row w-full justify-between">
28-
<span data-tauri-drag-region class="panel font-bold">"pts_bomber"</span>
28+
<span data-tauri-drag-region class="panel font-bold">
29+
"pts_bomber"
30+
</span>
2931
<em class="panel font-light whitespace-nowrap">{version}</em>
3032
<span
3133
data-tauri-drag-region
3234
class="panel w-full font-bold"
33-
class: bg-neutral-800 = move || title.get() == Status::IsIdling
34-
class: bg-red-700 = move || title.get() == Status::Attacking
35-
>{
36-
move || match title.get() {
35+
class:bg-neutral-800=move || title.get() == Status::IsIdling
36+
class:bg-red-700=move || title.get() == Status::Attacking
37+
>
38+
{move || match title.get() {
3739
Status::IsIdling => "Простаивает",
38-
Status::Attacking => "Атака"
39-
}
40-
}</span>
40+
Status::Attacking => "Атака",
41+
}}
42+
</span>
4143
<div class="panel material-symbols-rounded">
4244
<button on:click=move |_| { minimize() }>"minimize"</button>
4345
<button on:click=move |_| { close() }>"close"</button>

0 commit comments

Comments
 (0)