From 691e3a53bbe527532a667807819a14afcb54660d Mon Sep 17 00:00:00 2001 From: Dilawar Singh Date: Sat, 22 Mar 2025 04:30:28 +0530 Subject: [PATCH 1/5] adds external deps for qr scanning --- leptos/Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/leptos/Cargo.toml b/leptos/Cargo.toml index 0630cab..ab54463 100644 --- a/leptos/Cargo.toml +++ b/leptos/Cargo.toml @@ -7,6 +7,7 @@ edition = "2024" codee = { version = "0.3.0", features = ["json_serde"] } console_error_panic_hook = "0.1.7" leptos = { version = "0.7.7", features = ["csr", "nightly", "tracing"] } +leptos-qr-scanner = { git = "https://github.com/elsirion/leptos-qr-scanner" } leptos-use = { version = "0.15.7", features = ["storage", "docs" ] } leptos_meta = "0.7.7" leptos_router = { version = "0.7.7", features = ["tracing"] } From 46716d504c2eeff264cafb172ad22d27cff66d28 Mon Sep 17 00:00:00 2001 From: Dilawar Singh Date: Sun, 23 Mar 2025 08:58:50 +0530 Subject: [PATCH 2/5] Only collect unique values --- leptos/Cargo.toml | 2 +- leptos/app.css | 6 +++++ leptos/src/_app.module.scss | 6 +++++ leptos/src/app.rs | 8 ++++--- leptos/src/components/login.rs | 1 - leptos/src/components/mod.rs | 8 +++++++ leptos/src/components/qr.rs | 41 ++++++++++++++++++++++++++++++++++ 7 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 leptos/src/components/qr.rs diff --git a/leptos/Cargo.toml b/leptos/Cargo.toml index ab54463..44fa2c1 100644 --- a/leptos/Cargo.toml +++ b/leptos/Cargo.toml @@ -7,7 +7,7 @@ edition = "2024" codee = { version = "0.3.0", features = ["json_serde"] } console_error_panic_hook = "0.1.7" leptos = { version = "0.7.7", features = ["csr", "nightly", "tracing"] } -leptos-qr-scanner = { git = "https://github.com/elsirion/leptos-qr-scanner" } +leptos-qr-scanner = { git = "https://github.com/dilawar/leptos-qr-scanner" } leptos-use = { version = "0.15.7", features = ["storage", "docs" ] } leptos_meta = "0.7.7" leptos_router = { version = "0.7.7", features = ["tracing"] } diff --git a/leptos/app.css b/leptos/app.css index 2ea7680..fa98181 100644 --- a/leptos/app.css +++ b/leptos/app.css @@ -32,3 +32,9 @@ main { justify-content: center; align-items: center; } + +.qrscanner-372e0a1 { + width: 100%; + min-height: 400px; + border: 1px dotted gray; +} diff --git a/leptos/src/_app.module.scss b/leptos/src/_app.module.scss index 02866b0..c5815ba 100644 --- a/leptos/src/_app.module.scss +++ b/leptos/src/_app.module.scss @@ -32,3 +32,9 @@ main { justify-content: center; align-items: center; } + +.qrscanner { + width: 100%; + min-height: 400px; + border: 1px dotted gray; +} diff --git a/leptos/src/app.rs b/leptos/src/app.rs index bcb804b..d2a1859 100644 --- a/leptos/src/app.rs +++ b/leptos/src/app.rs @@ -5,7 +5,7 @@ use reactive_stores::Store; use thaw::*; use crate::css::styles; -use crate::components::{home, login}; +use crate::components::*; use crate::storage::{GlobalState, GlobalStateStoreFields}; #[component] @@ -25,13 +25,15 @@ pub fn App() -> impl IntoView {
- - + + +
diff --git a/leptos/src/components/login.rs b/leptos/src/components/login.rs index 78c8277..e40e8c9 100644 --- a/leptos/src/components/login.rs +++ b/leptos/src/components/login.rs @@ -1,6 +1,5 @@ // use codee::string::JsonSerdeCodec; use leptos::prelude::*; -// use leptos_use::storage::use_local_storage; use reactive_stores::Store; use thaw::*; diff --git a/leptos/src/components/mod.rs b/leptos/src/components/mod.rs index 57b1827..48cd666 100644 --- a/leptos/src/components/mod.rs +++ b/leptos/src/components/mod.rs @@ -1,2 +1,10 @@ +#![allow(unused_imports)] + pub(crate) mod home; +pub use home::*; + pub(crate) mod login; +pub use login::*; + +pub(crate) mod qr; +pub use qr::*; diff --git a/leptos/src/components/qr.rs b/leptos/src/components/qr.rs new file mode 100644 index 0000000..200affc --- /dev/null +++ b/leptos/src/components/qr.rs @@ -0,0 +1,41 @@ +//! QrCode related components. + +use reactive_stores::Store; +use thaw::*; +use leptos_qr_scanner::Scan; +use leptos::prelude::*; + +use crate::css::styles; +use crate::storage::{GlobalState, GlobalStateStoreFields}; + +#[component] +pub fn QrScanner() -> impl IntoView { + let scan = RwSignal::new(true); + let multiple = RwSignal::new(true); + + let result = RwSignal::new(vec![]); + + view! { + + + + + +

Scan result: {result}

+ } +} From b99b65ab9459c12911ea55372abad227cd53f56f Mon Sep 17 00:00:00 2001 From: Dilawar Singh Date: Sun, 23 Mar 2025 08:59:21 +0530 Subject: [PATCH 3/5] make fmt --- leptos/src/app.rs | 2 +- leptos/src/components/home.rs | 2 +- leptos/src/components/qr.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/leptos/src/app.rs b/leptos/src/app.rs index d2a1859..582168b 100644 --- a/leptos/src/app.rs +++ b/leptos/src/app.rs @@ -4,8 +4,8 @@ use leptos_router::path; use reactive_stores::Store; use thaw::*; -use crate::css::styles; use crate::components::*; +use crate::css::styles; use crate::storage::{GlobalState, GlobalStateStoreFields}; #[component] diff --git a/leptos/src/components/home.rs b/leptos/src/components/home.rs index 35e79ec..8089562 100644 --- a/leptos/src/components/home.rs +++ b/leptos/src/components/home.rs @@ -1,7 +1,7 @@ use leptos::prelude::*; use reactive_stores::Store; -use crate::components::login::{Login}; +use crate::components::login::Login; use crate::storage::{GlobalState, GlobalStateStoreFields}; #[component] diff --git a/leptos/src/components/qr.rs b/leptos/src/components/qr.rs index 200affc..0dece52 100644 --- a/leptos/src/components/qr.rs +++ b/leptos/src/components/qr.rs @@ -1,9 +1,9 @@ //! QrCode related components. +use leptos::prelude::*; +use leptos_qr_scanner::Scan; use reactive_stores::Store; use thaw::*; -use leptos_qr_scanner::Scan; -use leptos::prelude::*; use crate::css::styles; use crate::storage::{GlobalState, GlobalStateStoreFields}; From 0125b1caa1c52d161b7fb8e6d08a72e1149dfd26 Mon Sep 17 00:00:00 2001 From: Dilawar Singh Date: Sun, 23 Mar 2025 09:00:43 +0530 Subject: [PATCH 4/5] Adds target to fmt, fix the targets --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ec775b4 --- /dev/null +++ b/Makefile @@ -0,0 +1,10 @@ +check lint: + cargo clippy + +fix: + cargo clippy --fix --allow-dirty + +fmt: + cargo +nigthly fmt + + From 8ad85f77362010c873d4942c22802bc2129278ae Mon Sep 17 00:00:00 2001 From: Dilawar Singh Date: Sun, 23 Mar 2025 09:01:24 +0530 Subject: [PATCH 5/5] Adds makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ec775b4..1f44bae 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,6 @@ fix: cargo clippy --fix --allow-dirty fmt: - cargo +nigthly fmt + cargo +nightly fmt