From 2f75b40fa5d2aa7bf2abffc8a837f98a21eb6a01 Mon Sep 17 00:00:00 2001
From: Jinksi <ericjinks@gmail.com>
Date: Sat, 14 Oct 2017 16:16:04 +1000
Subject: [PATCH] Add Global Settings json

---
 content/settings/global.json  | 3 +++
 src/App.js                    | 7 +++----
 src/components/NetlifyForm.js | 5 ++---
 src/views/Contact.js          | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 content/settings/global.json

diff --git a/content/settings/global.json b/content/settings/global.json
new file mode 100644
index 0000000..2e2d5fc
--- /dev/null
+++ b/content/settings/global.json
@@ -0,0 +1,3 @@
+{
+  "siteTitle": "HyperStatic"
+}
diff --git a/src/App.js b/src/App.js
index 95e9289..a455494 100644
--- a/src/App.js
+++ b/src/App.js
@@ -13,8 +13,6 @@ import ServiceWorkerNotifications from './components/ServiceWorkerNotifications'
 import globalStyles from './globalStyles'
 import data from './data.json'
 
-export const siteTitle = 'HyperStatic'
-
 class App extends Component {
   state = {
     data
@@ -31,13 +29,14 @@ class App extends Component {
   getDocuments = (collection) => this.state.data[collection]
 
   render () {
+    const site = this.getDocument('settings', 'global')
     return (
       <Router>
         <div>
           <ScrollToTop />
           <ServiceWorkerNotifications />
           <GithubCorner url='https://github.com/Jinksi/hyperstatic' />
-          <Helmet titleTemplate={`${siteTitle} | %s`} />
+          <Helmet titleTemplate={`${site.siteTitle} | %s`} />
           <Nav />
           <Switch>
             <Route path='/' exact
@@ -47,7 +46,7 @@ class App extends Component {
               render={(props) => <About page={this.getDocument('pages', 'about')} {...props} />}
             />
             <Route path='/contact/' exact
-              render={(props) => <Contact page={this.getDocument('pages', 'contact')} {...props} />}
+              render={(props) => <Contact page={this.getDocument('pages', 'contact')} site={site} {...props} />}
             />
             <Route component={NoMatch} />
           </Switch>
diff --git a/src/components/NetlifyForm.js b/src/components/NetlifyForm.js
index 8238173..a92cf2e 100644
--- a/src/components/NetlifyForm.js
+++ b/src/components/NetlifyForm.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react'
 import styled from 'styled-components'
 import { stringify } from 'qs'
 import { color } from '../globalStyles'
-import { siteTitle } from '../App'
 const fetch = window.fetch
 
 class Form extends Component {
@@ -10,7 +9,7 @@ class Form extends Component {
     name: '',
     email: '',
     message: '',
-    subject: `New Submission from ${siteTitle}!`,
+    subject: `New Submission from ${this.props.siteTitle}!`,
     _gotcha: '',
     disabled: false,
     alert: '',
@@ -60,7 +59,7 @@ class Form extends Component {
           name: '',
           email: '',
           message: '',
-          subject: `New Submission from ${siteTitle}!`,
+          subject: `New Submission from ${this.props.siteTitle}!`,
           _gotcha: ''
         })
       })
diff --git a/src/views/Contact.js b/src/views/Contact.js
index 9025dd5..49b279d 100644
--- a/src/views/Contact.js
+++ b/src/views/Contact.js
@@ -6,7 +6,7 @@ import NetlifyForm from '../components/NetlifyForm'
 import { Container, Section } from '../components/common'
 import Marked from 'react-markdown'
 
-export default ({ page }) => (
+export default ({ page, site }) => (
   <Page>
     <PageHeader title={page.title} subtitle='<Contact />' />
     <Section thin>
@@ -14,7 +14,7 @@ export default ({ page }) => (
         <Marked source={page.body} />
         <br />
         <h3>{'<NetlifyForm />'}</h3>
-        <NetlifyForm />
+        <NetlifyForm siteTitle={site.siteTitle} />
         <em>Note: this will only work when deployed on Netlify</em>
         <br />
         <em>Also, this form is active and I will receive submissions</em> 😉