diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue index 93bcfd0..ea648d1 100644 --- a/src/pages/calendar/components/CalendarColumn.vue +++ b/src/pages/calendar/components/CalendarColumn.vue @@ -2,7 +2,7 @@ .calendar-column-wrapper.flex.flex-col .header.flex.items-center.justify-between.py-2.px-6.top-0 .flex.items-center - base-avatar.mr-2(:size="32" :color="ownerData.color") + base-avatar.mr-2(:size="32", :color="ownerData.color") img(:src="ownerData.avatar" alt="Team member" v-if="ownerData.avatar") span(v-if="!ownerData.avatar") {{ defaultAvatar }} span.owner-name.font-medium.text-base.mr-6 {{ ownerName }} diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue index 4388c02..a496d22 100644 --- a/src/pages/calendar/components/CalendarSchedule.vue +++ b/src/pages/calendar/components/CalendarSchedule.vue @@ -150,6 +150,7 @@ export default { last_name: elem.last_name, first_name: elem.first_name, patronymic: elem.patronymic, + color: elem.color, }); }); return filteredArray; diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue index e776436..7a29e47 100644 --- a/src/pages/clients/components/ClientsTableRow.vue +++ b/src/pages/clients/components/ClientsTableRow.vue @@ -89,6 +89,7 @@ export default { }, contacts: [...this.client.contacts], avatar: `${this.client.last_name[0]}${this.client.first_name[0]}`, + color: this.client.color, }; }, methods: { diff --git a/src/pages/clients/components/cells/TableCellBodyName.vue b/src/pages/clients/components/cells/TableCellBodyName.vue index 5814af6..3e6193e 100644 --- a/src/pages/clients/components/cells/TableCellBodyName.vue +++ b/src/pages/clients/components/cells/TableCellBodyName.vue @@ -1,6 +1,6 @@