Merge branch 'develop' of code.with.camp:858/frontend into develop

src/App.js

@@ -1,18 +1,23 @@
-import React, { Component } from 'react';
+import React, {Component} from 'react';
-import { Provider } from 'react-redux';
+import {Provider} from 'react-redux';
 import './App.css';
-import { Route } from 'react-router-dom';
+import {Route} from 'react-router-dom';
 import Home from './containers/Home';
 import TopicsList from './containers/TopicsList';
 import store from './store/configureStore';
+import Header from "./components/Header";
+import Footer from "./components/Footer";
 
 class App extends Component {
   render() {
     return (
-      <Provider store={ store }>
+      <Provider store={store}>
+
         <div className="App">
-          <Route exact={ true } path="/" component={ Home } />
+          <Header/>
-          <Route path="/topics" component={ TopicsList } />
+          <Route exact={true} path="/" component={Home}/>
+          <Route path="/topics" component={TopicsList}/>
+          <Footer/>
         </div>
       </Provider>
     );

src/containers/Home.js

@@ -16,12 +16,10 @@ class Home extends React.Component {
   render() {
     return (
       <div>
-        <Header/>
         <Search/>
         <RandomTopic/>
         <RandomLocation/>
         <RandomDate/>
-        <Footer/>
       </div>
     );
     //
@@ -41,7 +39,6 @@ class Home extends React.Component {
     //     })}
     //   </div>
     // </div>
-
   }
 }