diff --git a/components/calendar/Calendar.vue b/components/calendar/Calendar.vue index 3b38126..7c7c00c 100644 --- a/components/calendar/Calendar.vue +++ b/components/calendar/Calendar.vue @@ -12,11 +12,13 @@ const worldId = route.params.id const { setMonths, setDefaultDate, currentConfig, selectedDate, jumpToDate } = useCalendar() const { setEvents } = useCalendarEvents() +const { setCharacters } = useCharacters() -const { data: calendar, pending, refresh } = await useLazyFetch(`/api/calendars/query?world_id=${worldId}`) +const { data: calendar, pending: calPending, refresh: calRefresh } = await useLazyFetch(`/api/calendars/query?world_id=${worldId}`) +const { data: characters, pending: charPending, refresh: charRefresh } = await useLazyFetch(`/api/characters/query?world_id=${worldId}`) if (!calendar.value) { - await refresh() + await calRefresh() } else { if (calendar.value?.data?.months) { setMonths(calendar.value?.data?.months) @@ -28,8 +30,15 @@ if (!calendar.value) { setEvents(calendar.value?.data?.events) } } +if (!characters.value) { + await charRefresh() +} else { + if (characters.value?.data) { + setCharacters(characters.value?.data) + } +} -watch(pending, (newStatus) => { +watch(calPending, (newStatus) => { if (!newStatus) { if (calendar.value?.data?.months) { setMonths(calendar.value?.data?.months) @@ -42,6 +51,13 @@ watch(pending, (newStatus) => { } } }) +watch(charPending, (newStatus) => { + if (!newStatus) { + if (characters.value?.data) { + setCharacters(characters.value?.data) + } + } +}) const currentViewComponent: ComputedRef = computed(() => { switch (currentConfig.viewType) { @@ -67,7 +83,7 @@ onMounted(() => {