diff --git a/src/app/(main)/links/[linkId]/page.tsx b/src/app/(main)/links/[linkId]/page.tsx index 4317ada2..3a5f5d7e 100644 --- a/src/app/(main)/links/[linkId]/page.tsx +++ b/src/app/(main)/links/[linkId]/page.tsx @@ -1,8 +1,14 @@ import type { Metadata } from 'next'; +import { getLink } from '@/queries/prisma'; import { LinkPage } from './LinkPage'; export default async function ({ params }: { params: Promise<{ linkId: string }> }) { const { linkId } = await params; + const link = await getLink(linkId); + + if (!link || link?.deletedAt) { + return null; + } return ; } diff --git a/src/app/(main)/pixels/[pixelId]/page.tsx b/src/app/(main)/pixels/[pixelId]/page.tsx index d1db92f3..e174c195 100644 --- a/src/app/(main)/pixels/[pixelId]/page.tsx +++ b/src/app/(main)/pixels/[pixelId]/page.tsx @@ -1,8 +1,14 @@ import type { Metadata } from 'next'; +import { getPixel } from '@/queries/prisma'; import { PixelPage } from './PixelPage'; export default async function ({ params }: { params: { pixelId: string } }) { const { pixelId } = await params; + const pixel = await getPixel(pixelId); + + if (!pixel || pixel?.deletedAt) { + return null; + } return ; } diff --git a/src/app/(main)/websites/[websiteId]/layout.tsx b/src/app/(main)/websites/[websiteId]/layout.tsx index 67595e9d..b12ff950 100644 --- a/src/app/(main)/websites/[websiteId]/layout.tsx +++ b/src/app/(main)/websites/[websiteId]/layout.tsx @@ -1,5 +1,6 @@ import type { Metadata } from 'next'; import { WebsiteLayout } from '@/app/(main)/websites/[websiteId]/WebsiteLayout'; +import { getWebsite } from '@/queries/prisma'; export default async function ({ children, @@ -9,6 +10,11 @@ export default async function ({ params: Promise<{ websiteId: string }>; }) { const { websiteId } = await params; + const website = await getWebsite(websiteId); + + if (!website || website?.deletedAt) { + return null; + } return {children}; } diff --git a/src/lib/request.ts b/src/lib/request.ts index e6450bf3..d6543b18 100644 --- a/src/lib/request.ts +++ b/src/lib/request.ts @@ -85,7 +85,7 @@ export async function setWebsiteDate(websiteId: string, userId: string, data: Re const website = await fetchWebsite(websiteId); const cloudMode = !!process.env.CLOUD_MODE; - if (cloudMode && !website.teamId) { + if (cloudMode && website && !website.teamId) { const account = await fetchAccount(userId); if (!account?.hasSubscription) {