From ac8b6a04c27ae0bde92055a12cf894d714722ba0 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Wed, 26 Oct 2022 11:32:18 +0300
Subject: [PATCH 1/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D1=81=D0=BE=D1=82?=
 =?UTF-8?q?=D1=80=D1=83=D0=B4=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/calendar/TheCalendar.vue            | 40 ++++--------------
 .../calendar/components/CalendarSidebar.vue   | 42 ++++++++++++-------
 2 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index 80b3176..40ff09a 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
   .calendar-container.flex
-    calendar-sidebar(@width="changeWidth" :team="team")
+    calendar-sidebar(@width="changeWidth" :team-data="teamData")
     calendar-schedule(
       :current-date="currentDate"
       :time-information="timeInformation"
@@ -16,7 +16,6 @@
 import * as moment from "moment/moment";
 import CalendarSchedule from "./components/CalendarSchedule.vue";
 import CalendarSidebar from "./components/CalendarSidebar.vue";
-import img from "../../assets/images/team-member.svg";
 export default {
   name: "TheCalendar",
   components: { CalendarSchedule, CalendarSidebar },
@@ -30,36 +29,7 @@ export default {
         dayEndTime: "18:00",
       },
       eventsData: [],
-      team: [
-        {
-          id: 1,
-          last_name: "Гагарин",
-          first_name: "Юрий",
-          patronymic: "Алексеевич",
-          avatar: img,
-        },
-        {
-          id: 2,
-          last_name: "Константинопольская",
-          first_name: "Юлия",
-          patronymic: "Витальевна",
-          avatar: img,
-        },
-        {
-          id: 3,
-          last_name: "Коломойцев",
-          first_name: "Игорь",
-          patronymic: "Константинович",
-          avatar: img,
-        },
-        {
-          id: 4,
-          last_name: "Зайцев",
-          first_name: "Валерий",
-          patronymic: "Сергеевич",
-          avatar: img,
-        },
-      ],
+      teamData: [],
     };
   },
   methods: {
@@ -75,10 +45,16 @@ export default {
     saveEventsData(res) {
       this.eventsData = res.results;
     },
+    saveTeamData(res) {
+      this.teamData = res.results;
+    },
     fetchEventsData() {
       fetch("/registry/event/")
         .then((res) => res.json())
         .then((res) => this.saveEventsData(res));
+      fetch("http://45.84.227.122:8080/general/employee/")
+        .then((res) => res.json())
+        .then((res) => this.saveTeamData(res));
     },
     changeWidth(value) {
       this.sidebarWidth = value;
diff --git a/src/pages/calendar/components/CalendarSidebar.vue b/src/pages/calendar/components/CalendarSidebar.vue
index 6a70318..8b53443 100644
--- a/src/pages/calendar/components/CalendarSidebar.vue
+++ b/src/pages/calendar/components/CalendarSidebar.vue
@@ -4,7 +4,12 @@
       .sidebar-content.items-center.flex.flex-col.gap-y-8.px-4.py-19px
         base-button-plus(:size="40" v-if="!isOpen")
         .create-event.flex.items-center.justify-center(v-else)
-          base-create-button.pl-15px.pb-2.pr-3.pt-2.items-center.h-10(text-styled="createEvent" :icon-size="10" text="Создать событие" :with-icon="true" icon-position="right")
+          base-create-button.pl-15px.pb-2.pr-3.pt-2.items-center.h-10(
+            text-styled="createEvent"
+            :icon-size="10"
+            text="Создать событие"
+            :with-icon="true"
+            icon-position="right")
         .flex.flex-col.items-center(v-if="!isOpen")
           base-button-plus(:class="buttonStyled" :size="24" :icon-size="10")
           .flex.flex-col.gap-y-2.items-center.mt-4
@@ -16,22 +21,26 @@
             base-button-plus(:class="buttonStyled" :size="24" :icon-size="10")
           .flex.flex-col.gap-y-2
             .relative.flex.items-center.gap-x-3.h-8(v-for="event in events")
-              input.custom-input.py-2.pl-6.h-full.not-italic.font-medium.text-xxs(:placeholder="event.name" :key="event.id")
+              input.custom-input.py-2.pl-6.h-full.not-italic.font-medium.text-xxs(
+                :placeholder="event.name"
+                :key="event.id")
               .event-type(:style="{ background: event.color }")
               span.icon-edit.cursor-pointer
         .flex.flex-col.items-center.gap-y-2.justify-center(v-if="!isOpen")
           base-button-plus.mb-2(:class="buttonStyled" :size="24" :icon-size="10")
-          .team-card(v-for="teammate in team" :key="teammate.id")
-            img.avatar-wrapper(:src="teammate.avatar" alt="Team member")
+          .team-card(v-for="teammate in teamData" :key="teammate.id")
+            img.avatar-wrapper(:src="avatar" alt="Team member")
         .flex.flex-col.gap-y-4(v-else)
           .events-wrapper.flex.items-center.justify-between
             .flex {{ "Команды" }}
             base-button-plus(:class="buttonStyled" :size="24" :icon-size="10")
           .box-team.flex.flex-col.gap-y-2
-            .team-card.flex.items-center.justify-between.cursor-pointer(v-for="teammate in team" :key="teammate.id")
+            .team-card.flex.items-center.justify-between.cursor-pointer(
+              v-for="teammate in teamData"
+              :key="teammate.id")
               .flex.items-center
-                img.avatar-wrapper(:src="teammate.avatar" alt="Team member")
-                .flex.ml-2.not-italic.font-medium.text-xxs {{ changeLastName(teammate.last_name) + changeInitials(teammate.first_name, teammate.patronymic) }}
+                img.avatar-wrapper(:src="avatar" alt="Team member")
+                .flex.ml-2.not-italic.font-medium.text-xxs {{ changeName(teammate.last_name, teammate.first_name, teammate.patronymic) }}
               span.icon-change-place.cursor-pointer.w-5
         base-open-button.mt-148px(@click="changeSize" :style="{ transform: `rotate(${turnButton})` }")
 </template>
@@ -40,6 +49,8 @@
 import BaseButtonPlus from "../../../components/base/buttons/BaseButtonPlus.vue";
 import BaseOpenButton from "../../../components/base/buttons/BaseOpenButton.vue";
 import BaseCreateButton from "../../../components/base/buttons/BaseCreateButton.vue";
+import img from "../../../assets/images/team-member.svg";
+
 export default {
   name: "CalendarSidebar",
   components: {
@@ -48,7 +59,7 @@ export default {
     BaseCreateButton,
   },
   props: {
-    team: Array,
+    teamData: Array,
   },
   data() {
     return {
@@ -63,6 +74,7 @@ export default {
       isOpen: false,
       turnButton: "180deg",
       maxLengthLastName: 13,
+      avatar: img,
     };
   },
   computed: {
@@ -96,13 +108,15 @@ export default {
       );
       this.turnButton = this.isOpen ? "0deg" : "180deg";
     },
-    changeLastName(lastName) {
+    changeName(lastName, fitstName, patronymic) {
       return lastName.length > this.maxLengthLastName
-        ? lastName.substr(0, this.maxLengthLastName) + "... "
-        : lastName + " ";
-    },
-    changeInitials(firstName, patronymic) {
-      return firstName.substr(0, 1) + "." + patronymic.substr(0, 1) + ".";
+        ? lastName.slice(0, this.maxLengthLastName) + "... "
+        : lastName +
+            " " +
+            fitstName.slice(0, 1) +
+            "." +
+            patronymic.slice(0, 1) +
+            ".";
     },
   },
 };

From 8649690256b919cbf7328bd2505988d898619550 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Wed, 26 Oct 2022 11:38:50 +0300
Subject: [PATCH 2/3] =?UTF-8?q?Revert=20"=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE=D0=BA=20=D1=81?=
 =?UTF-8?q?=D0=BE=D1=82=D1=80=D1=83=D0=B4=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ac8b6a04c27ae0bde92055a12cf894d714722ba0.
---
 src/pages/calendar/TheCalendar.vue            | 40 ++++++++++++++----
 .../calendar/components/CalendarSidebar.vue   | 42 +++++++------------
 2 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index 40ff09a..80b3176 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
   .calendar-container.flex
-    calendar-sidebar(@width="changeWidth" :team-data="teamData")
+    calendar-sidebar(@width="changeWidth" :team="team")
     calendar-schedule(
       :current-date="currentDate"
       :time-information="timeInformation"
@@ -16,6 +16,7 @@
 import * as moment from "moment/moment";
 import CalendarSchedule from "./components/CalendarSchedule.vue";
 import CalendarSidebar from "./components/CalendarSidebar.vue";
+import img from "../../assets/images/team-member.svg";
 export default {
   name: "TheCalendar",
   components: { CalendarSchedule, CalendarSidebar },
@@ -29,7 +30,36 @@ export default {
         dayEndTime: "18:00",
       },
       eventsData: [],
-      teamData: [],
+      team: [
+        {
+          id: 1,
+          last_name: "Гагарин",
+          first_name: "Юрий",
+          patronymic: "Алексеевич",
+          avatar: img,
+        },
+        {
+          id: 2,
+          last_name: "Константинопольская",
+          first_name: "Юлия",
+          patronymic: "Витальевна",
+          avatar: img,
+        },
+        {
+          id: 3,
+          last_name: "Коломойцев",
+          first_name: "Игорь",
+          patronymic: "Константинович",
+          avatar: img,
+        },
+        {
+          id: 4,
+          last_name: "Зайцев",
+          first_name: "Валерий",
+          patronymic: "Сергеевич",
+          avatar: img,
+        },
+      ],
     };
   },
   methods: {
@@ -45,16 +75,10 @@ export default {
     saveEventsData(res) {
       this.eventsData = res.results;
     },
-    saveTeamData(res) {
-      this.teamData = res.results;
-    },
     fetchEventsData() {
       fetch("/registry/event/")
         .then((res) => res.json())
         .then((res) => this.saveEventsData(res));
-      fetch("http://45.84.227.122:8080/general/employee/")
-        .then((res) => res.json())
-        .then((res) => this.saveTeamData(res));
     },
     changeWidth(value) {
       this.sidebarWidth = value;
diff --git a/src/pages/calendar/components/CalendarSidebar.vue b/src/pages/calendar/components/CalendarSidebar.vue
index 8b53443..6a70318 100644
--- a/src/pages/calendar/components/CalendarSidebar.vue
+++ b/src/pages/calendar/components/CalendarSidebar.vue
@@ -4,12 +4,7 @@
       .sidebar-content.items-center.flex.flex-col.gap-y-8.px-4.py-19px
         base-button-plus(:size="40" v-if="!isOpen")
         .create-event.flex.items-center.justify-center(v-else)
-          base-create-button.pl-15px.pb-2.pr-3.pt-2.items-center.h-10(
-            text-styled="createEvent"
-            :icon-size="10"
-            text="Создать событие"
-            :with-icon="true"
-            icon-position="right")
+          base-create-button.pl-15px.pb-2.pr-3.pt-2.items-center.h-10(text-styled="createEvent" :icon-size="10" text="Создать событие" :with-icon="true" icon-position="right")
         .flex.flex-col.items-center(v-if="!isOpen")
           base-button-plus(:class="buttonStyled" :size="24" :icon-size="10")
           .flex.flex-col.gap-y-2.items-center.mt-4
@@ -21,26 +16,22 @@
             base-button-plus(:class="buttonStyled" :size="24" :icon-size="10")
           .flex.flex-col.gap-y-2
             .relative.flex.items-center.gap-x-3.h-8(v-for="event in events")
-              input.custom-input.py-2.pl-6.h-full.not-italic.font-medium.text-xxs(
-                :placeholder="event.name"
-                :key="event.id")
+              input.custom-input.py-2.pl-6.h-full.not-italic.font-medium.text-xxs(:placeholder="event.name" :key="event.id")
               .event-type(:style="{ background: event.color }")
               span.icon-edit.cursor-pointer
         .flex.flex-col.items-center.gap-y-2.justify-center(v-if="!isOpen")
           base-button-plus.mb-2(:class="buttonStyled" :size="24" :icon-size="10")
-          .team-card(v-for="teammate in teamData" :key="teammate.id")
-            img.avatar-wrapper(:src="avatar" alt="Team member")
+          .team-card(v-for="teammate in team" :key="teammate.id")
+            img.avatar-wrapper(:src="teammate.avatar" alt="Team member")
         .flex.flex-col.gap-y-4(v-else)
           .events-wrapper.flex.items-center.justify-between
             .flex {{ "Команды" }}
             base-button-plus(:class="buttonStyled" :size="24" :icon-size="10")
           .box-team.flex.flex-col.gap-y-2
-            .team-card.flex.items-center.justify-between.cursor-pointer(
-              v-for="teammate in teamData"
-              :key="teammate.id")
+            .team-card.flex.items-center.justify-between.cursor-pointer(v-for="teammate in team" :key="teammate.id")
               .flex.items-center
-                img.avatar-wrapper(:src="avatar" alt="Team member")
-                .flex.ml-2.not-italic.font-medium.text-xxs {{ changeName(teammate.last_name, teammate.first_name, teammate.patronymic) }}
+                img.avatar-wrapper(:src="teammate.avatar" alt="Team member")
+                .flex.ml-2.not-italic.font-medium.text-xxs {{ changeLastName(teammate.last_name) + changeInitials(teammate.first_name, teammate.patronymic) }}
               span.icon-change-place.cursor-pointer.w-5
         base-open-button.mt-148px(@click="changeSize" :style="{ transform: `rotate(${turnButton})` }")
 </template>
@@ -49,8 +40,6 @@
 import BaseButtonPlus from "../../../components/base/buttons/BaseButtonPlus.vue";
 import BaseOpenButton from "../../../components/base/buttons/BaseOpenButton.vue";
 import BaseCreateButton from "../../../components/base/buttons/BaseCreateButton.vue";
-import img from "../../../assets/images/team-member.svg";
-
 export default {
   name: "CalendarSidebar",
   components: {
@@ -59,7 +48,7 @@ export default {
     BaseCreateButton,
   },
   props: {
-    teamData: Array,
+    team: Array,
   },
   data() {
     return {
@@ -74,7 +63,6 @@ export default {
       isOpen: false,
       turnButton: "180deg",
       maxLengthLastName: 13,
-      avatar: img,
     };
   },
   computed: {
@@ -108,15 +96,13 @@ export default {
       );
       this.turnButton = this.isOpen ? "0deg" : "180deg";
     },
-    changeName(lastName, fitstName, patronymic) {
+    changeLastName(lastName) {
       return lastName.length > this.maxLengthLastName
-        ? lastName.slice(0, this.maxLengthLastName) + "... "
-        : lastName +
-            " " +
-            fitstName.slice(0, 1) +
-            "." +
-            patronymic.slice(0, 1) +
-            ".";
+        ? lastName.substr(0, this.maxLengthLastName) + "... "
+        : lastName + " ";
+    },
+    changeInitials(firstName, patronymic) {
+      return firstName.substr(0, 1) + "." + patronymic.substr(0, 1) + ".";
     },
   },
 };

From 7ac16298e0068109bbb69cbc359f22d1427ba25e Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Wed, 26 Oct 2022 15:19:59 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BA=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=BF=D0=BA=D0=B8=20=D1=81=D0=B0=D0=B9=D0=B4=D0=B1=D0=B0?=
 =?UTF-8?q?=D1=80=D0=B0,=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B2?=
 =?UTF-8?q?=20=D1=85=D0=B5=D0=B4=D0=B5=D1=80=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HeaderActiveClientPanel.vue    |  8 ++--
 src/components/TheHeader.vue                  |  2 +-
 .../calendar/components/CalendarSidebar.vue   | 37 +++++++++++--------
 tailwind.config.js                            |  1 +
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/components/HeaderActiveClientPanel.vue b/src/components/HeaderActiveClientPanel.vue
index cab3cdb..bb780ee 100644
--- a/src/components/HeaderActiveClientPanel.vue
+++ b/src/components/HeaderActiveClientPanel.vue
@@ -4,15 +4,15 @@
       img.img-wrapper.mr-2(:src="info.avatarSrc" alt="Charge person avatar")
       span.font-bold.text-sm.mr-6px {{ info.name }}
       .dot.mr-4
-      .icon-wrapper.icon-down-arrow.flex.items-center.justify-center.text-xxs(@click="changeState")
+      .icon-wrapper.icon-down-arrow.flex.items-center.justify-center.text-xxs.cursor-pointer(@click="changeState")
     .options.flex.flex-col.p-4.mt-1.font-medium.text-sm.gap-y-3(v-if="isOpen")
-      .flex.items-center
+      .flex.items-center.cursor-pointer
         .options-icon-wrapper.icon-star-off.flex.items-center.justify-center.text-base.mr-2
         span Снять с ведения
-      .flex.items-center
+      .flex.items-center.cursor-pointer
         .options-icon-wrapper.icon-table.flex.items-center.justify-center.text-lg.mr-2.pb-px
         span Перейти в таблицу
-      .flex.items-center
+      .flex.items-center.cursor-pointer
         .options-icon-wrapper.flex.items-center.justify-center.icon-user-data.text-base.mr-2
         span Данные 
 </template>
diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue
index 52349a4..2a9223f 100644
--- a/src/components/TheHeader.vue
+++ b/src/components/TheHeader.vue
@@ -48,7 +48,7 @@ export default {
   height: 56px
   background-color: var(--default-white)
   position: relative
-  z-index: 2
+  z-index: 11
 
 .logo-img
   height: 32px
diff --git a/src/pages/calendar/components/CalendarSidebar.vue b/src/pages/calendar/components/CalendarSidebar.vue
index 8b53443..6eafc82 100644
--- a/src/pages/calendar/components/CalendarSidebar.vue
+++ b/src/pages/calendar/components/CalendarSidebar.vue
@@ -1,21 +1,26 @@
 <template lang="pug">
   .sidebar.flex.flex-col.bg-white(:class="openSidebar")
-    .sidebar-wrapper.h-full.my-13px(:style="sidebarWidth")
-      .sidebar-content.items-center.flex.flex-col.gap-y-8.px-4.py-19px
-        base-button-plus(:size="40" v-if="!isOpen")
-        .create-event.flex.items-center.justify-center(v-else)
+    .sidebar-wrapper.h-full.my-13px.flex.flex-col.justify-between(:style="sidebarWidth")
+      .sidebar-content.items-center.flex.flex-col.gap-y-8.px-4.py-19px(v-if="!isOpen")
+        base-button-plus(:size="40")
+        .flex.flex-col.items-center(v-if="!isOpen")
+          base-button-plus(:class="buttonStyled" :size="24" :icon-size="10")
+          .flex.flex-col.gap-y-2.items-center.mt-4
+            .event.flex.items-center.justify-center(v-for="event in events" :key="event.id")
+              .event-type(:style="{ background: event.color }")
+        .flex.flex-col.items-center.gap-y-2.justify-center
+          base-button-plus.mb-2(:class="buttonStyled" :size="24" :icon-size="10")
+          .team-card(v-for="teammate in teamData" :key="teammate.id")
+            img.avatar-wrapper(:src="avatar" alt="Team member")
+      .sidebar-content.items-center.flex.flex-col.gap-y-8.px-4.py-19px(v-else)
+        .create-event.flex.items-center.justify-center
           base-create-button.pl-15px.pb-2.pr-3.pt-2.items-center.h-10(
             text-styled="createEvent"
             :icon-size="10"
             text="Создать событие"
             :with-icon="true"
             icon-position="right")
-        .flex.flex-col.items-center(v-if="!isOpen")
-          base-button-plus(:class="buttonStyled" :size="24" :icon-size="10")
-          .flex.flex-col.gap-y-2.items-center.mt-4
-            .event.flex.items-center.justify-center(v-for="event in events" :key="event.id")
-              .event-type(:style="{ background: event.color }")
-        .flex.items-center.flex-col.gap-y-4(v-else)
+        .flex.items-center.flex-col.gap-y-4
           .events-wrapper.flex.items-center.justify-between
             .flex {{ "Виды событий" }}
             base-button-plus(:class="buttonStyled" :size="24" :icon-size="10")
@@ -26,11 +31,7 @@
                 :key="event.id")
               .event-type(:style="{ background: event.color }")
               span.icon-edit.cursor-pointer
-        .flex.flex-col.items-center.gap-y-2.justify-center(v-if="!isOpen")
-          base-button-plus.mb-2(:class="buttonStyled" :size="24" :icon-size="10")
-          .team-card(v-for="teammate in teamData" :key="teammate.id")
-            img.avatar-wrapper(:src="avatar" alt="Team member")
-        .flex.flex-col.gap-y-4(v-else)
+        .flex.flex-col.gap-y-4
           .events-wrapper.flex.items-center.justify-between
             .flex {{ "Команды" }}
             base-button-plus(:class="buttonStyled" :size="24" :icon-size="10")
@@ -42,7 +43,8 @@
                 img.avatar-wrapper(:src="avatar" alt="Team member")
                 .flex.ml-2.not-italic.font-medium.text-xxs {{ changeName(teammate.last_name, teammate.first_name, teammate.patronymic) }}
               span.icon-change-place.cursor-pointer.w-5
-        base-open-button.mt-148px(@click="changeSize" :style="{ transform: `rotate(${turnButton})` }")
+      .button-wrapper.flex.justify-center.mb-23px
+        base-open-button(@click="changeSize" :style="{ transform: `rotate(${turnButton})`}")
 </template>
 
 <script>
@@ -166,6 +168,9 @@ export default {
     height: 16px
     top: 8px
     left: 8px
+  .button-wrapper
+    justify-content: end
+    padding-right: 16px
 
 .create-event
   width: 200px
diff --git a/tailwind.config.js b/tailwind.config.js
index b100f17..f245408 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -31,6 +31,7 @@ module.exports = {
         "13px": "13px",
         "15px": "15px",
         "19px": "19px",
+        "23px": "23px",
         "45px": "45px",
         "74px": "74px",
         "148px": "148px",