From 889c5093f6b5da7e990d861d19375db87fa62bbb Mon Sep 17 00:00:00 2001
From: Norbaev <timnrbv@gmail.com>
Date: Thu, 4 Jul 2024 12:05:23 +0500
Subject: [PATCH 1/5] =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D1=81=20=D0=B1=D0=B5=D0=BA=D0=B5=D0=BD=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/services/app.js    | 14 ++++++++
 client/src/views/contacts.vue | 60 ++++++++++++++++++++++++++++++-----
 2 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/client/src/services/app.js b/client/src/services/app.js
index 2781502..94b24bd 100644
--- a/client/src/services/app.js
+++ b/client/src/services/app.js
@@ -5,6 +5,8 @@ import { REST, RESTError } from './rest';
 // console.log(settings);
 
 export default class extends REST {
+  // export default class Django extends REST {
+
   static get settings() {
     return settings;
   }
@@ -237,4 +239,16 @@ export default class extends REST {
         );
       });
   }
+
+  static getSupportInfo() {
+    return this._get('radio/support_info', {}, {})
+      .then((data) => {
+        return data;
+      })
+      .catch((error) => {
+        throw new RESTError(error, 'Ошибка при получении контактов');
+      });
+  }
 }
+
+// window.django = Django;
diff --git a/client/src/views/contacts.vue b/client/src/views/contacts.vue
index 7d41275..ad86588 100644
--- a/client/src/views/contacts.vue
+++ b/client/src/views/contacts.vue
@@ -8,24 +8,35 @@
     />
     <h1 class="h2">Контакты</h1>
     <div class="contacts__content">
-      <div class="contacts__info">
-        <div class="text contacts__item">
+      <div v-if="contacts" class="contacts__info">
+        <div v-if="phone" class="text contacts__item">
           <span class="title">Телефон</span>
-          +7 (900) 000-00-00
+          {{ phone }}
         </div>
         <div class="text contacts__item">
           <span class="title">Почта</span>
-          it-radio@info.org
+          {{ email }}
         </div>
         <div class="text contacts__item">
           <span class="title">Адрес</span>
-          г. Челябинск, Адрес
+          {{ address }}
         </div>
-        <div class="text contacts__item">
+        <div
+          v-if="contacts.telegram_url || contacts.vk_url"
+          class="text contacts__item"
+        >
           <span class="title">Соц. сети</span>
           <div class="contacts__social">
-            <div class="contacts__social m--telegram"></div>
-            <div class="contacts__social m--vk"></div>
+            <a
+              v-if="contacts.telegram_url"
+              :href="contacts.telegram_url"
+              class="contacts__social m--telegram"
+            ></a>
+            <a
+              v-if="contacts.vk_url"
+              :href="contacts.vk_url"
+              class="contacts__social m--vk"
+            ></a>
           </div>
         </div>
       </div>
@@ -79,6 +90,7 @@
 <script>
 import AppBreadcrumbs from '@/components/app-breadcrumbs.vue';
 import SupportBlock from '@/components/support-block.vue';
+import { app } from '@/services';
 
 export default {
   name: 'contacts',
@@ -122,8 +134,40 @@ export default {
         },
       ],
       showLoaderSending: false,
+      contacts: null,
     };
   },
+  computed: {
+    email() {
+      return this.contacts.email;
+    },
+    address() {
+      // const adressParts = [];
+      // if (this.contacts.city) {
+      //   adressParts.push(`г. ${this.contacts.city}`);
+      // }
+      // if (this.contacts.street) {
+      //   adressParts.push(`ул. ${this.contacts.street}`);
+      // }
+      // if (this.contacts.house) {
+      //   adressParts.push(`д. ${this.contacts.house}`);
+      // }
+      // return adressParts.join(', ');
+      if (!this.contacts.city) false;
+      return `г. ${this.contacts.city}, ул. ${this.contacts.street}, д. ${this.contacts.house}`;
+    },
+    phone() {
+      return this.contacts?.phone;
+    },
+  },
+  created() {
+    console.log(this.contacts?.phone);
+    app.getSupportInfo().then((responce) => {
+      console.log(responce);
+      this.contacts = { ...responce };
+      console.log(this.contacts);
+    });
+  },
   methods: {
     submitHandler() {},
   },

From e07d48c84389e781a3bef5b02a9ef6139a890151 Mon Sep 17 00:00:00 2001
From: Norbaev <timnrbv@gmail.com>
Date: Thu, 4 Jul 2024 15:33:16 +0500
Subject: [PATCH 2/5] =?UTF-8?q?=D0=92=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20inpu?=
 =?UTF-8?q?t=20phone,=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=86=D0=B5=20about,=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80?=
 =?UTF-8?q?=D1=8C=20=D0=B2=D0=B2=D0=BE=D0=B4=20email?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/contacts.vue | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/client/src/views/contacts.vue b/client/src/views/contacts.vue
index ad86588..5296bd5 100644
--- a/client/src/views/contacts.vue
+++ b/client/src/views/contacts.vue
@@ -116,12 +116,11 @@ export default {
           outerClass: 'field--required',
         },
         {
-          $formkit: 'maska',
-          name: 'phone',
-          maska: { mask: '+7 (###) ###-##-##' },
-          label: 'Контактный телефон',
-          placeholder: '+7 (###) ###-##-##',
-          validation: 'required',
+          $formkit: 'text',
+          name: 'email',
+          label: 'Электронная почта',
+          placeholder: 'example@example.com',
+          validation: 'required|email',
           outerClass: 'field--required',
         },
         {
@@ -142,17 +141,6 @@ export default {
       return this.contacts.email;
     },
     address() {
-      // const adressParts = [];
-      // if (this.contacts.city) {
-      //   adressParts.push(`г. ${this.contacts.city}`);
-      // }
-      // if (this.contacts.street) {
-      //   adressParts.push(`ул. ${this.contacts.street}`);
-      // }
-      // if (this.contacts.house) {
-      //   adressParts.push(`д. ${this.contacts.house}`);
-      // }
-      // return adressParts.join(', ');
       if (!this.contacts.city) false;
       return `г. ${this.contacts.city}, ул. ${this.contacts.street}, д. ${this.contacts.house}`;
     },
@@ -161,11 +149,9 @@ export default {
     },
   },
   created() {
-    console.log(this.contacts?.phone);
     app.getSupportInfo().then((responce) => {
-      console.log(responce);
+      console.log([...responce]);
       this.contacts = { ...responce };
-      console.log(this.contacts);
     });
   },
   methods: {

From 8789bb2e0969463c94b1470e138c555d7756f39c Mon Sep 17 00:00:00 2001
From: Norbaev <timnrbv@gmail.com>
Date: Thu, 4 Jul 2024 18:14:40 +0500
Subject: [PATCH 3/5] =?UTF-8?q?=D0=9E=D1=82=D1=80=D0=B8=D1=81=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82=D0=BE=D0=B2=20(=D0=B1?=
 =?UTF-8?q?=D0=B5=D0=B7=20=D1=81=D0=BE=D1=86=D0=B8=D0=B0=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D1=8B=D1=85=20=D1=81=D0=B5=D1=82=D0=B5=D0=B9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/router/index.js    |   4 +-
 client/src/views/contacts.vue | 103 ++++++++++++++++++++++------------
 2 files changed, 69 insertions(+), 38 deletions(-)

diff --git a/client/src/router/index.js b/client/src/router/index.js
index 200f989..9e29984 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -49,7 +49,9 @@ export default route(function (/* { store, ssrContext } */) {
   });
 
   Router.beforeEach((to, from, next) => {
-    if (to.meta.isAuth) {
+    console.log(process.env.SERVER);
+    //уточнить зачем нужен process.env.SERVER
+    if (to.meta.isAuth && !process.env.SERVER) {
       if (store.state.user) {
         next();
       } else {
diff --git a/client/src/views/contacts.vue b/client/src/views/contacts.vue
index 5296bd5..081af6f 100644
--- a/client/src/views/contacts.vue
+++ b/client/src/views/contacts.vue
@@ -9,36 +9,14 @@
     <h1 class="h2">Контакты</h1>
     <div class="contacts__content">
       <div v-if="contacts" class="contacts__info">
-        <div v-if="phone" class="text contacts__item">
-          <span class="title">Телефон</span>
-          {{ phone }}
-        </div>
-        <div class="text contacts__item">
-          <span class="title">Почта</span>
-          {{ email }}
-        </div>
-        <div class="text contacts__item">
-          <span class="title">Адрес</span>
-          {{ address }}
-        </div>
-        <div
-          v-if="contacts.telegram_url || contacts.vk_url"
-          class="text contacts__item"
-        >
-          <span class="title">Соц. сети</span>
-          <div class="contacts__social">
-            <a
-              v-if="contacts.telegram_url"
-              :href="contacts.telegram_url"
-              class="contacts__social m--telegram"
-            ></a>
-            <a
-              v-if="contacts.vk_url"
-              :href="contacts.vk_url"
-              class="contacts__social m--vk"
-            ></a>
+        <div v-for="(item, index) in contactsField" :key="index">
+          <div class="text contacts__item">
+            <span class="title">{{ item.title }}</span>
+            {{ item.data }}
           </div>
         </div>
+        <span class="title">Соц. сети</span>
+        <div></div>
       </div>
       <div class="contacts__map">
         <div
@@ -134,28 +112,79 @@ export default {
       ],
       showLoaderSending: false,
       contacts: null,
+      dictionaryFields: {
+        phone: 'Телефон',
+        address: 'Адрес',
+        email: 'Почта',
+      },
     };
   },
   computed: {
-    email() {
-      return this.contacts.email;
+    contactsField() {
+      const address =
+        this.contacts.city && this.contacts.street && this.contacts.house
+          ? `г. ${this.contacts.city}, ул. ${this.contacts.street}, д. ${this.contacts.house}`
+          : null;
+
+      const phone = this.contacts.phone;
+      const email = this.contacts.email;
+
+      const fields = {
+        address,
+        phone,
+        email,
+      };
+
+      const fieldsWithoutNull = this.removeNullFields(fields);
+      return this.createArrayContacts(this.dictionaryFields, fieldsWithoutNull);
     },
-    address() {
-      if (!this.contacts.city) false;
-      return `г. ${this.contacts.city}, ул. ${this.contacts.street}, д. ${this.contacts.house}`;
-    },
-    phone() {
-      return this.contacts?.phone;
+    socialsField() {
+      const socials = {
+        telegram: this.contacts.telegram_url,
+        vk: this.contacts.vk_url,
+      };
+
+      return this.removeNullFields(socials);
     },
   },
   created() {
+    // Получаем объект с бэка
     app.getSupportInfo().then((responce) => {
-      console.log([...responce]);
       this.contacts = { ...responce };
     });
   },
+  mounted() {},
   methods: {
     submitHandler() {},
+    // Метод удаляет из объекта ключи с null
+    removeNullFields(obj) {
+      const result = {};
+
+      for (const key in obj) {
+        if (obj[key] !== null) {
+          if (typeof obj[key] === 'object' && !Array.isArray(obj[key])) {
+            result[key] = this.removeNullFields(obj[key]);
+          } else {
+            result[key] = obj[key];
+          }
+        }
+      }
+
+      return result;
+    },
+
+    // Метод формирует массив, на основе словаря и объекта
+    createArrayContacts(dictionary, fields) {
+      const result = [];
+
+      for (const key in fields) {
+        if (dictionary[key]) {
+          result.push({ title: dictionary[key], data: fields[key] });
+        }
+      }
+
+      return result;
+    },
   },
 };
 </script>

From e07d34d61e9933a280bc6815b805fe0982465e42 Mon Sep 17 00:00:00 2001
From: Norbaev <timnrbv@gmail.com>
Date: Thu, 4 Jul 2024 20:55:25 +0500
Subject: [PATCH 4/5] =?UTF-8?q?=D0=A0=D0=B5=D0=BD=D0=B4=D0=B5=D1=80=20?=
 =?UTF-8?q?=D1=81=D0=BE=D1=86=D0=B8=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20?=
 =?UTF-8?q?=D1=81=D0=B5=D1=82=D0=B5=D0=B9=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7?=
 =?UTF-8?q?=20=D1=86=D0=B8=D0=BA=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/contacts.vue | 50 ++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/client/src/views/contacts.vue b/client/src/views/contacts.vue
index 081af6f..d95505e 100644
--- a/client/src/views/contacts.vue
+++ b/client/src/views/contacts.vue
@@ -10,15 +10,26 @@
     <div class="contacts__content">
       <div v-if="contacts" class="contacts__info">
         <div v-for="(item, index) in contactsField" :key="index">
-          <div class="text contacts__item">
+          <div
+            v-if="item.title !== dictionaryFields.socials"
+            class="text contacts__item"
+          >
             <span class="title">{{ item.title }}</span>
             {{ item.data }}
           </div>
+          <div v-else class="contacts__socials">
+            <span class="title">{{ item.title }}</span>
+            <div
+              v-for="(href, social) in item.data"
+              :key="social"
+              class="contacts__social"
+            >
+              <a :href="href" :class="['contacts__social', social]"></a>
+            </div>
+          </div>
         </div>
-        <span class="title">Соц. сети</span>
-        <div></div>
       </div>
-      <div class="contacts__map">
+      <!-- <div class="contacts__map">
         <div
           class="contacts__map-frame"
           style="position: relative; overflow: hidden"
@@ -40,7 +51,7 @@
             style="position: relative"
           ></iframe>
         </div>
-      </div>
+      </div> -->
       <FormKit
         v-model="formData"
         type="form"
@@ -116,39 +127,32 @@ export default {
         phone: 'Телефон',
         address: 'Адрес',
         email: 'Почта',
+        socials: 'Соц. сети',
       },
     };
   },
   computed: {
     contactsField() {
-      const address =
-        this.contacts.city && this.contacts.street && this.contacts.house
-          ? `г. ${this.contacts.city}, ул. ${this.contacts.street}, д. ${this.contacts.house}`
-          : null;
-
+      const address = this.formatAddress(this.contacts);
       const phone = this.contacts.phone;
       const email = this.contacts.email;
+      const socials = {
+        ['m--telegram']: this.contacts.telegram_url,
+        ['m--vk']: this.contacts.vk_url,
+      };
 
       const fields = {
         address,
         phone,
         email,
+        socials,
       };
 
       const fieldsWithoutNull = this.removeNullFields(fields);
       return this.createArrayContacts(this.dictionaryFields, fieldsWithoutNull);
     },
-    socialsField() {
-      const socials = {
-        telegram: this.contacts.telegram_url,
-        vk: this.contacts.vk_url,
-      };
-
-      return this.removeNullFields(socials);
-    },
   },
   created() {
-    // Получаем объект с бэка
     app.getSupportInfo().then((responce) => {
       this.contacts = { ...responce };
     });
@@ -156,7 +160,6 @@ export default {
   mounted() {},
   methods: {
     submitHandler() {},
-    // Метод удаляет из объекта ключи с null
     removeNullFields(obj) {
       const result = {};
 
@@ -173,7 +176,6 @@ export default {
       return result;
     },
 
-    // Метод формирует массив, на основе словаря и объекта
     createArrayContacts(dictionary, fields) {
       const result = [];
 
@@ -185,6 +187,12 @@ export default {
 
       return result;
     },
+    formatAddress(contacts) {
+      if (contacts.city && contacts.street && contacts.house) {
+        return `г. ${contacts.city}, ул. ${contacts.street}, д. ${contacts.house}`;
+      }
+      return null;
+    },
   },
 };
 </script>

From c3ab0cf6b8cb11273e761c4b62481b64b9d1481b Mon Sep 17 00:00:00 2001
From: Norbaev <timnrbv@gmail.com>
Date: Fri, 5 Jul 2024 18:03:24 +0500
Subject: [PATCH 5/5] =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=20ymap.v?=
 =?UTF-8?q?ue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/ymap.vue | 62 ++++++++++++++++++++++++++++++++++
 client/src/views/contacts.vue  | 21 ++++--------
 2 files changed, 69 insertions(+), 14 deletions(-)
 create mode 100644 client/src/components/ymap.vue

diff --git a/client/src/components/ymap.vue b/client/src/components/ymap.vue
new file mode 100644
index 0000000..044e0bc
--- /dev/null
+++ b/client/src/components/ymap.vue
@@ -0,0 +1,62 @@
+<template>
+  <div ref="map" :style="{ width: mapWidth, height: mapHeight }"></div>
+</template>
+
+<script>
+export default {
+  name: 'YandexMap',
+  props: {
+    apiKey: {
+      type: String,
+      default: '',
+    },
+    mapWidth: {
+      type: String,
+      default: '100%',
+    },
+    mapHeight: {
+      type: String,
+      default: '100%',
+    },
+    center: {
+      type: Array,
+      default: () => [61.402554, 55.159902],
+    },
+    zoom: {
+      type: Number,
+      default: 10,
+    },
+  },
+  mounted() {
+    this.loadYandexMap();
+  },
+  methods: {
+    loadYandexMap() {
+      if (document.querySelector('script[src*="api-maps.yandex.ru"]')) {
+        this.initMap();
+      } else {
+        const script = document.createElement('script');
+        script.src = `https://api-maps.yandex.ru/v3/?apikey=${this.apiKey}&lang=ru_RU`;
+        script.onload = this.initMap;
+        document.head.appendChild(script);
+      }
+    },
+    async initMap() {
+      // eslint-disable-next-line no-undef
+      await ymaps3.ready;
+
+      // eslint-disable-next-line no-undef
+      const { YMap, YMapDefaultSchemeLayer, YMapDefaultMarker } = ymaps3;
+
+      const map = new YMap(this.$refs.map, {
+        location: {
+          center: this.center,
+          zoom: this.zoom,
+        },
+      });
+
+      map.addChild(new YMapDefaultSchemeLayer());
+    },
+  },
+};
+</script>
diff --git a/client/src/views/contacts.vue b/client/src/views/contacts.vue
index d95505e..94fc10d 100644
--- a/client/src/views/contacts.vue
+++ b/client/src/views/contacts.vue
@@ -29,8 +29,8 @@
           </div>
         </div>
       </div>
-      <!-- <div class="contacts__map">
-        <div
+      <div class="contacts__map">
+        <!-- <div
           class="contacts__map-frame"
           style="position: relative; overflow: hidden"
         >
@@ -38,10 +38,6 @@
             href="https://yandex.ru/maps/56/chelyabinsk/?utm_medium=mapframe&utm_source=maps"
             style="color: #eee; font-size: 12px; position: absolute; top: 0px"
             >Челябинск</a
-          ><a
-            href="https://yandex.ru/maps/geo/chelyabinsk/53159527/?ll=61.421984%2C55.159071&utm_medium=mapframe&utm_source=maps&z=14.04"
-            style="color: #eee; font-size: 12px; position: absolute; top: 14px"
-            >Челябинск — Яндекс Карты</a
           ><iframe
             src="https://yandex.ru/map-widget/v1/?ll=61.421984%2C55.159071&mode=poi&poi%5Bpoint%5D=61.399655%2C55.160475&poi%5Buri%5D=ymapsbm1%3A%2F%2Fgeo%3Fdata%3DCgg1MzE1OTUyNxIg0KDQvtGB0YHQuNGPLCDQp9C10LvRj9Cx0LjQvdGB0LoiCg04nHVCFb2jXEI%2C&z=14.04"
             width="100%"
@@ -50,8 +46,9 @@
             allowfullscreen="true"
             style="position: relative"
           ></iframe>
-        </div>
-      </div> -->
+        </div> -->
+        <YandexMap apiKey="e73ed16e-35ea-483b-afb4-9daac388591a" />
+      </div>
       <FormKit
         v-model="formData"
         type="form"
@@ -79,11 +76,12 @@
 <script>
 import AppBreadcrumbs from '@/components/app-breadcrumbs.vue';
 import SupportBlock from '@/components/support-block.vue';
+import YandexMap from '@/components/ymap.vue';
 import { app } from '@/services';
 
 export default {
   name: 'contacts',
-  components: { SupportBlock, AppBreadcrumbs },
+  components: { SupportBlock, AppBreadcrumbs, YandexMap },
   data() {
     return {
       formData: {},
@@ -162,7 +160,6 @@ export default {
     submitHandler() {},
     removeNullFields(obj) {
       const result = {};
-
       for (const key in obj) {
         if (obj[key] !== null) {
           if (typeof obj[key] === 'object' && !Array.isArray(obj[key])) {
@@ -172,19 +169,15 @@ export default {
           }
         }
       }
-
       return result;
     },
-
     createArrayContacts(dictionary, fields) {
       const result = [];
-
       for (const key in fields) {
         if (dictionary[key]) {
           result.push({ title: dictionary[key], data: fields[key] });
         }
       }
-
       return result;
     },
     formatAddress(contacts) {