From f76d1eec8bcda32c4774efbd1e3e46483880ed53 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Mon, 5 Dec 2022 18:37:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=BF=D1=80=D0=BE=D0=BF=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D1=84=D0=BE=D1=82=D0=BE=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/BaseClientFormCreate.vue   | 11 +++++++----
 .../components/CalendarFormAddEvent.vue        |  6 +++---
 src/pages/login/TheLogin.vue                   | 18 ++++++++++--------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue
index e50033b..df58b62 100644
--- a/src/components/base/BaseClientFormCreate.vue
+++ b/src/components/base/BaseClientFormCreate.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  .wrapper-create.flex.flex-col.fixed.right-6.bottom-6.px-4.py-7.gap-y-8(v-click-outside="closeForm")
+  .wrapper-create.flex.flex-col.fixed.right-6.bottom-6.px-4.py-7.gap-y-8(v-click-outside="closeModal")
     .icon-cancel.close.absolute.top-5.right-5.cursor-pointer(@click="closeForm")
     span.title.text-xl.font-bold.px-4 Создание клиента
     .flex.gap-x-4.h-fit.px-4
@@ -242,6 +242,9 @@ export default {
     closePopup() {
       this.showPopup = false;
     },
+    closeModal() {
+      !this.showModal ? this.closeForm() : null;
+    },
     createIdentityDocument(id) {
       Object.keys(
         this.filterDataEmptyProperty(this.infoClient.identity_document.pass)
@@ -384,14 +387,14 @@ export default {
     },
     checkFormFullness() {
       if (!this.infoClient.basic.full_name) {
-        this.addErrrorNotification(
+        this.addErrorNotification(
           "Не заполнено ФИО клиента",
           "Пожалуйста, заполните ФИО клиента"
         );
         return false;
       }
       if (this.infoClient.basic.full_name.split(" ").length < 3) {
-        this.addErrrorNotification(
+        this.addErrorNotification(
           "Некорректное ФИО клиента",
           "Пожалуйста, введите ФИО клиента правильно"
         );
@@ -399,7 +402,7 @@ export default {
       }
       return true;
     },
-    addErrrorNotification(title, message) {
+    addErrorNotification(title, message) {
       addNotification(new Date().getTime(), title, message, "error", 5000);
     },
     addSuccessNotification() {
diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue
index 83cad58..e1ae41a 100644
--- a/src/pages/calendar/components/CalendarFormAddEvent.vue
+++ b/src/pages/calendar/components/CalendarFormAddEvent.vue
@@ -326,7 +326,7 @@ export default {
     async postCreateEvent(event) {
       const response = await fetchWrapper.post("registry/event/create/", event);
       if (response.type && response.type === "validation_error") {
-        this.addErrrorNotification(response);
+        this.addErrorNotification(response);
       } else {
         this.addSuccessNotification("Событие успешно создано");
         this.clearForm();
@@ -338,7 +338,7 @@ export default {
         event
       );
       if (response.type && response.type === "validation_error") {
-        this.addErrrorNotification(response);
+        this.addErrorNotification(response);
       } else {
         this.addSuccessNotification("Изменения успешно сохранены");
         this.clearForm();
@@ -362,7 +362,7 @@ export default {
         return id;
       }
     },
-    addErrrorNotification(error) {
+    addErrorNotification(error) {
       addNotification(
         new Date().getTime(),
         error.errors[0].code,
diff --git a/src/pages/login/TheLogin.vue b/src/pages/login/TheLogin.vue
index 86e3a9b..985e8f2 100644
--- a/src/pages/login/TheLogin.vue
+++ b/src/pages/login/TheLogin.vue
@@ -12,17 +12,19 @@
           .flex.flex-col.gap-y-6px
             .flex.non-italic.font-semibold.text-xss Логин
             base-input.h-12.font-medium(
-            :style="{borderColor: wrongData ? this.redColor : ''}"
-            v-model:value="user.username"
-            type="text"
-            placeholder="Введите ваш логин")
+              :style="{borderColor: wrongData ? this.redColor : ''}",
+              v-model:value="user.username",
+              type="text",
+              placeholder="Введите ваш логин"
+            )
           .flex.flex-col.gap-y-6px.relative
             .flex.non-italic.font-semibold.text-xss Пароль
             base-input.h-12(
-            :style="{borderColor: wrongData ? this.redColor : ''}"
-            v-model:value="user.password"
-            :type="changeType"
-            placeholder="Введите ваш пароль")
+              :style="{borderColor: wrongData ? this.redColor : ''}",
+              v-model:value="user.password",
+              :type="changeType",
+              placeholder="Введите ваш пароль"
+            )
             img.absolute.z-10.right-4.bottom-14px.cursor-pointer(:src="changeIcon", alt="eyePassword", @click="changeView")
           span.font-medium(:style="{color: this.redColor}", v-show="wrongData") Неверный логин или пароль
           .flex.items-center.gap-x-11px