scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: cleanup "new" pages

Browse Source
This commit is contained in:
Christel Westerberg
2024-02-22 09:59:04 +01:00
parent 4e4b6f1bd6
commit d625e42f49
3 changed files with 4 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
app/[lang]/(live)/content-page/page.tsx
View File

@@ -1,57 +1,3 @@
import { notFound } from "next/navigation" export default async function ContentPage() {
return null
import { request } from "@/lib/request"
import { GetCurrentBlockPage } from "@/lib/graphql/Query/CurrentBlockPage.graphql"
import ContentPageComponent from "@/components/Current/ContentPage"
import type { PageArgs, LangParams, UriParams } from "@/types/params"
import type { GetCurrentBlockPageData } from "@/types/requests/currentBlockPage"
import Tracking from "../../Tracking"
export default async function ContentPage({
params,
searchParams,
}: PageArgs<LangParams, UriParams>) {
try {
if (!searchParams.uri) {
throw new Error("Bad URI")
}
const response = await request<GetCurrentBlockPageData>(
GetCurrentBlockPage,
{
locale: params.lang,
url: searchParams.uri,
}
)
if (!response.data?.all_current_blocks_page?.total) {
console.log("#### DATA ####")
console.log(response.data)
console.log("SearchParams URI: ", searchParams.uri)
throw new Error("Not found")
}
const pageData = response.data.all_current_blocks_page.items[0]
const trackingData = {
pageName: pageData.title,
pageType: pageData.__typename,
publishedDate: pageData.system.updated_at,
createdDate: pageData.system.created_at,
pageId: pageData.system.uid,
}
return (
<>
<ContentPageComponent
data={response.data}
uri={searchParams.uri}
lang={params.lang}
/>
<Tracking pageData={trackingData} />
</>
)
} catch (err) {
return notFound()
}
} }

8
app/[lang]/(preview)/layout.tsx
View File

@@ -1,11 +1,3 @@
import "../../core.css"
import "../../scandic.css"
import Footer from "@/components/Current/Footer"
import LangPopup from "@/components/Current/LangPopup"
import Script from "next/script"
import SkipToMainContent from "@/components/SkipToMainContent"
import type { Metadata } from "next" import type { Metadata } from "next"
import type { LangParams, LayoutArgs } from "@/types/params" import type { LangParams, LayoutArgs } from "@/types/params"
import InitLivePreview from "@/components/Current/LivePreview" import InitLivePreview from "@/components/Current/LivePreview"

46
app/[lang]/(preview)/preview/page.tsx
View File

@@ -1,45 +1,3 @@
import { previewRequest } from "@/lib/previewRequest" export default async function PreviewPage() {
import { GetCurrentBlockPage } from "@/lib/graphql/Query/CurrentBlockPage.graphql" return null
import type { PageArgs, LangParams, PreviewParams } from "@/types/params"
import type { GetCurrentBlockPageData } from "@/types/requests/currentBlockPage"
import ContentstackLivePreview from "@contentstack/live-preview-utils"
import LoadingSpinner from "@/components/Current/LoadingSpinner"
import ContentPage from "@/components/Current/ContentPage"
export default async function PreviewPage({
params,
searchParams,
}: PageArgs<LangParams, PreviewParams>) {
try {
ContentstackLivePreview.setConfigFromParams(searchParams)
if (!searchParams.uri || !searchParams.live_preview) {
return <LoadingSpinner />
}
const response = await previewRequest<GetCurrentBlockPageData>(
GetCurrentBlockPage,
{ locale: params.lang, url: searchParams.uri }
)
if (!response.data?.all_current_blocks_page?.total) {
console.log("#### DATA ####")
console.log(response.data)
console.log("SearchParams URI: ", searchParams.uri)
throw new Error("Not found")
}
return (
<ContentPage
data={response.data}
uri={searchParams.uri}
lang={params.lang}
/>
)
} catch (error) {
// TODO: throw 500
console.error(error)
throw new Error("Something went wrong")
}
} }