From 0e352544e8200c2f6c576be12725ec465b560d36 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Wed, 7 Dec 2022 12:41:02 +0300
Subject: [PATCH 1/2] =?UTF-8?q?[WIP]=20=D0=97=D0=B0=D0=B4=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B5=D0=B9=D0=B1=D0=BB=D0=B8=D0=BB=20=D0=B8=D0=BD=D0=BF=D1=83?=
 =?UTF-8?q?=D1=82=D1=8B=20=D0=B0=D0=B4=D1=80=D0=B5=D1=81=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/sass/variables.sass                |  1 +
 src/components/base/BaseSelect.vue            |  5 ++-
 .../components/ClientDetailInfoSection.vue    | 10 +----
 .../components/ClientDetailSectionAddress.vue | 44 +++++++++++++++----
 .../components/FormCreateAddresses.vue        | 26 ++++++++---
 5 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass
index 0f55b38..e548e32 100644
--- a/src/assets/sass/variables.sass
+++ b/src/assets/sass/variables.sass
@@ -48,3 +48,4 @@
   --btn-grey-color: #e8e8f3
   --pagination-item-shadow: 0 3px 1px -2px rgb(0 0 0 / 20%), 0 2px 2px 0 rgb(0 0 0 / 14%), 0 1px 5px 0 rgb(0 0 0 / 12%)
   --pagination-current-item-shadow: 0 2px 4px -1px rgb(0 0 0 / 20%), 0 4px 5px 0 rgb(0 0 0 / 14%), 0 1px 10px 0 rgb(0 0 0 / 12%)
+  --bg-disable-grey-color: #f0f0f0
diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue
index 003a57f..c2f6114 100644
--- a/src/components/base/BaseSelect.vue
+++ b/src/components/base/BaseSelect.vue
@@ -1,9 +1,9 @@
 <template lang="pug">
-  .base-select(@click="open = !open", :class="{'open': open, 'border-none': borderNone}")
+  .base-select(@click="open = !open", :class="{'open': open && !disable, 'border-none': borderNone}")
     .placeholder.text-base(:class="{'value-color': value || placeholderOpacity}") {{ value || placeholder }}
     .flex.items-center
       .select-form-separator.cursor-pointer.mr-4(v-if="separator")
-      span.icon-down-arrow.open-icon(:class="{'open': open }")
+      span.icon-down-arrow.open-icon(:class="{'open': open && !disable }")
     base-menu(v-if="open")
       .items-container(@click="open = false", v-click-outside="leaveSelect")
         .item(v-for="item in items", :key="item.id" @click="clickItem(item.label)") {{ item.label }}
@@ -24,6 +24,7 @@ export default {
     borderNone: Boolean,
     separator: Boolean,
     placeholderOpacity: Boolean,
+    disable: Boolean,
   },
   emits: ["update:modelValue"],
   data() {
diff --git a/src/pages/clients/components/ClientDetailInfoSection.vue b/src/pages/clients/components/ClientDetailInfoSection.vue
index f7885e0..e2ea9d9 100644
--- a/src/pages/clients/components/ClientDetailInfoSection.vue
+++ b/src/pages/clients/components/ClientDetailInfoSection.vue
@@ -91,10 +91,7 @@
             .line.absolute
             .text-separation.span.text-sm.separator.px-2 или
           .flex.flex-col.gap-y-4(v-if="section === 'addresses' && isChange")
-            client-detail-section-address(
-              :dope-address="dopeAddress"
-              :cities="cities"
-            )
+            client-detail-section-address(:dope-address="dopeAddress")
           .flex(v-if="item.name && !isChange")
             span.text-sm.w-fit {{item.title}}
           .flex.items-center(v-if="item.title")
@@ -170,11 +167,6 @@ export default {
       isOpenAddingWrap: false,
       isChange: false,
       settings: detail,
-      cities: [
-        { id: 1, label: "Рязань" },
-        { id: 1, label: "Москва" },
-        { id: 1, label: "Луховицы" },
-      ],
       isData: true,
       isAddress: true,
       isAttachments: true,
diff --git a/src/pages/clients/components/ClientDetailSectionAddress.vue b/src/pages/clients/components/ClientDetailSectionAddress.vue
index a1eef23..8c195f6 100644
--- a/src/pages/clients/components/ClientDetailSectionAddress.vue
+++ b/src/pages/clients/components/ClientDetailSectionAddress.vue
@@ -2,27 +2,54 @@
   .flex.flex-col.gap-y-4
     .flex.flex-col(class="gap-y-1.5")
       .text-info.text-xxs.font-semibold Город
-      base-select(
+      base-select.cursor-grab(
+        disable,
         placeholder="Выберите город",
-        :items="cities",
-        v-model="dopeAddress.city"
+        v-model="dopeAddress.city",
+        :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
       )
     .flex.flex-col(class="gap-y-1.5")
       .text-info.text-xxs.font-semibold Область
-      base-input.input-info(placeholder="Введите область", v-model:value="dopeAddress.region")
+      base-input.input-info(
+        disabled,
+        placeholder="Введите область",
+        v-model:value="dopeAddress.region",
+        :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
+      )
     .flex.flex-col(class="gap-y-1.5")
       .text-info.text-xxs.font-semibold Улица
-      base-input.input-info(placeholder="Введите улицу", v-model:value="dopeAddress.street")
+      base-input.input-info(
+        disabled,
+        placeholder="Введите улицу",
+        v-model:value="dopeAddress.street",
+        :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
+      )
     .flex.gap-x-4
       .flex.flex-col(class="gap-y-1.5")
         .text-info.text-xxs.font-semibold Дом
-        base-input.input-info(placeholder="Дом", v-model:value="dopeAddress.house")
+        base-input.input-info(
+          disabled,
+          placeholder="Дом",
+          v-model:value="dopeAddress.house",
+          :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
+        )
       .flex.flex-col(class="gap-y-1.5")
         .text-info.text-xxs.font-semibold Квартира
-        base-input.input-info(placeholder="Квартира", v-model:value="dopeAddress.flat")
+        base-input.input-info(
+          disabled,
+          placeholder="Квартира",
+          v-model:value="dopeAddress.flat",
+          :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
+        )
     .flex.flex-col(class="gap-y-1.5")
       .text-info.text-xxs.font-semibold Индекс
-      base-input.input-info(v-mask="'######'", placeholder="000000", v-model:value="dopeAddress.index")
+      base-input.input-info(
+        disabled,
+        v-mask="'######'",
+        placeholder="000000",
+        v-model:value="dopeAddress.index",
+        :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
+      )
 </template>
 
 <script>
@@ -37,7 +64,6 @@ export default {
   },
   props: {
     dopeAddress: Object,
-    cities: Array,
   },
   directives: { mask },
 };
diff --git a/src/pages/clients/components/FormCreateAddresses.vue b/src/pages/clients/components/FormCreateAddresses.vue
index f45d9d8..f30bb5f 100644
--- a/src/pages/clients/components/FormCreateAddresses.vue
+++ b/src/pages/clients/components/FormCreateAddresses.vue
@@ -14,39 +14,53 @@
         .flex.flex-col(class="gap-y-1.5")
           .text-info.text-xxs.font-semibold Город
           base-input.input-info(
+            disabled,
             placeholder="Выберите город",
-            v-model:value="addresses.city"
+            v-model:value="addresses.city",
+            :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
           )
         .flex.flex-col(class="gap-y-1.5")
           span.text-sm.font-semibold Область
           base-input.input-info(
+            disabled,
             placeholder="Введите область",
-            v-model:value="addresses.region"
+            v-model:value="addresses.region",
+
+            :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
           )
         .flex.flex-col(class="gap-y-1.5")
           span.text-sm.font-semibold Улица
           base-input.input-info(
+            disabled,
             placeholder="Введите улицу",
-            v-model:value="addresses.street"
+            v-model:value="addresses.street",
+
+            :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
           )
         .flex.flex-col(class="gap-y-1.5")
           span.text-sm.font-semibold Дом
           base-input.input-info(
+            disabled,
             placeholder="Номер дома",
-            v-model:value="addresses.house_number"
+            v-model:value="addresses.house_number",
+            :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
           )
         .flex.flex-col(class="gap-y-1.5")
           span.text-sm.font-semibold Квартира
           base-input.input-info(
+            disabled,
             placeholder="Номер квартиры",
-            v-model:value="addresses.apartment_number"
+            v-model:value="addresses.apartment_number",
+            :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
           )
         .flex.flex-col(class="gap-y-1.5")
           span.text-sm.font-semibold Индекс
           base-input.input-info(
+            disabled,
             placeholder="000000",
             v-mask="'######'",
-            v-model:value="addresses.zip_code"
+            v-model:value="addresses.zip_code",
+            :style="{backgroundColor: 'var(--bg-disable-grey-color)'}"
           )
     .px-4
       base-button(@click="saveClient" :size="40")

From 463a54b7e32dd73c32b952e38be36cca1c55717e Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Wed, 7 Dec 2022 13:50:27 +0300
Subject: [PATCH 2/2] =?UTF-8?q?[WIP]=20=D0=A4=D0=B8=D0=BA=D1=81=20=D1=83?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=82=D0=BE=D0=BA?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TheHeader.vue                  | 2 +-
 src/pages/calendar/TheCalendar.vue            | 4 ++--
 src/pages/clients/components/ClientsTable.vue | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue
index a00c6d5..93036aa 100644
--- a/src/components/TheHeader.vue
+++ b/src/components/TheHeader.vue
@@ -55,7 +55,7 @@ export default {
   },
   methods: {
     logout() {
-      localStorage.clear();
+      localStorage.removeItem("tokenAccess");
       this.$router.push("/login");
     },
   },
diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index 97ecbbd..fedb14d 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -107,8 +107,8 @@ export default {
     fetchEmployeesData() {
       fetchWrapper.get("general/employee/").then((res) => {
         if (res.type === "client_error") {
-          localStorage.clear();
-          this.$router.push("/login");
+          localStorage.removeItem("tokenAccess");
+          return this.$router.push("/login");
         } else this.saveEmployeesData(res);
       });
     },
diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index 98ca470..909d3b8 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -139,8 +139,8 @@ export default {
           }`
         );
         if (response.type === "client_error") {
-          localStorage.clear();
-          this.$router.push("/login");
+          localStorage.removeItem("tokenAccess");
+          return this.$router.push("/login");
         } else {
           this.saveDataClients(response);
           this.saveClientsCount(response);