From 8a12ca7234a9ca985f67d5c63f862c94e1f7044b Mon Sep 17 00:00:00 2001 From: Alois Date: Mon, 6 Apr 2026 15:21:04 +0200 Subject: [PATCH] Moved from electrobun to tauri+cef --- .gitignore | 1 - .prettierignore | 3 +- apps/desktop/.gitignore | 1 - apps/desktop/electrobun.config.ts | 46 -- apps/desktop/llms.txt | 24 - apps/desktop/package.json | 19 - apps/desktop/shell.nix | 41 - apps/desktop/src/bun/index.ts | 28 - apps/desktop/src/mainview/index.css | 126 --- apps/desktop/src/mainview/index.html | 64 -- apps/desktop/src/mainview/index.ts | 1 - apps/desktop/tsconfig.json | 22 - apps/mobile/package.json | 25 - apps/{mobile => tauri}/.gitignore | 0 apps/{mobile => tauri}/flake.lock | 0 apps/{mobile => tauri}/flake.nix | 78 +- apps/{mobile => tauri}/logo.png | Bin apps/tauri/package.json | 31 + apps/tauri/readme.md | 4 + apps/{mobile => tauri}/src-tauri/.gitignore | 0 apps/{mobile => tauri}/src-tauri/Cargo.lock | 719 +++++++++++++++++- apps/{mobile => tauri}/src-tauri/Cargo.toml | 14 +- apps/{mobile => tauri}/src-tauri/build.rs | 0 .../src-tauri/capabilities/default.json | 0 .../src-tauri/gen/android/.editorconfig | 0 .../src-tauri/gen/android/.gitignore | 0 .../src-tauri/gen/android/app/.gitignore | 0 .../gen/android/app/build.gradle.kts | 0 .../gen/android/app/proguard-rules.pro | 0 .../android/app/src/main/AndroidManifest.xml | 0 .../java/net/tensamin/client/MainActivity.kt | 0 .../drawable-v24/ic_launcher_foreground.xml | 0 .../res/drawable/ic_launcher_background.xml | 0 .../app/src/main/res/layout/activity_main.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../mipmap-hdpi/ic_launcher_foreground.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../mipmap-mdpi/ic_launcher_foreground.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../mipmap-xhdpi/ic_launcher_foreground.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../app/src/main/res/values-night/themes.xml | 0 .../app/src/main/res/values/colors.xml | 0 .../res/values/ic_launcher_background.xml | 0 .../app/src/main/res/values/strings.xml | 0 .../app/src/main/res/values/themes.xml | 0 .../app/src/main/res/xml/file_paths.xml | 0 .../src-tauri/gen/android/build.gradle.kts | 0 .../gen/android/buildSrc/build.gradle.kts | 0 .../net/tensamin/client/kotlin/BuildTask.kt | 0 .../net/tensamin/client/kotlin/RustPlugin.kt | 0 .../src-tauri/gen/android/gradle.properties | 0 .../android/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../src-tauri/gen/android/gradlew | 0 .../src-tauri/gen/android/gradlew.bat | 0 .../src-tauri/gen/android/settings.gradle | 0 .../src-tauri/icons/128x128.png | Bin .../src-tauri/icons/128x128@2x.png | Bin .../src-tauri/icons/32x32.png | Bin .../src-tauri/icons/64x64.png | Bin .../src-tauri/icons/Square107x107Logo.png | Bin .../src-tauri/icons/Square142x142Logo.png | Bin .../src-tauri/icons/Square150x150Logo.png | Bin .../src-tauri/icons/Square284x284Logo.png | Bin .../src-tauri/icons/Square30x30Logo.png | Bin .../src-tauri/icons/Square310x310Logo.png | Bin .../src-tauri/icons/Square44x44Logo.png | Bin .../src-tauri/icons/Square71x71Logo.png | Bin .../src-tauri/icons/Square89x89Logo.png | Bin .../src-tauri/icons/StoreLogo.png | Bin .../src-tauri/icons/icon.icns | Bin .../src-tauri/icons/icon.ico | Bin .../src-tauri/icons/icon.png | Bin .../src-tauri/icons/ios/AppIcon-20x20@1x.png | Bin .../icons/ios/AppIcon-20x20@2x-1.png | Bin .../src-tauri/icons/ios/AppIcon-20x20@2x.png | Bin .../src-tauri/icons/ios/AppIcon-20x20@3x.png | Bin .../src-tauri/icons/ios/AppIcon-29x29@1x.png | Bin .../icons/ios/AppIcon-29x29@2x-1.png | Bin .../src-tauri/icons/ios/AppIcon-29x29@2x.png | Bin .../src-tauri/icons/ios/AppIcon-29x29@3x.png | Bin .../src-tauri/icons/ios/AppIcon-40x40@1x.png | Bin .../icons/ios/AppIcon-40x40@2x-1.png | Bin .../src-tauri/icons/ios/AppIcon-40x40@2x.png | Bin .../src-tauri/icons/ios/AppIcon-40x40@3x.png | Bin .../src-tauri/icons/ios/AppIcon-512@2x.png | Bin .../src-tauri/icons/ios/AppIcon-60x60@2x.png | Bin .../src-tauri/icons/ios/AppIcon-60x60@3x.png | Bin .../src-tauri/icons/ios/AppIcon-76x76@1x.png | Bin .../src-tauri/icons/ios/AppIcon-76x76@2x.png | Bin .../icons/ios/AppIcon-83.5x83.5@2x.png | Bin apps/{mobile => tauri}/src-tauri/src/lib.rs | 0 apps/{mobile => tauri}/src-tauri/src/main.rs | 0 .../src-tauri/tauri.conf.json | 8 +- apps/{mobile => tauri}/src/context.tsx | 0 apps/{mobile => tauri}/tsconfig.json | 0 apps/web/package.json | 2 +- apps/web/src/components/sidebar.tsx | 2 +- apps/web/src/routes/app/home.tsx | 4 +- apps/web/src/routes/app/layout.tsx | 2 +- apps/web/src/routes/layout.tsx | 4 +- bun.lock | 53 +- package.json | 7 +- packages/ttp/src/core.test.ts | 6 - 114 files changed, 822 insertions(+), 513 deletions(-) delete mode 100644 apps/desktop/.gitignore delete mode 100644 apps/desktop/electrobun.config.ts delete mode 100644 apps/desktop/llms.txt delete mode 100644 apps/desktop/package.json delete mode 100644 apps/desktop/shell.nix delete mode 100644 apps/desktop/src/bun/index.ts delete mode 100644 apps/desktop/src/mainview/index.css delete mode 100644 apps/desktop/src/mainview/index.html delete mode 100644 apps/desktop/src/mainview/index.ts delete mode 100644 apps/desktop/tsconfig.json delete mode 100644 apps/mobile/package.json rename apps/{mobile => tauri}/.gitignore (100%) rename apps/{mobile => tauri}/flake.lock (100%) rename apps/{mobile => tauri}/flake.nix (67%) rename apps/{mobile => tauri}/logo.png (100%) create mode 100644 apps/tauri/package.json create mode 100644 apps/tauri/readme.md rename apps/{mobile => tauri}/src-tauri/.gitignore (100%) rename apps/{mobile => tauri}/src-tauri/Cargo.lock (88%) rename apps/{mobile => tauri}/src-tauri/Cargo.toml (68%) rename apps/{mobile => tauri}/src-tauri/build.rs (100%) rename apps/{mobile => tauri}/src-tauri/capabilities/default.json (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/.editorconfig (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/.gitignore (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/.gitignore (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/build.gradle.kts (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/proguard-rules.pro (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/AndroidManifest.xml (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/java/net/tensamin/client/MainActivity.kt (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/drawable/ic_launcher_background.xml (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/layout/activity_main.xml (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/values-night/themes.xml (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/values/colors.xml (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/values/ic_launcher_background.xml (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/values/strings.xml (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/values/themes.xml (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/app/src/main/res/xml/file_paths.xml (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/build.gradle.kts (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/buildSrc/build.gradle.kts (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/buildSrc/src/main/java/net/tensamin/client/kotlin/BuildTask.kt (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/buildSrc/src/main/java/net/tensamin/client/kotlin/RustPlugin.kt (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/gradle.properties (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.jar (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/gradlew (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/gradlew.bat (100%) rename apps/{mobile => tauri}/src-tauri/gen/android/settings.gradle (100%) rename apps/{mobile => tauri}/src-tauri/icons/128x128.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/128x128@2x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/32x32.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/64x64.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/Square107x107Logo.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/Square142x142Logo.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/Square150x150Logo.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/Square284x284Logo.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/Square30x30Logo.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/Square310x310Logo.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/Square44x44Logo.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/Square71x71Logo.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/Square89x89Logo.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/StoreLogo.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/icon.icns (100%) rename apps/{mobile => tauri}/src-tauri/icons/icon.ico (100%) rename apps/{mobile => tauri}/src-tauri/icons/icon.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-20x20@1x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-20x20@2x-1.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-20x20@2x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-20x20@3x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-29x29@1x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-29x29@2x-1.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-29x29@2x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-29x29@3x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-40x40@1x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-40x40@2x-1.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-40x40@2x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-40x40@3x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-512@2x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-60x60@2x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-60x60@3x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-76x76@1x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-76x76@2x.png (100%) rename apps/{mobile => tauri}/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png (100%) rename apps/{mobile => tauri}/src-tauri/src/lib.rs (100%) rename apps/{mobile => tauri}/src-tauri/src/main.rs (100%) rename apps/{mobile => tauri}/src-tauri/tauri.conf.json (80%) rename apps/{mobile => tauri}/src/context.tsx (100%) rename apps/{mobile => tauri}/tsconfig.json (100%) diff --git a/.gitignore b/.gitignore index ea8766b..3c3629e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ node_modules -packages/socket \ No newline at end of file diff --git a/.prettierignore b/.prettierignore index df2ca1c..3441b93 100644 --- a/.prettierignore +++ b/.prettierignore @@ -4,5 +4,4 @@ coverage .tmp *.tsbuildinfo bun.lock -apps/desktop/build -apps/mobile/src-tauri +apps/tauri/src-tauri diff --git a/apps/desktop/.gitignore b/apps/desktop/.gitignore deleted file mode 100644 index c795b05..0000000 --- a/apps/desktop/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build \ No newline at end of file diff --git a/apps/desktop/electrobun.config.ts b/apps/desktop/electrobun.config.ts deleted file mode 100644 index da3ecfe..0000000 --- a/apps/desktop/electrobun.config.ts +++ /dev/null @@ -1,46 +0,0 @@ -import type { ElectrobunConfig } from "electrobun"; - -import { version } from "../../package.json"; - -export default { - app: { - name: "tensamin", - identifier: "client.tensamin.net", - version, - urlSchemes: ["tensamin"], - }, - build: { - useAsar: true, - views: { - mainview: { - entrypoint: "src/mainview/index.ts", - }, - }, - copy: { - "../web/dist/": "views/mainview/", - "../mobile/src-tauri/icons": "views/mainview/icons/", - }, - mac: { - icons: "", - bundleWGPU: false, - defaultRenderer: "cef", - bundleCEF: true, - }, - linux: { - icon: "../mobile/src-tauri/icons/icon.png", - bundleWGPU: false, - defaultRenderer: "cef", - bundleCEF: true, - chromiumFlags: { - "enable-features": "UseOzonePlatform", - "ozone-platform": "wayland", - }, - }, - win: { - icon: "../mobile/src-tauri/icons/icon.ico", - bundleWGPU: false, - defaultRenderer: "cef", - bundleCEF: true, - }, - }, -} satisfies ElectrobunConfig; diff --git a/apps/desktop/llms.txt b/apps/desktop/llms.txt deleted file mode 100644 index 74e7715..0000000 --- a/apps/desktop/llms.txt +++ /dev/null @@ -1,24 +0,0 @@ -# Electrobun Project - -This is an Electrobun desktop application. - -IMPORTANT: Electrobun is NOT Electron. Do not use Electron APIs or patterns. - -## Documentation - -Full API reference: https://blackboard.sh/electrobun/llms.txt -Getting started: https://blackboard.sh/electrobun/docs/ - -## Quick Reference - -Import patterns: -- Main process (Bun): `import { BrowserWindow } from "electrobun/bun"` -- Browser context: `import { Electroview } from "electrobun/view"` - -Use `views://` URLs to load bundled assets (e.g., `url: "views://mainview/index.html"`). -Views must be configured in `electrobun.config.ts` to be built and copied into the bundle. - -## About - -Electrobun is built by Blackboard (https://blackboard.sh), an innovation lab building -tools and funding teams that define the next generation of technology. diff --git a/apps/desktop/package.json b/apps/desktop/package.json deleted file mode 100644 index 951ebda..0000000 --- a/apps/desktop/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "electrobun-hello-world", - "version": "1.0.0", - "description": "A simple Electrobun app showcasing core features", - "scripts": { - "format": "bunx prettier --write .", - "lint": "echo desktop lint skipped", - "build": "electrobun build", - "start": "electrobun dev", - "dev": "electrobun dev --watch" - }, - "dependencies": { - "electrobun": "1.15.1", - "@tensamin/shared": "workspace:*" - }, - "devDependencies": { - "@types/bun": "latest" - } -} diff --git a/apps/desktop/shell.nix b/apps/desktop/shell.nix deleted file mode 100644 index 854b915..0000000 --- a/apps/desktop/shell.nix +++ /dev/null @@ -1,41 +0,0 @@ -{pkgs ? import {}}: let - libs = with pkgs; [ - nspr - nss - libxcb - libxkbcommon - wayland - libdecor - dbus - atk - glib - gtk3 - cups - libx11 - libxcomposite - libxdamage - libxext - libxfixes - libxrandr - libgbm - expat - cairo - pango - alsa-lib - - webkitgtk_4_1 - libsoup_3 - libayatana-appindicator - gdk-pixbuf - ]; -in - pkgs.mkShell { - buildInputs = [pkgs.bun] ++ libs; - - shellHook = '' - export LD_LIBRARY_PATH=${pkgs.lib.makeLibraryPath libs}:$LD_LIBRARY_PATH - export GDK_BACKEND=wayland - export OZONE_PLATFORM=wayland - export XDG_SESSION_TYPE=wayland - ''; - } diff --git a/apps/desktop/src/bun/index.ts b/apps/desktop/src/bun/index.ts deleted file mode 100644 index 42afd2c..0000000 --- a/apps/desktop/src/bun/index.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { BrowserWindow, Tray } from "electrobun/bun"; - -const tray = new Tray({ - title: "Tensamin", - image: "views://mainview/icons/64x64.png", - height: 64, - width: 64, -}); - -const mainWindow = new BrowserWindow({ - title: "Tensamin", - url: "views://mainview/index.html", - renderer: "cef", - frame: { - width: 800, - height: 800, - x: 200, - y: 200, - }, -}); - -mainWindow.url = "views://mainview/index.html"; - -tray.on("tray-clicked", () => { - console.log("Tray clicked"); -}); - -console.log("Started desktop app"); \ No newline at end of file diff --git a/apps/desktop/src/mainview/index.css b/apps/desktop/src/mainview/index.css deleted file mode 100644 index 7a4d9ac..0000000 --- a/apps/desktop/src/mainview/index.css +++ /dev/null @@ -1,126 +0,0 @@ -* { - box-sizing: border-box; -} - -body { - font-family: - -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, - Cantarell, sans-serif; - margin: 0; - padding: 0; - background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); - color: #333; - min-height: 100vh; -} - -.container { - max-width: 800px; - margin: 0 auto; - padding: 40px 20px; -} - -h1 { - color: white; - font-size: 3rem; - text-align: center; - margin-bottom: 8px; - text-shadow: 0 2px 4px rgba(0, 0, 0, 0.3); -} - -.subtitle { - color: rgba(255, 255, 255, 0.9); - font-size: 1.25rem; - text-align: center; - margin-top: 0; - margin-bottom: 40px; - text-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); -} - -.welcome-section { - background: white; - border-radius: 12px; - padding: 30px; - margin: 30px 0; - box-shadow: 0 8px 25px rgba(0, 0, 0, 0.15); - line-height: 1.6; -} - -h2 { - color: #2563eb; - margin-top: 30px; - margin-bottom: 15px; -} - -ul { - margin: 20px 0; - padding-left: 20px; -} - -li { - margin: 8px 0; -} - -.links { - display: flex; - gap: 15px; - margin: 25px 0; - flex-wrap: wrap; -} - -.doc-link { - display: inline-block; - background: #2563eb; - color: white; - text-decoration: none; - padding: 12px 20px; - border-radius: 8px; - font-weight: 500; - transition: all 0.2s ease; - box-shadow: 0 2px 4px rgba(37, 99, 235, 0.2); -} - -.doc-link:hover { - background: #1d4ed8; - transform: translateY(-1px); - box-shadow: 0 4px 8px rgba(37, 99, 235, 0.3); -} - -code { - background: #f1f5f9; - color: #475569; - padding: 2px 6px; - border-radius: 4px; - font-family: "Monaco", "Menlo", "Ubuntu Mono", monospace; - font-size: 0.9em; -} - -.footer { - text-align: center; - color: rgba(255, 255, 255, 0.8); - margin-top: 40px; - padding: 20px; - background: rgba(255, 255, 255, 0.1); - border-radius: 8px; - backdrop-filter: blur(10px); -} - -.footer p { - margin: 8px 0; -} - -/* Dark mode support */ -@media (prefers-color-scheme: dark) { - .welcome-section { - background: #1f2937; - color: #f3f4f6; - } - - h2 { - color: #60a5fa; - } - - code { - background: #374151; - color: #d1d5db; - } -} diff --git a/apps/desktop/src/mainview/index.html b/apps/desktop/src/mainview/index.html deleted file mode 100644 index 6197add..0000000 --- a/apps/desktop/src/mainview/index.html +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - Hello Electrobun! - - - -
-

Hello Electrobun! 🎉

-

A fast, cross-platform desktop app framework

- -
-

- Welcome to your first Electrobun app! This framework combines the - power of Bun with native desktop capabilities. -

- -

What is Electrobun?

-
    -
  • - Fast: Built on Bun's lightning-fast JavaScript - runtime -
  • -
  • - Native: Access to system APIs like menus, trays, - and file dialogs -
  • -
  • - Cross-platform: Works on macOS, Windows, and Linux -
  • -
  • - Web-based UI: Use familiar HTML, CSS, and - JavaScript for your interface -
  • -
- -

Get Started

-

- Ready to build something amazing? Check out the documentation and - examples: -

- - -
- - -
- - diff --git a/apps/desktop/src/mainview/index.ts b/apps/desktop/src/mainview/index.ts deleted file mode 100644 index 0403408..0000000 --- a/apps/desktop/src/mainview/index.ts +++ /dev/null @@ -1 +0,0 @@ -console.log("Hello Electrobun view loaded!"); diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json deleted file mode 100644 index 1d8d7b9..0000000 --- a/apps/desktop/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "compilerOptions": { - "lib": ["ESNext", "DOM"], - "target": "ESNext", - "module": "ESNext", - "moduleDetection": "force", - "jsx": "react-jsx", - "allowJs": true, - "moduleResolution": "bundler", - "allowImportingTsExtensions": true, - "verbatimModuleSyntax": true, - "noEmit": true, - "strict": true, - "skipLibCheck": true, - "noFallthroughCasesInSwitch": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "noPropertyAccessFromIndexSignature": true - }, - "include": ["src/**/*", "./electrobun.config.ts"], - "exclude": ["node_modules", "dist", "build", "../../package/dist"] -} diff --git a/apps/mobile/package.json b/apps/mobile/package.json deleted file mode 100644 index 91d171c..0000000 --- a/apps/mobile/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "@tensamin/mobile", - "private": true, - "version": "0.0.0", - "type": "module", - "exports": { - "./context": "./src/context.tsx" - }, - "scripts": { - "dev:raw": "tauri android dev", - "build:raw": "tauri android build", - "dev": "if command -v nix >/dev/null 2>&1; then nix develop --command bun dev:raw; else bun dev:raw; fi", - "build": "if command -v nix >/dev/null 2>&1; then nix develop --command bun build:raw; else bun build:raw; fi", - "gen-icons": "tauri icon ./logo.png" - }, - "dependencies": { - "@tauri-apps/api": "^2", - "@tauri-apps/plugin-opener": "^2", - "react": "^19.2.0", - "react-dom": "^19.2.0" - }, - "devDependencies": { - "@tauri-apps/cli": "^2" - } -} diff --git a/apps/mobile/.gitignore b/apps/tauri/.gitignore similarity index 100% rename from apps/mobile/.gitignore rename to apps/tauri/.gitignore diff --git a/apps/mobile/flake.lock b/apps/tauri/flake.lock similarity index 100% rename from apps/mobile/flake.lock rename to apps/tauri/flake.lock diff --git a/apps/mobile/flake.nix b/apps/tauri/flake.nix similarity index 67% rename from apps/mobile/flake.nix rename to apps/tauri/flake.nix index 9944663..86a1b36 100644 --- a/apps/mobile/flake.nix +++ b/apps/tauri/flake.nix @@ -1,5 +1,5 @@ { - description = "Tauri Android development environment"; + description = "Tauri development environment"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; @@ -7,10 +7,15 @@ flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, rust-overlay, flake-utils }: - flake-utils.lib.eachDefaultSystem (system: - let - overlays = [ (import rust-overlay) ]; + outputs = { + self, + nixpkgs, + rust-overlay, + flake-utils, + }: + flake-utils.lib.eachDefaultSystem ( + system: let + overlays = [(import rust-overlay)]; pkgs = import nixpkgs { inherit system overlays; config = { @@ -28,17 +33,17 @@ cmdLineToolsVersion = "8.0"; toolsVersion = "26.1.1"; platformToolsVersion = "35.0.2"; - buildToolsVersions = [ "35.0.0" ]; - platformVersions = [ "35" "36" ]; + buildToolsVersions = ["35.0.0"]; + platformVersions = ["35" "36"]; includeSources = false; includeSystemImages = false; includeNDK = true; - ndkVersions = [ ndkVersion ]; + ndkVersions = [ndkVersion]; useGoogleAPIs = false; }; rustToolchain = pkgs.rust-bin.stable.latest.default.override { - extensions = [ "rust-src" "rust-analyzer" ]; + extensions = ["rust-src" "rust-analyzer"]; targets = [ "aarch64-linux-android" "armv7-linux-androideabi" @@ -48,21 +53,53 @@ ]; }; + desktopRuntimeLibs = with pkgs; [ + glib + gtk3 + gdk-pixbuf + pango + cairo + atk + at-spi2-atk + alsa-lib + dbus + cups + expat + libdrm + libgbm + libglvnd + mesa + libxkbcommon + libx11 + libxcomposite + libxdamage + libxext + libxfixes + libxrandr + libxcb + systemd + nspr + nss + ]; in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ - jdk17 - rustToolchain - gradle - nodejs - android.androidsdk - pkgs.android-studio-tools - ]; + buildInputs = with pkgs; + [ + jdk17 + rustToolchain + gradle + nodejs + pkg-config + ] + ++ desktopRuntimeLibs + ++ [ + android.androidsdk + pkgs.android-studio-tools + ]; shellHook = '' sdkSource="${android.androidsdk}/libexec/android-sdk" - # Build a Tauri-compatible SDK layout in a writable local directory. mkdir -p "${androidHome}" if [ -L "${sdkRoot}" ]; then rm -f "${sdkRoot}" @@ -93,10 +130,9 @@ export NDK_HOME="$ANDROID_NDK_ROOT" export NDK_PATH="$ANDROID_NDK_ROOT" export JAVA_HOME="${pkgs.jdk17}" - - echo "Android development environment ready!" + export LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath desktopRuntimeLibs}:$LD_LIBRARY_PATH" ''; }; } ); -} \ No newline at end of file +} diff --git a/apps/mobile/logo.png b/apps/tauri/logo.png similarity index 100% rename from apps/mobile/logo.png rename to apps/tauri/logo.png diff --git a/apps/tauri/package.json b/apps/tauri/package.json new file mode 100644 index 0000000..4253c23 --- /dev/null +++ b/apps/tauri/package.json @@ -0,0 +1,31 @@ +{ + "name": "@tensamin/tauri", + "private": true, + "version": "0.0.0", + "type": "module", + "exports": { + "./context": "./src/context.tsx" + }, + "scripts": { + "dev:mobile:raw": "tauri android dev", + "build:mobile:raw": "tauri android build", + "dev:mobile": "if command -v nix >/dev/null 2>&1; then nix develop --command bun dev:mobile:raw; else bun dev:mobile:raw; fi", + "build:mobile": "if command -v nix >/dev/null 2>&1; then nix develop --command bun build:mobile:raw; else bun build:mobile:raw; fi", + + "dev:desktop:raw": "tauri dev", + "build:desktop:raw": "tauri build", + "dev:desktop": "if command -v nix >/dev/null 2>&1; then nix develop --command bun dev:desktop:raw; else bun dev:desktop:raw; fi", + "build:desktop": "if command -v nix >/dev/null 2>&1; then nix develop --command bun build:desktop:raw; else bun build:desktop:raw; fi", + + "gen-icons": "tauri icon ./logo.png" + }, + "dependencies": { + "@tauri-apps/api": "^2", + "@tauri-apps/plugin-opener": "^2", + "react": "^19.2.0", + "react-dom": "^19.2.0" + }, + "devDependencies": { + "@tauri-apps/cli": "^2" + } +} diff --git a/apps/tauri/readme.md b/apps/tauri/readme.md new file mode 100644 index 0000000..ff047a2 --- /dev/null +++ b/apps/tauri/readme.md @@ -0,0 +1,4 @@ +# Outputs +- ./src-tauri/gen/android/app/build/outputs/apk/universal/release/app-universal-release.apk +- ./src-tauri/target/release/bundle/deb/Tensamin_{version}_{arch}.deb +- ./src-tauri/target/release/bundle/rpm/Tensamin-{version}-1.{arch}.rpm diff --git a/apps/mobile/src-tauri/.gitignore b/apps/tauri/src-tauri/.gitignore similarity index 100% rename from apps/mobile/src-tauri/.gitignore rename to apps/tauri/src-tauri/.gitignore diff --git a/apps/mobile/src-tauri/Cargo.lock b/apps/tauri/src-tauri/Cargo.lock similarity index 88% rename from apps/mobile/src-tauri/Cargo.lock rename to apps/tauri/src-tauri/Cargo.lock index 79ce5fe..ead86e0 100644 --- a/apps/mobile/src-tauri/Cargo.lock +++ b/apps/tauri/src-tauri/Cargo.lock @@ -41,6 +41,56 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" + +[[package]] +name = "anstyle-parse" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" +dependencies = [ + "windows-sys 0.60.2", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys 0.60.2", +] + [[package]] name = "anyhow" version = "1.0.102" @@ -334,6 +384,15 @@ dependencies = [ "serde", ] +[[package]] +name = "bzip2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a53fac24f34a81bc9954b5d6cfce0c21e18ec6959f44f56e8e90e4bb7c346c" +dependencies = [ + "libbz2-rs-sys", +] + [[package]] name = "cairo-rs" version = "0.18.5" @@ -411,6 +470,30 @@ dependencies = [ "shlex", ] +[[package]] +name = "cef" +version = "146.4.1+146.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5dad6495c583fedab04a24f6fc08274c59a28b33967ca87709398e1f11c2ebe" +dependencies = [ + "cef-dll-sys", + "libloading 0.9.0", + "objc2", + "windows-sys 0.61.2", +] + +[[package]] +name = "cef-dll-sys" +version = "146.4.1+146.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6616217417da12da57bb7650acc3c8be0fc26e7120892ab926d2ba8d84c8c9c2" +dependencies = [ + "anyhow", + "cmake", + "download-cef", + "serde_json", +] + [[package]] name = "cesu8" version = "1.1.0" @@ -456,6 +539,61 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "clap" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "clap_lex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" + +[[package]] +name = "cmake" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" +dependencies = [ + "cc", +] + +[[package]] +name = "colorchoice" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" + [[package]] name = "combine" version = "4.6.7" @@ -475,6 +613,18 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "console" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d64e8af5551369d19cf50138de61f1c42074ab970f74e99be916646777f8fc87" +dependencies = [ + "encode_unicode", + "libc", + "unicode-width", + "windows-sys 0.61.2", +] + [[package]] name = "convert_case" version = "0.4.0" @@ -487,10 +637,29 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ + "percent-encoding", "time", "version_check", ] +[[package]] +name = "cookie_store" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b2c103cf610ec6cae3da84a766285b42fd16aad564758459e6ecf128c75206" +dependencies = [ + "cookie", + "document-features", + "idna", + "indexmap 2.13.1", + "log", + "serde", + "serde_derive", + "serde_json", + "time", + "url", +] + [[package]] name = "core-foundation" version = "0.10.1" @@ -712,6 +881,12 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "dioxus-debug-cell" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ea539174bb236e0e7dc9c12b19b88eae3cb574dedbd0252a2d43ea7e6de13e2" + [[package]] name = "dirs" version = "6.0.0" @@ -779,6 +954,15 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "document-features" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61" +dependencies = [ + "litrs", +] + [[package]] name = "dom_query" version = "0.27.0" @@ -794,6 +978,25 @@ dependencies = [ "tendril 0.5.0", ] +[[package]] +name = "download-cef" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7471a7d5d3bd8df1b3b75871f0317d8a6dd73270ab861cc97ae7907ee63e554" +dependencies = [ + "bzip2", + "clap", + "indicatif", + "regex", + "semver", + "serde", + "serde_json", + "sha1_smol", + "tar", + "thiserror 2.0.18", + "ureq", +] + [[package]] name = "dpi" version = "0.1.2" @@ -850,6 +1053,12 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + [[package]] name = "endi" version = "1.1.1" @@ -950,6 +1159,17 @@ dependencies = [ "rustc_version", ] +[[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.9" @@ -1748,6 +1968,19 @@ dependencies = [ "serde_core", ] +[[package]] +name = "indicatif" +version = "0.18.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25470f23803092da7d239834776d653104d551bc4d7eacaf31e6837854b8e9eb" +dependencies = [ + "console", + "portable-atomic", + "unicode-width", + "unit-prefix", + "web-time", +] + [[package]] name = "infer" version = "0.19.0" @@ -1792,6 +2025,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" + [[package]] name = "itoa" version = "1.0.18" @@ -1948,10 +2187,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" dependencies = [ "gtk-sys", - "libloading", + "libloading 0.7.4", "once_cell", ] +[[package]] +name = "libbz2-rs-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7" + [[package]] name = "libc" version = "0.2.184" @@ -1968,13 +2213,26 @@ dependencies = [ "winapi", ] +[[package]] +name = "libloading" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754ca22de805bb5744484a5b151a9e1a8e837d5dc232c2d7d8c2e3492edc8b60" +dependencies = [ + "cfg-if", + "windows-link 0.2.1", +] + [[package]] name = "libredox" version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08" dependencies = [ + "bitflags 2.11.0", "libc", + "plain", + "redox_syscall 0.7.3", ] [[package]] @@ -1989,6 +2247,12 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +[[package]] +name = "litrs" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" + [[package]] name = "lock_api" version = "0.4.14" @@ -2212,8 +2476,38 @@ checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ "bitflags 2.11.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.11.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.11.0", + "objc2", "objc2-foundation", ] @@ -2241,6 +2535,41 @@ dependencies = [ "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.11.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.11.0", + "objc2", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-io-surface", +] + [[package]] name = "objc2-encode" version = "4.1.0" @@ -2264,6 +2593,7 @@ checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ "bitflags 2.11.0", "block2", + "libc", "objc2", "objc2-core-foundation", ] @@ -2279,6 +2609,16 @@ dependencies = [ "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", +] + [[package]] name = "objc2-quartz-core" version = "0.3.2" @@ -2291,6 +2631,17 @@ dependencies = [ "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.11.0", + "objc2", + "objc2-core-foundation", +] + [[package]] name = "objc2-ui-kit" version = "0.3.2" @@ -2315,6 +2666,8 @@ dependencies = [ "objc2-app-kit", "objc2-core-foundation", "objc2-foundation", + "objc2-javascript-core", + "objc2-security", ] [[package]] @@ -2323,6 +2676,12 @@ version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" +[[package]] +name = "once_cell_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" + [[package]] name = "open" version = "5.3.3" @@ -2400,7 +2759,7 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.18", "smallvec", "windows-link 0.2.1", ] @@ -2627,6 +2986,12 @@ version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + [[package]] name = "plist" version = "1.8.0" @@ -2667,6 +3032,12 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "portable-atomic" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" + [[package]] name = "potential_utf" version = "0.1.5" @@ -2901,6 +3272,15 @@ dependencies = [ "bitflags 2.11.0", ] +[[package]] +name = "redox_syscall" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16" +dependencies = [ + "bitflags 2.11.0", +] + [[package]] name = "redox_users" version = "0.5.2" @@ -2995,6 +3375,20 @@ dependencies = [ "web-sys", ] +[[package]] +name = "ring" +version = "0.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.17", + "libc", + "untrusted", + "windows-sys 0.52.0", +] + [[package]] name = "rustc-hash" version = "2.1.2" @@ -3023,6 +3417,41 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "rustls" +version = "0.23.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pki-types" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" +dependencies = [ + "zeroize", +] + +[[package]] +name = "rustls-webpki" +version = "0.103.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df33b2b81ac578cabaf06b89b0631153a3f416b0a886e8a7a1707fb51abbd1ef" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.22" @@ -3046,7 +3475,7 @@ checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" dependencies = [ "dyn-clone", "indexmap 1.9.3", - "schemars_derive", + "schemars_derive 0.8.22", "serde", "serde_json", "url", @@ -3073,8 +3502,11 @@ checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" dependencies = [ "dyn-clone", "ref-cast", + "schemars_derive 1.2.1", "serde", "serde_json", + "url", + "uuid", ] [[package]] @@ -3089,6 +3521,18 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "schemars_derive" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d115b50f4aaeea07e79c1912f645c7513d81715d0420f8bc77a18c6260b307f" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 2.0.117", +] + [[package]] name = "scopeguard" version = "1.2.0" @@ -3201,6 +3645,7 @@ version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ + "indexmap 2.13.1", "itoa", "memchr", "serde", @@ -3309,6 +3754,12 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "sha1_smol" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" + [[package]] name = "sha2" version = "0.10.9" @@ -3376,6 +3827,17 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "socks" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b" +dependencies = [ + "byteorder", + "libc", + "winapi", +] + [[package]] name = "softbuffer" version = "0.4.8" @@ -3391,7 +3853,7 @@ dependencies = [ "objc2-foundation", "objc2-quartz-core", "raw-window-handle", - "redox_syscall", + "redox_syscall 0.5.18", "tracing", "wasm-bindgen", "web-sys", @@ -3485,6 +3947,12 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + [[package]] name = "swift-rs" version = "1.0.7" @@ -3600,6 +4068,17 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "tar" +version = "0.4.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "target-lexicon" version = "0.12.16" @@ -3609,8 +4088,7 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" version = "2.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da77cc00fb9028caf5b5d4650f75e31f1ef3693459dfca7f7e506d1ecef0ba2d" +source = "git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef#37deabe7f13f1d32f4076723610de6b6b62865fc" dependencies = [ "anyhow", "bytes", @@ -3642,11 +4120,12 @@ dependencies = [ "serde_repr", "serialize-to-javascript", "swift-rs", - "tauri-build", + "tauri-build 2.5.6 (git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef)", "tauri-macros", "tauri-runtime", + "tauri-runtime-cef", "tauri-runtime-wry", - "tauri-utils", + "tauri-utils 2.8.3 (git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef)", "thiserror 2.0.18", "tokio", "tray-icon", @@ -3673,7 +4152,28 @@ dependencies = [ "semver", "serde", "serde_json", - "tauri-utils", + "tauri-utils 2.8.3 (registry+https://github.com/rust-lang/crates.io-index)", + "tauri-winres", + "toml 0.9.12+spec-1.1.0", + "walkdir", +] + +[[package]] +name = "tauri-build" +version = "2.5.6" +source = "git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef#37deabe7f13f1d32f4076723610de6b6b62865fc" +dependencies = [ + "anyhow", + "cargo_toml", + "dirs", + "glob", + "heck 0.5.0", + "json-patch", + "schemars 1.2.1", + "semver", + "serde", + "serde_json", + "tauri-utils 2.8.3 (git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef)", "tauri-winres", "toml 0.9.12+spec-1.1.0", "walkdir", @@ -3682,8 +4182,7 @@ dependencies = [ [[package]] name = "tauri-codegen" version = "2.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a24476afd977c5d5d169f72425868613d82747916dd29e0a357c84c4bd6d29" +source = "git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef#37deabe7f13f1d32f4076723610de6b6b62865fc" dependencies = [ "base64 0.22.1", "brotli", @@ -3698,7 +4197,7 @@ dependencies = [ "serde_json", "sha2", "syn 2.0.117", - "tauri-utils", + "tauri-utils 2.8.3 (git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef)", "thiserror 2.0.18", "time", "url", @@ -3709,15 +4208,14 @@ dependencies = [ [[package]] name = "tauri-macros" version = "2.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d39b349a98dadaffebb73f0a40dcd1f23c999211e5a2e744403db384d0c33de7" +source = "git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef#37deabe7f13f1d32f4076723610de6b6b62865fc" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.117", "tauri-codegen", - "tauri-utils", + "tauri-utils 2.8.3 (git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef)", ] [[package]] @@ -3732,7 +4230,7 @@ dependencies = [ "schemars 0.8.22", "serde", "serde_json", - "tauri-utils", + "tauri-utils 2.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.9.12+spec-1.1.0", "walkdir", ] @@ -3762,8 +4260,7 @@ dependencies = [ [[package]] name = "tauri-runtime" version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2826d79a3297ed08cd6ea7f412644ef58e32969504bc4fbd8d7dbeabc4445ea2" +source = "git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef#37deabe7f13f1d32f4076723610de6b6b62865fc" dependencies = [ "cookie", "dpi", @@ -3772,23 +4269,47 @@ dependencies = [ "jni", "objc2", "objc2-ui-kit", - "objc2-web-kit", "raw-window-handle", "serde", "serde_json", - "tauri-utils", + "tauri-utils 2.8.3 (git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef)", "thiserror 2.0.18", "url", - "webkit2gtk", - "webview2-com", "windows", ] +[[package]] +name = "tauri-runtime-cef" +version = "0.1.0" +source = "git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef#37deabe7f13f1d32f4076723610de6b6b62865fc" +dependencies = [ + "base64 0.22.1", + "cef", + "cef-dll-sys", + "dioxus-debug-cell", + "dirs", + "gtk", + "html5ever 0.29.1", + "http", + "kuchikiki", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "raw-window-handle", + "serde", + "serde_json", + "sha2", + "tauri-runtime", + "tauri-utils 2.8.3 (git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef)", + "url", + "windows", + "x11-dl", +] + [[package]] name = "tauri-runtime-wry" version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11ea2e6f801d275fdd890d6c9603736012742a1c33b96d0db788c9cdebf7f9e" +source = "git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef#37deabe7f13f1d32f4076723610de6b6b62865fc" dependencies = [ "gtk", "http", @@ -3796,13 +4317,14 @@ dependencies = [ "log", "objc2", "objc2-app-kit", + "objc2-web-kit", "once_cell", "percent-encoding", "raw-window-handle", "softbuffer", "tao", "tauri-runtime", - "tauri-utils", + "tauri-utils 2.8.3 (git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef)", "url", "webkit2gtk", "webview2-com", @@ -3815,6 +4337,42 @@ name = "tauri-utils" version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "219a1f983a2af3653f75b5747f76733b0da7ff03069c7a41901a5eb3ace4557d" +dependencies = [ + "anyhow", + "cargo_metadata", + "ctor", + "dunce", + "glob", + "html5ever 0.29.1", + "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.18", + "toml 0.9.12+spec-1.1.0", + "url", + "urlpattern", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-utils" +version = "2.8.3" +source = "git+https://github.com/tauri-apps/tauri?branch=feat%2Fcef#37deabe7f13f1d32f4076723610de6b6b62865fc" dependencies = [ "anyhow", "brotli", @@ -3833,7 +4391,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "schemars 0.8.22", + "schemars 1.2.1", "semver", "serde", "serde-untagged", @@ -3900,7 +4458,7 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build", + "tauri-build 2.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "tauri-plugin-opener", ] @@ -4297,12 +4855,63 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" +[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" +[[package]] +name = "unit-prefix" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81e544489bf3d8ef66c953931f56617f423cd4b5494be343d9b9d3dda037b9a3" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dea7109cdcd5864d4eeb1b58a1648dc9bf520360d7af16ec26d0a9354bafcfc0" +dependencies = [ + "base64 0.22.1", + "cookie_store", + "flate2", + "log", + "percent-encoding", + "rustls", + "rustls-pki-types", + "serde", + "serde_json", + "socks", + "ureq-proto", + "utf8-zero", + "webpki-roots", +] + +[[package]] +name = "ureq-proto" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e994ba84b0bd1b1b0cf92878b7ef898a5c1760108fe7b6010327e274917a808c" +dependencies = [ + "base64 0.22.1", + "http", + "httparse", + "log", +] + [[package]] name = "url" version = "2.5.8" @@ -4334,12 +4943,24 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8-zero" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e" + [[package]] name = "utf8_iter" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "uuid" version = "1.23.0" @@ -4545,6 +5166,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "web_atoms" version = "0.2.3" @@ -4601,6 +5232,15 @@ dependencies = [ "system-deps", ] +[[package]] +name = "webpki-roots" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webview2-com" version = "0.38.2" @@ -4831,6 +5471,15 @@ dependencies = [ "windows-targets 0.42.2", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.59.0" @@ -5258,6 +5907,16 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "xattr" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" +dependencies = [ + "libc", + "rustix", +] + [[package]] name = "yoke" version = "0.8.2" @@ -5383,6 +6042,12 @@ dependencies = [ "synstructure", ] +[[package]] +name = "zeroize" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" + [[package]] name = "zerotrie" version = "0.2.4" diff --git a/apps/mobile/src-tauri/Cargo.toml b/apps/tauri/src-tauri/Cargo.toml similarity index 68% rename from apps/mobile/src-tauri/Cargo.toml rename to apps/tauri/src-tauri/Cargo.toml index 7d1f4c6..8a70801 100644 --- a/apps/mobile/src-tauri/Cargo.toml +++ b/apps/tauri/src-tauri/Cargo.toml @@ -18,8 +18,20 @@ crate-type = ["staticlib", "cdylib", "rlib"] tauri-build = { version = "2", features = [] } [dependencies] -tauri = { version = "2", features = [] } tauri-plugin-opener = "2" serde = { version = "1", features = ["derive"] } serde_json = "1" +[target.'cfg(target_os = "android")'.dependencies.tauri] +version = "2" +features = [] +default-features = true + +[target.'cfg(not(target_os = "android"))'.dependencies.tauri] +version = "2" +features = ["cef"] +default-features = true + +[patch.crates-io.tauri] +git = "https://github.com/tauri-apps/tauri" +branch = "feat/cef" diff --git a/apps/mobile/src-tauri/build.rs b/apps/tauri/src-tauri/build.rs similarity index 100% rename from apps/mobile/src-tauri/build.rs rename to apps/tauri/src-tauri/build.rs diff --git a/apps/mobile/src-tauri/capabilities/default.json b/apps/tauri/src-tauri/capabilities/default.json similarity index 100% rename from apps/mobile/src-tauri/capabilities/default.json rename to apps/tauri/src-tauri/capabilities/default.json diff --git a/apps/mobile/src-tauri/gen/android/.editorconfig b/apps/tauri/src-tauri/gen/android/.editorconfig similarity index 100% rename from apps/mobile/src-tauri/gen/android/.editorconfig rename to apps/tauri/src-tauri/gen/android/.editorconfig diff --git a/apps/mobile/src-tauri/gen/android/.gitignore b/apps/tauri/src-tauri/gen/android/.gitignore similarity index 100% rename from apps/mobile/src-tauri/gen/android/.gitignore rename to apps/tauri/src-tauri/gen/android/.gitignore diff --git a/apps/mobile/src-tauri/gen/android/app/.gitignore b/apps/tauri/src-tauri/gen/android/app/.gitignore similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/.gitignore rename to apps/tauri/src-tauri/gen/android/app/.gitignore diff --git a/apps/mobile/src-tauri/gen/android/app/build.gradle.kts b/apps/tauri/src-tauri/gen/android/app/build.gradle.kts similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/build.gradle.kts rename to apps/tauri/src-tauri/gen/android/app/build.gradle.kts diff --git a/apps/mobile/src-tauri/gen/android/app/proguard-rules.pro b/apps/tauri/src-tauri/gen/android/app/proguard-rules.pro similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/proguard-rules.pro rename to apps/tauri/src-tauri/gen/android/app/proguard-rules.pro diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/AndroidManifest.xml b/apps/tauri/src-tauri/gen/android/app/src/main/AndroidManifest.xml similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/AndroidManifest.xml rename to apps/tauri/src-tauri/gen/android/app/src/main/AndroidManifest.xml diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/java/net/tensamin/client/MainActivity.kt b/apps/tauri/src-tauri/gen/android/app/src/main/java/net/tensamin/client/MainActivity.kt similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/java/net/tensamin/client/MainActivity.kt rename to apps/tauri/src-tauri/gen/android/app/src/main/java/net/tensamin/client/MainActivity.kt diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/apps/tauri/src-tauri/gen/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to apps/tauri/src-tauri/gen/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/drawable/ic_launcher_background.xml b/apps/tauri/src-tauri/gen/android/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/drawable/ic_launcher_background.xml rename to apps/tauri/src-tauri/gen/android/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/layout/activity_main.xml b/apps/tauri/src-tauri/gen/android/app/src/main/res/layout/activity_main.xml similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/layout/activity_main.xml rename to apps/tauri/src-tauri/gen/android/app/src/main/res/layout/activity_main.xml diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to apps/tauri/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/values-night/themes.xml b/apps/tauri/src-tauri/gen/android/app/src/main/res/values-night/themes.xml similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/values-night/themes.xml rename to apps/tauri/src-tauri/gen/android/app/src/main/res/values-night/themes.xml diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/values/colors.xml b/apps/tauri/src-tauri/gen/android/app/src/main/res/values/colors.xml similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/values/colors.xml rename to apps/tauri/src-tauri/gen/android/app/src/main/res/values/colors.xml diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/values/ic_launcher_background.xml b/apps/tauri/src-tauri/gen/android/app/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/values/ic_launcher_background.xml rename to apps/tauri/src-tauri/gen/android/app/src/main/res/values/ic_launcher_background.xml diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/values/strings.xml b/apps/tauri/src-tauri/gen/android/app/src/main/res/values/strings.xml similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/values/strings.xml rename to apps/tauri/src-tauri/gen/android/app/src/main/res/values/strings.xml diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/values/themes.xml b/apps/tauri/src-tauri/gen/android/app/src/main/res/values/themes.xml similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/values/themes.xml rename to apps/tauri/src-tauri/gen/android/app/src/main/res/values/themes.xml diff --git a/apps/mobile/src-tauri/gen/android/app/src/main/res/xml/file_paths.xml b/apps/tauri/src-tauri/gen/android/app/src/main/res/xml/file_paths.xml similarity index 100% rename from apps/mobile/src-tauri/gen/android/app/src/main/res/xml/file_paths.xml rename to apps/tauri/src-tauri/gen/android/app/src/main/res/xml/file_paths.xml diff --git a/apps/mobile/src-tauri/gen/android/build.gradle.kts b/apps/tauri/src-tauri/gen/android/build.gradle.kts similarity index 100% rename from apps/mobile/src-tauri/gen/android/build.gradle.kts rename to apps/tauri/src-tauri/gen/android/build.gradle.kts diff --git a/apps/mobile/src-tauri/gen/android/buildSrc/build.gradle.kts b/apps/tauri/src-tauri/gen/android/buildSrc/build.gradle.kts similarity index 100% rename from apps/mobile/src-tauri/gen/android/buildSrc/build.gradle.kts rename to apps/tauri/src-tauri/gen/android/buildSrc/build.gradle.kts diff --git a/apps/mobile/src-tauri/gen/android/buildSrc/src/main/java/net/tensamin/client/kotlin/BuildTask.kt b/apps/tauri/src-tauri/gen/android/buildSrc/src/main/java/net/tensamin/client/kotlin/BuildTask.kt similarity index 100% rename from apps/mobile/src-tauri/gen/android/buildSrc/src/main/java/net/tensamin/client/kotlin/BuildTask.kt rename to apps/tauri/src-tauri/gen/android/buildSrc/src/main/java/net/tensamin/client/kotlin/BuildTask.kt diff --git a/apps/mobile/src-tauri/gen/android/buildSrc/src/main/java/net/tensamin/client/kotlin/RustPlugin.kt b/apps/tauri/src-tauri/gen/android/buildSrc/src/main/java/net/tensamin/client/kotlin/RustPlugin.kt similarity index 100% rename from apps/mobile/src-tauri/gen/android/buildSrc/src/main/java/net/tensamin/client/kotlin/RustPlugin.kt rename to apps/tauri/src-tauri/gen/android/buildSrc/src/main/java/net/tensamin/client/kotlin/RustPlugin.kt diff --git a/apps/mobile/src-tauri/gen/android/gradle.properties b/apps/tauri/src-tauri/gen/android/gradle.properties similarity index 100% rename from apps/mobile/src-tauri/gen/android/gradle.properties rename to apps/tauri/src-tauri/gen/android/gradle.properties diff --git a/apps/mobile/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.jar b/apps/tauri/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from apps/mobile/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.jar rename to apps/tauri/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.jar diff --git a/apps/mobile/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties b/apps/tauri/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from apps/mobile/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties rename to apps/tauri/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties diff --git a/apps/mobile/src-tauri/gen/android/gradlew b/apps/tauri/src-tauri/gen/android/gradlew similarity index 100% rename from apps/mobile/src-tauri/gen/android/gradlew rename to apps/tauri/src-tauri/gen/android/gradlew diff --git a/apps/mobile/src-tauri/gen/android/gradlew.bat b/apps/tauri/src-tauri/gen/android/gradlew.bat similarity index 100% rename from apps/mobile/src-tauri/gen/android/gradlew.bat rename to apps/tauri/src-tauri/gen/android/gradlew.bat diff --git a/apps/mobile/src-tauri/gen/android/settings.gradle b/apps/tauri/src-tauri/gen/android/settings.gradle similarity index 100% rename from apps/mobile/src-tauri/gen/android/settings.gradle rename to apps/tauri/src-tauri/gen/android/settings.gradle diff --git a/apps/mobile/src-tauri/icons/128x128.png b/apps/tauri/src-tauri/icons/128x128.png similarity index 100% rename from apps/mobile/src-tauri/icons/128x128.png rename to apps/tauri/src-tauri/icons/128x128.png diff --git a/apps/mobile/src-tauri/icons/128x128@2x.png b/apps/tauri/src-tauri/icons/128x128@2x.png similarity index 100% rename from apps/mobile/src-tauri/icons/128x128@2x.png rename to apps/tauri/src-tauri/icons/128x128@2x.png diff --git a/apps/mobile/src-tauri/icons/32x32.png b/apps/tauri/src-tauri/icons/32x32.png similarity index 100% rename from apps/mobile/src-tauri/icons/32x32.png rename to apps/tauri/src-tauri/icons/32x32.png diff --git a/apps/mobile/src-tauri/icons/64x64.png b/apps/tauri/src-tauri/icons/64x64.png similarity index 100% rename from apps/mobile/src-tauri/icons/64x64.png rename to apps/tauri/src-tauri/icons/64x64.png diff --git a/apps/mobile/src-tauri/icons/Square107x107Logo.png b/apps/tauri/src-tauri/icons/Square107x107Logo.png similarity index 100% rename from apps/mobile/src-tauri/icons/Square107x107Logo.png rename to apps/tauri/src-tauri/icons/Square107x107Logo.png diff --git a/apps/mobile/src-tauri/icons/Square142x142Logo.png b/apps/tauri/src-tauri/icons/Square142x142Logo.png similarity index 100% rename from apps/mobile/src-tauri/icons/Square142x142Logo.png rename to apps/tauri/src-tauri/icons/Square142x142Logo.png diff --git a/apps/mobile/src-tauri/icons/Square150x150Logo.png b/apps/tauri/src-tauri/icons/Square150x150Logo.png similarity index 100% rename from apps/mobile/src-tauri/icons/Square150x150Logo.png rename to apps/tauri/src-tauri/icons/Square150x150Logo.png diff --git a/apps/mobile/src-tauri/icons/Square284x284Logo.png b/apps/tauri/src-tauri/icons/Square284x284Logo.png similarity index 100% rename from apps/mobile/src-tauri/icons/Square284x284Logo.png rename to apps/tauri/src-tauri/icons/Square284x284Logo.png diff --git a/apps/mobile/src-tauri/icons/Square30x30Logo.png b/apps/tauri/src-tauri/icons/Square30x30Logo.png similarity index 100% rename from apps/mobile/src-tauri/icons/Square30x30Logo.png rename to apps/tauri/src-tauri/icons/Square30x30Logo.png diff --git a/apps/mobile/src-tauri/icons/Square310x310Logo.png b/apps/tauri/src-tauri/icons/Square310x310Logo.png similarity index 100% rename from apps/mobile/src-tauri/icons/Square310x310Logo.png rename to apps/tauri/src-tauri/icons/Square310x310Logo.png diff --git a/apps/mobile/src-tauri/icons/Square44x44Logo.png b/apps/tauri/src-tauri/icons/Square44x44Logo.png similarity index 100% rename from apps/mobile/src-tauri/icons/Square44x44Logo.png rename to apps/tauri/src-tauri/icons/Square44x44Logo.png diff --git a/apps/mobile/src-tauri/icons/Square71x71Logo.png b/apps/tauri/src-tauri/icons/Square71x71Logo.png similarity index 100% rename from apps/mobile/src-tauri/icons/Square71x71Logo.png rename to apps/tauri/src-tauri/icons/Square71x71Logo.png diff --git a/apps/mobile/src-tauri/icons/Square89x89Logo.png b/apps/tauri/src-tauri/icons/Square89x89Logo.png similarity index 100% rename from apps/mobile/src-tauri/icons/Square89x89Logo.png rename to apps/tauri/src-tauri/icons/Square89x89Logo.png diff --git a/apps/mobile/src-tauri/icons/StoreLogo.png b/apps/tauri/src-tauri/icons/StoreLogo.png similarity index 100% rename from apps/mobile/src-tauri/icons/StoreLogo.png rename to apps/tauri/src-tauri/icons/StoreLogo.png diff --git a/apps/mobile/src-tauri/icons/icon.icns b/apps/tauri/src-tauri/icons/icon.icns similarity index 100% rename from apps/mobile/src-tauri/icons/icon.icns rename to apps/tauri/src-tauri/icons/icon.icns diff --git a/apps/mobile/src-tauri/icons/icon.ico b/apps/tauri/src-tauri/icons/icon.ico similarity index 100% rename from apps/mobile/src-tauri/icons/icon.ico rename to apps/tauri/src-tauri/icons/icon.ico diff --git a/apps/mobile/src-tauri/icons/icon.png b/apps/tauri/src-tauri/icons/icon.png similarity index 100% rename from apps/mobile/src-tauri/icons/icon.png rename to apps/tauri/src-tauri/icons/icon.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-20x20@1x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@1x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-20x20@1x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-20x20@1x.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-20x20@2x-1.png b/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@2x-1.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-20x20@2x-1.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-20x20@2x-1.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-20x20@2x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@2x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-20x20@2x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-20x20@2x.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-20x20@3x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-20x20@3x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-20x20@3x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-20x20@3x.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-29x29@1x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@1x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-29x29@1x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-29x29@1x.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-29x29@2x-1.png b/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@2x-1.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-29x29@2x-1.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-29x29@2x-1.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-29x29@2x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@2x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-29x29@2x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-29x29@2x.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-29x29@3x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-29x29@3x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-29x29@3x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-29x29@3x.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-40x40@1x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@1x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-40x40@1x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-40x40@1x.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-40x40@2x-1.png b/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@2x-1.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-40x40@2x-1.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-40x40@2x-1.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-40x40@2x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@2x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-40x40@2x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-40x40@2x.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-40x40@3x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-40x40@3x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-40x40@3x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-40x40@3x.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-512@2x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-512@2x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-512@2x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-512@2x.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-60x60@2x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-60x60@2x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-60x60@2x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-60x60@2x.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-60x60@3x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-60x60@3x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-60x60@3x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-60x60@3x.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-76x76@1x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-76x76@1x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-76x76@1x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-76x76@1x.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-76x76@2x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-76x76@2x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-76x76@2x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-76x76@2x.png diff --git a/apps/mobile/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png b/apps/tauri/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png similarity index 100% rename from apps/mobile/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png rename to apps/tauri/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png diff --git a/apps/mobile/src-tauri/src/lib.rs b/apps/tauri/src-tauri/src/lib.rs similarity index 100% rename from apps/mobile/src-tauri/src/lib.rs rename to apps/tauri/src-tauri/src/lib.rs diff --git a/apps/mobile/src-tauri/src/main.rs b/apps/tauri/src-tauri/src/main.rs similarity index 100% rename from apps/mobile/src-tauri/src/main.rs rename to apps/tauri/src-tauri/src/main.rs diff --git a/apps/mobile/src-tauri/tauri.conf.json b/apps/tauri/src-tauri/tauri.conf.json similarity index 80% rename from apps/mobile/src-tauri/tauri.conf.json rename to apps/tauri/src-tauri/tauri.conf.json index 5db8cf4..c39f21e 100644 --- a/apps/mobile/src-tauri/tauri.conf.json +++ b/apps/tauri/src-tauri/tauri.conf.json @@ -1,7 +1,8 @@ { "$schema": "https://schema.tauri.app/config/2", - "productName": "tensamin", - "version": "../../../package.json", + "productName": "Tensamin", + "version": "0.1.0", + "mainBinaryName": "tensamin", "identifier": "net.tensamin.client", "build": { "beforeDevCommand": "cd ../web && bun run dev && cd -", @@ -13,6 +14,7 @@ "withGlobalTauri": true, "windows": [ { + "decorations": false, "title": "Tensamin", "width": 800, "height": 600 @@ -24,7 +26,7 @@ }, "bundle": { "active": true, - "targets": "all", + "targets": ["app", "deb", "rpm", "nsis", "msi", "dmg"], "icon": [ "icons/32x32.png", "icons/128x128.png", diff --git a/apps/mobile/src/context.tsx b/apps/tauri/src/context.tsx similarity index 100% rename from apps/mobile/src/context.tsx rename to apps/tauri/src/context.tsx diff --git a/apps/mobile/tsconfig.json b/apps/tauri/tsconfig.json similarity index 100% rename from apps/mobile/tsconfig.json rename to apps/tauri/tsconfig.json diff --git a/apps/web/package.json b/apps/web/package.json index f0e20cf..f06d421 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -25,7 +25,7 @@ "@tensamin/ttp": "workspace:*", "@tensamin/ui": "workspace:*", "@tensamin/user": "workspace:*", - "@tensamin/mobile": "workspace:*", + "@tensamin/tauri": "workspace:*", "@tauri-apps/api": "^2", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", diff --git a/apps/web/src/components/sidebar.tsx b/apps/web/src/components/sidebar.tsx index ec17f53..f4276f2 100644 --- a/apps/web/src/components/sidebar.tsx +++ b/apps/web/src/components/sidebar.tsx @@ -23,7 +23,7 @@ export default function Sidebar() { return (
diff --git a/apps/web/src/routes/app/home.tsx b/apps/web/src/routes/app/home.tsx index dd45a57..933cc17 100644 --- a/apps/web/src/routes/app/home.tsx +++ b/apps/web/src/routes/app/home.tsx @@ -16,13 +16,15 @@ import { useState } from "react"; import { Loader2 } from "lucide-react"; import { isTauri } from "@tauri-apps/api/core"; import { useStorage } from "@tensamin/storage/context"; +import { useIsMobile } from "@tensamin/ui/utils"; // The page export default function Page() { const { clear } = useStorage(); + const isMobile = useIsMobile(); return ( -
+