From 9e9de3488ef4496f7d3515ddaa9aaa6454d4e2f1 Mon Sep 17 00:00:00 2001
From: fengyc <fengyc.work@gmail.com>
Date: Thu, 19 Dec 2024 14:51:28 +0800
Subject: [PATCH] build: update

---
 .github/workflows/build-web.yml |  4 ++--
 pisugar-server/Cargo.toml       | 14 ++------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml
index 448a0c3..b9df933 100644
--- a/.github/workflows/build-web.yml
+++ b/.github/workflows/build-web.yml
@@ -20,11 +20,11 @@ jobs:
       - name: NPM or Yarn install with caching
         uses: bahmutov/npm-install@v1.6.0
         with:
-          working-directory: electron
+          working-directory: pisugar-webui
 
       # Nodejs build web
       - run: npm run build:web
-        working-directory: electron
+        working-directory: pisugar-webui
 
       # Upload artifact
       - name: Upload artifacts
diff --git a/pisugar-server/Cargo.toml b/pisugar-server/Cargo.toml
index ca2ff6c..c00ffb4 100644
--- a/pisugar-server/Cargo.toml
+++ b/pisugar-server/Cargo.toml
@@ -79,20 +79,10 @@ assets = [
     "644",
   ],
   [
-    "../electron/dist/web/*",
+    "../pisugar-webui/dist/**/*",
     "usr/share/pisugar-server/web/",
     "644",
   ],
-  [
-    "../electron/dist/web/fonts/*",
-    "usr/share/pisugar-server/web/fonts",
-    "644",
-  ],
-  [
-    "../electron/dist/web/imgs/*",
-    "usr/share/pisugar-server/web/imgs",
-    "644",
-  ],
 ]
 conf-files = ["/etc/default/pisugar-server", "/etc/pisugar-server/config.json"]
 
@@ -110,4 +100,4 @@ pisugar-server = { path = "/usr/bin/pisugar-server" }
 "pisugar-server.default" = { path = "/etc/default/pisugar-server" }
 "config.json" = { path = "/etc/pisugar-server/config.json" }
 "_ws.json" = { path = "/usr/share/pisugar-server/web/_ws.json" }
-"../../electron/dist/web/" = { path = "/usr/share/pisugar-server/web" }
+"../../pisugar-webui/dist/" = { path = "/usr/share/pisugar-server/web" }