From 3df94526b007f9664896d9cac2b0aec067db502d Mon Sep 17 00:00:00 2001
From: diced <pranaco2@gmail.com>
Date: Fri, 28 Oct 2022 17:28:15 -0700
Subject: [PATCH] feat: add more info to cards & relative time

---
 src/components/File.tsx               |  7 ++++---
 src/components/pages/Files/index.tsx  |  9 ++++++++-
 src/components/pages/Invites.tsx      | 22 +++++++++++++++++-----
 src/components/pages/Urls/URLCard.tsx | 18 ++++++++++++++++--
 src/lib/utils/client.ts               | 20 ++++++++++----------
 5 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/src/components/File.tsx b/src/components/File.tsx
index 112f21f..3fdeccb 100644
--- a/src/components/File.tsx
+++ b/src/components/File.tsx
@@ -133,14 +133,15 @@ export default function File({ image, updateImages, disableMediaPreview }) {
               <FileMeta
                 Icon={EyeIcon}
                 title='Max views'
-                subtitle={image.maxViews.toLocaleString()}
+                subtitle={image?.maxViews?.toLocaleString()}
                 tooltip={`This file will be deleted after being viewed ${image?.maxViews?.toLocaleString()} times.`}
               />
             )}
             <FileMeta
               Icon={CalendarIcon}
-              title='Uploaded at'
-              subtitle={new Date(image.created_at).toLocaleString()}
+              title='Uploaded'
+              subtitle={relativeTime(new Date(image.created_at))}
+              tooltip={new Date(image?.created_at).toLocaleString()}
             />
             {image.expires_at && (
               <FileMeta
diff --git a/src/components/pages/Files/index.tsx b/src/components/pages/Files/index.tsx
index da73013..593d84e 100644
--- a/src/components/pages/Files/index.tsx
+++ b/src/components/pages/Files/index.tsx
@@ -30,7 +30,14 @@ export default function Files({ disableMediaPreview }) {
         </Link>
       </Group>
       {favoritePages.isSuccess && favoritePages.data.length ? (
-        <Accordion variant='contained' mb='sm'>
+        <Accordion
+          variant='contained'
+          mb='sm'
+          styles={(t) => ({
+            content: { backgroundColor: t.colorScheme === 'dark' ? t.colors.dark[7] : t.colors.gray[0] },
+            control: { backgroundColor: t.colorScheme === 'dark' ? t.colors.dark[7] : t.colors.gray[0] },
+          })}
+        >
           <Accordion.Item value='favorite'>
             <Accordion.Control>Favorite Files</Accordion.Control>
             <Accordion.Panel>
diff --git a/src/components/pages/Invites.tsx b/src/components/pages/Invites.tsx
index be7ce38..9e24fad 100644
--- a/src/components/pages/Invites.tsx
+++ b/src/components/pages/Invites.tsx
@@ -11,6 +11,7 @@ import {
   Skeleton,
   Stack,
   Title,
+  Tooltip,
 } from '@mantine/core';
 import { useClipboard } from '@mantine/hooks';
 import { useForm } from '@mantine/form';
@@ -21,6 +22,7 @@ import MutedText from 'components/MutedText';
 import useFetch from 'hooks/useFetch';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
+import { relativeTime } from 'lib/utils/client';
 
 const expires = ['30m', '1h', '6h', '12h', '1d', '3d', '5d', '7d', 'never'];
 
@@ -117,7 +119,7 @@ function CreateInviteModal({ open, setOpen, updateInvites }) {
   );
 }
 
-export default function Users() {
+export default function Uz2sers() {
   const router = useRouter();
   const modals = useModals();
   const clipboard = useClipboard();
@@ -198,10 +200,20 @@ export default function Users() {
                         {invite.code}
                         {invite.used && <> (Used)</>}
                       </Title>
-                      <MutedText size='sm'>Created: {new Date(invite.created_at).toLocaleString()}</MutedText>
-                      <MutedText size='sm'>
-                        Expires: {invite.expires_at ? new Date(invite.expires_at).toLocaleString() : 'Never'}
-                      </MutedText>
+                      <Tooltip label={new Date(invite.created_at).toLocaleString()}>
+                        <div>
+                          <MutedText size='sm'>
+                            Created: {relativeTime(new Date(invite.created_at))}
+                          </MutedText>
+                        </div>
+                      </Tooltip>
+                      <Tooltip label={new Date(invite.expires_at).toLocaleString()}>
+                        <div>
+                          <MutedText size='sm'>
+                            Expires: {relativeTime(new Date(invite.expires_at))}
+                          </MutedText>
+                        </div>
+                      </Tooltip>
                     </Stack>
                   </Group>
                   <Group position='right'>
diff --git a/src/components/pages/Urls/URLCard.tsx b/src/components/pages/Urls/URLCard.tsx
index 9341f78..c7ab1a7 100644
--- a/src/components/pages/Urls/URLCard.tsx
+++ b/src/components/pages/Urls/URLCard.tsx
@@ -1,9 +1,12 @@
-import { ActionIcon, Card, Group, LoadingOverlay, Title } from '@mantine/core';
+import { ActionIcon, Card, Group, LoadingOverlay, Stack, Title, Tooltip } from '@mantine/core';
 import { useClipboard } from '@mantine/hooks';
 import { showNotification } from '@mantine/notifications';
 import { CopyIcon, CrossIcon, DeleteIcon, ExternalLinkIcon } from 'components/icons';
 import TrashIcon from 'components/icons/TrashIcon';
+import Link from 'components/Link';
+import MutedText from 'components/MutedText';
 import { URLResponse, useURLDelete } from 'lib/queries/url';
+import { relativeTime } from 'lib/utils/client';
 
 export default function URLCard({ url }: { url: URLResponse }) {
   const clipboard = useClipboard();
@@ -46,7 +49,18 @@ export default function URLCard({ url }: { url: URLResponse }) {
 
       <Group position='apart'>
         <Group position='left'>
-          <Title>{url.vanity ?? url.id}</Title>
+          <Stack spacing={0}>
+            <Title>{url.vanity ?? url.id}</Title>
+            <Tooltip label={new Date(url.created_at).toLocaleString()}>
+              <div>
+                <MutedText size='sm'>Created: {relativeTime(new Date(url.created_at))}</MutedText>
+              </div>
+            </Tooltip>
+            {url.vanity && <MutedText size='sm'>ID: {url.id}</MutedText>}
+            <MutedText size='sm'>
+              URL: <Link href={url.destination}>{url.destination}</Link>
+            </MutedText>
+          </Stack>
         </Group>
         <Group position='right'>
           <ActionIcon href={url.url} component='a' target='_blank'>
diff --git a/src/lib/utils/client.ts b/src/lib/utils/client.ts
index ce0dea0..8b4c1b1 100644
--- a/src/lib/utils/client.ts
+++ b/src/lib/utils/client.ts
@@ -1,5 +1,10 @@
 import type { Image, User } from '@prisma/client';
+import dayjs from 'dayjs';
+import duration from 'dayjs/plugin/duration';
+import dayjsRelativeTime from 'dayjs/plugin/relativeTime';
 import ms, { StringValue } from 'ms';
+dayjs.extend(duration);
+dayjs.extend(dayjsRelativeTime);
 
 export function parse(str: string, image: Image, user: User) {
   if (!str) return null;
@@ -34,17 +39,12 @@ export const units = {
 };
 
 export function relativeTime(to: Date, from: Date = new Date()) {
-  const time = new Date(to.getTime() - from.getTime());
+  if (!to) return null;
 
-  const rtf = new Intl.RelativeTimeFormat('en', { style: 'long' });
-
-  for (const unit in units) {
-    if (time > units[unit]) {
-      return rtf.format(
-        Math.floor(Math.round(time.getTime() / units[unit])),
-        (unit as Intl.RelativeTimeFormatUnit) || 'second'
-      );
-    }
+  if (to.getTime() < from.getTime()) {
+    return dayjs(to).from(from);
+  } else {
+    return dayjs(from).to(to);
   }
 }