Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Non-blocking diffs computation using workers #65

Merged
merged 5 commits into from
Mar 18, 2024
Merged

Non-blocking diffs computation using workers #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8634167
feat(crypto-helper): started implementing non-blocking tasks using
TheBestTvarynka Mar 17, 2024
c410b00
Merge branch 'main' into feature/non-blocking
TheBestTvarynka Mar 17, 2024
8bb2034
feat(crypto-helper): diff: set up worker properly;
TheBestTvarynka Mar 17, 2024
484212d
feat(crypto-helper): diff: use custom codec for communication with
TheBestTvarynka Mar 18, 2024
78179bd
feat(crypto-helper): add simple `Loader` component (spinner);
TheBestTvarynka Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 78 additions & 37 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 11 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "web-app"
name = "crypto-helper"
version = "0.10.0"
description = "The crypto-helper is an online app that helps to work with the diferent crypto algorithms."
edition = "2021"
Expand All @@ -14,11 +14,20 @@ members = [
"crates/prop-strategies"
]

[[bin]]
name = "crypto-helper-app"
path = "src/bin/main.rs"

[[bin]]
name = "worker"
path = "src/bin/worker.rs"

[dependencies]
yew = { version = "0.21", features = ["csr"] }
yew-router = "0.18"
yew-notifications = { git = "https://github.com/TheBestTvarynka/yew-notifications.git", features = ["standard-notification"] }
yew-hooks = "0.3"
yew-agent = "0.3"

# wasm
js-sys = "0.3"
Expand Down Expand Up @@ -57,4 +66,4 @@ oid = { version = "0.2", default-features = false }
paste = "1.0"

# diff
similar = "2.4"
similar = { version = "2.4", features = ["serde"] }
5 changes: 5 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="utf-8" />
<title>Crypto helper</title>

<link data-trunk rel="sass" href="public/styles/footer.scss" />
<link data-trunk rel="sass" href="public/styles/header.scss" />
<link data-trunk rel="sass" href="public/styles/style.scss" />
Expand Down Expand Up @@ -32,5 +33,9 @@

<!-- diff styles -->
<link data-trunk rel="sass" href="public/styles/diff/styles.scss" />

<!-- bins -->
<link data-trunk rel="rust" href="Cargo.toml" data-bin="crypto-helper-app" data-type="main" data-weak-refs />
<link data-trunk rel="rust" href="Cargo.toml" data-bin="worker" data-type="worker" data-weak-refs />
</head>
</html>
2 changes: 2 additions & 0 deletions public/styles/diff/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,6 @@
background-color: #edd5ce;
padding-right: 0.3em;
padding-left: 0.3em;
border-bottom: 2px solid #403735;
margin-right: 0.3em;
}
89 changes: 89 additions & 0 deletions public/styles/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,3 +212,92 @@ article {
color: #dbcfbf;
cursor: pointer;
}

.loader-wrapper {
margin-top: 1em;
margin-bottom: 1em;
width: 100%;
display: inline-flex;
}

.loader {
color: #322a50;
font-size: 25px;
overflow: hidden;
width: 1em;
height: 1em;
border-radius: 50%;
margin: auto;
-webkit-transform: translateZ(0);
-ms-transform: translateZ(0);
transform: translateZ(0);
-webkit-animation: load6 1.3s infinite ease, round 1.3s infinite ease;
animation: load6 1.3s infinite ease, round 1.3s infinite ease;
}
@-webkit-keyframes load6 {
0% {
box-shadow: 0 -0.83em 0 -0.4em, 0 -0.83em 0 -0.42em, 0 -0.83em 0 -0.44em, 0 -0.83em 0 -0.46em, 0 -0.83em 0 -0.477em;
}
5%,
95% {
box-shadow: 0 -0.83em 0 -0.4em, 0 -0.83em 0 -0.42em, 0 -0.83em 0 -0.44em, 0 -0.83em 0 -0.46em, 0 -0.83em 0 -0.477em;
}
10%,
59% {
box-shadow: 0 -0.83em 0 -0.4em, -0.087em -0.825em 0 -0.42em, -0.173em -0.812em 0 -0.44em, -0.256em -0.789em 0 -0.46em, -0.297em -0.775em 0 -0.477em;
}
20% {
box-shadow: 0 -0.83em 0 -0.4em, -0.338em -0.758em 0 -0.42em, -0.555em -0.617em 0 -0.44em, -0.671em -0.488em 0 -0.46em, -0.749em -0.34em 0 -0.477em;
}
38% {
box-shadow: 0 -0.83em 0 -0.4em, -0.377em -0.74em 0 -0.42em, -0.645em -0.522em 0 -0.44em, -0.775em -0.297em 0 -0.46em, -0.82em -0.09em 0 -0.477em;
}
100% {
box-shadow: 0 -0.83em 0 -0.4em, 0 -0.83em 0 -0.42em, 0 -0.83em 0 -0.44em, 0 -0.83em 0 -0.46em, 0 -0.83em 0 -0.477em;
}
}

@keyframes load6 {
0% {
box-shadow: 0 -0.83em 0 -0.4em, 0 -0.83em 0 -0.42em, 0 -0.83em 0 -0.44em, 0 -0.83em 0 -0.46em, 0 -0.83em 0 -0.477em;
}
5%,
95% {
box-shadow: 0 -0.83em 0 -0.4em, 0 -0.83em 0 -0.42em, 0 -0.83em 0 -0.44em, 0 -0.83em 0 -0.46em, 0 -0.83em 0 -0.477em;
}
10%,
59% {
box-shadow: 0 -0.83em 0 -0.4em, -0.087em -0.825em 0 -0.42em, -0.173em -0.812em 0 -0.44em, -0.256em -0.789em 0 -0.46em, -0.297em -0.775em 0 -0.477em;
}
20% {
box-shadow: 0 -0.83em 0 -0.4em, -0.338em -0.758em 0 -0.42em, -0.555em -0.617em 0 -0.44em, -0.671em -0.488em 0 -0.46em, -0.749em -0.34em 0 -0.477em;
}
38% {
box-shadow: 0 -0.83em 0 -0.4em, -0.377em -0.74em 0 -0.42em, -0.645em -0.522em 0 -0.44em, -0.775em -0.297em 0 -0.46em, -0.82em -0.09em 0 -0.477em;
}
100% {
box-shadow: 0 -0.83em 0 -0.4em, 0 -0.83em 0 -0.42em, 0 -0.83em 0 -0.44em, 0 -0.83em 0 -0.46em, 0 -0.83em 0 -0.477em;
}
}

@-webkit-keyframes round {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
}

@keyframes round {
0% {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
-webkit-transform: rotate(360deg);
transform: rotate(360deg);
}
};
7 changes: 7 additions & 0 deletions src/bin/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
use crypto_helper::App;

fn main() {
wasm_logger::init(wasm_logger::Config::default());

yew::Renderer::<App>::new().render();
}
8 changes: 8 additions & 0 deletions src/bin/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
use crypto_helper::diff::{DiffTask, JsonCodec};
use yew_agent::Registrable;

fn main() {
wasm_logger::init(wasm_logger::Config::default());

DiffTask::registrar().encoding::<JsonCodec>().register();
}
10 changes: 10 additions & 0 deletions src/common/loader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
use yew::{function_component, html, Html};

#[function_component(Loader)]
pub fn loader() -> Html {
html! {
<div class="loader-wrapper">
<div class="loader" />
</div>
}
}
2 changes: 2 additions & 0 deletions src/common/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
mod byte_input;
mod bytes_viewer;
mod checkbox;
mod loader;
mod rc_slice;
mod simple_output;
mod switch;
Expand All @@ -9,6 +10,7 @@ mod table;
use base64::Engine;
pub use byte_input::{build_byte_input, ByteInput};
pub use checkbox::Checkbox;
pub use loader::Loader;
pub use rc_slice::RcSlice;
pub use simple_output::build_simple_output;
pub use switch::Switch;
Expand Down
Loading