diff options
| author | Armand Philippot <git@armandphilippot.com> | 2022-05-23 19:02:20 +0200 |
|---|---|---|
| committer | Armand Philippot <git@armandphilippot.com> | 2022-05-23 19:02:20 +0200 |
| commit | 5ebd7c14f7303a0feb8ec1d902ecd0e287d929c3 (patch) | |
| tree | 4e0e0352ac7598fa4e186230e93bcc4c1ac6b810 /src/pages/blog | |
| parent | 34e216546151eaf8a0a3cbb0bc8b65dae4c63bf2 (diff) | |
refactor(schema): use helpers function to avoid repeat between pages
Diffstat (limited to 'src/pages/blog')
| -rw-r--r-- | src/pages/blog/index.tsx | 49 | ||||
| -rw-r--r-- | src/pages/blog/page/[number].tsx | 49 |
2 files changed, 34 insertions, 64 deletions
diff --git a/src/pages/blog/index.tsx b/src/pages/blog/index.tsx index dd04fad..cfd6f8c 100644 --- a/src/pages/blog/index.tsx +++ b/src/pages/blog/index.tsx @@ -23,6 +23,11 @@ import { getPageLinkFromRawData, getPostsList, } from '@utils/helpers/pages'; +import { + getBlogSchema, + getSchemaJson, + getWebPageSchema, +} from '@utils/helpers/schema-org'; import useBreadcrumb from '@utils/hooks/use-breadcrumb'; import usePagination from '@utils/hooks/use-pagination'; import useSettings from '@utils/hooks/use-settings'; @@ -31,7 +36,6 @@ import Head from 'next/head'; import { useRouter } from 'next/router'; import Script from 'next/script'; import { useIntl } from 'react-intl'; -import { Blog, Graph, WebPage } from 'schema-dts'; type BlogPageProps = { articles: EdgesResponse<RawArticle>; @@ -80,37 +84,18 @@ const BlogPage: NextPageWithLayout<BlogPageProps> = ({ }, { websiteName: website.name } ); - const pageUrl = `${website.url}${asPath}`; - - const webpageSchema: WebPage = { - '@id': `${pageUrl}`, - '@type': 'WebPage', - breadcrumb: { '@id': `${website.url}/#breadcrumb` }, - name: pageTitle, + const webpageSchema = getWebPageSchema({ description: pageDescription, - inLanguage: website.locales.default, - reviewedBy: { '@id': `${website.url}/#branding` }, - url: `${website.url}`, - isPartOf: { - '@id': `${website.url}`, - }, - }; - - const blogSchema: Blog = { - '@id': `${website.url}/#blog`, - '@type': 'Blog', - author: { '@id': `${website.url}/#branding` }, - creator: { '@id': `${website.url}/#branding` }, - editor: { '@id': `${website.url}/#branding` }, - inLanguage: website.locales.default, - license: 'https://creativecommons.org/licenses/by-sa/4.0/deed.fr', - mainEntityOfPage: { '@id': `${pageUrl}` }, - }; - - const schemaJsonLd: Graph = { - '@context': 'https://schema.org', - '@graph': [webpageSchema, blogSchema], - }; + locale: website.locales.default, + slug: asPath, + title, + }); + const blogSchema = getBlogSchema({ + isSinglePage: false, + locale: website.locales.default, + slug: asPath, + }); + const schemaJsonLd = getSchemaJson([webpageSchema, blogSchema]); const { data, @@ -149,7 +134,7 @@ const BlogPage: NextPageWithLayout<BlogPageProps> = ({ <Head> <title>{pageTitle}</title> <meta name="description" content={pageDescription} /> - <meta property="og:url" content={`${pageUrl}`} /> + <meta property="og:url" content={`${website.url}${asPath}`} /> <meta property="og:type" content="website" /> <meta property="og:title" content={title} /> <meta property="og:description" content={pageDescription} /> diff --git a/src/pages/blog/page/[number].tsx b/src/pages/blog/page/[number].tsx index 8f50ddd..78b1db4 100644 --- a/src/pages/blog/page/[number].tsx +++ b/src/pages/blog/page/[number].tsx @@ -26,6 +26,11 @@ import { getPageLinkFromRawData, getPostsList, } from '@utils/helpers/pages'; +import { + getBlogSchema, + getSchemaJson, + getWebPageSchema, +} from '@utils/helpers/schema-org'; import useBreadcrumb from '@utils/hooks/use-breadcrumb'; import useRedirection from '@utils/hooks/use-redirection'; import useSettings from '@utils/hooks/use-settings'; @@ -35,7 +40,6 @@ import { useRouter } from 'next/router'; import Script from 'next/script'; import { ParsedUrlQuery } from 'querystring'; import { useIntl } from 'react-intl'; -import { Blog, Graph, WebPage } from 'schema-dts'; type BlogPageProps = { articles: EdgesResponse<RawArticle>; @@ -95,37 +99,18 @@ const BlogPage: NextPageWithLayout<BlogPageProps> = ({ }, { websiteName: website.name } ); - const pageUrl = `${website.url}${asPath}`; - - const webpageSchema: WebPage = { - '@id': `${pageUrl}`, - '@type': 'WebPage', - breadcrumb: { '@id': `${website.url}/#breadcrumb` }, - name: pageTitle, + const webpageSchema = getWebPageSchema({ description: pageDescription, - inLanguage: website.locales.default, - reviewedBy: { '@id': `${website.url}/#branding` }, - url: `${website.url}`, - isPartOf: { - '@id': `${website.url}`, - }, - }; - - const blogSchema: Blog = { - '@id': `${website.url}/#blog`, - '@type': 'Blog', - author: { '@id': `${website.url}/#branding` }, - creator: { '@id': `${website.url}/#branding` }, - editor: { '@id': `${website.url}/#branding` }, - inLanguage: website.locales.default, - license: 'https://creativecommons.org/licenses/by-sa/4.0/deed.fr', - mainEntityOfPage: { '@id': `${pageUrl}` }, - }; - - const schemaJsonLd: Graph = { - '@context': 'https://schema.org', - '@graph': [webpageSchema, blogSchema], - }; + locale: website.locales.default, + slug: asPath, + title, + }); + const blogSchema = getBlogSchema({ + isSinglePage: false, + locale: website.locales.default, + slug: asPath, + }); + const schemaJsonLd = getSchemaJson([webpageSchema, blogSchema]); const thematicsListTitle = intl.formatMessage({ defaultMessage: 'Thematics', @@ -144,7 +129,7 @@ const BlogPage: NextPageWithLayout<BlogPageProps> = ({ <Head> <title>{pageTitle}</title> <meta name="description" content={pageDescription} /> - <meta property="og:url" content={`${pageUrl}`} /> + <meta property="og:url" content={`${website.url}${asPath}`} /> <meta property="og:type" content="website" /> <meta property="og:title" content={pageTitleWithPageNumber} /> <meta property="og:description" content={pageDescription} /> |