From 56ff469f0334a8b2410ef63972f4331a64922a09 Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Sat, 31 May 2025 11:57:40 +1000 Subject: [PATCH] refactor(gui-client): merge all windows into a single view (#9295) This PR refactors the GUI clients frontend into a single window with a sidebar. The functionality remains the same but we do make minor UI improvements on the way. To pull the entire refactor off, we now use `react` and `flowbite-react` for the GUI. All the communication with the backend is moved towards one-way commands and events. That means, the flow is always: - Backend emits events to update frontend - Frontend triggers actions in the backend that may or may not result in further events This allows us to decouple the GUI from knowing about which side-effects change what parts of the state. Instead, it simply updates whenever it receives an event. - The previous "Advanced Settings" screen is now split into two parts: Settings and Diagnostics. Later, we will add a "General settings" page here. - The tray menu remains identical to the current one. When the user clicks "Settings" or "About", we open the window and navigate to the corresponding page. - The app and git version are now directly embedded in the frontend, simplifying the interaction between the frontend and the backend further. |Before|After| |---|---| |![](https://github.com/user-attachments/assets/7e8039c8-d589-495e-92b4-1742f9eb01b2)|![](https://github.com/user-attachments/assets/363184b3-4fcf-45c2-82d2-c466902759ef)| |![](https://github.com/user-attachments/assets/88163522-cafc-4ad4-90cd-be2e77073b7f)|![](https://github.com/user-attachments/assets/106ef921-38a7-4603-add9-8b0875064737)| |![](https://github.com/user-attachments/assets/a4bef4b0-5b29-43dd-aea6-0babd3b4ec9e)|![](https://github.com/user-attachments/assets/b84f1b51-c35c-48cc-9335-c653eee597ff) |![](https://github.com/user-attachments/assets/f0473a0a-cdba-4a15-af98-d97ef422dbc5)|![](https://github.com/user-attachments/assets/ddced01b-6f44-4241-80ea-038a4740915b)| --- rust/gui-client/.flowbite-react/.gitignore | 2 + rust/gui-client/.flowbite-react/config.json | 9 + rust/gui-client/index.html | 15 + rust/gui-client/package.json | 19 +- rust/gui-client/pnpm-lock.yaml | 1214 ++++++++++++----- .../src-frontend/components/AboutPage.tsx | 25 + .../src-frontend/components/App.tsx | 172 +++ .../components/ColorPalettePage.tsx | 76 ++ .../components/DiagnosticsPage.tsx | 58 + .../src-frontend/components/OverviewPage.tsx | 68 + .../src-frontend/components/SettingsPage.tsx | 144 ++ rust/gui-client/src-frontend/custom.d.ts | 4 + .../gui-client/{src => src-frontend}/logo.png | Bin .../{src/input.css => src-frontend/main.css} | 13 +- rust/gui-client/src-frontend/main.tsx | 36 + rust/gui-client/src-frontend/vite-env.d.ts | 4 + rust/gui-client/src-tauri/src/about.rs | 23 - rust/gui-client/src-tauri/src/clear_logs.rs | 62 - rust/gui-client/src-tauri/src/controller.rs | 52 +- rust/gui-client/src-tauri/src/gui.rs | 122 +- rust/gui-client/src-tauri/src/lib.rs | 6 +- rust/gui-client/src-tauri/src/logging.rs | 168 +-- rust/gui-client/src-tauri/src/service.rs | 15 +- rust/gui-client/src-tauri/src/settings.rs | 43 +- rust/gui-client/src-tauri/src/view.rs | 148 ++ rust/gui-client/src-tauri/src/welcome.rs | 30 - rust/gui-client/src-tauri/tauri.conf.json | 30 +- rust/gui-client/src/about.html | 30 - rust/gui-client/src/about.ts | 34 - rust/gui-client/src/settings.html | 181 --- rust/gui-client/src/settings.ts | 193 --- rust/gui-client/src/welcome.html | 61 - rust/gui-client/src/welcome.ts | 48 - rust/gui-client/tsconfig.json | 8 +- rust/gui-client/vite.config.ts | 34 +- scripts/bump-versions.sh | 1 + 36 files changed, 1851 insertions(+), 1297 deletions(-) create mode 100644 rust/gui-client/.flowbite-react/.gitignore create mode 100644 rust/gui-client/.flowbite-react/config.json create mode 100644 rust/gui-client/index.html create mode 100644 rust/gui-client/src-frontend/components/AboutPage.tsx create mode 100644 rust/gui-client/src-frontend/components/App.tsx create mode 100644 rust/gui-client/src-frontend/components/ColorPalettePage.tsx create mode 100644 rust/gui-client/src-frontend/components/DiagnosticsPage.tsx create mode 100644 rust/gui-client/src-frontend/components/OverviewPage.tsx create mode 100644 rust/gui-client/src-frontend/components/SettingsPage.tsx create mode 100644 rust/gui-client/src-frontend/custom.d.ts rename rust/gui-client/{src => src-frontend}/logo.png (100%) rename rust/gui-client/{src/input.css => src-frontend/main.css} (86%) create mode 100644 rust/gui-client/src-frontend/main.tsx create mode 100644 rust/gui-client/src-frontend/vite-env.d.ts delete mode 100644 rust/gui-client/src-tauri/src/about.rs delete mode 100644 rust/gui-client/src-tauri/src/clear_logs.rs create mode 100644 rust/gui-client/src-tauri/src/view.rs delete mode 100644 rust/gui-client/src-tauri/src/welcome.rs delete mode 100644 rust/gui-client/src/about.html delete mode 100644 rust/gui-client/src/about.ts delete mode 100644 rust/gui-client/src/settings.html delete mode 100644 rust/gui-client/src/settings.ts delete mode 100644 rust/gui-client/src/welcome.html delete mode 100644 rust/gui-client/src/welcome.ts diff --git a/rust/gui-client/.flowbite-react/.gitignore b/rust/gui-client/.flowbite-react/.gitignore new file mode 100644 index 000000000..2b4407d0d --- /dev/null +++ b/rust/gui-client/.flowbite-react/.gitignore @@ -0,0 +1,2 @@ +class-list.json +pid diff --git a/rust/gui-client/.flowbite-react/config.json b/rust/gui-client/.flowbite-react/config.json new file mode 100644 index 000000000..7b3e820d4 --- /dev/null +++ b/rust/gui-client/.flowbite-react/config.json @@ -0,0 +1,9 @@ +{ + "$schema": "https://unpkg.com/flowbite-react/schema.json", + "components": [], + "dark": false, + "prefix": "", + "path": "src-frontend/*", + "tsx": true, + "rsc": true +} diff --git a/rust/gui-client/index.html b/rust/gui-client/index.html new file mode 100644 index 000000000..3029a6790 --- /dev/null +++ b/rust/gui-client/index.html @@ -0,0 +1,15 @@ + + + + + + + + + + Firezone + + + diff --git a/rust/gui-client/package.json b/rust/gui-client/package.json index df6793f22..c818663b9 100644 --- a/rust/gui-client/package.json +++ b/rust/gui-client/package.json @@ -12,19 +12,24 @@ "dev": "run-script-os", "dev:win32": "call dev.bat", "dev:darwin:linux": "./dev.sh", - "tauri": "tauri" + "tauri": "tauri", + "postinstall": "flowbite-react patch" }, "dependencies": { + "@heroicons/react": "^2.2.0", "@tailwindcss/cli": "^4.1.7", - "@tauri-apps/api": "^2.5.0", - "flowbite": "^3.1.2" - }, - "devDependencies": { - "@rollup/plugin-typescript": "^12.1.2", "@tailwindcss/vite": "^4.1.7", + "@tauri-apps/api": "^2.5.0", "@tauri-apps/cli": "^2.5.0", "@types/node": "^22.15.3", - "http-server": "^14.1.1", + "@types/react": "^19.1.5", + "@types/react-dom": "^19.1.5", + "@vitejs/plugin-react": "^4.5.0", + "flowbite": "^3.1.2", + "flowbite-react": "^0.11.7", + "react": "^19.1.0", + "react-dom": "^19.1.0", + "react-router": "^7.6.1", "run-script-os": "^1.1.6", "tailwindcss": "^4.1.7", "tslib": "^2.8.1", diff --git a/rust/gui-client/pnpm-lock.yaml b/rust/gui-client/pnpm-lock.yaml index 511bee58f..a158dd87f 100644 --- a/rust/gui-client/pnpm-lock.yaml +++ b/rust/gui-client/pnpm-lock.yaml @@ -8,37 +8,54 @@ importers: .: dependencies: + '@heroicons/react': + specifier: ^2.2.0 + version: 2.2.0(react@19.1.0) '@tailwindcss/cli': specifier: ^4.1.7 - version: 4.1.7 + version: 4.1.8 + '@tailwindcss/vite': + specifier: ^4.1.7 + version: 4.1.8(vite@6.3.4(@types/node@22.15.3)(jiti@2.4.2)(lightningcss@1.30.1)(yaml@2.6.0)) '@tauri-apps/api': specifier: ^2.5.0 version: 2.5.0 - flowbite: - specifier: ^3.1.2 - version: 3.1.2(rollup@4.40.1) - devDependencies: - '@rollup/plugin-typescript': - specifier: ^12.1.2 - version: 12.1.2(rollup@4.40.1)(tslib@2.8.1)(typescript@5.8.3) - '@tailwindcss/vite': - specifier: ^4.1.7 - version: 4.1.7(vite@6.3.4(@types/node@22.15.3)(jiti@2.4.2)(lightningcss@1.30.1)(yaml@2.6.0)) '@tauri-apps/cli': specifier: ^2.5.0 version: 2.5.0 '@types/node': specifier: ^22.15.3 version: 22.15.3 - http-server: - specifier: ^14.1.1 - version: 14.1.1 + '@types/react': + specifier: ^19.1.5 + version: 19.1.5 + '@types/react-dom': + specifier: ^19.1.5 + version: 19.1.5(@types/react@19.1.5) + '@vitejs/plugin-react': + specifier: ^4.5.0 + version: 4.5.0(vite@6.3.4(@types/node@22.15.3)(jiti@2.4.2)(lightningcss@1.30.1)(yaml@2.6.0)) + flowbite: + specifier: ^3.1.2 + version: 3.1.2(rollup@4.40.1) + flowbite-react: + specifier: ^0.11.7 + version: 0.11.7(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(tailwindcss@4.1.8)(typescript@5.8.3) + react: + specifier: ^19.1.0 + version: 19.1.0 + react-dom: + specifier: ^19.1.0 + version: 19.1.0(react@19.1.0) + react-router: + specifier: ^7.6.1 + version: 7.6.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0) run-script-os: specifier: ^1.1.6 version: 1.1.6 tailwindcss: specifier: ^4.1.7 - version: 4.1.7 + version: 4.1.8 tslib: specifier: ^2.8.1 version: 2.8.1 @@ -58,6 +75,85 @@ packages: resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} engines: {node: '>=6.0.0'} + '@babel/code-frame@7.27.1': + resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==} + engines: {node: '>=6.9.0'} + + '@babel/compat-data@7.27.2': + resolution: {integrity: sha512-TUtMJYRPyUb/9aU8f3K0mjmjf6M9N5Woshn2CS6nqJSeJtTtQcpLUXjGt9vbF8ZGff0El99sWkLgzwW3VXnxZQ==} + engines: {node: '>=6.9.0'} + + '@babel/core@7.27.1': + resolution: {integrity: sha512-IaaGWsQqfsQWVLqMn9OB92MNN7zukfVA4s7KKAI0KfrrDsZ0yhi5uV4baBuLuN7n3vsZpwP8asPPcVwApxvjBQ==} + engines: {node: '>=6.9.0'} + + '@babel/generator@7.27.1': + resolution: {integrity: sha512-UnJfnIpc/+JO0/+KRVQNGU+y5taA5vCbwN8+azkX6beii/ZF+enZJSOKo11ZSzGJjlNfJHfQtmQT8H+9TXPG2w==} + engines: {node: '>=6.9.0'} + + '@babel/helper-compilation-targets@7.27.2': + resolution: {integrity: sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==} + engines: {node: '>=6.9.0'} + + '@babel/helper-module-imports@7.27.1': + resolution: {integrity: sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==} + engines: {node: '>=6.9.0'} + + '@babel/helper-module-transforms@7.27.1': + resolution: {integrity: sha512-9yHn519/8KvTU5BjTVEEeIM3w9/2yXNKoD82JifINImhpKkARMJKPP59kLo+BafpdN5zgNeIcS4jsGDmd3l58g==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + + '@babel/helper-plugin-utils@7.27.1': + resolution: {integrity: sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==} + engines: {node: '>=6.9.0'} + + '@babel/helper-string-parser@7.27.1': + resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==} + engines: {node: '>=6.9.0'} + + '@babel/helper-validator-identifier@7.27.1': + resolution: {integrity: sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==} + engines: {node: '>=6.9.0'} + + '@babel/helper-validator-option@7.27.1': + resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==} + engines: {node: '>=6.9.0'} + + '@babel/helpers@7.27.1': + resolution: {integrity: sha512-FCvFTm0sWV8Fxhpp2McP5/W53GPllQ9QeQ7SiqGWjMf/LVG07lFa5+pgK05IRhVwtvafT22KF+ZSnM9I545CvQ==} + engines: {node: '>=6.9.0'} + + '@babel/parser@7.27.2': + resolution: {integrity: sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==} + engines: {node: '>=6.0.0'} + hasBin: true + + '@babel/plugin-transform-react-jsx-self@7.27.1': + resolution: {integrity: sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + + '@babel/plugin-transform-react-jsx-source@7.27.1': + resolution: {integrity: sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + + '@babel/template@7.27.2': + resolution: {integrity: sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==} + engines: {node: '>=6.9.0'} + + '@babel/traverse@7.27.1': + resolution: {integrity: sha512-ZCYtZciz1IWJB4U61UPu4KEaqyfj+r5T1Q5mqPo+IBpcG9kHv30Z0aD8LXPgC1trYa6rK0orRyAhqUgk4MjmEg==} + engines: {node: '>=6.9.0'} + + '@babel/types@7.27.1': + resolution: {integrity: sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==} + engines: {node: '>=6.9.0'} + '@esbuild/aix-ppc64@0.25.3': resolution: {integrity: sha512-W8bFfPA8DowP8l//sxjJLSLkD8iEjMc7cBVyP+u4cEv9sM7mdUCkgsj+t0n/BWPFtv7WWCN5Yzj0N6FJNUUqBQ==} engines: {node: '>=18'} @@ -208,6 +304,38 @@ packages: cpu: [x64] os: [win32] + '@floating-ui/core@1.6.9': + resolution: {integrity: sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==} + + '@floating-ui/core@1.7.0': + resolution: {integrity: sha512-FRdBLykrPPA6P76GGGqlex/e7fbe0F1ykgxHYNXQsH/iTEtjMj/f9bpY5oQqbjt5VgZvgz/uKXbGuROijh3VLA==} + + '@floating-ui/dom@1.7.0': + resolution: {integrity: sha512-lGTor4VlXcesUMh1cupTUTDoCxMb0V6bm3CnxHzQcw8Eaf1jQbgQX4i02fYgT0vJ82tb5MZ4CZk1LRGkktJCzg==} + + '@floating-ui/react-dom@2.1.2': + resolution: {integrity: sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==} + peerDependencies: + react: '>=16.8.0' + react-dom: '>=16.8.0' + + '@floating-ui/react@0.27.3': + resolution: {integrity: sha512-CLHnes3ixIFFKVQDdICjel8muhFLOBdQH7fgtHNPY8UbCNqbeKZ262G7K66lGQOUQWWnYocf7ZbUsLJgGfsLHg==} + peerDependencies: + react: '>=17.0.0' + react-dom: '>=17.0.0' + + '@floating-ui/utils@0.2.9': + resolution: {integrity: sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==} + + '@heroicons/react@2.2.0': + resolution: {integrity: sha512-LMcepvRaS9LYHJGsF0zzmgKCUim/X3N/DQKc4jepAXJ7l8QxJ1PmxJzqplF2Z3FE4PqBAIGyJAQ/w4B5dsqbtQ==} + peerDependencies: + react: '>= 16 || ^19.0.0-rc' + + '@iarna/toml@2.2.5': + resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==} + '@isaacs/fs-minipass@4.0.1': resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==} engines: {node: '>=18.0.0'} @@ -230,6 +358,18 @@ packages: '@jridgewell/trace-mapping@0.3.25': resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} + '@nodelib/fs.scandir@2.1.5': + resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} + engines: {node: '>= 8'} + + '@nodelib/fs.stat@2.0.5': + resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} + engines: {node: '>= 8'} + + '@nodelib/fs.walk@1.2.8': + resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} + engines: {node: '>= 8'} + '@parcel/watcher-android-arm64@2.5.1': resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==} engines: {node: '>= 10.0.0'} @@ -315,6 +455,9 @@ packages: '@popperjs/core@2.11.8': resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} + '@rolldown/pluginutils@1.0.0-beta.9': + resolution: {integrity: sha512-e9MeMtVWo186sgvFFJOPGy7/d2j2mZhLJIdVW0C/xDluuOvymEATqz6zKsP0ZmXGzQtqlyjz5sC1sYQUoJG98w==} + '@rollup/plugin-node-resolve@15.3.1': resolution: {integrity: sha512-tgg6b91pAybXHJQMAAwW9VuWBO6Thi+q7BCNARLwSqlmsHz0XYURtGvh/AuwSADXSI4h/2uHbs7s4FzlZDGSGA==} engines: {node: '>=14.0.0'} @@ -446,69 +589,69 @@ packages: cpu: [x64] os: [win32] - '@tailwindcss/cli@4.1.7': - resolution: {integrity: sha512-hJNjpov/UiJc9ZWH4j/eEQxqklADrD/71s+t8Y0wbyQVAwtLkSp+MeC/sHTb03X+28rfbe0fRXkiBsf73/IwPg==} + '@tailwindcss/cli@4.1.8': + resolution: {integrity: sha512-+6lkjXSr/68zWiabK3mVYVHmOq/SAHjJ13mR8spyB4LgUWZbWzU9kCSErlAUo+gK5aVfgqe8kY6Ltz9+nz5XYA==} hasBin: true - '@tailwindcss/node@4.1.7': - resolution: {integrity: sha512-9rsOpdY9idRI2NH6CL4wORFY0+Q6fnx9XP9Ju+iq/0wJwGD5IByIgFmwVbyy4ymuyprj8Qh4ErxMKTUL4uNh3g==} + '@tailwindcss/node@4.1.8': + resolution: {integrity: sha512-OWwBsbC9BFAJelmnNcrKuf+bka2ZxCE2A4Ft53Tkg4uoiE67r/PMEYwCsourC26E+kmxfwE0hVzMdxqeW+xu7Q==} - '@tailwindcss/oxide-android-arm64@4.1.7': - resolution: {integrity: sha512-IWA410JZ8fF7kACus6BrUwY2Z1t1hm0+ZWNEzykKmMNM09wQooOcN/VXr0p/WJdtHZ90PvJf2AIBS/Ceqx1emg==} + '@tailwindcss/oxide-android-arm64@4.1.8': + resolution: {integrity: sha512-Fbz7qni62uKYceWYvUjRqhGfZKwhZDQhlrJKGtnZfuNtHFqa8wmr+Wn74CTWERiW2hn3mN5gTpOoxWKk0jRxjg==} engines: {node: '>= 10'} cpu: [arm64] os: [android] - '@tailwindcss/oxide-darwin-arm64@4.1.7': - resolution: {integrity: sha512-81jUw9To7fimGGkuJ2W5h3/oGonTOZKZ8C2ghm/TTxbwvfSiFSDPd6/A/KE2N7Jp4mv3Ps9OFqg2fEKgZFfsvg==} + '@tailwindcss/oxide-darwin-arm64@4.1.8': + resolution: {integrity: sha512-RdRvedGsT0vwVVDztvyXhKpsU2ark/BjgG0huo4+2BluxdXo8NDgzl77qh0T1nUxmM11eXwR8jA39ibvSTbi7A==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tailwindcss/oxide-darwin-x64@4.1.7': - resolution: {integrity: sha512-q77rWjEyGHV4PdDBtrzO0tgBBPlQWKY7wZK0cUok/HaGgbNKecegNxCGikuPJn5wFAlIywC3v+WMBt0PEBtwGw==} + '@tailwindcss/oxide-darwin-x64@4.1.8': + resolution: {integrity: sha512-t6PgxjEMLp5Ovf7uMb2OFmb3kqzVTPPakWpBIFzppk4JE4ix0yEtbtSjPbU8+PZETpaYMtXvss2Sdkx8Vs4XRw==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tailwindcss/oxide-freebsd-x64@4.1.7': - resolution: {integrity: sha512-RfmdbbK6G6ptgF4qqbzoxmH+PKfP4KSVs7SRlTwcbRgBwezJkAO3Qta/7gDy10Q2DcUVkKxFLXUQO6J3CRvBGw==} + '@tailwindcss/oxide-freebsd-x64@4.1.8': + resolution: {integrity: sha512-g8C8eGEyhHTqwPStSwZNSrOlyx0bhK/V/+zX0Y+n7DoRUzyS8eMbVshVOLJTDDC+Qn9IJnilYbIKzpB9n4aBsg==} engines: {node: '>= 10'} cpu: [x64] os: [freebsd] - '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.7': - resolution: {integrity: sha512-OZqsGvpwOa13lVd1z6JVwQXadEobmesxQ4AxhrwRiPuE04quvZHWn/LnihMg7/XkN+dTioXp/VMu/p6A5eZP3g==} + '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.8': + resolution: {integrity: sha512-Jmzr3FA4S2tHhaC6yCjac3rGf7hG9R6Gf2z9i9JFcuyy0u79HfQsh/thifbYTF2ic82KJovKKkIB6Z9TdNhCXQ==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tailwindcss/oxide-linux-arm64-gnu@4.1.7': - resolution: {integrity: sha512-voMvBTnJSfKecJxGkoeAyW/2XRToLZ227LxswLAwKY7YslG/Xkw9/tJNH+3IVh5bdYzYE7DfiaPbRkSHFxY1xA==} + '@tailwindcss/oxide-linux-arm64-gnu@4.1.8': + resolution: {integrity: sha512-qq7jXtO1+UEtCmCeBBIRDrPFIVI4ilEQ97qgBGdwXAARrUqSn/L9fUrkb1XP/mvVtoVeR2bt/0L77xx53bPZ/Q==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tailwindcss/oxide-linux-arm64-musl@4.1.7': - resolution: {integrity: sha512-PjGuNNmJeKHnP58M7XyjJyla8LPo+RmwHQpBI+W/OxqrwojyuCQ+GUtygu7jUqTEexejZHr/z3nBc/gTiXBj4A==} + '@tailwindcss/oxide-linux-arm64-musl@4.1.8': + resolution: {integrity: sha512-O6b8QesPbJCRshsNApsOIpzKt3ztG35gfX9tEf4arD7mwNinsoCKxkj8TgEE0YRjmjtO3r9FlJnT/ENd9EVefQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tailwindcss/oxide-linux-x64-gnu@4.1.7': - resolution: {integrity: sha512-HMs+Va+ZR3gC3mLZE00gXxtBo3JoSQxtu9lobbZd+DmfkIxR54NO7Z+UQNPsa0P/ITn1TevtFxXTpsRU7qEvWg==} + '@tailwindcss/oxide-linux-x64-gnu@4.1.8': + resolution: {integrity: sha512-32iEXX/pXwikshNOGnERAFwFSfiltmijMIAbUhnNyjFr3tmWmMJWQKU2vNcFX0DACSXJ3ZWcSkzNbaKTdngH6g==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tailwindcss/oxide-linux-x64-musl@4.1.7': - resolution: {integrity: sha512-MHZ6jyNlutdHH8rd+YTdr3QbXrHXqwIhHw9e7yXEBcQdluGwhpQY2Eku8UZK6ReLaWtQ4gijIv5QoM5eE+qlsA==} + '@tailwindcss/oxide-linux-x64-musl@4.1.8': + resolution: {integrity: sha512-s+VSSD+TfZeMEsCaFaHTaY5YNj3Dri8rST09gMvYQKwPphacRG7wbuQ5ZJMIJXN/puxPcg/nU+ucvWguPpvBDg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tailwindcss/oxide-wasm32-wasi@4.1.7': - resolution: {integrity: sha512-ANaSKt74ZRzE2TvJmUcbFQ8zS201cIPxUDm5qez5rLEwWkie2SkGtA4P+GPTj+u8N6JbPrC8MtY8RmJA35Oo+A==} + '@tailwindcss/oxide-wasm32-wasi@4.1.8': + resolution: {integrity: sha512-CXBPVFkpDjM67sS1psWohZ6g/2/cd+cq56vPxK4JeawelxwK4YECgl9Y9TjkE2qfF+9/s1tHHJqrC4SS6cVvSg==} engines: {node: '>=14.0.0'} cpu: [wasm32] bundledDependencies: @@ -519,24 +662,24 @@ packages: - '@emnapi/wasi-threads' - tslib - '@tailwindcss/oxide-win32-arm64-msvc@4.1.7': - resolution: {integrity: sha512-HUiSiXQ9gLJBAPCMVRk2RT1ZrBjto7WvqsPBwUrNK2BcdSxMnk19h4pjZjI7zgPhDxlAbJSumTC4ljeA9y0tEw==} + '@tailwindcss/oxide-win32-arm64-msvc@4.1.8': + resolution: {integrity: sha512-7GmYk1n28teDHUjPlIx4Z6Z4hHEgvP5ZW2QS9ygnDAdI/myh3HTHjDqtSqgu1BpRoI4OiLx+fThAyA1JePoENA==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tailwindcss/oxide-win32-x64-msvc@4.1.7': - resolution: {integrity: sha512-rYHGmvoHiLJ8hWucSfSOEmdCBIGZIq7SpkPRSqLsH2Ab2YUNgKeAPT1Fi2cx3+hnYOrAb0jp9cRyode3bBW4mQ==} + '@tailwindcss/oxide-win32-x64-msvc@4.1.8': + resolution: {integrity: sha512-fou+U20j+Jl0EHwK92spoWISON2OBnCazIc038Xj2TdweYV33ZRkS9nwqiUi2d/Wba5xg5UoHfvynnb/UB49cQ==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tailwindcss/oxide@4.1.7': - resolution: {integrity: sha512-5SF95Ctm9DFiUyjUPnDGkoKItPX/k+xifcQhcqX5RA85m50jw1pT/KzjdvlqxRja45Y52nR4MR9fD1JYd7f8NQ==} + '@tailwindcss/oxide@4.1.8': + resolution: {integrity: sha512-d7qvv9PsM5N3VNKhwVUhpK6r4h9wtLkJ6lz9ZY9aeZgrUWk1Z8VPyqyDT9MZlem7GTGseRQHkeB1j3tC7W1P+A==} engines: {node: '>= 10'} - '@tailwindcss/vite@4.1.7': - resolution: {integrity: sha512-tYa2fO3zDe41I7WqijyVbRd8oWT0aEID1Eokz5hMT6wShLIHj3yvwj9XbfuloHP9glZ6H+aG2AN/+ZrxJ1Y5RQ==} + '@tailwindcss/vite@4.1.8': + resolution: {integrity: sha512-CQ+I8yxNV5/6uGaJjiuymgw0kEQiNKRinYbZXPdx1fk5WgiyReG0VaUx/Xq6aVNSUNJFzxm6o8FNKS5aMaim5A==} peerDependencies: vite: ^5.2.0 || ^6 @@ -614,69 +757,129 @@ packages: engines: {node: '>= 10'} hasBin: true + '@types/babel__core@7.20.5': + resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==} + + '@types/babel__generator@7.27.0': + resolution: {integrity: sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==} + + '@types/babel__template@7.4.4': + resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==} + + '@types/babel__traverse@7.20.7': + resolution: {integrity: sha512-dkO5fhS7+/oos4ciWxyEyjWe48zmG6wbCheo/G2ZnHx4fs3EU6YC6UM8rk56gAjNJ9P3MTH2jo5jb92/K6wbng==} + '@types/estree@1.0.7': resolution: {integrity: sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==} '@types/node@22.15.3': resolution: {integrity: sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==} + '@types/react-dom@19.1.5': + resolution: {integrity: sha512-CMCjrWucUBZvohgZxkjd6S9h0nZxXjzus6yDfUb+xLxYM7VvjKNH1tQrE9GWLql1XoOP4/Ds3bwFqShHUYraGg==} + peerDependencies: + '@types/react': ^19.0.0 + + '@types/react@19.1.5': + resolution: {integrity: sha512-piErsCVVbpMMT2r7wbawdZsq4xMvIAhQuac2gedQHysu1TZYEigE6pnFfgZT+/jQnrRuF5r+SHzuehFjfRjr4g==} + '@types/resolve@1.20.2': resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==} - ansi-styles@4.3.0: - resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} - engines: {node: '>=8'} + '@typescript-eslint/types@8.26.0': + resolution: {integrity: sha512-89B1eP3tnpr9A8L6PZlSjBvnJhWXtYfZhECqlBl1D9Lme9mHO6iWlsprBtVenQvY1HMhax1mWOjhtL3fh/u+pA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - async@2.6.4: - resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} + '@typescript-eslint/typescript-estree@8.26.0': + resolution: {integrity: sha512-tiJ1Hvy/V/oMVRTbEOIeemA2XoylimlDQ03CgPPNaHYZbpsc78Hmngnt+WXZfJX1pjQ711V7g0H7cSJThGYfPQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '>=4.8.4 <5.9.0' - basic-auth@2.0.1: - resolution: {integrity: sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==} - engines: {node: '>= 0.8'} + '@typescript-eslint/visitor-keys@8.26.0': + resolution: {integrity: sha512-2z8JQJWAzPdDd51dRQ/oqIJxe99/hoLIqmf8RMCAJQtYDc535W/Jt2+RTP4bP0aKeBG1F65yjIZuczOXCmbWwg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@vitejs/plugin-react@4.5.0': + resolution: {integrity: sha512-JuLWaEqypaJmOJPLWwO335Ig6jSgC1FTONCWAxnqcQthLTK/Yc9aH6hr9z/87xciejbQcnP3GnA1FWUSWeXaeg==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + vite: ^4.2.0 || ^5.0.0 || ^6.0.0 + + array-timsort@1.0.3: + resolution: {integrity: sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==} + + ast-types@0.16.1: + resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==} + engines: {node: '>=4'} + + balanced-match@1.0.2: + resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} + + brace-expansion@2.0.1: + resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} braces@3.0.3: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} - call-bind@1.0.7: - resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} - engines: {node: '>= 0.4'} + browserslist@4.24.5: + resolution: {integrity: sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true - chalk@4.1.2: - resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} - engines: {node: '>=10'} + caniuse-lite@1.0.30001718: + resolution: {integrity: sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==} + + chokidar@4.0.3: + resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} + engines: {node: '>= 14.16.0'} chownr@3.0.0: resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} engines: {node: '>=18'} - color-convert@2.0.1: - resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} - engines: {node: '>=7.0.0'} + classnames@2.5.1: + resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==} - color-name@1.1.4: - resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + comment-json@4.2.5: + resolution: {integrity: sha512-bKw/r35jR3HGt5PEPm1ljsQQGyCrR8sFGNiN5L+ykDHdpO8Smxkrkla9Yi6NkQyUrb8V54PGhfMs6NrIwtxtdw==} + engines: {node: '>= 6'} - corser@2.0.1: - resolution: {integrity: sha512-utCYNzRSQIZNPIcGZdQc92UVJYAhtGAteCFg0yRaFm8f0P+CPtyGyHXJcGXnffjCybUCEx3FQ2G7U3/o9eIkVQ==} - engines: {node: '>= 0.4.0'} + convert-source-map@2.0.0: + resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} - debug@3.2.7: - resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} + cookie@1.0.2: + resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==} + engines: {node: '>=18'} + + core-util-is@1.0.3: + resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} + + csstype@3.1.3: + resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} + + debounce@2.2.0: + resolution: {integrity: sha512-Xks6RUDLZFdz8LIdR6q0MTH44k7FikOmnh5xkSjMig6ch45afc8sjTjRQf3P6ax8dMgcQrYO/AR2RGWURrruqw==} + engines: {node: '>=18'} + + debug@4.4.1: + resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==} + engines: {node: '>=6.0'} peerDependencies: supports-color: '*' peerDependenciesMeta: supports-color: optional: true + deepmerge-ts@7.1.4: + resolution: {integrity: sha512-fxqo6nHGQ9zOVgI4KXqtWXJR/yCLtC7aXIVq+6jc8tHPFUxlFmuUcm2kC4vztQ+LJxQ3gER/XAWearGYQ8niGA==} + engines: {node: '>=16.0.0'} + deepmerge@4.3.1: resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} - define-data-property@1.1.4: - resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} - engines: {node: '>= 0.4'} - detect-libc@1.0.3: resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==} engines: {node: '>=0.10'} @@ -686,28 +889,40 @@ packages: resolution: {integrity: sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==} engines: {node: '>=8'} + electron-to-chromium@1.5.158: + resolution: {integrity: sha512-9vcp2xHhkvraY6AHw2WMi+GDSLPX42qe2xjYaVoZqFRJiOcilVQFq9mZmpuHEQpzlgGDelKlV7ZiGcmMsc8WxQ==} + enhanced-resolve@5.18.1: resolution: {integrity: sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==} engines: {node: '>=10.13.0'} - es-define-property@1.0.0: - resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} - engines: {node: '>= 0.4'} - - es-errors@1.3.0: - resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} - engines: {node: '>= 0.4'} - esbuild@0.25.3: resolution: {integrity: sha512-qKA6Pvai73+M2FtftpNKRxJ78GIjmFXFxd/1DVBqGo/qNhLSfv+G12n9pNoWdytJC8U00TrViOwpjT0zgqQS8Q==} engines: {node: '>=18'} hasBin: true + escalade@3.2.0: + resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==} + engines: {node: '>=6'} + + eslint-visitor-keys@4.2.0: + resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + esprima@4.0.1: + resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==} + engines: {node: '>=4'} + hasBin: true + estree-walker@2.0.2: resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} - eventemitter3@4.0.7: - resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==} + fast-glob@3.3.3: + resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==} + engines: {node: '>=8.6.0'} + + fastq@1.19.1: + resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==} fdir@6.4.4: resolution: {integrity: sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==} @@ -724,21 +939,20 @@ packages: flowbite-datepicker@1.3.2: resolution: {integrity: sha512-6Nfm0MCVX3mpaR7YSCjmEO2GO8CDt6CX8ZpQnGdeu03WUCWtEPQ/uy0PUiNtIJjJZWnX0Cm3H55MOhbD1g+E/g==} + flowbite-react@0.11.7: + resolution: {integrity: sha512-Z8m+ycHEsXPacSAi8P4yYDeff7LvcHNwbGAnL/+Fpiv+6ZWDEAGY/YPKhUofZsZa837JTYrbcbmgjqQ1bpt51g==} + hasBin: true + peerDependencies: + react: ^18 || ^19 + react-dom: ^18 || ^19 + tailwindcss: ^3 || ^4 + flowbite@2.5.2: resolution: {integrity: sha512-kwFD3n8/YW4EG8GlY3Od9IoKND97kitO+/ejISHSqpn3vw2i5K/+ZI8Jm2V+KC4fGdnfi0XZ+TzYqQb4Q1LshA==} flowbite@3.1.2: resolution: {integrity: sha512-MkwSgbbybCYgMC+go6Da5idEKUFfMqc/AmSjm/2ZbdmvoKf5frLPq/eIhXc9P+rC8t9boZtUXzHDgt5whZ6A/Q==} - follow-redirects@1.15.9: - resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==} - engines: {node: '>=4.0'} - peerDependencies: - debug: '*' - peerDependenciesMeta: - debug: - optional: true - fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -747,56 +961,29 @@ packages: function-bind@1.1.2: resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} - get-intrinsic@1.2.4: - resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} - engines: {node: '>= 0.4'} + gensync@1.0.0-beta.2: + resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} + engines: {node: '>=6.9.0'} - gopd@1.0.1: - resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} + glob-parent@5.1.2: + resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} + engines: {node: '>= 6'} + + globals@11.12.0: + resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} + engines: {node: '>=4'} graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - has-flag@4.0.0: - resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} + has-own-prop@2.0.0: + resolution: {integrity: sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==} engines: {node: '>=8'} - has-property-descriptors@1.0.2: - resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} - - has-proto@1.0.3: - resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} - engines: {node: '>= 0.4'} - - has-symbols@1.0.3: - resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} - engines: {node: '>= 0.4'} - hasown@2.0.2: resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} - he@1.2.0: - resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==} - hasBin: true - - html-encoding-sniffer@3.0.0: - resolution: {integrity: sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==} - engines: {node: '>=12'} - - http-proxy@1.18.1: - resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==} - engines: {node: '>=8.0.0'} - - http-server@14.1.1: - resolution: {integrity: sha512-+cbxadF40UXd9T01zUHgA+rlo2Bg1Srer4+B4NwIHdaGxAGGv59nYRnGGDJ9LBk7alpS0US+J+bLLdQOOkJq4A==} - engines: {node: '>=12'} - hasBin: true - - iconv-lite@0.6.3: - resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} - engines: {node: '>=0.10.0'} - is-core-module@2.16.1: resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==} engines: {node: '>= 0.4'} @@ -820,6 +1007,23 @@ packages: resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==} hasBin: true + js-tokens@4.0.0: + resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} + + jsesc@3.1.0: + resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==} + engines: {node: '>=6'} + hasBin: true + + json5@2.2.3: + resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==} + engines: {node: '>=6'} + hasBin: true + + klona@2.0.6: + resolution: {integrity: sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==} + engines: {node: '>= 8'} + lightningcss-darwin-arm64@1.30.1: resolution: {integrity: sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==} engines: {node: '>= 12.0.0'} @@ -884,27 +1088,27 @@ packages: resolution: {integrity: sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==} engines: {node: '>= 12.0.0'} - lodash@4.17.21: - resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + lru-cache@5.1.1: + resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} magic-string@0.30.17: resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==} + merge2@1.4.1: + resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} + engines: {node: '>= 8'} + micromatch@4.0.8: resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} engines: {node: '>=8.6'} - mime@1.6.0: - resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==} - engines: {node: '>=4'} - hasBin: true - mini-svg-data-uri@1.4.4: resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==} hasBin: true - minimist@1.2.8: - resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} + minimatch@9.0.5: + resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==} + engines: {node: '>=16 || 14 >=14.17'} minipass@7.1.2: resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==} @@ -914,10 +1118,6 @@ packages: resolution: {integrity: sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==} engines: {node: '>= 18'} - mkdirp@0.5.6: - resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} - hasBin: true - mkdirp@3.0.1: resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==} engines: {node: '>=10'} @@ -938,13 +1138,11 @@ packages: node-addon-api@7.1.1: resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==} - object-inspect@1.13.2: - resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==} - engines: {node: '>= 0.4'} + node-releases@2.0.19: + resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==} - opener@1.5.2: - resolution: {integrity: sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==} - hasBin: true + package-manager-detector@0.2.9: + resolution: {integrity: sha512-+vYvA/Y31l8Zk8dwxHhL3JfTuHPm6tlxM2A3GeQyl7ovYnSp1+mzAxClxaOr0qO1TtPxbQxetI7v5XqKLJZk7Q==} path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} @@ -960,66 +1158,107 @@ packages: resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} engines: {node: '>=12'} - portfinder@1.0.32: - resolution: {integrity: sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==} - engines: {node: '>= 0.12.0'} - postcss@8.5.3: resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==} engines: {node: ^10 || ^12 || >=14} - qs@6.13.0: - resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==} - engines: {node: '>=0.6'} + queue-microtask@1.2.3: + resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - requires-port@1.0.0: - resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} + react-dom@19.1.0: + resolution: {integrity: sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==} + peerDependencies: + react: ^19.1.0 + + react-refresh@0.17.0: + resolution: {integrity: sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==} + engines: {node: '>=0.10.0'} + + react-router@7.6.1: + resolution: {integrity: sha512-hPJXXxHJZEsPFNVbtATH7+MMX43UDeOauz+EAU4cgqTn7ojdI9qQORqS8Z0qmDlL1TclO/6jLRYUEtbWidtdHQ==} + engines: {node: '>=20.0.0'} + peerDependencies: + react: '>=18' + react-dom: '>=18' + peerDependenciesMeta: + react-dom: + optional: true + + react@19.1.0: + resolution: {integrity: sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==} + engines: {node: '>=0.10.0'} + + readdirp@4.1.2: + resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==} + engines: {node: '>= 14.18.0'} + + recast@0.23.11: + resolution: {integrity: sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==} + engines: {node: '>= 4'} + + repeat-string@1.6.1: + resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==} + engines: {node: '>=0.10'} resolve@1.22.10: resolution: {integrity: sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==} engines: {node: '>= 0.4'} hasBin: true + reusify@1.1.0: + resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==} + engines: {iojs: '>=1.0.0', node: '>=0.10.0'} + rollup@4.40.1: resolution: {integrity: sha512-C5VvvgCCyfyotVITIAv+4efVytl5F7wt+/I2i9q9GZcEXW9BP52YYOXC58igUi+LFZVHukErIIqQSWwv/M3WRw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true + run-parallel@1.2.0: + resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} + run-script-os@1.1.6: resolution: {integrity: sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==} hasBin: true - safe-buffer@5.1.2: - resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} + scheduler@0.26.0: + resolution: {integrity: sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==} - safer-buffer@2.1.2: - resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} + semver@6.3.1: + resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} + hasBin: true - secure-compare@3.0.1: - resolution: {integrity: sha512-AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw==} + semver@7.7.2: + resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==} + engines: {node: '>=10'} + hasBin: true - set-function-length@1.2.2: - resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} - engines: {node: '>= 0.4'} - - side-channel@1.0.6: - resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==} - engines: {node: '>= 0.4'} + set-cookie-parser@2.7.1: + resolution: {integrity: sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==} source-map-js@1.2.1: resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} - supports-color@7.2.0: - resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} - engines: {node: '>=8'} + source-map@0.6.1: + resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} + engines: {node: '>=0.10.0'} supports-preserve-symlinks-flag@1.0.0: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} - tailwindcss@4.1.7: - resolution: {integrity: sha512-kr1o/ErIdNhTz8uzAYL7TpaUuzKIE6QPQ4qmSdxnoX/lo+5wmUHQA6h3L5yIqEImSRnAAURDirLu/BgiXGPAhg==} + tabbable@6.2.0: + resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==} + + tailwind-merge@2.6.0: + resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==} + + tailwind-merge@3.0.1: + resolution: {integrity: sha512-AvzE8FmSoXC7nC+oU5GlQJbip2UO7tmOhOfQyOmPhrStOGXHU08j8mZEHZ4BmCqY5dWTCo4ClWkNyRNx1wpT0g==} + + tailwindcss@4.1.8: + resolution: {integrity: sha512-kjeW8gjdxasbmFKpVGrGd5T4i40mV5J2Rasw48QARfYeQ8YS9x02ON9SFWax3Qf616rt4Cp3nVNIj6Hd1mP3og==} tapable@2.2.2: resolution: {integrity: sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==} @@ -1029,6 +1268,9 @@ packages: resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==} engines: {node: '>=18'} + tiny-invariant@1.3.3: + resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==} + tinyglobby@0.2.13: resolution: {integrity: sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==} engines: {node: '>=12.0.0'} @@ -1037,6 +1279,12 @@ packages: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} + ts-api-utils@2.1.0: + resolution: {integrity: sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==} + engines: {node: '>=18.12'} + peerDependencies: + typescript: '>=4.8.4' + tslib@2.8.1: resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} @@ -1048,12 +1296,11 @@ packages: undici-types@6.21.0: resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} - union@0.5.0: - resolution: {integrity: sha512-N6uOhuW6zO95P3Mel2I2zMsbsanvvtgn6jVqJv4vbVcz/JN0OkL9suomjQGmWtxJQXOCqUJvquc1sMeNz/IwlA==} - engines: {node: '>= 0.8.0'} - - url-join@4.0.1: - resolution: {integrity: sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==} + update-browserslist-db@1.1.3: + resolution: {integrity: sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==} + hasBin: true + peerDependencies: + browserslist: '>= 4.21.0' vite-plugin-typescript@1.0.4: resolution: {integrity: sha512-vTfXw5WzXx+qbPQhjEUVGB+DoU183FdDc2y0HfNDfpE/anYtdefKVv8re3Po/IZiKZULmwO/pY031m0btkIxUw==} @@ -1101,9 +1348,8 @@ packages: yaml: optional: true - whatwg-encoding@2.0.0: - resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==} - engines: {node: '>=12'} + yallist@3.1.1: + resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} yallist@5.0.0: resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} @@ -1121,6 +1367,116 @@ snapshots: '@jridgewell/gen-mapping': 0.3.8 '@jridgewell/trace-mapping': 0.3.25 + '@babel/code-frame@7.27.1': + dependencies: + '@babel/helper-validator-identifier': 7.27.1 + js-tokens: 4.0.0 + picocolors: 1.1.1 + + '@babel/compat-data@7.27.2': {} + + '@babel/core@7.27.1': + dependencies: + '@ampproject/remapping': 2.3.0 + '@babel/code-frame': 7.27.1 + '@babel/generator': 7.27.1 + '@babel/helper-compilation-targets': 7.27.2 + '@babel/helper-module-transforms': 7.27.1(@babel/core@7.27.1) + '@babel/helpers': 7.27.1 + '@babel/parser': 7.27.2 + '@babel/template': 7.27.2 + '@babel/traverse': 7.27.1 + '@babel/types': 7.27.1 + convert-source-map: 2.0.0 + debug: 4.4.1 + gensync: 1.0.0-beta.2 + json5: 2.2.3 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + + '@babel/generator@7.27.1': + dependencies: + '@babel/parser': 7.27.2 + '@babel/types': 7.27.1 + '@jridgewell/gen-mapping': 0.3.8 + '@jridgewell/trace-mapping': 0.3.25 + jsesc: 3.1.0 + + '@babel/helper-compilation-targets@7.27.2': + dependencies: + '@babel/compat-data': 7.27.2 + '@babel/helper-validator-option': 7.27.1 + browserslist: 4.24.5 + lru-cache: 5.1.1 + semver: 6.3.1 + + '@babel/helper-module-imports@7.27.1': + dependencies: + '@babel/traverse': 7.27.1 + '@babel/types': 7.27.1 + transitivePeerDependencies: + - supports-color + + '@babel/helper-module-transforms@7.27.1(@babel/core@7.27.1)': + dependencies: + '@babel/core': 7.27.1 + '@babel/helper-module-imports': 7.27.1 + '@babel/helper-validator-identifier': 7.27.1 + '@babel/traverse': 7.27.1 + transitivePeerDependencies: + - supports-color + + '@babel/helper-plugin-utils@7.27.1': {} + + '@babel/helper-string-parser@7.27.1': {} + + '@babel/helper-validator-identifier@7.27.1': {} + + '@babel/helper-validator-option@7.27.1': {} + + '@babel/helpers@7.27.1': + dependencies: + '@babel/template': 7.27.2 + '@babel/types': 7.27.1 + + '@babel/parser@7.27.2': + dependencies: + '@babel/types': 7.27.1 + + '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.27.1)': + dependencies: + '@babel/core': 7.27.1 + '@babel/helper-plugin-utils': 7.27.1 + + '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.27.1)': + dependencies: + '@babel/core': 7.27.1 + '@babel/helper-plugin-utils': 7.27.1 + + '@babel/template@7.27.2': + dependencies: + '@babel/code-frame': 7.27.1 + '@babel/parser': 7.27.2 + '@babel/types': 7.27.1 + + '@babel/traverse@7.27.1': + dependencies: + '@babel/code-frame': 7.27.1 + '@babel/generator': 7.27.1 + '@babel/parser': 7.27.2 + '@babel/template': 7.27.2 + '@babel/types': 7.27.1 + debug: 4.4.1 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + + '@babel/types@7.27.1': + dependencies: + '@babel/helper-string-parser': 7.27.1 + '@babel/helper-validator-identifier': 7.27.1 + '@esbuild/aix-ppc64@0.25.3': optional: true @@ -1196,6 +1552,41 @@ snapshots: '@esbuild/win32-x64@0.25.3': optional: true + '@floating-ui/core@1.6.9': + dependencies: + '@floating-ui/utils': 0.2.9 + + '@floating-ui/core@1.7.0': + dependencies: + '@floating-ui/utils': 0.2.9 + + '@floating-ui/dom@1.7.0': + dependencies: + '@floating-ui/core': 1.7.0 + '@floating-ui/utils': 0.2.9 + + '@floating-ui/react-dom@2.1.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0)': + dependencies: + '@floating-ui/dom': 1.7.0 + react: 19.1.0 + react-dom: 19.1.0(react@19.1.0) + + '@floating-ui/react@0.27.3(react-dom@19.1.0(react@19.1.0))(react@19.1.0)': + dependencies: + '@floating-ui/react-dom': 2.1.2(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + '@floating-ui/utils': 0.2.9 + react: 19.1.0 + react-dom: 19.1.0(react@19.1.0) + tabbable: 6.2.0 + + '@floating-ui/utils@0.2.9': {} + + '@heroicons/react@2.2.0(react@19.1.0)': + dependencies: + react: 19.1.0 + + '@iarna/toml@2.2.5': {} + '@isaacs/fs-minipass@4.0.1': dependencies: minipass: 7.1.2 @@ -1217,6 +1608,18 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.0 + '@nodelib/fs.scandir@2.1.5': + dependencies: + '@nodelib/fs.stat': 2.0.5 + run-parallel: 1.2.0 + + '@nodelib/fs.stat@2.0.5': {} + + '@nodelib/fs.walk@1.2.8': + dependencies: + '@nodelib/fs.scandir': 2.1.5 + fastq: 1.19.1 + '@parcel/watcher-android-arm64@2.5.1': optional: true @@ -1279,6 +1682,8 @@ snapshots: '@popperjs/core@2.11.8': {} + '@rolldown/pluginutils@1.0.0-beta.9': {} + '@rollup/plugin-node-resolve@15.3.1(rollup@4.40.1)': dependencies: '@rollup/pluginutils': 5.1.4(rollup@4.40.1) @@ -1366,17 +1771,17 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.40.1': optional: true - '@tailwindcss/cli@4.1.7': + '@tailwindcss/cli@4.1.8': dependencies: '@parcel/watcher': 2.5.1 - '@tailwindcss/node': 4.1.7 - '@tailwindcss/oxide': 4.1.7 + '@tailwindcss/node': 4.1.8 + '@tailwindcss/oxide': 4.1.8 enhanced-resolve: 5.18.1 mri: 1.2.0 picocolors: 1.1.1 - tailwindcss: 4.1.7 + tailwindcss: 4.1.8 - '@tailwindcss/node@4.1.7': + '@tailwindcss/node@4.1.8': dependencies: '@ampproject/remapping': 2.3.0 enhanced-resolve: 5.18.1 @@ -1384,67 +1789,67 @@ snapshots: lightningcss: 1.30.1 magic-string: 0.30.17 source-map-js: 1.2.1 - tailwindcss: 4.1.7 + tailwindcss: 4.1.8 - '@tailwindcss/oxide-android-arm64@4.1.7': + '@tailwindcss/oxide-android-arm64@4.1.8': optional: true - '@tailwindcss/oxide-darwin-arm64@4.1.7': + '@tailwindcss/oxide-darwin-arm64@4.1.8': optional: true - '@tailwindcss/oxide-darwin-x64@4.1.7': + '@tailwindcss/oxide-darwin-x64@4.1.8': optional: true - '@tailwindcss/oxide-freebsd-x64@4.1.7': + '@tailwindcss/oxide-freebsd-x64@4.1.8': optional: true - '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.7': + '@tailwindcss/oxide-linux-arm-gnueabihf@4.1.8': optional: true - '@tailwindcss/oxide-linux-arm64-gnu@4.1.7': + '@tailwindcss/oxide-linux-arm64-gnu@4.1.8': optional: true - '@tailwindcss/oxide-linux-arm64-musl@4.1.7': + '@tailwindcss/oxide-linux-arm64-musl@4.1.8': optional: true - '@tailwindcss/oxide-linux-x64-gnu@4.1.7': + '@tailwindcss/oxide-linux-x64-gnu@4.1.8': optional: true - '@tailwindcss/oxide-linux-x64-musl@4.1.7': + '@tailwindcss/oxide-linux-x64-musl@4.1.8': optional: true - '@tailwindcss/oxide-wasm32-wasi@4.1.7': + '@tailwindcss/oxide-wasm32-wasi@4.1.8': optional: true - '@tailwindcss/oxide-win32-arm64-msvc@4.1.7': + '@tailwindcss/oxide-win32-arm64-msvc@4.1.8': optional: true - '@tailwindcss/oxide-win32-x64-msvc@4.1.7': + '@tailwindcss/oxide-win32-x64-msvc@4.1.8': optional: true - '@tailwindcss/oxide@4.1.7': + '@tailwindcss/oxide@4.1.8': dependencies: detect-libc: 2.0.4 tar: 7.4.3 optionalDependencies: - '@tailwindcss/oxide-android-arm64': 4.1.7 - '@tailwindcss/oxide-darwin-arm64': 4.1.7 - '@tailwindcss/oxide-darwin-x64': 4.1.7 - '@tailwindcss/oxide-freebsd-x64': 4.1.7 - '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.7 - '@tailwindcss/oxide-linux-arm64-gnu': 4.1.7 - '@tailwindcss/oxide-linux-arm64-musl': 4.1.7 - '@tailwindcss/oxide-linux-x64-gnu': 4.1.7 - '@tailwindcss/oxide-linux-x64-musl': 4.1.7 - '@tailwindcss/oxide-wasm32-wasi': 4.1.7 - '@tailwindcss/oxide-win32-arm64-msvc': 4.1.7 - '@tailwindcss/oxide-win32-x64-msvc': 4.1.7 + '@tailwindcss/oxide-android-arm64': 4.1.8 + '@tailwindcss/oxide-darwin-arm64': 4.1.8 + '@tailwindcss/oxide-darwin-x64': 4.1.8 + '@tailwindcss/oxide-freebsd-x64': 4.1.8 + '@tailwindcss/oxide-linux-arm-gnueabihf': 4.1.8 + '@tailwindcss/oxide-linux-arm64-gnu': 4.1.8 + '@tailwindcss/oxide-linux-arm64-musl': 4.1.8 + '@tailwindcss/oxide-linux-x64-gnu': 4.1.8 + '@tailwindcss/oxide-linux-x64-musl': 4.1.8 + '@tailwindcss/oxide-wasm32-wasi': 4.1.8 + '@tailwindcss/oxide-win32-arm64-msvc': 4.1.8 + '@tailwindcss/oxide-win32-x64-msvc': 4.1.8 - '@tailwindcss/vite@4.1.7(vite@6.3.4(@types/node@22.15.3)(jiti@2.4.2)(lightningcss@1.30.1)(yaml@2.6.0))': + '@tailwindcss/vite@4.1.8(vite@6.3.4(@types/node@22.15.3)(jiti@2.4.2)(lightningcss@1.30.1)(yaml@2.6.0))': dependencies: - '@tailwindcss/node': 4.1.7 - '@tailwindcss/oxide': 4.1.7 - tailwindcss: 4.1.7 + '@tailwindcss/node': 4.1.8 + '@tailwindcss/oxide': 4.1.8 + tailwindcss: 4.1.8 vite: 6.3.4(@types/node@22.15.3)(jiti@2.4.2)(lightningcss@1.30.1)(yaml@2.6.0) '@tauri-apps/api@2.5.0': {} @@ -1496,80 +1901,146 @@ snapshots: '@tauri-apps/cli-win32-ia32-msvc': 2.5.0 '@tauri-apps/cli-win32-x64-msvc': 2.5.0 + '@types/babel__core@7.20.5': + dependencies: + '@babel/parser': 7.27.2 + '@babel/types': 7.27.1 + '@types/babel__generator': 7.27.0 + '@types/babel__template': 7.4.4 + '@types/babel__traverse': 7.20.7 + + '@types/babel__generator@7.27.0': + dependencies: + '@babel/types': 7.27.1 + + '@types/babel__template@7.4.4': + dependencies: + '@babel/parser': 7.27.2 + '@babel/types': 7.27.1 + + '@types/babel__traverse@7.20.7': + dependencies: + '@babel/types': 7.27.1 + '@types/estree@1.0.7': {} '@types/node@22.15.3': dependencies: undici-types: 6.21.0 + '@types/react-dom@19.1.5(@types/react@19.1.5)': + dependencies: + '@types/react': 19.1.5 + + '@types/react@19.1.5': + dependencies: + csstype: 3.1.3 + '@types/resolve@1.20.2': {} - ansi-styles@4.3.0: - dependencies: - color-convert: 2.0.1 + '@typescript-eslint/types@8.26.0': {} - async@2.6.4: + '@typescript-eslint/typescript-estree@8.26.0(typescript@5.8.3)': dependencies: - lodash: 4.17.21 + '@typescript-eslint/types': 8.26.0 + '@typescript-eslint/visitor-keys': 8.26.0 + debug: 4.4.1 + fast-glob: 3.3.3 + is-glob: 4.0.3 + minimatch: 9.0.5 + semver: 7.7.2 + ts-api-utils: 2.1.0(typescript@5.8.3) + typescript: 5.8.3 + transitivePeerDependencies: + - supports-color - basic-auth@2.0.1: + '@typescript-eslint/visitor-keys@8.26.0': dependencies: - safe-buffer: 5.1.2 + '@typescript-eslint/types': 8.26.0 + eslint-visitor-keys: 4.2.0 + + '@vitejs/plugin-react@4.5.0(vite@6.3.4(@types/node@22.15.3)(jiti@2.4.2)(lightningcss@1.30.1)(yaml@2.6.0))': + dependencies: + '@babel/core': 7.27.1 + '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.27.1) + '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.27.1) + '@rolldown/pluginutils': 1.0.0-beta.9 + '@types/babel__core': 7.20.5 + react-refresh: 0.17.0 + vite: 6.3.4(@types/node@22.15.3)(jiti@2.4.2)(lightningcss@1.30.1)(yaml@2.6.0) + transitivePeerDependencies: + - supports-color + + array-timsort@1.0.3: {} + + ast-types@0.16.1: + dependencies: + tslib: 2.8.1 + + balanced-match@1.0.2: {} + + brace-expansion@2.0.1: + dependencies: + balanced-match: 1.0.2 braces@3.0.3: dependencies: fill-range: 7.1.1 - call-bind@1.0.7: + browserslist@4.24.5: dependencies: - es-define-property: 1.0.0 - es-errors: 1.3.0 - function-bind: 1.1.2 - get-intrinsic: 1.2.4 - set-function-length: 1.2.2 + caniuse-lite: 1.0.30001718 + electron-to-chromium: 1.5.158 + node-releases: 2.0.19 + update-browserslist-db: 1.1.3(browserslist@4.24.5) - chalk@4.1.2: + caniuse-lite@1.0.30001718: {} + + chokidar@4.0.3: dependencies: - ansi-styles: 4.3.0 - supports-color: 7.2.0 + readdirp: 4.1.2 chownr@3.0.0: {} - color-convert@2.0.1: + classnames@2.5.1: {} + + comment-json@4.2.5: dependencies: - color-name: 1.1.4 + array-timsort: 1.0.3 + core-util-is: 1.0.3 + esprima: 4.0.1 + has-own-prop: 2.0.0 + repeat-string: 1.6.1 - color-name@1.1.4: {} + convert-source-map@2.0.0: {} - corser@2.0.1: {} + cookie@1.0.2: {} - debug@3.2.7: + core-util-is@1.0.3: {} + + csstype@3.1.3: {} + + debounce@2.2.0: {} + + debug@4.4.1: dependencies: ms: 2.1.3 - deepmerge@4.3.1: {} + deepmerge-ts@7.1.4: {} - define-data-property@1.1.4: - dependencies: - es-define-property: 1.0.0 - es-errors: 1.3.0 - gopd: 1.0.1 + deepmerge@4.3.1: {} detect-libc@1.0.3: {} detect-libc@2.0.4: {} + electron-to-chromium@1.5.158: {} + enhanced-resolve@5.18.1: dependencies: graceful-fs: 4.2.11 tapable: 2.2.2 - es-define-property@1.0.0: - dependencies: - get-intrinsic: 1.2.4 - - es-errors@1.3.0: {} - esbuild@0.25.3: optionalDependencies: '@esbuild/aix-ppc64': 0.25.3 @@ -1598,9 +2069,25 @@ snapshots: '@esbuild/win32-ia32': 0.25.3 '@esbuild/win32-x64': 0.25.3 + escalade@3.2.0: {} + + eslint-visitor-keys@4.2.0: {} + + esprima@4.0.1: {} + estree-walker@2.0.2: {} - eventemitter3@4.0.7: {} + fast-glob@3.3.3: + dependencies: + '@nodelib/fs.stat': 2.0.5 + '@nodelib/fs.walk': 1.2.8 + glob-parent: 5.1.2 + merge2: 1.4.1 + micromatch: 4.0.8 + + fastq@1.19.1: + dependencies: + reusify: 1.1.0 fdir@6.4.4(picomatch@4.0.2): optionalDependencies: @@ -1617,6 +2104,29 @@ snapshots: transitivePeerDependencies: - rollup + flowbite-react@0.11.7(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(tailwindcss@4.1.8)(typescript@5.8.3): + dependencies: + '@floating-ui/core': 1.6.9 + '@floating-ui/react': 0.27.3(react-dom@19.1.0(react@19.1.0))(react@19.1.0) + '@iarna/toml': 2.2.5 + '@typescript-eslint/typescript-estree': 8.26.0(typescript@5.8.3) + chokidar: 4.0.3 + classnames: 2.5.1 + comment-json: 4.2.5 + debounce: 2.2.0 + deepmerge-ts: 7.1.4 + klona: 2.0.6 + package-manager-detector: 0.2.9 + react: 19.1.0 + react-dom: 19.1.0(react@19.1.0) + recast: 0.23.11 + tailwind-merge-v2: tailwind-merge@2.6.0 + tailwind-merge-v3: tailwind-merge@3.0.1 + tailwindcss: 4.1.8 + transitivePeerDependencies: + - supports-color + - typescript + flowbite@2.5.2(rollup@4.40.1): dependencies: '@popperjs/core': 2.11.8 @@ -1634,78 +2144,27 @@ snapshots: transitivePeerDependencies: - rollup - follow-redirects@1.15.9: {} - fsevents@2.3.3: optional: true function-bind@1.1.2: {} - get-intrinsic@1.2.4: - dependencies: - es-errors: 1.3.0 - function-bind: 1.1.2 - has-proto: 1.0.3 - has-symbols: 1.0.3 - hasown: 2.0.2 + gensync@1.0.0-beta.2: {} - gopd@1.0.1: + glob-parent@5.1.2: dependencies: - get-intrinsic: 1.2.4 + is-glob: 4.0.3 + + globals@11.12.0: {} graceful-fs@4.2.11: {} - has-flag@4.0.0: {} - - has-property-descriptors@1.0.2: - dependencies: - es-define-property: 1.0.0 - - has-proto@1.0.3: {} - - has-symbols@1.0.3: {} + has-own-prop@2.0.0: {} hasown@2.0.2: dependencies: function-bind: 1.1.2 - he@1.2.0: {} - - html-encoding-sniffer@3.0.0: - dependencies: - whatwg-encoding: 2.0.0 - - http-proxy@1.18.1: - dependencies: - eventemitter3: 4.0.7 - follow-redirects: 1.15.9 - requires-port: 1.0.0 - transitivePeerDependencies: - - debug - - http-server@14.1.1: - dependencies: - basic-auth: 2.0.1 - chalk: 4.1.2 - corser: 2.0.1 - he: 1.2.0 - html-encoding-sniffer: 3.0.0 - http-proxy: 1.18.1 - mime: 1.6.0 - minimist: 1.2.8 - opener: 1.5.2 - portfinder: 1.0.32 - secure-compare: 3.0.1 - union: 0.5.0 - url-join: 4.0.1 - transitivePeerDependencies: - - debug - - supports-color - - iconv-lite@0.6.3: - dependencies: - safer-buffer: 2.1.2 - is-core-module@2.16.1: dependencies: hasown: 2.0.2 @@ -1722,6 +2181,14 @@ snapshots: jiti@2.4.2: {} + js-tokens@4.0.0: {} + + jsesc@3.1.0: {} + + json5@2.2.3: {} + + klona@2.0.6: {} + lightningcss-darwin-arm64@1.30.1: optional: true @@ -1767,22 +2234,26 @@ snapshots: lightningcss-win32-arm64-msvc: 1.30.1 lightningcss-win32-x64-msvc: 1.30.1 - lodash@4.17.21: {} + lru-cache@5.1.1: + dependencies: + yallist: 3.1.1 magic-string@0.30.17: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 + merge2@1.4.1: {} + micromatch@4.0.8: dependencies: braces: 3.0.3 picomatch: 2.3.1 - mime@1.6.0: {} - mini-svg-data-uri@1.4.4: {} - minimist@1.2.8: {} + minimatch@9.0.5: + dependencies: + brace-expansion: 2.0.1 minipass@7.1.2: {} @@ -1790,10 +2261,6 @@ snapshots: dependencies: minipass: 7.1.2 - mkdirp@0.5.6: - dependencies: - minimist: 1.2.8 - mkdirp@3.0.1: {} mri@1.2.0: {} @@ -1804,9 +2271,9 @@ snapshots: node-addon-api@7.1.1: {} - object-inspect@1.13.2: {} + node-releases@2.0.19: {} - opener@1.5.2: {} + package-manager-detector@0.2.9: {} path-parse@1.0.7: {} @@ -1816,25 +2283,42 @@ snapshots: picomatch@4.0.2: {} - portfinder@1.0.32: - dependencies: - async: 2.6.4 - debug: 3.2.7 - mkdirp: 0.5.6 - transitivePeerDependencies: - - supports-color - postcss@8.5.3: dependencies: nanoid: 3.3.11 picocolors: 1.1.1 source-map-js: 1.2.1 - qs@6.13.0: - dependencies: - side-channel: 1.0.6 + queue-microtask@1.2.3: {} - requires-port@1.0.0: {} + react-dom@19.1.0(react@19.1.0): + dependencies: + react: 19.1.0 + scheduler: 0.26.0 + + react-refresh@0.17.0: {} + + react-router@7.6.1(react-dom@19.1.0(react@19.1.0))(react@19.1.0): + dependencies: + cookie: 1.0.2 + react: 19.1.0 + set-cookie-parser: 2.7.1 + optionalDependencies: + react-dom: 19.1.0(react@19.1.0) + + react@19.1.0: {} + + readdirp@4.1.2: {} + + recast@0.23.11: + dependencies: + ast-types: 0.16.1 + esprima: 4.0.1 + source-map: 0.6.1 + tiny-invariant: 1.3.3 + tslib: 2.8.1 + + repeat-string@1.6.1: {} resolve@1.22.10: dependencies: @@ -1842,6 +2326,8 @@ snapshots: path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 + reusify@1.1.0: {} + rollup@4.40.1: dependencies: '@types/estree': 1.0.7 @@ -1868,39 +2354,33 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.40.1 fsevents: 2.3.3 + run-parallel@1.2.0: + dependencies: + queue-microtask: 1.2.3 + run-script-os@1.1.6: {} - safe-buffer@5.1.2: {} + scheduler@0.26.0: {} - safer-buffer@2.1.2: {} + semver@6.3.1: {} - secure-compare@3.0.1: {} + semver@7.7.2: {} - set-function-length@1.2.2: - dependencies: - define-data-property: 1.1.4 - es-errors: 1.3.0 - function-bind: 1.1.2 - get-intrinsic: 1.2.4 - gopd: 1.0.1 - has-property-descriptors: 1.0.2 - - side-channel@1.0.6: - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - get-intrinsic: 1.2.4 - object-inspect: 1.13.2 + set-cookie-parser@2.7.1: {} source-map-js@1.2.1: {} - supports-color@7.2.0: - dependencies: - has-flag: 4.0.0 + source-map@0.6.1: {} supports-preserve-symlinks-flag@1.0.0: {} - tailwindcss@4.1.7: {} + tabbable@6.2.0: {} + + tailwind-merge@2.6.0: {} + + tailwind-merge@3.0.1: {} + + tailwindcss@4.1.8: {} tapable@2.2.2: {} @@ -1913,6 +2393,8 @@ snapshots: mkdirp: 3.0.1 yallist: 5.0.0 + tiny-invariant@1.3.3: {} + tinyglobby@0.2.13: dependencies: fdir: 6.4.4(picomatch@4.0.2) @@ -1922,17 +2404,21 @@ snapshots: dependencies: is-number: 7.0.0 + ts-api-utils@2.1.0(typescript@5.8.3): + dependencies: + typescript: 5.8.3 + tslib@2.8.1: {} typescript@5.8.3: {} undici-types@6.21.0: {} - union@0.5.0: + update-browserslist-db@1.1.3(browserslist@4.24.5): dependencies: - qs: 6.13.0 - - url-join@4.0.1: {} + browserslist: 4.24.5 + escalade: 3.2.0 + picocolors: 1.1.1 vite-plugin-typescript@1.0.4(@rollup/plugin-typescript@12.1.2(rollup@4.40.1)(tslib@2.8.1)(typescript@5.8.3))(vite@6.3.4(@types/node@22.15.3)(jiti@2.4.2)(lightningcss@1.30.1)(yaml@2.6.0)): dependencies: @@ -1954,9 +2440,7 @@ snapshots: lightningcss: 1.30.1 yaml: 2.6.0 - whatwg-encoding@2.0.0: - dependencies: - iconv-lite: 0.6.3 + yallist@3.1.1: {} yallist@5.0.0: {} diff --git a/rust/gui-client/src-frontend/components/AboutPage.tsx b/rust/gui-client/src-frontend/components/AboutPage.tsx new file mode 100644 index 000000000..33cbaec07 --- /dev/null +++ b/rust/gui-client/src-frontend/components/AboutPage.tsx @@ -0,0 +1,25 @@ +import React from "react"; +import logo from "../logo.png"; + +export default function AboutPage() { + return ( +
+ Firezone Logo +

Version

+

+ {__APP_VERSION__} +

+

+ ({__GIT_VERSION__?.substring(0, 8)}) +

+ + Documentation + +
+ ); +} diff --git a/rust/gui-client/src-frontend/components/App.tsx b/rust/gui-client/src-frontend/components/App.tsx new file mode 100644 index 000000000..f18802ad5 --- /dev/null +++ b/rust/gui-client/src-frontend/components/App.tsx @@ -0,0 +1,172 @@ +import { + CogIcon, + DocumentMagnifyingGlassIcon, + HomeIcon, + InformationCircleIcon, + SwatchIcon, +} from "@heroicons/react/24/solid"; +import { invoke } from "@tauri-apps/api/core"; +import { listen } from "@tauri-apps/api/event"; +import { + Sidebar, + SidebarItem, + SidebarItemGroup, + SidebarItems, +} from "flowbite-react"; +import React, { useEffect, useState } from "react"; +import { NavLink, Route, Routes } from "react-router"; +import About from "./AboutPage"; +import ColorPalette from "./ColorPalettePage"; +import Diagnostics, { FileCount } from "./DiagnosticsPage"; +import Overview from "./OverviewPage"; +import SettingsPage, { Settings } from "./SettingsPage"; + +export interface Session { + account_slug: string; + actor_name: string; +} + +export default function App() { + let [session, setSession] = useState(null); + let [logCount, setLogCount] = useState(null); + let [settings, setSettings] = useState(null); + + useEffect(() => { + const signedInUnlisten = listen("signed_in", (e) => { + let session = e.payload; + + console.log("signed_in", { session }); + setSession(session); + }); + const signedOutUnlisten = listen("signed_out", (_e) => { + console.log("signed_out"); + setSession(null); + }); + const settingsChangedUnlisten = listen( + "settings_changed", + (e) => { + let settings = e.payload; + + console.log("settings_changed", { settings }); + setSettings(settings); + } + ); + const logsRecountedUnlisten = listen("logs_recounted", (e) => { + let file_count = e.payload; + + console.log("logs_recounted", { file_count }); + setLogCount(file_count); + }); + + invoke("update_state"); // Let the backend know that we (re)-initialised + + return () => { + signedInUnlisten.then((unlistenFn) => unlistenFn()); + signedOutUnlisten.then((unlistenFn) => unlistenFn()); + settingsChangedUnlisten.then((unlistenFn) => unlistenFn()); + logsRecountedUnlisten.then((unlistenFn) => unlistenFn()); + }; + }, []); + + const isDev = import.meta.env.DEV; + + return ( +
+ + + + + {({ isActive }) => ( + + Overview + + )} + + + {({ isActive }) => ( + + Settings + + )} + + + {({ isActive }) => ( + + Diagnostics + + )} + + + {({ isActive }) => ( + + About + + )} + + + {isDev && ( + + + {({ isActive }) => ( + + Color Palette + + )} + + + )} + + +
+ + invoke("sign_in")} + signOut={() => invoke("sign_out")} + /> + } + /> + + invoke("apply_advanced_settings", { settings }) + } + resetSettings={() => invoke("reset_advanced_settings")} + /> + } + /> + invoke("export_logs")} + clearLogs={async () => { + await invoke("clear_logs"); + let logCount = await invoke("count_logs"); + + setLogCount(logCount); + }} + /> + } + /> + } /> + } /> + +
+
+ ); +} diff --git a/rust/gui-client/src-frontend/components/ColorPalettePage.tsx b/rust/gui-client/src-frontend/components/ColorPalettePage.tsx new file mode 100644 index 000000000..4c19a9bd8 --- /dev/null +++ b/rust/gui-client/src-frontend/components/ColorPalettePage.tsx @@ -0,0 +1,76 @@ +import React from "react"; + +const primaryColors = [ + "bg-primary-50", + "bg-primary-100", + "bg-primary-200", + "bg-primary-300", + "bg-primary-400", + "bg-primary-450", + "bg-primary-500", + "bg-primary-600", + "bg-primary-700", + "bg-primary-800", + "bg-primary-900", +]; + +const accentColors = [ + "bg-accent-50", + "bg-accent-100", + "bg-accent-200", + "bg-accent-300", + "bg-accent-400", + "bg-accent-450", + "bg-accent-500", + "bg-accent-600", + "bg-accent-700", + "bg-accent-800", + "bg-accent-900", +]; + +const neutralColors = [ + "bg-neutral-50", + "bg-neutral-100", + "bg-neutral-200", + "bg-neutral-300", + "bg-neutral-400", + "bg-neutral-500", + "bg-neutral-600", + "bg-neutral-700", + "bg-neutral-800", + "bg-neutral-900", +]; + +export default function ColorPalettePage() { + return ( +
+ + + +
+ ); +} + +function ColorSwatch({ colorClass }: { colorClass: string }) { + return ( +
+
+
{colorClass}
+
+ ); +} + +function ColorSection({ title, colors }: { title: string; colors: string[] }) { + return ( +
+

+ {title} +

+
+ {colors.map((color) => ( + + ))} +
+
+ ); +} diff --git a/rust/gui-client/src-frontend/components/DiagnosticsPage.tsx b/rust/gui-client/src-frontend/components/DiagnosticsPage.tsx new file mode 100644 index 000000000..810808097 --- /dev/null +++ b/rust/gui-client/src-frontend/components/DiagnosticsPage.tsx @@ -0,0 +1,58 @@ +import React from "react"; +import { ShareIcon, TrashIcon } from "@heroicons/react/16/solid"; +import { Button } from "flowbite-react"; + +interface DiagnosticsPageProps { + logCount: FileCount | null; + exportLogs: () => void; + clearLogs: () => void; +} + +export interface FileCount { + files: number; + bytes: number; +} + +export default function Diagnostics({ + logCount, + exportLogs, + clearLogs, +}: DiagnosticsPageProps) { + let bytes = logCount?.bytes ?? 0; + let files = logCount?.files ?? 0; + + const megabytes = Math.round(bytes / 100000) / 10; + + return ( +
+
+

Diagnostic Logs

+
+ +
+
+

Log directory size:

+

{`${files} files, ${megabytes} MB`}

+
+ +
+ + + +
+
+
+ ); +} diff --git a/rust/gui-client/src-frontend/components/OverviewPage.tsx b/rust/gui-client/src-frontend/components/OverviewPage.tsx new file mode 100644 index 000000000..3e93e44eb --- /dev/null +++ b/rust/gui-client/src-frontend/components/OverviewPage.tsx @@ -0,0 +1,68 @@ +import React from "react"; +import logo from "../logo.png"; +import { Session } from "./App"; +import { Button } from "flowbite-react"; + +interface OverviewPageProps { + session: Session | null; + signOut: () => void; + signIn: () => void; +} + +export default function Overview({ + session, + signOut, + signIn, +}: OverviewPageProps) { + return ( +
+ Firezone Logo + +

Firezone

+ + {!session ? ( +
+
+

+ You can sign in by clicking the Firezone icon in the taskbar or by + clicking 'Sign in' below. +

+ +

+ Firezone will continue running after this window is closed. +
+ It is always available from the taskbar. +

+
+
+ ) : ( +
+
+

+ You are currently signed into  + + {session.account_slug} + +  as  + + {session.actor_name} + + .
+ Click the Firezone icon in the taskbar to see the list of + Resources. +

+ +

+ Firezone will continue running in the taskbar after this window is + closed. +

+
+
+ )} +
+ ); +} diff --git a/rust/gui-client/src-frontend/components/SettingsPage.tsx b/rust/gui-client/src-frontend/components/SettingsPage.tsx new file mode 100644 index 000000000..fbd173229 --- /dev/null +++ b/rust/gui-client/src-frontend/components/SettingsPage.tsx @@ -0,0 +1,144 @@ +import React, { useEffect, useState } from "react"; +import { Button, TextInput, Label, TextInputProps, Tooltip } from "flowbite-react"; + +export interface Settings { + auth_url: string; + auth_url_is_managed: boolean; + api_url: string; + api_url_is_managed: boolean; + log_filter: string; + log_filter_is_managed: boolean; +} + +interface SettingsPageProps { + settings: Settings | null; + saveSettings: (settings: Settings) => void; + resetSettings: () => void; +} + +export default function SettingsPage({ + settings, + saveSettings, + resetSettings, +}: SettingsPageProps) { + // Local settings can be edited without affecting the global state. + const [localSettings, setLocalSettings] = useState( + settings ?? { + api_url: "", + api_url_is_managed: false, + auth_url: "", + auth_url_is_managed: false, + log_filter: "", + log_filter_is_managed: false, + } + ); + + useEffect(() => { + setLocalSettings( + settings ?? { + api_url: "", + api_url_is_managed: false, + auth_url: "", + auth_url_is_managed: false, + log_filter: "", + log_filter_is_managed: false, + } + ); + }, [settings]); + + return ( +
+
+

Advanced Settings

+
+ +

+ WARNING: These settings are intended for internal + debug purposes only. Changing these is not supported + and will disrupt access to your resources. +

+ +
{ + e.preventDefault(); + saveSettings(localSettings); + }} + className="max-w mx-auto flex flex-col gap-2" + > +
+ + + setLocalSettings({ + ...localSettings, + auth_url: e.target.value, + }) + } + required + /> +
+ +
+ + + setLocalSettings({ + ...localSettings, + api_url: e.target.value, + }) + } + required + /> +
+ +
+ + + setLocalSettings({ + ...localSettings, + log_filter: e.target.value, + }) + } + required + /> +
+ +
+ + +
+
+
+ ); +} + +function ManagedTextInput(props: TextInputProps & { managed: boolean }) { + let { managed, ...inputProps } = props; + + if (managed) { + return + + + } else { + return + } +} diff --git a/rust/gui-client/src-frontend/custom.d.ts b/rust/gui-client/src-frontend/custom.d.ts new file mode 100644 index 000000000..66b245666 --- /dev/null +++ b/rust/gui-client/src-frontend/custom.d.ts @@ -0,0 +1,4 @@ +declare module "*.png" { + const value: string; + export default value; +} diff --git a/rust/gui-client/src/logo.png b/rust/gui-client/src-frontend/logo.png similarity index 100% rename from rust/gui-client/src/logo.png rename to rust/gui-client/src-frontend/logo.png diff --git a/rust/gui-client/src/input.css b/rust/gui-client/src-frontend/main.css similarity index 86% rename from rust/gui-client/src/input.css rename to rust/gui-client/src-frontend/main.css index a3661beb9..4ca6549a9 100644 --- a/rust/gui-client/src/input.css +++ b/rust/gui-client/src-frontend/main.css @@ -1,13 +1,12 @@ @import "tailwindcss"; -/* - * This file serves as the main entry point for your Tailwind CSS installation. - * Generate the CSS from this with `pnpm tailwindcss -i src/input.css -o src/output.css` - * This has been added to the build script in package.json for convenience. - */ - +@plugin "flowbite-react/plugin/tailwindcss"; @plugin 'flowbite/plugin'; +@source "../.flowbite-react/class-list.json"; + +@custom-variant dark (&:where(.dark, .dark *)); + @theme { --color-primary-50: #fff9f5; --color-primary-100: #fff1e5; @@ -43,6 +42,8 @@ --color-neutral-700: #766a60; --color-neutral-800: #4c3e33; --color-neutral-900: #1b140e; + + --default-font-family: "Source Sans 3"; } /* diff --git a/rust/gui-client/src-frontend/main.tsx b/rust/gui-client/src-frontend/main.tsx new file mode 100644 index 000000000..8298c1d8b --- /dev/null +++ b/rust/gui-client/src-frontend/main.tsx @@ -0,0 +1,36 @@ +import React, { StrictMode } from "react"; +import ReactDOM from "react-dom/client"; +import App from "./components/App"; +import { BrowserRouter } from "react-router"; +import { createTheme, ThemeProvider } from "flowbite-react"; + +const customTheme = createTheme({ + sidebar: { + root: { inner: "rounded-none bg-white" } + }, + button: { + color: { + default: "bg-accent-450 hover:bg-accent-700 text-white", + alternative: "text-neutral-900 border border-neutral-200 hover:bg-neutral-300 hover:text-neutral-900", + }, + }, + textInput: { + field: { + input: { + colors: { + gray: "focus:ring-accent-500 focus:border-accent-500" + } + } + } + } +}); + +ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render( + + + + + + + +); diff --git a/rust/gui-client/src-frontend/vite-env.d.ts b/rust/gui-client/src-frontend/vite-env.d.ts new file mode 100644 index 000000000..6ce68385f --- /dev/null +++ b/rust/gui-client/src-frontend/vite-env.d.ts @@ -0,0 +1,4 @@ +/// + +declare const __APP_VERSION__: string; +declare const __GIT_VERSION__: string; diff --git a/rust/gui-client/src-tauri/src/about.rs b/rust/gui-client/src-tauri/src/about.rs deleted file mode 100644 index dc88641c5..000000000 --- a/rust/gui-client/src-tauri/src/about.rs +++ /dev/null @@ -1,23 +0,0 @@ -//! Everything related to the About window - -#[tauri::command] -pub(crate) fn get_cargo_version() -> String { - env!("CARGO_PKG_VERSION").to_string() -} - -#[tauri::command] -pub(crate) fn get_git_version() -> String { - option_env!("GITHUB_SHA").unwrap_or("unknown").to_owned() -} - -#[cfg(test)] -mod tests { - #[test] - fn version() { - let cargo = super::get_cargo_version(); - - assert!(cargo != "Unknown", "{}", cargo); - assert!(cargo.starts_with("1.")); - assert!(cargo.len() >= 2, "{}", cargo); - } -} diff --git a/rust/gui-client/src-tauri/src/clear_logs.rs b/rust/gui-client/src-tauri/src/clear_logs.rs deleted file mode 100644 index 071fde458..000000000 --- a/rust/gui-client/src-tauri/src/clear_logs.rs +++ /dev/null @@ -1,62 +0,0 @@ -use anyhow::{Context, Result}; -use std::{io::ErrorKind::NotFound, path::Path}; - -/// Deletes all `.log` files in `path`. -pub async fn clear_logs(path: &Path) -> Result<()> { - let mut dir = match tokio::fs::read_dir(path).await { - Ok(x) => x, - Err(error) => { - if matches!(error.kind(), NotFound) { - // In smoke tests, the Tunnel service runs in debug mode, so it won't write any logs to disk. If the Tunnel service's log dir doesn't exist, we shouldn't crash, it's correct to simply not delete the non-existent files - return Ok(()); - } - // But any other error like permissions errors, should bubble. - return Err(error.into()); - } - }; - - let mut result = Ok(()); - - // If we can't delete some files due to permission errors, just keep going - // and delete as much as we can, then return the most recent error - while let Some(entry) = dir - .next_entry() - .await - .context("Failed to read next dir entry")? - { - if entry - .file_name() - .to_str() - .is_none_or(|name| !name.ends_with("log")) - { - continue; - } - - if let Err(e) = tokio::fs::remove_file(entry.path()).await { - result = Err(e); - } - } - - result.context("Failed to delete at least one file") -} - -#[cfg(test)] -mod tests { - use super::*; - - #[tokio::test] - async fn only_deletes_log_files() { - let dir = tempfile::tempdir().unwrap(); - - std::fs::write(dir.path().join("first.log"), "log file 1").unwrap(); - std::fs::write(dir.path().join("second.log"), "log file 1").unwrap(); - std::fs::write(dir.path().join("not_a_logfile.tmp"), "something important").unwrap(); - - clear_logs(dir.path()).await.unwrap(); - - assert_eq!( - std::fs::read_to_string(dir.path().join("not_a_logfile.tmp")).unwrap(), - "something important" - ); - } -} diff --git a/rust/gui-client/src-tauri/src/controller.rs b/rust/gui-client/src-tauri/src/controller.rs index 124ce85bd..ec9113925 100644 --- a/rust/gui-client/src-tauri/src/controller.rs +++ b/rust/gui-client/src-tauri/src/controller.rs @@ -2,7 +2,8 @@ use crate::{ auth, deep_link, gui::{self, system_tray}, ipc::{self, SocketId}, - logging, service, + logging::{self, FileCount}, + service, settings::{self, AdvancedSettings, GeneralSettings, MdmSettings}, updates, uptime, }; @@ -63,12 +64,6 @@ pub struct Controller { } pub trait GuiIntegration { - fn set_welcome_window_visible( - &self, - visible: bool, - current_session: Option<&auth::Session>, - ) -> Result<()>; - fn notify_signed_in(&self, session: &auth::Session) -> Result<()>; fn notify_signed_out(&self) -> Result<()>; fn notify_settings_changed( @@ -76,6 +71,7 @@ pub trait GuiIntegration { mdm_settings: MdmSettings, advanced_settings: AdvancedSettings, ) -> Result<()>; + fn notify_logs_recounted(&self, file_count: &FileCount) -> Result<()>; /// Also opens non-URLs fn open_url>(&self, url: P) -> Result<()>; @@ -85,12 +81,14 @@ pub trait GuiIntegration { fn show_notification(&self, title: &str, body: &str) -> Result<()>; fn show_update_notification(&self, ctlr_tx: CtlrTx, title: &str, url: url::Url) -> Result<()>; - fn show_settings_window( + fn set_window_visible(&self, visible: bool) -> Result<()>; + fn show_overview_page(&self, current_session: Option<&auth::Session>) -> Result<()>; + fn show_settings_page( &self, mdm_settings: MdmSettings, - advanced_settings: AdvancedSettings, + settings: AdvancedSettings, ) -> Result<()>; - fn show_about_window(&self) -> Result<()>; + fn show_about_page(&self) -> Result<()>; } pub enum ControllerRequest { @@ -106,6 +104,7 @@ pub enum ControllerRequest { Fail(Failure), SignIn, SignOut, + UpdateState, SystemTrayMenu(system_tray::Event), UpdateNotificationClicked(Url), } @@ -288,8 +287,7 @@ impl Controller { self.refresh_system_tray_menu(); if !ran_before::get().await? { - self.integration - .set_welcome_window_visible(true, self.auth.session())?; + self.integration.show_overview_page(self.auth.session())?; } while let Some(tick) = self.tick().await { @@ -506,6 +504,8 @@ impl Controller { // Refresh the menu in case the favorites were reset. self.refresh_system_tray_menu(); + + self.integration.show_notification("Settings saved", "")? } ClearLogs(completion_tx) => { if self.clear_logs_callback.is_some() { @@ -541,8 +541,7 @@ impl Controller { self.integration .open_url(url.expose_secret()) .context("Couldn't open auth page")?; - self.integration - .set_welcome_window_visible(false, self.auth.session())?; + self.integration.set_window_visible(false)?; } SystemTrayMenu(system_tray::Event::AddFavorite(resource_id)) => { self.general_settings.favorite_resources.insert(resource_id); @@ -593,8 +592,8 @@ impl Controller { } SystemTrayMenu(system_tray::Event::ShowWindow(window)) => { match window { - system_tray::Window::About => self.integration.show_about_window()?, - system_tray::Window::Settings => self.integration.show_settings_window( + system_tray::Window::About => self.integration.show_about_page()?, + system_tray::Window::Settings => self.integration.show_settings_page( self.mdm_settings.clone(), self.advanced_settings.clone(), )?, @@ -630,6 +629,19 @@ impl Controller { .open_url(&download_url) .context("Couldn't open update page")?; } + UpdateState => { + self.integration.notify_settings_changed( + self.mdm_settings.clone(), + self.advanced_settings.clone(), + )?; + match self.auth.session() { + Some(session) => self.integration.notify_signed_in(session)?, + None => self.integration.notify_signed_out()?, + }; + + let file_count = logging::count_logs().await?; + self.integration.notify_logs_recounted(&file_count)?; + } } Ok(()) } @@ -644,6 +656,9 @@ impl Controller { }; tx.send(result) .map_err(|_| anyhow!("Couldn't send `ClearLogs` result to Tauri task"))?; + + let file_count = logging::count_logs().await?; + self.integration.notify_logs_recounted(&file_count)?; } service::ServerMsg::ConnectResult(result) => { self.handle_connect_result(result).await?; @@ -738,8 +753,7 @@ impl Controller { } }, gui::ClientMsg::NewInstance => { - self.integration - .set_welcome_window_visible(true, self.auth.session())?; + self.integration.show_overview_page(self.auth.session())?; } } @@ -943,7 +957,7 @@ impl Controller { self.mdm_settings .auth_url .as_ref() - .unwrap_or(&self.advanced_settings.auth_base_url) + .unwrap_or(&self.advanced_settings.auth_url) } fn api_url(&self) -> &Url { diff --git a/rust/gui-client/src-tauri/src/gui.rs b/rust/gui-client/src-tauri/src/gui.rs index 237af4b48..95b8a2276 100644 --- a/rust/gui-client/src-tauri/src/gui.rs +++ b/rust/gui-client/src-tauri/src/gui.rs @@ -4,11 +4,11 @@ //! The real macOS Client is in `swift/apple` use crate::{ - about, auth, + auth, controller::{Controller, ControllerRequest, CtlrTx, Failure, GuiIntegration}, deep_link, ipc::{self, ClientRead, ClientWrite, SocketId}, - logging, + logging::FileCount, settings::{ self, AdvancedSettings, AdvancedSettingsLegacy, AdvancedSettingsViewModel, MdmSettings, }, @@ -55,17 +55,19 @@ struct TauriIntegration { } impl TauriIntegration { - fn show_window(&self, label: &str) -> Result<()> { - let win = self - .app - .get_webview_window(label) - .with_context(|| format!("Couldn't get handle to `{label}` window"))?; + fn main_window(&self) -> Result { + self.app + .get_webview_window("main") + .context("Couldn't get handle to window") + } - // Needed to bring shown windows to the front - // `request_user_attention` and `set_focus` don't work, at least on Linux - win.hide()?; - // Needed to show windows that are completely hidden - win.show()?; + fn navigate(&self, path: &str) -> Result<()> { + let window = self.main_window()?; + + let mut url = window.url()?; + url.set_path(path); + + window.navigate(url)?; Ok(()) } @@ -80,32 +82,6 @@ impl Drop for TauriIntegration { } impl GuiIntegration for TauriIntegration { - fn set_welcome_window_visible( - &self, - visible: bool, - current_session: Option<&auth::Session>, - ) -> Result<()> { - let win = self - .app - .get_webview_window("welcome") - .context("Couldn't get handle to Welcome window")?; - - if visible { - win.show().context("Couldn't show Welcome window")?; - win.set_focus().context("Failed to focus window")?; - } else { - win.hide().context("Couldn't hide Welcome window")?; - } - - // Ensure state in frontend is up-to-date. - match current_session { - Some(session) => self.notify_signed_in(session)?, - None => self.notify_signed_out()?, - }; - - Ok(()) - } - fn notify_signed_in(&self, session: &auth::Session) -> Result<()> { self.app .emit("signed_in", session) @@ -137,6 +113,14 @@ impl GuiIntegration for TauriIntegration { Ok(()) } + fn notify_logs_recounted(&self, file_count: &FileCount) -> Result<()> { + self.app + .emit("logs_recounted", file_count) + .context("Failed to send `logs_recounted` event")?; + + Ok(()) + } + fn open_url>(&self, url: P) -> Result<()> { tauri_plugin_opener::open_url(url, Option::<&str>::None)?; @@ -159,19 +143,51 @@ impl GuiIntegration for TauriIntegration { os::show_update_notification(&self.app, ctlr_tx, title, url) } - fn show_settings_window( - &self, - mdm_settings: MdmSettings, - advanced_settings: AdvancedSettings, - ) -> Result<()> { - self.show_window("settings")?; - self.notify_settings_changed(mdm_settings, advanced_settings)?; // Ensure settings are up to date in GUI. + fn set_window_visible(&self, visible: bool) -> Result<()> { + let win = self.main_window()?; + + if visible { + // Needed to bring shown windows to the front + // `request_user_attention` and `set_focus` don't work, at least on Linux + win.hide()?; + // Needed to show windows that are completely hidden + win.show()?; + } else { + win.hide().context("Couldn't hide window")?; + } Ok(()) } - fn show_about_window(&self) -> Result<()> { - self.show_window("about") + fn show_overview_page(&self, current_session: Option<&auth::Session>) -> Result<()> { + // Ensure state in frontend is up-to-date. + match current_session { + Some(session) => self.notify_signed_in(session)?, + None => self.notify_signed_out()?, + }; + self.navigate("overview")?; + self.set_window_visible(true)?; + + Ok(()) + } + + fn show_settings_page( + &self, + mdm_settings: MdmSettings, + advanced_settings: AdvancedSettings, + ) -> Result<()> { + self.notify_settings_changed(mdm_settings, advanced_settings)?; // Ensure settings are up to date in GUI. + self.navigate("settings")?; + self.set_window_visible(true)?; + + Ok(()) + } + + fn show_about_page(&self) -> Result<()> { + self.navigate("about")?; + self.set_window_visible(true)?; + + Ok(()) } } @@ -265,17 +281,7 @@ pub fn run( api.prevent_close(); } }) - .invoke_handler(tauri::generate_handler![ - about::get_cargo_version, - about::get_git_version, - logging::clear_logs, - logging::count_logs, - logging::export_logs, - settings::apply_advanced_settings, - settings::reset_advanced_settings, - crate::welcome::sign_in, - crate::welcome::sign_out, - ]) + .invoke_handler(crate::view::generate_handler()) .plugin(tauri_plugin_dialog::init()) .plugin(tauri_plugin_notification::init()) .plugin(tauri_plugin_shell::init()) diff --git a/rust/gui-client/src-tauri/src/lib.rs b/rust/gui-client/src-tauri/src/lib.rs index 9deb320a1..8b6443295 100644 --- a/rust/gui-client/src-tauri/src/lib.rs +++ b/rust/gui-client/src-tauri/src/lib.rs @@ -1,10 +1,8 @@ #![cfg_attr(test, allow(clippy::unwrap_used))] -mod about; -mod clear_logs; mod updates; mod uptime; -mod welcome; +mod view; // TODO: See how many of these we can make private. pub mod auth; @@ -17,8 +15,6 @@ pub mod logging; pub mod service; pub mod settings; -pub use clear_logs::clear_logs; - /// The Sentry "release" we are part of. /// /// Tunnel service and GUI client are always bundled into a single release. diff --git a/rust/gui-client/src-tauri/src/logging.rs b/rust/gui-client/src-tauri/src/logging.rs index b7886f669..4c3e8715a 100644 --- a/rust/gui-client/src-tauri/src/logging.rs +++ b/rust/gui-client/src-tauri/src/logging.rs @@ -1,89 +1,17 @@ //! Everything for logging to files, zipping up the files for export, and counting the files -use crate::gui::Managed; use anyhow::{Context as _, Result, bail}; use firezone_bin_shared::known_dirs; -use firezone_logging::{FilterReloadHandle, err_with_src}; +use firezone_logging::FilterReloadHandle; use serde::Serialize; use std::{ fs, io::{self, ErrorKind::NotFound}, path::{Path, PathBuf}, }; -use tauri_plugin_dialog::DialogExt as _; use tokio::task::spawn_blocking; use tracing_subscriber::{EnvFilter, Layer, Registry, layer::SubscriberExt}; -use super::controller::{ControllerRequest, CtlrTx}; - -#[tauri::command] -pub(crate) async fn clear_logs(managed: tauri::State<'_, Managed>) -> Result<(), String> { - let (tx, rx) = tokio::sync::oneshot::channel(); - if let Err(error) = managed.ctlr_tx.send(ControllerRequest::ClearLogs(tx)).await { - // Tauri will only log errors to the JS console for us, so log this ourselves. - tracing::error!( - "Error while asking `Controller` to clear logs: {}", - err_with_src(&error) - ); - return Err(error.to_string()); - } - if let Err(error) = rx.await { - tracing::error!( - "Error while awaiting log-clearing operation: {}", - err_with_src(&error) - ); - return Err(error.to_string()); - } - Ok(()) -} - -#[tauri::command] -pub(crate) async fn export_logs( - app: tauri::AppHandle, - managed: tauri::State<'_, Managed>, -) -> Result<(), String> { - show_export_dialog(&app, managed.ctlr_tx.clone()).map_err(|e| e.to_string()) -} - -#[tauri::command] -pub(crate) async fn count_logs() -> Result { - count_logs_imp().await.map_err(|e| e.to_string()) -} - -/// Pops up the "Save File" dialog -fn show_export_dialog(app: &tauri::AppHandle, ctlr_tx: CtlrTx) -> Result<()> { - let now = chrono::Local::now(); - let datetime_string = now.format("%Y_%m_%d-%H-%M"); - let stem = PathBuf::from(format!("firezone_logs_{datetime_string}")); - let filename = stem.with_extension("zip"); - let Some(filename) = filename.to_str() else { - bail!("zip filename isn't valid Unicode"); - }; - - tauri_plugin_dialog::FileDialogBuilder::new(app.dialog().clone()) - .add_filter("Zip", &["zip"]) - .set_file_name(filename) - .save_file(move |file_path| { - let Some(file_path) = file_path else { - return; - }; - - let path = match file_path.clone().into_path() { - Ok(path) => path, - Err(e) => { - tracing::warn!(%file_path, "Invalid file path: {}", err_with_src(&e)); - return; - } - }; - - // blocking_send here because we're in a sync callback within Tauri somewhere - if let Err(e) = ctlr_tx.blocking_send(ControllerRequest::ExportLogs { path, stem }) { - tracing::warn!("Failed to send `ExportLogs` command: {e}"); - } - }); - Ok(()) -} - /// If you don't store `Handles` in a variable, the file logger handle will drop immediately, /// resulting in empty log files. #[must_use] @@ -282,15 +210,51 @@ pub struct FileCount { files: u64, } -/// Delete all files in the logs directory. -/// -/// This includes the current log file, so we won't write any more logs to disk -/// until the file rolls over or the app restarts. -/// -/// If we get an error while removing a file, we still try to remove all other -/// files, then we return the most recent error. pub async fn clear_gui_logs() -> Result<()> { - crate::clear_logs(&known_dirs::logs().context("Can't compute GUI log dir")?).await + clear_logs(&known_dirs::logs().context("Can't compute GUI log dir")?).await +} + +pub async fn clear_service_logs() -> Result<()> { + clear_logs(&known_dirs::tunnel_service_logs().context("Can't compute service logs dir")?).await +} + +/// Deletes all `.log` files in `path`. +async fn clear_logs(path: &Path) -> Result<()> { + let mut dir = match tokio::fs::read_dir(path).await { + Ok(x) => x, + Err(error) => { + if matches!(error.kind(), NotFound) { + // In smoke tests, the Tunnel service runs in debug mode, so it won't write any logs to disk. If the Tunnel service's log dir doesn't exist, we shouldn't crash, it's correct to simply not delete the non-existent files + return Ok(()); + } + // But any other error like permissions errors, should bubble. + return Err(error.into()); + } + }; + + let mut result = Ok(()); + + // If we can't delete some files due to permission errors, just keep going + // and delete as much as we can, then return the most recent error + while let Some(entry) = dir + .next_entry() + .await + .context("Failed to read next dir entry")? + { + if entry + .file_name() + .to_str() + .is_none_or(|name| !name.ends_with("log") && name != "latest") + { + continue; + } + + if let Err(e) = tokio::fs::remove_file(entry.path()).await { + result = Err(e); + } + } + + result.context("Failed to delete at least one file") } /// Exports logs to a zip file @@ -361,7 +325,7 @@ fn add_dir_to_zip( } /// Count log files and their sizes -async fn count_logs_imp() -> Result { +pub async fn count_logs() -> Result { // I spent about 5 minutes on this and couldn't get it to work with `Stream` let mut total_count = FileCount::default(); for log_path in log_paths()? { @@ -373,7 +337,12 @@ async fn count_logs_imp() -> Result { } async fn count_one_dir(path: &Path) -> Result { - let mut dir = tokio::fs::read_dir(path).await?; + let mut dir = match tokio::fs::read_dir(path).await { + Ok(dir) => dir, + Err(e) if e.kind() == io::ErrorKind::NotFound => return Ok(FileCount::default()), + Err(e) => return Err(anyhow::Error::new(e)), + }; + let mut file_count = FileCount::default(); while let Some(entry) = dir.next_entry().await? { @@ -398,3 +367,36 @@ fn log_paths() -> Result> { }, ]) } + +#[cfg(test)] +mod tests { + use super::*; + + #[tokio::test] + async fn only_deletes_log_files() { + let dir = tempfile::tempdir().unwrap(); + + std::fs::write(dir.path().join("first.log"), "log file 1").unwrap(); + std::fs::write(dir.path().join("second.log"), "log file 1").unwrap(); + std::fs::write(dir.path().join("not_a_logfile.tmp"), "something important").unwrap(); + + clear_logs(dir.path()).await.unwrap(); + + assert_eq!( + std::fs::read_to_string(dir.path().join("not_a_logfile.tmp")).unwrap(), + "something important" + ); + } + + #[tokio::test] + async fn non_existing_path_is_empty() { + let dir = tempfile::tempdir().unwrap(); + let path = dir.path().to_owned(); + drop(dir); + + let file_count = count_one_dir(path.as_path()).await.unwrap(); + + assert_eq!(file_count.bytes, 0); + assert_eq!(file_count.files, 0); + } +} diff --git a/rust/gui-client/src-tauri/src/service.rs b/rust/gui-client/src-tauri/src/service.rs index cd177f82c..046ea10ca 100644 --- a/rust/gui-client/src-tauri/src/service.rs +++ b/rust/gui-client/src-tauri/src/service.rs @@ -1,4 +1,7 @@ -use crate::ipc::{self, SocketId}; +use crate::{ + ipc::{self, SocketId}, + logging, +}; use anyhow::{Context as _, Result, bail}; use atomicwrites::{AtomicFile, OverwriteBehavior}; use backoff::ExponentialBackoffBuilder; @@ -362,11 +365,7 @@ impl<'a> Handler<'a> { async fn handle_ipc_msg(&mut self, msg: ClientMsg) -> Result<()> { match msg { ClientMsg::ClearLogs => { - let result = crate::clear_logs( - &firezone_bin_shared::known_dirs::tunnel_service_logs() - .context("Can't compute logs dir")?, - ) - .await; + let result = logging::clear_service_logs().await; self.send_ipc(ServerMsg::ClearedLogs(result.map_err(|e| e.to_string()))) .await? } @@ -528,7 +527,7 @@ impl<'a> Handler<'a> { } pub fn run_debug(dns_control: DnsControlMethod) -> Result<()> { - let log_filter_reloader = crate::logging::setup_stdout()?; + let log_filter_reloader = logging::setup_stdout()?; tracing::info!( arch = std::env::consts::ARCH, version = env!("CARGO_PKG_VERSION"), @@ -555,7 +554,7 @@ pub fn run_smoke_test() -> Result<()> { use anyhow::{Context as _, bail}; use firezone_bin_shared::{DnsController, device_id}; - let log_filter_reloader = crate::logging::setup_stdout()?; + let log_filter_reloader = logging::setup_stdout()?; if !elevation_check()? { bail!("Tunnel service failed its elevation check, try running as admin / root"); } diff --git a/rust/gui-client/src-tauri/src/settings.rs b/rust/gui-client/src-tauri/src/settings.rs index f0e64875a..911ca7886 100644 --- a/rust/gui-client/src-tauri/src/settings.rs +++ b/rust/gui-client/src-tauri/src/settings.rs @@ -1,18 +1,14 @@ //! Everything related to the Settings window, including //! advanced settings and code for manipulating diagnostic logs. -use crate::gui::Managed; use anyhow::{Context as _, Result}; use connlib_model::ResourceId; use firezone_bin_shared::known_dirs; use serde::de::DeserializeOwned; use serde::{Deserialize, Serialize}; -use std::time::Duration; use std::{collections::HashSet, path::PathBuf}; use url::Url; -use super::controller::ControllerRequest; - #[cfg(target_os = "linux")] #[path = "settings/linux.rs"] pub(crate) mod mdm; @@ -27,33 +23,6 @@ pub(crate) mod mdm; pub use mdm::load_mdm_settings; -#[tauri::command] -pub(crate) async fn apply_advanced_settings( - managed: tauri::State<'_, Managed>, - settings: AdvancedSettings, -) -> Result<(), String> { - if managed.inner().inject_faults { - tokio::time::sleep(Duration::from_secs(2)).await; - } - - managed - .ctlr_tx - .send(ControllerRequest::ApplySettings(Box::new(settings))) - .await - .map_err(|e| e.to_string())?; - - Ok(()) -} - -#[tauri::command] -pub(crate) async fn reset_advanced_settings( - managed: tauri::State<'_, Managed>, -) -> Result<(), String> { - apply_advanced_settings(managed, AdvancedSettings::default()).await?; - - Ok(()) -} - /// Defines all configuration options settable via MDM policies. /// /// Configuring Firezone via MDM is optional, therefore all of these are [`Option`]s. @@ -84,7 +53,7 @@ pub struct AdvancedSettingsLegacy { #[derive(Clone, Deserialize, Serialize)] pub struct AdvancedSettings { - pub auth_base_url: Url, + pub auth_url: Url, pub api_url: Url, pub log_filter: String, } @@ -114,9 +83,7 @@ impl AdvancedSettingsViewModel { api_url_is_managed: mdm_settings.api_url.is_some(), log_filter_is_managed: mdm_settings.log_filter.is_some(), - auth_url: mdm_settings - .auth_url - .unwrap_or(advanced_settings.auth_base_url), + auth_url: mdm_settings.auth_url.unwrap_or(advanced_settings.auth_url), api_url: mdm_settings.api_url.unwrap_or(advanced_settings.api_url), log_filter: mdm_settings .log_filter @@ -160,7 +127,7 @@ impl GeneralSettings { impl Default for AdvancedSettings { fn default() -> Self { Self { - auth_base_url: Url::parse(defaults::AUTH_BASE_URL).expect("static URL is a valid URL"), + auth_url: Url::parse(defaults::AUTH_BASE_URL).expect("static URL is a valid URL"), api_url: Url::parse(defaults::API_URL).expect("static URL is a valid URL"), log_filter: defaults::LOG_FILTER.to_string(), } @@ -185,7 +152,7 @@ pub async fn migrate_legacy_settings( let general_settings = load_general_settings(); let advanced = AdvancedSettings { - auth_base_url: legacy.auth_base_url, + auth_url: legacy.auth_base_url, api_url: legacy.api_url, log_filter: legacy.log_filter, }; @@ -278,7 +245,7 @@ mod tests { "log_filter": "info" }"#; - let actual = serde_json::from_str::(s).unwrap(); + let actual = serde_json::from_str::(s).unwrap(); // Apparently the trailing slash here matters assert_eq!(actual.auth_base_url.to_string(), "https://example.com/"); assert_eq!(actual.api_url.to_string(), "wss://example.com/"); diff --git a/rust/gui-client/src-tauri/src/view.rs b/rust/gui-client/src-tauri/src/view.rs new file mode 100644 index 000000000..31cb96e15 --- /dev/null +++ b/rust/gui-client/src-tauri/src/view.rs @@ -0,0 +1,148 @@ +use std::{path::PathBuf, time::Duration}; + +use anyhow::{Context as _, Result, bail}; +use firezone_logging::err_with_src; +use tauri::{Wry, ipc::Invoke}; +use tauri_plugin_dialog::DialogExt as _; + +use crate::{ + controller::{ControllerRequest, CtlrTx}, + gui::Managed, + settings::AdvancedSettings, +}; + +pub fn generate_handler() -> impl Fn(Invoke) -> bool + Send + Sync + 'static { + tauri::generate_handler![ + clear_logs, + export_logs, + apply_advanced_settings, + reset_advanced_settings, + sign_in, + sign_out, + update_state, + ] +} + +#[tauri::command] +async fn clear_logs(managed: tauri::State<'_, Managed>) -> Result<(), String> { + let (tx, rx) = tokio::sync::oneshot::channel(); + if let Err(error) = managed.ctlr_tx.send(ControllerRequest::ClearLogs(tx)).await { + // Tauri will only log errors to the JS console for us, so log this ourselves. + tracing::error!( + "Error while asking `Controller` to clear logs: {}", + err_with_src(&error) + ); + return Err(error.to_string()); + } + if let Err(error) = rx.await { + tracing::error!( + "Error while awaiting log-clearing operation: {}", + err_with_src(&error) + ); + return Err(error.to_string()); + } + Ok(()) +} + +#[tauri::command] +async fn export_logs( + app: tauri::AppHandle, + managed: tauri::State<'_, Managed>, +) -> Result<(), String> { + show_export_dialog(&app, managed.ctlr_tx.clone()).map_err(|e| e.to_string()) +} + +#[tauri::command] +async fn apply_advanced_settings( + managed: tauri::State<'_, Managed>, + settings: AdvancedSettings, +) -> Result<(), String> { + if managed.inner().inject_faults { + tokio::time::sleep(Duration::from_secs(2)).await; + } + + managed + .ctlr_tx + .send(ControllerRequest::ApplySettings(Box::new(settings))) + .await + .map_err(|e| e.to_string())?; + + Ok(()) +} + +#[tauri::command] +async fn reset_advanced_settings(managed: tauri::State<'_, Managed>) -> Result<(), String> { + apply_advanced_settings(managed, AdvancedSettings::default()).await?; + + Ok(()) +} + +/// Pops up the "Save File" dialog +fn show_export_dialog(app: &tauri::AppHandle, ctlr_tx: CtlrTx) -> Result<()> { + let now = chrono::Local::now(); + let datetime_string = now.format("%Y_%m_%d-%H-%M"); + let stem = PathBuf::from(format!("firezone_logs_{datetime_string}")); + let filename = stem.with_extension("zip"); + let Some(filename) = filename.to_str() else { + bail!("zip filename isn't valid Unicode"); + }; + + tauri_plugin_dialog::FileDialogBuilder::new(app.dialog().clone()) + .add_filter("Zip", &["zip"]) + .set_file_name(filename) + .save_file(move |file_path| { + let Some(file_path) = file_path else { + return; + }; + + let path = match file_path.clone().into_path() { + Ok(path) => path, + Err(e) => { + tracing::warn!(%file_path, "Invalid file path: {}", err_with_src(&e)); + return; + } + }; + + // blocking_send here because we're in a sync callback within Tauri somewhere + if let Err(e) = ctlr_tx.blocking_send(ControllerRequest::ExportLogs { path, stem }) { + tracing::warn!("Failed to send `ExportLogs` command: {e}"); + } + }); + Ok(()) +} + +#[tauri::command] +async fn sign_in(managed: tauri::State<'_, Managed>) -> Result<(), String> { + managed + .ctlr_tx + .send(ControllerRequest::SignIn) + .await + .context("Failed to send `SignIn` command") + .map_err(|e| e.to_string())?; + + Ok(()) +} + +#[tauri::command] +async fn sign_out(managed: tauri::State<'_, Managed>) -> Result<(), String> { + managed + .ctlr_tx + .send(ControllerRequest::SignOut) + .await + .context("Failed to send `SignOut` command") + .map_err(|e| e.to_string())?; + + Ok(()) +} + +#[tauri::command] +async fn update_state(managed: tauri::State<'_, Managed>) -> Result<(), String> { + managed + .ctlr_tx + .send(ControllerRequest::UpdateState) + .await + .context("Failed to send `UpdateState` command") + .map_err(|e| e.to_string())?; + + Ok(()) +} diff --git a/rust/gui-client/src-tauri/src/welcome.rs b/rust/gui-client/src-tauri/src/welcome.rs deleted file mode 100644 index 4e9683988..000000000 --- a/rust/gui-client/src-tauri/src/welcome.rs +++ /dev/null @@ -1,30 +0,0 @@ -//! Everything related to the Welcome window - -use crate::gui::Managed; -use anyhow::Context; - -use super::controller::ControllerRequest; - -#[tauri::command] -pub(crate) async fn sign_in(managed: tauri::State<'_, Managed>) -> Result<(), String> { - managed - .ctlr_tx - .send(ControllerRequest::SignIn) - .await - .context("Failed to send `SignIn` command") - .map_err(|e| e.to_string())?; - - Ok(()) -} - -#[tauri::command] -pub(crate) async fn sign_out(managed: tauri::State<'_, Managed>) -> Result<(), String> { - managed - .ctlr_tx - .send(ControllerRequest::SignOut) - .await - .context("Failed to send `SignOut` command") - .map_err(|e| e.to_string())?; - - Ok(()) -} diff --git a/rust/gui-client/src-tauri/tauri.conf.json b/rust/gui-client/src-tauri/tauri.conf.json index c75c329ea..5caf89ddd 100644 --- a/rust/gui-client/src-tauri/tauri.conf.json +++ b/rust/gui-client/src-tauri/tauri.conf.json @@ -64,33 +64,13 @@ }, "windows": [ { - "label": "about", - "title": "About Firezone", - "url": "src/about.html", + "label": "main", + "title": "Firezone", + "url": "src-frontend/index.html", "fullscreen": false, "resizable": false, - "width": 400, - "height": 300, - "visible": false - }, - { - "label": "settings", - "title": "Settings", - "url": "src/settings.html", - "fullscreen": false, - "resizable": true, - "width": 640, - "height": 480, - "visible": false - }, - { - "label": "welcome", - "title": "Welcome", - "url": "src/welcome.html", - "fullscreen": false, - "resizable": false, - "width": 800, - "height": 450, + "width": 900, + "height": 500, "visible": false } ] diff --git a/rust/gui-client/src/about.html b/rust/gui-client/src/about.html deleted file mode 100644 index e0b8817ac..000000000 --- a/rust/gui-client/src/about.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - About Firezone - - - - -
- Firezone Logo -

Version

-

- -

-

- () -

- Documentation -
- - diff --git a/rust/gui-client/src/about.ts b/rust/gui-client/src/about.ts deleted file mode 100644 index 62256d287..000000000 --- a/rust/gui-client/src/about.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { invoke } from "@tauri-apps/api/core"; -import "flowbite" - -const cargoVersionSpan = ( - document.getElementById("cargo-version") -); -const gitVersionSpan = document.getElementById("git-version"); - -function get_cargo_version() { - try { - invoke("get_cargo_version").then((cargoVersion: unknown) => { - cargoVersionSpan.innerText = cargoVersion as string; - }); - } catch (e) { - cargoVersionSpan.innerText = "Unknown"; - console.error(e); - } -} - -function get_git_version() { - try { - invoke("get_git_version").then((gitVersion) => { - gitVersionSpan.innerText = gitVersion.substring(0, 8); // Trim Git hash - }); - } catch (e) { - gitVersionSpan.innerText = "Unknown"; - console.error(e); - } -} - -document.addEventListener("DOMContentLoaded", () => { - get_cargo_version(); - get_git_version(); -}); diff --git a/rust/gui-client/src/settings.html b/rust/gui-client/src/settings.html deleted file mode 100644 index f70bb2c05..000000000 --- a/rust/gui-client/src/settings.html +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - Settings - - - - -
-
-
    - - -
-
-
- - -
-
- - diff --git a/rust/gui-client/src/settings.ts b/rust/gui-client/src/settings.ts deleted file mode 100644 index 7f68814d0..000000000 --- a/rust/gui-client/src/settings.ts +++ /dev/null @@ -1,193 +0,0 @@ -import { invoke } from "@tauri-apps/api/core"; -import { listen } from "@tauri-apps/api/event"; -import "flowbite" - -// Custom types -interface Settings { - auth_url: string; - auth_url_is_managed: boolean; - api_url: string; - api_url_is_managed: boolean; - log_filter: string; - log_filter_is_managed: boolean; -} - -interface FileCount { - files: number; - bytes: number; -} - -// DOM elements -const form = document.getElementById("advanced-settings-form"); -const authBaseUrlInput = ( - document.getElementById("auth-base-url-input") -); -const apiUrlInput = document.getElementById("api-url-input"); -const logFilterInput = ( - document.getElementById("log-filter-input") -); -const logCountOutput = ( - document.getElementById("log-count-output") -); -const resetAdvancedSettingsBtn = ( - document.getElementById("reset-advanced-settings-btn") -); -const applyAdvancedSettingsBtn = ( - document.getElementById("apply-advanced-settings-btn") -); -const exportLogsBtn = ( - document.getElementById("export-logs-btn") -); -const clearLogsBtn = ( - document.getElementById("clear-logs-btn") -); -const logsTabBtn = document.getElementById("logs-tab"); - -// Rust bridge functions - -// Lock the UI when we're saving to disk, since disk writes are technically async. -function lockAdvancedSettingsForm() { - authBaseUrlInput.disabled = true; - apiUrlInput.disabled = true; - logFilterInput.disabled = true; - resetAdvancedSettingsBtn.disabled = true; - applyAdvancedSettingsBtn.disabled = true; - - resetAdvancedSettingsBtn.textContent = "Updating..."; - applyAdvancedSettingsBtn.textContent = "Updating..."; -} - -function unlockAdvancedSettingsForm() { - authBaseUrlInput.disabled = false; - apiUrlInput.disabled = false; - logFilterInput.disabled = false; - resetAdvancedSettingsBtn.disabled = false; - applyAdvancedSettingsBtn.disabled = false; - - resetAdvancedSettingsBtn.textContent = "Reset to Defaults"; - applyAdvancedSettingsBtn.textContent = "Apply"; -} - -function lockLogsForm() { - exportLogsBtn.disabled = true; - clearLogsBtn.disabled = true; -} - -function unlockLogsForm() { - exportLogsBtn.disabled = false; - clearLogsBtn.disabled = false; -} - -async function applyAdvancedSettings() { - console.log("Applying advanced settings"); - lockAdvancedSettingsForm(); - - try { - await invoke("apply_advanced_settings", { - settings: { - auth_base_url: authBaseUrlInput.value, - api_url: apiUrlInput.value, - log_filter: logFilterInput.value, - }, - }); - } catch (e) { - console.error(e); - } finally { - unlockAdvancedSettingsForm(); - } -} - -async function resetAdvancedSettings() { - console.log("Resetting advanced settings"); - lockAdvancedSettingsForm(); - - try { - await invoke("reset_advanced_settings") - } catch (e) { - console.error(e); - } finally { - unlockAdvancedSettingsForm(); - } -} - -async function exportLogs() { - console.log("Exporting logs"); - lockLogsForm(); - - try { - await invoke("export_logs"); - } catch (e) { - console.error(e); - } finally { - unlockLogsForm(); - } -} - -async function clearLogs() { - console.log("Clearing logs"); - lockLogsForm(); - - try { - await invoke("clear_logs"); - } catch (e) { - console.error(e); - } finally { - countLogs(); - unlockLogsForm(); - } -} - -async function countLogs() { - try { - let fileCount = (await invoke("count_logs")) as FileCount; - console.log(fileCount); - const megabytes = Math.round(fileCount.bytes / 100000) / 10; - logCountOutput.innerText = `${fileCount.files} files, ${megabytes} MB`; - } catch (e) { - let error = e as Error; - console.error(e); - logCountOutput.innerText = `Error counting logs: ${error.message}`; - } -} - -// Setup event listeners -form.addEventListener("submit", (e) => { - e.preventDefault(); - applyAdvancedSettings(); -}); -resetAdvancedSettingsBtn.addEventListener("click", (_e) => { - resetAdvancedSettings(); -}); -exportLogsBtn.addEventListener("click", (_e) => { - exportLogs(); -}); -clearLogsBtn.addEventListener("click", (_e) => { - clearLogs(); -}); -logsTabBtn.addEventListener("click", (_e) => { - countLogs(); -}); - -listen('settings_changed', (e) => { - let settings = e.payload; - - authBaseUrlInput.value = settings.auth_url; - apiUrlInput.value = settings.api_url; - logFilterInput.value = settings.log_filter; - - authBaseUrlInput.disabled = settings.auth_url_is_managed - apiUrlInput.disabled = settings.api_url_is_managed; - logFilterInput.disabled = settings.log_filter_is_managed; - - if (settings.auth_url_is_managed) { - authBaseUrlInput.dataset['tip'] = "This setting is managed by your organization." - } - - if (settings.api_url_is_managed) { - apiUrlInput.dataset['tip'] = "This setting is managed by your organization." - } - - if (settings.log_filter_is_managed) { - logFilterInput.dataset['tip'] = "This setting is managed by your organization." - } -}) diff --git a/rust/gui-client/src/welcome.html b/rust/gui-client/src/welcome.html deleted file mode 100644 index cccb24bcf..000000000 --- a/rust/gui-client/src/welcome.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - Welcome to Firezone - - - - - Firezone Logo - -

Firezone

- -
-
-

- You can sign in by clicking the Firezone icon the taskbar or by - clicking 'Sign-in' below. -

- -

- Firezone will continue running after this window is closed.
- It is always available from the taskbar. -

-
-
- -
-
-

- You are currently signed into  as .
- Click the Firezone icon in the taskbar to see the list of Resources. -

- -

- Firezone will continue running in the taskbar after this window is - closed. -

-
-
- - diff --git a/rust/gui-client/src/welcome.ts b/rust/gui-client/src/welcome.ts deleted file mode 100644 index 1f61047be..000000000 --- a/rust/gui-client/src/welcome.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { invoke } from "@tauri-apps/api/core"; -import { listen } from '@tauri-apps/api/event'; -import "flowbite" - -interface Session { - account_slug: string, - actor_name: string, -} - -const signInBtn = document.getElementById("sign-in"); -const signOutBtn = document.getElementById("sign-out"); - -const signedInDiv = document.getElementById("signed-in"); -const signedOutDiv = document.getElementById("signed-out"); - -const accountSlugSpan = document.getElementById("account-slug"); -const actorNameSpan = document.getElementById("actor-name"); - -// Initial state is to assume we are signed out. -signedOutDiv.style.display = "block"; -signedInDiv.style.display = "none"; - -signInBtn.addEventListener("click", async (_e) => { - console.log("Signing in..."); - - await invoke("sign_in"); -}); -signOutBtn.addEventListener("click", async (_e) => { - console.log("Signing in..."); - - await invoke("sign_out"); -}); - -listen('signed_in', (e) => { - let session = e.payload; - - accountSlugSpan.textContent = session.account_slug; - actorNameSpan.textContent = session.actor_name; - signedOutDiv.style.display = "none"; - signedInDiv.style.display = "block"; -}) - -listen('signed_out', (_e) => { - accountSlugSpan.textContent = ""; - actorNameSpan.textContent = ""; - signedOutDiv.style.display = "block"; - signedInDiv.style.display = "none"; -}) diff --git a/rust/gui-client/tsconfig.json b/rust/gui-client/tsconfig.json index 49f6ba489..efed97526 100644 --- a/rust/gui-client/tsconfig.json +++ b/rust/gui-client/tsconfig.json @@ -5,6 +5,7 @@ "module": "ESNext", "lib": ["ES2020", "DOM", "DOM.Iterable"], "skipLibCheck": true, + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo", /* Bundler mode */ "moduleResolution": "bundler", @@ -12,13 +13,16 @@ "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, + "jsx": "react", + "moduleDetection": "force", /* Linting */ "strict": true, "noUnusedLocals": true, "noUnusedParameters": true, - "noFallthroughCasesInSwitch": true + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true }, - "include": ["./src/**/*"], + "include": ["./src-frontend/**/*", "vite.config.ts"], "exclude": ["node_modules"] } diff --git a/rust/gui-client/vite.config.ts b/rust/gui-client/vite.config.ts index 9f76eedaf..efc92f718 100644 --- a/rust/gui-client/vite.config.ts +++ b/rust/gui-client/vite.config.ts @@ -1,28 +1,24 @@ +import tailwindcss from "@tailwindcss/vite"; +import react from "@vitejs/plugin-react"; import { defineConfig } from "vite"; -import { resolve } from "path"; -import tailwindcss from '@tailwindcss/vite' +import flowbiteReact from "flowbite-react/plugin/vite"; import typescript from 'vite-plugin-typescript'; +import { execSync } from "child_process"; -// @ts-expect-error process is a nodejs global const host = process.env.TAURI_DEV_HOST; +const gitVersion = process.env.GITHUB_SHA ?? execSync('git rev-parse --short HEAD') + .toString(); -// https://vitejs.dev/config/ -export default defineConfig(async () => ({ - build: { - rollupOptions: { - input: { - about: resolve(__dirname, "src/about.html"), - settings: resolve(__dirname, "src/settings.html"), - welcome: resolve(__dirname, "src/welcome.html"), - }, - }, +// https://vite.dev/config/ +export default defineConfig({ + plugins: [react(), flowbiteReact(), tailwindcss(), typescript()], + + define: { + // mark:next-gui-version + '__APP_VERSION__': JSON.stringify("1.5.0"), + '__GIT_VERSION__': JSON.stringify(gitVersion), }, - plugins: [ - tailwindcss(), - typescript(), - ], - // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build` // // 1. prevent vite from obscuring rust errors @@ -44,4 +40,4 @@ export default defineConfig(async () => ({ ignored: ["**/src-tauri/**"], }, }, -})); +}); diff --git a/scripts/bump-versions.sh b/scripts/bump-versions.sh index 155b342a3..ef4f250c0 100755 --- a/scripts/bump-versions.sh +++ b/scripts/bump-versions.sh @@ -138,6 +138,7 @@ function gui() { find website -type f -name "route.ts" -exec sed "${SEDARG[@]}" -e '/mark:current-gui-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_gui_version}"'/g;}' {} \; find .github -type f -exec sed "${SEDARG[@]}" -e '/mark:next-gui-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${next_gui_version}"'/g;}' {} \; find rust -path rust/gui-client/node_modules -prune -o -path rust/target -prune -o -name "Cargo.toml" -exec sed "${SEDARG[@]}" -e '/mark:next-gui-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${next_gui_version}"'/;}' {} \; + find rust -path rust/gui-client/node_modules -prune -o -path rust/target -prune -o -name "vite.config.ts" -exec sed "${SEDARG[@]}" -e '/mark:next-gui-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${next_gui_version}"'/;}' {} \; cargo_update_workspace }