From 87df080857a8c1ece067f33a93939538d1f8d987 Mon Sep 17 00:00:00 2001
From: Alexis <35.alexis.pele@gmail.com>
Date: Wed, 1 May 2024 14:15:56 +0200
Subject: [PATCH] Changed default event date to startDate

---
 .../calendar/CalendarEventDetails.vue         |  4 +-
 .../calendar/state/monthly/DayTile.vue        |  2 +-
 .../calendar/state/yearly/DayTile.vue         |  2 +-
 src/data/Events.ts                            | 44 +++++++++----------
 src/models/Events.ts                          |  3 +-
 src/stores/EventStore.ts                      | 19 ++++----
 6 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/src/components/calendar/CalendarEventDetails.vue b/src/components/calendar/CalendarEventDetails.vue
index 4adbecd..b81e413 100644
--- a/src/components/calendar/CalendarEventDetails.vue
+++ b/src/components/calendar/CalendarEventDetails.vue
@@ -11,7 +11,7 @@ const { defaultDate, getFormattedDateTitle } = useCalendar()
 
 const props = defineProps<{ event: CalendarEvent }>()
 
-const dateDifference: string = getRelativeString(defaultDate, props.event.date)
+const dateDifference: string = getRelativeString(defaultDate, props.event.startDate)
 </script>
 
 <template>
@@ -47,7 +47,7 @@ const dateDifference: string = getRelativeString(defaultDate, props.event.date)
       </div>
 
       <div class="mb-1 space-y-1">
-        <p class="font-semibold">{{ getFormattedDateTitle(event.date, true) }}</p>
+        <p class="font-semibold">{{ getFormattedDateTitle(event.startDate, true) }}</p>
         <p class="text-sm italic opacity-75 flex items-center gap-1">
           <PhHourglassMedium size="16" weight="fill" /> {{ dateDifference }}
         </p>
diff --git a/src/components/calendar/state/monthly/DayTile.vue b/src/components/calendar/state/monthly/DayTile.vue
index f1c3a4e..5d9aada 100644
--- a/src/components/calendar/state/monthly/DayTile.vue
+++ b/src/components/calendar/state/monthly/DayTile.vue
@@ -24,7 +24,7 @@ const { currentEvents } = storeToRefs(useCalendarEvents())
 
 const eventsForTheDay = computed(() => {
   return currentEvents.value.filter((currentEvent) => {
-    return areDatesIdentical(currentEvent.date, props.date)
+    return areDatesIdentical(currentEvent.startDate, props.date)
   })
 })
 
diff --git a/src/components/calendar/state/yearly/DayTile.vue b/src/components/calendar/state/yearly/DayTile.vue
index d065c1d..9c1e1dd 100644
--- a/src/components/calendar/state/yearly/DayTile.vue
+++ b/src/components/calendar/state/yearly/DayTile.vue
@@ -33,7 +33,7 @@ const isSelectedDate = computed<boolean>(() => {
 const hasAtLeastOneEvent = computed<boolean>(() => {
   return Boolean(
     currentEvents.value.find((currentEvent) => {
-      return areDatesIdentical(currentEvent.date, tileDate.value)
+      return areDatesIdentical(currentEvent.startDate, tileDate.value)
     })
   )
 })
diff --git a/src/data/Events.ts b/src/data/Events.ts
index 66301fb..28b96cb 100644
--- a/src/data/Events.ts
+++ b/src/data/Events.ts
@@ -4,7 +4,7 @@ export const regularEvents: CalendarEvent[] = [
   // Histoire Antique
   {
     title: "Laurdieu devient la première cité de l'empire de Kaliatos",
-    date: { day: 3, month: 4, year: -1932 },
+    startDate: { day: 3, month: 4, year: -1932 },
     description:
       "L'empire de Kaliatos établi sa capitale dans la cité de Laurdieu, qui connaitra une prospérité nouvelle au sein d'Aldys.",
     category: 'législation',
@@ -14,7 +14,7 @@ export const regularEvents: CalendarEvent[] = [
   },
   {
     title: "Apparition d'Asménys",
-    date: { day: 19, month: 7, year: -1358 },
+    startDate: { day: 19, month: 7, year: -1358 },
     description:
       "La défunte chanteuse Asménys apparaît à un barde pendant son jeune public, démarrant la religion des Prêtresses d'Asménys.",
     category: 'religion',
@@ -24,7 +24,7 @@ export const regularEvents: CalendarEvent[] = [
   },
   {
     title: 'Exécution de Tyhos',
-    date: { day: 1, month: 0, year: 0 },
+    startDate: { day: 1, month: 0, year: 0 },
     description:
       "Le léviathan Tyhos rend l'âme après un combat de plusieurs années contre Lystos, le dieu du Soleil.",
     category: 'bénédiction',
@@ -34,7 +34,7 @@ export const regularEvents: CalendarEvent[] = [
   },
   {
     title: 'Traité de Kadel',
-    date: { day: 29, month: 4, year: 100 },
+    startDate: { day: 29, month: 4, year: 100 },
     description: '',
     category: 'inauguration',
     secondaryCategories: ['législation'],
@@ -42,7 +42,7 @@ export const regularEvents: CalendarEvent[] = [
   },
   {
     title: 'Découverte des Plaines de Poussières',
-    date: { day: 17, month: 7, year: 305 },
+    startDate: { day: 17, month: 7, year: 305 },
     description:
       "Les troupes de la reconquête aldienne explorent le littoral d'une immense étendue grise et inerte.",
     category: 'découverte',
@@ -52,7 +52,7 @@ export const regularEvents: CalendarEvent[] = [
   },
   {
     title: 'Début de la construction du Rempart de Laurdieu',
-    date: { day: 30, month: 2, year: 340 },
+    startDate: { day: 30, month: 2, year: 340 },
     description:
       "Le Grand Conseil Kaldélien ordonne la construction d'une muraille autour des Plaines de Poussières, afin de contenir les quelques démons y sortant.",
     category: 'construction',
@@ -61,7 +61,7 @@ export const regularEvents: CalendarEvent[] = [
   },
   {
     title: 'Finition du Rempart de Laurdieu',
-    date: { day: 27, month: 9, year: 355 },
+    startDate: { day: 27, month: 9, year: 355 },
     description:
       "Les terramanciens kaldéliens terminent les remparts protégeant l'alliance des démons des Plaines de Poussières.",
     category: 'construction',
@@ -73,7 +73,7 @@ export const regularEvents: CalendarEvent[] = [
   // Histoire Récente
   {
     title: "Inauguration de l'Académie Artistique Arcanique",
-    date: { day: 11, month: 6, year: 2545 },
+    startDate: { day: 11, month: 6, year: 2545 },
     description:
       "Scäd Sceni ouvre son institut artistique dédié à l'apprentissage des arts arcaniques",
     category: 'inauguration',
@@ -82,7 +82,7 @@ export const regularEvents: CalendarEvent[] = [
   },
   {
     title: 'Création de la buse kaldélienne',
-    date: { day: 4, month: 2, year: 3113 },
+    startDate: { day: 4, month: 2, year: 3113 },
     description:
       'Sophia de Rougefer invente la buse kaldélienne, une arme à feu souple à deux canons.',
     category: 'invention',
@@ -91,7 +91,7 @@ export const regularEvents: CalendarEvent[] = [
   },
   {
     title: 'Scandale Rodhus',
-    date: { day: 25, month: 9, year: 3208 },
+    startDate: { day: 25, month: 9, year: 3208 },
     description:
       "Tivian Rodhus, un professeur estimé de l'Académie Centrale Kaldélienne, est emprisonné pour corruption et aggression sexuelle. Le corps enseignant y est remanié sur ordre de Lazarus Tymos, comte de Nacride.",
     category: 'criminalité',
@@ -102,7 +102,7 @@ export const regularEvents: CalendarEvent[] = [
   // "Les Milles Cages"
   {
     title: "Arrivée d'aventuriers à Borélis",
-    date: { day: 12, month: 7, year: 3209 },
+    startDate: { day: 12, month: 7, year: 3209 },
     description:
       'Tara Belyus, Vascylly et Adol Sulvan livrent 3 condamnés à Handany. Ils partent pour la mer durant la journée.',
     category: 'joueurs'
@@ -111,25 +111,25 @@ export const regularEvents: CalendarEvent[] = [
     title: "Naufrage de l'Éclipse",
     description:
       "L'Éclipse, le navire de la garde contenant des condamnés à destination des Cages Handaniennes, s'échoue au large des côtes montagneuses de la Lance d'Aldys.",
-    date: { day: 14, month: 7, year: 3209 },
+    startDate: { day: 14, month: 7, year: 3209 },
     category: 'catastrophe'
   },
   {
     title: 'Emprisonnement de Tivian Rodhus',
     description: "Celui qu'on surnomme la Bête d'Ambrose arrive à Handany, où il purgera sa peine.",
-    date: { day: 14, month: 7, year: 3209 },
+    startDate: { day: 14, month: 7, year: 3209 },
     category: 'législation'
   },
   {
     title: 'Sulvan et Anastael atteignent Bamast',
-    date: { day: 19, month: 2, year: 3210 },
+    startDate: { day: 19, month: 2, year: 3210 },
     category: 'joueurs'
   },
   {
     title: 'Jugement de Bormis Griloup',
     description:
       "Bromis Griloup est jugé coupable d'escroquerie et sabotage aux Cours d'Acier de Tourgrise. Il purgera une peine de 10 ans au sein des prisons royales.",
-    date: { day: 4, month: 8, year: 3209 },
+    startDate: { day: 4, month: 8, year: 3209 },
     category: 'législation'
   },
 
@@ -137,42 +137,42 @@ export const regularEvents: CalendarEvent[] = [
   {
     title: 'Inauguration de la Cloche du Pilier',
     description: "Le Moine Premier inaugure la grande cloche d'argent au sommet du Pilier d'Ikami.",
-    date: { day: 29, month: 5, year: 3209 },
+    startDate: { day: 29, month: 5, year: 3209 },
     category: 'religion',
     hidden: true
   },
   {
     title: '1ère disparation à Cantane',
     description: "Taleb Vaht décède dans une grotte à la suite d'une attaque d'ischiels enragées.",
-    date: { day: 28, month: 7, year: 3209 },
+    startDate: { day: 28, month: 7, year: 3209 },
     category: 'mort',
     hidden: true
   },
   {
     title: '2ème disparation à Cantane',
     description: 'Donovane le mineur kéturien disparait sans laisser de traces.',
-    date: { day: 32, month: 7, year: 3209 },
+    startDate: { day: 32, month: 7, year: 3209 },
     category: 'mort',
     hidden: true
   },
   {
     title: '3ème disparation à Cantane',
     description: 'Disparition de Sébastien, gredin sauride.',
-    date: { day: 10, month: 8, year: 3209 },
+    startDate: { day: 10, month: 8, year: 3209 },
     category: 'mort',
     hidden: true
   },
   {
     title: '4ème disparation à Cantane',
     description: 'Disparition de Thérence, patrouilleur sauride de la Vieille Garde.',
-    date: { day: 19, month: 8, year: 3209 },
+    startDate: { day: 19, month: 8, year: 3209 },
     category: 'mort',
     hidden: true
   },
   {
     title: '5ème disparation à Cantane',
     description: 'Disparition de Mathilda Boulais, vendeuse de pierres.',
-    date: { day: 22, month: 8, year: 3209 },
+    startDate: { day: 22, month: 8, year: 3209 },
     category: 'mort',
     hidden: true
   },
@@ -180,7 +180,7 @@ export const regularEvents: CalendarEvent[] = [
     title: 'Grande Banque Minérale de Cantane',
     description:
       'Les artisans et mineurs de Rougefer se réunissent à Cantane pour vendre le fruit de leur dur labeur.',
-    date: { day: 23, month: 8, year: 3209 },
+    startDate: { day: 23, month: 8, year: 3209 },
     category: 'inauguration'
   }
 ]
diff --git a/src/models/Events.ts b/src/models/Events.ts
index 42949d8..3a01343 100644
--- a/src/models/Events.ts
+++ b/src/models/Events.ts
@@ -2,7 +2,8 @@ import type { LeimDate } from './Date'
 
 export interface CalendarEvent {
   title: string
-  date: LeimDate
+  startDate: LeimDate
+  endDate?: LeimDate
   description?: string
   category?: CalendarEventCategory
   secondaryCategories?: CalendarEventCategory[]
diff --git a/src/stores/EventStore.ts b/src/stores/EventStore.ts
index 1e24890..663f2f5 100644
--- a/src/stores/EventStore.ts
+++ b/src/stores/EventStore.ts
@@ -15,7 +15,7 @@ export const useCalendarEvents = defineStore('calendar-events', () => {
   const characterBirthEvents = charactersWithBirthData.map((character) => {
     return {
       title: `Naissance de ${character.name}`,
-      date: character.birth,
+      startDate: character.birth,
       category: 'naissance'
     } as CalendarEvent
   })
@@ -23,7 +23,7 @@ export const useCalendarEvents = defineStore('calendar-events', () => {
   const characterDeathEvents = charactersWithDeathData.map((character) => {
     return {
       title: `Décès de ${character.name}`,
-      date: character.death,
+      startDate: character.death,
       category: 'mort'
     } as CalendarEvent
   })
@@ -47,9 +47,10 @@ export const useCalendarEvents = defineStore('calendar-events', () => {
    * @returns Whether the event should appear in the current view
    */
   function shouldEventBeDisplayed(event: CalendarEvent): boolean {
-    const eventDateToDays = convertDateToDays(event.date)
+    const eventDateToDays = convertDateToDays(event.startDate)
     const isEventOnCurrentScreen =
-      event.date.year === currentDate.currentYear && event.date.month === currentDate.currentMonth
+      event.startDate.year === currentDate.currentYear &&
+      event.startDate.month === currentDate.currentMonth
 
     // Check whether the event is on the last 8 tiles
     // This is to allow leap events from appearing on the last 8 tiles
@@ -69,18 +70,18 @@ export const useCalendarEvents = defineStore('calendar-events', () => {
         return isEventOnCurrentScreen || isEventOnNext8Tiles
 
       case 'year':
-        return event.date.year === currentDate.currentYear
+        return event.startDate.year === currentDate.currentYear
 
       case 'decade':
         return (
-          event.date.year >= currentDate.currentYear &&
-          event.date.year <= currentDate.currentYear + 10
+          event.startDate.year >= currentDate.currentYear &&
+          event.startDate.year <= currentDate.currentYear + 10
         )
 
       case 'century':
         return (
-          event.date.year >= currentDate.currentYear &&
-          event.date.year <= currentDate.currentYear + 100
+          event.startDate.year >= currentDate.currentYear &&
+          event.startDate.year <= currentDate.currentYear + 100
         )
 
       default: