From e9c14f355dc3a79f0d937c8c7f24d565d5bcb04c Mon Sep 17 00:00:00 2001
From: Alexis <35.alexis.pele@gmail.com>
Date: Wed, 1 May 2024 14:47:06 +0200
Subject: [PATCH] Fixed some bugs

One issue was a missing ui component and the other was about the previous commit's changes with startDate
---
 src/components/calendar/CalendarMenu.vue            |  1 +
 src/components/calendar/search/CalendarSearch.vue   |  6 +++---
 .../calendar/search/lists/EventCallout.vue          |  4 ++--
 src/components/calendar/search/lists/SearchList.vue |  6 +++---
 src/data/Events.ts                                  | 13 ++-----------
 src/models/Events.ts                                |  2 +-
 6 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/components/calendar/CalendarMenu.vue b/src/components/calendar/CalendarMenu.vue
index d6869b8..2afe5f3 100644
--- a/src/components/calendar/CalendarMenu.vue
+++ b/src/components/calendar/CalendarMenu.vue
@@ -2,6 +2,7 @@
 import { useCalendar } from '@/stores/CalendarStore'
 
 import { Button } from '@/components/ui/button'
+import { PhMagnifyingGlass } from '@phosphor-icons/vue'
 import CalendarMenuNav from './CalendarMenuNav.vue'
 import CalendarMenuToday from './CalendarMenuToday.vue'
 import CalendarSwitch from './CalendarSwitch.vue'
diff --git a/src/components/calendar/search/CalendarSearch.vue b/src/components/calendar/search/CalendarSearch.vue
index 2ab164d..8daa23d 100644
--- a/src/components/calendar/search/CalendarSearch.vue
+++ b/src/components/calendar/search/CalendarSearch.vue
@@ -139,7 +139,7 @@ const searchResults = computed<(Character | CalendarEvent)[]>(() => {
       }
 
       hitCategories = selectedCategories.value.every((selectedCat) => {
-        return allCategories.includes(selectedCat)
+        return allCategories.includes(selectedCat as CalendarEventCategory)
       })
 
       return (hitTitle || hitDesc) && hitCategories
@@ -162,7 +162,7 @@ const searchResults = computed<(Character | CalendarEvent)[]>(() => {
 
       // Handle categories logic
       let hitCategories: boolean = false
-      let allCategories: CalendarEventCategory[] = []
+      let allCategories: CharacterCategory[] = []
 
       if (item.category) {
         allCategories.push(item.category)
@@ -173,7 +173,7 @@ const searchResults = computed<(Character | CalendarEvent)[]>(() => {
       }
 
       hitCategories = selectedCategories.value.every((selectedCat) => {
-        return allCategories.includes(selectedCat)
+        return allCategories.includes(selectedCat as CharacterCategory)
       })
 
       return hitTitle && hitCategories
diff --git a/src/components/calendar/search/lists/EventCallout.vue b/src/components/calendar/search/lists/EventCallout.vue
index 0b0f64f..7aebc83 100644
--- a/src/components/calendar/search/lists/EventCallout.vue
+++ b/src/components/calendar/search/lists/EventCallout.vue
@@ -53,10 +53,10 @@ const { defaultDate, getFormattedDateTitle } = useCalendar()
     </div>
 
     <div class="mb-1 flex gap-4 items-center">
-      <p class="opacity-75">{{ getFormattedDateTitle(event.date, true) }}</p>
+      <p class="opacity-75">{{ getFormattedDateTitle(event.startDate, true) }}</p>
       <p class="text-sm italic opacity-75 flex items-center gap-1">
         <PhHourglassMedium size="16" weight="fill" />
-        {{ getRelativeString(defaultDate, event.date) }}
+        {{ getRelativeString(defaultDate, event.startDate) }}
       </p>
     </div>
 
diff --git a/src/components/calendar/search/lists/SearchList.vue b/src/components/calendar/search/lists/SearchList.vue
index d7d92ad..736d143 100644
--- a/src/components/calendar/search/lists/SearchList.vue
+++ b/src/components/calendar/search/lists/SearchList.vue
@@ -36,7 +36,7 @@ const sortedResults = computed(() => {
     let secondDate: LeimDate
 
     if (isCalendarEvent(a)) {
-      firstDate = a.date
+      firstDate = a.startDate
     } else if (isCharacter(a) && a.birth) {
       firstDate = a.birth
     } else {
@@ -44,7 +44,7 @@ const sortedResults = computed(() => {
     }
 
     if (isCalendarEvent(b)) {
-      secondDate = b.date
+      secondDate = b.startDate
     } else if (isCharacter(b) && b.birth) {
       secondDate = b.birth
     } else {
@@ -62,7 +62,7 @@ const pagedResults = computed(() => sortedResults.value.slice(props.startAt, pro
 <template>
   <ul class="grid gap-4">
     <li v-for="r in pagedResults" :key="isCalendarEvent(r) ? r.title : r.name">
-      <EventCallout v-if="isCalendarEvent(r)" @click="handleJumpToDate(r.date)" :event="r" />
+      <EventCallout v-if="isCalendarEvent(r)" @click="handleJumpToDate(r.startDate)" :event="r" />
 
       <CharacterCallout
         v-else-if="isCharacter(r)"
diff --git a/src/data/Events.ts b/src/data/Events.ts
index 28b96cb..9af8c7f 100644
--- a/src/data/Events.ts
+++ b/src/data/Events.ts
@@ -51,24 +51,15 @@ export const regularEvents: CalendarEvent[] = [
     hidden: true
   },
   {
-    title: 'Début de la construction du Rempart de Laurdieu',
+    title: 'Construction du Rempart de Laurdieu',
     startDate: { day: 30, month: 2, year: 340 },
+    endDate: { day: 27, month: 9, year: 355 },
     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',
     wiki: 'https://alexcreates.fr/leim/index.php/Plaines_de_poussi%C3%A8re',
     hidden: true
   },
-  {
-    title: 'Finition du Rempart de Laurdieu',
-    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',
-    secondaryCategories: ['inauguration'],
-    wiki: 'https://alexcreates.fr/leim/index.php/Plaines_de_poussi%C3%A8re',
-    hidden: true
-  },
 
   // Histoire Récente
   {
diff --git a/src/models/Events.ts b/src/models/Events.ts
index 3a01343..98178e0 100644
--- a/src/models/Events.ts
+++ b/src/models/Events.ts
@@ -34,5 +34,5 @@ export const calendarEventCategories = [
 export type CalendarEventCategory = (typeof calendarEventCategories)[number]
 
 export function isCalendarEvent(object: any): object is CalendarEvent {
-  return 'date' in object
+  return 'startDate' in object
 }