diff --git a/src/components/About.js b/src/components/About.js
index c1711d3..49a0706 100644
--- a/src/components/About.js
+++ b/src/components/About.js
@@ -1,12 +1,20 @@
-import React from 'react';
-// import { Home } from '.';
+import React, {Component} from 'react';
-export const About = () => (
-
-);
+export default class About extends Component {
-export default About;
+ render () {
+ if (this.props.isLoading) {
+ return (
+
+
Loading
+
+ );
+ }
+
+ return (
+
+ { this.props.about.hello }
+
+ )
+ }
+}
diff --git a/src/components/App.js b/src/components/App.js
index c6d6081..94ab983 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -1,17 +1,14 @@
import React from 'react';
import { Route, Switch } from 'react-router-dom';
-import { Home, About, Portfolio, Resume, NotFoundPage } from '.';
+import { Home, NotFoundPage } from '.';
import { BlogContainer, PostContainer } from '../containers';
export const App = () => (
-
-
-
diff --git a/src/components/Blog.js b/src/components/Blog.js
index 3e32c16..e0454a5 100644
--- a/src/components/Blog.js
+++ b/src/components/Blog.js
@@ -5,7 +5,9 @@ export default class Blog extends Component {
render() {
if (this.props.isLoading) {
return (
- Loading
+
+
Loading
+
);
}
diff --git a/src/components/Home.js b/src/components/Home.js
index 578790b..d62737a 100644
--- a/src/components/Home.js
+++ b/src/components/Home.js
@@ -37,26 +37,11 @@ export default class Home extends Component {
- -
-
- About
-
-
-
Blog
- -
-
- Portfolio
-
-
- -
-
- Resume
-
-
diff --git a/src/components/Portfolio.js b/src/components/Portfolio.js
deleted file mode 100644
index b99fe98..0000000
--- a/src/components/Portfolio.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-
-export const Portfolio = () => (
-
-);
-
-export default Portfolio;
diff --git a/src/components/Resume.js b/src/components/Resume.js
deleted file mode 100644
index d265999..0000000
--- a/src/components/Resume.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-
-export const Resume = () => (
-
-);
-
-export default Resume;
diff --git a/src/components/index.js b/src/components/index.js
index 6ac40d1..dbcc3db 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,8 +1,6 @@
export { default as Home } from './Home';
-export { default as About } from './About';
export { default as Blog } from './Blog';
+export { default as About } from './About';
export { default as Post } from './Post';
-export { default as Portfolio } from './Portfolio';
-export { default as Resume } from './Resume';
export { default as NotFoundPage } from './NotFoundPage';
export { default as App } from './App';
diff --git a/src/containers/BlogContainer.js b/src/containers/BlogContainer.js
index 5d8e81f..88275eb 100644
--- a/src/containers/BlogContainer.js
+++ b/src/containers/BlogContainer.js
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import axios from 'axios';
-import {Blog} from '../components';
+import {About, Blog} from '../components';
export default class BlogContainer extends Component {
@@ -8,14 +8,22 @@ export default class BlogContainer extends Component {
super();
this.state = {
- isLoading: true,
+ isLoadingBlog: true,
+ isLoadingAbout: true,
}
}
componentDidMount() {
+ axios.get('/api/about').then((res) => {
+ this.setState({
+ isLoadingAbout: false,
+ about: res.data,
+ });
+ })
+
axios.get('/api/blog').then((res) => {
this.setState({
- isLoading: false,
+ isLoadingBlog: false,
posts: res.data,
});
})
@@ -23,8 +31,12 @@ export default class BlogContainer extends Component {
render() {
return (
-
+
)
}
}
diff --git a/src/utils/api.js b/src/utils/api.js
index 36ace24..1c995df 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -7,6 +7,10 @@ api.get('/blog', (req, res) => {
res.json(data.posts);
});
+api.get('/about', (req, res) => {
+ res.json({"hello": "hello"});
+});
+
api.get('/post/:postname', (req, res) => {
const postname = req.params.postname;
const post = data.posts.find((el) => {
diff --git a/src/utils/compiler.js b/src/utils/compiler.js
index 6a61783..e87c161 100644
--- a/src/utils/compiler.js
+++ b/src/utils/compiler.js
@@ -50,9 +50,8 @@ function compile(filepath, data, fileData, callback) {
fs.writeFile(renderedpath, rendered, (err) => {
if (err) callback(err);
+ else callback(null, post);
});
-
- callback(null, post);
}
function Compiler(data) {