From 3eac743225f194f1de0a3ad34e9e5b5e117e9d70 Mon Sep 17 00:00:00 2001
From: M_Kececi <you@example.com>
Date: Tue, 17 Feb 2026 11:41:41 +0300
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 deploy/deploy.sh     | 47 ++++++++++++++++++++------------------------
 deploy/hooks.json    | 10 ++++++----
 ui/package-lock.json |  1 -
 3 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index ff06232..46ff04d 100644
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -3,43 +3,38 @@ set -e
 
 LOG=/var/log/bssapp_deploy.log
 
-echo "==============================" >> $LOG
-echo "🚀 DEPLOY START $(date)" >> $LOG
-echo "==============================" >> $LOG
+exec >> $LOG 2>&1
+
+echo "=============================="
+echo "🚀 DEPLOY START $(date)"
+echo "=============================="
 
 cd /opt/bssapp
 
-echo "== STOP SERVICE ==" >> $LOG
+echo "== STOP SERVICE =="
 systemctl stop bssapp || true
 
-echo "== GIT SYNC ==" >> $LOG
-git fetch origin >> $LOG 2>&1
-git reset --hard origin/master >> $LOG 2>&1
-git clean -fdx >> $LOG 2>&1
+echo "== GIT SYNC =="
+git fetch origin
+git reset --hard origin/master
+git clean -fdx
 
-echo "== BUILD UI ==" >> $LOG
+echo "== BUILD UI =="
 cd ui
-
-npm install >> $LOG 2>&1
-npm run build >> $LOG 2>&1
-
-echo "== COPY UI ==" >> $LOG
-rm -rf ../svc/public/*
-cp -r dist/spa/* ../svc/public/
-
+npm install
+npm run build
 cd ..
 
-echo "== BUILD BACKEND ==" >> $LOG
+echo "== COPY UI =="
+rm -rf svc/public/*
+cp -r ui/dist/spa/* svc/public/
+
+echo "== BUILD BACKEND =="
 cd svc
-
-go mod tidy >> $LOG 2>&1
-go build -o bssapp >> $LOG 2>&1
-
+go build -o bssapp
 cd ..
 
-echo "== START SERVICE ==" >> $LOG
+echo "== START SERVICE =="
 systemctl start bssapp
 
-echo "==============================" >> $LOG
-echo "✅ DEPLOY FINISHED" >> $LOG
-echo "==============================" >> $LOG
+echo "✅ DEPLOY DONE $(date)"
diff --git a/deploy/hooks.json b/deploy/hooks.json
index 66f19fa..51d11e3 100644
--- a/deploy/hooks.json
+++ b/deploy/hooks.json
@@ -3,13 +3,15 @@
     "id": "bssapp-deploy",
     "execute-command": "/opt/bssapp/deploy/deploy.sh",
     "command-working-directory": "/opt/bssapp",
-    "pass-arguments-to-command": [],
     "response-message": "BSSApp Deploy Triggered 🚀",
     "trigger-rule": {
       "match": {
-        "type": "header",
-        "name": "X-BSSAPP-SECRET",
-        "value": "bssapp-secret-2026"
+        "type": "value",
+        "value": "bssapp-secret-2026",
+        "parameter": {
+          "source": "header",
+          "name": "X-BSSAPP-SECRET"
+        }
       }
     }
   }
diff --git a/ui/package-lock.json b/ui/package-lock.json
index beb6054..6eeb716 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -7,7 +7,6 @@
     "": {
       "name": "baggisowtfaresystem",
       "version": "0.0.1",
-      "hasInstallScript": true,
       "dependencies": {
         "@quasar/extras": "^1.16.4",
         "axios": "^1.12.2",