summaryrefslogtreecommitdiffhomepage
path: root/app/app.js
diff options
context:
space:
mode:
authoranderklander <anderklander@gmail.com>2017-11-09 13:30:52 +0100
committerErik Larkö <erik@mullvad.net>2017-12-14 09:16:49 +0100
commita35898e0fafa2dae93b00ca074b810cc88a2fa71 (patch)
tree8b85b8bbff5085e4a121e5d06af31271132ac2f0 /app/app.js
parentb74910f21f720741a6b7e3e537ee637200e6a449 (diff)
downloadmullvadvpn-a35898e0fafa2dae93b00ca074b810cc88a2fa71.tar.xz
mullvadvpn-a35898e0fafa2dae93b00ca074b810cc88a2fa71.zip
Reactxp starter pack
Some changes in app init and rendering the header bar in reactxp. Moved linking and exit to separate files for web/mobile
Diffstat (limited to 'app/app.js')
-rw-r--r--app/app.js20
1 files changed, 12 insertions, 8 deletions
diff --git a/app/app.js b/app/app.js
index a10d0da07c..a5392a49c3 100644
--- a/app/app.js
+++ b/app/app.js
@@ -2,6 +2,7 @@
import React from 'react';
import ReactDOM from 'react-dom';
+import { Component} from 'reactxp';
import { Provider } from 'react-redux';
import { ConnectedRouter } from 'react-router-redux';
import { createMemoryHistory } from 'history';
@@ -104,11 +105,14 @@ function getRootElement() {
}
-ReactDOM.render(
- <Provider store={ store }>
- <ConnectedRouter history={ memoryHistory }>
- { makeRoutes(store.getState, { backend }) }
- </ConnectedRouter>
- </Provider>,
- getRootElement()
-);
+export default class App extends Component{
+ render() {
+ return (
+ <Provider store={ store }>
+ <ConnectedRouter history={ memoryHistory }>
+ { makeRoutes(store.getState, { backend }) }
+ </ConnectedRouter>
+ </Provider>
+ );
+ }
+}