🔥 #201 英語と日本語のページを明確に分けて、IPによるコンテンツ書き換えを中止したので canonicalLink を削除

nekochans · Sep 27, 2022 · 8d0823f · 8d0823f
1 parent 72a85ba
commit 8d0823f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 18 deletions.
diff --git a/src/layouts/DefaultLayout/DefaultLayout.tsx b/src/layouts/DefaultLayout/DefaultLayout.tsx
@@ -6,7 +6,6 @@ import type { FC, ReactNode } from 'react';
 type Props = {
   metaTag: MetaTag;
   children: ReactNode;
-  canonicalLink?: Url;
   alternateUrls?: {
     hreflang: Language;
     link?: Url;
@@ -17,7 +16,6 @@ type Props = {
 export const DefaultLayout: FC<Props> = ({
   metaTag,
   children,
-  canonicalLink,
   alternateUrls,
 }) => (
   <>
@@ -52,7 +50,6 @@ export const DefaultLayout: FC<Props> = ({
       <meta name="msapplication-TileColor" content="#da532c" />
       <meta name="msapplication-config" content="/favicons/browserconfig.xml" />
       <meta name="theme-color" content="#ffffff" />
-      {canonicalLink ? <link rel="canonical" href={canonicalLink} /> : ''}
       {alternateUrls?.map((alternateUrl, index) => (
         <link
           rel="alternate"

diff --git a/src/templates/TermsOrPrivacyTemplate/TermsOrPrivacyTemplate.tsx b/src/templates/TermsOrPrivacyTemplate/TermsOrPrivacyTemplate.tsx
@@ -54,11 +54,7 @@ export const TermsOrPrivacyTemplate: FC<Props> = ({
   });
 
   return (
-    <DefaultLayout
-      metaTag={metaTag}
-      canonicalLink={canonicalLink}
-      alternateUrls={alternateUrls}
-    >
+    <DefaultLayout metaTag={metaTag} alternateUrls={alternateUrls}>
       <OrgTermsOrPrivacyTemplate
         type={type}
         language={language}

diff --git a/src/templates/TopTemplate/TopTemplate.tsx b/src/templates/TopTemplate/TopTemplate.tsx
@@ -48,11 +48,7 @@ export const TopTemplate: FC<Props> = ({ language, lgtmImages }) => {
     useCatImagesFetcher();
 
   return (
-    <DefaultLayout
-      metaTag={metaTag}
-      canonicalLink={canonicalLink}
-      alternateUrls={alternateUrls}
-    >
+    <DefaultLayout metaTag={metaTag} alternateUrls={alternateUrls}>
       <OrgTopTemplate
         language={language}
         lgtmImages={lgtmImages}

diff --git a/src/templates/UploadTemplate/UploadTemplate.tsx b/src/templates/UploadTemplate/UploadTemplate.tsx
@@ -44,11 +44,7 @@ export const UploadTemplate: FC<Props> = ({ language }) => {
   const { imageUploader } = useCatImageUploader(language);
 
   return (
-    <DefaultLayout
-      metaTag={metaTag}
-      canonicalLink={canonicalLink}
-      alternateUrls={alternateUrls}
-    >
+    <DefaultLayout metaTag={metaTag} alternateUrls={alternateUrls}>
       <OrgUploadTemplate
         language={language}
         imageValidator={imageValidator}