From ec373a9d9b7aab21e848482a972f408a14e85c32 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Mon, 31 Oct 2022 19:31:17 +0300
Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82,=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=81=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{LoggedInLayout => }/LoggedInLayout.vue   |  0
 .../components/CalendarFormAddEvent.vue       | 16 ---------------
 .../calendar/components/CalendarSidebar.vue   | 20 ++++++-------------
 src/router.js                                 |  3 ++-
 4 files changed, 8 insertions(+), 31 deletions(-)
 rename src/components/{LoggedInLayout => }/LoggedInLayout.vue (100%)

diff --git a/src/components/LoggedInLayout/LoggedInLayout.vue b/src/components/LoggedInLayout.vue
similarity index 100%
rename from src/components/LoggedInLayout/LoggedInLayout.vue
rename to src/components/LoggedInLayout.vue
diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue
index e1f81b3..ea30433 100644
--- a/src/pages/calendar/components/CalendarFormAddEvent.vue
+++ b/src/pages/calendar/components/CalendarFormAddEvent.vue
@@ -24,21 +24,6 @@
         .icon-person.text-xl.icon
         .form-item.cursor-pointer.flex.gap-x-2.px-4.py-2.items-center
           input.item-input.cursor-text.no-italic.text-base(v-model="eventData.eventClient" type="text" placeholder="ФИО клиента")
-    //- .flex.flex-col.gap-y-2(class='additional-information')
-      //- .flex.gap-x-4.items-center
-      //-   span.not-italic.text-xs.opacity-40.leading-3 Дополнительная информация
-      //-   button-plus(id="addInfo" @click="(e)=>addFriendInfo(e)")
-      //-   base-button(
-            left-icon="icon-plus"
-            rounded secondary
-            :size="24"
-            :icon-left-size="10"
-            id="addInfo"
-            @click="(e)=>addFriendInfo(e)")
-      //- .flex.gap-x-4.items-center(v-for="(info, index) in listFriendInfo" :key="index")
-      //-   span.ml-1 {{info}}
-      //-   .form-item.cursor-pointer.flex.gap-x-2.px-4.py-2.items-center
-      //-     input.item-input.cursor-pointer.no-italic.text-base(v-model="eventData.friendInfo[info]" type="text" placeholder="Что-то важное")
     .flex.flex-col.gap-y-2
       span.not-italic.text-xs.opacity-40.leading-3 Вид события
       base-select(
@@ -91,7 +76,6 @@ export default {
           firstTime: "11:00",
           secondTime: "12:30",
         },
-        // friendInfo: {},
         kindEvent: "Вид события",
         contacts: {},
       },
diff --git a/src/pages/calendar/components/CalendarSidebar.vue b/src/pages/calendar/components/CalendarSidebar.vue
index 8194e4a..49b3e85 100644
--- a/src/pages/calendar/components/CalendarSidebar.vue
+++ b/src/pages/calendar/components/CalendarSidebar.vue
@@ -46,10 +46,6 @@
 </template>
 
 <script>
-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";
 import BaseButton from "@/components/base/BaseButton";
 import BaseAvatar from "@/components/base/BaseAvatar";
 
@@ -57,9 +53,6 @@ export default {
   name: "CalendarSidebar",
   components: {
     BaseButton,
-    BaseButtonPlus,
-    BaseOpenButton,
-    BaseCreateButton,
     BaseAvatar,
   },
   props: {
@@ -79,7 +72,6 @@ export default {
       isOpen: false,
       turnButton: "180deg",
       maxLengthLastName: 13,
-      avatar: img,
     };
   },
   computed: {
@@ -118,13 +110,13 @@ export default {
     },
     changeName(lastName, fitstName, patronymic) {
       return lastName.length > this.maxLengthLastName
-        ? lastName.slice(0, this.maxLengthLastName) + "... "
-        : lastName +
-            " " +
-            fitstName.slice(0, 1) +
+        ? lastName.slice(0, this.maxLengthLastName) +
+            "... " +
+            fitstName[0] +
             "." +
-            patronymic.slice(0, 1) +
-            ".";
+            patronymic[0] +
+            "."
+        : lastName + " " + fitstName[0] + "." + patronymic[0] + ".";
     },
   },
 };
diff --git a/src/router.js b/src/router.js
index d845592..2e67f00 100644
--- a/src/router.js
+++ b/src/router.js
@@ -3,7 +3,7 @@ import TheCalendar from "@/pages/calendar/TheCalendar";
 import TheUser from "@/pages/clients/TheClients";
 import TheSettings from "@/pages/settings/TheSettings";
 import TheLogin from "@/pages/login/TheLogin";
-import LoggedInLayout from "@/components/LoggedInLayout/LoggedInLayout";
+import LoggedInLayout from "@/components/LoggedInLayout";
 
 export default createRouter({
   history: createWebHashHistory(),
@@ -16,6 +16,7 @@ export default createRouter({
       path: "/",
       component: LoggedInLayout,
       children: [
+        { path: "", redirect: "calendar" },
         { path: "calendar", component: TheCalendar },
         { path: "clients", component: TheUser },
         { path: "settings", component: TheSettings },