From c01a854a5a1785e83e18a0d39a2b432702d46ec4 Mon Sep 17 00:00:00 2001
From: Kamran Ahmed <kamranahmed.se@gmail.com>
Date: Tue, 3 Dec 2019 17:54:34 +0400
Subject: [PATCH] Fix - Duplicated meta tags on pages

---
 layouts/default/index.js |  1 -
 pages/about.js           |  2 ++
 pages/guides/index.js    |  9 ++++++---
 pages/index.js           |  4 +++-
 pages/privacy.js         |  2 ++
 pages/roadmaps.js        | 14 +++++++++-----
 pages/signup.js          |  2 ++
 pages/terms.js           |  6 ++++--
 8 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/layouts/default/index.js b/layouts/default/index.js
index 66adf7d9c..aa293eb08 100644
--- a/layouts/default/index.js
+++ b/layouts/default/index.js
@@ -11,7 +11,6 @@ class DefaultLayout extends React.Component {
   render() {
     return (
       <div>
-        <Helmet />
         { this.props.children }
       </div>
     );
diff --git a/pages/about.js b/pages/about.js
index f7fa6519b..0bf8da0bd 100644
--- a/pages/about.js
+++ b/pages/about.js
@@ -3,9 +3,11 @@ import PageFooter from 'components/page-footer/index';
 import SiteNav from 'components/site-nav';
 import DefaultLayout from 'layouts/default/index';
 import FaqList from 'components/faq-list/index';
+import Helmet from 'components/helmet';
 
 const About = () => (
   <DefaultLayout>
+    <Helmet />
     <SiteNav />
     <AboutHeader />
     <FaqList />
diff --git a/pages/guides/index.js b/pages/guides/index.js
index 011a23786..3582c8d4d 100644
--- a/pages/guides/index.js
+++ b/pages/guides/index.js
@@ -8,13 +8,16 @@ import PageFooter from 'components/page-footer';
 import SiteNav from 'components/site-nav';
 import { getAllGuides } from 'lib/guide';
 import siteConfig from 'storage/site';
+import Helmet from 'components/helmet';
+
+const PageTitle = "Programming Guides";
+const PageDescription = "Easy to follow guides on complex topics written and maintained by the community";
 
 const Roadmap = () => (
   <DefaultLayout>
+    <Helmet title={PageTitle} desciption={PageDescription} />
     <SiteNav />
-    <PageHeader
-      title="Programming Guides"
-      subtitle="Easy to follow guides on complex topics written and maintained by the community">
+    <PageHeader title={PageTitle} subtitle={PageDescription}>
       <BadgesList className="mt-4">
         <BadgeLink href={siteConfig.url.addGuide} target="_blank">
           <SecondaryBadge>
diff --git a/pages/index.js b/pages/index.js
index c177cddc6..8ecf96b25 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -2,10 +2,12 @@ import FeaturedContent from 'components/featured-content/index';
 import HeroSection from 'components/hero-section/index';
 import PageFooter from 'components/page-footer/index';
 import SiteNav from 'components/site-nav';
-import DefaultLayout from 'layouts/default/index';
+import Helmet from 'components/helmet';
+import DefaultLayout from 'layouts/default';
 
 const Home = (props) => (
   <DefaultLayout>
+    <Helmet />
     <SiteNav />
     <HeroSection />
     <FeaturedContent />
diff --git a/pages/privacy.js b/pages/privacy.js
index 441469f02..2792e3b41 100644
--- a/pages/privacy.js
+++ b/pages/privacy.js
@@ -2,9 +2,11 @@ import SiteNav from 'components/site-nav';
 import PageFooter from 'components/page-footer/index';
 import { TosPage } from 'components/tos-page/index';
 import DefaultLayout from 'layouts/default/index';
+import Helmet from 'components/helmet';
 
 const Privacy = () => (
   <DefaultLayout>
+    <Helmet />
     <TosPage>
       <SiteNav />
       <div className="bg-light border-top privacy-wrap">
diff --git a/pages/roadmaps.js b/pages/roadmaps.js
index c69b3b61a..10d61a632 100644
--- a/pages/roadmaps.js
+++ b/pages/roadmaps.js
@@ -1,5 +1,6 @@
 import { faPlus } from '@fortawesome/free-solid-svg-icons';
-
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faEnvelope, faCodeBranch } from '@fortawesome/free-solid-svg-icons';
 import DefaultLayout from 'layouts/default/index';
 import SiteNav from 'components/site-nav';
 import PageFooter from 'components/page-footer';
@@ -9,16 +10,19 @@ import RowBlock from 'components/row-block';
 import IconRowBlock from 'components/icon-row-block';
 import siteConfig from "storage/site";
 import { BadgeLink, BadgesList, PrimaryBadge, SecondaryBadge } from 'components/badges';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faEnvelope, faCodeBranch } from '@fortawesome/free-solid-svg-icons';
+import Helmet from 'components/helmet';
+
+const PageTitle = "Developer Roadmaps";
+const PageDescription = "Step by step guides and paths to learn different tools or technologies";
 
 const RoadmapsList = () => (
   <DefaultLayout>
+    <Helmet title={PageTitle} desciption={PageDescription} />
     <SiteNav />
     <div className="container">
       <PageHeader
-        title="Developer Roadmaps"
-        subtitle="Step by step guides and paths to learn different tools or technologies">
+        title={PageTitle}
+        subtitle={PageDescription}>
         <BadgesList className="mt-4">
           <BadgeLink href={`${siteConfig.url.issue}?title=[RequestRoadmap] - Title Here`} target="_blank">
             <SecondaryBadge>
diff --git a/pages/signup.js b/pages/signup.js
index b6e94957b..7fa338629 100644
--- a/pages/signup.js
+++ b/pages/signup.js
@@ -2,9 +2,11 @@ import DefaultLayout from 'layouts/default';
 import PageFooter from 'components/page-footer';
 import SiteNav from 'components/site-nav';
 import SignUpForm from 'components/signup-form';
+import Helmet from 'components/helmet';
 
 const SignUp = () => (
   <DefaultLayout>
+    <Helmet />
     <SiteNav />
     <SignUpForm />
     <PageFooter />
diff --git a/pages/terms.js b/pages/terms.js
index 2ca512a7b..1a6ff10f1 100644
--- a/pages/terms.js
+++ b/pages/terms.js
@@ -1,11 +1,13 @@
-import PageFooter from 'components/page-footer/index';
+import PageFooter from 'components/page-footer';
 import SiteNav from 'components/site-nav';
-import { TosPage } from 'components/tos-page/index';
+import { TosPage } from 'components/tos-page';
+import Helmet from 'components/helmet';
 import DefaultLayout from 'layouts/default/index';
 
 const Terms = () => (
   <DefaultLayout>
     <TosPage>
+      <Helmet />
       <SiteNav />
       <div className="bg-light border-top tos-wrap">
         <div className="container pt-5 pb-5">