From 2ae631ea9c49e7252ef19299a75461d012132b33 Mon Sep 17 00:00:00 2001 From: DIYgod Date: Thu, 11 May 2023 23:16:15 +0100 Subject: [PATCH] fix: try to fix hydrate bug on site page --- src/app/site/[site]/[slug]/page.tsx | 64 +++++++++++++++++++++++++++-- src/app/site/[site]/not-found.tsx | 30 +++++++------- 2 files changed, 76 insertions(+), 18 deletions(-) diff --git a/src/app/site/[site]/[slug]/page.tsx b/src/app/site/[site]/[slug]/page.tsx index c316aded..ef00db9e 100644 --- a/src/app/site/[site]/[slug]/page.tsx +++ b/src/app/site/[site]/[slug]/page.tsx @@ -1,10 +1,14 @@ import { Metadata } from "next" import { notFound } from "next/navigation" +import serialize from "serialize-javascript" import { Hydrate, dehydrate } from "@tanstack/react-query" -import { SitePage } from "~/components/site/SitePage" +import { PageContent } from "~/components/common/PageContent" +import { PostFooter } from "~/components/site/PostFooter" +import PostMeta from "~/components/site/PostMeta" import { SITE_URL } from "~/lib/env" +import { getSiteLink } from "~/lib/helpers" import { useTranslation } from "~/lib/i18n" import getQueryClient from "~/lib/query-client" import { fetchGetPage } from "~/queries/page.server" @@ -96,9 +100,61 @@ export default async function SitePagePage({ const { t } = await useTranslation("site") + function addPageJsonLd() { + return { + __html: serialize({ + "@context": "https://schema.org", + "@type": "BlogPosting", + headline: page?.metadata?.content?.title, + ...(page?.metadata?.content?.cover && { + image: [page?.metadata?.content?.cover], + }), + datePublished: page?.metadata?.content?.date_published, + dateModified: page?.updatedAt, + author: [ + { + "@type": "Person", + name: site?.metadata?.content?.name, + url: getSiteLink({ + subdomain: site?.handle || "", + }), + }, + ], + }), + } + } + return ( - - - + <> +