diff --git a/projeto-pokedex/src/Components/CardPokemon/CardPokemon.js b/projeto-pokedex/src/Components/CardPokemon/CardPokemon.js index afb9f73..44c9980 100644 --- a/projeto-pokedex/src/Components/CardPokemon/CardPokemon.js +++ b/projeto-pokedex/src/Components/CardPokemon/CardPokemon.js @@ -67,74 +67,4 @@ const CardPokemon = (props) => { ); }; export default CardPokemon; -/* -import React, { useContext } from "react"; -import { useHistory } from "react-router-dom"; -import GlobalStateContext from "../../Global/GlobalStateContext"; -import { goToPokeDetails } from "../../Router/Coordinator"; -import ButtonProps from "../../Components/Buttons/Button"; -import { CardContainer, CardImg, CardName, Img, CardButton } from "./styled"; - -const CardPokemon = (props) => { - const { states, setters } = useContext(GlobalStateContext); - const { image, name } = props; - const history = useHistory(); - - const addToPokedex = (newPokemon) => { - const index = states.pokemonsHome.findIndex((i) => i.id === newPokemon.id); - const newPokedex = [...states.pokedexList, newPokemon]; - setters.setPokedexList(newPokedex); - states.pokemonsHome.splice(index, 1); - }; - - const removeFromPokedex = (newPokemon) => { - const index = states.pokedexList.findIndex((i) => i.id === newPokemon.id); - const newPokedex = [...states.pokemonsHome, newPokemon]; - setters.setPokemonsHome(newPokedex); - states.pokedexList.splice(index, 1); - }; - - const ButtonToChange = - history.location.pathname === "/" ? ( - addToPokedex(props.pokemon)} - /> - ) : ( - removeFromPokedex(props.pokemon)} - /> - ); - - return ( - - - {name} - - {name} - - {ButtonToChange} - goToPokeDetails(history, props.id)} - /> - - - ); -}; -export default CardPokemon; */ diff --git a/projeto-pokedex/src/Router/Coordinator.js b/projeto-pokedex/src/Router/Coordinator.js index 88a185d..e44a43d 100644 --- a/projeto-pokedex/src/Router/Coordinator.js +++ b/projeto-pokedex/src/Router/Coordinator.js @@ -8,4 +8,10 @@ export const goToPokeDetails = (history, id) => { export const goToHome = (history) => { history.push("/"); -}; \ No newline at end of file +}; + +export const goToBack = (history) => { + history.go(-1) +}; + + diff --git a/projeto-pokedex/src/Router/Router.js b/projeto-pokedex/src/Router/Router.js index c83082c..ff9d97e 100644 --- a/projeto-pokedex/src/Router/Router.js +++ b/projeto-pokedex/src/Router/Router.js @@ -9,12 +9,13 @@ import PokemonDetailsPage from "../Screens/PokemonDetailsPage"; const Router = () => { return ( -
+
+
diff --git a/projeto-pokedex/src/Screens/PokemonDetailsPage.js b/projeto-pokedex/src/Screens/PokemonDetailsPage.js index 2d97e33..e7afa78 100644 --- a/projeto-pokedex/src/Screens/PokemonDetailsPage.js +++ b/projeto-pokedex/src/Screens/PokemonDetailsPage.js @@ -1,18 +1,20 @@ -import React, { useState, useEffect, useContext } from "react"; +import React, { useEffect, useContext } from "react"; import styled from "styled-components"; import { BASE_URL } from "../Constant/Constant"; import axios from "axios" import GlobalStateContext from "../Global/GlobalStateContext"; import { useParams, useHistory } from "react-router-dom"; +import { goToBack } from "../Router/Coordinator" const ContainerContent = styled.div` -padding: 10px; display: flex; flex-direction: column; justify-content: center; align-items: center; border-radius: 10px; font-family: "Lato"; + margin: 0; + `; const ContainerDetails = styled.div` width: 30vw; @@ -108,29 +110,30 @@ const Image = styled.img` width: 15vw; margin-bottom: 25px; background-color: #D6F9EB; - /* opacity: 0.5; */ `; - const HeaderDetails = styled.div` -display: flex; -justify-content: space-between; -width: 100vw; -padding: 20px; -align-items: +const HeaderDetails = styled.div` + height: 10vh; + width: 100%; + background-color: #f5f5f5; + display: flex; + align-items: center; + justify-content: space-between; + border-bottom: solid 2px #dedede; + padding: 0 35px; ` const ContainerPokemon = styled.div` -display: flex; -align-items: center; + display: flex; + align-items: center; ` const Progress = styled.progress` -width: 27.5vw; -height: 3vh; + width: 27.5vw; + height: 3vh; ` - const PokemonDetailsPage = () => { const params = useParams() - const history = useHistory() + const history = useHistory() const { states, setters, requests } = useContext(GlobalStateContext); - + const detailsPokemon = () => { axios @@ -157,34 +160,34 @@ const PokemonDetailsPage = () => { requests.getPokemons(); }, [states, setters, requests]); - -const removeOrAdd = (newPokemon) => { - if(states.pokedexList.findIndex((item) => item.id === newPokemon.id)) { - console.log("Chamei a função") - removeFromPokedex(newPokemon) - } else { - console.log("Vou remover da pokedex") - addToPokedex(newPokemon) + const removeOrAdd = (newPokemon) => { + + if (states.pokedexList.findIndex((item) => item.id === newPokemon.id)) { + console.log("Chamei a função") + removeFromPokedex(newPokemon) + } else { + console.log("Vou remover da pokedex") + addToPokedex(newPokemon) + } } -} -const addToPokedex = (newPokemon) => { - const index = states.pokemonsHome.findIndex((i) => i.id === newPokemon.id); - const newPokedex = [...states.pokedexList, newPokemon]; - setters.setPokedexList(newPokedex); - states.pokemonsHome.splice(index, 1); -}; + const addToPokedex = (newPokemon) => { + const index = states.pokemonsHome.findIndex((i) => i.id === newPokemon.id); + const newPokedex = [...states.pokedexList, newPokemon]; + setters.setPokedexList(newPokedex); + states.pokemonsHome.splice(index, 1); + }; -const removeFromPokedex = (newPokemon) => { - const index = states.pokedexList.findIndex((i) => i.id === newPokemon.id); - const newPokedex = [...states.pokemonsHome, newPokemon]; - setters.setPokemonsHome(newPokedex); - states.pokedexList.splice(0, 1); -}; + const removeFromPokedex = (newPokemon) => { + const index = states.pokedexList.findIndex((i) => i.id === newPokemon.id); + const newPokedex = [...states.pokemonsHome, newPokemon]; + setters.setPokemonsHome(newPokedex); + states.pokedexList.splice(0, 1); + }; let movesThree = states.moves.slice(0, 3) @@ -192,8 +195,9 @@ const removeFromPokedex = (newPokemon) => { +

{states.name}

- +
@@ -204,7 +208,7 @@ const removeFromPokedex = (newPokemon) => { -

{states.name}

+

{states.name}