diff --git a/src/components/base/BaseButton.vue b/src/components/base/BaseButton.vue index 27377a9..7790cc5 100644 --- a/src/components/base/BaseButton.vue +++ b/src/components/base/BaseButton.vue @@ -1,7 +1,7 @@ @@ -56,7 +56,7 @@ export default { width: 100vw height: 100vh .base-content - padding: 32px + padding: 32px 40px background-color: var(--default-white) box-shadow: 4px 4px 8px rgba(9, 10, 21, 0.1), -4px -4px 8px rgba(9, 10, 21, 0.1) border-radius: 4px @@ -65,7 +65,7 @@ export default { font-weight: 700 font-size: 20px line-height: 23px - + color: var(--font-dark-blue-color) .base-header display: flex justify-content: space-between diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue index 70c60a2..198af2b 100644 --- a/src/pages/calendar/TheCalendar.vue +++ b/src/pages/calendar/TheCalendar.vue @@ -13,18 +13,36 @@ :events-data="eventsData" :members-data="membersData" :sidebar-width="sidebarWidth" - :close-form-create-event="closeFormCreateEvent" - :is-open-form="isOpenForm" :event-types="eventTypes" :change-form-was-closed="changeFormWasClosed" @previous-date="switchPreviousDate" @next-date="switchNextDate" @selected-layout="changeCalendarLayout" @open-change-form="openFormCreateEvent" + @reset-change-form="resetChangeFormState" + @selected-event="writeEventData" + @delete-event="openModal" + ) + calendar-form-add-event( + v-if="isOpenForm" + :close-form="closeFormCreateEvent" + :owners-data="employeesData" + :members-data="membersData" + :selected-event-data="selectedEvent" + :event-types="eventTypes" + @clear-selected-event-data="clearSelectedEvent" @update-events="fetchEventsData" @close-change-form="setChangeFormState" - @reset-change-form="resetChangeFormState" ) + base-modal( + v-model="showModal" + title="Удаление события" + ) + calendar-delete-modal( + :event-types="eventTypes" + :owner-event="selectedEvent" + :close-modal="changeShowModal" + ) diff --git a/src/pages/calendar/components/CalendarDeleteModal.vue b/src/pages/calendar/components/CalendarDeleteModal.vue new file mode 100644 index 0000000..d76f756 --- /dev/null +++ b/src/pages/calendar/components/CalendarDeleteModal.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/src/pages/calendar/components/CalendarEventCard.vue b/src/pages/calendar/components/CalendarEventCard.vue index 118cc5b..1a94c39 100644 --- a/src/pages/calendar/components/CalendarEventCard.vue +++ b/src/pages/calendar/components/CalendarEventCard.vue @@ -25,11 +25,9 @@ :style="descriptionCardPosition" :owner-event="ownerEvent" :event-types="eventTypes" - :event-time="eventTime" - :event-member="eventMember" - :description="description" @selected-event="transmitEventData" @close-description-card="closeDescriptionCard" + @delete-event="transmitDeleteEvent" ) @@ -210,6 +208,9 @@ export default { this.$emit("selected-event", this.ownerEvent); this.hideDescriptionCard(); }, + transmitDeleteEvent() { + this.$emit("delete-event", this.ownerEvent); + }, hideDescriptionCard() { this.isOpenDescriptionCard = false; }, diff --git a/src/pages/calendar/components/CalendarEventDescriptionCard.vue b/src/pages/calendar/components/CalendarEventDescriptionCard.vue index 5c33990..8914def 100644 --- a/src/pages/calendar/components/CalendarEventDescriptionCard.vue +++ b/src/pages/calendar/components/CalendarEventDescriptionCard.vue @@ -1,20 +1,21 @@