From 7c5de2654ef4d6eab9c9e0471e06c71fab46f0ee Mon Sep 17 00:00:00 2001
From: Alexis <35.alexis.pele@gmail.com>
Date: Thu, 25 Apr 2024 16:17:12 +0200
Subject: [PATCH] Added basic year view
---
src/components/calendar/Calendar.vue | 18 ++++----
src/components/calendar/state/Year.vue | 3 --
.../{Century.vue => centennially/Layout.vue} | 0
.../{Decade.vue => decennially/Layout.vue} | 0
.../monthly/DayTile.vue} | 6 +--
.../state/{Monthly.vue => monthly/Layout.vue} | 8 ++--
.../calendar/state/yearly/DayTile.vue | 43 +++++++++++++++++++
.../calendar/state/yearly/Layout.vue | 18 ++++++++
.../calendar/state/yearly/MonthTile.vue | 32 ++++++++++++++
src/stores/CalendarStore.ts | 1 -
10 files changed, 110 insertions(+), 19 deletions(-)
delete mode 100644 src/components/calendar/state/Year.vue
rename src/components/calendar/state/{Century.vue => centennially/Layout.vue} (100%)
rename src/components/calendar/state/{Decade.vue => decennially/Layout.vue} (100%)
rename src/components/calendar/{CalendarTile.vue => state/monthly/DayTile.vue} (97%)
rename src/components/calendar/state/{Monthly.vue => monthly/Layout.vue} (91%)
create mode 100644 src/components/calendar/state/yearly/DayTile.vue
create mode 100644 src/components/calendar/state/yearly/Layout.vue
create mode 100644 src/components/calendar/state/yearly/MonthTile.vue
diff --git a/src/components/calendar/Calendar.vue b/src/components/calendar/Calendar.vue
index 1636137..dd739ea 100644
--- a/src/components/calendar/Calendar.vue
+++ b/src/components/calendar/Calendar.vue
@@ -1,28 +1,30 @@
diff --git a/src/components/calendar/state/Year.vue b/src/components/calendar/state/Year.vue
deleted file mode 100644
index b5256a2..0000000
--- a/src/components/calendar/state/Year.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Annuel
-
diff --git a/src/components/calendar/state/Century.vue b/src/components/calendar/state/centennially/Layout.vue
similarity index 100%
rename from src/components/calendar/state/Century.vue
rename to src/components/calendar/state/centennially/Layout.vue
diff --git a/src/components/calendar/state/Decade.vue b/src/components/calendar/state/decennially/Layout.vue
similarity index 100%
rename from src/components/calendar/state/Decade.vue
rename to src/components/calendar/state/decennially/Layout.vue
diff --git a/src/components/calendar/CalendarTile.vue b/src/components/calendar/state/monthly/DayTile.vue
similarity index 97%
rename from src/components/calendar/CalendarTile.vue
rename to src/components/calendar/state/monthly/DayTile.vue
index 3d3a184..f1c3a4e 100644
--- a/src/components/calendar/CalendarTile.vue
+++ b/src/components/calendar/state/monthly/DayTile.vue
@@ -7,7 +7,7 @@ import { storeToRefs } from 'pinia'
import { computed, ref, type ComputedRef } from 'vue'
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import CalendarEventButton from './CalendarEvent.vue'
+import CalendarEventButton from '../../CalendarEvent.vue'
import type { CalendarEvent } from '@/models/Events'
const props = defineProps<{
@@ -107,8 +107,8 @@ const eventsNotDisplayed = computed(
- {{ date.day }}
+ {{ date.day }}
+
- {
-
-
+
-
+import { areDatesIdentical, type LeimDate } from '@/models/Date'
+import { useCalendar } from '@/stores/CalendarStore'
+import { storeToRefs } from 'pinia'
+import { computed, type ComputedRef } from 'vue'
+
+const { currentDate, defaultDate, selectDate } = useCalendar()
+const { selectedDate } = storeToRefs(useCalendar())
+
+const props = defineProps<{
+ monthNumber: number
+ dayNumber: number
+}>()
+
+const tileDate: ComputedRef = computed(() => {
+ return {
+ day: props.dayNumber,
+ month: props.monthNumber,
+ year: currentDate.currentYear
+ }
+})
+
+const isDefaultDate = computed(() => {
+ return areDatesIdentical(tileDate.value, defaultDate)
+})
+
+const isSelectedDate = computed(() => {
+ return areDatesIdentical(tileDate.value, selectedDate.value)
+})
+
+
+
+
+
diff --git a/src/components/calendar/state/yearly/Layout.vue b/src/components/calendar/state/yearly/Layout.vue
new file mode 100644
index 0000000..aea2a2b
--- /dev/null
+++ b/src/components/calendar/state/yearly/Layout.vue
@@ -0,0 +1,18 @@
+
+
+
+
+
diff --git a/src/components/calendar/state/yearly/MonthTile.vue b/src/components/calendar/state/yearly/MonthTile.vue
new file mode 100644
index 0000000..e6600ac
--- /dev/null
+++ b/src/components/calendar/state/yearly/MonthTile.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
+ {{ tileMonthName }}
+
+
+
+
+
+
diff --git a/src/stores/CalendarStore.ts b/src/stores/CalendarStore.ts
index cd1aaed..087f38b 100644
--- a/src/stores/CalendarStore.ts
+++ b/src/stores/CalendarStore.ts
@@ -378,7 +378,6 @@ export const useCalendar = defineStore('calendar', () => {
*/
function jumpToDefaultDate(): void {
jumpToDate(defaultDate.value)
- currentConfig.value.viewType = 'month'
}
/**