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
25,734 changes: 73 additions & 25,661 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 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",
"bootstrap": "^4.6.0",
"chokidar": "^3.5.1",
"dotenv": "^8.2.0",
"google-spreadsheet": "^3.1.15",
Expand Down
11 changes: 7 additions & 4 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
import React from 'react'
import MapContainer from './components/MapContainer/MapContainer'
import NavBar from './components/MapContainer/NavBar'

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

Expand Down
7 changes: 3 additions & 4 deletions src/components/MapContainer/Map/Map.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
.ol-map {
min-width: 600px;
min-height: 500px;
margin: 50px;
min-width: 90%;
min-height: 70%;
margin: 50px auto;
height: 500px;
width: '100%';
}

.ol-control {
Expand Down
13 changes: 9 additions & 4 deletions src/components/MapContainer/MapContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,20 @@ const MapContainer: React.FC = () => {
}, [])

return (
<>
<div id="cetacean_checkbox" style={{ margin: '0 40vw' }}>
<div className="container">
<div
id="cetacean_checkbox"
className="d-flex justify-content-center mt-3"
>
<img
className="mr-2"
src={orca}
width="25px"
height="25px"
alt="possible orca pin"
></img>
/>
<input
className="m-1"
type="checkbox"
checked={showLayer}
onChange={(event) => setShowLayer(event.target.checked)}
Expand All @@ -51,7 +56,7 @@ const MapContainer: React.FC = () => {
<FullScreenControl />
</Controls>
</Map>
</>
</div>
)
}

Expand Down
13 changes: 13 additions & 0 deletions src/components/MapContainer/NavBar.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React from 'react'

const NavBar = () => {
return (
<nav className="navbar navbar-dark bg-primary">
<div className="container-fluid">
<span className="navbar-brand mb-0 h1">Orca Map (test OL)</span>
</div>
</nav>
)
}

export default NavBar
1 change: 1 addition & 0 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import ReactDOM from 'react-dom'
import './index.css'
import App from './App'
import * as serviceWorker from './serviceWorker'
import 'bootstrap/dist/css/bootstrap.css'

ReactDOM.render(
<React.StrictMode>
Expand Down