fixerror

.gitea/workflows/deploy.yml

@@ -0,0 +1,26 @@
+name: Deploy
+run-name: ${{ gitea.actor }} build image and push to container registry
+
+on: 
+  push:
+    branches:
+      - 'main'
+      - 'staging'
+
+jobs:
+  DeployService:
+    runs-on: [frontstaging]
+    container:
+      image: gitea.pena:3000/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:3000/PenaDevops/actions.git/checkout@v1
+      - run: printenv
+      - run: GITHUB_RUN_NUMBER=${{ gitea.run_id }} compose -f deployments/${{ gitea.ref_name }}/docker-compose.yaml up -d
+    # uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.6-p
+    # with:
+    #   runner: frontstaging

.gitea/workflows/lint.yml

@@ -0,0 +1,14 @@
+name: Lint
+run-name: ${{ gitea.actor }} produce linting
+
+on:
+  push:
+    branches:
+      - 'sdev'
+
+jobs:
+  Lint:
+    runs-on: [hubstaging]
+    uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/lint.yml@v1.1.2
+    with:
+      runner: hubstaging

.yarnrc

@@ -1 +1 @@
-"@frontend:registry" "https://penahub.gitlab.yandexcloud.net/api/v4/packages/npm/"
+"@frontend:registry" "http://gitea.pena/api/packages/skeris/npm/"

Dockerfile

@@ -1,19 +1,14 @@
-FROM penahub.gitlab.yandexcloud.net:5050/devops/dockerhub-backup/node as build
+FROM gitea.pena/penadevops/container-images/node:main as build
 
 RUN apk update && rm -rf /var/cache/apk/*
 WORKDIR /usr/app
 COPY . .
 
-RUN npm config set -- //penahub.gitlab.yandexcloud.net/api/v4/packages/npm/:_authToken=glpat-JL_7wSM1QpW7xGfd-oWX
-RUN npm config set -- //penahub.gitlab.yandexcloud.net/api/v4/projects/43/packages/npm/:_authToken=glpat-JL_7wSM1QpW7xGfd-oWX
-RUN npm config set @frontend:registry https://penahub.gitlab.yandexcloud.net/api/v4/packages/npm/
-RUN yarn config set '//penahub.gitlab.yandexcloud.net/api/v4/packages/npm/:_authToken' "glpat-JL_7wSM1QpW7xGfd-oWX"
-RUN yarn config set '//penahub.gitlab.yandexcloud.net/api/v4/projects/:_authToken' "glpat-JL_7wSM1QpW7xGfd-oWX"
 RUN yarn install --ignore-scripts --non-interactive && yarn cache clean
 RUN yarn build
 
 
-FROM penahub.gitlab.yandexcloud.net:5050/devops/dockerhub-backup/nginx as result
+FROM gitea.pena/penadevops/container-images/nginx:main as result
 WORKDIR /usr/share/nginx/html
 COPY --from=build /usr/app/build/ /usr/share/nginx/html
 COPY hub.conf /etc/nginx/conf.d/default.conf

deployments/staging/docker-compose.yaml

@@ -3,13 +3,8 @@ services:
   squiz:
     container_name: squiz
     restart: unless-stopped
-    image: $CI_REGISTRY_IMAGE/staging:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
-    networks:
-      - marketplace_penahub_frontend
+    image: gitea.pena/squiz/frontpanel/staging:324
     labels:
       com.pena.domains: squiz.pena.digital
     hostname: squiz
     tty: true
-networks:
-  marketplace_penahub_frontend:
-    external: true

package.json

@@ -7,7 +7,7 @@
     "@emotion/react": "^11.10.5",
     "@emotion/styled": "^11.10.5",
     "@frontend/kitui": "^1.0.87",
-    "@frontend/squzanswerer": "^1.0.57",
+    "@frontend/squzanswerer": "^1.0.59",
     "@mui/icons-material": "^5.10.14",
     "@mui/material": "^5.10.14",
     "@mui/x-charts": "^6.19.5",

src/App.tsx

@@ -275,4 +275,4 @@ export default function App() {
       </Routes>
     </>
   );
-}
+}

src/api/ticket.ts

@@ -28,7 +28,7 @@ export const sendTicketMessage = async (
       url: `${API_URL}/send`,
       method: "POST",
       useToken: true,
-      body: { ticket: ticketId, message: message, lang: "ru", files: [], system: systemError },
+      body: { ticket: ticketId, message: message, lang: "ru", files: [], System: systemError },
       
     });
 
@@ -89,7 +89,7 @@ export const createTicket = async (
   try {
     const createdTicket = await createTicketRequest({
       url: `${process.env.REACT_APP_DOMAIN}/heruvym/v1.0.0/create`,
-      body: { Title: "Unauth title", Message: message, system: systemError },
+      body: { Title: "Unauth title", Message: message, System: systemError },
       useToken,
     });
 

yarn.lock

@@ -1513,18 +1513,18 @@
   resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.2.tgz#d8bae93ac8b815b2bd7a98078cf91e2724ef11e5"
   integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==
 
-"@frontend/kitui@^1.0.85":
-  version "1.0.85"
-  resolved "https://penahub.gitlab.yandexcloud.net/api/v4/projects/21/packages/npm/@frontend/kitui/-/@frontend/kitui-1.0.85.tgz#1a384c9ff3314175c1ba3d35d0979da7026a21ab"
-  integrity sha1-GjhMn/MxQXXBuj010JedpwJqIas=
+"@frontend/kitui@^1.0.87":
+  version "1.0.88"
+  resolved "http://gitea.pena/api/packages/skeris/npm/%40frontend%2Fkitui/-/1.0.88/kitui-1.0.88.tgz#cc176f53961e9f8c5cb360e4591356e7260f7352"
+  integrity sha512-kDDMVYEpj0aovY4ELlyOooxQoIbWx2hOhNUxuCK4fTjhm2Hqim1m+SjexZalv//4gZ/zehuNlBj1ciBUjUxPZA==
   dependencies:
     immer "^10.0.2"
     reconnecting-eventsource "^1.6.2"
 
-"@frontend/squzanswerer@^1.0.56":
-  version "1.0.56"
-  resolved "https://penahub.gitlab.yandexcloud.net/api/v4/projects/43/packages/npm/@frontend/squzanswerer/-/@frontend/squzanswerer-1.0.56.tgz#0372cda2bdfdf9f84c5854944d2817cffc1f0fd7"
-  integrity sha1-A3LNor39+fhMWFSUTSgXz/wfD9c=
+"@frontend/squzanswerer@^1.0.57":
+  version "1.0.59"
+  resolved "http://gitea.pena/api/packages/skeris/npm/%40frontend%2Fsquzanswerer/-/1.0.59/squzanswerer-1.0.59.tgz#01514b322049ef18fd1e223d125cacb0b084381d"
+  integrity sha512-FMH+vKPEdokl6oCUH85i4IqW02L7DAkU2GMwsRwaXg/e+in4UzUm/MV2OEM4qAa2uq60FHx1UuzbSme71EggkQ==
   dependencies:
     bowser "1.9.4"
     country-flag-emoji-polyfill "^0.1.8"
@@ -10593,7 +10593,16 @@ string-natural-compare@^3.0.1:
   resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-3.0.1.tgz#7a42d58474454963759e8e8b7ae63d71c1e7fdf4"
   integrity sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10689,7 +10698,14 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -11883,7 +11899,7 @@ workbox-window@6.6.1:
     "@types/trusted-types" "^2.0.2"
     workbox-core "6.6.1"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -11901,6 +11917,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"