From c1b07223d5d9c41b6fa60c13a7f48ddb0022a595 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Mon, 26 Jan 2026 23:27:50 +0530 Subject: [PATCH 01/37] feat: init gpui frontend migration --- src-tauri/Cargo.lock => Cargo.lock | 6236 +++++++++++------ src-tauri/Cargo.toml => Cargo.toml | 31 +- biome.json | 52 - components.json | 16 - deno.json | 21 - deno.lock | 1138 --- package-lock.json | 2866 -------- package.json | 46 - src-tauri/rustfmt.toml => rustfmt.toml | 0 src-tauri/build.rs | 3 - src-tauri/capabilities/default.json | 18 - src-tauri/src/lib.rs | 39 - {src-tauri => src}/.gitignore | 2 + src/app.css | 131 - src/app.html | 13 - {src-tauri/src => src/device}/error.rs | 0 .../src => src/device}/fido/constants.rs | 0 {src-tauri/src => src/device}/fido/hid.rs | 4 +- {src-tauri/src => src/device}/fido/mod.rs | 4 +- {src-tauri/src => src/device}/io.rs | 24 +- {src-tauri/src => src/device}/logging.rs | 0 {src-tauri/src => src/device}/main.rs | 0 src/device/mod.rs | 6 + .../src => src/device}/rescue/constants.rs | 0 {src-tauri/src => src/device}/rescue/mod.rs | 2 +- {src-tauri/src => src/device}/types.rs | 0 {src-tauri => src}/icons/128x128.png | Bin {src-tauri => src}/icons/128x128@2x.png | Bin {src-tauri => src}/icons/32x32.png | Bin {src-tauri => src}/icons/64x64.png | Bin .../icons/Square107x107Logo.png | Bin .../icons/Square142x142Logo.png | Bin .../icons/Square150x150Logo.png | Bin .../icons/Square284x284Logo.png | Bin {src-tauri => src}/icons/Square30x30Logo.png | Bin .../icons/Square310x310Logo.png | Bin {src-tauri => src}/icons/Square44x44Logo.png | Bin {src-tauri => src}/icons/Square71x71Logo.png | Bin {src-tauri => src}/icons/Square89x89Logo.png | Bin {src-tauri => src}/icons/StoreLogo.png | Bin .../android/mipmap-anydpi-v26/ic_launcher.xml | 0 .../icons/android/mipmap-hdpi/ic_launcher.png | Bin .../mipmap-hdpi/ic_launcher_foreground.png | Bin .../android/mipmap-hdpi/ic_launcher_round.png | Bin .../icons/android/mipmap-mdpi/ic_launcher.png | Bin .../mipmap-mdpi/ic_launcher_foreground.png | Bin .../android/mipmap-mdpi/ic_launcher_round.png | Bin .../android/mipmap-xhdpi/ic_launcher.png | Bin .../mipmap-xhdpi/ic_launcher_foreground.png | Bin .../mipmap-xhdpi/ic_launcher_round.png | Bin .../android/mipmap-xxhdpi/ic_launcher.png | Bin .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin .../mipmap-xxhdpi/ic_launcher_round.png | Bin .../android/mipmap-xxxhdpi/ic_launcher.png | Bin .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin .../mipmap-xxxhdpi/ic_launcher_round.png | Bin .../android/values/ic_launcher_background.xml | 0 {src-tauri => src}/icons/icon.icns | Bin {src-tauri => src}/icons/icon.ico | Bin {src-tauri => src}/icons/icon.png | Bin .../in.suyogtandel.picoforge-symbolic.svg | 0 .../icons/in.suyogtandel.picoforge.Devel.svg | 0 .../icons/in.suyogtandel.picoforge.source.svg | 0 .../icons/in.suyogtandel.picoforge.svg | 0 .../icons/ios/AppIcon-20x20@1x.png | Bin .../icons/ios/AppIcon-20x20@2x-1.png | Bin .../icons/ios/AppIcon-20x20@2x.png | Bin .../icons/ios/AppIcon-20x20@3x.png | Bin .../icons/ios/AppIcon-29x29@1x.png | Bin .../icons/ios/AppIcon-29x29@2x-1.png | Bin .../icons/ios/AppIcon-29x29@2x.png | Bin .../icons/ios/AppIcon-29x29@3x.png | Bin .../icons/ios/AppIcon-40x40@1x.png | Bin .../icons/ios/AppIcon-40x40@2x-1.png | Bin .../icons/ios/AppIcon-40x40@2x.png | Bin .../icons/ios/AppIcon-40x40@3x.png | Bin .../icons/ios/AppIcon-512@2x.png | Bin .../icons/ios/AppIcon-60x60@2x.png | Bin .../icons/ios/AppIcon-60x60@3x.png | Bin .../icons/ios/AppIcon-76x76@1x.png | Bin .../icons/ios/AppIcon-76x76@2x.png | Bin .../icons/ios/AppIcon-83.5x83.5@2x.png | Bin .../device/DeviceNotSupported.svelte | 22 - .../components/device/NoDeviceStatus.svelte | 23 - src/lib/components/dialogs/AuthDialog.svelte | 81 - .../components/dialogs/authPinDialog.svelte | 51 - .../dialogs/deleteCredentialDialog.svelte | 73 - .../components/dialogs/messageDialog.svelte | 34 - .../components/dialogs/minPinDialog.svelte | 80 - .../components/dialogs/setPinDialog.svelte | 75 - .../alert-dialog/alert-dialog-action.svelte | 18 - .../alert-dialog/alert-dialog-cancel.svelte | 18 - .../alert-dialog/alert-dialog-content.svelte | 29 - .../alert-dialog-description.svelte | 17 - .../alert-dialog/alert-dialog-footer.svelte | 20 - .../alert-dialog/alert-dialog-header.svelte | 20 - .../alert-dialog/alert-dialog-overlay.svelte | 20 - .../alert-dialog/alert-dialog-portal.svelte | 7 - .../ui/alert-dialog/alert-dialog-title.svelte | 17 - .../alert-dialog/alert-dialog-trigger.svelte | 7 - .../ui/alert-dialog/alert-dialog.svelte | 7 - src/lib/components/ui/alert-dialog/index.ts | 37 - .../ui/alert/alert-description.svelte | 23 - .../components/ui/alert/alert-title.svelte | 20 - src/lib/components/ui/alert/alert.svelte | 44 - src/lib/components/ui/alert/index.ts | 14 - src/lib/components/ui/badge/badge.svelte | 50 - src/lib/components/ui/badge/index.ts | 2 - src/lib/components/ui/button/button.svelte | 82 - src/lib/components/ui/button/index.ts | 17 - src/lib/components/ui/card/card-action.svelte | 20 - .../components/ui/card/card-content.svelte | 15 - .../ui/card/card-description.svelte | 20 - src/lib/components/ui/card/card-footer.svelte | 20 - src/lib/components/ui/card/card-header.svelte | 23 - src/lib/components/ui/card/card-title.svelte | 20 - src/lib/components/ui/card/card.svelte | 23 - src/lib/components/ui/card/index.ts | 25 - .../components/ui/dialog/dialog-close.svelte | 7 - .../ui/dialog/dialog-content.svelte | 45 - .../ui/dialog/dialog-description.svelte | 17 - .../components/ui/dialog/dialog-footer.svelte | 20 - .../components/ui/dialog/dialog-header.svelte | 20 - .../ui/dialog/dialog-overlay.svelte | 20 - .../components/ui/dialog/dialog-portal.svelte | 7 - .../components/ui/dialog/dialog-title.svelte | 17 - .../ui/dialog/dialog-trigger.svelte | 7 - src/lib/components/ui/dialog/dialog.svelte | 7 - src/lib/components/ui/dialog/index.ts | 34 - .../components/ui/drawer/drawer-close.svelte | 7 - .../ui/drawer/drawer-content.svelte | 40 - .../ui/drawer/drawer-description.svelte | 17 - .../components/ui/drawer/drawer-footer.svelte | 20 - .../components/ui/drawer/drawer-header.svelte | 20 - .../components/ui/drawer/drawer-nested.svelte | 12 - .../ui/drawer/drawer-overlay.svelte | 20 - .../components/ui/drawer/drawer-portal.svelte | 7 - .../components/ui/drawer/drawer-title.svelte | 17 - .../ui/drawer/drawer-trigger.svelte | 7 - src/lib/components/ui/drawer/drawer.svelte | 12 - src/lib/components/ui/drawer/index.ts | 38 - src/lib/components/ui/input/index.ts | 7 - src/lib/components/ui/input/input.svelte | 52 - src/lib/components/ui/label/index.ts | 7 - src/lib/components/ui/label/label.svelte | 20 - src/lib/components/ui/popover/index.ts | 19 - .../ui/popover/popover-close.svelte | 7 - .../ui/popover/popover-content.svelte | 31 - .../ui/popover/popover-portal.svelte | 7 - .../ui/popover/popover-trigger.svelte | 17 - src/lib/components/ui/popover/popover.svelte | 7 - src/lib/components/ui/progress/index.ts | 7 - .../components/ui/progress/progress.svelte | 27 - src/lib/components/ui/scroll-area/index.ts | 10 - .../scroll-area/scroll-area-scrollbar.svelte | 31 - .../ui/scroll-area/scroll-area.svelte | 43 - src/lib/components/ui/select/index.ts | 37 - .../ui/select/select-content.svelte | 45 - .../ui/select/select-group-heading.svelte | 21 - .../components/ui/select/select-group.svelte | 7 - .../components/ui/select/select-item.svelte | 38 - .../components/ui/select/select-label.svelte | 20 - .../components/ui/select/select-portal.svelte | 7 - .../select/select-scroll-down-button.svelte | 20 - .../ui/select/select-scroll-up-button.svelte | 20 - .../ui/select/select-separator.svelte | 18 - .../ui/select/select-trigger.svelte | 29 - src/lib/components/ui/select/select.svelte | 11 - src/lib/components/ui/separator/index.ts | 7 - .../components/ui/separator/separator.svelte | 21 - src/lib/components/ui/sheet/index.ts | 34 - .../components/ui/sheet/sheet-close.svelte | 7 - .../components/ui/sheet/sheet-content.svelte | 60 - .../ui/sheet/sheet-description.svelte | 17 - .../components/ui/sheet/sheet-footer.svelte | 20 - .../components/ui/sheet/sheet-header.svelte | 20 - .../components/ui/sheet/sheet-overlay.svelte | 20 - .../components/ui/sheet/sheet-portal.svelte | 7 - .../components/ui/sheet/sheet-title.svelte | 17 - .../components/ui/sheet/sheet-trigger.svelte | 7 - src/lib/components/ui/sheet/sheet.svelte | 7 - src/lib/components/ui/sidebar/constants.ts | 6 - .../components/ui/sidebar/context.svelte.ts | 81 - src/lib/components/ui/sidebar/index.ts | 75 - .../ui/sidebar/sidebar-content.svelte | 24 - .../ui/sidebar/sidebar-footer.svelte | 21 - .../ui/sidebar/sidebar-group-action.svelte | 36 - .../ui/sidebar/sidebar-group-content.svelte | 21 - .../ui/sidebar/sidebar-group-label.svelte | 34 - .../ui/sidebar/sidebar-group.svelte | 21 - .../ui/sidebar/sidebar-header.svelte | 21 - .../ui/sidebar/sidebar-input.svelte | 21 - .../ui/sidebar/sidebar-inset.svelte | 24 - .../ui/sidebar/sidebar-menu-action.svelte | 43 - .../ui/sidebar/sidebar-menu-badge.svelte | 29 - .../ui/sidebar/sidebar-menu-button.svelte | 103 - .../ui/sidebar/sidebar-menu-item.svelte | 21 - .../ui/sidebar/sidebar-menu-skeleton.svelte | 36 - .../ui/sidebar/sidebar-menu-sub-button.svelte | 43 - .../ui/sidebar/sidebar-menu-sub-item.svelte | 21 - .../ui/sidebar/sidebar-menu-sub.svelte | 25 - .../components/ui/sidebar/sidebar-menu.svelte | 21 - .../ui/sidebar/sidebar-provider.svelte | 53 - .../components/ui/sidebar/sidebar-rail.svelte | 36 - .../ui/sidebar/sidebar-separator.svelte | 19 - .../ui/sidebar/sidebar-trigger.svelte | 35 - src/lib/components/ui/sidebar/sidebar.svelte | 104 - src/lib/components/ui/skeleton/index.ts | 7 - .../components/ui/skeleton/skeleton.svelte | 17 - src/lib/components/ui/slider/index.ts | 7 - src/lib/components/ui/slider/slider.svelte | 52 - src/lib/components/ui/spinner/index.ts | 1 - src/lib/components/ui/spinner/spinner.svelte | 14 - src/lib/components/ui/switch/index.ts | 7 - src/lib/components/ui/switch/switch.svelte | 29 - src/lib/components/ui/tooltip/index.ts | 19 - .../ui/tooltip/tooltip-content.svelte | 52 - .../ui/tooltip/tooltip-portal.svelte | 7 - .../ui/tooltip/tooltip-provider.svelte | 7 - .../ui/tooltip/tooltip-trigger.svelte | 7 - src/lib/components/ui/tooltip/tooltip.svelte | 7 - src/lib/device/constants.svelte.ts | 49 - src/lib/device/manager.svelte.ts | 252 - src/lib/device/types.svelte.ts | 69 - src/lib/hooks/is-mobile.svelte.ts | 9 - src/lib/layout/sidebar.svelte | 234 - src/lib/services/log.svelte.ts | 31 - src/lib/state/configState.svelte.ts | 132 - src/lib/utils.ts | 13 - src/lib/views/aboutView.svelte | 69 - src/lib/views/configView.svelte | 251 - src/lib/views/homeView.svelte | 221 - src/lib/views/logsView.svelte | 66 - src/lib/views/passkeysView.svelte | 365 - src/lib/views/securityView.svelte | 97 - src/main.rs | 184 + src/routes/+layout.svelte | 6 - src/routes/+layout.ts | 5 - src/routes/+page.svelte | 68 - {src-tauri => src}/tauri.conf.json | 0 src/ui/color.rs | 69 + src/ui/components/sidebar.rs | 2 + src/ui/mod.rs | 2 + src/ui/views/about.rs | 10 + src/ui/views/config.rs | 13 + src/ui/views/home.rs | 521 ++ src/ui/views/logs.rs | 10 + src/ui/views/mod.rs | 6 + src/ui/views/passkeys.rs | 13 + src/ui/views/security.rs | 13 + static/build-configure-symbolic.svg | 2 - static/favicon.png | Bin 1571 -> 0 bytes static/svelte.svg | 1 - static/tauri.svg | 6 - static/vite.svg | 1 - svelte.config.js | 25 - tsconfig.json | 19 - vite.config.js | 57 - 258 files changed, 5111 insertions(+), 11940 deletions(-) rename src-tauri/Cargo.lock => Cargo.lock (55%) rename src-tauri/Cargo.toml => Cargo.toml (71%) delete mode 100644 biome.json delete mode 100644 components.json delete mode 100644 deno.json delete mode 100644 deno.lock delete mode 100644 package-lock.json delete mode 100644 package.json rename src-tauri/rustfmt.toml => rustfmt.toml (100%) delete mode 100644 src-tauri/build.rs delete mode 100644 src-tauri/capabilities/default.json delete mode 100644 src-tauri/src/lib.rs rename {src-tauri => src}/.gitignore (92%) delete mode 100644 src/app.css delete mode 100644 src/app.html rename {src-tauri/src => src/device}/error.rs (100%) rename {src-tauri/src => src/device}/fido/constants.rs (100%) rename {src-tauri/src => src/device}/fido/hid.rs (99%) rename {src-tauri/src => src/device}/fido/mod.rs (99%) rename {src-tauri/src => src/device}/io.rs (64%) rename {src-tauri/src => src/device}/logging.rs (100%) rename {src-tauri/src => src/device}/main.rs (100%) create mode 100644 src/device/mod.rs rename {src-tauri/src => src/device}/rescue/constants.rs (100%) rename {src-tauri/src => src/device}/rescue/mod.rs (99%) rename {src-tauri/src => src/device}/types.rs (100%) rename {src-tauri => src}/icons/128x128.png (100%) rename {src-tauri => src}/icons/128x128@2x.png (100%) rename {src-tauri => src}/icons/32x32.png (100%) rename {src-tauri => src}/icons/64x64.png (100%) rename {src-tauri => src}/icons/Square107x107Logo.png (100%) rename {src-tauri => src}/icons/Square142x142Logo.png (100%) rename {src-tauri => src}/icons/Square150x150Logo.png (100%) rename {src-tauri => src}/icons/Square284x284Logo.png (100%) rename {src-tauri => src}/icons/Square30x30Logo.png (100%) rename {src-tauri => src}/icons/Square310x310Logo.png (100%) rename {src-tauri => src}/icons/Square44x44Logo.png (100%) rename {src-tauri => src}/icons/Square71x71Logo.png (100%) rename {src-tauri => src}/icons/Square89x89Logo.png (100%) rename {src-tauri => src}/icons/StoreLogo.png (100%) rename {src-tauri => src}/icons/android/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {src-tauri => src}/icons/android/mipmap-hdpi/ic_launcher.png (100%) rename {src-tauri => src}/icons/android/mipmap-hdpi/ic_launcher_foreground.png (100%) rename {src-tauri => src}/icons/android/mipmap-hdpi/ic_launcher_round.png (100%) rename {src-tauri => src}/icons/android/mipmap-mdpi/ic_launcher.png (100%) rename {src-tauri => src}/icons/android/mipmap-mdpi/ic_launcher_foreground.png (100%) rename {src-tauri => src}/icons/android/mipmap-mdpi/ic_launcher_round.png (100%) rename {src-tauri => src}/icons/android/mipmap-xhdpi/ic_launcher.png (100%) rename {src-tauri => src}/icons/android/mipmap-xhdpi/ic_launcher_foreground.png (100%) rename {src-tauri => src}/icons/android/mipmap-xhdpi/ic_launcher_round.png (100%) rename {src-tauri => src}/icons/android/mipmap-xxhdpi/ic_launcher.png (100%) rename {src-tauri => src}/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png (100%) rename {src-tauri => src}/icons/android/mipmap-xxhdpi/ic_launcher_round.png (100%) rename {src-tauri => src}/icons/android/mipmap-xxxhdpi/ic_launcher.png (100%) rename {src-tauri => src}/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png (100%) rename {src-tauri => src}/icons/android/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename {src-tauri => src}/icons/android/values/ic_launcher_background.xml (100%) rename {src-tauri => src}/icons/icon.icns (100%) rename {src-tauri => src}/icons/icon.ico (100%) rename {src-tauri => src}/icons/icon.png (100%) rename {src-tauri => src}/icons/in.suyogtandel.picoforge-symbolic.svg (100%) rename {src-tauri => src}/icons/in.suyogtandel.picoforge.Devel.svg (100%) rename {src-tauri => src}/icons/in.suyogtandel.picoforge.source.svg (100%) rename {src-tauri => src}/icons/in.suyogtandel.picoforge.svg (100%) rename {src-tauri => src}/icons/ios/AppIcon-20x20@1x.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-20x20@2x-1.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-20x20@2x.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-20x20@3x.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-29x29@1x.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-29x29@2x-1.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-29x29@2x.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-29x29@3x.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-40x40@1x.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-40x40@2x-1.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-40x40@2x.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-40x40@3x.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-512@2x.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-60x60@2x.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-60x60@3x.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-76x76@1x.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-76x76@2x.png (100%) rename {src-tauri => src}/icons/ios/AppIcon-83.5x83.5@2x.png (100%) delete mode 100644 src/lib/components/device/DeviceNotSupported.svelte delete mode 100644 src/lib/components/device/NoDeviceStatus.svelte delete mode 100644 src/lib/components/dialogs/AuthDialog.svelte delete mode 100644 src/lib/components/dialogs/authPinDialog.svelte delete mode 100644 src/lib/components/dialogs/deleteCredentialDialog.svelte delete mode 100644 src/lib/components/dialogs/messageDialog.svelte delete mode 100644 src/lib/components/dialogs/minPinDialog.svelte delete mode 100644 src/lib/components/dialogs/setPinDialog.svelte delete mode 100644 src/lib/components/ui/alert-dialog/alert-dialog-action.svelte delete mode 100644 src/lib/components/ui/alert-dialog/alert-dialog-cancel.svelte delete mode 100644 src/lib/components/ui/alert-dialog/alert-dialog-content.svelte delete mode 100644 src/lib/components/ui/alert-dialog/alert-dialog-description.svelte delete mode 100644 src/lib/components/ui/alert-dialog/alert-dialog-footer.svelte delete mode 100644 src/lib/components/ui/alert-dialog/alert-dialog-header.svelte delete mode 100644 src/lib/components/ui/alert-dialog/alert-dialog-overlay.svelte delete mode 100644 src/lib/components/ui/alert-dialog/alert-dialog-portal.svelte delete mode 100644 src/lib/components/ui/alert-dialog/alert-dialog-title.svelte delete mode 100644 src/lib/components/ui/alert-dialog/alert-dialog-trigger.svelte delete mode 100644 src/lib/components/ui/alert-dialog/alert-dialog.svelte delete mode 100644 src/lib/components/ui/alert-dialog/index.ts delete mode 100644 src/lib/components/ui/alert/alert-description.svelte delete mode 100644 src/lib/components/ui/alert/alert-title.svelte delete mode 100644 src/lib/components/ui/alert/alert.svelte delete mode 100644 src/lib/components/ui/alert/index.ts delete mode 100644 src/lib/components/ui/badge/badge.svelte delete mode 100644 src/lib/components/ui/badge/index.ts delete mode 100644 src/lib/components/ui/button/button.svelte delete mode 100644 src/lib/components/ui/button/index.ts delete mode 100644 src/lib/components/ui/card/card-action.svelte delete mode 100644 src/lib/components/ui/card/card-content.svelte delete mode 100644 src/lib/components/ui/card/card-description.svelte delete mode 100644 src/lib/components/ui/card/card-footer.svelte delete mode 100644 src/lib/components/ui/card/card-header.svelte delete mode 100644 src/lib/components/ui/card/card-title.svelte delete mode 100644 src/lib/components/ui/card/card.svelte delete mode 100644 src/lib/components/ui/card/index.ts delete mode 100644 src/lib/components/ui/dialog/dialog-close.svelte delete mode 100644 src/lib/components/ui/dialog/dialog-content.svelte delete mode 100644 src/lib/components/ui/dialog/dialog-description.svelte delete mode 100644 src/lib/components/ui/dialog/dialog-footer.svelte delete mode 100644 src/lib/components/ui/dialog/dialog-header.svelte delete mode 100644 src/lib/components/ui/dialog/dialog-overlay.svelte delete mode 100644 src/lib/components/ui/dialog/dialog-portal.svelte delete mode 100644 src/lib/components/ui/dialog/dialog-title.svelte delete mode 100644 src/lib/components/ui/dialog/dialog-trigger.svelte delete mode 100644 src/lib/components/ui/dialog/dialog.svelte delete mode 100644 src/lib/components/ui/dialog/index.ts delete mode 100644 src/lib/components/ui/drawer/drawer-close.svelte delete mode 100644 src/lib/components/ui/drawer/drawer-content.svelte delete mode 100644 src/lib/components/ui/drawer/drawer-description.svelte delete mode 100644 src/lib/components/ui/drawer/drawer-footer.svelte delete mode 100644 src/lib/components/ui/drawer/drawer-header.svelte delete mode 100644 src/lib/components/ui/drawer/drawer-nested.svelte delete mode 100644 src/lib/components/ui/drawer/drawer-overlay.svelte delete mode 100644 src/lib/components/ui/drawer/drawer-portal.svelte delete mode 100644 src/lib/components/ui/drawer/drawer-title.svelte delete mode 100644 src/lib/components/ui/drawer/drawer-trigger.svelte delete mode 100644 src/lib/components/ui/drawer/drawer.svelte delete mode 100644 src/lib/components/ui/drawer/index.ts delete mode 100644 src/lib/components/ui/input/index.ts delete mode 100644 src/lib/components/ui/input/input.svelte delete mode 100644 src/lib/components/ui/label/index.ts delete mode 100644 src/lib/components/ui/label/label.svelte delete mode 100644 src/lib/components/ui/popover/index.ts delete mode 100644 src/lib/components/ui/popover/popover-close.svelte delete mode 100644 src/lib/components/ui/popover/popover-content.svelte delete mode 100644 src/lib/components/ui/popover/popover-portal.svelte delete mode 100644 src/lib/components/ui/popover/popover-trigger.svelte delete mode 100644 src/lib/components/ui/popover/popover.svelte delete mode 100644 src/lib/components/ui/progress/index.ts delete mode 100644 src/lib/components/ui/progress/progress.svelte delete mode 100644 src/lib/components/ui/scroll-area/index.ts delete mode 100644 src/lib/components/ui/scroll-area/scroll-area-scrollbar.svelte delete mode 100644 src/lib/components/ui/scroll-area/scroll-area.svelte delete mode 100644 src/lib/components/ui/select/index.ts delete mode 100644 src/lib/components/ui/select/select-content.svelte delete mode 100644 src/lib/components/ui/select/select-group-heading.svelte delete mode 100644 src/lib/components/ui/select/select-group.svelte delete mode 100644 src/lib/components/ui/select/select-item.svelte delete mode 100644 src/lib/components/ui/select/select-label.svelte delete mode 100644 src/lib/components/ui/select/select-portal.svelte delete mode 100644 src/lib/components/ui/select/select-scroll-down-button.svelte delete mode 100644 src/lib/components/ui/select/select-scroll-up-button.svelte delete mode 100644 src/lib/components/ui/select/select-separator.svelte delete mode 100644 src/lib/components/ui/select/select-trigger.svelte delete mode 100644 src/lib/components/ui/select/select.svelte delete mode 100644 src/lib/components/ui/separator/index.ts delete mode 100644 src/lib/components/ui/separator/separator.svelte delete mode 100644 src/lib/components/ui/sheet/index.ts delete mode 100644 src/lib/components/ui/sheet/sheet-close.svelte delete mode 100644 src/lib/components/ui/sheet/sheet-content.svelte delete mode 100644 src/lib/components/ui/sheet/sheet-description.svelte delete mode 100644 src/lib/components/ui/sheet/sheet-footer.svelte delete mode 100644 src/lib/components/ui/sheet/sheet-header.svelte delete mode 100644 src/lib/components/ui/sheet/sheet-overlay.svelte delete mode 100644 src/lib/components/ui/sheet/sheet-portal.svelte delete mode 100644 src/lib/components/ui/sheet/sheet-title.svelte delete mode 100644 src/lib/components/ui/sheet/sheet-trigger.svelte delete mode 100644 src/lib/components/ui/sheet/sheet.svelte delete mode 100644 src/lib/components/ui/sidebar/constants.ts delete mode 100644 src/lib/components/ui/sidebar/context.svelte.ts delete mode 100644 src/lib/components/ui/sidebar/index.ts delete mode 100644 src/lib/components/ui/sidebar/sidebar-content.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-footer.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-group-action.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-group-content.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-group-label.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-group.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-header.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-input.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-inset.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-menu-action.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-menu-badge.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-menu-button.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-menu-item.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-menu-skeleton.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-menu-sub-button.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-menu-sub-item.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-menu-sub.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-menu.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-provider.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-rail.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-separator.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar-trigger.svelte delete mode 100644 src/lib/components/ui/sidebar/sidebar.svelte delete mode 100644 src/lib/components/ui/skeleton/index.ts delete mode 100644 src/lib/components/ui/skeleton/skeleton.svelte delete mode 100644 src/lib/components/ui/slider/index.ts delete mode 100644 src/lib/components/ui/slider/slider.svelte delete mode 100644 src/lib/components/ui/spinner/index.ts delete mode 100644 src/lib/components/ui/spinner/spinner.svelte delete mode 100644 src/lib/components/ui/switch/index.ts delete mode 100644 src/lib/components/ui/switch/switch.svelte delete mode 100644 src/lib/components/ui/tooltip/index.ts delete mode 100644 src/lib/components/ui/tooltip/tooltip-content.svelte delete mode 100644 src/lib/components/ui/tooltip/tooltip-portal.svelte delete mode 100644 src/lib/components/ui/tooltip/tooltip-provider.svelte delete mode 100644 src/lib/components/ui/tooltip/tooltip-trigger.svelte delete mode 100644 src/lib/components/ui/tooltip/tooltip.svelte delete mode 100644 src/lib/device/constants.svelte.ts delete mode 100644 src/lib/device/manager.svelte.ts delete mode 100644 src/lib/device/types.svelte.ts delete mode 100644 src/lib/hooks/is-mobile.svelte.ts delete mode 100644 src/lib/layout/sidebar.svelte delete mode 100644 src/lib/services/log.svelte.ts delete mode 100644 src/lib/state/configState.svelte.ts delete mode 100644 src/lib/utils.ts delete mode 100644 src/lib/views/aboutView.svelte delete mode 100644 src/lib/views/configView.svelte delete mode 100644 src/lib/views/homeView.svelte delete mode 100644 src/lib/views/logsView.svelte delete mode 100644 src/lib/views/passkeysView.svelte delete mode 100644 src/lib/views/securityView.svelte create mode 100644 src/main.rs delete mode 100644 src/routes/+layout.svelte delete mode 100644 src/routes/+layout.ts delete mode 100644 src/routes/+page.svelte rename {src-tauri => src}/tauri.conf.json (100%) create mode 100644 src/ui/color.rs create mode 100644 src/ui/components/sidebar.rs create mode 100644 src/ui/mod.rs create mode 100644 src/ui/views/about.rs create mode 100644 src/ui/views/config.rs create mode 100644 src/ui/views/home.rs create mode 100644 src/ui/views/logs.rs create mode 100644 src/ui/views/mod.rs create mode 100644 src/ui/views/passkeys.rs create mode 100644 src/ui/views/security.rs delete mode 100644 static/build-configure-symbolic.svg delete mode 100644 static/favicon.png delete mode 100644 static/svelte.svg delete mode 100644 static/tauri.svg delete mode 100644 static/vite.svg delete mode 100644 svelte.config.js delete mode 100644 tsconfig.json delete mode 100644 vite.config.js diff --git a/src-tauri/Cargo.lock b/Cargo.lock similarity index 55% rename from src-tauri/Cargo.lock rename to Cargo.lock index fcce924..6ef66ce 100644 --- a/src-tauri/Cargo.lock +++ b/Cargo.lock @@ -17,6 +17,20 @@ dependencies = [ "cfg-if", "cipher", "cpufeatures", + "zeroize", +] + +[[package]] +name = "ahash" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" +dependencies = [ + "cfg-if", + "const-random", + "once_cell", + "version_check", + "zerocopy", ] [[package]] @@ -29,18 +43,21 @@ dependencies = [ ] [[package]] -name = "alloc-no-stdlib" -version = "2.0.4" +name = "aligned" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" +checksum = "ee4508988c62edf04abd8d92897fca0c2995d907ce1dfeaf369dac3716a40685" +dependencies = [ + "as-slice", +] [[package]] -name = "alloc-stdlib" -version = "0.2.2" +name = "aligned-vec" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +checksum = "dc890384c8602f339876ded803c97ad529f3842aba97f6392b3dba0dd171769b" dependencies = [ - "alloc-no-stdlib", + "equator", ] [[package]] @@ -58,6 +75,21 @@ version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" +[[package]] +name = "ar_archive_writer" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb93bbb63b9c227414f6eb3a0adfddca591a8ce1e9b60661bb08969b87e340b" +dependencies = [ + "object", +] + +[[package]] +name = "arbitrary" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" + [[package]] name = "arc-swap" version = "1.8.0" @@ -67,6 +99,103 @@ dependencies = [ "rustversion", ] +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "as-slice" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516b6b4f0e40d50dcda9365d53964ec74560ad4284da2e7fc97122cd83174516" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "ash" +version = "0.38.0+1.3.281" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" +dependencies = [ + "libloading", +] + +[[package]] +name = "ash-window" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52bca67b61cb81e5553babde81b8211f713cb6db79766f80168f3e5f40ea6c82" +dependencies = [ + "ash", + "raw-window-handle", + "raw-window-metal", +] + +[[package]] +name = "ashpd" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f3f79755c74fd155000314eb349864caa787c6592eace6c6882dad873d9c39" +dependencies = [ + "async-fs", + "async-net", + "enumflags2", + "futures-channel", + "futures-util", + "rand 0.9.2", + "serde", + "serde_repr", + "url", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.32.10", + "zbus", +] + +[[package]] +name = "ashpd" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "618a409b91d5265798a99e3d1d0b226911605e581c4e7255e83c1e397b172bce" +dependencies = [ + "async-fs", + "async-net", + "enumflags2", + "futures-channel", + "futures-util", + "rand 0.9.2", + "serde", + "serde_repr", + "url", + "zbus", +] + [[package]] name = "asn1-rs" version = "0.7.1" @@ -76,10 +205,10 @@ dependencies = [ "asn1-rs-derive", "asn1-rs-impl", "displaydoc", - "nom", + "nom 7.1.3", "num-traits", "rusticata-macros", - "thiserror 2.0.17", + "thiserror 2.0.18", "time", ] @@ -112,12 +241,23 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532" dependencies = [ - "event-listener", + "event-listener 5.4.1", "event-listener-strategy", "futures-core", "pin-project-lite", ] +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener 2.5.3", + "futures-core", +] + [[package]] name = "async-channel" version = "2.5.0" @@ -130,6 +270,18 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-compression" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d10e4f991a553474232bc0a31799f6d24b034a84c0971d80d2e2f78b2e576e40" +dependencies = [ + "compression-codecs", + "compression-core", + "futures-io", + "pin-project-lite", +] + [[package]] name = "async-executor" version = "1.13.3" @@ -138,12 +290,38 @@ checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8" dependencies = [ "async-task", "concurrent-queue", - "fastrand", - "futures-lite", + "fastrand 2.3.0", + "futures-lite 2.6.1", "pin-project-lite", "slab", ] +[[package]] +name = "async-fs" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5" +dependencies = [ + "async-lock", + "blocking", + "futures-lite 2.6.1", +] + +[[package]] +name = "async-global-executor" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +dependencies = [ + "async-channel 2.5.0", + "async-executor", + "async-io", + "async-lock", + "blocking", + "futures-lite 2.6.1", + "once_cell", +] + [[package]] name = "async-io" version = "2.6.0" @@ -154,10 +332,10 @@ dependencies = [ "cfg-if", "concurrent-queue", "futures-io", - "futures-lite", + "futures-lite 2.6.1", "parking", "polling", - "rustix", + "rustix 1.1.3", "slab", "windows-sys 0.61.2", ] @@ -168,27 +346,38 @@ version = "3.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" dependencies = [ - "event-listener", + "event-listener 5.4.1", "event-listener-strategy", "pin-project-lite", ] +[[package]] +name = "async-net" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io", + "blocking", + "futures-lite 2.6.1", +] + [[package]] name = "async-process" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75" dependencies = [ - "async-channel", + "async-channel 2.5.0", "async-io", "async-lock", "async-signal", "async-task", "blocking", "cfg-if", - "event-listener", - "futures-lite", - "rustix", + "event-listener 5.4.1", + "futures-lite 2.6.1", + "rustix 1.1.3", ] [[package]] @@ -214,12 +403,39 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix", + "rustix 1.1.3", "signal-hook-registry", "slab", "windows-sys 0.61.2", ] +[[package]] +name = "async-std" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b" +dependencies = [ + "async-channel 1.9.0", + "async-global-executor", + "async-io", + "async-lock", + "async-process", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite 2.6.1", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + [[package]] name = "async-task" version = "4.7.1" @@ -238,27 +454,23 @@ dependencies = [ ] [[package]] -name = "atk" -version = "0.18.2" +name = "async_zip" +version = "0.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241b621213072e993be4f6f3a9e4b45f65b7e6faad43001be957184b7bb1824b" +checksum = "00b9f7252833d5ed4b00aa9604b563529dd5e11de9c23615de2dcdf91eb87b52" dependencies = [ - "atk-sys", - "glib", - "libc", + "async-compression", + "crc32fast", + "futures-lite 2.6.1", + "pin-project", + "thiserror 1.0.69", ] [[package]] -name = "atk-sys" -version = "0.18.2" +name = "atomic" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] +checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" [[package]] name = "atomic-waker" @@ -273,10 +485,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] -name = "base64" -version = "0.21.7" +name = "av-scenechange" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "0f321d77c20e19b92c39e7471cf986812cbb46659d2af674adc4331ef3f18394" +dependencies = [ + "aligned", + "anyhow", + "arg_enum_proc_macro", + "arrayvec", + "log", + "num-rational", + "num-traits", + "pastey", + "rayon", + "thiserror 2.0.18", + "v_frame", + "y4m", +] + +[[package]] +name = "av1-grain" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cfddb07216410377231960af4fcab838eaa12e013417781b78bd95ee22077f8" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom 8.0.0", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47c8fbc0f831f4519fe8b810b6a7a91410ec83031b8233f730a0480029f6a23f" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "base62" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1adf9755786e27479693dedd3271691a92b5e242ab139cacb9fb8e7fb5381111" [[package]] name = "base64" @@ -284,6 +539,47 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "bindgen" +version = "0.71.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" +dependencies = [ + "bitflags 2.10.0", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash 2.1.1", + "shlex", + "syn 2.0.114", +] + +[[package]] +name = "bit-set" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" + +[[package]] +name = "bit_field" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6" + [[package]] name = "bitflags" version = "1.3.2" @@ -295,10 +591,80 @@ name = "bitflags" version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" + +[[package]] +name = "bitstream-io" +version = "4.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60d4bd9d1db2c6bdf285e223a7fa369d5ce98ec767dec949c6ca62863ce61757" dependencies = [ - "serde_core", + "core2", ] +[[package]] +name = "blade-graphics" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4deb8f595ce7f00dee3543ebf6fd9a20ea86fc421ab79600dac30876250bdae" +dependencies = [ + "ash", + "ash-window", + "bitflags 2.10.0", + "bytemuck", + "codespan-reporting", + "glow", + "gpu-alloc", + "gpu-alloc-ash", + "hidden-trait", + "js-sys", + "khronos-egl", + "libloading", + "log", + "mint", + "naga", + "objc2", + "objc2-app-kit", + "objc2-core-foundation", + "objc2-foundation", + "objc2-metal", + "objc2-quartz-core", + "objc2-ui-kit", + "once_cell", + "raw-window-handle", + "slab", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "blade-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27142319e2f4c264581067eaccb9f80acccdde60d8b4bf57cc50cd3152f109ca" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "blade-util" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6be3a82c001ba7a17b6f8e413ede5d1004e6047213f8efaf0ffc15b5c4904c" +dependencies = [ + "blade-graphics", + "bytemuck", + "log", + "profiling", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + [[package]] name = "block-buffer" version = "0.10.4" @@ -332,33 +698,28 @@ version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" dependencies = [ - "async-channel", + "async-channel 2.5.0", "async-task", "futures-io", - "futures-lite", + "futures-lite 2.6.1", "piper", ] [[package]] -name = "brotli" -version = "8.0.2" +name = "bstr" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" +checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", + "memchr", + "serde", ] [[package]] -name = "brotli-decompressor" -version = "5.0.0" +name = "built" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] +checksum = "f4ad8f11f288f48ca24471bbd51ac257aaeaaa07adae295591266b792902ae64" [[package]] name = "bumpalo" @@ -371,6 +732,20 @@ name = "bytemuck" version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] [[package]] name = "byteorder" @@ -378,80 +753,42 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" -dependencies = [ - "serde", -] [[package]] -name = "cairo-rs" -version = "0.18.5" +name = "calloop" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ "bitflags 2.10.0", - "cairo-sys-rs", - "glib", - "libc", - "once_cell", + "log", + "polling", + "rustix 0.38.44", + "slab", "thiserror 1.0.69", ] [[package]] -name = "cairo-sys-rs" -version = "0.18.2" +name = "calloop-wayland-source" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "camino" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48" -dependencies = [ - "serde_core", -] - -[[package]] -name = "cargo-platform" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror 2.0.17", -] - -[[package]] -name = "cargo_toml" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77" -dependencies = [ - "serde", - "toml 0.9.11+spec-1.1.0", + "calloop", + "rustix 0.38.44", + "wayland-backend", + "wayland-client", ] [[package]] @@ -464,40 +801,42 @@ dependencies = [ ] [[package]] -name = "cc" -version = "1.2.52" +name = "cbindgen" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3" +checksum = "eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff" +dependencies = [ + "heck 0.4.1", + "indexmap", + "log", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 2.0.114", + "tempfile", + "toml 0.8.23", +] + +[[package]] +name = "cc" +version = "1.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583" dependencies = [ "find-msvc-tools", + "jobserver", + "libc", "shlex", ] [[package]] -name = "cesu8" -version = "1.1.0" +name = "cexpr" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cfb" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ - "byteorder", - "fnv", - "uuid", -] - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", + "nom 7.1.3", ] [[package]] @@ -507,14 +846,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] -name = "chrono" -version = "0.4.42" +name = "cfg_aliases" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "cgl" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" +dependencies = [ + "libc", +] + +[[package]] +name = "chrono" +version = "0.4.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118" dependencies = [ "iana-time-zone", + "js-sys", "num-traits", - "serde", + "wasm-bindgen", "windows-link 0.2.1", ] @@ -553,18 +908,125 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", + "zeroize", ] [[package]] -name = "combine" -version = "4.6.7" +name = "clang-sys" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ - "bytes", + "glob", + "libc", + "libloading", +] + +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation 0.1.2", + "core-foundation 0.9.4", + "core-graphics 0.23.2", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" +dependencies = [ + "bitflags 2.10.0", + "block", + "cocoa-foundation 0.2.0", + "core-foundation 0.10.0", + "core-graphics 0.24.0", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" +dependencies = [ + "bitflags 2.10.0", + "block", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", + "libc", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81" +dependencies = [ + "serde", + "termcolor", + "unicode-width 0.2.2", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "command-fds" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f849b92c694fe237ecd8fafd1ba0df7ae0d45c1df6daeb7f68ed4220d51640bd" +dependencies = [ + "nix 0.30.1", + "thiserror 2.0.18", +] + +[[package]] +name = "compression-codecs" +version = "0.4.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00828ba6fd27b45a448e57dbfe84f1029d4c9f26b368157e9a448a5f49a2ec2a" +dependencies = [ + "compression-core", + "deflate64", + "flate2", "memchr", ] +[[package]] +name = "compression-core" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" + [[package]] name = "concurrent-queue" version = "2.5.0" @@ -574,6 +1036,26 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.17", + "once_cell", + "tiny-keccak", +] + [[package]] name = "convert_case" version = "0.4.0" @@ -581,20 +1063,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] -name = "cookie" -version = "0.18.1" +name = "core-foundation" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "time", - "version_check", + "core-foundation-sys", + "libc", ] [[package]] name = "core-foundation" -version = "0.10.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" dependencies = [ "core-foundation-sys", "libc", @@ -606,6 +1088,19 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types", + "libc", +] + [[package]] name = "core-graphics" version = "0.24.0" @@ -613,12 +1108,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" dependencies = [ "bitflags 2.10.0", - "core-foundation", - "core-graphics-types", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", "foreign-types", "libc", ] +[[package]] +name = "core-graphics" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97" +dependencies = [ + "bitflags 2.10.0", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-helmer-fork" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32eb7c354ae9f6d437a6039099ce7ecd049337a8109b23d73e48e8ffba8e9cd5" +dependencies = [ + "bitflags 2.10.0", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "libc", +] + [[package]] name = "core-graphics-types" version = "0.2.0" @@ -626,10 +1158,89 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ "bitflags 2.10.0", - "core-foundation", + "core-foundation 0.10.0", "libc", ] +[[package]] +name = "core-graphics2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e4583956b9806b69f73fcb23aee05eb3620efc282972f08f6a6db7504f8334d" +dependencies = [ + "bitflags 2.10.0", + "block", + "cfg-if", + "core-foundation 0.10.0", + "libc", +] + +[[package]] +name = "core-text" +version = "21.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fce32d657e17d6e4a8e70fe2ae6875218015f320620a78e5949d228bc76622bd" +dependencies = [ + "core-foundation 0.10.0", + "core-graphics 0.25.0", + "foreign-types", +] + +[[package]] +name = "core-video" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d45e71d5be22206bed53c3c3cb99315fc4c3d31b8963808c6bc4538168c4f8ef" +dependencies = [ + "block", + "core-foundation 0.10.0", + "core-graphics2", + "io-surface", + "libc", + "metal", +] + +[[package]] +name = "core2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] + +[[package]] +name = "core_maths" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77745e017f5edba1a9c1d854f6f3a52dac8a12dd5af5d2f54aecf61e43d80d30" +dependencies = [ + "libm", +] + +[[package]] +name = "cosmic-text" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da46a9d5a8905cc538a4a5bceb6a4510de7a51049c5588c0114efce102bcbbe8" +dependencies = [ + "bitflags 2.10.0", + "fontdb 0.16.2", + "log", + "rangemap", + "rustc-hash 1.1.0", + "rustybuzz 0.14.1", + "self_cell", + "smol_str", + "swash", + "sys-locale", + "ttf-parser 0.21.1", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + [[package]] name = "cpufeatures" version = "0.2.17" @@ -649,10 +1260,29 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.15" +name = "crossbeam-deque" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" dependencies = [ "crossbeam-utils", ] @@ -676,36 +1306,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", + "rand_core 0.6.4", "typenum", ] -[[package]] -name = "cssparser" -version = "0.29.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa", - "matches", - "phf 0.10.1", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.109", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.114", -] - [[package]] name = "ctap-hid-fido2" version = "3.5.8" @@ -714,7 +1318,7 @@ checksum = "aab54a72e056ad648b432faab0782512a989074a0e15d7c01e24825b22b0d033" dependencies = [ "aes", "anyhow", - "base64 0.22.1", + "base64", "byteorder", "cbc", "ciborium", @@ -724,55 +1328,26 @@ dependencies = [ "pad", "rand 0.9.2", "ring", - "strum", - "strum_macros", + "strum 0.27.2", + "strum_macros 0.27.2", "x509-parser", ] [[package]] name = "ctor" -version = "0.2.9" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" +checksum = "ec09e802f5081de6157da9a75701d6c713d8dc3ba52571fd4bd25f412644e8a6" dependencies = [ - "quote", - "syn 2.0.114", + "ctor-proc-macro", + "dtor", ] [[package]] -name = "darling" -version = "0.21.3" +name = "ctor-proc-macro" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.114", -] - -[[package]] -name = "darling_macro" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.114", -] +checksum = "e2931af7e13dc045d8e9d26afccc6fa115d64e115c9c84b1166288b46f6782c2" [[package]] name = "data-encoding" @@ -780,6 +1355,18 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea" +[[package]] +name = "data-url" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" + +[[package]] +name = "deflate64" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26bf8fc351c5ed29b5c2f0cbbac1b209b74f60ecd62e675a998df72c49af5204" + [[package]] name = "der-parser" version = "10.0.0" @@ -788,7 +1375,7 @@ checksum = "07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6" dependencies = [ "asn1-rs", "displaydoc", - "nom", + "nom 7.1.3", "num-bigint", "num-traits", "rusticata-macros", @@ -801,7 +1388,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" dependencies = [ "powerfmt", - "serde_core", ] [[package]] @@ -853,6 +1439,7 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", + "subtle", ] [[package]] @@ -861,7 +1448,25 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f5094c54661b38d03bd7e50df373292118db60b585c08a411c6d840017fe7d" dependencies = [ - "dirs-sys", + "dirs-sys 0.5.0", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", ] [[package]] @@ -870,7 +1475,30 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" dependencies = [ - "dirs-sys", + "dirs-sys 0.5.0", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users 0.4.6", + "winapi", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users 0.4.6", + "windows-sys 0.48.0", ] [[package]] @@ -881,7 +1509,7 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", "option-ext", - "redox_users", + "redox_users 0.5.2", "windows-sys 0.61.2", ] @@ -913,51 +1541,34 @@ dependencies = [ ] [[package]] -name = "dlopen2" -version = "0.8.2" +name = "dlib" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2c5bd4158e66d1e215c49b837e11d62f3267b30c92f1d171c4d3105e3dc4d4" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "dlopen2_derive", - "libc", - "once_cell", - "winapi", + "libloading", ] [[package]] -name = "dlopen2_derive" -version = "0.4.3" +name = "downcast-rs" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dtor" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97cbdf2ad6846025e8e25df05171abfb30e3ababa12ee0a0e44b9bbe570633a8" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.114", + "dtor-proc-macro", ] [[package]] -name = "dpi" -version = "0.1.2" +name = "dtor-proc-macro" +version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" -dependencies = [ - "serde", -] - -[[package]] -name = "dtoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590" - -[[package]] -name = "dtoa-short" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" -dependencies = [ - "dtoa", -] +checksum = "7454e41ff9012c00d53cf7f475c5e3afa3b91b7c90568495495e8d9bf47a1055" [[package]] name = "dunce" @@ -965,12 +1576,30 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" +[[package]] +name = "dwrote" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b35532432acc8b19ceed096e35dfa088d3ea037fe4f3c085f1f97f33b4d02" +dependencies = [ + "lazy_static", + "libc", + "winapi", + "wio", +] + [[package]] name = "dyn-clone" version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + [[package]] name = "embed-resource" version = "3.0.6" @@ -985,12 +1614,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "embed_plist" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" - [[package]] name = "encoding_rs" version = "0.8.35" @@ -1006,6 +1629,26 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099" +[[package]] +name = "enum-iterator" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4549325971814bda7a44061bf3fe7e487d447cba01e4220a4b454d630d7a016" +dependencies = [ + "enum-iterator-derive", +] + +[[package]] +name = "enum-iterator-derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685adfa4d6f3d765a26bc5dbc936577de9abf756c1feeb3089b01dd395034842" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + [[package]] name = "enumflags2" version = "0.7.12" @@ -1027,6 +1670,26 @@ dependencies = [ "syn 2.0.114", ] +[[package]] +name = "equator" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc" +dependencies = [ + "equator-macro", +] + +[[package]] +name = "equator-macro" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + [[package]] name = "equivalent" version = "1.0.2" @@ -1054,6 +1717,31 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "etagere" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc89bf99e5dc15954a60f707c1e09d7540e5cd9af85fa75caa0b510bc08c5342" +dependencies = [ + "euclid", + "svg_fmt", +] + +[[package]] +name = "euclid" +version = "0.22.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df61bf483e837f88d5c2291dcf55c67be7e676b3a51acc48db3a7b163b91ed63" +dependencies = [ + "num-traits", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + [[package]] name = "event-listener" version = "5.4.1" @@ -1071,16 +1759,60 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" dependencies = [ - "event-listener", + "event-listener 5.4.1", "pin-project-lite", ] +[[package]] +name = "exr" +version = "1.74.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4300e043a56aa2cb633c01af81ca8f699a321879a7854d3896a0ba89056363be" +dependencies = [ + "bit_field", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + [[package]] name = "fastrand" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +[[package]] +name = "fax" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab" +dependencies = [ + "fax_derive", +] + +[[package]] +name = "fax_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + [[package]] name = "fdeflate" version = "0.3.7" @@ -1091,20 +1823,32 @@ dependencies = [ ] [[package]] -name = "field-offset" -version = "0.3.6" +name = "filedescriptor" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +checksum = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d" dependencies = [ - "memoffset", - "rustc_version", + "libc", + "thiserror 1.0.69", + "winapi", +] + +[[package]] +name = "filetime" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db" +dependencies = [ + "cfg-if", + "libc", + "libredox", ] [[package]] name = "find-msvc-tools" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41" +checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db" [[package]] name = "flate2" @@ -1116,12 +1860,103 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" + +[[package]] +name = "float-ord" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d" + +[[package]] +name = "float_next_after" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" + +[[package]] +name = "fluent-uri" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "flume" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "spin", +] + [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + +[[package]] +name = "font-types" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a654f404bbcbd48ea58c617c2993ee91d1cb63727a37bf2323a4edeed1b8c5" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "fontconfig-parser" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbc773e24e02d4ddd8395fd30dc147524273a83e54e0f312d986ea30de5f5646" +dependencies = [ + "roxmltree", +] + +[[package]] +name = "fontdb" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2", + "slotmap", + "tinyvec", + "ttf-parser 0.20.0", +] + +[[package]] +name = "fontdb" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "457e789b3d1202543297a350643cf459f836cade38934e7a4cf6a39e7cde2905" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2", + "slotmap", + "tinyvec", + "ttf-parser 0.25.1", +] + [[package]] name = "foreign-types" version = "0.5.0" @@ -1158,6 +1993,26 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "freetype-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7edc5b9669349acfda99533e9e0bcf26a51862ab43b08ee7745c55d28eb134" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + [[package]] name = "futf" version = "0.1.5" @@ -1168,6 +2023,21 @@ dependencies = [ "new_debug_unreachable", ] +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + [[package]] name = "futures-channel" version = "0.3.31" @@ -1175,6 +2045,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -1200,13 +2071,28 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + [[package]] name = "futures-lite" version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" dependencies = [ - "fastrand", + "fastrand 2.3.0", "futures-core", "futures-io", "parking", @@ -1242,6 +2128,7 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ + "futures-channel", "futures-core", "futures-io", "futures-macro", @@ -1253,114 +2140,6 @@ dependencies = [ "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "gdk" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f245958c627ac99d8e529166f9823fb3b838d1d41fd2b297af3075093c2691" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", - "once_cell", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk-sys" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gdkwayland-sys" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140071d506d223f7572b9f09b5e155afbd77428cd5cc7af8f2694c41d98dfe69" -dependencies = [ - "gdk-sys", - "glib-sys", - "gobject-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gdkx11" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3caa00e14351bebbc8183b3c36690327eb77c49abc2268dd4bd36b856db3fbfe" -dependencies = [ - "gdk", - "gdkx11-sys", - "gio", - "glib", - "libc", - "x11", -] - -[[package]] -name = "gdkx11-sys" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e7445fe01ac26f11601db260dd8608fe172514eb63b3b5e261ea6b0f4428d" -dependencies = [ - "gdk-sys", - "glib-sys", - "libc", - "system-deps", - "x11", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -1372,14 +2151,13 @@ dependencies = [ ] [[package]] -name = "getrandom" -version = "0.1.16" +name = "gethostname" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8" dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "rustix 1.1.3", + "windows-link 0.2.1", ] [[package]] @@ -1389,8 +2167,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", + "js-sys", "libc", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", + "wasm-bindgen", ] [[package]] @@ -1400,88 +2180,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi", "wasip2", + "wasm-bindgen", ] [[package]] -name = "gio" -version = "0.18.4" +name = "gif" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" +checksum = "f5df2ba84018d80c213569363bdcd0c64e6933c67fe4c1d60ecf822971a3c35e" dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "once_cell", - "pin-project-lite", - "smallvec", - "thiserror 1.0.69", -] - -[[package]] -name = "gio-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi", -] - -[[package]] -name = "glib" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" -dependencies = [ - "bitflags 2.10.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "once_cell", - "smallvec", - "thiserror 1.0.69", -] - -[[package]] -name = "glib-macros" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" -dependencies = [ - "heck 0.4.1", - "proc-macro-crate 2.0.2", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.114", -] - -[[package]] -name = "glib-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" -dependencies = [ - "libc", - "system-deps", + "color_quant", + "weezl", ] [[package]] @@ -1491,68 +2204,428 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] -name = "gobject-sys" -version = "0.18.0" +name = "globset" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3" dependencies = [ - "glib-sys", - "libc", - "system-deps", + "aho-corasick", + "bstr", + "log", + "regex-automata", + "regex-syntax", ] [[package]] -name = "gtk" -version = "0.18.2" +name = "globwalk" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56fb197bfc42bd5d2751f4f017d44ff59fbb58140c6b49f9b3b2bdab08506a" +checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" +dependencies = [ + "bitflags 1.3.2", + "ignore", + "walkdir", +] + +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" dependencies = [ - "atk", - "cairo-rs", - "field-offset", "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "pango", - "pkg-config", + "futures-core", + "js-sys", + "wasm-bindgen", ] [[package]] -name = "gtk-sys" -version = "0.18.2" +name = "glow" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414" +checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08" dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps", + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", ] [[package]] -name = "gtk3-macros" -version = "0.18.2" +name = "gpu-alloc" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ff3c5b21f14f0736fed6dcfc0bfb4225ebf5725f3c0209edeec181e4d73e9d" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.10.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-ash" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbda7a18a29bc98c2e0de0435c347df935bf59489935d0cbd0b73f1679b6f79a" +dependencies = [ + "ash", + "gpu-alloc-types", + "tinyvec", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.10.0", +] + +[[package]] +name = "gpui" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "979b45cfa6ec723b6f42330915a1b3769b930d02b2d505f9697f8ca602bee707" +dependencies = [ + "anyhow", + "as-raw-xcb-connection", + "ashpd 0.11.1", + "async-task", + "bindgen", + "blade-graphics", + "blade-macros", + "blade-util", + "block", + "bytemuck", + "calloop", + "calloop-wayland-source", + "cbindgen", + "cocoa 0.26.0", + "cocoa-foundation 0.2.0", + "core-foundation 0.10.0", + "core-foundation-sys", + "core-graphics 0.24.0", + "core-text", + "core-video", + "cosmic-text", + "ctor", + "derive_more 0.99.20", + "embed-resource", + "etagere", + "filedescriptor", + "flume", + "foreign-types", + "futures", + "gpui-macros", + "gpui_collections", + "gpui_http_client", + "gpui_media", + "gpui_refineable", + "gpui_semantic_version", + "gpui_sum_tree", + "gpui_util", + "gpui_util_macros", + "image", + "inventory", + "itertools 0.14.0", + "libc", + "log", + "lyon", + "metal", + "naga", + "num_cpus", + "objc", + "oo7", + "open", + "parking", + "parking_lot", + "pathfinder_geometry", + "pin-project", + "postage", + "profiling", + "rand 0.9.2", + "raw-window-handle", + "resvg", + "schemars", + "seahash", + "serde", + "serde_json", + "slotmap", + "smallvec", + "smol", + "stacksafe", + "strum 0.27.2", + "taffy", + "thiserror 2.0.18", + "usvg", + "uuid", + "waker-fn", + "wayland-backend", + "wayland-client", + "wayland-cursor", + "wayland-protocols 0.31.2", + "wayland-protocols-plasma", + "windows 0.61.3", + "windows-core 0.61.2", + "windows-numerics", + "windows-registry 0.5.3", + "x11-clipboard", + "x11rb", + "xkbcommon", + "zed-font-kit", + "zed-scap", + "zed-xim", +] + +[[package]] +name = "gpui-component" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dda822a7bab4e0a08a4276ba68e2f82cc5855bf0b377d7b195c58c8061dc7d1" +dependencies = [ + "aho-corasick", + "anyhow", + "chrono", + "enum-iterator", + "gpui", + "gpui-component-macros", + "gpui-macros", + "html5ever", + "itertools 0.13.0", + "lsp-types", + "markdown", + "markup5ever_rcdom", + "notify", + "num-traits", + "once_cell", + "paste", + "regex", + "ropey", + "rust-i18n", + "schemars", + "serde", + "serde_json", + "serde_repr", + "smallvec", + "smol", + "tracing", + "tree-sitter", + "tree-sitter-json", + "unicode-segmentation", + "uuid", + "zed-sum-tree", +] + +[[package]] +name = "gpui-component-assets" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5842ea3f1e596fbc611894dcc0266df7125bc226f603ca313f5460b700503564" +dependencies = [ + "anyhow", + "gpui", + "rust-embed", +] + +[[package]] +name = "gpui-component-macros" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581a8cd1e38b2fd86d1029dd56a3296ffd1388fda295054104d89923755de902" dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro-error", "proc-macro2", "quote", "syn 2.0.114", ] +[[package]] +name = "gpui-macros" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcb02dd63a2859714ac7b6b476937617c3c744157af1b49f7c904023a79039be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "gpui_collections" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae39dc6d3d201be97e4bc08d96dbef2bc5b5c3d5734e05786e8cc3043342351c" +dependencies = [ + "indexmap", + "rustc-hash 2.1.1", +] + +[[package]] +name = "gpui_derive_refineable" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "644de174341a87b3478bd65b66bca38af868bcf2b2e865700523734f83cfc664" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "gpui_http_client" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23822b0a6d2c5e6a42507980a0ab3848610ea908942c8ef98187f646f690335e" +dependencies = [ + "anyhow", + "async-compression", + "async-fs", + "bytes", + "derive_more 0.99.20", + "futures", + "gpui_util", + "http", + "http-body", + "log", + "parking_lot", + "serde", + "serde_json", + "sha2", + "tempfile", + "url", + "zed-async-tar", + "zed-reqwest", +] + +[[package]] +name = "gpui_media" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05cb8912ae17371725132d2b7eec6797a255accc95d58ee5c1134b529810f14b" +dependencies = [ + "anyhow", + "bindgen", + "core-foundation 0.10.0", + "core-video", + "ctor", + "foreign-types", + "metal", + "objc", +] + +[[package]] +name = "gpui_perf" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40a0961dcf598955130e867f4b731150a20546427b41b1a63767c1037a86d77" +dependencies = [ + "gpui_collections", + "serde", + "serde_json", +] + +[[package]] +name = "gpui_refineable" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258cb099254e9468181aee5614410fba61db4ae115fc1d51b4a0b985f60d6641" +dependencies = [ + "gpui_derive_refineable", +] + +[[package]] +name = "gpui_semantic_version" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201e45eff7b695528fb3af6560a534943fbc2db5323d755b9d198bd743948e35" +dependencies = [ + "anyhow", + "serde", +] + +[[package]] +name = "gpui_sum_tree" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4f3bedd573fafafa13d1200b356c588cf094fb2786e3684bb3f5ea59b549fa9" +dependencies = [ + "arrayvec", + "log", + "rayon", +] + +[[package]] +name = "gpui_util" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68faea25903ae524de9af83990b9aa51bcbc8dd085929ac0aea7fd41905e05c3" +dependencies = [ + "anyhow", + "async-fs", + "async_zip", + "command-fds", + "dirs 4.0.0", + "dunce", + "futures", + "futures-lite 1.13.0", + "globset", + "gpui_collections", + "itertools 0.14.0", + "libc", + "log", + "nix 0.29.0", + "regex", + "rust-embed", + "schemars", + "serde", + "serde_json", + "serde_json_lenient", + "shlex", + "smol", + "take-until", + "tempfile", + "tendril", + "unicase", + "walkdir", + "which", +] + +[[package]] +name = "gpui_util_macros" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c28f65ef47fb97e21e82fd4dd75ccc2506eda010c846dc8054015ea234f1a22" +dependencies = [ + "gpui_perf", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "grid" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12101ecc8225ea6d675bc70263074eab6169079621c2186fe0c66590b2df9681" + +[[package]] +name = "h2" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "2.7.1" @@ -1561,14 +2634,24 @@ checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" dependencies = [ "cfg-if", "crunchy", + "num-traits", "zerocopy", ] [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "hashbrown" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "foldhash", +] [[package]] name = "hashbrown" @@ -1600,6 +2683,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + [[package]] name = "hidapi" version = "2.6.4" @@ -1614,15 +2703,55 @@ dependencies = [ ] [[package]] -name = "html5ever" -version = "0.29.1" +name = "hidden-trait" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7410cae13cbc75623c98ac4cbfd1f0bedddf3227afc24f370cf0f50a44a11c" +checksum = "68ed9e850438ac849bec07e7d09fbe9309cbd396a5988c30b010580ce08860df" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "html5ever" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" dependencies = [ "log", "mac", "markup5ever", - "match_token", + "proc-macro2", + "quote", + "syn 2.0.114", ] [[package]] @@ -1680,6 +2809,7 @@ dependencies = [ "bytes", "futures-channel", "futures-core", + "h2", "http", "http-body", "httparse", @@ -1691,13 +2821,29 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-rustls" +version = "0.27.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" +dependencies = [ + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-native-certs", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", +] + [[package]] name = "hyper-util" version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" dependencies = [ - "base64 0.22.1", "bytes", "futures-channel", "futures-core", @@ -1705,9 +2851,7 @@ dependencies = [ "http", "http-body", "hyper", - "ipnet", "libc", - "percent-encoding", "pin-project-lite", "socket2", "tokio", @@ -1739,16 +2883,6 @@ dependencies = [ "cc", ] -[[package]] -name = "ico" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98" -dependencies = [ - "byteorder", - "png", -] - [[package]] name = "icu_collections" version = "2.1.1" @@ -1830,12 +2964,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "1.1.0" @@ -1858,16 +2986,67 @@ dependencies = [ ] [[package]] -name = "indexmap" -version = "1.9.3" +name = "ignore" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "d3d782a365a015e0f5c04902246139249abf769125006fbe7649e2ee88169b4a" dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata", + "same-file", + "walkdir", + "winapi-util", ] +[[package]] +name = "image" +version = "0.25.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a" +dependencies = [ + "bytemuck", + "byteorder-lite", + "color_quant", + "exr", + "gif", + "image-webp", + "moxcms", + "num-traits", + "png 0.18.0", + "qoi", + "ravif", + "rayon", + "rgb", + "tiff", + "zune-core 0.5.1", + "zune-jpeg 0.5.11", +] + +[[package]] +name = "image-webp" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3" +dependencies = [ + "byteorder-lite", + "quick-error", +] + +[[package]] +name = "imagesize" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" + +[[package]] +name = "imgref" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8" + [[package]] name = "indexmap" version = "2.13.0" @@ -1881,12 +3060,23 @@ dependencies = [ ] [[package]] -name = "infer" -version = "0.19.0" +name = "inotify" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" dependencies = [ - "cfb", + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", ] [[package]] @@ -1899,22 +3089,53 @@ dependencies = [ "generic-array", ] +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "inventory" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc61209c082fbeb19919bee74b176221b27223e27b65d781eb91af24eb1fb46e" +dependencies = [ + "rustversion", +] + +[[package]] +name = "io-surface" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "554b8c5d64ec09a3a520fe58e4d48a73e00ff32899cdcbe32a4877afd4968b8e" +dependencies = [ + "cgl", + "core-foundation 0.10.0", + "core-foundation-sys", + "leaky-cow", +] + [[package]] name = "ipnet" version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" -[[package]] -name = "iri-string" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" -dependencies = [ - "memchr", - "serde", -] - [[package]] name = "is-docker" version = "0.2.0" @@ -1934,6 +3155,33 @@ dependencies = [ "once_cell", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.17" @@ -1941,103 +3189,73 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] -name = "javascriptcore-rs" -version = "1.1.2" +name = "jobserver" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ - "bitflags 1.3.2", - "glib", - "javascriptcore-rs-sys", -] - -[[package]] -name = "javascriptcore-rs-sys" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124" -dependencies = [ - "glib-sys", - "gobject-sys", + "getrandom 0.3.4", "libc", - "system-deps", ] -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys", - "log", - "thiserror 1.0.69", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - [[package]] name = "js-sys" -version = "0.3.83" +version = "0.3.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" +checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" dependencies = [ "once_cell", "wasm-bindgen", ] [[package]] -name = "json-patch" -version = "3.0.1" +name = "khronos-egl" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ - "jsonptr", - "serde", - "serde_json", - "thiserror 1.0.69", + "libc", + "libloading", ] [[package]] -name = "jsonptr" -version = "0.6.3" +name = "kqueue" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70" +checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a" dependencies = [ - "serde", - "serde_json", + "kqueue-sys", + "libc", ] [[package]] -name = "keyboard-types" -version = "0.7.0" +name = "kqueue-sys" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ - "bitflags 2.10.0", - "serde", - "unicode-segmentation", + "bitflags 1.3.2", + "libc", ] [[package]] -name = "kuchikiki" -version = "0.8.8-speedreader" +name = "kurbo" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2" +checksum = "c62026ae44756f8a599ba21140f350303d4f08dcdcc71b5ad9c9bb8128c13c62" dependencies = [ - "cssparser", - "html5ever", - "indexmap 2.13.0", - "selectors", + "arrayvec", + "euclid", + "smallvec", +] + +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", ] [[package]] @@ -2045,31 +3263,31 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libappindicator" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" dependencies = [ - "glib", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log", + "spin", ] [[package]] -name = "libappindicator-sys" -version = "0.9.0" +name = "leak" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" +checksum = "bd100e01f1154f2908dfa7d02219aeab25d0b9c7fa955164192e3245255a0c73" + +[[package]] +name = "leaky-cow" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40a8225d44241fd324a8af2806ba635fc7c8a7e9a7de4d5cf3ef54e71f5926fc" dependencies = [ - "gtk-sys", - "libloading", - "once_cell", + "leak", ] +[[package]] +name = "lebe" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" + [[package]] name = "libc" version = "0.2.180" @@ -2077,15 +3295,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] -name = "libloading" -version = "0.7.4" +name = "libfuzzer-sys" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404" +dependencies = [ + "arbitrary", + "cc", +] + +[[package]] +name = "libloading" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ "cfg-if", - "winapi", + "windows-link 0.2.1", ] +[[package]] +name = "libm" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" + [[package]] name = "libredox" version = "0.1.12" @@ -2094,8 +3328,15 @@ checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" dependencies = [ "bitflags 2.10.0", "libc", + "redox_syscall 0.7.0", ] +[[package]] +name = "linux-raw-sys" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + [[package]] name = "linux-raw-sys" version = "0.11.0" @@ -2124,6 +3365,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" dependencies = [ "serde_core", + "value-bag", ] [[package]] @@ -2154,13 +3396,93 @@ dependencies = [ "serde-value", "serde_json", "serde_yaml", - "thiserror 2.0.17", + "thiserror 2.0.18", "thread-id", "typemap-ors", "unicode-segmentation", "winapi", ] +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] + +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + +[[package]] +name = "lsp-types" +version = "0.97.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53353550a17c04ac46c585feb189c2db82154fc84b79c7a66c96c2c644f66071" +dependencies = [ + "bitflags 1.3.2", + "fluent-uri", + "serde", + "serde_json", + "serde_repr", +] + +[[package]] +name = "lyon" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbcb7d54d54c8937364c9d41902d066656817dce1e03a44e5533afebd1ef4352" +dependencies = [ + "lyon_algorithms", + "lyon_tessellation", +] + +[[package]] +name = "lyon_algorithms" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c0829e28c4f336396f250d850c3987e16ce6db057ffe047ce0dd54aab6b647" +dependencies = [ + "lyon_path", + "num-traits", +] + +[[package]] +name = "lyon_geom" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e260b6de923e6e47adfedf6243013a7a874684165a6a277594ee3906021b2343" +dependencies = [ + "arrayvec", + "euclid", + "num-traits", +] + +[[package]] +name = "lyon_path" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aeca86bcfd632a15984ba029b539ffb811e0a70bf55e814ef8b0f54f506fdeb" +dependencies = [ + "lyon_geom", + "num-traits", +] + +[[package]] +name = "lyon_tessellation" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3f586142e1280335b1bc89539f7c97dd80f08fc43e9ab1b74ef0a42b04aa353" +dependencies = [ + "float_next_after", + "lyon_path", + "num-traits", +] + [[package]] name = "mac" version = "0.1.1" @@ -2168,35 +3490,68 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] -name = "markup5ever" -version = "0.14.1" +name = "malloc_buf" +version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7a7213d12e1864c0f002f52c2923d4556935a43dec5e71355c2760e0f6e7a18" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "markdown" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5cab8f2cadc416a82d2e783a1946388b31654d391d1c7d92cc1f03e295b1deb" +dependencies = [ + "unicode-id", +] + +[[package]] +name = "markup5ever" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" dependencies = [ "log", - "phf 0.11.3", - "phf_codegen 0.11.3", + "phf", + "phf_codegen", "string_cache", "string_cache_codegen", "tendril", ] [[package]] -name = "match_token" -version = "0.1.0" +name = "markup5ever_rcdom" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b" +checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.114", + "html5ever", + "markup5ever", + "tendril", + "xml5ever", ] [[package]] -name = "matches" -version = "0.1.10" +name = "maybe-rayon" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", + "rayon", +] + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] [[package]] name = "memchr" @@ -2204,6 +3559,15 @@ version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" +[[package]] +name = "memmap2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490" +dependencies = [ + "libc", +] + [[package]] name = "memoffset" version = "0.9.1" @@ -2213,12 +3577,37 @@ dependencies = [ "autocfg", ] +[[package]] +name = "metal" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +dependencies = [ + "bitflags 2.10.0", + "block", + "core-graphics-types 0.1.3", + "foreign-types", + "log", + "objc", + "paste", +] + [[package]] name = "mime" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2235,6 +3624,12 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "mint" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" + [[package]] name = "mio" version = "1.1.1" @@ -2242,7 +3637,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", - "wasi 0.11.1+wasi-snapshot-preview1", + "log", + "wasi", "windows-sys 0.61.2", ] @@ -2253,54 +3649,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dce6dd36094cac388f119d2e9dc82dc730ef91c32a6222170d630e5414b956e6" [[package]] -name = "muda" -version = "0.17.1" +name = "moxcms" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c1738382f66ed56b3b9c8119e794a2e23148ac8ea214eda86622d4cb9d415a" +checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97" dependencies = [ - "crossbeam-channel", - "dpi", - "gtk", - "keyboard-types", - "objc2", - "objc2-app-kit", - "objc2-core-foundation", - "objc2-foundation", - "once_cell", - "png", - "serde", - "thiserror 2.0.17", - "windows-sys 0.60.2", + "num-traits", + "pxfm", ] [[package]] -name = "ndk" -version = "0.9.0" +name = "naga" +version = "25.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" +checksum = "2b977c445f26e49757f9aca3631c3b8b836942cb278d69a92e7b80d3b24da632" dependencies = [ + "arrayvec", + "bit-set", "bitflags 2.10.0", - "jni-sys", + "cfg_aliases", + "codespan-reporting", + "half", + "hashbrown 0.15.5", + "hexf-parse", + "indexmap", "log", - "ndk-sys", - "num_enum", - "raw-window-handle", - "thiserror 1.0.69", + "num-traits", + "once_cell", + "rustc-hash 1.1.0", + "spirv", + "strum 0.26.3", + "thiserror 2.0.18", + "unicode-ident", ] [[package]] -name = "ndk-context" -version = "0.1.1" +name = "nanorand" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.6.0+11769913" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "jni-sys", + "getrandom 0.2.17", ] [[package]] @@ -2310,10 +3699,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] -name = "nodrop" -version = "0.1.14" +name = "nix" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags 2.10.0", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "nix" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" +dependencies = [ + "bitflags 2.10.0", + "cfg-if", + "cfg_aliases", + "libc", +] [[package]] name = "nom" @@ -2325,6 +3732,67 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nom" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df9761775871bdef83bee530e60050f7e54b1105350d6884eb0fb4f46c2f9405" +dependencies = [ + "memchr", +] + +[[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[package]] +name = "normpath" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf23ab2b905654b4cb177e30b629937b3868311d4e1cba859f899c041046e69b" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "notify" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533b4c39709f9ba5005d8002048266593c1cfaf3c5f0739d5b8ab0c6c504009" +dependencies = [ + "bitflags 2.10.0", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "notify-types", + "walkdir", + "windows-sys 0.52.0", +] + +[[package]] +name = "notify-types" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585d3cb5e12e01aed9e8a1f70d5c6b5e86fe2a6e48fc8cd0b3e0b8df6f6eb174" +dependencies = [ + "instant", +] + +[[package]] +name = "ntapi" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c70f219e21142367c70c0b30c6a9e3a14d55b4d12a204d897fbec83a0363f081" +dependencies = [ + "winapi", +] + [[package]] name = "num" version = "0.4.3" @@ -2349,6 +3817,23 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint-dig" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" +dependencies = [ + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "serde", + "smallvec", + "zeroize", +] + [[package]] name = "num-complex" version = "0.4.6" @@ -2360,9 +3845,20 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] [[package]] name = "num-integer" @@ -2402,28 +3898,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] -name = "num_enum" -version = "0.7.5" +name = "num_cpus" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" +checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" dependencies = [ - "num_enum_derive", - "rustversion", + "hermit-abi", + "libc", ] [[package]] -name = "num_enum_derive" -version = "0.7.5" +name = "objc" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ - "proc-macro-crate 3.4.0", - "proc-macro2", - "quote", - "syn 2.0.114", + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", ] [[package]] @@ -2433,7 +3939,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" dependencies = [ "objc2-encode", - "objc2-exception-helper", ] [[package]] @@ -2443,42 +3948,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ "bitflags 2.10.0", - "block2", - "libc", "objc2", - "objc2-cloud-kit", - "objc2-core-data", "objc2-core-foundation", - "objc2-core-graphics", - "objc2-core-image", - "objc2-core-text", - "objc2-core-video", "objc2-foundation", "objc2-quartz-core", ] -[[package]] -name = "objc2-cloud-kit" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c" -dependencies = [ - "bitflags 2.10.0", - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-core-data" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa" -dependencies = [ - "bitflags 2.10.0", - "objc2", - "objc2-foundation", -] - [[package]] name = "objc2-core-foundation" version = "0.3.2" @@ -2490,69 +3965,12 @@ dependencies = [ "objc2", ] -[[package]] -name = "objc2-core-graphics" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" -dependencies = [ - "bitflags 2.10.0", - "dispatch2", - "objc2", - "objc2-core-foundation", - "objc2-io-surface", -] - -[[package]] -name = "objc2-core-image" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006" -dependencies = [ - "objc2", - "objc2-foundation", -] - -[[package]] -name = "objc2-core-text" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d" -dependencies = [ - "bitflags 2.10.0", - "objc2", - "objc2-core-foundation", - "objc2-core-graphics", -] - -[[package]] -name = "objc2-core-video" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6" -dependencies = [ - "bitflags 2.10.0", - "objc2", - "objc2-core-foundation", - "objc2-core-graphics", - "objc2-io-surface", -] - [[package]] name = "objc2-encode" version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" -[[package]] -name = "objc2-exception-helper" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7a1c5fbb72d7735b076bb47b578523aedc40f3c439bea6dfd595c089d79d98a" -dependencies = [ - "cc", -] - [[package]] name = "objc2-foundation" version = "0.3.2" @@ -2560,31 +3978,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ "bitflags 2.10.0", - "block2", - "libc", "objc2", "objc2-core-foundation", ] [[package]] -name = "objc2-io-surface" +name = "objc2-metal" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" +checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794" dependencies = [ "bitflags 2.10.0", + "block2", "objc2", - "objc2-core-foundation", -] - -[[package]] -name = "objc2-javascript-core" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1e6550c4caed348956ce3370c9ffeca70bb1dbed4fa96112e7c6170e074586" -dependencies = [ - "objc2", - "objc2-core-foundation", + "objc2-foundation", ] [[package]] @@ -2597,17 +4004,7 @@ dependencies = [ "objc2", "objc2-core-foundation", "objc2-foundation", -] - -[[package]] -name = "objc2-security" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a" -dependencies = [ - "bitflags 2.10.0", - "objc2", - "objc2-core-foundation", + "objc2-metal", ] [[package]] @@ -2620,22 +4017,34 @@ dependencies = [ "objc2", "objc2-core-foundation", "objc2-foundation", + "objc2-quartz-core", ] [[package]] -name = "objc2-web-kit" -version = "0.3.2" +name = "objc_exception" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" dependencies = [ - "bitflags 2.10.0", - "block2", - "objc2", - "objc2-app-kit", - "objc2-core-foundation", - "objc2-foundation", - "objc2-javascript-core", - "objc2-security", + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" +dependencies = [ + "memchr", ] [[package]] @@ -2653,18 +4062,58 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +[[package]] +name = "oo7" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3299dd401feaf1d45afd8fd1c0586f10fcfb22f244bb9afa942cec73503b89d" +dependencies = [ + "aes", + "ashpd 0.12.1", + "async-fs", + "async-io", + "async-lock", + "blocking", + "cbc", + "cipher", + "digest", + "endi", + "futures-lite 2.6.1", + "futures-util", + "getrandom 0.3.4", + "hkdf", + "hmac", + "md-5", + "num", + "num-bigint-dig", + "pbkdf2", + "rand 0.9.2", + "serde", + "sha2", + "subtle", + "zbus", + "zbus_macros", + "zeroize", + "zvariant", +] + [[package]] name = "open" version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43bb73a7fa3799b198970490a51174027ba0d4ec504b03cd08caf513d40024bc" dependencies = [ - "dunce", "is-wsl", "libc", "pathdiff", ] +[[package]] +name = "openssl-probe" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" + [[package]] name = "option-ext" version = "0.2.0" @@ -2690,48 +4139,13 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "os_pipe" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" -dependencies = [ - "libc", - "windows-sys 0.61.2", -] - [[package]] name = "pad" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3" dependencies = [ - "unicode-width", -] - -[[package]] -name = "pango" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" -dependencies = [ - "gio", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", + "unicode-width 0.1.14", ] [[package]] @@ -2758,17 +4172,58 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.18", "smallvec", "windows-link 0.2.1", ] +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pastey" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec" + [[package]] name = "pathdiff" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" +[[package]] +name = "pathfinder_geometry" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b7e7b4ea703700ce73ebf128e1450eb69c3a8329199ffbfb9b2a0418e5ad3" +dependencies = [ + "log", + "pathfinder_simd", +] + +[[package]] +name = "pathfinder_simd" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf9027960355bf3afff9841918474a81a5f972ac6d226d518060bba758b5ad57" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + [[package]] name = "pcsc" version = "2.9.0" @@ -2794,44 +4249,13 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_shared 0.8.0", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_macros 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", -] - [[package]] name = "phf" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" dependencies = [ - "phf_macros 0.11.3", - "phf_shared 0.11.3", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", + "phf_shared", ] [[package]] @@ -2840,28 +4264,8 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", + "phf_generator", + "phf_shared", ] [[package]] @@ -2870,73 +4274,37 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ - "phf_shared 0.11.3", + "phf_shared", "rand 0.8.5", ] -[[package]] -name = "phf_macros" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" -dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", - "proc-macro2", - "quote", - "syn 2.0.114", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher 0.3.11", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher 0.3.11", -] - [[package]] name = "phf_shared" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" dependencies = [ - "siphasher 1.0.1", + "siphasher", ] +[[package]] +name = "pico-args" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" + [[package]] name = "picoforge" -version = "0.3.0" +version = "0.4.0" dependencies = [ "anyhow", "bitflags 2.10.0", "byteorder", "ctap-hid-fido2", "directories", + "gpui", + "gpui-component", + "gpui-component-assets", "hex", "hidapi", "log", @@ -2947,11 +4315,28 @@ dependencies = [ "serde", "serde_cbor_2", "serde_json", - "tauri", - "tauri-build", - "tauri-plugin-opener", - "tauri-plugin-shell", - "thiserror 2.0.17", + "thiserror 2.0.18", + "tokio", +] + +[[package]] +name = "pin-project" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", ] [[package]] @@ -2973,7 +4358,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand", + "fastrand 2.3.0", "futures-io", ] @@ -2983,19 +4368,6 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" -[[package]] -name = "plist" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07" -dependencies = [ - "base64 0.22.1", - "indexmap 2.13.0", - "quick-xml", - "serde", - "time", -] - [[package]] name = "png" version = "0.17.16" @@ -3009,6 +4381,19 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "png" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0" +dependencies = [ + "bitflags 2.10.0", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + [[package]] name = "polling" version = "3.11.0" @@ -3019,10 +4404,33 @@ dependencies = [ "concurrent-queue", "hermit-abi", "pin-project-lite", - "rustix", + "rustix 1.1.3", "windows-sys 0.61.2", ] +[[package]] +name = "pollster" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7" + +[[package]] +name = "postage" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af3fb618632874fb76937c2361a7f22afd393c982a2165595407edc75b06d3c1" +dependencies = [ + "atomic", + "crossbeam-queue", + "futures", + "log", + "parking_lot", + "pin-project", + "pollster", + "static_assertions", + "thiserror 1.0.69", +] + [[package]] name = "potential_utf" version = "0.1.4" @@ -3054,23 +4462,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] -name = "proc-macro-crate" -version = "1.3.1" +name = "prettyplease" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" -dependencies = [ - "toml_datetime 0.6.3", - "toml_edit 0.20.2", + "proc-macro2", + "syn 2.0.114", ] [[package]] @@ -3083,44 +4481,98 @@ dependencies = [ ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" dependencies = [ "proc-macro2", "quote", - "version_check", ] [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" +name = "proc-macro-error2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.114", +] [[package]] name = "proc-macro2" -version = "1.0.105" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "535d180e0ecab6268a3e718bb9fd44db66bbbc256257165fc699dadf70d16fe7" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] +[[package]] +name = "profiling" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b" +dependencies = [ + "quote", + "syn 2.0.114", +] + +[[package]] +name = "psm" +version = "0.1.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa96cb91275ed31d6da3e983447320c4eb219ac180fa1679a0889ff32861e2d" +dependencies = [ + "ar_archive_writer", + "cc", +] + +[[package]] +name = "pxfm" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8" +dependencies = [ + "num-traits", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + [[package]] name = "quick-xml" version = "0.38.4" @@ -3131,10 +4583,65 @@ dependencies = [ ] [[package]] -name = "quote" -version = "1.0.43" +name = "quinn" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc74d9a594b72ae6656596548f56f667211f8a97b3d4c3d467150794690dc40a" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +dependencies = [ + "bytes", + "cfg_aliases", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.1.1", + "rustls", + "socket2", + "thiserror 2.0.18", + "tokio", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-proto" +version = "0.11.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +dependencies = [ + "bytes", + "getrandom 0.3.4", + "lru-slab", + "rand 0.9.2", + "ring", + "rustc-hash 2.1.1", + "rustls", + "rustls-pki-types", + "slab", + "thiserror 2.0.18", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.60.2", +] + +[[package]] +name = "quote" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" dependencies = [ "proc-macro2", ] @@ -3145,20 +4652,6 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - [[package]] name = "rand" version = "0.8.5" @@ -3180,16 +4673,6 @@ dependencies = [ "rand_core 0.9.5", ] -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - [[package]] name = "rand_chacha" version = "0.3.1" @@ -3210,15 +4693,6 @@ dependencies = [ "rand_core 0.9.5", ] -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - [[package]] name = "rand_core" version = "0.6.4" @@ -3238,21 +4712,59 @@ dependencies = [ ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "rangemap" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "973443cf09a9c8656b574a866ab68dfa19f0867d0340648c7d2f6a71b8a8ea68" + +[[package]] +name = "rav1e" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43b6dd56e85d9483277cde964fd1bdb0428de4fec5ebba7540995639a21cb32b" dependencies = [ - "rand_core 0.5.1", + "aligned-vec", + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av-scenechange", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools 0.14.0", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "paste", + "profiling", + "rand 0.9.2", + "rand_chacha 0.9.0", + "simd_helpers", + "thiserror 2.0.18", + "v_frame", + "wasm-bindgen", ] [[package]] -name = "rand_pcg" -version = "0.2.1" +name = "ravif" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +checksum = "ef69c1990ceef18a116855938e74793a5f7496ee907562bd0857b6ac734ab285" dependencies = [ - "rand_core 0.5.1", + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rayon", + "rgb", ] [[package]] @@ -3261,6 +4773,57 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" +[[package]] +name = "raw-window-metal" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76e8caa82e31bb98fee12fa8f051c94a6aa36b07cddb03f0d4fc558988360ff1" +dependencies = [ + "cocoa 0.25.0", + "core-graphics 0.23.2", + "objc", + "raw-window-handle", +] + +[[package]] +name = "rayon" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "read-fonts" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358" +dependencies = [ + "bytemuck", + "font-types", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_syscall" version = "0.5.18" @@ -3270,6 +4833,26 @@ dependencies = [ "bitflags 2.10.0", ] +[[package]] +name = "redox_syscall" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27" +dependencies = [ + "bitflags 2.10.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom 0.2.17", + "libredox", + "thiserror 1.0.69", +] + [[package]] name = "redox_users" version = "0.5.2" @@ -3278,7 +4861,7 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ "getrandom 0.2.17", "libredox", - "thiserror 2.0.17", + "thiserror 2.0.18", ] [[package]] @@ -3331,38 +4914,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] -name = "reqwest" -version = "0.12.28" +name = "resvg" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +checksum = "a8928798c0a55e03c9ca6c4c6846f76377427d2c1e1f7e6de3c06ae57942df43" dependencies = [ - "base64 0.22.1", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-util", - "js-sys", "log", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-util", - "tower", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", + "pico-args", + "rgb", + "svgtypes", + "tiny-skia", + "usvg", +] + +[[package]] +name = "rgb" +version = "0.8.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce" +dependencies = [ + "bytemuck", ] [[package]] @@ -3379,6 +4950,123 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "ropey" +version = "2.0.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4045a00dc327d084a2bbf126976e14125b54f23bd30511d45b842eba76c52d74" +dependencies = [ + "str_indices", +] + +[[package]] +name = "roxmltree" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" + +[[package]] +name = "rust-embed" +version = "8.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04113cb9355a377d83f06ef1f0a45b8ab8cd7d8b1288160717d66df5c7988d27" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0902e4c7c8e997159ab384e6d0fc91c221375f6894346ae107f47dd0f3ccaa" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "shellexpand", + "syn 2.0.114", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bcdef0be6fe7f6fa333b1073c949729274b05f123a0ad7efcb8efd878e5c3b1" +dependencies = [ + "globset", + "sha2", + "walkdir", +] + +[[package]] +name = "rust-i18n" +version = "3.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda2551fdfaf6cc5ee283adc15e157047b92ae6535cf80f6d4962d05717dc332" +dependencies = [ + "globwalk", + "once_cell", + "regex", + "rust-i18n-macro", + "rust-i18n-support", + "smallvec", +] + +[[package]] +name = "rust-i18n-macro" +version = "3.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22baf7d7f56656d23ebe24f6bb57a5d40d2bce2a5f1c503e692b5b2fa450f965" +dependencies = [ + "glob", + "once_cell", + "proc-macro2", + "quote", + "rust-i18n-support", + "serde", + "serde_json", + "serde_yaml", + "syn 2.0.114", +] + +[[package]] +name = "rust-i18n-support" +version = "3.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "940ed4f52bba4c0152056d771e563b7133ad9607d4384af016a134b58d758f19" +dependencies = [ + "arc-swap", + "base62", + "globwalk", + "itertools 0.11.0", + "lazy_static", + "normpath", + "once_cell", + "proc-macro2", + "regex", + "serde", + "serde_json", + "serde_yaml", + "siphasher", + "toml 0.8.23", + "triomphe", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc-hash" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + [[package]] name = "rustc_version" version = "0.4.1" @@ -3394,7 +5082,20 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" dependencies = [ - "nom", + "nom 7.1.3", +] + +[[package]] +name = "rustix" +version = "0.38.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags 2.10.0", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", ] [[package]] @@ -3406,16 +5107,107 @@ dependencies = [ "bitflags 2.10.0", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.11.0", "windows-sys 0.61.2", ] +[[package]] +name = "rustls" +version = "0.23.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" +dependencies = [ + "openssl-probe", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" +dependencies = [ + "web-time", + "zeroize", +] + +[[package]] +name = "rustls-webpki" +version = "0.103.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +[[package]] +name = "rustybuzz" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" +dependencies = [ + "bitflags 2.10.0", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.21.1", + "unicode-bidi-mirroring 0.2.0", + "unicode-ccc 0.2.0", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702" +dependencies = [ + "bitflags 2.10.0", + "bytemuck", + "core_maths", + "log", + "smallvec", + "ttf-parser 0.25.1", + "unicode-bidi-mirroring 0.4.0", + "unicode-ccc 0.4.0", + "unicode-properties", + "unicode-script", +] + [[package]] name = "ryu" version = "1.0.22" @@ -3432,30 +5224,12 @@ dependencies = [ ] [[package]] -name = "schemars" -version = "0.8.22" +name = "schannel" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" +checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" dependencies = [ - "dyn-clone", - "indexmap 1.9.3", - "schemars_derive", - "serde", - "serde_json", - "url", - "uuid", -] - -[[package]] -name = "schemars" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" -dependencies = [ - "dyn-clone", - "ref-cast", - "serde", - "serde_json", + "windows-sys 0.61.2", ] [[package]] @@ -3465,16 +5239,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54e910108742c57a770f492731f99be216a52fadd361b06c8fb59d74ccc267d2" dependencies = [ "dyn-clone", + "indexmap", "ref-cast", + "schemars_derive", "serde", "serde_json", ] [[package]] name = "schemars_derive" -version = "0.8.22" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d" +checksum = "4908ad288c5035a8eb12cfdf0d49270def0a268ee162b75eeee0f85d155a7c45" dependencies = [ "proc-macro2", "quote", @@ -3482,6 +5258,12 @@ dependencies = [ "syn 2.0.114", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.2.0" @@ -3489,32 +5271,68 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "selectors" -version = "0.24.0" +name = "screencapturekit" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" +checksum = "1a5eeeb57ac94960cfe5ff4c402be6585ae4c8d29a2cf41b276048c2e849d64e" dependencies = [ - "bitflags 1.3.2", - "cssparser", - "derive_more 0.99.20", - "fxhash", - "log", - "phf 0.8.0", - "phf_codegen 0.8.0", - "precomputed-hash", - "servo_arc", - "smallvec", + "screencapturekit-sys", ] +[[package]] +name = "screencapturekit-sys" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22411b57f7d49e7fe08025198813ee6fd65e1ee5eff4ebc7880c12c82bde4c60" +dependencies = [ + "block", + "dispatch", + "objc", + "objc-foundation", + "objc_id", + "once_cell", +] + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "security-framework" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" +dependencies = [ + "bitflags 2.10.0", + "core-foundation 0.10.0", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "self_cell" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89" + [[package]] name = "semver" version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" -dependencies = [ - "serde", - "serde_core", -] [[package]] name = "serde" @@ -3526,18 +5344,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-untagged" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9faf48a4a2d2693be24c6289dbe26552776eb7737074e6722891fadbe6c5058" -dependencies = [ - "erased-serde", - "serde", - "serde_core", - "typeid", -] - [[package]] name = "serde-value" version = "0.7.0" @@ -3589,12 +5395,22 @@ dependencies = [ "syn 2.0.114", ] +[[package]] +name = "serde_fmt" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e497af288b3b95d067a23a4f749f2861121ffcb2f6d8379310dcda040c345ed" +dependencies = [ + "serde_core", +] + [[package]] name = "serde_json" version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ + "indexmap", "itoa", "memchr", "serde", @@ -3602,6 +5418,19 @@ dependencies = [ "zmij", ] +[[package]] +name = "serde_json_lenient" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e033097bf0d2b59a62b42c18ebbb797503839b26afdda2c4e1415cb6c813540" +dependencies = [ + "indexmap", + "itoa", + "memchr", + "ryu", + "serde", +] + [[package]] name = "serde_repr" version = "0.1.20" @@ -3643,44 +5472,13 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "3.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7" -dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.13.0", - "schemars 0.9.0", - "schemars 1.2.0", - "serde_core", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.114", -] - [[package]] name = "serde_yaml" version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.13.0", + "indexmap", "itoa", "ryu", "serde", @@ -3688,36 +5486,10 @@ dependencies = [ ] [[package]] -name = "serialize-to-javascript" -version = "0.1.2" +name = "sha1_smol" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5" -dependencies = [ - "serde", - "serde_json", - "serialize-to-javascript-impl", -] - -[[package]] -name = "serialize-to-javascript-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.114", -] - -[[package]] -name = "servo_arc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741" -dependencies = [ - "nodrop", - "stable_deref_trait", -] +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" [[package]] name = "sha2" @@ -3731,14 +5503,12 @@ dependencies = [ ] [[package]] -name = "shared_child" -version = "1.1.1" +name = "shellexpand" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e362d9935bc50f019969e2f9ecd66786612daae13e8f277be7bfb66e8bed3f7" +checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb" dependencies = [ - "libc", - "sigchld", - "windows-sys 0.60.2", + "dirs 6.0.0", ] [[package]] @@ -3747,27 +5517,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "sigchld" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47106eded3c154e70176fc83df9737335c94ce22f821c32d17ed1db1f83badb1" -dependencies = [ - "libc", - "os_pipe", - "signal-hook", -] - -[[package]] -name = "signal-hook" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" version = "1.4.8" @@ -3785,10 +5534,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" [[package]] -name = "siphasher" -version = "0.3.11" +name = "simd_helpers" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + +[[package]] +name = "simplecss" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9c6883ca9c3c7c90e888de77b7a5c849c779d25d74a1269b0218b14e8b136c" +dependencies = [ + "log", +] [[package]] name = "siphasher" @@ -3796,12 +5557,31 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" +[[package]] +name = "skrifa" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841" +dependencies = [ + "bytemuck", + "read-fonts", +] + [[package]] name = "slab" version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" +[[package]] +name = "slotmap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038" +dependencies = [ + "version_check", +] + [[package]] name = "smallvec" version = "1.15.1" @@ -3809,61 +5589,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] -name = "socket2" -version = "0.6.1" +name = "smol" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" +checksum = "a33bd3e260892199c3ccfc487c88b2da2265080acb316cd920da72fdfd7c599f" +dependencies = [ + "async-channel 2.5.0", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-net", + "async-process", + "blocking", + "futures-lite 2.6.1", +] + +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" + +[[package]] +name = "socket2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0" dependencies = [ "libc", "windows-sys 0.60.2", ] [[package]] -name = "softbuffer" -version = "0.4.8" +name = "spin" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac18da81ebbf05109ab275b157c22a653bb3c12cf884450179942f81bcbf6c3" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ - "bytemuck", - "js-sys", - "ndk", - "objc2", - "objc2-core-foundation", - "objc2-core-graphics", - "objc2-foundation", - "objc2-quartz-core", - "raw-window-handle", - "redox_syscall", - "tracing", - "wasm-bindgen", - "web-sys", - "windows-sys 0.61.2", + "lock_api", ] [[package]] -name = "soup3" -version = "0.5.0" +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "futures-channel", - "gio", - "glib", - "libc", - "soup3-sys", -] - -[[package]] -name = "soup3-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", + "bitflags 2.10.0", ] [[package]] @@ -3872,6 +5645,67 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" +[[package]] +name = "stacker" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1f8b29fb42aafcea4edeeb6b2f2d7ecd0d969c48b4cf0d2e64aafc471dd6e59" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "windows-sys 0.59.0", +] + +[[package]] +name = "stacksafe" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d9c1172965d317e87ddb6d364a040d958b40a1db82b6ef97da26253a8b3d090" +dependencies = [ + "stacker", + "stacksafe-macro", +] + +[[package]] +name = "stacksafe-macro" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "172175341049678163e979d9107ca3508046d4d2a7c6682bee46ac541b17db69" +dependencies = [ + "proc-macro-error2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "str_indices" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d08889ec5408683408db66ad89e0e1f93dff55c73a4ccc71c427d5b277ee47e6" + +[[package]] +name = "streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + [[package]] name = "string_cache" version = "0.8.9" @@ -3880,7 +5714,7 @@ checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" dependencies = [ "new_debug_unreachable", "parking_lot", - "phf_shared 0.11.3", + "phf_shared", "precomputed-hash", "serde", ] @@ -3891,23 +5725,42 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0" dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", + "phf_generator", + "phf_shared", "proc-macro2", "quote", ] [[package]] -name = "strsim" -version = "0.11.1" +name = "strum" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", +] [[package]] name = "strum" version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +dependencies = [ + "strum_macros 0.27.2", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.114", +] [[package]] name = "strum_macros" @@ -3922,14 +5775,114 @@ dependencies = [ ] [[package]] -name = "swift-rs" -version = "1.0.7" +name = "subtle" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "sval" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502b8906c4736190684646827fbab1e954357dfe541013bbd7994d033d53a1ca" + +[[package]] +name = "sval_buffer" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4b854348b15b6c441bdd27ce9053569b016a0723eab2d015b1fd8e6abe4f708" dependencies = [ - "base64 0.21.7", - "serde", - "serde_json", + "sval", + "sval_ref", +] + +[[package]] +name = "sval_dynamic" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bd9e8b74410ddad37c6962587c5f9801a2caadba9e11f3f916ee3f31ae4a1f" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_fmt" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe17b8deb33a9441280b4266c2d257e166bafbaea6e66b4b34ca139c91766d9" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_json" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854addb048a5bafb1f496c98e0ab5b9b581c3843f03ca07c034ae110d3b7c623" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_nested" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96cf068f482108ff44ae8013477cb047a1665d5f1a635ad7cf79582c1845dce9" +dependencies = [ + "sval", + "sval_buffer", + "sval_ref", +] + +[[package]] +name = "sval_ref" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed02126365ffe5ab8faa0abd9be54fbe68d03d607cd623725b0a71541f8aaa6f" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_serde" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a263383c6aa2076c4ef6011d3bae1b356edf6ea2613e3d8e8ebaa7b57dd707d5" +dependencies = [ + "serde_core", + "sval", + "sval_nested", +] + +[[package]] +name = "svg_fmt" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb" + +[[package]] +name = "svgtypes" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc" +dependencies = [ + "kurbo", + "siphasher", +] + +[[package]] +name = "swash" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47846491253e976bdd07d0f9cc24b7daf24720d11309302ccbbc6e6b6e53550a" +dependencies = [ + "skrifa", + "yazi", + "zeno", ] [[package]] @@ -3975,348 +5928,77 @@ dependencies = [ ] [[package]] -name = "system-deps" -version = "6.2.2" +name = "sys-locale" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4" dependencies = [ - "cfg-expr", - "heck 0.5.0", - "pkg-config", - "toml 0.8.2", - "version-compare", + "libc", ] [[package]] -name = "tao" -version = "0.34.5" +name = "sysinfo" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a753bdc39c07b192151523a3f77cd0394aa75413802c883a0f6f6a0e5ee2e7" +checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" +dependencies = [ + "core-foundation-sys", + "libc", + "memchr", + "ntapi", + "rayon", + "windows 0.57.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ "bitflags 2.10.0", - "block2", - "core-foundation", - "core-graphics", - "crossbeam-channel", - "dispatch", - "dlopen2", - "dpi", - "gdkwayland-sys", - "gdkx11-sys", - "gtk", - "jni", - "lazy_static", + "core-foundation 0.9.4", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "once_cell", - "parking_lot", - "raw-window-handle", - "scopeguard", - "tao-macros", - "unicode-segmentation", - "url", - "windows", - "windows-core 0.61.2", - "windows-version", - "x11-dl", ] [[package]] -name = "tao-macros" -version = "0.1.3" +name = "taffy" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd" +checksum = "a13e5d13f79d558b5d353a98072ca8ca0e99da429467804de959aa8c83c9a004" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.114", + "arrayvec", + "grid", + "serde", + "slotmap", ] [[package]] -name = "target-lexicon" -version = "0.12.16" +name = "take-until" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +checksum = "8bdb6fa0dfa67b38c1e66b7041ba9dcf23b99d8121907cd31c807a332f7a0bbb" [[package]] -name = "tauri" -version = "2.9.5" +name = "tao-core-video-sys" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3868da5508446a7cd08956d523ac3edf0a8bc20bf7e4038f9a95c2800d2033" +checksum = "271450eb289cb4d8d0720c6ce70c72c8c858c93dd61fc625881616752e6b98f6" dependencies = [ - "anyhow", - "bytes", - "cookie", - "dirs", - "dunce", - "embed_plist", - "getrandom 0.3.4", - "glob", - "gtk", - "heck 0.5.0", - "http", - "jni", + "cfg-if", + "core-foundation-sys", "libc", - "log", - "mime", - "muda", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "objc2-ui-kit", - "objc2-web-kit", - "percent-encoding", - "plist", - "raw-window-handle", - "reqwest", - "serde", - "serde_json", - "serde_repr", - "serialize-to-javascript", - "swift-rs", - "tauri-build", - "tauri-macros", - "tauri-runtime", - "tauri-runtime-wry", - "tauri-utils", - "thiserror 2.0.17", - "tokio", - "tray-icon", - "url", - "webkit2gtk", - "webview2-com", - "window-vibrancy", - "windows", -] - -[[package]] -name = "tauri-build" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17fcb8819fd16463512a12f531d44826ce566f486d7ccd211c9c8cebdaec4e08" -dependencies = [ - "anyhow", - "cargo_toml", - "dirs", - "glob", - "heck 0.5.0", - "json-patch", - "schemars 0.8.22", - "semver", - "serde", - "serde_json", - "tauri-utils", - "tauri-winres", - "toml 0.9.11+spec-1.1.0", - "walkdir", -] - -[[package]] -name = "tauri-codegen" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa9844cefcf99554a16e0a278156ae73b0d8680bbc0e2ad1e4287aadd8489cf" -dependencies = [ - "base64 0.22.1", - "brotli", - "ico", - "json-patch", - "plist", - "png", - "proc-macro2", - "quote", - "semver", - "serde", - "serde_json", - "sha2", - "syn 2.0.114", - "tauri-utils", - "thiserror 2.0.17", - "time", - "url", - "uuid", - "walkdir", -] - -[[package]] -name = "tauri-macros" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3764a12f886d8245e66b7ee9b43ccc47883399be2019a61d80cf0f4117446fde" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.114", - "tauri-codegen", - "tauri-utils", -] - -[[package]] -name = "tauri-plugin" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1d0a4860b7ff570c891e1d2a586bf1ede205ff858fbc305e0b5ae5d14c1377" -dependencies = [ - "anyhow", - "glob", - "plist", - "schemars 0.8.22", - "serde", - "serde_json", - "tauri-utils", - "toml 0.9.11+spec-1.1.0", - "walkdir", -] - -[[package]] -name = "tauri-plugin-opener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc624469b06f59f5a29f874bbc61a2ed737c0f9c23ef09855a292c389c42e83f" -dependencies = [ - "dunce", - "glob", - "objc2-app-kit", - "objc2-foundation", - "open", - "schemars 0.8.22", - "serde", - "serde_json", - "tauri", - "tauri-plugin", - "thiserror 2.0.17", - "url", - "windows", - "zbus", -] - -[[package]] -name = "tauri-plugin-shell" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39b76f884a3937e04b631ffdc3be506088fa979369d25147361352f2f352e5ed" -dependencies = [ - "encoding_rs", - "log", - "open", - "os_pipe", - "regex", - "schemars 0.8.22", - "serde", - "serde_json", - "shared_child", - "tauri", - "tauri-plugin", - "thiserror 2.0.17", - "tokio", -] - -[[package]] -name = "tauri-runtime" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f766fe9f3d1efc4b59b17e7a891ad5ed195fa8d23582abb02e6c9a01137892" -dependencies = [ - "cookie", - "dpi", - "gtk", - "http", - "jni", - "objc2", - "objc2-ui-kit", - "objc2-web-kit", - "raw-window-handle", - "serde", - "serde_json", - "tauri-utils", - "thiserror 2.0.17", - "url", - "webkit2gtk", - "webview2-com", - "windows", -] - -[[package]] -name = "tauri-runtime-wry" -version = "2.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187a3f26f681bdf028f796ccf57cf478c1ee422c50128e5a0a6ebeb3f5910065" -dependencies = [ - "gtk", - "http", - "jni", - "log", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "once_cell", - "percent-encoding", - "raw-window-handle", - "softbuffer", - "tao", - "tauri-runtime", - "tauri-utils", - "url", - "webkit2gtk", - "webview2-com", - "windows", - "wry", -] - -[[package]] -name = "tauri-utils" -version = "2.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a423c51176eb3616ee9b516a9fa67fed5f0e78baaba680e44eb5dd2cc37490" -dependencies = [ - "anyhow", - "brotli", - "cargo_metadata", - "ctor", - "dunce", - "glob", - "html5ever", - "http", - "infer", - "json-patch", - "kuchikiki", - "log", - "memchr", - "phf 0.11.3", - "proc-macro2", - "quote", - "regex", - "schemars 0.8.22", - "semver", - "serde", - "serde-untagged", - "serde_json", - "serde_with", - "swift-rs", - "thiserror 2.0.17", - "toml 0.9.11+spec-1.1.0", - "url", - "urlpattern", - "uuid", - "walkdir", -] - -[[package]] -name = "tauri-winres" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1087b111fe2b005e42dbdc1990fc18593234238d47453b0c99b7de1c9ab2c1e0" -dependencies = [ - "dunce", - "embed-resource", - "toml 0.9.11+spec-1.1.0", + "objc", ] [[package]] @@ -4325,10 +6007,10 @@ version = "3.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" dependencies = [ - "fastrand", + "fastrand 2.3.0", "getrandom 0.3.4", "once_cell", - "rustix", + "rustix 1.1.3", "windows-sys 0.61.2", ] @@ -4343,6 +6025,15 @@ dependencies = [ "utf-8", ] +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + [[package]] name = "thiserror" version = "1.0.69" @@ -4354,11 +6045,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 2.0.17", + "thiserror-impl 2.0.18", ] [[package]] @@ -4374,9 +6065,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", @@ -4394,10 +6085,24 @@ dependencies = [ ] [[package]] -name = "time" -version = "0.3.45" +name = "tiff" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9e442fc33d7fdb45aa9bfeb312c095964abdf596f7567261062b2a7107aaabd" +checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f" +dependencies = [ + "fax", + "flate2", + "half", + "quick-error", + "weezl", + "zune-jpeg 0.4.21", +] + +[[package]] +name = "time" +version = "0.3.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9da98b7d9b7dad93488a84b8248efc35352b0b2657397d4167e7ad67e5d535e5" dependencies = [ "deranged", "itoa", @@ -4410,20 +6115,55 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b36ee98fd31ec7426d599183e8fe26932a8dc1fb76ddb6214d05493377d34ca" +checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" [[package]] name = "time-macros" -version = "0.2.25" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e552d1249bf61ac2a52db88179fd0673def1e1ad8243a00d9ec9ed71fee3dd" +checksum = "78cc610bac2dcee56805c99642447d4c5dbde4d01f752ffea0199aee1f601dc4" dependencies = [ "num-conv", "time-core", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "tiny-skia" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "png 0.17.16", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + [[package]] name = "tinystr" version = "0.8.2" @@ -4434,6 +6174,21 @@ dependencies = [ "zerovec", ] +[[package]] +name = "tinyvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + [[package]] name = "tokio" version = "1.49.0" @@ -4443,11 +6198,47 @@ dependencies = [ "bytes", "libc", "mio", + "parking_lot", "pin-project-lite", + "signal-hook-registry", "socket2", + "tokio-macros", "windows-sys 0.61.2", ] +[[package]] +name = "tokio-macros" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror 1.0.69", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.18" @@ -4463,14 +6254,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.2" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" dependencies = [ "serde", "serde_spanned 0.6.9", - "toml_datetime 0.6.3", - "toml_edit 0.20.2", + "toml_datetime 0.6.11", + "toml_edit 0.22.27", ] [[package]] @@ -4479,20 +6270,20 @@ version = "0.9.11+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" dependencies = [ - "indexmap 2.13.0", + "indexmap", "serde_core", "serde_spanned 1.0.4", "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "toml_writer", - "winnow 0.7.14", + "winnow", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" dependencies = [ "serde", ] @@ -4508,26 +6299,16 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.13.0", - "toml_datetime 0.6.3", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" -dependencies = [ - "indexmap 2.13.0", + "indexmap", "serde", "serde_spanned 0.6.9", - "toml_datetime 0.6.3", - "winnow 0.5.40", + "toml_datetime 0.6.11", + "toml_write", + "winnow", ] [[package]] @@ -4536,10 +6317,10 @@ version = "0.23.10+spec-1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" dependencies = [ - "indexmap 2.13.0", + "indexmap", "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", - "winnow 0.7.14", + "winnow", ] [[package]] @@ -4548,9 +6329,15 @@ version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" dependencies = [ - "winnow 0.7.14", + "winnow", ] +[[package]] +name = "toml_write" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" + [[package]] name = "toml_writer" version = "1.0.6+spec-1.1.0" @@ -4572,24 +6359,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "tower-http" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" -dependencies = [ - "bitflags 2.10.0", - "bytes", - "futures-util", - "http", - "http-body", - "iri-string", - "pin-project-lite", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-layer" version = "0.3.3" @@ -4634,25 +6403,44 @@ dependencies = [ ] [[package]] -name = "tray-icon" -version = "0.21.3" +name = "tree-sitter" +version = "0.25.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e85aa143ceb072062fc4d6356c1b520a51d636e7bc8e77ec94be3608e5e80c" +checksum = "78f873475d258561b06f1c595d93308a7ed124d9977cb26b148c2084a4a3cc87" dependencies = [ - "crossbeam-channel", - "dirs", - "libappindicator", - "muda", - "objc2", - "objc2-app-kit", - "objc2-core-foundation", - "objc2-core-graphics", - "objc2-foundation", - "once_cell", - "png", + "cc", + "regex", + "regex-syntax", + "serde_json", + "streaming-iterator", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-json" +version = "0.24.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d727acca406c0020cffc6cf35516764f36c8e3dc4408e5ebe2cb35a947ec471" +dependencies = [ + "cc", + "tree-sitter-language", +] + +[[package]] +name = "tree-sitter-language" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae62f7eae5eb549c71b76658648b72cc6111f2d87d24a1e31fa907f4943e3ce" + +[[package]] +name = "triomphe" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd69c5aa8f924c7519d6372789a74eac5b94fb0f8fcf0d4a97eb0bfc3e785f39" +dependencies = [ + "arc-swap", "serde", - "thiserror 2.0.17", - "windows-sys 0.60.2", + "stable_deref_trait", ] [[package]] @@ -4661,6 +6449,27 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "ttf-parser" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" + +[[package]] +name = "ttf-parser" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" + +[[package]] +name = "ttf-parser" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" +dependencies = [ + "core_maths", +] + [[package]] name = "typeid" version = "1.0.3" @@ -4694,45 +6503,46 @@ dependencies = [ ] [[package]] -name = "unic-char-property" -version = "0.9.0" +name = "unicase" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] +checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" [[package]] -name = "unic-char-range" -version = "0.9.0" +name = "unicode-bidi" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] -name = "unic-common" -version = "0.9.0" +name = "unicode-bidi-mirroring" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" [[package]] -name = "unic-ucd-ident" -version = "0.9.0" +name = "unicode-bidi-mirroring" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] +checksum = "5dfa6e8c60bb66d49db113e0125ee8711b7647b5579dc7f5f19c42357ed039fe" [[package]] -name = "unic-ucd-version" -version = "0.9.0" +name = "unicode-ccc" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" + +[[package]] +name = "unicode-ccc" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce61d488bcdc9bc8b5d1772c404828b17fc481c0a582b5581e95fb233aef503e" + +[[package]] +name = "unicode-id" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ba288e709927c043cbe476718d37be306be53fb1fafecd0dbe36d072be2580" [[package]] name = "unicode-ident" @@ -4740,18 +6550,48 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" +[[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-properties" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" + +[[package]] +name = "unicode-script" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee" + [[package]] name = "unicode-segmentation" version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + [[package]] name = "unicode-width" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-width" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" + [[package]] name = "unicode-xid" version = "0.2.6" @@ -4793,15 +6633,30 @@ dependencies = [ ] [[package]] -name = "urlpattern" -version = "0.3.0" +name = "usvg" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d" +checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef" dependencies = [ - "regex", - "serde", - "unic-ucd-ident", - "url", + "base64", + "data-url", + "flate2", + "fontdb 0.23.0", + "imagesize", + "kurbo", + "log", + "pico-args", + "roxmltree", + "rustybuzz 0.20.1", + "simplecss", + "siphasher", + "strict-num", + "svgtypes", + "tiny-skia-path", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "xmlwriter", ] [[package]] @@ -4818,21 +6673,63 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" +checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f" dependencies = [ "getrandom 0.3.4", "js-sys", "serde_core", + "sha1_smol", "wasm-bindgen", ] [[package]] -name = "version-compare" -version = "0.2.1" +name = "v_frame" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e" +checksum = "666b7727c8875d6ab5db9533418d7c764233ac9c0cff1d469aec8fa127597be2" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + +[[package]] +name = "value-bag" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba6f5989077681266825251a52748b8c1d8a4ad098cc37e440103d0ea717fc0" +dependencies = [ + "value-bag-serde1", + "value-bag-sval2", +] + +[[package]] +name = "value-bag-serde1" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16530907bfe2999a1773ca5900a65101e092c70f642f25cc23ca0c43573262c5" +dependencies = [ + "erased-serde", + "serde_core", + "serde_fmt", +] + +[[package]] +name = "value-bag-sval2" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d00ae130edd690eaa877e4f40605d534790d1cf1d651e7685bd6a144521b251f" +dependencies = [ + "sval", + "sval_buffer", + "sval_dynamic", + "sval_fmt", + "sval_json", + "sval_ref", + "sval_serde", +] [[package]] name = "version_check" @@ -4860,6 +6757,12 @@ dependencies = [ "libc", ] +[[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + [[package]] name = "walkdir" version = "2.5.0" @@ -4879,12 +6782,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.1+wasi-snapshot-preview1" @@ -4893,18 +6790,18 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.1+wasi-0.2.4" +version = "1.0.2+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" +checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" dependencies = [ "cfg-if", "once_cell", @@ -4915,11 +6812,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.56" +version = "0.4.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" +checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f" dependencies = [ "cfg-if", + "futures-util", "js-sys", "once_cell", "wasm-bindgen", @@ -4928,9 +6826,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" +checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4938,9 +6836,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" +checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" dependencies = [ "bumpalo", "proc-macro2", @@ -4951,9 +6849,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" +checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" dependencies = [ "unicode-ident", ] @@ -4972,93 +6870,138 @@ dependencies = [ ] [[package]] -name = "web-sys" -version = "0.3.83" +name = "wayland-backend" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" +checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9" +dependencies = [ + "cc", + "downcast-rs", + "rustix 1.1.3", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec" +dependencies = [ + "bitflags 2.10.0", + "rustix 1.1.3", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5864c4b5b6064b06b1e8b74ead4a98a6c45a285fe7a0e784d24735f011fdb078" +dependencies = [ + "rustix 1.1.3", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.10.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baeda9ffbcfc8cd6ddaade385eaf2393bd2115a69523c735f12242353c3df4f3" +dependencies = [ + "bitflags 2.10.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.10.0", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.31.2", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3" +dependencies = [ + "proc-macro2", + "quick-xml 0.38.4", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webkit2gtk" -version = "2.0.1" +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "gdk", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", - "javascriptcore-rs", - "libc", - "once_cell", - "soup3", - "webkit2gtk-sys", + "js-sys", + "wasm-bindgen", ] [[package]] -name = "webkit2gtk-sys" -version = "2.0.1" +name = "weezl" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c" -dependencies = [ - "bitflags 1.3.2", - "cairo-sys-rs", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk-sys", - "javascriptcore-rs-sys", - "libc", - "pkg-config", - "soup3-sys", - "system-deps", -] +checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" [[package]] -name = "webview2-com" -version = "0.38.2" +name = "which" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a" +checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" dependencies = [ - "webview2-com-macros", - "webview2-com-sys", - "windows", - "windows-core 0.61.2", - "windows-implement", - "windows-interface", -] - -[[package]] -name = "webview2-com-macros" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a921c1b6914c367b2b823cd4cde6f96beec77d30a939c8199bb377cf9b9b54" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.114", -] - -[[package]] -name = "webview2-com-sys" -version = "0.38.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c" -dependencies = [ - "thiserror 2.0.17", - "windows", - "windows-core 0.61.2", + "either", + "home", + "rustix 0.38.44", + "winsafe", ] [[package]] @@ -5093,18 +7036,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "window-vibrancy" -version = "0.6.0" +name = "windows" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ - "objc2", - "objc2-app-kit", - "objc2-core-foundation", - "objc2-foundation", - "raw-window-handle", - "windows-sys 0.59.0", - "windows-version", + "windows-core 0.57.0", + "windows-targets 0.52.6", ] [[package]] @@ -5120,6 +7058,19 @@ dependencies = [ "windows-numerics", ] +[[package]] +name = "windows-capture" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a4df73e95feddb9ec1a7e9c2ca6323b8c97d5eeeff78d28f1eccdf19c882b24" +dependencies = [ + "parking_lot", + "rayon", + "thiserror 2.0.18", + "windows 0.61.3", + "windows-future", +] + [[package]] name = "windows-collections" version = "0.2.0" @@ -5129,14 +7080,26 @@ dependencies = [ "windows-core 0.61.2", ] +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement 0.57.0", + "windows-interface 0.57.0", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-implement", - "windows-interface", + "windows-implement 0.60.2", + "windows-interface 0.59.3", "windows-link 0.1.3", "windows-result 0.3.4", "windows-strings 0.4.2", @@ -5148,8 +7111,8 @@ version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-implement", - "windows-interface", + "windows-implement 0.60.2", + "windows-interface 0.59.3", "windows-link 0.2.1", "windows-result 0.4.1", "windows-strings 0.5.1", @@ -5166,6 +7129,17 @@ dependencies = [ "windows-threading", ] +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + [[package]] name = "windows-implement" version = "0.60.2" @@ -5177,6 +7151,17 @@ dependencies = [ "syn 2.0.114", ] +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + [[package]] name = "windows-interface" version = "0.59.3" @@ -5210,6 +7195,37 @@ dependencies = [ "windows-link 0.1.3", ] +[[package]] +name = "windows-registry" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" +dependencies = [ + "windows-result 0.3.4", + "windows-strings 0.3.1", + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-registry" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" +dependencies = [ + "windows-link 0.1.3", + "windows-result 0.3.4", + "windows-strings 0.4.2", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-result" version = "0.3.4" @@ -5228,6 +7244,15 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "windows-strings" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" +dependencies = [ + "windows-link 0.1.3", +] + [[package]] name = "windows-strings" version = "0.4.2" @@ -5246,15 +7271,6 @@ dependencies = [ "windows-link 0.2.1", ] -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -5300,21 +7316,6 @@ dependencies = [ "windows-link 0.2.1", ] -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-targets" version = "0.48.5" @@ -5372,21 +7373,6 @@ dependencies = [ "windows-link 0.1.3", ] -[[package]] -name = "windows-version" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4060a1da109b9d0326b7262c8e12c84df67cc0dbc9e33cf49e01ccc2eb63631" -dependencies = [ - "windows-link 0.2.1", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -5405,12 +7391,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -5429,12 +7409,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -5465,12 +7439,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -5489,12 +7457,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -5513,12 +7475,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -5537,12 +7493,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -5561,15 +7511,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "0.7.14" @@ -5590,10 +7531,31 @@ dependencies = [ ] [[package]] -name = "wit-bindgen" -version = "0.46.0" +name = "winsafe" +version = "0.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + +[[package]] +name = "wio" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" +dependencies = [ + "winapi", +] + +[[package]] +name = "wit-bindgen" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" + +[[package]] +name = "workspace-hack" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beffa227304dbaea3ad6a06ac674f9bc83a3dec3b7f63eeb442de37e7cb6bb01" [[package]] name = "writeable" @@ -5601,51 +7563,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" -[[package]] -name = "wry" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728b7d4c8ec8d81cab295e0b5b8a4c263c0d41a785fb8f8c4df284e5411140a2" -dependencies = [ - "base64 0.22.1", - "block2", - "cookie", - "crossbeam-channel", - "dirs", - "dpi", - "dunce", - "gdkx11", - "gtk", - "html5ever", - "http", - "javascriptcore-rs", - "jni", - "kuchikiki", - "libc", - "ndk", - "objc2", - "objc2-app-kit", - "objc2-core-foundation", - "objc2-foundation", - "objc2-ui-kit", - "objc2-web-kit", - "once_cell", - "percent-encoding", - "raw-window-handle", - "sha2", - "soup3", - "tao-macros", - "thiserror 2.0.17", - "url", - "webkit2gtk", - "webkit2gtk-sys", - "webview2-com", - "windows", - "windows-core 0.61.2", - "windows-version", - "x11-dl", -] - [[package]] name = "x11" version = "2.21.0" @@ -5657,16 +7574,35 @@ dependencies = [ ] [[package]] -name = "x11-dl" -version = "2.21.0" +name = "x11-clipboard" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +checksum = "662d74b3d77e396b8e5beb00b9cad6a9eccf40b2ef68cc858784b14c41d535a3" dependencies = [ "libc", - "once_cell", - "pkg-config", + "x11rb", ] +[[package]] +name = "x11rb" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "rustix 1.1.3", + "x11rb-protocol", + "xcursor", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd" + [[package]] name = "x509-parser" version = "0.18.0" @@ -5677,13 +7613,116 @@ dependencies = [ "data-encoding", "der-parser", "lazy_static", - "nom", + "nom 7.1.3", "oid-registry", "rusticata-macros", - "thiserror 2.0.17", + "thiserror 2.0.18", "time", ] +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + +[[package]] +name = "xcb" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee4c580d8205abb0a5cf4eb7e927bd664e425b6c3263f9c5310583da96970cf6" +dependencies = [ + "bitflags 1.3.2", + "libc", + "quick-xml 0.30.0", + "x11", +] + +[[package]] +name = "xcursor" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" + +[[package]] +name = "xim-ctext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ac61a7062c40f3c37b6e82eeeef835d5cc7824b632a72784a89b3963c33284c" +dependencies = [ + "encoding_rs", +] + +[[package]] +name = "xim-parser" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dcee45f89572d5a65180af3a84e7ddb24f5ea690a6d3aa9de231281544dd7b7" +dependencies = [ + "bitflags 2.10.0", +] + +[[package]] +name = "xkbcommon" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9" +dependencies = [ + "as-raw-xcb-connection", + "libc", + "memmap2", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" + +[[package]] +name = "xml5ever" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bbb26405d8e919bc1547a5aa9abc95cbfa438f04844f5fdd9dc7596b748bf69" +dependencies = [ + "log", + "mac", + "markup5ever", +] + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "y4m" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448" + +[[package]] +name = "yazi" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5" + +[[package]] +name = "yeslogic-fontconfig-sys" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "503a066b4c037c440169d995b869046827dbc71263f6e8f3be6d77d4f3229dbd" +dependencies = [ + "dlib", + "once_cell", + "pkg-config", +] + [[package]] name = "yoke" version = "0.8.1" @@ -5709,9 +7748,9 @@ dependencies = [ [[package]] name = "zbus" -version = "5.13.1" +version = "5.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f79257df967b6779afa536788657777a0001f5b42524fcaf5038d4344df40b" +checksum = "1bfeff997a0aaa3eb20c4652baf788d2dfa6d2839a0ead0b3ff69ce2f9c4bdd1" dependencies = [ "async-broadcast", "async-executor", @@ -5723,20 +7762,20 @@ dependencies = [ "async-trait", "blocking", "enumflags2", - "event-listener", + "event-listener 5.4.1", "futures-core", - "futures-lite", + "futures-lite 2.6.1", "hex", "libc", "ordered-stream", - "rustix", + "rustix 1.1.3", "serde", "serde_repr", "tracing", "uds_windows", "uuid", "windows-sys 0.61.2", - "winnow 0.7.14", + "winnow", "zbus_macros", "zbus_names", "zvariant", @@ -5744,11 +7783,11 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "5.13.1" +version = "5.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aad23e2d2f91cae771c7af7a630a49e755f1eb74f8a46e9f6d5f7a146edf5a37" +checksum = "0bbd5a90dbe8feee5b13def448427ae314ccd26a49cac47905cafefb9ff846f1" dependencies = [ - "proc-macro-crate 3.4.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.114", @@ -5764,24 +7803,167 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f" dependencies = [ "serde", - "winnow 0.7.14", + "winnow", "zvariant", ] [[package]] -name = "zerocopy" -version = "0.8.33" +name = "zed-async-tar" +version = "0.5.0-zed" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd" +checksum = "6cf4b5f655e29700e473cb1acd914ab112b37b62f96f7e642d5fc6a0c02eb881" +dependencies = [ + "async-std", + "filetime", + "libc", + "pin-project", + "redox_syscall 0.2.16", + "xattr", +] + +[[package]] +name = "zed-font-kit" +version = "0.14.1-zed" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3898e450f36f852edda72e3f985c34426042c4951790b23b107f93394f9bff5" +dependencies = [ + "bitflags 2.10.0", + "byteorder", + "core-foundation 0.10.0", + "core-graphics 0.24.0", + "core-text", + "dirs 5.0.1", + "dwrote", + "float-ord", + "freetype-sys", + "lazy_static", + "libc", + "log", + "pathfinder_geometry", + "pathfinder_simd", + "walkdir", + "winapi", + "yeslogic-fontconfig-sys", +] + +[[package]] +name = "zed-reqwest" +version = "0.12.15-zed" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac2d05756ff48539950c3282ad7acf3817ad3f08797c205ad1c34a2ce03b9970" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls", + "tokio-socks", + "tokio-util", + "tower", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "windows-registry 0.4.0", +] + +[[package]] +name = "zed-scap" +version = "0.0.8-zed" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b338d705ae33a43ca00287c11129303a7a0aa57b101b72a1c08c863f698ac8" +dependencies = [ + "anyhow", + "cocoa 0.25.0", + "core-graphics-helmer-fork", + "log", + "objc", + "rand 0.8.5", + "screencapturekit", + "screencapturekit-sys", + "sysinfo", + "tao-core-video-sys", + "windows 0.61.3", + "windows-capture", + "x11", + "xcb", +] + +[[package]] +name = "zed-sum-tree" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d490156d0d7311855564d6e1d6dccab992405a0c0e15e1c8ef18920c02177e35" +dependencies = [ + "arrayvec", + "log", + "rayon", + "workspace-hack", +] + +[[package]] +name = "zed-xim" +version = "0.4.0-zed" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0b46ed118eba34d9ba53d94ddc0b665e0e06a2cf874cfa2dd5dec278148642" +dependencies = [ + "ahash", + "hashbrown 0.14.5", + "log", + "x11rb", + "xim-ctext", + "xim-parser", +] + +[[package]] +name = "zeno" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" + +[[package]] +name = "zerocopy" +version = "0.8.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71ddd76bcebeed25db614f82bf31a9f4222d3fbba300e6fb6c00afa26cbd4d9d" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1" +checksum = "d8187381b52e32220d50b255276aa16a084ec0a9017a0ca2152a1f55c539758d" dependencies = [ "proc-macro2", "quote", @@ -5809,6 +7991,26 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zeroize" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.114", +] + [[package]] name = "zerotrie" version = "0.2.3" @@ -5844,31 +8046,71 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd8f3f50b848df28f887acb68e41201b5aea6bc8a8dacc00fb40635ff9a72fea" +checksum = "02aae0f83f69aafc94776e879363e9771d7ecbffe2c7fbb6c14c5e00dfe88439" + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb8a0807f7c01457d0379ba880ba6322660448ddebc890ce29bb64da71fb40f9" + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zune-jpeg" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713" +dependencies = [ + "zune-core 0.4.12", +] + +[[package]] +name = "zune-jpeg" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2959ca473aae96a14ecedf501d20b3608d2825ba280d5adb57d651721885b0c2" +dependencies = [ + "zune-core 0.5.1", +] [[package]] name = "zvariant" -version = "5.9.1" +version = "5.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "326aaed414f04fe839777b4c443d4e94c74e7b3621093bd9c5e649ac8aa96543" +checksum = "68b64ef4f40c7951337ddc7023dd03528a57a3ce3408ee9da5e948bd29b232c4" dependencies = [ "endi", "enumflags2", "serde", - "winnow 0.7.14", + "url", + "winnow", "zvariant_derive", "zvariant_utils", ] [[package]] name = "zvariant_derive" -version = "5.9.1" +version = "5.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba44e1f8f4da9e6e2d25d2a60b116ef8b9d0be174a7685e55bb12a99866279a7" +checksum = "484d5d975eb7afb52cc6b929c13d3719a20ad650fea4120e6310de3fc55e415c" dependencies = [ - "proc-macro-crate 3.4.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.114", @@ -5885,5 +8127,5 @@ dependencies = [ "quote", "serde", "syn 2.0.114", - "winnow 0.7.14", + "winnow", ] diff --git a/src-tauri/Cargo.toml b/Cargo.toml similarity index 71% rename from src-tauri/Cargo.toml rename to Cargo.toml index 6feb856..c33a6f0 100644 --- a/src-tauri/Cargo.toml +++ b/Cargo.toml @@ -1,30 +1,20 @@ [package] name = "picoforge" -version = "0.3.0" +version = "0.4.0" description = "An open source commissioning tool for Pico FIDO security keys. Developed with Rust, Tauri, and Svelte." authors = ["Suyog Tandel", "PicoForge Contributers"] license = "AGPL-3.0" edition = "2024" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[lib] -# The `_lib` suffix may seem redundant but it is necessary -# to make the lib name unique and wouldn't conflict with the bin name. -# This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519 -name = "picoforge_lib" -crate-type = ["staticlib", "cdylib", "rlib"] - -[build-dependencies] -tauri-build = { version = "2", features = [] } - [dependencies] -tauri = { version = "2", features = ["macos-private-api"] } -tauri-plugin-opener = "2" -tauri-plugin-shell = "2" +tokio = { version = "1.0", features = ["full"] } serde = { version = "1", features = ["derive"] } serde_json = "1" +log = "0.4" # Logging facade +log4rs = "1" # For logging to output (like stdout) +directories = "6" # For Applcation config/data dir handling +# For device management backend: pcsc = "2" # Standard Smart Card API (connect to the key) hex = "0.4" # For parsing "CAFE:4242" VID/PID strings byteorder = "1.5" # Required for writing Big-Endian numbers (firmware requirement) @@ -37,10 +27,11 @@ rand = "0.9" bitflags = "2.10" ring = "0.17" # For signing fido2 messages with pin token -log = "0.4" # Logging facade -log4rs = "1" # For logging to output (like stdout) -# dirs = "6" -directories = "6" # For Applcation config/data dir handling +# For Application UI: +gpui = "0.2.2" +gpui-component = "0.5.0" +# Optional, for default bundled assets +gpui-component-assets = "0.5.0" [profile.dev] incremental = true # Compile your binary in smaller steps. diff --git a/biome.json b/biome.json deleted file mode 100644 index 4683f5f..0000000 --- a/biome.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "$schema": "https://biomejs.dev/schemas/2.3.11/schema.json", - "vcs": { - "enabled": true, - "clientKind": "git", - "useIgnoreFile": true - }, - "files": { - "ignoreUnknown": false, - "includes": [ - "src/**", - "!src/app.html", - "!src/app.css", - "!src/lib/components/ui/**", - "!src/lib/utils.ts", - "!src/lib/hooks/is-mobile.svelte.ts" - ] - }, - "formatter": { - "enabled": true, - "indentStyle": "space", - "indentWidth": 2, - "lineWidth": 140 - }, - "linter": { - "enabled": true, - "rules": { - "recommended": true - } - }, - "javascript": { - "formatter": { - "lineWidth": 120, - "quoteStyle": "double", - "semicolons": "always", - "trailingCommas": "es5" - } - }, - "html": { - "formatter": { - "lineWidth": 140 - } - }, - "assist": { - "enabled": true, - "actions": { - "source": { - "organizeImports": "on" - } - } - } -} diff --git a/components.json b/components.json deleted file mode 100644 index f258682..0000000 --- a/components.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$schema": "https://shadcn-svelte.com/schema.json", - "tailwind": { - "css": "src/app.css", - "baseColor": "zinc" - }, - "aliases": { - "components": "$lib/components", - "utils": "$lib/utils", - "ui": "$lib/components/ui", - "hooks": "$lib/hooks", - "lib": "$lib" - }, - "typescript": true, - "registry": "https://shadcn-svelte.com/registry" -} diff --git a/deno.json b/deno.json deleted file mode 100644 index 1751057..0000000 --- a/deno.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "unstable": ["fmt-component"], - - "fmt": { - "useTabs": false, - "indentWidth": 2, - "lineWidth": 140, - - "include": ["src"], - - "exclude": [ - "src/app.html", - "src/app.css", - - "src/lib/components/ui", - "src/lib/utils.ts", - "src/lib/hooks/is-mobile.svelte.ts" - ] - } -} - diff --git a/deno.lock b/deno.lock deleted file mode 100644 index 3328feb..0000000 --- a/deno.lock +++ /dev/null @@ -1,1138 +0,0 @@ -{ - "version": "5", - "specifiers": { - "npm:@biomejs/biome@^2.3.12": "2.3.12", - "npm:@internationalized/date@^3.10.1": "3.10.1", - "npm:@lucide/svelte@~0.563.1": "0.563.1_svelte@5.48.2__acorn@8.15.0", - "npm:@sveltejs/adapter-static@^3.0.6": "3.0.10_@sveltejs+kit@2.50.1__@sveltejs+vite-plugin-svelte@6.2.4___svelte@5.48.2____acorn@8.15.0___vite@7.3.1____picomatch@4.0.3__svelte@5.48.2___acorn@8.15.0__typescript@5.9.3__vite@7.3.1___picomatch@4.0.3__acorn@8.15.0_@sveltejs+vite-plugin-svelte@6.2.4__svelte@5.48.2___acorn@8.15.0__vite@7.3.1___picomatch@4.0.3_svelte@5.48.2__acorn@8.15.0_typescript@5.9.3_vite@7.3.1__picomatch@4.0.3", - "npm:@sveltejs/kit@^2.50.1": "2.50.1_@sveltejs+vite-plugin-svelte@6.2.4__svelte@5.48.2___acorn@8.15.0__vite@7.3.1___picomatch@4.0.3_svelte@5.48.2__acorn@8.15.0_typescript@5.9.3_vite@7.3.1__picomatch@4.0.3_acorn@8.15.0", - "npm:@sveltejs/vite-plugin-svelte@^6.2.4": "6.2.4_svelte@5.48.2__acorn@8.15.0_vite@7.3.1__picomatch@4.0.3", - "npm:@tailwindcss/vite@^4.1.18": "4.1.18_vite@7.3.1__picomatch@4.0.3", - "npm:@tauri-apps/api@2": "2.9.1", - "npm:@tauri-apps/cli@2": "2.9.6", - "npm:@tauri-apps/plugin-opener@2": "2.5.2", - "npm:@tauri-apps/plugin-shell@~2.3.4": "2.3.4", - "npm:bits-ui@^2.15.4": "2.15.4_@internationalized+date@3.10.1_svelte@5.48.2__acorn@8.15.0_@sveltejs+kit@2.50.1__@sveltejs+vite-plugin-svelte@6.2.4___svelte@5.48.2____acorn@8.15.0___vite@7.3.1____picomatch@4.0.3__svelte@5.48.2___acorn@8.15.0__typescript@5.9.3__vite@7.3.1___picomatch@4.0.3__acorn@8.15.0_@sveltejs+vite-plugin-svelte@6.2.4__svelte@5.48.2___acorn@8.15.0__vite@7.3.1___picomatch@4.0.3_typescript@5.9.3_vite@7.3.1__picomatch@4.0.3", - "npm:clsx@^2.1.1": "2.1.1", - "npm:svelte-check@4": "4.3.5_svelte@5.48.2__acorn@8.15.0_typescript@5.9.3", - "npm:svelte@^5.48.2": "5.48.2_acorn@8.15.0", - "npm:tailwind-merge@^3.4.0": "3.4.0", - "npm:tailwind-variants@^3.2.2": "3.2.2_tailwind-merge@3.4.0_tailwindcss@4.1.18", - "npm:tailwindcss@^4.1.18": "4.1.18", - "npm:tw-animate-css@^1.4.0": "1.4.0", - "npm:typescript@~5.9.3": "5.9.3", - "npm:vaul-svelte@^1.0.0-next.7": "1.0.0-next.7_svelte@5.48.2__acorn@8.15.0", - "npm:vite@^7.3.1": "7.3.1_picomatch@4.0.3" - }, - "npm": { - "@biomejs/biome@2.3.12": { - "integrity": "sha512-AR7h4aSlAvXj7TAajW/V12BOw2EiS0AqZWV5dGozf4nlLoUF/ifvD0+YgKSskT0ylA6dY1A8AwgP8kZ6yaCQnA==", - "optionalDependencies": [ - "@biomejs/cli-darwin-arm64", - "@biomejs/cli-darwin-x64", - "@biomejs/cli-linux-arm64", - "@biomejs/cli-linux-arm64-musl", - "@biomejs/cli-linux-x64", - "@biomejs/cli-linux-x64-musl", - "@biomejs/cli-win32-arm64", - "@biomejs/cli-win32-x64" - ], - "bin": true - }, - "@biomejs/cli-darwin-arm64@2.3.12": { - "integrity": "sha512-cO6fn+KiMBemva6EARDLQBxeyvLzgidaFRJi8G7OeRqz54kWK0E+uSjgFaiHlc3DZYoa0+1UFE8mDxozpc9ieg==", - "os": ["darwin"], - "cpu": ["arm64"] - }, - "@biomejs/cli-darwin-x64@2.3.12": { - "integrity": "sha512-/fiF/qmudKwSdvmSrSe/gOTkW77mHHkH8Iy7YC2rmpLuk27kbaUOPa7kPiH5l+3lJzTUfU/t6x1OuIq/7SGtxg==", - "os": ["darwin"], - "cpu": ["x64"] - }, - "@biomejs/cli-linux-arm64-musl@2.3.12": { - "integrity": "sha512-aqkeSf7IH+wkzFpKeDVPSXy9uDjxtLpYA6yzkYsY+tVjwFFirSuajHDI3ul8en90XNs1NA0n8kgBrjwRi5JeyA==", - "os": ["linux"], - "cpu": ["arm64"] - }, - "@biomejs/cli-linux-arm64@2.3.12": { - "integrity": "sha512-nbOsuQROa3DLla5vvsTZg+T5WVPGi9/vYxETm9BOuLHBJN3oWQIg3MIkE2OfL18df1ZtNkqXkH6Yg9mdTPem7A==", - "os": ["linux"], - "cpu": ["arm64"] - }, - "@biomejs/cli-linux-x64-musl@2.3.12": { - "integrity": "sha512-kVGWtupRRsOjvw47YFkk5mLiAdpCPMWBo1jOwAzh+juDpUb2sWarIp+iq+CPL1Wt0LLZnYtP7hH5kD6fskcxmg==", - "os": ["linux"], - "cpu": ["x64"] - }, - "@biomejs/cli-linux-x64@2.3.12": { - "integrity": "sha512-CQtqrJ+qEEI8tgRSTjjzk6wJAwfH3wQlkIGsM5dlecfRZaoT+XCms/mf7G4kWNexrke6mnkRzNy6w8ebV177ow==", - "os": ["linux"], - "cpu": ["x64"] - }, - "@biomejs/cli-win32-arm64@2.3.12": { - "integrity": "sha512-Re4I7UnOoyE4kHMqpgtG6UvSBGBbbtvsOvBROgCCoH7EgANN6plSQhvo2W7OCITvTp7gD6oZOyZy72lUdXjqZg==", - "os": ["win32"], - "cpu": ["arm64"] - }, - "@biomejs/cli-win32-x64@2.3.12": { - "integrity": "sha512-qqGVWqNNek0KikwPZlOIoxtXgsNGsX+rgdEzgw82Re8nF02W+E2WokaQhpF5TdBh/D/RQ3TLppH+otp6ztN0lw==", - "os": ["win32"], - "cpu": ["x64"] - }, - "@esbuild/aix-ppc64@0.27.2": { - "integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==", - "os": ["aix"], - "cpu": ["ppc64"] - }, - "@esbuild/android-arm64@0.27.2": { - "integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==", - "os": ["android"], - "cpu": ["arm64"] - }, - "@esbuild/android-arm@0.27.2": { - "integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==", - "os": ["android"], - "cpu": ["arm"] - }, - "@esbuild/android-x64@0.27.2": { - "integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==", - "os": ["android"], - "cpu": ["x64"] - }, - "@esbuild/darwin-arm64@0.27.2": { - "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==", - "os": ["darwin"], - "cpu": ["arm64"] - }, - "@esbuild/darwin-x64@0.27.2": { - "integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==", - "os": ["darwin"], - "cpu": ["x64"] - }, - "@esbuild/freebsd-arm64@0.27.2": { - "integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==", - "os": ["freebsd"], - "cpu": ["arm64"] - }, - "@esbuild/freebsd-x64@0.27.2": { - "integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==", - "os": ["freebsd"], - "cpu": ["x64"] - }, - "@esbuild/linux-arm64@0.27.2": { - "integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==", - "os": ["linux"], - "cpu": ["arm64"] - }, - "@esbuild/linux-arm@0.27.2": { - "integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==", - "os": ["linux"], - "cpu": ["arm"] - }, - "@esbuild/linux-ia32@0.27.2": { - "integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==", - "os": ["linux"], - "cpu": ["ia32"] - }, - "@esbuild/linux-loong64@0.27.2": { - "integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==", - "os": ["linux"], - "cpu": ["loong64"] - }, - "@esbuild/linux-mips64el@0.27.2": { - "integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==", - "os": ["linux"], - "cpu": ["mips64el"] - }, - "@esbuild/linux-ppc64@0.27.2": { - "integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==", - "os": ["linux"], - "cpu": ["ppc64"] - }, - "@esbuild/linux-riscv64@0.27.2": { - "integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==", - "os": ["linux"], - "cpu": ["riscv64"] - }, - "@esbuild/linux-s390x@0.27.2": { - "integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==", - "os": ["linux"], - "cpu": ["s390x"] - }, - "@esbuild/linux-x64@0.27.2": { - "integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==", - "os": ["linux"], - "cpu": ["x64"] - }, - "@esbuild/netbsd-arm64@0.27.2": { - "integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==", - "os": ["netbsd"], - "cpu": ["arm64"] - }, - "@esbuild/netbsd-x64@0.27.2": { - "integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==", - "os": ["netbsd"], - "cpu": ["x64"] - }, - "@esbuild/openbsd-arm64@0.27.2": { - "integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==", - "os": ["openbsd"], - "cpu": ["arm64"] - }, - "@esbuild/openbsd-x64@0.27.2": { - "integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==", - "os": ["openbsd"], - "cpu": ["x64"] - }, - "@esbuild/openharmony-arm64@0.27.2": { - "integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==", - "os": ["openharmony"], - "cpu": ["arm64"] - }, - "@esbuild/sunos-x64@0.27.2": { - "integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==", - "os": ["sunos"], - "cpu": ["x64"] - }, - "@esbuild/win32-arm64@0.27.2": { - "integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==", - "os": ["win32"], - "cpu": ["arm64"] - }, - "@esbuild/win32-ia32@0.27.2": { - "integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==", - "os": ["win32"], - "cpu": ["ia32"] - }, - "@esbuild/win32-x64@0.27.2": { - "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==", - "os": ["win32"], - "cpu": ["x64"] - }, - "@floating-ui/core@1.7.3": { - "integrity": "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==", - "dependencies": [ - "@floating-ui/utils" - ] - }, - "@floating-ui/dom@1.7.4": { - "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==", - "dependencies": [ - "@floating-ui/core", - "@floating-ui/utils" - ] - }, - "@floating-ui/utils@0.2.10": { - "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==" - }, - "@internationalized/date@3.10.1": { - "integrity": "sha512-oJrXtQiAXLvT9clCf1K4kxp3eKsQhIaZqxEyowkBcsvZDdZkbWrVmnGknxs5flTD0VGsxrxKgBCZty1EzoiMzA==", - "dependencies": [ - "@swc/helpers" - ] - }, - "@jridgewell/gen-mapping@0.3.13": { - "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", - "dependencies": [ - "@jridgewell/sourcemap-codec", - "@jridgewell/trace-mapping" - ] - }, - "@jridgewell/remapping@2.3.5": { - "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", - "dependencies": [ - "@jridgewell/gen-mapping", - "@jridgewell/trace-mapping" - ] - }, - "@jridgewell/resolve-uri@3.1.2": { - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==" - }, - "@jridgewell/sourcemap-codec@1.5.5": { - "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==" - }, - "@jridgewell/trace-mapping@0.3.31": { - "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", - "dependencies": [ - "@jridgewell/resolve-uri", - "@jridgewell/sourcemap-codec" - ] - }, - "@lucide/svelte@0.563.1_svelte@5.48.2__acorn@8.15.0": { - "integrity": "sha512-Kt+MbnE5D9RsuI/csmf7M+HWxALe57x3A0DhQ8pPnnUpneh7zuldrYjlT+veWtk+tVnp5doQtaAAxLujzIlhBw==", - "dependencies": [ - "svelte" - ] - }, - "@polka/url@1.0.0-next.29": { - "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==" - }, - "@rollup/rollup-android-arm-eabi@4.55.1": { - "integrity": "sha512-9R0DM/ykwfGIlNu6+2U09ga0WXeZ9MRC2Ter8jnz8415VbuIykVuc6bhdrbORFZANDmTDvq26mJrEVTl8TdnDg==", - "os": ["android"], - "cpu": ["arm"] - }, - "@rollup/rollup-android-arm64@4.55.1": { - "integrity": "sha512-eFZCb1YUqhTysgW3sj/55du5cG57S7UTNtdMjCW7LwVcj3dTTcowCsC8p7uBdzKsZYa8J7IDE8lhMI+HX1vQvg==", - "os": ["android"], - "cpu": ["arm64"] - }, - "@rollup/rollup-darwin-arm64@4.55.1": { - "integrity": "sha512-p3grE2PHcQm2e8PSGZdzIhCKbMCw/xi9XvMPErPhwO17vxtvCN5FEA2mSLgmKlCjHGMQTP6phuQTYWUnKewwGg==", - "os": ["darwin"], - "cpu": ["arm64"] - }, - "@rollup/rollup-darwin-x64@4.55.1": { - "integrity": "sha512-rDUjG25C9qoTm+e02Esi+aqTKSBYwVTaoS1wxcN47/Luqef57Vgp96xNANwt5npq9GDxsH7kXxNkJVEsWEOEaQ==", - "os": ["darwin"], - "cpu": ["x64"] - }, - "@rollup/rollup-freebsd-arm64@4.55.1": { - "integrity": "sha512-+JiU7Jbp5cdxekIgdte0jfcu5oqw4GCKr6i3PJTlXTCU5H5Fvtkpbs4XJHRmWNXF+hKmn4v7ogI5OQPaupJgOg==", - "os": ["freebsd"], - "cpu": ["arm64"] - }, - "@rollup/rollup-freebsd-x64@4.55.1": { - "integrity": "sha512-V5xC1tOVWtLLmr3YUk2f6EJK4qksksOYiz/TCsFHu/R+woubcLWdC9nZQmwjOAbmExBIVKsm1/wKmEy4z4u4Bw==", - "os": ["freebsd"], - "cpu": ["x64"] - }, - "@rollup/rollup-linux-arm-gnueabihf@4.55.1": { - "integrity": "sha512-Rn3n+FUk2J5VWx+ywrG/HGPTD9jXNbicRtTM11e/uorplArnXZYsVifnPPqNNP5BsO3roI4n8332ukpY/zN7rQ==", - "os": ["linux"], - "cpu": ["arm"] - }, - "@rollup/rollup-linux-arm-musleabihf@4.55.1": { - "integrity": "sha512-grPNWydeKtc1aEdrJDWk4opD7nFtQbMmV7769hiAaYyUKCT1faPRm2av8CX1YJsZ4TLAZcg9gTR1KvEzoLjXkg==", - "os": ["linux"], - "cpu": ["arm"] - }, - "@rollup/rollup-linux-arm64-gnu@4.55.1": { - "integrity": "sha512-a59mwd1k6x8tXKcUxSyISiquLwB5pX+fJW9TkWU46lCqD/GRDe9uDN31jrMmVP3feI3mhAdvcCClhV8V5MhJFQ==", - "os": ["linux"], - "cpu": ["arm64"] - }, - "@rollup/rollup-linux-arm64-musl@4.55.1": { - "integrity": "sha512-puS1MEgWX5GsHSoiAsF0TYrpomdvkaXm0CofIMG5uVkP6IBV+ZO9xhC5YEN49nsgYo1DuuMquF9+7EDBVYu4uA==", - "os": ["linux"], - "cpu": ["arm64"] - }, - "@rollup/rollup-linux-loong64-gnu@4.55.1": { - "integrity": "sha512-r3Wv40in+lTsULSb6nnoudVbARdOwb2u5fpeoOAZjFLznp6tDU8kd+GTHmJoqZ9lt6/Sys33KdIHUaQihFcu7g==", - "os": ["linux"], - "cpu": ["loong64"] - }, - "@rollup/rollup-linux-loong64-musl@4.55.1": { - "integrity": "sha512-MR8c0+UxAlB22Fq4R+aQSPBayvYa3+9DrwG/i1TKQXFYEaoW3B5b/rkSRIypcZDdWjWnpcvxbNaAJDcSbJU3Lw==", - "os": ["linux"], - "cpu": ["loong64"] - }, - "@rollup/rollup-linux-ppc64-gnu@4.55.1": { - "integrity": "sha512-3KhoECe1BRlSYpMTeVrD4sh2Pw2xgt4jzNSZIIPLFEsnQn9gAnZagW9+VqDqAHgm1Xc77LzJOo2LdigS5qZ+gw==", - "os": ["linux"], - "cpu": ["ppc64"] - }, - "@rollup/rollup-linux-ppc64-musl@4.55.1": { - "integrity": "sha512-ziR1OuZx0vdYZZ30vueNZTg73alF59DicYrPViG0NEgDVN8/Jl87zkAPu4u6VjZST2llgEUjaiNl9JM6HH1Vdw==", - "os": ["linux"], - "cpu": ["ppc64"] - }, - "@rollup/rollup-linux-riscv64-gnu@4.55.1": { - "integrity": "sha512-uW0Y12ih2XJRERZ4jAfKamTyIHVMPQnTZcQjme2HMVDAHY4amf5u414OqNYC+x+LzRdRcnIG1YodLrrtA8xsxw==", - "os": ["linux"], - "cpu": ["riscv64"] - }, - "@rollup/rollup-linux-riscv64-musl@4.55.1": { - "integrity": "sha512-u9yZ0jUkOED1BFrqu3BwMQoixvGHGZ+JhJNkNKY/hyoEgOwlqKb62qu+7UjbPSHYjiVy8kKJHvXKv5coH4wDeg==", - "os": ["linux"], - "cpu": ["riscv64"] - }, - "@rollup/rollup-linux-s390x-gnu@4.55.1": { - "integrity": "sha512-/0PenBCmqM4ZUd0190j7J0UsQ/1nsi735iPRakO8iPciE7BQ495Y6msPzaOmvx0/pn+eJVVlZrNrSh4WSYLxNg==", - "os": ["linux"], - "cpu": ["s390x"] - }, - "@rollup/rollup-linux-x64-gnu@4.55.1": { - "integrity": "sha512-a8G4wiQxQG2BAvo+gU6XrReRRqj+pLS2NGXKm8io19goR+K8lw269eTrPkSdDTALwMmJp4th2Uh0D8J9bEV1vg==", - "os": ["linux"], - "cpu": ["x64"] - }, - "@rollup/rollup-linux-x64-musl@4.55.1": { - "integrity": "sha512-bD+zjpFrMpP/hqkfEcnjXWHMw5BIghGisOKPj+2NaNDuVT+8Ds4mPf3XcPHuat1tz89WRL+1wbcxKY3WSbiT7w==", - "os": ["linux"], - "cpu": ["x64"] - }, - "@rollup/rollup-openbsd-x64@4.55.1": { - "integrity": "sha512-eLXw0dOiqE4QmvikfQ6yjgkg/xDM+MdU9YJuP4ySTibXU0oAvnEWXt7UDJmD4UkYialMfOGFPJnIHSe/kdzPxg==", - "os": ["openbsd"], - "cpu": ["x64"] - }, - "@rollup/rollup-openharmony-arm64@4.55.1": { - "integrity": "sha512-xzm44KgEP11te3S2HCSyYf5zIzWmx3n8HDCc7EE59+lTcswEWNpvMLfd9uJvVX8LCg9QWG67Xt75AuHn4vgsXw==", - "os": ["openharmony"], - "cpu": ["arm64"] - }, - "@rollup/rollup-win32-arm64-msvc@4.55.1": { - "integrity": "sha512-yR6Bl3tMC/gBok5cz/Qi0xYnVbIxGx5Fcf/ca0eB6/6JwOY+SRUcJfI0OpeTpPls7f194as62thCt/2BjxYN8g==", - "os": ["win32"], - "cpu": ["arm64"] - }, - "@rollup/rollup-win32-ia32-msvc@4.55.1": { - "integrity": "sha512-3fZBidchE0eY0oFZBnekYCfg+5wAB0mbpCBuofh5mZuzIU/4jIVkbESmd2dOsFNS78b53CYv3OAtwqkZZmU5nA==", - "os": ["win32"], - "cpu": ["ia32"] - }, - "@rollup/rollup-win32-x64-gnu@4.55.1": { - "integrity": "sha512-xGGY5pXj69IxKb4yv/POoocPy/qmEGhimy/FoTpTSVju3FYXUQQMFCaZZXJVidsmGxRioZAwpThl/4zX41gRKg==", - "os": ["win32"], - "cpu": ["x64"] - }, - "@rollup/rollup-win32-x64-msvc@4.55.1": { - "integrity": "sha512-SPEpaL6DX4rmcXtnhdrQYgzQ5W2uW3SCJch88lB2zImhJRhIIK44fkUrgIV/Q8yUNfw5oyZ5vkeQsZLhCb06lw==", - "os": ["win32"], - "cpu": ["x64"] - }, - "@standard-schema/spec@1.1.0": { - "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==" - }, - "@sveltejs/acorn-typescript@1.0.8_acorn@8.15.0": { - "integrity": "sha512-esgN+54+q0NjB0Y/4BomT9samII7jGwNy/2a3wNZbT2A2RpmXsXwUt24LvLhx6jUq2gVk4cWEvcRO6MFQbOfNA==", - "dependencies": [ - "acorn" - ] - }, - "@sveltejs/adapter-static@3.0.10_@sveltejs+kit@2.50.1__@sveltejs+vite-plugin-svelte@6.2.4___svelte@5.48.2____acorn@8.15.0___vite@7.3.1____picomatch@4.0.3__svelte@5.48.2___acorn@8.15.0__typescript@5.9.3__vite@7.3.1___picomatch@4.0.3__acorn@8.15.0_@sveltejs+vite-plugin-svelte@6.2.4__svelte@5.48.2___acorn@8.15.0__vite@7.3.1___picomatch@4.0.3_svelte@5.48.2__acorn@8.15.0_typescript@5.9.3_vite@7.3.1__picomatch@4.0.3": { - "integrity": "sha512-7D9lYFWJmB7zxZyTE/qxjksvMqzMuYrrsyh1f4AlZqeZeACPRySjbC3aFiY55wb1tWUaKOQG9PVbm74JcN2Iew==", - "dependencies": [ - "@sveltejs/kit" - ] - }, - "@sveltejs/kit@2.50.1_@sveltejs+vite-plugin-svelte@6.2.4__svelte@5.48.2___acorn@8.15.0__vite@7.3.1___picomatch@4.0.3_svelte@5.48.2__acorn@8.15.0_typescript@5.9.3_vite@7.3.1__picomatch@4.0.3_acorn@8.15.0": { - "integrity": "sha512-XRHD2i3zC4ukhz2iCQzO4mbsts081PAZnnMAQ7LNpWeYgeBmwMsalf0FGSwhFXBbtr2XViPKnFJBDCckWqrsLw==", - "dependencies": [ - "@standard-schema/spec", - "@sveltejs/acorn-typescript", - "@sveltejs/vite-plugin-svelte", - "@types/cookie", - "acorn", - "cookie", - "devalue", - "esm-env", - "kleur", - "magic-string", - "mrmime", - "sade", - "set-cookie-parser", - "sirv", - "svelte", - "typescript", - "vite" - ], - "optionalPeers": [ - "typescript" - ], - "bin": true - }, - "@sveltejs/vite-plugin-svelte-inspector@5.0.2_@sveltejs+vite-plugin-svelte@6.2.4__svelte@5.48.2___acorn@8.15.0__vite@7.3.1___picomatch@4.0.3_svelte@5.48.2__acorn@8.15.0_vite@7.3.1__picomatch@4.0.3": { - "integrity": "sha512-TZzRTcEtZffICSAoZGkPSl6Etsj2torOVrx6Uw0KpXxrec9Gg6jFWQ60Q3+LmNGfZSxHRCZL7vXVZIWmuV50Ig==", - "dependencies": [ - "@sveltejs/vite-plugin-svelte", - "obug", - "svelte", - "vite" - ] - }, - "@sveltejs/vite-plugin-svelte@6.2.4_svelte@5.48.2__acorn@8.15.0_vite@7.3.1__picomatch@4.0.3": { - "integrity": "sha512-ou/d51QSdTyN26D7h6dSpusAKaZkAiGM55/AKYi+9AGZw7q85hElbjK3kEyzXHhLSnRISHOYzVge6x0jRZ7DXA==", - "dependencies": [ - "@sveltejs/vite-plugin-svelte-inspector", - "deepmerge", - "magic-string", - "obug", - "svelte", - "vite", - "vitefu" - ] - }, - "@swc/helpers@0.5.18": { - "integrity": "sha512-TXTnIcNJQEKwThMMqBXsZ4VGAza6bvN4pa41Rkqoio6QBKMvo+5lexeTMScGCIxtzgQJzElcvIltani+adC5PQ==", - "dependencies": [ - "tslib" - ] - }, - "@tailwindcss/node@4.1.18": { - "integrity": "sha512-DoR7U1P7iYhw16qJ49fgXUlry1t4CpXeErJHnQ44JgTSKMaZUdf17cfn5mHchfJ4KRBZRFA/Coo+MUF5+gOaCQ==", - "dependencies": [ - "@jridgewell/remapping", - "enhanced-resolve", - "jiti", - "lightningcss", - "magic-string", - "source-map-js", - "tailwindcss" - ] - }, - "@tailwindcss/oxide-android-arm64@4.1.18": { - "integrity": "sha512-dJHz7+Ugr9U/diKJA0W6N/6/cjI+ZTAoxPf9Iz9BFRF2GzEX8IvXxFIi/dZBloVJX/MZGvRuFA9rqwdiIEZQ0Q==", - "os": ["android"], - "cpu": ["arm64"] - }, - "@tailwindcss/oxide-darwin-arm64@4.1.18": { - "integrity": "sha512-Gc2q4Qhs660bhjyBSKgq6BYvwDz4G+BuyJ5H1xfhmDR3D8HnHCmT/BSkvSL0vQLy/nkMLY20PQ2OoYMO15Jd0A==", - "os": ["darwin"], - "cpu": ["arm64"] - }, - "@tailwindcss/oxide-darwin-x64@4.1.18": { - "integrity": "sha512-FL5oxr2xQsFrc3X9o1fjHKBYBMD1QZNyc1Xzw/h5Qu4XnEBi3dZn96HcHm41c/euGV+GRiXFfh2hUCyKi/e+yw==", - "os": ["darwin"], - "cpu": ["x64"] - }, - "@tailwindcss/oxide-freebsd-x64@4.1.18": { - "integrity": "sha512-Fj+RHgu5bDodmV1dM9yAxlfJwkkWvLiRjbhuO2LEtwtlYlBgiAT4x/j5wQr1tC3SANAgD+0YcmWVrj8R9trVMA==", - "os": ["freebsd"], - "cpu": ["x64"] - }, - "@tailwindcss/oxide-linux-arm-gnueabihf@4.1.18": { - "integrity": "sha512-Fp+Wzk/Ws4dZn+LV2Nqx3IilnhH51YZoRaYHQsVq3RQvEl+71VGKFpkfHrLM/Li+kt5c0DJe/bHXK1eHgDmdiA==", - "os": ["linux"], - "cpu": ["arm"] - }, - "@tailwindcss/oxide-linux-arm64-gnu@4.1.18": { - "integrity": "sha512-S0n3jboLysNbh55Vrt7pk9wgpyTTPD0fdQeh7wQfMqLPM/Hrxi+dVsLsPrycQjGKEQk85Kgbx+6+QnYNiHalnw==", - "os": ["linux"], - "cpu": ["arm64"] - }, - "@tailwindcss/oxide-linux-arm64-musl@4.1.18": { - "integrity": "sha512-1px92582HkPQlaaCkdRcio71p8bc8i/ap5807tPRDK/uw953cauQBT8c5tVGkOwrHMfc2Yh6UuxaH4vtTjGvHg==", - "os": ["linux"], - "cpu": ["arm64"] - }, - "@tailwindcss/oxide-linux-x64-gnu@4.1.18": { - "integrity": "sha512-v3gyT0ivkfBLoZGF9LyHmts0Isc8jHZyVcbzio6Wpzifg/+5ZJpDiRiUhDLkcr7f/r38SWNe7ucxmGW3j3Kb/g==", - "os": ["linux"], - "cpu": ["x64"] - }, - "@tailwindcss/oxide-linux-x64-musl@4.1.18": { - "integrity": "sha512-bhJ2y2OQNlcRwwgOAGMY0xTFStt4/wyU6pvI6LSuZpRgKQwxTec0/3Scu91O8ir7qCR3AuepQKLU/kX99FouqQ==", - "os": ["linux"], - "cpu": ["x64"] - }, - "@tailwindcss/oxide-wasm32-wasi@4.1.18": { - "integrity": "sha512-LffYTvPjODiP6PT16oNeUQJzNVyJl1cjIebq/rWWBF+3eDst5JGEFSc5cWxyRCJ0Mxl+KyIkqRxk1XPEs9x8TA==", - "cpu": ["wasm32"] - }, - "@tailwindcss/oxide-win32-arm64-msvc@4.1.18": { - "integrity": "sha512-HjSA7mr9HmC8fu6bdsZvZ+dhjyGCLdotjVOgLA2vEqxEBZaQo9YTX4kwgEvPCpRh8o4uWc4J/wEoFzhEmjvPbA==", - "os": ["win32"], - "cpu": ["arm64"] - }, - "@tailwindcss/oxide-win32-x64-msvc@4.1.18": { - "integrity": "sha512-bJWbyYpUlqamC8dpR7pfjA0I7vdF6t5VpUGMWRkXVE3AXgIZjYUYAK7II1GNaxR8J1SSrSrppRar8G++JekE3Q==", - "os": ["win32"], - "cpu": ["x64"] - }, - "@tailwindcss/oxide@4.1.18": { - "integrity": "sha512-EgCR5tTS5bUSKQgzeMClT6iCY3ToqE1y+ZB0AKldj809QXk1Y+3jB0upOYZrn9aGIzPtUsP7sX4QQ4XtjBB95A==", - "optionalDependencies": [ - "@tailwindcss/oxide-android-arm64", - "@tailwindcss/oxide-darwin-arm64", - "@tailwindcss/oxide-darwin-x64", - "@tailwindcss/oxide-freebsd-x64", - "@tailwindcss/oxide-linux-arm-gnueabihf", - "@tailwindcss/oxide-linux-arm64-gnu", - "@tailwindcss/oxide-linux-arm64-musl", - "@tailwindcss/oxide-linux-x64-gnu", - "@tailwindcss/oxide-linux-x64-musl", - "@tailwindcss/oxide-wasm32-wasi", - "@tailwindcss/oxide-win32-arm64-msvc", - "@tailwindcss/oxide-win32-x64-msvc" - ] - }, - "@tailwindcss/vite@4.1.18_vite@7.3.1__picomatch@4.0.3": { - "integrity": "sha512-jVA+/UpKL1vRLg6Hkao5jldawNmRo7mQYrZtNHMIVpLfLhDml5nMRUo/8MwoX2vNXvnaXNNMedrMfMugAVX1nA==", - "dependencies": [ - "@tailwindcss/node", - "@tailwindcss/oxide", - "tailwindcss", - "vite" - ] - }, - "@tauri-apps/api@2.9.1": { - "integrity": "sha512-IGlhP6EivjXHepbBic618GOmiWe4URJiIeZFlB7x3czM0yDHHYviH1Xvoiv4FefdkQtn6v7TuwWCRfOGdnVUGw==" - }, - "@tauri-apps/cli-darwin-arm64@2.9.6": { - "integrity": "sha512-gf5no6N9FCk1qMrti4lfwP77JHP5haASZgVbBgpZG7BUepB3fhiLCXGUK8LvuOjP36HivXewjg72LTnPDScnQQ==", - "os": ["darwin"], - "cpu": ["arm64"] - }, - "@tauri-apps/cli-darwin-x64@2.9.6": { - "integrity": "sha512-oWh74WmqbERwwrwcueJyY6HYhgCksUc6NT7WKeXyrlY/FPmNgdyQAgcLuTSkhRFuQ6zh4Np1HZpOqCTpeZBDcw==", - "os": ["darwin"], - "cpu": ["x64"] - }, - "@tauri-apps/cli-linux-arm-gnueabihf@2.9.6": { - "integrity": "sha512-/zde3bFroFsNXOHN204DC2qUxAcAanUjVXXSdEGmhwMUZeAQalNj5cz2Qli2elsRjKN/hVbZOJj0gQ5zaYUjSg==", - "os": ["linux"], - "cpu": ["arm"] - }, - "@tauri-apps/cli-linux-arm64-gnu@2.9.6": { - "integrity": "sha512-pvbljdhp9VOo4RnID5ywSxgBs7qiylTPlK56cTk7InR3kYSTJKYMqv/4Q/4rGo/mG8cVppesKIeBMH42fw6wjg==", - "os": ["linux"], - "cpu": ["arm64"] - }, - "@tauri-apps/cli-linux-arm64-musl@2.9.6": { - "integrity": "sha512-02TKUndpodXBCR0oP//6dZWGYcc22Upf2eP27NvC6z0DIqvkBBFziQUcvi2n6SrwTRL0yGgQjkm9K5NIn8s6jw==", - "os": ["linux"], - "cpu": ["arm64"] - }, - "@tauri-apps/cli-linux-riscv64-gnu@2.9.6": { - "integrity": "sha512-fmp1hnulbqzl1GkXl4aTX9fV+ubHw2LqlLH1PE3BxZ11EQk+l/TmiEongjnxF0ie4kV8DQfDNJ1KGiIdWe1GvQ==", - "os": ["linux"], - "cpu": ["riscv64"] - }, - "@tauri-apps/cli-linux-x64-gnu@2.9.6": { - "integrity": "sha512-vY0le8ad2KaV1PJr+jCd8fUF9VOjwwQP/uBuTJvhvKTloEwxYA/kAjKK9OpIslGA9m/zcnSo74czI6bBrm2sYA==", - "os": ["linux"], - "cpu": ["x64"] - }, - "@tauri-apps/cli-linux-x64-musl@2.9.6": { - "integrity": "sha512-TOEuB8YCFZTWVDzsO2yW0+zGcoMiPPwcUgdnW1ODnmgfwccpnihDRoks+ABT1e3fHb1ol8QQWsHSCovb3o2ENQ==", - "os": ["linux"], - "cpu": ["x64"] - }, - "@tauri-apps/cli-win32-arm64-msvc@2.9.6": { - "integrity": "sha512-ujmDGMRc4qRLAnj8nNG26Rlz9klJ0I0jmZs2BPpmNNf0gM/rcVHhqbEkAaHPTBVIrtUdf7bGvQAD2pyIiUrBHQ==", - "os": ["win32"], - "cpu": ["arm64"] - }, - "@tauri-apps/cli-win32-ia32-msvc@2.9.6": { - "integrity": "sha512-S4pT0yAJgFX8QRCyKA1iKjZ9Q/oPjCZf66A/VlG5Yw54Nnr88J1uBpmenINbXxzyhduWrIXBaUbEY1K80ZbpMg==", - "os": ["win32"], - "cpu": ["ia32"] - }, - "@tauri-apps/cli-win32-x64-msvc@2.9.6": { - "integrity": "sha512-ldWuWSSkWbKOPjQMJoYVj9wLHcOniv7diyI5UAJ4XsBdtaFB0pKHQsqw/ItUma0VXGC7vB4E9fZjivmxur60aw==", - "os": ["win32"], - "cpu": ["x64"] - }, - "@tauri-apps/cli@2.9.6": { - "integrity": "sha512-3xDdXL5omQ3sPfBfdC8fCtDKcnyV7OqyzQgfyT5P3+zY6lcPqIYKQBvUasNvppi21RSdfhy44ttvJmftb0PCDw==", - "optionalDependencies": [ - "@tauri-apps/cli-darwin-arm64", - "@tauri-apps/cli-darwin-x64", - "@tauri-apps/cli-linux-arm-gnueabihf", - "@tauri-apps/cli-linux-arm64-gnu", - "@tauri-apps/cli-linux-arm64-musl", - "@tauri-apps/cli-linux-riscv64-gnu", - "@tauri-apps/cli-linux-x64-gnu", - "@tauri-apps/cli-linux-x64-musl", - "@tauri-apps/cli-win32-arm64-msvc", - "@tauri-apps/cli-win32-ia32-msvc", - "@tauri-apps/cli-win32-x64-msvc" - ], - "bin": true - }, - "@tauri-apps/plugin-opener@2.5.2": { - "integrity": "sha512-ei/yRRoCklWHImwpCcDK3VhNXx+QXM9793aQ64YxpqVF0BDuuIlXhZgiAkc15wnPVav+IbkYhmDJIv5R326Mew==", - "dependencies": [ - "@tauri-apps/api" - ] - }, - "@tauri-apps/plugin-shell@2.3.4": { - "integrity": "sha512-ktsRWf8wHLD17aZEyqE8c5x98eNAuTizR1FSX475zQ4TxaiJnhwksLygQz+AGwckJL5bfEP13nWrlTNQJUpKpA==", - "dependencies": [ - "@tauri-apps/api" - ] - }, - "@types/cookie@0.6.0": { - "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==" - }, - "@types/estree@1.0.8": { - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==" - }, - "acorn@8.15.0": { - "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", - "bin": true - }, - "aria-query@5.3.2": { - "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==" - }, - "axobject-query@4.1.0": { - "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==" - }, - "bits-ui@2.15.4_@internationalized+date@3.10.1_svelte@5.48.2__acorn@8.15.0_@sveltejs+kit@2.50.1__@sveltejs+vite-plugin-svelte@6.2.4___svelte@5.48.2____acorn@8.15.0___vite@7.3.1____picomatch@4.0.3__svelte@5.48.2___acorn@8.15.0__typescript@5.9.3__vite@7.3.1___picomatch@4.0.3__acorn@8.15.0_@sveltejs+vite-plugin-svelte@6.2.4__svelte@5.48.2___acorn@8.15.0__vite@7.3.1___picomatch@4.0.3_typescript@5.9.3_vite@7.3.1__picomatch@4.0.3": { - "integrity": "sha512-7H9YUfp03KOk1LVDh8wPYSRPxlZgG/GRWLNSA8QC73/8Z8ytun+DWJhIuibyFyz7A0cP/RANVcB4iDrbY8q+Og==", - "dependencies": [ - "@floating-ui/core", - "@floating-ui/dom", - "@internationalized/date", - "esm-env", - "runed@0.35.1_@sveltejs+kit@2.50.1__@sveltejs+vite-plugin-svelte@6.2.4___svelte@5.48.2____acorn@8.15.0___vite@7.3.1____picomatch@4.0.3__svelte@5.48.2___acorn@8.15.0__typescript@5.9.3__vite@7.3.1___picomatch@4.0.3__acorn@8.15.0_svelte@5.48.2__acorn@8.15.0_@sveltejs+vite-plugin-svelte@6.2.4__svelte@5.48.2___acorn@8.15.0__vite@7.3.1___picomatch@4.0.3_typescript@5.9.3_vite@7.3.1__picomatch@4.0.3", - "svelte", - "svelte-toolbelt@0.10.6_svelte@5.48.2__acorn@8.15.0_@sveltejs+kit@2.50.1__@sveltejs+vite-plugin-svelte@6.2.4___svelte@5.48.2____acorn@8.15.0___vite@7.3.1____picomatch@4.0.3__svelte@5.48.2___acorn@8.15.0__typescript@5.9.3__vite@7.3.1___picomatch@4.0.3__acorn@8.15.0_@sveltejs+vite-plugin-svelte@6.2.4__svelte@5.48.2___acorn@8.15.0__vite@7.3.1___picomatch@4.0.3_typescript@5.9.3_vite@7.3.1__picomatch@4.0.3", - "tabbable" - ] - }, - "chokidar@4.0.3": { - "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", - "dependencies": [ - "readdirp" - ] - }, - "clsx@2.1.1": { - "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==" - }, - "cookie@0.6.0": { - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==" - }, - "deepmerge@4.3.1": { - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==" - }, - "dequal@2.0.3": { - "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==" - }, - "detect-libc@2.1.2": { - "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==" - }, - "devalue@5.6.2": { - "integrity": "sha512-nPRkjWzzDQlsejL1WVifk5rvcFi/y1onBRxjaFMjZeR9mFpqu2gmAZ9xUB9/IEanEP/vBtGeGganC/GO1fmufg==" - }, - "enhanced-resolve@5.18.4": { - "integrity": "sha512-LgQMM4WXU3QI+SYgEc2liRgznaD5ojbmY3sb8LxyguVkIg5FxdpTkvk72te2R38/TGKxH634oLxXRGY6d7AP+Q==", - "dependencies": [ - "graceful-fs", - "tapable" - ] - }, - "esbuild@0.27.2": { - "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==", - "optionalDependencies": [ - "@esbuild/aix-ppc64", - "@esbuild/android-arm", - "@esbuild/android-arm64", - "@esbuild/android-x64", - "@esbuild/darwin-arm64", - "@esbuild/darwin-x64", - "@esbuild/freebsd-arm64", - "@esbuild/freebsd-x64", - "@esbuild/linux-arm", - "@esbuild/linux-arm64", - "@esbuild/linux-ia32", - "@esbuild/linux-loong64", - "@esbuild/linux-mips64el", - "@esbuild/linux-ppc64", - "@esbuild/linux-riscv64", - "@esbuild/linux-s390x", - "@esbuild/linux-x64", - "@esbuild/netbsd-arm64", - "@esbuild/netbsd-x64", - "@esbuild/openbsd-arm64", - "@esbuild/openbsd-x64", - "@esbuild/openharmony-arm64", - "@esbuild/sunos-x64", - "@esbuild/win32-arm64", - "@esbuild/win32-ia32", - "@esbuild/win32-x64" - ], - "scripts": true, - "bin": true - }, - "esm-env@1.2.2": { - "integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==" - }, - "esrap@2.2.1": { - "integrity": "sha512-GiYWG34AN/4CUyaWAgunGt0Rxvr1PTMlGC0vvEov/uOQYWne2bpN03Um+k8jT+q3op33mKouP2zeJ6OlM+qeUg==", - "dependencies": [ - "@jridgewell/sourcemap-codec" - ] - }, - "fdir@6.5.0_picomatch@4.0.3": { - "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", - "dependencies": [ - "picomatch" - ], - "optionalPeers": [ - "picomatch" - ] - }, - "fsevents@2.3.3": { - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "os": ["darwin"], - "scripts": true - }, - "graceful-fs@4.2.11": { - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" - }, - "inline-style-parser@0.2.7": { - "integrity": "sha512-Nb2ctOyNR8DqQoR0OwRG95uNWIC0C1lCgf5Naz5H6Ji72KZ8OcFZLz2P5sNgwlyoJ8Yif11oMuYs5pBQa86csA==" - }, - "is-reference@3.0.3": { - "integrity": "sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==", - "dependencies": [ - "@types/estree" - ] - }, - "jiti@2.6.1": { - "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==", - "bin": true - }, - "kleur@4.1.5": { - "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==" - }, - "lightningcss-android-arm64@1.30.2": { - "integrity": "sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A==", - "os": ["android"], - "cpu": ["arm64"] - }, - "lightningcss-darwin-arm64@1.30.2": { - "integrity": "sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==", - "os": ["darwin"], - "cpu": ["arm64"] - }, - "lightningcss-darwin-x64@1.30.2": { - "integrity": "sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ==", - "os": ["darwin"], - "cpu": ["x64"] - }, - "lightningcss-freebsd-x64@1.30.2": { - "integrity": "sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA==", - "os": ["freebsd"], - "cpu": ["x64"] - }, - "lightningcss-linux-arm-gnueabihf@1.30.2": { - "integrity": "sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA==", - "os": ["linux"], - "cpu": ["arm"] - }, - "lightningcss-linux-arm64-gnu@1.30.2": { - "integrity": "sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A==", - "os": ["linux"], - "cpu": ["arm64"] - }, - "lightningcss-linux-arm64-musl@1.30.2": { - "integrity": "sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==", - "os": ["linux"], - "cpu": ["arm64"] - }, - "lightningcss-linux-x64-gnu@1.30.2": { - "integrity": "sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==", - "os": ["linux"], - "cpu": ["x64"] - }, - "lightningcss-linux-x64-musl@1.30.2": { - "integrity": "sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==", - "os": ["linux"], - "cpu": ["x64"] - }, - "lightningcss-win32-arm64-msvc@1.30.2": { - "integrity": "sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==", - "os": ["win32"], - "cpu": ["arm64"] - }, - "lightningcss-win32-x64-msvc@1.30.2": { - "integrity": "sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==", - "os": ["win32"], - "cpu": ["x64"] - }, - "lightningcss@1.30.2": { - "integrity": "sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==", - "dependencies": [ - "detect-libc" - ], - "optionalDependencies": [ - "lightningcss-android-arm64", - "lightningcss-darwin-arm64", - "lightningcss-darwin-x64", - "lightningcss-freebsd-x64", - "lightningcss-linux-arm-gnueabihf", - "lightningcss-linux-arm64-gnu", - "lightningcss-linux-arm64-musl", - "lightningcss-linux-x64-gnu", - "lightningcss-linux-x64-musl", - "lightningcss-win32-arm64-msvc", - "lightningcss-win32-x64-msvc" - ] - }, - "locate-character@3.0.0": { - "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==" - }, - "lz-string@1.5.0": { - "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", - "bin": true - }, - "magic-string@0.30.21": { - "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", - "dependencies": [ - "@jridgewell/sourcemap-codec" - ] - }, - "mri@1.2.0": { - "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==" - }, - "mrmime@2.0.1": { - "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==" - }, - "nanoid@3.3.11": { - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", - "bin": true - }, - "obug@2.1.1": { - "integrity": "sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==" - }, - "picocolors@1.1.1": { - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" - }, - "picomatch@4.0.3": { - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==" - }, - "postcss@8.5.6": { - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", - "dependencies": [ - "nanoid", - "picocolors", - "source-map-js" - ] - }, - "readdirp@4.1.2": { - "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==" - }, - "rollup@4.55.1": { - "integrity": "sha512-wDv/Ht1BNHB4upNbK74s9usvl7hObDnvVzknxqY/E/O3X6rW1U1rV1aENEfJ54eFZDTNo7zv1f5N4edCluH7+A==", - "dependencies": [ - "@types/estree" - ], - "optionalDependencies": [ - "@rollup/rollup-android-arm-eabi", - "@rollup/rollup-android-arm64", - "@rollup/rollup-darwin-arm64", - "@rollup/rollup-darwin-x64", - "@rollup/rollup-freebsd-arm64", - "@rollup/rollup-freebsd-x64", - "@rollup/rollup-linux-arm-gnueabihf", - "@rollup/rollup-linux-arm-musleabihf", - "@rollup/rollup-linux-arm64-gnu", - "@rollup/rollup-linux-arm64-musl", - "@rollup/rollup-linux-loong64-gnu", - "@rollup/rollup-linux-loong64-musl", - "@rollup/rollup-linux-ppc64-gnu", - "@rollup/rollup-linux-ppc64-musl", - "@rollup/rollup-linux-riscv64-gnu", - "@rollup/rollup-linux-riscv64-musl", - "@rollup/rollup-linux-s390x-gnu", - "@rollup/rollup-linux-x64-gnu", - "@rollup/rollup-linux-x64-musl", - "@rollup/rollup-openbsd-x64", - "@rollup/rollup-openharmony-arm64", - "@rollup/rollup-win32-arm64-msvc", - "@rollup/rollup-win32-ia32-msvc", - "@rollup/rollup-win32-x64-gnu", - "@rollup/rollup-win32-x64-msvc", - "fsevents" - ], - "bin": true - }, - "runed@0.23.4_svelte@5.48.2__acorn@8.15.0": { - "integrity": "sha512-9q8oUiBYeXIDLWNK5DfCWlkL0EW3oGbk845VdKlPeia28l751VpfesaB/+7pI6rnbx1I6rqoZ2fZxptOJLxILA==", - "dependencies": [ - "esm-env", - "svelte" - ] - }, - "runed@0.35.1_@sveltejs+kit@2.50.1__@sveltejs+vite-plugin-svelte@6.2.4___svelte@5.48.2____acorn@8.15.0___vite@7.3.1____picomatch@4.0.3__svelte@5.48.2___acorn@8.15.0__typescript@5.9.3__vite@7.3.1___picomatch@4.0.3__acorn@8.15.0_svelte@5.48.2__acorn@8.15.0_@sveltejs+vite-plugin-svelte@6.2.4__svelte@5.48.2___acorn@8.15.0__vite@7.3.1___picomatch@4.0.3_typescript@5.9.3_vite@7.3.1__picomatch@4.0.3": { - "integrity": "sha512-2F4Q/FZzbeJTFdIS/PuOoPRSm92sA2LhzTnv6FXhCoENb3huf5+fDuNOg1LNvGOouy3u/225qxmuJvcV3IZK5Q==", - "dependencies": [ - "@sveltejs/kit", - "dequal", - "esm-env", - "lz-string", - "svelte" - ], - "optionalPeers": [ - "@sveltejs/kit" - ] - }, - "sade@1.8.1": { - "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==", - "dependencies": [ - "mri" - ] - }, - "set-cookie-parser@2.7.2": { - "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==" - }, - "sirv@3.0.2": { - "integrity": "sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==", - "dependencies": [ - "@polka/url", - "mrmime", - "totalist" - ] - }, - "source-map-js@1.2.1": { - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==" - }, - "style-to-object@1.0.14": { - "integrity": "sha512-LIN7rULI0jBscWQYaSswptyderlarFkjQ+t79nzty8tcIAceVomEVlLzH5VP4Cmsv6MtKhs7qaAiwlcp+Mgaxw==", - "dependencies": [ - "inline-style-parser" - ] - }, - "svelte-check@4.3.5_svelte@5.48.2__acorn@8.15.0_typescript@5.9.3": { - "integrity": "sha512-e4VWZETyXaKGhpkxOXP+B/d0Fp/zKViZoJmneZWe/05Y2aqSKj3YN2nLfYPJBQ87WEiY4BQCQ9hWGu9mPT1a1Q==", - "dependencies": [ - "@jridgewell/trace-mapping", - "chokidar", - "fdir", - "picocolors", - "sade", - "svelte", - "typescript" - ], - "bin": true - }, - "svelte-toolbelt@0.10.6_svelte@5.48.2__acorn@8.15.0_@sveltejs+kit@2.50.1__@sveltejs+vite-plugin-svelte@6.2.4___svelte@5.48.2____acorn@8.15.0___vite@7.3.1____picomatch@4.0.3__svelte@5.48.2___acorn@8.15.0__typescript@5.9.3__vite@7.3.1___picomatch@4.0.3__acorn@8.15.0_@sveltejs+vite-plugin-svelte@6.2.4__svelte@5.48.2___acorn@8.15.0__vite@7.3.1___picomatch@4.0.3_typescript@5.9.3_vite@7.3.1__picomatch@4.0.3": { - "integrity": "sha512-YWuX+RE+CnWYx09yseAe4ZVMM7e7GRFZM6OYWpBKOb++s+SQ8RBIMMe+Bs/CznBMc0QPLjr+vDBxTAkozXsFXQ==", - "dependencies": [ - "clsx", - "runed@0.35.1_@sveltejs+kit@2.50.1__@sveltejs+vite-plugin-svelte@6.2.4___svelte@5.48.2____acorn@8.15.0___vite@7.3.1____picomatch@4.0.3__svelte@5.48.2___acorn@8.15.0__typescript@5.9.3__vite@7.3.1___picomatch@4.0.3__acorn@8.15.0_svelte@5.48.2__acorn@8.15.0_@sveltejs+vite-plugin-svelte@6.2.4__svelte@5.48.2___acorn@8.15.0__vite@7.3.1___picomatch@4.0.3_typescript@5.9.3_vite@7.3.1__picomatch@4.0.3", - "style-to-object", - "svelte" - ] - }, - "svelte-toolbelt@0.7.1_svelte@5.48.2__acorn@8.15.0": { - "integrity": "sha512-HcBOcR17Vx9bjaOceUvxkY3nGmbBmCBBbuWLLEWO6jtmWH8f/QoWmbyUfQZrpDINH39en1b8mptfPQT9VKQ1xQ==", - "dependencies": [ - "clsx", - "runed@0.23.4_svelte@5.48.2__acorn@8.15.0", - "style-to-object", - "svelte" - ] - }, - "svelte@5.48.2_acorn@8.15.0": { - "integrity": "sha512-VPWD+UyoSFZ7Nxix5K/F8yWiKWOiROkLlWYXOZReE0TUycw+58YWB3D6lAKT+57xmN99wRX4H3oZmw0NPy7y3Q==", - "dependencies": [ - "@jridgewell/remapping", - "@jridgewell/sourcemap-codec", - "@sveltejs/acorn-typescript", - "@types/estree", - "acorn", - "aria-query", - "axobject-query", - "clsx", - "devalue", - "esm-env", - "esrap", - "is-reference", - "locate-character", - "magic-string", - "zimmerframe" - ] - }, - "tabbable@6.4.0": { - "integrity": "sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==" - }, - "tailwind-merge@3.4.0": { - "integrity": "sha512-uSaO4gnW+b3Y2aWoWfFpX62vn2sR3skfhbjsEnaBI81WD1wBLlHZe5sWf0AqjksNdYTbGBEd0UasQMT3SNV15g==" - }, - "tailwind-variants@3.2.2_tailwind-merge@3.4.0_tailwindcss@4.1.18": { - "integrity": "sha512-Mi4kHeMTLvKlM98XPnK+7HoBPmf4gygdFmqQPaDivc3DpYS6aIY6KiG/PgThrGvii5YZJqRsPz0aPyhoFzmZgg==", - "dependencies": [ - "tailwind-merge", - "tailwindcss" - ], - "optionalPeers": [ - "tailwind-merge" - ] - }, - "tailwindcss@4.1.18": { - "integrity": "sha512-4+Z+0yiYyEtUVCScyfHCxOYP06L5Ne+JiHhY2IjR2KWMIWhJOYZKLSGZaP5HkZ8+bY0cxfzwDE5uOmzFXyIwxw==" - }, - "tapable@2.3.0": { - "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==" - }, - "tinyglobby@0.2.15_picomatch@4.0.3": { - "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", - "dependencies": [ - "fdir", - "picomatch" - ] - }, - "totalist@3.0.1": { - "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==" - }, - "tslib@2.8.1": { - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" - }, - "tw-animate-css@1.4.0": { - "integrity": "sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==" - }, - "typescript@5.9.3": { - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", - "bin": true - }, - "vaul-svelte@1.0.0-next.7_svelte@5.48.2__acorn@8.15.0": { - "integrity": "sha512-7zN7Bi3dFQixvvbUJY9uGDe7Ws/dGZeBQR2pXdXmzQiakjrxBvWo0QrmsX3HK+VH+SZOltz378cmgmCS9f9rSg==", - "dependencies": [ - "runed@0.23.4_svelte@5.48.2__acorn@8.15.0", - "svelte", - "svelte-toolbelt@0.7.1_svelte@5.48.2__acorn@8.15.0" - ] - }, - "vite@7.3.1_picomatch@4.0.3": { - "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", - "dependencies": [ - "esbuild", - "fdir", - "picomatch", - "postcss", - "rollup", - "tinyglobby" - ], - "optionalDependencies": [ - "fsevents" - ], - "bin": true - }, - "vitefu@1.1.1_vite@7.3.1__picomatch@4.0.3": { - "integrity": "sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ==", - "dependencies": [ - "vite" - ], - "optionalPeers": [ - "vite" - ] - }, - "zimmerframe@1.1.4": { - "integrity": "sha512-B58NGBEoc8Y9MWWCQGl/gq9xBCe4IiKM0a2x7GZdQKOW5Exr8S1W24J6OgM1njK8xCRGvAJIL/MxXHf6SkmQKQ==" - } - }, - "workspace": { - "packageJson": { - "dependencies": [ - "npm:@biomejs/biome@^2.3.12", - "npm:@internationalized/date@^3.10.1", - "npm:@lucide/svelte@~0.563.1", - "npm:@sveltejs/adapter-static@^3.0.6", - "npm:@sveltejs/kit@^2.50.1", - "npm:@sveltejs/vite-plugin-svelte@^6.2.4", - "npm:@tailwindcss/vite@^4.1.18", - "npm:@tauri-apps/api@2", - "npm:@tauri-apps/cli@2", - "npm:@tauri-apps/plugin-opener@2", - "npm:@tauri-apps/plugin-shell@~2.3.4", - "npm:bits-ui@^2.15.4", - "npm:clsx@^2.1.1", - "npm:svelte-check@4", - "npm:svelte@^5.48.2", - "npm:tailwind-merge@^3.4.0", - "npm:tailwind-variants@^3.2.2", - "npm:tailwindcss@^4.1.18", - "npm:terser@^5.46.0", - "npm:tw-animate-css@^1.4.0", - "npm:typescript@~5.9.3", - "npm:vaul-svelte@^1.0.0-next.7", - "npm:vite@^7.3.1" - ] - } - } -} diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 5278519..0000000 --- a/package-lock.json +++ /dev/null @@ -1,2866 +0,0 @@ -{ - "name": "picoforge", - "version": "0.3.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "picoforge", - "version": "0.3.0", - "license": "MIT", - "dependencies": { - "@tailwindcss/vite": "^4.1.18", - "@tauri-apps/api": "^2", - "@tauri-apps/plugin-opener": "^2", - "@tauri-apps/plugin-shell": "~2.3.4", - "tailwindcss": "^4.1.18" - }, - "devDependencies": { - "@biomejs/biome": "^2.3.12", - "@internationalized/date": "^3.10.1", - "@lucide/svelte": "^0.563.1", - "@sveltejs/adapter-static": "^3.0.6", - "@sveltejs/kit": "^2.50.1", - "@sveltejs/vite-plugin-svelte": "^6.2.4", - "@tauri-apps/cli": "^2", - "bits-ui": "^2.15.4", - "clsx": "^2.1.1", - "svelte": "^5.48.2", - "svelte-check": "^4.0.0", - "tailwind-merge": "^3.4.0", - "tailwind-variants": "^3.2.2", - "terser": "^5.46.0", - "tw-animate-css": "^1.4.0", - "typescript": "~5.9.3", - "vaul-svelte": "^1.0.0-next.7", - "vite": "^7.3.1" - } - }, - "node_modules/@biomejs/biome": { - "version": "2.3.12", - "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.3.12.tgz", - "integrity": "sha512-AR7h4aSlAvXj7TAajW/V12BOw2EiS0AqZWV5dGozf4nlLoUF/ifvD0+YgKSskT0ylA6dY1A8AwgP8kZ6yaCQnA==", - "dev": true, - "license": "MIT OR Apache-2.0", - "bin": { - "biome": "bin/biome" - }, - "engines": { - "node": ">=14.21.3" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/biome" - }, - "optionalDependencies": { - "@biomejs/cli-darwin-arm64": "2.3.12", - "@biomejs/cli-darwin-x64": "2.3.12", - "@biomejs/cli-linux-arm64": "2.3.12", - "@biomejs/cli-linux-arm64-musl": "2.3.12", - "@biomejs/cli-linux-x64": "2.3.12", - "@biomejs/cli-linux-x64-musl": "2.3.12", - "@biomejs/cli-win32-arm64": "2.3.12", - "@biomejs/cli-win32-x64": "2.3.12" - } - }, - "node_modules/@biomejs/cli-darwin-arm64": { - "version": "2.3.12", - "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.3.12.tgz", - "integrity": "sha512-cO6fn+KiMBemva6EARDLQBxeyvLzgidaFRJi8G7OeRqz54kWK0E+uSjgFaiHlc3DZYoa0+1UFE8mDxozpc9ieg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-darwin-x64": { - "version": "2.3.12", - "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.3.12.tgz", - "integrity": "sha512-/fiF/qmudKwSdvmSrSe/gOTkW77mHHkH8Iy7YC2rmpLuk27kbaUOPa7kPiH5l+3lJzTUfU/t6x1OuIq/7SGtxg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-linux-arm64": { - "version": "2.3.12", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.3.12.tgz", - "integrity": "sha512-nbOsuQROa3DLla5vvsTZg+T5WVPGi9/vYxETm9BOuLHBJN3oWQIg3MIkE2OfL18df1ZtNkqXkH6Yg9mdTPem7A==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-linux-arm64-musl": { - "version": "2.3.12", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.3.12.tgz", - "integrity": "sha512-aqkeSf7IH+wkzFpKeDVPSXy9uDjxtLpYA6yzkYsY+tVjwFFirSuajHDI3ul8en90XNs1NA0n8kgBrjwRi5JeyA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-linux-x64": { - "version": "2.3.12", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.3.12.tgz", - "integrity": "sha512-CQtqrJ+qEEI8tgRSTjjzk6wJAwfH3wQlkIGsM5dlecfRZaoT+XCms/mf7G4kWNexrke6mnkRzNy6w8ebV177ow==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-linux-x64-musl": { - "version": "2.3.12", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.3.12.tgz", - "integrity": "sha512-kVGWtupRRsOjvw47YFkk5mLiAdpCPMWBo1jOwAzh+juDpUb2sWarIp+iq+CPL1Wt0LLZnYtP7hH5kD6fskcxmg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-win32-arm64": { - "version": "2.3.12", - "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.3.12.tgz", - "integrity": "sha512-Re4I7UnOoyE4kHMqpgtG6UvSBGBbbtvsOvBROgCCoH7EgANN6plSQhvo2W7OCITvTp7gD6oZOyZy72lUdXjqZg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-win32-x64": { - "version": "2.3.12", - "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.3.12.tgz", - "integrity": "sha512-qqGVWqNNek0KikwPZlOIoxtXgsNGsX+rgdEzgw82Re8nF02W+E2WokaQhpF5TdBh/D/RQ3TLppH+otp6ztN0lw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz", - "integrity": "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==", - "cpu": [ - "ppc64" - ], - "license": "MIT", - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.2.tgz", - "integrity": "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz", - "integrity": "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.2.tgz", - "integrity": "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz", - "integrity": "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz", - "integrity": "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz", - "integrity": "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz", - "integrity": "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz", - "integrity": "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz", - "integrity": "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz", - "integrity": "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz", - "integrity": "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==", - "cpu": [ - "loong64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz", - "integrity": "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==", - "cpu": [ - "mips64el" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz", - "integrity": "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==", - "cpu": [ - "ppc64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz", - "integrity": "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==", - "cpu": [ - "riscv64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz", - "integrity": "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==", - "cpu": [ - "s390x" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz", - "integrity": "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz", - "integrity": "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz", - "integrity": "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz", - "integrity": "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz", - "integrity": "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openharmony-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz", - "integrity": "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "openharmony" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz", - "integrity": "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz", - "integrity": "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz", - "integrity": "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz", - "integrity": "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@floating-ui/core": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.3.tgz", - "integrity": "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@floating-ui/utils": "^0.2.10" - } - }, - "node_modules/@floating-ui/dom": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz", - "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@floating-ui/core": "^1.7.3", - "@floating-ui/utils": "^0.2.10" - } - }, - "node_modules/@floating-ui/utils": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz", - "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/@internationalized/date": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.10.1.tgz", - "integrity": "sha512-oJrXtQiAXLvT9clCf1K4kxp3eKsQhIaZqxEyowkBcsvZDdZkbWrVmnGknxs5flTD0VGsxrxKgBCZty1EzoiMzA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@swc/helpers": "^0.5.0" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", - "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.0", - "@jridgewell/trace-mapping": "^0.3.24" - } - }, - "node_modules/@jridgewell/remapping": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", - "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", - "license": "MIT", - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "license": "MIT", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/source-map": { - "version": "0.3.11", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz", - "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==", - "devOptional": true, - "license": "MIT", - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", - "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", - "license": "MIT" - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.31", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", - "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", - "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "node_modules/@lucide/svelte": { - "version": "0.563.1", - "resolved": "https://registry.npmjs.org/@lucide/svelte/-/svelte-0.563.1.tgz", - "integrity": "sha512-Kt+MbnE5D9RsuI/csmf7M+HWxALe57x3A0DhQ8pPnnUpneh7zuldrYjlT+veWtk+tVnp5doQtaAAxLujzIlhBw==", - "dev": true, - "license": "ISC", - "peerDependencies": { - "svelte": "^5" - } - }, - "node_modules/@polka/url": { - "version": "1.0.0-next.29", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz", - "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==", - "dev": true, - "license": "MIT" - }, - "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.55.1.tgz", - "integrity": "sha512-9R0DM/ykwfGIlNu6+2U09ga0WXeZ9MRC2Ter8jnz8415VbuIykVuc6bhdrbORFZANDmTDvq26mJrEVTl8TdnDg==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-android-arm64": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.55.1.tgz", - "integrity": "sha512-eFZCb1YUqhTysgW3sj/55du5cG57S7UTNtdMjCW7LwVcj3dTTcowCsC8p7uBdzKsZYa8J7IDE8lhMI+HX1vQvg==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.55.1.tgz", - "integrity": "sha512-p3grE2PHcQm2e8PSGZdzIhCKbMCw/xi9XvMPErPhwO17vxtvCN5FEA2mSLgmKlCjHGMQTP6phuQTYWUnKewwGg==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.55.1.tgz", - "integrity": "sha512-rDUjG25C9qoTm+e02Esi+aqTKSBYwVTaoS1wxcN47/Luqef57Vgp96xNANwt5npq9GDxsH7kXxNkJVEsWEOEaQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.55.1.tgz", - "integrity": "sha512-+JiU7Jbp5cdxekIgdte0jfcu5oqw4GCKr6i3PJTlXTCU5H5Fvtkpbs4XJHRmWNXF+hKmn4v7ogI5OQPaupJgOg==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.55.1.tgz", - "integrity": "sha512-V5xC1tOVWtLLmr3YUk2f6EJK4qksksOYiz/TCsFHu/R+woubcLWdC9nZQmwjOAbmExBIVKsm1/wKmEy4z4u4Bw==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.55.1.tgz", - "integrity": "sha512-Rn3n+FUk2J5VWx+ywrG/HGPTD9jXNbicRtTM11e/uorplArnXZYsVifnPPqNNP5BsO3roI4n8332ukpY/zN7rQ==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.55.1.tgz", - "integrity": "sha512-grPNWydeKtc1aEdrJDWk4opD7nFtQbMmV7769hiAaYyUKCT1faPRm2av8CX1YJsZ4TLAZcg9gTR1KvEzoLjXkg==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.55.1.tgz", - "integrity": "sha512-a59mwd1k6x8tXKcUxSyISiquLwB5pX+fJW9TkWU46lCqD/GRDe9uDN31jrMmVP3feI3mhAdvcCClhV8V5MhJFQ==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.55.1.tgz", - "integrity": "sha512-puS1MEgWX5GsHSoiAsF0TYrpomdvkaXm0CofIMG5uVkP6IBV+ZO9xhC5YEN49nsgYo1DuuMquF9+7EDBVYu4uA==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.55.1.tgz", - "integrity": "sha512-r3Wv40in+lTsULSb6nnoudVbARdOwb2u5fpeoOAZjFLznp6tDU8kd+GTHmJoqZ9lt6/Sys33KdIHUaQihFcu7g==", - "cpu": [ - "loong64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-loong64-musl": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.55.1.tgz", - "integrity": "sha512-MR8c0+UxAlB22Fq4R+aQSPBayvYa3+9DrwG/i1TKQXFYEaoW3B5b/rkSRIypcZDdWjWnpcvxbNaAJDcSbJU3Lw==", - "cpu": [ - "loong64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.55.1.tgz", - "integrity": "sha512-3KhoECe1BRlSYpMTeVrD4sh2Pw2xgt4jzNSZIIPLFEsnQn9gAnZagW9+VqDqAHgm1Xc77LzJOo2LdigS5qZ+gw==", - "cpu": [ - "ppc64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-ppc64-musl": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.55.1.tgz", - "integrity": "sha512-ziR1OuZx0vdYZZ30vueNZTg73alF59DicYrPViG0NEgDVN8/Jl87zkAPu4u6VjZST2llgEUjaiNl9JM6HH1Vdw==", - "cpu": [ - "ppc64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.55.1.tgz", - "integrity": "sha512-uW0Y12ih2XJRERZ4jAfKamTyIHVMPQnTZcQjme2HMVDAHY4amf5u414OqNYC+x+LzRdRcnIG1YodLrrtA8xsxw==", - "cpu": [ - "riscv64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.55.1.tgz", - "integrity": "sha512-u9yZ0jUkOED1BFrqu3BwMQoixvGHGZ+JhJNkNKY/hyoEgOwlqKb62qu+7UjbPSHYjiVy8kKJHvXKv5coH4wDeg==", - "cpu": [ - "riscv64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.55.1.tgz", - "integrity": "sha512-/0PenBCmqM4ZUd0190j7J0UsQ/1nsi735iPRakO8iPciE7BQ495Y6msPzaOmvx0/pn+eJVVlZrNrSh4WSYLxNg==", - "cpu": [ - "s390x" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.55.1.tgz", - "integrity": "sha512-a8G4wiQxQG2BAvo+gU6XrReRRqj+pLS2NGXKm8io19goR+K8lw269eTrPkSdDTALwMmJp4th2Uh0D8J9bEV1vg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.55.1.tgz", - "integrity": "sha512-bD+zjpFrMpP/hqkfEcnjXWHMw5BIghGisOKPj+2NaNDuVT+8Ds4mPf3XcPHuat1tz89WRL+1wbcxKY3WSbiT7w==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-openbsd-x64": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.55.1.tgz", - "integrity": "sha512-eLXw0dOiqE4QmvikfQ6yjgkg/xDM+MdU9YJuP4ySTibXU0oAvnEWXt7UDJmD4UkYialMfOGFPJnIHSe/kdzPxg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ] - }, - "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.55.1.tgz", - "integrity": "sha512-xzm44KgEP11te3S2HCSyYf5zIzWmx3n8HDCc7EE59+lTcswEWNpvMLfd9uJvVX8LCg9QWG67Xt75AuHn4vgsXw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "openharmony" - ] - }, - "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.55.1.tgz", - "integrity": "sha512-yR6Bl3tMC/gBok5cz/Qi0xYnVbIxGx5Fcf/ca0eB6/6JwOY+SRUcJfI0OpeTpPls7f194as62thCt/2BjxYN8g==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.55.1.tgz", - "integrity": "sha512-3fZBidchE0eY0oFZBnekYCfg+5wAB0mbpCBuofh5mZuzIU/4jIVkbESmd2dOsFNS78b53CYv3OAtwqkZZmU5nA==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.55.1.tgz", - "integrity": "sha512-xGGY5pXj69IxKb4yv/POoocPy/qmEGhimy/FoTpTSVju3FYXUQQMFCaZZXJVidsmGxRioZAwpThl/4zX41gRKg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.55.1.tgz", - "integrity": "sha512-SPEpaL6DX4rmcXtnhdrQYgzQ5W2uW3SCJch88lB2zImhJRhIIK44fkUrgIV/Q8yUNfw5oyZ5vkeQsZLhCb06lw==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@standard-schema/spec": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz", - "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==", - "dev": true, - "license": "MIT" - }, - "node_modules/@sveltejs/acorn-typescript": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.8.tgz", - "integrity": "sha512-esgN+54+q0NjB0Y/4BomT9samII7jGwNy/2a3wNZbT2A2RpmXsXwUt24LvLhx6jUq2gVk4cWEvcRO6MFQbOfNA==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "acorn": "^8.9.0" - } - }, - "node_modules/@sveltejs/adapter-static": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-3.0.10.tgz", - "integrity": "sha512-7D9lYFWJmB7zxZyTE/qxjksvMqzMuYrrsyh1f4AlZqeZeACPRySjbC3aFiY55wb1tWUaKOQG9PVbm74JcN2Iew==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "@sveltejs/kit": "^2.0.0" - } - }, - "node_modules/@sveltejs/kit": { - "version": "2.50.1", - "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.50.1.tgz", - "integrity": "sha512-XRHD2i3zC4ukhz2iCQzO4mbsts081PAZnnMAQ7LNpWeYgeBmwMsalf0FGSwhFXBbtr2XViPKnFJBDCckWqrsLw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@standard-schema/spec": "^1.0.0", - "@sveltejs/acorn-typescript": "^1.0.5", - "@types/cookie": "^0.6.0", - "acorn": "^8.14.1", - "cookie": "^0.6.0", - "devalue": "^5.6.2", - "esm-env": "^1.2.2", - "kleur": "^4.1.5", - "magic-string": "^0.30.5", - "mrmime": "^2.0.0", - "sade": "^1.8.1", - "set-cookie-parser": "^2.6.0", - "sirv": "^3.0.0" - }, - "bin": { - "svelte-kit": "svelte-kit.js" - }, - "engines": { - "node": ">=18.13" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.0.0", - "@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0 || ^6.0.0-next.0", - "svelte": "^4.0.0 || ^5.0.0-next.0", - "typescript": "^5.3.3", - "vite": "^5.0.3 || ^6.0.0 || ^7.0.0-beta.0" - }, - "peerDependenciesMeta": { - "@opentelemetry/api": { - "optional": true - }, - "typescript": { - "optional": true - } - } - }, - "node_modules/@sveltejs/vite-plugin-svelte": { - "version": "6.2.4", - "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-6.2.4.tgz", - "integrity": "sha512-ou/d51QSdTyN26D7h6dSpusAKaZkAiGM55/AKYi+9AGZw7q85hElbjK3kEyzXHhLSnRISHOYzVge6x0jRZ7DXA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@sveltejs/vite-plugin-svelte-inspector": "^5.0.0", - "deepmerge": "^4.3.1", - "magic-string": "^0.30.21", - "obug": "^2.1.0", - "vitefu": "^1.1.1" - }, - "engines": { - "node": "^20.19 || ^22.12 || >=24" - }, - "peerDependencies": { - "svelte": "^5.0.0", - "vite": "^6.3.0 || ^7.0.0" - } - }, - "node_modules/@sveltejs/vite-plugin-svelte-inspector": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-5.0.2.tgz", - "integrity": "sha512-TZzRTcEtZffICSAoZGkPSl6Etsj2torOVrx6Uw0KpXxrec9Gg6jFWQ60Q3+LmNGfZSxHRCZL7vXVZIWmuV50Ig==", - "dev": true, - "license": "MIT", - "dependencies": { - "obug": "^2.1.0" - }, - "engines": { - "node": "^20.19 || ^22.12 || >=24" - }, - "peerDependencies": { - "@sveltejs/vite-plugin-svelte": "^6.0.0-next.0", - "svelte": "^5.0.0", - "vite": "^6.3.0 || ^7.0.0" - } - }, - "node_modules/@swc/helpers": { - "version": "0.5.18", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.18.tgz", - "integrity": "sha512-TXTnIcNJQEKwThMMqBXsZ4VGAza6bvN4pa41Rkqoio6QBKMvo+5lexeTMScGCIxtzgQJzElcvIltani+adC5PQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "tslib": "^2.8.0" - } - }, - "node_modules/@tailwindcss/node": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.18.tgz", - "integrity": "sha512-DoR7U1P7iYhw16qJ49fgXUlry1t4CpXeErJHnQ44JgTSKMaZUdf17cfn5mHchfJ4KRBZRFA/Coo+MUF5+gOaCQ==", - "license": "MIT", - "dependencies": { - "@jridgewell/remapping": "^2.3.4", - "enhanced-resolve": "^5.18.3", - "jiti": "^2.6.1", - "lightningcss": "1.30.2", - "magic-string": "^0.30.21", - "source-map-js": "^1.2.1", - "tailwindcss": "4.1.18" - } - }, - "node_modules/@tailwindcss/oxide": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.18.tgz", - "integrity": "sha512-EgCR5tTS5bUSKQgzeMClT6iCY3ToqE1y+ZB0AKldj809QXk1Y+3jB0upOYZrn9aGIzPtUsP7sX4QQ4XtjBB95A==", - "license": "MIT", - "engines": { - "node": ">= 10" - }, - "optionalDependencies": { - "@tailwindcss/oxide-android-arm64": "4.1.18", - "@tailwindcss/oxide-darwin-arm64": "4.1.18", - "@tailwindcss/oxide-darwin-x64": "4.1.18", - "@tailwindcss/oxide-freebsd-x64": "4.1.18", - "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.18", - "@tailwindcss/oxide-linux-arm64-gnu": "4.1.18", - "@tailwindcss/oxide-linux-arm64-musl": "4.1.18", - "@tailwindcss/oxide-linux-x64-gnu": "4.1.18", - "@tailwindcss/oxide-linux-x64-musl": "4.1.18", - "@tailwindcss/oxide-wasm32-wasi": "4.1.18", - "@tailwindcss/oxide-win32-arm64-msvc": "4.1.18", - "@tailwindcss/oxide-win32-x64-msvc": "4.1.18" - } - }, - "node_modules/@tailwindcss/oxide-android-arm64": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.18.tgz", - "integrity": "sha512-dJHz7+Ugr9U/diKJA0W6N/6/cjI+ZTAoxPf9Iz9BFRF2GzEX8IvXxFIi/dZBloVJX/MZGvRuFA9rqwdiIEZQ0Q==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-darwin-arm64": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.18.tgz", - "integrity": "sha512-Gc2q4Qhs660bhjyBSKgq6BYvwDz4G+BuyJ5H1xfhmDR3D8HnHCmT/BSkvSL0vQLy/nkMLY20PQ2OoYMO15Jd0A==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-darwin-x64": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.18.tgz", - "integrity": "sha512-FL5oxr2xQsFrc3X9o1fjHKBYBMD1QZNyc1Xzw/h5Qu4XnEBi3dZn96HcHm41c/euGV+GRiXFfh2hUCyKi/e+yw==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-freebsd-x64": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.18.tgz", - "integrity": "sha512-Fj+RHgu5bDodmV1dM9yAxlfJwkkWvLiRjbhuO2LEtwtlYlBgiAT4x/j5wQr1tC3SANAgD+0YcmWVrj8R9trVMA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.18.tgz", - "integrity": "sha512-Fp+Wzk/Ws4dZn+LV2Nqx3IilnhH51YZoRaYHQsVq3RQvEl+71VGKFpkfHrLM/Li+kt5c0DJe/bHXK1eHgDmdiA==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-linux-arm64-gnu": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.18.tgz", - "integrity": "sha512-S0n3jboLysNbh55Vrt7pk9wgpyTTPD0fdQeh7wQfMqLPM/Hrxi+dVsLsPrycQjGKEQk85Kgbx+6+QnYNiHalnw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-linux-arm64-musl": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.18.tgz", - "integrity": "sha512-1px92582HkPQlaaCkdRcio71p8bc8i/ap5807tPRDK/uw953cauQBT8c5tVGkOwrHMfc2Yh6UuxaH4vtTjGvHg==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-linux-x64-gnu": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.18.tgz", - "integrity": "sha512-v3gyT0ivkfBLoZGF9LyHmts0Isc8jHZyVcbzio6Wpzifg/+5ZJpDiRiUhDLkcr7f/r38SWNe7ucxmGW3j3Kb/g==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-linux-x64-musl": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.18.tgz", - "integrity": "sha512-bhJ2y2OQNlcRwwgOAGMY0xTFStt4/wyU6pvI6LSuZpRgKQwxTec0/3Scu91O8ir7qCR3AuepQKLU/kX99FouqQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.18.tgz", - "integrity": "sha512-LffYTvPjODiP6PT16oNeUQJzNVyJl1cjIebq/rWWBF+3eDst5JGEFSc5cWxyRCJ0Mxl+KyIkqRxk1XPEs9x8TA==", - "bundleDependencies": [ - "@napi-rs/wasm-runtime", - "@emnapi/core", - "@emnapi/runtime", - "@tybys/wasm-util", - "@emnapi/wasi-threads", - "tslib" - ], - "cpu": [ - "wasm32" - ], - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/core": "^1.7.1", - "@emnapi/runtime": "^1.7.1", - "@emnapi/wasi-threads": "^1.1.0", - "@napi-rs/wasm-runtime": "^1.1.0", - "@tybys/wasm-util": "^0.10.1", - "tslib": "^2.4.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@tailwindcss/oxide-win32-arm64-msvc": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.18.tgz", - "integrity": "sha512-HjSA7mr9HmC8fu6bdsZvZ+dhjyGCLdotjVOgLA2vEqxEBZaQo9YTX4kwgEvPCpRh8o4uWc4J/wEoFzhEmjvPbA==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/oxide-win32-x64-msvc": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.18.tgz", - "integrity": "sha512-bJWbyYpUlqamC8dpR7pfjA0I7vdF6t5VpUGMWRkXVE3AXgIZjYUYAK7II1GNaxR8J1SSrSrppRar8G++JekE3Q==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tailwindcss/vite": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.1.18.tgz", - "integrity": "sha512-jVA+/UpKL1vRLg6Hkao5jldawNmRo7mQYrZtNHMIVpLfLhDml5nMRUo/8MwoX2vNXvnaXNNMedrMfMugAVX1nA==", - "license": "MIT", - "dependencies": { - "@tailwindcss/node": "4.1.18", - "@tailwindcss/oxide": "4.1.18", - "tailwindcss": "4.1.18" - }, - "peerDependencies": { - "vite": "^5.2.0 || ^6 || ^7" - } - }, - "node_modules/@tauri-apps/api": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.9.1.tgz", - "integrity": "sha512-IGlhP6EivjXHepbBic618GOmiWe4URJiIeZFlB7x3czM0yDHHYviH1Xvoiv4FefdkQtn6v7TuwWCRfOGdnVUGw==", - "license": "Apache-2.0 OR MIT", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/tauri" - } - }, - "node_modules/@tauri-apps/cli": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-2.9.6.tgz", - "integrity": "sha512-3xDdXL5omQ3sPfBfdC8fCtDKcnyV7OqyzQgfyT5P3+zY6lcPqIYKQBvUasNvppi21RSdfhy44ttvJmftb0PCDw==", - "dev": true, - "license": "Apache-2.0 OR MIT", - "bin": { - "tauri": "tauri.js" - }, - "engines": { - "node": ">= 10" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/tauri" - }, - "optionalDependencies": { - "@tauri-apps/cli-darwin-arm64": "2.9.6", - "@tauri-apps/cli-darwin-x64": "2.9.6", - "@tauri-apps/cli-linux-arm-gnueabihf": "2.9.6", - "@tauri-apps/cli-linux-arm64-gnu": "2.9.6", - "@tauri-apps/cli-linux-arm64-musl": "2.9.6", - "@tauri-apps/cli-linux-riscv64-gnu": "2.9.6", - "@tauri-apps/cli-linux-x64-gnu": "2.9.6", - "@tauri-apps/cli-linux-x64-musl": "2.9.6", - "@tauri-apps/cli-win32-arm64-msvc": "2.9.6", - "@tauri-apps/cli-win32-ia32-msvc": "2.9.6", - "@tauri-apps/cli-win32-x64-msvc": "2.9.6" - } - }, - "node_modules/@tauri-apps/cli-darwin-arm64": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.9.6.tgz", - "integrity": "sha512-gf5no6N9FCk1qMrti4lfwP77JHP5haASZgVbBgpZG7BUepB3fhiLCXGUK8LvuOjP36HivXewjg72LTnPDScnQQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "Apache-2.0 OR MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tauri-apps/cli-darwin-x64": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.9.6.tgz", - "integrity": "sha512-oWh74WmqbERwwrwcueJyY6HYhgCksUc6NT7WKeXyrlY/FPmNgdyQAgcLuTSkhRFuQ6zh4Np1HZpOqCTpeZBDcw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "Apache-2.0 OR MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.9.6.tgz", - "integrity": "sha512-/zde3bFroFsNXOHN204DC2qUxAcAanUjVXXSdEGmhwMUZeAQalNj5cz2Qli2elsRjKN/hVbZOJj0gQ5zaYUjSg==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "Apache-2.0 OR MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tauri-apps/cli-linux-arm64-gnu": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.9.6.tgz", - "integrity": "sha512-pvbljdhp9VOo4RnID5ywSxgBs7qiylTPlK56cTk7InR3kYSTJKYMqv/4Q/4rGo/mG8cVppesKIeBMH42fw6wjg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "Apache-2.0 OR MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tauri-apps/cli-linux-arm64-musl": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.9.6.tgz", - "integrity": "sha512-02TKUndpodXBCR0oP//6dZWGYcc22Upf2eP27NvC6z0DIqvkBBFziQUcvi2n6SrwTRL0yGgQjkm9K5NIn8s6jw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "Apache-2.0 OR MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tauri-apps/cli-linux-riscv64-gnu": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-riscv64-gnu/-/cli-linux-riscv64-gnu-2.9.6.tgz", - "integrity": "sha512-fmp1hnulbqzl1GkXl4aTX9fV+ubHw2LqlLH1PE3BxZ11EQk+l/TmiEongjnxF0ie4kV8DQfDNJ1KGiIdWe1GvQ==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "Apache-2.0 OR MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tauri-apps/cli-linux-x64-gnu": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.9.6.tgz", - "integrity": "sha512-vY0le8ad2KaV1PJr+jCd8fUF9VOjwwQP/uBuTJvhvKTloEwxYA/kAjKK9OpIslGA9m/zcnSo74czI6bBrm2sYA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "Apache-2.0 OR MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tauri-apps/cli-linux-x64-musl": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.9.6.tgz", - "integrity": "sha512-TOEuB8YCFZTWVDzsO2yW0+zGcoMiPPwcUgdnW1ODnmgfwccpnihDRoks+ABT1e3fHb1ol8QQWsHSCovb3o2ENQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "Apache-2.0 OR MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tauri-apps/cli-win32-arm64-msvc": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.9.6.tgz", - "integrity": "sha512-ujmDGMRc4qRLAnj8nNG26Rlz9klJ0I0jmZs2BPpmNNf0gM/rcVHhqbEkAaHPTBVIrtUdf7bGvQAD2pyIiUrBHQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "Apache-2.0 OR MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tauri-apps/cli-win32-ia32-msvc": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.9.6.tgz", - "integrity": "sha512-S4pT0yAJgFX8QRCyKA1iKjZ9Q/oPjCZf66A/VlG5Yw54Nnr88J1uBpmenINbXxzyhduWrIXBaUbEY1K80ZbpMg==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "Apache-2.0 OR MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tauri-apps/cli-win32-x64-msvc": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.9.6.tgz", - "integrity": "sha512-ldWuWSSkWbKOPjQMJoYVj9wLHcOniv7diyI5UAJ4XsBdtaFB0pKHQsqw/ItUma0VXGC7vB4E9fZjivmxur60aw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "Apache-2.0 OR MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10" - } - }, - "node_modules/@tauri-apps/plugin-opener": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-opener/-/plugin-opener-2.5.3.tgz", - "integrity": "sha512-CCcUltXMOfUEArbf3db3kCE7Ggy1ExBEBl51Ko2ODJ6GDYHRp1nSNlQm5uNCFY5k7/ufaK5Ib3Du/Zir19IYQQ==", - "license": "MIT OR Apache-2.0", - "dependencies": { - "@tauri-apps/api": "^2.8.0" - } - }, - "node_modules/@tauri-apps/plugin-shell": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.3.4.tgz", - "integrity": "sha512-ktsRWf8wHLD17aZEyqE8c5x98eNAuTizR1FSX475zQ4TxaiJnhwksLygQz+AGwckJL5bfEP13nWrlTNQJUpKpA==", - "license": "MIT OR Apache-2.0", - "dependencies": { - "@tauri-apps/api": "^2.8.0" - } - }, - "node_modules/@types/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/estree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", - "license": "MIT" - }, - "node_modules/acorn": { - "version": "8.15.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", - "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", - "devOptional": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/aria-query": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz", - "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/axobject-query": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz", - "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/bits-ui": { - "version": "2.15.4", - "resolved": "https://registry.npmjs.org/bits-ui/-/bits-ui-2.15.4.tgz", - "integrity": "sha512-7H9YUfp03KOk1LVDh8wPYSRPxlZgG/GRWLNSA8QC73/8Z8ytun+DWJhIuibyFyz7A0cP/RANVcB4iDrbY8q+Og==", - "dev": true, - "license": "MIT", - "dependencies": { - "@floating-ui/core": "^1.7.1", - "@floating-ui/dom": "^1.7.1", - "esm-env": "^1.1.2", - "runed": "^0.35.1", - "svelte-toolbelt": "^0.10.6", - "tabbable": "^6.2.0" - }, - "engines": { - "node": ">=20" - }, - "funding": { - "url": "https://github.com/sponsors/huntabyte" - }, - "peerDependencies": { - "@internationalized/date": "^3.8.1", - "svelte": "^5.33.0" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "devOptional": true, - "license": "MIT" - }, - "node_modules/chokidar": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", - "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", - "dev": true, - "license": "MIT", - "dependencies": { - "readdirp": "^4.0.1" - }, - "engines": { - "node": ">= 14.16.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/clsx": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", - "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "devOptional": true, - "license": "MIT" - }, - "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/deepmerge": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", - "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/dequal": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", - "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/detect-libc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", - "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", - "license": "Apache-2.0", - "engines": { - "node": ">=8" - } - }, - "node_modules/devalue": { - "version": "5.6.2", - "resolved": "https://registry.npmjs.org/devalue/-/devalue-5.6.2.tgz", - "integrity": "sha512-nPRkjWzzDQlsejL1WVifk5rvcFi/y1onBRxjaFMjZeR9mFpqu2gmAZ9xUB9/IEanEP/vBtGeGganC/GO1fmufg==", - "dev": true, - "license": "MIT" - }, - "node_modules/enhanced-resolve": { - "version": "5.18.4", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.4.tgz", - "integrity": "sha512-LgQMM4WXU3QI+SYgEc2liRgznaD5ojbmY3sb8LxyguVkIg5FxdpTkvk72te2R38/TGKxH634oLxXRGY6d7AP+Q==", - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/esbuild": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.2.tgz", - "integrity": "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==", - "hasInstallScript": true, - "license": "MIT", - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=18" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.27.2", - "@esbuild/android-arm": "0.27.2", - "@esbuild/android-arm64": "0.27.2", - "@esbuild/android-x64": "0.27.2", - "@esbuild/darwin-arm64": "0.27.2", - "@esbuild/darwin-x64": "0.27.2", - "@esbuild/freebsd-arm64": "0.27.2", - "@esbuild/freebsd-x64": "0.27.2", - "@esbuild/linux-arm": "0.27.2", - "@esbuild/linux-arm64": "0.27.2", - "@esbuild/linux-ia32": "0.27.2", - "@esbuild/linux-loong64": "0.27.2", - "@esbuild/linux-mips64el": "0.27.2", - "@esbuild/linux-ppc64": "0.27.2", - "@esbuild/linux-riscv64": "0.27.2", - "@esbuild/linux-s390x": "0.27.2", - "@esbuild/linux-x64": "0.27.2", - "@esbuild/netbsd-arm64": "0.27.2", - "@esbuild/netbsd-x64": "0.27.2", - "@esbuild/openbsd-arm64": "0.27.2", - "@esbuild/openbsd-x64": "0.27.2", - "@esbuild/openharmony-arm64": "0.27.2", - "@esbuild/sunos-x64": "0.27.2", - "@esbuild/win32-arm64": "0.27.2", - "@esbuild/win32-ia32": "0.27.2", - "@esbuild/win32-x64": "0.27.2" - } - }, - "node_modules/esm-env": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz", - "integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==", - "dev": true, - "license": "MIT" - }, - "node_modules/esrap": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/esrap/-/esrap-2.2.1.tgz", - "integrity": "sha512-GiYWG34AN/4CUyaWAgunGt0Rxvr1PTMlGC0vvEov/uOQYWne2bpN03Um+k8jT+q3op33mKouP2zeJ6OlM+qeUg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15" - } - }, - "node_modules/fdir": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", - "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", - "license": "MIT", - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "picomatch": "^3 || ^4" - }, - "peerDependenciesMeta": { - "picomatch": { - "optional": true - } - } - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "license": "ISC" - }, - "node_modules/inline-style-parser": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.7.tgz", - "integrity": "sha512-Nb2ctOyNR8DqQoR0OwRG95uNWIC0C1lCgf5Naz5H6Ji72KZ8OcFZLz2P5sNgwlyoJ8Yif11oMuYs5pBQa86csA==", - "dev": true, - "license": "MIT" - }, - "node_modules/is-reference": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.3.tgz", - "integrity": "sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/estree": "^1.0.6" - } - }, - "node_modules/jiti": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz", - "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==", - "license": "MIT", - "bin": { - "jiti": "lib/jiti-cli.mjs" - } - }, - "node_modules/kleur": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz", - "integrity": "sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/lightningcss": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.2.tgz", - "integrity": "sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==", - "license": "MPL-2.0", - "dependencies": { - "detect-libc": "^2.0.3" - }, - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - }, - "optionalDependencies": { - "lightningcss-android-arm64": "1.30.2", - "lightningcss-darwin-arm64": "1.30.2", - "lightningcss-darwin-x64": "1.30.2", - "lightningcss-freebsd-x64": "1.30.2", - "lightningcss-linux-arm-gnueabihf": "1.30.2", - "lightningcss-linux-arm64-gnu": "1.30.2", - "lightningcss-linux-arm64-musl": "1.30.2", - "lightningcss-linux-x64-gnu": "1.30.2", - "lightningcss-linux-x64-musl": "1.30.2", - "lightningcss-win32-arm64-msvc": "1.30.2", - "lightningcss-win32-x64-msvc": "1.30.2" - } - }, - "node_modules/lightningcss-android-arm64": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.30.2.tgz", - "integrity": "sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A==", - "cpu": [ - "arm64" - ], - "license": "MPL-2.0", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-darwin-arm64": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz", - "integrity": "sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==", - "cpu": [ - "arm64" - ], - "license": "MPL-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-darwin-x64": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.2.tgz", - "integrity": "sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ==", - "cpu": [ - "x64" - ], - "license": "MPL-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-freebsd-x64": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.2.tgz", - "integrity": "sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA==", - "cpu": [ - "x64" - ], - "license": "MPL-2.0", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-arm-gnueabihf": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.2.tgz", - "integrity": "sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA==", - "cpu": [ - "arm" - ], - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-arm64-gnu": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.2.tgz", - "integrity": "sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A==", - "cpu": [ - "arm64" - ], - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-arm64-musl": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.2.tgz", - "integrity": "sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==", - "cpu": [ - "arm64" - ], - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-x64-gnu": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.2.tgz", - "integrity": "sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==", - "cpu": [ - "x64" - ], - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-x64-musl": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.2.tgz", - "integrity": "sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==", - "cpu": [ - "x64" - ], - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-win32-arm64-msvc": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.2.tgz", - "integrity": "sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==", - "cpu": [ - "arm64" - ], - "license": "MPL-2.0", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-win32-x64-msvc": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.2.tgz", - "integrity": "sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==", - "cpu": [ - "x64" - ], - "license": "MPL-2.0", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/locate-character": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz", - "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==", - "dev": true, - "license": "MIT" - }, - "node_modules/lz-string": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", - "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", - "dev": true, - "license": "MIT", - "bin": { - "lz-string": "bin/bin.js" - } - }, - "node_modules/magic-string": { - "version": "0.30.21", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", - "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.5" - } - }, - "node_modules/mri": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", - "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/mrmime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz", - "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - } - }, - "node_modules/nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/obug": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.1.tgz", - "integrity": "sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==", - "dev": true, - "funding": [ - "https://github.com/sponsors/sxzz", - "https://opencollective.com/debug" - ], - "license": "MIT" - }, - "node_modules/picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "license": "ISC" - }, - "node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "nanoid": "^3.3.11", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/readdirp": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", - "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 14.18.0" - }, - "funding": { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/rollup": { - "version": "4.55.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.55.1.tgz", - "integrity": "sha512-wDv/Ht1BNHB4upNbK74s9usvl7hObDnvVzknxqY/E/O3X6rW1U1rV1aENEfJ54eFZDTNo7zv1f5N4edCluH7+A==", - "license": "MIT", - "dependencies": { - "@types/estree": "1.0.8" - }, - "bin": { - "rollup": "dist/bin/rollup" - }, - "engines": { - "node": ">=18.0.0", - "npm": ">=8.0.0" - }, - "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.55.1", - "@rollup/rollup-android-arm64": "4.55.1", - "@rollup/rollup-darwin-arm64": "4.55.1", - "@rollup/rollup-darwin-x64": "4.55.1", - "@rollup/rollup-freebsd-arm64": "4.55.1", - "@rollup/rollup-freebsd-x64": "4.55.1", - "@rollup/rollup-linux-arm-gnueabihf": "4.55.1", - "@rollup/rollup-linux-arm-musleabihf": "4.55.1", - "@rollup/rollup-linux-arm64-gnu": "4.55.1", - "@rollup/rollup-linux-arm64-musl": "4.55.1", - "@rollup/rollup-linux-loong64-gnu": "4.55.1", - "@rollup/rollup-linux-loong64-musl": "4.55.1", - "@rollup/rollup-linux-ppc64-gnu": "4.55.1", - "@rollup/rollup-linux-ppc64-musl": "4.55.1", - "@rollup/rollup-linux-riscv64-gnu": "4.55.1", - "@rollup/rollup-linux-riscv64-musl": "4.55.1", - "@rollup/rollup-linux-s390x-gnu": "4.55.1", - "@rollup/rollup-linux-x64-gnu": "4.55.1", - "@rollup/rollup-linux-x64-musl": "4.55.1", - "@rollup/rollup-openbsd-x64": "4.55.1", - "@rollup/rollup-openharmony-arm64": "4.55.1", - "@rollup/rollup-win32-arm64-msvc": "4.55.1", - "@rollup/rollup-win32-ia32-msvc": "4.55.1", - "@rollup/rollup-win32-x64-gnu": "4.55.1", - "@rollup/rollup-win32-x64-msvc": "4.55.1", - "fsevents": "~2.3.2" - } - }, - "node_modules/runed": { - "version": "0.35.1", - "resolved": "https://registry.npmjs.org/runed/-/runed-0.35.1.tgz", - "integrity": "sha512-2F4Q/FZzbeJTFdIS/PuOoPRSm92sA2LhzTnv6FXhCoENb3huf5+fDuNOg1LNvGOouy3u/225qxmuJvcV3IZK5Q==", - "dev": true, - "funding": [ - "https://github.com/sponsors/huntabyte", - "https://github.com/sponsors/tglide" - ], - "license": "MIT", - "dependencies": { - "dequal": "^2.0.3", - "esm-env": "^1.0.0", - "lz-string": "^1.5.0" - }, - "peerDependencies": { - "@sveltejs/kit": "^2.21.0", - "svelte": "^5.7.0" - }, - "peerDependenciesMeta": { - "@sveltejs/kit": { - "optional": true - } - } - }, - "node_modules/sade": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz", - "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==", - "dev": true, - "license": "MIT", - "dependencies": { - "mri": "^1.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/set-cookie-parser": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz", - "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==", - "dev": true, - "license": "MIT" - }, - "node_modules/sirv": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.2.tgz", - "integrity": "sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@polka/url": "^1.0.0-next.24", - "mrmime": "^2.0.0", - "totalist": "^3.0.0" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "devOptional": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "devOptional": true, - "license": "MIT", - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/style-to-object": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.14.tgz", - "integrity": "sha512-LIN7rULI0jBscWQYaSswptyderlarFkjQ+t79nzty8tcIAceVomEVlLzH5VP4Cmsv6MtKhs7qaAiwlcp+Mgaxw==", - "dev": true, - "license": "MIT", - "dependencies": { - "inline-style-parser": "0.2.7" - } - }, - "node_modules/svelte": { - "version": "5.48.2", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.48.2.tgz", - "integrity": "sha512-VPWD+UyoSFZ7Nxix5K/F8yWiKWOiROkLlWYXOZReE0TUycw+58YWB3D6lAKT+57xmN99wRX4H3oZmw0NPy7y3Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/remapping": "^2.3.4", - "@jridgewell/sourcemap-codec": "^1.5.0", - "@sveltejs/acorn-typescript": "^1.0.5", - "@types/estree": "^1.0.5", - "acorn": "^8.12.1", - "aria-query": "^5.3.1", - "axobject-query": "^4.1.0", - "clsx": "^2.1.1", - "devalue": "^5.6.2", - "esm-env": "^1.2.1", - "esrap": "^2.2.1", - "is-reference": "^3.0.3", - "locate-character": "^3.0.0", - "magic-string": "^0.30.11", - "zimmerframe": "^1.1.2" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/svelte-check": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-4.3.5.tgz", - "integrity": "sha512-e4VWZETyXaKGhpkxOXP+B/d0Fp/zKViZoJmneZWe/05Y2aqSKj3YN2nLfYPJBQ87WEiY4BQCQ9hWGu9mPT1a1Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.25", - "chokidar": "^4.0.1", - "fdir": "^6.2.0", - "picocolors": "^1.0.0", - "sade": "^1.7.4" - }, - "bin": { - "svelte-check": "bin/svelte-check" - }, - "engines": { - "node": ">= 18.0.0" - }, - "peerDependencies": { - "svelte": "^4.0.0 || ^5.0.0-next.0", - "typescript": ">=5.0.0" - } - }, - "node_modules/svelte-toolbelt": { - "version": "0.10.6", - "resolved": "https://registry.npmjs.org/svelte-toolbelt/-/svelte-toolbelt-0.10.6.tgz", - "integrity": "sha512-YWuX+RE+CnWYx09yseAe4ZVMM7e7GRFZM6OYWpBKOb++s+SQ8RBIMMe+Bs/CznBMc0QPLjr+vDBxTAkozXsFXQ==", - "dev": true, - "funding": [ - "https://github.com/sponsors/huntabyte" - ], - "dependencies": { - "clsx": "^2.1.1", - "runed": "^0.35.1", - "style-to-object": "^1.0.8" - }, - "engines": { - "node": ">=18", - "pnpm": ">=8.7.0" - }, - "peerDependencies": { - "svelte": "^5.30.2" - } - }, - "node_modules/tabbable": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.4.0.tgz", - "integrity": "sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==", - "dev": true, - "license": "MIT" - }, - "node_modules/tailwind-merge": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.4.0.tgz", - "integrity": "sha512-uSaO4gnW+b3Y2aWoWfFpX62vn2sR3skfhbjsEnaBI81WD1wBLlHZe5sWf0AqjksNdYTbGBEd0UasQMT3SNV15g==", - "dev": true, - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/dcastil" - } - }, - "node_modules/tailwind-variants": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/tailwind-variants/-/tailwind-variants-3.2.2.tgz", - "integrity": "sha512-Mi4kHeMTLvKlM98XPnK+7HoBPmf4gygdFmqQPaDivc3DpYS6aIY6KiG/PgThrGvii5YZJqRsPz0aPyhoFzmZgg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=16.x", - "pnpm": ">=7.x" - }, - "peerDependencies": { - "tailwind-merge": ">=3.0.0", - "tailwindcss": "*" - }, - "peerDependenciesMeta": { - "tailwind-merge": { - "optional": true - } - } - }, - "node_modules/tailwindcss": { - "version": "4.1.18", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.18.tgz", - "integrity": "sha512-4+Z+0yiYyEtUVCScyfHCxOYP06L5Ne+JiHhY2IjR2KWMIWhJOYZKLSGZaP5HkZ8+bY0cxfzwDE5uOmzFXyIwxw==", - "license": "MIT" - }, - "node_modules/tapable": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz", - "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==", - "license": "MIT", - "engines": { - "node": ">=6" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/terser": { - "version": "5.46.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.0.tgz", - "integrity": "sha512-jTwoImyr/QbOWFFso3YoU3ik0jBBDJ6JTOQiy/J2YxVJdZCc+5u7skhNwiOR3FQIygFqVUPHl7qbbxtjW2K3Qg==", - "devOptional": true, - "license": "BSD-2-Clause", - "dependencies": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.15.0", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/tinyglobby": { - "version": "0.2.15", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", - "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", - "license": "MIT", - "dependencies": { - "fdir": "^6.5.0", - "picomatch": "^4.0.3" - }, - "engines": { - "node": ">=12.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/SuperchupuDev" - } - }, - "node_modules/totalist": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz", - "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/tslib": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "devOptional": true, - "license": "0BSD" - }, - "node_modules/tw-animate-css": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/tw-animate-css/-/tw-animate-css-1.4.0.tgz", - "integrity": "sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==", - "dev": true, - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/Wombosvideo" - } - }, - "node_modules/typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/vaul-svelte": { - "version": "1.0.0-next.7", - "resolved": "https://registry.npmjs.org/vaul-svelte/-/vaul-svelte-1.0.0-next.7.tgz", - "integrity": "sha512-7zN7Bi3dFQixvvbUJY9uGDe7Ws/dGZeBQR2pXdXmzQiakjrxBvWo0QrmsX3HK+VH+SZOltz378cmgmCS9f9rSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "runed": "^0.23.2", - "svelte-toolbelt": "^0.7.1" - }, - "engines": { - "node": ">=18", - "pnpm": ">=8.7.0" - }, - "peerDependencies": { - "svelte": "^5.0.0" - } - }, - "node_modules/vaul-svelte/node_modules/runed": { - "version": "0.23.4", - "resolved": "https://registry.npmjs.org/runed/-/runed-0.23.4.tgz", - "integrity": "sha512-9q8oUiBYeXIDLWNK5DfCWlkL0EW3oGbk845VdKlPeia28l751VpfesaB/+7pI6rnbx1I6rqoZ2fZxptOJLxILA==", - "dev": true, - "funding": [ - "https://github.com/sponsors/huntabyte", - "https://github.com/sponsors/tglide" - ], - "dependencies": { - "esm-env": "^1.0.0" - }, - "peerDependencies": { - "svelte": "^5.7.0" - } - }, - "node_modules/vaul-svelte/node_modules/svelte-toolbelt": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/svelte-toolbelt/-/svelte-toolbelt-0.7.1.tgz", - "integrity": "sha512-HcBOcR17Vx9bjaOceUvxkY3nGmbBmCBBbuWLLEWO6jtmWH8f/QoWmbyUfQZrpDINH39en1b8mptfPQT9VKQ1xQ==", - "dev": true, - "funding": [ - "https://github.com/sponsors/huntabyte" - ], - "dependencies": { - "clsx": "^2.1.1", - "runed": "^0.23.2", - "style-to-object": "^1.0.8" - }, - "engines": { - "node": ">=18", - "pnpm": ">=8.7.0" - }, - "peerDependencies": { - "svelte": "^5.0.0" - } - }, - "node_modules/vite": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz", - "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", - "license": "MIT", - "dependencies": { - "esbuild": "^0.27.0", - "fdir": "^6.5.0", - "picomatch": "^4.0.3", - "postcss": "^8.5.6", - "rollup": "^4.43.0", - "tinyglobby": "^0.2.15" - }, - "bin": { - "vite": "bin/vite.js" - }, - "engines": { - "node": "^20.19.0 || >=22.12.0" - }, - "funding": { - "url": "https://github.com/vitejs/vite?sponsor=1" - }, - "optionalDependencies": { - "fsevents": "~2.3.3" - }, - "peerDependencies": { - "@types/node": "^20.19.0 || >=22.12.0", - "jiti": ">=1.21.0", - "less": "^4.0.0", - "lightningcss": "^1.21.0", - "sass": "^1.70.0", - "sass-embedded": "^1.70.0", - "stylus": ">=0.54.8", - "sugarss": "^5.0.0", - "terser": "^5.16.0", - "tsx": "^4.8.1", - "yaml": "^2.4.2" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "jiti": { - "optional": true - }, - "less": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "sass": { - "optional": true - }, - "sass-embedded": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "terser": { - "optional": true - }, - "tsx": { - "optional": true - }, - "yaml": { - "optional": true - } - } - }, - "node_modules/vitefu": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/vitefu/-/vitefu-1.1.1.tgz", - "integrity": "sha512-B/Fegf3i8zh0yFbpzZ21amWzHmuNlLlmJT6n7bu5e+pCHUKQIfXSYokrqOBGEMMe9UG2sostKQF9mml/vYaWJQ==", - "dev": true, - "license": "MIT", - "workspaces": [ - "tests/deps/*", - "tests/projects/*", - "tests/projects/workspace/packages/*" - ], - "peerDependencies": { - "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0" - }, - "peerDependenciesMeta": { - "vite": { - "optional": true - } - } - }, - "node_modules/zimmerframe": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/zimmerframe/-/zimmerframe-1.1.4.tgz", - "integrity": "sha512-B58NGBEoc8Y9MWWCQGl/gq9xBCe4IiKM0a2x7GZdQKOW5Exr8S1W24J6OgM1njK8xCRGvAJIL/MxXHf6SkmQKQ==", - "dev": true, - "license": "MIT" - } - } -} diff --git a/package.json b/package.json deleted file mode 100644 index c16e19f..0000000 --- a/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "picoforge", - "version": "0.3.0", - "description": "", - "type": "module", - "scripts": { - "dev": "vite dev", - "build": "vite build", - "preview": "vite preview", - "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", - "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", - "tauri": "tauri", - "fmt": "biome format --write", - "fmt:check": "biome format", - "lint": "biome lint", - "lint:fix": "biome lint --write" - }, - "license": "MIT", - "dependencies": { - "@tailwindcss/vite": "^4.1.18", - "@tauri-apps/api": "^2", - "@tauri-apps/plugin-opener": "^2", - "@tauri-apps/plugin-shell": "~2.3.4", - "tailwindcss": "^4.1.18" - }, - "devDependencies": { - "@biomejs/biome": "^2.3.12", - "@internationalized/date": "^3.10.1", - "@lucide/svelte": "^0.563.1", - "@sveltejs/adapter-static": "^3.0.6", - "@sveltejs/kit": "^2.50.1", - "@sveltejs/vite-plugin-svelte": "^6.2.4", - "@tauri-apps/cli": "^2", - "bits-ui": "^2.15.4", - "clsx": "^2.1.1", - "svelte": "^5.48.2", - "svelte-check": "^4.0.0", - "tailwind-merge": "^3.4.0", - "tailwind-variants": "^3.2.2", - "terser": "^5.46.0", - "tw-animate-css": "^1.4.0", - "typescript": "~5.9.3", - "vaul-svelte": "^1.0.0-next.7", - "vite": "^7.3.1" - } -} diff --git a/src-tauri/rustfmt.toml b/rustfmt.toml similarity index 100% rename from src-tauri/rustfmt.toml rename to rustfmt.toml diff --git a/src-tauri/build.rs b/src-tauri/build.rs deleted file mode 100644 index d860e1e..0000000 --- a/src-tauri/build.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - tauri_build::build() -} diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json deleted file mode 100644 index 450ca64..0000000 --- a/src-tauri/capabilities/default.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "$schema": "../gen/schemas/desktop-schema.json", - "identifier": "default", - "description": "Capability for the main window", - "windows": [ - "main" - ], - "permissions": [ - "core:default", - "opener:default", - "core:window:allow-minimize", - "core:window:allow-maximize", - "core:window:allow-close", - "core:window:allow-start-dragging", - "core:window:allow-toggle-maximize", - "shell:default" - ] -} \ No newline at end of file diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs deleted file mode 100644 index de4c129..0000000 --- a/src-tauri/src/lib.rs +++ /dev/null @@ -1,39 +0,0 @@ -use serde::Serialize; - -mod error; -mod fido; -mod io; -mod logging; -mod rescue; -mod types; - -// This will be temporary here untill moved to a dedicated module: - -#[derive(Clone, Serialize)] -#[serde(rename_all = "camelCase")] -pub struct WindowState { - pub is_maximized: bool, -} - -#[cfg_attr(mobile, tauri::mobile_entry_point)] -pub fn run() { - logging::logger_init(); - log::info!("Initialisng PicoForge..."); - - tauri::Builder::default() - .plugin(tauri_plugin_shell::init()) - .plugin(tauri_plugin_opener::init()) - .invoke_handler(tauri::generate_handler![ - io::read_device_details, - io::write_config, - io::get_fido_info, - io::change_fido_pin, - io::get_credentials, - io::delete_credential, - io::set_min_pin_length, - io::enable_secure_boot, - io::reboot - ]) - .run(tauri::generate_context!()) - .expect("error while running tauri application"); -} diff --git a/src-tauri/.gitignore b/src/.gitignore similarity index 92% rename from src-tauri/.gitignore rename to src/.gitignore index b21bd68..fe86d2c 100644 --- a/src-tauri/.gitignore +++ b/src/.gitignore @@ -5,3 +5,5 @@ # Generated by Tauri # will have schema files for capabilities auto-completion /gen/schemas + +# /gpui-docs diff --git a/src/app.css b/src/app.css deleted file mode 100644 index a595326..0000000 --- a/src/app.css +++ /dev/null @@ -1,131 +0,0 @@ -@import "tailwindcss"; - -@import "tw-animate-css"; - -@custom-variant dark (&:is(.dark *)); - -:root { - --radius: 0.625rem; - --background: oklch(1 0 0); - --foreground: oklch(0.141 0.005 285.823); - --card: oklch(1 0 0); - --card-foreground: oklch(0.141 0.005 285.823); - --popover: oklch(1 0 0); - --popover-foreground: oklch(0.141 0.005 285.823); - --primary: oklch(0.21 0.006 285.885); - --primary-foreground: oklch(0.985 0 0); - --secondary: oklch(0.967 0.001 286.375); - --secondary-foreground: oklch(0.21 0.006 285.885); - --muted: oklch(0.967 0.001 286.375); - --muted-foreground: oklch(0.552 0.016 285.938); - --accent: oklch(0.967 0.001 286.375); - --accent-foreground: oklch(0.21 0.006 285.885); - --destructive: oklch(0.577 0.245 27.325); - --border: oklch(0.92 0.004 286.32); - --input: oklch(0.92 0.004 286.32); - --ring: oklch(0.705 0.015 286.067); - --chart-1: oklch(0.646 0.222 41.116); - --chart-2: oklch(0.6 0.118 184.704); - --chart-3: oklch(0.398 0.07 227.392); - --chart-4: oklch(0.828 0.189 84.429); - --chart-5: oklch(0.769 0.188 70.08); - --sidebar: oklch(0.985 0 0); - --sidebar-foreground: oklch(0.141 0.005 285.823); - --sidebar-primary: oklch(0.21 0.006 285.885); - --sidebar-primary-foreground: oklch(0.985 0 0); - --sidebar-accent: oklch(0.967 0.001 286.375); - --sidebar-accent-foreground: oklch(0.21 0.006 285.885); - --sidebar-border: oklch(0.92 0.004 286.32); - --sidebar-ring: oklch(0.705 0.015 286.067); -} - -.dark { - --background: oklch(0.141 0.005 285.823); - --foreground: oklch(0.985 0 0); - --card: oklch(0.21 0.006 285.885); - --card-foreground: oklch(0.985 0 0); - --popover: oklch(0.21 0.006 285.885); - --popover-foreground: oklch(0.985 0 0); - --primary: oklch(0.92 0.004 286.32); - --primary-foreground: oklch(0.21 0.006 285.885); - --secondary: oklch(0.274 0.006 286.033); - --secondary-foreground: oklch(0.985 0 0); - --muted: oklch(0.274 0.006 286.033); - --muted-foreground: oklch(0.705 0.015 286.067); - --accent: oklch(0.274 0.006 286.033); - --accent-foreground: oklch(0.985 0 0); - --destructive: oklch(0.704 0.191 22.216); - --border: oklch(1 0 0 / 10%); - --input: oklch(1 0 0 / 15%); - --ring: oklch(0.552 0.016 285.938); - --chart-1: oklch(0.488 0.243 264.376); - --chart-2: oklch(0.696 0.17 162.48); - --chart-3: oklch(0.769 0.188 70.08); - --chart-4: oklch(0.627 0.265 303.9); - --chart-5: oklch(0.645 0.246 16.439); - --sidebar: oklch(0.21 0.006 285.885); - --sidebar-foreground: oklch(0.985 0 0); - --sidebar-primary: oklch(0.488 0.243 264.376); - --sidebar-primary-foreground: oklch(0.985 0 0); - --sidebar-accent: oklch(0.274 0.006 286.033); - --sidebar-accent-foreground: oklch(0.985 0 0); - --sidebar-border: oklch(1 0 0 / 10%); - --sidebar-ring: oklch(0.552 0.016 285.938); -} - -@theme inline { - --radius-sm: calc(var(--radius) - 4px); - --radius-md: calc(var(--radius) - 2px); - --radius-lg: var(--radius); - --radius-xl: calc(var(--radius) + 4px); - --color-background: var(--background); - --color-foreground: var(--foreground); - --color-card: var(--card); - --color-card-foreground: var(--card-foreground); - --color-popover: var(--popover); - --color-popover-foreground: var(--popover-foreground); - --color-primary: var(--primary); - --color-primary-foreground: var(--primary-foreground); - --color-secondary: var(--secondary); - --color-secondary-foreground: var(--secondary-foreground); - --color-muted: var(--muted); - --color-muted-foreground: var(--muted-foreground); - --color-accent: var(--accent); - --color-accent-foreground: var(--accent-foreground); - --color-destructive: var(--destructive); - --color-border: var(--border); - --color-input: var(--input); - --color-ring: var(--ring); - --color-chart-1: var(--chart-1); - --color-chart-2: var(--chart-2); - --color-chart-3: var(--chart-3); - --color-chart-4: var(--chart-4); - --color-chart-5: var(--chart-5); - --color-sidebar: var(--sidebar); - --color-sidebar-foreground: var(--sidebar-foreground); - --color-sidebar-primary: var(--sidebar-primary); - --color-sidebar-primary-foreground: var(--sidebar-primary-foreground); - --color-sidebar-accent: var(--sidebar-accent); - --color-sidebar-accent-foreground: var(--sidebar-accent-foreground); - --color-sidebar-border: var(--sidebar-border); - --color-sidebar-ring: var(--sidebar-ring); -} - -@layer base { - * { - @apply border-border outline-ring/50; - } - body { - @apply bg-background text-foreground; - } -} - -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { - -webkit-appearance: none; - margin: 0; -} - -input[type="number"] { - appearance: textfield; -} diff --git a/src/app.html b/src/app.html deleted file mode 100644 index 46f55a8..0000000 --- a/src/app.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - Pico Forge - %sveltekit.head% - - -
%sveltekit.body%
- - diff --git a/src-tauri/src/error.rs b/src/device/error.rs similarity index 100% rename from src-tauri/src/error.rs rename to src/device/error.rs diff --git a/src-tauri/src/fido/constants.rs b/src/device/fido/constants.rs similarity index 100% rename from src-tauri/src/fido/constants.rs rename to src/device/fido/constants.rs diff --git a/src-tauri/src/fido/hid.rs b/src/device/fido/hid.rs similarity index 99% rename from src-tauri/src/fido/hid.rs rename to src/device/fido/hid.rs index bd41c50..0eaeab2 100644 --- a/src-tauri/src/fido/hid.rs +++ b/src/device/fido/hid.rs @@ -3,8 +3,8 @@ use serde_cbor_2::{Value, to_vec}; use std::collections::BTreeMap; use std::time::Duration; -use crate::error::PFError; -use crate::fido::constants::*; +use crate::device::error::PFError; +use crate::device::fido::constants::*; // HID Transport Constants const HID_REPORT_SIZE: usize = 64; diff --git a/src-tauri/src/fido/mod.rs b/src/device/fido/mod.rs similarity index 99% rename from src-tauri/src/fido/mod.rs rename to src/device/fido/mod.rs index 14c4b12..a7ac22b 100644 --- a/src-tauri/src/fido/mod.rs +++ b/src/device/fido/mod.rs @@ -2,8 +2,8 @@ pub mod constants; pub mod hid; use crate::{ - error::PFError, - types::{ + device::error::PFError, + device::types::{ AppConfig, AppConfigInput, DeviceInfo, DeviceMethod, FidoDeviceInfo, FullDeviceStatus, StoredCredential, }, diff --git a/src-tauri/src/io.rs b/src/device/io.rs similarity index 64% rename from src-tauri/src/io.rs rename to src/device/io.rs index db12b9e..1f77cba 100644 --- a/src-tauri/src/io.rs +++ b/src/device/io.rs @@ -1,7 +1,6 @@ //! Tauri Commands to interact with the pico-fido firmware via rescue and fido protocols. -use crate::{error::PFError, fido, rescue, types::*}; +use crate::{device::error::PFError, device::fido, device::rescue, device::types::*}; -#[tauri::command] pub fn read_device_details() -> Result { match rescue::read_device_details() { Ok(status) => Ok(status), @@ -12,7 +11,6 @@ pub fn read_device_details() -> Result { } } -#[tauri::command] pub fn write_config( config: AppConfigInput, method: DeviceMethod, @@ -25,17 +23,14 @@ pub fn write_config( } } -#[tauri::command] pub fn enable_secure_boot(lock: bool) -> Result { rescue::enable_secure_boot(lock) } -#[tauri::command] pub(crate) fn get_fido_info() -> Result { fido::get_fido_info() } -#[tauri::command] pub(crate) fn change_fido_pin( current_pin: Option, new_pin: String, @@ -43,8 +38,6 @@ pub(crate) fn change_fido_pin( fido::change_fido_pin(current_pin, new_pin) } -/// UNSTABLE! -#[tauri::command] pub(crate) fn set_min_pin_length( current_pin: String, min_pin_length: u8, @@ -52,21 +45,14 @@ pub(crate) fn set_min_pin_length( fido::set_min_pin_length(current_pin, min_pin_length) } -#[tauri::command] pub fn reboot(to_bootsel: bool) -> Result { rescue::reboot_device(to_bootsel) } -#[tauri::command] -pub async fn get_credentials(pin: String) -> Result, String> { - tauri::async_runtime::spawn_blocking(move || fido::get_credentials(pin)) - .await - .map_err(|e| e.to_string())? +pub fn get_credentials(pin: String) -> Result, String> { + fido::get_credentials(pin) } -#[tauri::command] -pub async fn delete_credential(pin: String, credential_id: String) -> Result { - tauri::async_runtime::spawn_blocking(move || fido::delete_credential(pin, credential_id)) - .await - .map_err(|e| e.to_string())? +pub fn delete_credential(pin: String, credential_id: String) -> Result { + fido::delete_credential(pin, credential_id) } diff --git a/src-tauri/src/logging.rs b/src/device/logging.rs similarity index 100% rename from src-tauri/src/logging.rs rename to src/device/logging.rs diff --git a/src-tauri/src/main.rs b/src/device/main.rs similarity index 100% rename from src-tauri/src/main.rs rename to src/device/main.rs diff --git a/src/device/mod.rs b/src/device/mod.rs new file mode 100644 index 0000000..8fee69c --- /dev/null +++ b/src/device/mod.rs @@ -0,0 +1,6 @@ +pub mod error; +pub mod fido; +pub mod io; +pub mod logging; +pub mod rescue; +pub mod types; diff --git a/src-tauri/src/rescue/constants.rs b/src/device/rescue/constants.rs similarity index 100% rename from src-tauri/src/rescue/constants.rs rename to src/device/rescue/constants.rs diff --git a/src-tauri/src/rescue/mod.rs b/src/device/rescue/mod.rs similarity index 99% rename from src-tauri/src/rescue/mod.rs rename to src/device/rescue/mod.rs index dfbbf78..0953a31 100644 --- a/src-tauri/src/rescue/mod.rs +++ b/src/device/rescue/mod.rs @@ -4,7 +4,7 @@ pub mod constants; -use crate::{error::PFError, rescue::constants::*, types::*}; +use crate::device::{error::PFError, rescue::constants::*, types::*}; use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; use pcsc::{Context, Protocols, Scope, ShareMode}; use std::io::Cursor; diff --git a/src-tauri/src/types.rs b/src/device/types.rs similarity index 100% rename from src-tauri/src/types.rs rename to src/device/types.rs diff --git a/src-tauri/icons/128x128.png b/src/icons/128x128.png similarity index 100% rename from src-tauri/icons/128x128.png rename to src/icons/128x128.png diff --git a/src-tauri/icons/128x128@2x.png b/src/icons/128x128@2x.png similarity index 100% rename from src-tauri/icons/128x128@2x.png rename to src/icons/128x128@2x.png diff --git a/src-tauri/icons/32x32.png b/src/icons/32x32.png similarity index 100% rename from src-tauri/icons/32x32.png rename to src/icons/32x32.png diff --git a/src-tauri/icons/64x64.png b/src/icons/64x64.png similarity index 100% rename from src-tauri/icons/64x64.png rename to src/icons/64x64.png diff --git a/src-tauri/icons/Square107x107Logo.png b/src/icons/Square107x107Logo.png similarity index 100% rename from src-tauri/icons/Square107x107Logo.png rename to src/icons/Square107x107Logo.png diff --git a/src-tauri/icons/Square142x142Logo.png b/src/icons/Square142x142Logo.png similarity index 100% rename from src-tauri/icons/Square142x142Logo.png rename to src/icons/Square142x142Logo.png diff --git a/src-tauri/icons/Square150x150Logo.png b/src/icons/Square150x150Logo.png similarity index 100% rename from src-tauri/icons/Square150x150Logo.png rename to src/icons/Square150x150Logo.png diff --git a/src-tauri/icons/Square284x284Logo.png b/src/icons/Square284x284Logo.png similarity index 100% rename from src-tauri/icons/Square284x284Logo.png rename to src/icons/Square284x284Logo.png diff --git a/src-tauri/icons/Square30x30Logo.png b/src/icons/Square30x30Logo.png similarity index 100% rename from src-tauri/icons/Square30x30Logo.png rename to src/icons/Square30x30Logo.png diff --git a/src-tauri/icons/Square310x310Logo.png b/src/icons/Square310x310Logo.png similarity index 100% rename from src-tauri/icons/Square310x310Logo.png rename to src/icons/Square310x310Logo.png diff --git a/src-tauri/icons/Square44x44Logo.png b/src/icons/Square44x44Logo.png similarity index 100% rename from src-tauri/icons/Square44x44Logo.png rename to src/icons/Square44x44Logo.png diff --git a/src-tauri/icons/Square71x71Logo.png b/src/icons/Square71x71Logo.png similarity index 100% rename from src-tauri/icons/Square71x71Logo.png rename to src/icons/Square71x71Logo.png diff --git a/src-tauri/icons/Square89x89Logo.png b/src/icons/Square89x89Logo.png similarity index 100% rename from src-tauri/icons/Square89x89Logo.png rename to src/icons/Square89x89Logo.png diff --git a/src-tauri/icons/StoreLogo.png b/src/icons/StoreLogo.png similarity index 100% rename from src-tauri/icons/StoreLogo.png rename to src/icons/StoreLogo.png diff --git a/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml b/src/icons/android/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml rename to src/icons/android/mipmap-anydpi-v26/ic_launcher.xml diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png b/src/icons/android/mipmap-hdpi/ic_launcher.png similarity index 100% rename from src-tauri/icons/android/mipmap-hdpi/ic_launcher.png rename to src/icons/android/mipmap-hdpi/ic_launcher.png diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png b/src/icons/android/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png rename to src/icons/android/mipmap-hdpi/ic_launcher_foreground.png diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png b/src/icons/android/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png rename to src/icons/android/mipmap-hdpi/ic_launcher_round.png diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png b/src/icons/android/mipmap-mdpi/ic_launcher.png similarity index 100% rename from src-tauri/icons/android/mipmap-mdpi/ic_launcher.png rename to src/icons/android/mipmap-mdpi/ic_launcher.png diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png b/src/icons/android/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png rename to src/icons/android/mipmap-mdpi/ic_launcher_foreground.png diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png b/src/icons/android/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png rename to src/icons/android/mipmap-mdpi/ic_launcher_round.png diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png b/src/icons/android/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png rename to src/icons/android/mipmap-xhdpi/ic_launcher.png diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png b/src/icons/android/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png rename to src/icons/android/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png b/src/icons/android/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png rename to src/icons/android/mipmap-xhdpi/ic_launcher_round.png diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png b/src/icons/android/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png rename to src/icons/android/mipmap-xxhdpi/ic_launcher.png diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png b/src/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png rename to src/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png b/src/icons/android/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png rename to src/icons/android/mipmap-xxhdpi/ic_launcher_round.png diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png b/src/icons/android/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png rename to src/icons/android/mipmap-xxxhdpi/ic_launcher.png diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/src/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png rename to src/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png b/src/icons/android/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png rename to src/icons/android/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/src-tauri/icons/android/values/ic_launcher_background.xml b/src/icons/android/values/ic_launcher_background.xml similarity index 100% rename from src-tauri/icons/android/values/ic_launcher_background.xml rename to src/icons/android/values/ic_launcher_background.xml diff --git a/src-tauri/icons/icon.icns b/src/icons/icon.icns similarity index 100% rename from src-tauri/icons/icon.icns rename to src/icons/icon.icns diff --git a/src-tauri/icons/icon.ico b/src/icons/icon.ico similarity index 100% rename from src-tauri/icons/icon.ico rename to src/icons/icon.ico diff --git a/src-tauri/icons/icon.png b/src/icons/icon.png similarity index 100% rename from src-tauri/icons/icon.png rename to src/icons/icon.png diff --git a/src-tauri/icons/in.suyogtandel.picoforge-symbolic.svg b/src/icons/in.suyogtandel.picoforge-symbolic.svg similarity index 100% rename from src-tauri/icons/in.suyogtandel.picoforge-symbolic.svg rename to src/icons/in.suyogtandel.picoforge-symbolic.svg diff --git a/src-tauri/icons/in.suyogtandel.picoforge.Devel.svg b/src/icons/in.suyogtandel.picoforge.Devel.svg similarity index 100% rename from src-tauri/icons/in.suyogtandel.picoforge.Devel.svg rename to src/icons/in.suyogtandel.picoforge.Devel.svg diff --git a/src-tauri/icons/in.suyogtandel.picoforge.source.svg b/src/icons/in.suyogtandel.picoforge.source.svg similarity index 100% rename from src-tauri/icons/in.suyogtandel.picoforge.source.svg rename to src/icons/in.suyogtandel.picoforge.source.svg diff --git a/src-tauri/icons/in.suyogtandel.picoforge.svg b/src/icons/in.suyogtandel.picoforge.svg similarity index 100% rename from src-tauri/icons/in.suyogtandel.picoforge.svg rename to src/icons/in.suyogtandel.picoforge.svg diff --git a/src-tauri/icons/ios/AppIcon-20x20@1x.png b/src/icons/ios/AppIcon-20x20@1x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-20x20@1x.png rename to src/icons/ios/AppIcon-20x20@1x.png diff --git a/src-tauri/icons/ios/AppIcon-20x20@2x-1.png b/src/icons/ios/AppIcon-20x20@2x-1.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-20x20@2x-1.png rename to src/icons/ios/AppIcon-20x20@2x-1.png diff --git a/src-tauri/icons/ios/AppIcon-20x20@2x.png b/src/icons/ios/AppIcon-20x20@2x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-20x20@2x.png rename to src/icons/ios/AppIcon-20x20@2x.png diff --git a/src-tauri/icons/ios/AppIcon-20x20@3x.png b/src/icons/ios/AppIcon-20x20@3x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-20x20@3x.png rename to src/icons/ios/AppIcon-20x20@3x.png diff --git a/src-tauri/icons/ios/AppIcon-29x29@1x.png b/src/icons/ios/AppIcon-29x29@1x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-29x29@1x.png rename to src/icons/ios/AppIcon-29x29@1x.png diff --git a/src-tauri/icons/ios/AppIcon-29x29@2x-1.png b/src/icons/ios/AppIcon-29x29@2x-1.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-29x29@2x-1.png rename to src/icons/ios/AppIcon-29x29@2x-1.png diff --git a/src-tauri/icons/ios/AppIcon-29x29@2x.png b/src/icons/ios/AppIcon-29x29@2x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-29x29@2x.png rename to src/icons/ios/AppIcon-29x29@2x.png diff --git a/src-tauri/icons/ios/AppIcon-29x29@3x.png b/src/icons/ios/AppIcon-29x29@3x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-29x29@3x.png rename to src/icons/ios/AppIcon-29x29@3x.png diff --git a/src-tauri/icons/ios/AppIcon-40x40@1x.png b/src/icons/ios/AppIcon-40x40@1x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-40x40@1x.png rename to src/icons/ios/AppIcon-40x40@1x.png diff --git a/src-tauri/icons/ios/AppIcon-40x40@2x-1.png b/src/icons/ios/AppIcon-40x40@2x-1.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-40x40@2x-1.png rename to src/icons/ios/AppIcon-40x40@2x-1.png diff --git a/src-tauri/icons/ios/AppIcon-40x40@2x.png b/src/icons/ios/AppIcon-40x40@2x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-40x40@2x.png rename to src/icons/ios/AppIcon-40x40@2x.png diff --git a/src-tauri/icons/ios/AppIcon-40x40@3x.png b/src/icons/ios/AppIcon-40x40@3x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-40x40@3x.png rename to src/icons/ios/AppIcon-40x40@3x.png diff --git a/src-tauri/icons/ios/AppIcon-512@2x.png b/src/icons/ios/AppIcon-512@2x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-512@2x.png rename to src/icons/ios/AppIcon-512@2x.png diff --git a/src-tauri/icons/ios/AppIcon-60x60@2x.png b/src/icons/ios/AppIcon-60x60@2x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-60x60@2x.png rename to src/icons/ios/AppIcon-60x60@2x.png diff --git a/src-tauri/icons/ios/AppIcon-60x60@3x.png b/src/icons/ios/AppIcon-60x60@3x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-60x60@3x.png rename to src/icons/ios/AppIcon-60x60@3x.png diff --git a/src-tauri/icons/ios/AppIcon-76x76@1x.png b/src/icons/ios/AppIcon-76x76@1x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-76x76@1x.png rename to src/icons/ios/AppIcon-76x76@1x.png diff --git a/src-tauri/icons/ios/AppIcon-76x76@2x.png b/src/icons/ios/AppIcon-76x76@2x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-76x76@2x.png rename to src/icons/ios/AppIcon-76x76@2x.png diff --git a/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png b/src/icons/ios/AppIcon-83.5x83.5@2x.png similarity index 100% rename from src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png rename to src/icons/ios/AppIcon-83.5x83.5@2x.png diff --git a/src/lib/components/device/DeviceNotSupported.svelte b/src/lib/components/device/DeviceNotSupported.svelte deleted file mode 100644 index 893b0be..0000000 --- a/src/lib/components/device/DeviceNotSupported.svelte +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {device.error ? "Connection Error" : "Feature not supported"} - - {device.error || message} - - diff --git a/src/lib/components/device/NoDeviceStatus.svelte b/src/lib/components/device/NoDeviceStatus.svelte deleted file mode 100644 index 12bde5c..0000000 --- a/src/lib/components/device/NoDeviceStatus.svelte +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {device.error ? "Connection Error" : "No Device Connected"} - - {device.error || message} - - diff --git a/src/lib/components/dialogs/AuthDialog.svelte b/src/lib/components/dialogs/AuthDialog.svelte deleted file mode 100644 index d9acdb8..0000000 --- a/src/lib/components/dialogs/AuthDialog.svelte +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - Authenticate to View Passkeys - - Enter your FIDO2 PIN to access and manage stored credentials. - -
-
- - e.key === "Enter" && handleUnlock()} - autofocus - /> -
- {#if error} - - {error} - - {/if} -
- - - - - diff --git a/src/lib/components/dialogs/authPinDialog.svelte b/src/lib/components/dialogs/authPinDialog.svelte deleted file mode 100644 index 33941f4..0000000 --- a/src/lib/components/dialogs/authPinDialog.svelte +++ /dev/null @@ -1,51 +0,0 @@ - - - - { - e.preventDefault(); - document.getElementById("auth-pin")?.focus(); - }} - > - - Authentication Required - - Please enter your FIDO2 PIN to authorize the configuration - change. - - -
-
- - - e.key === "Enter" && configState.confirmAuthPinSave()} - /> -
- {#if configState.authPinError} -

- {configState.authPinError} -

- {/if} -
- - (configState.authPinDialogOpen = false)} - >Cancel - configState.confirmAuthPinSave()} - >Confirm - - - diff --git a/src/lib/components/dialogs/deleteCredentialDialog.svelte b/src/lib/components/dialogs/deleteCredentialDialog.svelte deleted file mode 100644 index 1467823..0000000 --- a/src/lib/components/dialogs/deleteCredentialDialog.svelte +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - Are you sure? - - This action cannot be undone. This will permanently delete the - passkey for - {credential?.rpId}. - - - -
- - -
- - - Cancel - - - - diff --git a/src/lib/components/dialogs/messageDialog.svelte b/src/lib/components/dialogs/messageDialog.svelte deleted file mode 100644 index 62fd1c9..0000000 --- a/src/lib/components/dialogs/messageDialog.svelte +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - {state.dialogTitle} - - {state.dialogMessage} - - - - (state.dialogOpen = false)} - class={state.dialogType === "error" - ? "bg-red-600 hover:bg-red-700 text-white" - : ""} - > - {state.dialogType === "error" ? "Cancel" : "Okay"} - - - - diff --git a/src/lib/components/dialogs/minPinDialog.svelte b/src/lib/components/dialogs/minPinDialog.svelte deleted file mode 100644 index 1a64d13..0000000 --- a/src/lib/components/dialogs/minPinDialog.svelte +++ /dev/null @@ -1,80 +0,0 @@ - - - - { - e.preventDefault(); - document.getElementById("min-pin-current")?.focus(); - }} - > - - Update Minimum PIN Length - - Set the minimum allowed PIN length (4-63 characters) and enter a new PIN - that meets this requirement. - - -
-
- - -
-
- - -
-
- - -
-
- - -
- {#if configState.minPinError} -

{configState.minPinError}

- {/if} -
- - (configState.minPinDialogOpen = false)} - >Cancel - configState.handleMinPinChange()} - >Update - - - diff --git a/src/lib/components/dialogs/setPinDialog.svelte b/src/lib/components/dialogs/setPinDialog.svelte deleted file mode 100644 index 23e9324..0000000 --- a/src/lib/components/dialogs/setPinDialog.svelte +++ /dev/null @@ -1,75 +0,0 @@ - - - - { - e.preventDefault(); - const id = configState.isSettingPin ? "new-pin" : "current-pin"; - document.getElementById(id)?.focus(); - }} - > - - {configState.isSettingPin - ? "Set PIN" - : "Change PIN"} - - {configState.isSettingPin - ? "Set a PIN for your FIDO2 device. Minimum length is " + - (configState.minPinLength || 4) + - " characters." - : "Enter your current PIN and choose a new one."} - - -
- {#if !configState.isSettingPin} -
- - -
- {/if} -
- - -
-
- - -
- {#if configState.pinError} -

{configState.pinError}

- {/if} -
- - (configState.setPinDialogOpen = false)} - >Cancel - configState.handlePinChange()} - >Confirm - - - diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-action.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-action.svelte deleted file mode 100644 index a005691..0000000 --- a/src/lib/components/ui/alert-dialog/alert-dialog-action.svelte +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-cancel.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-cancel.svelte deleted file mode 100644 index a7b0cf7..0000000 --- a/src/lib/components/ui/alert-dialog/alert-dialog-cancel.svelte +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-content.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-content.svelte deleted file mode 100644 index 236bcad..0000000 --- a/src/lib/components/ui/alert-dialog/alert-dialog-content.svelte +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-description.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-description.svelte deleted file mode 100644 index 2ec67dc..0000000 --- a/src/lib/components/ui/alert-dialog/alert-dialog-description.svelte +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-footer.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-footer.svelte deleted file mode 100644 index f78b97a..0000000 --- a/src/lib/components/ui/alert-dialog/alert-dialog-footer.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-header.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-header.svelte deleted file mode 100644 index 1835d91..0000000 --- a/src/lib/components/ui/alert-dialog/alert-dialog-header.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-overlay.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-overlay.svelte deleted file mode 100644 index a64ee76..0000000 --- a/src/lib/components/ui/alert-dialog/alert-dialog-overlay.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - - diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-portal.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-portal.svelte deleted file mode 100644 index f0a19a8..0000000 --- a/src/lib/components/ui/alert-dialog/alert-dialog-portal.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-title.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-title.svelte deleted file mode 100644 index 7ef2b5f..0000000 --- a/src/lib/components/ui/alert-dialog/alert-dialog-title.svelte +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/lib/components/ui/alert-dialog/alert-dialog-trigger.svelte b/src/lib/components/ui/alert-dialog/alert-dialog-trigger.svelte deleted file mode 100644 index b22d1d5..0000000 --- a/src/lib/components/ui/alert-dialog/alert-dialog-trigger.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/alert-dialog/alert-dialog.svelte b/src/lib/components/ui/alert-dialog/alert-dialog.svelte deleted file mode 100644 index 7ea78bb..0000000 --- a/src/lib/components/ui/alert-dialog/alert-dialog.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/alert-dialog/index.ts b/src/lib/components/ui/alert-dialog/index.ts deleted file mode 100644 index 269538e..0000000 --- a/src/lib/components/ui/alert-dialog/index.ts +++ /dev/null @@ -1,37 +0,0 @@ -import Root from "./alert-dialog.svelte"; -import Portal from "./alert-dialog-portal.svelte"; -import Trigger from "./alert-dialog-trigger.svelte"; -import Title from "./alert-dialog-title.svelte"; -import Action from "./alert-dialog-action.svelte"; -import Cancel from "./alert-dialog-cancel.svelte"; -import Footer from "./alert-dialog-footer.svelte"; -import Header from "./alert-dialog-header.svelte"; -import Overlay from "./alert-dialog-overlay.svelte"; -import Content from "./alert-dialog-content.svelte"; -import Description from "./alert-dialog-description.svelte"; - -export { - Root, - Title, - Action, - Cancel, - Portal, - Footer, - Header, - Trigger, - Overlay, - Content, - Description, - // - Root as AlertDialog, - Title as AlertDialogTitle, - Action as AlertDialogAction, - Cancel as AlertDialogCancel, - Portal as AlertDialogPortal, - Footer as AlertDialogFooter, - Header as AlertDialogHeader, - Trigger as AlertDialogTrigger, - Overlay as AlertDialogOverlay, - Content as AlertDialogContent, - Description as AlertDialogDescription, -}; diff --git a/src/lib/components/ui/alert/alert-description.svelte b/src/lib/components/ui/alert/alert-description.svelte deleted file mode 100644 index 8b56aed..0000000 --- a/src/lib/components/ui/alert/alert-description.svelte +++ /dev/null @@ -1,23 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/alert/alert-title.svelte b/src/lib/components/ui/alert/alert-title.svelte deleted file mode 100644 index 77e45ad..0000000 --- a/src/lib/components/ui/alert/alert-title.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/alert/alert.svelte b/src/lib/components/ui/alert/alert.svelte deleted file mode 100644 index 2b2eff9..0000000 --- a/src/lib/components/ui/alert/alert.svelte +++ /dev/null @@ -1,44 +0,0 @@ - - - - - diff --git a/src/lib/components/ui/alert/index.ts b/src/lib/components/ui/alert/index.ts deleted file mode 100644 index 97e21b4..0000000 --- a/src/lib/components/ui/alert/index.ts +++ /dev/null @@ -1,14 +0,0 @@ -import Root from "./alert.svelte"; -import Description from "./alert-description.svelte"; -import Title from "./alert-title.svelte"; -export { alertVariants, type AlertVariant } from "./alert.svelte"; - -export { - Root, - Description, - Title, - // - Root as Alert, - Description as AlertDescription, - Title as AlertTitle, -}; diff --git a/src/lib/components/ui/badge/badge.svelte b/src/lib/components/ui/badge/badge.svelte deleted file mode 100644 index e3164ba..0000000 --- a/src/lib/components/ui/badge/badge.svelte +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - {@render children?.()} - diff --git a/src/lib/components/ui/badge/index.ts b/src/lib/components/ui/badge/index.ts deleted file mode 100644 index 64e0aa9..0000000 --- a/src/lib/components/ui/badge/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { default as Badge } from "./badge.svelte"; -export { badgeVariants, type BadgeVariant } from "./badge.svelte"; diff --git a/src/lib/components/ui/button/button.svelte b/src/lib/components/ui/button/button.svelte deleted file mode 100644 index a8296ae..0000000 --- a/src/lib/components/ui/button/button.svelte +++ /dev/null @@ -1,82 +0,0 @@ - - - - -{#if href} - - {@render children?.()} - -{:else} - -{/if} diff --git a/src/lib/components/ui/button/index.ts b/src/lib/components/ui/button/index.ts deleted file mode 100644 index fb585d7..0000000 --- a/src/lib/components/ui/button/index.ts +++ /dev/null @@ -1,17 +0,0 @@ -import Root, { - type ButtonProps, - type ButtonSize, - type ButtonVariant, - buttonVariants, -} from "./button.svelte"; - -export { - Root, - type ButtonProps as Props, - // - Root as Button, - buttonVariants, - type ButtonProps, - type ButtonSize, - type ButtonVariant, -}; diff --git a/src/lib/components/ui/card/card-action.svelte b/src/lib/components/ui/card/card-action.svelte deleted file mode 100644 index cc36c56..0000000 --- a/src/lib/components/ui/card/card-action.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/card/card-content.svelte b/src/lib/components/ui/card/card-content.svelte deleted file mode 100644 index bc90b83..0000000 --- a/src/lib/components/ui/card/card-content.svelte +++ /dev/null @@ -1,15 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/card/card-description.svelte b/src/lib/components/ui/card/card-description.svelte deleted file mode 100644 index 9b20ac7..0000000 --- a/src/lib/components/ui/card/card-description.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -

- {@render children?.()} -

diff --git a/src/lib/components/ui/card/card-footer.svelte b/src/lib/components/ui/card/card-footer.svelte deleted file mode 100644 index 2d4d0f2..0000000 --- a/src/lib/components/ui/card/card-footer.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/card/card-header.svelte b/src/lib/components/ui/card/card-header.svelte deleted file mode 100644 index 2501788..0000000 --- a/src/lib/components/ui/card/card-header.svelte +++ /dev/null @@ -1,23 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/card/card-title.svelte b/src/lib/components/ui/card/card-title.svelte deleted file mode 100644 index 7447231..0000000 --- a/src/lib/components/ui/card/card-title.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/card/card.svelte b/src/lib/components/ui/card/card.svelte deleted file mode 100644 index 99448cc..0000000 --- a/src/lib/components/ui/card/card.svelte +++ /dev/null @@ -1,23 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/card/index.ts b/src/lib/components/ui/card/index.ts deleted file mode 100644 index 4d3fce4..0000000 --- a/src/lib/components/ui/card/index.ts +++ /dev/null @@ -1,25 +0,0 @@ -import Root from "./card.svelte"; -import Content from "./card-content.svelte"; -import Description from "./card-description.svelte"; -import Footer from "./card-footer.svelte"; -import Header from "./card-header.svelte"; -import Title from "./card-title.svelte"; -import Action from "./card-action.svelte"; - -export { - Root, - Content, - Description, - Footer, - Header, - Title, - Action, - // - Root as Card, - Content as CardContent, - Description as CardDescription, - Footer as CardFooter, - Header as CardHeader, - Title as CardTitle, - Action as CardAction, -}; diff --git a/src/lib/components/ui/dialog/dialog-close.svelte b/src/lib/components/ui/dialog/dialog-close.svelte deleted file mode 100644 index 840b2f6..0000000 --- a/src/lib/components/ui/dialog/dialog-close.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/dialog/dialog-content.svelte b/src/lib/components/ui/dialog/dialog-content.svelte deleted file mode 100644 index 5c6ee6d..0000000 --- a/src/lib/components/ui/dialog/dialog-content.svelte +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - {@render children?.()} - {#if showCloseButton} - - - Close - - {/if} - - diff --git a/src/lib/components/ui/dialog/dialog-description.svelte b/src/lib/components/ui/dialog/dialog-description.svelte deleted file mode 100644 index 3845023..0000000 --- a/src/lib/components/ui/dialog/dialog-description.svelte +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/lib/components/ui/dialog/dialog-footer.svelte b/src/lib/components/ui/dialog/dialog-footer.svelte deleted file mode 100644 index e7ff446..0000000 --- a/src/lib/components/ui/dialog/dialog-footer.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/dialog/dialog-header.svelte b/src/lib/components/ui/dialog/dialog-header.svelte deleted file mode 100644 index 4e5c447..0000000 --- a/src/lib/components/ui/dialog/dialog-header.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/dialog/dialog-overlay.svelte b/src/lib/components/ui/dialog/dialog-overlay.svelte deleted file mode 100644 index f81ad83..0000000 --- a/src/lib/components/ui/dialog/dialog-overlay.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - - diff --git a/src/lib/components/ui/dialog/dialog-portal.svelte b/src/lib/components/ui/dialog/dialog-portal.svelte deleted file mode 100644 index ccfa79c..0000000 --- a/src/lib/components/ui/dialog/dialog-portal.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/dialog/dialog-title.svelte b/src/lib/components/ui/dialog/dialog-title.svelte deleted file mode 100644 index e4d4b34..0000000 --- a/src/lib/components/ui/dialog/dialog-title.svelte +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/lib/components/ui/dialog/dialog-trigger.svelte b/src/lib/components/ui/dialog/dialog-trigger.svelte deleted file mode 100644 index 9d1e801..0000000 --- a/src/lib/components/ui/dialog/dialog-trigger.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/dialog/dialog.svelte b/src/lib/components/ui/dialog/dialog.svelte deleted file mode 100644 index 211672c..0000000 --- a/src/lib/components/ui/dialog/dialog.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/dialog/index.ts b/src/lib/components/ui/dialog/index.ts deleted file mode 100644 index 076cef5..0000000 --- a/src/lib/components/ui/dialog/index.ts +++ /dev/null @@ -1,34 +0,0 @@ -import Root from "./dialog.svelte"; -import Portal from "./dialog-portal.svelte"; -import Title from "./dialog-title.svelte"; -import Footer from "./dialog-footer.svelte"; -import Header from "./dialog-header.svelte"; -import Overlay from "./dialog-overlay.svelte"; -import Content from "./dialog-content.svelte"; -import Description from "./dialog-description.svelte"; -import Trigger from "./dialog-trigger.svelte"; -import Close from "./dialog-close.svelte"; - -export { - Root, - Title, - Portal, - Footer, - Header, - Trigger, - Overlay, - Content, - Description, - Close, - // - Root as Dialog, - Title as DialogTitle, - Portal as DialogPortal, - Footer as DialogFooter, - Header as DialogHeader, - Trigger as DialogTrigger, - Overlay as DialogOverlay, - Content as DialogContent, - Description as DialogDescription, - Close as DialogClose, -}; diff --git a/src/lib/components/ui/drawer/drawer-close.svelte b/src/lib/components/ui/drawer/drawer-close.svelte deleted file mode 100644 index 95c2479..0000000 --- a/src/lib/components/ui/drawer/drawer-close.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/drawer/drawer-content.svelte b/src/lib/components/ui/drawer/drawer-content.svelte deleted file mode 100644 index 6bb01db..0000000 --- a/src/lib/components/ui/drawer/drawer-content.svelte +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - {@render children?.()} - - diff --git a/src/lib/components/ui/drawer/drawer-description.svelte b/src/lib/components/ui/drawer/drawer-description.svelte deleted file mode 100644 index 2763a1a..0000000 --- a/src/lib/components/ui/drawer/drawer-description.svelte +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/lib/components/ui/drawer/drawer-footer.svelte b/src/lib/components/ui/drawer/drawer-footer.svelte deleted file mode 100644 index 1691f58..0000000 --- a/src/lib/components/ui/drawer/drawer-footer.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/drawer/drawer-header.svelte b/src/lib/components/ui/drawer/drawer-header.svelte deleted file mode 100644 index 65d2de5..0000000 --- a/src/lib/components/ui/drawer/drawer-header.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/drawer/drawer-nested.svelte b/src/lib/components/ui/drawer/drawer-nested.svelte deleted file mode 100644 index 834af94..0000000 --- a/src/lib/components/ui/drawer/drawer-nested.svelte +++ /dev/null @@ -1,12 +0,0 @@ - - - diff --git a/src/lib/components/ui/drawer/drawer-overlay.svelte b/src/lib/components/ui/drawer/drawer-overlay.svelte deleted file mode 100644 index 53f78a2..0000000 --- a/src/lib/components/ui/drawer/drawer-overlay.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - - diff --git a/src/lib/components/ui/drawer/drawer-portal.svelte b/src/lib/components/ui/drawer/drawer-portal.svelte deleted file mode 100644 index 5a0dd74..0000000 --- a/src/lib/components/ui/drawer/drawer-portal.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/drawer/drawer-title.svelte b/src/lib/components/ui/drawer/drawer-title.svelte deleted file mode 100644 index a2e5761..0000000 --- a/src/lib/components/ui/drawer/drawer-title.svelte +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/lib/components/ui/drawer/drawer-trigger.svelte b/src/lib/components/ui/drawer/drawer-trigger.svelte deleted file mode 100644 index f1877d8..0000000 --- a/src/lib/components/ui/drawer/drawer-trigger.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/drawer/drawer.svelte b/src/lib/components/ui/drawer/drawer.svelte deleted file mode 100644 index 0cb57ff..0000000 --- a/src/lib/components/ui/drawer/drawer.svelte +++ /dev/null @@ -1,12 +0,0 @@ - - - diff --git a/src/lib/components/ui/drawer/index.ts b/src/lib/components/ui/drawer/index.ts deleted file mode 100644 index 1656cac..0000000 --- a/src/lib/components/ui/drawer/index.ts +++ /dev/null @@ -1,38 +0,0 @@ -import Root from "./drawer.svelte"; -import Content from "./drawer-content.svelte"; -import Description from "./drawer-description.svelte"; -import Overlay from "./drawer-overlay.svelte"; -import Footer from "./drawer-footer.svelte"; -import Header from "./drawer-header.svelte"; -import Title from "./drawer-title.svelte"; -import NestedRoot from "./drawer-nested.svelte"; -import Close from "./drawer-close.svelte"; -import Trigger from "./drawer-trigger.svelte"; -import Portal from "./drawer-portal.svelte"; - -export { - Root, - NestedRoot, - Content, - Description, - Overlay, - Footer, - Header, - Title, - Trigger, - Portal, - Close, - - // - Root as Drawer, - NestedRoot as DrawerNestedRoot, - Content as DrawerContent, - Description as DrawerDescription, - Overlay as DrawerOverlay, - Footer as DrawerFooter, - Header as DrawerHeader, - Title as DrawerTitle, - Trigger as DrawerTrigger, - Portal as DrawerPortal, - Close as DrawerClose, -}; diff --git a/src/lib/components/ui/input/index.ts b/src/lib/components/ui/input/index.ts deleted file mode 100644 index f47b6d3..0000000 --- a/src/lib/components/ui/input/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import Root from "./input.svelte"; - -export { - Root, - // - Root as Input, -}; diff --git a/src/lib/components/ui/input/input.svelte b/src/lib/components/ui/input/input.svelte deleted file mode 100644 index ff1a4c8..0000000 --- a/src/lib/components/ui/input/input.svelte +++ /dev/null @@ -1,52 +0,0 @@ - - -{#if type === "file"} - -{:else} - -{/if} diff --git a/src/lib/components/ui/label/index.ts b/src/lib/components/ui/label/index.ts deleted file mode 100644 index 8bfca0b..0000000 --- a/src/lib/components/ui/label/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import Root from "./label.svelte"; - -export { - Root, - // - Root as Label, -}; diff --git a/src/lib/components/ui/label/label.svelte b/src/lib/components/ui/label/label.svelte deleted file mode 100644 index d71afbc..0000000 --- a/src/lib/components/ui/label/label.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - - diff --git a/src/lib/components/ui/popover/index.ts b/src/lib/components/ui/popover/index.ts deleted file mode 100644 index b79d12e..0000000 --- a/src/lib/components/ui/popover/index.ts +++ /dev/null @@ -1,19 +0,0 @@ -import Root from "./popover.svelte"; -import Close from "./popover-close.svelte"; -import Content from "./popover-content.svelte"; -import Trigger from "./popover-trigger.svelte"; -import Portal from "./popover-portal.svelte"; - -export { - Root, - Content, - Trigger, - Close, - Portal, - // - Root as Popover, - Content as PopoverContent, - Trigger as PopoverTrigger, - Close as PopoverClose, - Portal as PopoverPortal, -}; diff --git a/src/lib/components/ui/popover/popover-close.svelte b/src/lib/components/ui/popover/popover-close.svelte deleted file mode 100644 index c360925..0000000 --- a/src/lib/components/ui/popover/popover-close.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/popover/popover-content.svelte b/src/lib/components/ui/popover/popover-content.svelte deleted file mode 100644 index 3d79f3c..0000000 --- a/src/lib/components/ui/popover/popover-content.svelte +++ /dev/null @@ -1,31 +0,0 @@ - - - - - diff --git a/src/lib/components/ui/popover/popover-portal.svelte b/src/lib/components/ui/popover/popover-portal.svelte deleted file mode 100644 index dd8265f..0000000 --- a/src/lib/components/ui/popover/popover-portal.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/popover/popover-trigger.svelte b/src/lib/components/ui/popover/popover-trigger.svelte deleted file mode 100644 index 586323c..0000000 --- a/src/lib/components/ui/popover/popover-trigger.svelte +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/lib/components/ui/popover/popover.svelte b/src/lib/components/ui/popover/popover.svelte deleted file mode 100644 index 6b1aa5f..0000000 --- a/src/lib/components/ui/popover/popover.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/progress/index.ts b/src/lib/components/ui/progress/index.ts deleted file mode 100644 index 25eee61..0000000 --- a/src/lib/components/ui/progress/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import Root from "./progress.svelte"; - -export { - Root, - // - Root as Progress, -}; diff --git a/src/lib/components/ui/progress/progress.svelte b/src/lib/components/ui/progress/progress.svelte deleted file mode 100644 index 6833013..0000000 --- a/src/lib/components/ui/progress/progress.svelte +++ /dev/null @@ -1,27 +0,0 @@ - - - -
- diff --git a/src/lib/components/ui/scroll-area/index.ts b/src/lib/components/ui/scroll-area/index.ts deleted file mode 100644 index e86a25b..0000000 --- a/src/lib/components/ui/scroll-area/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -import Scrollbar from "./scroll-area-scrollbar.svelte"; -import Root from "./scroll-area.svelte"; - -export { - Root, - Scrollbar, - //, - Root as ScrollArea, - Scrollbar as ScrollAreaScrollbar, -}; diff --git a/src/lib/components/ui/scroll-area/scroll-area-scrollbar.svelte b/src/lib/components/ui/scroll-area/scroll-area-scrollbar.svelte deleted file mode 100644 index 8f5d960..0000000 --- a/src/lib/components/ui/scroll-area/scroll-area-scrollbar.svelte +++ /dev/null @@ -1,31 +0,0 @@ - - - - {@render children?.()} - - diff --git a/src/lib/components/ui/scroll-area/scroll-area.svelte b/src/lib/components/ui/scroll-area/scroll-area.svelte deleted file mode 100644 index 86ee032..0000000 --- a/src/lib/components/ui/scroll-area/scroll-area.svelte +++ /dev/null @@ -1,43 +0,0 @@ - - - - - {@render children?.()} - - {#if orientation === "vertical" || orientation === "both"} - - {/if} - {#if orientation === "horizontal" || orientation === "both"} - - {/if} - - diff --git a/src/lib/components/ui/select/index.ts b/src/lib/components/ui/select/index.ts deleted file mode 100644 index 4dec358..0000000 --- a/src/lib/components/ui/select/index.ts +++ /dev/null @@ -1,37 +0,0 @@ -import Root from "./select.svelte"; -import Group from "./select-group.svelte"; -import Label from "./select-label.svelte"; -import Item from "./select-item.svelte"; -import Content from "./select-content.svelte"; -import Trigger from "./select-trigger.svelte"; -import Separator from "./select-separator.svelte"; -import ScrollDownButton from "./select-scroll-down-button.svelte"; -import ScrollUpButton from "./select-scroll-up-button.svelte"; -import GroupHeading from "./select-group-heading.svelte"; -import Portal from "./select-portal.svelte"; - -export { - Root, - Group, - Label, - Item, - Content, - Trigger, - Separator, - ScrollDownButton, - ScrollUpButton, - GroupHeading, - Portal, - // - Root as Select, - Group as SelectGroup, - Label as SelectLabel, - Item as SelectItem, - Content as SelectContent, - Trigger as SelectTrigger, - Separator as SelectSeparator, - ScrollDownButton as SelectScrollDownButton, - ScrollUpButton as SelectScrollUpButton, - GroupHeading as SelectGroupHeading, - Portal as SelectPortal, -}; diff --git a/src/lib/components/ui/select/select-content.svelte b/src/lib/components/ui/select/select-content.svelte deleted file mode 100644 index 4b9ca43..0000000 --- a/src/lib/components/ui/select/select-content.svelte +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - {@render children?.()} - - - - diff --git a/src/lib/components/ui/select/select-group-heading.svelte b/src/lib/components/ui/select/select-group-heading.svelte deleted file mode 100644 index 1fab5f0..0000000 --- a/src/lib/components/ui/select/select-group-heading.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - - - {@render children?.()} - diff --git a/src/lib/components/ui/select/select-group.svelte b/src/lib/components/ui/select/select-group.svelte deleted file mode 100644 index a1f43bf..0000000 --- a/src/lib/components/ui/select/select-group.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/select/select-item.svelte b/src/lib/components/ui/select/select-item.svelte deleted file mode 100644 index b85eef6..0000000 --- a/src/lib/components/ui/select/select-item.svelte +++ /dev/null @@ -1,38 +0,0 @@ - - - - {#snippet children({ selected, highlighted })} - - {#if selected} - - {/if} - - {#if childrenProp} - {@render childrenProp({ selected, highlighted })} - {:else} - {label || value} - {/if} - {/snippet} - diff --git a/src/lib/components/ui/select/select-label.svelte b/src/lib/components/ui/select/select-label.svelte deleted file mode 100644 index 4696025..0000000 --- a/src/lib/components/ui/select/select-label.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/select/select-portal.svelte b/src/lib/components/ui/select/select-portal.svelte deleted file mode 100644 index 424bcdd..0000000 --- a/src/lib/components/ui/select/select-portal.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/select/select-scroll-down-button.svelte b/src/lib/components/ui/select/select-scroll-down-button.svelte deleted file mode 100644 index 3629205..0000000 --- a/src/lib/components/ui/select/select-scroll-down-button.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/src/lib/components/ui/select/select-scroll-up-button.svelte b/src/lib/components/ui/select/select-scroll-up-button.svelte deleted file mode 100644 index 1aa2300..0000000 --- a/src/lib/components/ui/select/select-scroll-up-button.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - - - - diff --git a/src/lib/components/ui/select/select-separator.svelte b/src/lib/components/ui/select/select-separator.svelte deleted file mode 100644 index 0eac3eb..0000000 --- a/src/lib/components/ui/select/select-separator.svelte +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/src/lib/components/ui/select/select-trigger.svelte b/src/lib/components/ui/select/select-trigger.svelte deleted file mode 100644 index dbb81df..0000000 --- a/src/lib/components/ui/select/select-trigger.svelte +++ /dev/null @@ -1,29 +0,0 @@ - - - - {@render children?.()} - - diff --git a/src/lib/components/ui/select/select.svelte b/src/lib/components/ui/select/select.svelte deleted file mode 100644 index 05eb663..0000000 --- a/src/lib/components/ui/select/select.svelte +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/src/lib/components/ui/separator/index.ts b/src/lib/components/ui/separator/index.ts deleted file mode 100644 index 82442d2..0000000 --- a/src/lib/components/ui/separator/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import Root from "./separator.svelte"; - -export { - Root, - // - Root as Separator, -}; diff --git a/src/lib/components/ui/separator/separator.svelte b/src/lib/components/ui/separator/separator.svelte deleted file mode 100644 index e11a6f5..0000000 --- a/src/lib/components/ui/separator/separator.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/src/lib/components/ui/sheet/index.ts b/src/lib/components/ui/sheet/index.ts deleted file mode 100644 index 28d7da1..0000000 --- a/src/lib/components/ui/sheet/index.ts +++ /dev/null @@ -1,34 +0,0 @@ -import Root from "./sheet.svelte"; -import Portal from "./sheet-portal.svelte"; -import Trigger from "./sheet-trigger.svelte"; -import Close from "./sheet-close.svelte"; -import Overlay from "./sheet-overlay.svelte"; -import Content from "./sheet-content.svelte"; -import Header from "./sheet-header.svelte"; -import Footer from "./sheet-footer.svelte"; -import Title from "./sheet-title.svelte"; -import Description from "./sheet-description.svelte"; - -export { - Root, - Close, - Trigger, - Portal, - Overlay, - Content, - Header, - Footer, - Title, - Description, - // - Root as Sheet, - Close as SheetClose, - Trigger as SheetTrigger, - Portal as SheetPortal, - Overlay as SheetOverlay, - Content as SheetContent, - Header as SheetHeader, - Footer as SheetFooter, - Title as SheetTitle, - Description as SheetDescription, -}; diff --git a/src/lib/components/ui/sheet/sheet-close.svelte b/src/lib/components/ui/sheet/sheet-close.svelte deleted file mode 100644 index ae382c1..0000000 --- a/src/lib/components/ui/sheet/sheet-close.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/sheet/sheet-content.svelte b/src/lib/components/ui/sheet/sheet-content.svelte deleted file mode 100644 index 065fe04..0000000 --- a/src/lib/components/ui/sheet/sheet-content.svelte +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - {@render children?.()} - - - Close - - - diff --git a/src/lib/components/ui/sheet/sheet-description.svelte b/src/lib/components/ui/sheet/sheet-description.svelte deleted file mode 100644 index 333b17a..0000000 --- a/src/lib/components/ui/sheet/sheet-description.svelte +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/lib/components/ui/sheet/sheet-footer.svelte b/src/lib/components/ui/sheet/sheet-footer.svelte deleted file mode 100644 index dd9ed84..0000000 --- a/src/lib/components/ui/sheet/sheet-footer.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/sheet/sheet-header.svelte b/src/lib/components/ui/sheet/sheet-header.svelte deleted file mode 100644 index 757a6a5..0000000 --- a/src/lib/components/ui/sheet/sheet-header.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/sheet/sheet-overlay.svelte b/src/lib/components/ui/sheet/sheet-overlay.svelte deleted file mode 100644 index 345e197..0000000 --- a/src/lib/components/ui/sheet/sheet-overlay.svelte +++ /dev/null @@ -1,20 +0,0 @@ - - - diff --git a/src/lib/components/ui/sheet/sheet-portal.svelte b/src/lib/components/ui/sheet/sheet-portal.svelte deleted file mode 100644 index f3085a3..0000000 --- a/src/lib/components/ui/sheet/sheet-portal.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/sheet/sheet-title.svelte b/src/lib/components/ui/sheet/sheet-title.svelte deleted file mode 100644 index 9fda327..0000000 --- a/src/lib/components/ui/sheet/sheet-title.svelte +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/lib/components/ui/sheet/sheet-trigger.svelte b/src/lib/components/ui/sheet/sheet-trigger.svelte deleted file mode 100644 index e266975..0000000 --- a/src/lib/components/ui/sheet/sheet-trigger.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/sheet/sheet.svelte b/src/lib/components/ui/sheet/sheet.svelte deleted file mode 100644 index 5bf9783..0000000 --- a/src/lib/components/ui/sheet/sheet.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/sidebar/constants.ts b/src/lib/components/ui/sidebar/constants.ts deleted file mode 100644 index 4de4435..0000000 --- a/src/lib/components/ui/sidebar/constants.ts +++ /dev/null @@ -1,6 +0,0 @@ -export const SIDEBAR_COOKIE_NAME = "sidebar:state"; -export const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7; -export const SIDEBAR_WIDTH = "16rem"; -export const SIDEBAR_WIDTH_MOBILE = "18rem"; -export const SIDEBAR_WIDTH_ICON = "3rem"; -export const SIDEBAR_KEYBOARD_SHORTCUT = "b"; diff --git a/src/lib/components/ui/sidebar/context.svelte.ts b/src/lib/components/ui/sidebar/context.svelte.ts deleted file mode 100644 index 15248ad..0000000 --- a/src/lib/components/ui/sidebar/context.svelte.ts +++ /dev/null @@ -1,81 +0,0 @@ -import { IsMobile } from "$lib/hooks/is-mobile.svelte.js"; -import { getContext, setContext } from "svelte"; -import { SIDEBAR_KEYBOARD_SHORTCUT } from "./constants.js"; - -type Getter = () => T; - -export type SidebarStateProps = { - /** - * A getter function that returns the current open state of the sidebar. - * We use a getter function here to support `bind:open` on the `Sidebar.Provider` - * component. - */ - open: Getter; - - /** - * A function that sets the open state of the sidebar. To support `bind:open`, we need - * a source of truth for changing the open state to ensure it will be synced throughout - * the sub-components and any `bind:` references. - */ - setOpen: (open: boolean) => void; -}; - -class SidebarState { - readonly props: SidebarStateProps; - open = $derived.by(() => this.props.open()); - openMobile = $state(false); - setOpen: SidebarStateProps["setOpen"]; - #isMobile: IsMobile; - state = $derived.by(() => (this.open ? "expanded" : "collapsed")); - - constructor(props: SidebarStateProps) { - this.setOpen = props.setOpen; - this.#isMobile = new IsMobile(); - this.props = props; - } - - // Convenience getter for checking if the sidebar is mobile - // without this, we would need to use `sidebar.isMobile.current` everywhere - get isMobile() { - return this.#isMobile.current; - } - - // Event handler to apply to the `` - handleShortcutKeydown = (e: KeyboardEvent) => { - if (e.key === SIDEBAR_KEYBOARD_SHORTCUT && (e.metaKey || e.ctrlKey)) { - e.preventDefault(); - this.toggle(); - } - }; - - setOpenMobile = (value: boolean) => { - this.openMobile = value; - }; - - toggle = () => { - return this.#isMobile.current - ? (this.openMobile = !this.openMobile) - : this.setOpen(!this.open); - }; -} - -const SYMBOL_KEY = "scn-sidebar"; - -/** - * Instantiates a new `SidebarState` instance and sets it in the context. - * - * @param props The constructor props for the `SidebarState` class. - * @returns The `SidebarState` instance. - */ -export function setSidebar(props: SidebarStateProps): SidebarState { - return setContext(Symbol.for(SYMBOL_KEY), new SidebarState(props)); -} - -/** - * Retrieves the `SidebarState` instance from the context. This is a class instance, - * so you cannot destructure it. - * @returns The `SidebarState` instance. - */ -export function useSidebar(): SidebarState { - return getContext(Symbol.for(SYMBOL_KEY)); -} diff --git a/src/lib/components/ui/sidebar/index.ts b/src/lib/components/ui/sidebar/index.ts deleted file mode 100644 index 318a341..0000000 --- a/src/lib/components/ui/sidebar/index.ts +++ /dev/null @@ -1,75 +0,0 @@ -import { useSidebar } from "./context.svelte.js"; -import Content from "./sidebar-content.svelte"; -import Footer from "./sidebar-footer.svelte"; -import GroupAction from "./sidebar-group-action.svelte"; -import GroupContent from "./sidebar-group-content.svelte"; -import GroupLabel from "./sidebar-group-label.svelte"; -import Group from "./sidebar-group.svelte"; -import Header from "./sidebar-header.svelte"; -import Input from "./sidebar-input.svelte"; -import Inset from "./sidebar-inset.svelte"; -import MenuAction from "./sidebar-menu-action.svelte"; -import MenuBadge from "./sidebar-menu-badge.svelte"; -import MenuButton from "./sidebar-menu-button.svelte"; -import MenuItem from "./sidebar-menu-item.svelte"; -import MenuSkeleton from "./sidebar-menu-skeleton.svelte"; -import MenuSubButton from "./sidebar-menu-sub-button.svelte"; -import MenuSubItem from "./sidebar-menu-sub-item.svelte"; -import MenuSub from "./sidebar-menu-sub.svelte"; -import Menu from "./sidebar-menu.svelte"; -import Provider from "./sidebar-provider.svelte"; -import Rail from "./sidebar-rail.svelte"; -import Separator from "./sidebar-separator.svelte"; -import Trigger from "./sidebar-trigger.svelte"; -import Root from "./sidebar.svelte"; - -export { - Content, - Footer, - Group, - GroupAction, - GroupContent, - GroupLabel, - Header, - Input, - Inset, - Menu, - MenuAction, - MenuBadge, - MenuButton, - MenuItem, - MenuSkeleton, - MenuSub, - MenuSubButton, - MenuSubItem, - Provider, - Rail, - Root, - Separator, - // - Root as Sidebar, - Content as SidebarContent, - Footer as SidebarFooter, - Group as SidebarGroup, - GroupAction as SidebarGroupAction, - GroupContent as SidebarGroupContent, - GroupLabel as SidebarGroupLabel, - Header as SidebarHeader, - Input as SidebarInput, - Inset as SidebarInset, - Menu as SidebarMenu, - MenuAction as SidebarMenuAction, - MenuBadge as SidebarMenuBadge, - MenuButton as SidebarMenuButton, - MenuItem as SidebarMenuItem, - MenuSkeleton as SidebarMenuSkeleton, - MenuSub as SidebarMenuSub, - MenuSubButton as SidebarMenuSubButton, - MenuSubItem as SidebarMenuSubItem, - Provider as SidebarProvider, - Rail as SidebarRail, - Separator as SidebarSeparator, - Trigger as SidebarTrigger, - Trigger, - useSidebar, -}; diff --git a/src/lib/components/ui/sidebar/sidebar-content.svelte b/src/lib/components/ui/sidebar/sidebar-content.svelte deleted file mode 100644 index f121800..0000000 --- a/src/lib/components/ui/sidebar/sidebar-content.svelte +++ /dev/null @@ -1,24 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/sidebar/sidebar-footer.svelte b/src/lib/components/ui/sidebar/sidebar-footer.svelte deleted file mode 100644 index 6259cb9..0000000 --- a/src/lib/components/ui/sidebar/sidebar-footer.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/sidebar/sidebar-group-action.svelte b/src/lib/components/ui/sidebar/sidebar-group-action.svelte deleted file mode 100644 index a76dfe1..0000000 --- a/src/lib/components/ui/sidebar/sidebar-group-action.svelte +++ /dev/null @@ -1,36 +0,0 @@ - - -{#if child} - {@render child({ props: mergedProps })} -{:else} - -{/if} diff --git a/src/lib/components/ui/sidebar/sidebar-group-content.svelte b/src/lib/components/ui/sidebar/sidebar-group-content.svelte deleted file mode 100644 index 415255f..0000000 --- a/src/lib/components/ui/sidebar/sidebar-group-content.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/sidebar/sidebar-group-label.svelte b/src/lib/components/ui/sidebar/sidebar-group-label.svelte deleted file mode 100644 index b2e72b6..0000000 --- a/src/lib/components/ui/sidebar/sidebar-group-label.svelte +++ /dev/null @@ -1,34 +0,0 @@ - - -{#if child} - {@render child({ props: mergedProps })} -{:else} -
- {@render children?.()} -
-{/if} diff --git a/src/lib/components/ui/sidebar/sidebar-group.svelte b/src/lib/components/ui/sidebar/sidebar-group.svelte deleted file mode 100644 index ec18a69..0000000 --- a/src/lib/components/ui/sidebar/sidebar-group.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/sidebar/sidebar-header.svelte b/src/lib/components/ui/sidebar/sidebar-header.svelte deleted file mode 100644 index a1b2db1..0000000 --- a/src/lib/components/ui/sidebar/sidebar-header.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/sidebar/sidebar-input.svelte b/src/lib/components/ui/sidebar/sidebar-input.svelte deleted file mode 100644 index 19b3666..0000000 --- a/src/lib/components/ui/sidebar/sidebar-input.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/src/lib/components/ui/sidebar/sidebar-inset.svelte b/src/lib/components/ui/sidebar/sidebar-inset.svelte deleted file mode 100644 index 7d6d459..0000000 --- a/src/lib/components/ui/sidebar/sidebar-inset.svelte +++ /dev/null @@ -1,24 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/sidebar/sidebar-menu-action.svelte b/src/lib/components/ui/sidebar/sidebar-menu-action.svelte deleted file mode 100644 index d3fe295..0000000 --- a/src/lib/components/ui/sidebar/sidebar-menu-action.svelte +++ /dev/null @@ -1,43 +0,0 @@ - - -{#if child} - {@render child({ props: mergedProps })} -{:else} - -{/if} diff --git a/src/lib/components/ui/sidebar/sidebar-menu-badge.svelte b/src/lib/components/ui/sidebar/sidebar-menu-badge.svelte deleted file mode 100644 index e8ecdb4..0000000 --- a/src/lib/components/ui/sidebar/sidebar-menu-badge.svelte +++ /dev/null @@ -1,29 +0,0 @@ - - -
- {@render children?.()} -
diff --git a/src/lib/components/ui/sidebar/sidebar-menu-button.svelte b/src/lib/components/ui/sidebar/sidebar-menu-button.svelte deleted file mode 100644 index 0acd1ec..0000000 --- a/src/lib/components/ui/sidebar/sidebar-menu-button.svelte +++ /dev/null @@ -1,103 +0,0 @@ - - - - -{#snippet Button({ props }: { props?: Record })} - {@const mergedProps = mergeProps(buttonProps, props)} - {#if child} - {@render child({ props: mergedProps })} - {:else} - - {/if} -{/snippet} - -{#if !tooltipContent} - {@render Button({})} -{:else} - - - {#snippet child({ props })} - {@render Button({ props })} - {/snippet} - - - -{/if} diff --git a/src/lib/components/ui/sidebar/sidebar-menu-item.svelte b/src/lib/components/ui/sidebar/sidebar-menu-item.svelte deleted file mode 100644 index 4db4453..0000000 --- a/src/lib/components/ui/sidebar/sidebar-menu-item.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - -
  • - {@render children?.()} -
    • diff --git a/src/lib/components/ui/sidebar/sidebar-menu-skeleton.svelte b/src/lib/components/ui/sidebar/sidebar-menu-skeleton.svelte deleted file mode 100644 index 68604e2..0000000 --- a/src/lib/components/ui/sidebar/sidebar-menu-skeleton.svelte +++ /dev/null @@ -1,36 +0,0 @@ - - -
    - {#if showIcon} - - {/if} - - {@render children?.()} -
    diff --git a/src/lib/components/ui/sidebar/sidebar-menu-sub-button.svelte b/src/lib/components/ui/sidebar/sidebar-menu-sub-button.svelte deleted file mode 100644 index c8cd4ff..0000000 --- a/src/lib/components/ui/sidebar/sidebar-menu-sub-button.svelte +++ /dev/null @@ -1,43 +0,0 @@ - - -{#if child} - {@render child({ props: mergedProps })} -{:else} - - {@render children?.()} - -{/if} diff --git a/src/lib/components/ui/sidebar/sidebar-menu-sub-item.svelte b/src/lib/components/ui/sidebar/sidebar-menu-sub-item.svelte deleted file mode 100644 index 681d0f1..0000000 --- a/src/lib/components/ui/sidebar/sidebar-menu-sub-item.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - -
  • - {@render children?.()} -
    • diff --git a/src/lib/components/ui/sidebar/sidebar-menu-sub.svelte b/src/lib/components/ui/sidebar/sidebar-menu-sub.svelte deleted file mode 100644 index 76bd1d9..0000000 --- a/src/lib/components/ui/sidebar/sidebar-menu-sub.svelte +++ /dev/null @@ -1,25 +0,0 @@ - - -
      - {@render children?.()} -
    diff --git a/src/lib/components/ui/sidebar/sidebar-menu.svelte b/src/lib/components/ui/sidebar/sidebar-menu.svelte deleted file mode 100644 index 946ccce..0000000 --- a/src/lib/components/ui/sidebar/sidebar-menu.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - -
      - {@render children?.()} -
    diff --git a/src/lib/components/ui/sidebar/sidebar-provider.svelte b/src/lib/components/ui/sidebar/sidebar-provider.svelte deleted file mode 100644 index 5b0d0aa..0000000 --- a/src/lib/components/ui/sidebar/sidebar-provider.svelte +++ /dev/null @@ -1,53 +0,0 @@ - - - - - -
    - {@render children?.()} -
    -     diff --git a/src/lib/components/ui/sidebar/sidebar-rail.svelte b/src/lib/components/ui/sidebar/sidebar-rail.svelte deleted file mode 100644 index 704d54f..0000000 --- a/src/lib/components/ui/sidebar/sidebar-rail.svelte +++ /dev/null @@ -1,36 +0,0 @@ - - - diff --git a/src/lib/components/ui/sidebar/sidebar-separator.svelte b/src/lib/components/ui/sidebar/sidebar-separator.svelte deleted file mode 100644 index 5a7deda..0000000 --- a/src/lib/components/ui/sidebar/sidebar-separator.svelte +++ /dev/null @@ -1,19 +0,0 @@ - - - diff --git a/src/lib/components/ui/sidebar/sidebar-trigger.svelte b/src/lib/components/ui/sidebar/sidebar-trigger.svelte deleted file mode 100644 index 1825182..0000000 --- a/src/lib/components/ui/sidebar/sidebar-trigger.svelte +++ /dev/null @@ -1,35 +0,0 @@ - - - diff --git a/src/lib/components/ui/sidebar/sidebar.svelte b/src/lib/components/ui/sidebar/sidebar.svelte deleted file mode 100644 index bac55d8..0000000 --- a/src/lib/components/ui/sidebar/sidebar.svelte +++ /dev/null @@ -1,104 +0,0 @@ - - -{#if collapsible === "none"} -
    - {@render children?.()} -
    -{:else if sidebar.isMobile} - sidebar.openMobile, (v) => sidebar.setOpenMobile(v)} - {...restProps} - > - - - Sidebar - Displays the mobile sidebar. - -
    - {@render children?.()} -
    -     -     -{:else} - -{/if} diff --git a/src/lib/components/ui/skeleton/index.ts b/src/lib/components/ui/skeleton/index.ts deleted file mode 100644 index 186db21..0000000 --- a/src/lib/components/ui/skeleton/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import Root from "./skeleton.svelte"; - -export { - Root, - // - Root as Skeleton, -}; diff --git a/src/lib/components/ui/skeleton/skeleton.svelte b/src/lib/components/ui/skeleton/skeleton.svelte deleted file mode 100644 index c7e3d26..0000000 --- a/src/lib/components/ui/skeleton/skeleton.svelte +++ /dev/null @@ -1,17 +0,0 @@ - - -
    diff --git a/src/lib/components/ui/slider/index.ts b/src/lib/components/ui/slider/index.ts deleted file mode 100644 index 820f209..0000000 --- a/src/lib/components/ui/slider/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import Root from "./slider.svelte"; - -export { - Root, - // - Root as Slider, -}; diff --git a/src/lib/components/ui/slider/slider.svelte b/src/lib/components/ui/slider/slider.svelte deleted file mode 100644 index b2f793a..0000000 --- a/src/lib/components/ui/slider/slider.svelte +++ /dev/null @@ -1,52 +0,0 @@ - - - - - {#snippet children({ thumbs })} - - - - {#each thumbs as thumb (thumb)} - - {/each} - {/snippet} - diff --git a/src/lib/components/ui/spinner/index.ts b/src/lib/components/ui/spinner/index.ts deleted file mode 100644 index f8b1ced..0000000 --- a/src/lib/components/ui/spinner/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { default as Spinner } from "./spinner.svelte"; diff --git a/src/lib/components/ui/spinner/spinner.svelte b/src/lib/components/ui/spinner/spinner.svelte deleted file mode 100644 index 9b12131..0000000 --- a/src/lib/components/ui/spinner/spinner.svelte +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/src/lib/components/ui/switch/index.ts b/src/lib/components/ui/switch/index.ts deleted file mode 100644 index f5533db..0000000 --- a/src/lib/components/ui/switch/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -import Root from "./switch.svelte"; - -export { - Root, - // - Root as Switch, -}; diff --git a/src/lib/components/ui/switch/switch.svelte b/src/lib/components/ui/switch/switch.svelte deleted file mode 100644 index 80661fd..0000000 --- a/src/lib/components/ui/switch/switch.svelte +++ /dev/null @@ -1,29 +0,0 @@ - - - - - diff --git a/src/lib/components/ui/tooltip/index.ts b/src/lib/components/ui/tooltip/index.ts deleted file mode 100644 index 1718604..0000000 --- a/src/lib/components/ui/tooltip/index.ts +++ /dev/null @@ -1,19 +0,0 @@ -import Root from "./tooltip.svelte"; -import Trigger from "./tooltip-trigger.svelte"; -import Content from "./tooltip-content.svelte"; -import Provider from "./tooltip-provider.svelte"; -import Portal from "./tooltip-portal.svelte"; - -export { - Root, - Trigger, - Content, - Provider, - Portal, - // - Root as Tooltip, - Content as TooltipContent, - Trigger as TooltipTrigger, - Provider as TooltipProvider, - Portal as TooltipPortal, -}; diff --git a/src/lib/components/ui/tooltip/tooltip-content.svelte b/src/lib/components/ui/tooltip/tooltip-content.svelte deleted file mode 100644 index 788ec34..0000000 --- a/src/lib/components/ui/tooltip/tooltip-content.svelte +++ /dev/null @@ -1,52 +0,0 @@ - - - - - {@render children?.()} - - {#snippet child({ props })} -
    - {/snippet} -     -     -     diff --git a/src/lib/components/ui/tooltip/tooltip-portal.svelte b/src/lib/components/ui/tooltip/tooltip-portal.svelte deleted file mode 100644 index d234f7d..0000000 --- a/src/lib/components/ui/tooltip/tooltip-portal.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/tooltip/tooltip-provider.svelte b/src/lib/components/ui/tooltip/tooltip-provider.svelte deleted file mode 100644 index 8150bef..0000000 --- a/src/lib/components/ui/tooltip/tooltip-provider.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/tooltip/tooltip-trigger.svelte b/src/lib/components/ui/tooltip/tooltip-trigger.svelte deleted file mode 100644 index 1acdaa4..0000000 --- a/src/lib/components/ui/tooltip/tooltip-trigger.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/components/ui/tooltip/tooltip.svelte b/src/lib/components/ui/tooltip/tooltip.svelte deleted file mode 100644 index 0b0f9ce..0000000 --- a/src/lib/components/ui/tooltip/tooltip.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/lib/device/constants.svelte.ts b/src/lib/device/constants.svelte.ts deleted file mode 100644 index 4235fb1..0000000 --- a/src/lib/device/constants.svelte.ts +++ /dev/null @@ -1,49 +0,0 @@ -import type { DeviceConfig } from "$lib/device/types.svelte.ts"; - -export const VENDORS = [ - { value: "custom", label: "Custom (Manual Entry)", vid: "", pid: "" }, - { value: "generic", label: "Generic (FEFF:FCFD)", vid: "FEFF", pid: "FCFD" }, - { value: "pico-hsm", label: "Pico Keys HSM (2E8A:10FD)", vid: "2E8A", pid: "10FD" }, - { value: "pico-fido", label: "Pico Keys Fido (2E8A:10FE)", vid: "2E8A", pid: "10FE" }, - { value: "pico-openpgp", label: "Pico Keys OpenPGP (2E8A:10FF)", vid: "2E8A", pid: "10FF" }, - { value: "pico", label: "Pico (2E8A:0003)", vid: "2E8A", pid: "0003" }, - { value: "solokeys", label: "SoloKeys (0483:A2CA)", vid: "0483", pid: "A2CA" }, - { value: "nitrohsm", label: "NitroHSM (20A0:4230)", vid: "20A0", pid: "4230" }, - { value: "nitrofido2", label: "NitroFIDO2 (20A0:42D4)", vid: "20A0", pid: "42D4" }, - { value: "nitrostart", label: "NitroStart (20A0:4211)", vid: "20A0", pid: "4211" }, - { value: "nitropro", label: "NitroPro (20A0:4108)", vid: "20A0", pid: "4108" }, - { value: "nitro3", label: "Nitrokey 3 (20A0:42B2)", vid: "20A0", pid: "42B2" }, - { value: "yubikey5", label: "YubiKey 5 (1050:0407)", vid: "1050", pid: "0407" }, - { value: "yubikeyneo", label: "YubiKey Neo (1050:0116)", vid: "1050", pid: "0116" }, - { value: "yubihsm", label: "YubiHSM 2 (1050:0030)", vid: "1050", pid: "0030" }, - { value: "gnuk", label: "Gnuk Token (234B:0000)", vid: "234B", pid: "0000" }, - { value: "gnupg", label: "GnuPG (234B:0000)", vid: "234B", pid: "0000" }, -]; - -export const LED_DRIVERS = [ - { value: "1", label: "Pico (Standard GPIO)" }, - { value: "2", label: "Pimoroni (RGB)" }, - { value: "3", label: "WS2812 (Neopixel)" }, - { value: "5", label: "ESP32 Neopixel" }, -]; - -export const DEFAULT_CONFIG: DeviceConfig = { - vid: "CAFE", - pid: "4242", - productName: "Pico FIDO Key", - ledGpio: 2, - ledBrightness: 15, - touchTimeout: 30, - ledDimmable: false, - powerCycleOnReset: false, - ledSteady: false, - enableSecp256k1: false, - ledDriver: "1", -}; - -export const DEFAULT_DEVICE_INFO = { - serial: "---", - flashUsed: 0, - flashTotal: 0, - firmwareVersion: "---", -}; diff --git a/src/lib/device/manager.svelte.ts b/src/lib/device/manager.svelte.ts deleted file mode 100644 index e4bb0ad..0000000 --- a/src/lib/device/manager.svelte.ts +++ /dev/null @@ -1,252 +0,0 @@ -import { invoke } from "@tauri-apps/api/core"; -import { logger } from "$lib/services/log.svelte"; -import { DEFAULT_CONFIG, DEFAULT_DEVICE_INFO, VENDORS } from "$lib/device/constants.svelte"; -import type { - DeviceConfig, - DeviceInfo, - FidoInfo, - SecurityState, - FullDeviceStatus, - DeviceConfigInput, - StoredCredential, -} from "$lib/device/types.svelte"; - -class DeviceManager { - loading = $state(false); - connected = $state(false); - fidoInfo: FidoInfo | null = $state(null); - error: string | null = $state(null); - method: string = $state(""); - - credentials: StoredCredential[] = $state([]); - unlocked = $state(false); - - config: DeviceConfig = $state({ ...DEFAULT_CONFIG }); - info: DeviceInfo = $state({ ...DEFAULT_DEVICE_INFO }); - security: SecurityState = $state({ - secureBoot: false, - secureLock: false, - confirmed: false, - }); - - // Internal state for diffing - #originalConfig: any = null; - - get selectedVendor() { - if (!this.connected) return "custom"; - const match = VENDORS.find((v) => v.vid === this.config.vid && v.pid === this.config.pid); - return match ? match.value : "custom"; - } - - get hasFido() { - return !!this.fidoInfo; - } - - async refresh() { - this.loading = true; - this.error = null; - try { - logger.add("Attempting to connect to device...", "info"); - - const status = await invoke("read_device_details"); - - this.info = status.info; - - this.config = { - ...status.config, - ledDriver: status.config.ledDriver ? String(status.config.ledDriver) : "1", - }; - - this.#originalConfig = JSON.parse(JSON.stringify(this.config)); - - this.security = { - secureBoot: status.secureBoot, - secureLock: status.secureLock, - confirmed: false, - }; - - this.method = status.method; - - try { - const fido = await invoke("get_fido_info"); - this.fidoInfo = fido; - } catch (e) { - logger.add("FIDO info could not be read (device might not support FIDO features)", "warning"); - this.fidoInfo = null; - } - - if (!this.connected) { - logger.add(`Device Connected! Serial: ${this.info.serial}, FW: v${this.info.firmwareVersion}`, "success"); - } - this.connected = true; - } catch (err: any) { - console.error("Connection failed:", err); - - // Handle structured error from Rust (PFError) - if (err && typeof err === "object" && err.type === "NoDevice") { - this.error = null; - this.connected = false; - // Don't log "No device" as an error to the user log system, - // it's a normal state when nothing is plugged in. - } else { - const msg = typeof err === "string" ? err : err.message || JSON.stringify(err); - this.error = msg; - if (this.connected) { - logger.add(`Connection lost: ${msg}`, "error"); - } else { - logger.add(`Connection failed: ${msg}`, "error"); - } - this.connected = false; - } - } finally { - this.loading = false; - } - } - - async save(pin: string | null = null) { - if (!this.connected || !this.#originalConfig) return { success: false, msg: "Device not connected" }; - - this.loading = true; - logger.add("Analyzing configuration changes...", "info"); - - try { - const rustConfig: DeviceConfigInput = {}; - - // Diffing logic - if (this.config.vid !== this.#originalConfig.vid || this.config.pid !== this.#originalConfig.pid) { - rustConfig.vid = this.config.vid; - rustConfig.pid = this.config.pid; - logger.add(`Queuing change: VID/PID -> ${this.config.vid}:${this.config.pid}`, "info"); - } - - if (this.config.productName !== this.#originalConfig.productName) { - rustConfig.productName = this.config.productName; - logger.add(`Queuing change: Product Name -> ${this.config.productName}`, "info"); - } - - if (Number(this.config.ledGpio) !== Number(this.#originalConfig.ledGpio)) { - rustConfig.ledGpio = Number(this.config.ledGpio); - logger.add(`Queuing change: LED GPIO -> ${this.config.ledGpio}`, "info"); - } - - if (Number(this.config.ledBrightness) !== Number(this.#originalConfig.ledBrightness)) { - rustConfig.ledBrightness = Number(this.config.ledBrightness); - logger.add(`Queuing change: Brightness -> ${this.config.ledBrightness}`, "info"); - } - - if (Number(this.config.touchTimeout) !== Number(this.#originalConfig.touchTimeout)) { - rustConfig.touchTimeout = Number(this.config.touchTimeout); - logger.add(`Queuing change: Timeout -> ${this.config.touchTimeout}`, "info"); - } - - const optionsChanged = - this.config.ledDimmable !== this.#originalConfig.ledDimmable || - this.config.powerCycleOnReset !== this.#originalConfig.powerCycleOnReset || - this.config.ledSteady !== this.#originalConfig.ledSteady; - - if (optionsChanged) { - rustConfig.ledDimmable = this.config.ledDimmable; - rustConfig.powerCycleOnReset = this.config.powerCycleOnReset; - rustConfig.ledSteady = this.config.ledSteady; - logger.add("Queuing change: Device Options (Bitmask updated)", "info"); - } - - if (this.config.enableSecp256k1 !== this.#originalConfig.enableSecp256k1) { - rustConfig.enableSecp256k1 = this.config.enableSecp256k1; - logger.add(`Queuing change: Secp256k1 -> ${this.config.enableSecp256k1}`, "info"); - } - - if (Number(this.config.ledDriver) !== Number(this.#originalConfig.ledDriver)) { - rustConfig.ledDriver = Number(this.config.ledDriver); - logger.add(`Queuing change: LED Driver -> ${this.config.ledDriver}`, "info"); - } - - if (Object.keys(rustConfig).length === 0) { - logger.add("No changes detected.", "warning"); - return { success: false, msg: "No changes detected." }; - } else { - logger.add("Sending configuration to device...", "info"); - const response = await invoke("write_config", { config: rustConfig, method: this.method, pin }); - logger.add(`Device Response: ${response}`, "success"); - - await this.refresh(); - return { success: true, msg: response }; - } - } catch (err: any) { - console.error("Write failed:", err); - const msg = typeof err === "string" ? err : err.message || JSON.stringify(err); - logger.add(`Write Failed: ${msg}`, "error"); - return { success: false, msg: `Error: ${msg}` }; - } finally { - this.loading = false; - } - } - - setVendor(value: string) { - const v = VENDORS.find((x) => x.value === value); - if (v) { - this.config.vid = v.vid; - this.config.pid = v.pid; - logger.add(`Selected vendor preset: ${v.label}`, "info"); - } - } - - async changePin(current: string | null, next: string) { - try { - const res = await invoke("change_fido_pin", { currentPin: current, newPin: next }); - logger.add(res as string, "success"); - await this.refresh(); - return { success: true }; - } catch (err) { - logger.add(`PIN Error: ${err}`, "error"); - return { success: false, msg: err }; - } - } - - async updateMinPinLength(currentPin: string, length: number) { - try { - const res = await invoke("set_min_pin_length", { currentPin, minPinLength: length }); - logger.add(res as string, "success"); - await this.refresh(); - return { success: true }; - } catch (err) { - logger.add(`Min PIN Error: ${err}`, "error"); - return { success: false, msg: err }; - } - } - - async getCredentials(pin: string): Promise<{ success: boolean; data?: StoredCredential[]; msg?: string }> { - try { - logger.add("Fetching credentials...", "info"); - const creds = await invoke("get_credentials", { pin }); - - this.credentials = creds; - this.unlocked = true; - - logger.add(`Retrieved ${creds.length} credentials.`, "success"); - return { success: true, data: creds }; - } catch (err: any) { - logger.add(`Failed to fetch credentials: ${err}`, "error"); - return { success: false, msg: err }; - } - } - - lock() { - this.credentials = []; - this.unlocked = false; - } - - async deleteCredential(pin: string, credentialId: string): Promise<{ success: boolean; msg?: string }> { - try { - logger.add("Deleting credential...", "info"); - const res = await invoke("delete_credential", { pin, credentialId }); - logger.add(res, "success"); - return { success: true, msg: res }; - } catch (err: any) { - logger.add(`Failed to delete credential: ${err}`, "error"); - return { success: false, msg: err }; - } - } -} - -export const device = new DeviceManager(); diff --git a/src/lib/device/types.svelte.ts b/src/lib/device/types.svelte.ts deleted file mode 100644 index 11124a5..0000000 --- a/src/lib/device/types.svelte.ts +++ /dev/null @@ -1,69 +0,0 @@ -export interface DeviceConfig { - vid: string; - pid: string; - productName: string; - ledGpio: number; - ledBrightness: number; - touchTimeout: number; - ledDimmable: boolean; - powerCycleOnReset: boolean; - ledSteady: boolean; - enableSecp256k1: boolean; - ledDriver: string; -} - -export interface DeviceConfigInput { - vid?: string; - pid?: string; - productName?: string; - ledGpio?: number; - ledBrightness?: number; - touchTimeout?: number; - ledDriver?: number; - ledDimmable?: boolean; - powerCycleOnReset?: boolean; - ledSteady?: boolean; - enableSecp256k1?: boolean; -} - -export interface DeviceInfo { - serial: string; - flashUsed: number; - flashTotal: number; - firmwareVersion: string; -} - -export interface FullDeviceStatus { - info: DeviceInfo; - config: DeviceConfig; - secureBoot: boolean; - secureLock: boolean; - method: string; -} - -export interface SecurityState { - secureBoot: boolean; - secureLock: boolean; - confirmed: boolean; -} - -export interface FidoInfo { - versions: string[]; - extensions: string[]; - aaguid: string; - options: Record; - maxMsgSize: number; - pinProtocols: number[]; - // remainingDiscCreds: number; - minPinLength: number; - firmwareVersion: string; -} - -export interface StoredCredential { - credentialId: string; - rpId: string; - rpName: string; - userId: string; - userName: string; - userDisplayName: string; -} diff --git a/src/lib/hooks/is-mobile.svelte.ts b/src/lib/hooks/is-mobile.svelte.ts deleted file mode 100644 index 4829c00..0000000 --- a/src/lib/hooks/is-mobile.svelte.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { MediaQuery } from "svelte/reactivity"; - -const DEFAULT_MOBILE_BREAKPOINT = 768; - -export class IsMobile extends MediaQuery { - constructor(breakpoint: number = DEFAULT_MOBILE_BREAKPOINT) { - super(`max-width: ${breakpoint - 1}px`); - } -} diff --git a/src/lib/layout/sidebar.svelte b/src/lib/layout/sidebar.svelte deleted file mode 100644 index 9097beb..0000000 --- a/src/lib/layout/sidebar.svelte +++ /dev/null @@ -1,234 +0,0 @@ - - - - - -
    - PicoForge Logo - PicoForge -
    -     - - - - Menu - - - {#each menuItems as item} - - onViewChange(item.view)} - > - - {item.label} - - - {/each} - - - - - - -
    -
    - Device Status - {#if device.connected} - {#if device.method === "FIDO"} - Online - Fido - {:else} - Online - {/if} - {:else if device.error} - Error - {:else} - Offline - {/if} -
    - - -
    - -     -     - - -
    -
    - -
    -
    - -
    - - - - - -
    -
    - -
    - {@render children()} -
    -     -     diff --git a/src/lib/services/log.svelte.ts b/src/lib/services/log.svelte.ts deleted file mode 100644 index bd125e9..0000000 --- a/src/lib/services/log.svelte.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { tick } from "svelte"; - -export type LogType = "info" | "success" | "error" | "warning"; - -export interface LogEntry { - timestamp: string; - message: string; - type: LogType; -} - -class LogSystem { - logs = $state([]); - - add(message: string, type: LogType = "info") { - const now = new Date(); - const timeString = now.toLocaleTimeString("en-US", { - hour12: false, - hour: "2-digit", - minute: "2-digit", - second: "2-digit", - }); - - this.logs.push({ timestamp: timeString, message, type }); - } - - clear() { - this.logs = []; - } -} - -export const logger = new LogSystem(); diff --git a/src/lib/state/configState.svelte.ts b/src/lib/state/configState.svelte.ts deleted file mode 100644 index 6f70f07..0000000 --- a/src/lib/state/configState.svelte.ts +++ /dev/null @@ -1,132 +0,0 @@ -import { device } from "$lib/device/manager.svelte"; - -class configState { - setPinDialogOpen = $state(false); - currentPin = $state(""); - newPin = $state(""); - confirmPin = $state(""); - pinError = $state(""); - isSettingPin = $state(false); - - minPinDialogOpen = $state(false); - minPinCurrentPin = $state(""); - minPinNewPin = $state(""); - minPinConfirmPin = $state(""); - minPinLength = $state(4); - minPinError = $state(""); - - authPinDialogOpen = $state(false); - authPin = $state(""); - authPinError = $state(""); - - dialogOpen = $state(false); - dialogTitle = $state(""); - dialogMessage = $state(""); - dialogType: "success" | "error" = $state("success"); - - async handleSave() { - if (device.method === "FIDO" && device.fidoInfo?.options?.clientPin) { - this.authPin = ""; - this.authPinError = ""; - this.authPinDialogOpen = true; - return; - } - - const result = await device.save(); - if (result) { - this.showStatusDialog(result.success ? "Success" : "Write Failed", result.msg, result.success ? "success" : "error"); - } - } - - async confirmAuthPinSave() { - const result = await device.save(this.authPin); - if (result.success) { - this.authPinDialogOpen = false; - this.showStatusDialog("Success", result.msg); - } else { - this.authPinError = result.msg as string; - } - } - - showStatusDialog(title: string, message: string, type: "success" | "error" = "success") { - this.dialogTitle = title; - this.dialogMessage = message; - this.dialogType = type; - this.dialogOpen = true; - } - - openPinDialog() { - this.pinError = ""; - this.currentPin = ""; - this.newPin = ""; - this.confirmPin = ""; - if (device.fidoInfo?.options?.clientPin) { - this.isSettingPin = false; - } else { - this.isSettingPin = true; - } - this.setPinDialogOpen = true; - } - - async openMinPinDialog() { - this.minPinError = ""; - this.minPinCurrentPin = ""; - this.minPinNewPin = ""; - this.minPinConfirmPin = ""; - this.minPinLength = device.fidoInfo?.minPinLength || 4; - this.minPinDialogOpen = true; - } - - async handlePinChange() { - this.pinError = ""; - if (this.newPin.length < (device.fidoInfo?.minPinLength || 4)) { - this.pinError = `PIN must be at least ${device.fidoInfo?.minPinLength || 4} characters`; - return; - } - if (this.newPin !== this.confirmPin) { - this.pinError = "PINs do not match"; - return; - } - const result = await device.changePin(this.isSettingPin ? null : this.currentPin, this.newPin); - if (result.success) { - this.setPinDialogOpen = false; - this.showStatusDialog("Success", this.isSettingPin ? "PIN set successfully" : "PIN changed successfully", "success"); - } else { - this.pinError = result.msg as string; - } - } - - async handleMinPinChange() { - this.minPinError = ""; - if (this.minPinLength < 4 || this.minPinLength > 63) { - this.minPinError = "Minimum PIN length must be between 4 and 63"; - return; - } - if (this.minPinNewPin.length < this.minPinLength) { - this.minPinError = `New PIN must be at least ${this.minPinLength} characters`; - return; - } - if (this.minPinNewPin !== this.minPinConfirmPin) { - this.minPinError = "New PINs do not match"; - return; - } - const minLengthResult = await device.updateMinPinLength(this.minPinCurrentPin, this.minPinLength); - if (!minLengthResult.success) { - this.minPinError = minLengthResult.msg as string; - return; - } - const pinResult = await device.changePin(this.minPinCurrentPin, this.minPinNewPin); - if (pinResult.success) { - this.minPinDialogOpen = false; - this.showStatusDialog( - "Success", - `Minimum PIN length updated to ${this.minPinLength} and PIN changed successfully`, - "success", - ); - } else { - this.minPinError = pinResult.msg as string; - } - } -} - -export const configViewState = new configState(); diff --git a/src/lib/utils.ts b/src/lib/utils.ts deleted file mode 100644 index 55b3a91..0000000 --- a/src/lib/utils.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { clsx, type ClassValue } from "clsx"; -import { twMerge } from "tailwind-merge"; - -export function cn(...inputs: ClassValue[]) { - return twMerge(clsx(inputs)); -} - -// eslint-disable-next-line @typescript-eslint/no-explicit-any -export type WithoutChild = T extends { child?: any } ? Omit : T; -// eslint-disable-next-line @typescript-eslint/no-explicit-any -export type WithoutChildren = T extends { children?: any } ? Omit : T; -export type WithoutChildrenOrChild = WithoutChildren>; -export type WithElementRef = T & { ref?: U | null }; diff --git a/src/lib/views/aboutView.svelte b/src/lib/views/aboutView.svelte deleted file mode 100644 index d9d0bc8..0000000 --- a/src/lib/views/aboutView.svelte +++ /dev/null @@ -1,69 +0,0 @@ - - -
    -
    -

    About

    -
    - - - -
    - - - - PicoForge Logo - -

    PicoForge

    - v0.3.0 -

    - An open source commissioning tool for Pico FIDO security keys. - Developed with Rust, Tauri, and Svelte. -

    - -
    -
    - Code By: - Suyog Tandel -
    -
    - Copyright: - © 2026 Suyog Tandel -
    -
    - -
    - -
    -
    -     -     -
    diff --git a/src/lib/views/configView.svelte b/src/lib/views/configView.svelte deleted file mode 100644 index 284592b..0000000 --- a/src/lib/views/configView.svelte +++ /dev/null @@ -1,251 +0,0 @@ - - -
    -
    -

    Configuration

    -

    Customize device settings and behavior.

    -
    - - {#if !device.connected} - - {:else} -
    - - - - - Identity - - USB Identification settings - - -
    - - device.setVendor(v)} - disabled={!device.connected} - > - - {VENDORS.find((v) => v.value === device.selectedVendor) - ?.label ?? "Select a vendor"} - - - {#each VENDORS as vendor} - - {vendor.label} - - {/each} - - -
    - -
    -
    - - -
    -
    - - -
    -
    - - - -
    - - -
    -     -     - - - - - - LED Settings - - Adjust visual feedback behavior - - -
    - - -
    - -
    - - - - {LED_DRIVERS.find((d) => d.value === device.config.ledDriver) - ?.label ?? "Select driver"} - - - {#each LED_DRIVERS as driver} - - {driver.label} - - {/each} - - -
    - - - -
    - -
    - - Level {device.config.ledBrightness} -
    -
    - -
    -
    - -

    - Allow brightness adjustment -

    -
    - -
    - -
    -
    - -

    - Keep LED on constantly -

    -
    - -
    -     -     - - - - - - Touch & Timing - - Configure interaction timeouts - - -
    - - -
    -     -     - - - - - - Device Options - - Toggle advanced features - - -
    -
    - -

    - Restart device on reset -

    -
    - -
    - -
    -
    - -

    - Does not work on Android! -

    -
    - -
    -     -     -
    - -
    - -
    - {/if} -
    diff --git a/src/lib/views/homeView.svelte b/src/lib/views/homeView.svelte deleted file mode 100644 index 95c4c1c..0000000 --- a/src/lib/views/homeView.svelte +++ /dev/null @@ -1,221 +0,0 @@ - - -
    -
    -

    Device Overview

    -

    - Quick view of your device status and specifications. -

    -
    - - {#if !device.connected} - - {:else} -
    - - - - - Device Information - - - -
    -
    -

    Serial Number

    -

    {device.info.serial}

    -
    -
    -

    Firmware Version

    -

    - v{device.info.firmwareVersion} -

    -
    -
    -

    VID:PID

    -

    - {device.config.vid}:{device.config.pid} -

    -
    -
    -

    Product Name

    -

    {device.config.productName}

    -
    -
    - - - -
    -
    - Flash Memory - - {device.info.flashUsed} / {device.info.flashTotal} KB - -
    - -
    -     -     - - - - - - FIDO2 Information - - - - {#if device.fidoInfo} -
    -
    -

    FIDO Version

    -

    - {device.fidoInfo.versions[0] || "N/A"} -

    -
    -
    -

    PIN Set

    -

    - {device.fidoInfo.options?.clientPin ? "Yes" : "No"} -

    -
    -
    -

    Min PIN Length

    -

    {device.fidoInfo.minPinLength}

    -
    -
    -

    Resident Keys

    -

    - {device.fidoInfo.options?.rk ? "Supported" : "Not Supported"} -

    -
    -
    - - - -
    -

    AAGUID

    -

    - {device.fidoInfo.aaguid} -

    -
    - {:else} -

    - FIDO information not available -

    - {/if} -     -     - - - - - - LED Configuration - - - - {#if device.method === "FIDO"} -
    - -

    - Information is not available in Fido only communication mode. -

    -
    - {:else} -
    - LED GPIO Pin - GPIO {device.config.ledGpio} -
    -
    - LED Brightness - {device.config.ledBrightness} -
    -
    - Presence Touch Timeout - {device.config.touchTimeout}s -
    -
    - LED Dimmable - - {device.config.ledDimmable ? "Yes" : "No"} - -
    -
    - LED Steady Mode - - {device.config.ledSteady ? "On" : "Off"} - -
    - {/if} -     -     - - - - - - Security Status - - - -
    - Boot Mode -
    - {#if device.security.secureBoot} - - {:else} - - {/if} - - {device.security.secureBoot ? "Secure Boot" : "Development"} - -
    -
    -
    - Debug Interface - - {device.security.secureLock ? "Read-out Locked" : "Debug Enabled"} - -
    -
    - Secure Lock - - {device.security.confirmed ? "Acknowledged" : "Pending"} - -
    -     -     -
    - {/if} -
    diff --git a/src/lib/views/logsView.svelte b/src/lib/views/logsView.svelte deleted file mode 100644 index 5945fb2..0000000 --- a/src/lib/views/logsView.svelte +++ /dev/null @@ -1,66 +0,0 @@ - - -
    -
    -
    -

    System Logs

    -

    - Real-time device communication and application events. -

    -
    - -
    - - - - {#if logger.logs.length === 0} -
    - -

    No events recorded yet.

    -
    - {:else} - -
    - {#each logger.logs as log} -
    - [{log.timestamp}] - - {#if log.type === "success"}➜{/if} - {#if log.type === "error"}✖{/if} - {log.message} - -
    - {/each} -
    -     - {/if} -     -     -
    diff --git a/src/lib/views/passkeysView.svelte b/src/lib/views/passkeysView.svelte deleted file mode 100644 index e6ce204..0000000 --- a/src/lib/views/passkeysView.svelte +++ /dev/null @@ -1,365 +0,0 @@ - - -
    -
    -

    Passkeys

    -

    - Manage your security PIN and the FIDO credentials (passkeys) stored on - your device. -

    -
    - - {#if !device.connected} - - {:else if !device.hasFido} - - {:else} - - -
    - - - PIN Management - - Configure FIDO2 PIN security -
    -     - -
    -
    -

    Current PIN Status

    -

    - {device.fidoInfo?.options?.clientPin - ? "PIN is set" - : "No PIN configured"} -

    -
    - -
    - -
    -
    -

    Minimum PIN Length

    -

    - Current: {device.fidoInfo?.minPinLength || 4} characters -

    -
    - -
    -     -     - - - -
    - - - Stored Passkeys - - - View and manage your resident credentials - -
    -     - - - - {#if !device.unlocked} -
    -
    - -
    -

    Authentication Required

    -

    - Unlock your device to view and manage passkeys. -

    - -
    - {/if} - - {#if device.unlocked} -
    -
    - - - Unlocked - - - - {device.credentials.length} - {device.credentials.length === 1 ? "credential" : "credentials"} - stored - -
    - -
    - - {#if device.credentials.length === 0} - - -
    - -
    -

    No Passkeys Found

    -

    - This device doesn't have any resident credentials stored yet. - Create passkeys on websites to see them here. -

    -     -     - {:else} -
    - {#each device.credentials as cred} - -
    - -     - - {/each} -
    - {/if} - - - -
    - - - {selectedCredential?.rpName || - selectedCredential?.rpId || - "Passkey Details"} - - - Credential details for user {selectedCredential?.userName} - - - -
    -
    -
    - -
    -
    -
    - {selectedCredential?.rpId} -
    -
    - {selectedCredential?.userName} -
    -
    -
    - - - -
    -
    -

    - Display Name -

    -

    - {selectedCredential?.userDisplayName || "N/A"} -

    -
    - -
    -

    - User ID (Hex) -

    -

    - {selectedCredential?.userId} -

    -
    - -
    -

    - Credential ID (Hex) -

    -

    - {selectedCredential?.credentialId} -

    -
    -
    -
    - - - Close - -
    -     -     - - - {/if} - - - {/if} - diff --git a/src/lib/views/securityView.svelte b/src/lib/views/securityView.svelte deleted file mode 100644 index a481e36..0000000 --- a/src/lib/views/securityView.svelte +++ /dev/null @@ -1,97 +0,0 @@ - - -
    -
    -

    - Secure Boot -

    -

    - Permanently lock this device to the current firmware vendor. -

    -
    - - - - Feature Unstable - This feature is currently under work and disabled for safety. - - - - - Lock Settings - - -
    -
    - -

    - Verifies firmware signature on startup -

    -
    - -
    - -
    -
    - -

    - Prevents reading key material via debug ports -

    -
    - -
    - - - -
    - - -
    -     - - - -     -
    diff --git a/src/main.rs b/src/main.rs new file mode 100644 index 0000000..9122372 --- /dev/null +++ b/src/main.rs @@ -0,0 +1,184 @@ +use gpui::*; +use gpui_component::button::{Button, ButtonVariants}; +use gpui_component::{ActiveTheme, IconName, Root, TitleBar, h_flex, v_flex}; +use gpui_component::{Side, sidebar::*}; +use gpui_component::{Theme, ThemeMode}; +use ui::views::{ + about::AboutView, config::ConfigView, home::HomeView, logs::LogsView, passkeys::PasskeysView, + security::SecurityView, +}; + +mod device; +mod ui; + +#[derive(Clone, Copy, PartialEq)] +enum ActiveView { + Home, + Passkeys, + Configuration, + Security, + Logs, + About, +} + +pub struct ApplicationRoot { + active_view: ActiveView, + collapsed: bool, +} + +impl ApplicationRoot { + pub fn new() -> Self { + Self { + active_view: ActiveView::Home, + collapsed: false, + } + } +} + +impl Render for ApplicationRoot { + fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { + h_flex() + .size_full() + .child( + Sidebar::new(Side::Left) + .collapsed(self.collapsed) + .collapsible(true) + .h_full() + .header(SidebarHeader::new().child("PicoForge")) + .child( + SidebarGroup::new("Menu").child( + SidebarMenu::new() + .child( + SidebarMenuItem::new("Home") + .icon(IconName::LayoutDashboard) + .active(self.active_view == ActiveView::Home) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Home; + })), + ) + .child( + SidebarMenuItem::new("Passkeys") + .icon(IconName::Settings) + .active(self.active_view == ActiveView::Passkeys) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Passkeys; + })), + ) + .child( + SidebarMenuItem::new("Configuration") + .icon(IconName::Settings) + .active(self.active_view == ActiveView::Configuration) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Configuration; + })), + ) + // TODO: Replace these icons with correct ones from lucide + .child( + SidebarMenuItem::new("Security") + .icon(IconName::Eye) + .active(self.active_view == ActiveView::Security) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Security; + })), + ) + .child( + SidebarMenuItem::new("Logs") + .icon(IconName::File) + .active(self.active_view == ActiveView::Logs) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Logs; + })), + ) + .child( + SidebarMenuItem::new("About") + .icon(IconName::Info) + .active(self.active_view == ActiveView::About) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::About; + })), + ), + ), + ) + .footer(SidebarFooter::new().child("User Profile")), + ) + .child( + v_flex() + .size_full() + .child( + TitleBar::new().child( + h_flex() + .w_full() + .justify_between() + // .px_4() + .items_center() + .child( + // CORRECTED BUTTON SYNTAX + Button::new("sidebar_toggle") + .ghost() + .icon(IconName::PanelLeft) + .on_click(cx.listener(|this, _, _, _| { + this.collapsed = !this.collapsed; + })) + .tooltip("Toggle Sidebar"), + ), + ), + ) + .child(div().flex_grow().bg(cx.theme().background).child( + // Switch on the Enum to decide what to render + match self.active_view { + ActiveView::Home => HomeView::build(cx.theme()).into_any_element(), + ActiveView::Passkeys => PasskeysView::build().into_any_element(), + ActiveView::Configuration => ConfigView::build().into_any_element(), + ActiveView::Security => SecurityView::build().into_any_element(), + ActiveView::Logs => LogsView::build().into_any_element(), + ActiveView::About => AboutView::build().into_any_element(), + }, + )), + ) + } +} + +fn main() { + let app = Application::new().with_assets(gpui_component_assets::Assets); + + app.run(move |cx| { + gpui_component::init(cx); + Theme::change(ThemeMode::Dark, None, cx); + // Theme::change(ThemeMode::Dark, Some(ui::theme::dark_theme()), cx); + + cx.activate(true); + + let mut window_size = size(px(1280.0), px(720.0)); + if let Some(display) = cx.primary_display() { + let display_size = display.bounds().size; + window_size.width = window_size.width.min(display_size.width * 0.85); + window_size.height = window_size.height.min(display_size.height * 0.85); + } + let window_bounds = Bounds::centered(None, window_size, cx); + + cx.spawn(async move |cx| { + let window_options = WindowOptions { + window_bounds: Some(WindowBounds::Windowed(window_bounds)), + titlebar: Some(TitleBar::title_bar_options()), + window_min_size: Some(gpui::Size { + width: px(800.), + height: px(600.), + }), + kind: WindowKind::Normal, + #[cfg(target_os = "linux")] + window_background: gpui::WindowBackgroundAppearance::Transparent, + #[cfg(target_os = "linux")] + window_decorations: Some(gpui::WindowDecorations::Client), + ..Default::default() + }; + + cx.open_window(window_options, |window, cx| { + let view = cx.new(|_| ApplicationRoot::new()); + cx.new(|cx| Root::new(view, window, cx)) + })?; + + Ok::<_, anyhow::Error>(()) + }) + .detach(); + }); +} diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte deleted file mode 100644 index c6cdfa8..0000000 --- a/src/routes/+layout.svelte +++ /dev/null @@ -1,6 +0,0 @@ - - -{@render children()} diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts deleted file mode 100644 index 9d24899..0000000 --- a/src/routes/+layout.ts +++ /dev/null @@ -1,5 +0,0 @@ -// Tauri doesn't have a Node.js server to do proper SSR -// so we use adapter-static with a fallback to index.html to put the site in SPA mode -// See: https://svelte.dev/docs/kit/single-page-apps -// See: https://v2.tauri.app/start/frontend/sveltekit/ for more info -export const ssr = false; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte deleted file mode 100644 index 4bc5896..0000000 --- a/src/routes/+page.svelte +++ /dev/null @@ -1,68 +0,0 @@ - - - (currentView = view)}> - -
    -
    - -
    -
    -     -     - - - - - diff --git a/src-tauri/tauri.conf.json b/src/tauri.conf.json similarity index 100% rename from src-tauri/tauri.conf.json rename to src/tauri.conf.json diff --git a/src/ui/color.rs b/src/ui/color.rs new file mode 100644 index 0000000..a110c9b --- /dev/null +++ b/src/ui/color.rs @@ -0,0 +1,69 @@ +#[allow(unused)] +pub mod light { + pub const BACKGROUND: u32 = 0xfefefe; + pub const FOREGROUND: u32 = 0x09090b; + pub const CARD: u32 = 0xfefefe; + pub const CARD_FOREGROUND: u32 = 0x09090b; + pub const POPOVER: u32 = 0xfefefe; + pub const POPOVER_FOREGROUND: u32 = 0x09090b; + pub const PRIMARY: u32 = 0x17171a; + pub const PRIMARY_FOREGROUND: u32 = 0xf9f9f9; + pub const SECONDARY: u32 = 0xf3f3f4; + pub const SECONDARY_FOREGROUND: u32 = 0x17171a; + pub const MUTED: u32 = 0xf3f3f4; + pub const MUTED_FOREGROUND: u32 = 0x70707b; + pub const ACCENT: u32 = 0xf3f3f4; + pub const ACCENT_FOREGROUND: u32 = 0x17171a; + pub const DESTRUCTIVE: u32 = 0xe7000a; + pub const BORDER: u32 = 0xe4e4e7; + pub const INPUT: u32 = 0xe4e4e7; + pub const RING: u32 = 0x9e9ea9; + pub const CHART_1: u32 = 0xf44900; + pub const CHART_2: u32 = 0x009689; + pub const CHART_3: u32 = 0x104e64; + pub const CHART_4: u32 = 0xffb900; + pub const CHART_5: u32 = 0xfd9900; + pub const SIDEBAR: u32 = 0xf9f9f9; + pub const SIDEBAR_FOREGROUND: u32 = 0x09090b; + pub const SIDEBAR_PRIMARY: u32 = 0x17171a; + pub const SIDEBAR_PRIMARY_FOREGROUND: u32 = 0xf9f9f9; + pub const SIDEBAR_ACCENT: u32 = 0xf3f3f4; + pub const SIDEBAR_ACCENT_FOREGROUND: u32 = 0x17171a; + pub const SIDEBAR_BORDER: u32 = 0xe4e4e7; + pub const SIDEBAR_RING: u32 = 0x9e9ea9; +} + +#[allow(unused)] +pub mod dark { + pub const BACKGROUND: u32 = 0x09090b; + pub const FOREGROUND: u32 = 0xf9f9f9; + pub const CARD: u32 = 0x17171a; + pub const CARD_FOREGROUND: u32 = 0xf9f9f9; + pub const POPOVER: u32 = 0x17171a; + pub const POPOVER_FOREGROUND: u32 = 0xf9f9f9; + pub const PRIMARY: u32 = 0xe4e4e7; + pub const PRIMARY_FOREGROUND: u32 = 0x17171a; + pub const SECONDARY: u32 = 0x26262a; + pub const SECONDARY_FOREGROUND: u32 = 0xf9f9f9; + pub const MUTED: u32 = 0x26262a; + pub const MUTED_FOREGROUND: u32 = 0x9e9ea9; + pub const ACCENT: u32 = 0x26262a; + pub const ACCENT_FOREGROUND: u32 = 0xf9f9f9; + pub const DESTRUCTIVE: u32 = 0xff6366; + pub const BORDER: u32 = 0xfefefe19; + pub const INPUT: u32 = 0xfefefe26; + pub const RING: u32 = 0x70707b; + pub const CHART_1: u32 = 0x1347e5; + pub const CHART_2: u32 = 0x00bc7c; + pub const CHART_3: u32 = 0xfd9900; + pub const CHART_4: u32 = 0xac46ff; + pub const CHART_5: u32 = 0xff1f56; + pub const SIDEBAR: u32 = 0x17171a; + pub const SIDEBAR_FOREGROUND: u32 = 0xf9f9f9; + pub const SIDEBAR_PRIMARY: u32 = 0x1347e5; + pub const SIDEBAR_PRIMARY_FOREGROUND: u32 = 0xf9f9f9; + pub const SIDEBAR_ACCENT: u32 = 0x26262a; + pub const SIDEBAR_ACCENT_FOREGROUND: u32 = 0xf9f9f9; + pub const SIDEBAR_BORDER: u32 = 0xfefefe19; + pub const SIDEBAR_RING: u32 = 0x70707b; +} diff --git a/src/ui/components/sidebar.rs b/src/ui/components/sidebar.rs new file mode 100644 index 0000000..1e827c4 --- /dev/null +++ b/src/ui/components/sidebar.rs @@ -0,0 +1,2 @@ +pub struct Sidebar; +impl Render for Sidebar {} diff --git a/src/ui/mod.rs b/src/ui/mod.rs new file mode 100644 index 0000000..940b096 --- /dev/null +++ b/src/ui/mod.rs @@ -0,0 +1,2 @@ +pub mod color; +pub mod views; diff --git a/src/ui/views/about.rs b/src/ui/views/about.rs new file mode 100644 index 0000000..afd8642 --- /dev/null +++ b/src/ui/views/about.rs @@ -0,0 +1,10 @@ +// src/views/about.rs +use gpui::*; + +pub struct AboutView; + +impl AboutView { + pub fn build() -> impl IntoElement { + div().size_full().p_8().child("About goes here...") + } +} diff --git a/src/ui/views/config.rs b/src/ui/views/config.rs new file mode 100644 index 0000000..9014001 --- /dev/null +++ b/src/ui/views/config.rs @@ -0,0 +1,13 @@ +// src/views/config.rs +use gpui::*; + +pub struct ConfigView; + +impl ConfigView { + pub fn build() -> impl IntoElement { + div() + .size_full() + .p_8() + .child("Passkey Management List goes here...") + } +} diff --git a/src/ui/views/home.rs b/src/ui/views/home.rs new file mode 100644 index 0000000..36b4713 --- /dev/null +++ b/src/ui/views/home.rs @@ -0,0 +1,521 @@ +// use crate::device::types::*; +use gpui::*; +use gpui_component::StyledExt; +use gpui_component::{Icon, IconName, Theme, badge::Badge, h_flex, progress::Progress, v_flex}; + +// These will be replaced/added in types.rs +struct DeviceInfo { + serial: String, + firmware_version: String, + flash_used: f32, + flash_total: f32, +} + +struct DeviceConfig { + vid: u16, + pid: u16, + product_name: String, + led_gpio: u8, + led_brightness: u8, + touch_timeout: u8, + led_dimmable: bool, + led_steady: bool, +} + +struct FidoInfo { + versions: Vec, + client_pin: bool, + min_pin_length: u8, + resident_keys: bool, + aaguid: String, +} + +struct DeviceSecurity { + secure_boot: bool, + secure_lock: bool, + confirmed: bool, +} + +struct DeviceState { + connected: bool, + method: String, + info: DeviceInfo, + config: DeviceConfig, + fido_info: Option, + security: DeviceSecurity, +} + +pub struct HomeView; + +impl HomeView { + pub fn build(theme: &Theme) -> impl IntoElement { + // Mock Data + let device = DeviceState { + connected: true, + method: "HID".to_string(), + info: DeviceInfo { + serial: "A1B2C3D4E5".to_string(), + firmware_version: "1.2.0".to_string(), + flash_used: 128.0, + flash_total: 2048.0, + }, + config: DeviceConfig { + vid: 0xCAFE, + pid: 0xBABE, + product_name: "Pico FIDO Key".to_string(), + led_gpio: 25, + led_brightness: 128, + touch_timeout: 10, + led_dimmable: true, + led_steady: false, + }, + fido_info: Some(FidoInfo { + versions: vec!["FIDO2_1".to_string(), "U2F_V2".to_string()], + client_pin: true, + min_pin_length: 4, + resident_keys: true, + aaguid: "00000000-0000-0000-0000-000000000000".to_string(), + }), + security: DeviceSecurity { + secure_boot: true, + secure_lock: false, + confirmed: true, + }, + }; + + div() + .size_full() + .bg(theme.background) + .flex() + .flex_col() + .items_center() // Center the content + .child( + div() + .w_full() + .max_w(px(1400.0)) // Max width constraint + .px_16() // Big padding on sides + .py_10() + .child( + v_flex() + .gap_8() + // Header Section + .child( + v_flex() + .gap_1() + .child( + div() + .text_xl() + .font_bold() + .text_color(theme.foreground) + .child("Device Overview"), + ) + .child( + div().text_sm().text_color(theme.muted_foreground).child( + "Quick view of your device status and specifications.", + ), + ), + ) + // Content Section + .child(if !device.connected { + // No Device Status Placeholder + div() + .flex() + .items_center() + .justify_center() + .h_64() + .border_1() + .border_color(theme.border) + .rounded_xl() + .child( + div() + .text_color(theme.muted_foreground) + .child("No Device Connected"), + ) + .into_any_element() + } else { + // 4 Card Grid + div() + .grid() + .grid_cols(2) + .gap_6() + .child(Self::render_device_info(&device, theme)) + .child(Self::render_fido_info(&device, theme)) + .child(Self::render_led_config(&device, theme)) + .child(Self::render_security_status(&device, theme)) + .into_any_element() + }), + ), + ) + } + + fn render_card( + title: &str, + icon: IconName, + content: impl IntoElement, + theme: &Theme, + ) -> impl IntoElement { + div() + .w_full() + // TODO: REPLACE with a constant or modify default theme + .bg(rgb(0x18181b)) + .border_1() + .border_color(theme.border) + .rounded_xl() + .p_6() + .child( + v_flex() + .gap_6() + .child( + h_flex() + .items_center() + .gap_2() + .child(Icon::new(icon).size_5().text_color(theme.foreground)) + .child( + div() + .font_bold() + .text_color(theme.foreground) + .child(title.to_string()), + ), + ) + .child(content), + ) + } + + // --- Helper for Key-Value pairs --- + fn render_kv( + label: &str, + value: impl IntoElement, + theme: &Theme, + font_mono: bool, + ) -> impl IntoElement { + v_flex() + .gap_1() + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child(label.to_string()), + ) + .child( + div() + .text_sm() + .font_weight(if font_mono { + FontWeight::NORMAL + } else { + FontWeight::MEDIUM + }) + .font_family(if font_mono { "Mono" } else { "Sans" }) + .text_color(theme.foreground) + .child(value), + ) + } + + fn render_device_info(device: &DeviceState, theme: &Theme) -> impl IntoElement { + let flash_percent = (device.info.flash_used / device.info.flash_total) * 100.0; + + Self::render_card( + "Device Information", + IconName::SquareTerminal, + v_flex() + .gap_6() + .child( + div() + .grid() + .grid_cols(2) + .gap_4() + .child(Self::render_kv( + "Serial Number", + device.info.serial.clone(), + theme, + true, + )) + .child(Self::render_kv( + "Firmware Version", + format!("v{}", device.info.firmware_version), + theme, + true, + )) + .child(Self::render_kv( + "VID:PID", + format!("{:04x}:{:04x}", device.config.vid, device.config.pid), + theme, + true, + )) + .child(Self::render_kv( + "Product Name", + device.config.product_name.clone(), + theme, + false, + )), + ) + .child( + div().h_px().bg(theme.border), // Separator + ) + .child( + v_flex() + .gap_2() + .child( + h_flex() + .justify_between() + .text_sm() + .child( + div() + .text_color(theme.muted_foreground) + .child("Flash Memory"), + ) + .child(div().text_color(theme.foreground).child(format!( + "{:.0} / {:.0} KB", + device.info.flash_used, device.info.flash_total + ))), + ) + .child(Progress::new().value(flash_percent)), + ), + theme, + ) + } + + fn render_fido_info(device: &DeviceState, theme: &Theme) -> impl IntoElement { + Self::render_card( + "FIDO2 Information", + IconName::Info, + if let Some(fido) = &device.fido_info { + v_flex() + .gap_6() + .child( + div() + .grid() + .grid_cols(2) + .gap_4() + .child(Self::render_kv( + "FIDO Version", + fido.versions.first().cloned().unwrap_or("N/A".into()), + theme, + false, + )) + .child(Self::render_kv( + "PIN Set", + if fido.client_pin { "Yes" } else { "No" }, + theme, + false, + )) + .child(Self::render_kv( + "Min PIN Length", + fido.min_pin_length.to_string(), + theme, + false, + )) + .child(Self::render_kv( + "Resident Keys", + if fido.resident_keys { + "Supported" + } else { + "Not Supported" + }, + theme, + false, + )), + ) + .child(div().h_px().bg(theme.border)) + .child(Self::render_kv("AAGUID", fido.aaguid.clone(), theme, true)) + .into_any_element() + } else { + div() + .text_sm() + .text_color(theme.muted_foreground) + .child("FIDO information not available") + .into_any_element() + }, + theme, + ) + } + + fn render_led_config(device: &DeviceState, theme: &Theme) -> impl IntoElement { + Self::render_card( + "LED Configuration", + IconName::LayoutDashboard, + if device.method == "FIDO" { + v_flex() + .items_center() + .justify_center() + .py_4() + .gap_2() + .child( + Icon::new(IconName::TriangleAlert) + .size_8() + .text_color(gpui::yellow()), + ) + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child("Information is not available in Fido only communication mode."), + ) + .into_any_element() + } else { + v_flex() + .gap_3() + .text_sm() + .child( + h_flex() + .justify_between() + .child( + div() + .text_color(theme.muted_foreground) + .child("LED GPIO Pin"), + ) + .child(format!("GPIO {}", device.config.led_gpio)), + ) + .child( + h_flex() + .justify_between() + .child( + div() + .text_color(theme.muted_foreground) + .child("LED Brightness"), + ) + .child(device.config.led_brightness.to_string()), + ) + .child( + h_flex() + .justify_between() + .child( + div() + .text_color(theme.muted_foreground) + .child("Presence Touch Timeout"), + ) + .child(format!("{}s", device.config.touch_timeout)), + ) + .child( + h_flex() + .justify_between() + .child( + div() + .text_color(theme.muted_foreground) + .child("LED Dimmable"), + ) + .child( + Badge::new() + .child(if device.config.led_dimmable { + "Yes" + } else { + "No" + }) + .color(if device.config.led_dimmable { + theme.primary + } else { + theme.secondary + }), + ), + ) + .child( + h_flex() + .justify_between() + .child( + div() + .text_color(theme.muted_foreground) + .child("LED Steady Mode"), + ) + .child( + Badge::new() + .child(if device.config.led_steady { + "On" + } else { + "Off" + }) + .color(if device.config.led_steady { + theme.primary + } else { + theme.secondary + }), + ), + ) + .into_any_element() + }, + theme, + ) + } + + fn render_security_status(device: &DeviceState, theme: &Theme) -> impl IntoElement { + Self::render_card( + "Security Status", + IconName::CircleCheck, + v_flex() + .gap_3() + .text_sm() + .child( + h_flex() + .justify_between() + .items_center() + .child(div().text_color(theme.muted_foreground).child("Boot Mode")) + .child( + h_flex() + .gap_2() + .items_center() + .child(if device.security.secure_boot { + Icon::new(IconName::FolderClosed) + .size_3p5() + .text_color(gpui::green()) + } else { + Icon::new(IconName::FolderOpen) + .size_3p5() + .text_color(gpui::yellow()) + }) + .child( + Badge::new() + .child(if device.security.secure_boot { + "Secure Boot" + } else { + "Development" + }) + .color(if device.security.secure_boot { + theme.primary + } else { + theme.secondary + }), + ), + ), + ) + .child( + h_flex() + .justify_between() + .items_center() + .child( + div() + .text_color(theme.muted_foreground) + .child("Debug Interface"), + ) + .child(div().font_medium().text_color(theme.foreground).child( + if device.security.secure_lock { + "Read-out Locked" + } else { + "Debug Enabled" + }, + )), + ) + .child( + h_flex() + .justify_between() + .items_center() + .child( + div() + .text_color(theme.muted_foreground) + .child("Secure Lock"), + ) + .child( + Badge::new() + .child(if device.security.confirmed { + "Acknowledged" + } else { + "Pending" + }) + .color(if device.security.confirmed { + gpui::red() + } else { + theme.secondary + }), + ), + ), + theme, + ) + } +} diff --git a/src/ui/views/logs.rs b/src/ui/views/logs.rs new file mode 100644 index 0000000..fa08a6c --- /dev/null +++ b/src/ui/views/logs.rs @@ -0,0 +1,10 @@ +// src/views/logs.rs +use gpui::*; + +pub struct LogsView; + +impl LogsView { + pub fn build() -> impl IntoElement { + div().size_full().p_8().child("Logs goes here...") + } +} diff --git a/src/ui/views/mod.rs b/src/ui/views/mod.rs new file mode 100644 index 0000000..c325063 --- /dev/null +++ b/src/ui/views/mod.rs @@ -0,0 +1,6 @@ +pub mod about; +pub mod config; +pub mod home; +pub mod logs; +pub mod passkeys; +pub mod security; diff --git a/src/ui/views/passkeys.rs b/src/ui/views/passkeys.rs new file mode 100644 index 0000000..ac581b5 --- /dev/null +++ b/src/ui/views/passkeys.rs @@ -0,0 +1,13 @@ +// src/views/passkeys.rs +use gpui::*; + +pub struct PasskeysView; + +impl PasskeysView { + pub fn build() -> impl IntoElement { + div() + .size_full() + .p_8() + .child("Passkey Management List goes here...") + } +} diff --git a/src/ui/views/security.rs b/src/ui/views/security.rs new file mode 100644 index 0000000..d96ce44 --- /dev/null +++ b/src/ui/views/security.rs @@ -0,0 +1,13 @@ +// src/views/security.rs +use gpui::*; + +pub struct SecurityView; + +impl SecurityView { + pub fn build() -> impl IntoElement { + div() + .size_full() + .p_8() + .child("Security Management List goes here...") + } +} diff --git a/static/build-configure-symbolic.svg b/static/build-configure-symbolic.svg deleted file mode 100644 index e5f8080..0000000 --- a/static/build-configure-symbolic.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/static/favicon.png b/static/favicon.png deleted file mode 100644 index 825b9e65af7c104cfb07089bb28659393b4f2097..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1571 zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4i*LmhD`I74h#$ojKx9jP7LeL$-HD>V7=?< z;uunK>uv1q+}9QYp`3aLRhP6(c_0+yMGvW%`8w9Z4+AO$r=LiV^}WjuyMS z-`u@3yY$$SKDCAN>H9tj&u}g}XS4E2pY^*PkNZ3lroTLubH?oMf4#J9vzMpzCckct zowYnCeNLl>-tC#oR|mW7^83!__-WF*w@N!}ZnWO)*sV9e?K!tS_p_50%zk=doa_6a z9Ze7`Oq(1d_U2FyZ`xGx-xFfEE={d84w$f9rS697HscGE-dGl;{V=G?`XscL>&++e z>-U#%oq6{6`Q0U4b%OVNS0!jYj1*aM;g7Z{*A0W>9o{wqst=zQyeQ;ij+$byPs!T7 zP$;gE@43N(Z#KN^`%g~qnDC*fQ@9u5T z`010b%(4WBW*Igy)jqkB43?QUzqIP?pR?n;uR)>M{Z!UJzVqjLRQx?D9Xlud=JZMH zM4Dt}4@n0eu2Ixgk=cKk=N7x!uIU#Qr)QK{iRNADxA(7D>^{r+(1Q28%d+>r`1fM! z3!#PnEzgzrWhp(JYGANY`@x@o);^8RydN}I>CasHT;#z0|7n-*i5nc8wD_Qhgrn&1 z_=)HIc7)82SrZn{n5O;yq=&Wj!=(QfoT>{MZZVX#Y(9Ll{di*M8HGwlu2VN3EWtQvP&QN2PVR8N7!YC#E{m*$kY8i3^zQiv$JVzqYQu{#r;icEl z=UhCnkiGRom%yd1b*>!Dbz(=$xA=OCK9sWW?kjHnIi=(8N8<^v!`m)TWlU#3bX%EA zWW|L?Hd)uCpL{-aJW{t>_loq&RRZ@V7u56iZFu;9u7AgewTA2m_dYzmg!LfHN%jio z6)Tz8tu4PtytF=2_HyzK35Her8CehRz9{eceYP>8gyZOsf1e+R9eAyLo&U`AQ!>jL z>i##s-geN-*K&%b<6Sll}2Yvce^~*xG<6XX?1V3gp#~N zkiz|sN2i}Ey4w@5>yt(|hpKnhq#5tcY68zPo5(r8-F4X1_Ok2&?FGW>zrU(?x;Q#c?bx4-5dPgKtZr*@mZ=`3%X zy6%Z`^e5Hr^Y+>AzJm9>p2Z^BF4@_(4b1il6W?8xzhU;SdYz;2?R&rX$y{t=F!Y`E zR$}w<@9ihF9(X_5v`6rxTqRqD=!eToZeQ5@{QQC0#~w>6ukx<+wTnGF|CY_6xJ%zz zHr<`$x>nEcQ1ZHi?IAA|7rHVEt3Nz@U3=2vrr*f|MGoxkLSkxhhdzJg^6Z@Zq2`!6 zN9X(x&t6IHdUbyJoZ{}h2h3KD+a6rvIIkc7=B91g%$DcR#pk?L*qd_b^D~z6tu4>l zcb}QJe%gmWZyk5-zxe)Gtrh1xH}U_oBV*EcOaCc*(s}2g+Fj}Irl)7WovQcub7w{E upWAk8&OVF%_w#jD-*4ISJB6Y@xbv5oeJi^*U66r+fx*+&&t;ucLK6TBI`Z29 diff --git a/static/svelte.svg b/static/svelte.svg deleted file mode 100644 index c5e0848..0000000 --- a/static/svelte.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/tauri.svg b/static/tauri.svg deleted file mode 100644 index 31b62c9..0000000 --- a/static/tauri.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/static/vite.svg b/static/vite.svg deleted file mode 100644 index e7b8dfb..0000000 --- a/static/vite.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/svelte.config.js b/svelte.config.js deleted file mode 100644 index 9d11ff2..0000000 --- a/svelte.config.js +++ /dev/null @@ -1,25 +0,0 @@ -// Tauri doesn't have a Node.js server to do proper SSR -// so we use adapter-static with a fallback to index.html to put the site in SPA mode -// See: https://svelte.dev/docs/kit/single-page-apps -// See: https://v2.tauri.app/start/frontend/sveltekit/ for more info -import adapter from "@sveltejs/adapter-static"; -import { vitePreprocess } from "@sveltejs/vite-plugin-svelte"; - -/** @type {import('@sveltejs/kit').Config} */ -const config = { - compilerOptions: { - runes: true, - }, - preprocess: vitePreprocess(), - kit: { - adapter: adapter({ - fallback: "index.html", - }), - alias: { - $lib: "src/lib", - "$lib/*": "src/lib/*", - }, - }, -}; - -export default config; diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index 62735c3..0000000 --- a/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "./.svelte-kit/tsconfig.json", - "compilerOptions": { - "allowJs": true, - "checkJs": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "sourceMap": true, - "strict": true, - "moduleResolution": "bundler", - } - // Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias - // except $lib which is handled by https://svelte.dev/docs/kit/configuration#files - // - // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes - // from the referenced tsconfig.json - TypeScript does not merge them in -} diff --git a/vite.config.js b/vite.config.js deleted file mode 100644 index 7f39657..0000000 --- a/vite.config.js +++ /dev/null @@ -1,57 +0,0 @@ -import { defineConfig } from "vite"; -import { sveltekit } from "@sveltejs/kit/vite"; -import tailwindcss from '@tailwindcss/vite'; - -// @ts-expect-error process is a nodejs global -const host = process.env.TAURI_DEV_HOST; - -// https://vite.dev/config/ -export default defineConfig(() => ({ - plugins: [ - sveltekit(), - tailwindcss(), - ], - - build: { - minify: /** @type {'terser'} */ ('terser'), - sourcemap: false, - target: 'es2018', - terserOptions: { - compress: { - drop_console: true, - drop_debugger: true, - }, - }, - rollupOptions: { - output: { - manualChunks: (/** @type {string} */ id) => { - if (id.includes('node_modules')) { - return 'vendor'; - } - }, - }, - }, - }, - - // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build` - // - // 1. prevent Vite from obscuring rust errors - clearScreen: false, - // 2. tauri expects a fixed port, fail if that port is not available - server: { - port: 1420, - strictPort: true, - host: host || false, - hmr: host - ? { - protocol: "ws", - host, - port: 1421, - } - : undefined, - watch: { - // 3. tell Vite to ignore watching `src-tauri` - ignored: ["**/src-tauri/**"], - }, - }, -})); From a8275d9a423620ef5e3f4d39492dedc6e00ae804 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Tue, 27 Jan 2026 22:51:03 +0530 Subject: [PATCH 02/37] feat: add original lucid icons and fix ui bugs with gpui window --- Cargo.lock | 1 + Cargo.toml | 4 +- README.md | 2 +- src/.gitignore | 9 - .../android/mipmap-anydpi-v26/ic_launcher.xml | 5 - src/icons/android/mipmap-hdpi/ic_launcher.png | Bin 1392 -> 0 bytes .../mipmap-hdpi/ic_launcher_foreground.png | Bin 1803 -> 0 bytes .../android/mipmap-hdpi/ic_launcher_round.png | Bin 1341 -> 0 bytes src/icons/android/mipmap-mdpi/ic_launcher.png | Bin 1269 -> 0 bytes .../mipmap-mdpi/ic_launcher_foreground.png | Bin 1402 -> 0 bytes .../android/mipmap-mdpi/ic_launcher_round.png | Bin 1217 -> 0 bytes .../android/mipmap-xhdpi/ic_launcher.png | Bin 2161 -> 0 bytes .../mipmap-xhdpi/ic_launcher_foreground.png | Bin 2462 -> 0 bytes .../mipmap-xhdpi/ic_launcher_round.png | Bin 1904 -> 0 bytes .../android/mipmap-xxhdpi/ic_launcher.png | Bin 3415 -> 0 bytes .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin 3405 -> 0 bytes .../mipmap-xxhdpi/ic_launcher_round.png | Bin 2745 -> 0 bytes .../android/mipmap-xxxhdpi/ic_launcher.png | Bin 3724 -> 0 bytes .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 4399 -> 0 bytes .../mipmap-xxxhdpi/ic_launcher_round.png | Bin 3479 -> 0 bytes .../android/values/ic_launcher_background.xml | 4 - src/icons/ios/AppIcon-20x20@1x.png | Bin 382 -> 0 bytes src/icons/ios/AppIcon-20x20@2x-1.png | Bin 637 -> 0 bytes src/icons/ios/AppIcon-20x20@2x.png | Bin 637 -> 0 bytes src/icons/ios/AppIcon-20x20@3x.png | Bin 811 -> 0 bytes src/icons/ios/AppIcon-29x29@1x.png | Bin 491 -> 0 bytes src/icons/ios/AppIcon-29x29@2x-1.png | Bin 821 -> 0 bytes src/icons/ios/AppIcon-29x29@2x.png | Bin 821 -> 0 bytes src/icons/ios/AppIcon-29x29@3x.png | Bin 989 -> 0 bytes src/icons/ios/AppIcon-40x40@1x.png | Bin 637 -> 0 bytes src/icons/ios/AppIcon-40x40@2x-1.png | Bin 1019 -> 0 bytes src/icons/ios/AppIcon-40x40@2x.png | Bin 1019 -> 0 bytes src/icons/ios/AppIcon-40x40@3x.png | Bin 1445 -> 0 bytes src/icons/ios/AppIcon-512@2x.png | Bin 11430 -> 0 bytes src/icons/ios/AppIcon-60x60@2x.png | Bin 1445 -> 0 bytes src/icons/ios/AppIcon-60x60@3x.png | Bin 2044 -> 0 bytes src/icons/ios/AppIcon-76x76@1x.png | Bin 952 -> 0 bytes src/icons/ios/AppIcon-76x76@2x.png | Bin 1830 -> 0 bytes src/icons/ios/AppIcon-83.5x83.5@2x.png | Bin 1806 -> 0 bytes src/main.rs | 170 ++--------- src/ui/assets.rs | 29 ++ src/ui/color.rs | 69 ----- src/ui/components/mod.rs | 0 src/ui/mod.rs | 3 +- src/ui/rootview.rs | 141 +++++++++ src/ui/views/home.rs | 129 ++++----- {src/icons => static/appIcons}/128x128.png | Bin {src/icons => static/appIcons}/128x128@2x.png | Bin {src/icons => static/appIcons}/32x32.png | Bin {src/icons => static/appIcons}/64x64.png | Bin .../appIcons}/Square107x107Logo.png | Bin .../appIcons}/Square142x142Logo.png | Bin .../appIcons}/Square150x150Logo.png | Bin .../appIcons}/Square284x284Logo.png | Bin .../appIcons}/Square30x30Logo.png | Bin .../appIcons}/Square310x310Logo.png | Bin .../appIcons}/Square44x44Logo.png | Bin .../appIcons}/Square71x71Logo.png | Bin .../appIcons}/Square89x89Logo.png | Bin {src/icons => static/appIcons}/StoreLogo.png | Bin {src/icons => static/appIcons}/icon.icns | Bin {src/icons => static/appIcons}/icon.ico | Bin {src/icons => static/appIcons}/icon.png | Bin .../in.suyogtandel.picoforge-symbolic.svg | 0 .../in.suyogtandel.picoforge.Devel.svg | 0 .../in.suyogtandel.picoforge.source.svg | 0 .../appIcons}/in.suyogtandel.picoforge.svg | 0 static/icons/a-large-small.svg | 1 + static/icons/arrow-down.svg | 1 + static/icons/arrow-left.svg | 4 + static/icons/arrow-right.svg | 4 + static/icons/arrow-up.svg | 1 + static/icons/asterisk.svg | 1 + static/icons/battery-charging.svg | 16 ++ static/icons/battery-full.svg | 14 + static/icons/battery-low.svg | 18 ++ static/icons/battery-medium.svg | 18 ++ static/icons/battery-warning.svg | 16 ++ static/icons/battery.svg | 18 ++ static/icons/bell.svg | 1 + static/icons/book-open.svg | 14 + static/icons/bot.svg | 14 + static/icons/building-2.svg | 16 ++ static/icons/calendar.svg | 1 + static/icons/case-sensitive.svg | 1 + static/icons/chart-pie.svg | 14 + static/icons/check.svg | 3 + static/icons/chevron-down.svg | 3 + static/icons/chevron-left.svg | 3 + static/icons/chevron-right.svg | 3 + static/icons/chevron-up.svg | 1 + static/icons/chevrons-up-down.svg | 4 + static/icons/circle-check.svg | 1 + static/icons/circle-user.svg | 14 + static/icons/circle-x.svg | 1 + static/icons/close.svg | 1 + static/icons/copy.svg | 1 + static/icons/cpu.svg | 1 + static/icons/dash.svg | 3 + static/icons/delete.svg | 1 + static/icons/ellipsis-vertical.svg | 1 + static/icons/ellipsis.svg | 1 + static/icons/external-link.svg | 14 + static/icons/eye-off.svg | 6 + static/icons/eye.svg | 4 + static/icons/file.svg | 14 + static/icons/folder-closed.svg | 14 + static/icons/folder-open.svg | 14 + static/icons/folder.svg | 14 + static/icons/frame.svg | 22 ++ static/icons/gallery-vertical-end.svg | 18 ++ static/icons/github.svg | 1 + static/icons/globe.svg | 1 + static/icons/hard-drive.svg | 19 ++ static/icons/heart-off.svg | 1 + static/icons/heart.svg | 1 + static/icons/house.svg | 1 + static/icons/inbox.svg | 1 + static/icons/info.svg | 1 + static/icons/inspector.svg | 18 ++ static/icons/key-round.svg | 1 + static/icons/key.svg | 1 + static/icons/layout-dashboard.svg | 24 ++ static/icons/loader-circle.svg | 1 + static/icons/loader.svg | 10 + static/icons/lock-open.svg | 1 + static/icons/lock.svg | 1 + static/icons/map.svg | 14 + static/icons/maximize.svg | 1 + static/icons/memory-stick.svg | 22 ++ static/icons/menu.svg | 1 + static/icons/microchip.svg | 1 + static/icons/minimize.svg | 6 + static/icons/minus.svg | 3 + static/icons/moon.svg | 1 + static/icons/network.svg | 20 ++ static/icons/palette.svg | 1 + static/icons/panel-bottom-open.svg | 1 + static/icons/panel-bottom.svg | 1 + static/icons/panel-left-close.svg | 14 + static/icons/panel-left-open.svg | 1 + static/icons/panel-left.svg | 1 + static/icons/panel-right-close.svg | 14 + static/icons/panel-right-open.svg | 1 + static/icons/panel-right.svg | 1 + static/icons/pause.svg | 1 + static/icons/play.svg | 1 + static/icons/plus.svg | 1 + static/icons/redo-2.svg | 14 + static/icons/redo.svg | 14 + static/icons/refresh-cw.svg | 1 + static/icons/replace.svg | 16 ++ static/icons/resize-corner.svg | 9 + static/icons/save.svg | 1 + static/icons/scroll-text.svg | 1 + static/icons/search.svg | 4 + static/icons/settings-2.svg | 16 ++ static/icons/settings.svg | 1 + static/icons/shield-check.svg | 1 + static/icons/shield.svg | 1 + static/icons/sort-ascending.svg | 15 + static/icons/sort-descending.svg | 15 + static/icons/square-terminal.svg | 19 ++ static/icons/star-fill.svg | 1 + static/icons/star-off.svg | 1 + static/icons/star.svg | 1 + static/icons/sun.svg | 1 + static/icons/tag.svg | 1 + static/icons/terminal.svg | 1 + static/icons/thumbs-down.svg | 1 + static/icons/thumbs-up.svg | 1 + static/icons/trash-2.svg | 1 + static/icons/triangle-alert.svg | 1 + static/icons/undo-2.svg | 14 + static/icons/undo.svg | 14 + static/icons/user.svg | 16 ++ static/icons/window-close.svg | 9 + static/icons/window-maximize.svg | 9 + static/icons/window-minimize.svg | 9 + static/icons/window-restore.svg | 10 + static/in.suyogtandel.picoforge.svg | 270 ------------------ 181 files changed, 1010 insertions(+), 570 deletions(-) delete mode 100644 src/.gitignore delete mode 100644 src/icons/android/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 src/icons/android/mipmap-hdpi/ic_launcher.png delete mode 100644 src/icons/android/mipmap-hdpi/ic_launcher_foreground.png delete mode 100644 src/icons/android/mipmap-hdpi/ic_launcher_round.png delete mode 100644 src/icons/android/mipmap-mdpi/ic_launcher.png delete mode 100644 src/icons/android/mipmap-mdpi/ic_launcher_foreground.png delete mode 100644 src/icons/android/mipmap-mdpi/ic_launcher_round.png delete mode 100644 src/icons/android/mipmap-xhdpi/ic_launcher.png delete mode 100644 src/icons/android/mipmap-xhdpi/ic_launcher_foreground.png delete mode 100644 src/icons/android/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 src/icons/android/mipmap-xxhdpi/ic_launcher.png delete mode 100644 src/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png delete mode 100644 src/icons/android/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 src/icons/android/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 src/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png delete mode 100644 src/icons/android/mipmap-xxxhdpi/ic_launcher_round.png delete mode 100644 src/icons/android/values/ic_launcher_background.xml delete mode 100644 src/icons/ios/AppIcon-20x20@1x.png delete mode 100644 src/icons/ios/AppIcon-20x20@2x-1.png delete mode 100644 src/icons/ios/AppIcon-20x20@2x.png delete mode 100644 src/icons/ios/AppIcon-20x20@3x.png delete mode 100644 src/icons/ios/AppIcon-29x29@1x.png delete mode 100644 src/icons/ios/AppIcon-29x29@2x-1.png delete mode 100644 src/icons/ios/AppIcon-29x29@2x.png delete mode 100644 src/icons/ios/AppIcon-29x29@3x.png delete mode 100644 src/icons/ios/AppIcon-40x40@1x.png delete mode 100644 src/icons/ios/AppIcon-40x40@2x-1.png delete mode 100644 src/icons/ios/AppIcon-40x40@2x.png delete mode 100644 src/icons/ios/AppIcon-40x40@3x.png delete mode 100644 src/icons/ios/AppIcon-512@2x.png delete mode 100644 src/icons/ios/AppIcon-60x60@2x.png delete mode 100644 src/icons/ios/AppIcon-60x60@3x.png delete mode 100644 src/icons/ios/AppIcon-76x76@1x.png delete mode 100644 src/icons/ios/AppIcon-76x76@2x.png delete mode 100644 src/icons/ios/AppIcon-83.5x83.5@2x.png create mode 100644 src/ui/assets.rs delete mode 100644 src/ui/color.rs create mode 100644 src/ui/components/mod.rs create mode 100644 src/ui/rootview.rs rename {src/icons => static/appIcons}/128x128.png (100%) rename {src/icons => static/appIcons}/128x128@2x.png (100%) rename {src/icons => static/appIcons}/32x32.png (100%) rename {src/icons => static/appIcons}/64x64.png (100%) rename {src/icons => static/appIcons}/Square107x107Logo.png (100%) rename {src/icons => static/appIcons}/Square142x142Logo.png (100%) rename {src/icons => static/appIcons}/Square150x150Logo.png (100%) rename {src/icons => static/appIcons}/Square284x284Logo.png (100%) rename {src/icons => static/appIcons}/Square30x30Logo.png (100%) rename {src/icons => static/appIcons}/Square310x310Logo.png (100%) rename {src/icons => static/appIcons}/Square44x44Logo.png (100%) rename {src/icons => static/appIcons}/Square71x71Logo.png (100%) rename {src/icons => static/appIcons}/Square89x89Logo.png (100%) rename {src/icons => static/appIcons}/StoreLogo.png (100%) rename {src/icons => static/appIcons}/icon.icns (100%) rename {src/icons => static/appIcons}/icon.ico (100%) rename {src/icons => static/appIcons}/icon.png (100%) rename {src/icons => static/appIcons}/in.suyogtandel.picoforge-symbolic.svg (100%) rename {src/icons => static/appIcons}/in.suyogtandel.picoforge.Devel.svg (100%) rename {src/icons => static/appIcons}/in.suyogtandel.picoforge.source.svg (100%) rename {src/icons => static/appIcons}/in.suyogtandel.picoforge.svg (100%) create mode 100644 static/icons/a-large-small.svg create mode 100644 static/icons/arrow-down.svg create mode 100644 static/icons/arrow-left.svg create mode 100644 static/icons/arrow-right.svg create mode 100644 static/icons/arrow-up.svg create mode 100644 static/icons/asterisk.svg create mode 100644 static/icons/battery-charging.svg create mode 100644 static/icons/battery-full.svg create mode 100644 static/icons/battery-low.svg create mode 100644 static/icons/battery-medium.svg create mode 100644 static/icons/battery-warning.svg create mode 100644 static/icons/battery.svg create mode 100644 static/icons/bell.svg create mode 100644 static/icons/book-open.svg create mode 100644 static/icons/bot.svg create mode 100644 static/icons/building-2.svg create mode 100644 static/icons/calendar.svg create mode 100644 static/icons/case-sensitive.svg create mode 100644 static/icons/chart-pie.svg create mode 100644 static/icons/check.svg create mode 100644 static/icons/chevron-down.svg create mode 100644 static/icons/chevron-left.svg create mode 100644 static/icons/chevron-right.svg create mode 100644 static/icons/chevron-up.svg create mode 100644 static/icons/chevrons-up-down.svg create mode 100644 static/icons/circle-check.svg create mode 100644 static/icons/circle-user.svg create mode 100644 static/icons/circle-x.svg create mode 100644 static/icons/close.svg create mode 100644 static/icons/copy.svg create mode 100644 static/icons/cpu.svg create mode 100644 static/icons/dash.svg create mode 100644 static/icons/delete.svg create mode 100644 static/icons/ellipsis-vertical.svg create mode 100644 static/icons/ellipsis.svg create mode 100644 static/icons/external-link.svg create mode 100644 static/icons/eye-off.svg create mode 100644 static/icons/eye.svg create mode 100644 static/icons/file.svg create mode 100644 static/icons/folder-closed.svg create mode 100644 static/icons/folder-open.svg create mode 100644 static/icons/folder.svg create mode 100644 static/icons/frame.svg create mode 100644 static/icons/gallery-vertical-end.svg create mode 100644 static/icons/github.svg create mode 100644 static/icons/globe.svg create mode 100644 static/icons/hard-drive.svg create mode 100644 static/icons/heart-off.svg create mode 100644 static/icons/heart.svg create mode 100644 static/icons/house.svg create mode 100644 static/icons/inbox.svg create mode 100644 static/icons/info.svg create mode 100644 static/icons/inspector.svg create mode 100644 static/icons/key-round.svg create mode 100644 static/icons/key.svg create mode 100644 static/icons/layout-dashboard.svg create mode 100644 static/icons/loader-circle.svg create mode 100644 static/icons/loader.svg create mode 100644 static/icons/lock-open.svg create mode 100644 static/icons/lock.svg create mode 100644 static/icons/map.svg create mode 100644 static/icons/maximize.svg create mode 100644 static/icons/memory-stick.svg create mode 100644 static/icons/menu.svg create mode 100644 static/icons/microchip.svg create mode 100644 static/icons/minimize.svg create mode 100644 static/icons/minus.svg create mode 100644 static/icons/moon.svg create mode 100644 static/icons/network.svg create mode 100644 static/icons/palette.svg create mode 100644 static/icons/panel-bottom-open.svg create mode 100644 static/icons/panel-bottom.svg create mode 100644 static/icons/panel-left-close.svg create mode 100644 static/icons/panel-left-open.svg create mode 100644 static/icons/panel-left.svg create mode 100644 static/icons/panel-right-close.svg create mode 100644 static/icons/panel-right-open.svg create mode 100644 static/icons/panel-right.svg create mode 100644 static/icons/pause.svg create mode 100644 static/icons/play.svg create mode 100644 static/icons/plus.svg create mode 100644 static/icons/redo-2.svg create mode 100644 static/icons/redo.svg create mode 100644 static/icons/refresh-cw.svg create mode 100644 static/icons/replace.svg create mode 100644 static/icons/resize-corner.svg create mode 100644 static/icons/save.svg create mode 100644 static/icons/scroll-text.svg create mode 100644 static/icons/search.svg create mode 100644 static/icons/settings-2.svg create mode 100644 static/icons/settings.svg create mode 100644 static/icons/shield-check.svg create mode 100644 static/icons/shield.svg create mode 100644 static/icons/sort-ascending.svg create mode 100644 static/icons/sort-descending.svg create mode 100644 static/icons/square-terminal.svg create mode 100644 static/icons/star-fill.svg create mode 100644 static/icons/star-off.svg create mode 100644 static/icons/star.svg create mode 100644 static/icons/sun.svg create mode 100644 static/icons/tag.svg create mode 100644 static/icons/terminal.svg create mode 100644 static/icons/thumbs-down.svg create mode 100644 static/icons/thumbs-up.svg create mode 100644 static/icons/trash-2.svg create mode 100644 static/icons/triangle-alert.svg create mode 100644 static/icons/undo-2.svg create mode 100644 static/icons/undo.svg create mode 100644 static/icons/user.svg create mode 100644 static/icons/window-close.svg create mode 100644 static/icons/window-maximize.svg create mode 100644 static/icons/window-minimize.svg create mode 100644 static/icons/window-restore.svg delete mode 100644 static/in.suyogtandel.picoforge.svg diff --git a/Cargo.lock b/Cargo.lock index 6ef66ce..be4e9dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4312,6 +4312,7 @@ dependencies = [ "pcsc", "rand 0.9.2", "ring", + "rust-embed", "serde", "serde_cbor_2", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index c33a6f0..bf8285f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,14 +32,16 @@ gpui = "0.2.2" gpui-component = "0.5.0" # Optional, for default bundled assets gpui-component-assets = "0.5.0" +rust-embed = "8.11.0" [profile.dev] incremental = true # Compile your binary in smaller steps. codegen-units = 256 +opt-level = 1 [profile.release] codegen-units = 1 # Allows LLVM to perform better optimization. lto = true # Enables link-time-optimizations however is not stable. opt-level = 3 # Prioritizes speed. Use `z` if you prefer small binary size. -# panic = "abort" # Higher performance by disabling panic handlers. +panic = "abort" # Higher performance by disabling panic handlers. strip = true # Ensures debug symbols are removed. diff --git a/README.md b/README.md index 5bbad6d..9226484 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # PicoForge -PicoForge Logo +PicoForge Logo **An open source commissioning tool for Pico FIDO security keys** diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index fe86d2c..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -# Generated by Cargo -# will have compiled files and executables -/target/ - -# Generated by Tauri -# will have schema files for capabilities auto-completion -/gen/schemas - -# /gpui-docs diff --git a/src/icons/android/mipmap-anydpi-v26/ic_launcher.xml b/src/icons/android/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 2ffbf24..0000000 --- a/src/icons/android/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/icons/android/mipmap-hdpi/ic_launcher.png b/src/icons/android/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 1e789833bc79dd31e9f97d572899d0cf4f6fd5cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1392 zcmeAS@N?(olHy`uVBq!ia0y~yU@!z>4mJh`hT=JnG7Jo?=AJH&Ar-gYMtbK+hl=d| zezr&boW;h;Rx59bEb$PTut`&?!_}Na(M)Hez=C&L7rDwdyq%=`#(`z!ZY~v-h=Xmc z+$v$L8x^gWeDa@V(fRtv>+peH*SYHU6hB^E)}*}MT2*Stzn{DF<7)pd{m%U1*^9`qTZe=4pI(-~8?ukH z)wcTDzS7^l{Py0PIpoBd-*jKUb}z2tFDF?J}4j z9r5S$ZvXw2-_G^+Zx@b<)IFHtlqh|^`oURlA%_`lKEd)_EdLv&EpHbd>%Ts6Uf$H) zTeGt)Rhb2T)f{rXzu&JQRmkb+>}>uh|6f5?5-WN7MVcH1E4RKgeehnto>g>3iQMFi z|CWZ&XGpI!yH($l^&`e^e&Lr#r_wqj9P2b>J?n&K%l4NkAAQIEzvjR7mHL$%kA7i3 zQ7^xdD|`N*DE$)(EHN7%yj;Gn;r;Ih_uo_Fo_&^dk2*2)<;B*UGdfJKsToXTSe;Z-&d`-KmhoBOz@WoCJ2 zZs%ayd+z&JyT+X!)5#Lyv2IerDYQj zd{?uRcyA-P)8Cr#H~_w9k{^g~t#03N=)-Z|itn z6{Ya6eMg^^y`s}8mXNd=%a$4!yR2T(`taH{P2c0K3lvuWsQO>AQF!;cAiL^jmaDBTmxam& zZ7`^xDs^E-QR2ftmKtl%yuAPPwRYP}za;^O%@XoT1)q6~GhUD0@c*jXjw^inVcHu) zS2y#r#ndEn>aDR@Fso6m!SN|i@dQq%D#aDsmI%6fd}dfG*_qtDUTo_+#r4~59r~9Z zGdz34$Lfh)kbv{WJ*jO?Gc%{H|1sis2OEvRsLPTF3j5@|QamvL{HWBx4e3Wq4Ul;Sv zWx?zHZ{M=M{lGBm?7}TfE3-7FGHjQc+fX=1MQsaTC`0+$MX{^pWv2YUQQF$GT=a0g z{le#AKXzm?&p&TbRhU}5Tp?tNXJPT%+uvGGe>R`KKK}2LB~hVryPKpMT^AXK2JCur z<=x$X57izg*z~+UlHWD&=Yy>;_ww1eH%10t45^yI7ILcV4~y-zlU#Es%hH)d7tl}_{peF>4-~*@%QigZyl?AZ9aX42M36Ni#68UGj8s45_&FcCK%}w5vqJ z{n+|?l~Q4IP0zsn8eBpbo*n4qy5-GZ;Ms4hQ0O@4H+P19%x!D-2@@PR6pJ1mX#H}a zQCQSTODlBpG&Nr-^}?Lv_wqLn{N3LFu1MRv*?6)@gPejV z2ZJD^fS`aNgCHX|MwRE0?Ckq;mxbT`p10h$bBlM&PWcO~cHNuz?aqln?9XtV3Iz&64)b6T4OyEzDM$wJo@-t0V97#NF|KG<)~2o|uvUF~rla z=F>8jPZuRhrf|nf&x$?YedhYNgZ$-6$_t&ghHkagVkuQLyI!%^PUgG!Y{8HJ+xk{H z&i?&1ym-ouh&-2dXV+d;vsEgQKmQdJkku{E+`M%zb1hw0qNe-Psc(VOqj!;2J7ltI z-Th?*W3O}O%&A}Vg=t!*FpJ9@yRB7o6%0(6m6#Ni6qFd0m~b&znwD=CEc7>t_VrwT z>CsPX9#-K1;nUle*ciD42o`=<3EFiftJKg}J-~LRPY_qLrKE(8P>9PNTVdh#!YnQ< zE-Vf%4lWE329$#HA&egVP8TPklSif*T`xRZ8r#&|@mu}jiHx5si?+T?&HO0HDC8%4 zL)^r-`W=&2=?i{^NBa`C^vM286H;(_W4ElaBS!h1@YytPxpVrS3uoL9ii=*~eLYWD z!R3xTSL>cL_7OF&3{Lv!DJMT(%)%k~{bl&(`rB!Lt{!G#!kYAc&pG;Y?RjoFIr)iK zPtCHAP0!c7og4eo$E)oW`}Y`erDHwUjO890)fSdjZF%kbDvNy$w_viH+4QN)&6E6D z*JW?++k36G!|?Icbe^eM9&gKHJ2)CT8afy{I67_|-|^^TTB2zD^~^22^%JX0gjU~L zb<3y!M!Rj&>daFYAG@dgyx3)bdZX61r(Z&(gI_MG?@ssN>*YDU_a^%zF&mdR=6mj1r*x||vi6_9&E(YNdt$BqxoN}3i&Nb8YL>shGu>_RPG|ie_x%KB z=Z56E9kF}7m0vyOfkR+W@j8*us*-w@|0GX+>zi+BE4hxt?cmg_Rd09J`!5d)vI&_~ zVyVCUUbVN|c{#@;bxS7S*!+*DU8Z&;e@!^|*Z=eXeUUA6-w}9ln(|$~Z&J4}T~uaU z@Gk!T%IQftYjmcb+7&TP_hpIKsi(|yKfO)m=AP>Jv!T9sWn9-auhaY$Z4F9~?rq3D zUcct`Nj5L99oM$a-Meji?!NPB^K)FE&*EcrN2C^T>PSpuEj#2_&C)1mXmiD%`@-aYxkZGT$S& zKcCj#b~x(pj>R$odL_Othl}P!-|lN^_^}YgFHL*e|C@W$xrw|RU7yBTD(p2lTK@Rl znk&AO*Bs%QT0FJ-<>*Rc~!yM(D7;1)0n4mRWI!py?tNsD}1ez=yuh` zD;G^Mw%l~JJ><+ZotwNXb8=vGL2r=8bPHoj4MA2za=}UQYL5 zXnE+QAQ*h}h>2!{K@5k=qqE)DSI^1__jKM9$fqH`tIBzIgv_3I@)zs+OOAZK6!5N8 z=Eb)&r_TJ;zPjW^@W0!on}n>dg}$50Y-@Pby!hYe*`BfX?&l@e&kJ}O^K{?xYo`BA zDxWS(;Yv5jEIxbV`}LN(zP~Z$MRHMd^&3~-%wF1?R(#52Z?W!W+q7Fb$JGSqN1jX- zDxTS67kuLR^5y;U>)Q0q8#Z+D4mJh`hT=JnG7Jo?ES@foAr-gYM%~Sp2^Fz_ ze(ue=y41;M)3PsZsm)LfXl{~M=vbt|(e>W$hr%!R4h7dE*S|UbT9CglQsCe|PP-SA zr#OkWXf?T9?BZA3=v(&r;jZ1At*yVuo!_~6cFwJm&6}+^FEe$XHgjkByE~tEKY#r1 z+{_yV@-p89JAU)FY-o{4n={F)*UJ1~zUjsvj~0I}D*x(@O+O;)D^q#8SKmJ{ zeO~v`IeP12FO|=q_HT>aojyVSIe+gkuTM@1tTH(k$F0D&`dh;7^ z?o2N6J-@xVu!GrMq4w3xqsRa6*;P`jAfW#8VPkS4d#9iq>#nc2?L6kkoa73d`8Loi z^A@uUW5weKiI4K`Y;nH-Y)`EFE8Fi@)7xI~F&fIoF08Jfxc9bD*c+X&iJV(c&beV< zvO$;Ov&~XdnL4dL$0J@#Wj@ThCo5dIyVFHNnIlZtmB*4x_1TGF4Id}F`LA32-n4kC z*l+jQ-yzW|JKbJIsI&I_)M~BG-QEv2x-BnklH%t0)|zAHY`ufSjAPGnhYf5?^b?D; z^8dITZ&0cd_~oabZx&tf_`3ap&o)Bx)|ST=OLE@qJa8`dI)6}RyVP91^8S5Jg1Y68 zTH0r58hEG9%6q?w`Q|jnuL^12Pv;&!JvYK*{naM7!>#qJOgC?w>C<A&gC|Js0I zMh#o56R+07GZt6=8*)s3vqdGv-{-&|?&S-A1+%W|wK}t8S)$ccW zDg3Pdctl4g+NEF$>&qZ91I;r(0(G`!?~5hMwqI_}PRjpr_`CE;Of3!|sF4$Z3qUqD`r`}d`eY~PMw4Xe3{bbnqT`XSnW!1c|XHWgw zsxMdh{N=*9pU*zIhn!p7D<*hsdO;bJ+~N%m)3R@0OHaQqyHD%i-Ct3Q_uM=c5F)AG zmiJf8`?6oM)Su3Y_M2?}e68LU9d|wXlGApM>E#0JY)j>of8Y6f~)jr8r1aTTfi zdim~U+u1t1Pv)7aWOHO4Xx6K^A#iYhcU7oOl0)9`Q}a0ho{*yjZB;7Ixy*# zuBrR~<;za_cCm$WU)R_Ey=J{y-{xl(Q|I-5?itf}GasvXpt|($#rFAoe!RQ=w=Bs& zPiVVk;ek1J^<__28lR89v*OO2r*po$ACWBZ|KfhFHeJX!{;#Lmu>*e&J$iQZv-rH9 zf36l!ub#2#U4v`(tf;wJ$<=Ngj6MZ#j{DsWx$tB4yw2ZCodr8QzTIV7Cb@X)>D-Xj zU%nUd2b(b&+?{#*>$gQ_8WPFn*Th{OG`8&DzlZ7d{ksfmk~{d5ckfc%(eGsO;fRn- z^;1EE+#tUFS!Bl91D(7539>cpmAM@my z>mKZm7RbOlmx%NNI$(EN1c|~2iM+wTE}-Y z{dU`9e+H`sUYaYeN-ONPTHwL{?fl!PGO8O0Wa-q`swa>h)}{L_4i-)dgoGdy-I zw&lb-PtJMI-@as5Q<5)85PW}ZS#P-0W#u;GxF2_FL|9w`IT$M+nk-0}yq)z4*>$G>nosm6 ze0-Ul=OdWds-u)=HYHnst_@SWzb1zD zY%EOfD&TDGoS@jZ=vvt1gA+7VORj6K-Qqas#RRzkt(CVqGffKPHXQmRsc+Q0abi>G zy?GfffecG0&Hu&ntLQzKUeGDVHrCH+^*4Ge4=FGNPFv?YIbtF2*1P-fM85i9xp8gi z(|fF1vsFIxShbrRwd;(I6<}oCdb7N8r#(mW9%rBTE7qAt&CX=)waLyBX4jVw-u{%K z>2Z7c)LEI=ZltU&Tj1;T_7>k^KA)Q$FVf`d{{-*-_1tai*8&USsH3M<{j0*$qh~#d z^fk8F|518vuHl;_Q@mTI7`~Z)%6CPJX;F}j_Y=>L^OiibUOK@sI&(^6;?%Iyi4tz? zGG0Y9>^D1@T+iBmSo$^R^pwkri&c1K`)@32Fw1$_;NH3+D7NY6zVwxwyC=+T^f~#p zUq2?YF6ZIirPIUi?`iEl;mZEqqI|=eiBGh?$@XUbulstK{kq++w6jyMb6&nMb^Fxs z@pgr)ljTw^W-;?=ovYX^xckdx>G(CgR$d8`ZzS41?UNQYbN4CRJ=v@%CflMQ61J!H krRB#d4VsLPEB^8qz2^I5aL@h%0|Nttr>mdKI;Vst02y{!<^TWy diff --git a/src/icons/android/mipmap-mdpi/ic_launcher_foreground.png b/src/icons/android/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 2c4bbb74577071e45114bb7c8c2c8fed2c5df081..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1402 zcmeAS@N?(olHy`uVBq!ia0y~yV8{Vs4mJh`hW@nhvkVNZj-D=#Ar-gY&h^fh4wY!z zzw?KYpUnM9#|rg$TUe7Oc8Dr$)KCb^5!%?y`cQs?eWO;X;6KO1OxsG13Z*tWcyLIm z2#73F^AcX(`FNvj^)b2gOP}xXjJ~cp*E9W1;a9s!OA9AGPOkSqH?w%VPr`}`f=nFD z0&EIAhZtHIIhqX^5)Y&&zJ67n8Few`gEG-r0l)_x17$=_bKy+2f8>f!WQ&nrwoHTQ|= z_N$9u{40GO?+~W2VTM^)?EU{Xdp?*RG22j8D0%i*qLaY7UvY<`mQ8g^VNSmHU1*u) z+Zvrq_n9*1n5_Ke-l=oIg57w_)tD4_w>u(%YXd-wZ3+8so%%nvQc|J z=2ckVO{`7+TCZI@{piEWPkRify%2o6!*Ii%UN>pgGn+R|KFGQH?MjVA$AnpGGjmVh zX7BS*Ic>BoobBMn#Lg(+!@;v6Y`j`${<%<>RydcuUt9aS+F;R8#*AEeG89JX{M2WC| zv++8Ad(XcVsXE;*r509B{<6aVbovi7$7bD)A#Le&(f{$JtNYR{qUN+_-Mi6E)rzMh@jSahwz(enCs6>b&3;hoZ_ZZw?Nz(%XD(p$$445-+Q6Iz2h)=ck71>h>?E&qv$t_wMVRWF-Fn z$;r=c8@xY!>*YV8@oI{W_=zo5{<*XNs{2iPyDzNYO?k_QW1(H^e7>mQ z=iAxYRZq=%yW@#{e8dbp@8&ey1_Opf0XBn6j&bMi6#SaRcBp1iZnSOoi^}YY{$8Kh z_xIUcU0G+vyXpwzBp)@a{^E19zdtSF{l3BA;L$(#L;l~m;jw&+&EH|O?VQgo8$ zDZgPd;r*eq{!>@yPU?E`i>E*HqVw^4moHqoc8^gulh@^@dWBA<53{tl$&FoI_xroH ztX+L&i;v5nNgr-}l=u`OHBGc;^S>KcUgW)b3I}=r9N~1|r%ERpKV z<%tt#Y&jVHy<^?`H}j5Oi%;AhzHe1W-;S;yzwQc6oL-s3oO$j4kB47^yVbYEG`0J7Fq?+A{^p-9##jlY(yE sII$*FPf<$X*mdKI;Vst0A|>x-T(jq diff --git a/src/icons/android/mipmap-mdpi/ic_launcher_round.png b/src/icons/android/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index d4bb1ade30437e71878ef0e61329ccb09861e5aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1217 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F~DQ>TeqQbqistX!rY*=_+a5bgxeX>CA zh`fj`%hB15v7I*~%hT1Z{|3i~R<5r~=P9f%`&Tui*E+}8xxDoI?^XN0@0}mT&iC`U zCDVrm3=f(>3`F;H~jfDbLk?UT_2C0&u(SBY^z*s3#^3UI~# z`aSF9?lhA)qvrinKmJ?4Z^H+x*%A%>+rooiq|4d0PG_++l8`xCH1F2lwsYK8VeE`) zKRnObf5|csYxut1F7U^KzoKnCLOdbvhrX@%?J#qCpx1aK-E_uQjxARL@_u~y@Y1T| z0PA9(b)r8c&Q5uje>Fb2^@N7xs~>tfe~YC5#r&0hn{apKY1#P?%|1-o&-1nTxZ}3T zcRrd-k~KJ5yY=^{XUCVlSDM*#`cq%a64BdN6_U$t@4j&BR^!~a+iYK$&t05t(st~U z?KS>02U#lh|Kt>BF#OGX^?b?`_O)Tsv!wqYNGm=q_ht6Ei>B6dj`2x0%Ed?8SsS!| zV&gxyx<_k?SKG{aPH$g}Z=TJ4*ZlCB9Sh<)7#>+2ztVAkvYg>DwW-CNQxZcZ7&Zl~ zah6zVtc*$Vl-}pB@L!kB__6kaiSMWGWRRWuJ#Fp}`H)lJZY`Plz9MA&+$8jXtle)rh16NxA1+vYWDX4~3+_;A_?XGS!6d)xsu%x>h0FrSFIjz9 zxK!Y1qr~U`Gs}}UPoG=%^mE)h<1h~`6HA8J$BXY;c&mO8=({mFH1jd@LXDsI-Y{;s zvS5?Y{=)`LS%Q}9m=B3=J2BC-OQb8;<@2e$Y55x>88?JKZaT+tDZ_?|(@OX2noBCh zG3%c+_Io|4b*!s$95M-WBj|T3{%2N4hdYl zme=@v#{;>~Z){86?@&0#md6&b>oDVWM&lqA!8EZ= zY!CKt;_y4PAclXzw&|QZAur?S?&OqI^t~Ek7~NTsE_LalM9#jjPng z*d@H8|L2^Y)>Fot^yt3Tg09lW=9k4Pi+z@^SRvl_Br8nWaP!9lqD(R&vdbT(X)Oux z`xukbnr`#>{qmiYgT*e%_c#T%m2gTkJY@4soiSJ2_=B|SgIhgf3W?_zIEFuX7H(eW zBP1ENlC#zS!Ck#(Nd?oMjkCYqkzq;C{=f0a5jE*#wih>~ie#DPZZ>R7Fqq=}-EDo& zda0c5MPf}7%RbMsE}OAv-mygyl8cXi-#+Vp?XNRGi+U`npgcXV+{?t;g%L zRC7N*oSff(@6O(R`{Z60`U@*Gjy{?#Ww}{*66sDKeS=`O|O- zy=MVO>LPZYP}}BQ{A|1TeV^0+=KIA~ESwN~>egrV>0N9aKEIXEcE7!bd7*q_v9)hz;U2r{_gd&o}SP56)b09U|{fc^>bP0l+XkK*X2z3 diff --git a/src/icons/android/mipmap-xhdpi/ic_launcher.png b/src/icons/android/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index a882ace40e5e2a6b8b53780c78d1a65bd4b6dab5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2161 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^R$EIeHtLn>~)jrGovc9r;- z9$)t6#>&`ROMJC6xZg4^DbjTnRnS{e(3-vQDU-V#JD-Au!bhuu1a5>rDhVCaBMiudn$3x_INchPEeqaVg{4s|9)wyc(<0J`$Ug{bc~sk`~BLF6Bs|G&Ofnz@-}mg zIMIb~cZObnv{9Jt{@kArW^ZOxn<#MMLs`xGS8@{-wo5tf__A5{o{jrI>2=SQn)Dx9 z)Y_!UStmQ#&p-Nm4r|!##a^Z*brl7H{!J;T4SEYoxBH8AT`j3lMYW#sqDS~>we^|FVvATF{ zZdiK%q)}57iwW z(F>Fx&O5s&LwOA-X_2P!>s?<+Rl;MG0UJ# zSa8o4!#4A-^Bl?BPfCBgr`$WQxY4D2?*s`JeGQIHA%Sj5mlL!j+*iGGd^59Q&Fkz# zJU_l%@!e7LQfi9$^auCr)e;let*EIBvCe#z>b39K|6|`j?EO>Ev}ucAUa(8iPaTiA z$Nt*O+{<$oubRF%=Dfq9pT%0XEQ_z1m7d@B_UA9H3}@+w0wrq}SiKL}`^;NtuI$Fp z30tkcAD%C(q&l%A#P!U%TVGXs1YMFPp7RLE-csL?boa=oMYj`_C*&*)E4X^hZfVsK zEop^oU)S~)WEW0yZYtluGS@}u>9MQl%MI4}9Qh@Bsm&l{{vGoLeJ#=Nl&7xazgcU! zqF2`;a~VhQ_4JTB^$B;_%llWG9Nsj2^S>XAuNLnJXgaBVJ?xjt?+wMrHI^JVT9seN zRx+{timBU-^7TJL<;(2s_@cL^EHK&2v0Ll6Vg!qdM+?8t^MfgwZg(E!v0bm3WqSMg zw@F7He@a@IV&urevpROtpPmWjr@l-Sd{&&WN=_wH{qco)IxG8*35kSlQQ2`Xe0yTq zHlAg^)mJi0Ti#xYzrVKf$yb3NTS~1admnta{2Rk8ZGDZKb`?QiWw(7vzQ1!JkJan? z>(QIv&N277G|PO(Y<;IB4aWt$C!D2dO=qxHC*5eJ{2)&JVr{V75H}fY~r4@kNrE#^`_FrUPotKeA0GgfoRH<-8WexOSiIzyG!rgVbJZ` zSMJTWvLoSjme0=lj4L_2r@j*Jx0rsqDfQ~pKb zlr2!I$&-k=p1-EUK=g;(f{BKYd}r6Dw?se4575~#RjByQ*()cO^2nW=ZyeL-bNw-^ z%#`u~10_>rX3R2J`TM83k4C>mSHsof zc$0kwjGy~Ac}u-KS^7~bv1fxp@)92jTbq3^YwOPTuMue8DEaW%Wbsp?F-+mQJ%=>r z@K<$ge{%P3ruN)z?q6i&tdlRCv)OQK<;A#JnjI@|R!VHoSrI72y=k*aX;~a6xbeTofu|?i1CB_=Xo@Uw@U%as;Aej2K~tyu ztLI6Xd}3X4vb=6pQAt-m1{`;eT_Z2%<-U?J#aK*MNjG#O$8DeI5xLJ&pE0RlTsZyV zpW3U-O^lr4g$_LS;^3}WQ^))xRKmr}!Iu5O9Hn|L-X$^-P*kV?6jxN zpI!YcIsdL`x^Y@s@$Y44n$PZy6XkQ$1ZALn>~)z3ZDJohf_# zemDhbcD9+{TSuQ{Vr}kz5C0U zIcA)1x`&0Gh2l-%h(+bG$i!?RcN<5-hDx7TGNWV8}}z3e|cVX z(@d9=6TjYTUHXxpyXbo1uaZEqeW89X^{;OA)*RT=IN#SP{m*al`su%VdpqOLFZ;!m zx!&~Y6aMo)e|E72?oPh%QW9I9^=SXgkb|m5ZOg1Qucw1EWF$IOTwCbl8z2eeCe{`WpKmPk$U%z4)Lf zfit^8TXk!euaB~7-(%KIJw9qn-`#rQxiMtPLC%OxGPN%|D&}c_&2p|{jGceaZGmS+_&vf{bIgM;v);V3rt5NXhQ>PI{y-c3nEo3xd3ujxC#_=ouyJU8bd8Ue+LC>ku*qx=H|Hjr|du{b-mG6<6k4$)74;XZXZC>lP z^4hxJQIgim-QDdOAlpiL$!)y3LJTXXbQ z%WX5c`tr}a;PBd6RsjO1H+`!)wiMS=bLL`S=x^qXD2RxYzgze9m5?~DSBi&czCGxZTxHT6cVA}FN;&0xq1B~V zU-K}Das6)4eO|XmXKMUCnV+_PbM5rfr|%Ou^?dKfU-M$>zwfy$de{G%nf8YI* zmitM98(emm=RcnOyu17J;R|oR&05yH<#YOSKiS%6Tj&12_q~S64U~RSlL8xo} zN&d@`xhGN^8(f3JIMz?n|-$PG#W{;Jd6WV!GdS;%O$v?v{PKR;*8CsrO&- z(1t zzU22N^?UIyd3S&LE1drEY3HJ-wx!dKzCXhe!DN}b^=H`<4fXSLCVsp7EaHCkuaZEv z?o5zo^fnT0m^uA5vbI&< zJ<*@=f7kAfp5cmp@9wO>rYyf9Yw_JsXWhN6J96dtvdzVUmxkrvUwT|X+wp3S0%P=g z)0EuRe(M#*O4h!b)q6GNe)+xq%3uAa-*aB_QtIkft-{&9?}JV zAk!7uf!CL;^PM?mWl*`*?N5pORomA#$!z1Eqrq@ezUr9~1 zn7{7R@9;3Ku)3;9+tm3y7ayD!jh(#9?C^{dnOXVuKQ0&TR@KgGdjI{aO8oNo#y7~)jrGlub`_~J zwtoHNzj~(ELf?hHM_cWu3N!M3Il#-=X&hs5k$Z)VcIXzTRYzD|EE`&mG|tx+dUS%3 zPxR>(IW0bqr%utoCYuz_xv}wkeno!H@=j@K^~l@1zg1t1MK;H?d3Ny~%q{4tKES?z&VD1ku3vw?e&*iz ziZPzm{#9Z2+V>~7yXY|dDEVn!AJg8$zx@72CGG?1Pv4vRbj;D*r>n&3ka6nzM?>pF z42~|oKMx(M_vFjS;xfsIcjsaeT$<>v!TE0&cimm-j(=;HFllEue``9y|fLLFDUX^-}ohL>{;>XY~_aT&VY6+*%t}xCl{Nn;8^Q;OKeSCeACj? z0SVtuJ3YjE)Fjq!(0^{NVRa%#0YyI#6AO=YR( z&G=V4rVH6lo|pUTz^*NQZTFQIKS~KqUbFsMVa>Od-u9DNu4Q4>szz8yUf528o7fx%Ci^~B&`{aq`kgo8?~?Rt{1bY_*3PF8J}ECGh|CX zGEX>nOkPV{q9Nd9P{1~(>%|M>%6FL;F4CQ1ka}3{wwf5jr@Y$x?J;`XpZ(=uzhceT z%~xh9=@)2X-y?{CwqQq z#q~|I7+gUxo^Zx+cuJUA!%PzXyno7>}(^I^tUo}3itP`R_^ z^o%ftg;&%3m5TI=HMoDKr~AYPc8adhD70*pc6c{4^Mt+m=K#kg?|WE&_iN?+*~iz* z5@mDZ|72sgy$5Hky76l2rUOT>76kXTTsmz$q4uRlN7jbS3}FY6H4Cj4xk#>DA((Z` zS=Cg%@tNwGUz4KD91eecFu%I{!;MBE9sTfxvTYfsbo8brR$1|XpBDBYBU4OdTB&)= zhF2>}ZaQA$oY(R@*>t-`S59>?r|{OQMd}({*WRg4S)To6=1!HU?;gL-re(Z15@Y>! z7n_ee|F+pBL4piT;%U73%X{t}>j=8{W<@#!n|{jW$w!UN%L|IbZJu`W@>Xz2O__he zY74VyyhaMo$7w#kiud1d-%)@2&$9C?d`_z-FdSN@C6w{>%(L!e<{$319~b@E$ZuBL zR>%~2`ND-e%!g#lCUki`nS4PYG$J<6So*8nO%}I%CQN}IPknCkzL6E{xp-|eeb2)D3%AeReYb4mJE;aKxj9$vY_|UM?(P!JJ#o83++EB$77JfGdm#Bx z{QkniMhi)eRo#*C_AQ{=#3g zS?eZBe~1*^?S6CHvPY{F-u~jPo2vMo0a`XmAQ;m&Jh4Aq&UE*ZP;x&50|SGntDnm{ Hr-UW|I(2R2 diff --git a/src/icons/android/mipmap-xxhdpi/ic_launcher.png b/src/icons/android/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 52f298d58d2db67200ed7a11667f155ab83cbc04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3415 zcmeAS@N?(olHy`uVBq!ia0y~yV3+{H9Bd2>4A0#j?OXbZ`R!m&XEo5-4wXM}! zICjPhr$vrJLd^#)Sf-xS;5lq^x&P(MaNB*)zs~s`dNrgxV^`I#{Z;?|dtNm4tqr~U z{m;JQ_qN~f6w5X(U_Rj}?7+am&6~K*}Ts)ZpZN3IQX60s$_3ce?xY@UGej`^Y^@N zj{o!S`n%ZvYyG$Tc$@ef3q@XYrayXn-{$9=?)874PM!Y$^PQdb=C|SsZ@+G2UBP+& zj=J50d4E4YzOQ%dsC)JuF}{{+;=5^TS%c>yxZFAFJ>spVzK@ zBFeSD>eXfY8V`k}XpL>HawhyL%wK*y|M-62`~1*(5A1c)3Q{(tAHFrSNkrWyX#%JB zx|l!roWF_B%ekf0-M`sr*0S09HUAIK-+OxV9rxxakA~&hn+
      2hT;7T%t}_y5E5 zcXhXA+(=2Vnb0uvPmulh6IZ8p``@1TeDXERi0!lIdHgICc+%%L|Ie}OSJUezP8Hw8 z_rF@Z(P-zxFNWv)uiGus`Di00_yNiq-w^Bj=(IBT*M4sA*x5z8-oD>F z8*;zc?Y_7>Vp{2(+=i?VK9eSeT)w&`o% zZH+gQKI}5^<*Wa=sc2Wt_e^281v`W;KKnDPGH-fJ@|nEq0~y*&bpP?`R+MZHlV4xD zFmcM1qhidKY>(d0|C01!u})ue2$S%=>0u@xN-7nWJYD?rp63l|x2qj{3fI3DFn7D; zIW1X1`*-z%-^u)u>8saY*G%cSl;`|CNosD>o|nOYv!>b#t-tpr#bo|k-Z_cB>x7uQ z4t~qoXCjzgf7ko*)@t52XLNKtd(_`tjA@#1scM0=|J$ukoVI4oHM?f^{r=I9zx{ps zg7;0heR%VVcjpus0?L~zl1gSPZ@uc(doAqx$-=wm6qDo@X{b$KuQ`odr1j!%=S35R zZMRG~8FGD7Zr_bExdM?0oz)k0GgYoCPnD4T2g-nl&CW161jy%PGJ>)uI4|-nViaI$ zc;NM*jv?UpCYNH_Z2RnaZ?7{h5NuQLQtEni;)y`%to6!wPM8+GUE$oK*CYHb>#Nk& zth(d7)qN(-^6Ch9mQli(RW*O*OHIGiA5MHfT>EtL(;~fI|DN7G;)f(Udh1JGo!GkM z`?=F617(hXaCmX(M8(9{t^5p*42;lXfuRZP6mTg4Dli&;ImE1))qof%DBoYQkQR@(3Vb8kI+isjx_e=oC}i+xzockL95)Jn5y z|9pbRlx#6)Ul&+`R1H*8d-8sQW5xwqz~) z^n&H^6DEZfoAchBxRS!vop*&})7pt`>M*713Nf*L}X0b~I#y{?zVclS8&=scC4G&Q}fCA*|G>&cXEAs&QSw z8Oa$>YM1yFES&Iu!3zrpsXp12JQqGa66KQYxHi%BydYqg&gG|qTZ62QS?%Cs;7#PcH<#_bNW<%0evAto->lwMcj8Xo{p1E|v? zTl2U%Pxtz>!}a&~=6Fl(3%vf<@%^zCmVfk)v+sQJc46xY$z$uhd!CBKuKHnG^mAwK z?w22@zc)~xtXZja)$&T|oG*tB6{@F;R!XM3#uTqOl)1j_qGxuXCW8sX9}Q;jI-B$C z%iKerFn3R`a>}1mfB8uLE#_lPQR}8GzEp9sqPtc$;)MRXoRE|2f86#Kc+{xWAy@qD@Dn?L>=o!<3rkFCm-bNh1mc>aF=V{`44f}E@M4}J6DlBu*4pJXR4 z@UeL5)ookXhJA{7{2=bGhstF!`}IdlZa2SQES!FBLg?kSPaZr=kKmbM{A`xO(wgaU zb7T1%_=F164ol_-KWNnXzjD>x*(ajHI)#tixzV6#Dx~}_ZOONVEL^IkTSHFGe!Y6? zE>5Xa74EwnXR|-AJp2AQbLsjwAJbKxd|vOJ-G1Zfz9|Q~+r{QB^j{@@Sn~1Ard7Rn zMb^&Wb9hnVygeo9uU|)RIdWRWPCq#3!;Q4W#GP9&?Ao)(ZS`vDWs_cCx)l03>a@(s zIs4l4-dxMrXFk*Y_H*G!4$cB0A-CHVvVM!)TeCuam!RDwrdik1!d{lmEBSiYCcn2l z*8J81vpc!lbn17ZZ&57|7*R#!$YI_msSNYD3={HW?b-EhWV{cr@N7;F85+_Xlt2lb`>{M6i2OfUt#BX~U9t{&Uuqi(1@| zG;M0#{WZu;eA20>H;p%%dtE#HC2FbLuRq@DQ_OdDzhsVE?NzbX`)HlJrtI3Udfyxb z*YAq1dR}GAAT@Vi_ve;1x4A=NS6+Uk&3$Zh35!7Ws+qgfH0yUASiON$FiRz^wEy+L zIQhxzr$4{d&VR>Yx!tj?^^eZQOxRS}uC+WXOO8;M*U-j(krfsvY&wLtmm;d#Yi!m2Z zy<4_z68Guw!>!t{=NP})_Vj{7r1!0;TYny%3XO`nZ6NBxwvM~_Ms42J+Nz(2RQ=-k zPi_pDuqnFw|I)Qf&z|4=(=607^!m0n2bn$IG4(%I>6VWEaw$4L@PM__6aHXjX~UO( z{5rWhxw^S^mC2K1?wy~%^n3ZH{n8@3;o4umUuE5u`bNWdXHAU5<30wDcJp^r+)sGx zg&&gIyK!gMtveM;whtOz?%rvhdc-7t;*!#TzDKNOgu1)>CaW!XX8-gh^qf$K?mQ{0 zn00FE$Bm9Gi~Z`rF60~7sF7LMa@AuSXX%;fKIdDj+(cAAIJFlxe-e_NTKT)AbNA{w zx9WnWqk*`sAa{^|cq}v_A+rPI@DjbiG36#m3u3ty^|(*?YqwN73wLlGL1&IzE;! zrAohE?bg5Hnjh!hd3=BG1N~iQ>fKAuE`58H?X8(4N5hZP+#k;!v)79$(EexaRg|&F zr7F!~%HI+@qujH(db#>$0?{Tpm)<%Ruzz&gb}2BYqUymN;r^#xuiQNstQ32>Ky2dH z(9V#i9gi03KAq~_r&nNr+{!VIv*JYU+Xo3weJ;{duA{&Ffe$!`njxgN@xNA$ZU#p diff --git a/src/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png b/src/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index a445a166de329c6381a05dd62145ab071d1b5061..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3405 zcmeAS@N?(olHy`uVBq!ia0y~yU~~at4mJh`hWJ~)y_?%3^F8*! z$NOjO?#w+u{qs$~4UbIHLnWl5v4J6fLWN+sQ=qC!()4XXfiCAeh1s9W)$~{YHaUDIZqmHRD%-N}zrFMB z`C^OdM_&JU|NmUgdwc8M#$Oo{7UXd;un0N`Fj7twzW7)4HoxBR{N~A#^X7apaWY-v zX*XZx<)8OwY98PIUHIo@o#czpr~j8|tj(=aJw0i;@~7pwRRKTu?3uId=jq7$U-ReB z{{4#AagV=ZPs!ui6OZqF6wiP2M8f@@f}TZ+o0#=OY^R%Rboxv zx0&`rM|MYv{=0k9tvJ8&9LfH%R@H9llve2WM6furDTQt`EH9$ZiX_8pK;R1a$9Fq z&*lwSX~tvNQR~Q}b(L+q0E2+bf?1O$H*pwD;8tpIPGfLn5pZE}OnJX`-8%RESB(X~ zJLayE3+|UO5p1gXzcyz}-&r}E2a-3|{@lAqApHNwuP=1+X7>DEQJG>S_w!bI^0()G zvwC7Lz5UAHcUL{s%-VK4_YGC=`<3edzOUb}-nM(eoXbUdr!CXUzigTzv0Gu=t-bR< zUAbTX_iS9u-}dXiNA$Fx@0gQame_hj{;;Uh?vfRM?y|0ze0S7*UQ*xbooaj9JW97t zmrUn)J!c?QS-{JWplM+qN6s=Vyf(wKZ@2dS5zvTIC`E zm$LZfch{!yl)G(|QMO27+u)S4J|}NmkD#_o$HAvFtB!RjFmWg~AQK853{4yq5GO1= zE?<$5Jezx4q~QBT&!pPq#hV^$9}nvjTqAH(*gP!HMfa?-=j)5_Qzt$@EbAZiWqp{x z^7*QxH^LqrS>9JUNx-G-{=>t?hL)Csf7i%Iu9uHqoA>4SVcn#)(~dj|Q9h;ov?%AP zgrmSs;pO((~B>^b6LGL^iOfxB>@*V<2HAB8=0+9Z@2Z&oinH7uwz<&V@XyD`voB`+i0cQyEtjjlu|%<>XW30>w}~n(e(T5I`up#`lTM_T zeiH?Q@7-N@`CZ+a-Z@f*KVIC)l@GTnd$jOWZ}#)Y4gx#ZmI+Q?d+nP0znHrA{?)H` z6#47JW9!alWp{qpX|-Qg=Vs2jbMf&it95hxnH`^OnM$~ zO@r%ymIMVGM17LUO;K(Y;WZ+|)KCU8?|sp+}2;$uKU7n{rT4|w~Nk>f1b#x9W|f)a>dmw z!%~Ibm5*k7+n?^Ty!+?H&SQ$kS3kd8ZkH`|#x$&BN}61qLfxuu{oB4@p#R^htEclcpKqI!yhh-r zx}5#@pD$`EwYSynkgBxqK6x(YjM#Ury8lm3*{*e(eDan1>+a=AdiH|ft9CcNovd~A zz(_i~Cww|7rAlQ%Qn`uEw>PreWD z=DlAwKilM0;QISDCuiKYUH8ZK)cx$`osX8d&sw&(=ER`Sj_Quf4gsxo|uG{XcR0ZrkP+7OFg}n%{N%l+63QG()sJ4yzOHS(EjwSoqDjEz+p*^P_GS@^ z=g!Hkx^v@{;nZa9;~Wo7UA`S+_O}!1bu-S|niey&-gr~Zj_J3x>VKb~QHUj}>zz7vtKxc|bhdbF_RTY@KkZQGa7=l>BzWtNZ>@elXRa*% zw>a&{sR`y!oX=*=Uw8b~OTUj+0cV9<6gGW7#bI0ZEB*0Bt)8Qo8=+GfQiA^xqXc{WVFKVTF%yo79p2g)`L_IQdFs33M+ltn9iQ#=sL5V3xRM zefy93>-Q&mGiY6GTFCyfw^h2ZHudf`hU7Il4mX*?&*;@W|EhiQt@UG`$1Co9Kh4$> z&9UeEEyvx$>%&r<8uo_1`<=?nQuusQWv=bN*RP_t@kuB@wTplE`=MI!_NwHcZZZ4H z&W151FSv94bgf;@w4aY-V`Dr0CLI;#m+h~5wXDG)t141#ee8a*>*3cA<$An7a4AeX z?(cr{fC* z6z6^DtHAroU+c{G?cXJ_w@!}zlG_Op7<>BhoMc`b6fqIGOLTPz9;Rx z-FJ44b;pAT?zWub9e3A;CT|z^Uc1&&=Cu6XPuc#0i5iAF&O!clGW#7FF4t~UD&b~i zaAf(`S?S1f!;VATrQxG(ieLM79kx|9lhpQ`lsT?(jrnwidHb5FmmbO*@xPTlcfbDG zdOcC~r*~&d-uNjtZ|WxAR9=^x zO^(9H{(OoT&*5}<_~%AE|Hn(=`Y{@D9$URyBwkO}4DS-#Bcdk|&7W;pdyInwIf0^~)7h8Yp|2h5AzGhoj{j^i})~=kh z;gRz_|4MJZo^#RJr)qbtGF+0PbrS&<=-{nG2>eLb`6livS-{dm8B&-{Nn zzc1aq{_ly8{pmdKI;Vst0J1JCfB*mh diff --git a/src/icons/android/mipmap-xxhdpi/ic_launcher_round.png b/src/icons/android/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 63c37e15668b57232f9bd7928babcd9b2880946a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2745 zcmeAS@N?(olHy`uVBq!ia0y~yV3+{H9Bd2>4A0#j?OQ(R&^5u~(Lzz~McN;CtOy7^qV1|6 z;QyiP!Y3vn4+rtaFm8^idF7jLK5MVpt6gKkHPpAFKGK+0LI+ z{Lb?Eylg?1xlUsDm^c_5891061Q?nW7+4q;z}zMV0hR^`7c2wfp7Zj4%Cx}FaqZkT z{)V;}U*GB1bJ)0D4&N02qey0*^O1*2c{%@Gm^x2>`Fd))%PPiS_ukEBG_aVvZ`&tV zQ}Vf{Js8U zMar!d1!2jEZkH%I#S`mGSJtj~bX0$^{PW2$56zQXe2etNPH3e)ZS~XGf*XPenk-rpgW?Sz1^vHP1{!LDa$FI-#=W;oz6|+iOtR>|C zbF-c0(o@!2h(lXLFAUq~y!qZ+9Q&^C zw}#y8WSuX!ru^U0YY~6vhn!Eq3B5Df)isyh_V_DBZCrW1@9Ty2lD)=X_s+FtJMr1n z=kqo5d;dPh3oy$Hv-fU(^=Y@=&wcieb5u@l(%EEmts|3Fx$xup5XM<*SC^NjF1{hx ztn0Y@?$Wd6@?RcI6yA_^VJCO?l&21n$D`HP2t1!R*=m80=JfAbdB$Q4E4w2df?X3O zCcQ4xI2`8ExARJP*tzdkA}uo41E$@a;PRr=Z+go%mt!uSZnEqfMTK25R{3uaSjG%W z8KC%wqzrI!fTRqDz&+YYTTUGI)hN_m+pQGZ$lsLk|M5iY(CVqxU!yctbpo{B_I2E{ zj9SZ9Iq$4*>Ol!HSJTNe|Lp4fC+Wn&FvU#s^~C5?7nh!%o{_)2EP?&Oia75}ML+la zldRQdYY56{U3Haf?fP)_jMp7HGpY`>E{!-n+to6z1?7we9_>-C9b(&rXRC=b?}+$HL_W74ztj2U5Oagt%zXUQii98eg6Eb*^B{BVL_`{ z7J5Z$ZC-Oq=+%WOb~5U3O-wD>mps3`dhrVTO>)MzdCvl4 z`6ZX}nM&!#-V1Oz)T+8iQ71b+<8kNby|bpRjJ?#_Tl&}Za@U>P1|7fd$H%VU@U@d` z)vNT-RjE;Nnwi{FPe!erEk4Ccd|8aI-uo98%j!2Tey%S6ZjHjmn`d1&7JaF@eQr|0 zqR+=JMO@l&De8t*$-e6|(hu@(+t!y>%5uw6Y}F^t$AzblD4tN!3HY;{%~Sqot%17n z`W;K^c~8YkMHbiZrdL$x*kdB6V^n{_Q#%RX@7+q1HE;#+M?Jl7Z5zfEiZrmST7>;0?S zV(R&?RsR_1630_x1aHzwS*-dHUp`ZSr%ykj%9K z%Xpl_{vFU_o}#$^X7ACP9~oX0<~1L@@#DwjEoUU3KB#M7^HwN#$GeH|xiywdI&rc1 zoGRDZx+O;EG*`dTtMs1n_YK$8C8z&>b&q`*r02fWYvQWs`oaJHo)#(jbL8sjHA{Hs zPTzMWZ_S@OQmuC36O)o*;S z^(0xS^Wsd_U%ze6FK_4nZelYnbkW?oR_ym=wZuMKnFXB}O%W|~_gy!8>khH9i|Z!o z=KMAOa?Gjn&$=)twONz)7j9s8{xX5NQl;|A=YUs?Ldvyk^UrJ%7qZyM4yo8S=Gj=k zT6Uz-%Z8=l#g1RoY=m4^&vdZjZ|Pmh(9xG`Asln~lpNQLtDoXTeHZ7s?r~?xSfF8e zW8;opyViWR`x|rVRaWP(=gqRQ#~zI(*OI@GH^a(8DvXYqv8j2+?{l`~D-}ratLNB}2C-OVp-qt<_(3 zFZnN-p&zrO^@hp&site~GcOBp zTYd>+Ot4am6z5Lfe%>ojDB9(8@{4NKN6Zt#vrVJ(wtKe9=*C>GSijk)oZD~n4Ef~4 zx8GIh#yOmb$kq9C@alBCnH$d>z4Jg@tw!hGGUm);zSrMw&o1B7cDw8DxhqoT9~Xv* zyuayj+s5S%zqoyV?zs7}mc>sj~84`u_dj5H^k2<4$V-75|s#PtUXY zIVoa>%cJP6>|gAbySQra&hJdD<$!L0; zan{DP2#s^aMJ1Z)uj=b-zls|6*XjmeR{!@!_9l~qF>8h=x1(J~q_SgOjow!4?Gr#s(Xv8APjIa-9QctKUcwPH#eSP*x zJ>3Jk^QA1(?kwXz!?tMlbpi3YV)Mk;bzAf;pE1+!&+*s!49zFMTz|fPuf+AAYR1ze z&m=B?)4}y>o&0x3O97V~QyK9z3_*8t*cll3f<0XvLn>~)og3Yg5-Qqu zedpD^t6u(ga6a!KkXCZRFyR7=X+}kmu$+qFrv;x>;^G`?X3Ws&JjblOZ^nvF&a9qe zEW(u!e1)BAW>s)9&J;{ylh8A^jlFw0_G+p1_P0^LLrTNV?|xfaWmEdtl>3>*y9MGX-f+TLq|0ZR4LlaUZ$4 z+x-6jRp+0+T+81i>+9sUOt-h}5{(bqeI?sM)=c>yy8ha^c{`tPysx`=tHhU_`B98t zq8dAsFF#)X|J&o`#ZT{CkJ>sd=KJqs>KyfxhGZ{Io>{^`oP?e(S4lJ8g6{5*R! zyYM@UTaV%XlZ6Qug{MoteX&1hH+l7w{dd-Fwb9O=U2|IJ$61eWERGjGI&a&0c-z0f zGk4FgNcs8psNZ?y7^-Sg+CDwhZ6 z*M9%_a{auwKb>rtr~X)Gb+wb-&M17ARK3q3xtSjuKQC91OOozhd-PdS^+(2?GS@{i z*YJJ6d`y1dyWjuLNB%x&u+FpLwby}r={L9ieX+ee{+DY_aHwIT<+h8fO!p_uN?UWE z`AD1QHgS1@c#pXZF3ihP=Y-67tl)r`cov_4X)07c9qdq!Ddmd z;?$D`T9Id`a_v5Qt-yctghZ*6nL#3(9EB5A4sSehE^=Zq@8|HRBC{8~41Uq>{6CiS z@&|oe+M=f21Xf;IS-_#Y|s2URm*mqteyosaNN+G_``@ z%q^213Tpu^kGvG*gVSdOx{cd|m{OaJo^kqc|QPUZ0UvWRta%-O_DxyiA*74+Eo0zLW_E z6Hk+3!r0Rxi*KZ63p7X}6<1_mYv4i*K576(khhLARg+qqSa zL9#3py5t<@+&}q&&){_2|CGXie#ei_W8g^GQq55K&qvMqv2gMp?lVc(!|$FqJMr0O zRoL`I4vvH?)l!)sEB~+Gxv|%0k^D>1CF%#}C2%C9I4i9DaUpZ}p6)Zx@6RnwZ$IzM zpef1XuDj>x$Njm{yS8-IY-n-Vv{h)WJ&VC6TZbn<)Yh)MRysLeYr4lv$Mp*jFY4iI zyddqspnQw@OIPMpFV?7t6_={t$1KeI?4Kxb>CZ;XO)}hE4GeC(7li3eU%GRrvdF65 zD5q7{b^(f@usmqhP_a+s@U0qIvj&EstI`kTz!B-u&IXR;OA8rU7#KjvprrXh#;c&* zsJnOH-TG&KRO0p=KH*qqfdd!TJPH$^mXW)5Wq9t^2i=U(M&+rRmHr*y8o>G?*anV~H~K*#PxWwu>`c>2#&t2cFngT|e?u)zi;T`_#k(9I{LjY^59W!;hV^ zn(n^+l-m{VDLmq4xC`g*y^U4j^s8z*x$@(8uy=TxnEj%cC46ou-<@53@O_)@U*>yn*D-P= zWQZM7YBwp{TXtdd(QnodTuWFO7hGo&aL}5&(mH}o;J^c6o0w%wuD*Nm^30lv_lq+M zZxny2F3tEEGkv+wQ|sA(?uu41b0i3`-blH4s;Jj|&H9VHpC7-8IruxQV!QMCOBzx7 z1*R_)Z|>&Sl9IT+r+mk;*{{2=zxs35mxoQE;b4;dyaJWwFD5*%4$%@@d2;Qm-P84g z_ijJ5x~#nB(5e)4(o&KpaPdD%uiysH)>xV-+sLI0qA z6E1frf3hiUC~V&ozWL&%hiBsF{a(FJU}LPm!rtDiW+&E{oZ!!$wfnus-J<)3ML&0+ zzR#f0z}zn1D1G6^Md=q$7MD-1-sm{@s+nlm@|_8}>Cx#uMj|}BbnX2wWwhUsTHVa@ zNNbjxto-_d*Zy0+tnGg-cK1eN&4jaQm8QE~Zho}6`=?PzG+$@p^)HKBEf^SOB3Rxy z#2sGz$M;Rh_OKnUrZ3Z0-rw2n{(FDSh3=)9dqx( zvY$UA|5mTPcA@#&&6^tg(-R-gk_!pfa-B7AU!z`Zl*09|U*88$POb{bF4`OL_vehO zmLWcOnqF(pT45Sq%N>02ef09c#o4px3)@ck+$`5HY43!zoJfDOZyTQNG5p@oCJ!o@ zAjK1eTrlx=e4C{_M}u3v~h=xWcM6!yvkQPnVCZ& zF;voOE#FfkN!fiK9-HU)ezINoh3(8)x7qiXx4eDZl5@c&M`c=ZUAWYq^cnv@JKuBB zufCl6e%-yqJ-?mjX|JDn{Z#dpJz-n+i!(X!Pv|iAv&`RL@?U4`xvejk7OxLb-2Oiz z?ikP6ve|yMkMy)^v)Y`5pD%Y}=$!f2@T6VjB0hJAdB+0s(SJn31!MlH>ZNyDj!=z)-lICWLg)#^TnDe{En9I zOXjZ9G!wtw&A+5b(I@G#+W9Ga&a|dE$Npnp7%! z`kz@Lo-;MBF$(VZCoG?oym9M|n4J8hd)N>4Sx3hG`@&}3o>Tk! zf_%WE>pPcBNzwk0d2sFJsbO>P#jY(qJx9u;^@S+|UwOB7-0ZAVi_M#*M0dp+wyTzxkOi*#YVd&4X<4?ghIo>B9 zd_V2H`F#iP$I8AN{7x42k54s((jjnBz^=(hiLncL6uzm~kc%0h{ICukbgSzU18G zwn32Z=$>#6nMZq8*wk!XyUp-+RL(lt3AGM2id%OVo$bkOTem))ao>+${PL&HgzVeD zYs0sNX5v$`%AK-4UR+YgAgdxc`}X#lYnQqcEcM=*nnhP#-5XW?slUAD{mr%8{J(B1 z$z5$$v^Am@BW@u{(gO(iT!=97tOim7J@&toKH;ii`tzZvF+hAqid~uT%T*Z zbDf|6`;@VMOy$F^ufk?8)^iqN_X@w^t=PHFa@x6hs;yHlw6Ohs^q}#R+0_;k)o1<2 zZzSIxQkmT!%&xrEB!}lN*K*d~3?j#vz%49D5k?*I!T+=MjQZ?f_iuZuyNiK=fx*+& K&t;ucLK6VqudrzV diff --git a/src/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/src/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 4f9ea5320cd94225d8c1064ab2e01e96fc75b60b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4399 zcmeAS@N?(olHy`uVBq!ia0y~yVB7%09Bd2>3@7{yv=|r!zInPhhE&{odpEi#=6mdc zkN4-yoV#~@x$N!E$6GoxFST$S^=m!i8v0tn)Mi1~6V8m*S>hEgUzJ^zG_zK+@D~a` zVvI|2)%`FTTY(MTed0t{o6S|YnEKh znL9V@-2XX$>z~iDOkXC(5a3|y%+S!l2tf)73=qU2!2m~0Yz$xoQPR-B2vGtdajQaB zh^}gz>%Wwb?eXu*c2CYU@4F?^pya7lxGQMonZM_LT>rN+{`i7R`rN-Bz0scRS^6`4 zbA)X7AF+=U>=_rR_@!_D`BEoq`K5C&?#s-tD)T$wCAe;Sf2w}yzKO1{EpJ;~P~WYl z?|RF&vgVb!KWBvE;jf3&7frI8|M$fQg$w(u)9yaGeSG=8Z>t(am168Iq^7>>zS(~~ zXE%fG@bv3VEFF(B{z;opz)BnxSH&^UcjAJmjoOZrQdC4S>s#+*fYpK>nhRjd>FQ1a85PnPM3*dBSasvRE7uZzDCcy!79 zD7V74XMZ<*e;!et@NFN%o7S7mo4>Or=&#wpxH=`ilc{0nHV?+vb1PqPYcOs*>@0s~ zC(|~|UB`2R8J^vdzS_0X`}W^Wyj%z7MDJ<%d4-puI8Wq_z@zTX`tqA~8D~^;|B#Eg zy7Du_vwKQxYaV}4Y}jeu^-B(%Ou(swfr$+@fqZy5?cU7ppWBxuKi#X^9O$6T-*a@H z`nRJul@bgdyTmyx zc;}<9kDtejub1c4Ymynk~t@g)HY;Bo-%<8peYu1%=5m4aI`<6UNhMa92=m*48uG43Mf#Khnk#0p#wLILxRLGWME?3ee8gP?y+OXl{~dx z*ZIsUORlU`4U1mQCcwyCrWW`6+x=qqepxB0p4ZpYU3>OTmSDP3`E%a&yAty9rX4q! znadtbeZs~kea~xeoOuU_#0KVFZ44|tTq`CoV`F6D;o8AG?G`IDW3$pK2_^vpNb0y@ zv~scohqw{5bwcje+VK8-vnVz}M&@nzr)pncw6`o>@O82>+fajer%TiYh!LKzxn3d%RX=K z3QxY7YrW>XB`+`k(Sy$HW_$jy^WU9qTXuo18NJpMFrPPd`$PMN##_7OrvJaU?Qh_^ z&z8J=e0MH>QujQ1tf}E(UeROCr>{-T>~8ITt5*JN&bySKjzne71xJLO50qt=2RA3k zHa7&?tSvdKFeOGgSCWOL=ToHL?2X&5nF**)U4PqcSC)c+!Ks&fKTqdrD&=N!`)D$I z?Tme9!guqoCrokKr}w#Z*7|4x1FyALV|te^b^8{qx+-*bLg3#0@3i)o&RieNvHap? z{q?ts7cX9HXk#SOJ2h?18k0@G-PY)sSAXwyyX^3m>F{Can^sbN6EE_=+kCtIbxva9 z$$KW>4ruJJw%dPSA>z0~g2?%Y$@7glRKLFnmpA8VaqgIM?yvoC2N{bZgIVcf(boI_ zZp+s4xzDRv^WkyD{e!jt-`_7YN?=~hytkD5p@33qsQl{V`hS0hCx6;l&Ew|zsHwTg$2H*Nd(_w8)#i|74~nLn%JcfXy~Vg4S;8kU}all*I}jeh?9>ZE!6 zvv>WM(`H)eDXdxcVqSStVd2wh|8q60b8Y?~>El0p?%uD|Rmg8MPMt%7%@&YC-Ody=4m#_rYOX^^u2D0g^r?$+2@Pft!)jaL&e z(AatLe9!SiHOjlUt^RR6xv^!lz``edc7GGL#P7SdyPz^*f!yOI1{u$kqHXWM%}1C_LI6UNUXl zw(HuaSqx|P25#Y=x&Dl9>^4nM!)ZIa+2##K>A_3}-^KJ2rl*Us@*KD$-TFu8Nb$a0 zu>*6Wk2J*2irnDJIHR~*e8c8%2N=%mbmh5`v{-a{x_E9VL$uEP?9Z0r2h1*7i?6@A ziQ&vvR-PM6UqZ<$>Y`gUO{hZ#d+tvrN-_ZFvXV&?(uE9GRbhm~*?)}WC%9Jy$#_#O& zFvi<#>C4g|-Cccon^nW^Dd(5|oD=2Z8OZ+kEcf(Bf7bMSvg`={DKqQ*QrD>>l^_1U zJ#@4pzwTZb#|ForcV?bn_>fz-{M^ga(-%z&d351Ni>^?D?76dNkKGPm*OH%dkM-WZ zD$8eKvp>GLvTucI=UU+hVz)A-{##nh{x=Tq+a8~l8fhp#T|9Z=<*wt)za5{~s2Htv zfcM$;Ssy3g%-$HX$lqku)J#@W>$erz|GZ>mB>N8^o*cOLhBWi9=;gDI%{&$p6BXH0 zrmlN+)74Wu4y{|a_K44J(aBd2{&;i2g(oz7ThfB{PxN1$Hy2ORvo^Z=ZrbO=@?O@P zw=4H*uhuTyxKpM&+j--9I~jI1_dV`xE;H{x-gPUg^W{~yZ%X?lufAc~p0zdT*3-A$ zv6Hjcy2a$JaZ%qZH+kzpiS@ikY@40;&Uh;?x9uwP(K)xJdgHdN+dgaKjkxZeZ%zc8 zR`}~zybo$MzcJo|6hG%yk)hZWnFFK{hns81x=D?&Z4v7ZK z?G=pGzpwxMa@8y3S#B7^#-r{0+Mj>U(N37X+yD0@U+x1j(K{McuRdwvg)ryVeLHgV z#WBy>;s?Us)*L-~FGf3IcD}(Q)@X?a%WVaW)qB66TJWiMwxmPOx2^H_>-IWS$G37v ziG1pRT9XKkvNqz42{BaQvTl#W&}6 zFy`Dj$^Yzvzy{e*{r2DIKGzZzWRCbgFWfBsS#kOgw`X&|e~SSKc#X0=H#azUp=pX|HY;BNyfLu z-E$f3zWuGqJM;X+q}ZBRzx{PDkG5Z%byoaVX3gTuFWuD7<_pUIt-1X7_*woC5Jv;4fb{Z{tJvwpMernhGG zH!!O5->5P5j9bNfq%)lV|GS$S-;c+C?O$I1sr`J)LaS>pmmJ>|AuDLGK!nj-D?e=Y z$(3*F=l^OyzW;01m-Elfzpan2dA!^G^0!+lyJe4GDs!>+{aebgJ4)A6X=Up7trkgTe~DWM4fhW&yX diff --git a/src/icons/android/mipmap-xxxhdpi/ic_launcher_round.png b/src/icons/android/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 3b1f18ac62a1c5e93ea0eabab405a1bbef3b7076..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3479 zcmeAS@N?(olHy`uVBq!ia0y~yU^oE69Bd2>3_*8t*cljj<2+p)Ln>~)og3Ma5-xds z|L!Ym*KU6~Z*BD~9jRoV$sL`B$qIs;5*O87KRsz?Q#o(P!p?hg!VZ>C0xq>56}4O( z1p*xfT^w0EGm>HiOlPF@q%GV2GB;~?srY%z?W>koExSH*)x2Hb|J510eh<03E4cLh zcl+no&ui|N$1w8>`s>a(s*Hrv;qJ=$oqee+q@Mw{*1&mL{C z*}nUz>y4QfU6W5tw@8)Rs&jeQwA_s@R%@6fe$9)owYt6e>S4jt8-r5+7fN{F;8OkM z>|)Tvw`*7sH$8&V{Z&G;sG^~or{YtvNk67xfD_dlCz3yQ7${@%ync>odZx*iZ z)8cIO^XvYHrv5p5MAU0C`x2gev$amXIlTSUmA%K$WHfNJOgUk@u;;FxWsxK2f%vSB z;KIwI7TK!B)2;;thy63rcbA(naf9Tgbw(_!9Wo<7ZoHyml*2MzZAz8UoN4Y?PSyt6 zZ+)Fs^>2#LBmP@XuB9QH*K)`6#T2bQJ0W4c?jU$@n1;rr)j?%KR! z$T=>%C2Orr*!<18yWdYvs68k1%YKK$8V25Xa|#Uf1P)xd)py!WQmv^YmWGutEyOkm9^+u>Vd!Bvz`<}pWkvvpf{2pq?VAo7ERz!wglv}R2`Dr0tbHrM#n|G+ zz_Hrl3}b^OLtMc8Nskt52ni+K;5dEXuHn}*npDx>{dTTTP0hNk`cjr5AX0D7~i`GQ_C^4|MR$e>p{`RUZw?1?qZJHInVO|46P=i^>`Oiz@Ww&Ym z==r#rXV$h;0wP5Tl2gtmD9AG~h;t|`*AsA9=g#nq!9jzCVW9v+ixa~JVV(vCh8ye* z3GxgLwG0faoS7dm6;9r(J2{C#TtnPqU9s!Ce2JFIJ(F6Tp77SX|M1$Xv{zK&OTXLZ zm7jWEw>SxKO^n@syig|j&(fg4MHaVAxJ33iy<;g5*p{4JbvW2piN`t9EV@%+(T>Ss zl9S^)89oL3p8N63_T-1y!|8lyv?e@RIIHE~<5iv;-hHhOulw?X;SF<2xyCl#%-^|{ zpWj5US~TbW%wNZ(?Y*BW{buN4xT(sctQqc=#`odZ{{NeIS}l^2%-i>r%~RJ zyM~zMvbWv#YI1+}7TVI>D|<)!zM1yvZtYFGcID+2+zneVYggp4tj{mcDsOcF`}PN? zF8yJRjEM;QE>-5+@#V*l6*5*fis|vc-!FUICo|XRqq8L6LtC_SzPJ5zZ|o6!`Qe%EwjFk1``z6;+_XIW=6hQ)7C-Yl@~ZUjtz%2izT@5U zSSP0?byxl++ZxZOAH}#9o{V}~_RgwxV~nn}^VcZ?CHecN&%1R;JVG`)^!?S7AFbRS z=6eUPoHmI?a<1LVxXb^`ryajx!L1iC&HT`ojbfqy-ko`~(Kl>G^?T>Z!dja?2l#sw zr&N8I%XD|r7LTW&e0ol`^l|j+|Fyp*I%{uY+T==?xm!HV4so>ZSf|9%^y1VPx6~7b z=fm&&w=6e&WAMVT<%md=!imr;8Vdz7`Qo=d>AGciz3SYaR!?Cr#s-FlRt^@1-(?Gh z4x0<->$S(6-{r9Kb;FrWyHZcTI#rckYd^Pl^>_7a*RzvWzZWvDFl2g@oauf=Yq!ps z*a<~VBuWOsC)@t_t-1SRsTR>D_Ku2wD%HEcjy;YCq z=b!j-W5$)NQp@kx_NIQxy>fz4u=+}H-QYNBA8OYnA=u#i{$!0DNX&t%{p^d&yncWIrdB?rzG#y zeVW!gV_scM!{f{DKL7vUy0!Dj+FOb<@=9`CR<$2rT9p%Wuk`jB8QW5)Tc-9?nG{4G zS#>*n|8e}?e9@l^iqfyFC|I4V{_l(4S+Tm}yxG?_o0(>Zd(3{$bxqWF{b7YKm-%h~ zZ;ajB;K1=c<1Ax$Fa_qsarO)t-Sx<;#-@bdf=RO zFAr>u&*zEukB~jiayC=eB`_mw!LG)~EG|G^Q(MUbYP@jn z9GSZU2Yyw>>cvEepD(^z?7DKb%IuvxQ;maO)K_cC%v!XAL!q>qvr6Q}GscYRZvS^j z|K9&vN>y*d+P>m5*}o)e*ZkX_`iWcT+6O@guVg_h;X84^@4lMmesXSt+3|1c`;XZc z@^--577iLL6HYm3uq6E5;V@~{pTyP6YrM)QrYD~i-t?5|;*z3B*3N+339WOL!Z!)N zTQL8z-URl1>nF@I3qHQ~-MDh4Vd{sCoUJbw9hQ#~efPlPZtrF_aUJKM3_I^~?z8Fk zmj1p(t0L7)?iS^k;_i_T22*D>_{SmYF>I z(a|Y)b%w(ZKRX76hA&S<%C#)YmF@KVzuwGU_n?&Pky<5-(jl&iOSbBGy~|itkoHn1 zch;LVenviYq7a^m&Umo}4b@$I&+y1)4R zLhmhWew9x1;B56ccx~ycpi|#{JBzPP4zK&)HN`u;o?X0{eO6lVz3NxCLA%n8!fz(D zI4!AIzWvib&6T0Eh5oEp$X@$x>)iJntd7fS8Nd1F$$7R*=-T{Uo&|H3-!=G}S}JP! z+Rxu_-}`%YSB@H$)+X7X@LkbT+93P<0Ly}&1NU!SIC;|}f#+)f(R`ENAuCRw3!M|N z{jg2Pdz%k}2lCm&q7V7aJTT|(-GiyU53??8Ta@c|``m)qg^k<`?&WlUYU?a%sqI~G zD{af$j6;3q6HldH5a0iAv+?Uwq6IlhvWfYpPuvRIa(2zETON{~SNe?k+}wTo)8q2`bCYz`R@dadtu9=UoP1(R6*>j z6?sovZ(M9lD%25tt6$0QcKP$6fSZSE)~dx@eq1s2XTgi>S*MHkm?)(#SGadP(NjIh8%G&g$B+_w09XGd^TV{Wgy?Yx?zI!=NY@*YlI&=hWOe zRrPkEZQ=Ru^rZb~IVQ9V9?(`{`tdf_KVpeX*^k33jZ1!8CQ0u)hwUh?re`~Hw8axAq^-tD(P?J+?pZr5MKZfOCYj^z3O4otS4U%UIq&K=8-^lUv` zY;CI_y(hlR^4q6NW`}Fu_?50$_v*&Z{J+0?3fTD=7Mi^{a5cKXW>$ek$L)pZZD%k@ nFcR*NKw2LtU6%#+f8=dzuIJp>W|U%JU|{fc^>bP0l+XkK@=0zG diff --git a/src/icons/android/values/ic_launcher_background.xml b/src/icons/android/values/ic_launcher_background.xml deleted file mode 100644 index ea9c223..0000000 --- a/src/icons/android/values/ic_launcher_background.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #fff - \ No newline at end of file diff --git a/src/icons/ios/AppIcon-20x20@1x.png b/src/icons/ios/AppIcon-20x20@1x.png deleted file mode 100644 index b87b3187b3d39fe5bcaec395564e2993ce9e3a24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 382 zcmeAS@N?(olHy`uVBq!ia0y~yU=RUe4mJh`hTcwDUIqq6S5FtmkcwN$KlxdBLRfTo zLf8tJ)9a(ofB5>}d=t;Zv?oa(Pq|%81!gC%FSASf@#&3mmqfpae)EjoGF=iL@7K=n zm%MT#^<(wVvyIDn^5^eQuK4|nd4|4@)&T__&6Y$34x2wex*UCdrZsj>DBoB6``m~3 z@8b>FHfr{XxVgEl$=Sp!A}Y%En98#Vcy%W4_h{?EBDQP+4QD`v;lzv=F#A5Nb4=h4|8 zxp8$^v+I#~wl@74H{bKW&S%puVV?P~_|N^i_l(Mxoi}5BAMT&oq7|X9T+~_n>@f4D lqV~=PCZ+wsySW$`j{V7b5!Bk;!oa}5;OXk;vd$@?2>{D-p}YV9 diff --git a/src/icons/ios/AppIcon-20x20@2x-1.png b/src/icons/ios/AppIcon-20x20@2x-1.png deleted file mode 100644 index 90f5b65929cf043984b1ff1b1d824a821842c619..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 637 zcmeAS@N?(olHy`uVBq!ia0y~yV9)?z4mJh`hMs>rav2zyTs&PILn>~)opCzvvV%z5 z|BpM$?pQeSZrPN{9jMvFw8$e?A+CWv;b4<{Lgx`_#R~3i2lxV5MOPhh)#PNHBz3$~ zKUun;S(R@|gzBc)C&H04d)8XUpUXWL!K3Wh=<0ItX$6y1oqR2i5o@4fzi`N3>j#q` zc7K?;+xOFkYo#x}Dx7cnybx2U%YJ& zzfph7Q#^jUSi!${X{*x9tEwYnFa5La{$9SDJ^7f#jOXhAf6BCK^i4CrSF%~(xXDGZ z;ppRM?P7-%BHwp9T!@J7J-)F1%U*{Wu6I}*CuFU=^GT~)j zA1tkBJT)P3hSS?W8GkE_j&K^8g>!K4Qas$W$R+yDiL7Oo4U)S8x|lR_R^F)oBPr1* zYr0)5J>Riwap}RW++TmpYV|QvNebXyl_BMpcU$WESxLUqkDpi6)qctGsM~gXi?^gz zeD#jnX9D8-tJNRBUzff3>(P@U0rsX|8+w18DiPOTU3w>e_te?lJKxQka;Emv^71Rw x@*i)#c}^s6@v?~o0gv5&AE*0gGcYhPc)I$ztaD0e0sx}1E7$-4 diff --git a/src/icons/ios/AppIcon-20x20@2x.png b/src/icons/ios/AppIcon-20x20@2x.png deleted file mode 100644 index 90f5b65929cf043984b1ff1b1d824a821842c619..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 637 zcmeAS@N?(olHy`uVBq!ia0y~yV9)?z4mJh`hMs>rav2zyTs&PILn>~)opCzvvV%z5 z|BpM$?pQeSZrPN{9jMvFw8$e?A+CWv;b4<{Lgx`_#R~3i2lxV5MOPhh)#PNHBz3$~ zKUun;S(R@|gzBc)C&H04d)8XUpUXWL!K3Wh=<0ItX$6y1oqR2i5o@4fzi`N3>j#q` zc7K?;+xOFkYo#x}Dx7cnybx2U%YJ& zzfph7Q#^jUSi!${X{*x9tEwYnFa5La{$9SDJ^7f#jOXhAf6BCK^i4CrSF%~(xXDGZ z;ppRM?P7-%BHwp9T!@J7J-)F1%U*{Wu6I}*CuFU=^GT~)j zA1tkBJT)P3hSS?W8GkE_j&K^8g>!K4Qas$W$R+yDiL7Oo4U)S8x|lR_R^F)oBPr1* zYr0)5J>Riwap}RW++TmpYV|QvNebXyl_BMpcU$WESxLUqkDpi6)qctGsM~gXi?^gz zeD#jnX9D8-tJNRBUzff3>(P@U0rsX|8+w18DiPOTU3w>e_te?lJKxQka;Emv^71Rw x@*i)#c}^s6@v?~o0gv5&AE*0gGcYhPc)I$ztaD0e0sx}1E7$-4 diff --git a/src/icons/ios/AppIcon-20x20@3x.png b/src/icons/ios/AppIcon-20x20@3x.png deleted file mode 100644 index 1ec5afe4369c61f0a9c0439ba335787d221067f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 811 zcmeAS@N?(olHy`uVBq!ia0y~yV6XvU4mJh`2CF|eix?P~K6$!0hE&{oJNvx9u%pQF z{kLzH)jMQmEuGRdfx|0MxQAU@@7^DF6E(R#zukYN|A?Pa@#V=`?t>K9(bJ-@bdZZnLSF)3&L4f-~OkN!gSepZ>hoDF5EQ>eM#$VS@?R@7r$>>?!lf&N&cJnRKKe06X=;7k~i$DE+5cAb~o^tG~Ba8QJ=D+-g z&Tl7m6ZT%zFLG=llx)|Jze?$z!1zn+}9nuUVWNbywSVY8~6l9VIVYCLOp^vTS;r z-)V)r9=(bE1uQz}Uj{^rSVun%_*!fnIm6h<{=m=W-xGDs9^}dFmyVj2E;zku_t~`7 zit!mQB`WONkL*>kKj0PAxXGwdHLQwvZ|;Jd8Rg=SIW7C9PO*~ke-%-+Q)aK>ot$lo zo7-9Uf4L;oeZg+SjEVw&oz^QKx!xT87w~e|rP}CLKly&O6 zwyBHi{?VJ4HUF-8xbG#eJ>Pdu*jrmRz3#|AoAv2CZMh%bp67p8CXZ+TIs55pkA?3z z{x;iR`C--jE55(3ubfs|%%6Q#Norf+(ud2pPAU0*OGNC-$%8*5WgZJ2V2WV)tg@eR Y|3zopr0G3RQCIA2c diff --git a/src/icons/ios/AppIcon-29x29@1x.png b/src/icons/ios/AppIcon-29x29@1x.png deleted file mode 100644 index 0171aa539c8a4c157d15a4285361b43d0979d739..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmeAS@N?(olHy`uVBq!ia0y~yV2}l24mJh`hOo)${0t0?n><|{Ln?0Fop#pmkb}VS z|996-xizgnNz2Vp&gJmIZnY{iH~E9?9}dV;c7PFxIHR&5_HkbwJzgZu#^CQ#B z(8RqvZzik=eb4sZbaLCo3(SAhTY6q=-7Y*}E620(f3@c4?1jr-KA&UMu_M#BSI$e* zRVnk2?e|IVWx}RN#9W`PGi9TD#XR%K?|!})Pwtp*8eQmdKI;Vst0GC7K AW&i*H diff --git a/src/icons/ios/AppIcon-29x29@2x-1.png b/src/icons/ios/AppIcon-29x29@2x-1.png deleted file mode 100644 index 4c6d828df557701b8e0538a872c818ff24f6ce13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 821 zcmeAS@N?(olHy`uVBq!ia0y~yV6XyV4mJh`hKIYoG#D6|{&>1LhE&{oJL|pwWe17l z`^*1soo2Z05SxbE1r}2&)q^e-EB~zrt!f7a2MQupBOVa7^OO^{sRF zp5vWrCTX0s{?25bx9i@1{rP2Q^}C(B-QWIb;#Sbo>+lHRoaJ(1RdvhvbLxr?c`J)0 zf-gZbfW~T+!c@EwG zdPA;jJ3F(xz{F9%uBb(pV=O*ld-SHRx?#9$$D|xV$N%62R~k)$z}gMwPt3k zeCzg%Ykctv&$R3JX1kpd;GeQ=Ys8h0=N;9>^&kFtYMzsu_x<#-O_Cy9J1_j!W;cB^ z-H)kl^}kE$dH4G4S4=cC`2WaG%`DCT!FAIac{`@cJbHNg>}0!Hb5A;M<~97Kao_&r z{kgCHt4pW8dH3${rl8vPBYX4r-aGPS%ir63i)5xQFl0*2TEA1MKI&R+s{Z1J%Df^6 z+e-&utYE#|Ul$VkbLaC%O#)2s=LlUtmpbd&1-%UZP0|J$jyE@6^Xqf{I<+uot=Pjq z8y(mDx>s3~X=SSzD;0lbTrLh+bv1DH?u~4+TSY`nY%R`9JbR#7)W2R| zIPmw2Q)do6IQOFH*0IYw)ekuq&E5IV!n;g;x@}oQ_*8z4>#sL{JG3ozqWezi6WNh- mEPF%Qz6ymjd0qHCMPAlatU1=@xiA9*1B0ilpUXO@geCwqhmyYl diff --git a/src/icons/ios/AppIcon-29x29@2x.png b/src/icons/ios/AppIcon-29x29@2x.png deleted file mode 100644 index 4c6d828df557701b8e0538a872c818ff24f6ce13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 821 zcmeAS@N?(olHy`uVBq!ia0y~yV6XyV4mJh`hKIYoG#D6|{&>1LhE&{oJL|pwWe17l z`^*1soo2Z05SxbE1r}2&)q^e-EB~zrt!f7a2MQupBOVa7^OO^{sRF zp5vWrCTX0s{?25bx9i@1{rP2Q^}C(B-QWIb;#Sbo>+lHRoaJ(1RdvhvbLxr?c`J)0 zf-gZbfW~T+!c@EwG zdPA;jJ3F(xz{F9%uBb(pV=O*ld-SHRx?#9$$D|xV$N%62R~k)$z}gMwPt3k zeCzg%Ykctv&$R3JX1kpd;GeQ=Ys8h0=N;9>^&kFtYMzsu_x<#-O_Cy9J1_j!W;cB^ z-H)kl^}kE$dH4G4S4=cC`2WaG%`DCT!FAIac{`@cJbHNg>}0!Hb5A;M<~97Kao_&r z{kgCHt4pW8dH3${rl8vPBYX4r-aGPS%ir63i)5xQFl0*2TEA1MKI&R+s{Z1J%Df^6 z+e-&utYE#|Ul$VkbLaC%O#)2s=LlUtmpbd&1-%UZP0|J$jyE@6^Xqf{I<+uot=Pjq z8y(mDx>s3~X=SSzD;0lbTrLh+bv1DH?u~4+TSY`nY%R`9JbR#7)W2R| zIPmw2Q)do6IQOFH*0IYw)ekuq&E5IV!n;g;x@}oQ_*8z4>#sL{JG3ozqWezi6WNh- mEPF%Qz6ymjd0qHCMPAlatU1=@xiA9*1B0ilpUXO@geCwqhmyYl diff --git a/src/icons/ios/AppIcon-29x29@3x.png b/src/icons/ios/AppIcon-29x29@3x.png deleted file mode 100644 index a1fa55dc212cf413a8f535875ac1ee5c6891e62b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 989 zcmeAS@N?(olHy`uVBq!ia0y~yU=l1Q5 zNXy$7_GrPUc(1M#rE_t7n>>JzHDZ_lpGG7CLzvHrUA=FgfYd2{tOHY`Zo&Y&P(w0)OWf4c#X~8cGk0+ODAP~%VRy5 z9v8f_@YM6}<65Rld$r}NYrav2zyTs&PILn>~)opCzvvV%z5 z|BpM$?pQeSZrPN{9jMvFw8$e?A+CWv;b4<{Lgx`_#R~3i2lxV5MOPhh)#PNHBz3$~ zKUun;S(R@|gzBc)C&H04d)8XUpUXWL!K3Wh=<0ItX$6y1oqR2i5o@4fzi`N3>j#q` zc7K?;+xOFkYo#x}Dx7cnybx2U%YJ& zzfph7Q#^jUSi!${X{*x9tEwYnFa5La{$9SDJ^7f#jOXhAf6BCK^i4CrSF%~(xXDGZ z;ppRM?P7-%BHwp9T!@J7J-)F1%U*{Wu6I}*CuFU=^GT~)j zA1tkBJT)P3hSS?W8GkE_j&K^8g>!K4Qas$W$R+yDiL7Oo4U)S8x|lR_R^F)oBPr1* zYr0)5J>Riwap}RW++TmpYV|QvNebXyl_BMpcU$WESxLUqkDpi6)qctGsM~gXi?^gz zeD#jnX9D8-tJNRBUzff3>(P@U0rsX|8+w18DiPOTU3w>e_te?lJKxQka;Emv^71Rw x@*i)#c}^s6@v?~o0gv5&AE*0gGcYhPc)I$ztaD0e0sx}1E7$-4 diff --git a/src/icons/ios/AppIcon-40x40@2x-1.png b/src/icons/ios/AppIcon-40x40@2x-1.png deleted file mode 100644 index 3ef9b3de1c06ffe5cc95baffebbe7edf53f111b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1019 zcmeAS@N?(olHy`uVBq!ia0y~yUP@>k8_q}26-)N;#%b(vawUTC1l;s$BZvT{TnA#NX=u))6!eu>a@ajOV)zSUFpS} zs}3h$xzusYZ*qv&qtD*gEWTw-`dRc$X1-*$#9@&IRbtH?0t!qn4IBck4DGTBk=AW{ z_VK6gwYuh@(l0-0o`pwALIH!lncZQp&+V&qvggfjU4E$cc$M68F8Qo@p6v&fm1@;$ z-*YQSZi}C4dTQ;z-Y;_vUPwM@n^asop&%)Ndqbv4?0j`=!wtMjKchYd$(2O8^Ja)j zG3QS1<~ZQm+W0@LyK%dF!_KTmrpyl?_U->!qIu2e`?rq=6r*?+)w(=%d|lx!cXC@h zTSDq;i%GftE?VK5rx#@J`fKl3t)S64gM0q+#m(<@I2a%0@Nh9IIk0pv1ab&4DjhJs zR3iFn>$F_i_5IEbb4zrKud>`IV9-!F;FlCB7SVZBvByrJl|c~XcMX;f27l9;b2fNw zO53!(yn#V~%A=K1b7DiBxc4l`Xlv`8ANj!IoX^)+3SNvX6@fqh)Zbq(p;jT`0tvYS zjxC$_^7mFTs|5=``zhC=EYza(_WjkVT&Wtf*mt^nEjsfxlf^@%x7Fb~?}LhKO(!;d zsV`-6wC9LBxXayZ%K_s@Kk8r0G)=ev-)_`XI%kfu!6$M%CK_X-OM|)3}0xA$3^{T zJ??e7^n=Iz>DM;@{e2*7HS6hi>j@%fTjgf4H>N2Z*!Y-p?NSHl;Dt*}74@etT$dy6V4Uik3j(+jXvYjW)3UFfe?bRZ$mZAhzuN zx4g!c4lHp?#bbVJY_{0!&^c$jz5EV~&vUwDSs&J>p44c1)TQ|L`-fwve;B`V{W38* zcGd0LCEuqC>4b0EpecU*mXdMOj9ubB&U4=8we}zC-BIW!1x|@h4IBj~U)dGUxJ2wT Tf3T2&fq}u()z4*}Q$iB}(C)yU diff --git a/src/icons/ios/AppIcon-40x40@2x.png b/src/icons/ios/AppIcon-40x40@2x.png deleted file mode 100644 index 3ef9b3de1c06ffe5cc95baffebbe7edf53f111b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1019 zcmeAS@N?(olHy`uVBq!ia0y~yUP@>k8_q}26-)N;#%b(vawUTC1l;s$BZvT{TnA#NX=u))6!eu>a@ajOV)zSUFpS} zs}3h$xzusYZ*qv&qtD*gEWTw-`dRc$X1-*$#9@&IRbtH?0t!qn4IBck4DGTBk=AW{ z_VK6gwYuh@(l0-0o`pwALIH!lncZQp&+V&qvggfjU4E$cc$M68F8Qo@p6v&fm1@;$ z-*YQSZi}C4dTQ;z-Y;_vUPwM@n^asop&%)Ndqbv4?0j`=!wtMjKchYd$(2O8^Ja)j zG3QS1<~ZQm+W0@LyK%dF!_KTmrpyl?_U->!qIu2e`?rq=6r*?+)w(=%d|lx!cXC@h zTSDq;i%GftE?VK5rx#@J`fKl3t)S64gM0q+#m(<@I2a%0@Nh9IIk0pv1ab&4DjhJs zR3iFn>$F_i_5IEbb4zrKud>`IV9-!F;FlCB7SVZBvByrJl|c~XcMX;f27l9;b2fNw zO53!(yn#V~%A=K1b7DiBxc4l`Xlv`8ANj!IoX^)+3SNvX6@fqh)Zbq(p;jT`0tvYS zjxC$_^7mFTs|5=``zhC=EYza(_WjkVT&Wtf*mt^nEjsfxlf^@%x7Fb~?}LhKO(!;d zsV`-6wC9LBxXayZ%K_s@Kk8r0G)=ev-)_`XI%kfu!6$M%CK_X-OM|)3}0xA$3^{T zJ??e7^n=Iz>DM;@{e2*7HS6hi>j@%fTjgf4H>N2Z*!Y-p?NSHl;Dt*}74@etT$dy6V4Uik3j(+jXvYjW)3UFfe?bRZ$mZAhzuN zx4g!c4lHp?#bbVJY_{0!&^c$jz5EV~&vUwDSs&J>p44c1)TQ|L`-fwve;B`V{W38* zcGd0LCEuqC>4b0EpecU*mXdMOj9ubB&U4=8we}zC-BIW!1x|@h4IBj~U)dGUxJ2wT Tf3T2&fq}u()z4*}Q$iB}(C)yU diff --git a/src/icons/ios/AppIcon-40x40@3x.png b/src/icons/ios/AppIcon-40x40@3x.png deleted file mode 100644 index 04732b464ac0b5c6febb7563c4f6ada984bca3d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1445 zcmeAS@N?(olHy`uVBq!ia0y~yV5k6L4mJh`2Fnz)OAHLGIi4<#Ar-gY&b^&~J4EJq z{kG!bS74OYTowCTNmpx?3-VY5ED(-NfxA~<1q5eb9k@$vy)|PGF~C<8vOH%1VkP3jbDl_g&d_)1x^uPrsl1xbw%H$35p2CPW!=FtRXn zunF)eNH`cYBrqHVv6jSdxVh!!yzSomcmEFg{Hi03T~k|C>U_*1ZLe0YBE3)FJpzv} zy1v%;*Qq~^Izln1fp@{^fags(ZS z$eZ*ux?@AaAuA5m8+lbw){d;}s;4^tHhz6;-|{SemZZq6`UeVn2TPAHaPkuj|6lV% zShhxK+d}hiS*=?6zTLl@joCMvZi-p2X|m&3?Z?9lZ#`Rh;m={K2`k%I{9V?$p1J?b zyj7d4y*6Yg+_ApelG00)->Xau!wP;J-^8(@vaZWHt3(`p=HzU74EN@#fpDeX@Q9 zX46$ebsY-y54bK36k}oLXiH!~HUMnsJ6ksP({J8gek{wKb&J!okNe=t9}j2ptaP1v zYx;7do0`HkiQ;!={olZJ@q+ImrVmpN=pUVTd!OpWb^8c(^XOGXG z#lti8rk$rNhaYq0wn_C#tD3@0Krsz2pgZfU@$i~>zYvcx(6LE6)axLPYj*0pmE!z8$!py-kRf|>o$BBP_@vLImvzP?~i z?`}I?TEwE>;$AQRL_$(BBYIKM&rcdBH{JPmuQF3{MpfcWuW7fwZ#pxdw_*X`yTDU9 zmt@3$F1e$Abi0=^%l9*?x2)&(EoNC?pW9%t@m2h?7h5hZnt1hS#;UVNTIU-azdWaB zA>X^Ib$cw`@3pzVmR~b5{m=Hd5+bI~r?=-{IP&?tQ-OcU)M+A75ml-oQq3Ht1|F5N zIX8V>d<@zi9#!A5EV5%m!mCniyMtGgZ|6stEz;qTtA3|&E$`BD`+LgA4==UKtTF?zybDfHUK16(;5w85^v1sOk$0shl?0(F?CErxRDs7|9F`H{P&pOK{ zpIPQz{#DDg$64!Fq){Zd^g8P+TN972n=sjPy3DI!QL%9U9Qz*!OlD@7O}hOhaXGWb zCYM@Y)d{mR?0?L>WUxqo#s)qo&bYd)FsF{ALf0HM4z3RsTcIC(pfp0j=Gz^|oTlH! zT6?X(vw3Y)sCcupIbyfx`tWHluDvLo@~GvZ;q#6B-A{}crR<3MJ?-B5b-&nm>3tM4 ziMlA8=eoK->SFTIMgPBD=-Lt#*YPEGB5QHU`6cK5-d&P?D_-wzomMP#QSjXvUAvjf z*xFt$ZS;JZ_FqSI>I?qe|Kgh%AGX=U(!4XcoCBr)=DrW=8p}lb6GCn@F)%PNc)I$z JtaD0e0ss{zth4|C diff --git a/src/icons/ios/AppIcon-512@2x.png b/src/icons/ios/AppIcon-512@2x.png deleted file mode 100644 index 5ce3ba55c596ff40fd95c23d9dae00c66b29a881..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11430 zcmeAS@N?(olHy`uVBq!ia0y~yU||4Z4mJh`hI(1;W(EeGTu&FrkcwMx?%wR5`#ko* z$NO_EpPza6ahAosq~n>M-m{mjb?I2(5Z%S_m1*lM)dl~UJN`FBtF#Ej6dh)L#I#UJ zPs>4sg-h3SiC*VyGsSJf$Bnn8-+%sw`+f1FE$a${^f%9`JpcUij{X+@6cjkY}oO9@89(%brRvy#%%Qr z3@1D}c0|}opPz33GLn&l;ZMnj|AmipyBQf6EWdvI6zs&n@3p z6c{Er=bPN`o4#uLoU>gHt!=B2m|I+qMiGBB;v7Uj!;Z9-n0q(`;j}{#A?bo0%t4Ex{QWME=ozv@%0w=c5tVq`r7gTlM#Sq=LA|D)#U&fOxx#K3;C z|5g6+?OFPf91IK(8f!AYwEj3M$j>3dU?K2t?XRFeJ3ek}Wnf^CJ9YfD|Iz$ZehwD~ zg*)&085mlgGbu1^us{6YeA|CpG3(VJi*E?3bGbiSExcco>50ohA&GyC3=Hp7&q`!o z^Dt&-VrT<7oyCFSzz2Q?h7JY}2CxD_2F3>dY4g72|6pfe_-4hlB$9=(!S>VNTeIW7 zvNJHe={D(JGLwa|A=d2joNn>g_cseLFdW$DY3w=6SAgM$>g%^_f22Ki73SHB}aDXo|W9>2R z-s|maSQr>C7dDNT%pAxS;%=l4mj3=9mvu61vHAH~AhaHBE&-_9@c3=A*QH@{_F z&nCjq;a>CVzxG#eF(w9v7uA_%AHx_J8`{4Vy$!k^{GXAb!9pRQ)x)@FssKX=yZ!I~ zZm(te|1mQ#@b#D+-ofR-pdk0>&HhjZ28J_691IWN*fTIV?BHTxR1h&{U|=xjWpc3i z&CkFfu#QQ9;fA<#{H~6g*gZ zGi{k=x*`k1yQf*7cX_8UFf^PvpUaRxyO4$9UD#_An?E4W@3G}EIBUhha3^uw)&xP2 zp?pjZJO0QsFdSHO*jYQO>0iO(y$?RsgZR!nm=um*yB$66A3pA4_1>6S?L}&bT1NqyIgJI|Pi-lmn{8nIiaxba+=3xVngZLjxGVJ`X7O|OwfuZ3h zJEOw;S9f>0LiI2(Fu+Q*zxkV^B{y+F6+JiG71zqhz%Zj$093y)FoH-VCaB6{Z~zH{ zD^a{mbiGK%pfep97!cGITAm9E#cvRuf^>L-0_8&YH zAB2esUf*=P&F+)?`JGY>3hrFf7!-<%E#LS5dy;zC{=p2U1_lO!O1sbhr?21jME=Id z)r?igr*$QBH!v_b+>Zfez%pH?l;aYh0Qz?GQ2p6mF5(?`_sJ^QiZd`UGBn)SAO2T2 z&Hp$1jog&8f5AP z>T^%ttXKHhz<@V_AlZ&Ttt5zViCTLj;&xBgR=M7) z!%a^dDwoJ4Co31e_z)t}ZTE?x;lDXc!h^LsYmZf#{h6$<`DBTFX8!Wc90gx~2zG-a zjG_6}u`_dw|1l^0{dQG$`T2QUBp7(sG^sKuu>Cl*|DiqGtFDGE&q3+Sf#;g-f4$%R zjeCR?-r6#7FfbS>nDPAoCdY8dn1Mmz`=!4RZh*s3;Zwc6#WzsMQp=kRptQii0Er+X zGa1ogNVeff$%Qy3DK00@L`X4&U4_O22%ZN8s%HZ3P7FRFua@;4i3GIj_H3tx28h=;Fh%k|9j zpz@=Eam$7s6YdJfZ4{XJ{r5lZy?fajK1ew*NW{#Jo_#UHEUBi(rt9!g38_oRKQFlb z)@AkGF0Z9RU#spmF(@!ZFfnwzD7kfWLPT%bMv1p&>c21co_jn0_FTXB*YBlwRg0pFZ-QSn#kDmzl zM|aHeuAcKvis4W;17kvgZRNiho5EKqI{LcqYoof~zU^{7*?95dMTxU|-|fr(L`*rI z%FWckkif~HP{sU6c=@~y0`S@qsiMTm90c7Uu|BzA&LDb^Od6XEA zt{0S7!DV~{qk)Z$jPT^gfqK&yhuoUoFMl>oTdLPBCqH!2-Mrf@3@i-Z3=D6UIbRMo zG&J1ze1AR{?@RYzd$(`b-nemJrZKplC_DU7`1rRsJ^$N11r=gzH*DFF6U-nH!RpPx za71tJ&-d*Q?ceQCQmFL>Wiy5&eD^-@=b!%fcx?>lgnecZ6Ot~>lli`t(V>Ekfnh@N z%ev}#X;6N0IQRAP-v8_`vzg&8h81mKhf!_J;?0gGRR)H#Ti?QtUS|Vk?+NAE+0qc# zHSF1KSiHJ_|29i$7Epn=K{#t`RfzW1eZO~Ix;_P>hN0}lwQFTtZqMEKv+C0IO;7*T zGaQO$U|=Y_^X*xgN%UHavOg#G)ybarULC0Q^9D26nCxeH=Z^2rKYv7cxqQEK`|_lu zq?-Ikhs#vWu9-c)*85YVf6C)KKQEhs{jN~?qJU;x_tgd@(;Id`I z=EG(7t_|P!&D++?n2;caLIXNnPvh%uS^x+~}6@y@VXk|DF12&+P$pFe28`j_3SyUVT|FgbL?Yi~#^}n<0L6s?LioO{a;o{6e1NS;8Glv+`wrNf8kGpYasSeY_xwN@%g(^J$cKs z4I5-9_i4Vo@u*iB6z8=|0`rgkxf8VI&SLI24JA6B$ETF!fFfMs*ZZKmSKr9q{W>e1 ziGg2V*7?%LBWqn5eg2Mt;x zT!C_$sfG)t)V|Pn)#hec8@9TAsWzMX7^*jl=nOXaC-rU#IzdLEI*Z1AKh{mwxZlooC9Vz`$_9ewn^p=lTC%rzgKU znc2-~vk4Z93N|bP4KH?km&X6ttbc54eT}x*zht#VxxNkTe+n$ZdV=Hk2|VBbDX^On zWX$_Z?B9*|*D9v{d*~HXw?~bI!Tx%I*$?^OZ$4W5-nx9T#k(>kP+Dp(Za8muApXbU z{;zd=fBy0cxqqkQMwa`+(2i@py4)BT$c8D+W)R#yW9$*aJz{0?@=<8PB?u7TCGOb}xw#jTn@ABrl zNES$!>&e}-(w|`xKjoRk7hTPYM(JHnn|@8F$re;pGkkjY>gnr?dF47s8a%4!egl=* z3>^n|%haS+-gV;X*m6DZHz-{Xltl*B9Ge}&+6LekbW)m0+YaBC)ZyO z+otPr?(WXxjgS6YN7sCNvr|I8yzR#V@9G)fKD}FQ zb!pymNN1Yu#KY%)cRru@_wjLCX(RPEOxhTNOL0qWy{o5x`{4LZhJnrTq7Z|@ zigR^ul?y-X-`nv#Ui#F(iy2#zb8C&Q-iA$a_X^aTz9>TGT-#~G?(6K^wy)m1{I|K( z*^Dc*110p1J$$)RLVExA%`#kz4;O0PE(Vov2?u!k#gkvPzUle!`Yiw7-)8388|`)r zo=rQw=8+FT?~OTz;E3ek zR<=;odHH6|Pg5sKRMp;YI&yI5)WyHQc&xFH@5;M5RR)yo57fSxwz>Y-ofMx``>uSy z;}^a^U%V@#vuvs8Rq1H475qJO=e^l`E&t7t3Yp($9vgl;Q&Q2z3~F$F_|TkY7BTN+ z9kIC=PwHo|UY@}D?RwhMJka3#W_~7zcl$Y4?c;lxd0m>3um zzA4%;D?FceZM!an7sEKA__Q=s50gWMC>vz-{K0|fpo0*DBpDXAFfuT-oc=G!Py?Ec zXqh~ZgMt0v*{QtU3=9l2Dg_umy}Na%3p^li!@*FwJ#y{wu&b(|LH~bCBGWJLQD*oM zY(70!h?#+5MyUWp(fhltpz;Ga^nPEbG zc+F%628J|gmWDsK*Ia#kO83471H%DExqq8ys+~3CVE7|rU-5ex*s&%c$4;HPY4!GL zkQtLDk!h!I)-yKz{{G7JC=UaJ!D$7CBMvdF2G6w^7#JQr@G$P#{GW+||KZm1e7DV4 zw+Vp8$-Osw&q@?v=xE=`wLozCy}hZ53=9qXrl(CeIjq3&VZyx~I|aC3M}wz@qBGMx zH*+&F^uMTnez_2KO-mm#-A}kDL2g~*f-rxCY9cWJOTkI^~OFc~t2lOIu-08ZW zwns{Uf#HUIrkdwwP9}!kZ$2Fgx)XDI18BNzp7&;tS)Kw6H*ItO85kODrT<;#nUp5T!thOzspj|G^5n&8pxR`&`dOLGZw7z38Q!F` zyx8*C`ue)``x8n*vz>1aeTaV#l67EMz^`=Rf6RF$hgeW$Usmwrd|Ho5w!}YHhF>~N zdu)nrpKagM#mvA^QIfgM!?^8XJi`KgWe4?r=HwT{Yl|u0VLHG#c^%V_b8BC34EfB+?Id^P{t2(1yPZ3?W!lQ?=koaXUA@sY`{slDC*&mh7#w)cZDve+HGAWQ z6-Q=HTv@TkCNYqKL1DSrrpXPPZ$AHDwf${eJ!6C8R6d6ARjUnyZ+C1~Zhw?fsnfL% zG-Gz+u;>1%Z!8mxzxLjH{%_$z#cm}AhblV<>wBx#xGmfyw%lFq@s}4<%-KNsq;}K) z-dkyRR-}Lb;ckBEPX0G{h6nSeeuyenzIRfN>(h@D6*Bt$$2%t)ax*h9)aGrB>s|Ur z?EcTHr|Qo22cPsa9QeB<^mgCut8XRxob;LINYC$D8Fcdy1B1i-h?Uo?=HI^j;r_XE z-=%*EGIY4_)q0Rts-31CZ8&SM)rX8qmA)zNk8hmF=n?(v&%wa(&1>t`uBSOK;&ZQT z`u+R$-tb!Ss`TIOG0*xL4)Dnr+*+%{V)FRcx3DGc?R}zck2A!W`g;40{`gQJBVW9m zfq~)8l%-jwS~ss>xjQQT(Td(%|EfHsJ>o%Mh zD`^m`=dM{j;X&v3#SYuQyZcP*G7QvVXGWu-TmuKH^JO4>Cdt<(t{l{8! zslb!xzAT@d@4TJ;@1eKVzidy+GdBFQnvu%BdTpBVGwrK!0xwF!tL*oGfBjv_aeMLa z^wX>i2N)!GJwEgI_xIQLUtfRE|5pKALWA-Xs9r&7A|bVIkeCOYwIZ7SmR3D_@qcT1 z{`$gcoHEDftNZ$@P0pNrOJ>#PZY3M~w1_p+0{7eq_;#quGL*x_~p4?p)s@KfO!0;)5 z%jWxvEZ-ScWG?OIT3A_`{7eNjSG=i`g&{2`EA~04jW`=@e_I~d0pR*(@#6b;4Hy|1 zX1703Yp~qDx%Pk}0|Ud(t?6&W+67`59W1Jq56I?9-w|PEU^pQg?auJvw|-aIeo%e1 z0aPF5Z@HVE#K6E1&CaNB<$$lD)5-V8SQr?JRC4ERDHUM&F;9BeT?vrh{@U7b3l_$P zn=(>6?kxpXaCvvG?Y?|WkYUEz1n=?}Sy^8V85kHAyjq$&*^G~gq4>u2&6h!L34Oor zpY)#J`V1cyGagViVqkFKd-LwrBLNnMI-l^u&>j1VyZb=_8T$I#yo)-y(ku*hhwlEp zz7w?2Yem#=eaWqvEDYz4>fbVJc`LrYT$F)>F7f?z{9*I4{R{`3Ug>OU zb8qLXSjfo0;H{QBX^XD_Lqx*$ExhgVkRCkgYClf>WlY{@FAD@-I?E*67 z;u79T+d3u-Fhr#E^T>55FO37WlOhT-tC#RTQek13c4B_pyS~@lbCnnv7&atadggKa zuqOwD&cbKEj(zxk_WM!q*9-e2ZPSWq%MZp?{woiFDQbtY~sIrKi{9Y zbWKC*KNG`LQO1AU0zo<9S^l5py@`Lg8A38xe!M zI!F#nU2>Al1ktfTY(_c#63;r(3<3=9V>y``0MIn^inf9+G)FBehl zedpF4aXIT>K4zl(zA3RWFrHxAyK()(yDU(n zh26}2-RVnd9=987x+7;Mui*V}@y+SmpO5CrYq}S%`{Pls_Hw_&ulNaamy2!u(`O`dQoCnb%&gxE{~2V495eU)PG7KTF?y zUHN@6sI2_S$FR7y@lC+%cQ?ZJUov-MSP=I2`ICr>qCZpLd|2tf2&{&S;V^IZ=H|7# z9|bHv4H|H4kZfOm?2xeVQvrjog`iSw!7k2je!<^OU_s`^b${{fC-+k$u&zJA-0HuPEG=_}z z@iX7Mw8V{cwvO7J*b zU+dg{*p(sS-{0&{9u?15Z+vt2b+_0(Rl`!?g;B^f3pf; zVG#5Gnbjb|eCT$(+{t_Mf0@)2Jlb6F=XNky2RAo^_B7KJ=~-5X92OeqXn#HS>4pFM zU)C-x3|gmeAMbBj{Ir_mPkEM7_4^~sAO0{`KmX@%$74OYTowCTNmpx?3-VY5ED(-NfxA~<1q5eb9k@$vy)|PGF~C<8vOH%1VkP3jbDl_g&d_)1x^uPrsl1xbw%H$35p2CPW!=FtRXn zunF)eNH`cYBrqHVv6jSdxVh!!yzSomcmEFg{Hi03T~k|C>U_*1ZLe0YBE3)FJpzv} zy1v%;*Qq~^Izln1fp@{^fags(ZS z$eZ*ux?@AaAuA5m8+lbw){d;}s;4^tHhz6;-|{SemZZq6`UeVn2TPAHaPkuj|6lV% zShhxK+d}hiS*=?6zTLl@joCMvZi-p2X|m&3?Z?9lZ#`Rh;m={K2`k%I{9V?$p1J?b zyj7d4y*6Yg+_ApelG00)->Xau!wP;J-^8(@vaZWHt3(`p=HzU74EN@#fpDeX@Q9 zX46$ebsY-y54bK36k}oLXiH!~HUMnsJ6ksP({J8gek{wKb&J!okNe=t9}j2ptaP1v zYx;7do0`HkiQ;!={olZJ@q+ImrVmpN=pUVTd!OpWb^8c(^XOGXG z#lti8rk$rNhaYq0wn_C#tD3@0Krsz2pgZfU@$i~>zYvcx(6LE6)axLPYj*0pmE!z8$!py-kRf|>o$BBP_@vLImvzP?~i z?`}I?TEwE>;$AQRL_$(BBYIKM&rcdBH{JPmuQF3{MpfcWuW7fwZ#pxdw_*X`yTDU9 zmt@3$F1e$Abi0=^%l9*?x2)&(EoNC?pW9%t@m2h?7h5hZnt1hS#;UVNTIU-azdWaB zA>X^Ib$cw`@3pzVmR~b5{m=Hd5+bI~r?=-{IP&?tQ-OcU)M+A75ml-oQq3Ht1|F5N zIX8V>d<@zi9#!A5EV5%m!mCniyMtGgZ|6stEz;qTtA3|&E$`BD`+LgA4==UKtTF?zybDfHUK16(;5w85^v1sOk$0shl?0(F?CErxRDs7|9F`H{P&pOK{ zpIPQz{#DDg$64!Fq){Zd^g8P+TN972n=sjPy3DI!QL%9U9Qz*!OlD@7O}hOhaXGWb zCYM@Y)d{mR?0?L>WUxqo#s)qo&bYd)FsF{ALf0HM4z3RsTcIC(pfp0j=Gz^|oTlH! zT6?X(vw3Y)sCcupIbyfx`tWHluDvLo@~GvZ;q#6B-A{}crR<3MJ?-B5b-&nm>3tM4 ziMlA8=eoK->SFTIMgPBD=-Lt#*YPEGB5QHU`6cK5-d&P?D_-wzomMP#QSjXvUAvjf z*xFt$ZS;JZ_FqSI>I?qe|Kgh%AGX=U(!4XcoCBr)=DrW=8p}lb6GCn@F)%PNc)I$z JtaD0e0ss{zth4|C diff --git a/src/icons/ios/AppIcon-60x60@3x.png b/src/icons/ios/AppIcon-60x60@3x.png deleted file mode 100644 index a148b865fc821c263b761d28b4ed0b3ec8060c33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2044 zcmeAS@N?(olHy`uVBq!ia0y~yVAuk}9Bd2>47O+4j2IZ$4|}>ehE&{od-rAj?G%{< zALl=|D8FSIyM0|wa=5u!VNYhmj#i5n79o#@mWoc3inH1OSnqw9Ro^JC(AcsiT!Bxq zt%ad*^Tw^0tJZ`IJuk>v*Os_wr=Kj8y7kMyZ6(zuK3(0wT5;9VDc>HfjipIm*0M$Y^o9s9#(tqOHRik-YZU&8lf zWAJycs`9)C*PkAE?_4b!{_o$1-f*9mfse>4@tfEZgyp1j$Z-qAF*AVF4#MYFaI$^+TGIO0)ylCg+(XDwhO)y zoU}u9dW_xaL#i+2_A{=wHnQJ+VQQwj&@`1voMJ}#T-D2?*18wnV(H!X%FlMv<+SO{ z@Cbm!2RLFN@qrXi3NFK7X4zL*Ye9jYeSE0(+*nA zYCOeJOLY2-%G6s5FXY(gPD=hRm&=>};P=6trOAeiO=}#L4hpcb>}4&fIN}aT0Wgag zo7i9pg2AzQ0W?8?9KaEyHhJ2^T<6#O?gxD5i;sy2njicn(&LZ;+r)|Iw){`ozBDgx zeSQLeQ=iCTgS?;rv+lf}z2JA}`$`>_roL&ndv`q9`2Wo8Ln|&S>z$3;bh|G8eXq*o zp6`wq1TSTnq`dlbwDkUUW%b_oQpt>hC0i=issHAGo9YNkitvC@$N+Ic0drUT=_K8! zi}pU7#qG^?+dbvur%Ahn!ye!IUhEus^66&jSdo7A2Y3C(~b>F&WD{Rg&l7_ zof`cn$aT+z{HAw_=hc7gT(@W0<@g$1nZ8*W+sK6|@gfBL4YxBI#8R@#2wTO6dedHesr zhRWA&c}2f6v=fVvhUU2u%ORsP2E~~bNl>~FQ@+H?SB3; zQ(g7ElUl~jMH5}_X1hxTt!z2+_!)2f_Ue1DY(s9@@`F+}q|kw;F^=W?es@m(q->eH z?ZS&0`xyV8@c8%2^xAcOqp08ae_8%IqsU?PhdXrcFFlcK@j2_8?Vl#94$;rnf#aMXnoDiA3 z;G%s|-LwUaoWC~Q{kc^}A(^oGn`zZKgqlwO}If8KX< z+6K*CvUdYk_|^LB>YZ*qntF}TYSHYOTpMOPtbb}zoEW7i*1bkGrz6kRTshHhzvqm+WVqKaK*}~X`5c2nlW>ttY_)R-6tRBt(X{Q z8~*IowlmdP5f8I`l}caT7LEV6TI^~6)KtU2Ga`ITuP@u7TDa{N^LA6cYTnEa^|&+B zr|i;C+0^~L?aj$$n-|?Xcum$li+8v7bpho)Yj#}ZvdAnoPw}f&E|HU)uae==WS3K( zQqlC6qh--Tho-vJ`^s#qSrRieCM=kL`!7Q_%R&%SeG_YC@%_nf$`XS8WUCggl;*m+ z@_o5_ya`|0u}&%3i)Z(2{hz5^a=qxunkjqg&r7=<^AR#NbJ@OV_Qkg?pB^o7{>l0C z!H3(&_C4WSbS(F!TZ#6rnF^A=sxQQ|t4)9I_~QF{@=^JoS&vt5ZV8v$+ID`XljIxY z)?Zh?uWoIhwf?!h`KC0j5BIN6T@ZfOblTI~m*PMD{NsQ2zLznZBY)n7<3*3pPCwQs z-T##TG+%b~^}6`*=Dg=;KGm;z%2-r%d*8f&`{uFpa)_%lvhd<7AvuoyUs5&a%e4E< Ru?!3h44$rjF6*2Ung9{(+#&z~ diff --git a/src/icons/ios/AppIcon-76x76@1x.png b/src/icons/ios/AppIcon-76x76@1x.png deleted file mode 100644 index 82927067a3594b4e1c9a0ec3fca7cc70c9f78045..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 952 zcmeAS@N?(olHy`uVBq!ia0y~yVDJH94mJh`hU3!%wHX+g>pfi@Ln>~)opU(nCctS+t4oL$a3Hx$Y|)>N>^H9b$b%-+DB5Ui-EI+cq_C2!$b zSFOys7M<^psjG%+N2wRBN%(n2-?D7Y@oJber{XD>g$g={Yf|zOqSFH8w%xtE@qXrR9^QMK71!MO{&@AeZJU~H zy2T<~j)Wy`PET*JrxzFb{?U*Gi9Z)vsf85iv<@XZ=C+_o@|M*Ho<5n%-`@eIp zr~WdkJ#28`g75c6H;V^9>)W$uiq#(Yb}Dp(?suNHM9GLfX8-RWKgGs4BXiciEeE^v z=d5)|;NWRJARzHI^QghrCkw93W`3Bs(M2R><>OmvPCg17_I>&}=X0YWPqQ5t#ODGM zOx#@-ea&xt*dnH}E?s@#;lh>!ca~^n@rS*?#9^DmkuZzTe&4jl;x74~;Gky}e2qIb zXZ9rX9A40WAfS=;+WLygtIQ%d`)v&C;98ffx2l1e*LYpgX5OoRtxBHc<^TQtAR|Hg z)7&Wj*{3@8wq_J*J>AKB%%CUngL(9K`}pk&N6O!?5H|CfS-9fO)tZ<3)8{vfEpHdU zargQ60~Pn1tmg2(n_YfQL9%=2zin$ZK74cjcxK<3TdFf+|Wu2<)p=V z#i^^-i^$RT% diff --git a/src/icons/ios/AppIcon-76x76@2x.png b/src/icons/ios/AppIcon-76x76@2x.png deleted file mode 100644 index d9a2f8a7b2650a3699cf2c58cb936814d8e866a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1830 zcmeAS@N?(olHy`uVBq!ia0y~yV3+~I9Bd2>3=)SF6d4%U-g>$?hE&{oJ2y68Bvhi| z{@;Hu@^;_WJz96&DbS^rgYC+Z3Pr<=AIxfMaa9NVFUUWbTYgXCf3x_pBNBQnJ?08s z4GJN*yfSykzdd)ZuJ?J5<`kt%?{anT)<>}|=SU%6W5yWvoPf(4e zA)z6GfrAYMK};mhh0jg8rk^%l*rV^gcF&Yq*)BJjzqAJ#$(%Wrk+GkreY5OZ>kBJi zTGe0uKh67@e$o1!F2`)nRAfZ>9gCaTd7}88;G0E4uamxV-TWxH{L%VTnyOLPS$8MI zY}32Cj?JUD}i~$tZPZ zJNM@i&#TU}?hc)wywRiofy(vV{^q;ccho=G9%@c=lsMTQdw7cv3v>CUGWjzZ*E-_B zO13Bbj8auFEN5RHN&JAcW%jd{N{!ELeD$A}YK9apXmdHQX7 zcp&%LZ@?{oQyy=kYfcCKCrp5^sZ zkEA{y+;i+y>3bjPRXXdHXI$@4QJ!ac{gV^tK?Z>{p6=T&PPqECX^TwU9u{XuNtsg~ z7Csq*Il@bwBClQ7n#-AGu|(yxP>6lJ>$@pV3!j|Ym2r?kfCmH_4uTv=2tYO{mobu@0?VL0fxfsfqKA73Mq{ z_3|R`n~?hZ#`~+I>#u*m_TA)_?@Fnw?Z=IpnK`a?KQZT=CL1zo<@`TkFXySwn3Vat zdP~ggenkm}rqX%O`Tg=<-}o=+e`H=ozumRdYsEmGZemoJA-=(h;QKY{8-F#e z(fV|!{#=4j*U?S3tv9zG41d1t{KYQzjDveR0#}}T@?=JcR@<5XTVKq2no_0r|HhFH zmC2luGxqCmR#y`^lijn|PO*Gh{r$3^%$p~Fx-_wQQpo2wa|0sHpKOo+KOx%u`L@t~ z^;XIAwVNs@Y`3%5J@$6fl>8^Eai_fYhSg`?TzO$aN>k?XdSj{H6K`g37P6gLn>DjT z>+=2ilfEombLPyRW1&l?d!AYH_V@?mQ?C1TSMI()_vdWp=1j{!_avqt=Lxns6tmXL zMB@MU_h~b}73+v?G&jB|J@W->A)-g0}RhZ_fPv@O)^WsagwjBxR59^+oYrgpVHIE}r zLgD=`Iw}A4dY&}DcmH%esM%$`d%>jF+gPpVNG3DSlso9T?zY&QyC0KX_Cds@L(e|@ zc#!$agWA4xA2ZDDluYN#{Wh4ub!@_!<=|p8cR{Jj%&Enj(_eP~6qy@6H~Hl=gQLHH z_pjDGr1*2!m%XVTvNvlSg0{xY_nF5z=bYvHbaowAb-!1Rdllk!>XZM*%;T0wo7@=o z@tMQx&M!+!^IkL`*ypiK`D?k)2Ht5?GM;l^e;QSJao6rJfu$0WC0`vf0+t0yTF#N< z+%vb*vCUfL+B#0Q18bEW3>*v?SeQW&#DsD{%nv6285CB#KAX62S}y|w1B0ilpUXO@ GgeCwh=3R6E diff --git a/src/icons/ios/AppIcon-83.5x83.5@2x.png b/src/icons/ios/AppIcon-83.5x83.5@2x.png deleted file mode 100644 index 97aaadbb0cf4b7d6f8225ea8de864b3992fef599..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1806 zcmeAS@N?(olHy`uVBq!ia0y~yU|0^q9Bd2>3?*VdZx|TZu6nvShE&{od-ra3bgImO zkM}+O?#-I67JGm9x~;LUFI)1?opeZy^AXHXQQ}y%;dkToxT=S9%bUK(z3A1D>90d%vB#yumiOn*u~C11WQz!+ z%!w4i1`EbVEQL%*I3KZe2rKvrs5{J2@Pi7@6@4C6*}U}5QnfpW=ZZh~`Z({7#vi@< zDPa-Kv3b|#OksUL+32O@*1tP>t?hI6#QL4S`sVwlQ`a^U9M8OBCzf34Bhk3m3(fvuCKq_`0k)#;j8IIhmPbe*v0OCWao_d zN$gWCvRO@cvEOyQ{diB{j+3_>ymu9t{(d)St=hlL*DHT#M9(?tHEV0bw66yrdUG7V z2J%DMhEIN;o3iI_-Y+wQqjUFpm2<}n)%RvzHu(2nefO+s(en2v6m7d=`1uXr45RP& znppbUt+FCt+o>flep|VHU+|goJO7V8J)d6|GUKZ5-dXXs_vbFVX;<}bt5d$^%=~Yb zAS;-Ta0;Y1do7)`WU}P#dHN!pU74F+bY5nAoh==tb<6zE6tC2jqO3Wr-gC@yEW1_R z?d3rsE1-@MvdF>xLQ_xd;KfrqUf^{YN} z#>cxxTW_k@=jZ<_YM1r&_-+p9ye!9jJn5=DEY2L~Fcda{qO(Kz2q(nS1`C+ro4mUH z{=XLgeN-e_y)50xdeR-gjSVfE^=}`0TPDvD%+2;Y!Xn4=w)TAe4FVm)M>>yBI{l1q zZrqdCteue|_V*s+S?ls_y*?jCSh3zF03>c*VKpc8Y%I%?rzR z8i$`d{c8GlmoO=N=1)(<<2TgW+5P@9yY0PoNu5vMe$P3v=cPZLI`j1BtM|f1t2VON zPTW#!r&s%3FaLO_@R6I$U#40Gt(^Pn{lkLz())(fwXfvOURHg+_RlLLldAZw{|tZG zDfr!fDY1Rqq^%z|z1lqMW5uen==SjX`4Mj}UbTBA?>q-v*q3c;Z1niLe4gF*+Oo1m zWzq7kOodGrOPBALP5!=0{@3>~Tec%VZ`9cJ_w@5``(yYZx_N1A{DxEF+k}?qKC;eq zx0ly{ZM(+kt*~me-t9ez<&RfKK79 zt?wU~d;i-K{mf6_WdHt?`$RyAGyT|0F~4h0uYYA^eOC|R^qQ4?+@j^3)Ax(l3eVks zJ$nu3mL=WG9>>J&R6iOtb8Dm2-R5_T-WG~o>G`vvq}{Yh>aO#_Hr{Ev&Uvdp=I-2A zHhpVT7W*!CcV5-CDngGw?MkUDi12And=?kHNo&)Noq=y1=2)EDIq|HA*+#v`|2Fje zc1rs6^XR+&pxB1*d3L(x#hRX1Yt2_Evp@X$f5Fq3pgM0g6%D!0s+vXR_FAIdrkZy@ zEzEZQ^7Vw!(LF0(n{>zTO_G{+HPXF9?pg7sWqSXo>xW#iws`bLOz!duwwJ;7b@OK* zo-V)_&lLO7^GEUGVj(l;J#mj2?zX;Ly!P>&^L*zvsTCY(?M%OA&+-4<9dEYPOuzTm zJ*r&%ws4-Tm1cU9@t!S0SP?yqLE;zIDpkjZ# zUCpc9-?1BPbZ&kzqa*FuJUrWd&NIDy{MOL znZ8c0<@)~l+;g_9 Self { - Self { - active_view: ActiveView::Home, - collapsed: false, - } - } -} - -impl Render for ApplicationRoot { - fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { - h_flex() - .size_full() - .child( - Sidebar::new(Side::Left) - .collapsed(self.collapsed) - .collapsible(true) - .h_full() - .header(SidebarHeader::new().child("PicoForge")) - .child( - SidebarGroup::new("Menu").child( - SidebarMenu::new() - .child( - SidebarMenuItem::new("Home") - .icon(IconName::LayoutDashboard) - .active(self.active_view == ActiveView::Home) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Home; - })), - ) - .child( - SidebarMenuItem::new("Passkeys") - .icon(IconName::Settings) - .active(self.active_view == ActiveView::Passkeys) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Passkeys; - })), - ) - .child( - SidebarMenuItem::new("Configuration") - .icon(IconName::Settings) - .active(self.active_view == ActiveView::Configuration) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Configuration; - })), - ) - // TODO: Replace these icons with correct ones from lucide - .child( - SidebarMenuItem::new("Security") - .icon(IconName::Eye) - .active(self.active_view == ActiveView::Security) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Security; - })), - ) - .child( - SidebarMenuItem::new("Logs") - .icon(IconName::File) - .active(self.active_view == ActiveView::Logs) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Logs; - })), - ) - .child( - SidebarMenuItem::new("About") - .icon(IconName::Info) - .active(self.active_view == ActiveView::About) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::About; - })), - ), - ), - ) - .footer(SidebarFooter::new().child("User Profile")), - ) - .child( - v_flex() - .size_full() - .child( - TitleBar::new().child( - h_flex() - .w_full() - .justify_between() - // .px_4() - .items_center() - .child( - // CORRECTED BUTTON SYNTAX - Button::new("sidebar_toggle") - .ghost() - .icon(IconName::PanelLeft) - .on_click(cx.listener(|this, _, _, _| { - this.collapsed = !this.collapsed; - })) - .tooltip("Toggle Sidebar"), - ), - ), - ) - .child(div().flex_grow().bg(cx.theme().background).child( - // Switch on the Enum to decide what to render - match self.active_view { - ActiveView::Home => HomeView::build(cx.theme()).into_any_element(), - ActiveView::Passkeys => PasskeysView::build().into_any_element(), - ActiveView::Configuration => ConfigView::build().into_any_element(), - ActiveView::Security => SecurityView::build().into_any_element(), - ActiveView::Logs => LogsView::build().into_any_element(), - ActiveView::About => AboutView::build().into_any_element(), - }, - )), - ) - } -} - fn main() { - let app = Application::new().with_assets(gpui_component_assets::Assets); + // TODO: Configure and add custom assets. + // let app = Application::new().with_assets(gpui_component_assets::Assets); + let app = Application::new().with_assets(ui::assets::Assets); app.run(move |cx| { gpui_component::init(cx); @@ -149,26 +20,41 @@ fn main() { cx.activate(true); let mut window_size = size(px(1280.0), px(720.0)); + + // Basically, make sure that the window is max to max 85 percent size of the actual monitor/display, + // so the window does not get too big on small monitors. if let Some(display) = cx.primary_display() { let display_size = display.bounds().size; + window_size.width = window_size.width.min(display_size.width * 0.85); window_size.height = window_size.height.min(display_size.height * 0.85); } + let window_bounds = Bounds::centered(None, window_size, cx); cx.spawn(async move |cx| { let window_options = WindowOptions { + app_id: Some("in.suyogtandel.picoforge".into()), + window_bounds: Some(WindowBounds::Windowed(window_bounds)), - titlebar: Some(TitleBar::title_bar_options()), + + titlebar: Some(TitlebarOptions { + title: Some("PicoForge".into()), + appears_transparent: true, + // TODO: This option needs to be tested and adjusted on macos + traffic_light_position: Some(gpui::point(px(12.0), px(12.0))), + }), + + #[cfg(any(target_os = "linux", target_os = "freebsd"))] + window_background: gpui::WindowBackgroundAppearance::Transparent, + #[cfg(any(target_os = "linux", target_os = "freebsd"))] + window_decorations: Some(gpui::WindowDecorations::Client), + window_min_size: Some(gpui::Size { - width: px(800.), - height: px(600.), + width: px(650.), + height: px(300.), }), kind: WindowKind::Normal, - #[cfg(target_os = "linux")] - window_background: gpui::WindowBackgroundAppearance::Transparent, - #[cfg(target_os = "linux")] - window_decorations: Some(gpui::WindowDecorations::Client), ..Default::default() }; diff --git a/src/ui/assets.rs b/src/ui/assets.rs new file mode 100644 index 0000000..5f02101 --- /dev/null +++ b/src/ui/assets.rs @@ -0,0 +1,29 @@ +#[allow(unused)] +use anyhow::anyhow; +use gpui::*; +use rust_embed::RustEmbed; +use std::borrow::Cow; + +/// An asset source that loads assets from the `./assets` folder. +#[derive(RustEmbed)] +#[folder = "./static"] +#[include = "**/*.svg"] +pub struct Assets; + +impl AssetSource for Assets { + fn load(&self, path: &str) -> Result>> { + if path.is_empty() { + return Ok(None); + } + + Self::get(path) + .map(|f| Some(f.data)) + .ok_or_else(|| anyhow!("could not find asset at path \"{path}\"")) + } + + fn list(&self, path: &str) -> Result> { + Ok(Self::iter() + .filter_map(|p| p.starts_with(path).then(|| p.into())) + .collect()) + } +} diff --git a/src/ui/color.rs b/src/ui/color.rs deleted file mode 100644 index a110c9b..0000000 --- a/src/ui/color.rs +++ /dev/null @@ -1,69 +0,0 @@ -#[allow(unused)] -pub mod light { - pub const BACKGROUND: u32 = 0xfefefe; - pub const FOREGROUND: u32 = 0x09090b; - pub const CARD: u32 = 0xfefefe; - pub const CARD_FOREGROUND: u32 = 0x09090b; - pub const POPOVER: u32 = 0xfefefe; - pub const POPOVER_FOREGROUND: u32 = 0x09090b; - pub const PRIMARY: u32 = 0x17171a; - pub const PRIMARY_FOREGROUND: u32 = 0xf9f9f9; - pub const SECONDARY: u32 = 0xf3f3f4; - pub const SECONDARY_FOREGROUND: u32 = 0x17171a; - pub const MUTED: u32 = 0xf3f3f4; - pub const MUTED_FOREGROUND: u32 = 0x70707b; - pub const ACCENT: u32 = 0xf3f3f4; - pub const ACCENT_FOREGROUND: u32 = 0x17171a; - pub const DESTRUCTIVE: u32 = 0xe7000a; - pub const BORDER: u32 = 0xe4e4e7; - pub const INPUT: u32 = 0xe4e4e7; - pub const RING: u32 = 0x9e9ea9; - pub const CHART_1: u32 = 0xf44900; - pub const CHART_2: u32 = 0x009689; - pub const CHART_3: u32 = 0x104e64; - pub const CHART_4: u32 = 0xffb900; - pub const CHART_5: u32 = 0xfd9900; - pub const SIDEBAR: u32 = 0xf9f9f9; - pub const SIDEBAR_FOREGROUND: u32 = 0x09090b; - pub const SIDEBAR_PRIMARY: u32 = 0x17171a; - pub const SIDEBAR_PRIMARY_FOREGROUND: u32 = 0xf9f9f9; - pub const SIDEBAR_ACCENT: u32 = 0xf3f3f4; - pub const SIDEBAR_ACCENT_FOREGROUND: u32 = 0x17171a; - pub const SIDEBAR_BORDER: u32 = 0xe4e4e7; - pub const SIDEBAR_RING: u32 = 0x9e9ea9; -} - -#[allow(unused)] -pub mod dark { - pub const BACKGROUND: u32 = 0x09090b; - pub const FOREGROUND: u32 = 0xf9f9f9; - pub const CARD: u32 = 0x17171a; - pub const CARD_FOREGROUND: u32 = 0xf9f9f9; - pub const POPOVER: u32 = 0x17171a; - pub const POPOVER_FOREGROUND: u32 = 0xf9f9f9; - pub const PRIMARY: u32 = 0xe4e4e7; - pub const PRIMARY_FOREGROUND: u32 = 0x17171a; - pub const SECONDARY: u32 = 0x26262a; - pub const SECONDARY_FOREGROUND: u32 = 0xf9f9f9; - pub const MUTED: u32 = 0x26262a; - pub const MUTED_FOREGROUND: u32 = 0x9e9ea9; - pub const ACCENT: u32 = 0x26262a; - pub const ACCENT_FOREGROUND: u32 = 0xf9f9f9; - pub const DESTRUCTIVE: u32 = 0xff6366; - pub const BORDER: u32 = 0xfefefe19; - pub const INPUT: u32 = 0xfefefe26; - pub const RING: u32 = 0x70707b; - pub const CHART_1: u32 = 0x1347e5; - pub const CHART_2: u32 = 0x00bc7c; - pub const CHART_3: u32 = 0xfd9900; - pub const CHART_4: u32 = 0xac46ff; - pub const CHART_5: u32 = 0xff1f56; - pub const SIDEBAR: u32 = 0x17171a; - pub const SIDEBAR_FOREGROUND: u32 = 0xf9f9f9; - pub const SIDEBAR_PRIMARY: u32 = 0x1347e5; - pub const SIDEBAR_PRIMARY_FOREGROUND: u32 = 0xf9f9f9; - pub const SIDEBAR_ACCENT: u32 = 0x26262a; - pub const SIDEBAR_ACCENT_FOREGROUND: u32 = 0xf9f9f9; - pub const SIDEBAR_BORDER: u32 = 0xfefefe19; - pub const SIDEBAR_RING: u32 = 0x70707b; -} diff --git a/src/ui/components/mod.rs b/src/ui/components/mod.rs new file mode 100644 index 0000000..e69de29 diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 940b096..c38a239 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -1,2 +1,3 @@ -pub mod color; pub mod views; +pub mod assets; +pub mod rootview; diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs new file mode 100644 index 0000000..d52105e --- /dev/null +++ b/src/ui/rootview.rs @@ -0,0 +1,141 @@ +use crate::ui::views::{ + about::AboutView, config::ConfigView, home::HomeView, logs::LogsView, passkeys::PasskeysView, + security::SecurityView, +}; +use gpui::*; +use gpui_component::button::{Button, ButtonVariants}; +use gpui_component::scroll::ScrollableElement; +use gpui_component::{ActiveTheme, Icon, IconName, TitleBar, h_flex, v_flex}; +use gpui_component::{Side, sidebar::*}; + +#[derive(Clone, Copy, PartialEq)] +enum ActiveView { + Home, + Passkeys, + Configuration, + Security, + Logs, + About, +} + +pub struct ApplicationRoot { + active_view: ActiveView, + collapsed: bool, +} + +impl ApplicationRoot { + pub fn new() -> Self { + Self { + active_view: ActiveView::Home, + collapsed: false, + } + } +} + +impl Render for ApplicationRoot { + fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { + h_flex() + .size_full() + .child( + Sidebar::new(Side::Left) + .collapsed(self.collapsed) + .collapsible(true) + .h_full() + .bg(rgb(0x18181b)) + // .header(SidebarHeader::new().child("PicoForge")) + .child( + SidebarGroup::new("Menu").child( + SidebarMenu::new() + .child( + SidebarMenuItem::new("Home") + .icon(Icon::default().path("icons/house.svg")) + .active(self.active_view == ActiveView::Home) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Home; + })), + ) + .child( + SidebarMenuItem::new("Passkeys") + .icon(Icon::default().path("icons/key-round.svg")) + .active(self.active_view == ActiveView::Passkeys) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Passkeys; + })), + ) + .child( + SidebarMenuItem::new("Configuration") + .icon(Icon::default().path("icons/settings.svg")) + .active(self.active_view == ActiveView::Configuration) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Configuration; + })), + ) + // TODO: Replace these icons with correct ones from lucide + .child( + SidebarMenuItem::new("Security") + .icon(Icon::default().path("icons/shield-check.svg")) + .active(self.active_view == ActiveView::Security) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Security; + })), + ) + .child( + SidebarMenuItem::new("Logs") + .icon(Icon::default().path("icons/scroll-text.svg")) + .active(self.active_view == ActiveView::Logs) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Logs; + })), + ) + .child( + SidebarMenuItem::new("About") + .icon(Icon::default().path("icons/shield-check.svg")) + .active(self.active_view == ActiveView::About) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::About; + })), + ), + ), + ), // .footer(SidebarFooter::new().child("Device Status")), + ) + .child( + v_flex() + .size_full() + .child( + TitleBar::new().child( + h_flex() + .w_full() + .justify_between() + // .px_4() + .items_center() + .cursor(gpui::CursorStyle::OpenHand) + .child( + Button::new("sidebar_toggle") + .ghost() + .icon(IconName::PanelLeft) + .on_click(cx.listener(|this, _, _, _| { + this.collapsed = !this.collapsed; + })) + .tooltip("Toggle Sidebar"), + ), + ), + ) + .child( + v_flex() + .min_h(px(0.)) + .min_w(px(0.)) + .overflow_y_scrollbar() + .flex_grow() + .bg(cx.theme().background) + .child(match self.active_view { + ActiveView::Home => HomeView::build(cx.theme()).into_any_element(), + ActiveView::Passkeys => PasskeysView::build().into_any_element(), + ActiveView::Configuration => ConfigView::build().into_any_element(), + ActiveView::Security => SecurityView::build().into_any_element(), + ActiveView::Logs => LogsView::build().into_any_element(), + ActiveView::About => AboutView::build().into_any_element(), + }), + ), + ) + } +} diff --git a/src/ui/views/home.rs b/src/ui/views/home.rs index 36b4713..78a192b 100644 --- a/src/ui/views/home.rs +++ b/src/ui/views/home.rs @@ -49,7 +49,7 @@ pub struct HomeView; impl HomeView { pub fn build(theme: &Theme) -> impl IntoElement { - // Mock Data + // Mock Data, I will replace this with fetching of actual data later, kinda bored rn. let device = DeviceState { connected: true, method: "HID".to_string(), @@ -60,8 +60,8 @@ impl HomeView { flash_total: 2048.0, }, config: DeviceConfig { - vid: 0xCAFE, - pid: 0xBABE, + vid: 0x0000, + pid: 0x0000, product_name: "Pico FIDO Key".to_string(), led_gpio: 25, led_brightness: 128, @@ -88,69 +88,62 @@ impl HomeView { .bg(theme.background) .flex() .flex_col() - .items_center() // Center the content + .items_center() .child( - div() - .w_full() - .max_w(px(1400.0)) // Max width constraint - .px_16() // Big padding on sides - .py_10() - .child( - v_flex() - .gap_8() - // Header Section - .child( - v_flex() - .gap_1() - .child( - div() - .text_xl() - .font_bold() - .text_color(theme.foreground) - .child("Device Overview"), - ) - .child( - div().text_sm().text_color(theme.muted_foreground).child( - "Quick view of your device status and specifications.", - ), + div().w_full().max_w(px(1400.0)).px_10().py_5().child( + v_flex() + .gap_8() + .child( + v_flex() + .child( + div() + .text_3xl() + .font_extrabold() + .text_color(theme.foreground) + .child("Device Overview"), + ) + .child( + div().text_sm().text_color(theme.muted_foreground).child( + "Quick view of your device status and specifications.", ), - ) - // Content Section - .child(if !device.connected { - // No Device Status Placeholder - div() - .flex() - .items_center() - .justify_center() - .h_64() - .border_1() - .border_color(theme.border) - .rounded_xl() - .child( - div() - .text_color(theme.muted_foreground) - .child("No Device Connected"), - ) - .into_any_element() - } else { - // 4 Card Grid - div() - .grid() - .grid_cols(2) - .gap_6() - .child(Self::render_device_info(&device, theme)) - .child(Self::render_fido_info(&device, theme)) - .child(Self::render_led_config(&device, theme)) - .child(Self::render_security_status(&device, theme)) - .into_any_element() - }), - ), + ), + ) + // Content Section + .child(if !device.connected { + // No Device Status Placeholder + div() + .flex() + .items_center() + .justify_center() + .h_64() + .border_1() + .border_color(theme.border) + .rounded_xl() + .child( + div() + .text_color(theme.muted_foreground) + .child("No Device Connected"), + ) + .into_any_element() + } else { + // 4 Card Grid + div() + .grid() + .grid_cols(2) + .gap_6() + .child(Self::render_device_info(&device, theme)) + .child(Self::render_fido_info(&device, theme)) + .child(Self::render_led_config(&device, theme)) + .child(Self::render_security_status(&device, theme)) + .into_any_element() + }), + ), ) } - fn render_card( + fn home_card( title: &str, - icon: IconName, + icon: Icon, content: impl IntoElement, theme: &Theme, ) -> impl IntoElement { @@ -213,9 +206,9 @@ impl HomeView { fn render_device_info(device: &DeviceState, theme: &Theme) -> impl IntoElement { let flash_percent = (device.info.flash_used / device.info.flash_total) * 100.0; - Self::render_card( + Self::home_card( "Device Information", - IconName::SquareTerminal, + Icon::default().path("icons/cpu.svg"), v_flex() .gap_6() .child( @@ -275,9 +268,9 @@ impl HomeView { } fn render_fido_info(device: &DeviceState, theme: &Theme) -> impl IntoElement { - Self::render_card( + Self::home_card( "FIDO2 Information", - IconName::Info, + Icon::default().path("icons/shield.svg"), if let Some(fido) = &device.fido_info { v_flex() .gap_6() @@ -330,9 +323,9 @@ impl HomeView { } fn render_led_config(device: &DeviceState, theme: &Theme) -> impl IntoElement { - Self::render_card( + Self::home_card( "LED Configuration", - IconName::LayoutDashboard, + Icon::default().path("icons/microchip.svg"), if device.method == "FIDO" { v_flex() .items_center() @@ -436,9 +429,9 @@ impl HomeView { } fn render_security_status(device: &DeviceState, theme: &Theme) -> impl IntoElement { - Self::render_card( + Self::home_card( "Security Status", - IconName::CircleCheck, + Icon::default().path("icons/shield-check.svg"), v_flex() .gap_3() .text_sm() diff --git a/src/icons/128x128.png b/static/appIcons/128x128.png similarity index 100% rename from src/icons/128x128.png rename to static/appIcons/128x128.png diff --git a/src/icons/128x128@2x.png b/static/appIcons/128x128@2x.png similarity index 100% rename from src/icons/128x128@2x.png rename to static/appIcons/128x128@2x.png diff --git a/src/icons/32x32.png b/static/appIcons/32x32.png similarity index 100% rename from src/icons/32x32.png rename to static/appIcons/32x32.png diff --git a/src/icons/64x64.png b/static/appIcons/64x64.png similarity index 100% rename from src/icons/64x64.png rename to static/appIcons/64x64.png diff --git a/src/icons/Square107x107Logo.png b/static/appIcons/Square107x107Logo.png similarity index 100% rename from src/icons/Square107x107Logo.png rename to static/appIcons/Square107x107Logo.png diff --git a/src/icons/Square142x142Logo.png b/static/appIcons/Square142x142Logo.png similarity index 100% rename from src/icons/Square142x142Logo.png rename to static/appIcons/Square142x142Logo.png diff --git a/src/icons/Square150x150Logo.png b/static/appIcons/Square150x150Logo.png similarity index 100% rename from src/icons/Square150x150Logo.png rename to static/appIcons/Square150x150Logo.png diff --git a/src/icons/Square284x284Logo.png b/static/appIcons/Square284x284Logo.png similarity index 100% rename from src/icons/Square284x284Logo.png rename to static/appIcons/Square284x284Logo.png diff --git a/src/icons/Square30x30Logo.png b/static/appIcons/Square30x30Logo.png similarity index 100% rename from src/icons/Square30x30Logo.png rename to static/appIcons/Square30x30Logo.png diff --git a/src/icons/Square310x310Logo.png b/static/appIcons/Square310x310Logo.png similarity index 100% rename from src/icons/Square310x310Logo.png rename to static/appIcons/Square310x310Logo.png diff --git a/src/icons/Square44x44Logo.png b/static/appIcons/Square44x44Logo.png similarity index 100% rename from src/icons/Square44x44Logo.png rename to static/appIcons/Square44x44Logo.png diff --git a/src/icons/Square71x71Logo.png b/static/appIcons/Square71x71Logo.png similarity index 100% rename from src/icons/Square71x71Logo.png rename to static/appIcons/Square71x71Logo.png diff --git a/src/icons/Square89x89Logo.png b/static/appIcons/Square89x89Logo.png similarity index 100% rename from src/icons/Square89x89Logo.png rename to static/appIcons/Square89x89Logo.png diff --git a/src/icons/StoreLogo.png b/static/appIcons/StoreLogo.png similarity index 100% rename from src/icons/StoreLogo.png rename to static/appIcons/StoreLogo.png diff --git a/src/icons/icon.icns b/static/appIcons/icon.icns similarity index 100% rename from src/icons/icon.icns rename to static/appIcons/icon.icns diff --git a/src/icons/icon.ico b/static/appIcons/icon.ico similarity index 100% rename from src/icons/icon.ico rename to static/appIcons/icon.ico diff --git a/src/icons/icon.png b/static/appIcons/icon.png similarity index 100% rename from src/icons/icon.png rename to static/appIcons/icon.png diff --git a/src/icons/in.suyogtandel.picoforge-symbolic.svg b/static/appIcons/in.suyogtandel.picoforge-symbolic.svg similarity index 100% rename from src/icons/in.suyogtandel.picoforge-symbolic.svg rename to static/appIcons/in.suyogtandel.picoforge-symbolic.svg diff --git a/src/icons/in.suyogtandel.picoforge.Devel.svg b/static/appIcons/in.suyogtandel.picoforge.Devel.svg similarity index 100% rename from src/icons/in.suyogtandel.picoforge.Devel.svg rename to static/appIcons/in.suyogtandel.picoforge.Devel.svg diff --git a/src/icons/in.suyogtandel.picoforge.source.svg b/static/appIcons/in.suyogtandel.picoforge.source.svg similarity index 100% rename from src/icons/in.suyogtandel.picoforge.source.svg rename to static/appIcons/in.suyogtandel.picoforge.source.svg diff --git a/src/icons/in.suyogtandel.picoforge.svg b/static/appIcons/in.suyogtandel.picoforge.svg similarity index 100% rename from src/icons/in.suyogtandel.picoforge.svg rename to static/appIcons/in.suyogtandel.picoforge.svg diff --git a/static/icons/a-large-small.svg b/static/icons/a-large-small.svg new file mode 100644 index 0000000..cfba2de --- /dev/null +++ b/static/icons/a-large-small.svg @@ -0,0 +1 @@ + diff --git a/static/icons/arrow-down.svg b/static/icons/arrow-down.svg new file mode 100644 index 0000000..bb5b04c --- /dev/null +++ b/static/icons/arrow-down.svg @@ -0,0 +1 @@ + diff --git a/static/icons/arrow-left.svg b/static/icons/arrow-left.svg new file mode 100644 index 0000000..ed03495 --- /dev/null +++ b/static/icons/arrow-left.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/static/icons/arrow-right.svg b/static/icons/arrow-right.svg new file mode 100644 index 0000000..519fffd --- /dev/null +++ b/static/icons/arrow-right.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/static/icons/arrow-up.svg b/static/icons/arrow-up.svg new file mode 100644 index 0000000..ad12519 --- /dev/null +++ b/static/icons/arrow-up.svg @@ -0,0 +1 @@ + diff --git a/static/icons/asterisk.svg b/static/icons/asterisk.svg new file mode 100644 index 0000000..b2d266f --- /dev/null +++ b/static/icons/asterisk.svg @@ -0,0 +1 @@ + diff --git a/static/icons/battery-charging.svg b/static/icons/battery-charging.svg new file mode 100644 index 0000000..91392c3 --- /dev/null +++ b/static/icons/battery-charging.svg @@ -0,0 +1,16 @@ + diff --git a/static/icons/battery-full.svg b/static/icons/battery-full.svg new file mode 100644 index 0000000..4279ecf --- /dev/null +++ b/static/icons/battery-full.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/battery-low.svg b/static/icons/battery-low.svg new file mode 100644 index 0000000..45bab8d --- /dev/null +++ b/static/icons/battery-low.svg @@ -0,0 +1,18 @@ + diff --git a/static/icons/battery-medium.svg b/static/icons/battery-medium.svg new file mode 100644 index 0000000..65d6ac1 --- /dev/null +++ b/static/icons/battery-medium.svg @@ -0,0 +1,18 @@ + diff --git a/static/icons/battery-warning.svg b/static/icons/battery-warning.svg new file mode 100644 index 0000000..aa35819 --- /dev/null +++ b/static/icons/battery-warning.svg @@ -0,0 +1,16 @@ + diff --git a/static/icons/battery.svg b/static/icons/battery.svg new file mode 100644 index 0000000..96d8ce1 --- /dev/null +++ b/static/icons/battery.svg @@ -0,0 +1,18 @@ + diff --git a/static/icons/bell.svg b/static/icons/bell.svg new file mode 100644 index 0000000..eecc3ef --- /dev/null +++ b/static/icons/bell.svg @@ -0,0 +1 @@ + diff --git a/static/icons/book-open.svg b/static/icons/book-open.svg new file mode 100644 index 0000000..0264197 --- /dev/null +++ b/static/icons/book-open.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/bot.svg b/static/icons/bot.svg new file mode 100644 index 0000000..efcd1bb --- /dev/null +++ b/static/icons/bot.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/building-2.svg b/static/icons/building-2.svg new file mode 100644 index 0000000..a5b2183 --- /dev/null +++ b/static/icons/building-2.svg @@ -0,0 +1,16 @@ + diff --git a/static/icons/calendar.svg b/static/icons/calendar.svg new file mode 100644 index 0000000..2724a48 --- /dev/null +++ b/static/icons/calendar.svg @@ -0,0 +1 @@ + diff --git a/static/icons/case-sensitive.svg b/static/icons/case-sensitive.svg new file mode 100644 index 0000000..648134f --- /dev/null +++ b/static/icons/case-sensitive.svg @@ -0,0 +1 @@ + diff --git a/static/icons/chart-pie.svg b/static/icons/chart-pie.svg new file mode 100644 index 0000000..b8439f4 --- /dev/null +++ b/static/icons/chart-pie.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/check.svg b/static/icons/check.svg new file mode 100644 index 0000000..16bb379 --- /dev/null +++ b/static/icons/check.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/static/icons/chevron-down.svg b/static/icons/chevron-down.svg new file mode 100644 index 0000000..1d316c7 --- /dev/null +++ b/static/icons/chevron-down.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/static/icons/chevron-left.svg b/static/icons/chevron-left.svg new file mode 100644 index 0000000..f27e97c --- /dev/null +++ b/static/icons/chevron-left.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/static/icons/chevron-right.svg b/static/icons/chevron-right.svg new file mode 100644 index 0000000..c1b76ee --- /dev/null +++ b/static/icons/chevron-right.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/static/icons/chevron-up.svg b/static/icons/chevron-up.svg new file mode 100644 index 0000000..f1bb1ad --- /dev/null +++ b/static/icons/chevron-up.svg @@ -0,0 +1 @@ + diff --git a/static/icons/chevrons-up-down.svg b/static/icons/chevrons-up-down.svg new file mode 100644 index 0000000..106fac0 --- /dev/null +++ b/static/icons/chevrons-up-down.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/static/icons/circle-check.svg b/static/icons/circle-check.svg new file mode 100644 index 0000000..4a7e101 --- /dev/null +++ b/static/icons/circle-check.svg @@ -0,0 +1 @@ + diff --git a/static/icons/circle-user.svg b/static/icons/circle-user.svg new file mode 100644 index 0000000..1d9b51d --- /dev/null +++ b/static/icons/circle-user.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/circle-x.svg b/static/icons/circle-x.svg new file mode 100644 index 0000000..803c8cb --- /dev/null +++ b/static/icons/circle-x.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/close.svg b/static/icons/close.svg new file mode 100644 index 0000000..346ec0b --- /dev/null +++ b/static/icons/close.svg @@ -0,0 +1 @@ + diff --git a/static/icons/copy.svg b/static/icons/copy.svg new file mode 100644 index 0000000..f3b629c --- /dev/null +++ b/static/icons/copy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/cpu.svg b/static/icons/cpu.svg new file mode 100644 index 0000000..52c7437 --- /dev/null +++ b/static/icons/cpu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/dash.svg b/static/icons/dash.svg new file mode 100644 index 0000000..a1264e7 --- /dev/null +++ b/static/icons/dash.svg @@ -0,0 +1,3 @@ + + + diff --git a/static/icons/delete.svg b/static/icons/delete.svg new file mode 100644 index 0000000..eb058d9 --- /dev/null +++ b/static/icons/delete.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/ellipsis-vertical.svg b/static/icons/ellipsis-vertical.svg new file mode 100644 index 0000000..c75a25a --- /dev/null +++ b/static/icons/ellipsis-vertical.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/ellipsis.svg b/static/icons/ellipsis.svg new file mode 100644 index 0000000..07dcab5 --- /dev/null +++ b/static/icons/ellipsis.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/external-link.svg b/static/icons/external-link.svg new file mode 100644 index 0000000..dfef5df --- /dev/null +++ b/static/icons/external-link.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/eye-off.svg b/static/icons/eye-off.svg new file mode 100644 index 0000000..abf1280 --- /dev/null +++ b/static/icons/eye-off.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/static/icons/eye.svg b/static/icons/eye.svg new file mode 100644 index 0000000..4b3a970 --- /dev/null +++ b/static/icons/eye.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/static/icons/file.svg b/static/icons/file.svg new file mode 100644 index 0000000..32c6b4a --- /dev/null +++ b/static/icons/file.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/folder-closed.svg b/static/icons/folder-closed.svg new file mode 100644 index 0000000..aa197b0 --- /dev/null +++ b/static/icons/folder-closed.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/folder-open.svg b/static/icons/folder-open.svg new file mode 100644 index 0000000..594de4c --- /dev/null +++ b/static/icons/folder-open.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/folder.svg b/static/icons/folder.svg new file mode 100644 index 0000000..c66c472 --- /dev/null +++ b/static/icons/folder.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/frame.svg b/static/icons/frame.svg new file mode 100644 index 0000000..6511851 --- /dev/null +++ b/static/icons/frame.svg @@ -0,0 +1,22 @@ + diff --git a/static/icons/gallery-vertical-end.svg b/static/icons/gallery-vertical-end.svg new file mode 100644 index 0000000..39b1f80 --- /dev/null +++ b/static/icons/gallery-vertical-end.svg @@ -0,0 +1,18 @@ + diff --git a/static/icons/github.svg b/static/icons/github.svg new file mode 100644 index 0000000..7b643a9 --- /dev/null +++ b/static/icons/github.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/globe.svg b/static/icons/globe.svg new file mode 100644 index 0000000..2082a43 --- /dev/null +++ b/static/icons/globe.svg @@ -0,0 +1 @@ + diff --git a/static/icons/hard-drive.svg b/static/icons/hard-drive.svg new file mode 100644 index 0000000..d49ce55 --- /dev/null +++ b/static/icons/hard-drive.svg @@ -0,0 +1,19 @@ + diff --git a/static/icons/heart-off.svg b/static/icons/heart-off.svg new file mode 100644 index 0000000..68cda02 --- /dev/null +++ b/static/icons/heart-off.svg @@ -0,0 +1 @@ + diff --git a/static/icons/heart.svg b/static/icons/heart.svg new file mode 100644 index 0000000..2f267c9 --- /dev/null +++ b/static/icons/heart.svg @@ -0,0 +1 @@ + diff --git a/static/icons/house.svg b/static/icons/house.svg new file mode 100644 index 0000000..53ca883 --- /dev/null +++ b/static/icons/house.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/inbox.svg b/static/icons/inbox.svg new file mode 100644 index 0000000..15d6fae --- /dev/null +++ b/static/icons/inbox.svg @@ -0,0 +1 @@ + diff --git a/static/icons/info.svg b/static/icons/info.svg new file mode 100644 index 0000000..a2771b4 --- /dev/null +++ b/static/icons/info.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/inspector.svg b/static/icons/inspector.svg new file mode 100644 index 0000000..c3517a4 --- /dev/null +++ b/static/icons/inspector.svg @@ -0,0 +1,18 @@ + diff --git a/static/icons/key-round.svg b/static/icons/key-round.svg new file mode 100644 index 0000000..70cebb5 --- /dev/null +++ b/static/icons/key-round.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/key.svg b/static/icons/key.svg new file mode 100644 index 0000000..bd2abfd --- /dev/null +++ b/static/icons/key.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/layout-dashboard.svg b/static/icons/layout-dashboard.svg new file mode 100644 index 0000000..15cb8de --- /dev/null +++ b/static/icons/layout-dashboard.svg @@ -0,0 +1,24 @@ + diff --git a/static/icons/loader-circle.svg b/static/icons/loader-circle.svg new file mode 100644 index 0000000..3540a06 --- /dev/null +++ b/static/icons/loader-circle.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/loader.svg b/static/icons/loader.svg new file mode 100644 index 0000000..f6ff93f --- /dev/null +++ b/static/icons/loader.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/static/icons/lock-open.svg b/static/icons/lock-open.svg new file mode 100644 index 0000000..dcdf5b0 --- /dev/null +++ b/static/icons/lock-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/lock.svg b/static/icons/lock.svg new file mode 100644 index 0000000..207dd2f --- /dev/null +++ b/static/icons/lock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/map.svg b/static/icons/map.svg new file mode 100644 index 0000000..bb909ec --- /dev/null +++ b/static/icons/map.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/maximize.svg b/static/icons/maximize.svg new file mode 100644 index 0000000..b3504b5 --- /dev/null +++ b/static/icons/maximize.svg @@ -0,0 +1 @@ + diff --git a/static/icons/memory-stick.svg b/static/icons/memory-stick.svg new file mode 100644 index 0000000..7d12b57 --- /dev/null +++ b/static/icons/memory-stick.svg @@ -0,0 +1,22 @@ + diff --git a/static/icons/menu.svg b/static/icons/menu.svg new file mode 100644 index 0000000..6598697 --- /dev/null +++ b/static/icons/menu.svg @@ -0,0 +1 @@ + diff --git a/static/icons/microchip.svg b/static/icons/microchip.svg new file mode 100644 index 0000000..1be77cf --- /dev/null +++ b/static/icons/microchip.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/minimize.svg b/static/icons/minimize.svg new file mode 100644 index 0000000..3f81a42 --- /dev/null +++ b/static/icons/minimize.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/static/icons/minus.svg b/static/icons/minus.svg new file mode 100644 index 0000000..ab04a16 --- /dev/null +++ b/static/icons/minus.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/static/icons/moon.svg b/static/icons/moon.svg new file mode 100644 index 0000000..dfadc20 --- /dev/null +++ b/static/icons/moon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/network.svg b/static/icons/network.svg new file mode 100644 index 0000000..a6f0aaa --- /dev/null +++ b/static/icons/network.svg @@ -0,0 +1,20 @@ + diff --git a/static/icons/palette.svg b/static/icons/palette.svg new file mode 100644 index 0000000..b50674d --- /dev/null +++ b/static/icons/palette.svg @@ -0,0 +1 @@ + diff --git a/static/icons/panel-bottom-open.svg b/static/icons/panel-bottom-open.svg new file mode 100644 index 0000000..df77e5b --- /dev/null +++ b/static/icons/panel-bottom-open.svg @@ -0,0 +1 @@ + diff --git a/static/icons/panel-bottom.svg b/static/icons/panel-bottom.svg new file mode 100644 index 0000000..ebe599c --- /dev/null +++ b/static/icons/panel-bottom.svg @@ -0,0 +1 @@ + diff --git a/static/icons/panel-left-close.svg b/static/icons/panel-left-close.svg new file mode 100644 index 0000000..5f26cc6 --- /dev/null +++ b/static/icons/panel-left-close.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/panel-left-open.svg b/static/icons/panel-left-open.svg new file mode 100644 index 0000000..579e458 --- /dev/null +++ b/static/icons/panel-left-open.svg @@ -0,0 +1 @@ + diff --git a/static/icons/panel-left.svg b/static/icons/panel-left.svg new file mode 100644 index 0000000..fc23b5d --- /dev/null +++ b/static/icons/panel-left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/panel-right-close.svg b/static/icons/panel-right-close.svg new file mode 100644 index 0000000..5fe9dcd --- /dev/null +++ b/static/icons/panel-right-close.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/panel-right-open.svg b/static/icons/panel-right-open.svg new file mode 100644 index 0000000..3b5ff0b --- /dev/null +++ b/static/icons/panel-right-open.svg @@ -0,0 +1 @@ + diff --git a/static/icons/panel-right.svg b/static/icons/panel-right.svg new file mode 100644 index 0000000..d29a4a5 --- /dev/null +++ b/static/icons/panel-right.svg @@ -0,0 +1 @@ + diff --git a/static/icons/pause.svg b/static/icons/pause.svg new file mode 100644 index 0000000..a36563a --- /dev/null +++ b/static/icons/pause.svg @@ -0,0 +1 @@ + diff --git a/static/icons/play.svg b/static/icons/play.svg new file mode 100644 index 0000000..2d5f067 --- /dev/null +++ b/static/icons/play.svg @@ -0,0 +1 @@ + diff --git a/static/icons/plus.svg b/static/icons/plus.svg new file mode 100644 index 0000000..651bbd4 --- /dev/null +++ b/static/icons/plus.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/redo-2.svg b/static/icons/redo-2.svg new file mode 100644 index 0000000..7ea3df9 --- /dev/null +++ b/static/icons/redo-2.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/redo.svg b/static/icons/redo.svg new file mode 100644 index 0000000..b90dfa5 --- /dev/null +++ b/static/icons/redo.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/refresh-cw.svg b/static/icons/refresh-cw.svg new file mode 100644 index 0000000..b0edef9 --- /dev/null +++ b/static/icons/refresh-cw.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/replace.svg b/static/icons/replace.svg new file mode 100644 index 0000000..5d7b480 --- /dev/null +++ b/static/icons/replace.svg @@ -0,0 +1,16 @@ + diff --git a/static/icons/resize-corner.svg b/static/icons/resize-corner.svg new file mode 100644 index 0000000..31065be --- /dev/null +++ b/static/icons/resize-corner.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/static/icons/save.svg b/static/icons/save.svg new file mode 100644 index 0000000..b2561b3 --- /dev/null +++ b/static/icons/save.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/scroll-text.svg b/static/icons/scroll-text.svg new file mode 100644 index 0000000..07a0946 --- /dev/null +++ b/static/icons/scroll-text.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/search.svg b/static/icons/search.svg new file mode 100644 index 0000000..a658349 --- /dev/null +++ b/static/icons/search.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/static/icons/settings-2.svg b/static/icons/settings-2.svg new file mode 100644 index 0000000..31b06f7 --- /dev/null +++ b/static/icons/settings-2.svg @@ -0,0 +1,16 @@ + diff --git a/static/icons/settings.svg b/static/icons/settings.svg new file mode 100644 index 0000000..e28dad8 --- /dev/null +++ b/static/icons/settings.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/shield-check.svg b/static/icons/shield-check.svg new file mode 100644 index 0000000..e9dc0d9 --- /dev/null +++ b/static/icons/shield-check.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/shield.svg b/static/icons/shield.svg new file mode 100644 index 0000000..77ef4fb --- /dev/null +++ b/static/icons/shield.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/sort-ascending.svg b/static/icons/sort-ascending.svg new file mode 100644 index 0000000..bc17bd7 --- /dev/null +++ b/static/icons/sort-ascending.svg @@ -0,0 +1,15 @@ + + + + diff --git a/static/icons/sort-descending.svg b/static/icons/sort-descending.svg new file mode 100644 index 0000000..f41eecb --- /dev/null +++ b/static/icons/sort-descending.svg @@ -0,0 +1,15 @@ + + + + diff --git a/static/icons/square-terminal.svg b/static/icons/square-terminal.svg new file mode 100644 index 0000000..917dd1f --- /dev/null +++ b/static/icons/square-terminal.svg @@ -0,0 +1,19 @@ + diff --git a/static/icons/star-fill.svg b/static/icons/star-fill.svg new file mode 100644 index 0000000..3d542a9 --- /dev/null +++ b/static/icons/star-fill.svg @@ -0,0 +1 @@ + diff --git a/static/icons/star-off.svg b/static/icons/star-off.svg new file mode 100644 index 0000000..a262060 --- /dev/null +++ b/static/icons/star-off.svg @@ -0,0 +1 @@ + diff --git a/static/icons/star.svg b/static/icons/star.svg new file mode 100644 index 0000000..8d93131 --- /dev/null +++ b/static/icons/star.svg @@ -0,0 +1 @@ + diff --git a/static/icons/sun.svg b/static/icons/sun.svg new file mode 100644 index 0000000..668d778 --- /dev/null +++ b/static/icons/sun.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/tag.svg b/static/icons/tag.svg new file mode 100644 index 0000000..2a0f6e5 --- /dev/null +++ b/static/icons/tag.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/terminal.svg b/static/icons/terminal.svg new file mode 100644 index 0000000..30eaa6e --- /dev/null +++ b/static/icons/terminal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/thumbs-down.svg b/static/icons/thumbs-down.svg new file mode 100644 index 0000000..816273e --- /dev/null +++ b/static/icons/thumbs-down.svg @@ -0,0 +1 @@ + diff --git a/static/icons/thumbs-up.svg b/static/icons/thumbs-up.svg new file mode 100644 index 0000000..01fae76 --- /dev/null +++ b/static/icons/thumbs-up.svg @@ -0,0 +1 @@ + diff --git a/static/icons/trash-2.svg b/static/icons/trash-2.svg new file mode 100644 index 0000000..d82ac24 --- /dev/null +++ b/static/icons/trash-2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/triangle-alert.svg b/static/icons/triangle-alert.svg new file mode 100644 index 0000000..1a5b698 --- /dev/null +++ b/static/icons/triangle-alert.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/undo-2.svg b/static/icons/undo-2.svg new file mode 100644 index 0000000..660356e --- /dev/null +++ b/static/icons/undo-2.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/undo.svg b/static/icons/undo.svg new file mode 100644 index 0000000..e66126a --- /dev/null +++ b/static/icons/undo.svg @@ -0,0 +1,14 @@ + diff --git a/static/icons/user.svg b/static/icons/user.svg new file mode 100644 index 0000000..aabc54f --- /dev/null +++ b/static/icons/user.svg @@ -0,0 +1,16 @@ + diff --git a/static/icons/window-close.svg b/static/icons/window-close.svg new file mode 100644 index 0000000..62b6b0c --- /dev/null +++ b/static/icons/window-close.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/static/icons/window-maximize.svg b/static/icons/window-maximize.svg new file mode 100644 index 0000000..9da4cd7 --- /dev/null +++ b/static/icons/window-maximize.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/static/icons/window-minimize.svg b/static/icons/window-minimize.svg new file mode 100644 index 0000000..708e27b --- /dev/null +++ b/static/icons/window-minimize.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/static/icons/window-restore.svg b/static/icons/window-restore.svg new file mode 100644 index 0000000..896b6b6 --- /dev/null +++ b/static/icons/window-restore.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/static/in.suyogtandel.picoforge.svg b/static/in.suyogtandel.picoforge.svg deleted file mode 100644 index 0c8f937..0000000 --- a/static/in.suyogtandel.picoforge.svg +++ /dev/null @@ -1,270 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 38d05db1c5e6f05d5e7303d0005f473f731c7bd9 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Wed, 28 Jan 2026 00:16:10 +0530 Subject: [PATCH 03/37] feat: add zinc colors from shadcnui --- src/ui/colors.rs | 14 ++++++++++++++ src/ui/mod.rs | 1 + 2 files changed, 15 insertions(+) create mode 100644 src/ui/colors.rs diff --git a/src/ui/colors.rs b/src/ui/colors.rs new file mode 100644 index 0000000..218f207 --- /dev/null +++ b/src/ui/colors.rs @@ -0,0 +1,14 @@ +pub mod zinc { + #![allow(unused)] + pub const ZINC50: u32 = 0xfafafa; + pub const ZINC100: u32 = 0xf4f4f5; + pub const ZINC200: u32 = 0xe4e4e7; + pub const ZINC300: u32 = 0xd4d4d8; + pub const ZINC400: u32 = 0xa1a1aa; + pub const ZINC500: u32 = 0x71717a; + pub const ZINC600: u32 = 0x52525b; + pub const ZINC700: u32 = 0x3f3f46; + pub const ZINC800: u32 = 0x27272a; + pub const ZINC900: u32 = 0x18181b; + pub const ZINC950: u32 = 0x09090b; +} \ No newline at end of file diff --git a/src/ui/mod.rs b/src/ui/mod.rs index c38a239..43ff877 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -1,3 +1,4 @@ pub mod views; pub mod assets; pub mod rootview; +pub mod colors; From 0d837a19b4083e8ada3fcbd5b3b3c20f302bb888 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Wed, 28 Jan 2026 17:29:07 +0530 Subject: [PATCH 04/37] chore: change code formatting, use space for tabs and indents instead of tabs --- Cargo.lock | 31 -- Cargo.toml | 4 +- rustfmt.toml | 2 +- src/device/error.rs | 68 +-- src/device/fido/constants.rs | 446 +++++++-------- src/device/fido/hid.rs | 868 ++++++++++++++--------------- src/device/fido/mod.rs | 792 +++++++++++++-------------- src/device/io.rs | 52 +- src/device/logging.rs | 8 +- src/device/rescue/constants.rs | 98 ++-- src/device/rescue/mod.rs | 684 +++++++++++------------ src/device/types.rs | 102 ++-- src/main.rs | 91 ++-- src/ui/assets.rs | 26 +- src/ui/colors.rs | 2 +- src/ui/mod.rs | 4 +- src/ui/rootview.rs | 244 ++++----- src/ui/views/about.rs | 6 +- src/ui/views/config.rs | 12 +- src/ui/views/home.rs | 962 ++++++++++++++++----------------- src/ui/views/logs.rs | 6 +- src/ui/views/passkeys.rs | 12 +- src/ui/views/security.rs | 12 +- 23 files changed, 2248 insertions(+), 2284 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index be4e9dd..772b466 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1469,15 +1469,6 @@ dependencies = [ "dirs-sys 0.4.1", ] -[[package]] -name = "dirs" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" -dependencies = [ - "dirs-sys 0.5.0", -] - [[package]] name = "dirs-sys" version = "0.3.7" @@ -2416,17 +2407,6 @@ dependencies = [ "zed-sum-tree", ] -[[package]] -name = "gpui-component-assets" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5842ea3f1e596fbc611894dcc0266df7125bc226f603ca313f5460b700503564" -dependencies = [ - "anyhow", - "gpui", - "rust-embed", -] - [[package]] name = "gpui-component-macros" version = "0.5.0" @@ -4304,7 +4284,6 @@ dependencies = [ "directories", "gpui", "gpui-component", - "gpui-component-assets", "hex", "hidapi", "log", @@ -4986,7 +4965,6 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "shellexpand", "syn 2.0.114", "walkdir", ] @@ -5503,15 +5481,6 @@ dependencies = [ "digest", ] -[[package]] -name = "shellexpand" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb" -dependencies = [ - "dirs 6.0.0", -] - [[package]] name = "shlex" version = "1.3.0" diff --git a/Cargo.toml b/Cargo.toml index bf8285f..055b1fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ license = "AGPL-3.0" edition = "2024" [dependencies] -tokio = { version = "1.0", features = ["full"] } +tokio = { version = "1.49", features = ["full"] } serde = { version = "1", features = ["derive"] } serde_json = "1" log = "0.4" # Logging facade @@ -30,8 +30,6 @@ ring = "0.17" # For signing fido2 messages with pin token # For Application UI: gpui = "0.2.2" gpui-component = "0.5.0" -# Optional, for default bundled assets -gpui-component-assets = "0.5.0" rust-embed = "8.11.0" [profile.dev] diff --git a/rustfmt.toml b/rustfmt.toml index 69d92fe..a3a65db 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,4 +1,4 @@ edition = "2024" -hard_tabs = true +hard_tabs = false tab_spaces = 4 max_width = 100 diff --git a/src/device/error.rs b/src/device/error.rs index 1dee0ed..539e561 100644 --- a/src/device/error.rs +++ b/src/device/error.rs @@ -1,44 +1,44 @@ /// Custom error types for Pico Forge application. #[derive(Debug, thiserror::Error)] pub enum PFError { - #[error("No device found")] - NoDevice, - #[error("PCSC Error: {0}")] - Pcsc(#[from] pcsc::Error), - #[error("IO/Hex Error: {0}")] - Io(String), - #[error("Device Error: {0}")] - Device(String), + #[error("No device found")] + NoDevice, + #[error("PCSC Error: {0}")] + Pcsc(#[from] pcsc::Error), + #[error("IO/Hex Error: {0}")] + Io(String), + #[error("Device Error: {0}")] + Device(String), } // Allow error to be serialized to string for Tauri impl serde::Serialize for PFError { - fn serialize(&self, serializer: S) -> Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut state = serializer.serialize_struct("PFError", 2)?; - match self { - PFError::NoDevice => { - state.serialize_field("type", "NoDevice")?; - state.serialize_field("message", "No device found")?; - } - PFError::Pcsc(err) => { - state.serialize_field("type", "Pcsc")?; - state.serialize_field("message", &err.to_string())?; - } - PFError::Io(msg) => { - state.serialize_field("type", "Io")?; - state.serialize_field("message", msg)?; - } - PFError::Device(msg) => { - state.serialize_field("type", "Device")?; - state.serialize_field("message", msg)?; - } - } - state.end() - } + fn serialize(&self, serializer: S) -> Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut state = serializer.serialize_struct("PFError", 2)?; + match self { + PFError::NoDevice => { + state.serialize_field("type", "NoDevice")?; + state.serialize_field("message", "No device found")?; + } + PFError::Pcsc(err) => { + state.serialize_field("type", "Pcsc")?; + state.serialize_field("message", &err.to_string())?; + } + PFError::Io(msg) => { + state.serialize_field("type", "Io")?; + state.serialize_field("message", msg)?; + } + PFError::Device(msg) => { + state.serialize_field("type", "Device")?; + state.serialize_field("message", msg)?; + } + } + state.end() + } } // pub type Result = std::result::Result; diff --git a/src/device/fido/constants.rs b/src/device/fido/constants.rs index 5be640c..0c4801d 100644 --- a/src/device/fido/constants.rs +++ b/src/device/fido/constants.rs @@ -6,358 +6,358 @@ use std::fmt; #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum CtapCommand { - MakeCredential = 0x01, - GetAssertion = 0x02, - GetInfo = 0x04, - ClientPin = 0x06, - Reset = 0x07, - GetNextAssertion = 0x08, - CredentialMgmt = 0x0A, - Selection = 0x0B, - LargeBlobs = 0x0C, - Config = 0x0D, + MakeCredential = 0x01, + GetAssertion = 0x02, + GetInfo = 0x04, + ClientPin = 0x06, + Reset = 0x07, + GetNextAssertion = 0x08, + CredentialMgmt = 0x0A, + Selection = 0x0B, + LargeBlobs = 0x0C, + Config = 0x0D, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum U2fCommand { - Register = 0x01, - Authenticate = 0x02, - Version = 0x03, + Register = 0x01, + Authenticate = 0x02, + Version = 0x03, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum VendorCommand { - Backup = 0x01, - ManageSecurityEnvironment = 0x02, - Unlock = 0x03, - EnterpriseAttestation = 0x04, - PhysicalOptions = 0x05, - Memory = 0x06, + Backup = 0x01, + ManageSecurityEnvironment = 0x02, + Unlock = 0x03, + EnterpriseAttestation = 0x04, + PhysicalOptions = 0x05, + Memory = 0x06, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum AuthenticateControl { - EnforceUserPresence = 0x03, - CheckOnly = 0x07, + EnforceUserPresence = 0x03, + CheckOnly = 0x07, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum ClientPinSubCommand { - GetPinRetries = 0x01, - GetKeyAgreement = 0x02, - SetPin = 0x03, - ChangePin = 0x04, - GetPinToken = 0x05, - GetPinUvAuthTokenUsingUvWithPermissions = 0x06, - GetUvRetries = 0x07, - GetPinUvAuthTokenUsingPinWithPermissions = 0x08, + GetPinRetries = 0x01, + GetKeyAgreement = 0x02, + SetPin = 0x03, + ChangePin = 0x04, + GetPinToken = 0x05, + GetPinUvAuthTokenUsingUvWithPermissions = 0x06, + GetUvRetries = 0x07, + GetPinUvAuthTokenUsingPinWithPermissions = 0x08, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum MakeCredentialParam { - ClientDataHash = 0x01, - Rp = 0x02, - User = 0x03, - PubKeyCredParams = 0x04, - ExcludeList = 0x05, - Extensions = 0x06, - Options = 0x07, - PinUvAuthParam = 0x08, - PinUvAuthProtocol = 0x09, - EnterpriseAttestation = 0x0A, + ClientDataHash = 0x01, + Rp = 0x02, + User = 0x03, + PubKeyCredParams = 0x04, + ExcludeList = 0x05, + Extensions = 0x06, + Options = 0x07, + PinUvAuthParam = 0x08, + PinUvAuthProtocol = 0x09, + EnterpriseAttestation = 0x0A, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum GetAssertionParam { - RpId = 0x01, - ClientDataHash = 0x02, - AllowList = 0x03, - Extensions = 0x04, - Options = 0x05, - PinUvAuthParam = 0x06, - PinUvAuthProtocol = 0x07, + RpId = 0x01, + ClientDataHash = 0x02, + AllowList = 0x03, + Extensions = 0x04, + Options = 0x05, + PinUvAuthParam = 0x06, + PinUvAuthProtocol = 0x07, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum ClientPinParam { - PinUvAuthProtocol = 0x01, - SubCommand = 0x02, - KeyAgreement = 0x03, - PinUvAuthParam = 0x04, - NewPinEnc = 0x05, - PinHashEnc = 0x06, - Permissions = 0x09, - PermissionsRpId = 0x0A, + PinUvAuthProtocol = 0x01, + SubCommand = 0x02, + KeyAgreement = 0x03, + PinUvAuthParam = 0x04, + NewPinEnc = 0x05, + PinHashEnc = 0x06, + Permissions = 0x09, + PermissionsRpId = 0x0A, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum ConfigParam { - SubCommand = 0x01, - SubCommandParams = 0x02, - PinUvAuthProtocol = 0x03, - PinUvAuthParam = 0x04, + SubCommand = 0x01, + SubCommandParams = 0x02, + PinUvAuthProtocol = 0x03, + PinUvAuthParam = 0x04, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum ConfigSubCommand { - EnableEnterpriseAttestation = 0x01, - ToggleAlwaysUv = 0x02, - SetMinPinLength = 0x03, - VendorPrototype = 0xFF, + EnableEnterpriseAttestation = 0x01, + ToggleAlwaysUv = 0x02, + SetMinPinLength = 0x03, + VendorPrototype = 0xFF, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum VendorParam { - VendorCommand = 0x01, - VendorSubParams = 0x02, - PinUvAuthProtocol = 0x03, - PinUvAuthParam = 0x04, + VendorCommand = 0x01, + VendorSubParams = 0x02, + PinUvAuthProtocol = 0x03, + PinUvAuthParam = 0x04, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum VendorSubParam { - VendorParam = 0x01, - CoseKey = 0x02, - VendorParamInt = 0x03, - VendorParamText = 0x04, + VendorParam = 0x01, + CoseKey = 0x02, + VendorParamInt = 0x03, + VendorParamText = 0x04, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum ConfigSubCommandParam { - NewMinPinLength = 0x01, - MinPinLengthRPIDs = 0x02, - ForceChangePin = 0x03, + NewMinPinLength = 0x01, + MinPinLengthRPIDs = 0x02, + ForceChangePin = 0x03, } #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum VendorConfigCommand { - AuthEncryptionEnable, - AuthEncryptionDisable, - EnterpriseAttestationUpload, - PinComplexityPolicy, - PhysicalVidPid, - PhysicalLedBrightness, - PhysicalLedGpio, - PhysicalOptions, + AuthEncryptionEnable, + AuthEncryptionDisable, + EnterpriseAttestationUpload, + PinComplexityPolicy, + PhysicalVidPid, + PhysicalLedBrightness, + PhysicalLedGpio, + PhysicalOptions, } impl VendorConfigCommand { - pub fn to_u64(self) -> u64 { - match self { - Self::AuthEncryptionEnable => 0x03e43f56b34285e2, - Self::AuthEncryptionDisable => 0x1831a40f04a25ed9, - Self::EnterpriseAttestationUpload => 0x66f2a674c29a8dcf, - Self::PinComplexityPolicy => 0x6c07d70fe96c3897, - Self::PhysicalVidPid => 0x6fcb19b0cbe3acfa, - Self::PhysicalLedBrightness => 0x76a85945985d02fd, - Self::PhysicalLedGpio => 0x7b392a394de9f948, - Self::PhysicalOptions => 0x269f3b09eceb805f, - } - } + pub fn to_u64(self) -> u64 { + match self { + Self::AuthEncryptionEnable => 0x03e43f56b34285e2, + Self::AuthEncryptionDisable => 0x1831a40f04a25ed9, + Self::EnterpriseAttestationUpload => 0x66f2a674c29a8dcf, + Self::PinComplexityPolicy => 0x6c07d70fe96c3897, + Self::PhysicalVidPid => 0x6fcb19b0cbe3acfa, + Self::PhysicalLedBrightness => 0x76a85945985d02fd, + Self::PhysicalLedGpio => 0x7b392a394de9f948, + Self::PhysicalOptions => 0x269f3b09eceb805f, + } + } - pub fn from_u64(val: u64) -> Option { - match val { - 0x03e43f56b34285e2 => Some(Self::AuthEncryptionEnable), - 0x1831a40f04a25ed9 => Some(Self::AuthEncryptionDisable), - 0x66f2a674c29a8dcf => Some(Self::EnterpriseAttestationUpload), - 0x6c07d70fe96c3897 => Some(Self::PinComplexityPolicy), - 0x6fcb19b0cbe3acfa => Some(Self::PhysicalVidPid), - 0x76a85945985d02fd => Some(Self::PhysicalLedBrightness), - 0x7b392a394de9f948 => Some(Self::PhysicalLedGpio), - 0x269f3b09eceb805f => Some(Self::PhysicalOptions), - _ => None, - } - } + pub fn from_u64(val: u64) -> Option { + match val { + 0x03e43f56b34285e2 => Some(Self::AuthEncryptionEnable), + 0x1831a40f04a25ed9 => Some(Self::AuthEncryptionDisable), + 0x66f2a674c29a8dcf => Some(Self::EnterpriseAttestationUpload), + 0x6c07d70fe96c3897 => Some(Self::PinComplexityPolicy), + 0x6fcb19b0cbe3acfa => Some(Self::PhysicalVidPid), + 0x76a85945985d02fd => Some(Self::PhysicalLedBrightness), + 0x7b392a394de9f948 => Some(Self::PhysicalLedGpio), + 0x269f3b09eceb805f => Some(Self::PhysicalOptions), + _ => None, + } + } } impl fmt::Display for VendorConfigCommand { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - match self { - Self::AuthEncryptionEnable => write!(f, "AuthEncryptionEnable"), - Self::AuthEncryptionDisable => write!(f, "AuthEncryptionDisable"), - Self::EnterpriseAttestationUpload => write!(f, "EnterpriseAttestationUpload"), - Self::PinComplexityPolicy => write!(f, "PinComplexityPolicy"), - Self::PhysicalVidPid => write!(f, "PhysicalVidPid"), - Self::PhysicalLedBrightness => write!(f, "PhysicalLedBrightness"), - Self::PhysicalLedGpio => write!(f, "PhysicalLedGpio"), - Self::PhysicalOptions => write!(f, "PhysicalOptions"), - } - } + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + Self::AuthEncryptionEnable => write!(f, "AuthEncryptionEnable"), + Self::AuthEncryptionDisable => write!(f, "AuthEncryptionDisable"), + Self::EnterpriseAttestationUpload => write!(f, "EnterpriseAttestationUpload"), + Self::PinComplexityPolicy => write!(f, "PinComplexityPolicy"), + Self::PhysicalVidPid => write!(f, "PhysicalVidPid"), + Self::PhysicalLedBrightness => write!(f, "PhysicalLedBrightness"), + Self::PhysicalLedGpio => write!(f, "PhysicalLedGpio"), + Self::PhysicalOptions => write!(f, "PhysicalOptions"), + } + } } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum BackupSubCommand { - GetEncryptedBackup = 0x01, - RestoreEncryptedBackup = 0x02, + GetEncryptedBackup = 0x01, + RestoreEncryptedBackup = 0x02, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum MseSubCommand { - KeyAgreement = 0x01, + KeyAgreement = 0x01, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum EnterpriseAttestationSubCommand { - GenerateCsr = 0x01, + GenerateCsr = 0x01, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum PhysicalOptionsSubCommand { - GetOptions = 0x01, + GetOptions = 0x01, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum MemorySubCommand { - GetStats = 0x01, + GetStats = 0x01, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum MemoryResponseKey { - FreeSpace = 0x01, - UsedSpace = 0x02, - TotalSpace = 0x03, - NumFiles = 0x04, - FlashSize = 0x05, + FreeSpace = 0x01, + UsedSpace = 0x02, + TotalSpace = 0x03, + NumFiles = 0x04, + FlashSize = 0x05, } bitflags::bitflags! { - pub struct PinUvAuthTokenPermissions: u8 { - const MAKE_CREDENTIAL = 0x01; - const GET_ASSERTION = 0x02; - const CREDENTIAL_MANAGEMENT = 0x04; - const BIO_ENROLLMENT = 0x08; - const LARGE_BLOB_WRITE = 0x10; - const AUTHENTICATOR_CONFIG = 0x20; - const PER_CREDENTIAL_MGMT_READONLY = 0x40; - } + pub struct PinUvAuthTokenPermissions: u8 { + const MAKE_CREDENTIAL = 0x01; + const GET_ASSERTION = 0x02; + const CREDENTIAL_MANAGEMENT = 0x04; + const BIO_ENROLLMENT = 0x08; + const LARGE_BLOB_WRITE = 0x10; + const AUTHENTICATOR_CONFIG = 0x20; + const PER_CREDENTIAL_MGMT_READONLY = 0x40; + } } bitflags::bitflags! { - pub struct AuthenticatorFlags: u8 { - const USER_PRESENT = 0x01; - const USER_VERIFIED = 0x04; - const ATTESTED_CREDENTIAL_DATA = 0x40; - const EXTENSION_DATA = 0x80; - } + pub struct AuthenticatorFlags: u8 { + const USER_PRESENT = 0x01; + const USER_VERIFIED = 0x04; + const ATTESTED_CREDENTIAL_DATA = 0x40; + const EXTENSION_DATA = 0x80; + } } bitflags::bitflags! { - pub struct AuthenticatorOptions: u8 { - const ENTERPRISE_ATTESTATION = 0x01; - const USER_VERIFICATION = 0x02; - } + pub struct AuthenticatorOptions: u8 { + const ENTERPRISE_ATTESTATION = 0x01; + const USER_VERIFICATION = 0x02; + } } #[repr(i32)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum CoseAlgorithm { - ES256 = -7, - EdDSA = -8, - ESP256 = -9, - Ed25519 = -19, - EcdhEsHkdf256 = -25, - ES384 = -35, - ES512 = -36, - ES256K = -47, - ESP384 = -51, - ESP512 = -52, - Ed448 = -53, - RS256 = -257, - RS384 = -258, - RS512 = -259, - ESB256 = -265, - ESB384 = -267, - ESB512 = -268, + ES256 = -7, + EdDSA = -8, + ESP256 = -9, + Ed25519 = -19, + EcdhEsHkdf256 = -25, + ES384 = -35, + ES512 = -36, + ES256K = -47, + ESP384 = -51, + ESP512 = -52, + Ed448 = -53, + RS256 = -257, + RS384 = -258, + RS512 = -259, + ESB256 = -265, + ESB384 = -267, + ESB512 = -268, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum CoseCurve { - P256 = 1, - P384 = 2, - P521 = 3, - X25519 = 4, - X448 = 5, - Ed25519 = 6, - Ed448 = 7, - P256K1 = 8, - BP256R1 = 9, - BP384R1 = 10, - BP512R1 = 11, + P256 = 1, + P384 = 2, + P521 = 3, + X25519 = 4, + X448 = 5, + Ed25519 = 6, + Ed448 = 7, + P256K1 = 8, + BP256R1 = 9, + BP384R1 = 10, + BP512R1 = 11, } #[repr(i32)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum CoseKeyParam { - Kty = 1, - Kid = 2, - Alg = 3, - KeyOps = 4, - BaseIV = 5, - Crv = -1, - X = -2, - Y = -3, - D = -4, + Kty = 1, + Kid = 2, + Alg = 3, + KeyOps = 4, + BaseIV = 5, + Crv = -1, + X = -2, + Y = -3, + D = -4, } #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum Ctap2Error { - Success = 0x00, - CborUnexpectedType = 0x11, - InvalidCbor = 0x12, - MissingParameter = 0x14, - LimitExceeded = 0x15, - FpDatabaseFull = 0x17, - LargeBlobStorageFull = 0x18, - CredentialExcluded = 0x19, - Processing = 0x21, - InvalidCredential = 0x22, - UserActionPending = 0x23, - OperationPending = 0x24, - NoOperations = 0x25, - UnsupportedAlgorithm = 0x26, - OperationDenied = 0x27, - KeyStoreFull = 0x28, - UnsupportedOption = 0x2B, - InvalidOption = 0x2C, - KeepaliveCancel = 0x2D, - NoCredentials = 0x2E, - UserActionTimeout = 0x2F, - NotAllowed = 0x30, - PinInvalid = 0x31, - PinBlocked = 0x32, - PinAuthInvalid = 0x33, - PinAuthBlocked = 0x34, - PinNotSet = 0x35, - PuatRequired = 0x36, - PinPolicyViolation = 0x37, - RequestTooLarge = 0x39, - ActionTimeout = 0x3A, - UpRequired = 0x3B, - UvBlocked = 0x3C, - IntegrityFailure = 0x3D, - InvalidSubcommand = 0x3E, - UvInvalid = 0x3F, - UnauthorizedPermission = 0x40, + Success = 0x00, + CborUnexpectedType = 0x11, + InvalidCbor = 0x12, + MissingParameter = 0x14, + LimitExceeded = 0x15, + FpDatabaseFull = 0x17, + LargeBlobStorageFull = 0x18, + CredentialExcluded = 0x19, + Processing = 0x21, + InvalidCredential = 0x22, + UserActionPending = 0x23, + OperationPending = 0x24, + NoOperations = 0x25, + UnsupportedAlgorithm = 0x26, + OperationDenied = 0x27, + KeyStoreFull = 0x28, + UnsupportedOption = 0x2B, + InvalidOption = 0x2C, + KeepaliveCancel = 0x2D, + NoCredentials = 0x2E, + UserActionTimeout = 0x2F, + NotAllowed = 0x30, + PinInvalid = 0x31, + PinBlocked = 0x32, + PinAuthInvalid = 0x33, + PinAuthBlocked = 0x34, + PinNotSet = 0x35, + PuatRequired = 0x36, + PinPolicyViolation = 0x37, + RequestTooLarge = 0x39, + ActionTimeout = 0x3A, + UpRequired = 0x3B, + UvBlocked = 0x3C, + IntegrityFailure = 0x3D, + InvalidSubcommand = 0x3E, + UvInvalid = 0x3F, + UnauthorizedPermission = 0x40, } pub const CTAP_VENDOR_CBOR_CMD: u8 = 0xC1; @@ -382,5 +382,5 @@ pub const MAX_FRAGMENT_LENGTH: usize = MAX_MSG_SIZE - 64; pub const MAX_LARGE_BLOB_SIZE: usize = 2048; pub const AAGUID: [u8; 16] = [ - 0x89, 0xFB, 0x94, 0xB7, 0x06, 0xC9, 0x36, 0x73, 0x9B, 0x7E, 0x30, 0x52, 0x6D, 0x96, 0x81, 0x45, + 0x89, 0xFB, 0x94, 0xB7, 0x06, 0xC9, 0x36, 0x73, 0x9B, 0x7E, 0x30, 0x52, 0x6D, 0x96, 0x81, 0x45, ]; diff --git a/src/device/fido/hid.rs b/src/device/fido/hid.rs index 0eaeab2..2a33f6d 100644 --- a/src/device/fido/hid.rs +++ b/src/device/fido/hid.rs @@ -22,500 +22,500 @@ const HID_RESP_READ_TIMEOUT_MS: i32 = 2000; const HID_CONT_READ_TIMEOUT_MS: i32 = 500; pub struct HidTransport { - device: hidapi::HidDevice, - cid: u32, - pub vid: u16, - pub pid: u16, - pub product_name: String, + device: hidapi::HidDevice, + cid: u32, + pub vid: u16, + pub pid: u16, + pub product_name: String, } impl HidTransport { - pub fn open() -> Result { - log::info!("Attempting to open HID transport for FIDO device..."); - let api = hidapi::HidApi::new().map_err(|e| { - log::error!("Failed to initialize HidApi: {}", e); - PFError::Device(format!("Failed to initialize HidApi: {}", e)) - })?; + pub fn open() -> Result { + log::info!("Attempting to open HID transport for FIDO device..."); + let api = hidapi::HidApi::new().map_err(|e| { + log::error!("Failed to initialize HidApi: {}", e); + PFError::Device(format!("Failed to initialize HidApi: {}", e)) + })?; - // Find device with FIDO Usage Page (0xF1D0) - let info = api - .device_list() - .find(|d| d.usage_page() == HID_USAGE_PAGE_FIDO) - .ok_or_else(|| { - log::warn!("No FIDO device found with Usage Page 0xF1D0."); - PFError::NoDevice - })?; + // Find device with FIDO Usage Page (0xF1D0) + let info = api + .device_list() + .find(|d| d.usage_page() == HID_USAGE_PAGE_FIDO) + .ok_or_else(|| { + log::warn!("No FIDO device found with Usage Page 0xF1D0."); + PFError::NoDevice + })?; - log::debug!( - "Found FIDO device: VendorID=0x{:04X}, ProductID=0x{:04X}", - info.vendor_id(), - info.product_id() - ); + log::debug!( + "Found FIDO device: VendorID=0x{:04X}, ProductID=0x{:04X}", + info.vendor_id(), + info.product_id() + ); - let vid = info.vendor_id(); - let pid = info.product_id(); - let product_name = info - .product_string() - .unwrap_or("Unknown FIDO Device") - .to_string(); + let vid = info.vendor_id(); + let pid = info.product_id(); + let product_name = info + .product_string() + .unwrap_or("Unknown FIDO Device") + .to_string(); - let device = info.open_device(&api).map_err(|e| { - log::error!("Failed to open HID device: {}", e); - PFError::Device(format!("Failed to open HID device: {}", e)) - })?; + let device = info.open_device(&api).map_err(|e| { + log::error!("Failed to open HID device: {}", e); + PFError::Device(format!("Failed to open HID device: {}", e)) + })?; - // Negotiate Channel ID (CID) - let cid = Self::init_channel(&device).map_err(|e| { - log::error!("Failed to negotiate Channel ID: {}", e); - PFError::Device(format!("Failed to negotiate Channel ID: {}", e)) - })?; + // Negotiate Channel ID (CID) + let cid = Self::init_channel(&device).map_err(|e| { + log::error!("Failed to negotiate Channel ID: {}", e); + PFError::Device(format!("Failed to negotiate Channel ID: {}", e)) + })?; - log::info!("HID Transport established successfully. CID: 0x{:08X}", cid); - Ok(Self { - device, - cid, - vid, - pid, - product_name, - }) - } + log::info!("HID Transport established successfully. CID: 0x{:08X}", cid); + Ok(Self { + device, + cid, + vid, + pid, + product_name, + }) + } - fn init_channel(device: &hidapi::HidDevice) -> Result { - log::debug!("Initializing CTAPHID channel..."); + fn init_channel(device: &hidapi::HidDevice) -> Result { + log::debug!("Initializing CTAPHID channel..."); - // --- Drain Step --- - // Read and discard any pending packets to avoid using a stale response for CID negotiation. - let mut drain_buf = [0u8; HID_REPORT_SIZE]; - while let Ok(n) = device.read_timeout(&mut drain_buf[..], HID_READ_TIMEOUT_MS) { - if n == 0 { - break; - } - log::trace!("Drained stale HID packet: {:02X?}", &drain_buf[0..16]); - } + // --- Drain Step --- + // Read and discard any pending packets to avoid using a stale response for CID negotiation. + let mut drain_buf = [0u8; HID_REPORT_SIZE]; + while let Ok(n) = device.read_timeout(&mut drain_buf[..], HID_READ_TIMEOUT_MS) { + if n == 0 { + break; + } + log::trace!("Drained stale HID packet: {:02X?}", &drain_buf[0..16]); + } - let mut nonce = [0u8; 8]; - rand::rng().fill(&mut nonce); + let mut nonce = [0u8; 8]; + rand::rng().fill(&mut nonce); - // Construct Init Packet: [CID(4) | CMD(1) | LEN(2) | NONCE(8)] - let mut report = [0u8; HID_REPORT_SIZE + 1]; // +1 for Report ID (always 0) - report[1..5].copy_from_slice(&CTAPHID_CID_BROADCAST.to_be_bytes()); - report[5] = CTAPHID_INIT; - report[6] = 0; // Len MSB - report[7] = 8; // Len LSB - report[8..16].copy_from_slice(&nonce); + // Construct Init Packet: [CID(4) | CMD(1) | LEN(2) | NONCE(8)] + let mut report = [0u8; HID_REPORT_SIZE + 1]; // +1 for Report ID (always 0) + report[1..5].copy_from_slice(&CTAPHID_CID_BROADCAST.to_be_bytes()); + report[5] = CTAPHID_INIT; + report[6] = 0; // Len MSB + report[7] = 8; // Len LSB + report[8..16].copy_from_slice(&nonce); - log::trace!("Sending CTAPHID_INIT broadcast with nonce: {:02X?}", nonce); - device.write(&report[..]).map_err(|e| { - log::error!("Failed to write INIT packet: {}", e); - PFError::Io(format!("Failed to write INIT packet: {}", e)) - })?; + log::trace!("Sending CTAPHID_INIT broadcast with nonce: {:02X?}", nonce); + device.write(&report[..]).map_err(|e| { + log::error!("Failed to write INIT packet: {}", e); + PFError::Io(format!("Failed to write INIT packet: {}", e)) + })?; - // Read Response until we find our nonce - let start = std::time::Instant::now(); - while start.elapsed() < Duration::from_secs(1) { - let mut buf = [0u8; HID_REPORT_SIZE]; - if device - .read_timeout(&mut buf[..], HID_INIT_READ_TIMEOUT_MS) - .is_ok() - { - // Check if response matches our broadcast and nonce - if buf[0..4] == CTAPHID_CID_BROADCAST.to_be_bytes() - && buf[4] == CTAPHID_INIT - && buf[7..15] == nonce - { - // New CID is at bytes 16..20 - let new_cid = u32::from_be_bytes([buf[15], buf[16], buf[17], buf[18]]); - log::debug!("Channel negotiation successful. New CID: 0x{:08X}", new_cid); - return Ok(new_cid); - } else { - log::trace!( - "Received ignoreable HID packet during CID negotiation: {:02X?}", - &buf[0..16] - ); - } - } - } - log::error!("Timeout waiting for CTAPHID_INIT response."); - Err(PFError::Device( - "Timeout waiting for FIDO Init response".into(), - )) - } + // Read Response until we find our nonce + let start = std::time::Instant::now(); + while start.elapsed() < Duration::from_secs(1) { + let mut buf = [0u8; HID_REPORT_SIZE]; + if device + .read_timeout(&mut buf[..], HID_INIT_READ_TIMEOUT_MS) + .is_ok() + { + // Check if response matches our broadcast and nonce + if buf[0..4] == CTAPHID_CID_BROADCAST.to_be_bytes() + && buf[4] == CTAPHID_INIT + && buf[7..15] == nonce + { + // New CID is at bytes 16..20 + let new_cid = u32::from_be_bytes([buf[15], buf[16], buf[17], buf[18]]); + log::debug!("Channel negotiation successful. New CID: 0x{:08X}", new_cid); + return Ok(new_cid); + } else { + log::trace!( + "Received ignoreable HID packet during CID negotiation: {:02X?}", + &buf[0..16] + ); + } + } + } + log::error!("Timeout waiting for CTAPHID_INIT response."); + Err(PFError::Device( + "Timeout waiting for FIDO Init response".into(), + )) + } - pub fn send_cbor(&self, cmd: u8, payload: &[u8]) -> Result, PFError> { - self.write_cbor_request(cmd, payload)?; - self.read_cbor_response(cmd) - } + pub fn send_cbor(&self, cmd: u8, payload: &[u8]) -> Result, PFError> { + self.write_cbor_request(cmd, payload)?; + self.read_cbor_response(cmd) + } - fn write_cbor_request(&self, cmd: u8, payload: &[u8]) -> Result<(), PFError> { - log::debug!( - "Sending CBOR Command: 0x{:02X}, Payload Size: {} bytes", - cmd, - payload.len() - ); + fn write_cbor_request(&self, cmd: u8, payload: &[u8]) -> Result<(), PFError> { + log::debug!( + "Sending CBOR Command: 0x{:02X}, Payload Size: {} bytes", + cmd, + payload.len() + ); - let total_len = payload.len(); - let mut sent = 0; - let mut sequence = 0u8; + let total_len = payload.len(); + let mut sent = 0; + let mut sequence = 0u8; - // 1. Init Packet - let mut report = [0u8; HID_REPORT_SIZE + 1]; - report[1..5].copy_from_slice(&self.cid.to_be_bytes()); - report[5] = cmd; - report[6] = (total_len >> 8) as u8; - report[7] = (total_len & 0xFF) as u8; + // 1. Init Packet + let mut report = [0u8; HID_REPORT_SIZE + 1]; + report[1..5].copy_from_slice(&self.cid.to_be_bytes()); + report[5] = cmd; + report[6] = (total_len >> 8) as u8; + report[7] = (total_len & 0xFF) as u8; - let to_copy = std::cmp::min(total_len, HID_REPORT_SIZE - 7); - report[8..8 + to_copy].copy_from_slice(&payload[0..to_copy]); - sent += to_copy; + let to_copy = std::cmp::min(total_len, HID_REPORT_SIZE - 7); + report[8..8 + to_copy].copy_from_slice(&payload[0..to_copy]); + sent += to_copy; - // log::trace!("Writing Init Packet (Sent: {}/{})", sent, total_len); - if let Err(e) = self.device.write(&report[..]) { - log::error!("Failed to write initial HID packet: {}", e); - return Err(PFError::Io(format!( - "Failed to write initial HID packet: {}", - e, - ))); - } else { - log::trace!("Successfully sent initial HID packet"); - } + // log::trace!("Writing Init Packet (Sent: {}/{})", sent, total_len); + if let Err(e) = self.device.write(&report[..]) { + log::error!("Failed to write initial HID packet: {}", e); + return Err(PFError::Io(format!( + "Failed to write initial HID packet: {}", + e, + ))); + } else { + log::trace!("Successfully sent initial HID packet"); + } - // 2. Continuation Packets - while sent < total_len { - let mut report = [0u8; HID_REPORT_SIZE + 1]; - report[1..5].copy_from_slice(&self.cid.to_be_bytes()); - report[5] = 0x7F & sequence; // SEQ - sequence += 1; + // 2. Continuation Packets + while sent < total_len { + let mut report = [0u8; HID_REPORT_SIZE + 1]; + report[1..5].copy_from_slice(&self.cid.to_be_bytes()); + report[5] = 0x7F & sequence; // SEQ + sequence += 1; - let to_copy = std::cmp::min(total_len - sent, HID_REPORT_SIZE - 5); - report[6..6 + to_copy].copy_from_slice(&payload[sent..sent + to_copy]); - sent += to_copy; + let to_copy = std::cmp::min(total_len - sent, HID_REPORT_SIZE - 5); + report[6..6 + to_copy].copy_from_slice(&payload[sent..sent + to_copy]); + sent += to_copy; - // log::trace!("Writing Cont Packet Seq {} (Sent: {}/{})", sequence - 1, sent, total_len); - if let Err(e) = self.device.write(&report[..]) { - log::error!( - "Failed to write continuation HID packet (Seq {}): {}", - sequence - 1, - e - ); - return Err(PFError::Io(format!( - "Failed to write continuation HID packet: {}", - e, - ))); - } else { - log::trace!( - "Successfully sent continuation HID packet (Seq {})", - sequence - 1 - ); - } - } + // log::trace!("Writing Cont Packet Seq {} (Sent: {}/{})", sequence - 1, sent, total_len); + if let Err(e) = self.device.write(&report[..]) { + log::error!( + "Failed to write continuation HID packet (Seq {}): {}", + sequence - 1, + e + ); + return Err(PFError::Io(format!( + "Failed to write continuation HID packet: {}", + e, + ))); + } else { + log::trace!( + "Successfully sent continuation HID packet (Seq {})", + sequence - 1 + ); + } + } - Ok(()) - } + Ok(()) + } - fn read_cbor_response(&self, cmd: u8) -> Result, PFError> { - log::debug!("Waiting for response..."); + fn read_cbor_response(&self, cmd: u8) -> Result, PFError> { + log::debug!("Waiting for response..."); - let mut buf = [0u8; HID_REPORT_SIZE]; - let mut response_data = Vec::new(); - let expected_len: usize; - let mut read_len = 0; - let mut last_seq = 0; + let mut buf = [0u8; HID_REPORT_SIZE]; + let mut response_data = Vec::new(); + let expected_len: usize; + let mut read_len = 0; + let mut last_seq = 0; - // 1. Read First Packet (Loop to handle Keepalives) - loop { - if let Err(e) = self - .device - .read_timeout(&mut buf[..], HID_RESP_READ_TIMEOUT_MS) - { - log::error!("Timeout reading response packet: {}", e); - return Err(PFError::Io(format!( - "Timeout reading response packet: {}", - e - ))); - } + // 1. Read First Packet (Loop to handle Keepalives) + loop { + if let Err(e) = self + .device + .read_timeout(&mut buf[..], HID_RESP_READ_TIMEOUT_MS) + { + log::error!("Timeout reading response packet: {}", e); + return Err(PFError::Io(format!( + "Timeout reading response packet: {}", + e + ))); + } - // Check CID mismatch - if u32::from_be_bytes([buf[0], buf[1], buf[2], buf[3]]) != self.cid { - log::warn!("Received packet from different CID, ignoring..."); - continue; - } + // Check CID mismatch + if u32::from_be_bytes([buf[0], buf[1], buf[2], buf[3]]) != self.cid { + log::warn!("Received packet from different CID, ignoring..."); + continue; + } - // Check for KEEPALIVE (0xBB) - if buf[4] == CTAPHID_KEEPALIVE { - let status = buf[5]; // Keepalive status byte - log::debug!( - "Device sent KEEPALIVE (Status: 0x{:02X}), waiting...", - status - ); - continue; // Go back to start of loop and read again - } + // Check for KEEPALIVE (0xBB) + if buf[4] == CTAPHID_KEEPALIVE { + let status = buf[5]; // Keepalive status byte + log::debug!( + "Device sent KEEPALIVE (Status: 0x{:02X}), waiting...", + status + ); + continue; // Go back to start of loop and read again + } - // If we are here, it's a real response - break; - } + // If we are here, it's a real response + break; + } - if buf[4] == CTAPHID_ERROR { - log::error!("Device returned CTAP Error code: 0x{:02X}", buf[5]); - return Err(PFError::Device(format!( - "Device returned CTAP Error: 0x{:02X}", - buf[5], - ))); - } else { - log::trace!("Packet received is not a CTAP Error"); - } + if buf[4] == CTAPHID_ERROR { + log::error!("Device returned CTAP Error code: 0x{:02X}", buf[5]); + return Err(PFError::Device(format!( + "Device returned CTAP Error: 0x{:02X}", + buf[5], + ))); + } else { + log::trace!("Packet received is not a CTAP Error"); + } - if buf[4] == cmd { - expected_len = u16::from_be_bytes([buf[5], buf[6]]) as usize; - let in_pkt = std::cmp::min(expected_len, HID_REPORT_SIZE - 7); - response_data.extend_from_slice(&buf[7..7 + in_pkt]); - read_len += in_pkt; - // log::trace!("Received Init Response. Expecting {} bytes total.", expected_len); - } else { - log::error!( - "Unexpected command response: 0x{:02X} (Expected 0x{:02X})", - buf[4], - cmd - ); - return Err(PFError::Device(format!( - "Unexpected command response: 0x{:02X} (Expected 0x{:02X})", - buf[4], cmd - ))); - } + if buf[4] == cmd { + expected_len = u16::from_be_bytes([buf[5], buf[6]]) as usize; + let in_pkt = std::cmp::min(expected_len, HID_REPORT_SIZE - 7); + response_data.extend_from_slice(&buf[7..7 + in_pkt]); + read_len += in_pkt; + // log::trace!("Received Init Response. Expecting {} bytes total.", expected_len); + } else { + log::error!( + "Unexpected command response: 0x{:02X} (Expected 0x{:02X})", + buf[4], + cmd + ); + return Err(PFError::Device(format!( + "Unexpected command response: 0x{:02X} (Expected 0x{:02X})", + buf[4], cmd + ))); + } - // 2. Read Continuation Packets - while read_len < expected_len { - if let Err(e) = self - .device - .read_timeout(&mut buf[..], HID_CONT_READ_TIMEOUT_MS) - { - log::error!("Timeout reading continuation packet: {}", e); - return Err(PFError::Io(format!( - "Timeout reading continuation packet: {}", - e - ))); - } + // 2. Read Continuation Packets + while read_len < expected_len { + if let Err(e) = self + .device + .read_timeout(&mut buf[..], HID_CONT_READ_TIMEOUT_MS) + { + log::error!("Timeout reading continuation packet: {}", e); + return Err(PFError::Io(format!( + "Timeout reading continuation packet: {}", + e + ))); + } - if u32::from_be_bytes([buf[0], buf[1], buf[2], buf[3]]) != self.cid { - continue; // Ignore packets from other channels - } + if u32::from_be_bytes([buf[0], buf[1], buf[2], buf[3]]) != self.cid { + continue; // Ignore packets from other channels + } - let seq = buf[4]; - if seq != last_seq { - log::error!( - "Sequence mismatch in response. Expected {}, got {}", - last_seq, - seq - ); - return Err(PFError::Device("Sequence mismatch".into())); - } - last_seq += 1; + let seq = buf[4]; + if seq != last_seq { + log::error!( + "Sequence mismatch in response. Expected {}, got {}", + last_seq, + seq + ); + return Err(PFError::Device("Sequence mismatch".into())); + } + last_seq += 1; - let in_pkt = std::cmp::min(expected_len - read_len, HID_REPORT_SIZE - 5); - response_data.extend_from_slice(&buf[5..5 + in_pkt]); - read_len += in_pkt; - } + let in_pkt = std::cmp::min(expected_len - read_len, HID_REPORT_SIZE - 5); + response_data.extend_from_slice(&buf[5..5 + in_pkt]); + read_len += in_pkt; + } - // 3. Check CTAP Status Byte (First byte of payload) - if response_data.is_empty() { - log::error!("Device sent empty payload response."); - return Err(PFError::Device("Empty response".into())); - } - let status = response_data[0]; - if status != 0x00 { - log::error!("FIDO Operation returned failure status: 0x{:02X}", status); - return Err(PFError::Device(format!( - "FIDO Operation Failed with Status: 0x{:02X}", - status - ))); - } + // 3. Check CTAP Status Byte (First byte of payload) + if response_data.is_empty() { + log::error!("Device sent empty payload response."); + return Err(PFError::Device("Empty response".into())); + } + let status = response_data[0]; + if status != 0x00 { + log::error!("FIDO Operation returned failure status: 0x{:02X}", status); + return Err(PFError::Device(format!( + "FIDO Operation Failed with Status: 0x{:02X}", + status + ))); + } - log::debug!( - "Command 0x{:02X} successful. Response payload len: {}", - cmd, - response_data.len() - 1 - ); - // Return payload without status byte - Ok(response_data[1..].to_vec()) - } + log::debug!( + "Command 0x{:02X} successful. Response payload len: {}", + cmd, + response_data.len() - 1 + ); + // Return payload without status byte + Ok(response_data[1..].to_vec()) + } - pub fn send_vendor_config( - &self, - pin_token: &[u8], - vendor_cmd: VendorConfigCommand, - param: Value, - ) -> Result<(), PFError> { - log::debug!("Sending vendor config command: {}...", vendor_cmd); + pub fn send_vendor_config( + &self, + pin_token: &[u8], + vendor_cmd: VendorConfigCommand, + param: Value, + ) -> Result<(), PFError> { + log::debug!("Sending vendor config command: {}...", vendor_cmd); - // Build subCommandParams (Key 0x02) - // This map contains: - // 0x01: vendorCommandId (u64) - // 0x02/0x03/0x04: param - let mut sub_params_inner = BTreeMap::new(); - sub_params_inner.insert( - Value::Integer(0x01), - Value::Integer(vendor_cmd.to_u64() as i128), - ); + // Build subCommandParams (Key 0x02) + // This map contains: + // 0x01: vendorCommandId (u64) + // 0x02/0x03/0x04: param + let mut sub_params_inner = BTreeMap::new(); + sub_params_inner.insert( + Value::Integer(0x01), + Value::Integer(vendor_cmd.to_u64() as i128), + ); - match param { - Value::Bytes(_) => { - sub_params_inner.insert(Value::Integer(0x02), param.clone()); - } - Value::Integer(_) => { - sub_params_inner.insert(Value::Integer(0x03), param.clone()); - } - Value::Text(_) => { - sub_params_inner.insert(Value::Integer(0x04), param.clone()); - } - _ => return Err(PFError::Io("Unsupported parameter type".into())), - } + match param { + Value::Bytes(_) => { + sub_params_inner.insert(Value::Integer(0x02), param.clone()); + } + Value::Integer(_) => { + sub_params_inner.insert(Value::Integer(0x03), param.clone()); + } + Value::Text(_) => { + sub_params_inner.insert(Value::Integer(0x04), param.clone()); + } + _ => return Err(PFError::Io("Unsupported parameter type".into())), + } - let sub_params = Value::Map(sub_params_inner); - let sub_params_bytes = to_vec(&sub_params).map_err(|e| PFError::Io(e.to_string()))?; + let sub_params = Value::Map(sub_params_inner); + let sub_params_bytes = to_vec(&sub_params).map_err(|e| PFError::Io(e.to_string()))?; - // Calculate PIN Auth - let pin_auth = self.sign_config_command( - pin_token, - ConfigSubCommand::VendorPrototype as u8, - &sub_params_bytes, - ); + // Calculate PIN Auth + let pin_auth = self.sign_config_command( + pin_token, + ConfigSubCommand::VendorPrototype as u8, + &sub_params_bytes, + ); - // Build full authenticatorConfig map - let mut config_map = BTreeMap::new(); - config_map.insert( - Value::Integer(ConfigParam::SubCommand as i128), - Value::Integer(ConfigSubCommand::VendorPrototype as i128), - ); - config_map.insert( - Value::Integer(ConfigParam::SubCommandParams as i128), - sub_params, - ); - config_map.insert( - Value::Integer(ConfigParam::PinUvAuthProtocol as i128), - Value::Integer(1), - ); - config_map.insert( - Value::Integer(ConfigParam::PinUvAuthParam as i128), - Value::Bytes(pin_auth), - ); + // Build full authenticatorConfig map + let mut config_map = BTreeMap::new(); + config_map.insert( + Value::Integer(ConfigParam::SubCommand as i128), + Value::Integer(ConfigSubCommand::VendorPrototype as i128), + ); + config_map.insert( + Value::Integer(ConfigParam::SubCommandParams as i128), + sub_params, + ); + config_map.insert( + Value::Integer(ConfigParam::PinUvAuthProtocol as i128), + Value::Integer(1), + ); + config_map.insert( + Value::Integer(ConfigParam::PinUvAuthParam as i128), + Value::Bytes(pin_auth), + ); - let config_payload_cbor = - to_vec(&Value::Map(config_map)).map_err(|e| PFError::Io(e.to_string()))?; + let config_payload_cbor = + to_vec(&Value::Map(config_map)).map_err(|e| PFError::Io(e.to_string()))?; - // Encapsulate for CTAP - let mut payload = vec![CtapCommand::Config as u8]; - payload.extend(config_payload_cbor); + // Encapsulate for CTAP + let mut payload = vec![CtapCommand::Config as u8]; + payload.extend(config_payload_cbor); - // Send via HID - self.send_cbor(CTAPHID_CBOR, &payload).map_err(|e| { - log::error!("Failed to send FIDO config: {}", e); - PFError::Device(format!("FIDO config failed: {}", e)) - })?; + // Send via HID + self.send_cbor(CTAPHID_CBOR, &payload).map_err(|e| { + log::error!("Failed to send FIDO config: {}", e); + PFError::Device(format!("FIDO config failed: {}", e)) + })?; - Ok(()) - } + Ok(()) + } - /// Send authenticatorConfig command to set minimum PIN length. - /// - /// This bypasses the ctap-hid-fido2 library which has a bug where it sends - /// CBOR map keys out of order (0x01, 0x03, 0x04, 0x02) instead of the required - /// ascending order (0x01, 0x02, 0x03, 0x04). The pico-fido firmware strictly - /// enforces canonical CBOR ordering per CTAP2 spec. - pub fn send_config_set_min_pin_length( - &self, - pin_token: &[u8], - new_min_pin_length: u8, - ) -> Result<(), PFError> { - log::debug!( - "Sending setMinPINLength config command (new length: {})...", - new_min_pin_length - ); + /// Send authenticatorConfig command to set minimum PIN length. + /// + /// This bypasses the ctap-hid-fido2 library which has a bug where it sends + /// CBOR map keys out of order (0x01, 0x03, 0x04, 0x02) instead of the required + /// ascending order (0x01, 0x02, 0x03, 0x04). The pico-fido firmware strictly + /// enforces canonical CBOR ordering per CTAP2 spec. + pub fn send_config_set_min_pin_length( + &self, + pin_token: &[u8], + new_min_pin_length: u8, + ) -> Result<(), PFError> { + log::debug!( + "Sending setMinPINLength config command (new length: {})...", + new_min_pin_length + ); - // Build subCommandParams (Key 0x02): { 0x01: newMinPINLength } - let mut sub_params_map = BTreeMap::new(); - sub_params_map.insert( - Value::Integer(ConfigSubCommandParam::NewMinPinLength as i128), - Value::Integer(new_min_pin_length as i128), - ); - let sub_params = Value::Map(sub_params_map); - let sub_params_bytes = to_vec(&sub_params).map_err(|e| PFError::Io(e.to_string()))?; + // Build subCommandParams (Key 0x02): { 0x01: newMinPINLength } + let mut sub_params_map = BTreeMap::new(); + sub_params_map.insert( + Value::Integer(ConfigSubCommandParam::NewMinPinLength as i128), + Value::Integer(new_min_pin_length as i128), + ); + let sub_params = Value::Map(sub_params_map); + let sub_params_bytes = to_vec(&sub_params).map_err(|e| PFError::Io(e.to_string()))?; - // Calculate PIN Auth - let pin_auth = self.sign_config_command( - pin_token, - ConfigSubCommand::SetMinPinLength as u8, - &sub_params_bytes, - ); + // Calculate PIN Auth + let pin_auth = self.sign_config_command( + pin_token, + ConfigSubCommand::SetMinPinLength as u8, + &sub_params_bytes, + ); - // Build full authenticatorConfig map with keys in ASCENDING ORDER - // Keeping the map item in the correct order is critical - the firmware parser rejects out-of-order keys with CTAP2_ERR_INVALID_CBOR - let mut config_map = BTreeMap::new(); - config_map.insert( - Value::Integer(ConfigParam::SubCommand as i128), // 0x01 - Value::Integer(ConfigSubCommand::SetMinPinLength as i128), // 0x03 - ); - config_map.insert( - Value::Integer(ConfigParam::SubCommandParams as i128), // 0x02 - sub_params, - ); - config_map.insert( - Value::Integer(ConfigParam::PinUvAuthProtocol as i128), // 0x03 - Value::Integer(1), // PIN protocol version 1 - ); - config_map.insert( - Value::Integer(ConfigParam::PinUvAuthParam as i128), // 0x04 - Value::Bytes(pin_auth), - ); + // Build full authenticatorConfig map with keys in ASCENDING ORDER + // Keeping the map item in the correct order is critical - the firmware parser rejects out-of-order keys with CTAP2_ERR_INVALID_CBOR + let mut config_map = BTreeMap::new(); + config_map.insert( + Value::Integer(ConfigParam::SubCommand as i128), // 0x01 + Value::Integer(ConfigSubCommand::SetMinPinLength as i128), // 0x03 + ); + config_map.insert( + Value::Integer(ConfigParam::SubCommandParams as i128), // 0x02 + sub_params, + ); + config_map.insert( + Value::Integer(ConfigParam::PinUvAuthProtocol as i128), // 0x03 + Value::Integer(1), // PIN protocol version 1 + ); + config_map.insert( + Value::Integer(ConfigParam::PinUvAuthParam as i128), // 0x04 + Value::Bytes(pin_auth), + ); - let config_payload_cbor = - to_vec(&Value::Map(config_map)).map_err(|e| PFError::Io(e.to_string()))?; + let config_payload_cbor = + to_vec(&Value::Map(config_map)).map_err(|e| PFError::Io(e.to_string()))?; - // Prepend CTAP command byte - let mut payload = vec![CtapCommand::Config as u8]; - payload.extend(config_payload_cbor); + // Prepend CTAP command byte + let mut payload = vec![CtapCommand::Config as u8]; + payload.extend(config_payload_cbor); - // Send via HID - match self.send_cbor(CTAPHID_CBOR, &payload) { - Ok(_) => { - log::info!( - "Successfully set minimum PIN length to {}", - new_min_pin_length - ); - Ok(()) - } - Err(e) => { - let err_str = e.to_string(); - log::error!("Failed to send setMinPINLength config: {}", err_str); + // Send via HID + match self.send_cbor(CTAPHID_CBOR, &payload) { + Ok(_) => { + log::info!( + "Successfully set minimum PIN length to {}", + new_min_pin_length + ); + Ok(()) + } + Err(e) => { + let err_str = e.to_string(); + log::error!("Failed to send setMinPINLength config: {}", err_str); - // Check for PIN policy violation (0x37) - cannot decrease min PIN length - if err_str.contains("0x37") { - return Err(PFError::Device( + // Check for PIN policy violation (0x37) - cannot decrease min PIN length + if err_str.contains("0x37") { + return Err(PFError::Device( "Cannot decrease minimum PIN length. The FIDO2 security policy only allows increasing the minimum PIN length, not decreasing it. A device reset is required to lower the minimum.".into() )); - } + } - Err(PFError::Device(format!("setMinPINLength failed: {}", e))) - } - } - } + Err(PFError::Device(format!("setMinPINLength failed: {}", e))) + } + } + } - /// Helper to sign the authenticatorConfig command - fn sign_config_command( - &self, - pin_token: &[u8], - sub_cmd: u8, - sub_params_bytes: &[u8], - ) -> Vec { - // Build HMAC message for signing - // According to FIDO 2.1: authenticate(pinUvAuthToken, 32×0xff || 0x0d || uint8(subCommand) || subCommandParams) - let mut message = vec![0xff; 32]; - message.push(CtapCommand::Config as u8); - message.push(sub_cmd); - message.extend(sub_params_bytes); + /// Helper to sign the authenticatorConfig command + fn sign_config_command( + &self, + pin_token: &[u8], + sub_cmd: u8, + sub_params_bytes: &[u8], + ) -> Vec { + // Build HMAC message for signing + // According to FIDO 2.1: authenticate(pinUvAuthToken, 32×0xff || 0x0d || uint8(subCommand) || subCommandParams) + let mut message = vec![0xff; 32]; + message.push(CtapCommand::Config as u8); + message.push(sub_cmd); + message.extend(sub_params_bytes); - // Sign using provided PIN token - use ring::hmac; - let hmac_key = hmac::Key::new(hmac::HMAC_SHA256, pin_token); - let sig = hmac::sign(&hmac_key, &message); - sig.as_ref()[0..16].to_vec() - } + // Sign using provided PIN token + use ring::hmac; + let hmac_key = hmac::Key::new(hmac::HMAC_SHA256, pin_token); + let sig = hmac::sign(&hmac_key, &message); + sig.as_ref()[0..16].to_vec() + } } diff --git a/src/device/fido/mod.rs b/src/device/fido/mod.rs index a7ac22b..d9bf364 100644 --- a/src/device/fido/mod.rs +++ b/src/device/fido/mod.rs @@ -2,17 +2,17 @@ pub mod constants; pub mod hid; use crate::{ - device::error::PFError, - device::types::{ - AppConfig, AppConfigInput, DeviceInfo, DeviceMethod, FidoDeviceInfo, FullDeviceStatus, - StoredCredential, - }, + device::error::PFError, + device::types::{ + AppConfig, AppConfigInput, DeviceInfo, DeviceMethod, FidoDeviceInfo, FullDeviceStatus, + StoredCredential, + }, }; use constants::*; use ctap_hid_fido2::{ - Cfg, FidoKeyHidFactory, - fidokey::{FidoKeyHid, pin::Permission}, - public_key_credential_descriptor::PublicKeyCredentialDescriptor, + Cfg, FidoKeyHidFactory, + fidokey::{FidoKeyHid, pin::Permission}, + public_key_credential_descriptor::PublicKeyCredentialDescriptor, }; use hid::*; use serde_cbor_2::{Value, from_slice, to_vec}; @@ -21,482 +21,482 @@ use std::collections::{BTreeMap, HashMap}; // Fido functions that require pin: ( Uses ctap_hid_fido2 crate) fn get_device() -> Result { - let cfg = Cfg::init(); - FidoKeyHidFactory::create(&cfg).map_err(|e| { - format!( - "Could not connect to FIDO device. Is it plugged in? Error: {:?}", - e - ) - }) + let cfg = Cfg::init(); + FidoKeyHidFactory::create(&cfg).map_err(|e| { + format!( + "Could not connect to FIDO device. Is it plugged in? Error: {:?}", + e + ) + }) } pub(crate) fn get_fido_info() -> Result { - let device = get_device()?; + let device = get_device()?; - let info = device - .get_info() - .map_err(|e| format!("Error reading device info: {:?}", e))?; + let info = device + .get_info() + .map_err(|e| format!("Error reading device info: {:?}", e))?; - let options_map: HashMap = info.options.into_iter().collect(); + let options_map: HashMap = info.options.into_iter().collect(); - Ok(FidoDeviceInfo { - versions: info.versions, - extensions: info.extensions, - aaguid: hex::encode_upper(info.aaguid), - options: options_map, - max_msg_size: info.max_msg_size, - pin_protocols: info.pin_uv_auth_protocols, - min_pin_length: info.min_pin_length, - firmware_version: format!( - "{}.{}", - (info.firmware_version >> 8) & 0xFF, - info.firmware_version & 0xFF - ), - }) + Ok(FidoDeviceInfo { + versions: info.versions, + extensions: info.extensions, + aaguid: hex::encode_upper(info.aaguid), + options: options_map, + max_msg_size: info.max_msg_size, + pin_protocols: info.pin_uv_auth_protocols, + min_pin_length: info.min_pin_length, + firmware_version: format!( + "{}.{}", + (info.firmware_version >> 8) & 0xFF, + info.firmware_version & 0xFF + ), + }) } pub(crate) fn change_fido_pin( - current_pin: Option, - new_pin: String, + current_pin: Option, + new_pin: String, ) -> Result { - let device = get_device()?; + let device = get_device()?; - match current_pin { - Some(old) => { - device - .change_pin(&old, &new_pin) - .map_err(|e| format!("Failed to change PIN: {:?}", e))?; - Ok("PIN Changed Successfully".into()) - } - None => { - device - .set_new_pin(&new_pin) - .map_err(|e| format!("Failed to set PIN: {:?}", e))?; - Ok("PIN Set Successfully".into()) - } - } + match current_pin { + Some(old) => { + device + .change_pin(&old, &new_pin) + .map_err(|e| format!("Failed to change PIN: {:?}", e))?; + Ok("PIN Changed Successfully".into()) + } + None => { + device + .set_new_pin(&new_pin) + .map_err(|e| format!("Failed to set PIN: {:?}", e))?; + Ok("PIN Set Successfully".into()) + } + } } pub(crate) fn set_min_pin_length( - current_pin: String, - min_pin_length: u8, + current_pin: String, + min_pin_length: u8, ) -> Result { - log::info!("Starting set_min_pin_length (custom implementation)..."); + log::info!("Starting set_min_pin_length (custom implementation)..."); - // 1. Obtain PIN token using the library handle - let pin_token = { - let device = get_device()?; + // 1. Obtain PIN token using the library handle + let pin_token = { + let device = get_device()?; - // Obtain a token with AuthenticatorConfiguration permission (CTAP 2.1) - match device.get_pinuv_auth_token_with_permission( - ¤t_pin, - Permission::AuthenticatorConfiguration, - ) { - Ok(token) => { - log::debug!("Successfully obtained PIN token with ACFG permission."); - token.key - } - Err(e) => { - log::error!("Failed to get PIN token with ACFG permission: {:?}", e); - return Err(format!("Failed to obtain PIN token: {:?}", e)); - } - } - // Library handle 'device' is dropped here, closing the HID session. - }; + // Obtain a token with AuthenticatorConfiguration permission (CTAP 2.1) + match device.get_pinuv_auth_token_with_permission( + ¤t_pin, + Permission::AuthenticatorConfiguration, + ) { + Ok(token) => { + log::debug!("Successfully obtained PIN token with ACFG permission."); + token.key + } + Err(e) => { + log::error!("Failed to get PIN token with ACFG permission: {:?}", e); + return Err(format!("Failed to obtain PIN token: {:?}", e)); + } + } + // Library handle 'device' is dropped here, closing the HID session. + }; - // 2. Open custom HidTransport and send command using the token because ctap-hid-fido2 has a bug where it sends CBOR map keys out of order (0x01, 0x03, 0x04, 0x02) instead of the required ascending order (0x01, 0x02, 0x03, 0x04). The pico-fido firmware strictly requires ascending order. - let transport = - HidTransport::open().map_err(|e| format!("Could not open HID transport: {}", e))?; + // 2. Open custom HidTransport and send command using the token because ctap-hid-fido2 has a bug where it sends CBOR map keys out of order (0x01, 0x03, 0x04, 0x02) instead of the required ascending order (0x01, 0x02, 0x03, 0x04). The pico-fido firmware strictly requires ascending order. + let transport = + HidTransport::open().map_err(|e| format!("Could not open HID transport: {}", e))?; - transport - .send_config_set_min_pin_length(&pin_token, min_pin_length) - .map_err(|e| format!("Failed to set minimum PIN length: {}", e))?; + transport + .send_config_set_min_pin_length(&pin_token, min_pin_length) + .map_err(|e| format!("Failed to set minimum PIN length: {}", e))?; - Ok(format!( - "Minimum PIN length successfully set to {}", - min_pin_length - )) + Ok(format!( + "Minimum PIN length successfully set to {}", + min_pin_length + )) } pub(crate) fn get_credentials(pin: String) -> Result, String> { - let device = get_device()?; + let device = get_device()?; - let rps = match device.credential_management_enumerate_rps(Some(&pin)) { - Ok(rps) => rps, - Err(e) => { - // CTAP2_ERR_NO_CREDENTIALS (0x2E) means no credentials exist - return empty list - let err_str = format!("{:?}", e); - if err_str.contains("0x2E") || err_str.contains("NO_CREDENTIALS") { - log::info!("No credentials stored on device (CTAP2_ERR_NO_CREDENTIALS)"); - return Ok(Vec::new()); - } - return Err(format!("Failed to enumerate Relying Parties: {:?}", e)); - } - }; + let rps = match device.credential_management_enumerate_rps(Some(&pin)) { + Ok(rps) => rps, + Err(e) => { + // CTAP2_ERR_NO_CREDENTIALS (0x2E) means no credentials exist - return empty list + let err_str = format!("{:?}", e); + if err_str.contains("0x2E") || err_str.contains("NO_CREDENTIALS") { + log::info!("No credentials stored on device (CTAP2_ERR_NO_CREDENTIALS)"); + return Ok(Vec::new()); + } + return Err(format!("Failed to enumerate Relying Parties: {:?}", e)); + } + }; - let mut all_credentials = Vec::new(); + let mut all_credentials = Vec::new(); - for rp in rps { - let creds = device - .credential_management_enumerate_credentials(Some(&pin), &rp.rpid_hash) - .map_err(|e| { - format!( - "Failed to enumerate credentials for RP {}: {:?}", - rp.public_key_credential_rp_entity.id, e - ) - })?; + for rp in rps { + let creds = device + .credential_management_enumerate_credentials(Some(&pin), &rp.rpid_hash) + .map_err(|e| { + format!( + "Failed to enumerate credentials for RP {}: {:?}", + rp.public_key_credential_rp_entity.id, e + ) + })?; - for cred in creds { - all_credentials.push(StoredCredential { - credential_id: hex::encode(&cred.public_key_credential_descriptor.id), - rp_id: rp.public_key_credential_rp_entity.id.clone(), - rp_name: rp.public_key_credential_rp_entity.name.clone(), - user_name: cred.public_key_credential_user_entity.name.clone(), - user_display_name: cred.public_key_credential_user_entity.display_name.clone(), - user_id: hex::encode(&cred.public_key_credential_user_entity.id).clone(), - }); - } - } + for cred in creds { + all_credentials.push(StoredCredential { + credential_id: hex::encode(&cred.public_key_credential_descriptor.id), + rp_id: rp.public_key_credential_rp_entity.id.clone(), + rp_name: rp.public_key_credential_rp_entity.name.clone(), + user_name: cred.public_key_credential_user_entity.name.clone(), + user_display_name: cred.public_key_credential_user_entity.display_name.clone(), + user_id: hex::encode(&cred.public_key_credential_user_entity.id).clone(), + }); + } + } - Ok(all_credentials) + Ok(all_credentials) } pub(crate) fn delete_credential(pin: String, credential_id_hex: String) -> Result { - let device = get_device()?; + let device = get_device()?; - let cred_id_bytes = hex::decode(&credential_id_hex) - .map_err(|_| "Invalid Credential ID Hex string".to_string())?; + let cred_id_bytes = hex::decode(&credential_id_hex) + .map_err(|_| "Invalid Credential ID Hex string".to_string())?; - let descriptor = PublicKeyCredentialDescriptor { - ctype: "public-key".to_string(), - id: cred_id_bytes, - }; + let descriptor = PublicKeyCredentialDescriptor { + ctype: "public-key".to_string(), + id: cred_id_bytes, + }; - device - .credential_management_delete_credential(Some(&pin), descriptor) - .map_err(|e| format!("Failed to delete credential: {:?}", e))?; + device + .credential_management_delete_credential(Some(&pin), descriptor) + .map_err(|e| format!("Failed to delete credential: {:?}", e))?; - Ok("Credential deleted successfully".into()) + Ok("Credential deleted successfully".into()) } // Custom Fido functions ( works only with pico-fido firmware ) pub fn read_device_details() -> Result { - log::info!("Starting FIDO device details read..."); + log::info!("Starting FIDO device details read..."); - let transport = HidTransport::open().map_err(|e| { - if matches!(e, PFError::NoDevice) { - PFError::NoDevice - } else { - log::error!("Failed to open HID transport: {}", e); - PFError::Device(e.to_string()) - } - })?; + let transport = HidTransport::open().map_err(|e| { + if matches!(e, PFError::NoDevice) { + PFError::NoDevice + } else { + log::error!("Failed to open HID transport: {}", e); + PFError::Device(e.to_string()) + } + })?; - let (aaguid_str, fw_version) = read_device_info(&transport)?; + let (aaguid_str, fw_version) = read_device_info(&transport)?; - log::info!( - "Device identified: AAGUID={}, FW={}", - aaguid_str, - fw_version - ); + log::info!( + "Device identified: AAGUID={}, FW={}", + aaguid_str, + fw_version + ); - let (used, total) = read_memory_stats(&transport)?; - log::debug!( - "Memory Stats: Used={}KB, Total={}KB", - used / 1024, - total / 1024 - ); + let (used, total) = read_memory_stats(&transport)?; + log::debug!( + "Memory Stats: Used={}KB, Total={}KB", + used / 1024, + total / 1024 + ); - let config = read_physical_config(&transport)?; + let config = read_physical_config(&transport)?; - log::info!("Successfully read all device details."); + log::info!("Successfully read all device details."); - Ok(FullDeviceStatus { - info: DeviceInfo { - serial: "?".to_string(), // Serial number is not available through fido - flash_used: used / 1024, - flash_total: total / 1024, - firmware_version: fw_version, - }, - config, - secure_boot: false, - secure_lock: false, - method: DeviceMethod::Fido, - }) + Ok(FullDeviceStatus { + info: DeviceInfo { + serial: "?".to_string(), // Serial number is not available through fido + flash_used: used / 1024, + flash_total: total / 1024, + firmware_version: fw_version, + }, + config, + secure_boot: false, + secure_lock: false, + method: DeviceMethod::Fido, + }) } fn read_device_info(transport: &HidTransport) -> Result<(String, String), PFError> { - log::debug!("Sending GetInfo command (0x04)..."); - let info_payload = [CtapCommand::GetInfo as u8]; - let info_res = transport - .send_cbor(CTAPHID_CBOR, &info_payload) - .map_err(|e| { - log::error!("GetInfo CTAP command failed: {}", e); - PFError::Device(format!("GetInfo failed: {}", e)) - })?; + log::debug!("Sending GetInfo command (0x04)..."); + let info_payload = [CtapCommand::GetInfo as u8]; + let info_res = transport + .send_cbor(CTAPHID_CBOR, &info_payload) + .map_err(|e| { + log::error!("GetInfo CTAP command failed: {}", e); + PFError::Device(format!("GetInfo failed: {}", e)) + })?; - log::debug!("GetInfo response received ({} bytes)", info_res.len()); + log::debug!("GetInfo response received ({} bytes)", info_res.len()); - let info_val: Value = from_slice(&info_res).map_err(|e| { - log::error!("Failed to parse GetInfo CBOR: {}", e); - PFError::Io(e.to_string()) - })?; + let info_val: Value = from_slice(&info_res).map_err(|e| { + log::error!("Failed to parse GetInfo CBOR: {}", e); + PFError::Io(e.to_string()) + })?; - // NOTE: Key 0x03 is AAGUID, not the unique device Serial. - let aaguid_str = if let Value::Map(m) = &info_val { - m.get(&Value::Integer(0x03)) - .and_then(|v| { - if let Value::Bytes(b) = v { - Some(hex::encode_upper(b)) - } else { - None - } - }) - .unwrap_or_else(|| { - log::warn!("AAGUID not found in GetInfo response"); - "Unknown".into() - }) - } else { - "Unknown".into() - }; + // NOTE: Key 0x03 is AAGUID, not the unique device Serial. + let aaguid_str = if let Value::Map(m) = &info_val { + m.get(&Value::Integer(0x03)) + .and_then(|v| { + if let Value::Bytes(b) = v { + Some(hex::encode_upper(b)) + } else { + None + } + }) + .unwrap_or_else(|| { + log::warn!("AAGUID not found in GetInfo response"); + "Unknown".into() + }) + } else { + "Unknown".into() + }; - let fw_version = if let Value::Map(m) = &info_val { - m.get(&Value::Integer(0x0E)) - .and_then(|v| { - if let Value::Integer(i) = v { - Some(format!("{}.{}", (i >> 8) & 0xFF, i & 0xFF)) - } else { - None - } - }) - .unwrap_or_else(|| { - log::warn!("Firmware version not found in GetInfo response"); - "Unknown".into() - }) - } else { - "Unknown".into() - }; + let fw_version = if let Value::Map(m) = &info_val { + m.get(&Value::Integer(0x0E)) + .and_then(|v| { + if let Value::Integer(i) = v { + Some(format!("{}.{}", (i >> 8) & 0xFF, i & 0xFF)) + } else { + None + } + }) + .unwrap_or_else(|| { + log::warn!("Firmware version not found in GetInfo response"); + "Unknown".into() + }) + } else { + "Unknown".into() + }; - Ok((aaguid_str, fw_version)) + Ok((aaguid_str, fw_version)) } fn read_memory_stats(transport: &HidTransport) -> Result<(u32, u32), PFError> { - log::debug!("Preparing Memory Stats vendor command..."); + log::debug!("Preparing Memory Stats vendor command..."); - let mut mem_req = BTreeMap::new(); - mem_req.insert( - Value::Integer(1), // Sub-command key (usually 1) - Value::Integer(MemorySubCommand::GetStats as i128), - ); + let mut mem_req = BTreeMap::new(); + mem_req.insert( + Value::Integer(1), // Sub-command key (usually 1) + Value::Integer(MemorySubCommand::GetStats as i128), + ); - let mem_cbor = to_vec(&Value::Map(mem_req)).map_err(|e| { - log::error!("Failed to encode Memory Stats CBOR: {}", e); - PFError::Io(format!("CBOR encode error: {}", e)) - })?; + let mem_cbor = to_vec(&Value::Map(mem_req)).map_err(|e| { + log::error!("Failed to encode Memory Stats CBOR: {}", e); + PFError::Io(format!("CBOR encode error: {}", e)) + })?; - let mut mem_payload = vec![VendorCommand::Memory as u8]; - mem_payload.extend(mem_cbor); + let mut mem_payload = vec![VendorCommand::Memory as u8]; + mem_payload.extend(mem_cbor); - log::debug!("Sending Memory Stats command..."); - let mem_res = transport - .send_cbor(CTAP_VENDOR_CBOR_CMD, &mem_payload) - .map_err(|e| { - log::warn!("Failed to fetch memory stats (Vendor Cmd): {}", e); - PFError::Device(format!("Failed to fetch memory stats: {}", e)) - })?; + log::debug!("Sending Memory Stats command..."); + let mem_res = transport + .send_cbor(CTAP_VENDOR_CBOR_CMD, &mem_payload) + .map_err(|e| { + log::warn!("Failed to fetch memory stats (Vendor Cmd): {}", e); + PFError::Device(format!("Failed to fetch memory stats: {}", e)) + })?; - let mem_map: BTreeMap = if !mem_res.is_empty() { - from_slice(&mem_res).map_err(|e| { - log::error!("Failed to parse Memory Stats CBOR response: {}", e); - PFError::Io(format!("Failed to parse Memory Stats CBOR: {}", e)) - })? - } else { - BTreeMap::new() - }; + let mem_map: BTreeMap = if !mem_res.is_empty() { + from_slice(&mem_res).map_err(|e| { + log::error!("Failed to parse Memory Stats CBOR response: {}", e); + PFError::Io(format!("Failed to parse Memory Stats CBOR: {}", e)) + })? + } else { + BTreeMap::new() + }; - let used = mem_map - .get(&(MemoryResponseKey::UsedSpace as i128)) - .cloned() - .unwrap_or(0) as u32; - let total = mem_map - .get(&(MemoryResponseKey::TotalSpace as i128)) - .cloned() - .unwrap_or(0) as u32; + let used = mem_map + .get(&(MemoryResponseKey::UsedSpace as i128)) + .cloned() + .unwrap_or(0) as u32; + let total = mem_map + .get(&(MemoryResponseKey::TotalSpace as i128)) + .cloned() + .unwrap_or(0) as u32; - Ok((used, total)) + Ok((used, total)) } fn read_physical_config(transport: &HidTransport) -> Result { - log::debug!("Preparing Physical Config vendor command..."); + log::debug!("Preparing Physical Config vendor command..."); - // FIX: Only arguments in CBOR map - let mut phy_params = BTreeMap::new(); - phy_params.insert( - Value::Integer(1), // Sub-command key - Value::Integer(PhysicalOptionsSubCommand::GetOptions as i128), - ); + // FIX: Only arguments in CBOR map + let mut phy_params = BTreeMap::new(); + phy_params.insert( + Value::Integer(1), // Sub-command key + Value::Integer(PhysicalOptionsSubCommand::GetOptions as i128), + ); - let phy_cbor = to_vec(&Value::Map(phy_params)).map_err(|e| { - log::error!("Failed to encode Physical Config CBOR: {}", e); - PFError::Io(format!("CBOR encode error: {}", e)) - })?; + let phy_cbor = to_vec(&Value::Map(phy_params)).map_err(|e| { + log::error!("Failed to encode Physical Config CBOR: {}", e); + PFError::Io(format!("CBOR encode error: {}", e)) + })?; - let mut phy_payload = vec![VendorCommand::PhysicalOptions as u8]; - phy_payload.extend(phy_cbor); + let mut phy_payload = vec![VendorCommand::PhysicalOptions as u8]; + phy_payload.extend(phy_cbor); - log::debug!("Sending Physical Config command..."); - let phy_res = transport - .send_cbor(CTAP_VENDOR_CBOR_CMD, &phy_payload) - .unwrap_or_else(|e| { - log::warn!("Failed to fetch physical config (Vendor Cmd): {}", e); - Vec::new() - }); + log::debug!("Sending Physical Config command..."); + let phy_res = transport + .send_cbor(CTAP_VENDOR_CBOR_CMD, &phy_payload) + .unwrap_or_else(|e| { + log::warn!("Failed to fetch physical config (Vendor Cmd): {}", e); + Vec::new() + }); - let mut config = AppConfig { - vid: format!("{:04X}", transport.vid), - pid: format!("{:04X}", transport.pid), - product_name: transport.product_name.clone(), - ..Default::default() - }; + let mut config = AppConfig { + vid: format!("{:04X}", transport.vid), + pid: format!("{:04X}", transport.pid), + product_name: transport.product_name.clone(), + ..Default::default() + }; - if let Ok(Value::Map(m)) = from_slice(&phy_res) { - log::debug!("Parsed Physical Config map successfully"); - if let Some(Value::Integer(v)) = m.get(&Value::Text("gpio".into())) { - config.led_gpio = *v as u8; - } else { - log::warn!("No led_gpio in CBOR map"); - } + if let Ok(Value::Map(m)) = from_slice(&phy_res) { + log::debug!("Parsed Physical Config map successfully"); + if let Some(Value::Integer(v)) = m.get(&Value::Text("gpio".into())) { + config.led_gpio = *v as u8; + } else { + log::warn!("No led_gpio in CBOR map"); + } - if let Some(Value::Integer(v)) = m.get(&Value::Text("brightness".into())) { - config.led_brightness = *v as u8; - } else { - log::warn!("No led_brightness in CBOR map"); - } - } else if !phy_res.is_empty() { - log::warn!("Physical config response was not a valid CBOR map"); - } else { - log::debug!("Physical config response was empty or already handled."); - } + if let Some(Value::Integer(v)) = m.get(&Value::Text("brightness".into())) { + config.led_brightness = *v as u8; + } else { + log::warn!("No led_brightness in CBOR map"); + } + } else if !phy_res.is_empty() { + log::warn!("Physical config response was not a valid CBOR map"); + } else { + log::debug!("Physical config response was empty or already handled."); + } - Ok(config) + Ok(config) } pub fn write_config(config: AppConfigInput, pin: Option) -> Result { - log::info!("Starting FIDO write_config..."); + log::info!("Starting FIDO write_config..."); - let pin_val = pin.as_deref().ok_or_else(|| { - log::error!("write_config called without any security PIN provided"); - PFError::Device( - "A security PIN is required to be set to change the configuration in fido mode".into(), - ) - })?; + let pin_val = pin.as_deref().ok_or_else(|| { + log::error!("write_config called without any security PIN provided"); + PFError::Device( + "A security PIN is required to be set to change the configuration in fido mode".into(), + ) + })?; - // 1. Obtain PIN token using the library handle - let pin_token = { - let device = get_device().map_err(PFError::Device)?; + // 1. Obtain PIN token using the library handle + let pin_token = { + let device = get_device().map_err(PFError::Device)?; - // Try to obtain a token with AuthenticatorConfiguration permission (CTAP 2.1) - match device - .get_pinuv_auth_token_with_permission(pin_val, Permission::AuthenticatorConfiguration) - { - Ok(token) => { - log::debug!("Successfully obtained PIN token with ACFG permission."); - token.key - } - Err(e) => { - log::warn!( - "Failed to get PIN token with ACFG permission (Error: {:?}). Falling back to standard token.", - e - ); - // Fallback to standard PIN token (Subcommand 0x05) - let token = device.get_pin_token(pin_val).map_err(|e2| { - log::error!("Failed to obtain even a standard PIN token: {:?}", e2); - PFError::Device(format!("PIN token acquisition failed: {:?}", e2)) - })?; - log::debug!("Successfully obtained standard PIN token (fallback)."); - token.key - } - } - // Library handle 'device' is dropped here, closing the HID session. - }; + // Try to obtain a token with AuthenticatorConfiguration permission (CTAP 2.1) + match device + .get_pinuv_auth_token_with_permission(pin_val, Permission::AuthenticatorConfiguration) + { + Ok(token) => { + log::debug!("Successfully obtained PIN token with ACFG permission."); + token.key + } + Err(e) => { + log::warn!( + "Failed to get PIN token with ACFG permission (Error: {:?}). Falling back to standard token.", + e + ); + // Fallback to standard PIN token (Subcommand 0x05) + let token = device.get_pin_token(pin_val).map_err(|e2| { + log::error!("Failed to obtain even a standard PIN token: {:?}", e2); + PFError::Device(format!("PIN token acquisition failed: {:?}", e2)) + })?; + log::debug!("Successfully obtained standard PIN token (fallback)."); + token.key + } + } + // Library handle 'device' is dropped here, closing the HID session. + }; - // 2. Open custom HidTransport and send vendor commands using the token - let transport = HidTransport::open().map_err(|e| { - log::error!("Failed to open HID transport: {}", e); - PFError::Device(format!("Could not open HID transport: {}", e)) - })?; + // 2. Open custom HidTransport and send vendor commands using the token + let transport = HidTransport::open().map_err(|e| { + log::error!("Failed to open HID transport: {}", e); + PFError::Device(format!("Could not open HID transport: {}", e)) + })?; - // VID/PID config - if let (Some(vid_str), Some(pid_str)) = (&config.vid, &config.pid) { - let vid = u16::from_str_radix(vid_str, 16).map_err(|e| PFError::Io(e.to_string()))?; - let pid = u16::from_str_radix(pid_str, 16).map_err(|e| PFError::Io(e.to_string()))?; - let vidpid = ((vid as u32) << 16) | (pid as u32); - transport.send_vendor_config( - &pin_token, - VendorConfigCommand::PhysicalVidPid, - Value::Integer(vidpid as i128), - )?; - } else { - log::info!("VID/PID configuration not provided, skipping update."); - } + // VID/PID config + if let (Some(vid_str), Some(pid_str)) = (&config.vid, &config.pid) { + let vid = u16::from_str_radix(vid_str, 16).map_err(|e| PFError::Io(e.to_string()))?; + let pid = u16::from_str_radix(pid_str, 16).map_err(|e| PFError::Io(e.to_string()))?; + let vidpid = ((vid as u32) << 16) | (pid as u32); + transport.send_vendor_config( + &pin_token, + VendorConfigCommand::PhysicalVidPid, + Value::Integer(vidpid as i128), + )?; + } else { + log::info!("VID/PID configuration not provided, skipping update."); + } - // LED GPIO config - if let Some(gpio) = config.led_gpio { - transport.send_vendor_config( - &pin_token, - VendorConfigCommand::PhysicalLedGpio, - Value::Integer(gpio as i128), - )?; - } else { - log::info!("LED GPIO configuration not provided, skipping update."); - } + // LED GPIO config + if let Some(gpio) = config.led_gpio { + transport.send_vendor_config( + &pin_token, + VendorConfigCommand::PhysicalLedGpio, + Value::Integer(gpio as i128), + )?; + } else { + log::info!("LED GPIO configuration not provided, skipping update."); + } - // LED brightness config - if let Some(brightness) = config.led_brightness { - transport.send_vendor_config( - &pin_token, - VendorConfigCommand::PhysicalLedBrightness, - Value::Integer(brightness as i128), - )?; - } else { - log::info!("LED brightness configuration not provided, skipping update."); - } + // LED brightness config + if let Some(brightness) = config.led_brightness { + transport.send_vendor_config( + &pin_token, + VendorConfigCommand::PhysicalLedBrightness, + Value::Integer(brightness as i128), + )?; + } else { + log::info!("LED brightness configuration not provided, skipping update."); + } - // Options config - let mut opts = 0u16; - if config.led_dimmable.unwrap_or(false) { - opts |= 0x02; // PHY_OPT_DIMM - } - if !config.power_cycle_on_reset.unwrap_or(true) { - opts |= 0x04; // PHY_OPT_DISABLE_POWER_RESET - } - if config.led_steady.unwrap_or(false) { - opts |= 0x08; // PHY_OPT_LED_STEADY - } - // Touch_timeout config - if let Some(timeout) = config.touch_timeout { - transport - .send_vendor_config( - &pin_token, - VendorConfigCommand::PhysicalOptions, - Value::Integer(timeout as i128), - ) - .ok(); - } else { - log::info!("Touch timeout configuration not provided, skipping update."); - } + // Options config + let mut opts = 0u16; + if config.led_dimmable.unwrap_or(false) { + opts |= 0x02; // PHY_OPT_DIMM + } + if !config.power_cycle_on_reset.unwrap_or(true) { + opts |= 0x04; // PHY_OPT_DISABLE_POWER_RESET + } + if config.led_steady.unwrap_or(false) { + opts |= 0x08; // PHY_OPT_LED_STEADY + } + // Touch_timeout config + if let Some(timeout) = config.touch_timeout { + transport + .send_vendor_config( + &pin_token, + VendorConfigCommand::PhysicalOptions, + Value::Integer(timeout as i128), + ) + .ok(); + } else { + log::info!("Touch timeout configuration not provided, skipping update."); + } - transport.send_vendor_config( - &pin_token, - VendorConfigCommand::PhysicalOptions, - Value::Integer(opts as i128), - )?; + transport.send_vendor_config( + &pin_token, + VendorConfigCommand::PhysicalOptions, + Value::Integer(opts as i128), + )?; - // ToDo : Product name configuration is not implemented in pico-fido firmware (cbor_config.c)? + // ToDo : Product name configuration is not implemented in pico-fido firmware (cbor_config.c)? - Ok( - "Configuration updated successfully! Unplug and re-plug the device to apply VID/PID changes." - .to_string(), - ) + Ok( + "Configuration updated successfully! Unplug and re-plug the device to apply VID/PID changes." + .to_string(), + ) } diff --git a/src/device/io.rs b/src/device/io.rs index 1f77cba..6cc2a44 100644 --- a/src/device/io.rs +++ b/src/device/io.rs @@ -2,57 +2,57 @@ use crate::{device::error::PFError, device::fido, device::rescue, device::types::*}; pub fn read_device_details() -> Result { - match rescue::read_device_details() { - Ok(status) => Ok(status), - Err(e) => { - log::warn!("Rescue method failed: {}. Falling back to FIDO...", e); - fido::read_device_details() - } - } + match rescue::read_device_details() { + Ok(status) => Ok(status), + Err(e) => { + log::warn!("Rescue method failed: {}. Falling back to FIDO...", e); + fido::read_device_details() + } + } } pub fn write_config( - config: AppConfigInput, - method: DeviceMethod, - pin: Option, + config: AppConfigInput, + method: DeviceMethod, + pin: Option, ) -> Result { - if method == DeviceMethod::Fido { - fido::write_config(config, pin) - } else { - rescue::write_config(config) - } + if method == DeviceMethod::Fido { + fido::write_config(config, pin) + } else { + rescue::write_config(config) + } } pub fn enable_secure_boot(lock: bool) -> Result { - rescue::enable_secure_boot(lock) + rescue::enable_secure_boot(lock) } pub(crate) fn get_fido_info() -> Result { - fido::get_fido_info() + fido::get_fido_info() } pub(crate) fn change_fido_pin( - current_pin: Option, - new_pin: String, + current_pin: Option, + new_pin: String, ) -> Result { - fido::change_fido_pin(current_pin, new_pin) + fido::change_fido_pin(current_pin, new_pin) } pub(crate) fn set_min_pin_length( - current_pin: String, - min_pin_length: u8, + current_pin: String, + min_pin_length: u8, ) -> Result { - fido::set_min_pin_length(current_pin, min_pin_length) + fido::set_min_pin_length(current_pin, min_pin_length) } pub fn reboot(to_bootsel: bool) -> Result { - rescue::reboot_device(to_bootsel) + rescue::reboot_device(to_bootsel) } pub fn get_credentials(pin: String) -> Result, String> { - fido::get_credentials(pin) + fido::get_credentials(pin) } pub fn delete_credential(pin: String, credential_id: String) -> Result { - fido::delete_credential(pin, credential_id) + fido::delete_credential(pin, credential_id) } diff --git a/src/device/logging.rs b/src/device/logging.rs index f4a759f..9602637 100644 --- a/src/device/logging.rs +++ b/src/device/logging.rs @@ -1,19 +1,19 @@ +use directories::ProjectDirs; use log::LevelFilter; use log4rs::{ append::{ console::{ConsoleAppender, Target}, rolling_file::{ - policy::compound::{ - roll::delete::DeleteRoller, trigger::size::SizeTrigger, CompoundPolicy, - }, RollingFileAppender, + policy::compound::{ + CompoundPolicy, roll::delete::DeleteRoller, trigger::size::SizeTrigger, + }, }, }, config::{Appender, Logger, Root}, encode::pattern::PatternEncoder, }; use std::fs; -use directories::ProjectDirs; /// Initializes log4rs with custom configuration for stdout and file logging. pub fn logger_init() { diff --git a/src/device/rescue/constants.rs b/src/device/rescue/constants.rs index 039e03e..9f4c9ed 100644 --- a/src/device/rescue/constants.rs +++ b/src/device/rescue/constants.rs @@ -29,53 +29,53 @@ pub const RESCUE_AID: &[u8] = &[0xA0, 0x58, 0x3F, 0xC1, 0x9B, 0x7E, 0x4F, 0x21]; #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum RescueInstruction { - KeyDevSign = 0x10, - Write = 0x1C, - Secure = 0x1D, - Read = 0x1E, - Reboot = 0x1F, + KeyDevSign = 0x10, + Write = 0x1C, + Secure = 0x1D, + Read = 0x1E, + Reboot = 0x1F, } /// P1 Parameters for RescueInstruction::Read (0x1E) #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum ReadParam { - PhyConfig = 0x01, - FlashInfo = 0x02, - SecureBootStatus = 0x03, + PhyConfig = 0x01, + FlashInfo = 0x02, + SecureBootStatus = 0x03, } /// P1 Parameters for WRITE (0x1C) #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum WriteParam { - PhyConfig = 0x01, + PhyConfig = 0x01, } /// P1 Parameters for RescueInstruction::KeyDevSign (0x10) #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum SignParam { - SignData = 0x01, - GetPublicKey = 0x02, - UploadCert = 0x03, + SignData = 0x01, + GetPublicKey = 0x02, + UploadCert = 0x03, } /// P1 Parameters for RescueInstruction::Reboot (0x1F) #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum RebootParam { - Normal = 0x00, - Bootsel = 0x01, + Normal = 0x00, + Bootsel = 0x01, } /// P2 Parameters for SECURE (0x1D) #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)] pub enum SecureLockParam { - #[default] - Unlock = 0x00, - Lock = 0x01, + #[default] + Unlock = 0x00, + Lock = 0x01, } /// Default P2 value when not used @@ -87,45 +87,45 @@ pub const P2_UNUSED: u8 = 0x00; #[repr(u8)] #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum PhyTag { - VidPid = 0x00, - LedGpio = 0x04, - LedBrightness = 0x05, - Opts = 0x06, - PresenceTimeout = 0x08, // Previously TAG_UP_BTN - UsbProduct = 0x09, - Curves = 0x0A, - LedDriver = 0x0C, + VidPid = 0x00, + LedGpio = 0x04, + LedBrightness = 0x05, + Opts = 0x06, + PresenceTimeout = 0x08, // Previously TAG_UP_BTN + UsbProduct = 0x09, + Curves = 0x0A, + LedDriver = 0x0C, } impl PhyTag { - /// Helper to convert raw u8 from device back to Enum - pub fn from_u8(val: u8) -> Option { - match val { - 0x00 => Some(Self::VidPid), - 0x04 => Some(Self::LedGpio), - 0x05 => Some(Self::LedBrightness), - 0x06 => Some(Self::Opts), - 0x08 => Some(Self::PresenceTimeout), - 0x09 => Some(Self::UsbProduct), - 0x0A => Some(Self::Curves), - 0x0C => Some(Self::LedDriver), - _ => None, - } - } + /// Helper to convert raw u8 from device back to Enum + pub fn from_u8(val: u8) -> Option { + match val { + 0x00 => Some(Self::VidPid), + 0x04 => Some(Self::LedGpio), + 0x05 => Some(Self::LedBrightness), + 0x06 => Some(Self::Opts), + 0x08 => Some(Self::PresenceTimeout), + 0x09 => Some(Self::UsbProduct), + 0x0A => Some(Self::Curves), + 0x0C => Some(Self::LedDriver), + _ => None, + } + } } bitflags::bitflags! { - /// Configuration options for TAG_OPTS (Tag 0x06) - pub struct RescueOptions: u16 { - const LED_DIMMABLE = 0x02; - const DISABLE_POWER_RESET = 0x04; - const LED_STEADY = 0x08; - } + /// Configuration options for TAG_OPTS (Tag 0x06) + pub struct RescueOptions: u16 { + const LED_DIMMABLE = 0x02; + const DISABLE_POWER_RESET = 0x04; + const LED_STEADY = 0x08; + } } bitflags::bitflags! { - /// Enabled curves for TAG_CURVES (Tag 0x0A) - pub struct RescueCurves: u32 { - const SECP256K1 = 0x08; - } + /// Enabled curves for TAG_CURVES (Tag 0x0A) + pub struct RescueCurves: u32 { + const SECP256K1 = 0x08; + } } diff --git a/src/device/rescue/mod.rs b/src/device/rescue/mod.rs index 0953a31..cf835bd 100644 --- a/src/device/rescue/mod.rs +++ b/src/device/rescue/mod.rs @@ -11,410 +11,410 @@ use std::io::Cursor; /// Connects to the first available reader and selects the Rescue Applet fn connect_and_select() -> Result<(pcsc::Card, Vec), PFError> { - let ctx = Context::establish(Scope::User).map_err(|e| { - log::error!("Failed to establish PCSC context: {}", e); - PFError::Pcsc(e) - })?; + let ctx = Context::establish(Scope::User).map_err(|e| { + log::error!("Failed to establish PCSC context: {}", e); + PFError::Pcsc(e) + })?; - let mut readers_buf = [0; 2048]; - let mut readers = ctx.list_readers(&mut readers_buf)?; + let mut readers_buf = [0; 2048]; + let mut readers = ctx.list_readers(&mut readers_buf)?; - // Use the first reader found - let reader = readers.next().ok_or_else(|| { - log::info!("No Smart Card Reader found"); - PFError::NoDevice - })?; + // Use the first reader found + let reader = readers.next().ok_or_else(|| { + log::info!("No Smart Card Reader found"); + PFError::NoDevice + })?; - let card = ctx.connect(reader, ShareMode::Shared, Protocols::ANY)?; + let card = ctx.connect(reader, ShareMode::Shared, Protocols::ANY)?; - // Select Applet APDU: 00 A4 04 04 [Len] [AID] - let mut apdu = vec![ - APDU_CLA_ISO, - APDU_INS_SELECT, - APDU_P1_SELECT_BY_DF_NAME, - APDU_P2_RETURN_FCI, - RESCUE_AID.len() as u8, - ]; - apdu.extend_from_slice(RESCUE_AID); + // Select Applet APDU: 00 A4 04 04 [Len] [AID] + let mut apdu = vec![ + APDU_CLA_ISO, + APDU_INS_SELECT, + APDU_P1_SELECT_BY_DF_NAME, + APDU_P2_RETURN_FCI, + RESCUE_AID.len() as u8, + ]; + apdu.extend_from_slice(RESCUE_AID); - let mut rx_buf = [0; 256]; - let rx = card.transmit(&apdu, &mut rx_buf)?; + let mut rx_buf = [0; 256]; + let rx = card.transmit(&apdu, &mut rx_buf)?; - // Check Success (0x90 0x00) - if !rx.ends_with(&[0x90, 0x00]) { - log::error!("Rescue Applet not found on the device!"); - return Err(PFError::Device( - // There is no such mode as fido, i tink the rescue applet stays active and at the same time fido mode works? - // Need to study this more. - "Rescue Applet not found on device. Is it in FIDO mode?".into(), - )); - } + // Check Success (0x90 0x00) + if !rx.ends_with(&[0x90, 0x00]) { + log::error!("Rescue Applet not found on the device!"); + return Err(PFError::Device( + // There is no such mode as fido, i tink the rescue applet stays active and at the same time fido mode works? + // Need to study this more. + "Rescue Applet not found on device. Is it in FIDO mode?".into(), + )); + } - log::info!("Successfully connected to Rescue Applet"); - Ok((card, rx.to_vec())) + log::info!("Successfully connected to Rescue Applet"); + Ok((card, rx.to_vec())) } pub fn read_device_details() -> Result { - log::info!("Reading full device details"); - let (card, select_resp) = connect_and_select()?; + log::info!("Reading full device details"); + let (card, select_resp) = connect_and_select()?; - log::info!("Select Response: {:?}", select_resp); + log::info!("Select Response: {:?}", select_resp); - // FIX: Relax the length check. - // Minimum valid response is 4 bytes data + 2 bytes SW = 6 bytes. - if select_resp.len() < 6 { - log::error!("Invalid select response length: {}", select_resp.len()); - return Err(PFError::Device("Invalid select response".into())); - } + // FIX: Relax the length check. + // Minimum valid response is 4 bytes data + 2 bytes SW = 6 bytes. + if select_resp.len() < 6 { + log::error!("Invalid select response length: {}", select_resp.len()); + return Err(PFError::Device("Invalid select response".into())); + } - let version_major = select_resp[2]; - let version_minor = select_resp[3]; + let version_major = select_resp[2]; + let version_minor = select_resp[3]; - // FIX: Handle missing Serial Number safely - // If the firmware sends 14 bytes, we have a serial. If it sends 6, we don't. - let serial_str = if select_resp.len() >= 14 { - hex::encode_upper(&select_resp[4..12]) - } else { - log::warn!( - "Device did not return a Serial Number (Firmware mismatch?). Using placeholder." - ); - "00000000".to_string() - }; + // FIX: Handle missing Serial Number safely + // If the firmware sends 14 bytes, we have a serial. If it sends 6, we don't. + let serial_str = if select_resp.len() >= 14 { + hex::encode_upper(&select_resp[4..12]) + } else { + log::warn!( + "Device did not return a Serial Number (Firmware mismatch?). Using placeholder." + ); + "00000000".to_string() + }; - log::info!("Device Version: {}.{}", version_major, version_minor); - log::info!("Device Serial: {}", serial_str); + log::info!("Device Version: {}.{}", version_major, version_minor); + log::info!("Device Serial: {}", serial_str); - // 2. Read Flash Info - let mut rx_buf = [0; 256]; - let rx_flash = card.transmit( - &[ - APDU_CLA_PROPRIETARY, - RescueInstruction::Read as u8, - ReadParam::FlashInfo as u8, - P2_UNUSED, - 0x00, // Le - ], - &mut rx_buf, - )?; + // 2. Read Flash Info + let mut rx_buf = [0; 256]; + let rx_flash = card.transmit( + &[ + APDU_CLA_PROPRIETARY, + RescueInstruction::Read as u8, + ReadParam::FlashInfo as u8, + P2_UNUSED, + 0x00, // Le + ], + &mut rx_buf, + )?; - if !rx_flash.ends_with(&SW_SUCCESS) { - return Err(PFError::Device("Failed to read flash".into())); - } + if !rx_flash.ends_with(&SW_SUCCESS) { + return Err(PFError::Device("Failed to read flash".into())); + } - let mut rdr = Cursor::new(&rx_flash[..rx_flash.len() - 2]); - let _free = rdr.read_u32::().unwrap_or(0); - let used = rdr.read_u32::().unwrap_or(0); - let total = rdr.read_u32::().unwrap_or(0); + let mut rdr = Cursor::new(&rx_flash[..rx_flash.len() - 2]); + let _free = rdr.read_u32::().unwrap_or(0); + let used = rdr.read_u32::().unwrap_or(0); + let total = rdr.read_u32::().unwrap_or(0); - // NOTE: captured but currently unused variables - let _nfiles = rdr.read_u32::().unwrap_or(0); - let _chip_size = rdr.read_u32::().unwrap_or(0); + // NOTE: captured but currently unused variables + let _nfiles = rdr.read_u32::().unwrap_or(0); + let _chip_size = rdr.read_u32::().unwrap_or(0); - // --- Read Secure Boot Status --- - let rx_secure = card.transmit( - &[ - APDU_CLA_PROPRIETARY, - RescueInstruction::Read as u8, - ReadParam::SecureBootStatus as u8, - P2_UNUSED, - 0x00, - ], - &mut rx_buf, - )?; + // --- Read Secure Boot Status --- + let rx_secure = card.transmit( + &[ + APDU_CLA_PROPRIETARY, + RescueInstruction::Read as u8, + ReadParam::SecureBootStatus as u8, + P2_UNUSED, + 0x00, + ], + &mut rx_buf, + )?; - let (sb_enabled, sb_locked) = if rx_secure.ends_with(&[0x90, 0x00]) && rx_secure.len() >= 4 { - (rx_secure[0] != 0, rx_secure[1] != 0) - } else { - (false, false) - }; // --- Read PHY Config --- - let rx_phy = card.transmit( - &[ - APDU_CLA_PROPRIETARY, - RescueInstruction::Read as u8, - ReadParam::PhyConfig as u8, - 0x01, - 0x00, - ], - &mut rx_buf, - )?; + let (sb_enabled, sb_locked) = if rx_secure.ends_with(&[0x90, 0x00]) && rx_secure.len() >= 4 { + (rx_secure[0] != 0, rx_secure[1] != 0) + } else { + (false, false) + }; // --- Read PHY Config --- + let rx_phy = card.transmit( + &[ + APDU_CLA_PROPRIETARY, + RescueInstruction::Read as u8, + ReadParam::PhyConfig as u8, + 0x01, + 0x00, + ], + &mut rx_buf, + )?; - if !rx_phy.ends_with(&[0x90, 0x00]) { - return Err(PFError::Device("Failed to read config".into())); - } + if !rx_phy.ends_with(&[0x90, 0x00]) { + return Err(PFError::Device("Failed to read config".into())); + } - // Parse TLV - let mut config = AppConfig::default(); - let data = &rx_phy[..rx_phy.len() - 2]; - let mut i = 0; - while i < data.len() { - if i + 2 > data.len() { - break; - } - let tag_byte = data[i]; - let len = data[i + 1] as usize; - i += 2; - if i + len > data.len() { - break; - } - let val = &data[i..i + len]; + // Parse TLV + let mut config = AppConfig::default(); + let data = &rx_phy[..rx_phy.len() - 2]; + let mut i = 0; + while i < data.len() { + if i + 2 > data.len() { + break; + } + let tag_byte = data[i]; + let len = data[i + 1] as usize; + i += 2; + if i + len > data.len() { + break; + } + let val = &data[i..i + len]; - if let Some(tag) = PhyTag::from_u8(tag_byte) { - match tag { - PhyTag::VidPid => { - if val.len() == 4 { - let vid = u16::from_be_bytes([val[0], val[1]]); - let pid = u16::from_be_bytes([val[2], val[3]]); - config.vid = format!("{:04X}", vid); - config.pid = format!("{:04X}", pid); - } - } - PhyTag::LedGpio => { - if !val.is_empty() { - config.led_gpio = val[0]; - } - } - PhyTag::LedBrightness => { - if !val.is_empty() { - config.led_brightness = val[0]; - } - } - PhyTag::PresenceTimeout => { - if !val.is_empty() { - config.touch_timeout = val[0]; - } - } - PhyTag::UsbProduct => { - let s = std::str::from_utf8(val) - .unwrap_or("") - .trim_matches(char::from(0)); - config.product_name = s.to_string(); - } - PhyTag::Opts => { - if val.len() >= 2 { - let opts_val = u16::from_be_bytes([val[0], val[1]]); - let opts = RescueOptions::from_bits_truncate(opts_val); + if let Some(tag) = PhyTag::from_u8(tag_byte) { + match tag { + PhyTag::VidPid => { + if val.len() == 4 { + let vid = u16::from_be_bytes([val[0], val[1]]); + let pid = u16::from_be_bytes([val[2], val[3]]); + config.vid = format!("{:04X}", vid); + config.pid = format!("{:04X}", pid); + } + } + PhyTag::LedGpio => { + if !val.is_empty() { + config.led_gpio = val[0]; + } + } + PhyTag::LedBrightness => { + if !val.is_empty() { + config.led_brightness = val[0]; + } + } + PhyTag::PresenceTimeout => { + if !val.is_empty() { + config.touch_timeout = val[0]; + } + } + PhyTag::UsbProduct => { + let s = std::str::from_utf8(val) + .unwrap_or("") + .trim_matches(char::from(0)); + config.product_name = s.to_string(); + } + PhyTag::Opts => { + if val.len() >= 2 { + let opts_val = u16::from_be_bytes([val[0], val[1]]); + let opts = RescueOptions::from_bits_truncate(opts_val); - config.led_dimmable = opts.contains(RescueOptions::LED_DIMMABLE); - config.power_cycle_on_reset = - !opts.contains(RescueOptions::DISABLE_POWER_RESET); - config.led_steady = opts.contains(RescueOptions::LED_STEADY); - } - } - PhyTag::Curves => { - if val.len() >= 4 { - let curves_val = u32::from_be_bytes([val[0], val[1], val[2], val[3]]); - let curves = RescueCurves::from_bits_truncate(curves_val); - config.enable_secp256k1 = curves.contains(RescueCurves::SECP256K1); - } - } - PhyTag::LedDriver => { - if !val.is_empty() { - config.led_driver = Some(val[0]); - } - } - } - } - i += len; - } + config.led_dimmable = opts.contains(RescueOptions::LED_DIMMABLE); + config.power_cycle_on_reset = + !opts.contains(RescueOptions::DISABLE_POWER_RESET); + config.led_steady = opts.contains(RescueOptions::LED_STEADY); + } + } + PhyTag::Curves => { + if val.len() >= 4 { + let curves_val = u32::from_be_bytes([val[0], val[1], val[2], val[3]]); + let curves = RescueCurves::from_bits_truncate(curves_val); + config.enable_secp256k1 = curves.contains(RescueCurves::SECP256K1); + } + } + PhyTag::LedDriver => { + if !val.is_empty() { + config.led_driver = Some(val[0]); + } + } + } + } + i += len; + } - log::info!( - "Successfully read device details - Serial: {}, Firmware: {}.{}", - serial_str, - version_major, - version_minor - ); + log::info!( + "Successfully read device details - Serial: {}, Firmware: {}.{}", + serial_str, + version_major, + version_minor + ); - Ok(FullDeviceStatus { - info: DeviceInfo { - serial: serial_str, - flash_used: used / 1024, - flash_total: total / 1024, - firmware_version: format!("{}.{}", version_major, version_minor), - }, - config, - secure_boot: sb_enabled, - secure_lock: sb_locked, - method: DeviceMethod::Rescue, - }) + Ok(FullDeviceStatus { + info: DeviceInfo { + serial: serial_str, + flash_used: used / 1024, + flash_total: total / 1024, + firmware_version: format!("{}.{}", version_major, version_minor), + }, + config, + secure_boot: sb_enabled, + secure_lock: sb_locked, + method: DeviceMethod::Rescue, + }) } pub fn write_config(config: AppConfigInput) -> Result { - log::info!("Writing configuration to device"); - log::debug!("Config input: {:?}", config); + log::info!("Writing configuration to device"); + log::debug!("Config input: {:?}", config); - // 1. Construct TLV Blob - let mut tlv = Vec::new(); + // 1. Construct TLV Blob + let mut tlv = Vec::new(); - // VID:PID (Tag 0x00) - if let (Some(vid_str), Some(pid_str)) = (&config.vid, &config.pid) { - let vid = - u16::from_str_radix(vid_str, 16).map_err(|_| PFError::Io("Invalid VID".into()))?; - let pid = - u16::from_str_radix(pid_str, 16).map_err(|_| PFError::Io("Invalid PID".into()))?; + // VID:PID (Tag 0x00) + if let (Some(vid_str), Some(pid_str)) = (&config.vid, &config.pid) { + let vid = + u16::from_str_radix(vid_str, 16).map_err(|_| PFError::Io("Invalid VID".into()))?; + let pid = + u16::from_str_radix(pid_str, 16).map_err(|_| PFError::Io("Invalid PID".into()))?; - tlv.push(PhyTag::VidPid as u8); - tlv.push(0x04); - tlv.write_u16::(vid).unwrap(); - tlv.write_u16::(pid).unwrap(); - } + tlv.push(PhyTag::VidPid as u8); + tlv.push(0x04); + tlv.write_u16::(vid).unwrap(); + tlv.write_u16::(pid).unwrap(); + } - // LED GPIO (Tag 0x04) - if let Some(val) = config.led_gpio { - tlv.push(PhyTag::LedGpio as u8); - tlv.push(0x01); - tlv.push(val); - } + // LED GPIO (Tag 0x04) + if let Some(val) = config.led_gpio { + tlv.push(PhyTag::LedGpio as u8); + tlv.push(0x01); + tlv.push(val); + } - // LED Brightness (Tag 0x05) - if let Some(val) = config.led_brightness { - tlv.push(PhyTag::LedBrightness as u8); - tlv.push(0x01); - tlv.push(val); - } + // LED Brightness (Tag 0x05) + if let Some(val) = config.led_brightness { + tlv.push(PhyTag::LedBrightness as u8); + tlv.push(0x01); + tlv.push(val); + } - // Touch Timeout (Tag 0x08) - if let Some(val) = config.touch_timeout { - tlv.push(PhyTag::PresenceTimeout as u8); - tlv.push(0x01); - tlv.push(val); - } + // Touch Timeout (Tag 0x08) + if let Some(val) = config.touch_timeout { + tlv.push(PhyTag::PresenceTimeout as u8); + tlv.push(0x01); + tlv.push(val); + } - // Options - if let (Some(dim), Some(cycle), Some(steady)) = ( - config.led_dimmable, - config.power_cycle_on_reset, - config.led_steady, - ) { - let mut opts = RescueOptions::empty(); - if dim { - opts.insert(RescueOptions::LED_DIMMABLE); - } - if !cycle { - opts.insert(RescueOptions::DISABLE_POWER_RESET); - } - if steady { - opts.insert(RescueOptions::LED_STEADY); - } + // Options + if let (Some(dim), Some(cycle), Some(steady)) = ( + config.led_dimmable, + config.power_cycle_on_reset, + config.led_steady, + ) { + let mut opts = RescueOptions::empty(); + if dim { + opts.insert(RescueOptions::LED_DIMMABLE); + } + if !cycle { + opts.insert(RescueOptions::DISABLE_POWER_RESET); + } + if steady { + opts.insert(RescueOptions::LED_STEADY); + } - tlv.push(PhyTag::Opts as u8); - tlv.push(0x02); - tlv.write_u16::(opts.bits()).unwrap(); - } + tlv.push(PhyTag::Opts as u8); + tlv.push(0x02); + tlv.write_u16::(opts.bits()).unwrap(); + } - // Curves - if let Some(enabled) = config.enable_secp256k1 { - let mut curves = RescueCurves::empty(); - if enabled { - curves.insert(RescueCurves::SECP256K1); - } + // Curves + if let Some(enabled) = config.enable_secp256k1 { + let mut curves = RescueCurves::empty(); + if enabled { + curves.insert(RescueCurves::SECP256K1); + } - tlv.push(PhyTag::Curves as u8); - tlv.push(0x04); - tlv.write_u32::(curves.bits()).unwrap(); - } + tlv.push(PhyTag::Curves as u8); + tlv.push(0x04); + tlv.write_u32::(curves.bits()).unwrap(); + } - // LED Driver (Tag 0x0C) - if let Some(val) = config.led_driver { - tlv.push(PhyTag::LedDriver as u8); - tlv.push(0x01); - tlv.push(val); - } + // LED Driver (Tag 0x0C) + if let Some(val) = config.led_driver { + tlv.push(PhyTag::LedDriver as u8); + tlv.push(0x01); + tlv.push(val); + } - // Product Name (Tag 0x09) - if let Some(name) = config.product_name.filter(|n| !n.is_empty()) { - let name_bytes = name.as_bytes(); - let len = name_bytes.len() + 1; - if len > 32 { - return Err(PFError::Io("Product name too long".into())); - } + // Product Name (Tag 0x09) + if let Some(name) = config.product_name.filter(|n| !n.is_empty()) { + let name_bytes = name.as_bytes(); + let len = name_bytes.len() + 1; + if len > 32 { + return Err(PFError::Io("Product name too long".into())); + } - tlv.push(PhyTag::UsbProduct as u8); - tlv.push(len as u8); - tlv.extend_from_slice(name_bytes); - tlv.push(0x00); // Null terminator - } + tlv.push(PhyTag::UsbProduct as u8); + tlv.push(len as u8); + tlv.extend_from_slice(name_bytes); + tlv.push(0x00); // Null terminator + } - // 2. Connect and Send - if tlv.is_empty() { - log::warn!("No configuration changes to apply"); - return Ok("No changes to apply".into()); - } + // 2. Connect and Send + if tlv.is_empty() { + log::warn!("No configuration changes to apply"); + return Ok("No changes to apply".into()); + } - log::debug!("TLV payload size: {} bytes", tlv.len()); + log::debug!("TLV payload size: {} bytes", tlv.len()); - let (card, _) = connect_and_select()?; + let (card, _) = connect_and_select()?; - // APDU: 80 1C 01 00 [Lc] [Data] - let mut apdu = vec![ - APDU_CLA_PROPRIETARY, - RescueInstruction::Write as u8, - WriteParam::PhyConfig as u8, - P2_UNUSED, - tlv.len() as u8, // Lc - ]; - apdu.extend_from_slice(&tlv); + // APDU: 80 1C 01 00 [Lc] [Data] + let mut apdu = vec![ + APDU_CLA_PROPRIETARY, + RescueInstruction::Write as u8, + WriteParam::PhyConfig as u8, + P2_UNUSED, + tlv.len() as u8, // Lc + ]; + apdu.extend_from_slice(&tlv); - let mut rx_buf = [0; 256]; - let rx = card.transmit(&apdu, &mut rx_buf)?; + let mut rx_buf = [0; 256]; + let rx = card.transmit(&apdu, &mut rx_buf)?; - if rx.ends_with(&[0x90, 0x00]) { - log::info!("Configuration applied successfully"); - Ok("Configuration Applied Successfully".into()) - } else { - log::error!("Configuration write failed: {:02X?}", rx); - Err(PFError::Device(format!("Write failed: {:02X?}", rx))) - } + if rx.ends_with(&[0x90, 0x00]) { + log::info!("Configuration applied successfully"); + Ok("Configuration Applied Successfully".into()) + } else { + log::error!("Configuration write failed: {:02X?}", rx); + Err(PFError::Device(format!("Write failed: {:02X?}", rx))) + } } pub fn reboot_device(to_bootsel: bool) -> Result { - let (card, _) = connect_and_select()?; + let (card, _) = connect_and_select()?; - let param = if to_bootsel { - RebootParam::Bootsel - } else { - RebootParam::Normal - }; + let param = if to_bootsel { + RebootParam::Bootsel + } else { + RebootParam::Normal + }; - let apdu = [ - APDU_CLA_PROPRIETARY, - RescueInstruction::Reboot as u8, - param as u8, - P2_UNUSED, - 0x00, - ]; + let apdu = [ + APDU_CLA_PROPRIETARY, + RescueInstruction::Reboot as u8, + param as u8, + P2_UNUSED, + 0x00, + ]; - let mut rx_buf = [0; 256]; - let rx = card.transmit(&apdu, &mut rx_buf)?; + let mut rx_buf = [0; 256]; + let rx = card.transmit(&apdu, &mut rx_buf)?; - if rx.ends_with(&SW_SUCCESS) { - Ok("Reboot command sent".into()) - } else { - Err(PFError::Device(format!("Reboot failed: {:02X?}", rx))) - } + if rx.ends_with(&SW_SUCCESS) { + Ok("Reboot command sent".into()) + } else { + Err(PFError::Device(format!("Reboot failed: {:02X?}", rx))) + } } /// UNSTABLE! (WIP) pub fn enable_secure_boot(lock: bool) -> Result { - let (card, _) = connect_and_select()?; + let (card, _) = connect_and_select()?; - // APDU: 80 1D [KeyIndex] [LockBool] 00 - // KeyIndex = 0 (Default), LockBool = 1 if true - let lock_byte = if lock { 0x01 } else { 0x00 }; + // APDU: 80 1D [KeyIndex] [LockBool] 00 + // KeyIndex = 0 (Default), LockBool = 1 if true + let lock_byte = if lock { 0x01 } else { 0x00 }; - let apdu = [ - APDU_CLA_PROPRIETARY, - RescueInstruction::Secure as u8, - 0x00, // Boot Key Index (0 = Default) - lock_byte as u8, - 0x00, - ]; + let apdu = [ + APDU_CLA_PROPRIETARY, + RescueInstruction::Secure as u8, + 0x00, // Boot Key Index (0 = Default) + lock_byte as u8, + 0x00, + ]; - let mut rx_buf = [0; 256]; - let rx = card.transmit(&apdu, &mut rx_buf)?; + let mut rx_buf = [0; 256]; + let rx = card.transmit(&apdu, &mut rx_buf)?; - if rx.ends_with(&[0x90, 0x00]) { - Ok("Secure Boot Enabled".into()) - } else { - Err(PFError::Device(format!("Secure Boot failed: {:02X?}", rx))) - } + if rx.ends_with(&[0x90, 0x00]) { + Ok("Secure Boot Enabled".into()) + } else { + Err(PFError::Device(format!("Secure Boot failed: {:02X?}", rx))) + } } diff --git a/src/device/types.rs b/src/device/types.rs index cbff91e..fbe4386 100644 --- a/src/device/types.rs +++ b/src/device/types.rs @@ -3,66 +3,66 @@ use serde::{Deserialize, Serialize}; struct PForgeState { - device_info: DeviceInfo, + device_info: DeviceInfo, } #[derive(Serialize)] #[serde(rename_all = "camelCase")] pub struct DeviceInfo { - pub serial: String, - pub flash_used: u32, - pub flash_total: u32, - pub firmware_version: String, + pub serial: String, + pub flash_used: u32, + pub flash_total: u32, + pub firmware_version: String, } #[derive(Serialize, Deserialize, Debug, Default)] #[serde(rename_all = "camelCase")] pub struct AppConfig { - pub vid: String, - pub pid: String, - pub product_name: String, - pub led_gpio: u8, - pub led_brightness: u8, - pub touch_timeout: u8, - #[serde(skip_serializing_if = "Option::is_none")] - pub led_driver: Option, - pub led_dimmable: bool, - pub power_cycle_on_reset: bool, - pub led_steady: bool, - pub enable_secp256k1: bool, + pub vid: String, + pub pid: String, + pub product_name: String, + pub led_gpio: u8, + pub led_brightness: u8, + pub touch_timeout: u8, + #[serde(skip_serializing_if = "Option::is_none")] + pub led_driver: Option, + pub led_dimmable: bool, + pub power_cycle_on_reset: bool, + pub led_steady: bool, + pub enable_secp256k1: bool, } #[derive(Deserialize, Debug, Clone)] #[serde(rename_all = "camelCase")] pub struct AppConfigInput { - pub vid: Option, - pub pid: Option, - pub product_name: Option, - pub led_gpio: Option, - pub led_brightness: Option, - pub touch_timeout: Option, - pub led_driver: Option, - pub led_dimmable: Option, - pub power_cycle_on_reset: Option, - pub led_steady: Option, - pub enable_secp256k1: Option, + pub vid: Option, + pub pid: Option, + pub product_name: Option, + pub led_gpio: Option, + pub led_brightness: Option, + pub touch_timeout: Option, + pub led_driver: Option, + pub led_dimmable: Option, + pub power_cycle_on_reset: Option, + pub led_steady: Option, + pub enable_secp256k1: Option, } #[derive(Serialize)] #[serde(rename_all = "camelCase")] pub struct FullDeviceStatus { - pub info: DeviceInfo, - pub config: AppConfig, - pub secure_boot: bool, - pub secure_lock: bool, - pub method: DeviceMethod, + pub info: DeviceInfo, + pub config: AppConfig, + pub secure_boot: bool, + pub secure_lock: bool, + pub method: DeviceMethod, } #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)] pub enum DeviceMethod { - #[serde(rename = "FIDO")] - Fido, - Rescue, + #[serde(rename = "FIDO")] + Fido, + Rescue, } // Fido stuff: @@ -70,24 +70,24 @@ pub enum DeviceMethod { #[derive(Serialize)] #[serde(rename_all = "camelCase")] pub struct FidoDeviceInfo { - pub versions: Vec, - pub extensions: Vec, - pub aaguid: String, - pub options: std::collections::HashMap, - pub max_msg_size: i32, - pub pin_protocols: Vec, - // pub remaining_disc_creds: u32, - pub min_pin_length: u32, - pub firmware_version: String, + pub versions: Vec, + pub extensions: Vec, + pub aaguid: String, + pub options: std::collections::HashMap, + pub max_msg_size: i32, + pub pin_protocols: Vec, + // pub remaining_disc_creds: u32, + pub min_pin_length: u32, + pub firmware_version: String, } #[derive(Debug, Clone, Serialize)] #[serde(rename_all = "camelCase")] pub struct StoredCredential { - pub rp_id: String, - pub rp_name: String, - pub user_name: String, - pub user_display_name: String, - pub user_id: String, - pub credential_id: String, + pub rp_id: String, + pub rp_name: String, + pub user_name: String, + pub user_display_name: String, + pub user_id: String, + pub credential_id: String, } diff --git a/src/main.rs b/src/main.rs index 04e1188..b7a26e7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,69 +2,66 @@ use gpui::*; use gpui_component::Root; use gpui_component::{Theme, ThemeMode}; use ui::rootview::ApplicationRoot; -// use crate::ui::assets::Assets; mod device; mod ui; fn main() { - // TODO: Configure and add custom assets. - // let app = Application::new().with_assets(gpui_component_assets::Assets); - let app = Application::new().with_assets(ui::assets::Assets); + let app = Application::new().with_assets(ui::assets::Assets); - app.run(move |cx| { - gpui_component::init(cx); - Theme::change(ThemeMode::Dark, None, cx); - // Theme::change(ThemeMode::Dark, Some(ui::theme::dark_theme()), cx); + app.run(move |cx| { + gpui_component::init(cx); + Theme::change(ThemeMode::Dark, None, cx); + // Theme::change(ThemeMode::Dark, Some(ui::theme::dark_theme()), cx); - cx.activate(true); + cx.activate(true); - let mut window_size = size(px(1280.0), px(720.0)); + let mut window_size = size(px(1280.0), px(720.0)); - // Basically, make sure that the window is max to max 85 percent size of the actual monitor/display, - // so the window does not get too big on small monitors. - if let Some(display) = cx.primary_display() { - let display_size = display.bounds().size; + // Basically, make sure that the window is max to max 85 percent size of the actual + // monitor/display, so the window does not get too big on small monitors. + if let Some(display) = cx.primary_display() { + let display_size = display.bounds().size; - window_size.width = window_size.width.min(display_size.width * 0.85); - window_size.height = window_size.height.min(display_size.height * 0.85); - } + window_size.width = window_size.width.min(display_size.width * 0.85); + window_size.height = window_size.height.min(display_size.height * 0.85); + } - let window_bounds = Bounds::centered(None, window_size, cx); + let window_bounds = Bounds::centered(None, window_size, cx); - cx.spawn(async move |cx| { - let window_options = WindowOptions { - app_id: Some("in.suyogtandel.picoforge".into()), + cx.spawn(async move |cx| { + let window_options = WindowOptions { + app_id: Some("in.suyogtandel.picoforge".into()), - window_bounds: Some(WindowBounds::Windowed(window_bounds)), + window_bounds: Some(WindowBounds::Windowed(window_bounds)), - titlebar: Some(TitlebarOptions { - title: Some("PicoForge".into()), - appears_transparent: true, - // TODO: This option needs to be tested and adjusted on macos - traffic_light_position: Some(gpui::point(px(12.0), px(12.0))), - }), + titlebar: Some(TitlebarOptions { + title: Some("PicoForge".into()), + appears_transparent: true, + // TODO: This option needs to be tested and adjusted on macos + traffic_light_position: Some(gpui::point(px(12.0), px(12.0))), + }), - #[cfg(any(target_os = "linux", target_os = "freebsd"))] - window_background: gpui::WindowBackgroundAppearance::Transparent, - #[cfg(any(target_os = "linux", target_os = "freebsd"))] - window_decorations: Some(gpui::WindowDecorations::Client), + #[cfg(any(target_os = "linux", target_os = "freebsd"))] + window_background: gpui::WindowBackgroundAppearance::Transparent, + #[cfg(any(target_os = "linux", target_os = "freebsd"))] + window_decorations: Some(gpui::WindowDecorations::Client), - window_min_size: Some(gpui::Size { - width: px(650.), - height: px(300.), - }), - kind: WindowKind::Normal, - ..Default::default() - }; + window_min_size: Some(gpui::Size { + width: px(650.), + height: px(300.), + }), + kind: WindowKind::Normal, + ..Default::default() + }; - cx.open_window(window_options, |window, cx| { - let view = cx.new(|_| ApplicationRoot::new()); - cx.new(|cx| Root::new(view, window, cx)) - })?; + cx.open_window(window_options, |window, cx| { + let view = cx.new(|_| ApplicationRoot::new()); + cx.new(|cx| Root::new(view, window, cx)) + })?; - Ok::<_, anyhow::Error>(()) - }) - .detach(); - }); + Ok::<_, anyhow::Error>(()) + }) + .detach(); + }); } diff --git a/src/ui/assets.rs b/src/ui/assets.rs index 5f02101..bff2b52 100644 --- a/src/ui/assets.rs +++ b/src/ui/assets.rs @@ -11,19 +11,19 @@ use std::borrow::Cow; pub struct Assets; impl AssetSource for Assets { - fn load(&self, path: &str) -> Result>> { - if path.is_empty() { - return Ok(None); - } + fn load(&self, path: &str) -> Result>> { + if path.is_empty() { + return Ok(None); + } - Self::get(path) - .map(|f| Some(f.data)) - .ok_or_else(|| anyhow!("could not find asset at path \"{path}\"")) - } + Self::get(path) + .map(|f| Some(f.data)) + .ok_or_else(|| anyhow!("could not find asset at path \"{path}\"")) + } - fn list(&self, path: &str) -> Result> { - Ok(Self::iter() - .filter_map(|p| p.starts_with(path).then(|| p.into())) - .collect()) - } + fn list(&self, path: &str) -> Result> { + Ok(Self::iter() + .filter_map(|p| p.starts_with(path).then(|| p.into())) + .collect()) + } } diff --git a/src/ui/colors.rs b/src/ui/colors.rs index 218f207..9a38649 100644 --- a/src/ui/colors.rs +++ b/src/ui/colors.rs @@ -11,4 +11,4 @@ pub mod zinc { pub const ZINC800: u32 = 0x27272a; pub const ZINC900: u32 = 0x18181b; pub const ZINC950: u32 = 0x09090b; -} \ No newline at end of file +} diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 43ff877..d14489d 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -1,4 +1,4 @@ -pub mod views; pub mod assets; -pub mod rootview; pub mod colors; +pub mod rootview; +pub mod views; diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index d52105e..e7d2bd6 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -1,141 +1,141 @@ +use crate::ui::colors; use crate::ui::views::{ - about::AboutView, config::ConfigView, home::HomeView, logs::LogsView, passkeys::PasskeysView, - security::SecurityView, + about::AboutView, config::ConfigView, home::HomeView, logs::LogsView, passkeys::PasskeysView, + security::SecurityView, }; use gpui::*; use gpui_component::button::{Button, ButtonVariants}; use gpui_component::scroll::ScrollableElement; -use gpui_component::{ActiveTheme, Icon, IconName, TitleBar, h_flex, v_flex}; +use gpui_component::{ActiveTheme, Icon, IconName, StyledExt, TitleBar, h_flex, v_flex}; use gpui_component::{Side, sidebar::*}; #[derive(Clone, Copy, PartialEq)] enum ActiveView { - Home, - Passkeys, - Configuration, - Security, - Logs, - About, + Home, + Passkeys, + Configuration, + Security, + Logs, + About, } pub struct ApplicationRoot { - active_view: ActiveView, - collapsed: bool, + active_view: ActiveView, + collapsed: bool, } impl ApplicationRoot { - pub fn new() -> Self { - Self { - active_view: ActiveView::Home, - collapsed: false, - } - } + pub fn new() -> Self { + Self { + active_view: ActiveView::Home, + collapsed: false, + } + } } impl Render for ApplicationRoot { - fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { - h_flex() - .size_full() - .child( - Sidebar::new(Side::Left) - .collapsed(self.collapsed) - .collapsible(true) - .h_full() - .bg(rgb(0x18181b)) - // .header(SidebarHeader::new().child("PicoForge")) - .child( - SidebarGroup::new("Menu").child( - SidebarMenu::new() - .child( - SidebarMenuItem::new("Home") - .icon(Icon::default().path("icons/house.svg")) - .active(self.active_view == ActiveView::Home) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Home; - })), - ) - .child( - SidebarMenuItem::new("Passkeys") - .icon(Icon::default().path("icons/key-round.svg")) - .active(self.active_view == ActiveView::Passkeys) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Passkeys; - })), - ) - .child( - SidebarMenuItem::new("Configuration") - .icon(Icon::default().path("icons/settings.svg")) - .active(self.active_view == ActiveView::Configuration) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Configuration; - })), - ) - // TODO: Replace these icons with correct ones from lucide - .child( - SidebarMenuItem::new("Security") - .icon(Icon::default().path("icons/shield-check.svg")) - .active(self.active_view == ActiveView::Security) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Security; - })), - ) - .child( - SidebarMenuItem::new("Logs") - .icon(Icon::default().path("icons/scroll-text.svg")) - .active(self.active_view == ActiveView::Logs) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Logs; - })), - ) - .child( - SidebarMenuItem::new("About") - .icon(Icon::default().path("icons/shield-check.svg")) - .active(self.active_view == ActiveView::About) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::About; - })), - ), - ), - ), // .footer(SidebarFooter::new().child("Device Status")), - ) - .child( - v_flex() - .size_full() - .child( - TitleBar::new().child( - h_flex() - .w_full() - .justify_between() - // .px_4() - .items_center() - .cursor(gpui::CursorStyle::OpenHand) - .child( - Button::new("sidebar_toggle") - .ghost() - .icon(IconName::PanelLeft) - .on_click(cx.listener(|this, _, _, _| { - this.collapsed = !this.collapsed; - })) - .tooltip("Toggle Sidebar"), - ), - ), - ) - .child( - v_flex() - .min_h(px(0.)) - .min_w(px(0.)) - .overflow_y_scrollbar() - .flex_grow() - .bg(cx.theme().background) - .child(match self.active_view { - ActiveView::Home => HomeView::build(cx.theme()).into_any_element(), - ActiveView::Passkeys => PasskeysView::build().into_any_element(), - ActiveView::Configuration => ConfigView::build().into_any_element(), - ActiveView::Security => SecurityView::build().into_any_element(), - ActiveView::Logs => LogsView::build().into_any_element(), - ActiveView::About => AboutView::build().into_any_element(), - }), - ), - ) - } + fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { + h_flex() + .size_full() + .child( + Sidebar::new(Side::Left) + .collapsed(self.collapsed) + .collapsible(true) + .h_full() + .bg(rgb(0x18181b)) + .child( + SidebarGroup::new("Menu").child( + SidebarMenu::new() + .child( + SidebarMenuItem::new("Home") + .icon(Icon::default().path("icons/house.svg")) + .active(self.active_view == ActiveView::Home) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Home; + })), + ) + .child( + SidebarMenuItem::new("Passkeys") + .icon(Icon::default().path("icons/key-round.svg")) + .active(self.active_view == ActiveView::Passkeys) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Passkeys; + })), + ) + .child( + SidebarMenuItem::new("Configuration") + .icon(Icon::default().path("icons/settings.svg")) + .active(self.active_view == ActiveView::Configuration) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Configuration; + })), + ) + // TODO: Replace these icons with correct ones from lucide + .child( + SidebarMenuItem::new("Security") + .icon(Icon::default().path("icons/shield-check.svg")) + .active(self.active_view == ActiveView::Security) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Security; + })), + ) + .child( + SidebarMenuItem::new("Logs") + .icon(Icon::default().path("icons/scroll-text.svg")) + .active(self.active_view == ActiveView::Logs) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Logs; + })), + ) + .child( + SidebarMenuItem::new("About") + .icon(IconName::Info) + .active(self.active_view == ActiveView::About) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::About; + })), + ), + ), + ), + ) + .child( + v_flex() + .size_full() + .child( + TitleBar::new().bg(rgba(colors::zinc::ZINC900)).child( + h_flex() + .w_full() + .justify_between() + .bg(rgba(colors::zinc::ZINC900)) + .items_center() + .cursor(gpui::CursorStyle::OpenHand) + .child( + Button::new("sidebar_toggle") + .ghost() + .icon(IconName::PanelLeft) + .on_click(cx.listener(|this, _, _, _| { + this.collapsed = !this.collapsed; + })) + .tooltip("Toggle Sidebar"), + ), + ), + ) + .child( + v_flex() + .min_h(px(0.)) + .min_w(px(0.)) + .overflow_y_scrollbar() + .flex_grow() + .bg(cx.theme().background) + .child(match self.active_view { + ActiveView::Home => HomeView::build(cx.theme()).into_any_element(), + ActiveView::Passkeys => PasskeysView::build().into_any_element(), + ActiveView::Configuration => ConfigView::build().into_any_element(), + ActiveView::Security => SecurityView::build().into_any_element(), + ActiveView::Logs => LogsView::build().into_any_element(), + ActiveView::About => AboutView::build().into_any_element(), + }), + ), + ) + } } diff --git a/src/ui/views/about.rs b/src/ui/views/about.rs index afd8642..49be916 100644 --- a/src/ui/views/about.rs +++ b/src/ui/views/about.rs @@ -4,7 +4,7 @@ use gpui::*; pub struct AboutView; impl AboutView { - pub fn build() -> impl IntoElement { - div().size_full().p_8().child("About goes here...") - } + pub fn build() -> impl IntoElement { + div().size_full().p_8().child("About goes here...") + } } diff --git a/src/ui/views/config.rs b/src/ui/views/config.rs index 9014001..94c155f 100644 --- a/src/ui/views/config.rs +++ b/src/ui/views/config.rs @@ -4,10 +4,10 @@ use gpui::*; pub struct ConfigView; impl ConfigView { - pub fn build() -> impl IntoElement { - div() - .size_full() - .p_8() - .child("Passkey Management List goes here...") - } + pub fn build() -> impl IntoElement { + div() + .size_full() + .p_8() + .child("Passkey Management List goes here...") + } } diff --git a/src/ui/views/home.rs b/src/ui/views/home.rs index 78a192b..228a683 100644 --- a/src/ui/views/home.rs +++ b/src/ui/views/home.rs @@ -5,510 +5,510 @@ use gpui_component::{Icon, IconName, Theme, badge::Badge, h_flex, progress::Prog // These will be replaced/added in types.rs struct DeviceInfo { - serial: String, - firmware_version: String, - flash_used: f32, - flash_total: f32, + serial: String, + firmware_version: String, + flash_used: f32, + flash_total: f32, } struct DeviceConfig { - vid: u16, - pid: u16, - product_name: String, - led_gpio: u8, - led_brightness: u8, - touch_timeout: u8, - led_dimmable: bool, - led_steady: bool, + vid: u16, + pid: u16, + product_name: String, + led_gpio: u8, + led_brightness: u8, + touch_timeout: u8, + led_dimmable: bool, + led_steady: bool, } struct FidoInfo { - versions: Vec, - client_pin: bool, - min_pin_length: u8, - resident_keys: bool, - aaguid: String, + versions: Vec, + client_pin: bool, + min_pin_length: u8, + resident_keys: bool, + aaguid: String, } struct DeviceSecurity { - secure_boot: bool, - secure_lock: bool, - confirmed: bool, + secure_boot: bool, + secure_lock: bool, + confirmed: bool, } struct DeviceState { - connected: bool, - method: String, - info: DeviceInfo, - config: DeviceConfig, - fido_info: Option, - security: DeviceSecurity, + connected: bool, + method: String, + info: DeviceInfo, + config: DeviceConfig, + fido_info: Option, + security: DeviceSecurity, } pub struct HomeView; impl HomeView { - pub fn build(theme: &Theme) -> impl IntoElement { - // Mock Data, I will replace this with fetching of actual data later, kinda bored rn. - let device = DeviceState { - connected: true, - method: "HID".to_string(), - info: DeviceInfo { - serial: "A1B2C3D4E5".to_string(), - firmware_version: "1.2.0".to_string(), - flash_used: 128.0, - flash_total: 2048.0, - }, - config: DeviceConfig { - vid: 0x0000, - pid: 0x0000, - product_name: "Pico FIDO Key".to_string(), - led_gpio: 25, - led_brightness: 128, - touch_timeout: 10, - led_dimmable: true, - led_steady: false, - }, - fido_info: Some(FidoInfo { - versions: vec!["FIDO2_1".to_string(), "U2F_V2".to_string()], - client_pin: true, - min_pin_length: 4, - resident_keys: true, - aaguid: "00000000-0000-0000-0000-000000000000".to_string(), - }), - security: DeviceSecurity { - secure_boot: true, - secure_lock: false, - confirmed: true, - }, - }; + pub fn build(theme: &Theme) -> impl IntoElement { + // Mock Data, I will replace this with fetching of actual data later, kinda bored rn. + let device = DeviceState { + connected: true, + method: "HID".to_string(), + info: DeviceInfo { + serial: "A1B2C3D4E5".to_string(), + firmware_version: "1.2.0".to_string(), + flash_used: 128.0, + flash_total: 2048.0, + }, + config: DeviceConfig { + vid: 0x0000, + pid: 0x0000, + product_name: "Pico FIDO Key".to_string(), + led_gpio: 25, + led_brightness: 128, + touch_timeout: 10, + led_dimmable: true, + led_steady: false, + }, + fido_info: Some(FidoInfo { + versions: vec!["FIDO2_1".to_string(), "U2F_V2".to_string()], + client_pin: true, + min_pin_length: 4, + resident_keys: true, + aaguid: "00000000-0000-0000-0000-000000000000".to_string(), + }), + security: DeviceSecurity { + secure_boot: true, + secure_lock: false, + confirmed: true, + }, + }; - div() - .size_full() - .bg(theme.background) - .flex() - .flex_col() - .items_center() - .child( - div().w_full().max_w(px(1400.0)).px_10().py_5().child( - v_flex() - .gap_8() - .child( - v_flex() - .child( - div() - .text_3xl() - .font_extrabold() - .text_color(theme.foreground) - .child("Device Overview"), - ) - .child( - div().text_sm().text_color(theme.muted_foreground).child( - "Quick view of your device status and specifications.", - ), - ), - ) - // Content Section - .child(if !device.connected { - // No Device Status Placeholder - div() - .flex() - .items_center() - .justify_center() - .h_64() - .border_1() - .border_color(theme.border) - .rounded_xl() - .child( - div() - .text_color(theme.muted_foreground) - .child("No Device Connected"), - ) - .into_any_element() - } else { - // 4 Card Grid - div() - .grid() - .grid_cols(2) - .gap_6() - .child(Self::render_device_info(&device, theme)) - .child(Self::render_fido_info(&device, theme)) - .child(Self::render_led_config(&device, theme)) - .child(Self::render_security_status(&device, theme)) - .into_any_element() - }), - ), - ) - } + div() + .size_full() + .bg(theme.background) + .flex() + .flex_col() + .items_center() + .child( + div().w_full().max_w(px(1400.0)).px_10().py_5().child( + v_flex() + .gap_8() + .child( + v_flex() + .child( + div() + .text_3xl() + .font_extrabold() + .text_color(theme.foreground) + .child("Device Overview"), + ) + .child( + div().text_sm().text_color(theme.muted_foreground).child( + "Quick view of your device status and specifications.", + ), + ), + ) + // Content Section + .child(if !device.connected { + // No Device Status Placeholder + div() + .flex() + .items_center() + .justify_center() + .h_64() + .border_1() + .border_color(theme.border) + .rounded_xl() + .child( + div() + .text_color(theme.muted_foreground) + .child("No Device Connected"), + ) + .into_any_element() + } else { + // 4 Card Grid + div() + .grid() + .grid_cols(2) + .gap_6() + .child(Self::render_device_info(&device, theme)) + .child(Self::render_fido_info(&device, theme)) + .child(Self::render_led_config(&device, theme)) + .child(Self::render_security_status(&device, theme)) + .into_any_element() + }), + ), + ) + } - fn home_card( - title: &str, - icon: Icon, - content: impl IntoElement, - theme: &Theme, - ) -> impl IntoElement { - div() - .w_full() - // TODO: REPLACE with a constant or modify default theme - .bg(rgb(0x18181b)) - .border_1() - .border_color(theme.border) - .rounded_xl() - .p_6() - .child( - v_flex() - .gap_6() - .child( - h_flex() - .items_center() - .gap_2() - .child(Icon::new(icon).size_5().text_color(theme.foreground)) - .child( - div() - .font_bold() - .text_color(theme.foreground) - .child(title.to_string()), - ), - ) - .child(content), - ) - } + fn home_card( + title: &str, + icon: Icon, + content: impl IntoElement, + theme: &Theme, + ) -> impl IntoElement { + div() + .w_full() + // TODO: REPLACE with a constant or modify default theme + .bg(rgb(0x18181b)) + .border_1() + .border_color(theme.border) + .rounded_xl() + .p_6() + .child( + v_flex() + .gap_6() + .child( + h_flex() + .items_center() + .gap_2() + .child(Icon::new(icon).size_5().text_color(theme.foreground)) + .child( + div() + .font_bold() + .text_color(theme.foreground) + .child(title.to_string()), + ), + ) + .child(content), + ) + } - // --- Helper for Key-Value pairs --- - fn render_kv( - label: &str, - value: impl IntoElement, - theme: &Theme, - font_mono: bool, - ) -> impl IntoElement { - v_flex() - .gap_1() - .child( - div() - .text_sm() - .text_color(theme.muted_foreground) - .child(label.to_string()), - ) - .child( - div() - .text_sm() - .font_weight(if font_mono { - FontWeight::NORMAL - } else { - FontWeight::MEDIUM - }) - .font_family(if font_mono { "Mono" } else { "Sans" }) - .text_color(theme.foreground) - .child(value), - ) - } + // --- Helper for Key-Value pairs --- + fn render_kv( + label: &str, + value: impl IntoElement, + theme: &Theme, + font_mono: bool, + ) -> impl IntoElement { + v_flex() + .gap_1() + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child(label.to_string()), + ) + .child( + div() + .text_sm() + .font_weight(if font_mono { + FontWeight::NORMAL + } else { + FontWeight::MEDIUM + }) + .font_family(if font_mono { "Mono" } else { "Sans" }) + .text_color(theme.foreground) + .child(value), + ) + } - fn render_device_info(device: &DeviceState, theme: &Theme) -> impl IntoElement { - let flash_percent = (device.info.flash_used / device.info.flash_total) * 100.0; + fn render_device_info(device: &DeviceState, theme: &Theme) -> impl IntoElement { + let flash_percent = (device.info.flash_used / device.info.flash_total) * 100.0; - Self::home_card( - "Device Information", - Icon::default().path("icons/cpu.svg"), - v_flex() - .gap_6() - .child( - div() - .grid() - .grid_cols(2) - .gap_4() - .child(Self::render_kv( - "Serial Number", - device.info.serial.clone(), - theme, - true, - )) - .child(Self::render_kv( - "Firmware Version", - format!("v{}", device.info.firmware_version), - theme, - true, - )) - .child(Self::render_kv( - "VID:PID", - format!("{:04x}:{:04x}", device.config.vid, device.config.pid), - theme, - true, - )) - .child(Self::render_kv( - "Product Name", - device.config.product_name.clone(), - theme, - false, - )), - ) - .child( - div().h_px().bg(theme.border), // Separator - ) - .child( - v_flex() - .gap_2() - .child( - h_flex() - .justify_between() - .text_sm() - .child( - div() - .text_color(theme.muted_foreground) - .child("Flash Memory"), - ) - .child(div().text_color(theme.foreground).child(format!( - "{:.0} / {:.0} KB", - device.info.flash_used, device.info.flash_total - ))), - ) - .child(Progress::new().value(flash_percent)), - ), - theme, - ) - } + Self::home_card( + "Device Information", + Icon::default().path("icons/cpu.svg"), + v_flex() + .gap_6() + .child( + div() + .grid() + .grid_cols(2) + .gap_4() + .child(Self::render_kv( + "Serial Number", + device.info.serial.clone(), + theme, + true, + )) + .child(Self::render_kv( + "Firmware Version", + format!("v{}", device.info.firmware_version), + theme, + true, + )) + .child(Self::render_kv( + "VID:PID", + format!("{:04x}:{:04x}", device.config.vid, device.config.pid), + theme, + true, + )) + .child(Self::render_kv( + "Product Name", + device.config.product_name.clone(), + theme, + false, + )), + ) + .child(div().h_px().bg(theme.border)) + .child( + v_flex() + .gap_2() + .child( + h_flex() + .justify_between() + .text_sm() + .child( + div() + .text_color(theme.muted_foreground) + .child("Flash Memory"), + ) + .child(div().text_color(theme.foreground).child(format!( + "{:.0} / {:.0} KB", + device.info.flash_used, device.info.flash_total + ))), + ) + .child(Progress::new().value(flash_percent)), + ), + theme, + ) + } - fn render_fido_info(device: &DeviceState, theme: &Theme) -> impl IntoElement { - Self::home_card( - "FIDO2 Information", - Icon::default().path("icons/shield.svg"), - if let Some(fido) = &device.fido_info { - v_flex() - .gap_6() - .child( - div() - .grid() - .grid_cols(2) - .gap_4() - .child(Self::render_kv( - "FIDO Version", - fido.versions.first().cloned().unwrap_or("N/A".into()), - theme, - false, - )) - .child(Self::render_kv( - "PIN Set", - if fido.client_pin { "Yes" } else { "No" }, - theme, - false, - )) - .child(Self::render_kv( - "Min PIN Length", - fido.min_pin_length.to_string(), - theme, - false, - )) - .child(Self::render_kv( - "Resident Keys", - if fido.resident_keys { - "Supported" - } else { - "Not Supported" - }, - theme, - false, - )), - ) - .child(div().h_px().bg(theme.border)) - .child(Self::render_kv("AAGUID", fido.aaguid.clone(), theme, true)) - .into_any_element() - } else { - div() - .text_sm() - .text_color(theme.muted_foreground) - .child("FIDO information not available") - .into_any_element() - }, - theme, - ) - } + fn render_fido_info(device: &DeviceState, theme: &Theme) -> impl IntoElement { + Self::home_card( + "FIDO2 Information", + Icon::default().path("icons/shield.svg"), + if let Some(fido) = &device.fido_info { + v_flex() + .gap_6() + .child( + div() + .grid() + .grid_cols(2) + .gap_4() + .child(Self::render_kv( + "FIDO Version", + fido.versions.first().cloned().unwrap_or("N/A".into()), + theme, + false, + )) + .child(Self::render_kv( + "PIN Set", + if fido.client_pin { "Yes" } else { "No" }, + theme, + false, + )) + .child(Self::render_kv( + "Min PIN Length", + fido.min_pin_length.to_string(), + theme, + false, + )) + .child(Self::render_kv( + "Resident Keys", + if fido.resident_keys { + "Supported" + } else { + "Not Supported" + }, + theme, + false, + )), + ) + .child(div().h_px().bg(theme.border)) + .child(Self::render_kv("AAGUID", fido.aaguid.clone(), theme, true)) + .into_any_element() + } else { + div() + .text_sm() + .text_color(theme.muted_foreground) + .child("FIDO information not available") + .into_any_element() + }, + theme, + ) + } - fn render_led_config(device: &DeviceState, theme: &Theme) -> impl IntoElement { - Self::home_card( - "LED Configuration", - Icon::default().path("icons/microchip.svg"), - if device.method == "FIDO" { - v_flex() - .items_center() - .justify_center() - .py_4() - .gap_2() - .child( - Icon::new(IconName::TriangleAlert) - .size_8() - .text_color(gpui::yellow()), - ) - .child( - div() - .text_sm() - .text_color(theme.muted_foreground) - .child("Information is not available in Fido only communication mode."), - ) - .into_any_element() - } else { - v_flex() - .gap_3() - .text_sm() - .child( - h_flex() - .justify_between() - .child( - div() - .text_color(theme.muted_foreground) - .child("LED GPIO Pin"), - ) - .child(format!("GPIO {}", device.config.led_gpio)), - ) - .child( - h_flex() - .justify_between() - .child( - div() - .text_color(theme.muted_foreground) - .child("LED Brightness"), - ) - .child(device.config.led_brightness.to_string()), - ) - .child( - h_flex() - .justify_between() - .child( - div() - .text_color(theme.muted_foreground) - .child("Presence Touch Timeout"), - ) - .child(format!("{}s", device.config.touch_timeout)), - ) - .child( - h_flex() - .justify_between() - .child( - div() - .text_color(theme.muted_foreground) - .child("LED Dimmable"), - ) - .child( - Badge::new() - .child(if device.config.led_dimmable { - "Yes" - } else { - "No" - }) - .color(if device.config.led_dimmable { - theme.primary - } else { - theme.secondary - }), - ), - ) - .child( - h_flex() - .justify_between() - .child( - div() - .text_color(theme.muted_foreground) - .child("LED Steady Mode"), - ) - .child( - Badge::new() - .child(if device.config.led_steady { - "On" - } else { - "Off" - }) - .color(if device.config.led_steady { - theme.primary - } else { - theme.secondary - }), - ), - ) - .into_any_element() - }, - theme, - ) - } + fn render_led_config(device: &DeviceState, theme: &Theme) -> impl IntoElement { + Self::home_card( + "LED Configuration", + Icon::default().path("icons/microchip.svg"), + if device.method == "FIDO" { + v_flex() + .items_center() + .justify_center() + .py_4() + .gap_2() + .child( + Icon::new(IconName::TriangleAlert) + .size_8() + .text_color(gpui::yellow()), + ) + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child("Information is not available in Fido only communication mode."), + ) + .into_any_element() + } else { + v_flex() + .gap_3() + .text_sm() + .child( + h_flex() + .justify_between() + .child( + div() + .text_color(theme.muted_foreground) + .child("LED GPIO Pin"), + ) + .child(format!("GPIO {}", device.config.led_gpio)), + ) + .child( + h_flex() + .justify_between() + .child( + div() + .text_color(theme.muted_foreground) + .child("LED Brightness"), + ) + .child(device.config.led_brightness.to_string()), + ) + .child( + h_flex() + .justify_between() + .child( + div() + .text_color(theme.muted_foreground) + .child("Presence Touch Timeout"), + ) + .child(format!("{}s", device.config.touch_timeout)), + ) + .child( + h_flex() + .justify_between() + .child( + div() + .text_color(theme.muted_foreground) + .child("LED Dimmable"), + ) + .child( + Badge::new() + .child(if device.config.led_dimmable { + "Yes" + } else { + "No" + }) + .color(if device.config.led_dimmable { + theme.primary + } else { + theme.secondary + }), + ), + ) + .child( + h_flex() + .justify_between() + .child( + div() + .text_color(theme.muted_foreground) + .child("LED Steady Mode"), + ) + .child( + Badge::new() + .child(if device.config.led_steady { + "On" + } else { + "Off" + }) + .color(if device.config.led_steady { + theme.primary + } else { + theme.secondary + }), + ), + ) + .into_any_element() + }, + theme, + ) + } - fn render_security_status(device: &DeviceState, theme: &Theme) -> impl IntoElement { - Self::home_card( - "Security Status", - Icon::default().path("icons/shield-check.svg"), - v_flex() - .gap_3() - .text_sm() - .child( - h_flex() - .justify_between() - .items_center() - .child(div().text_color(theme.muted_foreground).child("Boot Mode")) - .child( - h_flex() - .gap_2() - .items_center() - .child(if device.security.secure_boot { - Icon::new(IconName::FolderClosed) - .size_3p5() - .text_color(gpui::green()) - } else { - Icon::new(IconName::FolderOpen) - .size_3p5() - .text_color(gpui::yellow()) - }) - .child( - Badge::new() - .child(if device.security.secure_boot { - "Secure Boot" - } else { - "Development" - }) - .color(if device.security.secure_boot { - theme.primary - } else { - theme.secondary - }), - ), - ), - ) - .child( - h_flex() - .justify_between() - .items_center() - .child( - div() - .text_color(theme.muted_foreground) - .child("Debug Interface"), - ) - .child(div().font_medium().text_color(theme.foreground).child( - if device.security.secure_lock { - "Read-out Locked" - } else { - "Debug Enabled" - }, - )), - ) - .child( - h_flex() - .justify_between() - .items_center() - .child( - div() - .text_color(theme.muted_foreground) - .child("Secure Lock"), - ) - .child( - Badge::new() - .child(if device.security.confirmed { - "Acknowledged" - } else { - "Pending" - }) - .color(if device.security.confirmed { - gpui::red() - } else { - theme.secondary - }), - ), - ), - theme, - ) - } + fn render_security_status(device: &DeviceState, theme: &Theme) -> impl IntoElement { + Self::home_card( + "Security Status", + Icon::default().path("icons/shield-check.svg"), + v_flex() + .gap_3() + .text_sm() + .child( + h_flex() + .justify_between() + .items_center() + .child(div().text_color(theme.muted_foreground).child("Boot Mode")) + .child( + h_flex() + .gap_2() + .items_center() + .child(if device.security.secure_boot { + Icon::default() + .path("icons/lock.svg") + .size_3p5() + .text_color(gpui::green()) + } else { + Icon::default() + .path("icons/lock-open.svg") + .size_3p5() + .text_color(gpui::yellow()) + }) + .child( + Badge::new() + .child(if device.security.secure_boot { + "Secure Boot" + } else { + "Development" + }) + .color(if device.security.secure_boot { + theme.primary + } else { + theme.secondary + }), + ), + ), + ) + .child( + h_flex() + .justify_between() + .items_center() + .child( + div() + .text_color(theme.muted_foreground) + .child("Debug Interface"), + ) + .child(div().font_medium().text_color(theme.foreground).child( + if device.security.secure_lock { + "Read-out Locked" + } else { + "Debug Enabled" + }, + )), + ) + .child( + h_flex() + .justify_between() + .items_center() + .child( + div() + .text_color(theme.muted_foreground) + .child("Secure Lock"), + ) + .child( + Badge::new() + .child(if device.security.confirmed { + "Acknowledged" + } else { + "Pending" + }) + .color(if device.security.confirmed { + gpui::red() + } else { + theme.secondary + }), + ), + ), + theme, + ) + } } diff --git a/src/ui/views/logs.rs b/src/ui/views/logs.rs index fa08a6c..504105e 100644 --- a/src/ui/views/logs.rs +++ b/src/ui/views/logs.rs @@ -4,7 +4,7 @@ use gpui::*; pub struct LogsView; impl LogsView { - pub fn build() -> impl IntoElement { - div().size_full().p_8().child("Logs goes here...") - } + pub fn build() -> impl IntoElement { + div().size_full().p_8().child("Logs goes here...") + } } diff --git a/src/ui/views/passkeys.rs b/src/ui/views/passkeys.rs index ac581b5..aac79ce 100644 --- a/src/ui/views/passkeys.rs +++ b/src/ui/views/passkeys.rs @@ -4,10 +4,10 @@ use gpui::*; pub struct PasskeysView; impl PasskeysView { - pub fn build() -> impl IntoElement { - div() - .size_full() - .p_8() - .child("Passkey Management List goes here...") - } + pub fn build() -> impl IntoElement { + div() + .size_full() + .p_8() + .child("Passkey Management List goes here...") + } } diff --git a/src/ui/views/security.rs b/src/ui/views/security.rs index d96ce44..3e458ba 100644 --- a/src/ui/views/security.rs +++ b/src/ui/views/security.rs @@ -4,10 +4,10 @@ use gpui::*; pub struct SecurityView; impl SecurityView { - pub fn build() -> impl IntoElement { - div() - .size_full() - .p_8() - .child("Security Management List goes here...") - } + pub fn build() -> impl IntoElement { + div() + .size_full() + .p_8() + .child("Security Management List goes here...") + } } From 353410d492b6578b0e8c9b62f93c611e3b867607 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Wed, 28 Jan 2026 18:33:35 +0530 Subject: [PATCH 05/37] feat: add sidebar header and footer --- src/ui/rootview.rs | 168 +++++++++++++++++++++++++++++---------------- 1 file changed, 110 insertions(+), 58 deletions(-) diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index e7d2bd6..c625cf2 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -6,7 +6,7 @@ use crate::ui::views::{ use gpui::*; use gpui_component::button::{Button, ButtonVariants}; use gpui_component::scroll::ScrollableElement; -use gpui_component::{ActiveTheme, Icon, IconName, StyledExt, TitleBar, h_flex, v_flex}; +use gpui_component::{ActiveTheme, Icon, IconName, TitleBar, h_flex, v_flex}; use gpui_component::{Side, sidebar::*}; #[derive(Clone, Copy, PartialEq)] @@ -38,75 +38,127 @@ impl Render for ApplicationRoot { h_flex() .size_full() .child( - Sidebar::new(Side::Left) - .collapsed(self.collapsed) - .collapsible(true) + v_flex() .h_full() - .bg(rgb(0x18181b)) + .bg(rgb(colors::zinc::ZINC900)) + .w(if self.collapsed { px(48.) } else { px(255.) }) + .child({ + let header = h_flex() + .w_full() + .items_center() + .bg(rgb(colors::zinc::ZINC900)) + .border_r_1() + .border_color(cx.theme().sidebar_border) + .pt_4(); + + let header = if self.collapsed { + header.justify_center() + } else { + header.justify_start().pl_4() + }; + + header + .child( + img("appIcons/in.suyogtandel.picoforge.svg") + .w(px(48.)) + .h(px(48.)), + ) + .children(if !self.collapsed { + Some( + div() + .ml_2() + .child("PicoForge") + .font_weight(gpui::FontWeight::EXTRA_BOLD) + .text_color(rgb(colors::zinc::ZINC100)), + ) + } else { + None + }) + }) .child( - SidebarGroup::new("Menu").child( - SidebarMenu::new() - .child( - SidebarMenuItem::new("Home") - .icon(Icon::default().path("icons/house.svg")) - .active(self.active_view == ActiveView::Home) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Home; - })), - ) - .child( - SidebarMenuItem::new("Passkeys") - .icon(Icon::default().path("icons/key-round.svg")) - .active(self.active_view == ActiveView::Passkeys) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Passkeys; - })), - ) - .child( - SidebarMenuItem::new("Configuration") - .icon(Icon::default().path("icons/settings.svg")) - .active(self.active_view == ActiveView::Configuration) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Configuration; - })), - ) - // TODO: Replace these icons with correct ones from lucide - .child( - SidebarMenuItem::new("Security") - .icon(Icon::default().path("icons/shield-check.svg")) - .active(self.active_view == ActiveView::Security) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Security; - })), - ) - .child( - SidebarMenuItem::new("Logs") - .icon(Icon::default().path("icons/scroll-text.svg")) - .active(self.active_view == ActiveView::Logs) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Logs; - })), - ) - .child( - SidebarMenuItem::new("About") - .icon(IconName::Info) - .active(self.active_view == ActiveView::About) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::About; - })), + Sidebar::new(Side::Left) + .collapsed(self.collapsed) + .collapsible(true) + .h_auto() + .w_full() + .flex_grow() + .bg(rgb(colors::zinc::ZINC900)) + .child( + SidebarGroup::new("Menu").child( + SidebarMenu::new() + .child( + SidebarMenuItem::new("Home") + .icon(Icon::default().path("icons/house.svg")) + .active(self.active_view == ActiveView::Home) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Home; + })), + ) + .child( + SidebarMenuItem::new("Passkeys") + .icon(Icon::default().path("icons/key-round.svg")) + .active(self.active_view == ActiveView::Passkeys) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Passkeys; + })), + ) + .child( + SidebarMenuItem::new("Configuration") + .icon(Icon::default().path("icons/settings.svg")) + .active( + self.active_view == ActiveView::Configuration, + ) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Configuration; + })), + ) + .child( + SidebarMenuItem::new("Security") + .icon( + Icon::default().path("icons/shield-check.svg"), + ) + .active(self.active_view == ActiveView::Security) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Security; + })), + ) + .child( + SidebarMenuItem::new("Logs") + .icon(Icon::default().path("icons/scroll-text.svg")) + .active(self.active_view == ActiveView::Logs) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::Logs; + })), + ) + .child( + SidebarMenuItem::new("About") + .icon(IconName::Info) + .active(self.active_view == ActiveView::About) + .on_click(cx.listener(|this, _, _, _| { + this.active_view = ActiveView::About; + })), + ), ), - ), + ), + ) + .child( + div() + .w_full() + .h(px(90.)) + .bg(rgb(0x111113)) + .border_r_1() + .border_color(cx.theme().sidebar_border), ), ) .child( v_flex() .size_full() .child( - TitleBar::new().bg(rgba(colors::zinc::ZINC900)).child( + TitleBar::new().bg(rgba(colors::zinc::ZINC950)).child( h_flex() .w_full() .justify_between() - .bg(rgba(colors::zinc::ZINC900)) + .bg(rgba(colors::zinc::ZINC950)) .items_center() .cursor(gpui::CursorStyle::OpenHand) .child( From 63b26919b6d229fbfe05a8e8df77e258b4477c1e Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Wed, 28 Jan 2026 18:46:18 +0530 Subject: [PATCH 06/37] chore: adjust sidebar icon size when collapsed and change min window width --- Cargo.lock | 16 ++++++++-------- src/main.rs | 2 +- src/ui/rootview.rs | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 772b466..df74319 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2841,9 +2841,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.64" +version = "0.1.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -5523,9 +5523,9 @@ dependencies = [ [[package]] name = "siphasher" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" +checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" [[package]] name = "skrifa" @@ -7922,18 +7922,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" [[package]] name = "zerocopy" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ddd76bcebeed25db614f82bf31a9f4222d3fbba300e6fb6c00afa26cbd4d9d" +checksum = "fdea86ddd5568519879b8187e1cf04e24fce28f7fe046ceecbce472ff19a2572" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8187381b52e32220d50b255276aa16a084ec0a9017a0ca2152a1f55c539758d" +checksum = "0c15e1b46eff7c6c91195752e0eeed8ef040e391cdece7c25376957d5f15df22" dependencies = [ "proc-macro2", "quote", diff --git a/src/main.rs b/src/main.rs index b7a26e7..111a571 100644 --- a/src/main.rs +++ b/src/main.rs @@ -49,7 +49,7 @@ fn main() { window_min_size: Some(gpui::Size { width: px(650.), - height: px(300.), + height: px(400.), }), kind: WindowKind::Normal, ..Default::default() diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index c625cf2..4136d8f 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -60,8 +60,8 @@ impl Render for ApplicationRoot { header .child( img("appIcons/in.suyogtandel.picoforge.svg") - .w(px(48.)) - .h(px(48.)), + .w(if self.collapsed { px(32.) } else { px(48.) }) + .h(if self.collapsed { px(32.) } else { px(48.) }), ) .children(if !self.collapsed { Some( From 87e14d24b54e8190f21303ce10d93424bc42a563 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Wed, 28 Jan 2026 23:36:15 +0530 Subject: [PATCH 07/37] feat: complete sidebar ui implementation using gpui --- src/device/mod.rs | 1 - src/device/types.rs | 6 +- src/{device => }/logging.rs | 0 src/main.rs | 5 +- src/ui/rootview.rs | 155 +++++++++++++++++++++++++++++++++--- 5 files changed, 148 insertions(+), 19 deletions(-) rename src/{device => }/logging.rs (100%) diff --git a/src/device/mod.rs b/src/device/mod.rs index 8fee69c..c90640c 100644 --- a/src/device/mod.rs +++ b/src/device/mod.rs @@ -1,6 +1,5 @@ pub mod error; pub mod fido; pub mod io; -pub mod logging; pub mod rescue; pub mod types; diff --git a/src/device/types.rs b/src/device/types.rs index fbe4386..ea6e591 100644 --- a/src/device/types.rs +++ b/src/device/types.rs @@ -6,7 +6,7 @@ struct PForgeState { device_info: DeviceInfo, } -#[derive(Serialize)] +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)] #[serde(rename_all = "camelCase")] pub struct DeviceInfo { pub serial: String, @@ -15,7 +15,7 @@ pub struct DeviceInfo { pub firmware_version: String, } -#[derive(Serialize, Deserialize, Debug, Default)] +#[derive(Serialize, Deserialize, Debug, Default, Clone, PartialEq)] #[serde(rename_all = "camelCase")] pub struct AppConfig { pub vid: String, @@ -48,7 +48,7 @@ pub struct AppConfigInput { pub enable_secp256k1: Option, } -#[derive(Serialize)] +#[derive(Serialize, Debug, Clone, PartialEq)] #[serde(rename_all = "camelCase")] pub struct FullDeviceStatus { pub info: DeviceInfo, diff --git a/src/device/logging.rs b/src/logging.rs similarity index 100% rename from src/device/logging.rs rename to src/logging.rs diff --git a/src/main.rs b/src/main.rs index 111a571..bfea5c9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,15 +4,16 @@ use gpui_component::{Theme, ThemeMode}; use ui::rootview::ApplicationRoot; mod device; +pub mod logging; mod ui; fn main() { + logging::logger_init(); let app = Application::new().with_assets(ui::assets::Assets); app.run(move |cx| { gpui_component::init(cx); Theme::change(ThemeMode::Dark, None, cx); - // Theme::change(ThemeMode::Dark, Some(ui::theme::dark_theme()), cx); cx.activate(true); @@ -56,7 +57,7 @@ fn main() { }; cx.open_window(window_options, |window, cx| { - let view = cx.new(|_| ApplicationRoot::new()); + let view = cx.new(|cx| ApplicationRoot::new(cx)); cx.new(|cx| Root::new(view, window, cx)) })?; diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index 4136d8f..aa9ae24 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -1,13 +1,20 @@ -use crate::ui::colors; -use crate::ui::views::{ - about::AboutView, config::ConfigView, home::HomeView, logs::LogsView, passkeys::PasskeysView, - security::SecurityView, +use crate::device::types::{DeviceMethod, FullDeviceStatus}; +use crate::ui::{ + colors, + views::{ + about::AboutView, config::ConfigView, home::HomeView, logs::LogsView, + passkeys::PasskeysView, security::SecurityView, + }, }; use gpui::*; -use gpui_component::button::{Button, ButtonVariants}; -use gpui_component::scroll::ScrollableElement; -use gpui_component::{ActiveTheme, Icon, IconName, TitleBar, h_flex, v_flex}; -use gpui_component::{Side, sidebar::*}; +use gpui_component::{ + ActiveTheme, Icon, IconName, Side, TitleBar, + button::{Button, ButtonVariants}, + h_flex, + scroll::ScrollableElement, + sidebar::*, + v_flex, +}; #[derive(Clone, Copy, PartialEq)] enum ActiveView { @@ -22,19 +29,45 @@ enum ActiveView { pub struct ApplicationRoot { active_view: ActiveView, collapsed: bool, + device_status: Option, + device_loading: bool, + device_error: Option, } impl ApplicationRoot { - pub fn new() -> Self { - Self { + pub fn new(cx: &mut Context) -> Self { + let mut this = Self { active_view: ActiveView::Home, collapsed: false, + device_status: None, + device_loading: false, + device_error: None, + }; + this.refresh_device_status(cx); + this + } + + fn refresh_device_status(&mut self, cx: &mut Context) { + if self.device_loading { + return; } + + self.device_loading = true; + self.device_error = None; + cx.notify(); + + // TODO: Enable async refresh once WeakView/handle type is resolved + self.device_loading = false; } } impl Render for ApplicationRoot { fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { + let device_status = self.device_status.clone(); + + let device_error = self.device_error.clone(); + let collapsed = self.collapsed; + h_flex() .size_full() .child( @@ -142,12 +175,108 @@ impl Render for ApplicationRoot { ), ) .child( - div() + v_flex() .w_full() - .h(px(90.)) .bg(rgb(0x111113)) .border_r_1() - .border_color(cx.theme().sidebar_border), + .border_color(cx.theme().sidebar_border) + .p_2() + .gap_3() + .child(if collapsed { + // Collapsed View + v_flex() + .items_center() + .justify_center() + .gap_2() + .child( + Button::new("refresh-btn-collapsed") + .ghost() + .child(Icon::default().path("icons/refresh-cw.svg")) + .on_click(cx.listener(|this, _, _, cx| { + this.refresh_device_status(cx); + })), + ) + .child(div().w(px(8.)).h(px(8.)).rounded_full().bg( + if let Some(status) = &device_status { + if status.method == DeviceMethod::Fido { + rgb(0xf59e0b) + } else { + rgb(0x22c55e) + } + } else if device_error.is_some() { + rgb(0xf59e0b) + } else { + rgb(0xef4444) + }, + )) + } else { + // Expanded View + v_flex() + .gap_3() + .child( + h_flex() + .items_center() + .justify_between() + .child( + div() + .text_size(px(12.)) + .font_weight(gpui::FontWeight::MEDIUM) + .text_color(cx.theme().muted_foreground) + .child("Device Status"), + ) + .child({ + let (text, color_bg, color_text) = + if let Some(status) = &device_status { + if status.method == DeviceMethod::Fido { + ( + "Online - Fido", + rgb(0xf59e0b), + rgb(0xffffff), + ) + } else { + ("Online", rgb(0x16a34a), rgb(0xffffff)) + } + } else if device_error.is_some() { + ("Error", rgb(0xd97706), rgb(0xffffff)) + } else { + ("Offline", rgb(0xef4444), rgb(0xffffff)) + }; + + div() + .px(px(6.)) + .h(px(20.)) + .flex() + .items_center() + .rounded(px(10.)) + .bg(color_bg) + .child( + div() + .text_size(px(10.)) + .font_weight(gpui::FontWeight::BOLD) + .text_color(color_text) + .child(text), + ) + }), + ) + .child( + Button::new("refresh-btn") + .outline() + .w_full() + .child( + h_flex() + .gap_2() + .justify_center() + .child( + Icon::default() + .path("icons/refresh-cw.svg"), + ) + .child("Refresh"), + ) + .on_click(cx.listener(|this, _, _, cx| { + this.refresh_device_status(cx); + })), + ) + }), ), ) .child( From 7abc945fe16ad8b2418a9aa25ff0129bfeec3b00 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 29 Jan 2026 00:14:37 +0530 Subject: [PATCH 08/37] feat: add animation to sidebar collapsing --- src/ui/rootview.rs | 51 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index aa9ae24..9e45532 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -32,6 +32,7 @@ pub struct ApplicationRoot { device_status: Option, device_loading: bool, device_error: Option, + sidebar_width: Pixels, } impl ApplicationRoot { @@ -42,6 +43,7 @@ impl ApplicationRoot { device_status: None, device_loading: false, device_error: None, + sidebar_width: px(255.), }; this.refresh_device_status(cx); this @@ -62,19 +64,27 @@ impl ApplicationRoot { } impl Render for ApplicationRoot { - fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { + fn render(&mut self, window: &mut Window, cx: &mut Context) -> impl IntoElement { let device_status = self.device_status.clone(); let device_error = self.device_error.clone(); let collapsed = self.collapsed; + let target_width = if self.collapsed { px(48.) } else { px(255.) }; + if (self.sidebar_width - target_width).abs() > px(0.1) { + self.sidebar_width = self.sidebar_width + (target_width - self.sidebar_width) * 0.2; + window.request_animation_frame(); + } else { + self.sidebar_width = target_width; + } + h_flex() .size_full() .child( v_flex() .h_full() .bg(rgb(colors::zinc::ZINC900)) - .w(if self.collapsed { px(48.) } else { px(255.) }) + .w(self.sidebar_width) .child({ let header = h_flex() .w_full() @@ -84,22 +94,43 @@ impl Render for ApplicationRoot { .border_color(cx.theme().sidebar_border) .pt_4(); - let header = if self.collapsed { - header.justify_center() + let current_width = self.sidebar_width; + let t = ((current_width - px(48.)) / (px(255.) - px(48.))).clamp(0.0, 1.0); + + // Animate padding-left from 8px (collapsed) to 16px (expanded) + let padding_left = px(8.) + (px(16.) - px(8.)) * t; + + let header = header.justify_start().pl(padding_left); + + // Icon Animation: Stays 48px until width drops below 120px, then shrinks to 32px + // Range: [48px ... 120px] -> [32px ... 48px] + let width_icon_start = px(120.); + let t_icon = ((current_width - px(48.)) / (width_icon_start - px(48.))) + .clamp(0.0, 1.0); + let icon_size = px(32.) + (px(48.) - px(32.)) * t_icon; + + // Text Animation: Fades out first, before icon starts shrinking + // Range: [200px ... 255px] -> [0.0 ... 1.0] + let width_text_start = px(200.); + let text_opacity: f32 = if current_width > width_text_start { + ((current_width - width_text_start) / (px(255.) - width_text_start)) + .clamp(0.0, 1.0) } else { - header.justify_start().pl_4() + 0.0 }; header .child( img("appIcons/in.suyogtandel.picoforge.svg") - .w(if self.collapsed { px(32.) } else { px(48.) }) - .h(if self.collapsed { px(32.) } else { px(48.) }), + .w(icon_size) + .h(icon_size) + .flex_shrink_0(), ) - .children(if !self.collapsed { + .children(if self.sidebar_width > px(60.) { Some( div() .ml_2() + .opacity(text_opacity) .child("PicoForge") .font_weight(gpui::FontWeight::EXTRA_BOLD) .text_color(rgb(colors::zinc::ZINC100)), @@ -110,8 +141,8 @@ impl Render for ApplicationRoot { }) .child( Sidebar::new(Side::Left) - .collapsed(self.collapsed) - .collapsible(true) + .collapsed(self.sidebar_width < px(120.)) + .collapsible(false) .h_auto() .w_full() .flex_grow() From 3226e35cd3ea14077a867ee521fdc24bb262f670 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 29 Jan 2026 10:09:45 +0530 Subject: [PATCH 09/37] fix: ui children overflowing out of the window when window size is too small --- src/main.rs | 4 +- src/ui/components/mod.rs | 1 + src/ui/components/sidebar.rs | 333 ++++++++++++++++++++++++++++++++- src/ui/mod.rs | 1 + src/ui/rootview.rs | 349 +++++++---------------------------- 5 files changed, 400 insertions(+), 288 deletions(-) diff --git a/src/main.rs b/src/main.rs index bfea5c9..61de1fc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -49,8 +49,8 @@ fn main() { window_decorations: Some(gpui::WindowDecorations::Client), window_min_size: Some(gpui::Size { - width: px(650.), - height: px(400.), + width: px(450.), + height: px(200.), }), kind: WindowKind::Normal, ..Default::default() diff --git a/src/ui/components/mod.rs b/src/ui/components/mod.rs index e69de29..e16f8da 100644 --- a/src/ui/components/mod.rs +++ b/src/ui/components/mod.rs @@ -0,0 +1 @@ +pub mod sidebar; diff --git a/src/ui/components/sidebar.rs b/src/ui/components/sidebar.rs index 1e827c4..439686f 100644 --- a/src/ui/components/sidebar.rs +++ b/src/ui/components/sidebar.rs @@ -1,2 +1,331 @@ -pub struct Sidebar; -impl Render for Sidebar {} +use crate::device::types::{DeviceMethod, FullDeviceStatus}; +use crate::ui::colors; +use gpui::*; +use gpui_component::{ + ActiveTheme, Icon, IconName, Side, + button::{Button, ButtonVariants}, + h_flex, + sidebar::*, + v_flex, +}; +use std::rc::Rc; + +#[derive(Clone, Copy, PartialEq)] +pub enum ActiveView { + Home, + Passkeys, + Configuration, + Security, + Logs, + About, +} + +pub struct AppSidebar { + active_view: ActiveView, + width: Pixels, + collapsed: bool, + device_status: Option, + device_error: Option, + on_select: Option)>>, + on_refresh: Option)>>, +} + +impl AppSidebar { + pub fn new( + active_view: ActiveView, + width: Pixels, + collapsed: bool, + device_status: Option, + device_error: Option, + ) -> Self { + Self { + active_view, + width, + collapsed, + device_status, + device_error, + on_select: None, + on_refresh: None, + } + } + + pub fn on_select( + mut self, + handler: impl Fn(&mut V, ActiveView, &mut Window, &mut Context) + 'static, + ) -> Self { + self.on_select = Some(Rc::new(handler)); + self + } + + pub fn on_refresh( + mut self, + handler: impl Fn(&mut V, &mut Window, &mut Context) + 'static, + ) -> Self { + self.on_refresh = Some(Rc::new(handler)); + self + } + + pub fn render(self, cx: &mut Context) -> impl IntoElement { + let width = self.width; + let collapsed = self.collapsed; + // active_view was unused + let device_status = self.device_status.clone(); + let device_error = self.device_error.clone(); + + let border_color = cx.theme().sidebar_border; + // bg_color was unused + let muted_foreground = cx.theme().muted_foreground; + + v_flex() + .h_full() + .bg(rgb(colors::zinc::ZINC900)) + .w(width) + .child({ + let header = h_flex() + .w_full() + .items_center() + .bg(rgb(colors::zinc::ZINC900)) + .border_r_1() + .border_color(border_color) + .pt_4(); + + let current_width = width; + let t = ((current_width - px(48.)) / (px(255.) - px(48.))).clamp(0.0, 1.0); + + // Animate padding-left from 8px (collapsed) to 16px (expanded) + let padding_left = px(8.) + (px(16.) - px(8.)) * t; + + let header = header.justify_start().pl(padding_left); + + // Icon Animation: Stays 48px until width drops below 120px, then shrinks to 32px + // Range: [48px ... 120px] -> [32px ... 48px] + let width_icon_start = px(120.); + let t_icon = + ((current_width - px(48.)) / (width_icon_start - px(48.))).clamp(0.0, 1.0); + let icon_size = px(32.) + (px(48.) - px(32.)) * t_icon; + + // Text Animation: Fades out first, before icon starts shrinking + // Range: [200px ... 255px] -> [0.0 ... 1.0] + let width_text_start = px(200.); + let text_opacity: f32 = if current_width > width_text_start { + ((current_width - width_text_start) / (px(255.) - width_text_start)) + .clamp(0.0, 1.0) + } else { + 0.0 + }; + + header + .child( + img("appIcons/in.suyogtandel.picoforge.svg") + .w(icon_size) + .h(icon_size) + .flex_shrink_0(), + ) + .children(if width > px(60.) { + Some( + div() + .ml_2() + .opacity(text_opacity) + .child("PicoForge") + .font_weight(gpui::FontWeight::EXTRA_BOLD) + .text_color(rgb(colors::zinc::ZINC100)), + ) + } else { + None + }) + }) + .child( + Sidebar::new(Side::Left) + .collapsed(width < px(120.)) + .collapsible(false) + .h_auto() + .w_full() + .flex_grow() + .bg(rgb(colors::zinc::ZINC900)) + .child( + SidebarGroup::new("Menu").child( + SidebarMenu::new() + .child(self.menu_item( + cx, + "Home", + "icons/house.svg", + ActiveView::Home, + )) + .child(self.menu_item( + cx, + "Passkeys", + "icons/key-round.svg", + ActiveView::Passkeys, + )) + .child(self.menu_item( + cx, + "Configuration", + "icons/settings.svg", + ActiveView::Configuration, + )) + .child(self.menu_item( + cx, + "Security", + "icons/shield-check.svg", + ActiveView::Security, + )) + .child(self.menu_item( + cx, + "Logs", + "icons/scroll-text.svg", + ActiveView::Logs, + )) + .child(self.menu_item_icon_name( + cx, + "About", + IconName::Info, + ActiveView::About, + )), + ), + ), + ) + .child( + v_flex() + .w_full() + .bg(rgb(0x111113)) + .border_r_1() + .border_color(border_color) + .p_2() + .gap_3() + .child(if collapsed { + // Collapsed View + v_flex() + .items_center() + .justify_center() + .gap_2() + .child( + Button::new("refresh-btn-collapsed") + .ghost() + .child(Icon::default().path("icons/refresh-cw.svg")) + .on_click(cx.listener({ + let on_refresh = self.on_refresh.clone(); + move |view, _, window, cx| { + if let Some(f) = &on_refresh { + f(view, window, cx) + } + } + })), + ) + .child(div().w(px(8.)).h(px(8.)).rounded_full().bg( + if let Some(status) = &device_status { + if status.method == DeviceMethod::Fido { + rgb(0xf59e0b) + } else { + rgb(0x22c55e) + } + } else if device_error.is_some() { + rgb(0xf59e0b) + } else { + rgb(0xef4444) + }, + )) + } else { + // Expanded View + v_flex() + .gap_3() + .child( + h_flex() + .items_center() + .justify_between() + .child( + div() + .text_size(px(12.)) + .font_weight(gpui::FontWeight::MEDIUM) + .text_color(muted_foreground) + .child("Device Status"), + ) + .child({ + let (text, color_bg, color_text) = + if let Some(status) = &device_status { + if status.method == DeviceMethod::Fido { + ("Online - Fido", rgb(0xf59e0b), rgb(0xffffff)) + } else { + ("Online", rgb(0x16a34a), rgb(0xffffff)) + } + } else if device_error.is_some() { + ("Error", rgb(0xd97706), rgb(0xffffff)) + } else { + ("Offline", rgb(0xef4444), rgb(0xffffff)) + }; + + div() + .px(px(6.)) + .h(px(20.)) + .flex() + .items_center() + .rounded(px(10.)) + .bg(color_bg) + .child( + div() + .text_size(px(10.)) + .font_weight(gpui::FontWeight::BOLD) + .text_color(color_text) + .child(text), + ) + }), + ) + .child( + Button::new("refresh-btn") + .outline() + .w_full() + .child( + h_flex() + .gap_2() + .justify_center() + .child(Icon::default().path("icons/refresh-cw.svg")) + .child("Refresh"), + ) + .on_click(cx.listener({ + let on_refresh = self.on_refresh.clone(); + move |view, _, window, cx| { + if let Some(f) = &on_refresh { + f(view, window, cx) + } + } + })), + ) + }), + ) + } + + fn menu_item( + &self, + cx: &mut Context, + label: &'static str, + icon_path: &'static str, + view: ActiveView, + ) -> SidebarMenuItem { + let on_select = self.on_select.clone(); + SidebarMenuItem::new(label) + .icon(Icon::default().path(icon_path)) + .active(self.active_view == view) + .on_click(cx.listener(move |element, _, window, cx| { + if let Some(f) = &on_select { + f(element, view, window, cx); + } + })) + } + + fn menu_item_icon_name( + &self, + cx: &mut Context, + label: &'static str, + icon: IconName, + view: ActiveView, + ) -> SidebarMenuItem { + let on_select = self.on_select.clone(); + SidebarMenuItem::new(label) + .icon(icon) + .active(self.active_view == view) + .on_click(cx.listener(move |element, _, window, cx| { + if let Some(f) = &on_select { + f(element, view, window, cx); + } + })) + } +} diff --git a/src/ui/mod.rs b/src/ui/mod.rs index d14489d..07a5775 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -1,4 +1,5 @@ pub mod assets; pub mod colors; +pub mod components; pub mod rootview; pub mod views; diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index 9e45532..3ce0fd9 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -1,4 +1,5 @@ -use crate::device::types::{DeviceMethod, FullDeviceStatus}; +use crate::device::types::FullDeviceStatus; +use crate::ui::components::sidebar::{ActiveView, AppSidebar}; use crate::ui::{ colors, views::{ @@ -8,24 +9,13 @@ use crate::ui::{ }; use gpui::*; use gpui_component::{ - ActiveTheme, Icon, IconName, Side, TitleBar, + ActiveTheme, IconName, TitleBar, button::{Button, ButtonVariants}, h_flex, scroll::ScrollableElement, - sidebar::*, v_flex, }; -#[derive(Clone, Copy, PartialEq)] -enum ActiveView { - Home, - Passkeys, - Configuration, - Security, - Logs, - About, -} - pub struct ApplicationRoot { active_view: ActiveView, collapsed: bool, @@ -65,11 +55,6 @@ impl ApplicationRoot { impl Render for ApplicationRoot { fn render(&mut self, window: &mut Window, cx: &mut Context) -> impl IntoElement { - let device_status = self.device_status.clone(); - - let device_error = self.device_error.clone(); - let collapsed = self.collapsed; - let target_width = if self.collapsed { px(48.) } else { px(255.) }; if (self.sidebar_width - target_width).abs() > px(0.1) { self.sidebar_width = self.sidebar_width + (target_width - self.sidebar_width) * 0.2; @@ -78,276 +63,72 @@ impl Render for ApplicationRoot { self.sidebar_width = target_width; } - h_flex() - .size_full() - .child( - v_flex() - .h_full() - .bg(rgb(colors::zinc::ZINC900)) - .w(self.sidebar_width) - .child({ - let header = h_flex() - .w_full() - .items_center() - .bg(rgb(colors::zinc::ZINC900)) - .border_r_1() - .border_color(cx.theme().sidebar_border) - .pt_4(); - - let current_width = self.sidebar_width; - let t = ((current_width - px(48.)) / (px(255.) - px(48.))).clamp(0.0, 1.0); - - // Animate padding-left from 8px (collapsed) to 16px (expanded) - let padding_left = px(8.) + (px(16.) - px(8.)) * t; - - let header = header.justify_start().pl(padding_left); - - // Icon Animation: Stays 48px until width drops below 120px, then shrinks to 32px - // Range: [48px ... 120px] -> [32px ... 48px] - let width_icon_start = px(120.); - let t_icon = ((current_width - px(48.)) / (width_icon_start - px(48.))) - .clamp(0.0, 1.0); - let icon_size = px(32.) + (px(48.) - px(32.)) * t_icon; - - // Text Animation: Fades out first, before icon starts shrinking - // Range: [200px ... 255px] -> [0.0 ... 1.0] - let width_text_start = px(200.); - let text_opacity: f32 = if current_width > width_text_start { - ((current_width - width_text_start) / (px(255.) - width_text_start)) - .clamp(0.0, 1.0) - } else { - 0.0 - }; - - header - .child( - img("appIcons/in.suyogtandel.picoforge.svg") - .w(icon_size) - .h(icon_size) - .flex_shrink_0(), - ) - .children(if self.sidebar_width > px(60.) { - Some( - div() - .ml_2() - .opacity(text_opacity) - .child("PicoForge") - .font_weight(gpui::FontWeight::EXTRA_BOLD) - .text_color(rgb(colors::zinc::ZINC100)), - ) - } else { - None - }) + div().size_full().overflow_hidden().child( + h_flex() + .size_full() + .child( + AppSidebar::new( + self.active_view, + self.sidebar_width, + self.collapsed, + self.device_status.clone(), + self.device_error.clone(), + ) + .on_select(|this: &mut Self, view, _, _| { + this.active_view = view; }) - .child( - Sidebar::new(Side::Left) - .collapsed(self.sidebar_width < px(120.)) - .collapsible(false) - .h_auto() - .w_full() - .flex_grow() - .bg(rgb(colors::zinc::ZINC900)) - .child( - SidebarGroup::new("Menu").child( - SidebarMenu::new() - .child( - SidebarMenuItem::new("Home") - .icon(Icon::default().path("icons/house.svg")) - .active(self.active_view == ActiveView::Home) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Home; - })), - ) - .child( - SidebarMenuItem::new("Passkeys") - .icon(Icon::default().path("icons/key-round.svg")) - .active(self.active_view == ActiveView::Passkeys) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Passkeys; - })), - ) - .child( - SidebarMenuItem::new("Configuration") - .icon(Icon::default().path("icons/settings.svg")) - .active( - self.active_view == ActiveView::Configuration, - ) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Configuration; - })), - ) - .child( - SidebarMenuItem::new("Security") - .icon( - Icon::default().path("icons/shield-check.svg"), - ) - .active(self.active_view == ActiveView::Security) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Security; - })), - ) - .child( - SidebarMenuItem::new("Logs") - .icon(Icon::default().path("icons/scroll-text.svg")) - .active(self.active_view == ActiveView::Logs) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::Logs; - })), - ) - .child( - SidebarMenuItem::new("About") - .icon(IconName::Info) - .active(self.active_view == ActiveView::About) - .on_click(cx.listener(|this, _, _, _| { - this.active_view = ActiveView::About; - })), - ), - ), - ), - ) - .child( - v_flex() - .w_full() - .bg(rgb(0x111113)) - .border_r_1() - .border_color(cx.theme().sidebar_border) - .p_2() - .gap_3() - .child(if collapsed { - // Collapsed View - v_flex() + .on_refresh(|this: &mut Self, _, cx| { + this.refresh_device_status(cx); + }) + .render(cx), + ) + .child( + v_flex() + .size_full() + .child( + TitleBar::new().bg(rgba(colors::zinc::ZINC950)).child( + h_flex() + .w_full() + .justify_between() + .bg(rgba(colors::zinc::ZINC950)) .items_center() - .justify_center() - .gap_2() + .cursor(gpui::CursorStyle::OpenHand) .child( - Button::new("refresh-btn-collapsed") + Button::new("sidebar_toggle") .ghost() - .child(Icon::default().path("icons/refresh-cw.svg")) - .on_click(cx.listener(|this, _, _, cx| { - this.refresh_device_status(cx); - })), - ) - .child(div().w(px(8.)).h(px(8.)).rounded_full().bg( - if let Some(status) = &device_status { - if status.method == DeviceMethod::Fido { - rgb(0xf59e0b) - } else { - rgb(0x22c55e) - } - } else if device_error.is_some() { - rgb(0xf59e0b) - } else { - rgb(0xef4444) - }, - )) - } else { - // Expanded View - v_flex() - .gap_3() - .child( - h_flex() - .items_center() - .justify_between() - .child( - div() - .text_size(px(12.)) - .font_weight(gpui::FontWeight::MEDIUM) - .text_color(cx.theme().muted_foreground) - .child("Device Status"), - ) - .child({ - let (text, color_bg, color_text) = - if let Some(status) = &device_status { - if status.method == DeviceMethod::Fido { - ( - "Online - Fido", - rgb(0xf59e0b), - rgb(0xffffff), - ) - } else { - ("Online", rgb(0x16a34a), rgb(0xffffff)) - } - } else if device_error.is_some() { - ("Error", rgb(0xd97706), rgb(0xffffff)) - } else { - ("Offline", rgb(0xef4444), rgb(0xffffff)) - }; - - div() - .px(px(6.)) - .h(px(20.)) - .flex() - .items_center() - .rounded(px(10.)) - .bg(color_bg) - .child( - div() - .text_size(px(10.)) - .font_weight(gpui::FontWeight::BOLD) - .text_color(color_text) - .child(text), - ) - }), - ) - .child( - Button::new("refresh-btn") - .outline() - .w_full() - .child( - h_flex() - .gap_2() - .justify_center() - .child( - Icon::default() - .path("icons/refresh-cw.svg"), - ) - .child("Refresh"), - ) - .on_click(cx.listener(|this, _, _, cx| { - this.refresh_device_status(cx); - })), - ) - }), - ), - ) - .child( - v_flex() - .size_full() - .child( - TitleBar::new().bg(rgba(colors::zinc::ZINC950)).child( - h_flex() - .w_full() - .justify_between() - .bg(rgba(colors::zinc::ZINC950)) - .items_center() - .cursor(gpui::CursorStyle::OpenHand) - .child( - Button::new("sidebar_toggle") - .ghost() - .icon(IconName::PanelLeft) - .on_click(cx.listener(|this, _, _, _| { - this.collapsed = !this.collapsed; - })) - .tooltip("Toggle Sidebar"), - ), + .icon(IconName::PanelLeft) + .on_click(cx.listener(|this, _, _, _| { + this.collapsed = !this.collapsed; + })) + .tooltip("Toggle Sidebar"), + ), + ), + ) + .child( + v_flex() + .min_h(px(0.)) + .min_w(px(0.)) + .overflow_y_scrollbar() + .flex_grow() + .bg(cx.theme().background) + .child(match self.active_view { + ActiveView::Home => { + HomeView::build(cx.theme()).into_any_element() + } + ActiveView::Passkeys => { + PasskeysView::build().into_any_element() + } + ActiveView::Configuration => { + ConfigView::build().into_any_element() + } + ActiveView::Security => { + SecurityView::build().into_any_element() + } + ActiveView::Logs => LogsView::build().into_any_element(), + ActiveView::About => AboutView::build().into_any_element(), + }), ), - ) - .child( - v_flex() - .min_h(px(0.)) - .min_w(px(0.)) - .overflow_y_scrollbar() - .flex_grow() - .bg(cx.theme().background) - .child(match self.active_view { - ActiveView::Home => HomeView::build(cx.theme()).into_any_element(), - ActiveView::Passkeys => PasskeysView::build().into_any_element(), - ActiveView::Configuration => ConfigView::build().into_any_element(), - ActiveView::Security => SecurityView::build().into_any_element(), - ActiveView::Logs => LogsView::build().into_any_element(), - ActiveView::About => AboutView::build().into_any_element(), - }), - ), - ) + ), + ) } } From 7e58d58d5557ae4b0ad435893f19e25b78e66ea7 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 29 Jan 2026 11:45:24 +0530 Subject: [PATCH 10/37] feat: implement/migrate about page in gpui --- src/device/main.rs | 6 -- src/main.rs | 3 + src/ui/components/sidebar.rs | 6 -- src/ui/rootview.rs | 4 +- src/ui/views/about.rs | 142 ++++++++++++++++++++++++++++++++++- src/ui/views/home.rs | 2 +- 6 files changed, 147 insertions(+), 16 deletions(-) delete mode 100644 src/device/main.rs diff --git a/src/device/main.rs b/src/device/main.rs deleted file mode 100644 index 48cf4d8..0000000 --- a/src/device/main.rs +++ /dev/null @@ -1,6 +0,0 @@ -// Prevents additional console window on Windows in release, DO NOT REMOVE!! -#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] - -fn main() { - picoforge_lib::run() -} diff --git a/src/main.rs b/src/main.rs index 61de1fc..cf98501 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,6 @@ +// Prevents additional console window on Windows in release, DO NOT REMOVE!! +#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] + use gpui::*; use gpui_component::Root; use gpui_component::{Theme, ThemeMode}; diff --git a/src/ui/components/sidebar.rs b/src/ui/components/sidebar.rs index 439686f..4e7d3ed 100644 --- a/src/ui/components/sidebar.rs +++ b/src/ui/components/sidebar.rs @@ -68,12 +68,10 @@ impl AppSidebar { pub fn render(self, cx: &mut Context) -> impl IntoElement { let width = self.width; let collapsed = self.collapsed; - // active_view was unused let device_status = self.device_status.clone(); let device_error = self.device_error.clone(); let border_color = cx.theme().sidebar_border; - // bg_color was unused let muted_foreground = cx.theme().muted_foreground; v_flex() @@ -97,15 +95,11 @@ impl AppSidebar { let header = header.justify_start().pl(padding_left); - // Icon Animation: Stays 48px until width drops below 120px, then shrinks to 32px - // Range: [48px ... 120px] -> [32px ... 48px] let width_icon_start = px(120.); let t_icon = ((current_width - px(48.)) / (width_icon_start - px(48.))).clamp(0.0, 1.0); let icon_size = px(32.) + (px(48.) - px(32.)) * t_icon; - // Text Animation: Fades out first, before icon starts shrinking - // Range: [200px ... 255px] -> [0.0 ... 1.0] let width_text_start = px(200.); let text_opacity: f32 = if current_width > width_text_start { ((current_width - width_text_start) / (px(255.) - width_text_start)) diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index 3ce0fd9..3025eb1 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -125,7 +125,9 @@ impl Render for ApplicationRoot { SecurityView::build().into_any_element() } ActiveView::Logs => LogsView::build().into_any_element(), - ActiveView::About => AboutView::build().into_any_element(), + ActiveView::About => { + AboutView::build(cx.theme()).into_any_element() + } }), ), ), diff --git a/src/ui/views/about.rs b/src/ui/views/about.rs index 49be916..cc82fea 100644 --- a/src/ui/views/about.rs +++ b/src/ui/views/about.rs @@ -1,10 +1,148 @@ // src/views/about.rs use gpui::*; +use gpui_component::{Icon, StyledExt, Theme, badge::Badge, button::Button, h_flex, v_flex}; pub struct AboutView; impl AboutView { - pub fn build() -> impl IntoElement { - div().size_full().p_8().child("About goes here...") + pub fn build(theme: &Theme) -> impl IntoElement { + div() + .size_full() + .bg(theme.background) + .flex() + .flex_col() + .items_center() + .child( + div().w_full().max_w(px(1200.0)).px_10().py_5().child( + v_flex() + .gap_8() + .child( + v_flex() + .child( + div() + .text_3xl() + .font_extrabold() + .text_color(theme.foreground) + .child("About"), + ) + .child( + div().text_sm().text_color(theme.muted_foreground).child( + "Information about the application and its development.", + ), + ), + ) + .child( + div() + .w_full() + .flex() + .justify_center() + .child( + div() + .max_w(px(1200.0)) + .w_full() + .bg(rgb(0x18181b)) + .border_1() + .border_color(theme.border) + .rounded_xl() + .p_6() + .child( + v_flex() + .items_center() + .justify_center() + .gap_4() + .py_8() + .text_center() + .child( + img("appIcons/in.suyogtandel.picoforge.svg") + .w(px(256.0)) + .h(px(256.0)) + ) + .child( + div() + .text_2xl() + .font_bold() + .text_color(theme.foreground) + .child("PicoForge"), + ) + .child( + Badge::new() + .child("v0.4.0") + .color(theme.secondary), + ) + .child( + div() + .text_color(theme.muted_foreground) + .max_w(px(450.0)) + .child( + "An open source commissioning tool for Pico FIDO security keys. Developed with Rust and GPUI.", + ), + ) + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .gap_1() + .pt_4() + .border_t_1() + .border_color(theme.border) + .border_t_1() + .border_color(theme.border) + .w(px(320.0)) + .child( + h_flex() + .justify_between() + .child("Code By:") + .child( + div() + .font_medium() + .text_color(theme.foreground) + .child("Suyog Tandel"), + ), + ) + .child( + h_flex() + .justify_between() + .items_center() + .pt_2() + .mt_2() + .child( + h_flex() + .items_center() + .gap_1() + .child("Copyright:"), + ) + .child( + div() + .font_medium() + .text_color(theme.foreground) + .child("© 2026 Suyog Tandel"), + ), + ), + ) + .child( + h_flex() + .gap_4() + .pt_6() + .child( + Button::new("github_btn") + .outline() + .child( + h_flex() + .gap_2() + .child( + Icon::default().path("icons/github.svg").size_4() + ) + .child("GitHub") + ) + .on_click(|_, _, cx| { + cx.open_url("https://github.com/librekeys/picoforge") + }), + ), + ), + ), + ), + ), + ), + ) } } diff --git a/src/ui/views/home.rs b/src/ui/views/home.rs index 228a683..e15c0a3 100644 --- a/src/ui/views/home.rs +++ b/src/ui/views/home.rs @@ -90,7 +90,7 @@ impl HomeView { .flex_col() .items_center() .child( - div().w_full().max_w(px(1400.0)).px_10().py_5().child( + div().w_full().max_w(px(1200.0)).px_10().py_5().child( v_flex() .gap_8() .child( From 49ff0dc5155813dea8b5e628cab1132689831c57 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 29 Jan 2026 12:07:50 +0530 Subject: [PATCH 11/37] chore: abstract pages into a pageview component --- src/ui/components/mod.rs | 1 + src/ui/components/page_view.rs | 43 +++++++ src/ui/views/about.rs | 206 ++++++++++++++------------------- src/ui/views/home.rs | 92 ++++++--------- 4 files changed, 167 insertions(+), 175 deletions(-) create mode 100644 src/ui/components/page_view.rs diff --git a/src/ui/components/mod.rs b/src/ui/components/mod.rs index e16f8da..85270b0 100644 --- a/src/ui/components/mod.rs +++ b/src/ui/components/mod.rs @@ -1 +1,2 @@ +pub mod page_view; pub mod sidebar; diff --git a/src/ui/components/page_view.rs b/src/ui/components/page_view.rs new file mode 100644 index 0000000..5e29bfb --- /dev/null +++ b/src/ui/components/page_view.rs @@ -0,0 +1,43 @@ +use gpui::*; +use gpui_component::{StyledExt, Theme, v_flex}; + +pub struct PageView; + +impl PageView { + pub fn build( + title: impl Into, + subtitle: impl Into, + content: impl IntoElement, + theme: &Theme, + ) -> impl IntoElement { + div() + .size_full() + .bg(theme.background) + .flex() + .flex_col() + .items_center() + .child( + div().w_full().max_w(px(1200.0)).px_10().py_5().child( + v_flex() + .gap_8() + .child( + v_flex() + .child( + div() + .text_3xl() + .font_extrabold() + .text_color(theme.foreground) + .child(title.into()), + ) + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child(subtitle.into()), + ), + ) + .child(content), + ), + ) + } +} diff --git a/src/ui/views/about.rs b/src/ui/views/about.rs index cc82fea..c325b4e 100644 --- a/src/ui/views/about.rs +++ b/src/ui/views/about.rs @@ -1,4 +1,5 @@ // src/views/about.rs +use crate::ui::components::page_view::PageView; use gpui::*; use gpui_component::{Icon, StyledExt, Theme, badge::Badge, button::Button, h_flex, v_flex}; @@ -6,143 +7,112 @@ pub struct AboutView; impl AboutView { pub fn build(theme: &Theme) -> impl IntoElement { - div() - .size_full() - .bg(theme.background) - .flex() - .flex_col() - .items_center() - .child( - div().w_full().max_w(px(1200.0)).px_10().py_5().child( - v_flex() - .gap_8() + PageView::build( + "About", + "Information about the application and its development.", + div() + .w_full() + .flex() + .justify_center() + .child( + div() + .max_w(px(1200.0)) + .w_full() + .bg(rgb(0x18181b)) + .border_1() + .border_color(theme.border) + .rounded_xl() + .p_6() .child( v_flex() + .items_center() + .justify_center() + .gap_4() + .py_8() + .text_center() .child( - div() - .text_3xl() - .font_extrabold() - .text_color(theme.foreground) - .child("About"), + img("appIcons/in.suyogtandel.picoforge.svg") + .w(px(256.0)) + .h(px(256.0)), ) .child( - div().text_sm().text_color(theme.muted_foreground).child( - "Information about the application and its development.", - ), - ), - ) - .child( - div() - .w_full() - .flex() - .justify_center() + div() + .text_2xl() + .font_bold() + .text_color(theme.foreground) + .child("PicoForge"), + ) + .child(Badge::new().child("v0.4.0").color(theme.secondary)) .child( div() - .max_w(px(1200.0)) - .w_full() - .bg(rgb(0x18181b)) - .border_1() - .border_color(theme.border) - .rounded_xl() - .p_6() + .text_color(theme.muted_foreground) + .max_w(px(450.0)) .child( - v_flex() - .items_center() - .justify_center() - .gap_4() - .py_8() - .text_center() - .child( - img("appIcons/in.suyogtandel.picoforge.svg") - .w(px(256.0)) - .h(px(256.0)) - ) + "An open source commissioning tool for Pico FIDO security keys. Developed with Rust and GPUI.", + ), + ) + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .gap_1() + .pt_4() + .border_t_1() + .border_color(theme.border) + .border_t_1() + .border_color(theme.border) + .w(px(320.0)) + .child( + h_flex() + .justify_between() + .child("Code By:") .child( div() - .text_2xl() - .font_bold() + .font_medium() .text_color(theme.foreground) - .child("PicoForge"), - ) - .child( - Badge::new() - .child("v0.4.0") - .color(theme.secondary), - ) + .child("Suyog Tandel"), + ), + ) + .child( + h_flex() + .justify_between() + .items_center() + .pt_2() + .mt_2() + .child(h_flex().items_center().gap_1().child("Copyright:")) .child( div() - .text_color(theme.muted_foreground) - .max_w(px(450.0)) - .child( - "An open source commissioning tool for Pico FIDO security keys. Developed with Rust and GPUI.", - ), - ) - .child( - div() - .text_sm() - .text_color(theme.muted_foreground) - .gap_1() - .pt_4() - .border_t_1() - .border_color(theme.border) - .border_t_1() - .border_color(theme.border) - .w(px(320.0)) - .child( - h_flex() - .justify_between() - .child("Code By:") - .child( - div() - .font_medium() - .text_color(theme.foreground) - .child("Suyog Tandel"), - ), - ) - .child( - h_flex() - .justify_between() - .items_center() - .pt_2() - .mt_2() - .child( - h_flex() - .items_center() - .gap_1() - .child("Copyright:"), - ) - .child( - div() - .font_medium() - .text_color(theme.foreground) - .child("© 2026 Suyog Tandel"), - ), - ), - ) + .font_medium() + .text_color(theme.foreground) + .child("© 2026 Suyog Tandel"), + ), + ), + ) + .child( + h_flex() + .gap_4() + .pt_6() + .child( + Button::new("github_btn") + .outline() .child( h_flex() - .gap_4() - .pt_6() + .gap_2() .child( - Button::new("github_btn") - .outline() - .child( - h_flex() - .gap_2() - .child( - Icon::default().path("icons/github.svg").size_4() - ) - .child("GitHub") - ) - .on_click(|_, _, cx| { - cx.open_url("https://github.com/librekeys/picoforge") - }), - ), - ), + Icon::default() + .path("icons/github.svg") + .size_4(), + ) + .child("GitHub"), + ) + .on_click(|_, _, cx| { + cx.open_url("https://github.com/librekeys/picoforge") + }), ), ), ), ), - ) + theme, + ) } } diff --git a/src/ui/views/home.rs b/src/ui/views/home.rs index e15c0a3..48a346f 100644 --- a/src/ui/views/home.rs +++ b/src/ui/views/home.rs @@ -1,4 +1,5 @@ // use crate::device::types::*; +use crate::ui::components::page_view::PageView; use gpui::*; use gpui_component::StyledExt; use gpui_component::{Icon, IconName, Theme, badge::Badge, h_flex, progress::Progress, v_flex}; @@ -83,62 +84,39 @@ impl HomeView { }, }; - div() - .size_full() - .bg(theme.background) - .flex() - .flex_col() - .items_center() - .child( - div().w_full().max_w(px(1200.0)).px_10().py_5().child( - v_flex() - .gap_8() - .child( - v_flex() - .child( - div() - .text_3xl() - .font_extrabold() - .text_color(theme.foreground) - .child("Device Overview"), - ) - .child( - div().text_sm().text_color(theme.muted_foreground).child( - "Quick view of your device status and specifications.", - ), - ), - ) - // Content Section - .child(if !device.connected { - // No Device Status Placeholder - div() - .flex() - .items_center() - .justify_center() - .h_64() - .border_1() - .border_color(theme.border) - .rounded_xl() - .child( - div() - .text_color(theme.muted_foreground) - .child("No Device Connected"), - ) - .into_any_element() - } else { - // 4 Card Grid - div() - .grid() - .grid_cols(2) - .gap_6() - .child(Self::render_device_info(&device, theme)) - .child(Self::render_fido_info(&device, theme)) - .child(Self::render_led_config(&device, theme)) - .child(Self::render_security_status(&device, theme)) - .into_any_element() - }), - ), - ) + PageView::build( + "Device Overview", + "Quick view of your device status and specifications.", + if !device.connected { + // No Device Status Placeholder + div() + .flex() + .items_center() + .justify_center() + .h_64() + .border_1() + .border_color(theme.border) + .rounded_xl() + .child( + div() + .text_color(theme.muted_foreground) + .child("No Device Connected"), + ) + .into_any_element() + } else { + // 4 Card Grid + div() + .grid() + .grid_cols(2) + .gap_6() + .child(Self::render_device_info(&device, theme)) + .child(Self::render_fido_info(&device, theme)) + .child(Self::render_led_config(&device, theme)) + .child(Self::render_security_status(&device, theme)) + .into_any_element() + }, + theme, + ) } fn home_card( @@ -174,7 +152,7 @@ impl HomeView { ) } - // --- Helper for Key-Value pairs --- + // Helper for Key-Value pairs fn render_kv( label: &str, value: impl IntoElement, From 9cab9de8e7f24ccb954d4b20c25e5240b05a6cf6 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 29 Jan 2026 13:20:30 +0530 Subject: [PATCH 12/37] fix: refresh button theme --- src/ui/components/sidebar.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ui/components/sidebar.rs b/src/ui/components/sidebar.rs index 4e7d3ed..c66954f 100644 --- a/src/ui/components/sidebar.rs +++ b/src/ui/components/sidebar.rs @@ -3,7 +3,7 @@ use crate::ui::colors; use gpui::*; use gpui_component::{ ActiveTheme, Icon, IconName, Side, - button::{Button, ButtonVariants}, + button::{Button, ButtonCustomVariant, ButtonVariants}, h_flex, sidebar::*, v_flex, @@ -265,7 +265,12 @@ impl AppSidebar { ) .child( Button::new("refresh-btn") - .outline() + .custom( + ButtonCustomVariant::new(cx) + .color(rgb(colors::zinc::ZINC800).into()) + .hover(rgb(colors::zinc::ZINC600).into()) + .active(rgb(colors::zinc::ZINC700).into()), + ) .w_full() .child( h_flex() From fc3147299891739a11c24036ebf8a7ff0b63bed5 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 29 Jan 2026 13:53:03 +0530 Subject: [PATCH 13/37] feat: implement security view in gpui --- src/ui/rootview.rs | 2 +- src/ui/views/security.rs | 187 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 182 insertions(+), 7 deletions(-) diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index 3025eb1..400ce9e 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -122,7 +122,7 @@ impl Render for ApplicationRoot { ConfigView::build().into_any_element() } ActiveView::Security => { - SecurityView::build().into_any_element() + SecurityView::build(cx).into_any_element() } ActiveView::Logs => LogsView::build().into_any_element(), ActiveView::About => { diff --git a/src/ui/views/security.rs b/src/ui/views/security.rs index 3e458ba..5946864 100644 --- a/src/ui/views/security.rs +++ b/src/ui/views/security.rs @@ -1,13 +1,188 @@ -// src/views/security.rs +use crate::ui::components::page_view::PageView; use gpui::*; +use gpui_component::{ + ActiveTheme, Disableable, Icon, StyledExt, + button::{Button, ButtonCustomVariant, ButtonVariants}, + h_flex, + switch::Switch, + v_flex, +}; pub struct SecurityView; impl SecurityView { - pub fn build() -> impl IntoElement { - div() - .size_full() - .p_8() - .child("Security Management List goes here...") + pub fn build(cx: &mut Context) -> impl IntoElement { + let (fg, muted_fg, border) = { + let theme = cx.theme(); + (theme.foreground, theme.muted_foreground, theme.border) + }; + + let destructive_red = rgb(0xef4444); + let destructive_red_hover = rgb(0xdc2626); + let destructive_red_active = rgb(0xb91c1c); + let destructive_border = rgba(0xef44444d); + let destructive_bg_muted = rgba(0xef44441a); + + let content = v_flex() + .gap_6() + .w_full() + .child( + v_flex() + .w_full() + .p_4() + .gap_2() + .border_1() + .border_color(destructive_border) + .bg(rgb(crate::ui::colors::zinc::ZINC900)) + .rounded_md() + .child( + h_flex() + .gap_2() + .items_center() + .child( + Icon::default() + .path("icons/triangle-alert.svg") + .text_color(destructive_red), + ) + .child( + div() + .font_bold() + .text_color(destructive_red) + .child("Feature Unstable"), + ), + ) + .child( + div() + .text_sm() + .text_color(destructive_red) + .child("This feature is currently under work and disabled for safety."), + ), + ) + .child( + v_flex() + .w_full() + .border_1() + .border_color(destructive_border) + .bg(rgb(crate::ui::colors::zinc::ZINC900)) + .rounded_xl() + .overflow_hidden() + .child( + div().p_6().child( + div() + .text_lg() + .font_bold() + .text_color(fg) + .child("Lock Settings"), + ), + ) + // Card Content + .child( + v_flex() + .px_6() + .pb_6() + .gap_6() + .child( + h_flex() + .justify_between() + .items_center() + .child( + v_flex() + .gap_1() + .child( + div() + .text_sm() + .font_medium() + .child("Enable Secure Boot"), + ) + .child( + div().text_xs().text_color(muted_fg).child( + "Verifies firmware signature on startup", + ), + ), + ) + .child( + Switch::new("secure-boot-switch") + .checked(false) + .disabled(true), + ), + ) + .child( + // Secure Lock Row (Disabled) + h_flex() + .justify_between() + .items_center() + .child( + v_flex() + .gap_1() + .child( + div().text_sm().font_medium().child("Secure Lock"), + ) + .child(div().text_xs().text_color(muted_fg).child( + "Prevents reading key material via debug ports", + )), + ) + .child( + Switch::new("secure-lock-switch") + .checked(false) + .disabled(true), + ), + ) + .child(div().h_px().bg(border)) + .child( + h_flex() + .items_center() + .gap_4() + .p_4() + .rounded_md() + .bg(destructive_bg_muted) + .border_1() + .border_color(destructive_border) + .child( + Switch::new("confirm-switch").checked(false).disabled(true), + ) + .child( + div() + .font_medium() + .text_color(destructive_red) + .child("I understand the risks of bricking my device."), + ), + ), + ) + // Card Footer + .child( + div() + .border_t_1() + .border_color(border) + .bg(gpui::rgba(0x00000033)) + .px_6() + .py_4() + .flex() + .justify_end() + .child( + Button::new("lock-device-btn") + .custom( + ButtonCustomVariant::new(cx) + .color(destructive_red.into()) + .hover(destructive_red_hover.into()) + .active(destructive_red_active.into()), + ) + .disabled(true) + .child( + h_flex() + .gap_2() + .items_center() + .child(Icon::default().path("icons/lock.svg").size_4()) + .child("Permanently Lock Device"), + ), + ), + ), + ); + + PageView::build( + "Secure Boot", + "Permanently lock this device to the current firmware vendor.", + content, + cx.theme(), + ) } } From 25f3d8b0342903c0f6a33fa79485439faf579c6e Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 29 Jan 2026 15:41:37 +0530 Subject: [PATCH 14/37] feat(ui): add config page skeleton --- .gitignore | 6 +- Cargo.lock | 6 +- Cargo.toml | 2 +- src/ui/rootview.rs | 2 +- src/ui/views/config.rs | 449 ++++++++++++++++++++++++++++++++++++++++- 5 files changed, 453 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 314e65f..3a886c1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,8 @@ vite.config.ts.timestamp-* # Nix result -.direnv \ No newline at end of file +.direnv + +# misc +docs-gpui-components +src-svelte \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index df74319..d8650ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3002,7 +3002,7 @@ dependencies = [ "rgb", "tiff", "zune-core 0.5.1", - "zune-jpeg 0.5.11", + "zune-jpeg 0.5.12", ] [[package]] @@ -8052,9 +8052,9 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2959ca473aae96a14ecedf501d20b3608d2825ba280d5adb57d651721885b0c2" +checksum = "410e9ecef634c709e3831c2cfdb8d9c32164fae1c67496d5b68fff728eec37fe" dependencies = [ "zune-core 0.5.1", ] diff --git a/Cargo.toml b/Cargo.toml index 055b1fc..9c1f571 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ bitflags = "2.10" ring = "0.17" # For signing fido2 messages with pin token # For Application UI: -gpui = "0.2.2" +gpui = { version = "0.2.2", features = [] } gpui-component = "0.5.0" rust-embed = "8.11.0" diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index 400ce9e..fb3bb90 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -119,7 +119,7 @@ impl Render for ApplicationRoot { PasskeysView::build().into_any_element() } ActiveView::Configuration => { - ConfigView::build().into_any_element() + cx.new(|cx| ConfigView::new(window, cx)).into_any_element() } ActiveView::Security => { SecurityView::build(cx).into_any_element() diff --git a/src/ui/views/config.rs b/src/ui/views/config.rs index 94c155f..24b052c 100644 --- a/src/ui/views/config.rs +++ b/src/ui/views/config.rs @@ -1,13 +1,450 @@ -// src/views/config.rs +use crate::ui::components::page_view::PageView; use gpui::*; +use gpui_component::{ + ActiveTheme, Disableable, Icon, StyledExt, Theme, + button::Button, + input::{Input, InputState}, + select::{Select, SelectItem, SelectState}, + slider::{Slider, SliderState}, + switch::Switch, + v_flex, +}; -pub struct ConfigView; +#[derive(Clone, PartialEq)] +struct VendorItem { + value: SharedString, + label: SharedString, +} +impl SelectItem for VendorItem { + type Value = SharedString; + + fn title(&self) -> SharedString { + self.label.clone() + } + + fn value(&self) -> &Self::Value { + &self.value + } +} + +#[derive(Clone, PartialEq)] +struct DriverItem { + value: u8, + label: SharedString, +} + +impl SelectItem for DriverItem { + type Value = u8; + + fn title(&self) -> SharedString { + self.label.clone() + } + + fn value(&self) -> &Self::Value { + &self.value + } +} + +pub struct ConfigView { + vendor_select: Entity>>, + vid_input: Entity, + pid_input: Entity, + product_name_input: Entity, + led_gpio_input: Entity, + led_driver_select: Entity>>, + led_brightness_slider: Entity, + led_dimmable: bool, + led_steady: bool, + touch_timeout_input: Entity, + power_cycle: bool, + enable_secp256k1: bool, + loading: bool, +} + impl ConfigView { - pub fn build() -> impl IntoElement { + pub fn new(window: &mut Window, cx: &mut Context) -> Self { + let vendors = vec![ + VendorItem { + value: "custom".into(), + label: "Custom".into(), + }, + VendorItem { + value: "solokeys".into(), + label: "SoloKeys".into(), + }, + VendorItem { + value: "google".into(), + label: "Google".into(), + }, + VendorItem { + value: "yubico".into(), + label: "Yubico".into(), + }, + ]; + + let drivers = vec![ + DriverItem { + value: 0, + label: "WS2812".into(), + }, + DriverItem { + value: 1, + label: "SK6812".into(), + }, + DriverItem { + value: 2, + label: "APA102".into(), + }, + ]; + + let vendor_select = cx.new(|cx| { + SelectState::new( + vendors, + Some(gpui_component::IndexPath::default()), + window, + cx, + ) + }); + + let vid_input = cx.new(|cx| InputState::new(window, cx).default_value("CAFE")); + let pid_input = cx.new(|cx| InputState::new(window, cx).default_value("4242")); + let product_name_input = cx.new(|cx| InputState::new(window, cx).default_value("My Key")); + + let led_gpio_input = cx.new(|cx| InputState::new(window, cx).default_value("25")); + let led_driver_select = cx.new(|cx| { + SelectState::new( + drivers, + Some(gpui_component::IndexPath::default()), + window, + cx, + ) + }); + + let led_brightness_slider = cx.new(|_| { + SliderState::new() + .min(0.0) + .max(15.0) + .step(1.0) + .default_value(8.0) + }); + + let touch_timeout_input = cx.new(|cx| InputState::new(window, cx).default_value("10")); + + Self { + vendor_select, + vid_input, + pid_input, + product_name_input, + led_gpio_input, + led_driver_select, + led_brightness_slider, + led_dimmable: true, + led_steady: false, + touch_timeout_input, + power_cycle: false, + enable_secp256k1: true, + loading: false, + } + } + + fn render_identity_card(&self, theme: &Theme) -> impl IntoElement { + let content = v_flex() + .gap_4() + .child( + v_flex() + .gap_2() + .child("Vendor Preset") + .child(Select::new(&self.vendor_select).w_full()), + ) + .child( + div() + .grid() + .grid_cols(2) + .gap_4() + .child( + v_flex() + .gap_2() + .child("Vendor ID (HEX)") + .child(Input::new(&self.vid_input).font_family("Mono")), + ) + .child( + v_flex() + .gap_2() + .child("Product ID (HEX)") + .child(Input::new(&self.pid_input).font_family("Mono")), + ), + ) + .child(div().h_px().bg(theme.border)) + .child( + v_flex() + .gap_2() + .child("Product Name") + .child(Input::new(&self.product_name_input)), + ); + + Self::config_card( + "Identity", + "USB Identification settings", + Icon::default().path("icons/tag.svg"), + content, + theme, + ) + } + + fn render_led_card(&mut self, cx: &mut Context) -> impl IntoElement { + let dim_listener = cx.listener(|this, checked, _, cx| { + this.led_dimmable = *checked; + cx.notify(); + }); + + let steady_listener = cx.listener(|this, checked, _, cx| { + this.led_steady = *checked; + cx.notify(); + }); + + // Access theme after creating listeners (which requires mutable borrow of cx) + let theme = cx.theme(); + + // Read slider value (requires immutable borrow of cx) + let brightness = self.led_brightness_slider.read(cx).value().start() as i32; + + let content = v_flex() + .gap_4() + .child( + v_flex() + .gap_2() + .child("LED GPIO Pin") + .child(Input::new(&self.led_gpio_input)), + ) + .child( + v_flex() + .gap_2() + .child("LED Driver") + .child(Select::new(&self.led_driver_select).w_full()), + ) + .child(div().h_px().bg(theme.border)) + .child( + v_flex().gap_2().child("Brightness (0-15)").child( + gpui_component::h_flex() + .items_center() + .gap_4() + .child(Slider::new(&self.led_brightness_slider).flex_1()) + .child( + div() + .text_xs() + .text_color(theme.muted_foreground) + .child(format!("Level {}", brightness)), + ), + ), + ) + .child( + gpui_component::h_flex() + .items_center() + .justify_between() + .child( + v_flex().gap_0p5().child("LED Dimmable").child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child("Allow brightness adjustment"), + ), + ) + .child( + Switch::new("led-dimmable") + .checked(self.led_dimmable) + .on_click(dim_listener), + ), + ) + .child( + gpui_component::h_flex() + .items_center() + .justify_between() + .child( + v_flex().gap_0p5().child("LED Steady Mode").child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child("Keep LED on constantly"), + ), + ) + .child( + Switch::new("led-steady") + .checked(self.led_steady) + .on_click(steady_listener), + ), + ); + + Self::config_card( + "LED Settings", + "Adjust visual feedback behavior", + Icon::default().path("icons/microchip.svg"), + content, + theme, + ) + } + + fn render_touch_card(&self, theme: &Theme) -> impl IntoElement { + let content = v_flex().gap_4().child( + v_flex() + .gap_2() + .child("Touch Timeout (seconds)") + .child(Input::new(&self.touch_timeout_input)), + ); + + Self::config_card( + "Touch & Timing", + "Configure interaction timeouts", + Icon::default().path("icons/settings.svg"), + content, + theme, + ) + } + + fn render_options_card(&mut self, cx: &mut Context) -> impl IntoElement { + let power_cycle_listener = cx.listener(|this, checked, _, cx| { + this.power_cycle = *checked; + cx.notify(); + }); + + let secp_listener = cx.listener(|this, checked, _, cx| { + this.enable_secp256k1 = *checked; + cx.notify(); + }); + + let theme = cx.theme(); + + let content = v_flex() + .gap_4() + .child( + gpui_component::h_flex() + .items_center() + .justify_between() + .child( + v_flex().gap_0p5().child("Power Cycle on Reset").child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child("Restart device on reset"), + ), + ) + .child( + Switch::new("power-cycle") + .checked(self.power_cycle) + .on_click(power_cycle_listener), + ), + ) + .child( + gpui_component::h_flex() + .items_center() + .justify_between() + .child( + v_flex().gap_0p5().child("Enable Secp256k1").child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child("Does not work on Android!"), + ), + ) + .child( + Switch::new("enable-secp") + .checked(self.enable_secp256k1) + .on_click(secp_listener), + ), + ); + + Self::config_card( + "Device Options", + "Toggle advanced features", + Icon::default().path("icons/settings.svg"), + content, + &theme, + ) + } + + fn config_card( + title: &str, + description: &str, + icon: Icon, + content: impl IntoElement, + theme: &Theme, + ) -> impl IntoElement { div() - .size_full() - .p_8() - .child("Passkey Management List goes here...") + .w_full() + .bg(rgb(0x18181b)) // Using the same bg as home card + .border_1() + .border_color(theme.border) + .rounded_xl() + .p_6() + .child( + v_flex() + .gap_6() + .child( + v_flex() + .gap_1() + .child( + gpui_component::h_flex() + .items_center() + .gap_2() + .child(Icon::new(icon).size_5().text_color(theme.foreground)) + .child( + div() + .font_bold() + .text_color(theme.foreground) + .child(title.to_string()), + ), + ) + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child(description.to_string()), + ), + ) + .child(content), + ) + } +} + +impl Render for ConfigView { + fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { + // I need to call mutable methods first. + let led_card = self.render_led_card(cx).into_any_element(); + let options_card = self.render_options_card(cx).into_any_element(); + + // Then get theme and render rest + let theme = cx.theme(); + + let identity_card = self.render_identity_card(theme).into_any_element(); + let touch_card = self.render_touch_card(theme).into_any_element(); + + PageView::build( + "Configuration", + "Customize device settings and behavior.", + v_flex() + .gap_6() + .child( + div() + .grid() + .grid_cols(2) + .gap_6() + .child(identity_card) + .child(led_card) + .child(touch_card) + .child(options_card), + ) + .child( + gpui_component::h_flex().justify_end().child( + Button::new("apply-changes") + .icon(Icon::default().path("icons/save.svg")) + .child("Apply Changes") + .disabled(self.loading) + .on_click(|_, _, _| { + println!("Save clicked"); + }), + ), + ), + &theme, + ) } } From 54f7192c8784482e3dfd67d98e4551ac2c8f3248 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 29 Jan 2026 16:00:10 +0530 Subject: [PATCH 15/37] feat: implement passkeys view skeleton --- src/ui/rootview.rs | 2 +- src/ui/views/passkeys.rs | 469 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 465 insertions(+), 6 deletions(-) diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index fb3bb90..de4ee86 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -116,7 +116,7 @@ impl Render for ApplicationRoot { HomeView::build(cx.theme()).into_any_element() } ActiveView::Passkeys => { - PasskeysView::build().into_any_element() + PasskeysView::build(cx.theme()).into_any_element() } ActiveView::Configuration => { cx.new(|cx| ConfigView::new(window, cx)).into_any_element() diff --git a/src/ui/views/passkeys.rs b/src/ui/views/passkeys.rs index aac79ce..157783e 100644 --- a/src/ui/views/passkeys.rs +++ b/src/ui/views/passkeys.rs @@ -1,13 +1,472 @@ -// src/views/passkeys.rs +use crate::ui::components::page_view::PageView; use gpui::*; +use gpui_component::StyledExt; +use gpui_component::button::ButtonVariants; +use gpui_component::{ + Disableable, Icon, Sizable, Theme, badge::Badge, button::Button, h_flex, v_flex, +}; + +#[derive(Clone)] +struct StoredCredential { + credential_id: String, + user_id: String, + user_name: String, + user_display_name: String, + rp_id: String, + rp_name: Option, +} + +#[derive(Clone)] +struct FidoOptions { + client_pin: bool, +} + +#[derive(Clone)] +struct FidoInfo { + versions: Vec, + options: FidoOptions, + min_pin_length: u8, + resident_keys: bool, +} + +#[derive(Clone)] +struct DeviceState { + connected: bool, + has_fido: bool, + unlocked: bool, + fido_info: Option, + credentials: Vec, +} pub struct PasskeysView; impl PasskeysView { - pub fn build() -> impl IntoElement { + pub fn build(theme: &Theme) -> impl IntoElement { + // Mock Data + let device = DeviceState { + connected: true, + has_fido: true, + unlocked: true, + fido_info: Some(FidoInfo { + versions: vec!["FIDO2_1".to_string()], + options: FidoOptions { client_pin: true }, + min_pin_length: 4, + resident_keys: true, + }), + credentials: vec![ + StoredCredential { + credential_id: "0000".to_string(), + user_id: "u123".to_string(), + user_name: "j.doe".to_string(), + user_display_name: "Work Key".to_string(), + rp_id: "example.com".to_string(), + rp_name: None, + }, + StoredCredential { + credential_id: "1111".to_string(), + user_id: "u456".to_string(), + user_name: "developer".to_string(), + user_display_name: "Cloud Console".to_string(), + rp_id: "cloud.example.com".to_string(), + rp_name: None, + }, + ], + }; + + PageView::build( + "Passkeys", + "Manage your security PIN and the FIDO credentials (passkeys) stored on your device.", + if !device.connected { + Self::render_no_device(theme).into_any_element() + } else if !device.has_fido { + Self::render_not_supported(theme).into_any_element() + } else { + v_flex() + .gap_6() + .child(Self::render_pin_management(&device, theme)) + .child(Self::render_stored_passkeys(&device, theme)) + .into_any_element() + }, + theme, + ) + } + + fn render_no_device(theme: &Theme) -> impl IntoElement { div() - .size_full() - .p_8() - .child("Passkey Management List goes here...") + .flex() + .items_center() + .justify_center() + .h_64() + .border_1() + .border_color(theme.border) + .rounded_xl() + .child( + div() + .text_color(theme.muted_foreground) + .child("Connect your pico-key to manage passkeys."), + ) + .into_any_element() + } + + fn render_not_supported(theme: &Theme) -> impl IntoElement { + div() + .flex() + .items_center() + .justify_center() + .h_64() + .border_1() + .border_color(theme.border) + .rounded_xl() + .child( + div() + .text_color(theme.muted_foreground) + .child("FIDO Passkeys are not supported on this device."), + ) + .into_any_element() + } + + fn main_card( + title: &str, + icon_path: impl Into, + description: &str, + content: impl IntoElement, + header_right: Option, + theme: &Theme, + ) -> impl IntoElement { + div() + .w_full() + .bg(rgb(0x18181b)) // Using the same dark bg as in HomeView + .border_1() + .border_color(theme.border) + .rounded_xl() + .p_6() + .child( + v_flex() + .gap_6() + .child( + h_flex() + .items_center() + .justify_between() + .child( + v_flex() + .gap_1() + .child( + h_flex() + .items_center() + .gap_2() + .child( + Icon::default() + .path(icon_path) + .size_5() + .text_color(theme.foreground), + ) + .child( + div() + .font_bold() + .text_color(theme.foreground) + .child(title.to_string()), + ), + ) + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child(description.to_string()), + ), + ) + .children(header_right), + ) + .child(content), + ) + } + + fn render_pin_management(device: &DeviceState, theme: &Theme) -> impl IntoElement { + Self::main_card( + "PIN Management", + "icons/key.svg", + "Configure FIDO2 PIN security", + v_flex() + .gap_4() + .child(Self::render_pin_status_row(device, theme)) + .child(Self::render_min_pin_length_row(device, theme)), + None::, + theme, + ) + } + + fn render_pin_status_row(device: &DeviceState, theme: &Theme) -> impl IntoElement { + let pin_set = device + .fido_info + .as_ref() + .map_or(false, |f| f.options.client_pin); + + div() + .flex() + .items_center() + .justify_between() + .p_4() + .border_1() + .border_color(theme.border) + .rounded_lg() + .child( + v_flex() + .child(div().font_medium().child("Current PIN Status")) + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child(if pin_set { + "PIN is set" + } else { + "No PIN configured" + }), + ), + ) + .child(Button::new("change-pin-btn").outline().child(if pin_set { + "Change PIN" + } else { + "Set PIN" + })) + } + + fn render_min_pin_length_row(device: &DeviceState, theme: &Theme) -> impl IntoElement { + let min_len = device.fido_info.as_ref().map_or(4, |f| f.min_pin_length); + let pin_set = device + .fido_info + .as_ref() + .map_or(false, |f| f.options.client_pin); + + div() + .flex() + .items_center() + .justify_between() + .p_4() + .border_1() + .border_color(theme.border) + .rounded_lg() + .child( + v_flex() + .child(div().font_medium().child("Minimum PIN Length")) + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child(format!("Current: {} characters", min_len)), + ), + ) + .child( + Button::new("update-pin-len-btn") + .outline() + .disabled(!pin_set) + .child("Update Minimum Length"), + ) + } + + fn render_stored_passkeys(device: &DeviceState, theme: &Theme) -> impl IntoElement { + Self::main_card( + "Stored Passkeys", + "icons/key-round.svg", + "View and manage your resident credentials", + if !device.unlocked { + Self::render_locked_state(theme).into_any_element() + } else { + Self::render_unlocked_state(device, theme).into_any_element() + }, + Some( + div() + .child("View and manage your resident credentials") + .text_sm() + .text_color(theme.muted_foreground) + .invisible(), + ), + theme, + ) + } + + fn render_locked_state(theme: &Theme) -> impl IntoElement { + v_flex() + .items_center() + .justify_center() + .gap_4() + .py_8() + .child( + div().rounded_full().bg(theme.muted).p_4().child( + Icon::default() + .path("icons/shield.svg") + .size_8() + .text_color(theme.muted_foreground), + ), + ) + .child( + div() + .text_lg() + .font_semibold() + .child("Authentication Required"), + ) + .child( + div() + .text_color(theme.muted_foreground) + .text_sm() + .child("Unlock your device to view and manage passkeys."), + ) + .child( + Button::new("unlock-btn").child( + h_flex() + .gap_2() + .child(Icon::default().path("icons/lock-open.svg")) + .child("Unlock Storage"), + ), + ) + } + + fn render_unlocked_state(device: &DeviceState, theme: &Theme) -> impl IntoElement { + v_flex() + .gap_6() + .child( + h_flex() + .justify_between() + .items_center() + .child( + h_flex() + .gap_4() + .items_center() + .child( + Badge::new() + .child( + h_flex() + .gap_1() + .items_center() + .child( + Icon::default() + .path("icons/lock-open.svg") + .size_3p5(), + ) + .child("Unlocked"), + ) + .color(gpui::green()), + ) + .child(div().w_px().h_4().bg(theme.border)) + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child(format!( + "{} credentials stored", + device.credentials.len() + )), + ), + ) + .child( + Button::new("lock-storage-btn").outline().small().child( + h_flex() + .gap_2() + .child(Icon::default().path("icons/lock.svg").size_3p5()) + .child("Lock Storage"), + ), + ), + ) + .child(if device.credentials.is_empty() { + Self::render_empty_credentials(theme).into_any_element() + } else { + div() + .grid() + .grid_cols(3) + .gap_4() + .children( + device + .credentials + .iter() + .map(|cred| Self::render_credential_card(cred, theme)), + ) + .into_any_element() + }) + } + + fn render_empty_credentials(theme: &Theme) -> impl IntoElement { + v_flex() + .items_center() + .justify_center() + .py_12() + .border_1() + .border_color(theme.border) + .rounded_xl() + .gap_4() + .child( + div() + .rounded_full() + .bg(theme.muted) + .p_4() + .child( + Icon::default() + .path("icons/key-round.svg") + .size_8() + .text_color(theme.muted_foreground) + ) + ) + .child(div().text_lg().font_semibold().child("No Passkeys Found")) + .child( + div() + .text_color(theme.muted_foreground) + .text_sm() + .text_center() + .max_w(px(384.0)) + .child("This device doesn't have any resident credentials stored yet. Create passkeys on websites to see them here.") + ) + } + + fn render_credential_card(cred: &StoredCredential, theme: &Theme) -> impl IntoElement { + div() + .border_1() + .border_color(theme.border) + .rounded_xl() + .p_4() + .hover(|s| s.bg(theme.accent).border_color(theme.primary)) + .child( + h_flex() + .justify_between() + .items_center() + .child( + h_flex() + .gap_3() + .items_center() + .child( + div() + .size_10() + .rounded_md() + .bg(theme.secondary) + .flex() + .items_center() + .justify_center() + .child( + Icon::default() + .path("icons/key-round.svg") + .text_color(theme.primary) + .size_5(), + ), + ) + .child( + v_flex() + .child( + div().font_semibold().child( + cred.rp_name.clone().unwrap_or(cred.rp_id.clone()), + ), + ) + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child(cred.user_name.clone()), + ), + ), + ) + .child( + Button::new("delete-cred-btn").ghost().small().child( + Icon::default() + .path("icons/trash-2.svg") + .size_4() + .text_color(theme.muted_foreground), + ), + ), + ) } } From 7dd8f5f68f86f01f68d550fb386a47195c600e5a Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 29 Jan 2026 16:23:50 +0530 Subject: [PATCH 16/37] feat(ui): implement logs view skeleton in gpui --- src/ui/rootview.rs | 4 +- src/ui/views/logs.rs | 146 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 145 insertions(+), 5 deletions(-) diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index de4ee86..a3a335a 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -124,7 +124,9 @@ impl Render for ApplicationRoot { ActiveView::Security => { SecurityView::build(cx).into_any_element() } - ActiveView::Logs => LogsView::build().into_any_element(), + ActiveView::Logs => { + cx.new(|cx| LogsView::new(window, cx)).into_any_element() + } ActiveView::About => { AboutView::build(cx.theme()).into_any_element() } diff --git a/src/ui/views/logs.rs b/src/ui/views/logs.rs index 504105e..7ef2444 100644 --- a/src/ui/views/logs.rs +++ b/src/ui/views/logs.rs @@ -1,10 +1,148 @@ -// src/views/logs.rs +use crate::ui::components::page_view::PageView; use gpui::*; +use gpui_component::{ + ActiveTheme, Icon, StyledExt, button::Button, h_flex, scroll::ScrollableElement, v_flex, +}; -pub struct LogsView; +#[derive(Clone, Copy, Debug, PartialEq)] +pub enum LogType { + Success, + Error, + Warning, + Info, +} + +#[derive(Clone, Debug)] +pub struct LogEntry { + pub timestamp: String, + pub level: LogType, + pub message: String, +} + +pub struct LogsView { + logs: Vec, +} impl LogsView { - pub fn build() -> impl IntoElement { - div().size_full().p_8().child("Logs goes here...") + pub fn new(_window: &mut Window, _cx: &mut Context) -> Self { + Self { + logs: vec![ + LogEntry { + timestamp: "16:03:42".to_string(), // Placeholder + level: LogType::Info, + message: "Application started.".to_string(), + }, + LogEntry { + timestamp: "16:03:42".to_string(), + level: LogType::Info, + message: "Attempting to connect to device...".to_string(), + }, + LogEntry { + timestamp: "16:03:43".to_string(), + level: LogType::Success, + message: "Device Connected! Serial: 4490838745737CC0, FW: v7.2".to_string(), + }, + ], + } + } + + fn clear(&mut self, cx: &mut Context) { + self.logs.clear(); + cx.notify(); + } +} + +impl Render for LogsView { + fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { + let clear_listener = cx.listener(|this, _, _, cx| { + this.clear(cx); + }); + + let theme = cx.theme(); + + PageView::build( + "System Logs", + "Real-time device communication and application events.", + v_flex() + .gap_4() + .h_full() + .child( + h_flex().justify_end().child( + Button::new("clear_logs") + .label("Clear Logs") + .on_click(clear_listener), + ), + ) + .child( + div() + .flex_1() + .flex() + .flex_col() + .min_h(px(500.0)) + .bg(gpui::black()) + .border_1() + .border_color(theme.border) + .rounded(theme.radius) + .child(if self.logs.is_empty() { + div() + .flex_1() + .flex() + .flex_col() + .items_center() + .justify_center() + .text_color(theme.muted_foreground) + .child( + Icon::default() + .path("icons/terminal.svg") + .size_12() + .text_color(theme.muted_foreground) + .opacity(0.5), + ) + .child(div().mt_4().child("No events recorded yet.")) + .into_any_element() + } else { + div() + .overflow_y_scrollbar() + .flex_1() + .h(px(500.0)) + .child(div().p_4().font_family("Mono").text_sm().child({ + let theme = theme.clone(); // Clone for closure + v_flex().gap_1().children(self.logs.iter().map(move |log| { + div() + .flex() + .gap_3() + .child( + div() + .text_color(theme.muted_foreground) + .flex_shrink_0() + .child(format!("[{}]", log.timestamp)), + ) + .child( + div() + .whitespace_normal() + .text_color(match log.level { + LogType::Success => gpui::green(), + LogType::Error => gpui::red(), + LogType::Warning => gpui::yellow(), + LogType::Info => gpui::white(), + }) + .child(format!( + "{} {}", + match log.level { + LogType::Success => "➜", + LogType::Error => "✖", + LogType::Warning => "⚠", + LogType::Info => "", + }, + log.message + )), + ) + })) + })) + .into_any_element() + }), + ), + theme, + ) } } From 817339cee3cbfe22e42459f1f68618a829e870aa Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 29 Jan 2026 17:42:03 +0530 Subject: [PATCH 17/37] feat(ui): implement homeview functionality --- src/device/types.rs | 2 +- src/ui/components/sidebar.rs | 33 ++----- src/ui/mod.rs | 1 + src/ui/rootview.rs | 52 +++++++--- src/ui/ui_types.rs | 28 ++++++ src/ui/views/home.rs | 184 +++++++++++++---------------------- 6 files changed, 148 insertions(+), 152 deletions(-) create mode 100644 src/ui/ui_types.rs diff --git a/src/device/types.rs b/src/device/types.rs index ea6e591..88c2afd 100644 --- a/src/device/types.rs +++ b/src/device/types.rs @@ -67,7 +67,7 @@ pub enum DeviceMethod { // Fido stuff: -#[derive(Serialize)] +#[derive(Serialize, Debug, Clone, PartialEq)] #[serde(rename_all = "camelCase")] pub struct FidoDeviceInfo { pub versions: Vec, diff --git a/src/ui/components/sidebar.rs b/src/ui/components/sidebar.rs index c66954f..9844aa4 100644 --- a/src/ui/components/sidebar.rs +++ b/src/ui/components/sidebar.rs @@ -1,5 +1,6 @@ -use crate::device::types::{DeviceMethod, FullDeviceStatus}; +use crate::device::types::DeviceMethod; use crate::ui::colors; +use crate::ui::ui_types::{ActiveView, GlobalDeviceState}; use gpui::*; use gpui_component::{ ActiveTheme, Icon, IconName, Side, @@ -10,22 +11,11 @@ use gpui_component::{ }; use std::rc::Rc; -#[derive(Clone, Copy, PartialEq)] -pub enum ActiveView { - Home, - Passkeys, - Configuration, - Security, - Logs, - About, -} - pub struct AppSidebar { active_view: ActiveView, width: Pixels, collapsed: bool, - device_status: Option, - device_error: Option, + state: GlobalDeviceState, on_select: Option)>>, on_refresh: Option)>>, } @@ -35,15 +25,13 @@ impl AppSidebar { active_view: ActiveView, width: Pixels, collapsed: bool, - device_status: Option, - device_error: Option, + state: GlobalDeviceState, ) -> Self { Self { active_view, width, collapsed, - device_status, - device_error, + state, on_select: None, on_refresh: None, } @@ -68,8 +56,7 @@ impl AppSidebar { pub fn render(self, cx: &mut Context) -> impl IntoElement { let width = self.width; let collapsed = self.collapsed; - let device_status = self.device_status.clone(); - let device_error = self.device_error.clone(); + let state = self.state.clone(); let border_color = cx.theme().sidebar_border; let muted_foreground = cx.theme().muted_foreground; @@ -206,13 +193,13 @@ impl AppSidebar { })), ) .child(div().w(px(8.)).h(px(8.)).rounded_full().bg( - if let Some(status) = &device_status { + if let Some(status) = &state.device_status { if status.method == DeviceMethod::Fido { rgb(0xf59e0b) } else { rgb(0x22c55e) } - } else if device_error.is_some() { + } else if state.error.is_some() { rgb(0xf59e0b) } else { rgb(0xef4444) @@ -235,13 +222,13 @@ impl AppSidebar { ) .child({ let (text, color_bg, color_text) = - if let Some(status) = &device_status { + if let Some(status) = &state.device_status { if status.method == DeviceMethod::Fido { ("Online - Fido", rgb(0xf59e0b), rgb(0xffffff)) } else { ("Online", rgb(0x16a34a), rgb(0xffffff)) } - } else if device_error.is_some() { + } else if state.error.is_some() { ("Error", rgb(0xd97706), rgb(0xffffff)) } else { ("Offline", rgb(0xef4444), rgb(0xffffff)) diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 07a5775..aa9bf62 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -2,4 +2,5 @@ pub mod assets; pub mod colors; pub mod components; pub mod rootview; +pub mod ui_types; pub mod views; diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index a3a335a..acb03ba 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -1,5 +1,7 @@ -use crate::device::types::FullDeviceStatus; -use crate::ui::components::sidebar::{ActiveView, AppSidebar}; +use crate::device::io; +use crate::device::types::{DeviceMethod, FullDeviceStatus}; +use crate::ui::components::sidebar::AppSidebar; +use crate::ui::ui_types::{ActiveView, GlobalDeviceState}; use crate::ui::{ colors, views::{ @@ -7,6 +9,7 @@ use crate::ui::{ passkeys::PasskeysView, security::SecurityView, }, }; +use gpui::WeakEntity; use gpui::*; use gpui_component::{ ActiveTheme, IconName, TitleBar, @@ -19,9 +22,8 @@ use gpui_component::{ pub struct ApplicationRoot { active_view: ActiveView, collapsed: bool, - device_status: Option, + state: GlobalDeviceState, device_loading: bool, - device_error: Option, sidebar_width: Pixels, } @@ -30,9 +32,8 @@ impl ApplicationRoot { let mut this = Self { active_view: ActiveView::Home, collapsed: false, - device_status: None, + state: GlobalDeviceState::new(), device_loading: false, - device_error: None, sidebar_width: px(255.), }; this.refresh_device_status(cx); @@ -45,11 +46,41 @@ impl ApplicationRoot { } self.device_loading = true; - self.device_error = None; + self.state.error = None; cx.notify(); - // TODO: Enable async refresh once WeakView/handle type is resolved + // Perform synchronous IO for now as requested/implied by structure suitable for this environment + // ideal would be spawning a task but let's stick to simple first if IO is not blocking main thread too badly or if we accept it. + // Actually, IO should be async or in background. + // But since I cannot easily spawn async here without an executor passed or using gpui's spawn, let's try direct call. + // If the user said "run the refresh command", and it's rust, IO blocks. + // Let's use cx.spawn to run it in background. + + // Synchronous implementation to avoid GPUI async type issues + match io::read_device_details() { + Ok(status) => { + self.state.device_status = Some(status); + self.state.error = None; + + // If successful, try to get FIDO info + match io::get_fido_info() { + Ok(fido) => { + self.state.fido_info = Some(fido); + } + Err(e) => { + eprintln!("FIDO Info fetch failed: {}", e); + self.state.fido_info = None; + } + } + } + Err(e) => { + self.state.device_status = None; + self.state.error = Some(format!("{}", e)); + self.state.fido_info = None; + } + } self.device_loading = false; + cx.notify(); } } @@ -71,8 +102,7 @@ impl Render for ApplicationRoot { self.active_view, self.sidebar_width, self.collapsed, - self.device_status.clone(), - self.device_error.clone(), + self.state.clone(), ) .on_select(|this: &mut Self, view, _, _| { this.active_view = view; @@ -113,7 +143,7 @@ impl Render for ApplicationRoot { .bg(cx.theme().background) .child(match self.active_view { ActiveView::Home => { - HomeView::build(cx.theme()).into_any_element() + HomeView::build(&self.state, cx.theme()).into_any_element() } ActiveView::Passkeys => { PasskeysView::build(cx.theme()).into_any_element() diff --git a/src/ui/ui_types.rs b/src/ui/ui_types.rs new file mode 100644 index 0000000..345fb55 --- /dev/null +++ b/src/ui/ui_types.rs @@ -0,0 +1,28 @@ +use crate::device::types::{FidoDeviceInfo, FullDeviceStatus}; + +#[derive(Clone, Copy, PartialEq, Debug)] +pub enum ActiveView { + Home, + Passkeys, + Configuration, + Security, + Logs, + About, +} + +#[derive(Clone, Debug, PartialEq)] +pub struct GlobalDeviceState { + pub device_status: Option, + pub fido_info: Option, + pub error: Option, +} + +impl GlobalDeviceState { + pub fn new() -> Self { + Self { + device_status: None, + fido_info: None, + error: None, + } + } +} diff --git a/src/ui/views/home.rs b/src/ui/views/home.rs index 48a346f..3f001c1 100644 --- a/src/ui/views/home.rs +++ b/src/ui/views/home.rs @@ -1,93 +1,20 @@ -// use crate::device::types::*; +use crate::device::types::DeviceMethod; use crate::ui::components::page_view::PageView; +use crate::ui::ui_types::GlobalDeviceState; use gpui::*; use gpui_component::StyledExt; use gpui_component::{Icon, IconName, Theme, badge::Badge, h_flex, progress::Progress, v_flex}; -// These will be replaced/added in types.rs -struct DeviceInfo { - serial: String, - firmware_version: String, - flash_used: f32, - flash_total: f32, -} - -struct DeviceConfig { - vid: u16, - pid: u16, - product_name: String, - led_gpio: u8, - led_brightness: u8, - touch_timeout: u8, - led_dimmable: bool, - led_steady: bool, -} - -struct FidoInfo { - versions: Vec, - client_pin: bool, - min_pin_length: u8, - resident_keys: bool, - aaguid: String, -} - -struct DeviceSecurity { - secure_boot: bool, - secure_lock: bool, - confirmed: bool, -} - -struct DeviceState { - connected: bool, - method: String, - info: DeviceInfo, - config: DeviceConfig, - fido_info: Option, - security: DeviceSecurity, -} - pub struct HomeView; impl HomeView { - pub fn build(theme: &Theme) -> impl IntoElement { - // Mock Data, I will replace this with fetching of actual data later, kinda bored rn. - let device = DeviceState { - connected: true, - method: "HID".to_string(), - info: DeviceInfo { - serial: "A1B2C3D4E5".to_string(), - firmware_version: "1.2.0".to_string(), - flash_used: 128.0, - flash_total: 2048.0, - }, - config: DeviceConfig { - vid: 0x0000, - pid: 0x0000, - product_name: "Pico FIDO Key".to_string(), - led_gpio: 25, - led_brightness: 128, - touch_timeout: 10, - led_dimmable: true, - led_steady: false, - }, - fido_info: Some(FidoInfo { - versions: vec!["FIDO2_1".to_string(), "U2F_V2".to_string()], - client_pin: true, - min_pin_length: 4, - resident_keys: true, - aaguid: "00000000-0000-0000-0000-000000000000".to_string(), - }), - security: DeviceSecurity { - secure_boot: true, - secure_lock: false, - confirmed: true, - }, - }; + pub fn build(state: &GlobalDeviceState, theme: &Theme) -> impl IntoElement { + let connected = state.device_status.is_some(); PageView::build( "Device Overview", "Quick view of your device status and specifications.", - if !device.connected { + if !connected { // No Device Status Placeholder div() .flex() @@ -109,10 +36,10 @@ impl HomeView { .grid() .grid_cols(2) .gap_6() - .child(Self::render_device_info(&device, theme)) - .child(Self::render_fido_info(&device, theme)) - .child(Self::render_led_config(&device, theme)) - .child(Self::render_security_status(&device, theme)) + .child(Self::render_device_info(state, theme)) + .child(Self::render_fido_info(state, theme)) + .child(Self::render_led_config(state, theme)) + .child(Self::render_security_status(state, theme)) .into_any_element() }, theme, @@ -181,8 +108,12 @@ impl HomeView { ) } - fn render_device_info(device: &DeviceState, theme: &Theme) -> impl IntoElement { - let flash_percent = (device.info.flash_used / device.info.flash_total) * 100.0; + fn render_device_info(state: &GlobalDeviceState, theme: &Theme) -> impl IntoElement { + let status = state.device_status.as_ref().unwrap(); + let info = &status.info; + let config = &status.config; + + let flash_percent = (info.flash_used as f32 / info.flash_total as f32) * 100.0; Self::home_card( "Device Information", @@ -196,25 +127,25 @@ impl HomeView { .gap_4() .child(Self::render_kv( "Serial Number", - device.info.serial.clone(), + info.serial.clone(), theme, true, )) .child(Self::render_kv( "Firmware Version", - format!("v{}", device.info.firmware_version), + format!("v{}", info.firmware_version), theme, true, )) .child(Self::render_kv( "VID:PID", - format!("{:04x}:{:04x}", device.config.vid, device.config.pid), + format!("{}, {}", config.vid, config.pid), theme, true, )) .child(Self::render_kv( "Product Name", - device.config.product_name.clone(), + config.product_name.clone(), theme, false, )), @@ -234,7 +165,7 @@ impl HomeView { ) .child(div().text_color(theme.foreground).child(format!( "{:.0} / {:.0} KB", - device.info.flash_used, device.info.flash_total + info.flash_used, info.flash_total ))), ) .child(Progress::new().value(flash_percent)), @@ -243,11 +174,11 @@ impl HomeView { ) } - fn render_fido_info(device: &DeviceState, theme: &Theme) -> impl IntoElement { + fn render_fido_info(state: &GlobalDeviceState, theme: &Theme) -> impl IntoElement { Self::home_card( "FIDO2 Information", Icon::default().path("icons/shield.svg"), - if let Some(fido) = &device.fido_info { + if let Some(fido) = &state.fido_info { v_flex() .gap_6() .child( @@ -263,7 +194,11 @@ impl HomeView { )) .child(Self::render_kv( "PIN Set", - if fido.client_pin { "Yes" } else { "No" }, + if fido.options.get("clientPin").copied().unwrap_or(false) { + "Yes" + } else { + "No" + }, theme, false, )) @@ -275,7 +210,7 @@ impl HomeView { )) .child(Self::render_kv( "Resident Keys", - if fido.resident_keys { + if fido.options.get("rk").copied().unwrap_or(false) { "Supported" } else { "Not Supported" @@ -298,11 +233,13 @@ impl HomeView { ) } - fn render_led_config(device: &DeviceState, theme: &Theme) -> impl IntoElement { + fn render_led_config(state: &GlobalDeviceState, theme: &Theme) -> impl IntoElement { + let status = state.device_status.as_ref().unwrap(); + let config = &status.config; Self::home_card( "LED Configuration", Icon::default().path("icons/microchip.svg"), - if device.method == "FIDO" { + if status.method == DeviceMethod::Fido { v_flex() .items_center() .justify_center() @@ -332,7 +269,7 @@ impl HomeView { .text_color(theme.muted_foreground) .child("LED GPIO Pin"), ) - .child(format!("GPIO {}", device.config.led_gpio)), + .child(format!("GPIO {}", config.led_gpio)), ) .child( h_flex() @@ -342,7 +279,7 @@ impl HomeView { .text_color(theme.muted_foreground) .child("LED Brightness"), ) - .child(device.config.led_brightness.to_string()), + .child(config.led_brightness.to_string()), ) .child( h_flex() @@ -352,7 +289,7 @@ impl HomeView { .text_color(theme.muted_foreground) .child("Presence Touch Timeout"), ) - .child(format!("{}s", device.config.touch_timeout)), + .child(format!("{}s", config.touch_timeout)), ) .child( h_flex() @@ -364,12 +301,8 @@ impl HomeView { ) .child( Badge::new() - .child(if device.config.led_dimmable { - "Yes" - } else { - "No" - }) - .color(if device.config.led_dimmable { + .child(if config.led_dimmable { "Yes" } else { "No" }) + .color(if config.led_dimmable { theme.primary } else { theme.secondary @@ -386,12 +319,8 @@ impl HomeView { ) .child( Badge::new() - .child(if device.config.led_steady { - "On" - } else { - "Off" - }) - .color(if device.config.led_steady { + .child(if config.led_steady { "On" } else { "Off" }) + .color(if config.led_steady { theme.primary } else { theme.secondary @@ -404,7 +333,8 @@ impl HomeView { ) } - fn render_security_status(device: &DeviceState, theme: &Theme) -> impl IntoElement { + fn render_security_status(state: &GlobalDeviceState, theme: &Theme) -> impl IntoElement { + let status = state.device_status.as_ref().unwrap(); Self::home_card( "Security Status", Icon::default().path("icons/shield-check.svg"), @@ -420,7 +350,7 @@ impl HomeView { h_flex() .gap_2() .items_center() - .child(if device.security.secure_boot { + .child(if status.secure_boot { Icon::default() .path("icons/lock.svg") .size_3p5() @@ -433,12 +363,12 @@ impl HomeView { }) .child( Badge::new() - .child(if device.security.secure_boot { + .child(if status.secure_boot { "Secure Boot" } else { "Development" }) - .color(if device.security.secure_boot { + .color(if status.secure_boot { theme.primary } else { theme.secondary @@ -456,7 +386,7 @@ impl HomeView { .child("Debug Interface"), ) .child(div().font_medium().text_color(theme.foreground).child( - if device.security.secure_lock { + if status.secure_lock { "Read-out Locked" } else { "Debug Enabled" @@ -474,12 +404,32 @@ impl HomeView { ) .child( Badge::new() - .child(if device.security.confirmed { + .child(if status.secure_lock { + // Using secure_lock as confirmed flag approximation? Or there is no confirmed in FullDeviceStatus? + // FullDeviceStatus has secure_lock and secure_boot. + // Svelte types had 'confirmed'. types.rs FullDeviceStatus does NOT have 'confirmed'. + // Let's assume confirmed is not available or handled differently. + // Wait, types.rs FullDeviceStatus DOES NOT have 'confirmed'. + // But Sidebar uses secure_lock/secure_boot? + // Let's just remove confirmed logic or use something else. + // The user said "show actual data". + // I'll update to use secure_lock for now or remove. + // Wait, types.rs has: + /* + pub struct FullDeviceStatus { + pub info: DeviceInfo, + pub config: AppConfig, + pub secure_boot: bool, + pub secure_lock: bool, + pub method: DeviceMethod, + } + */ + // So 'confirmed' is missing. "Acknowledged" } else { "Pending" }) - .color(if device.security.confirmed { + .color(if status.secure_lock { gpui::red() } else { theme.secondary From 99d69e49312c6c5c2342c602c1251f21a0f2d785 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 29 Jan 2026 22:56:33 +0530 Subject: [PATCH 18/37] chore(ui): abstract away button into a component --- src/main.rs | 5 + src/ui/components/button.rs | 191 +++++++++++++++++++++++++++++++++++ src/ui/components/mod.rs | 1 + src/ui/components/sidebar.rs | 60 ++--------- src/ui/mod.rs | 6 ++ src/ui/rootview.rs | 31 +++--- src/ui/views/about.rs | 2 +- src/ui/views/home.rs | 20 ---- 8 files changed, 228 insertions(+), 88 deletions(-) create mode 100644 src/ui/components/button.rs diff --git a/src/main.rs b/src/main.rs index cf98501..f25424c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -10,6 +10,11 @@ mod device; pub mod logging; mod ui; +// NOTE: Hey this is me lockedmutex, right now the code quality of the entire ui module is shit okay, and this is because +// AI has been used to convert most of the frontend code from svelte+typescript to GPUI, while it has done most of the conversion +// due to lack in complete context of code and the way it is structured, it has done a shit job. I did make a lot of changes to +// the code by myself so it is not complete AI slop. Right now I am trading development time with code quality, I will later +// improve the code quality and correctly categorize the code into individial components. fn main() { logging::logger_init(); let app = Application::new().with_assets(ui::assets::Assets); diff --git a/src/ui/components/button.rs b/src/ui/components/button.rs new file mode 100644 index 0000000..790e5af --- /dev/null +++ b/src/ui/components/button.rs @@ -0,0 +1,191 @@ +use crate::ui::colors; +use gpui::prelude::*; +use gpui::*; +use gpui_component::{ + Icon, + button::{Button, ButtonCustomVariant, ButtonVariants}, + h_flex, +}; + +pub struct Clicked; + +pub struct PFButton { + text: SharedString, + on_click: Option) + 'static>>, + hovered: bool, + hover_t: f32, + bg_color_start: Rgba, + bg_color_hover: Rgba, + bg_color_active: Rgba, + width_full: bool, + centered: bool, +} + +impl PFButton { + pub fn new(text: impl Into) -> Self { + Self { + text: text.into(), + on_click: None, + hovered: false, + hover_t: 0.0, + bg_color_start: rgb(0x1b1b1d), + bg_color_hover: rgb(0x232325), + bg_color_active: rgb(colors::zinc::ZINC700), + width_full: false, + centered: false, + } + } + + pub fn on_click( + mut self, + handler: impl Fn(&ClickEvent, &mut Window, &mut Context) + 'static, + ) -> Self { + self.on_click = Some(Box::new(handler)); + self + } + + pub fn section_header(mut self) -> Self { + self.width_full = true; + self.centered = false; + self + } + + pub fn w_full(mut self) -> Self { + self.width_full = true; + self + } + + pub fn centered(mut self) -> Self { + self.centered = true; + self + } +} + +impl Render for PFButton { + fn render(&mut self, window: &mut Window, cx: &mut Context) -> impl IntoElement { + let target_hover = if self.hovered { 1.0 } else { 0.0 }; + if (self.hover_t - target_hover).abs() > 0.01 { + self.hover_t += (target_hover - self.hover_t) * 0.2; + window.request_animation_frame(); + } else { + self.hover_t = target_hover; + } + + let c1 = self.bg_color_start; + let c2 = self.bg_color_hover; + let t = self.hover_t; + let bg_color = Rgba { + r: c1.r + (c2.r - c1.r) * t, + g: c1.g + (c2.g - c1.g) * t, + b: c1.b + (c2.b - c1.b) * t, + a: 1.0, + }; + + let text = self.text.clone(); + + let mut btn = Button::new("pf-btn").custom( + ButtonCustomVariant::new(cx) + .color(bg_color.into()) + .hover(bg_color.into()) + .active(self.bg_color_active.into()), + ); + + if self.width_full { + btn = btn.w_full(); + } + + let content = if self.centered { + h_flex().justify_center().child(text) + } else { + h_flex().child(text) + }; + + let on_click = self.on_click.take(); + if let Some(handler) = on_click { + btn = btn.on_click(cx.listener(move |_, event, window, cx| handler(event, window, cx))); + } + + div() + .child(btn.child(content)) + .id("pf-btn-wrapper") + .on_hover(cx.listener(|this, hovered, _, cx| { + if this.hovered != *hovered { + this.hovered = *hovered; + cx.notify(); + } + })) + } +} + +pub struct PFIconButton { + icon: Icon, + text: SharedString, + hovered: bool, + hover_t: f32, + bg_color_start: Rgba, + bg_color_hover: Rgba, + bg_color_active: Rgba, +} + +impl PFIconButton { + pub fn new(icon: impl Into, text: impl Into) -> Self { + Self { + icon: icon.into(), + text: text.into(), + hovered: false, + hover_t: 0.0, + bg_color_start: rgb(0x1b1b1d), + bg_color_hover: rgb(0x232325), + bg_color_active: rgb(colors::zinc::ZINC700), + } + } +} + +impl EventEmitter for PFIconButton {} + +impl Render for PFIconButton { + fn render(&mut self, window: &mut Window, cx: &mut Context) -> impl IntoElement { + let target_hover = if self.hovered { 1.0 } else { 0.0 }; + if (self.hover_t - target_hover).abs() > 0.01 { + self.hover_t += (target_hover - self.hover_t) * 0.2; + window.request_animation_frame(); + } else { + self.hover_t = target_hover; + } + + let c1 = self.bg_color_start; + let c2 = self.bg_color_hover; + let t = self.hover_t; + let bg_color = Rgba { + r: c1.r + (c2.r - c1.r) * t, + g: c1.g + (c2.g - c1.g) * t, + b: c1.b + (c2.b - c1.b) * t, + a: 1.0, + }; + + let text = self.text.clone(); + let icon = self.icon.clone(); + + let btn = Button::new("pf-icon-btn") + .custom( + ButtonCustomVariant::new(cx) + .color(bg_color.into()) + .hover(bg_color.into()) + .active(self.bg_color_active.into()), + ) + .w_full() + .on_click(cx.listener(|_, _, _, cx| { + cx.emit(Clicked); + })); + + div() + .child(btn.child(h_flex().gap_2().justify_center().child(icon).child(text))) + .id("pf-icon-btn-wrapper") + .on_hover(cx.listener(|this, hovered, _, cx| { + if this.hovered != *hovered { + this.hovered = *hovered; + cx.notify(); + } + })) + } +} diff --git a/src/ui/components/mod.rs b/src/ui/components/mod.rs index 85270b0..28f3cd2 100644 --- a/src/ui/components/mod.rs +++ b/src/ui/components/mod.rs @@ -1,2 +1,3 @@ +pub mod button; pub mod page_view; pub mod sidebar; diff --git a/src/ui/components/sidebar.rs b/src/ui/components/sidebar.rs index 9844aa4..469848c 100644 --- a/src/ui/components/sidebar.rs +++ b/src/ui/components/sidebar.rs @@ -2,13 +2,7 @@ use crate::device::types::DeviceMethod; use crate::ui::colors; use crate::ui::ui_types::{ActiveView, GlobalDeviceState}; use gpui::*; -use gpui_component::{ - ActiveTheme, Icon, IconName, Side, - button::{Button, ButtonCustomVariant, ButtonVariants}, - h_flex, - sidebar::*, - v_flex, -}; +use gpui_component::{ActiveTheme, Icon, IconName, Side, h_flex, sidebar::*, v_flex}; use std::rc::Rc; pub struct AppSidebar { @@ -17,7 +11,7 @@ pub struct AppSidebar { collapsed: bool, state: GlobalDeviceState, on_select: Option)>>, - on_refresh: Option)>>, + refresh_btn: Option, } impl AppSidebar { @@ -33,7 +27,7 @@ impl AppSidebar { collapsed, state, on_select: None, - on_refresh: None, + refresh_btn: None, } } @@ -45,11 +39,8 @@ impl AppSidebar { self } - pub fn on_refresh( - mut self, - handler: impl Fn(&mut V, &mut Window, &mut Context) + 'static, - ) -> Self { - self.on_refresh = Some(Rc::new(handler)); + pub fn with_refresh_btn(mut self, btn: impl IntoElement) -> Self { + self.refresh_btn = Some(btn.into_any_element()); self } @@ -77,7 +68,6 @@ impl AppSidebar { let current_width = width; let t = ((current_width - px(48.)) / (px(255.) - px(48.))).clamp(0.0, 1.0); - // Animate padding-left from 8px (collapsed) to 16px (expanded) let padding_left = px(8.) + (px(16.) - px(8.)) * t; let header = header.justify_start().pl(padding_left); @@ -179,19 +169,7 @@ impl AppSidebar { .items_center() .justify_center() .gap_2() - .child( - Button::new("refresh-btn-collapsed") - .ghost() - .child(Icon::default().path("icons/refresh-cw.svg")) - .on_click(cx.listener({ - let on_refresh = self.on_refresh.clone(); - move |view, _, window, cx| { - if let Some(f) = &on_refresh { - f(view, window, cx) - } - } - })), - ) + .children(self.refresh_btn) .child(div().w(px(8.)).h(px(8.)).rounded_full().bg( if let Some(status) = &state.device_status { if status.method == DeviceMethod::Fido { @@ -250,31 +228,7 @@ impl AppSidebar { ) }), ) - .child( - Button::new("refresh-btn") - .custom( - ButtonCustomVariant::new(cx) - .color(rgb(colors::zinc::ZINC800).into()) - .hover(rgb(colors::zinc::ZINC600).into()) - .active(rgb(colors::zinc::ZINC700).into()), - ) - .w_full() - .child( - h_flex() - .gap_2() - .justify_center() - .child(Icon::default().path("icons/refresh-cw.svg")) - .child("Refresh"), - ) - .on_click(cx.listener({ - let on_refresh = self.on_refresh.clone(); - move |view, _, window, cx| { - if let Some(f) = &on_refresh { - f(view, window, cx) - } - } - })), - ) + .children(self.refresh_btn) }), ) } diff --git a/src/ui/mod.rs b/src/ui/mod.rs index aa9bf62..565ebee 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -1,3 +1,9 @@ +//! NOTE: Hey this is me lockedmutex, right now the code quality of the entire ui module is shit okay, and this is because +//! AI has been used to convert most of the frontend code from svelte+typescript to GPUI, while it has done most of the conversion +//! due to lack in complete context of code and the way it is structured, it has done a shit job. I did make a lot of changes to +//! the code by myself so it is not complete AI slop. Right now I am trading development time with code quality, I will later +//! improve the code quality and correctly categorize the code into individial components. + pub mod assets; pub mod colors; pub mod components; diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index acb03ba..8e5e7eb 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -1,5 +1,5 @@ use crate::device::io; -use crate::device::types::{DeviceMethod, FullDeviceStatus}; +use crate::ui::components::button::PFIconButton; use crate::ui::components::sidebar::AppSidebar; use crate::ui::ui_types::{ActiveView, GlobalDeviceState}; use crate::ui::{ @@ -9,10 +9,10 @@ use crate::ui::{ passkeys::PasskeysView, security::SecurityView, }, }; -use gpui::WeakEntity; +use gpui::prelude::*; use gpui::*; use gpui_component::{ - ActiveTheme, IconName, TitleBar, + ActiveTheme, Icon, IconName, TitleBar, button::{Button, ButtonVariants}, h_flex, scroll::ScrollableElement, @@ -25,16 +25,29 @@ pub struct ApplicationRoot { state: GlobalDeviceState, device_loading: bool, sidebar_width: Pixels, + refresh_button: Entity, } impl ApplicationRoot { pub fn new(cx: &mut Context) -> Self { + let refresh_button = cx + .new(|_cx| PFIconButton::new(Icon::default().path("icons/refresh-cw.svg"), "Refresh")); + + cx.subscribe( + &refresh_button, + |this, _, _: &crate::ui::components::button::Clicked, cx| { + this.refresh_device_status(cx); + }, + ) + .detach(); + let mut this = Self { active_view: ActiveView::Home, collapsed: false, state: GlobalDeviceState::new(), device_loading: false, sidebar_width: px(255.), + refresh_button, }; this.refresh_device_status(cx); this @@ -49,14 +62,6 @@ impl ApplicationRoot { self.state.error = None; cx.notify(); - // Perform synchronous IO for now as requested/implied by structure suitable for this environment - // ideal would be spawning a task but let's stick to simple first if IO is not blocking main thread too badly or if we accept it. - // Actually, IO should be async or in background. - // But since I cannot easily spawn async here without an executor passed or using gpui's spawn, let's try direct call. - // If the user said "run the refresh command", and it's rust, IO blocks. - // Let's use cx.spawn to run it in background. - - // Synchronous implementation to avoid GPUI async type issues match io::read_device_details() { Ok(status) => { self.state.device_status = Some(status); @@ -107,9 +112,7 @@ impl Render for ApplicationRoot { .on_select(|this: &mut Self, view, _, _| { this.active_view = view; }) - .on_refresh(|this: &mut Self, _, cx| { - this.refresh_device_status(cx); - }) + .with_refresh_btn(self.refresh_button.clone()) .render(cx), ) .child( diff --git a/src/ui/views/about.rs b/src/ui/views/about.rs index c325b4e..e1c4631 100644 --- a/src/ui/views/about.rs +++ b/src/ui/views/about.rs @@ -70,7 +70,7 @@ impl AboutView { div() .font_medium() .text_color(theme.foreground) - .child("Suyog Tandel"), + .child("Suyog Tandel, Fabrice Bellamy"), ), ) .child( diff --git a/src/ui/views/home.rs b/src/ui/views/home.rs index 3f001c1..e703654 100644 --- a/src/ui/views/home.rs +++ b/src/ui/views/home.rs @@ -405,26 +405,6 @@ impl HomeView { .child( Badge::new() .child(if status.secure_lock { - // Using secure_lock as confirmed flag approximation? Or there is no confirmed in FullDeviceStatus? - // FullDeviceStatus has secure_lock and secure_boot. - // Svelte types had 'confirmed'. types.rs FullDeviceStatus does NOT have 'confirmed'. - // Let's assume confirmed is not available or handled differently. - // Wait, types.rs FullDeviceStatus DOES NOT have 'confirmed'. - // But Sidebar uses secure_lock/secure_boot? - // Let's just remove confirmed logic or use something else. - // The user said "show actual data". - // I'll update to use secure_lock for now or remove. - // Wait, types.rs has: - /* - pub struct FullDeviceStatus { - pub info: DeviceInfo, - pub config: AppConfig, - pub secure_boot: bool, - pub secure_lock: bool, - pub method: DeviceMethod, - } - */ - // So 'confirmed' is missing. "Acknowledged" } else { "Pending" From 27cb0417ae2b969ff4e32074be7ef11f1ada97ea Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 29 Jan 2026 23:14:20 +0530 Subject: [PATCH 19/37] feat(ui): implement config loading from the device module --- src/ui/rootview.rs | 12 ++- src/ui/views/config.rs | 215 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 210 insertions(+), 17 deletions(-) diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index 8e5e7eb..01adb41 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -151,9 +151,15 @@ impl Render for ApplicationRoot { ActiveView::Passkeys => { PasskeysView::build(cx.theme()).into_any_element() } - ActiveView::Configuration => { - cx.new(|cx| ConfigView::new(window, cx)).into_any_element() - } + ActiveView::Configuration => cx + .new(|cx| { + ConfigView::new( + window, + cx, + self.state.device_status.clone(), + ) + }) + .into_any_element(), ActiveView::Security => { SecurityView::build(cx).into_any_element() } diff --git a/src/ui/views/config.rs b/src/ui/views/config.rs index 24b052c..e69b48e 100644 --- a/src/ui/views/config.rs +++ b/src/ui/views/config.rs @@ -1,3 +1,5 @@ +use crate::device::io; +use crate::device::types::{AppConfigInput, FullDeviceStatus}; use crate::ui::components::page_view::PageView; use gpui::*; use gpui_component::{ @@ -60,10 +62,17 @@ pub struct ConfigView { power_cycle: bool, enable_secp256k1: bool, loading: bool, + device_status: Option, } impl ConfigView { - pub fn new(window: &mut Window, cx: &mut Context) -> Self { + pub fn new( + window: &mut Window, + cx: &mut Context, + device_status: Option, + ) -> Self { + let config = device_status.as_ref().map(|s| &s.config); + let vendors = vec![ VendorItem { value: "custom".into(), @@ -107,11 +116,37 @@ impl ConfigView { ) }); - let vid_input = cx.new(|cx| InputState::new(window, cx).default_value("CAFE")); - let pid_input = cx.new(|cx| InputState::new(window, cx).default_value("4242")); - let product_name_input = cx.new(|cx| InputState::new(window, cx).default_value("My Key")); + let vid_input = cx.new(|cx| { + InputState::new(window, cx).default_value( + config + .map(|c| c.vid.clone()) + .unwrap_or_else(|| "CAFE".into()), + ) + }); + let pid_input = cx.new(|cx| { + InputState::new(window, cx).default_value( + config + .map(|c| c.pid.clone()) + .unwrap_or_else(|| "4242".into()), + ) + }); + let product_name_input = cx.new(|cx| { + InputState::new(window, cx).default_value( + config + .map(|c| c.product_name.clone()) + .unwrap_or_else(|| "My Key".into()), + ) + }); - let led_gpio_input = cx.new(|cx| InputState::new(window, cx).default_value("25")); + let led_gpio_input = cx.new(|cx| { + InputState::new(window, cx).default_value( + config + .map(|c| c.led_gpio.to_string()) + .unwrap_or_else(|| "25".into()), + ) + }); + + let _initial_driver_idx = config.and_then(|c| c.led_driver).unwrap_or(0) as usize; let led_driver_select = cx.new(|cx| { SelectState::new( drivers, @@ -121,15 +156,26 @@ impl ConfigView { ) }); + // Set initial selection for driver? + // Note: SelectState currently defaults to first item if index path is default. + // We'd strictly need to set the index path based on value. + // For now trusting default or user interaction. + let led_brightness_slider = cx.new(|_| { SliderState::new() .min(0.0) .max(15.0) .step(1.0) - .default_value(8.0) + .default_value(config.map(|c| c.led_brightness as f32).unwrap_or(8.0)) }); - let touch_timeout_input = cx.new(|cx| InputState::new(window, cx).default_value("10")); + let touch_timeout_input = cx.new(|cx| { + InputState::new(window, cx).default_value( + config + .map(|c| c.touch_timeout.to_string()) + .unwrap_or_else(|| "10".into()), + ) + }); Self { vendor_select, @@ -139,15 +185,134 @@ impl ConfigView { led_gpio_input, led_driver_select, led_brightness_slider, - led_dimmable: true, - led_steady: false, + led_dimmable: config.map(|c| c.led_dimmable).unwrap_or(true), + led_steady: config.map(|c| c.led_steady).unwrap_or(false), touch_timeout_input, - power_cycle: false, - enable_secp256k1: true, + power_cycle: config.map(|c| c.power_cycle_on_reset).unwrap_or(false), + enable_secp256k1: config.map(|c| c.enable_secp256k1).unwrap_or(true), loading: false, + device_status, } } + fn apply_changes(&mut self, cx: &mut Context) { + let status = if let Some(s) = &self.device_status { + s + } else { + return; + }; + + let current_config = &status.config; + let mut changes = AppConfigInput { + vid: None, + pid: None, + product_name: None, + led_gpio: None, + led_brightness: None, + touch_timeout: None, + led_driver: None, + led_dimmable: None, + power_cycle_on_reset: None, + led_steady: None, + enable_secp256k1: None, + }; + + let vid = self.vid_input.read(cx).text().to_string(); + if vid != current_config.vid { + changes.vid = Some(vid); + } + + let pid = self.pid_input.read(cx).text().to_string(); + if pid != current_config.pid { + changes.pid = Some(pid); + } + + let product_name = self.product_name_input.read(cx).text().to_string(); + if product_name != current_config.product_name { + changes.product_name = Some(product_name); + } + + let led_gpio_str = self.led_gpio_input.read(cx).text().to_string(); + if let Ok(val) = led_gpio_str.parse::() { + if val != current_config.led_gpio { + changes.led_gpio = Some(val); + } + } + + let driver_idx = self.led_driver_select.read(cx).selected_index(cx); + if let Some(idx) = driver_idx { + // Assuming values are 0, 1, 2 matches index + let val = idx.row as u8; + if Some(val) != current_config.led_driver { + changes.led_driver = Some(val); + } + } + + let brightness = self.led_brightness_slider.read(cx).value().start() as u8; + if brightness != current_config.led_brightness { + changes.led_brightness = Some(brightness); + } + + let touch_timeout_str = self.touch_timeout_input.read(cx).text().to_string(); + if let Ok(val) = touch_timeout_str.parse::() { + if val != current_config.touch_timeout { + changes.touch_timeout = Some(val); + } + } + + if self.led_dimmable != current_config.led_dimmable { + changes.led_dimmable = Some(self.led_dimmable); + } + + if self.led_steady != current_config.led_steady { + changes.led_steady = Some(self.led_steady); + } + + if self.power_cycle != current_config.power_cycle_on_reset { + changes.power_cycle_on_reset = Some(self.power_cycle); + } + + if self.enable_secp256k1 != current_config.enable_secp256k1 { + changes.enable_secp256k1 = Some(self.enable_secp256k1); + } + + // Check if we have any changes + let has_changes = changes.vid.is_some() + || changes.pid.is_some() + || changes.product_name.is_some() + || changes.led_gpio.is_some() + || changes.led_brightness.is_some() + || changes.touch_timeout.is_some() + || changes.led_driver.is_some() + || changes.led_dimmable.is_some() + || changes.power_cycle_on_reset.is_some() + || changes.led_steady.is_some() + || changes.enable_secp256k1.is_some(); + + if !has_changes { + println!("No changes detected"); + return; + } + + self.loading = true; + cx.notify(); + + let result = io::write_config(changes, status.method.clone(), None); + + self.loading = false; + + match result { + Ok(msg) => { + println!("Success: {}", msg); + } + Err(e) => { + eprintln!("Error saving config: {}", e); + } + } + + cx.notify(); + } + fn render_identity_card(&self, theme: &Theme) -> impl IntoElement { let content = v_flex() .gap_4() @@ -408,6 +573,27 @@ impl ConfigView { impl Render for ConfigView { fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { + let theme = cx.theme(); + + // If not connected, show placeholder + if self.device_status.is_none() { + return PageView::build( + "Configuration", + "Customize device settings and behavior.", + div() + .flex() + .items_center() + .justify_center() + .h_64() + .border_1() + .border_color(theme.border) + .rounded_xl() + .child(div().text_color(theme.muted_foreground).child("No Content")), + theme, + ) + .into_any_element(); + } + // I need to call mutable methods first. let led_card = self.render_led_card(cx).into_any_element(); let options_card = self.render_options_card(cx).into_any_element(); @@ -439,12 +625,13 @@ impl Render for ConfigView { .icon(Icon::default().path("icons/save.svg")) .child("Apply Changes") .disabled(self.loading) - .on_click(|_, _, _| { - println!("Save clicked"); - }), + .on_click(cx.listener(|this, _, _, cx| { + this.apply_changes(cx); + })), ), ), &theme, ) + .into_any_element() } } From f915bbf95410e6b8c42bb8ce164692f6df0eca31 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 29 Jan 2026 23:57:05 +0530 Subject: [PATCH 20/37] feat: enable device configuration via the ui and report correct config --- src/ui/rootview.rs | 26 +++- src/ui/views/config.rs | 338 ++++++++++++++++++++++++++++++++--------- 2 files changed, 283 insertions(+), 81 deletions(-) diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index 01adb41..2658835 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -26,6 +26,7 @@ pub struct ApplicationRoot { device_loading: bool, sidebar_width: Pixels, refresh_button: Entity, + config_view: Option>, } impl ApplicationRoot { @@ -48,6 +49,7 @@ impl ApplicationRoot { device_loading: false, sidebar_width: px(255.), refresh_button, + config_view: None, }; this.refresh_device_status(cx); this @@ -151,15 +153,25 @@ impl Render for ApplicationRoot { ActiveView::Passkeys => { PasskeysView::build(cx.theme()).into_any_element() } - ActiveView::Configuration => cx - .new(|cx| { - ConfigView::new( + ActiveView::Configuration => { + let view = self.config_view.get_or_insert_with(|| { + cx.new(|cx| { + ConfigView::new( + window, + cx, + self.state.device_status.clone(), + ) + }) + }); + view.update(cx, |view, cx| { + view.update_status( + self.state.device_status.clone(), window, cx, - self.state.device_status.clone(), - ) - }) - .into_any_element(), + ); + }); + view.clone().into_any_element() + } ActiveView::Security => { SecurityView::build(cx).into_any_element() } diff --git a/src/ui/views/config.rs b/src/ui/views/config.rs index e69b48e..659e9de 100644 --- a/src/ui/views/config.rs +++ b/src/ui/views/config.rs @@ -48,6 +48,118 @@ impl SelectItem for DriverItem { } } +struct VendorData { + value: &'static str, + label: &'static str, + vid: &'static str, + pid: &'static str, +} + +const VENDORS: &[VendorData] = &[ + VendorData { + value: "custom", + label: "Custom (Manual Entry)", + vid: "", + pid: "", + }, + VendorData { + value: "generic", + label: "Generic (FEFF:FCFD)", + vid: "FEFF", + pid: "FCFD", + }, + VendorData { + value: "pico-hsm", + label: "Pico Keys HSM (2E8A:10FD)", + vid: "2E8A", + pid: "10FD", + }, + VendorData { + value: "pico-fido", + label: "Pico Keys Fido (2E8A:10FE)", + vid: "2E8A", + pid: "10FE", + }, + VendorData { + value: "pico-openpgp", + label: "Pico Keys OpenPGP (2E8A:10FF)", + vid: "2E8A", + pid: "10FF", + }, + VendorData { + value: "pico", + label: "Pico (2E8A:0003)", + vid: "2E8A", + pid: "0003", + }, + VendorData { + value: "solokeys", + label: "SoloKeys (0483:A2CA)", + vid: "0483", + pid: "A2CA", + }, + VendorData { + value: "nitrohsm", + label: "NitroHSM (20A0:4230)", + vid: "20A0", + pid: "4230", + }, + VendorData { + value: "nitrofido2", + label: "NitroFIDO2 (20A0:42D4)", + vid: "20A0", + pid: "42D4", + }, + VendorData { + value: "nitrostart", + label: "NitroStart (20A0:4211)", + vid: "20A0", + pid: "4211", + }, + VendorData { + value: "nitropro", + label: "NitroPro (20A0:4108)", + vid: "20A0", + pid: "4108", + }, + VendorData { + value: "nitro3", + label: "Nitrokey 3 (20A0:42B2)", + vid: "20A0", + pid: "42B2", + }, + VendorData { + value: "yubikey5", + label: "YubiKey 5 (1050:0407)", + vid: "1050", + pid: "0407", + }, + VendorData { + value: "yubikeyneo", + label: "YubiKey Neo (1050:0116)", + vid: "1050", + pid: "0116", + }, + VendorData { + value: "yubihsm", + label: "YubiHSM 2 (1050:0030)", + vid: "1050", + pid: "0030", + }, + VendorData { + value: "gnuk", + label: "Gnuk Token (234B:0000)", + vid: "234B", + pid: "0000", + }, + VendorData { + value: "gnupg", + label: "GnuPG (234B:0000)", + vid: "234B", + pid: "0000", + }, +]; + pub struct ConfigView { vendor_select: Entity>>, vid_input: Entity, @@ -63,6 +175,7 @@ pub struct ConfigView { enable_secp256k1: bool, loading: bool, device_status: Option, + is_custom_vendor: bool, } impl ConfigView { @@ -73,78 +186,84 @@ impl ConfigView { ) -> Self { let config = device_status.as_ref().map(|s| &s.config); - let vendors = vec![ - VendorItem { - value: "custom".into(), - label: "Custom".into(), - }, - VendorItem { - value: "solokeys".into(), - label: "SoloKeys".into(), - }, - VendorItem { - value: "google".into(), - label: "Google".into(), - }, - VendorItem { - value: "yubico".into(), - label: "Yubico".into(), - }, - ]; + let vendors: Vec = VENDORS + .iter() + .map(|v| VendorItem { + value: v.value.into(), + label: v.label.into(), + }) + .collect(); let drivers = vec![ - DriverItem { - value: 0, - label: "WS2812".into(), - }, DriverItem { value: 1, - label: "SK6812".into(), + label: "Pico (Standard GPIO)".into(), }, DriverItem { value: 2, - label: "APA102".into(), + label: "Pimoroni (RGB)".into(), + }, + DriverItem { + value: 3, + label: "WS2812 (Neopixel)".into(), + }, + DriverItem { + value: 5, + label: "ESP32 Neopixel".into(), }, ]; + // Determine initial vendor selection + let current_vid: SharedString = config + .map(|c| c.vid.clone().into()) + .unwrap_or_else(|| "CAFE".into()); + let current_pid: SharedString = config + .map(|c| c.pid.clone().into()) + .unwrap_or_else(|| "4242".into()); + let current_product_name: SharedString = config + .map(|c| c.product_name.clone().into()) + .unwrap_or_else(|| "My Key".into()); + let current_led_gpio: SharedString = config + .map(|c| c.led_gpio.to_string().into()) + .unwrap_or_else(|| "25".into()); + let current_touch_timeout: SharedString = config + .map(|c| c.touch_timeout.to_string().into()) + .unwrap_or_else(|| "10".into()); + let current_brightness = config.map(|c| c.led_brightness as f32).unwrap_or(8.0); + + let mut initial_vendor_idx = 0; // Default to first item (Custom) + let mut is_custom_vendor = true; + + for (i, vendor) in VENDORS.iter().enumerate() { + // Check matching VID/PID, but skip the generic "custom" entries if they don't have specific values + if vendor.value == "custom" && vendor.vid.is_empty() { + continue; + } + if vendor.vid.eq_ignore_ascii_case(current_vid.as_ref()) + && vendor.pid.eq_ignore_ascii_case(current_pid.as_ref()) + { + initial_vendor_idx = i; + is_custom_vendor = false; + break; + } + } + let vendor_select = cx.new(|cx| { SelectState::new( vendors, - Some(gpui_component::IndexPath::default()), + Some(gpui_component::IndexPath::default().row(initial_vendor_idx)), window, cx, ) }); - let vid_input = cx.new(|cx| { - InputState::new(window, cx).default_value( - config - .map(|c| c.vid.clone()) - .unwrap_or_else(|| "CAFE".into()), - ) - }); - let pid_input = cx.new(|cx| { - InputState::new(window, cx).default_value( - config - .map(|c| c.pid.clone()) - .unwrap_or_else(|| "4242".into()), - ) - }); - let product_name_input = cx.new(|cx| { - InputState::new(window, cx).default_value( - config - .map(|c| c.product_name.clone()) - .unwrap_or_else(|| "My Key".into()), - ) - }); + let vid_input = cx.new(|cx| InputState::new(window, cx).default_value(current_vid.clone())); + let pid_input = cx.new(|cx| InputState::new(window, cx).default_value(current_pid.clone())); + let product_name_input = + cx.new(|cx| InputState::new(window, cx).default_value(current_product_name.clone())); - let led_gpio_input = cx.new(|cx| { - InputState::new(window, cx).default_value( - config - .map(|c| c.led_gpio.to_string()) - .unwrap_or_else(|| "25".into()), - ) - }); + let led_gpio_input = + cx.new(|cx| InputState::new(window, cx).default_value(current_led_gpio.clone())); let _initial_driver_idx = config.and_then(|c| c.led_driver).unwrap_or(0) as usize; let led_driver_select = cx.new(|cx| { @@ -156,26 +275,37 @@ impl ConfigView { ) }); - // Set initial selection for driver? - // Note: SelectState currently defaults to first item if index path is default. - // We'd strictly need to set the index path based on value. - // For now trusting default or user interaction. + cx.subscribe_in( + &vendor_select, + window, + |this: &mut Self, _, event, window, cx| { + if let gpui_component::select::SelectEvent::Confirm(Some(value)) = event { + if let Some(vendor) = VENDORS.iter().find(|v| value == v.value) { + this.is_custom_vendor = vendor.value == "custom"; + + if !this.is_custom_vendor { + this.vid_input + .update(cx, |input, cx| input.set_value(vendor.vid, window, cx)); + this.pid_input + .update(cx, |input, cx| input.set_value(vendor.pid, window, cx)); + } + cx.notify(); + } + } + }, + ) + .detach(); let led_brightness_slider = cx.new(|_| { SliderState::new() .min(0.0) .max(15.0) .step(1.0) - .default_value(config.map(|c| c.led_brightness as f32).unwrap_or(8.0)) + .default_value(current_brightness) }); - let touch_timeout_input = cx.new(|cx| { - InputState::new(window, cx).default_value( - config - .map(|c| c.touch_timeout.to_string()) - .unwrap_or_else(|| "10".into()), - ) - }); + let touch_timeout_input = + cx.new(|cx| InputState::new(window, cx).default_value(current_touch_timeout.clone())); Self { vendor_select, @@ -191,7 +321,8 @@ impl ConfigView { power_cycle: config.map(|c| c.power_cycle_on_reset).unwrap_or(false), enable_secp256k1: config.map(|c| c.enable_secp256k1).unwrap_or(true), loading: false, - device_status, + device_status: device_status.clone(), + is_custom_vendor, } } @@ -313,6 +444,63 @@ impl ConfigView { cx.notify(); } + pub fn update_status( + &mut self, + status: Option, + window: &mut Window, + cx: &mut Context, + ) { + if self.device_status == status { + return; + } + self.device_status = status.clone(); + let config = status.as_ref().map(|s| &s.config); + + // Update inputs + let vid = config + .map(|c| c.vid.clone()) + .unwrap_or_else(|| "CAFE".into()); + self.vid_input + .update(cx, |input, cx| input.set_value(vid, window, cx)); + + let pid = config + .map(|c| c.pid.clone()) + .unwrap_or_else(|| "4242".into()); + self.pid_input + .update(cx, |input, cx| input.set_value(pid, window, cx)); + + let product = config + .map(|c| c.product_name.clone()) + .unwrap_or_else(|| "My Key".into()); + self.product_name_input + .update(cx, |input, cx| input.set_value(product, window, cx)); + + let gpio = config + .map(|c| c.led_gpio.to_string()) + .unwrap_or_else(|| "25".into()); + self.led_gpio_input + .update(cx, |input, cx| input.set_value(gpio, window, cx)); + + let timeout = config + .map(|c| c.touch_timeout.to_string()) + .unwrap_or_else(|| "10".into()); + self.touch_timeout_input + .update(cx, |input, cx| input.set_value(timeout, window, cx)); + + // Update flags + self.led_dimmable = config.map(|c| c.led_dimmable).unwrap_or(true); + self.led_steady = config.map(|c| c.led_steady).unwrap_or(false); + self.power_cycle = config.map(|c| c.power_cycle_on_reset).unwrap_or(false); + self.enable_secp256k1 = config.map(|c| c.enable_secp256k1).unwrap_or(true); + + // Update slider + let brightness = config.map(|c| c.led_brightness as f32).unwrap_or(8.0); + self.led_brightness_slider + .update(cx, |slider, cx| slider.set_value(brightness, window, cx)); + + cx.notify(); + } + fn render_identity_card(&self, theme: &Theme) -> impl IntoElement { let content = v_flex() .gap_4() @@ -328,16 +516,18 @@ impl ConfigView { .grid_cols(2) .gap_4() .child( - v_flex() - .gap_2() - .child("Vendor ID (HEX)") - .child(Input::new(&self.vid_input).font_family("Mono")), + v_flex().gap_2().child("Vendor ID (HEX)").child( + Input::new(&self.vid_input) + .font_family("Mono") + .disabled(!self.is_custom_vendor), + ), ) .child( - v_flex() - .gap_2() - .child("Product ID (HEX)") - .child(Input::new(&self.pid_input).font_family("Mono")), + v_flex().gap_2().child("Product ID (HEX)").child( + Input::new(&self.pid_input) + .font_family("Mono") + .disabled(!self.is_custom_vendor), + ), ), ) .child(div().h_px().bg(theme.border)) From f188197dda6e5cdb42e199b02f3ad7e1b4c673d7 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Fri, 30 Jan 2026 21:05:20 +0530 Subject: [PATCH 21/37] fix: led steady mode in config.rs --- src/ui/ui_types.rs | 112 +++++++++++++++++++++++++++++++ src/ui/views/config.rs | 148 ++++++----------------------------------- src/ui/views/home.rs | 2 +- 3 files changed, 132 insertions(+), 130 deletions(-) diff --git a/src/ui/ui_types.rs b/src/ui/ui_types.rs index 345fb55..d3f5c76 100644 --- a/src/ui/ui_types.rs +++ b/src/ui/ui_types.rs @@ -26,3 +26,115 @@ impl GlobalDeviceState { } } } + +pub struct VendorData { + pub value: &'static str, + pub label: &'static str, + pub vid: &'static str, + pub pid: &'static str, +} + +pub const VENDORS: &[VendorData] = &[ + VendorData { + value: "custom", + label: "Custom (Manual Entry)", + vid: "", + pid: "", + }, + VendorData { + value: "generic", + label: "Generic (FEFF:FCFD)", + vid: "FEFF", + pid: "FCFD", + }, + VendorData { + value: "pico-hsm", + label: "Pico Keys HSM (2E8A:10FD)", + vid: "2E8A", + pid: "10FD", + }, + VendorData { + value: "pico-fido", + label: "Pico Keys Fido (2E8A:10FE)", + vid: "2E8A", + pid: "10FE", + }, + VendorData { + value: "pico-openpgp", + label: "Pico Keys OpenPGP (2E8A:10FF)", + vid: "2E8A", + pid: "10FF", + }, + VendorData { + value: "pico", + label: "Pico (2E8A:0003)", + vid: "2E8A", + pid: "0003", + }, + VendorData { + value: "solokeys", + label: "SoloKeys (0483:A2CA)", + vid: "0483", + pid: "A2CA", + }, + VendorData { + value: "nitrohsm", + label: "NitroHSM (20A0:4230)", + vid: "20A0", + pid: "4230", + }, + VendorData { + value: "nitrofido2", + label: "NitroFIDO2 (20A0:42D4)", + vid: "20A0", + pid: "42D4", + }, + VendorData { + value: "nitrostart", + label: "NitroStart (20A0:4211)", + vid: "20A0", + pid: "4211", + }, + VendorData { + value: "nitropro", + label: "NitroPro (20A0:4108)", + vid: "20A0", + pid: "4108", + }, + VendorData { + value: "nitro3", + label: "Nitrokey 3 (20A0:42B2)", + vid: "20A0", + pid: "42B2", + }, + VendorData { + value: "yubikey5", + label: "YubiKey 5 (1050:0407)", + vid: "1050", + pid: "0407", + }, + VendorData { + value: "yubikeyneo", + label: "YubiKey Neo (1050:0116)", + vid: "1050", + pid: "0116", + }, + VendorData { + value: "yubihsm", + label: "YubiHSM 2 (1050:0030)", + vid: "1050", + pid: "0030", + }, + VendorData { + value: "gnuk", + label: "Gnuk Token (234B:0000)", + vid: "234B", + pid: "0000", + }, + VendorData { + value: "gnupg", + label: "GnuPG (234B:0000)", + vid: "234B", + pid: "0000", + }, +]; diff --git a/src/ui/views/config.rs b/src/ui/views/config.rs index 659e9de..8c330d6 100644 --- a/src/ui/views/config.rs +++ b/src/ui/views/config.rs @@ -1,6 +1,7 @@ use crate::device::io; use crate::device::types::{AppConfigInput, FullDeviceStatus}; use crate::ui::components::page_view::PageView; +use crate::ui::ui_types::VENDORS; use gpui::*; use gpui_component::{ ActiveTheme, Disableable, Icon, StyledExt, Theme, @@ -48,118 +49,6 @@ impl SelectItem for DriverItem { } } -struct VendorData { - value: &'static str, - label: &'static str, - vid: &'static str, - pid: &'static str, -} - -const VENDORS: &[VendorData] = &[ - VendorData { - value: "custom", - label: "Custom (Manual Entry)", - vid: "", - pid: "", - }, - VendorData { - value: "generic", - label: "Generic (FEFF:FCFD)", - vid: "FEFF", - pid: "FCFD", - }, - VendorData { - value: "pico-hsm", - label: "Pico Keys HSM (2E8A:10FD)", - vid: "2E8A", - pid: "10FD", - }, - VendorData { - value: "pico-fido", - label: "Pico Keys Fido (2E8A:10FE)", - vid: "2E8A", - pid: "10FE", - }, - VendorData { - value: "pico-openpgp", - label: "Pico Keys OpenPGP (2E8A:10FF)", - vid: "2E8A", - pid: "10FF", - }, - VendorData { - value: "pico", - label: "Pico (2E8A:0003)", - vid: "2E8A", - pid: "0003", - }, - VendorData { - value: "solokeys", - label: "SoloKeys (0483:A2CA)", - vid: "0483", - pid: "A2CA", - }, - VendorData { - value: "nitrohsm", - label: "NitroHSM (20A0:4230)", - vid: "20A0", - pid: "4230", - }, - VendorData { - value: "nitrofido2", - label: "NitroFIDO2 (20A0:42D4)", - vid: "20A0", - pid: "42D4", - }, - VendorData { - value: "nitrostart", - label: "NitroStart (20A0:4211)", - vid: "20A0", - pid: "4211", - }, - VendorData { - value: "nitropro", - label: "NitroPro (20A0:4108)", - vid: "20A0", - pid: "4108", - }, - VendorData { - value: "nitro3", - label: "Nitrokey 3 (20A0:42B2)", - vid: "20A0", - pid: "42B2", - }, - VendorData { - value: "yubikey5", - label: "YubiKey 5 (1050:0407)", - vid: "1050", - pid: "0407", - }, - VendorData { - value: "yubikeyneo", - label: "YubiKey Neo (1050:0116)", - vid: "1050", - pid: "0116", - }, - VendorData { - value: "yubihsm", - label: "YubiHSM 2 (1050:0030)", - vid: "1050", - pid: "0030", - }, - VendorData { - value: "gnuk", - label: "Gnuk Token (234B:0000)", - vid: "234B", - pid: "0000", - }, - VendorData { - value: "gnupg", - label: "GnuPG (234B:0000)", - vid: "234B", - pid: "0000", - }, -]; - pub struct ConfigView { vendor_select: Entity>>, vid_input: Entity, @@ -326,7 +215,7 @@ impl ConfigView { } } - fn apply_changes(&mut self, cx: &mut Context) { + fn apply_changes(&mut self, window: &mut Window, cx: &mut Context) { let status = if let Some(s) = &self.device_status { s } else { @@ -391,15 +280,12 @@ impl ConfigView { } } - if self.led_dimmable != current_config.led_dimmable { + if (self.led_dimmable != current_config.led_dimmable) + || (self.led_steady != current_config.led_steady) + || (self.power_cycle != current_config.power_cycle_on_reset) + { changes.led_dimmable = Some(self.led_dimmable); - } - - if self.led_steady != current_config.led_steady { changes.led_steady = Some(self.led_steady); - } - - if self.power_cycle != current_config.power_cycle_on_reset { changes.power_cycle_on_reset = Some(self.power_cycle); } @@ -421,7 +307,7 @@ impl ConfigView { || changes.enable_secp256k1.is_some(); if !has_changes { - println!("No changes detected"); + log::info!("No changes detected"); return; } @@ -434,10 +320,18 @@ impl ConfigView { match result { Ok(msg) => { - println!("Success: {}", msg); + log::info!("Success: {}", msg); + + if let Ok(new_status) = io::read_device_details() { + log::info!( + "Refreshed device status. LED Steady: {}", + new_status.config.led_steady + ); + self.update_status(Some(new_status), window, cx); + } } Err(e) => { - eprintln!("Error saving config: {}", e); + log::error!("Error saving config: {}", e); } } @@ -558,10 +452,8 @@ impl ConfigView { cx.notify(); }); - // Access theme after creating listeners (which requires mutable borrow of cx) let theme = cx.theme(); - // Read slider value (requires immutable borrow of cx) let brightness = self.led_brightness_slider.read(cx).value().start() as i32; let content = v_flex() @@ -784,11 +676,9 @@ impl Render for ConfigView { .into_any_element(); } - // I need to call mutable methods first. let led_card = self.render_led_card(cx).into_any_element(); let options_card = self.render_options_card(cx).into_any_element(); - // Then get theme and render rest let theme = cx.theme(); let identity_card = self.render_identity_card(theme).into_any_element(); @@ -815,8 +705,8 @@ impl Render for ConfigView { .icon(Icon::default().path("icons/save.svg")) .child("Apply Changes") .disabled(self.loading) - .on_click(cx.listener(|this, _, _, cx| { - this.apply_changes(cx); + .on_click(cx.listener(|this, _, window, cx| { + this.apply_changes(window, cx); })), ), ), diff --git a/src/ui/views/home.rs b/src/ui/views/home.rs index e703654..70f0b0e 100644 --- a/src/ui/views/home.rs +++ b/src/ui/views/home.rs @@ -359,7 +359,7 @@ impl HomeView { Icon::default() .path("icons/lock-open.svg") .size_3p5() - .text_color(gpui::yellow()) + .text_color(rgb(0xfe9a00)) }) .child( Badge::new() From c1beeff6b23f92f775e19145746366ecd3022363 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Fri, 30 Jan 2026 21:21:26 +0530 Subject: [PATCH 22/37] chore(ui): abstract away cards into a card component --- src/ui/components/card.rs | 108 ++++++++++++ src/ui/components/mod.rs | 1 + src/ui/views/about.rs | 183 ++++++++++----------- src/ui/views/config.rs | 95 +++-------- src/ui/views/home.rs | 337 +++++++++++++++++--------------------- src/ui/views/logs.rs | 2 +- src/ui/views/passkeys.rs | 102 +++--------- 7 files changed, 394 insertions(+), 434 deletions(-) create mode 100644 src/ui/components/card.rs diff --git a/src/ui/components/card.rs b/src/ui/components/card.rs new file mode 100644 index 0000000..5f20fa9 --- /dev/null +++ b/src/ui/components/card.rs @@ -0,0 +1,108 @@ +use gpui::*; +use gpui_component::{ActiveTheme, Icon, Theme, h_flex, v_flex}; + +#[derive(IntoElement)] +pub struct Card { + title: Option, + description: Option, + icon: Option, + header_right: Option, + children: Vec, +} + +impl Card { + pub fn new() -> Self { + Self { + title: None, + description: None, + icon: None, + header_right: None, + children: Vec::new(), + } + } + + pub fn title(mut self, title: impl Into) -> Self { + self.title = Some(title.into()); + self + } + + pub fn description(mut self, description: impl Into) -> Self { + self.description = Some(description.into()); + self + } + + pub fn icon(mut self, icon: Icon) -> Self { + self.icon = Some(icon); + self + } + + pub fn header_right(mut self, element: impl IntoElement) -> Self { + self.header_right = Some(element.into_any_element()); + self + } +} + +impl ParentElement for Card { + fn extend(&mut self, elements: impl IntoIterator) { + self.children.extend(elements); + } +} + +impl RenderOnce for Card { + fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement { + let theme: &Theme = cx.theme(); + + let has_header = self.title.is_some() + || self.icon.is_some() + || self.description.is_some() + || self.header_right.is_some(); + + let header = if has_header { + let mut left_side = v_flex().gap_1(); + + let mut icon_title_row = h_flex().items_center().gap_2(); + if let Some(icon) = self.icon { + icon_title_row = + icon_title_row.child(Icon::new(icon).size_5().text_color(theme.foreground)); + } + if let Some(title) = self.title { + icon_title_row = icon_title_row.child( + div() + .font_weight(FontWeight::BOLD) + .text_color(theme.foreground) + .child(title), + ); + } + + left_side = left_side.child(icon_title_row); + + if let Some(desc) = self.description { + left_side = left_side.child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child(desc), + ); + } + + let mut header_row = h_flex().items_center().justify_between().child(left_side); + + if let Some(right) = self.header_right { + header_row = header_row.child(right); + } + + Some(header_row.into_any_element()) + } else { + None + }; + + div() + .w_full() + .bg(rgb(0x18181b)) + .border_1() + .border_color(theme.border) + .rounded_xl() + .p_6() + .child(v_flex().gap_6().children(header).children(self.children)) + } +} diff --git a/src/ui/components/mod.rs b/src/ui/components/mod.rs index 28f3cd2..4f4ac29 100644 --- a/src/ui/components/mod.rs +++ b/src/ui/components/mod.rs @@ -1,3 +1,4 @@ pub mod button; +pub mod card; pub mod page_view; pub mod sidebar; diff --git a/src/ui/views/about.rs b/src/ui/views/about.rs index e1c4631..3b71302 100644 --- a/src/ui/views/about.rs +++ b/src/ui/views/about.rs @@ -1,5 +1,5 @@ // src/views/about.rs -use crate::ui::components::page_view::PageView; +use crate::ui::components::{card::Card, page_view::PageView}; use gpui::*; use gpui_component::{Icon, StyledExt, Theme, badge::Badge, button::Button, h_flex, v_flex}; @@ -16,100 +16,97 @@ impl AboutView { .justify_center() .child( div() - .max_w(px(1200.0)) .w_full() - .bg(rgb(0x18181b)) - .border_1() - .border_color(theme.border) - .rounded_xl() - .p_6() + .max_w(px(1200.0)) .child( - v_flex() - .items_center() - .justify_center() - .gap_4() - .py_8() - .text_center() - .child( - img("appIcons/in.suyogtandel.picoforge.svg") - .w(px(256.0)) - .h(px(256.0)), - ) - .child( - div() - .text_2xl() - .font_bold() - .text_color(theme.foreground) - .child("PicoForge"), - ) - .child(Badge::new().child("v0.4.0").color(theme.secondary)) - .child( - div() - .text_color(theme.muted_foreground) - .max_w(px(450.0)) - .child( - "An open source commissioning tool for Pico FIDO security keys. Developed with Rust and GPUI.", - ), - ) - .child( - div() - .text_sm() - .text_color(theme.muted_foreground) - .gap_1() - .pt_4() - .border_t_1() - .border_color(theme.border) - .border_t_1() - .border_color(theme.border) - .w(px(320.0)) - .child( - h_flex() - .justify_between() - .child("Code By:") - .child( - div() - .font_medium() - .text_color(theme.foreground) - .child("Suyog Tandel, Fabrice Bellamy"), - ), - ) - .child( - h_flex() - .justify_between() - .items_center() - .pt_2() - .mt_2() - .child(h_flex().items_center().gap_1().child("Copyright:")) - .child( - div() - .font_medium() - .text_color(theme.foreground) - .child("© 2026 Suyog Tandel"), - ), - ), - ) - .child( - h_flex() - .gap_4() - .pt_6() - .child( - Button::new("github_btn") - .outline() - .child( - h_flex() - .gap_2() - .child( - Icon::default() - .path("icons/github.svg") - .size_4(), - ) - .child("GitHub"), - ) - .on_click(|_, _, cx| { - cx.open_url("https://github.com/librekeys/picoforge") - }), - ), - ), + Card::new().child( + v_flex() + .items_center() + .justify_center() + .gap_4() + .py_8() + .text_center() + .child( + img("appIcons/in.suyogtandel.picoforge.svg") + .w(px(256.0)) + .h(px(256.0)), + ) + .child( + div() + .text_2xl() + .font_bold() + .text_color(theme.foreground) + .child("PicoForge"), + ) + .child(Badge::new().child("v0.4.0").color(theme.secondary)) + .child( + div() + .text_color(theme.muted_foreground) + .max_w(px(450.0)) + .child( + "An open source commissioning tool for Pico FIDO security keys. Developed with Rust and GPUI.", + ), + ) + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .gap_1() + .pt_4() + .border_t_1() + .border_color(theme.border) + .border_t_1() + .border_color(theme.border) + .w(px(320.0)) + .child( + h_flex() + .justify_between() + .child("Code By:") + .child( + div() + .font_medium() + .text_color(theme.foreground) + .child("Suyog Tandel, Fabrice Bellamy"), + ), + ) + .child( + h_flex() + .justify_between() + .items_center() + .pt_2() + .mt_2() + .child(h_flex().items_center().gap_1().child("Copyright:")) + .child( + div() + .font_medium() + .text_color(theme.foreground) + .child("© 2026 Suyog Tandel"), + ), + ), + ) + .child( + h_flex() + .gap_4() + .pt_6() + .child( + Button::new("github_btn") + .outline() + .child( + h_flex() + .gap_2() + .child( + Icon::default() + .path("icons/github.svg") + .size_4(), + ) + .child("GitHub"), + ) + .on_click(|_, _, cx| { + cx.open_url("https://github.com/librekeys/picoforge") + }), + ), + ), + ), ), ), theme, diff --git a/src/ui/views/config.rs b/src/ui/views/config.rs index 8c330d6..4b1b573 100644 --- a/src/ui/views/config.rs +++ b/src/ui/views/config.rs @@ -1,10 +1,10 @@ use crate::device::io; use crate::device::types::{AppConfigInput, FullDeviceStatus}; -use crate::ui::components::page_view::PageView; +use crate::ui::components::{card::Card, page_view::PageView}; use crate::ui::ui_types::VENDORS; use gpui::*; use gpui_component::{ - ActiveTheme, Disableable, Icon, StyledExt, Theme, + ActiveTheme, Disableable, Icon, Theme, button::Button, input::{Input, InputState}, select::{Select, SelectItem, SelectState}, @@ -432,13 +432,11 @@ impl ConfigView { .child(Input::new(&self.product_name_input)), ); - Self::config_card( - "Identity", - "USB Identification settings", - Icon::default().path("icons/tag.svg"), - content, - theme, - ) + Card::new() + .title("Identity") + .description("USB Identification settings") + .icon(Icon::default().path("icons/tag.svg")) + .child(content) } fn render_led_card(&mut self, cx: &mut Context) -> impl IntoElement { @@ -522,13 +520,11 @@ impl ConfigView { ), ); - Self::config_card( - "LED Settings", - "Adjust visual feedback behavior", - Icon::default().path("icons/microchip.svg"), - content, - theme, - ) + Card::new() + .title("LED Settings") + .description("Adjust visual feedback behavior") + .icon(Icon::default().path("icons/microchip.svg")) + .child(content) } fn render_touch_card(&self, theme: &Theme) -> impl IntoElement { @@ -539,13 +535,11 @@ impl ConfigView { .child(Input::new(&self.touch_timeout_input)), ); - Self::config_card( - "Touch & Timing", - "Configure interaction timeouts", - Icon::default().path("icons/settings.svg"), - content, - theme, - ) + Card::new() + .title("Touch & Timing") + .description("Configure interaction timeouts") + .icon(Icon::default().path("icons/settings.svg")) + .child(content) } fn render_options_card(&mut self, cx: &mut Context) -> impl IntoElement { @@ -600,56 +594,11 @@ impl ConfigView { ), ); - Self::config_card( - "Device Options", - "Toggle advanced features", - Icon::default().path("icons/settings.svg"), - content, - &theme, - ) - } - - fn config_card( - title: &str, - description: &str, - icon: Icon, - content: impl IntoElement, - theme: &Theme, - ) -> impl IntoElement { - div() - .w_full() - .bg(rgb(0x18181b)) // Using the same bg as home card - .border_1() - .border_color(theme.border) - .rounded_xl() - .p_6() - .child( - v_flex() - .gap_6() - .child( - v_flex() - .gap_1() - .child( - gpui_component::h_flex() - .items_center() - .gap_2() - .child(Icon::new(icon).size_5().text_color(theme.foreground)) - .child( - div() - .font_bold() - .text_color(theme.foreground) - .child(title.to_string()), - ), - ) - .child( - div() - .text_sm() - .text_color(theme.muted_foreground) - .child(description.to_string()), - ), - ) - .child(content), - ) + Card::new() + .title("Device Options") + .description("Toggle advanced features") + .icon(Icon::default().path("icons/settings.svg")) + .child(content) } } diff --git a/src/ui/views/home.rs b/src/ui/views/home.rs index 70f0b0e..3fc0cd5 100644 --- a/src/ui/views/home.rs +++ b/src/ui/views/home.rs @@ -1,5 +1,5 @@ use crate::device::types::DeviceMethod; -use crate::ui::components::page_view::PageView; +use crate::ui::components::{card::Card, page_view::PageView}; use crate::ui::ui_types::GlobalDeviceState; use gpui::*; use gpui_component::StyledExt; @@ -46,39 +46,6 @@ impl HomeView { ) } - fn home_card( - title: &str, - icon: Icon, - content: impl IntoElement, - theme: &Theme, - ) -> impl IntoElement { - div() - .w_full() - // TODO: REPLACE with a constant or modify default theme - .bg(rgb(0x18181b)) - .border_1() - .border_color(theme.border) - .rounded_xl() - .p_6() - .child( - v_flex() - .gap_6() - .child( - h_flex() - .items_center() - .gap_2() - .child(Icon::new(icon).size_5().text_color(theme.foreground)) - .child( - div() - .font_bold() - .text_color(theme.foreground) - .child(title.to_string()), - ), - ) - .child(content), - ) - } - // Helper for Key-Value pairs fn render_kv( label: &str, @@ -115,70 +82,70 @@ impl HomeView { let flash_percent = (info.flash_used as f32 / info.flash_total as f32) * 100.0; - Self::home_card( - "Device Information", - Icon::default().path("icons/cpu.svg"), - v_flex() - .gap_6() - .child( - div() - .grid() - .grid_cols(2) - .gap_4() - .child(Self::render_kv( - "Serial Number", - info.serial.clone(), - theme, - true, - )) - .child(Self::render_kv( - "Firmware Version", - format!("v{}", info.firmware_version), - theme, - true, - )) - .child(Self::render_kv( - "VID:PID", - format!("{}, {}", config.vid, config.pid), - theme, - true, - )) - .child(Self::render_kv( - "Product Name", - config.product_name.clone(), - theme, - false, - )), - ) - .child(div().h_px().bg(theme.border)) - .child( - v_flex() - .gap_2() - .child( - h_flex() - .justify_between() - .text_sm() - .child( - div() - .text_color(theme.muted_foreground) - .child("Flash Memory"), - ) - .child(div().text_color(theme.foreground).child(format!( - "{:.0} / {:.0} KB", - info.flash_used, info.flash_total - ))), - ) - .child(Progress::new().value(flash_percent)), - ), - theme, - ) + Card::new() + .title("Device Information") + .icon(Icon::default().path("icons/cpu.svg")) + .child( + v_flex() + .gap_6() + .child( + div() + .grid() + .grid_cols(2) + .gap_4() + .child(Self::render_kv( + "Serial Number", + info.serial.clone(), + theme, + true, + )) + .child(Self::render_kv( + "Firmware Version", + format!("v{}", info.firmware_version), + theme, + true, + )) + .child(Self::render_kv( + "VID:PID", + format!("{}, {}", config.vid, config.pid), + theme, + true, + )) + .child(Self::render_kv( + "Product Name", + config.product_name.clone(), + theme, + false, + )), + ) + .child(div().h_px().bg(theme.border)) + .child( + v_flex() + .gap_2() + .child( + h_flex() + .justify_between() + .text_sm() + .child( + div() + .text_color(theme.muted_foreground) + .child("Flash Memory"), + ) + .child(div().text_color(theme.foreground).child(format!( + "{:.0} / {:.0} KB", + info.flash_used, info.flash_total + ))), + ) + .child(Progress::new().value(flash_percent)), + ), + ) } fn render_fido_info(state: &GlobalDeviceState, theme: &Theme) -> impl IntoElement { - Self::home_card( - "FIDO2 Information", - Icon::default().path("icons/shield.svg"), - if let Some(fido) = &state.fido_info { + Card::new() + .title("FIDO2 Information") + .icon(Icon::default().path("icons/shield.svg")) + .child(if let Some(fido) = &state.fido_info { v_flex() .gap_6() .child( @@ -228,18 +195,16 @@ impl HomeView { .text_color(theme.muted_foreground) .child("FIDO information not available") .into_any_element() - }, - theme, - ) + }) } fn render_led_config(state: &GlobalDeviceState, theme: &Theme) -> impl IntoElement { let status = state.device_status.as_ref().unwrap(); let config = &status.config; - Self::home_card( - "LED Configuration", - Icon::default().path("icons/microchip.svg"), - if status.method == DeviceMethod::Fido { + Card::new() + .title("LED Configuration") + .icon(Icon::default().path("icons/microchip.svg")) + .child(if status.method == DeviceMethod::Fido { v_flex() .items_center() .justify_center() @@ -328,95 +293,93 @@ impl HomeView { ), ) .into_any_element() - }, - theme, - ) + }) } fn render_security_status(state: &GlobalDeviceState, theme: &Theme) -> impl IntoElement { let status = state.device_status.as_ref().unwrap(); - Self::home_card( - "Security Status", - Icon::default().path("icons/shield-check.svg"), - v_flex() - .gap_3() - .text_sm() - .child( - h_flex() - .justify_between() - .items_center() - .child(div().text_color(theme.muted_foreground).child("Boot Mode")) - .child( - h_flex() - .gap_2() - .items_center() - .child(if status.secure_boot { - Icon::default() - .path("icons/lock.svg") - .size_3p5() - .text_color(gpui::green()) + Card::new() + .title("Security Status") + .icon(Icon::default().path("icons/shield-check.svg")) + .child( + v_flex() + .gap_3() + .text_sm() + .child( + h_flex() + .justify_between() + .items_center() + .child(div().text_color(theme.muted_foreground).child("Boot Mode")) + .child( + h_flex() + .gap_2() + .items_center() + .child(if status.secure_boot { + Icon::default() + .path("icons/lock.svg") + .size_3p5() + .text_color(gpui::green()) + } else { + Icon::default() + .path("icons/lock-open.svg") + .size_3p5() + .text_color(rgb(0xfe9a00)) + }) + .child( + Badge::new() + .child(if status.secure_boot { + "Secure Boot" + } else { + "Development" + }) + .color(if status.secure_boot { + theme.primary + } else { + theme.secondary + }), + ), + ), + ) + .child( + h_flex() + .justify_between() + .items_center() + .child( + div() + .text_color(theme.muted_foreground) + .child("Debug Interface"), + ) + .child(div().font_medium().text_color(theme.foreground).child( + if status.secure_lock { + "Read-out Locked" } else { - Icon::default() - .path("icons/lock-open.svg") - .size_3p5() - .text_color(rgb(0xfe9a00)) - }) - .child( - Badge::new() - .child(if status.secure_boot { - "Secure Boot" - } else { - "Development" - }) - .color(if status.secure_boot { - theme.primary - } else { - theme.secondary - }), - ), - ), - ) - .child( - h_flex() - .justify_between() - .items_center() - .child( - div() - .text_color(theme.muted_foreground) - .child("Debug Interface"), - ) - .child(div().font_medium().text_color(theme.foreground).child( - if status.secure_lock { - "Read-out Locked" - } else { - "Debug Enabled" - }, - )), - ) - .child( - h_flex() - .justify_between() - .items_center() - .child( - div() - .text_color(theme.muted_foreground) - .child("Secure Lock"), - ) - .child( - Badge::new() - .child(if status.secure_lock { - "Acknowledged" - } else { - "Pending" - }) - .color(if status.secure_lock { - gpui::red() - } else { - theme.secondary - }), - ), - ), - theme, - ) + "Debug Enabled" + }, + )), + ) + .child( + h_flex() + .justify_between() + .items_center() + .child( + div() + .text_color(theme.muted_foreground) + .child("Secure Lock"), + ) + .child( + Badge::new() + .child(if status.secure_lock { + "Acknowledged" + } else { + "Pending" + }) + .color(if status.secure_lock { + gpui::red() + } else { + theme.secondary + }), + ), + ), + ) } } diff --git a/src/ui/views/logs.rs b/src/ui/views/logs.rs index 7ef2444..40f83f8 100644 --- a/src/ui/views/logs.rs +++ b/src/ui/views/logs.rs @@ -1,7 +1,7 @@ use crate::ui::components::page_view::PageView; use gpui::*; use gpui_component::{ - ActiveTheme, Icon, StyledExt, button::Button, h_flex, scroll::ScrollableElement, v_flex, + ActiveTheme, Icon, button::Button, h_flex, scroll::ScrollableElement, v_flex, }; #[derive(Clone, Copy, Debug, PartialEq)] diff --git a/src/ui/views/passkeys.rs b/src/ui/views/passkeys.rs index 157783e..ec34489 100644 --- a/src/ui/views/passkeys.rs +++ b/src/ui/views/passkeys.rs @@ -1,4 +1,4 @@ -use crate::ui::components::page_view::PageView; +use crate::ui::components::{card::Card, page_view::PageView}; use gpui::*; use gpui_component::StyledExt; use gpui_component::button::ButtonVariants; @@ -125,75 +125,19 @@ impl PasskeysView { .into_any_element() } - fn main_card( - title: &str, - icon_path: impl Into, - description: &str, - content: impl IntoElement, - header_right: Option, - theme: &Theme, - ) -> impl IntoElement { - div() - .w_full() - .bg(rgb(0x18181b)) // Using the same dark bg as in HomeView - .border_1() - .border_color(theme.border) - .rounded_xl() - .p_6() + fn render_pin_management(device: &DeviceState, theme: &Theme) -> impl IntoElement { + Card::new() + .title("PIN Management") + .icon(Icon::default().path("icons/key.svg")) + .description("Configure FIDO2 PIN security") .child( v_flex() - .gap_6() - .child( - h_flex() - .items_center() - .justify_between() - .child( - v_flex() - .gap_1() - .child( - h_flex() - .items_center() - .gap_2() - .child( - Icon::default() - .path(icon_path) - .size_5() - .text_color(theme.foreground), - ) - .child( - div() - .font_bold() - .text_color(theme.foreground) - .child(title.to_string()), - ), - ) - .child( - div() - .text_sm() - .text_color(theme.muted_foreground) - .child(description.to_string()), - ), - ) - .children(header_right), - ) - .child(content), + .gap_4() + .child(Self::render_pin_status_row(device, theme)) + .child(Self::render_min_pin_length_row(device, theme)), ) } - fn render_pin_management(device: &DeviceState, theme: &Theme) -> impl IntoElement { - Self::main_card( - "PIN Management", - "icons/key.svg", - "Configure FIDO2 PIN security", - v_flex() - .gap_4() - .child(Self::render_pin_status_row(device, theme)) - .child(Self::render_min_pin_length_row(device, theme)), - None::, - theme, - ) - } - fn render_pin_status_row(device: &DeviceState, theme: &Theme) -> impl IntoElement { let pin_set = device .fido_info @@ -263,24 +207,22 @@ impl PasskeysView { } fn render_stored_passkeys(device: &DeviceState, theme: &Theme) -> impl IntoElement { - Self::main_card( - "Stored Passkeys", - "icons/key-round.svg", - "View and manage your resident credentials", - if !device.unlocked { + Card::new() + .title("Stored Passkeys") + .icon(Icon::default().path("icons/key-round.svg")) + .description("View and manage your resident credentials") + .child(if !device.unlocked { Self::render_locked_state(theme).into_any_element() } else { Self::render_unlocked_state(device, theme).into_any_element() - }, - Some( - div() - .child("View and manage your resident credentials") - .text_sm() - .text_color(theme.muted_foreground) - .invisible(), - ), - theme, - ) + }) + // header_right was effectively invisible/placeholder in original code: + // Some(div().child("View and manage...").invisible()) + // We can omit it or add it if needed, but it looked like a hack or mistake in original code? + // The original header_right was: + // Some(div().child("View and manage your resident credentials").text_sm().text_color(...).invisible()) + // This suggests it was maybe trying to take up space or something? But description handles the text. + // I will simplify and omit it, which is cleaner. } fn render_locked_state(theme: &Theme) -> impl IntoElement { From 8603dcc2d2773548dbd2a8c6ab19352b4172ffa0 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Fri, 30 Jan 2026 21:52:30 +0530 Subject: [PATCH 23/37] chore: change logging levels for deps --- src/logging.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/logging.rs b/src/logging.rs index 9602637..e11774a 100644 --- a/src/logging.rs +++ b/src/logging.rs @@ -58,20 +58,23 @@ pub fn logger_init() { ))) .build(); - let (app_level, root_level) = if cfg!(debug_assertions) { - (LevelFilter::Trace, LevelFilter::Debug) + let app_level = if cfg!(debug_assertions) { + LevelFilter::Trace } else { - (LevelFilter::Info, LevelFilter::Error) + LevelFilter::Info }; let config = log4rs::Config::builder() .appender(Appender::builder().build("stdout", Box::new(stdout))) .appender(Appender::builder().build("logfile", Box::new(logfile))) .logger(Logger::builder().build("picoforge", app_level)) + .logger(Logger::builder().build("gpui", LevelFilter::Error)) + .logger(Logger::builder().build("gpui_component", LevelFilter::Error)) + .logger(Logger::builder().build("blade_graphics", LevelFilter::Error)) .build( Root::builder() .appenders(vec!["logfile", "stdout"]) - .build(root_level), + .build(LevelFilter::Error), ) .unwrap(); From e2aadff1d81964f3cbb66da3602e215677808994 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Sat, 31 Jan 2026 00:50:56 +0530 Subject: [PATCH 24/37] chore(ui): refactor config view data/types --- src/tauri.conf.json | 43 ------- src/ui/ui_types.rs | 247 +++++++++++++++++++++++------------------ src/ui/views/config.rs | 132 +++++++++++----------- 3 files changed, 203 insertions(+), 219 deletions(-) delete mode 100644 src/tauri.conf.json diff --git a/src/tauri.conf.json b/src/tauri.conf.json deleted file mode 100644 index 4c84f4a..0000000 --- a/src/tauri.conf.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "$schema": "https://schema.tauri.app/config/2", - "productName": "picoforge", - "version": "0.3.0", - "identifier": "in.suyogtandel.picoforge", - "build": { - "beforeDevCommand": "deno task dev", - "devUrl": "http://localhost:1420", - "beforeBuildCommand": "deno task build", - "frontendDist": "../build" - }, - "app": { - "macOSPrivateApi": true, - "windows": [ - { - "title": "picoforge", - "width": 1280, - "height": 720, - "minWidth": 500, - "minHeight": 250, - "resizable": true, - "decorations": false, - "transparent": false - } - ], - "security": { - "csp": null - } - }, - "bundle": { - "active": true, - "targets": "all", - "icon": [ - "icons/32x32.png", - "icons/128x128.png", - "icons/128x128@2x.png", - "icons/icon.icns", - "icons/icon.ico", - "icons/icon.png", - "icons/in.suyogtandel.picoforge.svg" - ] - } -} diff --git a/src/ui/ui_types.rs b/src/ui/ui_types.rs index d3f5c76..5155e2b 100644 --- a/src/ui/ui_types.rs +++ b/src/ui/ui_types.rs @@ -1,3 +1,5 @@ +use gpui::SharedString; + use crate::device::types::{FidoDeviceInfo, FullDeviceStatus}; #[derive(Clone, Copy, PartialEq, Debug)] @@ -27,114 +29,141 @@ impl GlobalDeviceState { } } -pub struct VendorData { - pub value: &'static str, - pub label: &'static str, - pub vid: &'static str, - pub pid: &'static str, +// config view: + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum UsbIdentityPreset { + Custom, + Generic, + PicoHsm, + PicoFido, + PicoOpenPgp, + Pico, + SoloKeys, + NitroHsm, + NitroFido2, + NitroStart, + NitroPro, + NitroKey3, + YubiKey5, + YubiKeyNeo, + YubiHsm2, + Gnuk, + GnuPg, } -pub const VENDORS: &[VendorData] = &[ - VendorData { - value: "custom", - label: "Custom (Manual Entry)", - vid: "", - pid: "", - }, - VendorData { - value: "generic", - label: "Generic (FEFF:FCFD)", - vid: "FEFF", - pid: "FCFD", - }, - VendorData { - value: "pico-hsm", - label: "Pico Keys HSM (2E8A:10FD)", - vid: "2E8A", - pid: "10FD", - }, - VendorData { - value: "pico-fido", - label: "Pico Keys Fido (2E8A:10FE)", - vid: "2E8A", - pid: "10FE", - }, - VendorData { - value: "pico-openpgp", - label: "Pico Keys OpenPGP (2E8A:10FF)", - vid: "2E8A", - pid: "10FF", - }, - VendorData { - value: "pico", - label: "Pico (2E8A:0003)", - vid: "2E8A", - pid: "0003", - }, - VendorData { - value: "solokeys", - label: "SoloKeys (0483:A2CA)", - vid: "0483", - pid: "A2CA", - }, - VendorData { - value: "nitrohsm", - label: "NitroHSM (20A0:4230)", - vid: "20A0", - pid: "4230", - }, - VendorData { - value: "nitrofido2", - label: "NitroFIDO2 (20A0:42D4)", - vid: "20A0", - pid: "42D4", - }, - VendorData { - value: "nitrostart", - label: "NitroStart (20A0:4211)", - vid: "20A0", - pid: "4211", - }, - VendorData { - value: "nitropro", - label: "NitroPro (20A0:4108)", - vid: "20A0", - pid: "4108", - }, - VendorData { - value: "nitro3", - label: "Nitrokey 3 (20A0:42B2)", - vid: "20A0", - pid: "42B2", - }, - VendorData { - value: "yubikey5", - label: "YubiKey 5 (1050:0407)", - vid: "1050", - pid: "0407", - }, - VendorData { - value: "yubikeyneo", - label: "YubiKey Neo (1050:0116)", - vid: "1050", - pid: "0116", - }, - VendorData { - value: "yubihsm", - label: "YubiHSM 2 (1050:0030)", - vid: "1050", - pid: "0030", - }, - VendorData { - value: "gnuk", - label: "Gnuk Token (234B:0000)", - vid: "234B", - pid: "0000", - }, - VendorData { - value: "gnupg", - label: "GnuPG (234B:0000)", - vid: "234B", - pid: "0000", - }, -]; +impl UsbIdentityPreset { + pub fn details(&self) -> (SharedString, Option<&'static str>, Option<&'static str>) { + match self { + Self::Custom => ("Custom (Manual Entry)".into(), None, None), + Self::Generic => ("Generic (FEFF:FCFD)".into(), Some("FEFF"), Some("FCFD")), + Self::PicoHsm => ( + "Pico Keys HSM (2E8A:10FD)".into(), + Some("2E8A"), + Some("10FD"), + ), + Self::PicoFido => ( + "Pico Keys Fido (2E8A:10FE)".into(), + Some("2E8A"), + Some("10FE"), + ), + Self::PicoOpenPgp => ( + "Pico Keys OpenPGP (2E8A:10FF)".into(), + Some("2E8A"), + Some("10FF"), + ), + Self::Pico => ("Pico (2E8A:0003)".into(), Some("2E8A"), Some("0003")), + Self::SoloKeys => ("SoloKeys (0483:A2CA)".into(), Some("0483"), Some("A2CA")), + Self::NitroHsm => ("NitroHSM (20A0:4230)".into(), Some("20A0"), Some("4230")), + Self::NitroFido2 => ("NitroFIDO2 (20A0:42D4)".into(), Some("20A0"), Some("42D4")), + Self::NitroStart => ("NitroStart (20A0:4211)".into(), Some("20A0"), Some("4211")), + Self::NitroPro => ("NitroPro (20A0:4108)".into(), Some("20A0"), Some("4108")), + Self::NitroKey3 => ("Nitrokey 3 (20A0:42B2)".into(), Some("20A0"), Some("42B2")), + Self::YubiKey5 => ("YubiKey 5 (1050:0407)".into(), Some("1050"), Some("0407")), + Self::YubiKeyNeo => ("YubiKey Neo (1050:0116)".into(), Some("1050"), Some("0116")), + Self::YubiHsm2 => ("YubiHSM 2 (1050:0030)".into(), Some("1050"), Some("0030")), + Self::Gnuk => ("Gnuk Token (234B:0000)".into(), Some("234B"), Some("0000")), + Self::GnuPg => ("GnuPG (234B:0000)".into(), Some("234B"), Some("0000")), + } + } + + /// Helper to find a preset by VID/PID string matching + pub fn from_vid_pid(vid: &str, pid: &str) -> Self { + let vid = vid.to_uppercase(); + let pid = pid.to_uppercase(); + + match (vid.as_str(), pid.as_str()) { + ("FEFF", "FCFD") => Self::Generic, + ("2E8A", "10FD") => Self::PicoHsm, + ("2E8A", "10FE") => Self::PicoFido, + ("2E8A", "10FF") => Self::PicoOpenPgp, + ("2E8A", "0003") => Self::Pico, + ("0483", "A2CA") => Self::SoloKeys, + ("20A0", "4230") => Self::NitroHsm, + ("20A0", "42D4") => Self::NitroFido2, + ("20A0", "4211") => Self::NitroStart, + ("20A0", "4108") => Self::NitroPro, + ("20A0", "42B2") => Self::NitroKey3, + ("1050", "0407") => Self::YubiKey5, + ("1050", "0116") => Self::YubiKeyNeo, + ("1050", "0030") => Self::YubiHsm2, + ("234B", "0000") => Self::Gnuk, + _ => Self::Custom, + } + } + + pub fn all() -> &'static [Self] { + &[ + Self::Custom, + Self::Generic, + Self::PicoHsm, + Self::PicoFido, + Self::PicoOpenPgp, + Self::Pico, + Self::SoloKeys, + Self::NitroHsm, + Self::NitroFido2, + Self::NitroStart, + Self::NitroPro, + Self::NitroKey3, + Self::YubiKey5, + Self::YubiKeyNeo, + Self::YubiHsm2, + Self::Gnuk, + Self::GnuPg, + ] + } +} + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum LedDriverType { + PicoGpio = 1, + PimoroniRgb = 2, + Ws2812Neopixel = 3, + Esp32Neopixel = 5, +} + +impl LedDriverType { + pub fn label(&self) -> SharedString { + match self { + Self::PicoGpio => "Pico (Standard GPIO)".into(), + Self::PimoroniRgb => "Pimoroni (RGB)".into(), + Self::Ws2812Neopixel => "WS2812 (Neopixel)".into(), + Self::Esp32Neopixel => "ESP32 Neopixel".into(), + } + } + + /// Returns the u8 value expected by the firmware configuration + pub fn value(&self) -> u8 { + *self as u8 + } + + pub fn all() -> &'static [Self] { + &[ + Self::PicoGpio, + Self::PimoroniRgb, + Self::Ws2812Neopixel, + Self::Esp32Neopixel, + ] + } +} diff --git a/src/ui/views/config.rs b/src/ui/views/config.rs index 4b1b573..8f33c96 100644 --- a/src/ui/views/config.rs +++ b/src/ui/views/config.rs @@ -1,7 +1,7 @@ use crate::device::io; use crate::device::types::{AppConfigInput, FullDeviceStatus}; use crate::ui::components::{card::Card, page_view::PageView}; -use crate::ui::ui_types::VENDORS; +use crate::ui::ui_types::{LedDriverType, UsbIdentityPreset}; use gpui::*; use gpui_component::{ ActiveTheme, Disableable, Icon, Theme, @@ -14,48 +14,48 @@ use gpui_component::{ }; #[derive(Clone, PartialEq)] -struct VendorItem { - value: SharedString, +struct VendorSelectOption { + preset: UsbIdentityPreset, label: SharedString, } -impl SelectItem for VendorItem { - type Value = SharedString; +impl SelectItem for VendorSelectOption { + type Value = UsbIdentityPreset; fn title(&self) -> SharedString { self.label.clone() } fn value(&self) -> &Self::Value { - &self.value + &self.preset } } #[derive(Clone, PartialEq)] -struct DriverItem { - value: u8, +struct DriverSelectOption { + driver_type: LedDriverType, label: SharedString, } -impl SelectItem for DriverItem { - type Value = u8; +impl SelectItem for DriverSelectOption { + type Value = LedDriverType; fn title(&self) -> SharedString { self.label.clone() } fn value(&self) -> &Self::Value { - &self.value + &self.driver_type } } pub struct ConfigView { - vendor_select: Entity>>, + vendor_select: Entity>>, vid_input: Entity, pid_input: Entity, product_name_input: Entity, led_gpio_input: Entity, - led_driver_select: Entity>>, + led_driver_select: Entity>>, led_brightness_slider: Entity, led_dimmable: bool, led_steady: bool, @@ -75,34 +75,28 @@ impl ConfigView { ) -> Self { let config = device_status.as_ref().map(|s| &s.config); - let vendors: Vec = VENDORS + // Prepare Vendor Options + let vendors: Vec = UsbIdentityPreset::all() .iter() - .map(|v| VendorItem { - value: v.value.into(), - label: v.label.into(), + .map(|preset| { + let (label, _, _) = preset.details(); + VendorSelectOption { + preset: *preset, + label, + } }) .collect(); - let drivers = vec![ - DriverItem { - value: 1, - label: "Pico (Standard GPIO)".into(), - }, - DriverItem { - value: 2, - label: "Pimoroni (RGB)".into(), - }, - DriverItem { - value: 3, - label: "WS2812 (Neopixel)".into(), - }, - DriverItem { - value: 5, - label: "ESP32 Neopixel".into(), - }, - ]; + // Prepare Driver Options + let drivers: Vec = LedDriverType::all() + .iter() + .map(|driver| DriverSelectOption { + driver_type: *driver, + label: driver.label(), + }) + .collect(); - // Determine initial vendor selection + // Determine Initial State let current_vid: SharedString = config .map(|c| c.vid.clone().into()) .unwrap_or_else(|| "CAFE".into()); @@ -120,22 +114,15 @@ impl ConfigView { .unwrap_or_else(|| "10".into()); let current_brightness = config.map(|c| c.led_brightness as f32).unwrap_or(8.0); - let mut initial_vendor_idx = 0; // Default to first item (Custom) - let mut is_custom_vendor = true; + // Identify Preset + let initial_preset = UsbIdentityPreset::from_vid_pid(¤t_vid, ¤t_pid); + let is_custom_vendor = initial_preset == UsbIdentityPreset::Custom; - for (i, vendor) in VENDORS.iter().enumerate() { - // Check matching VID/PID, but skip the generic "custom" entries if they don't have specific values - if vendor.value == "custom" && vendor.vid.is_empty() { - continue; - } - if vendor.vid.eq_ignore_ascii_case(current_vid.as_ref()) - && vendor.pid.eq_ignore_ascii_case(current_pid.as_ref()) - { - initial_vendor_idx = i; - is_custom_vendor = false; - break; - } - } + // Find index for the SelectState + let initial_vendor_idx = UsbIdentityPreset::all() + .iter() + .position(|p| *p == initial_preset) + .unwrap_or(0); let vendor_select = cx.new(|cx| { SelectState::new( @@ -154,11 +141,17 @@ impl ConfigView { let led_gpio_input = cx.new(|cx| InputState::new(window, cx).default_value(current_led_gpio.clone())); - let _initial_driver_idx = config.and_then(|c| c.led_driver).unwrap_or(0) as usize; + // Identify Driver + let current_driver_val = config.and_then(|c| c.led_driver).unwrap_or(0); + let initial_driver_idx = LedDriverType::all() + .iter() + .position(|d| d.value() == current_driver_val) + .unwrap_or(0); + let led_driver_select = cx.new(|cx| { SelectState::new( drivers, - Some(gpui_component::IndexPath::default()), + Some(gpui_component::IndexPath::default().row(initial_driver_idx)), window, cx, ) @@ -168,18 +161,20 @@ impl ConfigView { &vendor_select, window, |this: &mut Self, _, event, window, cx| { - if let gpui_component::select::SelectEvent::Confirm(Some(value)) = event { - if let Some(vendor) = VENDORS.iter().find(|v| value == v.value) { - this.is_custom_vendor = vendor.value == "custom"; + if let gpui_component::select::SelectEvent::Confirm(Some(preset)) = event { + let (_, vid_opt, pid_opt) = preset.details(); - if !this.is_custom_vendor { - this.vid_input - .update(cx, |input, cx| input.set_value(vendor.vid, window, cx)); - this.pid_input - .update(cx, |input, cx| input.set_value(vendor.pid, window, cx)); - } - cx.notify(); + if let (Some(vid), Some(pid)) = (vid_opt, pid_opt) { + this.is_custom_vendor = false; + this.vid_input + .update(cx, |input, cx| input.set_value(vid, window, cx)); + this.pid_input + .update(cx, |input, cx| input.set_value(pid, window, cx)); + } else { + // Custom selected + this.is_custom_vendor = true; } + cx.notify(); } }, ) @@ -259,12 +254,15 @@ impl ConfigView { } } + // Get Driver Value let driver_idx = self.led_driver_select.read(cx).selected_index(cx); if let Some(idx) = driver_idx { - // Assuming values are 0, 1, 2 matches index - let val = idx.row as u8; - if Some(val) != current_config.led_driver { - changes.led_driver = Some(val); + // Map index back to enum value safely + if let Some(driver) = LedDriverType::all().get(idx.row) { + let val = driver.value(); + if Some(val) != current_config.led_driver { + changes.led_driver = Some(val); + } } } From 15f6ac776af326ba1fb6dbfd9a3529f01256259d Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Sat, 31 Jan 2026 02:53:18 +0530 Subject: [PATCH 25/37] fix(ui): collapsed sidebare refresh status button --- src/ui/components/sidebar.rs | 9 ++++++++- src/ui/rootview.rs | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/ui/components/sidebar.rs b/src/ui/components/sidebar.rs index 469848c..edca902 100644 --- a/src/ui/components/sidebar.rs +++ b/src/ui/components/sidebar.rs @@ -12,6 +12,7 @@ pub struct AppSidebar { state: GlobalDeviceState, on_select: Option)>>, refresh_btn: Option, + refresh_btn_collapsed: Option, } impl AppSidebar { @@ -28,6 +29,7 @@ impl AppSidebar { state, on_select: None, refresh_btn: None, + refresh_btn_collapsed: None, } } @@ -44,6 +46,11 @@ impl AppSidebar { self } + pub fn with_refresh_btn_collapsed(mut self, btn: impl IntoElement) -> Self { + self.refresh_btn_collapsed = Some(btn.into_any_element()); + self + } + pub fn render(self, cx: &mut Context) -> impl IntoElement { let width = self.width; let collapsed = self.collapsed; @@ -169,7 +176,7 @@ impl AppSidebar { .items_center() .justify_center() .gap_2() - .children(self.refresh_btn) + .children(self.refresh_btn_collapsed) .child(div().w(px(8.)).h(px(8.)).rounded_full().bg( if let Some(status) = &state.device_status { if status.method == DeviceMethod::Fido { diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index 2658835..5e8405f 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -115,6 +115,14 @@ impl Render for ApplicationRoot { this.active_view = view; }) .with_refresh_btn(self.refresh_button.clone()) + .with_refresh_btn_collapsed( + Button::new("refresh-btn-collapsed") + .ghost() + .child(Icon::default().path("icons/refresh-cw.svg")) + .on_click(cx.listener(|this, _, _, cx| { + this.refresh_device_status(cx); + })), + ) .render(cx), ) .child( From e86cd4ada79ed80bc94883230d321563a53d6177 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Sat, 31 Jan 2026 12:49:42 +0530 Subject: [PATCH 26/37] fix(ui): config view input field theme --- .gitignore | 2 +- Cargo.toml | 3 +++ src/ui/components/button.rs | 2 ++ src/ui/views/config.rs | 26 ++++++++++++++++++-------- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 3a886c1..03b9e93 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,4 @@ result # misc docs-gpui-components -src-svelte \ No newline at end of file +src-svelte diff --git a/Cargo.toml b/Cargo.toml index 9c1f571..ebf1748 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,3 +43,6 @@ lto = true # Enables link-time-optimizations however is not stable. opt-level = 3 # Prioritizes speed. Use `z` if you prefer small binary size. panic = "abort" # Higher performance by disabling panic handlers. strip = true # Ensures debug symbols are removed. + +[alias] +run-watch = "watch -c -x check -x run" diff --git a/src/ui/components/button.rs b/src/ui/components/button.rs index 790e5af..3548b5e 100644 --- a/src/ui/components/button.rs +++ b/src/ui/components/button.rs @@ -1,3 +1,5 @@ +// TODO: convert this from an entity to a stateless button component. + use crate::ui::colors; use gpui::prelude::*; use gpui::*; diff --git a/src/ui/views/config.rs b/src/ui/views/config.rs index 8f33c96..ff84eef 100644 --- a/src/ui/views/config.rs +++ b/src/ui/views/config.rs @@ -1,8 +1,10 @@ use crate::device::io; use crate::device::types::{AppConfigInput, FullDeviceStatus}; +use crate::ui::colors; use crate::ui::components::{card::Card, page_view::PageView}; use crate::ui::ui_types::{LedDriverType, UsbIdentityPreset}; use gpui::*; +use gpui_component::button::{ButtonCustomVariant, ButtonVariants}; use gpui_component::{ ActiveTheme, Disableable, Icon, Theme, button::Button, @@ -400,7 +402,7 @@ impl ConfigView { v_flex() .gap_2() .child("Vendor Preset") - .child(Select::new(&self.vendor_select).w_full()), + .child(Select::new(&self.vendor_select).bg(rgb(0x222225)).w_full()), ) .child( div() @@ -427,7 +429,7 @@ impl ConfigView { v_flex() .gap_2() .child("Product Name") - .child(Input::new(&self.product_name_input)), + .child(Input::new(&self.product_name_input).bg(rgb(0x222225))), ); Card::new() @@ -458,13 +460,14 @@ impl ConfigView { v_flex() .gap_2() .child("LED GPIO Pin") - .child(Input::new(&self.led_gpio_input)), + .child(Input::new(&self.led_gpio_input).bg(rgb(0x222225))), ) .child( - v_flex() - .gap_2() - .child("LED Driver") - .child(Select::new(&self.led_driver_select).w_full()), + v_flex().gap_2().child("LED Driver").child( + Select::new(&self.led_driver_select) + .w_full() + .bg(rgb(0x222225)), + ), ) .child(div().h_px().bg(theme.border)) .child( @@ -530,7 +533,7 @@ impl ConfigView { v_flex() .gap_2() .child("Touch Timeout (seconds)") - .child(Input::new(&self.touch_timeout_input)), + .child(Input::new(&self.touch_timeout_input).bg(rgb(0x222225))), ); Card::new() @@ -652,6 +655,13 @@ impl Render for ConfigView { .icon(Icon::default().path("icons/save.svg")) .child("Apply Changes") .disabled(self.loading) + .custom( + ButtonCustomVariant::new(cx) + .color(rgb(0xe3e3e6).into()) + .hover(rgb(0xcfcfd1).into()) + .active(rgb(0xe3e3e6).into()) + .foreground(rgb(0x4b4b4e).into()), + ) .on_click(cx.listener(|this, _, window, cx| { this.apply_changes(window, cx); })), From 8f6eccd2ffa8be900d315e37bc7e624d8163aa60 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Tue, 3 Feb 2026 21:31:29 +0530 Subject: [PATCH 27/37] chore: update shell config for gpui compilation and make configu update async --- .envrc | 2 +- flake.lock | 36 +++++++++--------- shell.nix | 54 +++++++++++---------------- src/ui/rootview.rs | 16 ++++---- src/ui/views/config.rs | 85 ++++++++++++++++++++++++++++++------------ 5 files changed, 109 insertions(+), 84 deletions(-) diff --git a/.envrc b/.envrc index 3550a30..cffc922 100644 --- a/.envrc +++ b/.envrc @@ -1 +1 @@ -use flake +use flake . --impure diff --git a/flake.lock b/flake.lock index 57a4201..e1d7514 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1769064677, - "narHash": "sha256-Upa108vGOlaOBGQTmmLEKuWekBm519u42A/oYSjTs+4=", + "lastModified": 1770102568, + "narHash": "sha256-VYwA9FmakKJ3zLfAd7bdj9xIB9PzfISLoYh6eZl+EuQ=", "owner": "nix-community", "repo": "fenix", - "rev": "439e81e0b40781e16c444ca1c7fcd1cf8c5c406c", + "rev": "592daa37b5a3175c61541329b64d6c1972303bc1", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768886240, - "narHash": "sha256-C2TjvwYZ2VDxYWeqvvJ5XPPp6U7H66zeJlRaErJKoEM=", + "lastModified": 1770019141, + "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "80e4adbcf8992d3fd27ad4964fbb84907f9478b0", + "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "rev": "72716169fe93074c333e8d0173151350670b824c", "type": "github" }, "original": { @@ -69,11 +69,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1770115704, + "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1768996281, - "narHash": "sha256-s+TolkG0f98fR6RtBEmymBb8RHmZ04U3SL8cjoqog2k=", + "lastModified": 1770026591, + "narHash": "sha256-VZlloygYDmozJwbZZkCSNpiPhNdOW/AA0b6LmNBZ3xU=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "2d124215693f13dcf6ad097a02acdd473c80e447", + "rev": "74eca73f3b0a41b80228b8e499c7547cc8b2effa", "type": "github" }, "original": { diff --git a/shell.nix b/shell.nix index d9d961e..ec072a7 100644 --- a/shell.nix +++ b/shell.nix @@ -2,22 +2,22 @@ let libraries = with pkgs; [ - at-spi2-atk - atkmm - cairo - gdk-pixbuf - glib - gtk3 - harfbuzz - librsvg - libsoup_3 - pango - webkitgtk_4_1 - libcanberra-gtk3 pcsclite hidapi - mesa + mesa udev + libxkbcommon + vulkan-loader + wayland + libglvnd + wayland-protocols + libunwind + libdrm + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libxcb ]; packages = with pkgs; [ @@ -28,29 +28,17 @@ let openssl_3 librsvg git - + # Development tools rustc mold cargo deno nodejs_22 - - # Tauri 2 dependencies - at-spi2-atk - atkmm - cairo - gdk-pixbuf - glib - gtk3 - harfbuzz - librsvg - libsoup_3 - pango - webkitgtk_4_1 - libcanberra-gtk3 - packagekit - + + # GPUI + libxkbcommon + # Hardware pcsclite hidapi @@ -62,14 +50,14 @@ pkgs.mkShell { shellHook = '' export LD_LIBRARY_PATH=${pkgs.lib.makeLibraryPath libraries}:$LD_LIBRARY_PATH - export GTK_PATH=${pkgs.libcanberra-gtk3}/lib/gtk-3.0:${pkgs.packagekit}/lib/gtk-3.0:$GTK_PATH + # export GTK_PATH=${pkgs.libcanberra-gtk3}/lib/gtk-3.0:${pkgs.packagekit}/lib/gtk-3.0:$GTK_PATH export XDG_DATA_DIRS=$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS export RUSTFLAGS="-C link-arg=-fuse-ld=mold" - + # Try to uncomment the following lines if you encounter EGL_BAD_PARAMETER errors: # export LIBGL_ALWAYS_SOFTWARE=1 # export WEBKIT_DISABLE_COMPOSITING_MODE=1 - + echo "Nix development environment loaded!" echo "Available tools: rustc, cargo, deno, node, tauri" ''; diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index 5e8405f..b6e4447 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -66,10 +66,9 @@ impl ApplicationRoot { match io::read_device_details() { Ok(status) => { - self.state.device_status = Some(status); + self.state.device_status = Some(status.clone()); self.state.error = None; - // If successful, try to get FIDO info match io::get_fido_info() { Ok(fido) => { self.state.fido_info = Some(fido); @@ -79,6 +78,12 @@ impl ApplicationRoot { self.state.fido_info = None; } } + + if let Some(config_view) = &self.config_view { + config_view.update(cx, |view, cx| { + view.update_device_status(Some(status), cx); + }); + } } Err(e) => { self.state.device_status = None; @@ -171,13 +176,6 @@ impl Render for ApplicationRoot { ) }) }); - view.update(cx, |view, cx| { - view.update_status( - self.state.device_status.clone(), - window, - cx, - ); - }); view.clone().into_any_element() } ActiveView::Security => { diff --git a/src/ui/views/config.rs b/src/ui/views/config.rs index ff84eef..b1bc9a2 100644 --- a/src/ui/views/config.rs +++ b/src/ui/views/config.rs @@ -1,6 +1,5 @@ use crate::device::io; use crate::device::types::{AppConfigInput, FullDeviceStatus}; -use crate::ui::colors; use crate::ui::components::{card::Card, page_view::PageView}; use crate::ui::ui_types::{LedDriverType, UsbIdentityPreset}; use gpui::*; @@ -67,6 +66,7 @@ pub struct ConfigView { loading: bool, device_status: Option, is_custom_vendor: bool, + _task: Option>, } impl ConfigView { @@ -209,10 +209,11 @@ impl ConfigView { loading: false, device_status: device_status.clone(), is_custom_vendor, + _task: None, } } - fn apply_changes(&mut self, window: &mut Window, cx: &mut Context) { + fn apply_changes(&mut self, _window: &mut Window, cx: &mut Context) { let status = if let Some(s) = &self.device_status { s } else { @@ -256,10 +257,8 @@ impl ConfigView { } } - // Get Driver Value let driver_idx = self.led_driver_select.read(cx).selected_index(cx); if let Some(idx) = driver_idx { - // Map index back to enum value safely if let Some(driver) = LedDriverType::all().get(idx.row) { let val = driver.value(); if Some(val) != current_config.led_driver { @@ -293,7 +292,6 @@ impl ConfigView { changes.enable_secp256k1 = Some(self.enable_secp256k1); } - // Check if we have any changes let has_changes = changes.vid.is_some() || changes.pid.is_some() || changes.product_name.is_some() @@ -314,28 +312,50 @@ impl ConfigView { self.loading = true; cx.notify(); - let result = io::write_config(changes, status.method.clone(), None); + let entity = cx.entity().downgrade(); + let method = status.method.clone(); - self.loading = false; + self._task = Some(cx.spawn(async move |_, cx| { + use std::time::Duration; - match result { - Ok(msg) => { - log::info!("Success: {}", msg); + cx.background_executor() + .timer(Duration::from_millis(500)) + .await; - if let Ok(new_status) = io::read_device_details() { - log::info!( - "Refreshed device status. LED Steady: {}", - new_status.config.led_steady - ); - self.update_status(Some(new_status), window, cx); + let result = io::write_config(changes, method, None); + + let _ = entity.update(cx, |this, cx| { + this.loading = false; + + match result { + Ok(msg) => { + log::info!("Success: {}", msg); + + if let Ok(new_status) = io::read_device_details() { + log::info!( + "Refreshed device status. LED Steady: {}", + new_status.config.led_steady + ); + + let config = &new_status.config; + + this.led_dimmable = config.led_dimmable; + this.led_steady = config.led_steady; + this.power_cycle = config.power_cycle_on_reset; + this.enable_secp256k1 = config.enable_secp256k1; + + this.device_status = Some(new_status); + cx.notify(); + } + } + Err(e) => { + log::error!("Error saving config: {}", e); + } } - } - Err(e) => { - log::error!("Error saving config: {}", e); - } - } - cx.notify(); + cx.notify(); + }); + })); } pub fn update_status( @@ -395,6 +415,25 @@ impl ConfigView { cx.notify(); } + pub(crate) fn update_device_status( + &mut self, + status: Option, + cx: &mut Context, + ) { + if self.device_status == status { + return; + } + self.device_status = status.clone(); + let config = status.as_ref().map(|s| &s.config); + + self.led_dimmable = config.map(|c| c.led_dimmable).unwrap_or(true); + self.led_steady = config.map(|c| c.led_steady).unwrap_or(false); + self.power_cycle = config.map(|c| c.power_cycle_on_reset).unwrap_or(false); + self.enable_secp256k1 = config.map(|c| c.enable_secp256k1).unwrap_or(true); + + cx.notify(); + } + fn render_identity_card(&self, theme: &Theme) -> impl IntoElement { let content = v_flex() .gap_4() @@ -528,7 +567,7 @@ impl ConfigView { .child(content) } - fn render_touch_card(&self, theme: &Theme) -> impl IntoElement { + fn render_touch_card(&self, _theme: &Theme) -> impl IntoElement { let content = v_flex().gap_4().child( v_flex() .gap_2() From 1ffb15ea1ad7757ce46b4ec577ad414023db3c80 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Wed, 4 Feb 2026 23:25:14 +0530 Subject: [PATCH 28/37] feat(ui): implement passkeys handling and fetching with gpui --- .gitignore | 1 + Cargo.lock | 69 ++-- flake.lock | 18 +- shell.nix | 15 +- src/ui/rootview.rs | 47 ++- src/ui/views/passkeys.rs | 767 ++++++++++++++++++++++++++++----------- 6 files changed, 645 insertions(+), 272 deletions(-) diff --git a/.gitignore b/.gitignore index 03b9e93..8e816b2 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ result # misc docs-gpui-components src-svelte +gpui-component \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index d8650ca..272f0d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -92,9 +92,9 @@ checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" [[package]] name = "arc-swap" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e" +checksum = "9ded5f9a03ac8f24d1b8a25101ee812cd32cdc8c50a4c50237de2c4915850e73" dependencies = [ "rustversion", ] @@ -729,9 +729,9 @@ checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "bytemuck" -version = "1.24.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" +checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" dependencies = [ "bytemuck_derive", ] @@ -761,9 +761,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] name = "calloop" @@ -820,9 +820,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.54" +version = "1.2.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6354c81bbfd62d9cfa9cb3c773c2b7b2a3a482d569de977fd0e961f6e7c00583" +checksum = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29" dependencies = [ "find-msvc-tools", "jobserver", @@ -1837,15 +1837,15 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "flate2" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ "crc32fast", "miniz_oxide", @@ -2820,13 +2820,12 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.19" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" +checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", "http", "http-body", @@ -4866,9 +4865,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.12.2" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", @@ -4878,9 +4877,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -4889,9 +4888,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" +checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c" [[package]] name = "resvg" @@ -5213,9 +5212,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e910108742c57a770f492731f99be216a52fadd361b06c8fb59d74ccc267d2" +checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" dependencies = [ "dyn-clone", "indexmap", @@ -5227,9 +5226,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4908ad288c5035a8eb12cfdf0d49270def0a268ee162b75eeee0f85d155a7c45" +checksum = "7d115b50f4aaeea07e79c1912f645c7513d81715d0420f8bc77a18c6260b307f" dependencies = [ "proc-macro2", "quote", @@ -5539,9 +5538,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "slotmap" @@ -6398,9 +6397,9 @@ dependencies = [ [[package]] name = "tree-sitter-language" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae62f7eae5eb549c71b76658648b72cc6111f2d87d24a1e31fa907f4943e3ce" +checksum = "009994f150cc0cd50ff54917d5bc8bffe8cad10ca10d81c34da2ec421ae61782" [[package]] name = "triomphe" @@ -7922,18 +7921,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" [[package]] name = "zerocopy" -version = "0.8.35" +version = "0.8.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdea86ddd5568519879b8187e1cf04e24fce28f7fe046ceecbce472ff19a2572" +checksum = "57cf3aa6855b23711ee9852dfc97dfaa51c45feaba5b645d0c777414d494a961" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.35" +version = "0.8.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c15e1b46eff7c6c91195752e0eeed8ef040e391cdece7c25376957d5f15df22" +checksum = "8a616990af1a287837c4fe6596ad77ef57948f787e46ce28e166facc0cc1cb75" dependencies = [ "proc-macro2", "quote", @@ -8016,9 +8015,9 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.17" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02aae0f83f69aafc94776e879363e9771d7ecbffe2c7fbb6c14c5e00dfe88439" +checksum = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445" [[package]] name = "zune-core" diff --git a/flake.lock b/flake.lock index e1d7514..a457d30 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1770102568, - "narHash": "sha256-VYwA9FmakKJ3zLfAd7bdj9xIB9PzfISLoYh6eZl+EuQ=", + "lastModified": 1770188896, + "narHash": "sha256-ZBpEh6aTvdoZvIM8sojnr43FPyegq/sjUkNWtF4kDO8=", "owner": "nix-community", "repo": "fenix", - "rev": "592daa37b5a3175c61541329b64d6c1972303bc1", + "rev": "6dbe5750c68a55e7cb3f8b62883c4dbfeecf14d5", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770019141, - "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=", + "lastModified": 1770115704, + "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137", + "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1770026591, - "narHash": "sha256-VZlloygYDmozJwbZZkCSNpiPhNdOW/AA0b6LmNBZ3xU=", + "lastModified": 1770092556, + "narHash": "sha256-DcUKN1nzz7LhyZGJMhSBhY5zrl8/GjJJ9SNqqTd77OQ=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "74eca73f3b0a41b80228b8e499c7547cc8b2effa", + "rev": "a84d92ff213e30fb00d7b812e07c4f67e99dcd29", "type": "github" }, "original": { diff --git a/shell.nix b/shell.nix index ec072a7..ccc11f7 100644 --- a/shell.nix +++ b/shell.nix @@ -1,4 +1,6 @@ -{ pkgs ? import { } }: +{ + pkgs ? import { }, +}: let libraries = with pkgs; [ @@ -31,10 +33,12 @@ let # Development tools rustc + clippy + rustfmt + rust-analyzer + rustPlatform.rustLibSrc mold cargo - deno - nodejs_22 # GPUI libxkbcommon @@ -48,9 +52,10 @@ in pkgs.mkShell { buildInputs = packages; + RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}"; + shellHook = '' export LD_LIBRARY_PATH=${pkgs.lib.makeLibraryPath libraries}:$LD_LIBRARY_PATH - # export GTK_PATH=${pkgs.libcanberra-gtk3}/lib/gtk-3.0:${pkgs.packagekit}/lib/gtk-3.0:$GTK_PATH export XDG_DATA_DIRS=$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS export RUSTFLAGS="-C link-arg=-fuse-ld=mold" @@ -59,6 +64,6 @@ pkgs.mkShell { # export WEBKIT_DISABLE_COMPOSITING_MODE=1 echo "Nix development environment loaded!" - echo "Available tools: rustc, cargo, deno, node, tauri" + echo "Available tools: rustc, cargo" ''; } diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index b6e4447..d5c861e 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -6,13 +6,14 @@ use crate::ui::{ colors, views::{ about::AboutView, config::ConfigView, home::HomeView, logs::LogsView, - passkeys::PasskeysView, security::SecurityView, + passkeys::PasskeysEvent, passkeys::PasskeysView, security::SecurityView, }, }; + use gpui::prelude::*; use gpui::*; use gpui_component::{ - ActiveTheme, Icon, IconName, TitleBar, + ActiveTheme, Icon, IconName, TitleBar, WindowExt, button::{Button, ButtonVariants}, h_flex, scroll::ScrollableElement, @@ -27,6 +28,7 @@ pub struct ApplicationRoot { sidebar_width: Pixels, refresh_button: Entity, config_view: Option>, + passkeys_view: Option>, } impl ApplicationRoot { @@ -50,6 +52,7 @@ impl ApplicationRoot { sidebar_width: px(255.), refresh_button, config_view: None, + passkeys_view: None, }; this.refresh_device_status(cx); this @@ -81,7 +84,14 @@ impl ApplicationRoot { if let Some(config_view) = &self.config_view { config_view.update(cx, |view, cx| { - view.update_device_status(Some(status), cx); + view.update_device_status(Some(status.clone()), cx); + }); + } + + if let Some(passkeys_view) = &self.passkeys_view { + let fido = self.state.fido_info.clone(); + passkeys_view.update(cx, |view, cx| { + view.update_device_status(Some(status.clone()), fido, cx); }); } } @@ -164,7 +174,36 @@ impl Render for ApplicationRoot { HomeView::build(&self.state, cx.theme()).into_any_element() } ActiveView::Passkeys => { - PasskeysView::build(cx.theme()).into_any_element() + let view = self.passkeys_view.get_or_insert_with(|| { + let view = cx.new(|cx| { + PasskeysView::new( + window, + cx, + self.state.device_status.clone(), + self.state.fido_info.clone(), + ) + }); + cx.subscribe_in( + &view, + window, + |_, _, event: &PasskeysEvent, window, cx| { + match event { + PasskeysEvent::Notification(msg) => { + window.push_notification( + msg.to_string(), + cx, + ); + } + PasskeysEvent::CloseDialog => { + window.close_dialog(cx); + } + } + }, + ) + .detach(); + view + }); + view.clone().into_any_element() } ActiveView::Configuration => { let view = self.config_view.get_or_insert_with(|| { diff --git a/src/ui/views/passkeys.rs b/src/ui/views/passkeys.rs index ec34489..065540b 100644 --- a/src/ui/views/passkeys.rs +++ b/src/ui/views/passkeys.rs @@ -1,97 +1,195 @@ +use crate::device::io; +use crate::device::types::{FidoDeviceInfo, FullDeviceStatus, StoredCredential}; use crate::ui::components::{card::Card, page_view::PageView}; use gpui::*; -use gpui_component::StyledExt; -use gpui_component::button::ButtonVariants; +use gpui_component::button::{Button, ButtonVariants}; use gpui_component::{ - Disableable, Icon, Sizable, Theme, badge::Badge, button::Button, h_flex, v_flex, + ActiveTheme, Disableable, Icon, Sizable, StyledExt, Theme, WindowExt, badge::Badge, h_flex, + input::Input, input::InputState, v_flex, }; -#[derive(Clone)] -struct StoredCredential { - credential_id: String, - user_id: String, - user_name: String, - user_display_name: String, - rp_id: String, - rp_name: Option, -} - -#[derive(Clone)] -struct FidoOptions { - client_pin: bool, -} - -#[derive(Clone)] -struct FidoInfo { - versions: Vec, - options: FidoOptions, - min_pin_length: u8, - resident_keys: bool, -} - -#[derive(Clone)] -struct DeviceState { - connected: bool, - has_fido: bool, - unlocked: bool, - fido_info: Option, +pub struct PasskeysView { + device_status: Option, + fido_info: Option, credentials: Vec, + unlocked: bool, + cached_pin: Option, + loading: bool, + + _task: Option>, + active_modal: Option, } -pub struct PasskeysView; +pub enum ActiveModal { + Unlock(Entity), + Delete { + cred: StoredCredential, + pin: String, + }, + ChangePin, + MinPin, +} + +pub enum PasskeysEvent { + Notification(String), + CloseDialog, +} + +impl EventEmitter for PasskeysView {} impl PasskeysView { - pub fn build(theme: &Theme) -> impl IntoElement { - // Mock Data - let device = DeviceState { - connected: true, - has_fido: true, - unlocked: true, - fido_info: Some(FidoInfo { - versions: vec!["FIDO2_1".to_string()], - options: FidoOptions { client_pin: true }, - min_pin_length: 4, - resident_keys: true, - }), - credentials: vec![ - StoredCredential { - credential_id: "0000".to_string(), - user_id: "u123".to_string(), - user_name: "j.doe".to_string(), - user_display_name: "Work Key".to_string(), - rp_id: "example.com".to_string(), - rp_name: None, - }, - StoredCredential { - credential_id: "1111".to_string(), - user_id: "u456".to_string(), - user_name: "developer".to_string(), - user_display_name: "Cloud Console".to_string(), - rp_id: "cloud.example.com".to_string(), - rp_name: None, - }, - ], - }; - - PageView::build( - "Passkeys", - "Manage your security PIN and the FIDO credentials (passkeys) stored on your device.", - if !device.connected { - Self::render_no_device(theme).into_any_element() - } else if !device.has_fido { - Self::render_not_supported(theme).into_any_element() - } else { - v_flex() - .gap_6() - .child(Self::render_pin_management(&device, theme)) - .child(Self::render_stored_passkeys(&device, theme)) - .into_any_element() - }, - theme, - ) + pub fn new( + _window: &mut Window, + _cx: &mut Context, + device_status: Option, + fido_info: Option, + ) -> Self { + Self { + device_status, + fido_info, + credentials: Vec::new(), + unlocked: false, + cached_pin: None, + loading: false, + _task: None, + active_modal: None, + } } - fn render_no_device(theme: &Theme) -> impl IntoElement { + pub fn update_device_status( + &mut self, + status: Option, + fido_info: Option, + cx: &mut Context, + ) { + if self.device_status == status && self.fido_info == fido_info { + return; + } + self.device_status = status; + self.fido_info = fido_info; + cx.notify(); + } + + fn unlock_storage(&mut self, pin: String, cx: &mut Context) { + if self.loading { + return; + } + self.loading = true; + cx.notify(); + + let entity = cx.entity().downgrade(); + + cx.spawn(async move |_, cx| { + let result = io::get_credentials(pin.clone()); + + let _ = entity.update(cx, |this, cx| { + this.loading = false; + match result { + Ok(creds) => { + this.unlocked = true; + this.cached_pin = Some(pin); + this.credentials = creds; + cx.emit(PasskeysEvent::CloseDialog); + } + Err(e) => { + let msg = format!("Failed to unlock: {}", e); + cx.emit(PasskeysEvent::Notification(msg)); + } + } + cx.notify(); + }); + }) + .detach(); + } + + fn lock_storage(&mut self, cx: &mut Context) { + self.unlocked = false; + self.cached_pin = None; + self.credentials.clear(); + cx.notify(); + } + + fn execute_delete( + &mut self, + credential_id: String, + pin: String, + cx: &mut Context, + ) { + if self.loading { + return; + } + self.loading = true; + cx.notify(); + + let entity = cx.entity().downgrade(); + + self._task = Some(cx.spawn(async move |_, cx| { + let result = io::delete_credential(pin.clone(), credential_id); + + let _ = entity.update(cx, |this, cx| { + match result { + Ok(_) => { + // Refresh credentials + let _ = this.refresh_credentials(pin, cx); + cx.emit(PasskeysEvent::CloseDialog); + cx.emit(PasskeysEvent::Notification("Credential deleted".to_string())); + } + Err(e) => { + this.loading = false; + let msg = format!("Error deleting: {}", e); + cx.emit(PasskeysEvent::Notification(msg)); + cx.notify(); + } + } + }); + })); + } + + fn refresh_credentials(&mut self, pin: String, cx: &mut Context) -> Task<()> { + let entity = cx.entity().downgrade(); + cx.spawn(async move |_, cx| { + let result = io::get_credentials(pin); + let _ = entity.update(cx, |this, cx| { + this.loading = false; + if let Ok(creds) = result { + this.credentials = creds; + } + cx.notify(); + }); + }) + } + + fn open_unlock_dialog(&mut self, window: &mut Window, cx: &mut Context) { + let pin_input = cx.new(|cx| InputState::new(window, cx).placeholder("Enter FIDO PIN")); + self.active_modal = Some(ActiveModal::Unlock(pin_input)); + cx.notify(); + } + + fn open_delete_dialog( + &mut self, + cred: &StoredCredential, + pin: String, + _window: &mut Window, + cx: &mut Context, + ) { + self.active_modal = Some(ActiveModal::Delete { + cred: cred.clone(), + pin, + }); + cx.notify(); + } + + fn open_change_pin_dialog(&mut self, window: &mut Window, cx: &mut Context) { + // TODO: Implement Change PIN Dialog + // Placeholder for now + window.open_dialog(cx, |dialog, _, _| { + dialog + .title("Not Implemented") + .child("Change PIN dialog coming soon") + }); + } + + fn render_no_device(&self, theme: &Theme) -> impl IntoElement { div() .flex() .items_center() @@ -108,7 +206,7 @@ impl PasskeysView { .into_any_element() } - fn render_not_supported(theme: &Theme) -> impl IntoElement { + fn render_not_supported(&self, theme: &Theme) -> impl IntoElement { div() .flex() .items_center() @@ -125,7 +223,10 @@ impl PasskeysView { .into_any_element() } - fn render_pin_management(device: &DeviceState, theme: &Theme) -> impl IntoElement { + fn render_pin_management(&self, cx: &mut Context) -> impl IntoElement { + let status_row = self.render_pin_status_row(cx).into_any_element(); + let min_len_row = self.render_min_pin_length_row(cx).into_any_element(); + Card::new() .title("PIN Management") .icon(Icon::default().path("icons/key.svg")) @@ -133,16 +234,23 @@ impl PasskeysView { .child( v_flex() .gap_4() - .child(Self::render_pin_status_row(device, theme)) - .child(Self::render_min_pin_length_row(device, theme)), + .child(status_row) + .child(min_len_row), ) } - fn render_pin_status_row(device: &DeviceState, theme: &Theme) -> impl IntoElement { - let pin_set = device + fn render_pin_status_row(&self, cx: &mut Context) -> impl IntoElement { + let pin_set = self .fido_info .as_ref() - .map_or(false, |f| f.options.client_pin); + .and_then(|f| f.options.get("clientPin").copied()) + .unwrap_or(false); + + let listener = cx.listener(|this, _, window, cx| { + this.open_change_pin_dialog(window, cx); + }); + + let theme = cx.theme(); div() .flex() @@ -166,19 +274,27 @@ impl PasskeysView { }), ), ) - .child(Button::new("change-pin-btn").outline().child(if pin_set { - "Change PIN" - } else { - "Set PIN" - })) + .child( + Button::new("change-pin-btn") + .outline() + .child(if pin_set { "Change PIN" } else { "Set PIN" }) + .on_click(listener), + ) } - fn render_min_pin_length_row(device: &DeviceState, theme: &Theme) -> impl IntoElement { - let min_len = device.fido_info.as_ref().map_or(4, |f| f.min_pin_length); - let pin_set = device + fn render_min_pin_length_row(&self, cx: &mut Context) -> impl IntoElement { + let min_len = self .fido_info .as_ref() - .map_or(false, |f| f.options.client_pin); + .map(|f| f.min_pin_length) + .unwrap_or(4); + let pin_set = self + .fido_info + .as_ref() + .and_then(|f| f.options.get("clientPin").copied()) + .unwrap_or(false); + + let theme = cx.theme(); div() .flex() @@ -206,125 +322,155 @@ impl PasskeysView { ) } - fn render_stored_passkeys(device: &DeviceState, theme: &Theme) -> impl IntoElement { + fn render_stored_passkeys(&self, cx: &mut Context) -> impl IntoElement { + if !self.unlocked { + self.render_locked_state(cx).into_any_element() + } else { + self.render_unlocked_state(cx).into_any_element() + } + } + + fn render_locked_state(&self, cx: &mut Context) -> impl IntoElement { + let listener = cx.listener(|this, _, window, cx| { + this.open_unlock_dialog(window, cx); + }); + let theme = cx.theme(); + Card::new() .title("Stored Passkeys") .icon(Icon::default().path("icons/key-round.svg")) .description("View and manage your resident credentials") - .child(if !device.unlocked { - Self::render_locked_state(theme).into_any_element() - } else { - Self::render_unlocked_state(device, theme).into_any_element() - }) - // header_right was effectively invisible/placeholder in original code: - // Some(div().child("View and manage...").invisible()) - // We can omit it or add it if needed, but it looked like a hack or mistake in original code? - // The original header_right was: - // Some(div().child("View and manage your resident credentials").text_sm().text_color(...).invisible()) - // This suggests it was maybe trying to take up space or something? But description handles the text. - // I will simplify and omit it, which is cleaner. - } - - fn render_locked_state(theme: &Theme) -> impl IntoElement { - v_flex() - .items_center() - .justify_center() - .gap_4() - .py_8() .child( - div().rounded_full().bg(theme.muted).p_4().child( - Icon::default() - .path("icons/shield.svg") - .size_8() - .text_color(theme.muted_foreground), - ), - ) - .child( - div() - .text_lg() - .font_semibold() - .child("Authentication Required"), - ) - .child( - div() - .text_color(theme.muted_foreground) - .text_sm() - .child("Unlock your device to view and manage passkeys."), - ) - .child( - Button::new("unlock-btn").child( - h_flex() - .gap_2() - .child(Icon::default().path("icons/lock-open.svg")) - .child("Unlock Storage"), - ), - ) - } - - fn render_unlocked_state(device: &DeviceState, theme: &Theme) -> impl IntoElement { - v_flex() - .gap_6() - .child( - h_flex() - .justify_between() + v_flex() .items_center() + .justify_center() + .gap_4() + .py_8() .child( - h_flex() - .gap_4() - .items_center() + div().rounded_full().bg(theme.muted).p_4().child( + Icon::default() + .path("icons/shield.svg") + .size_8() + .text_color(theme.muted_foreground), + ), + ) + .child( + div() + .text_lg() + .font_semibold() + .child("Authentication Required"), + ) + .child( + div() + .text_color(theme.muted_foreground) + .text_sm() .child( - Badge::new() - .child( - h_flex() - .gap_1() - .items_center() - .child( - Icon::default() - .path("icons/lock-open.svg") - .size_3p5(), - ) - .child("Unlocked"), - ) - .color(gpui::green()), - ) - .child(div().w_px().h_4().bg(theme.border)) - .child( - div() - .text_sm() - .text_color(theme.muted_foreground) - .child(format!( - "{} credentials stored", - device.credentials.len() - )), + "Unlock your device to view and manage passkeys.", ), ) .child( - Button::new("lock-storage-btn").outline().small().child( - h_flex() - .gap_2() - .child(Icon::default().path("icons/lock.svg").size_3p5()) - .child("Lock Storage"), - ), + Button::new("unlock-btn") + .child( + h_flex() + .gap_2() + .child(Icon::default().path("icons/lock-open.svg")) + .child("Unlock Storage"), + ) + .on_click(listener), ), ) - .child(if device.credentials.is_empty() { - Self::render_empty_credentials(theme).into_any_element() - } else { - div() - .grid() - .grid_cols(3) - .gap_4() - .children( - device - .credentials - .iter() - .map(|cred| Self::render_credential_card(cred, theme)), - ) - .into_any_element() - }) } - fn render_empty_credentials(theme: &Theme) -> impl IntoElement { + fn render_unlocked_state(&self, cx: &mut Context) -> impl IntoElement { + let creds_len = self.credentials.len(); + let lock_listener = cx.listener(|this, _, _, cx| { + this.lock_storage(cx); + }); + + // Prepare credential cards before getting theme + // We need to iterate self.credentials + // render_credential_card needs cx for listeners. + // It also needs theme. + // So render_credential_card must adhere to the pattern: create listeners, then get theme. + + // This is tricky for map. + // We can create a list of listeners first? + // Or simply `render_credential_card` should take `cx` and handle it. + // Yes, `render_credential_card(&self, cred, cx)`. + + let mut cards = Vec::new(); + for cred in &self.credentials { + cards.push(self.render_credential_card(cred, cx).into_any_element()); + } + + let theme = cx.theme(); + + Card::new() + .title("Stored Passkeys") + .icon(Icon::default().path("icons/key-round.svg")) + .description("View and manage your resident credentials") + .child( + v_flex() + .gap_6() + .child( + h_flex() + .justify_between() + .items_center() + .child( + h_flex() + .gap_4() + .items_center() + .child( + Badge::new() + .child( + h_flex() + .gap_1() + .items_center() + .child( + Icon::default() + .path("icons/lock-open.svg") + .size_3p5(), + ) + .child("Unlocked"), + ) + .color(gpui::green()), + ) + .child(div().w_px().h_4().bg(theme.border)) + .child( + div() + .text_sm() + .text_color(theme.muted_foreground) + .child(format!("{} credentials stored", creds_len)), + ), + ) + .child( + Button::new("lock-storage-btn") + .outline() + .small() + .child( + h_flex() + .gap_2() + .child(Icon::default().path("icons/lock.svg").size_3p5()) + .child("Lock Storage"), + ) + .on_click(lock_listener), + ), + ) + .child(if self.credentials.is_empty() { + self.render_empty_credentials_with_theme(theme).into_any_element() + } else { + div() + .grid() + .grid_cols(3) + .gap_4() + .children(cards) + .into_any_element() + }), + ) + } + + // Rework layout of render_empty_credentials to take theme, assuming call site handles it. + fn render_empty_credentials_with_theme(&self, theme: &Theme) -> impl IntoElement { v_flex() .items_center() .justify_center() @@ -334,7 +480,7 @@ impl PasskeysView { .rounded_xl() .gap_4() .child( - div() + div() .rounded_full() .bg(theme.muted) .p_4() @@ -342,21 +488,131 @@ impl PasskeysView { Icon::default() .path("icons/key-round.svg") .size_8() - .text_color(theme.muted_foreground) - ) + .text_color(theme.muted_foreground), + ), ) - .child(div().text_lg().font_semibold().child("No Passkeys Found")) + .child(div().text_lg().font_semibold().child("No Passkeys Found")) .child( div() .text_color(theme.muted_foreground) .text_sm() .text_center() .max_w(px(384.0)) - .child("This device doesn't have any resident credentials stored yet. Create passkeys on websites to see them here.") + .child("This device doesn't have any resident credentials stored yet. Create passkeys on websites to see them here."), ) } - fn render_credential_card(cred: &StoredCredential, theme: &Theme) -> impl IntoElement { + fn render_modal(&self, cx: &mut Context) -> impl IntoElement { + if let Some(modal) = &self.active_modal { + let theme = cx.theme(); + let content = match modal { + ActiveModal::Unlock(pin_input) => { + let pin_input_clone = pin_input.clone(); + v_flex() + .gap_4() + .child("Enter your device PIN to view saved passkeys") + .child(Input::new(pin_input)) + .child( + h_flex() + .gap_2() + .justify_end() + .child( + Button::new("cancel-unlock") + .label("Cancel") + .on_click(cx.listener(|this, _, _, cx| { + this.active_modal = None; + cx.notify(); + })) + ) + .child( + Button::new("confirm-unlock") + .primary() + .label("Unlock") + .on_click(cx.listener(move |this, _, _, cx| { + let pin = pin_input_clone.read(cx).text().to_string(); + if !pin.is_empty() { + this.unlock_storage(pin, cx); + this.active_modal = None; // Manual close on success + cx.notify(); + } + })) + ) + ) + }, + ActiveModal::Delete { cred, pin } => { + let cred_id = cred.credential_id.clone(); + let pin_str = pin.clone(); + let name = cred.rp_id.clone(); + + v_flex() + .gap_4() + .child(format!("Are you sure you want to delete the passkey for {}?", name)) + .child( + h_flex() + .gap_2() + .justify_end() + .child( + Button::new("cancel-del") + .label("Cancel") + .on_click(cx.listener(|this, _, _, cx| { + this.active_modal = None; + cx.notify(); + })) + ) + .child( + Button::new("confirm-del") + .danger() + .label("Delete") + .on_click(cx.listener(move |this, _, _, cx| { + this.execute_delete(cred_id.clone(), pin_str.clone(), cx); + this.active_modal = None; + cx.notify(); + })) + ) + ) + } + _ => div().child("Not Implemented"), + }; + + div() + .absolute() + .top_0() + .left_0() + .size_full() + .flex() + .items_center() + .justify_center() + .bg(gpui::black().opacity(0.5)) + .child( + div() + .w(px(400.0)) + .bg(theme.background) + .border_1() + .border_color(theme.border) + .rounded_lg() + .shadow_lg() + .p_6() + .child(content) + ) + .into_any_element() + } else { + div().into_any_element() + } + } + + fn render_credential_card( + &self, + cred: &StoredCredential, + cx: &mut Context, + ) -> impl IntoElement { + let cred_clone = cred.clone(); + + let delete_listener = cx.listener(move |this, _, window, cx| { + this.open_ask_delete_pin(cred_clone.clone(), window, cx); + }); + + let theme = cx.theme(); + div() .border_1() .border_color(theme.border) @@ -388,11 +644,7 @@ impl PasskeysView { ) .child( v_flex() - .child( - div().font_semibold().child( - cred.rp_name.clone().unwrap_or(cred.rp_id.clone()), - ), - ) + .child(div().font_semibold().child(cred.rp_name.clone())) .child( div() .text_sm() @@ -402,13 +654,90 @@ impl PasskeysView { ), ) .child( - Button::new("delete-cred-btn").ghost().small().child( - Icon::default() - .path("icons/trash-2.svg") - .size_4() - .text_color(theme.muted_foreground), - ), + Button::new("delete-cred-btn") + .ghost() + .small() + .child( + Icon::default() + .path("icons/trash-2.svg") + .size_4() + .text_color(theme.muted_foreground), + ) + .on_click(delete_listener), ), ) } + + fn open_ask_delete_pin( + &mut self, + cred: StoredCredential, + window: &mut Window, + cx: &mut Context, + ) { + if let Some(pin) = &self.cached_pin { + self.open_delete_dialog(&cred, pin.clone(), window, cx); + } else { + window.push_notification("Session expired, please unlock again.", cx); + self.lock_storage(cx); + } + } +} + +impl Render for PasskeysView { + fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { + let device_connected = self.device_status.is_some(); + if !device_connected { + // Static render, need theme. + // Since we don't need listeners here, we can just get theme. + let theme = cx.theme(); // borrow cx + return + PageView::build( + "Passkeys", + "Manage your security PIN and the FIDO credentials (passkeys) stored on your device.", + self.render_no_device(theme).into_any_element(), + theme + ).into_any_element(); + } + + let has_fido = self + .device_status + .as_ref() + .map(|s| s.method == crate::device::types::DeviceMethod::Fido) + .unwrap_or(false) + || self.fido_info.is_some(); + + if !has_fido { + let theme = cx.theme(); + return PageView::build( + "Passkeys", + "Manage your security PIN and the FIDO credentials (passkeys) stored on your device.", + self.render_not_supported(theme).into_any_element(), + theme + ).into_any_element(); + } + + // Main view + // 1. Render content (calls helpers which access cx for listeners and theme) + let content = v_flex() + .gap_6() + .child(self.render_pin_management(cx)) + .child(self.render_stored_passkeys(cx)); + + // 2. Get theme for PageView wrapper + let theme = cx.theme(); + + div() + .size_full() + .relative() // Critical for absolute modal + .child( + PageView::build( + "Passkeys", + "Manage your security PIN and the FIDO credentials (passkeys) stored on your device.", + content.into_any_element(), + theme, + ) + ) + .child(self.render_modal(cx)) + .into_any_element() + } } From b724ab70032022d4ec14db59dcd7a9b80d110dc1 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Wed, 4 Feb 2026 23:58:54 +0530 Subject: [PATCH 29/37] chore(ui): convert buttons into a reusable component from entity --- src/ui/components/button.rs | 218 +++++++++++++++++++++-------------- src/ui/components/sidebar.rs | 57 ++++++--- src/ui/rootview.rs | 29 +---- src/ui/views/passkeys.rs | 57 ++++----- 4 files changed, 200 insertions(+), 161 deletions(-) diff --git a/src/ui/components/button.rs b/src/ui/components/button.rs index 3548b5e..06bb2a7 100644 --- a/src/ui/components/button.rs +++ b/src/ui/components/button.rs @@ -4,23 +4,24 @@ use crate::ui::colors; use gpui::prelude::*; use gpui::*; use gpui_component::{ - Icon, + Disableable, Icon, Sizable, Size, button::{Button, ButtonCustomVariant, ButtonVariants}, h_flex, }; -pub struct Clicked; - +/// A stateless text button wrapper +#[derive(IntoElement)] pub struct PFButton { text: SharedString, - on_click: Option) + 'static>>, - hovered: bool, - hover_t: f32, + on_click: Option>, bg_color_start: Rgba, bg_color_hover: Rgba, bg_color_active: Rgba, width_full: bool, centered: bool, + disabled: bool, + small: bool, + loading: bool, } impl PFButton { @@ -28,24 +29,33 @@ impl PFButton { Self { text: text.into(), on_click: None, - hovered: false, - hover_t: 0.0, bg_color_start: rgb(0x1b1b1d), bg_color_hover: rgb(0x232325), bg_color_active: rgb(colors::zinc::ZINC700), width_full: false, centered: false, + disabled: false, + small: false, + loading: false, } } pub fn on_click( mut self, - handler: impl Fn(&ClickEvent, &mut Window, &mut Context) + 'static, + handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static, ) -> Self { self.on_click = Some(Box::new(handler)); self } + /// Allows overriding the default colors + pub fn with_colors(mut self, start: Rgba, hover: Rgba, active: Rgba) -> Self { + self.bg_color_start = start; + self.bg_color_hover = hover; + self.bg_color_active = active; + self + } + pub fn section_header(mut self) -> Self { self.width_full = true; self.centered = false; @@ -61,34 +71,32 @@ impl PFButton { self.centered = true; self } + + pub fn disabled(mut self, disabled: bool) -> Self { + self.disabled = disabled; + self + } + + pub fn small(mut self) -> Self { + self.small = true; + self + } + + pub fn loading(mut self, loading: bool) -> Self { + self.loading = loading; + self + } } -impl Render for PFButton { - fn render(&mut self, window: &mut Window, cx: &mut Context) -> impl IntoElement { - let target_hover = if self.hovered { 1.0 } else { 0.0 }; - if (self.hover_t - target_hover).abs() > 0.01 { - self.hover_t += (target_hover - self.hover_t) * 0.2; - window.request_animation_frame(); - } else { - self.hover_t = target_hover; - } - - let c1 = self.bg_color_start; - let c2 = self.bg_color_hover; - let t = self.hover_t; - let bg_color = Rgba { - r: c1.r + (c2.r - c1.r) * t, - g: c1.g + (c2.g - c1.g) * t, - b: c1.b + (c2.b - c1.b) * t, - a: 1.0, - }; - - let text = self.text.clone(); +// RenderOnce makes this a "Component" not an "Entity" +impl RenderOnce for PFButton { + fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement { + let text = self.text; let mut btn = Button::new("pf-btn").custom( ButtonCustomVariant::new(cx) - .color(bg_color.into()) - .hover(bg_color.into()) + .color(self.bg_color_start.into()) + .hover(self.bg_color_hover.into()) .active(self.bg_color_active.into()), ); @@ -96,37 +104,46 @@ impl Render for PFButton { btn = btn.w_full(); } + if self.disabled { + btn = btn.disabled(true); + } + + if self.loading { + btn = btn.loading(true); + } + + if self.small { + btn = btn.with_size(Size::Small); + } + let content = if self.centered { h_flex().justify_center().child(text) } else { h_flex().child(text) }; - let on_click = self.on_click.take(); - if let Some(handler) = on_click { - btn = btn.on_click(cx.listener(move |_, event, window, cx| handler(event, window, cx))); + if let Some(handler) = self.on_click { + // We cast the handler to satisfy GPUI's generic requirements + btn = btn.on_click(move |e, w, c| handler(e, w, c)); } - div() - .child(btn.child(content)) - .id("pf-btn-wrapper") - .on_hover(cx.listener(|this, hovered, _, cx| { - if this.hovered != *hovered { - this.hovered = *hovered; - cx.notify(); - } - })) + btn.child(content) } } +/// A stateless Icon + Text button wrapper +#[derive(IntoElement)] pub struct PFIconButton { icon: Icon, text: SharedString, - hovered: bool, - hover_t: f32, + on_click: Option>, bg_color_start: Rgba, bg_color_hover: Rgba, bg_color_active: Rgba, + disabled: bool, + small: bool, + width_full: bool, + loading: bool, } impl PFIconButton { @@ -134,60 +151,85 @@ impl PFIconButton { Self { icon: icon.into(), text: text.into(), - hovered: false, - hover_t: 0.0, + on_click: None, bg_color_start: rgb(0x1b1b1d), bg_color_hover: rgb(0x232325), bg_color_active: rgb(colors::zinc::ZINC700), + disabled: false, + small: false, + width_full: false, + loading: false, } } + + pub fn on_click( + mut self, + handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static, + ) -> Self { + self.on_click = Some(Box::new(handler)); + self + } + + pub fn with_colors(mut self, start: Rgba, hover: Rgba, active: Rgba) -> Self { + self.bg_color_start = start; + self.bg_color_hover = hover; + self.bg_color_active = active; + self + } + + pub fn disabled(mut self, disabled: bool) -> Self { + self.disabled = disabled; + self + } + + pub fn small(mut self) -> Self { + self.small = true; + self + } + + pub fn w_full(mut self) -> Self { + self.width_full = true; + self + } + + pub fn loading(mut self, loading: bool) -> Self { + self.loading = loading; + self + } } -impl EventEmitter for PFIconButton {} +impl RenderOnce for PFIconButton { + fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement { + let text = self.text; + let icon = self.icon; -impl Render for PFIconButton { - fn render(&mut self, window: &mut Window, cx: &mut Context) -> impl IntoElement { - let target_hover = if self.hovered { 1.0 } else { 0.0 }; - if (self.hover_t - target_hover).abs() > 0.01 { - self.hover_t += (target_hover - self.hover_t) * 0.2; - window.request_animation_frame(); - } else { - self.hover_t = target_hover; + let mut btn = Button::new("pf-icon-btn").custom( + ButtonCustomVariant::new(cx) + .color(self.bg_color_start.into()) + .hover(self.bg_color_hover.into()) + .active(self.bg_color_active.into()), + ); + + if self.width_full { + btn = btn.w_full(); } - let c1 = self.bg_color_start; - let c2 = self.bg_color_hover; - let t = self.hover_t; - let bg_color = Rgba { - r: c1.r + (c2.r - c1.r) * t, - g: c1.g + (c2.g - c1.g) * t, - b: c1.b + (c2.b - c1.b) * t, - a: 1.0, - }; + if self.disabled { + btn = btn.disabled(true); + } - let text = self.text.clone(); - let icon = self.icon.clone(); + if self.loading { + btn = btn.loading(true); + } - let btn = Button::new("pf-icon-btn") - .custom( - ButtonCustomVariant::new(cx) - .color(bg_color.into()) - .hover(bg_color.into()) - .active(self.bg_color_active.into()), - ) - .w_full() - .on_click(cx.listener(|_, _, _, cx| { - cx.emit(Clicked); - })); + if self.small { + btn = btn.with_size(Size::Small); + } - div() - .child(btn.child(h_flex().gap_2().justify_center().child(icon).child(text))) - .id("pf-icon-btn-wrapper") - .on_hover(cx.listener(|this, hovered, _, cx| { - if this.hovered != *hovered { - this.hovered = *hovered; - cx.notify(); - } - })) + if let Some(handler) = self.on_click { + btn = btn.on_click(move |e, w, c| handler(e, w, c)); + } + + btn.child(h_flex().gap_2().justify_center().child(icon).child(text)) } } diff --git a/src/ui/components/sidebar.rs b/src/ui/components/sidebar.rs index edca902..f32158d 100644 --- a/src/ui/components/sidebar.rs +++ b/src/ui/components/sidebar.rs @@ -1,8 +1,15 @@ use crate::device::types::DeviceMethod; use crate::ui::colors; +use crate::ui::components::button::PFIconButton; use crate::ui::ui_types::{ActiveView, GlobalDeviceState}; use gpui::*; -use gpui_component::{ActiveTheme, Icon, IconName, Side, h_flex, sidebar::*, v_flex}; +use gpui_component::{ + ActiveTheme, Icon, IconName, Side, + button::{Button, ButtonVariants}, + h_flex, + sidebar::*, + v_flex, +}; use std::rc::Rc; pub struct AppSidebar { @@ -11,8 +18,7 @@ pub struct AppSidebar { collapsed: bool, state: GlobalDeviceState, on_select: Option)>>, - refresh_btn: Option, - refresh_btn_collapsed: Option, + on_refresh: Option)>>, } impl AppSidebar { @@ -28,8 +34,7 @@ impl AppSidebar { collapsed, state, on_select: None, - refresh_btn: None, - refresh_btn_collapsed: None, + on_refresh: None, } } @@ -41,13 +46,11 @@ impl AppSidebar { self } - pub fn with_refresh_btn(mut self, btn: impl IntoElement) -> Self { - self.refresh_btn = Some(btn.into_any_element()); - self - } - - pub fn with_refresh_btn_collapsed(mut self, btn: impl IntoElement) -> Self { - self.refresh_btn_collapsed = Some(btn.into_any_element()); + pub fn on_refresh( + mut self, + handler: impl Fn(&mut V, &mut Window, &mut Context) + 'static, + ) -> Self { + self.on_refresh = Some(Rc::new(handler)); self } @@ -59,6 +62,10 @@ impl AppSidebar { let border_color = cx.theme().sidebar_border; let muted_foreground = cx.theme().muted_foreground; + // Clone for closures + let on_refresh = self.on_refresh.clone(); + let on_refresh_collapsed = self.on_refresh.clone(); + v_flex() .h_full() .bg(rgb(colors::zinc::ZINC900)) @@ -176,7 +183,17 @@ impl AppSidebar { .items_center() .justify_center() .gap_2() - .children(self.refresh_btn_collapsed) + .child( + Button::new("refresh-btn-collapsed") + .ghost() + .child(Icon::default().path("icons/refresh-cw.svg")) + .on_click(cx.listener(move |this, _, window, cx| { + if let Some(f) = &on_refresh_collapsed { + f(this, window, cx); + } + })) + .w_full(), + ) .child(div().w(px(8.)).h(px(8.)).rounded_full().bg( if let Some(status) = &state.device_status { if status.method == DeviceMethod::Fido { @@ -235,7 +252,19 @@ impl AppSidebar { ) }), ) - .children(self.refresh_btn) + .child( + PFIconButton::new( + Icon::default().path("icons/refresh-cw.svg"), + "Refresh", + ) + .on_click(cx.listener( + move |this, _, window, cx| { + if let Some(f) = &on_refresh { + f(this, window, cx); + } + }, + )), + ) }), ) } diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index d5c861e..bd6b564 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -1,5 +1,4 @@ use crate::device::io; -use crate::ui::components::button::PFIconButton; use crate::ui::components::sidebar::AppSidebar; use crate::ui::ui_types::{ActiveView, GlobalDeviceState}; use crate::ui::{ @@ -13,7 +12,7 @@ use crate::ui::{ use gpui::prelude::*; use gpui::*; use gpui_component::{ - ActiveTheme, Icon, IconName, TitleBar, WindowExt, + ActiveTheme, IconName, TitleBar, WindowExt, button::{Button, ButtonVariants}, h_flex, scroll::ScrollableElement, @@ -26,23 +25,13 @@ pub struct ApplicationRoot { state: GlobalDeviceState, device_loading: bool, sidebar_width: Pixels, - refresh_button: Entity, config_view: Option>, passkeys_view: Option>, } impl ApplicationRoot { pub fn new(cx: &mut Context) -> Self { - let refresh_button = cx - .new(|_cx| PFIconButton::new(Icon::default().path("icons/refresh-cw.svg"), "Refresh")); - - cx.subscribe( - &refresh_button, - |this, _, _: &crate::ui::components::button::Clicked, cx| { - this.refresh_device_status(cx); - }, - ) - .detach(); + // We no longer need to create a persistent PFIconButton entity here let mut this = Self { active_view: ActiveView::Home, @@ -50,7 +39,6 @@ impl ApplicationRoot { state: GlobalDeviceState::new(), device_loading: false, sidebar_width: px(255.), - refresh_button, config_view: None, passkeys_view: None, }; @@ -129,15 +117,10 @@ impl Render for ApplicationRoot { .on_select(|this: &mut Self, view, _, _| { this.active_view = view; }) - .with_refresh_btn(self.refresh_button.clone()) - .with_refresh_btn_collapsed( - Button::new("refresh-btn-collapsed") - .ghost() - .child(Icon::default().path("icons/refresh-cw.svg")) - .on_click(cx.listener(|this, _, _, cx| { - this.refresh_device_status(cx); - })), - ) + // Here is the new connection: passing the refresh logic to the sidebar + .on_refresh(|this, _, cx| { + this.refresh_device_status(cx); + }) .render(cx), ) .child( diff --git a/src/ui/views/passkeys.rs b/src/ui/views/passkeys.rs index 065540b..32fbc27 100644 --- a/src/ui/views/passkeys.rs +++ b/src/ui/views/passkeys.rs @@ -1,6 +1,6 @@ use crate::device::io; use crate::device::types::{FidoDeviceInfo, FullDeviceStatus, StoredCredential}; -use crate::ui::components::{card::Card, page_view::PageView}; +use crate::ui::components::{card::Card, page_view::PageView, button::{PFButton, PFIconButton}}; use gpui::*; use gpui_component::button::{Button, ButtonVariants}; use gpui_component::{ @@ -275,9 +275,7 @@ impl PasskeysView { ), ) .child( - Button::new("change-pin-btn") - .outline() - .child(if pin_set { "Change PIN" } else { "Set PIN" }) + PFButton::new(if pin_set { "Change PIN" } else { "Set PIN" }) .on_click(listener), ) } @@ -315,10 +313,8 @@ impl PasskeysView { ), ) .child( - Button::new("update-pin-len-btn") - .outline() - .disabled(!pin_set) - .child("Update Minimum Length"), + PFButton::new("Update Minimum Length") + .disabled(!pin_set), ) } @@ -369,14 +365,11 @@ impl PasskeysView { ), ) .child( - Button::new("unlock-btn") - .child( - h_flex() - .gap_2() - .child(Icon::default().path("icons/lock-open.svg")) - .child("Unlock Storage"), - ) - .on_click(listener), + PFIconButton::new( + Icon::default().path("icons/lock-open.svg"), + "Unlock Storage", + ) + .on_click(listener), ), ) } @@ -444,16 +437,12 @@ impl PasskeysView { ), ) .child( - Button::new("lock-storage-btn") - .outline() - .small() - .child( - h_flex() - .gap_2() - .child(Icon::default().path("icons/lock.svg").size_3p5()) - .child("Lock Storage"), - ) - .on_click(lock_listener), + PFIconButton::new( + Icon::default().path("icons/lock.svg").size_3p5(), + "Lock Storage", + ) + .small() + .on_click(lock_listener), ), ) .child(if self.credentials.is_empty() { @@ -517,17 +506,15 @@ impl PasskeysView { .gap_2() .justify_end() .child( - Button::new("cancel-unlock") - .label("Cancel") + PFButton::new("Cancel") .on_click(cx.listener(|this, _, _, cx| { this.active_modal = None; cx.notify(); })) ) .child( - Button::new("confirm-unlock") - .primary() - .label("Unlock") + PFButton::new("Unlock") + // Primary/Zinc style is default .on_click(cx.listener(move |this, _, _, cx| { let pin = pin_input_clone.read(cx).text().to_string(); if !pin.is_empty() { @@ -552,17 +539,15 @@ impl PasskeysView { .gap_2() .justify_end() .child( - Button::new("cancel-del") - .label("Cancel") + PFButton::new("Cancel") .on_click(cx.listener(|this, _, _, cx| { this.active_modal = None; cx.notify(); })) ) .child( - Button::new("confirm-del") - .danger() - .label("Delete") + PFButton::new("Delete") + .with_colors(rgb(0x7f1d1d), rgb(0x991b1b), rgb(0xfca5a5)) // Danger colors .on_click(cx.listener(move |this, _, _, cx| { this.execute_delete(cred_id.clone(), pin_str.clone(), cx); this.active_modal = None; From 5d97c57f891e5a4a5175e48844c4d8722024b5ec Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 5 Feb 2026 18:10:43 +0530 Subject: [PATCH 30/37] feat(ui): Implement backend connection of passkeys ui --- src/ui/components/button.rs | 16 +- src/ui/components/card.rs | 2 + src/ui/components/sidebar.rs | 1 - src/ui/rootview.rs | 9 +- src/ui/views/config.rs | 12 - src/ui/views/passkeys.rs | 672 ++++++++++++++++++++++++----------- 6 files changed, 476 insertions(+), 236 deletions(-) diff --git a/src/ui/components/button.rs b/src/ui/components/button.rs index 06bb2a7..de6027b 100644 --- a/src/ui/components/button.rs +++ b/src/ui/components/button.rs @@ -1,4 +1,4 @@ -// TODO: convert this from an entity to a stateless button component. +#![allow(unused)] use crate::ui::colors; use gpui::prelude::*; @@ -12,6 +12,7 @@ use gpui_component::{ /// A stateless text button wrapper #[derive(IntoElement)] pub struct PFButton { + id: SharedString, text: SharedString, on_click: Option>, bg_color_start: Rgba, @@ -26,8 +27,10 @@ pub struct PFButton { impl PFButton { pub fn new(text: impl Into) -> Self { + let text = text.into(); Self { - text: text.into(), + id: text.clone(), + text, on_click: None, bg_color_start: rgb(0x1b1b1d), bg_color_hover: rgb(0x232325), @@ -40,6 +43,11 @@ impl PFButton { } } + pub fn id(mut self, id: impl Into) -> Self { + self.id = id.into(); + self + } + pub fn on_click( mut self, handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static, @@ -88,12 +96,11 @@ impl PFButton { } } -// RenderOnce makes this a "Component" not an "Entity" impl RenderOnce for PFButton { fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement { let text = self.text; - let mut btn = Button::new("pf-btn").custom( + let mut btn = Button::new(self.id).custom( ButtonCustomVariant::new(cx) .color(self.bg_color_start.into()) .hover(self.bg_color_hover.into()) @@ -123,7 +130,6 @@ impl RenderOnce for PFButton { }; if let Some(handler) = self.on_click { - // We cast the handler to satisfy GPUI's generic requirements btn = btn.on_click(move |e, w, c| handler(e, w, c)); } diff --git a/src/ui/components/card.rs b/src/ui/components/card.rs index 5f20fa9..6f8af78 100644 --- a/src/ui/components/card.rs +++ b/src/ui/components/card.rs @@ -1,3 +1,5 @@ +#![allow(unused)] + use gpui::*; use gpui_component::{ActiveTheme, Icon, Theme, h_flex, v_flex}; diff --git a/src/ui/components/sidebar.rs b/src/ui/components/sidebar.rs index f32158d..025f9d3 100644 --- a/src/ui/components/sidebar.rs +++ b/src/ui/components/sidebar.rs @@ -62,7 +62,6 @@ impl AppSidebar { let border_color = cx.theme().sidebar_border; let muted_foreground = cx.theme().muted_foreground; - // Clone for closures let on_refresh = self.on_refresh.clone(); let on_refresh_collapsed = self.on_refresh.clone(); diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index bd6b564..a6ca3df 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -11,6 +11,7 @@ use crate::ui::{ use gpui::prelude::*; use gpui::*; +use gpui_component::Root; use gpui_component::{ ActiveTheme, IconName, TitleBar, WindowExt, button::{Button, ButtonVariants}, @@ -31,8 +32,6 @@ pub struct ApplicationRoot { impl ApplicationRoot { pub fn new(cx: &mut Context) -> Self { - // We no longer need to create a persistent PFIconButton entity here - let mut this = Self { active_view: ActiveView::Home, collapsed: false, @@ -104,6 +103,8 @@ impl Render for ApplicationRoot { self.sidebar_width = target_width; } + let dialog_layer = Root::render_dialog_layer(window, cx); + div().size_full().overflow_hidden().child( h_flex() .size_full() @@ -117,7 +118,6 @@ impl Render for ApplicationRoot { .on_select(|this: &mut Self, view, _, _| { this.active_view = view; }) - // Here is the new connection: passing the refresh logic to the sidebar .on_refresh(|this, _, cx| { this.refresh_device_status(cx); }) @@ -211,7 +211,8 @@ impl Render for ApplicationRoot { } }), ), - ), + ) + .children(dialog_layer), ) } } diff --git a/src/ui/views/config.rs b/src/ui/views/config.rs index b1bc9a2..87e31cf 100644 --- a/src/ui/views/config.rs +++ b/src/ui/views/config.rs @@ -77,7 +77,6 @@ impl ConfigView { ) -> Self { let config = device_status.as_ref().map(|s| &s.config); - // Prepare Vendor Options let vendors: Vec = UsbIdentityPreset::all() .iter() .map(|preset| { @@ -89,7 +88,6 @@ impl ConfigView { }) .collect(); - // Prepare Driver Options let drivers: Vec = LedDriverType::all() .iter() .map(|driver| DriverSelectOption { @@ -98,7 +96,6 @@ impl ConfigView { }) .collect(); - // Determine Initial State let current_vid: SharedString = config .map(|c| c.vid.clone().into()) .unwrap_or_else(|| "CAFE".into()); @@ -116,11 +113,9 @@ impl ConfigView { .unwrap_or_else(|| "10".into()); let current_brightness = config.map(|c| c.led_brightness as f32).unwrap_or(8.0); - // Identify Preset let initial_preset = UsbIdentityPreset::from_vid_pid(¤t_vid, ¤t_pid); let is_custom_vendor = initial_preset == UsbIdentityPreset::Custom; - // Find index for the SelectState let initial_vendor_idx = UsbIdentityPreset::all() .iter() .position(|p| *p == initial_preset) @@ -143,7 +138,6 @@ impl ConfigView { let led_gpio_input = cx.new(|cx| InputState::new(window, cx).default_value(current_led_gpio.clone())); - // Identify Driver let current_driver_val = config.and_then(|c| c.led_driver).unwrap_or(0); let initial_driver_idx = LedDriverType::all() .iter() @@ -173,7 +167,6 @@ impl ConfigView { this.pid_input .update(cx, |input, cx| input.set_value(pid, window, cx)); } else { - // Custom selected this.is_custom_vendor = true; } cx.notify(); @@ -370,7 +363,6 @@ impl ConfigView { self.device_status = status.clone(); let config = status.as_ref().map(|s| &s.config); - // Update inputs let vid = config .map(|c| c.vid.clone()) .unwrap_or_else(|| "CAFE".into()); @@ -401,13 +393,11 @@ impl ConfigView { self.touch_timeout_input .update(cx, |input, cx| input.set_value(timeout, window, cx)); - // Update flags self.led_dimmable = config.map(|c| c.led_dimmable).unwrap_or(true); self.led_steady = config.map(|c| c.led_steady).unwrap_or(false); self.power_cycle = config.map(|c| c.power_cycle_on_reset).unwrap_or(false); self.enable_secp256k1 = config.map(|c| c.enable_secp256k1).unwrap_or(true); - // Update slider let brightness = config.map(|c| c.led_brightness as f32).unwrap_or(8.0); self.led_brightness_slider .update(cx, |slider, cx| slider.set_value(brightness, window, cx)); @@ -645,8 +635,6 @@ impl ConfigView { impl Render for ConfigView { fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { let theme = cx.theme(); - - // If not connected, show placeholder if self.device_status.is_none() { return PageView::build( "Configuration", diff --git a/src/ui/views/passkeys.rs b/src/ui/views/passkeys.rs index 32fbc27..8cfd9e6 100644 --- a/src/ui/views/passkeys.rs +++ b/src/ui/views/passkeys.rs @@ -1,12 +1,31 @@ use crate::device::io; use crate::device::types::{FidoDeviceInfo, FullDeviceStatus, StoredCredential}; -use crate::ui::components::{card::Card, page_view::PageView, button::{PFButton, PFIconButton}}; -use gpui::*; -use gpui_component::button::{Button, ButtonVariants}; -use gpui_component::{ - ActiveTheme, Disableable, Icon, Sizable, StyledExt, Theme, WindowExt, badge::Badge, h_flex, - input::Input, input::InputState, v_flex, +use crate::ui::components::{ + button::{PFButton, PFIconButton}, + card::Card, + page_view::PageView, }; +use gpui::*; +use gpui_component::button::{Button, ButtonVariant, ButtonVariants}; +use gpui_component::{ + ActiveTheme, Icon, Sizable, StyledExt, Theme, WindowExt, + badge::Badge, + h_flex, + input::{Input, InputState}, + slider::{Slider, SliderState}, + v_flex, +}; + +struct SliderLabel { + slider: Entity, +} + +impl Render for SliderLabel { + fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { + let val = self.slider.read(cx).value().start() as u8; + format!("Minimum PIN Length ({})", val) + } +} pub struct PasskeysView { device_status: Option, @@ -17,17 +36,6 @@ pub struct PasskeysView { loading: bool, _task: Option>, - active_modal: Option, -} - -pub enum ActiveModal { - Unlock(Entity), - Delete { - cred: StoredCredential, - pin: String, - }, - ChangePin, - MinPin, } pub enum PasskeysEvent { @@ -52,7 +60,6 @@ impl PasskeysView { cached_pin: None, loading: false, _task: None, - active_modal: None, } } @@ -79,7 +86,7 @@ impl PasskeysView { let entity = cx.entity().downgrade(); - cx.spawn(async move |_, cx| { + self._task = Some(cx.spawn(async move |_, cx| { let result = io::get_credentials(pin.clone()); let _ = entity.update(cx, |this, cx| { @@ -98,8 +105,7 @@ impl PasskeysView { } cx.notify(); }); - }) - .detach(); + })); } fn lock_storage(&mut self, cx: &mut Context) { @@ -109,12 +115,7 @@ impl PasskeysView { cx.notify(); } - fn execute_delete( - &mut self, - credential_id: String, - pin: String, - cx: &mut Context, - ) { + fn execute_delete(&mut self, credential_id: String, pin: String, cx: &mut Context) { if self.loading { return; } @@ -126,28 +127,27 @@ impl PasskeysView { self._task = Some(cx.spawn(async move |_, cx| { let result = io::delete_credential(pin.clone(), credential_id); - let _ = entity.update(cx, |this, cx| { - match result { - Ok(_) => { - // Refresh credentials - let _ = this.refresh_credentials(pin, cx); - cx.emit(PasskeysEvent::CloseDialog); - cx.emit(PasskeysEvent::Notification("Credential deleted".to_string())); - } - Err(e) => { - this.loading = false; - let msg = format!("Error deleting: {}", e); - cx.emit(PasskeysEvent::Notification(msg)); - cx.notify(); - } + let _ = entity.update(cx, |this, cx| match result { + Ok(_) => { + this.refresh_credentials(pin, cx); + cx.emit(PasskeysEvent::CloseDialog); + cx.emit(PasskeysEvent::Notification( + "Credential deleted".to_string(), + )); + } + Err(e) => { + this.loading = false; + let msg = format!("Error deleting: {}", e); + cx.emit(PasskeysEvent::Notification(msg)); + cx.notify(); } }); })); } - fn refresh_credentials(&mut self, pin: String, cx: &mut Context) -> Task<()> { + fn refresh_credentials(&mut self, pin: String, cx: &mut Context) { let entity = cx.entity().downgrade(); - cx.spawn(async move |_, cx| { + self._task = Some(cx.spawn(async move |_, cx| { let result = io::get_credentials(pin); let _ = entity.update(cx, |this, cx| { this.loading = false; @@ -156,37 +156,395 @@ impl PasskeysView { } cx.notify(); }); - }) + })); } fn open_unlock_dialog(&mut self, window: &mut Window, cx: &mut Context) { - let pin_input = cx.new(|cx| InputState::new(window, cx).placeholder("Enter FIDO PIN")); - self.active_modal = Some(ActiveModal::Unlock(pin_input)); - cx.notify(); + let pin_input = cx.new(|cx| { + InputState::new(window, cx) + .placeholder("Enter FIDO PIN") + .masked(true) + }); + let view_handle = cx.entity().downgrade(); + + window.open_dialog(cx, move |dialog, _, _| { + let view_handle_for_footer = view_handle.clone(); + let pin_input_for_footer = pin_input.clone(); + + dialog + .title("Unlock Storage") + .child( + v_flex() + .gap_4() + .child("Enter your device PIN to view saved passkeys") + .child(Input::new(&pin_input)), + ) + .footer(move |_, _, _, _| { + let view = view_handle_for_footer.clone(); + let input = pin_input_for_footer.clone(); + + vec![ + Button::new("cancel") + .label("Cancel") + .on_click(|_, window, cx| { + window.close_dialog(cx); + }), + Button::new("unlock").primary().label("Unlock").on_click( + move |_, _window, cx| { + let pin = input.read(cx).text().to_string(); + if !pin.is_empty() { + let _ = view.update(cx, |this, cx| { + this.unlock_storage(pin, cx); + }); + } + }, + ), + ] + }) + }); } fn open_delete_dialog( &mut self, cred: &StoredCredential, pin: String, - _window: &mut Window, + window: &mut Window, cx: &mut Context, ) { - self.active_modal = Some(ActiveModal::Delete { - cred: cred.clone(), - pin, + let cred_id = cred.credential_id.clone(); + let pin_str = pin.clone(); + let name = cred.rp_id.clone(); + let view_handle = cx.entity().downgrade(); + + window.open_dialog(cx, move |dialog, _, _| { + let view_handle = view_handle.clone(); + let cred_id = cred_id.clone(); + let pin_str = pin_str.clone(); + + dialog + .confirm() + .title("Delete Passkey") + .child(format!( + "Are you sure you want to delete the passkey for {}?", + name + )) + .on_ok(move |_, _, cx| { + let _ = view_handle.update(cx, |this, cx| { + this.execute_delete(cred_id.clone(), pin_str.clone(), cx); + }); + false + }) + .on_cancel(|_, _, _| true) + .button_props( + gpui_component::dialog::DialogButtonProps::default() + .ok_text("Delete") + .ok_variant(ButtonVariant::Danger), + ) }); - cx.notify(); } fn open_change_pin_dialog(&mut self, window: &mut Window, cx: &mut Context) { - // TODO: Implement Change PIN Dialog - // Placeholder for now - window.open_dialog(cx, |dialog, _, _| { - dialog - .title("Not Implemented") - .child("Change PIN dialog coming soon") + let current_pin = cx.new(|cx| { + InputState::new(window, cx) + .placeholder("Enter current PIN") + .masked(true) }); + let new_pin = cx.new(|cx| { + InputState::new(window, cx) + .placeholder("Enter new PIN") + .masked(true) + }); + let confirm_pin = cx.new(|cx| { + InputState::new(window, cx) + .placeholder("Confirm new PIN") + .masked(true) + }); + + let view_handle = cx.entity().downgrade(); + + window.open_dialog(cx, move |dialog, _, _| { + let view = view_handle.clone(); + let current = current_pin.clone(); + let new = new_pin.clone(); + let confirm = confirm_pin.clone(); + + dialog + .title("Change PIN") + .child("Enter your current PIN and choose a new one.") + .child( + v_flex() + .gap_4() + .child("Current PIN") + .child(Input::new(¤t)) + .child("New PIN") + .child(Input::new(&new)) + .child("Confirm New PIN") + .child(Input::new(&confirm)), + ) + .footer(move |_, _window, _cx, _| { + let view = view.clone(); + let current = current.clone(); + let new = new.clone(); + let confirm = confirm.clone(); + + vec![ + Button::new("cancel") + .label("Cancel") + .on_click(|_, window, cx| window.close_dialog(cx)), + Button::new("confirm").primary().label("Confirm").on_click( + move |_, _, cx| { + let current_val = current.read(cx).text().to_string(); + let new_val = new.read(cx).text().to_string(); + let confirm_val = confirm.read(cx).text().to_string(); + + if current_val.is_empty() { + return; + // Todo: show error + } + + if new_val != confirm_val { + // Todo: show validation error (toast?) + let _ = view.update(cx, |_, cx| { + cx.emit(PasskeysEvent::Notification( + "PINs do not match".to_string(), + )); + }); + return; + } + + if new_val.len() < 4 { + let _ = view.update(cx, |_, cx| { + cx.emit(PasskeysEvent::Notification( + "PIN too short".to_string(), + )); + }); + return; + } + + let _ = view.update(cx, |this, cx| { + this.change_pin(current_val, new_val, cx); + }); + }, + ), + ] + }) + }); + } + + fn open_min_pin_length_dialog(&mut self, window: &mut Window, cx: &mut Context) { + let current_min = self + .fido_info + .as_ref() + .map(|f| f.min_pin_length) + .unwrap_or(4); + + let slider = cx.new(|_| { + SliderState::new() + .min(4.0) + .max(63.0) + .step(1.0) + .default_value(current_min as f32) + }); + + let current_pin = cx.new(|cx| { + InputState::new(window, cx) + .placeholder("Enter current PIN") + .masked(true) + }); + let new_pin = cx.new(|cx| { + InputState::new(window, cx) + .placeholder("Enter new PIN") + .masked(true) + }); + let confirm_pin = cx.new(|cx| { + InputState::new(window, cx) + .placeholder("Confirm new PIN") + .masked(true) + }); + + // Create the label view + let label_view = cx.new(|_cx| SliderLabel { + slider: slider.clone(), + }); + + let view_handle = cx.entity().downgrade(); + + window.open_dialog(cx, move |dialog, _, _| { + let view = view_handle.clone(); + let current = current_pin.clone(); + let new = new_pin.clone(); + let confirm = confirm_pin.clone(); + let slider_handle = slider.clone(); + + dialog + .title("Update Minimum PIN Length") + .child( + "Set the minimum allowed PIN length (4-63 characters) and enter a new PIN that meets this requirement.", + ) + .child( + v_flex() + .gap_4() + .child( + v_flex() + .gap_2() + .child(label_view.clone()) + .child(Slider::new(&slider_handle)) + ) + .child("Current PIN") + .child(Input::new(¤t)) + .child( + v_flex() + .gap_2() + .child(format!("New PIN (min {} chars)", current_min)) + .child(Input::new(&new)) + ) + .child("Confirm New PIN") + .child(Input::new(&confirm)), + ) + .footer(move |_, _window, _cx, _| { + let view = view.clone(); + let current = current.clone(); + let new = new.clone(); + let confirm = confirm.clone(); + let slider = slider_handle.clone(); + + vec![ + Button::new("cancel") + .label("Cancel") + .on_click(|_, window, cx| window.close_dialog(cx)), + Button::new("update") + .primary() + .label("Update") + .on_click(move |_, _, cx| { + let current_val = current.read(cx).text().to_string(); + let new_val = new.read(cx).text().to_string(); + let confirm_val = confirm.read(cx).text().to_string(); + let min_len = slider.read(cx).value().start() as u8; + + if current_val.is_empty() { + return; + } + + if !new_val.is_empty() { + if new_val != confirm_val { + let _ = view.update(cx, |_, cx| { + cx.emit(PasskeysEvent::Notification("PINs do not match".to_string())); + }); + return; + } + if new_val.len() < min_len as usize { + let _ = view.update(cx, |_, cx| { + cx.emit(PasskeysEvent::Notification(format!("PIN must be at least {} characters", min_len))); + }); + return; + } + } + let _ = view.update(cx, |this, cx| { + this.update_min_length(current_val, min_len, new_val, cx); + }); + }), + ] + }) + }); + } + + fn change_pin(&mut self, current: String, new: String, cx: &mut Context) { + if self.loading { + return; + } + self.loading = true; + cx.notify(); + let entity = cx.entity().downgrade(); + + self._task = Some(cx.spawn(async move |_, cx| { + let result = io::change_fido_pin(Some(current), new); + let _ = entity.update(cx, |this, cx| { + this.loading = false; + match result { + Ok(msg) => { + cx.emit(PasskeysEvent::CloseDialog); + cx.emit(PasskeysEvent::Notification(msg)); + // Refresh device info + if let Ok(info) = io::get_fido_info() { + this.fido_info = Some(info); + } + } + Err(e) => { + cx.emit(PasskeysEvent::Notification(format!("Error: {}", e))); + } + } + cx.notify(); + }); + })); + } + + fn update_min_length( + &mut self, + current: String, + min_len: u8, + new_pin: String, + cx: &mut Context, + ) { + if self.loading { + return; + } + self.loading = true; + cx.notify(); + let entity = cx.entity().downgrade(); + + self._task = Some(cx.spawn(async move |_, cx| { + let res_len = io::set_min_pin_length(current.clone(), min_len); + + if let Err(e) = res_len { + let _ = entity.update(cx, |this, cx| { + this.loading = false; + cx.emit(PasskeysEvent::Notification(format!( + "Failed to set length: {}", + e + ))); + cx.notify(); + }); + return; + } + + if !new_pin.is_empty() { + let res_pin = io::change_fido_pin(Some(current), new_pin); + let _ = entity.update(cx, |this, cx| { + this.loading = false; + match res_pin { + Ok(_) => { + cx.emit(PasskeysEvent::CloseDialog); + cx.emit(PasskeysEvent::Notification( + "Minimum length and PIN updated".to_string(), + )); + if let Ok(info) = io::get_fido_info() { + this.fido_info = Some(info); + } + } + Err(e) => { + cx.emit(PasskeysEvent::Notification(format!( + "Length set, but PIN change failed: {}", + e + ))); + } + } + cx.notify(); + }); + } else { + let _ = entity.update(cx, |this, cx| { + this.loading = false; + cx.emit(PasskeysEvent::CloseDialog); + cx.emit(PasskeysEvent::Notification(format!( + "Minimum length updated to {}", + min_len + ))); + if let Ok(info) = io::get_fido_info() { + this.fido_info = Some(info); + } + cx.notify(); + }); + } + })); } fn render_no_device(&self, theme: &Theme) -> impl IntoElement { @@ -231,12 +589,7 @@ impl PasskeysView { .title("PIN Management") .icon(Icon::default().path("icons/key.svg")) .description("Configure FIDO2 PIN security") - .child( - v_flex() - .gap_4() - .child(status_row) - .child(min_len_row), - ) + .child(v_flex().gap_4().child(status_row).child(min_len_row)) } fn render_pin_status_row(&self, cx: &mut Context) -> impl IntoElement { @@ -276,6 +629,7 @@ impl PasskeysView { ) .child( PFButton::new(if pin_set { "Change PIN" } else { "Set PIN" }) + .id("change-pin-btn") .on_click(listener), ) } @@ -314,7 +668,11 @@ impl PasskeysView { ) .child( PFButton::new("Update Minimum Length") - .disabled(!pin_set), + .id("update-min-len-btn") + .disabled(!pin_set) + .on_click(cx.listener(|this, _, window, cx| { + this.open_min_pin_length_dialog(window, cx); + })), ) } @@ -360,9 +718,7 @@ impl PasskeysView { div() .text_color(theme.muted_foreground) .text_sm() - .child( - "Unlock your device to view and manage passkeys.", - ), + .child("Unlock your device to view and manage passkeys."), ) .child( PFIconButton::new( @@ -380,17 +736,6 @@ impl PasskeysView { this.lock_storage(cx); }); - // Prepare credential cards before getting theme - // We need to iterate self.credentials - // render_credential_card needs cx for listeners. - // It also needs theme. - // So render_credential_card must adhere to the pattern: create listeners, then get theme. - - // This is tricky for map. - // We can create a list of listeners first? - // Or simply `render_credential_card` should take `cx` and handle it. - // Yes, `render_credential_card(&self, cred, cx)`. - let mut cards = Vec::new(); for cred in &self.credentials { cards.push(self.render_credential_card(cred, cx).into_any_element()); @@ -446,7 +791,8 @@ impl PasskeysView { ), ) .child(if self.credentials.is_empty() { - self.render_empty_credentials_with_theme(theme).into_any_element() + self.render_empty_credentials_with_theme(theme) + .into_any_element() } else { div() .grid() @@ -457,8 +803,7 @@ impl PasskeysView { }), ) } - - // Rework layout of render_empty_credentials to take theme, assuming call site handles it. + fn render_empty_credentials_with_theme(&self, theme: &Theme) -> impl IntoElement { v_flex() .items_center() @@ -491,109 +836,15 @@ impl PasskeysView { ) } - fn render_modal(&self, cx: &mut Context) -> impl IntoElement { - if let Some(modal) = &self.active_modal { - let theme = cx.theme(); - let content = match modal { - ActiveModal::Unlock(pin_input) => { - let pin_input_clone = pin_input.clone(); - v_flex() - .gap_4() - .child("Enter your device PIN to view saved passkeys") - .child(Input::new(pin_input)) - .child( - h_flex() - .gap_2() - .justify_end() - .child( - PFButton::new("Cancel") - .on_click(cx.listener(|this, _, _, cx| { - this.active_modal = None; - cx.notify(); - })) - ) - .child( - PFButton::new("Unlock") - // Primary/Zinc style is default - .on_click(cx.listener(move |this, _, _, cx| { - let pin = pin_input_clone.read(cx).text().to_string(); - if !pin.is_empty() { - this.unlock_storage(pin, cx); - this.active_modal = None; // Manual close on success - cx.notify(); - } - })) - ) - ) - }, - ActiveModal::Delete { cred, pin } => { - let cred_id = cred.credential_id.clone(); - let pin_str = pin.clone(); - let name = cred.rp_id.clone(); - - v_flex() - .gap_4() - .child(format!("Are you sure you want to delete the passkey for {}?", name)) - .child( - h_flex() - .gap_2() - .justify_end() - .child( - PFButton::new("Cancel") - .on_click(cx.listener(|this, _, _, cx| { - this.active_modal = None; - cx.notify(); - })) - ) - .child( - PFButton::new("Delete") - .with_colors(rgb(0x7f1d1d), rgb(0x991b1b), rgb(0xfca5a5)) // Danger colors - .on_click(cx.listener(move |this, _, _, cx| { - this.execute_delete(cred_id.clone(), pin_str.clone(), cx); - this.active_modal = None; - cx.notify(); - })) - ) - ) - } - _ => div().child("Not Implemented"), - }; - - div() - .absolute() - .top_0() - .left_0() - .size_full() - .flex() - .items_center() - .justify_center() - .bg(gpui::black().opacity(0.5)) - .child( - div() - .w(px(400.0)) - .bg(theme.background) - .border_1() - .border_color(theme.border) - .rounded_lg() - .shadow_lg() - .p_6() - .child(content) - ) - .into_any_element() - } else { - div().into_any_element() - } - } - fn render_credential_card( &self, cred: &StoredCredential, cx: &mut Context, ) -> impl IntoElement { let cred_clone = cred.clone(); - + let delete_listener = cx.listener(move |this, _, window, cx| { - this.open_ask_delete_pin(cred_clone.clone(), window, cx); + this.open_ask_delete_pin(cred_clone.clone(), window, cx); }); let theme = cx.theme(); @@ -672,16 +923,14 @@ impl Render for PasskeysView { fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { let device_connected = self.device_status.is_some(); if !device_connected { - // Static render, need theme. - // Since we don't need listeners here, we can just get theme. - let theme = cx.theme(); // borrow cx - return - PageView::build( - "Passkeys", - "Manage your security PIN and the FIDO credentials (passkeys) stored on your device.", - self.render_no_device(theme).into_any_element(), - theme - ).into_any_element(); + let theme = cx.theme(); + return PageView::build( + "Passkeys", + "Manage your security PIN and the FIDO credentials (passkeys) stored on your device.", + self.render_no_device(theme).into_any_element(), + theme, + ) + .into_any_element(); } let has_fido = self @@ -690,39 +939,34 @@ impl Render for PasskeysView { .map(|s| s.method == crate::device::types::DeviceMethod::Fido) .unwrap_or(false) || self.fido_info.is_some(); - + if !has_fido { - let theme = cx.theme(); - return PageView::build( - "Passkeys", - "Manage your security PIN and the FIDO credentials (passkeys) stored on your device.", - self.render_not_supported(theme).into_any_element(), - theme - ).into_any_element(); + let theme = cx.theme(); + return PageView::build( + "Passkeys", + "Manage your security PIN and the FIDO credentials (passkeys) stored on your device.", + self.render_not_supported(theme).into_any_element(), + theme, + ) + .into_any_element(); } - // Main view - // 1. Render content (calls helpers which access cx for listeners and theme) let content = v_flex() - .gap_6() - .child(self.render_pin_management(cx)) - .child(self.render_stored_passkeys(cx)); - - // 2. Get theme for PageView wrapper + .gap_6() + .child(self.render_pin_management(cx)) + .child(self.render_stored_passkeys(cx)); + let theme = cx.theme(); - + div() .size_full() - .relative() // Critical for absolute modal - .child( - PageView::build( - "Passkeys", - "Manage your security PIN and the FIDO credentials (passkeys) stored on your device.", - content.into_any_element(), - theme, - ) - ) - .child(self.render_modal(cx)) + .relative() + .child(PageView::build( + "Passkeys", + "Manage your security PIN and the FIDO credentials (passkeys) stored on your device.", + content.into_any_element(), + theme, + )) .into_any_element() } } From 4ff3e9eeadaf058d896dc372bfad904cd6464c8d Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 5 Feb 2026 18:20:36 +0530 Subject: [PATCH 31/37] fix(ui): IO functions blocking ui thread in passkeys view --- src/ui/views/passkeys.rs | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/src/ui/views/passkeys.rs b/src/ui/views/passkeys.rs index 8cfd9e6..d724bb5 100644 --- a/src/ui/views/passkeys.rs +++ b/src/ui/views/passkeys.rs @@ -87,7 +87,11 @@ impl PasskeysView { let entity = cx.entity().downgrade(); self._task = Some(cx.spawn(async move |_, cx| { - let result = io::get_credentials(pin.clone()); + let pin_for_bg = pin.clone(); + let result = cx + .background_executor() + .spawn(async move { io::get_credentials(pin_for_bg) }) + .await; let _ = entity.update(cx, |this, cx| { this.loading = false; @@ -125,7 +129,11 @@ impl PasskeysView { let entity = cx.entity().downgrade(); self._task = Some(cx.spawn(async move |_, cx| { - let result = io::delete_credential(pin.clone(), credential_id); + let pin_for_bg = pin.clone(); + let result = cx + .background_executor() + .spawn(async move { io::delete_credential(pin_for_bg, credential_id) }) + .await; let _ = entity.update(cx, |this, cx| match result { Ok(_) => { @@ -148,7 +156,11 @@ impl PasskeysView { fn refresh_credentials(&mut self, pin: String, cx: &mut Context) { let entity = cx.entity().downgrade(); self._task = Some(cx.spawn(async move |_, cx| { - let result = io::get_credentials(pin); + let result = cx + .background_executor() + .spawn(async move { io::get_credentials(pin) }) + .await; + let _ = entity.update(cx, |this, cx| { this.loading = false; if let Ok(creds) = result { @@ -303,7 +315,7 @@ impl PasskeysView { } if new_val != confirm_val { - // Todo: show validation error (toast?) + // Todo: show validation error (toast) let _ = view.update(cx, |_, cx| { cx.emit(PasskeysEvent::Notification( "PINs do not match".to_string(), @@ -457,7 +469,11 @@ impl PasskeysView { let entity = cx.entity().downgrade(); self._task = Some(cx.spawn(async move |_, cx| { - let result = io::change_fido_pin(Some(current), new); + let result = cx + .background_executor() + .spawn(async move { io::change_fido_pin(Some(current), new) }) + .await; + let _ = entity.update(cx, |this, cx| { this.loading = false; match result { @@ -493,7 +509,12 @@ impl PasskeysView { let entity = cx.entity().downgrade(); self._task = Some(cx.spawn(async move |_, cx| { - let res_len = io::set_min_pin_length(current.clone(), min_len); + // 1. Set Min Length + let current_for_bg = current.clone(); + let res_len = cx + .background_executor() + .spawn(async move { io::set_min_pin_length(current_for_bg, min_len) }) + .await; if let Err(e) = res_len { let _ = entity.update(cx, |this, cx| { @@ -508,7 +529,10 @@ impl PasskeysView { } if !new_pin.is_empty() { - let res_pin = io::change_fido_pin(Some(current), new_pin); + let res_pin = cx + .background_executor() + .spawn(async move { io::change_fido_pin(Some(current), new_pin) }) + .await; let _ = entity.update(cx, |this, cx| { this.loading = false; match res_pin { From 9838dcf22dd0212522dd1ab5cd8d430786e7d2cf Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 5 Feb 2026 18:37:20 +0530 Subject: [PATCH 32/37] chore(ui): add borders to button component --- src/ui/components/button.rs | 33 ++++++++++++++++++++------------- src/ui/views/config.rs | 6 ------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/ui/components/button.rs b/src/ui/components/button.rs index de6027b..849d649 100644 --- a/src/ui/components/button.rs +++ b/src/ui/components/button.rs @@ -1,10 +1,11 @@ #![allow(unused)] use crate::ui::colors; +use gpui::Styled; use gpui::prelude::*; use gpui::*; use gpui_component::{ - Disableable, Icon, Sizable, Size, + ActiveTheme, Disableable, Icon, Sizable, Size, button::{Button, ButtonCustomVariant, ButtonVariants}, h_flex, }; @@ -100,12 +101,15 @@ impl RenderOnce for PFButton { fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement { let text = self.text; - let mut btn = Button::new(self.id).custom( - ButtonCustomVariant::new(cx) - .color(self.bg_color_start.into()) - .hover(self.bg_color_hover.into()) - .active(self.bg_color_active.into()), - ); + let mut btn = Button::new(self.id) + .custom( + ButtonCustomVariant::new(cx) + .color(self.bg_color_start.into()) + .hover(self.bg_color_hover.into()) + .active(self.bg_color_active.into()) + .border(cx.theme().border), + ) + .border_t_1(); if self.width_full { btn = btn.w_full(); @@ -209,12 +213,15 @@ impl RenderOnce for PFIconButton { let text = self.text; let icon = self.icon; - let mut btn = Button::new("pf-icon-btn").custom( - ButtonCustomVariant::new(cx) - .color(self.bg_color_start.into()) - .hover(self.bg_color_hover.into()) - .active(self.bg_color_active.into()), - ); + let mut btn = Button::new("pf-icon-btn") + .custom( + ButtonCustomVariant::new(cx) + .color(self.bg_color_start.into()) + .hover(self.bg_color_hover.into()) + .active(self.bg_color_active.into()) + .border(cx.theme().border), + ) + .border_t_1(); if self.width_full { btn = btn.w_full(); diff --git a/src/ui/views/config.rs b/src/ui/views/config.rs index 87e31cf..0206a5d 100644 --- a/src/ui/views/config.rs +++ b/src/ui/views/config.rs @@ -309,12 +309,6 @@ impl ConfigView { let method = status.method.clone(); self._task = Some(cx.spawn(async move |_, cx| { - use std::time::Duration; - - cx.background_executor() - .timer(Duration::from_millis(500)) - .await; - let result = io::write_config(changes, method, None); let _ = entity.update(cx, |this, cx| { From 22d1879508ce60b23a9e9377fdee53e5d54e31bc Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 5 Feb 2026 23:04:18 +0530 Subject: [PATCH 33/37] feat(ui): add font color customization to button component --- Cargo.lock | 56 ++++++++++--------------------------- Cargo.toml | 4 +-- src/ui/components/button.rs | 29 ++++++++++++++++++- src/ui/views/passkeys.rs | 10 ++++--- 4 files changed, 51 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 272f0d6..86f9a7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1114,19 +1114,6 @@ dependencies = [ "libc", ] -[[package]] -name = "core-graphics" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97" -dependencies = [ - "bitflags 2.10.0", - "core-foundation 0.10.0", - "core-graphics-types 0.2.0", - "foreign-types", - "libc", -] - [[package]] name = "core-graphics-helmer-fork" version = "0.24.0" @@ -1177,13 +1164,14 @@ dependencies = [ [[package]] name = "core-text" -version = "21.1.0" +version = "21.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce32d657e17d6e4a8e70fe2ae6875218015f320620a78e5949d228bc76622bd" +checksum = "a593227b66cbd4007b2a050dfdd9e1d1318311409c8d600dc82ba1b15ca9c130" dependencies = [ "core-foundation 0.10.0", - "core-graphics 0.25.0", + "core-graphics 0.24.0", "foreign-types", + "libc", ] [[package]] @@ -2370,13 +2358,14 @@ dependencies = [ [[package]] name = "gpui-component" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dda822a7bab4e0a08a4276ba68e2f82cc5855bf0b377d7b195c58c8061dc7d1" +checksum = "d021d46b4088d3d93a57ccdf443da85695a77272108caca2f6fe5369f584966a" dependencies = [ "aho-corasick", "anyhow", "chrono", + "core-text", "enum-iterator", "gpui", "gpui-component-macros", @@ -2409,9 +2398,9 @@ dependencies = [ [[package]] name = "gpui-component-macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581a8cd1e38b2fd86d1029dd56a3296ffd1388fda295054104d89923755de902" +checksum = "86fbc2d84bf91717b171320e6adc600d91ccb3ed259448f3b006787633c1c615" dependencies = [ "proc-macro2", "quote", @@ -4295,7 +4284,6 @@ dependencies = [ "serde_cbor_2", "serde_json", "thiserror 2.0.18", - "tokio", ] [[package]] @@ -6069,9 +6057,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.46" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9da98b7d9b7dad93488a84b8248efc35352b0b2657397d4167e7ad67e5d535e5" +checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" dependencies = [ "deranged", "itoa", @@ -6090,9 +6078,9 @@ checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" [[package]] name = "time-macros" -version = "0.2.26" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc610bac2dcee56805c99642447d4c5dbde4d01f752ffea0199aee1f601dc4" +checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" dependencies = [ "num-conv", "time-core", @@ -6167,25 +6155,11 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot", "pin-project-lite", - "signal-hook-registry", "socket2", - "tokio-macros", "windows-sys 0.61.2", ] -[[package]] -name = "tokio-macros" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.114", -] - [[package]] name = "tokio-rustls" version = "0.26.4" @@ -7574,9 +7548,9 @@ checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd" [[package]] name = "x509-parser" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3e137310115a65136898d2079f003ce33331a6c4b0d51f1531d1be082b6425" +checksum = "d43b0f71ce057da06bc0851b23ee24f3f86190b07203dd8f567d0b706a185202" dependencies = [ "asn1-rs", "data-encoding", diff --git a/Cargo.toml b/Cargo.toml index ebf1748..85fd529 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ license = "AGPL-3.0" edition = "2024" [dependencies] -tokio = { version = "1.49", features = ["full"] } +# tokio = { version = "1.49", features = ["full"] } serde = { version = "1", features = ["derive"] } serde_json = "1" log = "0.4" # Logging facade @@ -29,7 +29,7 @@ ring = "0.17" # For signing fido2 messages with pin token # For Application UI: gpui = { version = "0.2.2", features = [] } -gpui-component = "0.5.0" +gpui-component = "0.5.1" rust-embed = "8.11.0" [profile.dev] diff --git a/src/ui/components/button.rs b/src/ui/components/button.rs index 849d649..d8d3175 100644 --- a/src/ui/components/button.rs +++ b/src/ui/components/button.rs @@ -24,6 +24,7 @@ pub struct PFButton { disabled: bool, small: bool, loading: bool, + text_color: Option, } impl PFButton { @@ -41,6 +42,7 @@ impl PFButton { disabled: false, small: false, loading: false, + text_color: None, } } @@ -65,6 +67,11 @@ impl PFButton { self } + pub fn with_text_color(mut self, color: Rgba) -> Self { + self.text_color = Some(color); + self + } + pub fn section_header(mut self) -> Self { self.width_full = true; self.centered = false; @@ -133,6 +140,12 @@ impl RenderOnce for PFButton { h_flex().child(text) }; + let content = if let Some(color) = self.text_color { + content.text_color(color) + } else { + content + }; + if let Some(handler) = self.on_click { btn = btn.on_click(move |e, w, c| handler(e, w, c)); } @@ -154,6 +167,7 @@ pub struct PFIconButton { small: bool, width_full: bool, loading: bool, + text_color: Option, } impl PFIconButton { @@ -169,6 +183,7 @@ impl PFIconButton { small: false, width_full: false, loading: false, + text_color: None, } } @@ -187,6 +202,11 @@ impl PFIconButton { self } + pub fn with_text_color(mut self, color: Rgba) -> Self { + self.text_color = Some(color); + self + } + pub fn disabled(mut self, disabled: bool) -> Self { self.disabled = disabled; self @@ -243,6 +263,13 @@ impl RenderOnce for PFIconButton { btn = btn.on_click(move |e, w, c| handler(e, w, c)); } - btn.child(h_flex().gap_2().justify_center().child(icon).child(text)) + let content = h_flex().gap_2().justify_center().child(icon).child(text); + let content = if let Some(color) = self.text_color { + content.text_color(color) + } else { + content + }; + + btn.child(content) } } diff --git a/src/ui/views/passkeys.rs b/src/ui/views/passkeys.rs index d724bb5..7b3fdd4 100644 --- a/src/ui/views/passkeys.rs +++ b/src/ui/views/passkeys.rs @@ -722,13 +722,13 @@ impl PasskeysView { v_flex() .items_center() .justify_center() - .gap_4() - .py_8() + .gap_3() + .py_3() .child( div().rounded_full().bg(theme.muted).p_4().child( Icon::default() .path("icons/shield.svg") - .size_8() + .size_12() .text_color(theme.muted_foreground), ), ) @@ -749,7 +749,9 @@ impl PasskeysView { Icon::default().path("icons/lock-open.svg"), "Unlock Storage", ) - .on_click(listener), + .on_click(listener) + .with_colors(rgb(0xe4e4e7), rgb(0xd0d0d3), rgb(0xe4e4e7)) + .with_text_color(rgb(0x18181b)), ), ) } From 1814a36c23b57456c4b9409299902954b830636e Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Thu, 5 Feb 2026 23:35:59 +0530 Subject: [PATCH 34/37] feat(ui): application logging output to logsview --- src/logging.rs | 69 ++++++++++++++++++++++-- src/ui/rootview.rs | 7 ++- src/ui/views/logs.rs | 122 +++++++++++++++++++------------------------ 3 files changed, 124 insertions(+), 74 deletions(-) diff --git a/src/logging.rs b/src/logging.rs index e11774a..7586cf1 100644 --- a/src/logging.rs +++ b/src/logging.rs @@ -1,7 +1,9 @@ use directories::ProjectDirs; use log::LevelFilter; +use log::Record; use log4rs::{ append::{ + Append, console::{ConsoleAppender, Target}, rolling_file::{ RollingFileAppender, @@ -11,9 +13,57 @@ use log4rs::{ }, }, config::{Appender, Logger, Root}, - encode::pattern::PatternEncoder, + encode::{Encode, Write, pattern::PatternEncoder}, }; use std::fs; +use std::sync::{Arc, Mutex, OnceLock}; + +pub static LOG_BUFFER: OnceLock>>> = OnceLock::new(); + +struct SimpleWriter(Vec); + +impl std::io::Write for SimpleWriter { + fn write(&mut self, buf: &[u8]) -> std::io::Result { + self.0.extend_from_slice(buf); + Ok(buf.len()) + } + + fn flush(&mut self) -> std::io::Result<()> { + Ok(()) + } +} + +impl Write for SimpleWriter {} + +#[derive(Debug)] +struct BufferAppender { + encoder: Box, +} + +impl BufferAppender { + pub fn new(encoder: Box) -> Self { + Self { encoder } + } +} + +impl Append for BufferAppender { + fn append(&self, record: &Record) -> anyhow::Result<()> { + let mut writer = SimpleWriter(Vec::new()); + self.encoder.encode(&mut writer, record)?; + let log = String::from_utf8(writer.0)?; + + let buffer = LOG_BUFFER.get_or_init(|| Arc::new(Mutex::new(Vec::new()))); + if let Ok(mut logs) = buffer.lock() { + if logs.len() >= 1000 { + logs.remove(0); + } + logs.push(log); + } + Ok(()) + } + + fn flush(&self) {} +} /// Initializes log4rs with custom configuration for stdout and file logging. pub fn logger_init() { @@ -21,7 +71,8 @@ pub fn logger_init() { let org = "suyogtandel"; let app = "picoforge"; - // Determine the log file path using ProjectDirs for cross-platform compatibility + LOG_BUFFER.get_or_init(|| Arc::new(Mutex::new(Vec::new()))); + let log_file_path = { let log_dir = if let Some(proj_dirs) = ProjectDirs::from(qual, org, app) { proj_dirs.data_local_dir().join("logs") @@ -58,6 +109,11 @@ pub fn logger_init() { ))) .build(); + // Buffer Appender + let buffer_appender = BufferAppender::new(Box::new(PatternEncoder::new( + "[{d(%Y-%m-%d %H:%M:%S %Z)} {l} {t}] {m}{n}", + ))); + let app_level = if cfg!(debug_assertions) { LevelFilter::Trace } else { @@ -67,13 +123,18 @@ pub fn logger_init() { let config = log4rs::Config::builder() .appender(Appender::builder().build("stdout", Box::new(stdout))) .appender(Appender::builder().build("logfile", Box::new(logfile))) - .logger(Logger::builder().build("picoforge", app_level)) + .appender(Appender::builder().build("buffer", Box::new(buffer_appender) as Box)) + .logger( + Logger::builder() + .appenders(["stdout", "logfile", "buffer"]) + .build("picoforge", app_level), + ) .logger(Logger::builder().build("gpui", LevelFilter::Error)) .logger(Logger::builder().build("gpui_component", LevelFilter::Error)) .logger(Logger::builder().build("blade_graphics", LevelFilter::Error)) .build( Root::builder() - .appenders(vec!["logfile", "stdout"]) + .appenders(vec!["logfile", "stdout", "buffer"]) .build(LevelFilter::Error), ) .unwrap(); diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index a6ca3df..fef01b4 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -28,6 +28,7 @@ pub struct ApplicationRoot { sidebar_width: Pixels, config_view: Option>, passkeys_view: Option>, + logs_view: Option>, } impl ApplicationRoot { @@ -40,6 +41,7 @@ impl ApplicationRoot { sidebar_width: px(255.), config_view: None, passkeys_view: None, + logs_view: None, }; this.refresh_device_status(cx); this @@ -204,7 +206,10 @@ impl Render for ApplicationRoot { SecurityView::build(cx).into_any_element() } ActiveView::Logs => { - cx.new(|cx| LogsView::new(window, cx)).into_any_element() + let view = self.logs_view.get_or_insert_with(|| { + cx.new(|cx| LogsView::new(window, cx)) + }); + view.clone().into_any_element() } ActiveView::About => { AboutView::build(cx.theme()).into_any_element() diff --git a/src/ui/views/logs.rs b/src/ui/views/logs.rs index 40f83f8..bcc6c94 100644 --- a/src/ui/views/logs.rs +++ b/src/ui/views/logs.rs @@ -1,52 +1,56 @@ +use crate::logging::LOG_BUFFER; use crate::ui::components::page_view::PageView; use gpui::*; use gpui_component::{ ActiveTheme, Icon, button::Button, h_flex, scroll::ScrollableElement, v_flex, }; -#[derive(Clone, Copy, Debug, PartialEq)] -pub enum LogType { - Success, - Error, - Warning, - Info, -} - -#[derive(Clone, Debug)] -pub struct LogEntry { - pub timestamp: String, - pub level: LogType, - pub message: String, -} - pub struct LogsView { - logs: Vec, + logs: Vec, } impl LogsView { - pub fn new(_window: &mut Window, _cx: &mut Context) -> Self { - Self { - logs: vec![ - LogEntry { - timestamp: "16:03:42".to_string(), // Placeholder - level: LogType::Info, - message: "Application started.".to_string(), - }, - LogEntry { - timestamp: "16:03:42".to_string(), - level: LogType::Info, - message: "Attempting to connect to device...".to_string(), - }, - LogEntry { - timestamp: "16:03:43".to_string(), - level: LogType::Success, - message: "Device Connected! Serial: 4490838745737CC0, FW: v7.2".to_string(), - }, - ], + pub fn new(_window: &mut Window, cx: &mut Context) -> Self { + let view_weak = cx.entity().downgrade(); + let mut cx_async = cx.to_async(); + + cx.spawn(async move |_, _| { + loop { + cx_async + .background_executor() + .timer(std::time::Duration::from_millis(250)) + .await; + + if let Some(view) = view_weak.upgrade() { + view.update(&mut cx_async, |view, cx| { + view.sync_logs(); + cx.notify(); + }) + .ok(); + } else { + break; + } + } + }) + .detach(); + + Self { logs: Vec::new() } + } + + fn sync_logs(&mut self) { + if let Some(buffer) = LOG_BUFFER.get() { + if let Ok(logs) = buffer.lock() { + self.logs = logs.clone(); + } } } fn clear(&mut self, cx: &mut Context) { + if let Some(buffer) = LOG_BUFFER.get() { + if let Ok(mut logs) = buffer.lock() { + logs.clear(); + } + } self.logs.clear(); cx.notify(); } @@ -105,40 +109,20 @@ impl Render for LogsView { .overflow_y_scrollbar() .flex_1() .h(px(500.0)) - .child(div().p_4().font_family("Mono").text_sm().child({ - let theme = theme.clone(); // Clone for closure - v_flex().gap_1().children(self.logs.iter().map(move |log| { - div() - .flex() - .gap_3() - .child( - div() - .text_color(theme.muted_foreground) - .flex_shrink_0() - .child(format!("[{}]", log.timestamp)), - ) - .child( - div() - .whitespace_normal() - .text_color(match log.level { - LogType::Success => gpui::green(), - LogType::Error => gpui::red(), - LogType::Warning => gpui::yellow(), - LogType::Info => gpui::white(), - }) - .child(format!( - "{} {}", - match log.level { - LogType::Success => "➜", - LogType::Error => "✖", - LogType::Warning => "⚠", - LogType::Info => "", - }, - log.message - )), - ) - })) - })) + .child(div().p_4().font_family("Mono").text_sm().child( + v_flex().gap_1().children(self.logs.iter().map(|log| { + // Simple heuristic for color + let color = if log.contains("ERROR") { + gpui::red() + } else if log.contains("WARN") { + gpui::yellow() + } else { + theme.foreground + }; + + div().text_color(color).child(log.clone()) + })), + )) .into_any_element() }), ), From 9aac13c8b506fb9351ffbe98c322529d1077cc42 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Sun, 8 Feb 2026 16:43:09 +0530 Subject: [PATCH 35/37] fix(ui): inconsistencies in cards --- .cargo/config.toml | 2 ++ Cargo.toml | 3 --- src/logging.rs | 1 + src/main.rs | 4 ++-- src/ui/components/button.rs | 2 +- src/ui/components/sidebar.rs | 1 + src/ui/rootview.rs | 9 ++++++--- src/ui/views/config.rs | 7 +++++-- src/ui/views/home.rs | 14 ++++++++++---- src/ui/views/logs.rs | 15 +++++++-------- src/ui/views/passkeys.rs | 22 +++++++++++++++++++++- 11 files changed, 56 insertions(+), 24 deletions(-) create mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 0000000..e565974 --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,2 @@ +[alias] +run-watch = "watch -c -x check -x run" \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 85fd529..43e0a4e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,6 +43,3 @@ lto = true # Enables link-time-optimizations however is not stable. opt-level = 3 # Prioritizes speed. Use `z` if you prefer small binary size. panic = "abort" # Higher performance by disabling panic handlers. strip = true # Ensures debug symbols are removed. - -[alias] -run-watch = "watch -c -x check -x run" diff --git a/src/logging.rs b/src/logging.rs index 7586cf1..dd85049 100644 --- a/src/logging.rs +++ b/src/logging.rs @@ -127,6 +127,7 @@ pub fn logger_init() { .logger( Logger::builder() .appenders(["stdout", "logfile", "buffer"]) + .additive(false) .build("picoforge", app_level), ) .logger(Logger::builder().build("gpui", LevelFilter::Error)) diff --git a/src/main.rs b/src/main.rs index f25424c..3e12f68 100644 --- a/src/main.rs +++ b/src/main.rs @@ -11,9 +11,9 @@ pub mod logging; mod ui; // NOTE: Hey this is me lockedmutex, right now the code quality of the entire ui module is shit okay, and this is because -// AI has been used to convert most of the frontend code from svelte+typescript to GPUI, while it has done most of the conversion +// AI has been used to convert most of the frontend code from svelte+typescript to GPUI, while it has done most of the conversion, // due to lack in complete context of code and the way it is structured, it has done a shit job. I did make a lot of changes to -// the code by myself so it is not complete AI slop. Right now I am trading development time with code quality, I will later +// the code by myself, so it is not complete AI slop. Right now I am trading development time with code quality, I will later // improve the code quality and correctly categorize the code into individial components. fn main() { logging::logger_init(); diff --git a/src/ui/components/button.rs b/src/ui/components/button.rs index d8d3175..7a5e4ae 100644 --- a/src/ui/components/button.rs +++ b/src/ui/components/button.rs @@ -241,7 +241,7 @@ impl RenderOnce for PFIconButton { .active(self.bg_color_active.into()) .border(cx.theme().border), ) - .border_t_1(); + .border_t_2(); if self.width_full { btn = btn.w_full(); diff --git a/src/ui/components/sidebar.rs b/src/ui/components/sidebar.rs index 025f9d3..63aab00 100644 --- a/src/ui/components/sidebar.rs +++ b/src/ui/components/sidebar.rs @@ -173,6 +173,7 @@ impl AppSidebar { .w_full() .bg(rgb(0x111113)) .border_r_1() + .border_t_1() .border_color(border_color) .p_2() .gap_3() diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index fef01b4..0a7dcd6 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -155,9 +155,12 @@ impl Render for ApplicationRoot { .flex_grow() .bg(cx.theme().background) .child(match self.active_view { - ActiveView::Home => { - HomeView::build(&self.state, cx.theme()).into_any_element() - } + ActiveView::Home => HomeView::build( + &self.state, + cx.theme(), + window.bounds().size.width, + ) + .into_any_element(), ActiveView::Passkeys => { let view = self.passkeys_view.get_or_insert_with(|| { let view = cx.new(|cx| { diff --git a/src/ui/views/config.rs b/src/ui/views/config.rs index 0206a5d..282a76e 100644 --- a/src/ui/views/config.rs +++ b/src/ui/views/config.rs @@ -627,7 +627,7 @@ impl ConfigView { } impl Render for ConfigView { - fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { + fn render(&mut self, window: &mut Window, cx: &mut Context) -> impl IntoElement { let theme = cx.theme(); if self.device_status.is_none() { return PageView::build( @@ -655,6 +655,9 @@ impl Render for ConfigView { let identity_card = self.render_identity_card(theme).into_any_element(); let touch_card = self.render_touch_card(theme).into_any_element(); + let is_wide = window.bounds().size.width > px(1100.0); + let columns = if is_wide { 2 } else { 1 }; + PageView::build( "Configuration", "Customize device settings and behavior.", @@ -663,7 +666,7 @@ impl Render for ConfigView { .child( div() .grid() - .grid_cols(2) + .grid_cols(columns) .gap_6() .child(identity_card) .child(led_card) diff --git a/src/ui/views/home.rs b/src/ui/views/home.rs index 3fc0cd5..bbd2975 100644 --- a/src/ui/views/home.rs +++ b/src/ui/views/home.rs @@ -8,8 +8,14 @@ use gpui_component::{Icon, IconName, Theme, badge::Badge, h_flex, progress::Prog pub struct HomeView; impl HomeView { - pub fn build(state: &GlobalDeviceState, theme: &Theme) -> impl IntoElement { + pub fn build( + state: &GlobalDeviceState, + theme: &Theme, + window_width: Pixels, + ) -> impl IntoElement { let connected = state.device_status.is_some(); + let is_wide = window_width > px(1100.0); + let columns = if is_wide { 2 } else { 1 }; PageView::build( "Device Overview", @@ -31,10 +37,10 @@ impl HomeView { ) .into_any_element() } else { - // 4 Card Grid + // Card Grid div() .grid() - .grid_cols(2) + .grid_cols(columns) .gap_6() .child(Self::render_device_info(state, theme)) .child(Self::render_fido_info(state, theme)) @@ -107,7 +113,7 @@ impl HomeView { )) .child(Self::render_kv( "VID:PID", - format!("{}, {}", config.vid, config.pid), + format!("{}:{}", config.vid, config.pid), theme, true, )) diff --git a/src/ui/views/logs.rs b/src/ui/views/logs.rs index bcc6c94..ac29765 100644 --- a/src/ui/views/logs.rs +++ b/src/ui/views/logs.rs @@ -70,13 +70,6 @@ impl Render for LogsView { v_flex() .gap_4() .h_full() - .child( - h_flex().justify_end().child( - Button::new("clear_logs") - .label("Clear Logs") - .on_click(clear_listener), - ), - ) .child( div() .flex_1() @@ -111,7 +104,6 @@ impl Render for LogsView { .h(px(500.0)) .child(div().p_4().font_family("Mono").text_sm().child( v_flex().gap_1().children(self.logs.iter().map(|log| { - // Simple heuristic for color let color = if log.contains("ERROR") { gpui::red() } else if log.contains("WARN") { @@ -125,6 +117,13 @@ impl Render for LogsView { )) .into_any_element() }), + ) + .child( + h_flex().justify_end().child( + Button::new("clear_logs") + .label("Clear Logs") + .on_click(clear_listener), + ), ), theme, ) diff --git a/src/ui/views/passkeys.rs b/src/ui/views/passkeys.rs index 7b3fdd4..04b4f21 100644 --- a/src/ui/views/passkeys.rs +++ b/src/ui/views/passkeys.rs @@ -889,6 +889,8 @@ impl PasskeysView { h_flex() .gap_3() .items_center() + .flex_1() + .min_w_0() .child( div() .size_10() @@ -906,11 +908,29 @@ impl PasskeysView { ) .child( v_flex() - .child(div().font_semibold().child(cred.rp_name.clone())) + .min_w_0() + .overflow_hidden() + .child( + div() + .font_semibold() + .whitespace_nowrap() + .overflow_hidden() + .text_ellipsis() + .child(if !cred.rp_name.is_empty() { + cred.rp_name.clone() + } else if !cred.rp_id.is_empty() { + cred.rp_id.clone() + } else { + "Unknown Service".to_string() + }), + ) .child( div() .text_sm() .text_color(theme.muted_foreground) + .whitespace_nowrap() + .overflow_hidden() + .text_ellipsis() .child(cred.user_name.clone()), ), ), From 430aec1f3429ee8b89470f78d6db8c22c5de7db4 Mon Sep 17 00:00:00 2001 From: Suyog Tandel Date: Sun, 8 Feb 2026 18:05:18 +0530 Subject: [PATCH 36/37] chore(ui): fix unused code and make io functions async --- src/device/io.rs | 6 ++++-- src/ui/rootview.rs | 16 +++++++++------- src/ui/views/config.rs | 23 ++--------------------- src/ui/views/passkeys.rs | 15 +++++++-------- 4 files changed, 22 insertions(+), 38 deletions(-) diff --git a/src/device/io.rs b/src/device/io.rs index 6cc2a44..669f5b0 100644 --- a/src/device/io.rs +++ b/src/device/io.rs @@ -1,4 +1,6 @@ //! Tauri Commands to interact with the pico-fido firmware via rescue and fido protocols. +#![allow(unused)] + use crate::{device::error::PFError, device::fido, device::rescue, device::types::*}; pub fn read_device_details() -> Result { @@ -11,7 +13,7 @@ pub fn read_device_details() -> Result { } } -pub fn write_config( +pub async fn write_config( config: AppConfigInput, method: DeviceMethod, pin: Option, @@ -49,7 +51,7 @@ pub fn reboot(to_bootsel: bool) -> Result { rescue::reboot_device(to_bootsel) } -pub fn get_credentials(pin: String) -> Result, String> { +pub async fn get_credentials(pin: String) -> Result, String> { fido::get_credentials(pin) } diff --git a/src/ui/rootview.rs b/src/ui/rootview.rs index 0a7dcd6..84c990d 100644 --- a/src/ui/rootview.rs +++ b/src/ui/rootview.rs @@ -43,11 +43,11 @@ impl ApplicationRoot { passkeys_view: None, logs_view: None, }; - this.refresh_device_status(cx); + this.refresh_device_status(None, cx); this } - fn refresh_device_status(&mut self, cx: &mut Context) { + fn refresh_device_status(&mut self, window: Option<&mut Window>, cx: &mut Context) { if self.device_loading { return; } @@ -72,9 +72,11 @@ impl ApplicationRoot { } if let Some(config_view) = &self.config_view { - config_view.update(cx, |view, cx| { - view.update_device_status(Some(status.clone()), cx); - }); + if let Some(window) = window { + config_view.update(cx, |view, cx| { + view.update_device_status(Some(status.clone()), window, cx); + }); + } } if let Some(passkeys_view) = &self.passkeys_view { @@ -120,8 +122,8 @@ impl Render for ApplicationRoot { .on_select(|this: &mut Self, view, _, _| { this.active_view = view; }) - .on_refresh(|this, _, cx| { - this.refresh_device_status(cx); + .on_refresh(|this, window, cx| { + this.refresh_device_status(Some(window), cx); }) .render(cx), ) diff --git a/src/ui/views/config.rs b/src/ui/views/config.rs index 282a76e..58116e7 100644 --- a/src/ui/views/config.rs +++ b/src/ui/views/config.rs @@ -309,7 +309,7 @@ impl ConfigView { let method = status.method.clone(); self._task = Some(cx.spawn(async move |_, cx| { - let result = io::write_config(changes, method, None); + let result = io::write_config(changes, method, None).await; let _ = entity.update(cx, |this, cx| { this.loading = false; @@ -345,7 +345,7 @@ impl ConfigView { })); } - pub fn update_status( + pub(crate) fn update_device_status( &mut self, status: Option, window: &mut Window, @@ -399,25 +399,6 @@ impl ConfigView { cx.notify(); } - pub(crate) fn update_device_status( - &mut self, - status: Option, - cx: &mut Context, - ) { - if self.device_status == status { - return; - } - self.device_status = status.clone(); - let config = status.as_ref().map(|s| &s.config); - - self.led_dimmable = config.map(|c| c.led_dimmable).unwrap_or(true); - self.led_steady = config.map(|c| c.led_steady).unwrap_or(false); - self.power_cycle = config.map(|c| c.power_cycle_on_reset).unwrap_or(false); - self.enable_secp256k1 = config.map(|c| c.enable_secp256k1).unwrap_or(true); - - cx.notify(); - } - fn render_identity_card(&self, theme: &Theme) -> impl IntoElement { let content = v_flex() .gap_4() diff --git a/src/ui/views/passkeys.rs b/src/ui/views/passkeys.rs index 04b4f21..f3517c6 100644 --- a/src/ui/views/passkeys.rs +++ b/src/ui/views/passkeys.rs @@ -88,10 +88,12 @@ impl PasskeysView { self._task = Some(cx.spawn(async move |_, cx| { let pin_for_bg = pin.clone(); - let result = cx - .background_executor() - .spawn(async move { io::get_credentials(pin_for_bg) }) - .await; + // let result = cx + // .background_executor() + // .spawn(async move { io::get_credentials(pin_for_bg) }) + // .await; + + let result = io::get_credentials(pin_for_bg).await; let _ = entity.update(cx, |this, cx| { this.loading = false; @@ -156,10 +158,7 @@ impl PasskeysView { fn refresh_credentials(&mut self, pin: String, cx: &mut Context) { let entity = cx.entity().downgrade(); self._task = Some(cx.spawn(async move |_, cx| { - let result = cx - .background_executor() - .spawn(async move { io::get_credentials(pin) }) - .await; + let result = io::get_credentials(pin).await; let _ = entity.update(cx, |this, cx| { this.loading = false; From bfd8a563edb101344f285eec6814a8839e567b06 Mon Sep 17 00:00:00 2001 From: jetcookies <226018678+jetcookies@users.noreply.github.com> Date: Tue, 10 Feb 2026 18:54:16 +0800 Subject: [PATCH 37/37] build(package.nix): 0.3.0 -> 0.3.1-unstable-2026-02-08 migrate from Tauri to gpui https://github.com/librekeys/picoforge/pull/50 --- package.nix | 88 ++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/package.nix b/package.nix index a24323e..0b5d8b0 100644 --- a/package.nix +++ b/package.nix @@ -1,81 +1,80 @@ { lib, + stdenv, rustPlatform, - buildNpmPackage, fetchFromGitHub, makeDesktopItem, pkg-config, - cargo-tauri, - wrapGAppsHook3, copyDesktopItems, + makeWrapper, - glib, - gtk3, - openssl, + hidapi, pcsclite, udev, - webkitgtk_4_1, + alsa-lib, + libxkbcommon, + wayland, + libGL, + vulkan-loader, + libx11, + libxcb, + + withGLES ? false, }: +assert withGLES -> stdenv.hostPlatform.isLinux; rustPlatform.buildRustPackage (finalAttrs: { pname = "picoforge"; - version = "0.3.0"; + version = "0.3.1-unstable-2026-02-08"; src = fetchFromGitHub { owner = "librekeys"; repo = "picoforge"; - rev = "v${finalAttrs.version}"; - hash = "sha256-26UGHCzpN14UTsSQ7gIeRh/Qv0ze03BXTjvp4tdflo8="; + rev = "430aec1f3429ee8b89470f78d6db8c22c5de7db4"; + hash = "sha256-BWLLmINoKC+nIuY8KWfzhOnYtuo2KrbHd2jdappPyuE="; }; - cargoRoot = "src-tauri"; - buildAndTestSubdir = finalAttrs.cargoRoot; - - cargoHash = "sha256-DB54egPebUniP/yjEZc+/AY9vOChJRBA+tqnbISmEgg="; - - postPatch = '' - sed -i src-tauri/tauri.conf.json -e '/beforeBuildCommand/d' - ''; + cargoHash = "sha256-be0ycwwDxlBaKxQsTGidZC0loFh91HXMpr0jMHfbAd4="; nativeBuildInputs = [ pkg-config - cargo-tauri.hook - wrapGAppsHook3 copyDesktopItems + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + makeWrapper ]; + gpu-lib = if withGLES then libGL else vulkan-loader; + buildInputs = [ - glib - gtk3 - openssl + hidapi pcsclite udev - webkitgtk_4_1 + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libxkbcommon + wayland + finalAttrs.gpu-lib + libx11 + libxcb ]; - frontendDist = buildNpmPackage { - name = "${finalAttrs.pname}-${finalAttrs.version}-frontend-dist"; - inherit (finalAttrs) src; - - npmDepsHash = "sha256-7DLooiGLzk3JRsKAftOxSf7HAgHBXCJDaAFp2p/pryc="; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r build/* $out - - runHook postInstall - ''; - }; - - preBuild = '' - cp -r ${finalAttrs.frontendDist} build + postInstall = '' + install -Dm644 ${finalAttrs.src}/static/appIcons/in.suyogtandel.picoforge.svg $out/share/icons/hicolor/scalable/apps/picoforge.svg ''; - postInstall = '' - install -Dm644 ${finalAttrs.src}/static/in.suyogtandel.picoforge.svg $out/share/icons/hicolor/scalable/apps/picoforge.svg + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + wrapProgram $out/bin/picoforge --prefix LD_LIBRARY_PATH : "${ + lib.makeLibraryPath [ + wayland + libxkbcommon + finalAttrs.gpu-lib + libx11 + libxcb + ] + }" ''; desktopItems = [ @@ -99,5 +98,6 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/librekeys/picoforge"; license = lib.licenses.agpl3Only; mainProgram = "picoforge"; + platforms = lib.platforms.linux; }; })