Skip to content

Fix awkward event dates spanning multiple months #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DanWillman wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix awkward event dates spanning multiple months #241

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d1d21d
Fix format when event runs over multiple months
DanWillman Apr 10, 2024
bb3b01a
Make more betterer compare
DanWillman Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/routes/(that conferences)/wi/[year]/tickets/_components/Hero.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
</script>

<Hero imagePath="/images/heros/wi/badge.jpg">
<div class="flex flex-col px-4">
<div class="flex max-w-3xl flex-col space-y-8">
<h2 class="text-2xl font-bold uppercase tracking-wider text-white antialiased">
<span class="text-green-500">{`${venue.city}, ${venue.state}`}</span> / {dayjs(
event.startDate
).format('MMMM Do')} - {dayjs(event.endDate).format('Do, YYYY')}
<span class="text-green-500">{`${venue.city}, ${venue.state}`}</span> / {#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}
Comment on lines +24 to +28
Copy link
Copy Markdown

@AgentEnder AgentEnder May 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it maybe worth pulling this whole block out into either a date range component or a formatDateRange util?

</h2>
<h1
class="text-4xl font-extrabold uppercase text-white sm:text-5xl md:text-6xl lg:text-5xl xl:text-6xl">
Expand Down