From 919988317cf77d989cacc4b805400abd94e57417 Mon Sep 17 00:00:00 2001 From: Amanda Date: Wed, 18 Jan 2023 18:36:24 -0300 Subject: [PATCH] fix(main): corrigi escrita do codigo e altera as imagens para svg --- src/components/Main/Main.tsx | 8 ++++---- .../Main/Subject/Contato/RegistrationForm.tsx | 3 +-- .../Main/Subject/Entrega/Entrega.tsx | 4 ++-- .../Forma-de-pagamento/FormaDePagamento.tsx | 4 ++-- src/components/Main/Subject/Nav/Li/Li.tsx | 7 ++++--- src/components/Main/Subject/Nav/Nav.tsx | 19 ++++++++++-------- .../SegurancaEPrivacidade.tsx | 4 ++-- src/components/Main/Subject/Sobre/Sobre.tsx | 4 ++-- src/components/Main/Subject/SubjectMain.tsx | 16 +++++++-------- src/components/Main/Subject/SubjectText.tsx | 5 +++-- .../Troca-e-devolucao/TrocaEDevolucao.tsx | 4 ++-- src/components/Main/assets/arrow.png | Bin 205 -> 0 bytes src/components/Main/assets/arrow.svg | 10 +++++++++ src/components/Main/assets/iconHome.png | Bin 350 -> 0 bytes src/components/Main/assets/iconHome.svg | 3 +++ src/index.tsx | 2 +- src/pages/Home.tsx | 4 ++-- 17 files changed, 57 insertions(+), 40 deletions(-) delete mode 100644 src/components/Main/assets/arrow.png create mode 100644 src/components/Main/assets/arrow.svg delete mode 100644 src/components/Main/assets/iconHome.png create mode 100644 src/components/Main/assets/iconHome.svg diff --git a/src/components/Main/Main.tsx b/src/components/Main/Main.tsx index 5c7c58d..df83ea8 100644 --- a/src/components/Main/Main.tsx +++ b/src/components/Main/Main.tsx @@ -1,6 +1,6 @@ -import iconHome from "./assets/iconHome.png"; -import arrow from "./assets/arrow.png"; -import SubjectMain from "./Subject/SubjectMain"; +import iconHome from "./assets/iconHome.svg"; +import arrow from "./assets/arrow.svg"; +import { SubjectMain } from "./Subject/SubjectMain"; import styles from "./main.module.scss"; @@ -18,4 +18,4 @@ const Main = () => { ); }; -export default Main; +export { Main }; diff --git a/src/components/Main/Subject/Contato/RegistrationForm.tsx b/src/components/Main/Subject/Contato/RegistrationForm.tsx index 44f53f1..792caa6 100644 --- a/src/components/Main/Subject/Contato/RegistrationForm.tsx +++ b/src/components/Main/Subject/Contato/RegistrationForm.tsx @@ -1,5 +1,4 @@ import react, { useState } from "react"; -import mask from "react-input-mask"; import styles from "./form.module.scss"; import stylesInput from "./input.module.scss"; import stylesCheckbox from "./checkbox.module.scss"; @@ -169,4 +168,4 @@ const RegistrationForm = () => { ); }; -export default RegistrationForm; +export { RegistrationForm }; diff --git a/src/components/Main/Subject/Entrega/Entrega.tsx b/src/components/Main/Subject/Entrega/Entrega.tsx index 6a3bd6f..552b944 100644 --- a/src/components/Main/Subject/Entrega/Entrega.tsx +++ b/src/components/Main/Subject/Entrega/Entrega.tsx @@ -1,8 +1,8 @@ import React from "react"; -import SubjectText from "../SubjectText"; +import { SubjectText } from "../SubjectText"; const Entrega = () => { return ; }; -export default Entrega; +export { Entrega }; diff --git a/src/components/Main/Subject/Forma-de-pagamento/FormaDePagamento.tsx b/src/components/Main/Subject/Forma-de-pagamento/FormaDePagamento.tsx index 0afb3c8..c4252e4 100644 --- a/src/components/Main/Subject/Forma-de-pagamento/FormaDePagamento.tsx +++ b/src/components/Main/Subject/Forma-de-pagamento/FormaDePagamento.tsx @@ -1,8 +1,8 @@ import React from "react"; -import SubjectText from "../SubjectText"; +import { SubjectText } from "../SubjectText"; const FormaDePagamento = () => { return ; }; -export default FormaDePagamento; +export { FormaDePagamento }; diff --git a/src/components/Main/Subject/Nav/Li/Li.tsx b/src/components/Main/Subject/Nav/Li/Li.tsx index ccf7802..1fca08d 100644 --- a/src/components/Main/Subject/Nav/Li/Li.tsx +++ b/src/components/Main/Subject/Nav/Li/Li.tsx @@ -8,20 +8,21 @@ interface LiProps extends NavLinkProps { } const LiForm = (props: LiProps) => { + const { text, to } = props; return (
  • isActive ? styles["page-subject__active"] : styles["page-subject__button"] } > - {props.text} + {text}
  • ); }; -export default LiForm; +export { LiForm }; diff --git a/src/components/Main/Subject/Nav/Nav.tsx b/src/components/Main/Subject/Nav/Nav.tsx index f7294c7..0a068c1 100644 --- a/src/components/Main/Subject/Nav/Nav.tsx +++ b/src/components/Main/Subject/Nav/Nav.tsx @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import Li from "./Li/Li"; +import { LiForm } from "./Li/Li"; import styles from "../subject.module.scss"; const Nav = () => { @@ -12,16 +12,19 @@ const Nav = () => { <> ); }; -export default Nav; +export { Nav }; diff --git a/src/components/Main/Subject/Segurança-e-privacidade/SegurancaEPrivacidade.tsx b/src/components/Main/Subject/Segurança-e-privacidade/SegurancaEPrivacidade.tsx index 0dbad5a..e4c2f63 100644 --- a/src/components/Main/Subject/Segurança-e-privacidade/SegurancaEPrivacidade.tsx +++ b/src/components/Main/Subject/Segurança-e-privacidade/SegurancaEPrivacidade.tsx @@ -1,8 +1,8 @@ import React from "react"; -import SubjectText from "../SubjectText"; +import { SubjectText } from "../SubjectText"; const SegurancaEPrivacidade = () => { return ; }; -export default SegurancaEPrivacidade; +export { SegurancaEPrivacidade }; diff --git a/src/components/Main/Subject/Sobre/Sobre.tsx b/src/components/Main/Subject/Sobre/Sobre.tsx index 84221ca..11ae8e2 100644 --- a/src/components/Main/Subject/Sobre/Sobre.tsx +++ b/src/components/Main/Subject/Sobre/Sobre.tsx @@ -1,8 +1,8 @@ import React from "react"; -import SubjectText from "../SubjectText"; +import { SubjectText } from "../SubjectText"; const Sobre = () => { return ; }; -export default Sobre; +export { Sobre }; diff --git a/src/components/Main/Subject/SubjectMain.tsx b/src/components/Main/Subject/SubjectMain.tsx index 3a993e5..8f7f648 100644 --- a/src/components/Main/Subject/SubjectMain.tsx +++ b/src/components/Main/Subject/SubjectMain.tsx @@ -1,13 +1,13 @@ import React from "react"; import styles from "./subject.module.scss"; -import Nav from "./Nav/Nav"; +import { Nav } from "./Nav/Nav"; import { BrowserRouter as Router, Routes, Route } from "react-router-dom"; -import Sobre from "./Sobre/Sobre"; -import FormaDePagamento from "./Forma-de-pagamento/FormaDePagamento"; -import Entrega from "./Entrega/Entrega"; -import TrocaEDevolucao from "./Troca-e-devolucao/TrocaEDevolucao"; -import SegurancaEPrivacidade from "./Segurança-e-privacidade/SegurancaEPrivacidade"; -import RegistrationForm from "./Contato/RegistrationForm"; +import { Sobre } from "./Sobre/Sobre"; +import { FormaDePagamento } from "./Forma-de-pagamento/FormaDePagamento"; +import { Entrega } from "./Entrega/Entrega"; +import { TrocaEDevolucao } from "./Troca-e-devolucao/TrocaEDevolucao"; +import { SegurancaEPrivacidade } from "./Segurança-e-privacidade/SegurancaEPrivacidade"; +import { RegistrationForm } from "./Contato/RegistrationForm"; const SubjectMain = () => { return ( @@ -30,4 +30,4 @@ const SubjectMain = () => { ); }; -export default SubjectMain; +export { SubjectMain }; diff --git a/src/components/Main/Subject/SubjectText.tsx b/src/components/Main/Subject/SubjectText.tsx index c545728..cc447b4 100644 --- a/src/components/Main/Subject/SubjectText.tsx +++ b/src/components/Main/Subject/SubjectText.tsx @@ -4,9 +4,10 @@ interface SubjectTextProps { title: string; } const SubjectText = (props: SubjectTextProps) => { + const { title } = props; return (
    -

    {props.title}

    +

    {title}

    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim @@ -38,4 +39,4 @@ const SubjectText = (props: SubjectTextProps) => { ); }; -export default SubjectText; +export { SubjectText }; diff --git a/src/components/Main/Subject/Troca-e-devolucao/TrocaEDevolucao.tsx b/src/components/Main/Subject/Troca-e-devolucao/TrocaEDevolucao.tsx index 6411aa5..fcc7d96 100644 --- a/src/components/Main/Subject/Troca-e-devolucao/TrocaEDevolucao.tsx +++ b/src/components/Main/Subject/Troca-e-devolucao/TrocaEDevolucao.tsx @@ -1,8 +1,8 @@ import React from "react"; -import SubjectText from "../SubjectText"; +import { SubjectText } from "../SubjectText"; const TrocaEDevolucao = () => { return ; }; -export default TrocaEDevolucao; +export { TrocaEDevolucao }; diff --git a/src/components/Main/assets/arrow.png b/src/components/Main/assets/arrow.png deleted file mode 100644 index 489a76deac12cdac5b3394d0becfc8a46c842bec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJx0U~c5>$3n-oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBev+q)V@L&KX^Wf;i%HkKsS6Dq1XH + + + + + + + + + diff --git a/src/components/Main/assets/iconHome.png b/src/components/Main/assets/iconHome.png deleted file mode 100644 index 04fe81b3d9ca331fff98a4615c2c61bd0c3e7e7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{%21Y$B+ufr9roOn+!y9XY)Pa=y_m2;RM^R zM!y4E7L0iZI0WP#imP1^{PFy$W+tapl;NBuOPB9_e&_UF)guiy=bbnD7+z74JO0sx zHE@cm# zIM!TIdcv}oGY!Qa{z$lywWjS4V~Y4k-brCHsVtGxex7bvq_HSbqVKeI%9@5;r^VvVGQHpcxi9ZJNbn+nNvCa`|7_{Cu{# tQGz?{#&_F^b95}#3~CR~=Z@=q%Nsmv-AbRX*C6jRc)I$ztaD0e0suRXiqHT6 diff --git a/src/components/Main/assets/iconHome.svg b/src/components/Main/assets/iconHome.svg new file mode 100644 index 0000000..d58e833 --- /dev/null +++ b/src/components/Main/assets/iconHome.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/index.tsx b/src/index.tsx index 8cdc8b4..bbdff60 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,6 +1,6 @@ import ReactDOM from "react-dom"; import "./global.module.scss"; -import Home from "./pages/Home"; +import { Home } from "./pages/Home"; const App = () => { return ( diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index 1cc471a..5d0feba 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -1,6 +1,6 @@ import Footer from "../components/footer/Footer"; import Header from "../components/Header/Header"; -import Main from "../components/Main/Main"; +import { Main } from "../components/Main/Main"; const Home = () => { return ( @@ -12,4 +12,4 @@ const Home = () => { ); }; -export default Home; +export { Home };