diff options
4 files changed, 17 insertions, 18 deletions
diff --git a/examples/docs/src/components/HeadSEO.astro b/examples/docs/src/components/HeadSEO.astro index bd86b544d..298c17073 100644 --- a/examples/docs/src/components/HeadSEO.astro +++ b/examples/docs/src/components/HeadSEO.astro @@ -1,17 +1,17 @@ --- import { SITE, OPEN_GRAPH } from '../config'; export interface Props { - content: any; + frontmatter: any; site: any; canonicalURL: URL | string; } const canonicalURL = new URL(Astro.url.pathname, Astro.site); -const { content = {} } = Astro.props; -const formattedContentTitle = content.title ? `${content.title} 🚀 ${SITE.title}` : SITE.title; -const imageSrc = content?.image?.src ?? OPEN_GRAPH.image.src; +const { frontmatter = {} } = Astro.props; +const formattedContentTitle = frontmatter.title ? `${frontmatter.title} 🚀 ${SITE.title}` : SITE.title; +const imageSrc = frontmatter?.image?.src ?? OPEN_GRAPH.image.src; const canonicalImageSrc = new URL(imageSrc, Astro.site); -const imageAlt = content?.image?.alt ?? OPEN_GRAPH.image.alt; +const imageAlt = frontmatter?.image?.alt ?? OPEN_GRAPH.image.alt; --- <!-- Page Metadata --> @@ -21,13 +21,13 @@ const imageAlt = content?.image?.alt ?? OPEN_GRAPH.image.alt; <meta property="og:title" content={formattedContentTitle} /> <meta property="og:type" content="article" /> <meta property="og:url" content={canonicalURL} /> -<meta property="og:locale" content={content.ogLocale ?? SITE.defaultLanguage} /> +<meta property="og:locale" content={frontmatter.ogLocale ?? SITE.defaultLanguage} /> <meta property="og:image" content={canonicalImageSrc} /> <meta property="og:image:alt" content={imageAlt} /> <meta name="description" property="og:description" - content={content.description ? content.description : SITE.description} + content={frontmatter.description ? frontmatter.description : SITE.description} /> <meta property="og:site_name" content={SITE.title} /> @@ -37,7 +37,7 @@ const imageAlt = content?.image?.alt ?? OPEN_GRAPH.image.alt; <meta name="twitter:title" content={formattedContentTitle} /> <meta name="twitter:description" - content={content.description ? content.description : SITE.description} + content={frontmatter.description ? frontmatter.description : SITE.description} /> <meta name="twitter:image" content={canonicalImageSrc} /> <meta name="twitter:image:alt" content={imageAlt} /> diff --git a/examples/docs/src/components/PageContent/PageContent.astro b/examples/docs/src/components/PageContent/PageContent.astro index 185b310c3..49a74ab70 100644 --- a/examples/docs/src/components/PageContent/PageContent.astro +++ b/examples/docs/src/components/PageContent/PageContent.astro @@ -2,8 +2,8 @@ import MoreMenu from '../RightSidebar/MoreMenu.astro'; import TableOfContents from '../RightSidebar/TableOfContents'; -const { content, headings, githubEditUrl } = Astro.props; -const title = content.title; +const { frontmatter, headings, githubEditUrl } = Astro.props; +const title = frontmatter.title; --- <article id="article" class="content"> diff --git a/examples/docs/src/components/RightSidebar/RightSidebar.astro b/examples/docs/src/components/RightSidebar/RightSidebar.astro index 0c01a2398..6144ed928 100644 --- a/examples/docs/src/components/RightSidebar/RightSidebar.astro +++ b/examples/docs/src/components/RightSidebar/RightSidebar.astro @@ -1,7 +1,7 @@ --- import TableOfContents from './TableOfContents'; import MoreMenu from './MoreMenu.astro'; -const { content, headings, githubEditUrl } = Astro.props; +const { headings, githubEditUrl } = Astro.props; --- <nav class="sidebar-nav" aria-labelledby="grid-right"> diff --git a/examples/docs/src/layouts/MainLayout.astro b/examples/docs/src/layouts/MainLayout.astro index 39e9e0efa..2554a416c 100644 --- a/examples/docs/src/layouts/MainLayout.astro +++ b/examples/docs/src/layouts/MainLayout.astro @@ -2,24 +2,23 @@ import HeadCommon from '../components/HeadCommon.astro'; import HeadSEO from '../components/HeadSEO.astro'; import Header from '../components/Header/Header.astro'; -import Footer from '../components/Footer/Footer.astro'; import PageContent from '../components/PageContent/PageContent.astro'; import LeftSidebar from '../components/LeftSidebar/LeftSidebar.astro'; import RightSidebar from '../components/RightSidebar/RightSidebar.astro'; import * as CONFIG from '../config'; -const { content = {} } = Astro.props; +const { frontmatter = {}, headings } = Astro.props; const canonicalURL = new URL(Astro.url.pathname, Astro.site); const currentPage = Astro.url.pathname; const currentFile = `src/pages${currentPage.replace(/\/$/, '')}.md`; const githubEditUrl = CONFIG.GITHUB_EDIT_URL && CONFIG.GITHUB_EDIT_URL + currentFile; --- -<html dir={content.dir ?? 'ltr'} lang={content.lang ?? 'en-us'} class="initial"> +<html dir={frontmatter.dir ?? 'ltr'} lang={frontmatter.lang ?? 'en-us'} class="initial"> <head> <HeadCommon /> - <HeadSEO {content} canonicalURL={canonicalURL} /> - <title>{content.title ? `${content.title} 🚀 ${CONFIG.SITE.title}` : CONFIG.SITE.title}</title> + <HeadSEO {frontmatter} canonicalURL={canonicalURL} /> + <title>{frontmatter.title ? `${frontmatter.title} 🚀 ${CONFIG.SITE.title}` : CONFIG.SITE.title}</title> <style> body { width: 100%; @@ -111,12 +110,12 @@ const githubEditUrl = CONFIG.GITHUB_EDIT_URL && CONFIG.GITHUB_EDIT_URL + current <LeftSidebar {currentPage} /> </aside> <div id="grid-main"> - <PageContent {content} {githubEditUrl}> + <PageContent {frontmatter} {headings} {githubEditUrl}> <slot /> </PageContent> </div> <aside id="grid-right" class="grid-sidebar" title="Table of Contents"> - <RightSidebar {content} {githubEditUrl} /> + <RightSidebar {headings} {githubEditUrl} /> </aside> </main> </body> |