From 9d1d21dfff6fcbdd3dfb76df5f9449910f36c519 Mon Sep 17 00:00:00 2001 From: Dan Willman Date: Wed, 10 Apr 2024 12:31:10 -0500 Subject: [PATCH 1/2] Fix format when event runs over multiple months --- .../wi/[year]/tickets/_components/Hero.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/(that conferences)/wi/[year]/tickets/_components/Hero.svelte b/src/routes/(that conferences)/wi/[year]/tickets/_components/Hero.svelte index c42f018..fc8e062 100644 --- a/src/routes/(that conferences)/wi/[year]/tickets/_components/Hero.svelte +++ b/src/routes/(that conferences)/wi/[year]/tickets/_components/Hero.svelte @@ -18,7 +18,7 @@

{`${venue.city}, ${venue.state}`} / {dayjs( event.startDate - ).format('MMMM Do')} - {dayjs(event.endDate).format('Do, YYYY')} + ).format('MMMM Do')} - {dayjs(event.endDate).format('MMMM Do, YYYY')}

From bb3b01a62487b4ee34e565f4897813c6a09aa543 Mon Sep 17 00:00:00 2001 From: Dan Willman Date: Wed, 10 Apr 2024 12:36:24 -0500 Subject: [PATCH 2/2] Make more betterer compare --- .../wi/[year]/tickets/_components/Hero.svelte | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/routes/(that conferences)/wi/[year]/tickets/_components/Hero.svelte b/src/routes/(that conferences)/wi/[year]/tickets/_components/Hero.svelte index fc8e062..9f5573b 100644 --- a/src/routes/(that conferences)/wi/[year]/tickets/_components/Hero.svelte +++ b/src/routes/(that conferences)/wi/[year]/tickets/_components/Hero.svelte @@ -10,15 +10,22 @@ dayjs.extend(advancedFormat); const venue = event.venues[0]; + + function isSameMonthAndYear(startDate, endDate) { + return dayjs(startDate).month() === dayjs(endDate).month() && + dayjs(startDate).year() === dayjs(endDate).year(); + }

- {`${venue.city}, ${venue.state}`} / {dayjs( - event.startDate - ).format('MMMM Do')} - {dayjs(event.endDate).format('MMMM Do, YYYY')} + {`${venue.city}, ${venue.state}`} / {#if isSameMonthAndYear(event.startDate, event.endDate)} + {dayjs(event.startDate).format('MMMM Do')} - {dayjs(event.endDate).format('Do, YYYY')} + {:else} + {dayjs(event.startDate).format('MMMM Do, YYYY')} - {dayjs(event.endDate).format('MMMM Do, YYYY')} + {/if}