aboutsummaryrefslogtreecommitdiff
path: root/modern/src/App.js
diff options
context:
space:
mode:
Diffstat (limited to 'modern/src/App.js')
-rw-r--r--modern/src/App.js22
1 files changed, 12 insertions, 10 deletions
diff --git a/modern/src/App.js b/modern/src/App.js
index 203067e..204c89e 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -1,18 +1,20 @@
import React, { Component } from 'react';
-import logo from './logo.svg';
-import './App.css';
+import ContainerDimensions from 'react-container-dimensions';
+import MainToobar from './MainToolbar';
+import MainMap from './MainMap';
class App extends Component {
render() {
return (
- <div className="App">
- <header className="App-header">
- <img src={logo} className="App-logo" alt="logo" />
- <h1 className="App-title">Welcome to React</h1>
- </header>
- <p className="App-intro">
- To get started, edit <code>src/App.js</code> and save to reload.
- </p>
+ <div style={{height: "100vh", display: "flex", flexDirection: "column"}}>
+ <div style={{flex: 0}}>
+ <MainToobar />
+ </div>
+ <div style={{flex: 1}}>
+ <ContainerDimensions>
+ <MainMap/>
+ </ContainerDimensions>
+ </div>
</div>
);
}