From aab79739283168182f96ebdbebdb34978b112bf2 Mon Sep 17 00:00:00 2001 From: Joscha Date: Tue, 21 Jan 2025 23:40:26 +0100 Subject: [PATCH] Use tta crate from tauri app --- Cargo.lock | 1 + tta-app/src-tauri/Cargo.toml | 5 +++-- tta-app/src-tauri/src/lib.rs | 2 +- tta-app/src/App.vue | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 56ba9d0..70811d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4167,6 +4167,7 @@ dependencies = [ "tauri", "tauri-build", "tauri-plugin-opener", + "tta", ] [[package]] diff --git a/tta-app/src-tauri/Cargo.toml b/tta-app/src-tauri/Cargo.toml index 31df71e..53b4f14 100644 --- a/tta-app/src-tauri/Cargo.toml +++ b/tta-app/src-tauri/Cargo.toml @@ -18,10 +18,11 @@ 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" +tauri = { version = "2", features = [] } +tauri-plugin-opener = "2" +tta = { workspace = true } [lints] workspace = true diff --git a/tta-app/src-tauri/src/lib.rs b/tta-app/src-tauri/src/lib.rs index 4a277ef..637213d 100644 --- a/tta-app/src-tauri/src/lib.rs +++ b/tta-app/src-tauri/src/lib.rs @@ -1,7 +1,7 @@ // Learn more about Tauri commands at https://tauri.app/develop/calling-rust/ #[tauri::command] fn greet(name: &str) -> String { - format!("Hello, {}! You've been greeted from Rust!", name) + tta::greet(name) } #[cfg_attr(mobile, tauri::mobile_entry_point)] diff --git a/tta-app/src/App.vue b/tta-app/src/App.vue index 5a26f11..1afd750 100644 --- a/tta-app/src/App.vue +++ b/tta-app/src/App.vue @@ -29,7 +29,7 @@ async function greet() {

Click on the Tauri, Vite, and Vue logos to learn more.

- +

{{ greetMsg }}

@@ -157,4 +157,4 @@ button { } } - \ No newline at end of file +