Removed default date abstraction
This would cause problems after initial store load
This commit is contained in:
@@ -26,7 +26,7 @@ type CalendarCurrentDate = {
|
|||||||
|
|
||||||
export const useCalendar = defineStore('calendar', () => {
|
export const useCalendar = defineStore('calendar', () => {
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
const isCalendarView: boolean = route.name === 'i-world-id-calendar'
|
const isCalendarView: boolean = route.name === 'i-calendar-id'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Static calendar config
|
* Static calendar config
|
||||||
@@ -60,8 +60,6 @@ export const useCalendar = defineStore('calendar', () => {
|
|||||||
today: calendarData.today
|
today: calendarData.today
|
||||||
}
|
}
|
||||||
|
|
||||||
setDefaultDate(activeCalendar.value.today)
|
|
||||||
|
|
||||||
months.value = calendarData.months
|
months.value = calendarData.months
|
||||||
|
|
||||||
baseEvents.value = calendarData.events
|
baseEvents.value = calendarData.events
|
||||||
@@ -79,16 +77,16 @@ export const useCalendar = defineStore('calendar', () => {
|
|||||||
|
|
||||||
// Default date settings (current day in the world)
|
// Default date settings (current day in the world)
|
||||||
// The base setting is the first day / month of year 0
|
// The base setting is the first day / month of year 0
|
||||||
const defaultDay: Ref<number> = ref<number>(1)
|
// const defaultDay: Ref<number> = ref<number>(1)
|
||||||
const defaultMonth: Ref<number> = ref<number>(0)
|
// const defaultMonth: Ref<number> = ref<number>(0)
|
||||||
const defaultYear: Ref<number> = ref<number>(0)
|
// const defaultYear: Ref<number> = ref<number>(0)
|
||||||
|
|
||||||
// Object representation
|
// Object representation
|
||||||
const defaultDate: ComputedRef<RPGDate> = computed(() => {
|
const defaultDate: ComputedRef<RPGDate> = computed(() => {
|
||||||
return {
|
return {
|
||||||
day: defaultDay.value,
|
day: activeCalendar.value?.today.day || 1,
|
||||||
month: defaultMonth.value,
|
month: activeCalendar.value?.today.month || 0,
|
||||||
year: defaultYear.value
|
year: activeCalendar.value?.today.year || 0
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -110,17 +108,6 @@ export const useCalendar = defineStore('calendar', () => {
|
|||||||
initialValue: initialParams,
|
initialValue: initialParams,
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the new defaultDate (aka the "today" value from the calendar)
|
|
||||||
*
|
|
||||||
* @param date The new data to set as defaultDate
|
|
||||||
*/
|
|
||||||
function setDefaultDate(date: RPGDate) {
|
|
||||||
defaultDay.value = date.day
|
|
||||||
defaultMonth.value = date.month as number
|
|
||||||
defaultYear.value = date.year
|
|
||||||
}
|
|
||||||
|
|
||||||
// Everytime the defaultDate changes / is set, we should update the params in the URL
|
// Everytime the defaultDate changes / is set, we should update the params in the URL
|
||||||
watch(defaultDate, () => {
|
watch(defaultDate, () => {
|
||||||
params.day = String(defaultDate.value.day)
|
params.day = String(defaultDate.value.day)
|
||||||
@@ -924,7 +911,6 @@ export const useCalendar = defineStore('calendar', () => {
|
|||||||
currentRPGDate,
|
currentRPGDate,
|
||||||
currentMonthData,
|
currentMonthData,
|
||||||
defaultDate,
|
defaultDate,
|
||||||
setDefaultDate,
|
|
||||||
selectedDate: skipHydrate(selectedDate),
|
selectedDate: skipHydrate(selectedDate),
|
||||||
selectDate,
|
selectDate,
|
||||||
params,
|
params,
|
||||||
|
|||||||
Reference in New Issue
Block a user