Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 132 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"@types/openlayers": "^4.6.17",
"@types/react": "^17.0.3",
"@types/react-dom": "^17.0.2",
"@types/react-router-dom": "^5.1.7",
"chokidar": "^3.5.1",
"dotenv": "^8.2.0",
"google-spreadsheet": "^3.1.15",
Expand All @@ -20,6 +21,7 @@
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-mapbox-gl": "^5.1.1",
"react-router-dom": "^5.2.0",
"react-scripts": "^4.0.3",
"typescript": "^4.2.3"
},
Expand Down
14 changes: 5 additions & 9 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
import React from 'react'
import MapContainer from './components/MapContainer/MapContainer'
import { Route } from 'react-router-dom'
import Main from './components/main'

const App: React.FC = () => {
return (
<div className="App">
<h1 style={{ textAlign: 'center' }}> (test OL) Orca Map</h1>
<MapContainer />
</div>
)
const Approutes: React.FC = () => {
return <Route path="/" component={Main} />
}

export default App
export default Approutes
7 changes: 7 additions & 0 deletions src/components/header.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import React from 'react'

const Header: React.FC = () => {
return <h1 style={{ textAlign: 'center' }}> (test OL) Orca Map</h1>
}

export default Header
16 changes: 16 additions & 0 deletions src/components/main.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React from 'react'
import { Route, Switch } from 'react-router-dom'
import Header from './header'
import MapContainer from './MapContainer/MapContainer'

const Main: React.FC = () => {
return (
<React.Fragment>
<Header />
<Switch>
<Route path="/" exact component={MapContainer} />
</Switch>
</React.Fragment>
)
}
export default Main
7 changes: 5 additions & 2 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
import React from 'react'
import ReactDOM from 'react-dom'
import './index.css'
import App from './App'
import Approutes from './App'
import { BrowserRouter } from 'react-router-dom'
import * as serviceWorker from './serviceWorker'

ReactDOM.render(
<React.StrictMode>
<App />
<BrowserRouter>
<Approutes />
</BrowserRouter>
</React.StrictMode>,

document.getElementById('root'),
Expand Down