admin/astra-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WIP] Добавил аватары на страницу календаря

Browse Source
This commit is contained in:
megavrilinvv
2022-12-01 12:34:30 +03:00
parent 17db21306a
commit e24f301e44
11 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/LoggedInLayout.vue
View File

@@ -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: {

9
src/pages/calendar/TheCalendar.vue
View File

@@ -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",

5
src/pages/calendar/components/CalendarColumn.vue
View File

@@ -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 {

3
src/pages/calendar/components/CalendarSchedule.vue
View File

@@ -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;

3
src/pages/calendar/components/CalendarSidebar.vue
View File

@@ -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 {

15
src/pages/calendar/components/CalendarSidebarTeammate.vue
View File

@@ -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,

4
src/pages/clients/TheClients.vue
View File

@@ -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() {

2
src/pages/clients/components/ClientsTable.vue
View File

@@ -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() {

4
src/pages/clients/components/ClientsTableRow.vue
View File

@@ -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() {

4
src/pages/clients/components/ClientsWrapper.vue
View File

@@ -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() {

7
src/pages/clients/components/cells/TableCellBodyName.vue
View File

@@ -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>