From a78d973a940515ecb73200296bfc952643a7a008 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 4 Jul 2024 11:29:33 +0300
Subject: [PATCH 1/8] add reach goal

---
 .gitea/workflows/deploy.yaml |  3 ++-
 README.md                    |  3 ++-
 components/calcValues.vue    |  8 ++++++++
 components/modal.vue         |  9 ++++++++-
 nuxt.config.ts               |  6 +++++-
 package-lock.json            | 27 ++++++++++++++++++++++++++-
 package.json                 |  1 +
 7 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 4438695..81ee4fc 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -36,12 +36,13 @@ jobs:
           NUXT_PUBLIC_API_BASE: 'https://mns.kustarshina.ru/kp'
           NUXT_PUBLIC_IMG_BASE: 'https://mns.kustarshina.ru'
           NUXT_PUBLIC_BASE_URL: 'https://kupizabor.kustarshina.ru'
+          NUXT_PUBLIC_YANDEX_METRIKA_ID: ${{ secrets.YANDEX_METRIKA_ID }}
         with:
           host: ${{ secrets.SSH_HOST }}
           username: ${{ secrets.SSH_USERNAME }}
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           port: ${{ secrets.SSH_PORT }}
-          envs: NUXT_PUBLIC_API_BASE, NUXT_PUBLIC_IMG_BASE, NUXT_PUBLIC_BASE_URL
+          envs: NUXT_PUBLIC_API_BASE, NUXT_PUBLIC_IMG_BASE, NUXT_PUBLIC_BASE_URL, NUXT_PUBLIC_YANDEX_METRIKA_ID
           script: |
             cd /home/svs-adm/mns-mini-zabor
             echo "restart container"
diff --git a/README.md b/README.md
index b3d4c6d..cfcdd49 100644
--- a/README.md
+++ b/README.md
@@ -15,4 +15,5 @@
 
 * `NUXT_PUBLIC_API_BASE='https://mns.kustarshina.ru/kp'`
 * `NUXT_PUBLIC_IMG_BASE='https://mns.kustarshina.ru'`
-* `NUXT_PUBLIC_BASE_URL='https://kupizabor.kustarshina.ru'`
\ No newline at end of file
+* `NUXT_PUBLIC_BASE_URL='https://kupizabor.kustarshina.ru'`
+* `NUXT_PUBLIC_YANDEX_METRIKA_ID=12345678`
\ No newline at end of file
diff --git a/components/calcValues.vue b/components/calcValues.vue
index 9e5d040..0431b07 100644
--- a/components/calcValues.vue
+++ b/components/calcValues.vue
@@ -115,6 +115,8 @@ const changeParametres = () => {
     section_count.value = form_state.full_sections
     extra_section.value = form_state.extra_section
     remove_pillar.value = form_state.remove_pillar
+
+    goal('calc_fence', form_state)
 }
 
 const setLamelleColor = (color: ralTypes) => {
@@ -134,6 +136,12 @@ const plurals = {
     fence: { one: 'cтолб', few: 'столба', many: 'столбов' },
     section: { one: 'секция', few: 'секции', many: 'секций' },
 }
+const goal = (target: string, params: object) => {
+    const nuxtApp = useNuxtApp()
+    if (nuxtApp.$metrika) {
+        nuxtApp.$metrika.reachGoal(target, params || {})
+    }
+}
 </script>
 <template>
     <div class="container relative py-4">
diff --git a/components/modal.vue b/components/modal.vue
index db46497..fa2bb9d 100644
--- a/components/modal.vue
+++ b/components/modal.vue
@@ -5,7 +5,6 @@ import type { ralTypes } from '@/components/ral'
 const config = useRuntimeConfig()
 const apiBase = config.public.apiBase
 const { data: calculatorData } = await useFetch<ApiCalcType>(`${apiBase}/calculator/5/`)
-
 const isModalOpen = useState('modal_open', () => false)
 
 const lamelle_height = useState<number>('lamelle_height')
@@ -44,6 +43,7 @@ const modal_state = reactive({
 })
 const openForm = () => {
     modal_state.show_form = !modal_state.show_form
+    goal('open_form', total_txt)
 }
 const validateInput = (evt: KeyboardEvent) => {
     const valid_symbols = /[a-zA-Z0-9\+(\\)\ @\.]/
@@ -67,6 +67,7 @@ const validate = () => {
     }
 }
 const submit = (e: any) => {
+    goal('submit_form', modal_data)
     fetch(`${apiBase}/custom_request/`, {
         method: 'POST',
         headers: {
@@ -160,6 +161,12 @@ const total_txt = computed(() => {
         total: res_total
     }
 })
+const goal = (target: string, params: object) => {
+    const nuxtApp = useNuxtApp()
+    if (nuxtApp.$metrika) {
+        nuxtApp.$metrika.reachGoal(target, params || {})
+    }
+}
 </script>
 <template>
     <div v-if="isModalOpen" class="modal-backdrop" @click.self="toggleModal">
diff --git a/nuxt.config.ts b/nuxt.config.ts
index da08ef3..412bf5b 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -51,13 +51,17 @@ export default defineNuxtConfig({
     '@tresjs/nuxt',
     'nuxt-anchorscroll',
     '@nuxtjs/robots',
+    '@artmizu/yandex-metrika-nuxt',
   ],
   runtimeConfig: {
     public: {
       apiBase: 'https://mns.kustarshina.ru/kp',
       imgBase: 'https://mns.kustarshina.ru',
       baseUrl: '',
-    },
+      yandexMetrika: {
+        id: 0
+      },
+    }
   },
   routeRules: {
     '/index.html': { redirect: '/' },
diff --git a/package-lock.json b/package-lock.json
index 6a23b00..81d91e7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,6 +7,7 @@
       "name": "nuxt-app",
       "hasInstallScript": true,
       "dependencies": {
+        "@artmizu/yandex-metrika-nuxt": "^1.0.4",
         "@monogrid/gainmap-js": "^3.0.5",
         "@nuxt/image": "^1.7.0",
         "@nuxtjs/robots": "^3.0.0",
@@ -26,7 +27,8 @@
         "tailwindcss": "^3.4.3",
         "three": "^0.165.0",
         "vue": "^3.4.27",
-        "vue-router": "^4.3.2"
+        "vue-router": "^4.3.2",
+        "yandex-metrika-vue3": "^1.3.1"
       },
       "devDependencies": {
         "@types/imagemin": "^9.0.0"
@@ -162,6 +164,21 @@
         "url": "https://github.com/sponsors/antfu"
       }
     },
+    "node_modules/@artmizu/yandex-metrika-nuxt": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@artmizu/yandex-metrika-nuxt/-/yandex-metrika-nuxt-1.0.4.tgz",
+      "integrity": "sha512-Er10jaxk/r8EaL8ZrZMXWK+UifOw0gm1ArqV1mx0Z2PVly2v4zKUdFxwzUe3ew4TEeFhRit4wmJxgK4zeySc7g==",
+      "dependencies": {
+        "@nuxt/kit": "^3.3.1",
+        "consola": "^2.15.3",
+        "defu": "^6.1.2"
+      }
+    },
+    "node_modules/@artmizu/yandex-metrika-nuxt/node_modules/consola": {
+      "version": "2.15.3",
+      "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz",
+      "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw=="
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.6.tgz",
@@ -17183,6 +17200,14 @@
         "node": ">= 14"
       }
     },
+    "node_modules/yandex-metrika-vue3": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/yandex-metrika-vue3/-/yandex-metrika-vue3-1.3.1.tgz",
+      "integrity": "sha512-aopwC9iruhKZY8E5BP/6c68FQ+L1pN65gJT5W7KUzEDHyWzBjgrNrsNMW/snDfADMJrPL1VmaaI3eaWj8Lmi2Q==",
+      "peerDependencies": {
+        "vue": ">=3.0.0"
+      }
+    },
     "node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
diff --git a/package.json b/package.json
index b2feb83..a169370 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "postinstall": "nuxt prepare"
   },
   "dependencies": {
+    "@artmizu/yandex-metrika-nuxt": "^1.0.4",
     "@monogrid/gainmap-js": "^3.0.5",
     "@nuxt/image": "^1.7.0",
     "@nuxtjs/robots": "^3.0.0",
-- 
2.40.1


From 55870fd9937c42f48a1bebd0aef9c2774d4ac40d Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 4 Jul 2024 12:04:24 +0300
Subject: [PATCH 2/8] env in docker

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 9ee9299..f8c5d0a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,7 @@ RUN apt -y install libpng-dev libimagequant-dev
 RUN mkdir -p /src
 
 COPY package.json src/package.json
+COPY .env src/.env
 
 WORKDIR /src
 RUN npm install --omit=dev
-- 
2.40.1


From 04ff72157609bbf0cdc086f317fe938da19a424e Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 4 Jul 2024 12:17:34 +0300
Subject: [PATCH 3/8] set env file

---
 compose.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose.yaml b/compose.yaml
index dc8bc31..fc0ccac 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -3,6 +3,7 @@ services:
     build:
       context: ./
       dockerfile: Dockerfile
+    env_file: ".env"
     container_name: mns-mini-zabor
     restart: always
     ports:
-- 
2.40.1


From cb1eff213e828e6758a68d32f1cc97d487040367 Mon Sep 17 00:00:00 2001
From: George Butskivsky <bgp@svs-tech.pro>
Date: Thu, 4 Jul 2024 12:39:39 +0300
Subject: [PATCH 4/8] modify secrets action to deploy

---
 .gitea/workflows/deploy.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 81ee4fc..20d9097 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -41,7 +41,7 @@ jobs:
           host: ${{ secrets.SSH_HOST }}
           username: ${{ secrets.SSH_USERNAME }}
           key: ${{ secrets.SSH_PRIVATE_KEY }}
-          port: ${{ secrets.SSH_PORT }}
+          # port: ${{ secrets.SSH_PORT }}
           envs: NUXT_PUBLIC_API_BASE, NUXT_PUBLIC_IMG_BASE, NUXT_PUBLIC_BASE_URL, NUXT_PUBLIC_YANDEX_METRIKA_ID
           script: |
             cd /home/svs-adm/mns-mini-zabor
-- 
2.40.1


From faa10b9b2022e6e97d5e18f950d18e4286579838 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 4 Jul 2024 12:44:13 +0300
Subject: [PATCH 5/8] remove env

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f8c5d0a..9ee9299 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,6 @@ RUN apt -y install libpng-dev libimagequant-dev
 RUN mkdir -p /src
 
 COPY package.json src/package.json
-COPY .env src/.env
 
 WORKDIR /src
 RUN npm install --omit=dev
-- 
2.40.1


From 0c333d589c070f33cd4cd37b779820cdacd05700 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 4 Jul 2024 12:54:55 +0300
Subject: [PATCH 6/8] pull env

---
 .gitea/workflows/deploy.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 20d9097..c536622 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -45,7 +45,10 @@ jobs:
           envs: NUXT_PUBLIC_API_BASE, NUXT_PUBLIC_IMG_BASE, NUXT_PUBLIC_BASE_URL, NUXT_PUBLIC_YANDEX_METRIKA_ID
           script: |
             cd /home/svs-adm/mns-mini-zabor
-            echo "restart container"
+            echo "NUXT_PUBLIC_API_BASE=${{ secrets.NUXT_PUBLIC_API_BASE }}
+            NUXT_PUBLIC_IMG_BASE=${{ secrets.NUXT_PUBLIC_IMG_BASE }}
+            NUXT_PUBLIC_BASE_URL=${{ secrets.NUXT_PUBLIC_BASE_URL }}
+            NUXT_PUBLIC_YANDEX_METRIKA_ID=${{ secrets.NUXT_PUBLIC_YANDEX_METRIKA_ID }}" > .env
             docker-compose down
             docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} ci.svs-tech.pro
             docker-compose pull
-- 
2.40.1


From 7521af95a5938f58845d9988fb5993e5be914d5b Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 4 Jul 2024 12:57:45 +0300
Subject: [PATCH 7/8] remove  env

---
 .gitea/workflows/deploy.yaml | 4 ----
 compose.yaml                 | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index c536622..ee35bbd 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -45,10 +45,6 @@ jobs:
           envs: NUXT_PUBLIC_API_BASE, NUXT_PUBLIC_IMG_BASE, NUXT_PUBLIC_BASE_URL, NUXT_PUBLIC_YANDEX_METRIKA_ID
           script: |
             cd /home/svs-adm/mns-mini-zabor
-            echo "NUXT_PUBLIC_API_BASE=${{ secrets.NUXT_PUBLIC_API_BASE }}
-            NUXT_PUBLIC_IMG_BASE=${{ secrets.NUXT_PUBLIC_IMG_BASE }}
-            NUXT_PUBLIC_BASE_URL=${{ secrets.NUXT_PUBLIC_BASE_URL }}
-            NUXT_PUBLIC_YANDEX_METRIKA_ID=${{ secrets.NUXT_PUBLIC_YANDEX_METRIKA_ID }}" > .env
             docker-compose down
             docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} ci.svs-tech.pro
             docker-compose pull
diff --git a/compose.yaml b/compose.yaml
index fc0ccac..c8be317 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -3,7 +3,7 @@ services:
     build:
       context: ./
       dockerfile: Dockerfile
-    env_file: ".env"
+    # env_file: ".env"
     container_name: mns-mini-zabor
     restart: always
     ports:
-- 
2.40.1


From ecbbb3d8fbf7c73cc463a3a3b5ebee9ed9feab6d Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 4 Jul 2024 13:08:07 +0300
Subject: [PATCH 8/8] compose command

---
 .gitea/workflows/deploy.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index ee35bbd..bd3b628 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -45,8 +45,8 @@ jobs:
           envs: NUXT_PUBLIC_API_BASE, NUXT_PUBLIC_IMG_BASE, NUXT_PUBLIC_BASE_URL, NUXT_PUBLIC_YANDEX_METRIKA_ID
           script: |
             cd /home/svs-adm/mns-mini-zabor
-            docker-compose down
+            docker compose down
             docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} ci.svs-tech.pro
-            docker-compose pull
+            docker compose pull
             docker logout ci.svs-tech.pro
-            docker-compose up -d
\ No newline at end of file
+            docker compose up -d
\ No newline at end of file
-- 
2.40.1