change file/folder label when choosed

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 0d2894f882dbc5b24b9ceb75c8647a64b997210c..46367418db42d0c774f0f52022d03296d5650c8c 100644 (file)
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -2,7 +2,7 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
 use native_dialog::FileDialog;
-use tauri::{AppHandle, Manager};
+use tauri::Manager;
 use std::sync::Mutex;
 
 #[macro_use]
@@ -22,15 +22,16 @@ struct Payload {
 // Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
 #[tauri::command]
 async fn select_file_button(app: tauri::AppHandle) {
-    let _ = app.emit_all("my_event", ());
     FILE_PATH.lock().unwrap().replace_range(.., &choose_file());
     println!("{}",FILE_PATH.lock().unwrap());
+    let _ = app.emit_all("file_path_changed", Payload { message: FILE_PATH.lock().unwrap().to_string() });
 }
 
 #[tauri::command]
-async fn select_folder_button() {
+async fn select_folder_button(app: tauri::AppHandle) {
     FOLDER_PATH.lock().unwrap().replace_range(.., &choose_folder());
     println!("{}",FOLDER_PATH.lock().unwrap());
+    let _ = app.emit_all("folder_path_changed", Payload { message: FOLDER_PATH.lock().unwrap().to_string() });
 }
 
 #[tauri::command]
@@ -44,7 +45,7 @@ fn choose_file() -> String{
     let path = FileDialog::new()
         .show_open_single_file()
         .unwrap();
-    format!("{:?}", path) // turn the FileDialog into a string
+    format!("{:?}", path).replace("Some(\"", "").replace("\")", "") // turn the FileDialog into a string and remove Some("")
 }
 
 fn choose_folder() -> String{
@@ -52,7 +53,7 @@ fn choose_folder() -> String{
     let path = FileDialog::new()
         .show_open_single_dir()
         .unwrap();
-    format!("{:?}", path) // turn the FileDialog into a string
+    format!("{:?}", path).replace("Some(\"", "").replace("\")", "") // turn the FileDialog into a string
 }
 
 fn main() {

diff --git a/src/event_handler.js b/src/event_handler.js
index 4814592f5ca4cc999804b50c3cce7e88c7be91ae..351a683562c0ba7a32538940912e15e131bd0310 100644 (file)
--- a/src/event_handler.js
+++ b/src/event_handler.js
@@ -2,15 +2,14 @@ const { listen } = window.__TAURI__.event
 
 document.getElementById("fileLocation").innerHTML = "hey";
 
-// listen to the `click` event and get a function to remove the event listener
-// there's also a `once` function that subscribes to an event and automatically unsubscribes the listener on the first event
-const unlisten = await listen('my_event', (event) => {
-  // event.event is the event name (useful if you want to use a single callback fn for multiple event types)
-  // event.payload is the payload object
-  document.getElementById("fileLocation").innerHTML = "hello";
+// listen for file location from rust backend
+const unlistenfile = await listen('file_path_changed', (event) => {
+  document.getElementById("fileLocation").innerHTML = event.payload.message;
+  console.log("changing file label to : ", event.payload.message);
 })
 
-// emits the `click` event with the object payload
-emit('click', {
-  theMessage: 'Tauri is awesome!',
+// listen for folder location from rust backend
+const unlistenfolder = await listen('folder_path_changed', (event) => {
+  document.getElementById("folderLocation").innerHTML = event.payload.message;
+  console.log("changing folder label to : ", event.payload.message);
 })
\ No newline at end of file

diff --git a/src/index.html b/src/index.html
index fb8c5b127cb7f132c7c453558a8a2900dbb26b0a..1ec3f715a638bbb998be3cbe2d23e359ee4533c1 100644 (file)
--- a/src/index.html
+++ b/src/index.html
@@ -16,8 +16,10 @@
     <div class="main-container">
       <h3>Welcome to the Rusty slicer! <img src="assets/cat-vibe-vibe-cat.gif"></h1>
         <div class="select-file">
-          <p><b> Input file </b> <br></p>
-          <p id="fileLocation"> no location choosen </p>
+          <div>
+            <p><b> Input file </b></p>
+            <p id="fileLocation"> no location choosen </p>
+          </div>
           <button id="fileButton">choose file 📂</button>
         </div>
 
@@ -26,7 +28,10 @@
         </div>
 
         <div class="select-file">
-          <p><b> Output folder </b> <br> no location choosen </p>
+          <div>
+            <p><b> Output folder </b> </p>
+            <p id="folderLocation"> no location choosen </p>
+          </div>
           <button id="folderButton">choose folder 📂</button>
         </div>