From 0cd546e0a8ba63504363d7ee22fff70da9deb900 Mon Sep 17 00:00:00 2001 From: DIYgod Date: Fri, 23 Jun 2023 18:56:20 +0100 Subject: [PATCH] feat: support the redirection of the site page under the /site/ path --- src/components/site/PostList.tsx | 14 +++++++---- src/components/site/PostMeta.tsx | 9 ++------ src/components/site/PostTag.tsx | 20 ++++++++++++++++ src/components/site/SiteArchives.tsx | 15 +++++++++--- src/components/site/SiteHeaderLink.tsx | 4 ++++ src/components/site/SiteHeaderMenu.tsx | 5 +++- src/lib/helpers.ts | 32 ++++++++++++++------------ 7 files changed, 69 insertions(+), 30 deletions(-) create mode 100644 src/components/site/PostTag.tsx diff --git a/src/components/site/PostList.tsx b/src/components/site/PostList.tsx index e509a357..ec5853da 100644 --- a/src/components/site/PostList.tsx +++ b/src/components/site/PostList.tsx @@ -1,7 +1,7 @@ "use client" import Link from "next/link" -import { useRouter } from "next/navigation" +import { usePathname, useRouter } from "next/navigation" import { memo } from "react" import reactStringReplace from "react-string-replace" @@ -13,7 +13,7 @@ import { Button } from "~/components/ui/Button" import { EmptyState } from "~/components/ui/EmptyState" import { useIsClient } from "~/hooks/useClient" import { useDate } from "~/hooks/useDate" -import { getSlugUrl } from "~/lib/helpers" +import { getSiteRelativeUrl } from "~/lib/helpers" import { useTranslation } from "~/lib/i18n/client" import { ExpandedNote } from "~/lib/types" @@ -96,6 +96,7 @@ const PostItem = memo( const isMounted = useIsClient() const date = useDate() const router = useRouter() + const pathname = usePathname() return ( { e.stopPropagation() e.preventDefault() - router.push(`/tag/${tag}`) + router.push( + getSiteRelativeUrl(pathname, `/tag/${tag}`), + ) }} > #{tag} diff --git a/src/components/site/PostMeta.tsx b/src/components/site/PostMeta.tsx index b4bfb874..06995c4f 100644 --- a/src/components/site/PostMeta.tsx +++ b/src/components/site/PostMeta.tsx @@ -1,6 +1,7 @@ import { Time } from "~/components/common/Time" import { BlockchainIcon } from "~/components/icons/BlockchainIcon" import { EditButton } from "~/components/site/EditButton" +import PostTag from "~/components/site/PostTag" import { UniLink } from "~/components/ui/UniLink" import { CSB_SCAN } from "~/lib/env" import { useTranslation } from "~/lib/i18n" @@ -38,13 +39,7 @@ export default async function PostMeta({ {page.metadata?.content?.tags ?.filter((tag) => tag !== "post" && tag !== "page") .map((tag) => ( - - <>#{tag} - + ))} diff --git a/src/components/site/PostTag.tsx b/src/components/site/PostTag.tsx new file mode 100644 index 00000000..14f834d8 --- /dev/null +++ b/src/components/site/PostTag.tsx @@ -0,0 +1,20 @@ +"use client" + +import { usePathname } from "next/navigation" + +import { getSiteRelativeUrl } from "~/lib/helpers" + +import { UniLink } from "../ui/UniLink" + +export default async function PostTag({ tag }: { tag: string }) { + const pathname = usePathname() + + return ( + + <>#{tag} + + ) +} diff --git a/src/components/site/SiteArchives.tsx b/src/components/site/SiteArchives.tsx index 8d9ff9dd..eed977d9 100644 --- a/src/components/site/SiteArchives.tsx +++ b/src/components/site/SiteArchives.tsx @@ -1,11 +1,12 @@ "use client" import Link from "next/link" -import { useParams } from "next/navigation" +import { useParams, usePathname } from "next/navigation" import { useMemo } from "react" import { Button } from "~/components/ui/Button" import { useDate } from "~/hooks/useDate" +import { getSiteRelativeUrl } from "~/lib/helpers" import { useTranslation } from "~/lib/i18n/client" import { ExpandedNote, PageVisibilityEnum } from "~/lib/types" import { useGetPagesBySiteLite } from "~/queries/page" @@ -19,6 +20,7 @@ export const SiteArchives = () => { const date = useDate() const { t } = useTranslation("site") const { t: commonT } = useTranslation("common") + const pathname = usePathname() const params = useParams() if (params?.tag) { params.tag = decodeURIComponent(params.tag as string) @@ -96,7 +98,11 @@ export const SiteArchives = () => {
{[...tags.keys()].map((tag) => ( - + {tag} ({tags.get(tag)}) @@ -119,7 +125,10 @@ export const SiteArchives = () => { return ( diff --git a/src/components/site/SiteHeaderLink.tsx b/src/components/site/SiteHeaderLink.tsx index b47fcb4b..5373aeca 100644 --- a/src/components/site/SiteHeaderLink.tsx +++ b/src/components/site/SiteHeaderLink.tsx @@ -2,6 +2,7 @@ import { usePathname } from "next/navigation" +import { getSiteRelativeUrl } from "~/lib/helpers" import { useTranslation } from "~/lib/i18n/client" import { cn } from "~/lib/utils" @@ -17,6 +18,9 @@ export type HeaderLinkType = { export const HeaderLink = ({ link }: { link: HeaderLinkType }) => { const pathname = usePathname() const { t } = useTranslation("site") + if (link.url) { + link.url = getSiteRelativeUrl(pathname, link.url) + } const active = pathname === link.url return ( diff --git a/src/components/site/SiteHeaderMenu.tsx b/src/components/site/SiteHeaderMenu.tsx index d5ab4118..7c2ce0c9 100644 --- a/src/components/site/SiteHeaderMenu.tsx +++ b/src/components/site/SiteHeaderMenu.tsx @@ -11,6 +11,7 @@ import { Image } from "~/components/ui/Image" import { Modal } from "~/components/ui/Modal" import { Tooltip } from "~/components/ui/Tooltip" import { CSB_SCAN, CSB_XCHAR, CSB_XFEED } from "~/lib/env" +import { getSiteLink } from "~/lib/helpers" import { useTranslation } from "~/lib/i18n/client" import { Button } from "../ui/Button" @@ -92,7 +93,9 @@ export const SiteHeaderMenu = ({ { text: "Subscribe to RSS", icon: , - url: `/feed?format=xml`, + url: `${getSiteLink({ + subdomain: handle || "", + })}/feed?format=xml`, out: true, }, { diff --git a/src/lib/helpers.ts b/src/lib/helpers.ts index 3bcd928c..91fd3a60 100644 --- a/src/lib/helpers.ts +++ b/src/lib/helpers.ts @@ -5,7 +5,6 @@ import { ExpandedCharacter, ExpandedNote } from "~/lib/types" import { IS_PROD, IS_VERCEL_PREVIEW } from "./constants" import { OUR_DOMAIN } from "./env" -import { isServerSide } from "./utils" export const getSiteLink = ({ domain, @@ -28,20 +27,6 @@ export const getSiteLink = ({ return `${IS_PROD ? "https" : "http"}://${subdomain}.${OUR_DOMAIN}` } -export const getSlugUrl = (slug: string) => { - if (!isServerSide() && IS_VERCEL_PREVIEW) { - const pathArr = new URL(location.href).pathname.split("/").filter(($) => $) - const indicatorIndex = pathArr.findIndex(($) => $ === "site") - if (-~indicatorIndex) { - const handle = pathArr[indicatorIndex + 1] - - return `/site/${handle}${slug}` - } - } - - return slug -} - export const getNoteSlug = (note: NoteEntity) => { return encodeURIComponent( note.metadata?.content?.attributes?.find( @@ -85,3 +70,20 @@ export const getTwitterShareUrl = ({ ), )}` } + +export const getSiteRelativeUrl = (pathname: string, address: string) => { + if (!address.startsWith("/")) { + address = `/${address}` + } + const reg = /\/site\/[^/]*/ + if (address.match(reg) || address.match(/^https?:\/\//)) { + return address + } else { + const match = pathname.match(reg) + if (match?.[0]) { + return `${match[0]}${address === "/" ? "" : address}` + } else { + return address + } + } +}