From 091a2123bb03b359edad4850a359bb7d35d6ebb3 Mon Sep 17 00:00:00 2001 From: haex Date: Sat, 31 May 2025 16:07:12 +0200 Subject: [PATCH] fix build --- .../android/app/src/main/AndroidManifest.xml | 3 +- .../main/java/space/haex/hub/MainActivity.kt | 12 +- src-tauri/gen/android/build.gradle.kts | 2 +- .../gen/android/buildSrc/build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- src-tauri/src/database/mod.rs | 21 +- src-tauri/src/lib.rs | 67 -- src-tauri/tauri.conf.json | 2 +- src/assets/css/tailwind.css | 2 +- src/components/ui/accordion/index.vue | 45 +- src/components/ui/dialog/confirm.vue | 44 +- src/components/ui/dropdown/index.vue | 59 +- src/components/ui/dropdown/locale.vue | 20 +- src/components/ui/logo/haexhub.vue | 828 ++++++++++++++++++ src/components/ui/logo/itemis.vue | 80 +- src/components/vault/button/create.vue | 2 +- src/components/vault/button/open.vue | 7 +- src/pages/index.vue | 9 +- src/plugins/flyonui.client.ts | 16 +- src/stores/vault/index.ts | 1 + src/stores/vault/notifications.ts | 1 + 21 files changed, 1034 insertions(+), 191 deletions(-) create mode 100644 src/components/ui/logo/haexhub.vue create mode 100644 src/stores/vault/notifications.ts diff --git a/src-tauri/gen/android/app/src/main/AndroidManifest.xml b/src-tauri/gen/android/app/src/main/AndroidManifest.xml index 0d17964..b6a3941 100644 --- a/src-tauri/gen/android/app/src/main/AndroidManifest.xml +++ b/src-tauri/gen/android/app/src/main/AndroidManifest.xml @@ -1,8 +1,7 @@ - - + diff --git a/src-tauri/gen/android/app/src/main/java/space/haex/hub/MainActivity.kt b/src-tauri/gen/android/app/src/main/java/space/haex/hub/MainActivity.kt index 0af2838..cee843f 100644 --- a/src-tauri/gen/android/app/src/main/java/space/haex/hub/MainActivity.kt +++ b/src-tauri/gen/android/app/src/main/java/space/haex/hub/MainActivity.kt @@ -1,13 +1,3 @@ package space.haex.hub -import android.webkit.WebView -import android.os.Bundle -import android.content.pm.ApplicationInfo -class MainActivity : TauriActivity(){ - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - if (0!= (applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE)) { - WebView.setWebContentsDebuggingEnabled(true) - } - } -} \ No newline at end of file +class MainActivity : TauriActivity() \ No newline at end of file diff --git a/src-tauri/gen/android/build.gradle.kts b/src-tauri/gen/android/build.gradle.kts index ca48cb4..c5ef452 100644 --- a/src-tauri/gen/android/build.gradle.kts +++ b/src-tauri/gen/android/build.gradle.kts @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:8.10.0") + classpath("com.android.tools.build:gradle:8.5.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25") } } diff --git a/src-tauri/gen/android/buildSrc/build.gradle.kts b/src-tauri/gen/android/buildSrc/build.gradle.kts index c4edbcd..39e90b0 100644 --- a/src-tauri/gen/android/buildSrc/build.gradle.kts +++ b/src-tauri/gen/android/buildSrc/build.gradle.kts @@ -18,6 +18,6 @@ repositories { dependencies { compileOnly(gradleApi()) - implementation("com.android.tools.build:gradle:8.10.0") + implementation("com.android.tools.build:gradle:8.5.1") } diff --git a/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties b/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties index 0d4bd19..0df10d5 100644 --- a/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties +++ b/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue May 10 19:22:52 CST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/src-tauri/src/database/mod.rs b/src-tauri/src/database/mod.rs index 88a0708..77b21b9 100644 --- a/src-tauri/src/database/mod.rs +++ b/src-tauri/src/database/mod.rs @@ -33,7 +33,7 @@ pub async fn sql_execute( /// Erstellt eine verschlüsselte Datenbank #[tauri::command] -pub fn create_encrypted_database_old( +pub fn create_encrypted_database( app_handle: AppHandle, path: String, key: String, @@ -41,9 +41,15 @@ pub fn create_encrypted_database_old( ) -> Result { // Ressourcenpfad zur eingebundenen Datenbank auflösen + println!("Arbeitsverzeichnis: {:?}", std::env::current_dir()); + println!( + "Ressourcenverzeichnis: {:?}", + app_handle.path().resource_dir() + ); + let resource_path = app_handle .path() - .resolve("vault.db", BaseDirectory::Resource) + .resolve("database/vault.db", BaseDirectory::Resource) .map_err(|e| format!("Fehler beim Auflösen des Ressourcenpfads: {}", e))?; // Prüfen, ob die Ressourcendatei existiert @@ -227,9 +233,10 @@ pub fn open_encrypted_database( return Err("Datenbankdatei nicht gefunden".into()); } - let conn = core::open_and_init_db(&path, &key, false)?; + let conn = core::open_and_init_db(&path, &key, false) + .map_err(|e| format!("Fehler beim öffnen: {}", e)); let mut db = state.0.lock().map_err(|e| e.to_string())?; - *db = Some(conn); + *db = Some(conn.unwrap()); Ok(format!("success")) } @@ -260,7 +267,7 @@ fn prepare_temporary_asset_db( //.resolve("vault.db", BaseDirectory::Resource) let asset_bytes = app_handle .asset_resolver() - .get(asset_name.to_string()) + .get(asset_name.to_owned()) .ok_or_else(|| format!("Asset '{}' wurde nicht im Bundle gefunden.", asset_name))? .bytes() .to_vec(); @@ -493,7 +500,7 @@ fn open_and_verify_encrypted_db(db_path: &Path, key: &str) -> Result, path: String, key: String, @@ -503,7 +510,7 @@ pub fn create_encrypted_database( let temp_db_path: PathBuf; // Muss deklariert werden, um im Fehlerfall aufgeräumt werden zu können // Schritt 1: Asset vorbereiten - match prepare_temporary_asset_db(&app_handle, &asset_name, BaseDirectory::AppData) { + match prepare_temporary_asset_db(&app_handle, &asset_name, BaseDirectory::Resource) { Ok(path) => temp_db_path = path, Err(e) => return Err(e), } diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 56b3d83..ad18242 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -12,73 +12,6 @@ pub fn run() { let protocol_name = "haex-extension"; tauri::Builder::default() - .setup(|app| { - // --- START DER ASSET-INVENTUR (Korrigierte Version) --- - println!("\n[INVENTUR] App-Setup wird ausgeführt. Liste alle Assets im Bundle auf..."); - - let mut found_assets_count = 0; - - // KORREKTE METHODE: Direkt über eine Referenz auf den AssetResolver iterieren - for asset_name in app.asset_resolver().iter() { - found_assets_count += 1; - // Wir geben jeden gefundenen Asset-Namen aus - println!("[INVENTUR] Gefundenes Asset: '{}'", asset_name.0); - } - - if found_assets_count == 0 { - println!("[INVENTUR] Es wurden KEINE Assets im Bundle gefunden!"); - } else { - println!( - "[INVENTUR] Inventur abgeschlossen. {} Assets gefunden.", - found_assets_count - ); - } - - println!("[INVENTUR] --- ENDE DER INVENTUR ---\n"); - // --- ENDE DER ASSET-INVENTUR --- - // --- START DES DEFINITIVEN ASSET-TESTS --- - println!("\n[DEBUG] App-Setup wird ausgeführt. Versuche, die Datenbank zu laden..."); - - // BITTE SICHERSTELLEN: Dieser String muss EXAKT dem SCHLÜSSEL (KEY) - // in deiner tauri.conf.json entsprechen! - let asset_to_find = "database/vault.db"; - - println!( - "[DEBUG] Suche nach Asset mit dem Alias: '{}'", - asset_to_find - ); - - match app.asset_resolver().get(asset_to_find.to_string()) { - Some(asset) => { - // ERFOLG! Das Asset wurde gefunden. - println!("\n✅ ✅ ✅ ERFOLG! ✅ ✅ ✅"); - println!( - "[DEBUG] Asset '{}' wurde im Bundle gefunden.", - asset_to_find - ); - println!("[DEBUG] Größe der Datenbank: {} Bytes.", asset.bytes.len()); - } - None => { - // FEHLER! Das Asset wurde nicht gefunden. - println!("\n❌ ❌ ❌ FEHLER! ❌ ❌ ❌"); - println!( - "[DEBUG] Asset '{}' wurde NICHT im Bundle gefunden.", - asset_to_find - ); - println!("[DEBUG] Mögliche Ursachen:"); - println!("[DEBUG] 1. Der Alias-String im Code ist falsch (Tippfehler?)."); - println!("[DEBUG] 2. Der Schlüssel in 'tauri.conf.json' ist anders."); - println!( - "[DEBUG] 3. Der Build-Cache ist veraltet (lösche 'src-tauri/target')." - ); - } - } - println!("[DEBUG] --- ENDE DES ASSET-TESTS ---\n"); - // --- ENDE DES DEFINITIVEN ASSET-TESTS --- - - // Hier kann dein restlicher Setup-Code stehen bleiben - Ok(()) - }) .register_uri_scheme_protocol(protocol_name, move |context, request| { match extension::core::extension_protocol_handler(&context, &request) { Ok(response) => response, // Wenn der Handler Ok ist, gib die Response direkt zurück diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index f1869cf..855a8fc 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -54,6 +54,6 @@ "icons/icon.icns", "icons/icon.ico" ], - "resources": ["test.txt"] + "resources": ["database/vault.db"] } } diff --git a/src/assets/css/tailwind.css b/src/assets/css/tailwind.css index 032b2cf..def5d4b 100644 --- a/src/assets/css/tailwind.css +++ b/src/assets/css/tailwind.css @@ -6,4 +6,4 @@ themes: all; } -@source "../../node_modules/flyonui/flyonui.js"; +/* @source "../../../node_modules/flyonui/flyonui.js"; */ diff --git a/src/components/ui/accordion/index.vue b/src/components/ui/accordion/index.vue index 33443e3..adfa4f8 100644 --- a/src/components/ui/accordion/index.vue +++ b/src/components/ui/accordion/index.vue @@ -1,37 +1,48 @@ \ No newline at end of file +}) + diff --git a/src/components/ui/dialog/confirm.vue b/src/components/ui/dialog/confirm.vue index edb9299..80af2cc 100644 --- a/src/components/ui/dialog/confirm.vue +++ b/src/components/ui/dialog/confirm.vue @@ -1,5 +1,8 @@ - de: - abort: Abbrechen - confirm: Bestätigen +de: + abort: Abbrechen + confirm: Bestätigen - en: - abort: Abort - confirm: Confirm - \ No newline at end of file +en: + abort: Abort + confirm: Confirm + diff --git a/src/components/ui/dropdown/index.vue b/src/components/ui/dropdown/index.vue index 777852b..67a74a8 100644 --- a/src/components/ui/dropdown/index.vue +++ b/src/components/ui/dropdown/index.vue @@ -1,44 +1,61 @@ \ No newline at end of file +const id = useId() + diff --git a/src/components/ui/dropdown/locale.vue b/src/components/ui/dropdown/locale.vue index ce19b0a..d21040c 100644 --- a/src/components/ui/dropdown/locale.vue +++ b/src/components/ui/dropdown/locale.vue @@ -1,17 +1,23 @@