#31 Refactor to Components (#32)

* Add Image Deletion * Remove most of global state * Make functions pure * Switch to NPM --------- Co-authored-by: Kawsar Ahmed <[email protected]>
ARK-Builders · May 29, 2024 · 9bd2f77 · 9bd2f77
1 parent 57a69e2
commit 9bd2f77
Show file tree

Hide file tree

Showing 24 changed files with 518 additions and 439 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,10 +33,10 @@ jobs:
  pkg-config
 
  - name: Fetch Node.js dependencies
- run: yarn
+ run: npm install
 
  - name: Build Release version
- run: yarn tauri build
+ run: npm run tauri build
 
  - name: Release AppImage
  uses: ncipollo/release-action@v1

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -17,12 +17,12 @@ tauri-build = { version = "1.5.1", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.6.1", features = [
+trash = "4.1.0"
+tauri = { version = "1.6.1", features = [ "fs-remove-file",
  "protocol-asset",
  "fs-read-file",
  "fs-read-dir",
  "dialog-open",
- "devtools"
 ] }
 
 [features]

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -4,6 +4,15 @@
 use std::{fs::{self}, time::{Duration, SystemTime}};
 use serde::Serialize;
 
+#[derive(Serialize)]
+struct MetadataInfo {
+ file_type: String,
+ file_size: u64,
+ created_time: String,
+ modified_time: String,
+ accessed_time: String,
+}
+
 
 #[tauri::command]
 fn get_file_metadata(file_path: String) -> Result<MetadataInfo, String> {
@@ -40,19 +49,15 @@ fn get_file_metadata(file_path: String) -> Result<MetadataInfo, String> {
  }
 }
 
-#[derive(Serialize)]
-struct MetadataInfo {
- file_type: String,
- file_size: u64,
- created_time: String,
- modified_time: String,
- accessed_time: String,
+#[tauri::command]
+fn move_file_to_trash(file_path: String) -> Result<(), String> {
+ trash::delete(&file_path).map_err(|e| e.to_string())
 }
 
 
 fn main() {
  tauri::Builder::default()
- .invoke_handler(tauri::generate_handler![get_file_metadata])
+ .invoke_handler(tauri::generate_handler![get_file_metadata, move_file_to_trash])
  .run(tauri::generate_context!())
  .expect("error while running tauri application");
 }
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -34,7 +34,7 @@
  "readDir": true,
  "readFile": true,
  "removeDir": false,
- "removeFile": false,
+ "removeFile": true,
  "renameFile": false,
  "scope": [],
  "writeFile": false

diff --git a/src/app.html b/src/app.html
@@ -4,6 +4,13 @@
  <meta charset="utf-8" />
  <link rel="icon" href="%sveltekit.assets%/favicon.png" />
  <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <link rel="preconnect" href="https://fonts.googleapis.com" />
+ <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+ <link
+ href="https://fonts.googleapis.com/css2?family=Inria+Sans:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap"
+ rel="stylesheet"
+ />
+
  %sveltekit.head%
  </head>
  <body data-sveltekit-preload-data="hover">