Skip to content

Commit

Permalink
finalização mapa
Browse files Browse the repository at this point in the history
  • Loading branch information
ThaisEFAG committed May 9, 2024
1 parent 717594d commit 2e6212d
Show file tree
Hide file tree
Showing 20 changed files with 388 additions and 310 deletions.
31 changes: 25 additions & 6 deletions data/db.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@
"localizacao_endereco": "Rua João Adão Scheeren",
"localizacao_cidade": "Sinop",
"localizacao_estado": "MT",
"localizacao_coordenadas": "sfdsf sfdsdfs",
"localizacao_latitude": -27.589185,
"localizacao_longitude": -48.52482,
"tipos_esportes": "caminhada, dança, alongamentos",
"id": 2
},
Expand All @@ -181,7 +182,8 @@
"localizacao_endereco": "Rua João Adão Scheeren",
"localizacao_cidade": "Sinop",
"localizacao_estado": "MT",
"localizacao_coordenadas": "asdfasdfa",
"localizacao_latitude": -27.72489,
"localizacao_longitude": -48.545404,
"tipos_esportes": "natação, caminhada, musculação",
"id": 3
},
Expand All @@ -192,7 +194,8 @@
"localizacao_endereco": "Rua João Adão Scheeren",
"localizacao_cidade": "Sinop",
"localizacao_estado": "MT",
"localizacao_coordenadas": "asdfasdfadsdfs sdfsd",
"localizacao_latitude": -27.606248,
"localizacao_longitude": -48.662039,
"tipos_esportes": "natação, caminhada, musculação",
"id": 4
},
Expand All @@ -203,7 +206,8 @@
"localizacao_endereco": "Rua Adelqui Stefenoni",
"localizacao_cidade": "Colatina",
"localizacao_estado": "ES",
"localizacao_coordenadas": "sdfd sdfsdf",
"localizacao_latitude": -27.5194647,
"localizacao_longitude": -48.649684,
"tipos_esportes": "caminhada, dança, alongamentos",
"id": 5
},
Expand All @@ -214,7 +218,8 @@
"localizacao_endereco": "Rua Tenente-Coronel - Eb Pedro Jerônimo dos Santos",
"localizacao_cidade": "Maceió",
"localizacao_estado": "AL",
"localizacao_coordenadas": "sfs sdfsdfs",
"localizacao_latitude": -27.5194647,
"localizacao_longitude": -48.649684,
"tipos_esportes": "caminhada, dança, alongamentos",
"id_user": null,
"id": 6
Expand All @@ -226,10 +231,24 @@
"localizacao_endereco": "Rua Tenente-Coronel - Eb Pedro Jerônimo dos Santos",
"localizacao_cidade": "Maceió",
"localizacao_estado": "AL",
"localizacao_coordenadas": "sdfsgrew",
"localizacao_latitude": -27.5194647,
"localizacao_longitude": -48.649684,
"tipos_esportes": "caminhada, dança, alongamentos",
"id_user": "amUTQKI",
"id": 7
},
{
"nome_local": "Floresta",
"descricao_local": "Verde",
"localizacao_cep": "78557129",
"localizacao_endereco": "Rua João Adão Scheeren",
"localizacao_cidade": "Sinop",
"localizacao_estado": "MT",
"localizacao_latitude": "-15.927584",
"localizacao_longitude": "-48.080684",
"tipos_esportes": "caminhada, dança, alongamentos",
"id_user": "0f5c",
"id": 8
}
]
}
56 changes: 43 additions & 13 deletions package-lock.json

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

8 changes: 5 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@
"build": "vite build",
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview",
"server":"json-server --watch ./data/db.json"
"server": "json-server --watch ./data/db.json"
},
"dependencies": {
"react": "^18.2.0",
"react-dom": "^18.2.0",
"leaflet": "^1.9.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.51.3",
"react-leaflet": "^4.2.1",
"react-router-dom": "^6.23.0"
},
"devDependencies": {
Expand Down
7 changes: 5 additions & 2 deletions src/Components/CardLocaisEdit/CardLocaisEdit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const CardLocaisEdit = ({ local }) => {
reset(local);
};


const handleEdit = (data) => {
editLoc(data);
setDesabilitar(true);
Expand Down Expand Up @@ -61,7 +60,11 @@ const CardLocaisEdit = ({ local }) => {
<button type="submit" disabled={desabilitar}>
Salvar
</button>
<button type="button" onClick={() => removeLoc(local.id)} disabled={desabilitar}>
<button
type="button"
onClick={() => removeLoc(local.id)}
disabled={desabilitar}
>
Excluir
</button>
</form>
Expand Down
12 changes: 2 additions & 10 deletions src/Components/FooterPage/index.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@


function footer() {

return(

<h3>Created by Thaís Gonçalves</h3>


)
return <h3>Created by Thaís Gonçalves</h3>;
}

export default footer;
export default footer;
31 changes: 31 additions & 0 deletions src/Components/Mapa/Mapa.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import "leaflet/dist/leaflet.css";
import { MapContainer, Marker, Popup, TileLayer } from "react-leaflet";

function Mapa(props) {
const { position, markers } = props;
if (!markers) return null;
if(markers === 0) {
console.log(markers)
}
return (
<MapContainer
center={position}
zoom={10}
scrollWheelZoom={false}
{...props}
>
<TileLayer
attribution='&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
/>
{markers.map((locaisMap, index) => {
return <Marker key={index} position={[Number(locaisMap.localizacao_latitude), Number(locaisMap.localizacao_longitude)]}>
<Popup>
A pretty CSS3 popup. <br /> Easily customizable.
</Popup>
</Marker>;
})}
</MapContainer>
);
}
export default Mapa;
46 changes: 20 additions & 26 deletions src/Components/NavHeader/index.jsx
Original file line number Diff line number Diff line change
@@ -1,38 +1,32 @@
import { useContext, useEffect, useState } from "react";
import { Link } from "react-router-dom";
import {useState, useEffect, useContext} from "react"
import { UsuariosContext } from "../../Context/UsuariosContext";

function navHeader() {

const [isLogCount, setIsLogCount] = useState(0)
const {logout} = useContext(UsuariosContext);
const [isLogCount, setIsLogCount] = useState(0);
const { logout } = useContext(UsuariosContext);

useEffect(() => {
fetch("http://localhost:3000/listUsuarios?isLogado=true")
.then((response) => response.json())
.then((data) => setIsLogCount(data.length))
.catch((error) => console.error(error));
}, [])

return(

<nav>
<div className="links-menu">
<Link to="/">Home</Link>
<Link to="/cadastroExercicios">Cadastro de Locais</Link>
<Link to="/editExercicios">Edição Locais</Link>
</div>
<div className="users-logs">
Usuarios logados: {isLogCount && isLogCount}
</div>

<button onClick={logout}>Sair</button>


</nav>


)
}, []);

return (
<nav>
<div className="links-menu">
<Link to="/">Home</Link>
<Link to="/cadastroExercicios">Cadastro de Locais</Link>
<Link to="/editExercicios">Edição Locais</Link>
</div>
<div className="users-logs">
Usuarios logados: {isLogCount && isLogCount}
</div>

<button onClick={logout}>Sair</button>
</nav>
);
}

export default navHeader;
export default navHeader;
39 changes: 17 additions & 22 deletions src/Components/cardLocaisExercicio/index.jsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@


const Cardcomponents = (props) => {
const local = props.localprop
return(

<div>
<h1>{local.nome_local}</h1>
<span>{local.identificador_usuario}</span>
<span>{local.descricao_local}</span>
<span>{local.localizacao_cep}</span>
<span>{local.localizacao_endereco}</span>
<span>{local.localizacao_cidade}</span>
<span>{local.localizacao_estado}</span>
<span>{local.localizacao_coordenadas}</span>
<span>{local.tipos_esportes}</span>
<span>{local.id}</span>

</div>

)
}
const local = props.localprop;
return (
<div>
<h1>{local.nome_local}</h1>
<span>{local.identificador_usuario}</span>
<span>{local.descricao_local}</span>
<span>{local.localizacao_cep}</span>
<span>{local.localizacao_endereco}</span>
<span>{local.localizacao_cidade}</span>
<span>{local.localizacao_estado}</span>
<span>{local.localizacao_coordenadas}</span>
<span>{local.tipos_esportes}</span>
<span>{local.id}</span>
</div>
);
};

export default Cardcomponents
export default Cardcomponents;
Loading

0 comments on commit 2e6212d

Please sign in to comment.