Merge branch 'develop' of code.with.camp:858/frontend into develop
This commit is contained in:
commit
7a3e025278
|
@ -5,14 +5,19 @@ 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}>
|
||||
|
||||
<div className="App">
|
||||
<Header/>
|
||||
<Route exact={true} path="/" component={Home}/>
|
||||
<Route path="/topics" component={TopicsList}/>
|
||||
<Footer/>
|
||||
</div>
|
||||
</Provider>
|
||||
);
|
||||
|
|
|
@ -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>
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user