- {{ tileMonthName }}
+ {{ month.name }}
-
diff --git a/models/CalendarConfig.ts b/models/CalendarConfig.ts
index 792bae1..19bd086 100644
--- a/models/CalendarConfig.ts
+++ b/models/CalendarConfig.ts
@@ -1,6 +1,12 @@
+import type { CalendarEvent } from "./CalendarEvent"
+import type { CalendarMonth } from "./CalendarMonth"
+
export interface CalendarConfig {
- months: string[]
- monthsPerYear: number
+ months: CalendarMonth[]
daysPerMonth: number
- // todayDate: any
+}
+
+export interface Calendar extends CalendarConfig {
+ id: number
+ events: CalendarEvent[]
}
diff --git a/models/CalendarEvent.ts b/models/CalendarEvent.ts
new file mode 100644
index 0000000..d19d06d
--- /dev/null
+++ b/models/CalendarEvent.ts
@@ -0,0 +1,18 @@
+import type { Category } from './Category'
+import type { RPGDate } from './Date'
+
+export interface CalendarEvent {
+ id: number
+ title: string
+ startDate: RPGDate
+ endDate?: RPGDate
+ description?: string
+ category?: Category
+ hidden?: boolean
+ wiki?: string
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function isCalendarEvent(object: any): object is CalendarEvent {
+ return 'startDate' in object
+}
diff --git a/models/CalendarMonth.ts b/models/CalendarMonth.ts
new file mode 100644
index 0000000..bd457c3
--- /dev/null
+++ b/models/CalendarMonth.ts
@@ -0,0 +1,6 @@
+export interface CalendarMonth {
+ id: number
+ days: number,
+ name: string,
+ position: number,
+}
diff --git a/models/Category.ts b/models/Category.ts
new file mode 100644
index 0000000..f86e0c3
--- /dev/null
+++ b/models/Category.ts
@@ -0,0 +1,4 @@
+export interface Category {
+ id: number
+ name: string
+}
diff --git a/models/Characters.ts b/models/Characters.ts
index 8be796c..2c6d2a8 100644
--- a/models/Characters.ts
+++ b/models/Characters.ts
@@ -1,10 +1,10 @@
-import type { LeimDate } from './Date'
+import type { RPGDate } from './Date'
export interface Character {
name: string
description?: string
- birth?: LeimDate
- death?: LeimDate
+ birth?: RPGDate
+ death?: RPGDate
hiddenBirth?: boolean
hiddenDeath?: boolean
category?: CharacterCategory
diff --git a/models/Date.ts b/models/Date.ts
index 209819a..cc87b1a 100644
--- a/models/Date.ts
+++ b/models/Date.ts
@@ -1,13 +1,13 @@
-export interface LeimDate {
+export interface RPGDate {
day: number
month: number
year: number
- period?: LeimPeriod
+ period?: RPGPeriod
}
-export type LeimPeriod = 'ante' | 'nante'
-export type LeimPeriodShort = 'A.R' | 'N.R'
-export type LeimDateOrder = 'asc' | 'desc'
+export type RPGPeriod = 'ante' | 'nante'
+export type RPGPeriodShort = 'A.R' | 'N.R'
+export type RPGDateOrder = 'asc' | 'desc'
export const monthsPerYear: number = 10
export const daysPerYear: number = 320
@@ -21,7 +21,7 @@ export const daysPerWeek: number = 6
* @param date2 Second date
* @returns True if the dates are identical
*/
-export function areDatesIdentical(date1: LeimDate, date2: LeimDate): boolean {
+export function areDatesIdentical(date1: RPGDate, date2: RPGDate): boolean {
return convertDateToDays({ ...date1 }) === convertDateToDays({ ...date2 })
}
@@ -32,7 +32,7 @@ export function areDatesIdentical(date1: LeimDate, date2: LeimDate): boolean {
* @param date2 Second date
* @returns 1 means the first date comes before the second, -1 means the second comes before the first, and 0 if they're identical
*/
-export function compareDates(a: LeimDate, b: LeimDate, order: LeimDateOrder = 'desc'): number {
+export function compareDates(a: RPGDate, b: RPGDate, order: RPGDateOrder = 'desc'): number {
// Reverses the order if specified
const orderFactor: number = order === 'desc' ? 1 : -1
@@ -58,13 +58,13 @@ export function compareDates(a: LeimDate, b: LeimDate, order: LeimDateOrder = 'd
}
/**
- * Converts a LeimDate to its equivalent in days
+ * Converts a RPGDate to its equivalent in days
*
* @todo Handle negative dates
* @param dateToConvert The date object
* @returns How many days does it represent
*/
-export function convertDateToDays(dateToConvert: LeimDate): number {
+export function convertDateToDays(dateToConvert: RPGDate): number {
let numberOfDays: number = dateToConvert.day
numberOfDays = numberOfDays + dateToConvert.month * daysPerMonth
@@ -79,7 +79,7 @@ export function convertDateToDays(dateToConvert: LeimDate): number {
* @param relativeDate The year to compare it to
* @returns The number of days separating the two dates (both positive and negative numbers)
*/
-export function getDifferenceInDays(baseDate: LeimDate, relativeDate: LeimDate): number {
+export function getDifferenceInDays(baseDate: RPGDate, relativeDate: RPGDate): number {
return convertDateToDays(relativeDate) - convertDateToDays(baseDate)
}
@@ -91,8 +91,8 @@ export function getDifferenceInDays(baseDate: LeimDate, relativeDate: LeimDate):
* @returns A string with info on how the relative date differs to the base date
*/
export function getRelativeString(
- baseDate: LeimDate,
- relativeDate: LeimDate,
+ baseDate: RPGDate,
+ relativeDate: RPGDate,
formatting: 'compact' | 'complex' = 'complex'
): string {
const differenceInDays: number = getDifferenceInDays(baseDate, relativeDate)
@@ -177,11 +177,11 @@ export function getRelativeString(
return output
}
-// export function getRelativeDate(baseDate: LeimDate, relativeDate: LeimDate) {
+// export function getRelativeDate(baseDate: RPGDate, relativeDate: RPGDate) {
// let newDay: number
// let newMonth: number
// let newYear: number
-// let newPeriod: LeimPeriod
+// let newPeriod: RPGPeriod
// const differenceInDays = getDifferenceInDays(baseDate, relativeDate)
diff --git a/models/Events.ts b/models/Events.ts
deleted file mode 100644
index 6ddeb4d..0000000
--- a/models/Events.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import type { LeimDate } from './Date'
-
-export interface CalendarEvent {
- title: string
- startDate: LeimDate
- endDate?: LeimDate
- description?: string
- category?: CalendarEventCategory
- secondaryCategories?: CalendarEventCategory[]
- hidden?: boolean
- wiki?: string
-}
-
-export const calendarEventCategories = [
- 'naissance',
- 'mort',
- 'catastrophe',
- 'législation',
- 'catastrophe naturelle',
- 'inauguration',
- 'religion',
- 'invention',
- 'science',
- 'bénédiction',
- 'joueurs',
- 'découverte',
- 'exploration',
- 'construction',
- 'arcanologie',
- 'criminalité',
- 'scandale',
- 'commerce'
-] as const
-
-export type CalendarEventCategory = (typeof calendarEventCategories)[number]
-
-export function isCalendarEvent(object: any): object is CalendarEvent {
- return 'startDate' in object
-}
diff --git a/pages/index.vue b/pages/index.vue
index 9ec7533..10c9254 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -11,21 +11,5 @@ const sidebarMenu: MenuItem[] = []
-
-
-
-
- Calendrier
-
-
- chronologie
-
-
-
-
- Chronologie complète de Léïm, rassemblant les évènements et personnages clés du monde
-
-
-
diff --git a/server/api/calendars/query.get.ts b/server/api/calendars/query.get.ts
index d6e8c39..3e63866 100644
--- a/server/api/calendars/query.get.ts
+++ b/server/api/calendars/query.get.ts
@@ -1,5 +1,6 @@
import { serverSupabaseClient } from "#supabase/server";
import { z } from 'zod'
+import type { Calendar } from "~/models/CalendarConfig";
const querySchema = z.object({
world_id: z.number({ coerce: true }).positive().int()
@@ -13,11 +14,21 @@ export default defineEventHandler(async (event) => {
.from('world_calendars')
.select(`
id,
- months,
- days_per_year,
- events (*)
+ months:calendar_months (*),
+ events:calendar_events (
+ id,
+ title,
+ description,
+ hidden,
+ startDate:start_date,
+ endDate:end_date,
+ wiki,
+ category:calendar_events_category (*)
+ )
`)
.eq('world_id', query.world_id)
+ .limit(1)
+ .single
()
return output
})
diff --git a/server/api/events/query.get.ts b/server/api/events/query.get.ts
index 0331304..087d867 100644
--- a/server/api/events/query.get.ts
+++ b/server/api/events/query.get.ts
@@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => {
const query = await getValidatedQuery(event, querySchema.parse)
const output = client
- .from('events')
+ .from('calendar_events')
.select(`
id,
title,
diff --git a/stores/CalendarStore.ts b/stores/CalendarStore.ts
index 1c405c1..651cce2 100644
--- a/stores/CalendarStore.ts
+++ b/stores/CalendarStore.ts
@@ -1,26 +1,13 @@
import {
- monthsPerYear,
- daysPerWeek,
- daysPerMonth,
- daysPerYear,
- type LeimDate,
- type LeimPeriod,
- type LeimPeriodShort
+ type RPGDate,
} from '@/models/Date'
import { useLocalStorage, useUrlSearchParams } from '@vueuse/core'
import { defineStore, skipHydrate } from 'pinia'
import { computed, ref, type ComputedRef, type Ref } from 'vue'
+import type { CalendarMonth } from '~/models/CalendarMonth'
type CalendarViewType = 'month' | 'year' | 'decade' | 'century'
-type CalendarStaticConfig = {
- months: string[]
- monthsPerYear: number
- daysPerYear: number
- daysPerMonth: number
- daysPerWeek: number
-}
-
type CalendarCurrentConfig = {
viewType: CalendarViewType
}
@@ -30,8 +17,6 @@ type CalendarCurrentDate = {
currentMonth: ComputedRef
currentMonthName: ComputedRef
currentYear: ComputedRef
- currentPeriod: Ref
- currentPeriodAbbr: Ref
currentDateTitle: ComputedRef
}
@@ -43,27 +28,10 @@ export const useCalendar = defineStore('calendar', () => {
/**
* Month list
*/
- const months: string[] = [
- 'Jalen',
- 'Malsen',
- 'Verlys',
- 'Nalys',
- 'Verdore',
- 'Sidore',
- 'Lyllion',
- 'Rion',
- 'Farene',
- 'Dalvene'
- ]
-
- // Assign the static config
- const staticConfig: CalendarStaticConfig = {
- months,
- monthsPerYear,
- daysPerYear,
- daysPerMonth,
- daysPerWeek
- }
+ const months: Ref = ref([])
+ const sortedMonths = computed(() => months.value.sort((a, b) => a.position - b.position))
+ const monthsPerYear = computed(() => months.value.length)
+ const daysPerYear = computed(() => months.value.reduce((acc, o) => acc + o.days, 0))
const currentConfig: Ref = ref({
viewType: 'month'
@@ -79,7 +47,7 @@ export const useCalendar = defineStore('calendar', () => {
const defaultDay: number = 23
const defaultMonth: number = 8
const defaultYear: number = 3209
- const defaultDate: ComputedRef = computed(() => {
+ const defaultDate: ComputedRef = computed(() => {
return {
day: defaultDay,
month: defaultMonth,
@@ -104,6 +72,9 @@ export const useCalendar = defineStore('calendar', () => {
const currentMonth = computed(() => {
return Number(params.month)
})
+ const currentMonthData = computed(() => {
+ return sortedMonths.value[currentMonth.value]
+ })
// Gets the label from currentMonth index
const currentMonthName = computed(() => getMonthName(currentMonth.value))
@@ -111,12 +82,6 @@ export const useCalendar = defineStore('calendar', () => {
return Number(params.year)
})
- // Get period from currentYear
- const currentPeriod = computed(() => getPeriodOfYear(currentYear.value).long)
- const currentPeriodAbbr = computed(
- () => getPeriodOfYear(currentYear.value).short
- )
-
const currentDateTitle = computed(() => {
switch (currentConfig.value.viewType) {
case 'month':
@@ -124,17 +89,16 @@ export const useCalendar = defineStore('calendar', () => {
day: currentDate.currentDay.value,
month: currentDate.currentMonth.value,
year: currentDate.currentYear.value,
- period: currentDate.currentPeriod.value
})
case 'year':
- return `Année ${currentYear.value} ${currentPeriodAbbr.value}`
+ return `Année ${currentYear.value}`
case 'decade':
- return `Années ${currentYear.value} ${getPeriodOfYear(currentYear.value).short} - ${currentYear.value + 10} ${getPeriodOfYear(currentYear.value + 10).short}`
+ return `Années ${currentYear.value} - ${currentYear.value + 10}`
case 'century':
- return `Années ${currentYear.value} ${getPeriodOfYear(currentYear.value).short} - ${currentYear.value + 100} ${getPeriodOfYear(currentYear.value + 100).short}`
+ return `Années ${currentYear.value} - ${currentYear.value + 100}`
default:
return 'Date inconnue'
@@ -147,21 +111,18 @@ export const useCalendar = defineStore('calendar', () => {
currentMonth,
currentMonthName,
currentYear,
- currentPeriod,
- currentPeriodAbbr,
currentDateTitle
}
- const currentLeimDate = computed(() => {
+ const currentRPGDate = computed(() => {
return {
day: currentDate.currentDay.value,
month: currentDate.currentMonth.value,
year: currentDate.currentYear.value,
- period: currentDate.currentPeriod.value
}
})
- const selectedDate = useLocalStorage('selected-date', currentLeimDate.value, { deep: true })
+ const selectedDate = useLocalStorage('selected-date', currentRPGDate.value, { deep: true })
/**
* Check whether the current viewType is active
@@ -192,7 +153,7 @@ export const useCalendar = defineStore('calendar', () => {
let newValue = Number(params.month) + 1
// If the new value would exceed the max number of month per year
- if (newValue >= staticConfig.monthsPerYear) {
+ if (newValue >= monthsPerYear.value) {
newValue = 0
// Increment the year
incrementYear()
@@ -209,7 +170,7 @@ export const useCalendar = defineStore('calendar', () => {
// If the new value would go below 0
if (newValue < 0) {
- newValue = staticConfig.monthsPerYear - 1
+ newValue = monthsPerYear.value - 1
// Decrement the year
decrementYear()
}
@@ -227,7 +188,7 @@ export const useCalendar = defineStore('calendar', () => {
const target: number = monthNumber - 1
if (target < 0) {
- return monthsPerYear - 1
+ return monthsPerYear.value - 1
}
return target
@@ -242,7 +203,7 @@ export const useCalendar = defineStore('calendar', () => {
function getNextMonth(monthNumber: number): number {
const target: number = monthNumber + 1
- if (target + 1 >= monthsPerYear) {
+ if (target + 1 >= monthsPerYear.value) {
return 0
}
@@ -254,7 +215,7 @@ export const useCalendar = defineStore('calendar', () => {
*/
function setMonth(target: number): void {
// If the target is outside the month bounds
- if (target < 0 || target >= staticConfig.monthsPerYear) {
+ if (target < 0 || target >= monthsPerYear.value) {
return
}
@@ -279,23 +240,6 @@ export const useCalendar = defineStore('calendar', () => {
params.year = newValue.toString()
}
- /**
- * From a given year, returns a set of LeimPeriod identifier
- *
- * This is used in range use-cases
- *
- * @param year The year to display
- * @returns An object containing both short and long LeimPeriod
- */
- function getPeriodOfYear(year: string | number): { long: LeimPeriod; short: LeimPeriodShort } {
- const numYear = year as number
-
- return {
- long: numYear >= 0 ? 'nante' : 'ante',
- short: numYear >= 0 ? 'N.R' : 'A.R'
- }
- }
-
/**
* Get the formatted month name given its index
*
@@ -304,7 +248,7 @@ export const useCalendar = defineStore('calendar', () => {
*/
function getMonthName(monthNumber: number): string {
const index = Number(monthNumber)
- return staticConfig.months[index]
+ return sortedMonths.value[index].name
}
/**
@@ -340,18 +284,18 @@ export const useCalendar = defineStore('calendar', () => {
}
/**
- * From a LeimDate, returns the legible date title
+ * From a RPGDate, returns the legible date title
*
* @param date Date target
* @param showNumber Should the date show the day number
* @returns Formatted date name
*/
- function getFormattedDateTitle(date: LeimDate, showNumber?: boolean): string {
+ function getFormattedDateTitle(date: RPGDate, showNumber?: boolean): string {
if (showNumber) {
- return `${date.day} ${getMonthName(date.month)} ${date.year} ${getPeriodOfYear(date.year).short}`
+ return `${date.day} ${getMonthName(date.month)} ${date.year}`
}
- return `${getMonthName(date.month)} ${date.year} ${getPeriodOfYear(date.year).short}`
+ return `${getMonthName(date.month)} ${date.year}`
}
/**
@@ -359,7 +303,7 @@ export const useCalendar = defineStore('calendar', () => {
*
* @param date Target date
*/
- function jumpToDate(date: LeimDate): void {
+ function jumpToDate(date: RPGDate): void {
params.day = date.day.toString()
params.month = date.month.toString()
params.year = date.year.toString()
@@ -376,7 +320,7 @@ export const useCalendar = defineStore('calendar', () => {
/**
* Jump the calendar to the default date
*/
- function selectDate(date: LeimDate): void {
+ function selectDate(date: RPGDate): void {
selectedDate.value = date
}
@@ -387,16 +331,19 @@ export const useCalendar = defineStore('calendar', () => {
}
return {
- staticConfig,
+ months,
+ sortedMonths,
+ daysPerYear,
+ monthsPerYear,
viewTypeOptions,
currentConfig,
currentDate,
- currentLeimDate,
+ currentRPGDate,
+ currentMonthData,
defaultDate,
selectedDate: skipHydrate(selectedDate),
selectDate,
params,
- getPeriodOfYear,
incrementMonth,
decrementMonth,
setMonth,
diff --git a/stores/EventStore.ts b/stores/EventStore.ts
index 9013ba3..dcd1056 100644
--- a/stores/EventStore.ts
+++ b/stores/EventStore.ts
@@ -1,5 +1,5 @@
-import { compareDates, convertDateToDays, daysPerMonth, type LeimDate } from '@/models/Date'
-import type { CalendarEvent } from '@/models/Events'
+import { compareDates, convertDateToDays, daysPerMonth, type RPGDate } from '@/models/Date'
+import type { CalendarEvent } from '@/models/CalendarEvent'
import { defineStore } from 'pinia'
import { ref, watch, type Ref } from 'vue'
import { useCalendar } from './CalendarStore'
@@ -119,8 +119,8 @@ export const useCalendarEvents = defineStore('calendar-events', () => {
event: CalendarEvent,
position: 'next' | 'prev' = 'next',
initialIsEnd: boolean = false
- ): { event: CalendarEvent; targetDate: LeimDate } {
- let dateToParse: LeimDate // Day value of the date that the user interacted with
+ ): { event: CalendarEvent; targetDate: RPGDate } {
+ let dateToParse: RPGDate // Day value of the date that the user interacted with
if (initialIsEnd && event.endDate) {
dateToParse = event.endDate
@@ -132,9 +132,9 @@ export const useCalendarEvents = defineStore('calendar-events', () => {
}
function getRelativeEventFromDate(
- date: LeimDate,
+ date: RPGDate,
position: 'next' | 'prev' = 'next'
- ): { event: CalendarEvent; targetDate: LeimDate } {
+ ): { event: CalendarEvent; targetDate: RPGDate } {
const pivotValue = convertDateToDays(date)
let t: { eventData: CalendarEvent; distance: number; targetKey: 'startDate' | 'endDate' }[] = []
diff --git a/supabase/migrations/202401_init.sql b/supabase/migrations/202401_init.sql
index 7b81467..74b9c11 100644
--- a/supabase/migrations/202401_init.sql
+++ b/supabase/migrations/202401_init.sql
@@ -47,33 +47,41 @@ comment on table public.worlds is 'Worlds belonging to a single user ; a game ma
-- World Calendars
create table public.world_calendars (
id bigint generated by default as identity primary key,
- months text array,
- days_per_year int not null,
world_id bigint references public.worlds on delete cascade not null
);
comment on table public.world_calendars is 'Calendar settings and configuration attached to a single world.';
+-- Calendar Months
+create table public.calendar_months (
+ id bigint generated by default as identity primary key,
+ name text not null,
+ days int not null,
+ position int not null,
+ calendar_id bigint references public.world_calendars on delete cascade not null
+);
+comment on table public.calendar_months is 'A calendar month.';
+
-- Event categories
-create table public.events_category (
+create table public.calendar_events_category (
id bigint generated by default as identity primary key,
name text not null,
unique (name)
);
-comment on table public.events_category is 'Categories describing events';
+comment on table public.calendar_events_category is 'Categories describing events';
-- Events
-create table public.events (
+create table public.calendar_events (
id bigint generated by default as identity primary key,
title text not null,
description text,
start_date json not null,
end_date json,
- category bigint references public.events_category on delete cascade,
+ category bigint references public.calendar_events_category on delete cascade,
hidden boolean,
wiki text,
calendar_id bigint references public.world_calendars on delete cascade not null
);
-comment on table public.events is 'Events linked to a world';
+comment on table public.calendar_events is 'Events linked to a world';
-- Character categories
create table public.characters_category (
@@ -121,11 +129,12 @@ alter table public.users enable row level security;
alter table public.user_roles enable row level security;
alter table public.role_permissions enable row level security;
alter table public.worlds enable row level security;
-alter table public.world_calendars enable row level security;
-alter table public.events_category enable row level security;
alter table public.characters_category enable row level security;
alter table public.characters enable row level security;
-alter table public.events enable row level security;
+alter table public.world_calendars enable row level security;
+alter table public.calendar_months enable row level security;
+alter table public.calendar_events enable row level security;
+alter table public.calendar_events_category enable row level security;
-- User policies
create policy "Allow logged-in read access" on public.users for select using ( auth.role() = 'authenticated' );
@@ -158,23 +167,43 @@ create policy "Allow individual update access for GMs" on public.world_calendars
)
);
+-- Month policies
+create policy "Allow individual read access for GMs" on public.calendar_months for select using (
+ exists (
+ select 1 from world_calendars
+ where world_calendars.id = calendar_months.calendar_id
+ )
+);
+create policy "Allow individual insert access for GMs" on public.calendar_months for insert with check (
+ exists (
+ select 1 from world_calendars
+ where world_calendars.id = calendar_months.calendar_id
+ )
+);
+create policy "Allow individual update access for GMs" on public.calendar_months for update with check (
+ exists (
+ select 1 from world_calendars
+ where world_calendars.id = calendar_months.calendar_id
+ )
+);
+
-- Event policies
-create policy "Allow individual read access for GMs" on public.events for select using (
+create policy "Allow individual read access for GMs" on public.calendar_events for select using (
exists (
select 1 from world_calendars
- where world_calendars.id = events.calendar_id
+ where world_calendars.id = calendar_events.calendar_id
)
);
-create policy "Allow individual insert access for GMs" on public.events for insert with check (
+create policy "Allow individual insert access for GMs" on public.calendar_events for insert with check (
exists (
select 1 from world_calendars
- where world_calendars.id = events.calendar_id
+ where world_calendars.id = calendar_events.calendar_id
)
);
-create policy "Allow individual update access for GMs" on public.events for update with check (
+create policy "Allow individual update access for GMs" on public.calendar_events for update with check (
exists (
select 1 from world_calendars
- where world_calendars.id = events.calendar_id
+ where world_calendars.id = calendar_events.calendar_id
)
);
@@ -198,6 +227,10 @@ create policy "Allow individual update access for GMs" on public.characters for
)
);
+-- Categories are public to view but not to insert
+create policy "Allow logged-in read access" on public.calendar_events_category for select using ( auth.role() = 'authenticated' );
+create policy "Allow logged-in read access" on public.characters_category for select using ( auth.role() = 'authenticated' );
+
-- Send "previous data" on change
alter table public.users replica identity full;
diff --git a/supabase/seed.sql b/supabase/seed.sql
index efb1df7..b08cda0 100644
--- a/supabase/seed.sql
+++ b/supabase/seed.sql
@@ -2,24 +2,24 @@ insert into public.role_permissions (role, permission) values ('sa', 'events.see
insert into public.role_permissions (role, permission) values ('sa', 'users.ban');
-- Event categories
-insert into public.events_category (name) values ('naissance');
-insert into public.events_category (name) values ('mort');
-insert into public.events_category (name) values ('catastrophe');
-insert into public.events_category (name) values ('catastrophe naturelle');
-insert into public.events_category (name) values ('inauguration');
-insert into public.events_category (name) values ('religion');
-insert into public.events_category (name) values ('invention');
-insert into public.events_category (name) values ('science');
-insert into public.events_category (name) values ('bénédiction');
-insert into public.events_category (name) values ('joueurs');
-insert into public.events_category (name) values ('découverte');
-insert into public.events_category (name) values ('exploration');
-insert into public.events_category (name) values ('construction');
-insert into public.events_category (name) values ('arcanologie');
-insert into public.events_category (name) values ('criminalité');
-insert into public.events_category (name) values ('scandale');
-insert into public.events_category (name) values ('commerce');
-insert into public.events_category (name) values ('législation');
+insert into public.calendar_events_category (name) values ('naissance');
+insert into public.calendar_events_category (name) values ('mort');
+insert into public.calendar_events_category (name) values ('catastrophe');
+insert into public.calendar_events_category (name) values ('catastrophe naturelle');
+insert into public.calendar_events_category (name) values ('inauguration');
+insert into public.calendar_events_category (name) values ('religion');
+insert into public.calendar_events_category (name) values ('invention');
+insert into public.calendar_events_category (name) values ('science');
+insert into public.calendar_events_category (name) values ('bénédiction');
+insert into public.calendar_events_category (name) values ('joueurs');
+insert into public.calendar_events_category (name) values ('découverte');
+insert into public.calendar_events_category (name) values ('exploration');
+insert into public.calendar_events_category (name) values ('construction');
+insert into public.calendar_events_category (name) values ('arcanologie');
+insert into public.calendar_events_category (name) values ('criminalité');
+insert into public.calendar_events_category (name) values ('scandale');
+insert into public.calendar_events_category (name) values ('commerce');
+insert into public.calendar_events_category (name) values ('législation');
-- Character categories
insert into public.characters_category (name) values ('joueur');
@@ -39,10 +39,24 @@ insert into public.characters_category (name) values ('commerçant');
insert into public.worlds (name, description, color) values ('Léïm', 'Monde d''aventures et d''intrigues med-fan', 'black');
-- Worlds' calendars
-insert into public.world_calendars (world_id, months, days_per_year) values (1, ARRAY['Jalen', 'Malsen', 'Verlys', 'Nalys', 'Verdore', 'Sidore', 'Lyllion', 'Rion', 'Farene', 'Dalvene'], 320);
+insert into public.world_calendars (world_id) values (1);
+
+-- Calendar's months
+insert into public.calendar_months (calendar_id, name, days, position) values (1, 'Jalen', 32, 1);
+insert into public.calendar_months (calendar_id, name, days, position) values (1, 'Malsen', 32, 2);
+insert into public.calendar_months (calendar_id, name, days, position) values (1, 'Verlys', 32, 3);
+insert into public.calendar_months (calendar_id, name, days, position) values (1, 'Nalys', 32, 4);
+insert into public.calendar_months (calendar_id, name, days, position) values (1, 'Verdore', 32, 5);
+insert into public.calendar_months (calendar_id, name, days, position) values (1, 'Sidore', 32, 6);
+insert into public.calendar_months (calendar_id, name, days, position) values (1, 'Lyllion', 32, 7);
+insert into public.calendar_months (calendar_id, name, days, position) values (1, 'Rion', 32, 8);
+insert into public.calendar_months (calendar_id, name, days, position) values (1, 'Farene', 32, 9);
+insert into public.calendar_months (calendar_id, name, days, position) values (1, 'Dalvene', 32, 10);
+insert into public.calendar_months (calendar_id, name, days, position) values (1, 'Testos', 32, 11);
+insert into public.calendar_months (calendar_id, name, days, position) values (1, 'Jalen2 le meilleur', 32, 12);
-- Events
-insert into public.events (title, description, start_date, category, hidden, wiki, calendar_id) values (
+insert into public.calendar_events (title, description, start_date, category, hidden, wiki, calendar_id) values (
'Laurdieu devient la première cité de l''empire de Kaliatos',
'L''empire de Kaliatos établi sa capitale dans la cité de Laurdieu, qui connaitra une prospérité nouvelle au sein d''Aldys.',
'{ "day": 3, "month": 4, "year": -1932 }',
@@ -51,7 +65,7 @@ insert into public.events (title, description, start_date, category, hidden, wik
'https://alexcreates.fr/leim/index.php/Laurdieu',
1
);
-insert into public.events (title, description, start_date, category, hidden, wiki, calendar_id) values (
+insert into public.calendar_events (title, description, start_date, category, hidden, wiki, calendar_id) values (
'Apparition d''Asménys',
'La défunte chanteuse Asménys apparaît à un barde pendant son jeune public, démarrant la religion des Prêtresses d''Asménys.',
'{ "day": 19, "month": 7, "year": -1358 }',
@@ -60,7 +74,7 @@ insert into public.events (title, description, start_date, category, hidden, wik
'https://alexcreates.fr/leim/index.php/Pr%C3%AAtresses_d%27Asm%C3%A9nys',
1
);
-insert into public.events (title, description, start_date, end_date, category, hidden, wiki, calendar_id) values (
+insert into public.calendar_events (title, description, start_date, end_date, category, hidden, wiki, calendar_id) values (
'La Rupture',
'Les Abysses se déversent à la surface de Léim, à travers plusieurs brèches. Plusieurs hordes de démons se rapprochent des villes, et ce qu''on appellera l''Âge des Abysses commencent alors sur la planète entière.',
'{ "day": 26, "month": 5, "year": -756 }',
@@ -70,7 +84,7 @@ insert into public.events (title, description, start_date, end_date, category, h
'https://alexcreates.fr/leim/index.php/Seconde_Rupture',
1
);
-insert into public.events (title, description, start_date, end_date, category, hidden, wiki, calendar_id) values (
+insert into public.calendar_events (title, description, start_date, end_date, category, hidden, wiki, calendar_id) values (
'Marche du sang',
'L''empereur de Kaliatos ordonne personnellement la traque de Jorhas Kirendre pour connivence avec les démons. Plusieurs bataillons sont affectés à la chasse de Jorhas, qui se terminera par son incarcération ainsi que la mort de plusieurs centaines de soldats.',
'{ "day": 18, "month": 9, "year": -420 }',
@@ -80,7 +94,7 @@ insert into public.events (title, description, start_date, end_date, category, h
'https://alexcreates.fr/leim/index.php/Jorhas_Kirendre',
1
);
-insert into public.events (title, description, start_date, category, hidden, wiki, calendar_id) values (
+insert into public.calendar_events (title, description, start_date, category, hidden, wiki, calendar_id) values (
'Exécution de Tyhos',
'Le léviathan Tyhos rend l''âme après un combat de plusieurs années contre Lystos, le dieu du Soleil.',
'{ "day": 1, "month": 0, "year": 0 }',
@@ -89,14 +103,14 @@ insert into public.events (title, description, start_date, category, hidden, wik
'https://alexcreates.fr/leim/index.php/Tyhos',
1
);
-insert into public.events (title, start_date, category, wiki, calendar_id) values (
+insert into public.calendar_events (title, start_date, category, wiki, calendar_id) values (
'Traité de Kadel',
'{ "day": 29, "month": 4, "year": 100 }',
5,
'https://alexcreates.fr/leim/index.php/Alliance_Kald%C3%A9lienne#Trait%C3%A9_de_Kadel',
1
);
-insert into public.events (title, description, start_date, category, hidden, wiki, calendar_id) values (
+insert into public.calendar_events (title, description, start_date, category, hidden, wiki, calendar_id) values (
'Découverte des Plaines de Poussières',
'Les troupes de la reconquête aldienne explorent le littoral d''une immense étendue grise et inerte.',
'{ "day": 17, "month": 7, "year": 305 }',
From 5dd06ea3f86469cf1c3608144ee9e07ec2bbc529 Mon Sep 17 00:00:00 2001
From: Alexis <35.alexis.pele@gmail.com>
Date: Fri, 17 May 2024 17:03:56 +0200
Subject: [PATCH 03/15] Fixed errors caused by new event model
---
components/calendar/CalendarEvent.vue | 38 ++++++------
components/calendar/CalendarEventDetails.vue | 40 ++++++-------
.../calendar/search/lists/EventCallout.vue | 58 +++++++++----------
3 files changed, 66 insertions(+), 70 deletions(-)
diff --git a/components/calendar/CalendarEvent.vue b/components/calendar/CalendarEvent.vue
index e80d2ce..d388f15 100644
--- a/components/calendar/CalendarEvent.vue
+++ b/components/calendar/CalendarEvent.vue
@@ -2,9 +2,7 @@
import { ref } from 'vue'
import { cn } from '@/lib/utils'
import { areDatesIdentical, type RPGDate } from '@/models/Date'
-
import type { CalendarEvent } from '~/models/CalendarEvent'
-import CalendarEventDetails from './CalendarEventDetails.vue'
const props = defineProps<{
event: CalendarEvent
@@ -32,24 +30,24 @@ function handleClosePopover() {
:class="
cn({
'text-white bg-slate-600 hover:bg-slate-700': !event.category,
- 'text-white bg-lime-600 hover:bg-lime-700': event.category === 'naissance',
- 'text-white bg-stone-500 hover:bg-stone-700': event.category === 'mort',
- 'text-white bg-orange-600 hover:bg-orange-700': event.category === 'catastrophe',
- 'text-white bg-pink-600 hover:bg-pink-700': event.category === 'catastrophe naturelle',
- 'text-white bg-sky-600 hover:bg-sky-700': event.category === 'législation',
- 'text-white bg-purple-600 hover:bg-purple-700': event.category === 'religion',
- 'text-white bg-emerald-600 hover:bg-emerald-700': event.category === 'joueurs',
- 'text-slate-900 bg-amber-300 hover:bg-amber-400': event.category === 'inauguration',
- 'text-slate-900 bg-emerald-200 hover:bg-emerald-300': event.category === 'invention',
- 'text-slate-900 bg-cyan-300 hover:bg-cyan-400': event.category === 'science',
- 'text-slate-900 bg-white hover:bg-yellow-200': event.category === 'bénédiction',
- 'text-slate-900 bg-purple-200 hover:bg-purple-300': event.category === 'découverte',
- 'text-slate-900 bg-indigo-200 hover:bg-indigo-300': event.category === 'exploration',
- 'text-white bg-amber-600 hover:bg-amber-700': event.category === 'construction',
- 'text-slate-900 bg-violet-200 hover:bg-violet-300': event.category === 'arcanologie',
- 'text-white bg-rose-600 hover:bg-rose-700': event.category === 'criminalité',
- 'text-white bg-stone-600 hover:bg-stone-700': event.category === 'scandale',
- 'text-slate-900 bg-yellow-500 hover:bg-yellow-600': event.category === 'commerce',
+ 'text-white bg-lime-600 hover:bg-lime-700': event.category?.name === 'naissance',
+ 'text-white bg-stone-500 hover:bg-stone-700': event.category?.name === 'mort',
+ 'text-white bg-orange-600 hover:bg-orange-700': event.category?.name === 'catastrophe',
+ 'text-white bg-pink-600 hover:bg-pink-700': event.category?.name === 'catastrophe naturelle',
+ 'text-white bg-sky-600 hover:bg-sky-700': event.category?.name === 'législation',
+ 'text-white bg-purple-600 hover:bg-purple-700': event.category?.name === 'religion',
+ 'text-white bg-emerald-600 hover:bg-emerald-700': event.category?.name === 'joueurs',
+ 'text-slate-900 bg-amber-300 hover:bg-amber-400': event.category?.name === 'inauguration',
+ 'text-slate-900 bg-emerald-200 hover:bg-emerald-300': event.category?.name === 'invention',
+ 'text-slate-900 bg-cyan-300 hover:bg-cyan-400': event.category?.name === 'science',
+ 'text-slate-900 bg-white hover:bg-yellow-200': event.category?.name === 'bénédiction',
+ 'text-slate-900 bg-purple-200 hover:bg-purple-300': event.category?.name === 'découverte',
+ 'text-slate-900 bg-indigo-200 hover:bg-indigo-300': event.category?.name === 'exploration',
+ 'text-white bg-amber-600 hover:bg-amber-700': event.category?.name === 'construction',
+ 'text-slate-900 bg-violet-200 hover:bg-violet-300': event.category?.name === 'arcanologie',
+ 'text-white bg-rose-600 hover:bg-rose-700': event.category?.name === 'criminalité',
+ 'text-white bg-stone-600 hover:bg-stone-700': event.category?.name === 'scandale',
+ 'text-slate-900 bg-yellow-500 hover:bg-yellow-600': event.category?.name === 'commerce',
'rounded-r-none': isStartEvent,
'rounded-l-none': isEndEvent
})
diff --git a/components/calendar/CalendarEventDetails.vue b/components/calendar/CalendarEventDetails.vue
index 95d4aa1..76b412c 100644
--- a/components/calendar/CalendarEventDetails.vue
+++ b/components/calendar/CalendarEventDetails.vue
@@ -1,6 +1,6 @@
-
@@ -91,15 +89,15 @@ const dateDuration: string | null = props.event.endDate