diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass index 19e65c6..c8d3b82 100644 --- a/src/assets/sass/variables.sass +++ b/src/assets/sass/variables.sass @@ -25,9 +25,19 @@ --font-obligatory-color: #ff0000 --bg-event-box-color: rgba(37, 40, 80, 0.1) --bg-event-green-color: #24d07d + --bg-event-green-color-0: #cdf0e5 + --bg-event-green-color-1: #92e8be --bg-event-red-color: #e93131 + --bg-event-red-color-0: #f8c1c1 + --bg-event-red-color-1: #f49898 --bg-event-yellow-color: #e5e931 + --bg-event-yellow-color-0: #f8f9c2 + --bg-event-yellow-color-1: #f2f498 --bg-event-blue-color: #3ba3ee + --bg-event-blue-color-0: #c5e4fa + --bg-event-blue-color-1: #93cdf6 + --bg-event-default-hover-color: #d9e1f9 + --border-event-default-color: #b3c3f3 --light-grey-bg-color: #f8f9fa --btn-green-color: rgba(60, 217, 75, 1) --btn-light-green-color: rgba(60, 217, 75, 0.2) diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue index dbbf066..3a3f714 100644 --- a/src/pages/calendar/TheCalendar.vue +++ b/src/pages/calendar/TheCalendar.vue @@ -4,7 +4,7 @@ @width="changeWidth" :team-data="employeesData" :open-form-create="openFormCreateEvent" - :event-type="eventType" + :event-types="eventTypes" ) calendar-schedule( :owners-data="employeesData" @@ -15,6 +15,7 @@ :sidebar-width="sidebarWidth" :close-form-create-event="closeFormCreateEvent" :is-open-form="isOpenForm" + :event-types="eventTypes" @previous-date="switchPreviousDate" @next-date="switchNextDate" @selected-layout="changeCalendarLayout" @@ -55,7 +56,7 @@ export default { employeesData: [], isOpenForm: false, membersData: [], - eventType: [ + eventTypes: [ { id: 1, label: "Встреча", color: "var(--bg-event-green-color)" }, { id: 2, label: "Планерка", color: "var(--bg-event-red-color)" }, { id: 3, label: "Интервью", color: "var(--bg-event-yellow-color)" }, diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue index 597bf1d..af2562b 100644 --- a/src/pages/calendar/components/CalendarColumn.vue +++ b/src/pages/calendar/components/CalendarColumn.vue @@ -17,6 +17,7 @@ v-for="event in dayEvents" :key="event.id" :ownerEvent="event" + :event-types="eventTypes" :style="eventCardPosition(event.start, event.end)" @selected-event="transmitEventData" ) @@ -38,6 +39,7 @@ export default { dayEvents: Array, dayEndTime: Number, dayStartTime: Number, + eventTypes: Array, }, data() { return { diff --git a/src/pages/calendar/components/CalendarEventCard.vue b/src/pages/calendar/components/CalendarEventCard.vue index 1054eec..4cd708e 100644 --- a/src/pages/calendar/components/CalendarEventCard.vue +++ b/src/pages/calendar/components/CalendarEventCard.vue @@ -1,20 +1,52 @@ diff --git a/src/pages/calendar/components/CalendarEventDescriptionCard.vue b/src/pages/calendar/components/CalendarEventDescriptionCard.vue new file mode 100644 index 0000000..b134ca2 --- /dev/null +++ b/src/pages/calendar/components/CalendarEventDescriptionCard.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue index de28271..c32f0f1 100644 --- a/src/pages/calendar/components/CalendarFormAddEvent.vue +++ b/src/pages/calendar/components/CalendarFormAddEvent.vue @@ -114,6 +114,12 @@ export default { return {}; }, }, + eventTypes: { + type: Array, + default() { + return []; + }, + }, }, data() { return { diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue index 838e8c5..664d9ba 100644 --- a/src/pages/calendar/components/CalendarSchedule.vue +++ b/src/pages/calendar/components/CalendarSchedule.vue @@ -20,6 +20,7 @@ :day-start-time="validateStartTime" :day-end-time="validateEndTime" :style="columnSize" + :event-types="eventTypes" @selected-event="writeEventData" ) .flex.w-full.relative @@ -49,6 +50,7 @@ :owners-data="ownersData" :members-data="membersData" :selected-event-data="selectedEvent" + :event-types="eventTypes" @clear-selected-event-data="clearSelectedEvent" @update-events="transmitUpdateEvents" ) @@ -104,6 +106,12 @@ export default { }, closeFormCreateEvent: Function, isOpenForm: Boolean, + eventTypes: { + type: Array, + default() { + return []; + }, + }, }, data() { return { @@ -370,6 +378,7 @@ export default {