From 9d4b21adb9853210babdc804b6c91c7489eace22 Mon Sep 17 00:00:00 2001 From: DIYgod Date: Tue, 9 May 2023 23:17:51 +0100 Subject: [PATCH] feat: do not use SitePage on the preview page --- src/app/site/[site]/[slug]/page.tsx | 2 +- .../site/[site]/preview/[previewId]/page.tsx | 32 +++++++++++++++---- src/components/site/SitePage.tsx | 14 +------- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/app/site/[site]/[slug]/page.tsx b/src/app/site/[site]/[slug]/page.tsx index 06b94f37..6c3e5d15 100644 --- a/src/app/site/[site]/[slug]/page.tsx +++ b/src/app/site/[site]/[slug]/page.tsx @@ -97,7 +97,7 @@ export default async function SitePagePage({ return ( - + ) } diff --git a/src/app/site/[site]/preview/[previewId]/page.tsx b/src/app/site/[site]/preview/[previewId]/page.tsx index 96f672bf..9502735d 100644 --- a/src/app/site/[site]/preview/[previewId]/page.tsx +++ b/src/app/site/[site]/preview/[previewId]/page.tsx @@ -1,6 +1,6 @@ "use client" -import { SitePage } from "~/components/site/SitePage" +import { PageContent } from "~/components/common/PageContent" import { useTranslation } from "~/lib/i18n/client" import { useGetPage } from "~/queries/page" import { useGetSite } from "~/queries/site" @@ -28,10 +28,30 @@ export default function SitePreviewPage({ const { t } = useTranslation("site") return ( - + <> +
+ {t( + "This address is in local editing preview mode and cannot be viewed by the public.", + )} +
+
+
+ {page.data?.metadata?.content?.tags?.includes("post") ? ( +

+ {page.data.metadata?.content?.title} +

+ ) : ( +

+ {page.data?.metadata?.content?.title} +

+ )} +
+ +
+ ) } diff --git a/src/components/site/SitePage.tsx b/src/components/site/SitePage.tsx index 0e8e45b3..eb0e528f 100644 --- a/src/components/site/SitePage.tsx +++ b/src/components/site/SitePage.tsx @@ -1,4 +1,3 @@ -import { TFunction } from "i18next" import serialize from "serialize-javascript" import { PageContent } from "~/components/common/PageContent" @@ -10,13 +9,9 @@ import { ExpandedCharacter, ExpandedNote } from "~/lib/types" export function SitePage({ page, site, - preview, - t, }: { page?: ExpandedNote site?: ExpandedCharacter - preview?: boolean - t: TFunction }) { function addPageJsonLd() { return { @@ -48,13 +43,6 @@ export function SitePage({ type="application/ld+json" dangerouslySetInnerHTML={addPageJsonLd()} /> - {preview && ( -
- {t( - "This address is in local editing preview mode and cannot be viewed by the public.", - )} -
- )}
{page?.metadata?.content?.tags?.includes("post") ? ( @@ -66,7 +54,7 @@ export function SitePage({ {page?.metadata?.content?.title} )} - {page?.metadata?.content?.tags?.includes("post") && !preview && ( + {page?.metadata?.content?.tags?.includes("post") && ( /* @ts-expect-error Async Server Component */ )}