diff --git a/src/components/Blog.js b/src/components/Blog.js
index b71082b..3a66e84 100644
--- a/src/components/Blog.js
+++ b/src/components/Blog.js
@@ -1,11 +1,24 @@
-import React from 'react';
+import React, {Component} from 'react';
-export const Blog = (props) => (
-
-
-
{ props.data.isLoading ? 'Loading...' : 'Blog' }
-
-
-);
+export default class Blog extends Component {
-export default Blog;
+ render() {
+ if (this.props.data.isLoading) {
+ return (
+ Loading
+ );
+ }
+
+ return (
+
+
+
Blog
+
+
{this.props.data.posts[0].published}
+
{this.props.data.posts[0].filename}
+
+
+
+ );
+ }
+};
diff --git a/src/containers/BlogContainer.js b/src/containers/BlogContainer.js
index 0726834..8b9a8c0 100644
--- a/src/containers/BlogContainer.js
+++ b/src/containers/BlogContainer.js
@@ -16,6 +16,7 @@ export default class BlogContainer extends Component {
axios.get('/api/blog').then((res) => {
this.setState({
isLoading: false,
+ posts: res.data,
});
})
}
diff --git a/src/utils/api.js b/src/utils/api.js
index c801328..b0eebd1 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -1,7 +1,7 @@
+const data = require('./data.json');
+
module.exports = function(app) {
app.get('/api/blog', ((req, res) => {
- res.json({
- "blog": "Blog hello"
- });
+ res.json(data.posts);
}));
}