From e24f301e44683084c92ae2addb8a299428bb7a9e Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Thu, 1 Dec 2022 12:34:30 +0300
Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B0=D0=B2=D0=B0=D1=82=D0=B0=D1=80=D1=8B=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=83=20?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=BB=D0=B5=D0=BD=D0=B4=D0=B0=D1=80=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LoggedInLayout.vue                 |  4 +++-
 src/pages/calendar/TheCalendar.vue                |  9 +++++++--
 src/pages/calendar/components/CalendarColumn.vue  |  5 +++--
 .../calendar/components/CalendarSchedule.vue      |  3 +++
 src/pages/calendar/components/CalendarSidebar.vue |  3 ++-
 .../components/CalendarSidebarTeammate.vue        | 15 ++++++++-------
 src/pages/clients/TheClients.vue                  |  4 +++-
 src/pages/clients/components/ClientsTable.vue     |  2 ++
 src/pages/clients/components/ClientsTableRow.vue  |  4 +++-
 src/pages/clients/components/ClientsWrapper.vue   |  4 +++-
 .../components/cells/TableCellBodyName.vue        |  7 +------
 11 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/components/LoggedInLayout.vue b/src/components/LoggedInLayout.vue
index 172f217..90cafa2 100644
--- a/src/components/LoggedInLayout.vue
+++ b/src/components/LoggedInLayout.vue
@@ -12,7 +12,8 @@
         :open-form="openForm",
         :is-open-form="isOpenForm",
         :updated-clients="updatedClients",
-        @reset-updated-clients="resetUpdatedClients"
+        @reset-updated-clients="resetUpdatedClients",
+        :url="url"
       )
     the-notification-provider
 </template>
@@ -29,6 +30,7 @@ export default {
     return {
       isOpenForm: false,
       updatedClients: false,
+      url: "http://45.84.227.122:8080",
     };
   },
   methods: {
diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index e8a4d0b..d06bca1 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -1,12 +1,14 @@
 <template lang="pug">
   .calendar-container.flex
     calendar-sidebar(
-      @width="changeWidth",
+      :url="url",
       :team-data="employeesData",
       :open-form-create="openFormCreateEvent",
-      :event-types="eventTypes"
+      :event-types="eventTypes",
+      @width="changeWidth",
     )
     calendar-schedule(
+      :url="url",
       :owners-data="employeesData",
       :current-date="currentDate",
       :time-information="timeInformation",
@@ -60,6 +62,9 @@ export default {
     BaseModal,
     CalendarDeleteModal,
   },
+  props: {
+    url: String,
+  },
   data() {
     return {
       sidebarWidth: "72px",
diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue
index a1795a1..c57477f 100644
--- a/src/pages/calendar/components/CalendarColumn.vue
+++ b/src/pages/calendar/components/CalendarColumn.vue
@@ -3,8 +3,8 @@
     .header.flex.items-center.justify-between.py-2.px-6.top-0
       .flex.items-center
         base-avatar.mr-2(:size="32", :color="ownerData.color")
-          img(
-            :src="ownerData.avatar",
+          img.h-full(
+            :src="url + ownerData.avatar",
             alt="Team member",
             v-if="ownerData.avatar"
           )
@@ -47,6 +47,7 @@ export default {
     eventTypes: Array,
     changeFormWasClosed: Boolean,
     scheduleBodyRef: Node,
+    url: String,
   },
   data() {
     return {
diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue
index 53bcb68..0eda7f9 100644
--- a/src/pages/calendar/components/CalendarSchedule.vue
+++ b/src/pages/calendar/components/CalendarSchedule.vue
@@ -20,6 +20,7 @@
           v-for="(owner, index) in filteredOwners",
           :key="owner.id",
           :owner-data="owner",
+          :url="url",
           :day-events="filterEventsByOwner(owner)",
           :day-start-time="validateStartTime",
           :day-end-time="validateEndTime",
@@ -69,6 +70,7 @@ export default {
     CalendarColumn,
   },
   props: {
+    url: String,
     changeFormWasClosed: Boolean,
     currentDate: {
       type: Object,
@@ -170,6 +172,7 @@ export default {
           first_name: elem.first_name,
           patronymic: elem.patronymic,
           color: elem.color,
+          avatar: elem.photo,
         });
       });
       return filteredArray;
diff --git a/src/pages/calendar/components/CalendarSidebar.vue b/src/pages/calendar/components/CalendarSidebar.vue
index 416bfac..e50e0e5 100644
--- a/src/pages/calendar/components/CalendarSidebar.vue
+++ b/src/pages/calendar/components/CalendarSidebar.vue
@@ -20,7 +20,7 @@
           v-else
         ) Создать событие
         calendar-sidebar-event(:is-open="isOpen", :event-type="eventTypes")
-        calendar-sidebar-teammate(:team-data="teamData", :is-open="isOpen")
+        calendar-sidebar-teammate(:team-data="teamData", :is-open="isOpen", :url="url")
     //-    .button-wrapper.flex.justify-center.mb-23px
           base-button(
             left-icon="icon-long-arrow",
@@ -48,6 +48,7 @@ export default {
     teamData: Array,
     openFormCreate: Function,
     eventTypes: Array,
+    url: String,
   },
   data() {
     return {
diff --git a/src/pages/calendar/components/CalendarSidebarTeammate.vue b/src/pages/calendar/components/CalendarSidebarTeammate.vue
index 4b9a9df..29c6e75 100644
--- a/src/pages/calendar/components/CalendarSidebarTeammate.vue
+++ b/src/pages/calendar/components/CalendarSidebarTeammate.vue
@@ -3,21 +3,21 @@
     base-button.mb-2(left-icon="icon-plus", rounded, :size="24", :icon-left-size="10", secondary)
     .team-card(v-for="teammate in teamData" :key="teammate.id")
       base-avatar(:size="32", :color="teammate.color")
-        img(:src="teammate.avatar" alt="Team member" v-if="teammate.avatar")
-        span(v-if="!teammate.avatar") {{`${teammate.last_name[0]}${teammate.first_name[0]}`}}
+        img.h-full(:src="url + teammate.photo", alt="Team member", v-if="teammate.photo")
+        span(v-if="!teammate.photo") {{`${teammate.last_name[0]}${teammate.first_name[0]}`}}
   .flex.flex-col.gap-y-4.w-full(v-else, :style="{ color: 'var(--font-dark-blue-color)' }")
     .flex.items-center.justify-between
       .flex.text-base.font-bold Команды
       base-button(left-icon="icon-plus", rounded, :size="24", :icon-left-size="10", secondary)
     .box-team.flex.flex-col.gap-y-2
       .team-card.flex.items-center.justify-between.cursor-pointer(
-        v-for="teammate in teamData"
+        v-for="teammate in teamData",
         :key="teammate.id"
-        )
+      )
         .flex.items-center
-          base-avatar(:size="32" :color="teammate.color")
-            img(:src="teammate.avatar" alt="Team member" v-if="teammate.avatar")
-            span(v-if="!teammate.avatar") {{`${teammate.last_name[0]}${teammate.first_name[0]}`}}
+          base-avatar(:size="32", :color="teammate.color")
+            img.h-full(:src="url + teammate.photo", alt="Team member", v-if="teammate.photo")
+            span(v-if="!teammate.photo") {{`${teammate.last_name[0]}${teammate.first_name[0]}`}}
           .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.flex.items-center.justify-center.w-6.h-6
 </template>
@@ -30,6 +30,7 @@ export default {
   props: {
     teamData: Array,
     isOpen: Boolean,
+    url: String,
   },
   components: {
     BaseButton,
diff --git a/src/pages/clients/TheClients.vue b/src/pages/clients/TheClients.vue
index b3487ae..273ad2a 100644
--- a/src/pages/clients/TheClients.vue
+++ b/src/pages/clients/TheClients.vue
@@ -3,7 +3,8 @@
     :open-form="openForm",
     :is-open-form="isOpenForm",
     :updated-clients="updatedClients",
-    @reset-updated-clients="transmitReset"
+    @reset-updated-clients="transmitReset",
+    :url="url"
   )
 </template>
 
@@ -16,6 +17,7 @@ export default {
     openForm: Function,
     isOpenForm: Boolean,
     updatedClients: Boolean,
+    url: String,
   },
   methods: {
     transmitReset() {
diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index d521202..4ccee00 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -12,6 +12,7 @@
           v-for="client in dataClients",
           :key="client.id",
           :id="client.id",
+          :url="url",
           :is-check="marked.includes(client.id)",
           :check="selectedCheck",
           :client="client",
@@ -64,6 +65,7 @@ export default {
     openForm: Function,
     isOpenForm: Boolean,
     updatedClients: Boolean,
+    url: String,
   },
 
   data() {
diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue
index cb7e906..4209fa0 100644
--- a/src/pages/clients/components/ClientsTableRow.vue
+++ b/src/pages/clients/components/ClientsTableRow.vue
@@ -26,7 +26,8 @@
           :value="dataClient",
           :avatar="dataClient.avatar",
           :avatar-color="dataClient.color",
-          :photo="dataClient.photo"
+          :photo="dataClient.photo",
+          :url="url",
           :is-open-change="isOpenChange",
           :width="columnBody.find(el => el.name === 'fullName').width"
         )
@@ -172,6 +173,7 @@ export default {
     isCheck: Boolean,
     client: Object,
     rowOverlay: Boolean,
+    url: String,
   },
   computed: {
     rowSize() {
diff --git a/src/pages/clients/components/ClientsWrapper.vue b/src/pages/clients/components/ClientsWrapper.vue
index 8ba02d7..b146d32 100644
--- a/src/pages/clients/components/ClientsWrapper.vue
+++ b/src/pages/clients/components/ClientsWrapper.vue
@@ -4,7 +4,8 @@
       :open-form="openForm",
       :is-open-form="isOpenForm",
       :updated-clients="updatedClients",
-      @reset-updated-clients="transmitReset"
+      @reset-updated-clients="transmitReset",
+      :url="url"
     )
 </template>
 
@@ -17,6 +18,7 @@ export default {
     openForm: Function,
     isOpenForm: Boolean,
     updatedClients: Boolean,
+    url: String,
   },
   methods: {
     transmitReset() {
diff --git a/src/pages/clients/components/cells/TableCellBodyName.vue b/src/pages/clients/components/cells/TableCellBodyName.vue
index 16658fb..83259a1 100644
--- a/src/pages/clients/components/cells/TableCellBodyName.vue
+++ b/src/pages/clients/components/cells/TableCellBodyName.vue
@@ -18,14 +18,9 @@ export default {
     avatar: String,
     photo: String,
     width: Number,
-    imgUrl: String,
     isOpenChange: Boolean,
     avatarColor: String,
-  },
-  data() {
-    return {
-      url: "http://45.84.227.122:8080",
-    };
+    url: String,
   },
 };
 </script>