From a514263d1cf30d55ff1de4da553a178c2abbdefd Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Mon, 8 Jul 2024 16:42:12 +0300
Subject: [PATCH 01/27] set branch tag

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

diff --git a/compose.yaml b/compose.yaml
index 8af857b..91352aa 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -10,4 +10,4 @@ services:
       - "${DOCKER_PORT}:3000"
     volumes:
       - ./.env:/src/.env
-    image: ci.svs-tech.pro/mns-mini-zabor:latest
+    image: ci.svs-tech.pro/mns-mini-zabor:$BRANCH
-- 
2.40.1


From 154e12ff3c6ef6e6183c932536c318eb76df5982 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Mon, 8 Jul 2024 16:52:37 +0300
Subject: [PATCH 02/27] set container name

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

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 114529c..10860e4 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -52,6 +52,7 @@ jobs:
           script: |
             cd $HOSTING_PATH
             git checkout ${{gitea.ref_name}}
+            git pull
             echo "NUXT_PUBLIC_API_BASE=$NUXT_PUBLIC_API_BASE
             NUXT_PUBLIC_IMG_BASE=$NUXT_PUBLIC_IMG_BASE
             NUXT_PUBLIC_BASE_URL=$NUXT_PUBLIC_BASE_URL
-- 
2.40.1


From c73a694beddca641bfdafdb72fde882238fbf99b Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Tue, 9 Jul 2024 09:03:17 +0300
Subject: [PATCH 03/27] fix image base

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

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 10860e4..b4cbc8c 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -26,6 +26,7 @@ jobs:
   deploy_to_server_dev:
     needs: [build_and_push_images]
     runs-on: ubuntu-latest
+    
     steps:
       - uses: actions/checkout@v4
       - name: Configure SSH key
@@ -40,7 +41,7 @@ jobs:
           HOSTING_PATH: ${{ gitea.ref_name == 'main' && '/home/svs-adm/mns-mini-zabor' || '/home/svs-adm/mns-mini-zabor_dev' }}
           DOCKER_PORT: ${{ gitea.ref_name == 'main' && '8103' || '8104' }}
           NUXT_PUBLIC_API_BASE: ${{'https://mns.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru/kp
-          NUXT_PUBLIC_IMG_BASE: ${{'https://mns.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru
+          NUXT_PUBLIC_IMG_BASE: ${{'https://mns.kustarshina.ru
           NUXT_PUBLIC_BASE_URL: ${{'https://kupizabor.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru
           NUXT_PUBLIC_YANDEX_METRIKA_ID: ${{ secrets.YANDEX_METRIKA_ID }}
         with:
-- 
2.40.1


From f26e7d393d50983d681e3a1b1ea7b4a7f6aa076b Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Wed, 10 Jul 2024 12:37:11 +0300
Subject: [PATCH 04/27] add link to policy page

---
 assets/main.scss     |  3 +++
 components/modal.vue | 13 +++++++++++++
 pages/policy.vue     | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 pages/policy.vue

diff --git a/assets/main.scss b/assets/main.scss
index f8886a2..9e2a361 100644
--- a/assets/main.scss
+++ b/assets/main.scss
@@ -174,6 +174,9 @@ label {
 input {
     @apply bg-neutral-200 border border-gray-300 text-gray-900 rounded focus:ring-blue-500 focus:border-blue-500 text-lg p-2.5 disabled:cursor-not-allowed;
 }
+input[type=checkbox] {
+    @apply w-4 h-4;
+}
 
 textarea {
     @apply block p-2.5 w-full text-sm text-gray-900 bg-gray-50 rounded-lg border border-gray-300 focus:ring-blue-500 focus:border-blue-500 max-w-full min-h-10 max-h-40;
diff --git a/components/modal.vue b/components/modal.vue
index eec4526..fab00a0 100644
--- a/components/modal.vue
+++ b/components/modal.vue
@@ -178,6 +178,14 @@ const modalStatus = {
     'success': ["mdi:check-circle-outline", 'Данные отправлены'],
     'error': ["mdi:close-circle-outline", 'Ошибка отправки'],
 }
+
+const policy = () => {
+    navigateTo('/policy', {
+        open: {
+            target: "_blank",
+        },
+    });
+}
 </script>
 <template>
     <div v-if="isModalOpen" class="modal-backdrop" @click.self="toggleModal">
@@ -199,6 +207,11 @@ const modalStatus = {
                         @keypress="validateInput" @keyup="validate" />
                     <input type="e-mail" placeholder="Ваш e-mail" v-model="modal_data.email" @keypress="validateInput"
                         @keyup="validate" />
+                    <div class="flex gap-4 justify-between items-center">
+                        <input type="checkbox" id="policy" />
+                        <label for="policy">Соглашение... <NuxtLink to="policy" @click="policy">cсылка</NuxtLink>
+                            </label>
+                    </div>
                     {{ total_txt && total_txt.total[0] }}
                     <div class="flex gap-4">
                         <button class="not-prose" :disabled="modal_form.disabled" type="submit">Отправить</button>
diff --git a/pages/policy.vue b/pages/policy.vue
new file mode 100644
index 0000000..08d67ef
--- /dev/null
+++ b/pages/policy.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+const config = useRuntimeConfig()
+const imgBase = config.public.imgBase
+
+import { apiFetch } from '~/utils/apiFetch';
+import { marked } from 'marked';
+
+import og_img from '/og_img.png'
+
+const { data: seoData } = await apiFetch<ApiKpType>(`kp/1`)
+useSeoMeta({
+    title: seoData.value?.title,
+    ogTitle: seoData.value?.title,
+    description: seoData.value?.content,
+    ogDescription: seoData.value?.content,
+    ogImage: config.public.baseUrl + og_img,
+    // twitterCard: 'summary_large_image',
+})
+
+const { data: policyData } = await apiFetch<ApiPagesType[]>(`pages/1`)
+const policyText = computed(() => {
+    let c = policyData?.value.content || ''
+    return marked.parse(c)
+})
+
+</script>
+<template>
+    <div>
+        <div class="siteblock bg-white">
+            <div class="container">
+                <h1 class="siteblock-title">{{ policyData.title }}</h1>
+                <div class="col-span-full prose max-w-full" v-html="policyText" />
+            </div>
+        </div>
+        <div class="siteblock siteblock_calc bg-white">
+            <Suspense>
+                <CalcModels />
+            </Suspense>
+        </div>
+    </div>
+</template>
\ No newline at end of file
-- 
2.40.1


From e946079728e29b5873bd135359a45a3b2f3808c0 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Wed, 10 Jul 2024 12:44:18 +0300
Subject: [PATCH 05/27] modal check validate

---
 components/modal.vue | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/components/modal.vue b/components/modal.vue
index fab00a0..b0c8c20 100644
--- a/components/modal.vue
+++ b/components/modal.vue
@@ -30,12 +30,15 @@ type modalDataType = {
     phone?: string
     name?: string
     email?: string
+    policy: boolean
 }
 const modal_data = reactive<modalDataType>({
     email: undefined,
     phone: undefined,
-    name: undefined
+    name: undefined,
+    policy: true
 })
+
 const modal_form = reactive({
     disabled: true,
     errors: [],
@@ -62,13 +65,17 @@ const validate = () => {
 
     modal_form.disabled = true
     if (
-        (modal_data.phone && phone_regexp.test(modal_data.phone))
-        || (modal_data.email && email_regex.test(modal_data.email))
+        (
+            (modal_data.phone && phone_regexp.test(modal_data.phone))
+            || (modal_data.email && email_regex.test(modal_data.email))
+        ) && modal_data.policy == true
     ) {
         modal_form.disabled = false
         return
     }
 }
+watch(modal_data, validate)
+
 const submit = async (e: any) => {
     goal('submit_form', modal_data)
     modal_state.show_status = 'loading'
@@ -202,15 +209,15 @@ const policy = () => {
             <template v-else-if="modal_state.show_form">
                 <h2>Оставьте контакты для связи </h2>
                 <form @submit.prevent="submit" ref="form">
-                    <input type="text" placeholder="Ваше имя" v-model="modal_data.name" @keyup="validate" />
+                    <input type="text" placeholder="Ваше имя" v-model="modal_data.name" />
                     <input type="phone" placeholder="Ваш номер телефона" v-model="modal_data.phone"
-                        @keypress="validateInput" @keyup="validate" />
-                    <input type="e-mail" placeholder="Ваш e-mail" v-model="modal_data.email" @keypress="validateInput"
-                        @keyup="validate" />
+                        @keypress="validateInput" />
+                    <input type="e-mail" placeholder="Ваш e-mail" v-model="modal_data.email"
+                        @keypress="validateInput" />
                     <div class="flex gap-4 justify-between items-center">
-                        <input type="checkbox" id="policy" />
+                        <input type="checkbox" id="policy" v-model="modal_data.policy" />
                         <label for="policy">Соглашение... <NuxtLink to="policy" @click="policy">cсылка</NuxtLink>
-                            </label>
+                        </label>
                     </div>
                     {{ total_txt && total_txt.total[0] }}
                     <div class="flex gap-4">
-- 
2.40.1


From c4b6e61655bc3311f97dc0e20607d62590acedfd Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Wed, 10 Jul 2024 14:00:07 +0300
Subject: [PATCH 06/27] 404 redirect

---
 components/header.vue            |  3 ++-
 error.vue                        | 15 ++++++++++-----
 pages/{policy.vue => [slug].vue} | 14 ++++++++++----
 pages/index.vue                  | 11 ++++++-----
 types/index.d.ts                 |  6 ++++++
 utils/apiFetch.ts                | 10 +++++++++-
 6 files changed, 43 insertions(+), 16 deletions(-)
 rename pages/{policy.vue => [slug].vue} (74%)

diff --git a/components/header.vue b/components/header.vue
index 4bf8c74..bb122bf 100644
--- a/components/header.vue
+++ b/components/header.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { apiFetch } from '~/utils/apiFetch';
 
-const { data: pagesData } = await apiFetch<ApiPagesType[]>(`pages/?ordering=order`)
+const { data: menuData } = await apiFetch<ApiMenuType>(`menu/1/?ordering=order`)
+const pagesData = menuData.value ? menuData.value.pages : []
 const route = useRoute()
 </script>
 <template>
diff --git a/error.vue b/error.vue
index 2d6582b..55e048d 100644
--- a/error.vue
+++ b/error.vue
@@ -1,8 +1,6 @@
 <script setup lang="ts">
-const config = useRuntimeConfig()
-const apiBase = config.public.apiBase
 import '@/assets/main.scss'
-
+const config = useRuntimeConfig()
 import { apiFetch } from './utils/apiFetch';
 import type { NuxtError } from '#app'
 import og_img from '/og_img.png'
@@ -20,9 +18,11 @@ useSeoMeta({
 const props = defineProps({
     error: Object as () => NuxtError
 })
-
+const route = useRoute()
+if(route.path !== '/404') {
+    navigateTo('/404')
+}
 </script>
-
 <template>
     <div>
         <Header />
@@ -32,6 +32,11 @@ const props = defineProps({
                     <h1>Вы ищете страницу, которой не существует. Вернитесь на главную страницу сайта</h1>
                     <p>Извините, но мы не можем найти запрашиваемую страницу. К сожалению, мы не можем помочь вам с
                         покупкой забора здесь.</p>
+                    <p class="hidden">
+                        <code>
+                            {{ error?.message }}
+                        </code>
+                    </p>
                     <button @click="navigateTo('/')" class="not-prose">Вернуться на главную</button>
                 </div>
             </div>
diff --git a/pages/policy.vue b/pages/[slug].vue
similarity index 74%
rename from pages/policy.vue
rename to pages/[slug].vue
index 08d67ef..6112102 100644
--- a/pages/policy.vue
+++ b/pages/[slug].vue
@@ -16,10 +16,16 @@ useSeoMeta({
     ogImage: config.public.baseUrl + og_img,
     // twitterCard: 'summary_large_image',
 })
-
-const { data: policyData } = await apiFetch<ApiPagesType[]>(`pages/1`)
+const route = useRoute()
+const { data } = await apiFetch<ApiPagesType>(`pages/${route.params.slug}`)
+if (!data.value) {
+    throw createError({
+        statusCode: 404,
+    })
+}
 const policyText = computed(() => {
-    let c = policyData?.value.content || ''
+    if (!data?.value) return ''
+    let c = data?.value.content || ''
     return marked.parse(c)
 })
 
@@ -28,7 +34,7 @@ const policyText = computed(() => {
     <div>
         <div class="siteblock bg-white">
             <div class="container">
-                <h1 class="siteblock-title">{{ policyData.title }}</h1>
+                <h1 class="siteblock-title">{{ data?.title || '404' }}</h1>
                 <div class="col-span-full prose max-w-full" v-html="policyText" />
             </div>
         </div>
diff --git a/pages/index.vue b/pages/index.vue
index 7d1ac30..a74436c 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -17,15 +17,16 @@ useSeoMeta({
     // twitterCard: 'summary_large_image',
 })
 
-const { data: pagesData } = await apiFetch<ApiPagesType[]>(`pages/?ordering=order`)
+const { data: menuData } = await apiFetch<ApiMenuType>(`menu/1/?ordering=order`)
+const pagesData = menuData.value ? menuData.value.pages : []
 
 const { data: reviewsData } = await apiFetch<ApiReviewsType[]>(`review/`)
 const { data: calculatorData } = await apiFetch(`calculator/5/`)
 
-const about = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'about')
-const reviews = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'clients')
-const delivery = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'how_to')
-const advantages = (pagesData.value as ApiPagesType[]).find(el => el.slug == 'advantages')
+const about = pagesData.find(el => el.slug == 'about')
+const reviews = pagesData.find(el => el.slug == 'clients')
+const delivery = pagesData.find(el => el.slug == 'how_to')
+const advantages = pagesData.find(el => el.slug == 'advantages')
 
 const roubleSign = new Intl.NumberFormat('ru-RU', {
     style: 'currency',
diff --git a/types/index.d.ts b/types/index.d.ts
index eea6bba..8c61d6e 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -14,6 +14,12 @@ type ApiKpType = {
     is_indexed: boolean
 }
 
+type ApiMenuType = {
+    id: number
+    type: string
+    pages: ApiPagesType[]
+}
+
 type ApiPagesType = {
     id: number
     title: string
diff --git a/utils/apiFetch.ts b/utils/apiFetch.ts
index 2a3aa53..706c87f 100644
--- a/utils/apiFetch.ts
+++ b/utils/apiFetch.ts
@@ -5,6 +5,14 @@ export async function apiFetch<T>(path: string) {
     headers.set('Referer', config.public.baseUrl)
     return useFetch<T>(`${apiBase}/${path}`, {
         baseURL: config.public.baseUrl,
-        headers
+        headers,
+        onResponseError({ response }) {
+            console.log(response)
+            window.location.pathname = '/404'
+            throw createError({
+                statusCode: 404,
+                fatal: true
+            })
+        },
     })
 }
\ No newline at end of file
-- 
2.40.1


From e18e1bcc18d07d4de92f189b3d9f004c673b0f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=90=D0=BD=D0=B0=D1=81=D1=82=D0=B0=D1=81=D0=B8=D1=8F=20=D0=9D?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5=D0=B2=D0=BD=D0=B0?=
 <a.zelenskaya@svs-tech.pro>
Date: Wed, 10 Jul 2024 14:14:57 +0300
Subject: [PATCH 07/27] policy

---
 components/modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/modal.vue b/components/modal.vue
index b0c8c20..c6c810f 100644
--- a/components/modal.vue
+++ b/components/modal.vue
@@ -216,7 +216,7 @@ const policy = () => {
                         @keypress="validateInput" />
                     <div class="flex gap-4 justify-between items-center">
                         <input type="checkbox" id="policy" v-model="modal_data.policy" />
-                        <label for="policy">Соглашение... <NuxtLink to="policy" @click="policy">cсылка</NuxtLink>
+                        <label for="policy"> Я соглашаюсь с Политикой конфиденциальности <NuxtLink to="policy" @click="policy">cсылка</NuxtLink>
                         </label>
                     </div>
                     {{ total_txt && total_txt.total[0] }}
-- 
2.40.1


From 3542e8c49a33aeb147c3ca765dc104d8cb046083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=90=D0=BD=D0=B0=D1=81=D1=82=D0=B0=D1=81=D0=B8=D1=8F=20=D0=9D?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5=D0=B2=D0=BD=D0=B0?=
 <a.zelenskaya@svs-tech.pro>
Date: Wed, 10 Jul 2024 14:18:01 +0300
Subject: [PATCH 08/27] policy

---
 components/modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/modal.vue b/components/modal.vue
index c6c810f..b5bcfb2 100644
--- a/components/modal.vue
+++ b/components/modal.vue
@@ -216,7 +216,7 @@ const policy = () => {
                         @keypress="validateInput" />
                     <div class="flex gap-4 justify-between items-center">
                         <input type="checkbox" id="policy" v-model="modal_data.policy" />
-                        <label for="policy"> Я соглашаюсь с Политикой конфиденциальности <NuxtLink to="policy" @click="policy">cсылка</NuxtLink>
+                        <label for="policy">Нажимая кнопку "Отправить" Вы также даете согласие на обработку персональных данных.<NuxtLink to="policy" @click="policy">cсылка</NuxtLink>
                         </label>
                     </div>
                     {{ total_txt && total_txt.total[0] }}
-- 
2.40.1


From 5e14427a13c89d16c8a47da77eda2e4807d5792c Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Wed, 10 Jul 2024 15:11:39 +0300
Subject: [PATCH 09/27] use fetch

---
 components/header.vue | 4 ++--
 error.vue             | 4 ++--
 nuxt.config.ts        | 5 +++++
 pages/[slug].vue      | 7 +++++--
 pages/index.vue       | 2 +-
 types/index.d.ts      | 1 +
 utils/apiFetch.ts     | 3 ++-
 7 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/components/header.vue b/components/header.vue
index bb122bf..31d4f48 100644
--- a/components/header.vue
+++ b/components/header.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { apiFetch } from '~/utils/apiFetch';
 
-const { data: menuData } = await apiFetch<ApiMenuType>(`menu/1/?ordering=order`)
-const pagesData = menuData.value ? menuData.value.pages : []
+const { data: menuData } = await apiFetch<ApiMenuType>(`menu/1/`)
+const pagesData = (menuData.value ? menuData.value.pages : []).sort((a, b) => a.order - b.order)
 const route = useRoute()
 </script>
 <template>
diff --git a/error.vue b/error.vue
index 55e048d..2ba9369 100644
--- a/error.vue
+++ b/error.vue
@@ -5,7 +5,7 @@ import { apiFetch } from './utils/apiFetch';
 import type { NuxtError } from '#app'
 import og_img from '/og_img.png'
 
-const { data: seoData } = await apiFetch<ApiKpType>(`kp/2`)
+const { data: seoData } = await apiFetch<ApiKpType>(`kp/2/`)
 useSeoMeta({
     title: seoData.value?.title,
     ogTitle: seoData.value?.title,
@@ -20,7 +20,7 @@ const props = defineProps({
 })
 const route = useRoute()
 if(route.path !== '/404') {
-    navigateTo('/404')
+    // navigateTo('/404')
 }
 </script>
 <template>
diff --git a/nuxt.config.ts b/nuxt.config.ts
index a2e80c4..d45e970 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -42,6 +42,11 @@ export default defineNuxtConfig({
       },
     },
   },
+  vue: {
+    compilerOptions: {
+      isCustomElement: (tag) => ['nobr'].includes(tag),
+    }
+  },
   ssr: true,
   modules: [
     '@nuxtjs/tailwindcss',
diff --git a/pages/[slug].vue b/pages/[slug].vue
index 6112102..59ea8ef 100644
--- a/pages/[slug].vue
+++ b/pages/[slug].vue
@@ -7,7 +7,7 @@ import { marked } from 'marked';
 
 import og_img from '/og_img.png'
 
-const { data: seoData } = await apiFetch<ApiKpType>(`kp/1`)
+const { data: seoData } = await apiFetch<ApiKpType>(`kp/1/`)
 useSeoMeta({
     title: seoData.value?.title,
     ogTitle: seoData.value?.title,
@@ -17,7 +17,7 @@ useSeoMeta({
     // twitterCard: 'summary_large_image',
 })
 const route = useRoute()
-const { data } = await apiFetch<ApiPagesType>(`pages/${route.params.slug}`)
+const { data } = await apiFetch<ApiPagesType>(`pages/${route.params.slug}/`)
 if (!data.value) {
     throw createError({
         statusCode: 404,
@@ -38,6 +38,9 @@ const policyText = computed(() => {
                 <div class="col-span-full prose max-w-full" v-html="policyText" />
             </div>
         </div>
+        <div class="siteblock-image" v-if="data?.image">
+            <NuxtImg :src="[imgBase, data?.image].join('/')" :alt="data.title || 'фоновая картинка'" title="" format="webp" />
+        </div>
         <div class="siteblock siteblock_calc bg-white">
             <Suspense>
                 <CalcModels />
diff --git a/pages/index.vue b/pages/index.vue
index a74436c..4dffb05 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -7,7 +7,7 @@ import { marked } from 'marked';
 
 import og_img from '/og_img.png'
 
-const { data: seoData } = await apiFetch<ApiKpType>(`kp/1`)
+const { data: seoData } = await apiFetch<ApiKpType>(`kp/1/`)
 useSeoMeta({
     title: seoData.value?.title,
     ogTitle: seoData.value?.title,
diff --git a/types/index.d.ts b/types/index.d.ts
index 8c61d6e..be3fce7 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -22,6 +22,7 @@ type ApiMenuType = {
 
 type ApiPagesType = {
     id: number
+    order: number
     title: string
     menu_title: string
     slug: string
diff --git a/utils/apiFetch.ts b/utils/apiFetch.ts
index 706c87f..e42ca76 100644
--- a/utils/apiFetch.ts
+++ b/utils/apiFetch.ts
@@ -7,7 +7,8 @@ export async function apiFetch<T>(path: string) {
         baseURL: config.public.baseUrl,
         headers,
         onResponseError({ response }) {
-            console.log(response)
+            console.log(response.status)
+            console.log(response.url)
             window.location.pathname = '/404'
             throw createError({
                 statusCode: 404,
-- 
2.40.1


From c4d942e4f09b2e84c9974d902e3fc99dd4d9016c Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Wed, 10 Jul 2024 15:12:23 +0300
Subject: [PATCH 10/27] policy text

---
 components/modal.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/modal.vue b/components/modal.vue
index b5bcfb2..76e2c70 100644
--- a/components/modal.vue
+++ b/components/modal.vue
@@ -216,7 +216,8 @@ const policy = () => {
                         @keypress="validateInput" />
                     <div class="flex gap-4 justify-between items-center">
                         <input type="checkbox" id="policy" v-model="modal_data.policy" />
-                        <label for="policy">Нажимая кнопку "Отправить" Вы также даете согласие на обработку персональных данных.<NuxtLink to="policy" @click="policy">cсылка</NuxtLink>
+                        <label for="policy">Нажимая кнопку "Отправить" Вы также даете согласие на <NuxtLink to="policy" @click="policy">обработку персональных
+                            данных</NuxtLink>.
                         </label>
                     </div>
                     {{ total_txt && total_txt.total[0] }}
-- 
2.40.1


From a300d77a524655cef6bbe00262bfaf4aa12e84a1 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Wed, 10 Jul 2024 15:26:58 +0300
Subject: [PATCH 11/27] dev env fix

---
 .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 b4cbc8c..eab5afb 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -41,7 +41,7 @@ jobs:
           HOSTING_PATH: ${{ gitea.ref_name == 'main' && '/home/svs-adm/mns-mini-zabor' || '/home/svs-adm/mns-mini-zabor_dev' }}
           DOCKER_PORT: ${{ gitea.ref_name == 'main' && '8103' || '8104' }}
           NUXT_PUBLIC_API_BASE: ${{'https://mns.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru/kp
-          NUXT_PUBLIC_IMG_BASE: ${{'https://mns.kustarshina.ru
+          NUXT_PUBLIC_IMG_BASE: 'https://mns.kustarshina.ru'
           NUXT_PUBLIC_BASE_URL: ${{'https://kupizabor.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru
           NUXT_PUBLIC_YANDEX_METRIKA_ID: ${{ secrets.YANDEX_METRIKA_ID }}
         with:
-- 
2.40.1


From f0886a36f6298469ba2305f5a70c4ef8c7467fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=90=D0=BD=D0=B0=D1=81=D1=82=D0=B0=D1=81=D0=B8=D1=8F=20=D0=9D?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5=D0=B2=D0=BD=D0=B0?=
 <a.zelenskaya@svs-tech.pro>
Date: Wed, 10 Jul 2024 16:36:18 +0300
Subject: [PATCH 12/27] icon

---
 assets/LOGO.svg       | 9 +++++++++
 components/footer.vue | 2 +-
 components/header.vue | 6 +++++-
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 assets/LOGO.svg

diff --git a/assets/LOGO.svg b/assets/LOGO.svg
new file mode 100644
index 0000000..33380a6
--- /dev/null
+++ b/assets/LOGO.svg
@@ -0,0 +1,9 @@
+<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M80.7917 0L65.2088 21.1238H112.386L128 0H80.7917Z" fill="#FF5A06"/>
+<path d="M112.926 106.876H64.8394L79.4215 128H127.986L112.926 106.876Z" fill="#FF5A06"/>
+<path d="M55.1291 21.1238V0H17.1687L0 21.1238H55.1291Z" fill="#FF5A06"/>
+<path d="M108.204 26.7819H61.0348L55.1291 34.7875V26.7819H17.1687L0 48.0314H92.4977L108.204 26.7819Z" fill="#FF5A06"/>
+<path d="M17.1687 53.6896H88.3154L81.5421 62.8533L89.8892 74.5619H0L17.1687 53.6896Z" fill="#FF5A06"/>
+<path d="M17.1687 80.22H93.9229L108.893 101.218H60.9334L55.1291 92.8099V101.218H0L17.1687 80.22Z" fill="#FF5A06"/>
+<path d="M55.1291 128V106.876H17.1687L0 128H55.1291Z" fill="#FF5A06"/>
+</svg>
diff --git a/components/footer.vue b/components/footer.vue
index 7727a1b..b43d762 100644
--- a/components/footer.vue
+++ b/components/footer.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import k_logo from '@/assets/icons/logo.svg'
+import k_logo from '@/assets/LOGO.svg'
 import { apiFetch } from '~/utils/apiFetch';
 
 const { data: footerData } = await apiFetch<ApiFooterType[]>(`footer/?ordering=small_text`)
diff --git a/components/header.vue b/components/header.vue
index 31d4f48..c28f170 100644
--- a/components/header.vue
+++ b/components/header.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { apiFetch } from '~/utils/apiFetch';
+import k_logo from '@/assets/LOGO.svg'
 
 const { data: menuData } = await apiFetch<ApiMenuType>(`menu/1/`)
 const pagesData = (menuData.value ? menuData.value.pages : []).sort((a, b) => a.order - b.order)
@@ -9,8 +10,11 @@ const route = useRoute()
     <div class="header">
         <div class="container">
             <div class="logo">
+                <div class="k-logo">
+                    <k_logo />
+                </div>
                 <NuxtLink to="/">
-                    Купи забор
+                    Kupizabor
                 </NuxtLink>
             </div>
             <div class="menu">
-- 
2.40.1


From 59509db2de595a8902431f5d0f197c372a384e20 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Wed, 10 Jul 2024 16:49:08 +0300
Subject: [PATCH 13/27] test

---
 components/header.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/header.vue b/components/header.vue
index c28f170..c7ac784 100644
--- a/components/header.vue
+++ b/components/header.vue
@@ -12,10 +12,10 @@ const route = useRoute()
             <div class="logo">
                 <div class="k-logo">
                     <k_logo />
+                    <NuxtLink to="/">
+                        Kupizabor
+                    </NuxtLink>
                 </div>
-                <NuxtLink to="/">
-                    Kupizabor
-                </NuxtLink>
             </div>
             <div class="menu">
                 <template v-for="item in pagesData">
-- 
2.40.1


From 6570d2aa77e9cb69ca31de56abe209060f3da20f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=90=D0=BD=D0=B0=D1=81=D1=82=D0=B0=D1=81=D0=B8=D1=8F=20=D0=9D?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5=D0=B2=D0=BD=D0=B0?=
 <a.zelenskaya@svs-tech.pro>
Date: Wed, 10 Jul 2024 16:59:35 +0300
Subject: [PATCH 14/27] tg

---
 assets/icons/telegram.svg | 3 +++
 assets/icons/vk.svg       | 3 +++
 assets/icons/youtube.svg  | 3 +++
 components/modal.vue      | 4 ++++
 4 files changed, 13 insertions(+)
 create mode 100644 assets/icons/telegram.svg
 create mode 100644 assets/icons/vk.svg
 create mode 100644 assets/icons/youtube.svg

diff --git a/assets/icons/telegram.svg b/assets/icons/telegram.svg
new file mode 100644
index 0000000..3398099
--- /dev/null
+++ b/assets/icons/telegram.svg
@@ -0,0 +1,3 @@
+<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 64C0 28.672 28.672 0 64 0C99.328 0 128 28.672 128 64C128 99.328 99.328 128 64 128C28.672 128 0 99.328 0 64ZM91.545 90.2986C94.0432 76.9254 98.964 47.9124 100.1 35.9747C100.139 35.4178 100.116 34.777 100.097 34.2289C100.079 33.7361 100.064 33.3183 100.1 33.1036C100.024 32.4992 99.7968 31.6681 99.0397 31.0636C98.1313 30.3081 96.6929 30.157 96.0872 30.157C93.2105 30.157 88.8953 31.6681 67.8494 40.4324C60.5061 43.4546 45.8194 49.8012 23.7136 59.3967C20.1555 60.8322 18.2629 62.1922 18.1115 63.5522C17.84 65.9231 20.7938 66.8364 24.845 68.089C25.3123 68.2335 25.7943 68.3826 26.2876 68.5388C30.1485 69.8233 35.2964 71.2588 38.0218 71.3344C40.4443 71.4099 43.1697 70.3522 46.1979 68.3122C66.8653 54.4101 77.4639 47.3835 78.1452 47.2324C78.2046 47.2239 78.2649 47.2145 78.3258 47.205C78.8089 47.1296 79.3317 47.048 79.735 47.3835C79.9043 47.5623 80.0272 47.7797 80.0932 48.0167C80.1591 48.2537 80.1661 48.5032 80.1136 48.7435C79.8129 50.0036 67.5273 61.3664 61.9141 66.5581C60.4594 67.9035 59.4528 68.8345 59.2191 69.0677C58.6372 69.6586 58.0457 70.2193 57.4762 70.7592C53.8217 74.2233 51.0694 76.8321 57.5536 81.0809C60.7527 83.1844 63.297 84.9144 65.8654 86.6609C68.4632 88.4273 71.0858 90.2106 74.4357 92.4142C75.2864 92.9751 76.1005 93.5543 76.8939 94.1188C80.0546 96.3675 82.8872 98.3828 86.397 98.0808C88.3654 97.8541 90.4851 95.9653 91.545 90.2986Z" fill="#333333"/>
+</svg>
diff --git a/assets/icons/vk.svg b/assets/icons/vk.svg
new file mode 100644
index 0000000..148494b
--- /dev/null
+++ b/assets/icons/vk.svg
@@ -0,0 +1,3 @@
+<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 64C0 28.672 28.672 0 64 0C99.328 0 128 28.672 128 64C128 99.328 99.328 128 64 128C28.672 128 0 99.328 0 64ZM94.2421 90.8735H103.893L103.88 90.8694C106.61 90.8694 108.014 89.4619 107.062 86.7591C106.215 84.0355 103.037 80.0995 98.9033 75.408C97.7647 74.0829 96.3361 72.68 95.0685 71.4352C93.834 70.2229 92.7521 69.1605 92.2397 68.4661C90.8314 66.5853 91.2219 65.8504 92.2397 64.1648C92.2397 64.1648 104.075 47.4702 105.289 41.8487C105.937 39.7727 105.289 38.2822 102.389 38.2822H92.7175C90.2706 38.2822 89.1447 39.5984 88.4967 41.0058C88.4967 41.0058 83.5197 53.0088 76.5737 60.7935C74.3262 63.0438 73.2876 63.7787 72.0745 63.7787C71.5137 63.7787 70.5831 63.0438 70.5831 60.9679V41.7449C70.5831 39.3243 69.827 38.1992 67.7706 38.1992H52.5616C51.0702 38.1992 50.1396 39.3243 50.1396 40.4495C50.1396 41.3407 50.6445 41.974 51.2892 42.7825C52.3323 44.0907 53.7414 45.8579 53.9699 49.9198V64.1689C53.9699 67.2621 53.4091 67.8225 52.196 67.8225C48.9099 67.8225 40.946 55.7365 36.1644 41.94C35.213 39.3243 34.2825 38.1992 31.8356 38.1992H22.1642C19.4598 38.1992 18.8989 39.5153 18.8989 40.9228C18.8989 43.5385 22.185 56.1891 34.1952 73.0788C42.1591 84.6043 53.5171 90.7905 63.7534 90.7905C69.9433 90.7905 70.6787 89.3872 70.6787 87.0497V78.335C70.6787 75.6072 71.2437 75.0467 73.2336 75.0467C74.6419 75.0467 77.1719 75.7816 82.8841 81.316C84.776 83.2318 86.2168 84.8363 87.3965 86.1501C90.3176 89.4031 91.638 90.8735 94.2421 90.8735Z" fill="#333333"/>
+</svg>
diff --git a/assets/icons/youtube.svg b/assets/icons/youtube.svg
new file mode 100644
index 0000000..2b93a07
--- /dev/null
+++ b/assets/icons/youtube.svg
@@ -0,0 +1,3 @@
+<svg width="128" height="128" viewBox="0 0 128 128" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 64C0 28.672 28.672 0 64 0C99.328 0 128 28.672 128 64C128 99.328 99.328 128 64 128C28.672 128 0 99.328 0 64ZM46.2495 91.7311L96.8031 68.0998C101.228 66.0253 101.228 62.643 96.8031 60.5685L46.2495 36.9373C41.8246 34.8854 38.1992 37.1966 38.1992 42.0784V86.5899C38.1992 91.483 41.8246 93.783 46.2495 91.7311Z" fill="#333333"/>
+</svg>
diff --git a/components/modal.vue b/components/modal.vue
index 76e2c70..08259d1 100644
--- a/components/modal.vue
+++ b/components/modal.vue
@@ -2,6 +2,7 @@
 import { getColorNameFromRal } from '@/components/ral'
 import type { ralTypes } from '@/components/ral'
 import { apiFetch } from '~/utils/apiFetch';
+import telegram from '@/assets/icons/telegram.svg'
 
 const config = useRuntimeConfig()
 const apiBase = config.public.apiBase
@@ -199,6 +200,9 @@ const policy = () => {
         <div class="modal">
             <span class="modal-close" @click="toggleModal">
                 <Icon name="mdi:close" />
+                <div>
+                    <Icon name="telegram" />
+                </div>
             </span>
             <div class="modal-status" v-if="modal_state.show_status" :class="[modal_state.show_status]">
                 <div class="modal-status-icon">
-- 
2.40.1


From c2578637a748df9b8b5d6ccc54570b79fbd699af Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Wed, 10 Jul 2024 17:12:04 +0300
Subject: [PATCH 15/27] add icons footer

---
 components/footer.vue | 13 ++++++++++++-
 components/header.vue |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/components/footer.vue b/components/footer.vue
index b43d762..2efc357 100644
--- a/components/footer.vue
+++ b/components/footer.vue
@@ -2,6 +2,15 @@
 import k_logo from '@/assets/LOGO.svg'
 import { apiFetch } from '~/utils/apiFetch';
 
+import tg from '@/assets/icons/telegram.svg'
+import vk from '@/assets/icons/vk.svg'
+import yt from '@/assets/icons/youtube.svg'
+const icons = {
+    'simple-icons:vk': vk,
+    'simple-icons:telegram': tg,
+    'simple-icons:youtube': yt,
+}
+
 const { data: footerData } = await apiFetch<ApiFooterType[]>(`footer/?ordering=small_text`)
 const { data: social_networkData } = await apiFetch<ApiSocial_networkType[]>(`social_network/`)
 </script>
@@ -17,7 +26,9 @@ const { data: social_networkData } = await apiFetch<ApiSocial_networkType[]>(`so
             <div class="footer-text footer-text-social" v-if="social_networkData">
                 <template v-for="item in social_networkData">
                     <a :href="item.link" target="_blank">
-                        <Icon :name="item.icon" /> {{ item.name }}
+                        <component :is="icons[(item.icon.trim() as keyof typeof icons)]"
+                            v-if="icons.hasOwnProperty(item.icon.trim())" />
+                        <Icon :name="item.icon" v-else /> {{ item.name }}
                     </a>
                 </template>
             </div>
diff --git a/components/header.vue b/components/header.vue
index c7ac784..92b19df 100644
--- a/components/header.vue
+++ b/components/header.vue
@@ -11,8 +11,8 @@ const route = useRoute()
         <div class="container">
             <div class="logo">
                 <div class="k-logo">
-                    <k_logo />
                     <NuxtLink to="/">
+                        <k_logo />
                         Kupizabor
                     </NuxtLink>
                 </div>
-- 
2.40.1


From 2a190123d5a9936aed45e2a10b35cd101907d683 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Wed, 10 Jul 2024 17:17:22 +0300
Subject: [PATCH 16/27] add icons footer

---
 assets/main.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/main.scss b/assets/main.scss
index 9e2a361..54c8691 100644
--- a/assets/main.scss
+++ b/assets/main.scss
@@ -63,7 +63,7 @@ a[href^="#"] {
     }
 
     .k-logo {
-        @apply col-span-12 xl:col-span-2 row-span-3 text-9xl text-orange-400;
+        @apply col-span-12 xl:col-span-2 row-span-3 text-9xl text-ioprim;
 
         svg {
             @apply my-0 mx-auto;
-- 
2.40.1


From 86a8c84dad54f055ec54f9b5d84471e7dd92e40a Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 11 Jul 2024 10:26:29 +0300
Subject: [PATCH 17/27] fix bg

---
 pages/[slug].vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pages/[slug].vue b/pages/[slug].vue
index 59ea8ef..4403149 100644
--- a/pages/[slug].vue
+++ b/pages/[slug].vue
@@ -38,8 +38,10 @@ const policyText = computed(() => {
                 <div class="col-span-full prose max-w-full" v-html="policyText" />
             </div>
         </div>
-        <div class="siteblock-image" v-if="data?.image">
-            <NuxtImg :src="[imgBase, data?.image].join('/')" :alt="data.title || 'фоновая картинка'" title="" format="webp" />
+        <div class="siteblock siteblock_imgbg bg-slate-500" v-if="data?.image"
+            :style="[{ backgroundImage: `url(${[imgBase, data?.image].join('/')})` }]">
+            <NuxtImg :src="[imgBase, data?.image].join('/')" class="invisible" alt="data.title || 'фоновая картинка'" title="" format="webp"
+                loading="lazy" />
         </div>
         <div class="siteblock siteblock_calc bg-white">
             <Suspense>
-- 
2.40.1


From 19999cc49295095fa5375af7ee64e63f6e84b0a9 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 11 Jul 2024 10:33:08 +0300
Subject: [PATCH 18/27] deploy img base

---
 .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 eab5afb..932251f 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -41,7 +41,7 @@ jobs:
           HOSTING_PATH: ${{ gitea.ref_name == 'main' && '/home/svs-adm/mns-mini-zabor' || '/home/svs-adm/mns-mini-zabor_dev' }}
           DOCKER_PORT: ${{ gitea.ref_name == 'main' && '8103' || '8104' }}
           NUXT_PUBLIC_API_BASE: ${{'https://mns.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru/kp
-          NUXT_PUBLIC_IMG_BASE: 'https://mns.kustarshina.ru'
+          NUXT_PUBLIC_IMG_BASE: ${{'https://kupizabor.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru
           NUXT_PUBLIC_BASE_URL: ${{'https://kupizabor.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru
           NUXT_PUBLIC_YANDEX_METRIKA_ID: ${{ secrets.YANDEX_METRIKA_ID }}
         with:
-- 
2.40.1


From b7fb99af23d9b2083e7fec22068d2edaa0e43e49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D0=90=D0=BD=D0=B0=D1=81=D1=82=D0=B0=D1=81=D0=B8=D1=8F=20=D0=9D?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5=D0=B2=D0=BD=D0=B0?=
 <a.zelenskaya@svs-tech.pro>
Date: Thu, 11 Jul 2024 10:51:44 +0300
Subject: [PATCH 19/27] telegram

---
 components/modal.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/components/modal.vue b/components/modal.vue
index 08259d1..76e2c70 100644
--- a/components/modal.vue
+++ b/components/modal.vue
@@ -2,7 +2,6 @@
 import { getColorNameFromRal } from '@/components/ral'
 import type { ralTypes } from '@/components/ral'
 import { apiFetch } from '~/utils/apiFetch';
-import telegram from '@/assets/icons/telegram.svg'
 
 const config = useRuntimeConfig()
 const apiBase = config.public.apiBase
@@ -200,9 +199,6 @@ const policy = () => {
         <div class="modal">
             <span class="modal-close" @click="toggleModal">
                 <Icon name="mdi:close" />
-                <div>
-                    <Icon name="telegram" />
-                </div>
             </span>
             <div class="modal-status" v-if="modal_state.show_status" :class="[modal_state.show_status]">
                 <div class="modal-status-icon">
-- 
2.40.1


From 0fd9dd472dbccb69938473d41eefa96329a5a1bf Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 11 Jul 2024 11:16:20 +0300
Subject: [PATCH 20/27] topmenu styles

---
 assets/main.scss      | 39 +++++++++++++++++++++++++++++++--------
 components/header.vue | 10 ++++------
 pages/[slug].vue      |  2 +-
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/assets/main.scss b/assets/main.scss
index 54c8691..45156b9 100644
--- a/assets/main.scss
+++ b/assets/main.scss
@@ -25,24 +25,44 @@ body {
 .header {
     @apply p-2 bg-slate-200;
 
-    a:not([target="_blank"]) {
-        @apply hidden xl:inline-block
+    .container {
+        @apply items-center;
     }
 }
 
 .logo {
-    @apply text-ioprim font-bold w-20 text-2xl leading-4 py-4 col-span-4 xl:col-span-2;
+    @apply w-full py-4 col-span-4 xl:col-span-2;
+
+    a {
+        @apply flex items-center gap-2;
+    }
+
+    &_text {
+        @apply leading-4 text-3xl font-semibold;
+    }
+
+    svg {
+        @apply text-ioprim inline-block m-0 w-10 h-10;
+    }
 }
 
 .menu {
-    @apply col-span-8 flex justify-between;
+    @apply col-span-10 flex justify-end;
 
     a {
-        @apply underline decoration-0 underline-offset-4 decoration-dotted hover:decoration-transparent transition-all;
+        @apply hover:text-ioprim-900 transition-colors;
+
+        &:before {
+            content: '';
+            @apply inline-block w-[2px] h-5  mx-4 align-middle bg-gradient-to-t from-transparent via-[#333333] via-50% to-transparent;
+        }
+        &:first-child::before {
+            content: none;
+        }
     }
 
     a[href^=http] {
-        @apply relative no-underline;
+        @apply relative;
 
         &:after {
             content: '↷';
@@ -63,7 +83,7 @@ a[href^="#"] {
     }
 
     .k-logo {
-        @apply col-span-12 xl:col-span-2 row-span-3 text-9xl text-ioprim;
+        @apply col-span-12 xl:col-span-2 row-span-3 text-9xl;
 
         svg {
             @apply my-0 mx-auto;
@@ -150,9 +170,11 @@ a[href^="#"] {
 
     &-status {
         @apply text-center;
+
         &-icon {
             @apply text-8xl;
         }
+
         &-text {
             @apply text-3xl;
         }
@@ -172,8 +194,9 @@ label {
 }
 
 input {
-    @apply bg-neutral-200 border border-gray-300 text-gray-900 rounded focus:ring-blue-500 focus:border-blue-500 text-lg p-2.5 disabled:cursor-not-allowed;
+    @apply bg-neutral-200 border border-gray-300 text-gray-900 rounded focus:ring-blue-500 focus:border-blue-500 text-lg p-2.5 disabled:cursor-not-allowed disabled:text-black;
 }
+
 input[type=checkbox] {
     @apply w-4 h-4;
 }
diff --git a/components/header.vue b/components/header.vue
index 92b19df..93ef533 100644
--- a/components/header.vue
+++ b/components/header.vue
@@ -10,12 +10,10 @@ const route = useRoute()
     <div class="header">
         <div class="container">
             <div class="logo">
-                <div class="k-logo">
-                    <NuxtLink to="/">
-                        <k_logo />
-                        Kupizabor
-                    </NuxtLink>
-                </div>
+                <NuxtLink to="/">
+                    <k_logo />
+                    <span class="logo_text">Kupizabor</span>
+                </NuxtLink>
             </div>
             <div class="menu">
                 <template v-for="item in pagesData">
diff --git a/pages/[slug].vue b/pages/[slug].vue
index 4403149..aa83e9d 100644
--- a/pages/[slug].vue
+++ b/pages/[slug].vue
@@ -43,7 +43,7 @@ const policyText = computed(() => {
             <NuxtImg :src="[imgBase, data?.image].join('/')" class="invisible" alt="data.title || 'фоновая картинка'" title="" format="webp"
                 loading="lazy" />
         </div>
-        <div class="siteblock siteblock_calc bg-white">
+        <div class="siteblock siteblock_calc bg-white" v-else>
             <Suspense>
                 <CalcModels />
             </Suspense>
-- 
2.40.1


From f6b2f6d7faae498e50e64425064f149c20688fd2 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 11 Jul 2024 11:58:03 +0300
Subject: [PATCH 21/27] footer text

---
 assets/main.scss      | 43 ++++++++++++++++++++++++++------
 components/footer.vue | 57 +++++++++++++++++++++++++++++++------------
 2 files changed, 78 insertions(+), 22 deletions(-)

diff --git a/assets/main.scss b/assets/main.scss
index 45156b9..e152edd 100644
--- a/assets/main.scss
+++ b/assets/main.scss
@@ -50,12 +50,13 @@ body {
     @apply col-span-10 flex justify-end;
 
     a {
-        @apply hover:text-ioprim-900 transition-colors;
+        @apply text-zinc-800 hover:text-ioprim-900 transition-colors;
 
         &:before {
             content: '';
-            @apply inline-block w-[2px] h-5  mx-4 align-middle bg-gradient-to-t from-transparent via-[#333333] via-50% to-transparent;
+            @apply inline-block w-[2px] h-5 mx-4 align-middle bg-gradient-to-t from-transparent via-zinc-800 via-50% to-transparent;
         }
+
         &:first-child::before {
             content: none;
         }
@@ -76,14 +77,14 @@ a[href^="#"] {
 }
 
 .footer {
-    @apply px-2 py-4 bg-slate-200;
+    @apply px-2 py-4 bg-slate-200 text-zinc-800;
 
     .container {
         @apply gap-4
     }
 
     .k-logo {
-        @apply col-span-12 xl:col-span-2 row-span-3 text-9xl;
+        @apply col-span-12 xl:col-span-2 row-span-3 text-9xl text-ioprim;
 
         svg {
             @apply my-0 mx-auto;
@@ -91,16 +92,44 @@ a[href^="#"] {
     }
 
     &-text {
-        @apply col-span-12 xl:col-span-5 text-sm prose;
+        @apply col-span-12 xl:col-span-5 text-sm mb-2;
 
         &-small {
-            @apply col-span-12 xl:col-span-10 text-xs min-w-full prose;
+            @apply col-span-12 xl:col-span-10 text-xs min-w-full;
         }
 
         &-social {
-            @apply col-span-12 xl:col-span-10 flex gap-4
+            @apply col-span-12 xl:col-span-10 flex gap-4 flex-wrap justify-center;
         }
     }
+
+    &-icon {
+        @apply order-2 flex justify-center items-center gap-2;
+
+        &:hover {
+            .footer-icon-text {
+                @apply no-underline;
+            }
+        }
+
+        svg {
+            @apply mb-0;
+        }
+
+        &-big {
+            @apply text-3xl order-1 w-full text-center;
+            .footer-icon-text {
+                @apply no-underline;
+            }
+        }
+
+        &-text {
+            @apply underline;
+        }
+    }
+    &_two {
+        @apply xl:bg-slate-200 py-16 text-sm text-zinc-500;
+    }
 }
 
 .siteblock {
diff --git a/components/footer.vue b/components/footer.vue
index 2efc357..c618299 100644
--- a/components/footer.vue
+++ b/components/footer.vue
@@ -15,22 +15,49 @@ const { data: footerData } = await apiFetch<ApiFooterType[]>(`footer/?ordering=s
 const { data: social_networkData } = await apiFetch<ApiSocial_networkType[]>(`social_network/`)
 </script>
 <template>
-    <div class="footer" id="contacts">
-        <div class="container">
-            <div class="k-logo">
-                <k_logo />
+    <div>
+        <div class="footer" id="contacts">
+            <div class="container">
+                <div class="col-span-3">
+                    <div class="k-logo">
+                        <k_logo />
+                    </div>
+                </div>
+                <div class="col-span-6">
+                    <template v-for="item in footerData">
+                        <div class="footer-text" v-if="!item.small_text">
+                            <template v-for="p in item.text.split('\n')">
+                                <p v-if="p.trim().length">{{ p }}</p>
+                            </template>
+                        </div>
+                    </template>
+                </div>
+                <div class="col-span-3">
+                    <div class="footer-text footer-text-social" v-if="social_networkData">
+                        <template v-for="item in social_networkData">
+                            <a :class="['footer-icon', { 'footer-icon-big': !item.icon }]" :href="item.link"
+                                target="_blank">
+                                <template v-if="item.icon">
+                                    <component :is="icons[(item.icon.trim() as keyof typeof icons)]"
+                                        v-if="icons.hasOwnProperty(item.icon.trim())" />
+                                    <Icon :name="item.icon" v-else />
+                                </template>
+                                <span class="footer-icon-text">{{ item.name }}</span>
+                            </a>
+                        </template>
+                    </div>
+                </div>
             </div>
-            <template v-for="item in footerData">
-                <div class="footer-text" :class="[{ 'footer-text-small': item.small_text }]">{{ item.text }}</div>
-            </template>
-            <div class="footer-text footer-text-social" v-if="social_networkData">
-                <template v-for="item in social_networkData">
-                    <a :href="item.link" target="_blank">
-                        <component :is="icons[(item.icon.trim() as keyof typeof icons)]"
-                            v-if="icons.hasOwnProperty(item.icon.trim())" />
-                        <Icon :name="item.icon" v-else /> {{ item.name }}
-                    </a>
-                </template>
+        </div>
+        <div class="footer_two">
+            <div class="container">
+                <div class="col-span-10 col-start-2">
+                    <template v-for="item in footerData">
+                        <div class="footer-text" v-if="item.small_text">
+                            {{ item.text }}
+                        </div>
+                    </template>
+                </div>
             </div>
         </div>
     </div>
-- 
2.40.1


From 4b5d6da477ecf3db0e9bf16d0c6a91343af6f0c9 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 11 Jul 2024 12:09:24 +0300
Subject: [PATCH 22/27] footer view

---
 assets/main.scss      | 12 ++++++++++--
 components/footer.vue |  6 +++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/assets/main.scss b/assets/main.scss
index e152edd..c7b17b4 100644
--- a/assets/main.scss
+++ b/assets/main.scss
@@ -77,7 +77,7 @@ a[href^="#"] {
 }
 
 .footer {
-    @apply px-2 py-4 bg-slate-200 text-zinc-800;
+    @apply px-2 py-4 bg-slate-200 text-zinc-800 pt-12;
 
     .container {
         @apply gap-4
@@ -89,6 +89,12 @@ a[href^="#"] {
         svg {
             @apply my-0 mx-auto;
         }
+
+        &:after {
+            content: '';
+            @apply block lg:hidden mr-auto ml-auto mt-5 h-[2px] max-w-44 mx-4 align-middle bg-gradient-to-r from-transparent via-zinc-800 via-50% to-transparent;
+
+        }
     }
 
     &-text {
@@ -118,6 +124,7 @@ a[href^="#"] {
 
         &-big {
             @apply text-3xl order-1 w-full text-center;
+
             .footer-icon-text {
                 @apply no-underline;
             }
@@ -127,8 +134,9 @@ a[href^="#"] {
             @apply underline;
         }
     }
+
     &_two {
-        @apply xl:bg-slate-200 py-16 text-sm text-zinc-500;
+        @apply xl:bg-slate-200 py-16 lg:py-8 text-sm text-zinc-500;
     }
 }
 
diff --git a/components/footer.vue b/components/footer.vue
index c618299..7797b2f 100644
--- a/components/footer.vue
+++ b/components/footer.vue
@@ -18,12 +18,12 @@ const { data: social_networkData } = await apiFetch<ApiSocial_networkType[]>(`so
     <div>
         <div class="footer" id="contacts">
             <div class="container">
-                <div class="col-span-3">
+                <div class="col-span-12 lg:col-span-6 xl:col-span-3 mb-12 lg:mb-0">
                     <div class="k-logo">
                         <k_logo />
                     </div>
                 </div>
-                <div class="col-span-6">
+                <div class="col-span-12 lg:col-span-6 xl:col-span-6 mb-12 lg:mb-0">
                     <template v-for="item in footerData">
                         <div class="footer-text" v-if="!item.small_text">
                             <template v-for="p in item.text.split('\n')">
@@ -32,7 +32,7 @@ const { data: social_networkData } = await apiFetch<ApiSocial_networkType[]>(`so
                         </div>
                     </template>
                 </div>
-                <div class="col-span-3">
+                <div class="col-span-12 xl:col-span-3">
                     <div class="footer-text footer-text-social" v-if="social_networkData">
                         <template v-for="item in social_networkData">
                             <a :class="['footer-icon', { 'footer-icon-big': !item.icon }]" :href="item.link"
-- 
2.40.1


From 64987e3ea93728f9860fa83b0c1ff68b1d85f9a8 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 11 Jul 2024 12:24:34 +0300
Subject: [PATCH 23/27] header adaptivity

---
 assets/main.scss      | 26 +++++++++++++++++++++++++-
 components/header.vue | 16 ++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/assets/main.scss b/assets/main.scss
index c7b17b4..4e9b7d3 100644
--- a/assets/main.scss
+++ b/assets/main.scss
@@ -47,7 +47,7 @@ body {
 }
 
 .menu {
-    @apply col-span-10 flex justify-end;
+    @apply hidden xl:flex col-span-10 justify-end;
 
     a {
         @apply text-zinc-800 hover:text-ioprim-900 transition-colors;
@@ -70,6 +70,30 @@ body {
             @apply ml-2;
         }
     }
+
+    &.toggle_visible {
+        @apply flex flex-col text-center;
+
+        a {
+            @apply mb-2;
+        }
+
+        a:before {
+            content: none;
+        }
+    }
+
+    &-toggle {
+        @apply flex xl:hidden col-span-8 justify-end;
+
+        >span {
+            @apply cursor-pointer text-zinc-600 hover:text-ioprim-900 transition-colors;
+
+            svg {
+                @apply text-3xl;
+            }
+        }
+    }
 }
 
 a[href^="#"] {
diff --git a/components/header.vue b/components/header.vue
index 93ef533..0291c09 100644
--- a/components/header.vue
+++ b/components/header.vue
@@ -5,6 +5,13 @@ import k_logo from '@/assets/LOGO.svg'
 const { data: menuData } = await apiFetch<ApiMenuType>(`menu/1/`)
 const pagesData = (menuData.value ? menuData.value.pages : []).sort((a, b) => a.order - b.order)
 const route = useRoute()
+
+const menu_visible = ref(false)
+const toggle_menu = () => {
+    if (window.innerWidth < 1280) {
+        menu_visible.value = !menu_visible.value
+    }
+}
 </script>
 <template>
     <div class="header">
@@ -15,10 +22,15 @@ const route = useRoute()
                     <span class="logo_text">Kupizabor</span>
                 </NuxtLink>
             </div>
-            <div class="menu">
+            <div class="menu-toggle">
+                <span @click="toggle_menu">
+                    <Icon name="mdi:menu" />
+                </span>
+            </div>
+            <div class="menu" :class="[{ 'toggle_visible': menu_visible }]">
                 <template v-for="item in pagesData">
                     <NuxtLink :to="item.external_link || ((route.name == 'index' ? '' : '/') + `#${item.slug}`)"
-                        :target="item.external_link ? '_blank' : '_self'">
+                        :target="item.external_link ? '_blank' : '_self'" @click="toggle_menu">
                         {{ item.menu_title }}
                     </NuxtLink>
                 </template>
-- 
2.40.1


From 905344ae442833eacea3430a6302da3a1dac08ca Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 11 Jul 2024 12:34:08 +0300
Subject: [PATCH 24/27] topmenu

---
 assets/main.scss | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/assets/main.scss b/assets/main.scss
index 4e9b7d3..7cfb543 100644
--- a/assets/main.scss
+++ b/assets/main.scss
@@ -72,14 +72,16 @@ body {
     }
 
     &.toggle_visible {
-        @apply flex flex-col text-center;
+        @apply max-xl:flex max-xl:flex-col max-xl:text-center;
 
         a {
-            @apply mb-2;
+            @apply max-xl:mb-2;
         }
 
         a:before {
-            content: none;
+            @media screen and (max-width: 1280px) {    
+                content: none;
+            }
         }
     }
 
-- 
2.40.1


From a0e7cc3215186180a1ff5fa68be5647c05f1cd12 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 11 Jul 2024 12:38:14 +0300
Subject: [PATCH 25/27] deploy script

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

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 932251f..3e106f0 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -41,9 +41,9 @@ jobs:
           HOSTING_PATH: ${{ gitea.ref_name == 'main' && '/home/svs-adm/mns-mini-zabor' || '/home/svs-adm/mns-mini-zabor_dev' }}
           DOCKER_PORT: ${{ gitea.ref_name == 'main' && '8103' || '8104' }}
           NUXT_PUBLIC_API_BASE: ${{'https://mns.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru/kp
-          NUXT_PUBLIC_IMG_BASE: ${{'https://kupizabor.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru
+          NUXT_PUBLIC_IMG_BASE: ${{'https://mns.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru
           NUXT_PUBLIC_BASE_URL: ${{'https://kupizabor.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru
-          NUXT_PUBLIC_YANDEX_METRIKA_ID: ${{ secrets.YANDEX_METRIKA_ID }}
+          NUXT_PUBLIC_YANDEX_METRIKA_ID: ${{ gitea.ref_name == 'dev' && 0 || secrets.YANDEX_METRIKA_ID }}
         with:
           host: ${{ secrets.SSH_HOST }}
           username: ${{ secrets.SSH_USERNAME }}
-- 
2.40.1


From ec42dfba6682c75675710046d48c5a3010ea720b Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Fri, 12 Jul 2024 11:00:21 +0300
Subject: [PATCH 26/27] calc fix

---
 components/calcModels.vue |  9 +-----
 components/calcValues.vue | 68 ++++++++++++++++++---------------------
 composables/useCalc.ts    |  2 +-
 3 files changed, 34 insertions(+), 45 deletions(-)

diff --git a/components/calcModels.vue b/components/calcModels.vue
index 7e5d45a..f19a2f5 100644
--- a/components/calcModels.vue
+++ b/components/calcModels.vue
@@ -23,14 +23,7 @@ const cameraStat = reactive({
 })
 
 const pointLight = ref()
-
-const groundMaterial = ref({
-    color: "#555",
-    roughness: 0.7,
-    metalness: 0,
-    side: FrontSide,
-    precision: 'lowp',
-})
+const pointLight2 = ref()
 const loadAll = async () => {
     const { scene: light } = await useGLTF('/models_light/zabor_so_svetom.glb')
     pointLight.value = light.children[2]
diff --git a/components/calcValues.vue b/components/calcValues.vue
index 3aab477..9195f72 100644
--- a/components/calcValues.vue
+++ b/components/calcValues.vue
@@ -78,11 +78,11 @@ const changeParametres = () => {
     if (auto_length) {
         let w = parametric.length.min
         const max_sections = Math.floor((total_length_mm - fence_length) / (parametric.length.min + fence_length))
-        const min_sections = Math.ceil((total_length_mm - fence_length) / (parametric.length.max + fence_length))
+        const min_sections = Math.floor((total_length_mm - fence_length) / (parametric.length.max + fence_length))
 
         for (let index = min_sections; index <= max_sections; index++) {
             full_sections = index
-            w = (total_length_mm - fence_length * (index - 1)) / index
+            w = (total_length_mm - fence_length - fence_length * index) / index
             if (
                 w >= parametric.length.min
                 && w <= parametric.length.max
@@ -99,7 +99,7 @@ const changeParametres = () => {
         }
     }
 
-    if (((full_sections * length) + (full_sections * fence_length) + fence_length) <= total_length_mm) {
+    if (((full_sections * length) + (full_sections * fence_length) + fence_length) < total_length_mm) {
         form_state.extra_section = Math.floor((total_length_mm - fence_length) % length)
     } else {
         form_state.extra_section = 0
@@ -160,19 +160,6 @@ const goal = (target: string, params: object) => {
                         <input id="height" type="range" class="w-full" v-bind="parametric.height"
                             v-model="form_state.height" :ref="form_refs.height" />
                     </div>
-                    <div class="form-item">
-                        <label for="total_length">Общая длина забора, м</label>
-                        <input type="number" id="total_length" v-bind="parametric.total_length"
-                            v-model="form_state.total_length" :ref="form_refs.total_length" />
-                    </div>
-                    <div class="form-item form-item_checkbox">
-                        <input id="auto_length" type="checkbox" v-model="form_state.auto_length" />
-                        <label for="auto_length">Автоматический подбор секции</label>
-                    </div>
-                    <div class="form-item form-item_checkbox">
-                        <input id="remove_pillar" type="checkbox" v-model="form_state.remove_pillar" />
-                        <label for="remove_pillar">Без столбов</label>
-                    </div>
                 </div>
             </div>
             <div class="col-span-12 lg:col-span-6">
@@ -183,27 +170,40 @@ const goal = (target: string, params: object) => {
                             disabled />
                         <ColorPicker :cb="setLamelleColor" />
                     </div>
-                    <div class="form-item">
-                        <template v-for="item in predefLamelleColors">
-                            <ColorPicker :color="item" :cb="setLamelleColor" :open="false"
-                                :active="lamelle_color == item" />
-                        </template>
-                    </div>
                     <div class="form-item">
                         <label for="pillar_color">Цвет столба</label>
                         <input id="pillar_color" type="text" :value="getColorNameFromRal(pillar_color)" class="w-60"
                             disabled />
                         <ColorPicker :cb="setPillarColor" />
                     </div>
+                </div>
+            </div>
+            <div class="col-span-12">
+                <div class="form-row">
                     <div class="form-item">
-                        <template v-for="item in predefPillarColors">
-                            <ColorPicker :color="item" :cb="setPillarColor" :open="false"
-                                :active="pillar_color == item" />
-                        </template>
+                        <label for="total_length">Общая длина забора, м</label>
+                        <input type="number" id="total_length" v-bind="parametric.total_length"
+                            v-model="form_state.total_length" :ref="form_refs.total_length" />
+                    </div>
+                    <div class="form-item w-full lg:w-2/4">
+                        <p v-if="form_state.extra_section" class="text-ioprim">
+                            Внимание! Дополнительная секция приводит к увеличению стоимости.
+                            Рекомендуем вам изменить длину забора или длину секции!
+                        </p>
+                    </div>
+                </div>
+                <div class="form-row min-h-12">
+                    <div class="form-item form-item_checkbox">
+                        <input id="auto_length" type="checkbox" v-model="form_state.auto_length" />
+                        <label for="auto_length">Автоматический подбор секции</label>
+                    </div>
+                    <div class="form-item form-item_checkbox">
+                        <input id="remove_pillar" type="checkbox" v-model="form_state.remove_pillar" />
+                        <label for="remove_pillar">Без столбов</label>
                     </div>
                 </div>
             </div>
-            <div class="col-span-12 lg:col-span-8 prose min-w-full">
+            <div class="col-span-12 lg:col-span-6 prose min-w-full">
                 <template v-if="(form_state.total_length * 1000) >= parametric.length.min">
                     <p>
                         Забор общей длиной {{ form_state.total_length }}{{ '\xa0' }}м,
@@ -227,17 +227,13 @@ const goal = (target: string, params: object) => {
                             {{ `длиной ${form_state.extra_section}\xa0мм` }}
                         </template>.
                     </p>
-                    <p>
-                        Окрашивается по технологии порошковой окраски: <br />
-                        ламели: {{ getColorNameFromRal(lamelle_color)?.toLowerCase() }};
-                        столбы: {{ getColorNameFromRal(pillar_color)?.toLowerCase() }}.
-                    </p>
                 </template>
             </div>
-            <div class="prose col-span-12 lg:col-span-4">
-                <p v-if="form_state.extra_section" class="text-ioprim">
-                    Внимание! Дополнительная секция приводит к увеличению стоимости.
-                    Рекомендуем вам изменить длину забора или длину секции!
+            <div class="prose col-span-12 lg:col-span-6">
+                <p>
+                    Окрашивается по технологии порошковой окраски: <br />
+                    ламели: {{ getColorNameFromRal(lamelle_color)?.toLowerCase() }};
+                    столбы: {{ getColorNameFromRal(pillar_color)?.toLowerCase() }}.
                 </p>
             </div>
             <div class="form-row justify-center">
diff --git a/composables/useCalc.ts b/composables/useCalc.ts
index 5feb052..ea19ae6 100644
--- a/composables/useCalc.ts
+++ b/composables/useCalc.ts
@@ -13,7 +13,7 @@ export const use_pillar_color = () => useState<ralTypes>('pillar_color', () => p
 export const use_lamelle_color = () => useState<ralTypes>('lamelle_color', () => predefLamelleColors[Math.floor(Math.random() * predefLamelleColors.length)] as ralTypes)
 export const use_section_count = () => useState('section_count', () => n)
 export const use_extra_section = () => useState('extra_section', () => 0)
-export const use_total_length = () => useState('total_length', () => ((min * n) - 100) * 0.001)
+export const use_total_length = () => useState('total_length', () => (((min + 104) * n) + 104) * 0.001)
 export const use_min_length = () => useState('min_length', () => 700)
 export const use_max_size = () => useState<number>('max_size', () => 13)
 export const use_explosion_state = () => useState<boolean>('explosion_state', () => false)
\ No newline at end of file
-- 
2.40.1


From aba6e88d8cd070ff017c3d3e206964bc263f4748 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Fri, 12 Jul 2024 13:01:28 +0300
Subject: [PATCH 27/27] base table

---
 assets/main.scss          | 18 +++++++++++-
 components/calcValues.vue | 61 +++++++++++++++++++--------------------
 2 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/assets/main.scss b/assets/main.scss
index 7cfb543..2f7569d 100644
--- a/assets/main.scss
+++ b/assets/main.scss
@@ -79,7 +79,7 @@ body {
         }
 
         a:before {
-            @media screen and (max-width: 1280px) {    
+            @media screen and (max-width: 1280px) {
                 content: none;
             }
         }
@@ -347,4 +347,20 @@ button {
             @apply cursor-not-allowed opacity-50 pointer-events-none;
         }
     }
+}
+
+.calc_table {
+    @apply flex flex-col gap-4 max-w-4xl;
+
+    >.grid {
+        @apply gap-4 border-solid border-b items-center last:border-b-0;
+
+        >[class*=col] {
+            @apply p-2;
+        }
+
+        >[class*=row-span]+[class*=col-span] {
+            @apply pl-4;
+        }
+    }
 }
\ No newline at end of file
diff --git a/components/calcValues.vue b/components/calcValues.vue
index 9195f72..463c7dd 100644
--- a/components/calcValues.vue
+++ b/components/calcValues.vue
@@ -203,42 +203,39 @@ const goal = (target: string, params: object) => {
                     </div>
                 </div>
             </div>
-            <div class="col-span-12 lg:col-span-6 prose min-w-full">
+            <div class="col-span-12 grid calc_table">
                 <template v-if="(form_state.total_length * 1000) >= parametric.length.min">
-                    <p>
-                        Забор общей длиной {{ form_state.total_length }}{{ '\xa0' }}м,
-                        {{ section_count }}
-                        <Plural :n="section_count" :forms="plurals.section" /> по
-                        {{ `${parseFloat(form_state.length.toString()).toFixed(2)}\xa0мм` }}{{
-                            form_state.extra_section ? ` и 1 дополнительная секция
-                        длиной ${form_state.extra_section.toFixed(2)}\xa0мм` : '' }}.
-                    </p>
-                    <p v-if="parametric.length.min <= form_state.total_length * 1000">
-                        Всего <template v-if="!form_state.remove_pillar">
+                    <div class="grid grid-cols-6">
+                        <div class="col-span-4">Секции</div>
+                        <div class="col-span-1">{{ section_count }}</div>
+                        <div class="col-span-1 row-span-2">{{
+                            `${parseFloat(form_state.length.toString()).toFixed(2)}\xa0мм` }}
+                        </div>
+                        <div class="col-span-4">Ламели, RAL {{ lamelle_color }}, {{
+                            getColorNameFromRal(lamelle_color)?.toLowerCase() }}</div>
+                        <div class="col-span-1"> {{ section_count * lamelles_count }}</div>
+                    </div>
+                    <div class="grid grid-cols-6" v-if="form_state.extra_section">
+                        <div class="col-span-4">Дополнительная секция</div>
+                        <div class="col-span-1">1</div>
+                        <div class="col-span-1 row-span-2">{{
+                            `${parseFloat(form_state.extra_section.toString()).toFixed(2)}\xa0мм` }}</div>
+                        <div class="col-span-4">Ламели, RAL {{ lamelle_color }}, {{
+                            getColorNameFromRal(lamelle_color)?.toLowerCase() }}</div>
+                        <div class="col-span-1"> {{ 1 * lamelles_count }}</div>
+                    </div>
+                    <div class="grid grid-cols-6" v-if="!form_state.remove_pillar">
+                        <div class="col-span-4">Столбы, RAL {{ pillar_color }}, {{
+                            getColorNameFromRal(pillar_color)?.toLowerCase() }}</div>
+                        <div class="col-span-1">
                             {{ section_count + ~~(!!form_state.extra_section) + 1 }}
-                            <Plural :forms="plurals.fence" :n="section_count + ~~(!!form_state.extra_section) + 1" />,
-                        </template>
-                        {{ section_count * lamelles_count }}
-                        <Plural :n="section_count * lamelles_count" :forms="plurals.lamelle" />
-                        {{ `длиной ${parseFloat(form_state.length.toString()).toFixed(2)}\xa0мм` }}<template
-                            v-if="form_state.extra_section">
-                            {{ ` и ${~~(!!form_state.extra_section.toFixed(2)) * lamelles_count}` }}
-                            <Plural :n="~~(!!form_state.extra_section) * lamelles_count" :forms="plurals.lamelle" />
-                            {{ `длиной ${form_state.extra_section}\xa0мм` }}
-                        </template>.
-                    </p>
+                        </div>
+                        <div class="col-span-1">
+                            {{ `${parseFloat(form_state.fence_length.toString()).toFixed(2)}\xa0мм` }}
+                        </div>
+                    </div>
                 </template>
             </div>
-            <div class="prose col-span-12 lg:col-span-6">
-                <p>
-                    Окрашивается по технологии порошковой окраски: <br />
-                    ламели: {{ getColorNameFromRal(lamelle_color)?.toLowerCase() }};
-                    столбы: {{ getColorNameFromRal(pillar_color)?.toLowerCase() }}.
-                </p>
-            </div>
-            <div class="form-row justify-center">
-                <button @click.prevent="toggleModal">Рассчитать прямо сейчас</button>
-            </div>
         </form>
     </div>
 </template>
\ No newline at end of file
-- 
2.40.1