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 = () => ( -
-
-

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 {