aboutsummaryrefslogtreecommitdiff
path: root/modern/src/App.js
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-09-04 16:44:14 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2018-09-04 16:44:14 +1200
commitc821e4722da493c5408bcb505599239d687453c6 (patch)
tree68a3723e083b382fde30f86dea2d6c374623fb23 /modern/src/App.js
parent6f6cf5427bd78b6de9ea1331952e086ecb277d10 (diff)
downloadetbsa-traccar-web-c821e4722da493c5408bcb505599239d687453c6.tar.gz
etbsa-traccar-web-c821e4722da493c5408bcb505599239d687453c6.tar.bz2
etbsa-traccar-web-c821e4722da493c5408bcb505599239d687453c6.zip
Implement login logic
Diffstat (limited to 'modern/src/App.js')
-rw-r--r--modern/src/App.js26
1 files changed, 12 insertions, 14 deletions
diff --git a/modern/src/App.js b/modern/src/App.js
index 204c89e..31b8b69 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -1,21 +1,19 @@
-import React, { Component } from 'react';
-import ContainerDimensions from 'react-container-dimensions';
-import MainToobar from './MainToolbar';
-import MainMap from './MainMap';
+import React, { Component, Fragment } from 'react';
+import { Switch, Route } from 'react-router-dom'
+import CssBaseline from '@material-ui/core/CssBaseline';
+import MainPage from './MainPage';
+import LoginPage from './LoginPage';
class App extends Component {
render() {
return (
- <div style={{height: "100vh", display: "flex", flexDirection: "column"}}>
- <div style={{flex: 0}}>
- <MainToobar />
- </div>
- <div style={{flex: 1}}>
- <ContainerDimensions>
- <MainMap/>
- </ContainerDimensions>
- </div>
- </div>
+ <Fragment>
+ <CssBaseline />
+ <Switch>
+ <Route exact path='/' component={MainPage} />
+ <Route exact path='/login' component={LoginPage} />
+ </Switch>
+ </Fragment>
);
}
}