From e61cf74d008732cb7f52f65ab373eb60a9e27ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20=C5=A0korpil?= Date: Sat, 7 Jan 2023 20:36:19 +0100 Subject: [PATCH] Added software icons, added date format component --- application/src/components/FormattedDate.tsx | 13 ++ .../components/feed/badges/CreatedAtBadge.tsx | 3 +- .../feed/badges/LastPostAtBadge.tsx | 3 +- .../src/components/node/NodeResult.tsx | 3 +- application/src/public/software/akkoma.svg | 87 ++++++++++++ .../src/public/software/birdsitelive.svg | 43 ++++++ application/src/public/software/calckey.svg | 66 +++++++++ application/src/public/software/ecko.svg | 9 +- application/src/public/software/foundkey.svg | 21 +++ application/src/public/software/gancio.svg | 48 +++++++ application/src/public/software/hometown.svg | 70 +++++++++- application/src/public/software/mastodon.svg | 12 +- application/src/public/software/takahe.svg | 128 ++++++++++++++++++ 13 files changed, 494 insertions(+), 12 deletions(-) create mode 100644 application/src/components/FormattedDate.tsx create mode 100644 application/src/public/software/akkoma.svg create mode 100644 application/src/public/software/birdsitelive.svg create mode 100644 application/src/public/software/calckey.svg create mode 100644 application/src/public/software/foundkey.svg create mode 100644 application/src/public/software/gancio.svg create mode 100644 application/src/public/software/takahe.svg diff --git a/application/src/components/FormattedDate.tsx b/application/src/components/FormattedDate.tsx new file mode 100644 index 0000000..52ca0ea --- /dev/null +++ b/application/src/components/FormattedDate.tsx @@ -0,0 +1,13 @@ +import React, { ReactElement, ReactNode } from 'react' + +export default function FormattedDate ({ timestamp, emptyValue, timeTitle }: { + timestamp: string | number | null | undefined + emptyValue?: string | ReactNode + timeTitle?: boolean +}): ReactElement { + if (timestamp === '' || timestamp === null || timestamp === undefined) { + return <>{emptyValue ?? ''} + } + const date = new Date(timestamp) + return {date.toLocaleDateString()} +} diff --git a/application/src/components/feed/badges/CreatedAtBadge.tsx b/application/src/components/feed/badges/CreatedAtBadge.tsx index 50230fd..b50e0c1 100644 --- a/application/src/components/feed/badges/CreatedAtBadge.tsx +++ b/application/src/components/feed/badges/CreatedAtBadge.tsx @@ -1,12 +1,13 @@ import React, { ReactElement } from 'react' import { faCalendarPlus } from '@fortawesome/free-solid-svg-icons' +import FormattedDate from '../../FormattedDate' import Badge from './Badge' export default function CreatedAtBadge ({ createdAt }: { createdAt: string | null }): ReactElement { return ( : null} className={'created-at'} /> ) diff --git a/application/src/components/feed/badges/LastPostAtBadge.tsx b/application/src/components/feed/badges/LastPostAtBadge.tsx index efa939f..5c0916f 100644 --- a/application/src/components/feed/badges/LastPostAtBadge.tsx +++ b/application/src/components/feed/badges/LastPostAtBadge.tsx @@ -1,4 +1,5 @@ import React, { ReactElement } from 'react' +import FormattedDate from '../../FormattedDate' import Badge from './Badge' import { faCalendarCheck } from '@fortawesome/free-solid-svg-icons' @@ -6,7 +7,7 @@ export default function LastPostAtBadge ({ lastStatusAt }: { lastStatusAt: strin return ( : null} className={'last-status-at'} /> ) diff --git a/application/src/components/node/NodeResult.tsx b/application/src/components/node/NodeResult.tsx index 009e505..7682b0b 100644 --- a/application/src/components/node/NodeResult.tsx +++ b/application/src/components/node/NodeResult.tsx @@ -1,5 +1,6 @@ import React, { ReactElement } from 'react' import { ListNodesItemFragment } from '../../graphql/generated/types' +import FormattedDate from '../FormattedDate' import SoftwareBadge from '../SoftwareBadge' export default function NodeResult ({ node }: { node: ListNodesItemFragment }): ReactElement { @@ -22,7 +23,7 @@ export default function NodeResult ({ node }: { node: ListNodesItemFragment }): ? '?' : (node.openRegistrations ? 'Opened' : 'Closed') } - {node.refreshedAt !== '' ? (new Date(node.refreshedAt)).toLocaleDateString() : 'Never'} + ) } diff --git a/application/src/public/software/akkoma.svg b/application/src/public/software/akkoma.svg new file mode 100644 index 0000000..de0157a --- /dev/null +++ b/application/src/public/software/akkoma.svg @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + diff --git a/application/src/public/software/birdsitelive.svg b/application/src/public/software/birdsitelive.svg new file mode 100644 index 0000000..4b69a80 --- /dev/null +++ b/application/src/public/software/birdsitelive.svg @@ -0,0 +1,43 @@ + + + + diff --git a/application/src/public/software/calckey.svg b/application/src/public/software/calckey.svg new file mode 100644 index 0000000..2fd1423 --- /dev/null +++ b/application/src/public/software/calckey.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + diff --git a/application/src/public/software/ecko.svg b/application/src/public/software/ecko.svg index 87ec2c5..65ccb4a 100644 --- a/application/src/public/software/ecko.svg +++ b/application/src/public/software/ecko.svg @@ -1,4 +1,7 @@ - - - + + + + + + diff --git a/application/src/public/software/foundkey.svg b/application/src/public/software/foundkey.svg new file mode 100644 index 0000000..93c9565 --- /dev/null +++ b/application/src/public/software/foundkey.svg @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/application/src/public/software/gancio.svg b/application/src/public/software/gancio.svg new file mode 100644 index 0000000..548e8cc --- /dev/null +++ b/application/src/public/software/gancio.svg @@ -0,0 +1,48 @@ + + + + diff --git a/application/src/public/software/hometown.svg b/application/src/public/software/hometown.svg index 87ec2c5..46a3255 100644 --- a/application/src/public/software/hometown.svg +++ b/application/src/public/software/hometown.svg @@ -1,4 +1,68 @@ - - - + + + + + + + + + + + + + diff --git a/application/src/public/software/mastodon.svg b/application/src/public/software/mastodon.svg index 87ec2c5..bd58c71 100644 --- a/application/src/public/software/mastodon.svg +++ b/application/src/public/software/mastodon.svg @@ -1,4 +1,10 @@ - - - + + + + + + + + + diff --git a/application/src/public/software/takahe.svg b/application/src/public/software/takahe.svg new file mode 100644 index 0000000..a2e6b36 --- /dev/null +++ b/application/src/public/software/takahe.svg @@ -0,0 +1,128 @@ + + + +