From 8d0823f0d2bf8a79e2939edc7313b85a7fe65555 Mon Sep 17 00:00:00 2001
From: keitakn <keita.koga.work@gmail.com>
Date: Tue, 27 Sep 2022 14:06:29 +0900
Subject: [PATCH] =?UTF-8?q?:fire:=20#201=20=E8=8B=B1=E8=AA=9E=E3=81=A8?=
 =?UTF-8?q?=E6=97=A5=E6=9C=AC=E8=AA=9E=E3=81=AE=E3=83=9A=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=82=92=E6=98=8E=E7=A2=BA=E3=81=AB=E5=88=86=E3=81=91=E3=81=A6?=
 =?UTF-8?q?=E3=80=81IP=E3=81=AB=E3=82=88=E3=82=8B=E3=82=B3=E3=83=B3?=
 =?UTF-8?q?=E3=83=86=E3=83=B3=E3=83=84=E6=9B=B8=E3=81=8D=E6=8F=9B=E3=81=88?=
 =?UTF-8?q?=E3=82=92=E4=B8=AD=E6=AD=A2=E3=81=97=E3=81=9F=E3=81=AE=E3=81=A7?=
 =?UTF-8?q?=20canonicalLink=20=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/DefaultLayout/DefaultLayout.tsx                 | 3 ---
 .../TermsOrPrivacyTemplate/TermsOrPrivacyTemplate.tsx       | 6 +-----
 src/templates/TopTemplate/TopTemplate.tsx                   | 6 +-----
 src/templates/UploadTemplate/UploadTemplate.tsx             | 6 +-----
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/layouts/DefaultLayout/DefaultLayout.tsx b/src/layouts/DefaultLayout/DefaultLayout.tsx
index c2d6a977..c8878f90 100644
--- 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
index 535254e6..03b18541 100644
--- 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
index a4adf61b..e45e2c0b 100644
--- 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
index 3582215e..2ce19ee2 100644
--- 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}