diff --git a/components/calendar/Calendar.vue b/components/calendar/Calendar.vue index 746d0c9..6908f1a 100644 --- a/components/calendar/Calendar.vue +++ b/components/calendar/Calendar.vue @@ -10,6 +10,7 @@ import DecadeLayout from './state/decennially/Layout.vue' import YearLayout from './state/yearly/Layout.vue' const { currentConfig } = useCalendar() +const { eventsLoaded, eventsAreLoading } = storeToRefs(useCalendarEvents()) const currentViewComponent: ComputedRef = computed(() => { switch (currentConfig.viewType) { @@ -32,8 +33,14 @@ const currentViewComponent: ComputedRef = computed(() => { diff --git a/components/calendar/CalendarMenuToday.vue b/components/calendar/CalendarMenuToday.vue index f53a944..d334e7f 100644 --- a/components/calendar/CalendarMenuToday.vue +++ b/components/calendar/CalendarMenuToday.vue @@ -8,11 +8,9 @@ import { areDatesIdentical } from '@/models/Date' const { defaultDate, selectedDate } = storeToRefs(useCalendar()) const { jumpToDefaultDate, getFormattedDateTitle } = useCalendar() -const defaultDateFormatted = getFormattedDateTitle(defaultDate.value, true) +const defaultDateFormatted: string = getFormattedDateTitle(defaultDate.value, true) -const isDefaultDate = computed(() => { - return areDatesIdentical(selectedDate.value, defaultDate.value) -}) +const isDefaultDate: ComputedRef = computed(() => areDatesIdentical(selectedDate.value, defaultDate.value))