Merge pull request #60 from dderbentsov/UC-21

[WIP] Добавил элементы для сайдбара в открытом состоянии, виды событий и команды
This commit is contained in:
frontgavrilin
2022-10-25 00:59:56 +03:00
committed by GitHub
5 changed files with 103 additions and 21 deletions

View File

@@ -1,6 +1,6 @@
<template lang="pug"> <template lang="pug">
.input-wrapper.flex.gap-x-2.px-4.box-border(class="py-2.5" :style="{ minWidth: widthInput + 'px' }") .input-wrapper.flex.gap-x-2.px-4.box-border(class="py-2.5" :style="{ minWidth: widthInput + 'px' }")
input.w-full.outline-0.text-base.not-italic(:value="value" :type="type" @input="$emit('update:value', $event.target.value)" :placeholder="placeholder" :maxlength="maxLength") input.w-full.outline-0.text-base.not-italic(:style="{ backgroundColor: backgroundInput, fontSize: fontSizeInput }" :value="value" :type="type" @input="$emit('update:value', $event.target.value)" :placeholder="placeholder" :maxlength="maxLength")
.slot(v-if="withIcon" :class="iconPosition") .slot(v-if="withIcon" :class="iconPosition")
slot.cursor-pointer slot.cursor-pointer
</template> </template>
@@ -24,6 +24,8 @@ export default {
default: "Поиск", default: "Поиск",
}, },
widthInput: Number, widthInput: Number,
backgroundInput: String,
fontSizeInput: String,
}, },
}; };
</script> </script>

View File

@@ -31,10 +31,34 @@ export default {
}, },
eventsData: [], eventsData: [],
team: [ team: [
{ id: 1, name: "Захарова А.О.", avatar: img }, {
{ id: 2, name: "Константинопольская Ю.В.", avatar: img }, id: 1,
{ id: 3, name: "Коломойцев И.К.", avatar: img }, last_name: "Гагарин",
{ id: 4, name: "Зайцев В.С.", avatar: img }, 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,
},
], ],
}; };
}, },

View File

@@ -55,7 +55,6 @@ export default {
<style lang="sass" scoped> <style lang="sass" scoped>
.current-time .current-time
color: var(--bg-event-red-color) color: var(--bg-event-red-color)
.calendar-clock-column .calendar-clock-column
width: 80px width: 80px
height: 100% height: 100%

View File

@@ -1,28 +1,53 @@
<template lang="pug"> <template lang="pug">
.sidebar.flex.flex-col.bg-white .sidebar.flex.flex-col.bg-white(:class="openSidebar")
.sidebar-wrapper.h-full.my-13px(:style="sidebarWidth") .sidebar-wrapper.h-full.my-13px(:style="sidebarWidth")
.sidebar-content.items-center.flex.flex-col.gap-y-8.px-4.py-19px .sidebar-content.items-center.flex.flex-col.gap-y-8.px-4.py-19px
base-button-plus base-button-plus(:size="40" v-if="!isOpen")
.flex.flex-col.items-center .create-event.flex.items-center.justify-center(v-else)
base-button-plus(:class="buttonStyled") base-create-button.font-medium.pl-15px.py-10.5px(text="Создать событие" :withIcon="true")
.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 .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.flex.items-center.justify-center(v-for="event in events" :key="event.id")
.event-type(:style="{ background: event.color }") .event-type(:style="{ background: event.color }")
.flex.flex-col.items-center.gap-y-2.justify-center .flex.items-center.flex-col.gap-y-4(v-else)
base-button-plus.mb-2(:class="buttonStyled") .events-wrapper.flex.items-center.justify-between
.flex {{ "Виды событий" }}
base-button-plus(:class="buttonStyled" :size="24" :icon-size="10")
.flex.flex-col.gap-y-2
.relative.flex.items-center.gap-x-3(v-for="event in events")
base-input.py-2.pl-6(:placeholder="event.name" :key="event.id" :backgroundInput="red" background-input="transparent" font-size-input="12px")
.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") .team-card(v-for="teammate in team" :key="teammate.id")
img.avatar-wrapper(:src="teammate.avatar" alt="Team member") 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(v-for="teammate in team" :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) }}
.span.icon-change-place.cursor-pointer
base-open-button.mt-148px(@click="changeSize" :style="{ transform: `rotate(${turnButton})` }") base-open-button.mt-148px(@click="changeSize" :style="{ transform: `rotate(${turnButton})` }")
</template> </template>
<script> <script>
import BaseButtonPlus from "../../../components/base/buttons/BaseButtonPlus.vue"; import BaseButtonPlus from "../../../components/base/buttons/BaseButtonPlus.vue";
import BaseOpenButton from "../../../components/base/buttons/BaseOpenButton.vue"; import BaseOpenButton from "../../../components/base/buttons/BaseOpenButton.vue";
import BaseCreateButton from "../../../components/base/buttons/BaseCreateButton.vue";
import BaseInput from "../../../components/base/BaseInput.vue";
export default { export default {
name: "CalendarSidebar", name: "CalendarSidebar",
components: { components: {
BaseButtonPlus, BaseButtonPlus,
BaseOpenButton, BaseOpenButton,
BaseCreateButton,
BaseInput,
}, },
props: { props: {
team: Array, team: Array,
@@ -30,18 +55,24 @@ export default {
data() { data() {
return { return {
events: [ events: [
{ id: 1, color: "var(--bg-event-green-color)" }, { id: 1, name: "Встреча", color: "var(--bg-event-green-color)" },
{ id: 2, color: "var(--bg-event-red-color)" }, { id: 2, name: "Планерка", color: "var(--bg-event-red-color)" },
{ id: 3, color: "var(--bg-event-yellow-color)" }, { id: 3, name: "Интервью", color: "var(--bg-event-yellow-color)" },
{ id: 4, color: "var(--bg-event-blue-color)" }, { id: 4, name: "Важная работа", color: "var(--bg-event-blue-color)" },
], ],
widthSidebarOpen: "232px", widthSidebarOpen: "232px",
widthSidebarClose: "72px", widthSidebarClose: "72px",
isOpen: false, isOpen: false,
turnButton: "180deg", turnButton: "180deg",
maxLengthLastName: 13,
}; };
}, },
computed: { computed: {
openSidebar() {
return {
"open-sidebar": this.isOpen,
};
},
buttonStyled() { buttonStyled() {
return { return {
"button-styled": true, "button-styled": true,
@@ -67,6 +98,14 @@ export default {
); );
this.turnButton = this.isOpen ? "0deg" : "180deg"; this.turnButton = this.isOpen ? "0deg" : "180deg";
}, },
changeLastName(lastName) {
return lastName.length > this.maxLengthLastName
? lastName.substr(0, this.maxLengthLastName) + "... "
: lastName + " ";
},
changeInitials(firstName, patronymic) {
return firstName.substr(0, 1) + "." + patronymic.substr(0, 1) + ".";
},
}, },
}; };
</script> </script>
@@ -75,8 +114,6 @@ export default {
.sidebar-wrapper .sidebar-wrapper
border-left: 2px solid var(--btn-blue-color-3) border-left: 2px solid var(--btn-blue-color-3)
.button-plus .button-plus
width: 40px
height: 40px
max-height: 40px max-height: 40px
background: var(--btn-blue-color) background: var(--btn-blue-color)
color: var(--default-white) color: var(--default-white)
@@ -97,10 +134,28 @@ export default {
height: 40px height: 40px
max-height: 40px max-height: 40px
.button-styled .button-styled
width: 24px
height: 24px
max-height: 24px max-height: 24px
background: var(--btn-blue-color-1) background: var(--btn-blue-color-1)
color: var(--btn-blue-color) color: var(--btn-blue-color)
font-size: 10px .open-sidebar
.sidebar-content
align-items: flex-end
padding-left: 15px
.event-type
position: absolute
width: 8px
height: 16px
top: 8px
left: 8px
.create-event
width: 200px
height: 40px
border-radius: 4px
.events-wrapper
width: 200px
.input-wrapper
border: none
background: var(--bg-event-box-color)
height: 32px
width: 169px
</style> </style>

View File

@@ -27,7 +27,9 @@ module.exports = {
"3px": "3px", "3px": "3px",
"6px": "6px", "6px": "6px",
"10px": "10px", "10px": "10px",
"10.5px": "10.5px",
"13px": "13px", "13px": "13px",
"15px": "15px",
"19px": "19px", "19px": "19px",
"45px": "45px", "45px": "45px",
"74px": "74px", "74px": "74px",