From dfc78cf1022dc7e63a6cbdc7fc1f0339b00d2af4 Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Fri, 29 Jun 2018 08:00:07 +1000
Subject: [PATCH] Added custom title support

---
 package.json                        |  1 +
 public/footer/Footer.jsx            | 23 ++++++++++++++-------
 public/language/en-AU.jsx           | 13 +++++++++++-
 public/page/Page.jsx                | 31 +++++++++++++++++++++++++++--
 public/page/about/AboutPage.jsx     |  3 ++-
 public/page/contact/ContactPage.jsx |  2 +-
 public/page/home/Homepage.jsx       |  2 +-
 7 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index fa431d3..1969767 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "babel-polyfill": "^6.26.0",
     "react": "^16.4.0",
     "react-dom": "^16.4.0",
+    "react-helmet": "^5.2.0",
     "react-redux": "^5.0.7",
     "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",
diff --git a/public/footer/Footer.jsx b/public/footer/Footer.jsx
index 277a675..5db7f67 100644
--- a/public/footer/Footer.jsx
+++ b/public/footer/Footer.jsx
@@ -22,14 +22,17 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import React from 'react';
+import { connect } from 'react-redux';
+import Language from './../language/Language';
 import { NavLink } from 'react-router-dom'
 import { PageBoundary } from './../page/Page';
 
 const FooterLink = function(props) {
+  let key = "footer.links." + props.title;
   return (
     <span className="c-footer__link">
-      <NavLink to="/about">
-        Link
+      <NavLink to={ props.to }>
+        { Language.get(key) }
       </NavLink>
     </span>
   );
@@ -50,10 +53,10 @@ class Footer extends React.Component {
           <div className="c-footer__inner">
 
             <nav className="c-footer__links">
-              <FooterLink title="privacy" />
-              <FooterLink title="privacy" />
-              <FooterLink title="privacy" />
-              <FooterLink title="privacy" />
+              <FooterLink title="home" to="/" />
+              <FooterLink title="about" to="/about" />
+              <FooterLink title="contact" to="/contact" />
+              <FooterLink title="privacy" to="/legal/privacy" />
             </nav>
 
             <div className="c-footer__copyright">
@@ -68,4 +71,10 @@ class Footer extends React.Component {
   }
 }
 
-export default Footer;
+const mapStateToProps = function(state) {
+  return {
+    code: state.language.code
+  }
+}
+
+export default connect(mapStateToProps)(Footer);
diff --git a/public/language/en-AU.jsx b/public/language/en-AU.jsx
index f203cd0..7235da5 100644
--- a/public/language/en-AU.jsx
+++ b/public/language/en-AU.jsx
@@ -5,7 +5,9 @@ import Policy from './policy-english';
 
 module.exports = {
   "site": {
-    "name": "domsPlace"
+    "name": "domsPlace",
+    "title": "domsPlace - Personal Site of Dominic Masters",
+    "titleTemplate": "%s - domsPlace"
   },
 
   "navbar": {
@@ -14,6 +16,15 @@ module.exports = {
     "contact": "Contact"
   },
 
+  "footer": {
+    "links": {
+      "home": "Home",
+      "about": "About Me",
+      "contact": "Contact Me",
+      "privacy": "Privacy Policy"
+    }
+  },
+
   "pages": {
 
     "about": {
diff --git a/public/page/Page.jsx b/public/page/Page.jsx
index f96f95c..5788465 100644
--- a/public/page/Page.jsx
+++ b/public/page/Page.jsx
@@ -22,9 +22,12 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import React from 'react';
+import { connect } from 'react-redux';
+import { Helmet } from "react-helmet";
 import PageBoundary from './PageBoundary';
+import Language from './../language/Language';
 
-export default class Page extends React.Component {
+class Page extends React.Component {
   constructor(props) {
     super(props);
   }
@@ -34,12 +37,36 @@ export default class Page extends React.Component {
 
     if(this.props.className) clazzes += " " + this.props.className;
 
+    let title;
+    if(
+      (typeof this.props.title === typeof undefined ||
+      typeof this.props.title.length === typeof undefined ||
+      !this.props.title.length) && this.props.style != "home-page"
+    ) {
+      console.exception("This page (" + (this.props.style || this.props.className) + ") does not have a title!");
+    } else {
+      title = <title>{ this.props.title }</title>
+    }
+
     return (
       <div className={clazzes}>
+        <Helmet defaultTitle={ Language.get("site.title") } titleTemplate={ Language.get("site.titleTemplate") }>
+          { title }
+        </Helmet>
         { this.props.children }
       </div>
     );
   }
 }
 
-export { PageBoundary };
+const mapStateToProps = function(state) {
+  return {
+    code: state.language.code
+  }
+}
+
+export default connect(mapStateToProps)(Page);
+
+export {
+  PageBoundary
+}
diff --git a/public/page/about/AboutPage.jsx b/public/page/about/AboutPage.jsx
index f259335..122a9fb 100644
--- a/public/page/about/AboutPage.jsx
+++ b/public/page/about/AboutPage.jsx
@@ -24,6 +24,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import Page from './../Page';
+import Language from './../../language/Language'
 
 import BannerSection from './sections/BannerSection';
 import PromoVideoSection from './sections/PromoVideoSection';
@@ -34,7 +35,7 @@ import ExistingWorkSection from './sections/ExistingWorkSection';
 const AboutPage = (props) => {
   //Return
   return (
-    <Page style="home-page" className="p-about-page">
+    <Page style="about-page" className="p-about-page" title={ Language.get("pages.about.title") }>
 
       { /* Banner */ }
       <BannerSection />
diff --git a/public/page/contact/ContactPage.jsx b/public/page/contact/ContactPage.jsx
index f91dc34..a7f3b13 100644
--- a/public/page/contact/ContactPage.jsx
+++ b/public/page/contact/ContactPage.jsx
@@ -43,7 +43,7 @@ class ContactPage extends React.Component {
 
   render() {
     return (
-      <Page style="contact-page" className="p-contact-page" title="">
+      <Page style="contact-page" className="p-contact-page" title={ Language.get("pages.contact.title") }>
 
         <ClearSection />
 
diff --git a/public/page/home/Homepage.jsx b/public/page/home/Homepage.jsx
index a26f996..1d66eed 100644
--- a/public/page/home/Homepage.jsx
+++ b/public/page/home/Homepage.jsx
@@ -35,7 +35,7 @@ export default function() {
   }
 
   return (
-    <Page style="home-page" className="p-home-page">
+    <Page style="home-page" title={0} className="p-home-page">
       Welcome home
       { lines }
     </Page>