DefGuard
diff --git a/‎.editorconfig
+5 b/‎.editorconfig
+5
diff --git a/‎.github/pull_request_template.md
+3-3 b/‎.github/pull_request_template.md
+3-3
diff --git a/‎.github/workflows/lint.yaml
+2-3 b/‎.github/workflows/lint.yaml
+2-3
diff --git a/‎.gitignore
+4 b/‎.gitignore
+4
diff --git a/‎README.md
+41-1 b/‎README.md
+41-1
diff --git a/‎package.json
+9-9 b/‎package.json
+9-9
@@ -26,3 +26,8 @@ rulers = 90
 indent_style = space
 indent_size = 2
 rulers = 80
+
+[*.{rs}]
+indent_style = space
+indent_size = 4
+rulers = 90
@@ -7,17 +7,17 @@
 
 #### Documentation ###
 
-- [ ] If testing requires changes in the environment or deployment, please **update the documentation** (https://defguard.gitbook.io) first and **attach the link to the documentation** section in this pull request
+- [ ] If testing requires changes in the environment or deployment, please **update the documentation** (https://docs.defguard.net) first and **attach the link to the documentation** section in this pull request
 - [ ] I have commented on my code, particularly in hard-to-understand areas
 
-#### Testing ### 
+#### Testing ###
 
 - [ ] I have performed manual tests manually and all changes work
 - [ ] New and existing unit tests pass locally with my changes
 
 ### 🏚️ Main Branch Merge Checklist:
 
-#### Testing ### 
+#### Testing ###
 
 - [ ] I have merged my changes before to dev and the dev checklist is done
 - [ ] I have tested all functionalities on the dev instance and they work
 
@@ -5,7 +5,6 @@ on:
     branches:
       - main
       - dev
-
   pull_request:
     branches:
       - main
@@ -19,13 +18,13 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
           node-version: '20'
 
       - uses: pnpm/action-setup@v2
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
 
@@ -22,3 +22,7 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+*.db
+*.db-shm
+*.db-wal
@@ -17,7 +17,7 @@ Desktop client for managing WireGuard VPN connections (any WireGuard server and
 - Multiple instances & locations - When combining with [defguard](https://github.com/DefGuard/defguard) VPN & SSO you can have multiple defguard instances (sites/installations) and multiple Locations (VPN tunnels in that location/site) in <strong>one client</strong>! If you are an admin/devops - all your customers (instances) and all their tunnels (locations) can be in one place!
 - Fast! - Built with Rust, [tauri](https://tauri.app/) and [React.js](https://react.dev/).
 
-To learn more about the system see our [documentation](https://defguard.gitbook.io).
+To learn more about the system see our [documentation](https://docs.defguard.net).
 
 ## Development
 
@@ -26,9 +26,11 @@ To learn more about the system see our [documentation](https://defguard.gitbook.
 Make sure to install prerequisites from [tauri](https://tauri.app/v1/guides/getting-started/prerequisites/).
 
 ### Proto submodule
+
 Make sure you have cloned, and up to date, proto submodule in `src-tauri/proto`
 
 ### Protoc compiler
+
 Make sure you have [protoc](https://grpc.io/docs/protoc-installation/) available.
 
 ### Install pnpm and node deps
@@ -37,16 +39,33 @@ Make sure you have [protoc](https://grpc.io/docs/protoc-installation/) available
 pnpm install
 ```
 
+### Sqlx and local database file
+
+To work with sqlx on a local db file, you'll have to set `DATABASE_URL` env variable.
+It's best to set it to absolute path since `pnpm tauri dev` runs with weird paths.
+
+Init the file with:
+
+```bash
+export DATABASE_URL=sqlite://<full-path-to-project-dir>/dev.db`
+sqlx db create
+sqlx migrate run --source src-tauri/migrations/
+```
+
+Then keep the `$DATABASE_URL` set during development (use direnv etc.)
+
 ### Dev server command
 
 ```bash
 pnpm tauri dev
 ```
 
 ### Build command
+
 ```bash
 pnpm tauri build
 ```
+
 Built packages are available after in `src-tauri/target/release/bundle`.
 
 ### Windows
@@ -60,6 +79,7 @@ Remove `default-run` line from `[package]` section in `Cargo.toml` to build the
 </p>
 
 # Legal
+
 WireGuard® is [registered trademarks](https://www.wireguard.com/trademark-policy/) of Jason A. Donenfeld.
 
 # Known issues
@@ -80,3 +100,23 @@ The app launches but the window is blank. Set the `WEBKIT_DISABLE_DMABUF_RENDERE
 ```
 WEBKIT_DISABLE_DMABUF_RENDERER=1 defguard-client
 ```
+
+## Failed to run `pnpm tauri dev`
+
+`pnpm tauri dev` command may result in the following error:
+
+```
+Error [ERR_REQUIRE_ESM]: require() of ES Module /home/jck/workspace/work/teonite/defguard/client/node_modules/.pnpm/[email protected]/node_modules/path-type/index.js from /home/jck/workspace/work/teonite/defguard/client/node_modules/.pnpm/[email protected]/node_modules/read-pkg/index.js not supported.
+Instead change the require of /home/jck/workspace/work/teonite/defguard/client/node_modules/.pnpm/[email protected]/node_modules/path-type/index.js in /home/jck/workspace/work/teonite/defguard/client/node_modules/.pnpm/[email protected]/node_modules/read-pkg/index.js to a dynamic import() which is available in all CommonJS modules.
+    at TracingChannel.traceSync (node:diagnostics_channel:315:14)
+    at Object.<anonymous> (/home/jck/workspace/work/teonite/defguard/client/node_modules/.pnpm/[email protected]/node_modules/read-pkg/index.js:4:18) {
+  code: 'ERR_REQUIRE_ESM'
+}
+
+Node.js v22.7.0
+ ELIFECYCLE  Command failed with exit code 1.
+       Error The "beforeDevCommand" terminated with a non-zero status code.
+ ELIFECYCLE  Command failed with exit code 1.
+```
+
+To fix this remove node_modules and rerun `pnpm install`.
@@ -1,7 +1,7 @@
 {
   "name": "defguard-client",
   "private": false,
-  "version": "0.4.1",
+  "version": "1.0.0",
   "type": "module",
   "scripts": {
     "dev": "npm-run-all --parallel vite typesafe-i18n",
@@ -42,17 +42,17 @@
   "dependencies": {
     "@floating-ui/react": "^0.26.3",
     "@hookform/resolvers": "^3.3.2",
-    "@ladle/react": "^3.3.1",
+    "@ladle/react": "^4.1.1",
     "@stablelib/base64": "^1.0.1",
     "@stablelib/x25519": "^1.0.3",
     "@tanstack/query-core": "^5.12.1",
     "@tanstack/react-virtual": "3.0.0-beta.54",
-    "@tauri-apps/api": "^1.5.1",
+    "@tauri-apps/api": "^1.6.0",
     "@types/byte-size": "^8.1.2",
     "byte-size": "^8.1.1",
     "classnames": "^2.3.2",
     "compare-versions": "^6.1.0",
-    "dayjs": "^1.11.10",
+    "dayjs": "^1.11.13",
     "detect-browser": "^5.3.0",
     "fast-deep-equal": "^3.1.3",
     "file-saver": "^2.0.5",
@@ -70,9 +70,9 @@
     "react-hook-form": "^7.48.2",
     "react-loading-skeleton": "^3.3.1",
     "react-markdown": "^9.0.1",
-    "react-qr-code": "^2.0.12",
+    "react-qr-code": "^2.0.15",
     "react-router-dom": "^6.20.1",
-    "react-virtualized-auto-sizer": "^1.0.20",
+    "react-virtualized-auto-sizer": "^1.0.24",
     "recharts": "^2.10.3",
     "rehype-sanitize": "^6.0.0",
     "rxjs": "^7.8.1",
@@ -87,7 +87,7 @@
     "@svgr/cli": "^8.1.0",
     "@tanstack/react-query": "^5.12.2",
     "@tanstack/react-query-devtools": "^5.12.2",
-    "@tauri-apps/cli": "^1.5.7",
+    "@tauri-apps/cli": "^1.6.2",
     "@types/file-saver": "^2.0.7",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.10.3",
@@ -97,7 +97,7 @@
     "@typescript-eslint/parser": "^6.13.1",
     "@vitejs/plugin-react": "^4.2.0",
     "@vitejs/plugin-react-swc": "^3.5.0",
-    "autoprefixer": "^10.4.16",
+    "autoprefixer": "^10.4.20",
     "eslint": "^8.55.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.0",
@@ -113,7 +113,7 @@
     "typesafe-i18n": "^5.26.2",
     "typescript": "^5.3.2",
     "typescript-eslint-language-service": "^5.0.5",
-    "vite": "^4.5.1"
+    "vite": "^4.5.3"
   },
   "volta": {
     "node": "20.5.1"