{pkg.value.description || No description}
- Created {twas(new Date(pkg.value.createdAt).getTime())}. + Created {timeAgo(pkg.value.createdAt)}.
{fromCli && (diff --git a/frontend/routes/account/(_components)/AccountLayout.tsx b/frontend/routes/account/(_components)/AccountLayout.tsx index 3248c2fe8..ab6c93cd8 100644 --- a/frontend/routes/account/(_components)/AccountLayout.tsx +++ b/frontend/routes/account/(_components)/AccountLayout.tsx @@ -1,6 +1,6 @@ // Copyright 2024 the JSR authors. All rights reserved. MIT license. import { ComponentChildren } from "preact"; -import twas from "twas"; +import { timeAgo } from "../../../utils/timeAgo.ts"; import { AccountNav, AccountNavTab } from "./AccountNav.tsx"; import { FullUser, User } from "../../../utils/api_types.ts"; import { GitHubUserLink } from "../../../islands/GithubUserLink.tsx"; @@ -25,7 +25,7 @@ export function AccountLayout({ user, active, children }: AccountLayoutProps) { {user.name}
- Created account {twas(new Date(user.createdAt).getTime())} + Created account {timeAgo(new Date(user.createdAt).getTime())}
- Created {twas(new Date(token.createdAt).getTime())} + Created {timeAgo(new Date(token.createdAt).getTime())}
@@ -160,7 +160,7 @@ function SessionRow({ token }: { token: Token }) { Active {expiresAt === null ? "forever" : `– expires ${ - twas(new Date().getTime(), expiresAt.getTime()).replace( + timeAgo(expiresAt.getTime()).replace( "ago", "from now", ) @@ -169,7 +169,7 @@ function SessionRow({ token }: { token: Token }) { ) : ( - Inactive - expired {twas(expiresAt.getTime())} + Inactive - expired {timeAgo(expiresAt.getTime())} )} @@ -178,7 +178,7 @@ function SessionRow({ token }: { token: Token }) {
- Created {twas(new Date(token.createdAt).getTime())} + Created {timeAgo(new Date(token.createdAt).getTime())}
Created:{" "} - {twas(new Date(data.publishingTask.createdAt).getTime())} + {timeAgo(new Date(data.publishingTask.createdAt))}
{data.publishingTask.userId && (diff --git a/frontend/utils/timeAgo.ts b/frontend/utils/timeAgo.ts new file mode 100644 index 000000000..6f439d984 --- /dev/null +++ b/frontend/utils/timeAgo.ts @@ -0,0 +1,22 @@ +export function timeAgo(date: Date | string): string { + const now = new Date(); + const past = new Date(date); + const diff = Math.abs(now.getTime() - past.getTime()); + + const duration = { + years: Math.floor(diff / (1000 * 60 * 60 * 24 * 365)), + months: Math.floor( + (diff % (1000 * 60 * 60 * 24 * 365)) / (1000 * 60 * 60 * 24 * 30), + ), + days: Math.floor( + (diff % (1000 * 60 * 60 * 24 * 30)) / (1000 * 60 * 60 * 24), + ), + hours: Math.floor((diff % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60)), + minutes: Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60)), + seconds: Math.floor((diff % (1000 * 60)) / 1000), + }; + + // Force english because JSR is an English-only project + const formatter = new Intl.DurationFormat("en", { style: "long" }); + return formatter.format(duration); +} From 3721c6ee5c1d2187955010f6483afb1e8622e3b3 Mon Sep 17 00:00:00 2001 From: Augustin Mauroy <97875033+AugustinMauroy@users.noreply.github.com> Date: Tue, 11 Mar 2025 21:57:05 +0100 Subject: [PATCH 3/4] fix: ci --- frontend/islands/admin/UserEdit.tsx | 2 +- .../routes/account/(_components)/AccountLayout.tsx | 2 +- frontend/routes/account/tokens/index.tsx | 12 ++++++------ frontend/routes/admin/publishingTasks.tsx | 4 ++-- frontend/routes/package/og.ts | 2 +- frontend/routes/package/versions.tsx | 5 ++--- frontend/utils/timeAgo.ts | 2 ++ 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/frontend/islands/admin/UserEdit.tsx b/frontend/islands/admin/UserEdit.tsx index b239397a8..cd1447a8c 100644 --- a/frontend/islands/admin/UserEdit.tsx +++ b/frontend/islands/admin/UserEdit.tsx @@ -68,7 +68,7 @@ export default function UserEdit({ user }: { user: FullUser }) { : String(isBlocked)}
- Created account {timeAgo(new Date(user.createdAt).getTime())} + Created account {timeAgo(new Date(user.createdAt))}
- Created {timeAgo(new Date(token.createdAt).getTime())} + Created {timeAgo(new Date(token.createdAt))}
@@ -160,7 +160,7 @@ function SessionRow({ token }: { token: Token }) { Active {expiresAt === null ? "forever" : `– expires ${ - timeAgo(expiresAt.getTime()).replace( + timeAgo(expiresAt).replace( "ago", "from now", ) @@ -169,7 +169,7 @@ function SessionRow({ token }: { token: Token }) { ) : ( - Inactive - expired {timeAgo(expiresAt.getTime())} + Inactive - expired {timeAgo(expiresAt)} )} @@ -178,7 +178,7 @@ function SessionRow({ token }: { token: Token }) {
- Created {timeAgo(new Date(token.createdAt).getTime())} + Created {timeAgo(new Date(token.createdAt))}