From 27da0630723ce527c799aa31affa71d389f54b2a Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Thu, 10 Nov 2022 15:26:54 +0300
Subject: [PATCH 1/3] =?UTF-8?q?WIP=20=D0=BF=D1=80=D0=B8=D0=B2=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=20=D0=BA=20=D0=B8=D0=B7=D0=BD=D0=B0=D1=87=D0=B0?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BD=D0=BE=D0=BC=D1=83=20=D0=B2=D0=B8=D0=B4=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LoggedInLayout.vue             | 24 ++-----------------
 src/components/TheHeader.vue                  | 15 ++----------
 src/components/base/BaseClientFormCreate.vue  |  4 +---
 src/pages/calendar/TheCalendar.vue            | 13 +---------
 src/pages/clients/TheClients.vue              |  7 +-----
 src/pages/clients/components/ClientsTable.vue |  5 ----
 .../clients/components/ClientsWrapper.vue     |  9 ++++---
 7 files changed, 13 insertions(+), 64 deletions(-)

diff --git a/src/components/LoggedInLayout.vue b/src/components/LoggedInLayout.vue
index e3d7272..6c7c8d7 100644
--- a/src/components/LoggedInLayout.vue
+++ b/src/components/LoggedInLayout.vue
@@ -1,15 +1,9 @@
 <template lang="pug">
 .flex.flex-col.w-full.h-full.gap-y-2
-    the-header(
-      :is-open-page-form="isOpenPageForm",
-      @is-open-header-form="changeHeaderFormState"
-    )
+    the-header
     .flex.flex-auto
       the-sidebar
-      router-view(
-        :is-open-header-form="isOpenHeaderForm",
-        @is-open-page-form="changePageFormState",
-      )
+      router-view
 </template>
 
 <script>
@@ -19,19 +13,5 @@ import TheSidebar from "@/components/TheSidebar";
 export default {
   name: "LoggedInLayout",
   components: { TheHeader, TheSidebar },
-  data() {
-    return {
-      isOpenPageForm: false,
-      isOpenHeaderForm: false,
-    };
-  },
-  methods: {
-    changePageFormState(value) {
-      this.isOpenPageForm = value;
-    },
-    changeHeaderFormState(value) {
-      this.isOpenHeaderForm = value;
-    },
-  },
 };
 </script>
diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue
index 27c441b..6e93305 100644
--- a/src/components/TheHeader.vue
+++ b/src/components/TheHeader.vue
@@ -13,8 +13,8 @@
         :size="40",
         right-icon="icon-person",
         :icon-right-size="18",
-        @click="changeFormState"
-        )
+        @click="isOpenCreate=true"
+      )
       button.header-buttons.flex.justify-center.items-center.mr-8.p-0(@click="logout")
         .icon-bell.text-xxl
       .flex.justify-centflexer.items-center
@@ -34,12 +34,6 @@ import BaseClientFormCreate from "@/components/base/BaseClientFormCreate";
 export default {
   name: "TheHeader",
   components: { HeaderInputs, BaseAvatar, BaseButton, BaseClientFormCreate },
-  props: {
-    isOpenPageForm: {
-      type: Boolean,
-      default: false,
-    },
-  },
   data() {
     return {
       avatarSrc: img,
@@ -53,16 +47,11 @@ export default {
   methods: {
     closeFormCreate() {
       this.isOpenCreate = false;
-      this.$emit("is-open-header-form", this.isOpenCreate);
     },
     logout() {
       localStorage.clear();
       this.$router.push("/login");
     },
-    changeFormState() {
-      this.isOpenCreate = !this.isOpenPageForm;
-      this.$emit("is-open-header-form", this.isOpenCreate);
-    },
   },
 };
 </script>
diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue
index bcabed8..b802add 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.absolute.top-0.px-4.py-7.gap-y-8
+  .wrapper-create.flex.flex-col.absolute.top-0.px-4.py-7.gap-y-8(v-click-outside="closeForm")
     .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
@@ -38,13 +38,11 @@ import FormCreateIdentityDocuments from "@/pages/clients/components/FormCreateId
 import FormCreateAddresses from "@/pages/clients/components/FormCreateAddresses";
 import FormCreateAdditional from "@/pages/clients/components/FormCreateAdditional";
 import BaseInput from "@/components/base/BaseInput";
-import BaseSelect from "@/components/base/OldBaseSelect";
 import BaseButton from "@/components/base/BaseButton";
 export default {
   name: "BaseClientFormClient",
   components: {
     BaseInput,
-    BaseSelect,
     FormCreateBasicInfo,
     FormCreateIdentityDocuments,
     FormCreateAddresses,
diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index 3a3f714..d6b7176 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -37,12 +37,6 @@ export default {
     CalendarSidebar,
     CalendarFormAddEvent,
   },
-  props: {
-    isOpenHeaderForm: {
-      type: Boolean,
-      default: false,
-    },
-  },
   data() {
     return {
       sidebarWidth: "72px",
@@ -100,21 +94,16 @@ export default {
       this.sidebarWidth = value;
     },
     openFormCreateEvent() {
-      this.isOpenForm = !this.isOpenHeaderForm;
-      this.$emit("is-open-page-form", this.isOpenForm);
+      this.isOpenForm = true;
     },
     closeFormCreateEvent() {
       this.isOpenForm = false;
-      this.$emit("is-open-page-form", this.isOpenForm);
     },
   },
   mounted() {
     this.fetchPersonsData();
     this.fetchEventsData();
   },
-  beforeUnmount() {
-    this.closeFormCreateEvent();
-  },
 };
 </script>
 
diff --git a/src/pages/clients/TheClients.vue b/src/pages/clients/TheClients.vue
index b0a6874..bfe6a5f 100644
--- a/src/pages/clients/TheClients.vue
+++ b/src/pages/clients/TheClients.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  clients-wrapper(@is-open-client-add-form="transmitPageFormState")
+  clients-wrapper
 </template>
 
 <script>
@@ -7,10 +7,5 @@ import ClientsWrapper from "@/pages/clients/components/ClientsWrapper";
 export default {
   name: "TheClients",
   components: { ClientsWrapper },
-  methods: {
-    transmitPageFormState(value) {
-      this.$emit("is-open-page-form", value);
-    },
-  },
 };
 </script>
diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index c2463bb..357cdfe 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -43,11 +43,9 @@ export default {
   methods: {
     openFormCreateClient() {
       this.isOpenFormCreate = true;
-      this.$emit("is-open-client-add-form", this.isOpenFormCreate);
     },
     closeFormCreateClient() {
       this.isOpenFormCreate = false;
-      this.$emit("is-open-client-add-form", this.isOpenFormCreate);
       this.fetchDataClients();
     },
     saveDataClients(data) {
@@ -81,9 +79,6 @@ export default {
   mounted() {
     this.fetchDataClients();
   },
-  beforeUnmount() {
-    this.closeFormCreateClient();
-  },
 };
 </script>
 
diff --git a/src/pages/clients/components/ClientsWrapper.vue b/src/pages/clients/components/ClientsWrapper.vue
index ee4e3f3..c0114d1 100644
--- a/src/pages/clients/components/ClientsWrapper.vue
+++ b/src/pages/clients/components/ClientsWrapper.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
   .wrapper.flex.w-full.relative.mx-6
-    clients-table(@is-open-client-add-form="transmitPageFormState")
+    clients-table(:open-form-create="openFormCreateClient")
 </template>
 
 <script>
@@ -14,8 +14,11 @@ export default {
     };
   },
   methods: {
-    transmitPageFormState(value) {
-      this.$emit("is-open-client-add-form", value);
+    openFormCreateClient() {
+      this.isOpenForm = true;
+    },
+    closeFormCreateClient() {
+      this.isOpenForm = false;
     },
   },
 };

From 80075bee65b26542e83d9024370ae6af426c27e3 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Fri, 11 Nov 2022 18:09:02 +0300
Subject: [PATCH 2/3] =?UTF-8?q?WIP=20=D0=A1=D0=BF=D0=BE=D0=B7=D0=B8=D1=86?=
 =?UTF-8?q?=D0=B8=D0=BE=D0=BD=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=D0=B0=20?=
 =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20=D0=B2=20=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B9=20=D0=BD=D0=B8=D0=B6=D0=BD=D0=B8=D0=B9=20?=
 =?UTF-8?q?=D1=83=D0=B3=D0=BE=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TheHeader.vue                           | 2 +-
 src/components/base/BaseClientFormCreate.vue           | 2 +-
 src/pages/calendar/components/CalendarFormAddEvent.vue | 2 +-
 src/pages/clients/components/ClientsTable.vue          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue
index 6e93305..4f8b174 100644
--- a/src/components/TheHeader.vue
+++ b/src/components/TheHeader.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
   .header-wrapper.relative.flex.justify-center.box-border.py-2.pl-4_75px.pr-6
-    base-client-form-create.right-0.top-16(v-if="isOpenCreate", @blure="isOpenCreate=false", :close-form="closeFormCreate")
+    base-client-form-create(v-if="isOpenCreate", @blure="isOpenCreate=false", :close-form="closeFormCreate")
     .flex.items-center.box-border.cursor-pointer.mr-auto
       img.logo-img.mr-29_25px(src="@/assets/images/logo.svg", alt="Logo")
       header-inputs
diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue
index b802add..94ea34a 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.absolute.top-0.px-4.py-7.gap-y-8(v-click-outside="closeForm")
+  .wrapper-create.flex.flex-col.fixed.right-0.bottom-4.px-4.py-7.gap-y-8(v-click-outside="closeForm")
     .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
diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue
index c32f0f1..c88a84f 100644
--- a/src/pages/calendar/components/CalendarFormAddEvent.vue
+++ b/src/pages/calendar/components/CalendarFormAddEvent.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  .flex.flex-col.gap-y-6.pt-6.pb-7.px-8.event-form.absolute.right-0.bottom-14
+  .flex.flex-col.gap-y-6.pt-6.pb-7.px-8.event-form.fixed.right-0.bottom-3
     .flex.justify-between
       span.title.text-xl.font-bold {{!selectedEventData.id ? "Назначение события" : "Изменение события"}}
       .flex.pt-2
diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index 357cdfe..b9cebc2 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
   .wrapper-table.relative.flex.flex-col.gap-y-8.px-6.py-6.h-full.w-full
-    base-client-form-create.right-0(v-if="isOpenFormCreate" :close-form="closeFormCreateClient")
+    base-client-form-create(v-if="isOpenFormCreate" :close-form="closeFormCreateClient")
     clients-table-hat(:is-open-actions="marked.length" :open-form-create="openFormCreateClient")
     .flex.flex-col.h-full.gap-y-2.table-container.w-full
       clients-table-header(:check="selectedCheck" :is-check="selectAll")

From 77808d899606ace894b9c7cfd33b812d6d94fd2b Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Fri, 11 Nov 2022 18:11:56 +0300
Subject: [PATCH 3/3] =?UTF-8?q?WIP=20=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B0=20click-outside?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue
index 94ea34a..49abfcf 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-0.bottom-4.px-4.py-7.gap-y-8(v-click-outside="closeForm")
+  .wrapper-create.flex.flex-col.fixed.right-0.bottom-4.px-4.py-7.gap-y-8
     .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