Skip to content

Commit a70bc23

Browse files
authored
Merge pull request #8 from ZeroKnowledgeNetwork/feat/nav-settings
feat: add route nav, state management, and persistent settings
2 parents 078d894 + 299f803 commit a70bc23

File tree

18 files changed

+719
-274
lines changed

18 files changed

+719
-274
lines changed

package-lock.json

Lines changed: 89 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@
1717
"@tauri-apps/plugin-opener": "^2",
1818
"@tauri-apps/plugin-os": "^2.2.0",
1919
"@tauri-apps/plugin-shell": "^2.2.0",
20+
"@tauri-apps/plugin-store": "^2.2.0",
2021
"@tauri-apps/plugin-upload": "^2.2.1",
2122
"react": "^18.3.1",
22-
"react-dom": "^18.3.1"
23+
"react-dom": "^18.3.1",
24+
"react-router": "^7.1.5",
25+
"zustand": "^5.0.3"
2326
},
2427
"devDependencies": {
2528
"@tailwindcss/vite": "^4.0.6",

src-tauri/Cargo.lock

Lines changed: 18 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src-tauri/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "zkn-client"
3-
version = "0.1.0"
3+
version = "0.1.0-dev"
44
description = "A Tauri App"
55
authors = ["you"]
66
edition = "2021"
@@ -29,4 +29,5 @@ tauri-plugin-shell = "2"
2929
tauri-plugin-fs = "2"
3030
tauri-plugin-log = "2"
3131
time = { version = "0.3", features = ["formatting"] }
32+
tauri-plugin-store = "2"
3233

src-tauri/capabilities/default.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"os:allow-platform",
1313
"shell:allow-kill",
1414
"shell:default",
15+
"store:default",
1516
"upload:default",
1617
{
1718
"identifier": "fs:allow-exists",
@@ -50,7 +51,12 @@
5051
{
5152
"name": "walletshield-listen",
5253
"cmd": "walletshield",
53-
"args": ["-listen", ":7070", "-config", "client.toml"],
54+
"args": [
55+
"-listen",
56+
{ "validator": "^(\\S*:\\d+)$" },
57+
"-config",
58+
"client.toml"
59+
],
5460
"sidecar": false
5561
}
5662
]

src-tauri/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ fn network_connect(network_id: &str) -> String {
77
#[cfg_attr(mobile, tauri::mobile_entry_point)]
88
pub fn run() {
99
tauri::Builder::default()
10+
.plugin(tauri_plugin_store::Builder::new().build())
1011
.plugin(
1112
tauri_plugin_log::Builder::new()
1213
// https://tauri.app/plugin/logging/#formatting

src/App.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,18 @@
4444
-moz-osx-font-smoothing: grayscale;
4545
}
4646

47+
/*
48+
* Set scrollbar-gutter to prevent sidebar-induced layout shift on Windows
49+
* https://github.com/saadeghi/daisyui/issues/2859#issuecomment-2383862183
50+
* https://github.com/saadeghi/daisyui/discussions/3246#discussioncomment-11738876
51+
*/
52+
html {
53+
scrollbar-gutter: auto !important;
54+
}
55+
html:has(body.content-overflow-y) {
56+
scrollbar-gutter: stable !important;
57+
}
58+
4759
.logo {
4860
@apply h-48 p-6 transition duration-1000;
4961
will-change: filter;

0 commit comments

Comments
 (0)