From 6749fdb46ea5edb104c5cbd89beaa3072ae642a7 Mon Sep 17 00:00:00 2001 From: Alexis <35.alexis.pele@gmail.com> Date: Wed, 5 Jun 2024 18:28:38 +0200 Subject: [PATCH] Moved event modal states and functions to event store --- components/calendar/Calendar.vue | 4 +- components/calendar/CalendarEventDetails.vue | 4 +- components/calendar/form/DeleteEvent.vue | 112 +++++++++++++++++++ stores/CalendarStore.ts | 11 -- stores/EventStore.ts | 36 +++++- 5 files changed, 152 insertions(+), 15 deletions(-) create mode 100644 components/calendar/form/DeleteEvent.vue diff --git a/components/calendar/Calendar.vue b/components/calendar/Calendar.vue index b16f81e..063aa40 100644 --- a/components/calendar/Calendar.vue +++ b/components/calendar/Calendar.vue @@ -7,7 +7,8 @@ import CenturyLayout from './state/centennially/Layout.vue' import DecadeLayout from './state/decennially/Layout.vue' import YearLayout from './state/yearly/Layout.vue' -const { isAdvancedSearchOpen, isEditEventModalOpen } = storeToRefs(useCalendar()) +const { isAdvancedSearchOpen } = storeToRefs(useCalendar()) +const { isEditEventModalOpen, isDeleteEventModalOpen } = storeToRefs(useCalendarEvents()) const route = useRoute() const worldId = route.params.id @@ -111,5 +112,6 @@ onMounted(() => { + diff --git a/components/calendar/CalendarEventDetails.vue b/components/calendar/CalendarEventDetails.vue index 9816ace..b7c252a 100644 --- a/components/calendar/CalendarEventDetails.vue +++ b/components/calendar/CalendarEventDetails.vue @@ -11,8 +11,8 @@ import { PhDotsThreeOutlineVertical } from '@phosphor-icons/vue' -const { defaultDate, getFormattedDateTitle, jumpToDate, revealEditEventModal, getRelativeString } = useCalendar() -const { deleteEvent } = useCalendarEvents() +const { defaultDate, getFormattedDateTitle, jumpToDate, getRelativeString } = useCalendar() +const { deleteEvent, revealEditEventModal } = useCalendarEvents() const { lastActiveEvent } = storeToRefs(useCalendarEvents()) const props = defineProps<{ diff --git a/components/calendar/form/DeleteEvent.vue b/components/calendar/form/DeleteEvent.vue new file mode 100644 index 0000000..58c4c8a --- /dev/null +++ b/components/calendar/form/DeleteEvent.vue @@ -0,0 +1,112 @@ + + + + + + + Modifier l'évènement + + + Mettre à jour les données de l'évènement + + + + + + + + + + + + + + + + + + + + — + + + + + + + + {{ formErrors.message }} + + + + + + Sauvegarder + + + + + + + diff --git a/stores/CalendarStore.ts b/stores/CalendarStore.ts index 1b7fe75..2d9fd4f 100644 --- a/stores/CalendarStore.ts +++ b/stores/CalendarStore.ts @@ -298,15 +298,6 @@ export const useCalendar = defineStore('calendar', () => { isAdvancedSearchOpen.value = true } - /** - * State for advanced search modal - */ - const isEditEventModalOpen: Ref = ref(false) - - function revealEditEventModal() { - isEditEventModalOpen.value = true - } - /** * Switches the active viewType * @@ -649,8 +640,6 @@ export const useCalendar = defineStore('calendar', () => { isCurrentScreenActive, isAdvancedSearchOpen, revealAdvancedSearch, - isEditEventModalOpen, - revealEditEventModal, convertDateToDays, getDifferenceInDays, areDatesIdentical, diff --git a/stores/EventStore.ts b/stores/EventStore.ts index d703b5a..6281662 100644 --- a/stores/EventStore.ts +++ b/stores/EventStore.ts @@ -165,6 +165,24 @@ export const useCalendarEvents = defineStore('calendar-events', () => { } } + /** + * State for event modal edition + */ + const isEditEventModalOpen: Ref = ref(false) + + function revealEditEventModal() { + isEditEventModalOpen.value = true + } + + /** + * State for event modal edition + */ + const isDeleteEventModalOpen: Ref = ref(false) + + function revealDeleteEventModal() { + isDeleteEventModalOpen.value = true + } + /** * EVENT CREATION FUNCTIONS */ @@ -219,5 +237,21 @@ export const useCalendarEvents = defineStore('calendar-events', () => { } } - return { allEvents, setEvents, currentEvents, getRelativeEventFromDate, getRelativeEventFromEvent, eventSkeleton, resetSkeleton, submitSkeleton, lastActiveEvent, updateEventFromSkeleton, deleteEvent } + return { + allEvents, + setEvents, + currentEvents, + getRelativeEventFromDate, + getRelativeEventFromEvent, + eventSkeleton, + resetSkeleton, + submitSkeleton, + lastActiveEvent, + updateEventFromSkeleton, + deleteEvent, + isEditEventModalOpen, + revealEditEventModal, + isDeleteEventModalOpen, + revealDeleteEventModal + } })