Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
93 changes: 89 additions & 4 deletions package-lock.json

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

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@
"@tauri-apps/plugin-opener": "^2",
"@tauri-apps/plugin-os": "^2.2.0",
"@tauri-apps/plugin-shell": "^2.2.0",
"@tauri-apps/plugin-store": "^2.2.0",
"@tauri-apps/plugin-upload": "^2.2.1",
"react": "^18.3.1",
"react-dom": "^18.3.1"
"react-dom": "^18.3.1",
"react-router": "^7.1.5",
"zustand": "^5.0.3"
},
"devDependencies": {
"@tailwindcss/vite": "^4.0.6",
Expand Down
19 changes: 18 additions & 1 deletion src-tauri/Cargo.lock

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

3 changes: 2 additions & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "zkn-client"
version = "0.1.0"
version = "0.1.0-dev"
description = "A Tauri App"
authors = ["you"]
edition = "2021"
Expand Down Expand Up @@ -29,4 +29,5 @@ tauri-plugin-shell = "2"
tauri-plugin-fs = "2"
tauri-plugin-log = "2"
time = { version = "0.3", features = ["formatting"] }
tauri-plugin-store = "2"

8 changes: 7 additions & 1 deletion src-tauri/capabilities/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"os:allow-platform",
"shell:allow-kill",
"shell:default",
"store:default",
"upload:default",
{
"identifier": "fs:allow-exists",
Expand Down Expand Up @@ -50,7 +51,12 @@
{
"name": "walletshield-listen",
"cmd": "walletshield",
"args": ["-listen", ":7070", "-config", "client.toml"],
"args": [
"-listen",
{ "validator": "^(\\S*:\\d+)$" },
"-config",
"client.toml"
],
"sidecar": false
}
]
Expand Down
1 change: 1 addition & 0 deletions src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ fn network_connect(network_id: &str) -> String {
#[cfg_attr(mobile, tauri::mobile_entry_point)]
pub fn run() {
tauri::Builder::default()
.plugin(tauri_plugin_store::Builder::new().build())
.plugin(
tauri_plugin_log::Builder::new()
// https://tauri.app/plugin/logging/#formatting
Expand Down
12 changes: 12 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,18 @@
-moz-osx-font-smoothing: grayscale;
}

/*
* Set scrollbar-gutter to prevent sidebar-induced layout shift on Windows
* https://github.com/saadeghi/daisyui/issues/2859#issuecomment-2383862183
* https://github.com/saadeghi/daisyui/discussions/3246#discussioncomment-11738876
*/
html {
scrollbar-gutter: auto !important;
}
html:has(body.content-overflow-y) {
scrollbar-gutter: stable !important;
}

.logo {
@apply h-48 p-6 transition duration-1000;
will-change: filter;
Expand Down
Loading