@@ -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 =
{ this.props.title }
+ }
+
return (
+
+ { title }
+
{ this.props.children }
);
}
}
-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 (
-
+
{ /* Banner */ }
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 (
-
+
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 (
-
+
Welcome home
{ lines }