-
{ config.name }
+ { this.props.config.name }
{socialLinks}
diff --git a/src/components/Navbar.js b/src/components/Navbar.js
index 8d6f521..6d5e162 100644
--- a/src/components/Navbar.js
+++ b/src/components/Navbar.js
@@ -1,16 +1,21 @@
import React, { Component } from 'react'
-import config from '../../config/config.json'
+import PropTypes from 'prop-types'
import '../stylesheets/globals.scss'
import styles from './Navbar.scss'
export default class Navbar extends Component {
+
+ static propTypes = {
+ config: PropTypes.object.isRequired
+ }
+
render () {
let key = 0
- const objKeys = Object.keys(config.social)
+ const objKeys = Object.keys(this.props.config.social)
const socialLinks = objKeys.map((val) => {
const link = (
-
+
{val}
@@ -21,7 +26,7 @@ export default class Navbar extends Component {
})
socialLinks.push(
-
+
e-mail
@@ -33,7 +38,7 @@ export default class Navbar extends Component {
-
- {config.name} |
+ {this.props.config.name} |
-
diff --git a/src/components/NotFoundPage.js b/src/components/NotFoundPage.js
index 99783a7..628825d 100644
--- a/src/components/NotFoundPage.js
+++ b/src/components/NotFoundPage.js
@@ -3,7 +3,7 @@ import { Navbar, Header } from '.'
import '../stylesheets/globals.scss'
import contentStyle from '../stylesheets/content.scss'
-export const NotFoundPage = (props) => {
+export const NotFoundPage = () => {
return (
diff --git a/src/components/Post.js b/src/components/Post.js
index 869acfd..a7bc289 100644
--- a/src/components/Post.js
+++ b/src/components/Post.js
@@ -11,7 +11,8 @@ import moment from 'moment'
export default class Post extends Component {
static propTypes = {
isLoading: PropTypes.bool.isRequired,
- post: PropTypes.object.isRequired
+ post: PropTypes.object.isRequired,
+ config: PropTypes.object.isRequired
}
render () {
@@ -31,7 +32,7 @@ export default class Post extends Component {
return (
-
+
diff --git a/src/containers/MainContainer.js b/src/containers/MainContainer.js
index d57721e..777d6a6 100644
--- a/src/containers/MainContainer.js
+++ b/src/containers/MainContainer.js
@@ -22,15 +22,16 @@ export default class MainContainer extends Component {
this.state = {
isLoadingBlog: !data.posts,
isLoadingAbout: !data.other.about,
- about: data.other.about,
- posts: data.posts
+ about: data[0].other.about,
+ posts: data[0].posts,
+ config: data[1]
}
}
render () {
return (
-
+
diff --git a/src/containers/PostContainer.js b/src/containers/PostContainer.js
index 7dcc772..0959ebf 100644
--- a/src/containers/PostContainer.js
+++ b/src/containers/PostContainer.js
@@ -10,19 +10,20 @@ export default class PostContainer extends Component {
constructor (props) {
super(props)
- let post
+ let data
// eslint-disable-next-line no-undef
if (__isBrowser__) {
- post = window.__INITIAL_DATA__
+ data = window.__INITIAL_DATA__
delete window.__INITIAL_DATA__
} else {
- post = props.staticContext.data
+ data = props.staticContext.data
}
this.state = {
isLoading: !post,
error: false,
- post: post
+ post: data[0],
+ config: data[1]
}
}
@@ -36,7 +37,7 @@ export default class PostContainer extends Component {
return (
+ post={this.state.post} config={this.state.config} />
)
}