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: add usecorpse hook and skeleton rendering #296

Merged
merged 1 commit into from
Jan 31, 2025
Merged

feat: add usecorpse hook and skeleton rendering #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
149 changes: 10 additions & 139 deletions src/WebClient/app/components/Graveyard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
import { useCallback, useEffect, useState, JSX } from 'react';
import {
Button,
Card,
CardHeader,
Image,
Text,
makeStyles,
tokens,
} from '@fluentui/react-components';
import { News16Regular } from '@fluentui/react-icons';
import { makeStyles, tokens } from '@fluentui/react-components';
import corpsesDocument from '@microsoftgraveyard/data/corpses.json';
import GraveyardHeader from '@microsoftgraveyard/components/GraveyardHeader';
import GraveyardFooter from '@microsoftgraveyard/components/GraveyardFooter';
import {
Corpse,
CorpseRecord,
CorpsesDocument,
} from '@microsoftgraveyard/types/corpse';
import Headstone from '@microsoftgraveyard/components/Headstone';

const useStyles = makeStyles({
main: {
Expand Down Expand Up @@ -52,94 +49,6 @@ const useStyles = makeStyles({
},
});

interface Corpse {
name: string;
qualifier: string | null;
birthDate: Date | null;
deathDate: Date;
description: string;
link: string;
}

interface CorpseRecord {
name: string;
qualifier: string | null;
birthDate: string | null;
deathDate: string;
description: string;
link: string;
}

interface CorpsesDocument {
$schema: string;
corpses: CorpseRecord[];
}

const getAge = (start: Date, end: Date): { age: number; period: string } => {
let years = end.getFullYear() - start.getFullYear();
if (
end.getMonth() < start.getMonth() ||
(end.getMonth() === start.getMonth() && end.getDate() < start.getDate())
) {
years--;
}

if (years >= 1) {
return { age: years, period: years === 1 ? 'year' : 'years' };
}

const months =
end.getMonth() -
start.getMonth() +
12 * (end.getFullYear() - start.getFullYear());
if (months >= 1) {
return { age: months, period: months === 1 ? 'month' : 'months' };
}

const days = end.getDate() - start.getDate();
return { age: days, period: days === 1 ? 'day' : 'days' };
};

const getExpectedDeathDate = (corpse: Corpse): string =>
corpse.deathDate.toLocaleDateString(undefined, {
month: 'long',
year: 'numeric',
});

const getFullName = (corpse: Corpse): string =>
corpse.qualifier ? `${corpse.name} (${corpse.qualifier})` : corpse.name;

const getLifeDates = (corpse: Corpse): string =>
corpse.birthDate
? `${corpse.birthDate.getFullYear()} - ${corpse.deathDate.getFullYear()}`
: `${corpse.deathDate.getFullYear()}`;

const getObituary = (corpse: Corpse, today: Date): string => {
let obituary = '';

const dead = isDead(corpse, today);
if (dead) {
const { age, period } = getAge(corpse.deathDate, today);
const message = age === 0 ? 'today' : `${age} ${period} ago`;
obituary += `Killed by Microsoft ${message}, `;
} else {
const { age, period } = getAge(today, corpse.deathDate);
obituary += `To be killed by Microsoft in ${age} ${period}, `;
}

obituary += `${corpse.name} ${dead ? 'was' : 'is'} ${corpse.description}.`;

if (dead && corpse.birthDate) {
const { age, period } = getAge(corpse.birthDate, corpse.deathDate);
obituary += ` It was ${age} ${period} old.`;
}

return obituary;
};

const isDead = (corpse: Corpse, today: Date): boolean =>
corpse.deathDate <= today;

const Graveyard = () => {
const [corpses, setCorpses] = useState<Corpse[]>([]);
const today: Date = new Date();
Expand Down Expand Up @@ -168,48 +77,10 @@ const Graveyard = () => {
);
}, []);

const renderGraves = (): JSX.Element[] => {
const renderHeadstones = (): JSX.Element[] => {
return corpses.map((corpse, index) => (
<li className={styles.container} key={index}>
<Card appearance="filled-alternative" key={index}>
<CardHeader
image={
<Image
src={
isDead(corpse, today)
? '/images/headstone.svg'
: '/images/coffin.svg'
}
alt="a headstone for that which is dead"
height={72}
width={72}
/>
}
header={
<Text as="h2" weight="bold" block className={styles.title}>
{getFullName(corpse)}
</Text>
}
description={
<Text as="p" className={styles.lifeDates}>
{isDead(corpse, today)
? getLifeDates(corpse)
: getExpectedDeathDate(corpse)}
</Text>
}
action={
<Button
as="a"
icon={<News16Regular />}
appearance="subtle"
href={corpse.link}
target="_blank"
rel="noreferrer noopener"
/>
}
/>
<Text as="p">{getObituary(corpse, today)}</Text>
</Card>
<Headstone corpse={corpse} today={today} />
</li>
));
};
Expand All @@ -222,7 +93,7 @@ const Graveyard = () => {
<main className={styles.main}>
<GraveyardHeader />
<section id="graveyard">
<ul className={styles.list}>{renderGraves()}</ul>
<ul className={styles.list}>{renderHeadstones()}</ul>
</section>
<GraveyardFooter />
</main>
Expand Down
158 changes: 158 additions & 0 deletions src/WebClient/app/components/Headstone.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
import {
Card,
CardHeader,
Button,
Image,
tokens,
makeStyles,
Skeleton,
SkeletonItem,
Body1,
Subtitle1,
} from '@fluentui/react-components';
import { News16Regular } from '@fluentui/react-icons';
import useCorpse from '@microsoftgraveyard/hooks/useCorpse';
import { Corpse } from '@microsoftgraveyard/types/corpse';
import { FC } from 'react';

const useStyles = makeStyles({
container: {
width: '100%',
},
skeletonImage: {
height: '72px',
width: '72px',
},
skeletonAction: {
height: '16px',
width: '16px',
},
skeletonFirstRow: {
alignItems: 'center',
display: 'grid',
paddingTop: '10px',
paddingBottom: '10px',
position: 'relative',
gap: '10px',
gridTemplateColumns: '20% 15% 30% 25% min-content',
},
skeletonSecondRow: {
alignItems: 'center',
display: 'grid',
paddingBottom: '10px',
position: 'relative',
gap: '10px',
gridTemplateColumns: '15% 30% 20% min-content 20%',
},
skeletonThirdRow: {
alignItems: 'center',
display: 'grid',
paddingBottom: '10px',
position: 'relative',
gap: '10px',
gridTemplateColumns: '10% 15% 20% 35% min-content',
},
title: {
margin: `${tokens.spacingVerticalXS} ${tokens.spacingHorizontalNone}`,
},
lifeDates: {
color: tokens.colorBrandForeground2,
lineHeight: tokens.lineHeightBase200,
margin: `${tokens.spacingVerticalXS} ${tokens.spacingHorizontalNone}`,
},
});

interface HeadstoneProps {
corpse: Corpse;
today: Date;
}

const Headstone: FC<HeadstoneProps> = ({ corpse, today }) => {
const styles = useStyles();
const { name, lifeDates, obituary, isDead, loading } = useCorpse(
corpse,
today
);

return (
<Card appearance="filled-alternative" className={styles.container}>
{loading ? (
<Skeleton aria-label="Loading headstone">
<CardHeader
image={
<SkeletonItem shape="circle" className={styles.skeletonImage} />
}
header={<SkeletonItem size={20} className={styles.title} />}
description={
<SkeletonItem size={16} className={styles.lifeDates} />
}
action={
<SkeletonItem
shape="square"
size={24}
className={styles.skeletonAction}
/>
}
/>
<div className={styles.skeletonFirstRow}>
<SkeletonItem size={12} />
<SkeletonItem size={12} />
<SkeletonItem size={12} />
<SkeletonItem size={12} />
<SkeletonItem size={12} />
</div>
<div className={styles.skeletonSecondRow}>
<SkeletonItem size={12} />
<SkeletonItem size={12} />
<SkeletonItem size={12} />
<SkeletonItem size={12} />
<SkeletonItem size={12} />
</div>
<div className={styles.skeletonThirdRow}>
<SkeletonItem size={12} />
<SkeletonItem size={12} />
<SkeletonItem size={12} />
<SkeletonItem size={12} />
<SkeletonItem size={12} />
</div>
</Skeleton>
) : (
<>
<CardHeader
image={
<Image
src={isDead ? '/images/headstone.svg' : '/images/coffin.svg'}
alt="a headstone for that which is dead"
height={72}
width={72}
/>
}
header={
<Subtitle1 as="h2" block className={styles.title}>
{name}
</Subtitle1>
}
description={
<Body1 as="p" className={styles.lifeDates}>
{lifeDates}
</Body1>
}
action={
<Button
as="a"
icon={<News16Regular />}
appearance="subtle"
href={corpse.link}
target="_blank"
rel="noreferrer noopener"
/>
}
/>
<Body1 as="p">{obituary}</Body1>
</>
)}
</Card>
);
};

export default Headstone;
Loading