Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V0.5 #3

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
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
615 changes: 614 additions & 1 deletion package-lock.json

Large diffs are not rendered by default.

17 changes: 16 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,30 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.35",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.1.14",
"@material-ui/core": "^4.11.3",
"@material-ui/icons": "^4.11.2",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"axios": "^0.21.1",
"bootstrap": "^4.6.0",
"leaflet": "^1.6.0",
"leaflet.heat": "^0.2.0",
"materialize-css": "^1.0.0-rc.2",
"md5": "^2.3.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-leaflet": "^2.7.0",
"react-leaflet-control": "^2.1.2",
"react-leaflet-heatmap-layer": "^2.0.0",
"react-modal": "^3.12.1",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.3"
"react-scripts": "3.4.3",
"reactstrap": "^8.9.0",
"universal-cookie": "^4.0.4"
},
"scripts": {
"start": "react-scripts start",
Expand Down
7 changes: 7 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@

*{
padding:0;
margin:0;
box-sizing: border-box;
}

.leaflet-container {
width: 100vw;
height: 100vh;
Expand Down
18 changes: 12 additions & 6 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
import React from "react";
import "./App.css";


import { BrowserRouter as Router, Switch, Route } from "react-router-dom";

import MapView from "./components/MapView";
import Home from "./components/Home";


import Mapa from "./components/Mapa";
import Login from "./components/Login";


function App() {
return (
<Router>
<Switch>
<Route path="/map">
<MapView />;
</Route>

<Route path="/mapa">
<Mapa />;
</Route>
<Route path="/">
<Home />
<Login />
</Route>

</Switch>
</Router>
);
Expand Down
1 change: 1 addition & 0 deletions src/assets/undraw.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading