diff --git a/app/pages/admin/events/index.vue b/app/pages/admin/events/index.vue
index 0cafd01..9cf458d 100644
--- a/app/pages/admin/events/index.vue
+++ b/app/pages/admin/events/index.vue
@@ -92,8 +92,8 @@
{{ event.eventType }}
- {{ formatDate(event.startDate) }}
- {{ formatTime(event.startDate) }}
+ {{ formatDate(event) }}
+ {{ formatTime(event) }}
|
@@ -190,8 +190,8 @@
{{ event.eventType }}
|
- {{ formatDate(event.startDate) }}
- {{ formatTime(event.startDate) }}
+ {{ formatDate(event) }}
+ {{ formatTime(event) }}
|
@@ -349,19 +349,23 @@ watch([searchQuery, typeFilter, seriesFilter], () => {
pastPage.value = 1
})
-const formatDate = (dateString) => {
- return new Date(dateString).toLocaleDateString('en-US', {
+const formatDate = (event) => {
+ if (!event?.startDate) return ''
+ return new Date(event.startDate).toLocaleDateString('en-US', {
month: 'short',
day: 'numeric',
year: 'numeric',
+ timeZone: event.displayTimezone || 'America/Toronto',
})
}
-const formatTime = (dateString) => {
- return new Date(dateString).toLocaleTimeString('en-US', {
+const formatTime = (event) => {
+ if (!event?.startDate) return ''
+ return new Date(event.startDate).toLocaleTimeString('en-US', {
hour: 'numeric',
minute: '2-digit',
hour12: true,
+ timeZone: event.displayTimezone || 'America/Toronto',
})
}
diff --git a/app/pages/index.vue b/app/pages/index.vue
index de89b01..a675749 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -42,7 +42,7 @@
- {{ formatDate(event.startDate) }}
+ {{ formatDate(event) }}
{{
event.title
@@ -168,10 +168,13 @@ const circleData = [
},
];
-const formatDate = (dateStr) => {
- if (!dateStr) return "";
- const d = new Date(dateStr);
- return d.toLocaleDateString("en-US", { month: "short", day: "numeric" });
+const formatDate = (event) => {
+ if (!event?.startDate) return "";
+ return new Date(event.startDate).toLocaleDateString("en-US", {
+ month: "short",
+ day: "numeric",
+ timeZone: event.displayTimezone || "America/Toronto",
+ });
};
|