From c59f8b99028f7633db12fc8e9e30c2b6c6e55b91 Mon Sep 17 00:00:00 2001 From: Chris Chudzicki Date: Thu, 10 Oct 2024 13:00:45 -0400 Subject: [PATCH 1/2] move metadataBase to root layout so it affects all pages --- frontends/main/src/app/layout.tsx | 11 +++++++++-- frontends/main/src/app/page.tsx | 3 --- frontends/ol-components/src/index.ts | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/frontends/main/src/app/layout.tsx b/frontends/main/src/app/layout.tsx index 3580696819..d483f47d20 100644 --- a/frontends/main/src/app/layout.tsx +++ b/frontends/main/src/app/layout.tsx @@ -1,5 +1,3 @@ -"use client" - import React from "react" import Header from "@/page-components/Header/Header" import Footer from "@/page-components/Footer/Footer" @@ -11,6 +9,15 @@ import ErrorBoundary from "@/components/ErrorBoundary/ErrorBoundary" import "./GlobalStyles" +const { NEXT_PUBLIC_ORIGIN } = process.env + +/** + * As part of the root layout, this metadata object is site-wide defaults + */ +export const metadata = { + metadataBase: NEXT_PUBLIC_ORIGIN ? new URL(NEXT_PUBLIC_ORIGIN) : null, +} + export default function RootLayout({ children, }: Readonly<{ diff --git a/frontends/main/src/app/page.tsx b/frontends/main/src/app/page.tsx index 3cdf1861dc..f6406e519a 100644 --- a/frontends/main/src/app/page.tsx +++ b/frontends/main/src/app/page.tsx @@ -3,15 +3,12 @@ import type { Metadata } from "next" import HomePage from "@/app-pages/HomePage/HomePage" import { getMetadataAsync } from "@/common/metadata" -const { NEXT_PUBLIC_ORIGIN } = process.env - export async function generateMetadata({ searchParams, }: { searchParams: { [key: string]: string | string[] | undefined } }): Promise { return await getMetadataAsync({ - metadataBase: NEXT_PUBLIC_ORIGIN ? new URL(NEXT_PUBLIC_ORIGIN) : null, title: "Learn with MIT", searchParams, }) diff --git a/frontends/ol-components/src/index.ts b/frontends/ol-components/src/index.ts index c78bcee93f..3fda8ca006 100644 --- a/frontends/ol-components/src/index.ts +++ b/frontends/ol-components/src/index.ts @@ -1,3 +1,4 @@ +"use client" /// /// From 57c0b0d6b6d83bdcf4a085432722fccda5e7dd9b Mon Sep 17 00:00:00 2001 From: Chris Chudzicki Date: Thu, 10 Oct 2024 13:01:41 -0400 Subject: [PATCH 2/2] remove channel-specific og:image --- frontends/main/src/app/c/[channelType]/[name]/page.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/frontends/main/src/app/c/[channelType]/[name]/page.tsx b/frontends/main/src/app/c/[channelType]/[name]/page.tsx index c67a167ab6..ba46a40022 100644 --- a/frontends/main/src/app/c/[channelType]/[name]/page.tsx +++ b/frontends/main/src/app/c/[channelType]/[name]/page.tsx @@ -25,7 +25,6 @@ export async function generateMetadata({ searchParams, title: `${channelDetails.title}`, description: channelDetails.public_description, - image: channelDetails.configuration.logo, }) }