fix(main): corrigi escrita do codigo e altera as imagens para svg

This commit is contained in:
Amanda de Almeida Fonseca 2023-01-18 18:36:24 -03:00
parent 1e2f43e8b9
commit 919988317c
17 changed files with 57 additions and 40 deletions

View File

@ -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 };

View File

@ -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 };

View File

@ -1,8 +1,8 @@
import React from "react";
import SubjectText from "../SubjectText";
import { SubjectText } from "../SubjectText";
const Entrega = () => {
return <SubjectText title="Entrega" />;
};
export default Entrega;
export { Entrega };

View File

@ -1,8 +1,8 @@
import React from "react";
import SubjectText from "../SubjectText";
import { SubjectText } from "../SubjectText";
const FormaDePagamento = () => {
return <SubjectText title="Forma de pagamento" />;
};
export default FormaDePagamento;
export { FormaDePagamento };

View File

@ -8,20 +8,21 @@ interface LiProps extends NavLinkProps {
}
const LiForm = (props: LiProps) => {
const { text, to } = props;
return (
<li>
<NavLink
to={props.to}
to={to}
className={({ isActive }) =>
isActive
? styles["page-subject__active"]
: styles["page-subject__button"]
}
>
{props.text}
{text}
</NavLink>
</li>
);
};
export default LiForm;
export { LiForm };

View File

@ -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 = () => {
<>
<nav className={styles["page-subject__nav"]}>
<ul className={styles["page-subject__menu"]}>
<Li to="/" text="Sobre" />
<Li to="/forma-de-pagamento" text="Forma de Pagamento" />
<Li to="/entrega" text="Entrega" />
<Li to="/troca-e-devolucao" text="Troca e Devolução" />
<Li to="/seguranca-e-privacidade" text="Segurança e Privacidade" />
<Li onClick={Sobre} to="/formulario" text="Contato" />
<LiForm to="/" text="Sobre" />
<LiForm to="/forma-de-pagamento" text="Forma de Pagamento" />
<LiForm to="/entrega" text="Entrega" />
<LiForm to="/troca-e-devolucao" text="Troca e Devolução" />
<LiForm
to="/seguranca-e-privacidade"
text="Segurança e Privacidade"
/>
<LiForm onClick={Sobre} to="/formulario" text="Contato" />
</ul>
</nav>
</>
);
};
export default Nav;
export { Nav };

View File

@ -1,8 +1,8 @@
import React from "react";
import SubjectText from "../SubjectText";
import { SubjectText } from "../SubjectText";
const SegurancaEPrivacidade = () => {
return <SubjectText title="Segurança e Privacidade" />;
};
export default SegurancaEPrivacidade;
export { SegurancaEPrivacidade };

View File

@ -1,8 +1,8 @@
import React from "react";
import SubjectText from "../SubjectText";
import { SubjectText } from "../SubjectText";
const Sobre = () => {
return <SubjectText title="Sobre" />;
};
export default Sobre;
export { Sobre };

View File

@ -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 };

View File

@ -4,9 +4,10 @@ interface SubjectTextProps {
title: string;
}
const SubjectText = (props: SubjectTextProps) => {
const { title } = props;
return (
<article className={styles["page-subject__container"]}>
<h2 className={styles["page-subject__title"]}>{props.title}</h2>
<h2 className={styles["page-subject__title"]}>{title}</h2>
<p className={styles["page-subject__paragraph"]}>
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 };

View File

@ -1,8 +1,8 @@
import React from "react";
import SubjectText from "../SubjectText";
import { SubjectText } from "../SubjectText";
const TrocaEDevolucao = () => {
return <SubjectText title="Troca e Devolução" />;
};
export default TrocaEDevolucao;
export { TrocaEDevolucao };

Binary file not shown.

Before

Width:  |  Height:  |  Size: 205 B

View File

@ -0,0 +1,10 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_3751_560)">
<path d="M11.9417 7.03685L5.22531 0.320703C4.79807 -0.106746 4.10537 -0.106746 3.67833 0.320703C3.25126 0.747771 3.25126 1.44043 3.67833 1.86747L9.62128 7.81023L3.67851 13.7528C3.25144 14.18 3.25144 14.8726 3.67851 15.2997C4.10558 15.7269 4.79824 15.7269 5.22548 15.2997L11.9418 8.58344C12.1554 8.3698 12.262 8.0901 12.262 7.81026C12.262 7.53029 12.1552 7.25038 11.9417 7.03685Z" fill="#C4C4C4"/>
</g>
<defs>
<clipPath id="clip0_3751_560">
<rect width="15.62" height="15.62" fill="white" transform="matrix(1 0 0 -1 0 15.6201)"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 689 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 350 B

View File

@ -0,0 +1,3 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M30.9231 14.8352L28.692 12.6041L16.4147 0.326808C15.9789 -0.108936 15.2723 -0.108936 14.8365 0.326808L2.55915 12.6041L0.326936 14.8364C-0.101287 15.2798 -0.089058 15.9863 0.354338 16.4146C0.786878 16.8323 1.47257 16.8323 1.90511 16.4146L2.23099 16.0864V30.1339C2.23099 30.7503 2.73069 31.25 3.34713 31.25H27.9018C28.5182 31.25 29.0179 30.7503 29.0179 30.1339V16.0864L29.3449 16.4134C29.7883 16.8417 30.4949 16.8294 30.9231 16.386C31.3408 15.9535 31.3408 15.2677 30.9231 14.8352ZM18.9728 29.0178H12.2761V20.0888H18.9728V29.0178ZM26.7856 29.0178H21.2051V18.9727C21.2051 18.3563 20.7054 17.8566 20.0889 17.8566H11.16C10.5436 17.8566 10.0438 18.3563 10.0438 18.9727V29.0178H4.46327V13.8542L15.6244 2.69296L26.7856 13.8542V29.0178Z" fill="#C4C4C4"/>
</svg>

After

Width:  |  Height:  |  Size: 857 B

View File

@ -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 (

View File

@ -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 };