diff --git a/src/components/common/BlockchainInfo.tsx b/src/components/common/BlockchainInfo.tsx index 1e02bbe0..bf16e61b 100644 --- a/src/components/common/BlockchainInfo.tsx +++ b/src/components/common/BlockchainInfo.tsx @@ -6,12 +6,6 @@ import { ChevronUpIcon } from "@heroicons/react/20/solid" import { BlockchainIcon } from "~/components/icons/BlockchainIcon" import { toIPFS, toGateway } from "~/lib/ipfs-parser" import { IPFS_SW_GATEWAY_PREFIX } from "~/lib/ipfs-gateway" -import dayjs from "dayjs" -import duration from "dayjs/plugin/duration" -import relativeTime from "dayjs/plugin/relativeTime" - -dayjs.extend(duration) -dayjs.extend(relativeTime) export const BlockchainInfo: React.FC<{ site?: Profile | null diff --git a/src/components/common/CharacterCard.tsx b/src/components/common/CharacterCard.tsx index 9e6f207d..c1bd4a4c 100644 --- a/src/components/common/CharacterCard.tsx +++ b/src/components/common/CharacterCard.tsx @@ -12,17 +12,12 @@ import { useDismiss, } from "@floating-ui/react-dom-interactions" import { Avatar } from "~/components/ui/Avatar" -import dayjs from "dayjs" -import duration from "dayjs/plugin/duration" -import relativeTime from "dayjs/plugin/relativeTime" +import dayjs from "~/lib/date" import { FollowingButton } from "~/components/common/FollowingButton" import { FollowingCount } from "~/components/common/FollowingCount" import * as siteModel from "~/models/site.model" import type { Profile } from "~/lib/types" -dayjs.extend(duration) -dayjs.extend(relativeTime) - export const CharacterCard: React.FC<{ siteId?: string children: JSX.Element diff --git a/src/components/common/CommentItem.tsx b/src/components/common/CommentItem.tsx index c37f9ed9..f03c537b 100644 --- a/src/components/common/CommentItem.tsx +++ b/src/components/common/CommentItem.tsx @@ -1,7 +1,5 @@ import { Avatar } from "~/components/ui/Avatar" -import dayjs from "dayjs" -import duration from "dayjs/plugin/duration" -import relativeTime from "dayjs/plugin/relativeTime" +import dayjs from "~/lib/date" import { UniLink } from "~/components/ui/UniLink" import { BlockchainIcon } from "~/components/icons/BlockchainIcon" import { CSB_SCAN } from "~/lib/env" @@ -14,9 +12,6 @@ import { useState } from "react" import { CommentInput } from "~/components/common/CommentInput" import { CharacterCard } from "~/components/common/CharacterCard" -dayjs.extend(duration) -dayjs.extend(relativeTime) - export const CommentItem: React.FC<{ comment: NoteEntity & { character?: CharacterEntity | null diff --git a/src/lib/date.ts b/src/lib/date.ts index 34258894..9380a7b9 100644 --- a/src/lib/date.ts +++ b/src/lib/date.ts @@ -2,19 +2,35 @@ import dayjs from "dayjs" import utc from "dayjs/plugin/utc" import tz from "dayjs/plugin/timezone" +import localizedFormat from "dayjs/plugin/localizedFormat" +import duration from "dayjs/plugin/duration" +import relativeTime from "dayjs/plugin/relativeTime" +dayjs.extend(localizedFormat) dayjs.extend(utc) dayjs.extend(tz) +dayjs.extend(duration) +dayjs.extend(relativeTime) export const formatDate = ( date: string | Date, format: "MMM D" | "MMM D, YYYY" | "YYYY" = "MMM D, YYYY", timezone?: string, ) => { - console.log("date", date, timezone, format) + console.log( + "date", + date, + timezone, + format, + dayjs(date), + dayjs(date).tz(timezone), + dayjs(date).tz(timezone).format(format), + ) return dayjs(date).tz(timezone).format(format) } export const inLocalTimezone = (date: string | Date) => { return dayjs(date).tz().toDate() } + +export default dayjs diff --git a/src/lib/page-helpers.ts b/src/lib/page-helpers.ts index d87b3df7..01552911 100644 --- a/src/lib/page-helpers.ts +++ b/src/lib/page-helpers.ts @@ -1,4 +1,4 @@ -import dayjs from "dayjs" +import dayjs from "~/lib/date" import { PageVisibilityEnum } from "./types" export const getPageVisibility = ({ diff --git a/src/pages/dashboard/[subdomain]/editor.tsx b/src/pages/dashboard/[subdomain]/editor.tsx index 4e2dcda1..e8a1462b 100644 --- a/src/pages/dashboard/[subdomain]/editor.tsx +++ b/src/pages/dashboard/[subdomain]/editor.tsx @@ -1,5 +1,5 @@ import clsx from "clsx" -import dayjs from "dayjs" +import dayjs from "~/lib/date" import { useRouter } from "next/router" import { ChangeEvent, diff --git a/src/pages/dashboard/[subdomain]/notifications.tsx b/src/pages/dashboard/[subdomain]/notifications.tsx index 67536812..d6681c14 100644 --- a/src/pages/dashboard/[subdomain]/notifications.tsx +++ b/src/pages/dashboard/[subdomain]/notifications.tsx @@ -6,18 +6,13 @@ import { getSiteLink } from "~/lib/helpers" import { useGetNotifications, useGetSite } from "~/queries/site" import { CharacterCard } from "~/components/common/CharacterCard" import { Avatar } from "~/components/ui/Avatar" -import dayjs from "dayjs" -import duration from "dayjs/plugin/duration" -import relativeTime from "dayjs/plugin/relativeTime" +import dayjs from "~/lib/date" import { BlockchainIcon } from "~/components/icons/BlockchainIcon" import { CSB_SCAN } from "~/lib/env" import { PageContent } from "~/components/common/PageContent" import { useEffect, useMemo, useState } from "react" import { setStorage, getStorage } from "~/lib/storage" -dayjs.extend(duration) -dayjs.extend(relativeTime) - export default function SubdomainIndex() { const router = useRouter() const subdomain = router.query.subdomain as string