From 5f3460d3a62beadf45eb15348cc00473244b3e4b Mon Sep 17 00:00:00 2001
From: Nastya <nastyab015@yandex.ru>
Date: Wed, 13 Aug 2025 01:47:03 +0300
Subject: [PATCH] update duploy

---
 .gitea/workflows/deployProd.yml        | 46 ++++++++++++++++----------
 deployments/main/docker-compose.yaml   |  3 +-
 src/assets/icons/logo/PostbackLogo.tsx | 10 ++++++
 src/assets/icons/logo/ZapierLogo.tsx   | 15 +++++++++
 4 files changed, 56 insertions(+), 18 deletions(-)
 create mode 100644 src/assets/icons/logo/PostbackLogo.tsx
 create mode 100644 src/assets/icons/logo/ZapierLogo.tsx

diff --git a/.gitea/workflows/deployProd.yml b/.gitea/workflows/deployProd.yml
index cd705f0c..73a0f6db 100644
--- a/.gitea/workflows/deployProd.yml
+++ b/.gitea/workflows/deployProd.yml
@@ -6,20 +6,32 @@ on:
     types: [published]
 
 jobs:
-  CreateImage:
-    runs-on: [skeris]
-    uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p
-    with:
-      runner: skeris 
-    secrets:
-      REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
-      REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
-  DeployService:
-    runs-on: [frontprod]
-    needs: CreateImage
-    uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7
-    with:
-      runner: hubprod
-      actionid: ${{ gitea.run_id }}
-    
-
+  # CreateImage:
+  #   runs-on: [skeris]
+  #   uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p
+  #   with:
+  #     runner: skeris 
+  #   secrets:
+  #     REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
+  #     REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
+  # DeployService:
+  #   runs-on: [frontprod]
+  #   needs: CreateImage
+  #   uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7
+  #   with:
+  #     runner: hubprod
+  #     actionid: ${{ gitea.run_id }}
+  #   
+   DeployService:
+      if: contains(github.event.package.name, 'main')
+      runs-on: [frontprod]
+      container:
+        image: gitea.pena/penadevops/container-images/node-compose:main
+        env:
+          GITHUB_RUN_NUMBER: "${{ inputs.actionid }}"
+        volumes:
+          - /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock
+      steps:
+        - name: Check out repository code
+          uses: http://gitea.pena/PenaDevops/actions.git/checkout@v1
+        - run: compose -f deployments/main/docker-compose.yaml up -d
diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml
index ce954b76..da022dd5 100644
--- a/deployments/main/docker-compose.yaml
+++ b/deployments/main/docker-compose.yaml
@@ -2,6 +2,7 @@ services:
   squiz:
     container_name: squiz
     restart: unless-stopped
-    image: gitea.pena/squiz/frontpanel/main:$GITHUB_RUN_NUMBER
+    image: gitea.pena/squiz/frontpanel/main:$latest
     hostname: squiz
     tty: true
+    pull_policy: always
diff --git a/src/assets/icons/logo/PostbackLogo.tsx b/src/assets/icons/logo/PostbackLogo.tsx
new file mode 100644
index 00000000..daff6059
--- /dev/null
+++ b/src/assets/icons/logo/PostbackLogo.tsx
@@ -0,0 +1,10 @@
+import { Box, SxProps } from "@mui/material";
+import PostbackDefault from "./Postback";
+import PostbackPC from "./PostbackPC";
+
+export const PostbackLogo = (sx: SxProps) => (
+  <Box sx={{ display: "flex", alignItems: "center", gap: 1, ...sx }}>
+    <PostbackPC sx={{ width: "24px", height: "20px" }} />
+    <PostbackDefault sx={{ width: "40px", height: "8px" }} />
+  </Box>
+); 
\ No newline at end of file
diff --git a/src/assets/icons/logo/ZapierLogo.tsx b/src/assets/icons/logo/ZapierLogo.tsx
new file mode 100644
index 00000000..3b06b61b
--- /dev/null
+++ b/src/assets/icons/logo/ZapierLogo.tsx
@@ -0,0 +1,15 @@
+import { Box, SxProps } from "@mui/material";
+
+export const ZapierLogo = (sx: SxProps) => (
+  <Box
+    component="img"
+    src="/src/assets/icons/logo/zapier.png"
+    alt="Zapier"
+    sx={{
+      width: "40px",
+      height: "40px",
+      objectFit: "contain",
+      ...sx,
+    }}
+  />
+); 
\ No newline at end of file