Skip to content
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

feat(web): Generic List - Stop date from taking up space if it is not present #17188

Merged
merged 2 commits into from
Dec 10, 2024
Merged

feat(web): Generic List - Stop date from taking up space if it is not present #17188

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fd5d83
Stop date from taking up space if it is not present
RunarVestmann Dec 10, 2024
df7e7fd
Merge branch 'main' into feature/web-generic-list-hide-date
kodiakhq[bot] Dec 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
67 changes: 47 additions & 20 deletions apps/web/components/GenericList/GenericList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
GridColumn,
GridContainer,
GridRow,
Hyphen,
Icon,
type IconProps,
Inline,
Expand Down Expand Up @@ -85,9 +86,11 @@ export const NonClickableItem = ({ item }: ItemProps) => {
<Stack space={3}>
<Stack space={0}>
<Stack space={0}>
<Text variant="eyebrow" color="purple400">
{item.date && format(new Date(item.date), 'dd.MM.yyyy')}
</Text>
{item.date && (
<Text variant="eyebrow" color="purple400">
{format(new Date(item.date), 'dd.MM.yyyy')}
</Text>
)}
<Text variant="h3" as="span" color="dark400">
{item.title}
</Text>
Expand Down Expand Up @@ -153,24 +156,48 @@ export const ClickableItem = ({ item, baseUrl }: ClickableItemProps) => {
<Stack space={3}>
<Box width="full">
<Box width="full">
<Box className={styles.clickableItemTopRowContainer}>
<Inline space={2} justifyContent="spaceBetween">
<Text variant="eyebrow" color="purple400">
{item.date && format(new Date(item.date), 'dd.MM.yyyy')}
{item.date && (
<Box className={styles.clickableItemTopRowContainer}>
<Inline space={2} justifyContent="spaceBetween">
<Text variant="eyebrow" color="purple400">
{format(new Date(item.date), 'dd.MM.yyyy')}
</Text>
{icon && (
<Icon
size="medium"
type="outline"
color="blue400"
icon={icon}
/>
)}
</Inline>
</Box>
)}
<GridRow>
<GridColumn
span={
!item.date && icon
? ['10/12', '10/12', '10/12', '10/12', '11/12']
: '1/1'
}
>
<Text variant="h3" as="span" color="blue400">
<Hyphen>{item.title}</Hyphen>
</Text>
{icon && (
<Icon
size="medium"
type="outline"
color="blue400"
icon={icon}
/>
)}
</Inline>
</Box>
<Text variant="h3" as="span" color="blue400">
{item.title}
</Text>
</GridColumn>
{!item.date && icon && (
<GridColumn span={['2/12', '2/12', '2/12', '2/12', '1/12']}>
<Box display="flex" justifyContent="flexEnd">
<Icon
size="medium"
type="outline"
color="blue400"
icon={icon}
/>
</Box>
</GridColumn>
)}
</GridRow>
</Box>
{item.cardIntro?.length > 0 && (
<Box>{webRichText(item.cardIntro ?? [])}</Box>
Expand Down
Loading