diff --git a/src/pageComponents/Event/Event.stories.tsx b/src/pageComponents/Event/Event.stories.tsx index a0b8ccd..3865f2b 100644 --- a/src/pageComponents/Event/Event.stories.tsx +++ b/src/pageComponents/Event/Event.stories.tsx @@ -123,4 +123,11 @@ export const WithOccurrences: Story = { }, ], }, +} + +export const WithOccurrencesAndGroup: Story = { + args: { + ...WithOccurrences.args, + group: 'some_group', + }, } \ No newline at end of file diff --git a/src/pageComponents/Event/Event.tsx b/src/pageComponents/Event/Event.tsx index c1aaf7c..a6a8b41 100644 --- a/src/pageComponents/Event/Event.tsx +++ b/src/pageComponents/Event/Event.tsx @@ -6,7 +6,7 @@ import { Container } from '@/components/Container/Container' import { Col } from '@/components/Flex/Col' import { Pill } from '@/components/Pill/Pill' import { useDate } from '@/hooks/useCompactDate' -import { readableDateTime } from '@/utils/readableDate' +import { formatEventDate } from '@/utils/formatEventDate' import { TextDiv } from '@/components/Text/TextDiv' import { Button } from '@/components/Button/Button' import Image, { StaticImageData } from 'next/image' @@ -72,7 +72,7 @@ export function EventPage( }: EventProps ) { const published = useDate(createdAt) - const readableDate = readableDateTime(date, endDateTime) + const readableDate = formatEventDate(new Date(date), endDateTime ? new Date(endDateTime) : undefined, "long") const where = locationString(location); const contactPersonPhoto = typeof contact === "object" ? getPhoto("thumbnail", contact.photo) : undefined; const isRecurring = recurrenceType && recurrenceType !== 'none' @@ -93,12 +93,13 @@ export function EventPage(
- {shortDescription} -
-+ +