[UXIT-1680] Event Page · Include moderators and speakers #767
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,3 @@ | ||
| export type NonEmptyArray<T> = [T, ...Array<T>] | ||
| export type NonEmptyReadonlyArray<T> = readonly [T, ...Array<T>] | ||
| export type Object = Record<string, unknown> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| 'use client' | ||
|
|
||
| import { BasicCard } from '@/components/BasicCard' | ||
| import { Heading } from '@/components/Heading' | ||
| import { TextLink } from '@/components/TextLink' | ||
|
|
||
| import type { Event } from '../../../schemas/ScheduleSchema' | ||
| import { formatTime } from '../../utils/dateUtils' | ||
|
|
||
| import { type ParticipantsProps, ScheduleParticipants } from './Participants' | ||
|
|
||
| export function EventDetails(event: Event) { | ||
| return ( | ||
| <BasicCard> | ||
| <div className="grid gap-6 lg:grid-cols-3"> | ||
| <div className="flex gap-6 text-brand-300 lg:flex-col lg:gap-1"> | ||
| <div className="text-sm font-bold"> | ||
| <span>{formatTime(event.start)}</span> | ||
| {event.end && <span> – {formatTime(event.end)}</span>} | ||
| </div> | ||
| <span className="text-sm">{event.location}</span> | ||
| </div> | ||
| <div className="lg:col-span-2"> | ||
| <Heading tag="h3" variant="lg"> | ||
| {event.title} | ||
| </Heading> | ||
| <div className="mt-2 space-y-2"> | ||
| {event.description && ( | ||
| <p className="max-w-readable">{event.description}</p> | ||
| )} | ||
| {event.moderators && event.moderators.length > 0 && ( | ||
| <ScheduleParticipants | ||
| title="Moderators" | ||
| participants={ | ||
| event.moderators as ParticipantsProps['participants'] | ||
| } | ||
| /> | ||
| )} | ||
| {event.speakers && event.speakers.length > 0 && ( | ||
| <ScheduleParticipants | ||
| title="Speakers" | ||
| participants={ | ||
| event.speakers as ParticipantsProps['participants'] | ||
|
There was a problem hiding this comment. Same comment here :) |
||
| } | ||
| /> | ||
| )} | ||
| </div> | ||
| {event.url && ( | ||
| <div className="mt-4"> | ||
| <TextLink href={event.url}>View Details</TextLink> | ||
| </div> | ||
| )} | ||
| </div> | ||
| </div> | ||
| </BasicCard> | ||
| ) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| import React from 'react' | ||
|
|
||
| import type { NonEmptyArray } from '@/types/utils' | ||
|
|
||
| import type { Participant } from '../../../schemas/ScheduleSchema' | ||
|
|
||
| export type ParticipantsProps = { | ||
| title: string | ||
| participants: NonEmptyArray<Participant> | ||
| } | ||
|
|
||
| export function ScheduleParticipants({ | ||
| title, | ||
| participants, | ||
| }: ParticipantsProps) { | ||
| return ( | ||
| <p className="text-sm"> | ||
| <span className="font-semibold">{title}:</span>{' '} | ||
| <span>{participants.map(formatParticipant).join('; ')}</span> | ||
| </p> | ||
| ) | ||
| } | ||
|
|
||
| function formatParticipant({ name, company }: Participant) { | ||
| return `${name}, ${company}` | ||
| } | ||
|
There was a problem hiding this comment. UX improvement suggestion. I find mixing commas and semicolons hard to read, it's difficult to tell if word is a person’s name or a company name when scanning the text. Would that format be possible? I couldn't find a Figma design for this part so maybe this is already good to go. There was a problem hiding this comment. I like that! Yes, apologies, should've mentioned that there's no Figma design yet. |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the list of participants cannot be empty, then it would be better to reflect in the schema instead of using an
astype assertion hereSo here we would have:
And in the
EventSchemawe would have:What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, Yes! That's perfect. Thank you.