From 5bf2c3d0ffc211ab678648af9d59e8dfa33fbab9 Mon Sep 17 00:00:00 2001 From: Greg Shuflin Date: Wed, 2 Oct 2024 20:24:51 -0700 Subject: [PATCH] OS Info usage --- src-tauri/src/lib.rs | 9 ++++++++- src/index.html | 6 ++++++ src/main.js | 12 ++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index f9aeae2..ddc4210 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -4,12 +4,19 @@ fn greet(name: &str) -> String { format!("Gamarjoba, {name}! This is coming from Rust!") } +#[tauri::command] +fn os_info() -> String { + println!("MAKING A REQUEST"); + let platform = tauri_plugin_os::platform(); + format!("Platform Info: {}", platform) +} + #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { tauri::Builder::default() .plugin(tauri_plugin_os::init()) .plugin(tauri_plugin_shell::init()) - .invoke_handler(tauri::generate_handler![greet]) + .invoke_handler(tauri::generate_handler![greet, os_info]) .run(tauri::generate_context!()) .expect("error while running tauri application"); } diff --git a/src/index.html b/src/index.html index 1e76536..0b36422 100644 --- a/src/index.html +++ b/src/index.html @@ -36,6 +36,12 @@

+
+
+ +
+

+ diff --git a/src/main.js b/src/main.js index 9a7530b..662bbfd 100644 --- a/src/main.js +++ b/src/main.js @@ -8,6 +8,12 @@ async function greet() { greetMsgEl.textContent = await invoke("greet", { name: greetInputEl.value }); } + +async function os_info(elem) { + elem.textContent = await invoke("os_info", {}); +} + + window.addEventListener("DOMContentLoaded", () => { greetInputEl = document.querySelector("#greet-input"); greetMsgEl = document.querySelector("#greet-msg"); @@ -15,4 +21,10 @@ window.addEventListener("DOMContentLoaded", () => { e.preventDefault(); greet(); }); + + document.querySelector("#os-info-form").addEventListener("submit", (e) => { + e.preventDefault(); + const elem = document.querySelector("#os-msg"); + os_info(elem); + }); });