summaryrefslogtreecommitdiff
path: root/src/main/js/src/index.js
diff options
context:
space:
mode:
authorjbion <joffrey.bion@amadeus.com>2017-01-20 14:10:41 +0100
committerjbion <joffrey.bion@amadeus.com>2017-01-20 14:10:41 +0100
commitf505583d4f5b1c76312f5e4e4181842bd130232e (patch)
tree8286d7b8e29af1658d8636bdfabdae1f50ede67b /src/main/js/src/index.js
parentAdd test for GameRepository (diff)
parentHandle username choice from server (diff)
downloadseven-wonders-f505583d4f5b1c76312f5e4e4181842bd130232e.tar.gz
seven-wonders-f505583d4f5b1c76312f5e4e4181842bd130232e.tar.bz2
seven-wonders-f505583d4f5b1c76312f5e4e4181842bd130232e.zip
Merge remote-tracking branch 'origin/feature/front'
Diffstat (limited to 'src/main/js/src/index.js')
-rw-r--r--src/main/js/src/index.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/js/src/index.js b/src/main/js/src/index.js
index 78c63ddf..3edce222 100644
--- a/src/main/js/src/index.js
+++ b/src/main/js/src/index.js
@@ -10,14 +10,14 @@ const initialState = {}
const { store, history } = configureStore(initialState)
import './global-styles.css'
-import App from './containers/App'
+import HomePage from './containers/HomePage'
import Error404 from './components/errors/Error404'
ReactDOM.render(
<Provider store={store}>
<Router history={history}>
<div className="app">
- <Route path="/" component={App}/>
+ <Route path="/" component={HomePage}/>
<Route path="*" component={Error404}/>
</div>
</Router>
bgstack15