Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.lock

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

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ web-sys = { version = "0.3", features = [
"IdbIndex",
"IdbKeyRange",
"DomStringList",
"Navigator",
"Clipboard",
"Location",
] }

# Serialization
Expand All @@ -61,13 +64,14 @@ thiserror = "1"

# Utilities
chrono = { version = "0.4", features = ["serde", "wasmbind"] }
uuid = { version = "1", features = ["v4", "serde"] }
uuid = { version = "1", features = ["v4", "serde", "js"] }
regex = "1"
url = "2"
base64 = "0.22"
pulldown-cmark = "0.9" # Markdown rendering
gloo-file = "0.3" # File upload in WASM
gloo-net = "0.5" # HTTP requests in WASM
gloo-timers = "0.3" # Timers in WASM

# Logging
tracing = "0.1"
Expand Down
34 changes: 16 additions & 18 deletions src/components/login_modal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ fn GenerateKeysTab(
}
}

if let Some(keys) = generated_keys.read().as_ref() {
if let Some(keys) = generated_keys.read().clone() {
div { class: "space-y-3",
// Private Key
div {
Expand All @@ -403,14 +403,13 @@ fn GenerateKeysTab(
{
use wasm_bindgen::prelude::*;
if let Some(window) = web_sys::window() {
if let Some(navigator) = window.navigator().clipboard() {
let nsec = keys.nsec.clone();
spawn(async move {
let _ = wasm_bindgen_futures::JsFuture::from(
navigator.write_text(&nsec)
).await;
});
}
let clipboard = window.navigator().clipboard();
let nsec = keys.nsec.clone();
spawn(async move {
let _ = wasm_bindgen_futures::JsFuture::from(
clipboard.write_text(&nsec)
).await;
});
}
}
},
Expand All @@ -420,7 +419,7 @@ fn GenerateKeysTab(
}

// Mnemonic if available
if let Some(mnemonic) = &keys.mnemonic {
if let Some(mnemonic) = keys.mnemonic.clone() {
div {
label { class: "block text-sm font-medium text-gray-700 mb-2",
"Recovery Phrase (12 words)"
Expand All @@ -440,14 +439,13 @@ fn GenerateKeysTab(
{
use wasm_bindgen::prelude::*;
if let Some(window) = web_sys::window() {
if let Some(navigator) = window.navigator().clipboard() {
let mnem = mnemonic.clone();
spawn(async move {
let _ = wasm_bindgen_futures::JsFuture::from(
navigator.write_text(&mnem)
).await;
});
}
let clipboard = window.navigator().clipboard();
let mnem = mnemonic.clone();
spawn(async move {
let _ = wasm_bindgen_futures::JsFuture::from(
clipboard.write_text(&mnem)
).await;
});
}
}
},
Expand Down
6 changes: 5 additions & 1 deletion src/components/video_player.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,14 @@ pub fn VideoEmbed(url: String) -> Element {
}
} else if url.contains("twitch.tv") {
let channel = url.split('/').last().unwrap_or("");
let hostname = window()
.location()
.hostname()
.unwrap_or_else(|_| String::from("localhost"));
rsx! {
div { class: "video-embed",
iframe {
src: "https://player.twitch.tv/?channel={channel}&parent={window().location().hostname()}",
src: "https://player.twitch.tv/?channel={channel}&parent={hostname}",
width: "100%",
height: "450",
allowfullscreen: true,
Expand Down
Loading