Merge pull request #21 from EastSun5566/feat/add-tray

feat: add items to tray

.github/workflows/build.yml

@@ -2,11 +2,11 @@ name: Testing build
 
 on:
   pull_request:
-    types: [labeled]
+  workflow_dispatch:
 
 jobs:
   build:
-    if: ${{ github.event.label.name == 'build' }}
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'build') || github.event_name == 'workflow_dispatch' }}
 
     strategy:
       fail-fast: false

.github/workflows/deploy.yml

@@ -4,8 +4,6 @@ on:
   push:
     tags:
       - "v*"
-
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages

README.md

@@ -46,8 +46,8 @@ And You can also follow me on [HackMD](https://hackmd.io/@EastSun5566) 😎
 
 ### Prerequisites
 
-- [Rust v1.71](https://www.rust-lang.org/learn/get-started)
-- [Node.js v16+](https://github.com/nvm-sh/nvm?tab=readme-ov-file#installing-and-updating)
+- [Rust v1.71+](https://www.rust-lang.org/learn/get-started)
+- [Node.js v18+](https://github.com/nvm-sh/nvm?tab=readme-ov-file#installing-and-updating)
 - [Pnpm v8+](https://pnpm.io/installation#using-corepack)
 
 ### Getting Started

package.json

@@ -4,6 +4,10 @@
   "private": true,
   "version": "0.0.6",
   "type": "module",
+  "engines": {
+    "node": ">=18",
+    "pnpm": ">=8"
+  },
   "scripts": {
     "dev": "tauri dev",
     "build": "tauri build",

src-tauri/src/app/mod.rs

@@ -2,6 +2,7 @@ pub mod cmd;
 pub mod conf;
 pub mod menu;
 pub mod setup;
+pub mod tray;
 
 #[cfg(target_os = "macos")]
 pub mod mac;

src-tauri/src/app/tray.rs

@@ -0,0 +1,20 @@
+use tauri::{AppHandle, CustomMenuItem, SystemTray, SystemTrayEvent, SystemTrayMenu};
+
+pub fn init() -> SystemTray {
+    let quit = CustomMenuItem::new("quit".to_string(), "Quit");
+    let tray_menu = SystemTrayMenu::new().add_item(quit);
+
+    SystemTray::new().with_menu(tray_menu)
+}
+
+pub fn handler(app: &AppHandle, event: SystemTrayEvent) {
+    match event {
+        SystemTrayEvent::MenuItemClick { id, .. } => match id.as_str() {
+            "quit" => {
+                app.exit(0);
+            }
+            _ => {}
+        },
+        _ => {}
+    }
+}

src-tauri/src/main.rs

@@ -4,7 +4,7 @@
 mod app;
 mod utils;
 
-use app::{cmd, menu, setup};
+use app::{cmd, menu, setup, tray};
 
 #[tokio::main]
 async fn main() {
@@ -23,7 +23,8 @@ async fn main() {
         .setup(setup::init)
         .menu(menu::init(&context))
         .on_menu_event(menu::handler)
-        .system_tray(tauri::SystemTray::default())
+        .system_tray(tray::init())
+        .on_system_tray_event(tray::handler)
         .run(context)
         .expect("error while running HackDesk application");
 }

src-tauri/tauri.conf.json

@@ -19,10 +19,13 @@
         "open": true
       },
       "fs": {
-        "scope": ["$HOME/.hackdesk/*"]
+        "all": false,
+        "scope": ["$HOME/.hackdesk/*"],
+        "readFile": true,
+        "writeFile": true
       },
       "globalShortcut": {
-        "all": true
+        "all": false
       }
     },
     "systemTray": {