From 544a324beb83e5f221f8038cd4453a50276a3269 Mon Sep 17 00:00:00 2001 From: Gabriel Jorge Date: Fri, 20 May 2022 20:29:41 -0300 Subject: [PATCH] =?UTF-8?q?Ajustes=20para=20Exibi=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modulo3/astromatch2/src/App.js | 61 ++++++------------- .../astromatch2/src/components/TelaInicial.js | 33 +++------- .../astromatch2/src/components/TelaMatch.js | 40 ++++-------- .../astromatch2/src/components/TelaMusica.js | 17 ++---- modulo3/astromatch2/src/components/header.js | 16 ++--- 5 files changed, 50 insertions(+), 117 deletions(-) diff --git a/modulo3/astromatch2/src/App.js b/modulo3/astromatch2/src/App.js index 610c60c..c7aa830 100644 --- a/modulo3/astromatch2/src/App.js +++ b/modulo3/astromatch2/src/App.js @@ -8,11 +8,11 @@ import './style.css' import Header from "./components/header"; const DivGlobal = styled.div` -background-color: #3299a8 ; -color: black; -margin: auto; -width: 50%; -border-radius: 10%; + background-color: #3299a8 ; + color: black; + margin: auto; + width: 50%; + border-radius: 10%; ` @@ -37,7 +37,7 @@ const App = () => { return { return @@ -61,7 +61,7 @@ const App = () => { return @@ -70,29 +70,19 @@ const App = () => { } } - // const trocaTela = () => { - // if (telaAtual === "apreTelaInicial"){ - // setTelaAtual("apreTelaMatch") - // } else{ - // setTelaAtual("apreTelaInicial") - // } - - // } - -const vaiPaginaMatch = () => { - setTelaAtual("apreTelaMatch") - getMatchs() -} + const vaiPaginaMatch = () => { + setTelaAtual("apreTelaMatch") + getMatchs() + } -const vaiPaginaInicial = () => { - setTelaAtual("apreTelaInicial") - getPerfilUsuario() -} + const vaiPaginaInicial = () => { + setTelaAtual("apreTelaInicial") + getPerfilUsuario() + } -const vaiPaginaMusicas = () => { - setTelaAtual("apreTelaMusica") -// console.log("qualquer coisa") -} + const vaiPaginaMusicas = () => { + setTelaAtual("apreTelaMusica") + } @@ -182,19 +172,6 @@ const limpar = () => { } - - - - - - - - - - - - - return (
diff --git a/modulo3/astromatch2/src/components/TelaInicial.js b/modulo3/astromatch2/src/components/TelaInicial.js index cb7d269..d4aa06c 100644 --- a/modulo3/astromatch2/src/components/TelaInicial.js +++ b/modulo3/astromatch2/src/components/TelaInicial.js @@ -1,44 +1,29 @@ -// import React from 'react' -// import App from '../App' import styled from "styled-components" const StyledTelaInicial = styled.div` img{ - border-radius: 10px 10px 10px 10px; - height: 300px; - width: 300px; - object-fit: cover; - object-position: center; - padding: 5px - -} - - + border-radius: 10px 10px 10px 10px; + height: 300px; + width: 300px; + object-fit: cover; + object-position: center; + padding: 5px + } ` - - - - - - - - - const TelaInicial = (props) => { return(
-

{props.userName}, {props.userAge}

+

{props.userName}, {props.userAge}

{props.userBio}

-

Tela Inicial

- + {/* */}
diff --git a/modulo3/astromatch2/src/components/TelaMatch.js b/modulo3/astromatch2/src/components/TelaMatch.js index 8a07ddd..a3ee161 100644 --- a/modulo3/astromatch2/src/components/TelaMatch.js +++ b/modulo3/astromatch2/src/components/TelaMatch.js @@ -11,19 +11,10 @@ img{ object-fit: cover; object-position: center; padding: 5px - -} - - + } ` - - - - - - const TelaMatch = (props) => { const renderMatches = props.matchesList.map((pessoa) => { return ( @@ -31,26 +22,19 @@ return (

{pessoa.name}

- -) - + ) }) - - -return( -
- - {renderMatches} - -

Tela Match Ok

- - -
- - - -) + return( +
+ + {renderMatches} + +

Tela Match Ok

+ + +
+ ) } export default TelaMatch diff --git a/modulo3/astromatch2/src/components/TelaMusica.js b/modulo3/astromatch2/src/components/TelaMusica.js index 3fee54e..3c30cb2 100644 --- a/modulo3/astromatch2/src/components/TelaMusica.js +++ b/modulo3/astromatch2/src/components/TelaMusica.js @@ -1,20 +1,13 @@ import React from 'react' - const TelaMusica = (props) => { - - - -return( -
+ return( +

Tela Musicas Ok

-
- - - -) +
+ ) } -export default TelaMusica +export default TelaMusica \ No newline at end of file diff --git a/modulo3/astromatch2/src/components/header.js b/modulo3/astromatch2/src/components/header.js index 49c6f38..f29d6cd 100644 --- a/modulo3/astromatch2/src/components/header.js +++ b/modulo3/astromatch2/src/components/header.js @@ -1,14 +1,8 @@ -import styled from "styled-components"; - export default function Header() { -return ( -
- heather - -
-) - - - + return ( +
+ heather +
+ ) }