diff --git a/src/components/Footer/Footer.tsx b/src/components/Footer/Footer.tsx new file mode 100644 index 0000000..9aed252 --- /dev/null +++ b/src/components/Footer/Footer.tsx @@ -0,0 +1,18 @@ +import React from "react"; + +import { Newsletter } from "../Newsletter/Newsletter"; +import { FooterTop } from "./FooterTop/FooterTop"; +import { FooterBottom } from "./FooterBottom/FooterBottom"; + +const Footer = () => { + + return ( + <> + + + + + ); +} + +export { Footer }; \ No newline at end of file diff --git a/src/components/FooterBottom/FooterBottom.module.scss b/src/components/Footer/FooterBottom/FooterBottom.module.scss similarity index 99% rename from src/components/FooterBottom/FooterBottom.module.scss rename to src/components/Footer/FooterBottom/FooterBottom.module.scss index adc8389..2636cc4 100644 --- a/src/components/FooterBottom/FooterBottom.module.scss +++ b/src/components/Footer/FooterBottom/FooterBottom.module.scss @@ -1,4 +1,4 @@ -@use '../../variables'; +@use '../../../variables'; .footer-bottom { background-color: variables.$black; diff --git a/src/components/FooterBottom/FooterBottom.tsx b/src/components/Footer/FooterBottom/FooterBottom.tsx similarity index 97% rename from src/components/FooterBottom/FooterBottom.tsx rename to src/components/Footer/FooterBottom/FooterBottom.tsx index a17402b..49412e6 100644 --- a/src/components/FooterBottom/FooterBottom.tsx +++ b/src/components/Footer/FooterBottom/FooterBottom.tsx @@ -13,8 +13,8 @@ import imgLogoPayPal from "./assets/PayPal.png"; import imgLogoBoleto from "./assets/Boleto.png"; import imgLogoVtexPCI from "./assets/vtex-pci-200.png"; -import { IconList } from "../IconList/IconList"; -import { ItemList } from "../ItemList/ItemList"; +import { IconList } from "../../IconList/IconList"; +import { ItemList } from "../../ItemList/ItemList"; const FooterBottom = () => { return ( diff --git a/src/components/FooterBottom/assets/AmericanExpress.png b/src/components/Footer/FooterBottom/assets/AmericanExpress.png similarity index 100% rename from src/components/FooterBottom/assets/AmericanExpress.png rename to src/components/Footer/FooterBottom/assets/AmericanExpress.png diff --git a/src/components/FooterBottom/assets/Boleto.png b/src/components/Footer/FooterBottom/assets/Boleto.png similarity index 100% rename from src/components/FooterBottom/assets/Boleto.png rename to src/components/Footer/FooterBottom/assets/Boleto.png diff --git a/src/components/FooterBottom/assets/Elo.png b/src/components/Footer/FooterBottom/assets/Elo.png similarity index 100% rename from src/components/FooterBottom/assets/Elo.png rename to src/components/Footer/FooterBottom/assets/Elo.png diff --git a/src/components/FooterBottom/assets/Hiper.png b/src/components/Footer/FooterBottom/assets/Hiper.png similarity index 100% rename from src/components/FooterBottom/assets/Hiper.png rename to src/components/Footer/FooterBottom/assets/Hiper.png diff --git a/src/components/FooterBottom/assets/Master.png b/src/components/Footer/FooterBottom/assets/Master.png similarity index 100% rename from src/components/FooterBottom/assets/Master.png rename to src/components/Footer/FooterBottom/assets/Master.png diff --git a/src/components/FooterBottom/assets/PayPal.png b/src/components/Footer/FooterBottom/assets/PayPal.png similarity index 100% rename from src/components/FooterBottom/assets/PayPal.png rename to src/components/Footer/FooterBottom/assets/PayPal.png diff --git a/src/components/FooterBottom/assets/Visa.png b/src/components/Footer/FooterBottom/assets/Visa.png similarity index 100% rename from src/components/FooterBottom/assets/Visa.png rename to src/components/Footer/FooterBottom/assets/Visa.png diff --git a/src/components/FooterBottom/assets/m3-logo.svg b/src/components/Footer/FooterBottom/assets/m3-logo.svg similarity index 100% rename from src/components/FooterBottom/assets/m3-logo.svg rename to src/components/Footer/FooterBottom/assets/m3-logo.svg diff --git a/src/components/FooterBottom/assets/vtex-logo.svg b/src/components/Footer/FooterBottom/assets/vtex-logo.svg similarity index 100% rename from src/components/FooterBottom/assets/vtex-logo.svg rename to src/components/Footer/FooterBottom/assets/vtex-logo.svg diff --git a/src/components/FooterBottom/assets/vtex-pci-200.png b/src/components/Footer/FooterBottom/assets/vtex-pci-200.png similarity index 100% rename from src/components/FooterBottom/assets/vtex-pci-200.png rename to src/components/Footer/FooterBottom/assets/vtex-pci-200.png diff --git a/src/components/FooterMenu/FooterMenu.module.scss b/src/components/Footer/FooterMenu/FooterMenu.module.scss similarity index 98% rename from src/components/FooterMenu/FooterMenu.module.scss rename to src/components/Footer/FooterMenu/FooterMenu.module.scss index 80bc14d..6299503 100644 --- a/src/components/FooterMenu/FooterMenu.module.scss +++ b/src/components/Footer/FooterMenu/FooterMenu.module.scss @@ -1,4 +1,4 @@ -@use '../../variables'; +@use '../../../variables'; .footer-menu { display: flex; diff --git a/src/components/FooterMenu/FooterMenu.tsx b/src/components/Footer/FooterMenu/FooterMenu.tsx similarity index 98% rename from src/components/FooterMenu/FooterMenu.tsx rename to src/components/Footer/FooterMenu/FooterMenu.tsx index 74133cd..ffe25eb 100644 --- a/src/components/FooterMenu/FooterMenu.tsx +++ b/src/components/Footer/FooterMenu/FooterMenu.tsx @@ -2,7 +2,7 @@ import {useState} from "react"; import styles from "./FooterMenu.module.scss"; -import { ItemList } from "../ItemList/ItemList"; +import { ItemList } from "../../ItemList/ItemList"; const FooterMenu = () => { diff --git a/src/components/FooterTop/FooterTop.module.scss b/src/components/Footer/FooterTop/FooterTop.module.scss similarity index 90% rename from src/components/FooterTop/FooterTop.module.scss rename to src/components/Footer/FooterTop/FooterTop.module.scss index b1fd4bf..e93d92a 100644 --- a/src/components/FooterTop/FooterTop.module.scss +++ b/src/components/Footer/FooterTop/FooterTop.module.scss @@ -1,4 +1,4 @@ -@use '../../variables'; +@use '../../../variables'; .footer-top { display: flex; diff --git a/src/components/FooterTop/FooterTop.tsx b/src/components/Footer/FooterTop/FooterTop.tsx similarity index 82% rename from src/components/FooterTop/FooterTop.tsx rename to src/components/Footer/FooterTop/FooterTop.tsx index 9dec508..0491c4b 100644 --- a/src/components/FooterTop/FooterTop.tsx +++ b/src/components/Footer/FooterTop/FooterTop.tsx @@ -2,7 +2,7 @@ import React from "react"; import styles from "./FooterTop.module.scss"; -import { RedesSociais } from "../RedesSociais/RedesSociais"; +import { RedesSociais } from "../../RedesSociais/RedesSociais"; import { FooterMenu } from "../FooterMenu/FooterMenu"; const FooterTop = () => { diff --git a/src/components/InstitucionalForm/InstitucionalForm.module.scss b/src/components/Form/RegistrationForm.module.scss similarity index 100% rename from src/components/InstitucionalForm/InstitucionalForm.module.scss rename to src/components/Form/RegistrationForm.module.scss diff --git a/src/components/InstitucionalForm/InstitucionalForm.tsx b/src/components/Form/RegistrationForm.tsx similarity index 95% rename from src/components/InstitucionalForm/InstitucionalForm.tsx rename to src/components/Form/RegistrationForm.tsx index 80745c7..cebe247 100644 --- a/src/components/InstitucionalForm/InstitucionalForm.tsx +++ b/src/components/Form/RegistrationForm.tsx @@ -2,9 +2,9 @@ import {useState} from "react"; import { Formik, Form, Field, ErrorMessage, FormikHelpers} from "formik"; -import styles from "./InstitucionalForm.module.scss"; +import styles from "./RegistrationForm.module.scss"; -import FormSchema from "./Schema/InstitucionalFormSchema"; +import RegistrationFormSchema from "./Schema/RegistrationFormSchema"; interface FormValue { name: string; @@ -28,7 +28,7 @@ const initialValue = { let listClient: Array = []; -const InstitucionalForm = () => { +const RegistrationForm = () => { const [successMessage, setSuccessMessage] = useState(false); @@ -46,7 +46,7 @@ const InstitucionalForm = () => { + validationSchema={RegistrationFormSchema} > {({errors, touched}) => (
@@ -185,4 +185,4 @@ const InstitucionalForm = () => { ); }; -export { InstitucionalForm }; +export { RegistrationForm }; diff --git a/src/components/InstitucionalForm/Schema/InstitucionalFormSchema.ts b/src/components/Form/Schema/RegistrationFormSchema.ts similarity index 100% rename from src/components/InstitucionalForm/Schema/InstitucionalFormSchema.ts rename to src/components/Form/Schema/RegistrationFormSchema.ts diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx new file mode 100644 index 0000000..cc60641 --- /dev/null +++ b/src/components/Header/Header.tsx @@ -0,0 +1,16 @@ +import React from "react"; + +import { HeaderTop } from "./HeaderTop/HeaderTop"; +import { HeaderBottom } from "./HeaderBottom/HeaderBottom"; + +const Header = () => { + + return ( + <> + + + + ); +} + +export { Header }; diff --git a/src/components/HeaderBottom/HeaderBottom.module.scss b/src/components/Header/HeaderBottom/HeaderBottom.module.scss similarity index 75% rename from src/components/HeaderBottom/HeaderBottom.module.scss rename to src/components/Header/HeaderBottom/HeaderBottom.module.scss index b6bb0e5..7d62aaf 100644 --- a/src/components/HeaderBottom/HeaderBottom.module.scss +++ b/src/components/Header/HeaderBottom/HeaderBottom.module.scss @@ -1,4 +1,4 @@ -@use '../../variables'; +@use '../../../variables'; .header-bottom { @media (max-width: 1024px) { diff --git a/src/components/HeaderBottom/HeaderBottom.tsx b/src/components/Header/HeaderBottom/HeaderBottom.tsx similarity index 100% rename from src/components/HeaderBottom/HeaderBottom.tsx rename to src/components/Header/HeaderBottom/HeaderBottom.tsx diff --git a/src/components/HeaderNavBar/HeaderNavBar.module.scss b/src/components/Header/HeaderNavBar/HeaderNavBar.module.scss similarity index 98% rename from src/components/HeaderNavBar/HeaderNavBar.module.scss rename to src/components/Header/HeaderNavBar/HeaderNavBar.module.scss index 08f642d..8a565db 100644 --- a/src/components/HeaderNavBar/HeaderNavBar.module.scss +++ b/src/components/Header/HeaderNavBar/HeaderNavBar.module.scss @@ -1,4 +1,4 @@ -@use '../../variables'; +@use '../../../variables'; .header-nav-bar { height: 44px; diff --git a/src/components/Header/HeaderNavBar/HeaderNavBar.tsx b/src/components/Header/HeaderNavBar/HeaderNavBar.tsx new file mode 100644 index 0000000..30f10b6 --- /dev/null +++ b/src/components/Header/HeaderNavBar/HeaderNavBar.tsx @@ -0,0 +1,36 @@ +import React from "react"; + +import styles from "./HeaderNavBar.module.scss"; + +import { ItemList } from "../../ItemList/ItemList"; + +const HeaderNavBar = () => { + return ( + + ); +}; + +export { HeaderNavBar }; diff --git a/src/components/HeaderTop/HeaderTop.module.scss b/src/components/Header/HeaderTop/HeaderTop.module.scss similarity index 99% rename from src/components/HeaderTop/HeaderTop.module.scss rename to src/components/Header/HeaderTop/HeaderTop.module.scss index 6fa0c16..d4b6b45 100644 --- a/src/components/HeaderTop/HeaderTop.module.scss +++ b/src/components/Header/HeaderTop/HeaderTop.module.scss @@ -1,4 +1,4 @@ -@use '../../variables'; +@use '../../../variables'; .header-top { border-bottom: 1px solid variables.$gray-400; diff --git a/src/components/HeaderTop/HeaderTop.tsx b/src/components/Header/HeaderTop/HeaderTop.tsx similarity index 97% rename from src/components/HeaderTop/HeaderTop.tsx rename to src/components/Header/HeaderTop/HeaderTop.tsx index d7bde1e..f3613ce 100644 --- a/src/components/HeaderTop/HeaderTop.tsx +++ b/src/components/Header/HeaderTop/HeaderTop.tsx @@ -2,7 +2,7 @@ import { useState, useEffect, useRef } from "react"; import styles from "./HeaderTop.module.scss"; -import imgLogo from "./assets/logo-m3academy.png"; +import imgLogo from "./assets/logo-m3academy.svg"; import imgCart from "./assets/cart.svg"; import imgSearch from "./assets/search.svg"; import imgHamburgerBtn from "./assets/hamburger-menu-btn-icon.svg"; @@ -59,7 +59,7 @@ const HeaderTop = () => { - + diff --git a/src/components/HeaderTop/assets/cart.svg b/src/components/Header/HeaderTop/assets/cart.svg similarity index 100% rename from src/components/HeaderTop/assets/cart.svg rename to src/components/Header/HeaderTop/assets/cart.svg diff --git a/src/components/HeaderTop/assets/close-menu-btn-icon.svg b/src/components/Header/HeaderTop/assets/close-menu-btn-icon.svg similarity index 100% rename from src/components/HeaderTop/assets/close-menu-btn-icon.svg rename to src/components/Header/HeaderTop/assets/close-menu-btn-icon.svg diff --git a/src/components/HeaderTop/assets/hamburger-menu-btn-icon.svg b/src/components/Header/HeaderTop/assets/hamburger-menu-btn-icon.svg similarity index 100% rename from src/components/HeaderTop/assets/hamburger-menu-btn-icon.svg rename to src/components/Header/HeaderTop/assets/hamburger-menu-btn-icon.svg diff --git a/src/components/Header/HeaderTop/assets/logo-m3academy.svg b/src/components/Header/HeaderTop/assets/logo-m3academy.svg new file mode 100644 index 0000000..4a6c7e4 --- /dev/null +++ b/src/components/Header/HeaderTop/assets/logo-m3academy.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/components/HeaderTop/assets/search.svg b/src/components/Header/HeaderTop/assets/search.svg similarity index 100% rename from src/components/HeaderTop/assets/search.svg rename to src/components/Header/HeaderTop/assets/search.svg diff --git a/src/components/HeaderNavBar/HeaderNavBar.tsx b/src/components/HeaderNavBar/HeaderNavBar.tsx deleted file mode 100644 index 8d29ce0..0000000 --- a/src/components/HeaderNavBar/HeaderNavBar.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import React from "react"; - -import styles from "./HeaderNavBar.module.scss"; - -import { ItemList } from "../ItemList/ItemList"; - -const HeaderNavBar = () => { - return ( - - ); -}; - -export { HeaderNavBar }; diff --git a/src/components/HeaderTop/assets/logo-m3academy.png b/src/components/HeaderTop/assets/logo-m3academy.png deleted file mode 100644 index 7f6b6ad..0000000 Binary files a/src/components/HeaderTop/assets/logo-m3academy.png and /dev/null differ diff --git a/src/components/Main/Main.tsx b/src/components/Main/Main.tsx index dc0a7ec..1fbf11c 100644 --- a/src/components/Main/Main.tsx +++ b/src/components/Main/Main.tsx @@ -8,9 +8,7 @@ import imgArrowToRight from "./assets/arrow-point-to-right.svg"; import { IconList } from "../IconList/IconList"; import { ItemList } from "../ItemList/ItemList"; -import { TitlePrincipal } from "../TitlePrincipal/TitlePrincipal"; -import { InstitucionalRoutes } from "../Routes/InstitucionalRoutes"; - +import { InstitucionalRoutes } from "./Routes/InstitucionalRoutes"; const Main = () => { @@ -38,7 +36,7 @@ const Main = () => { - +

Institucional

diff --git a/src/components/MenuSideBar/MenuSideBar.module.scss b/src/components/Main/MenuSideBar/MenuSideBar.module.scss similarity index 96% rename from src/components/MenuSideBar/MenuSideBar.module.scss rename to src/components/Main/MenuSideBar/MenuSideBar.module.scss index 3d32f68..1e944ea 100644 --- a/src/components/MenuSideBar/MenuSideBar.module.scss +++ b/src/components/Main/MenuSideBar/MenuSideBar.module.scss @@ -1,4 +1,4 @@ -@use '../../variables'; +@use '../../../variables'; .menu-sidebar { border-right: 1px solid variables.$black; diff --git a/src/components/MenuSideBar/MenuSideBar.tsx b/src/components/Main/MenuSideBar/MenuSideBar.tsx similarity index 100% rename from src/components/MenuSideBar/MenuSideBar.tsx rename to src/components/Main/MenuSideBar/MenuSideBar.tsx diff --git a/src/components/Routes/InstitucionalRoutes.tsx b/src/components/Main/Routes/InstitucionalRoutes.tsx similarity index 100% rename from src/components/Routes/InstitucionalRoutes.tsx rename to src/components/Main/Routes/InstitucionalRoutes.tsx diff --git a/src/components/Routes/RoutesPages/Contato.tsx b/src/components/Main/Routes/RoutesPages/Contato.tsx similarity index 74% rename from src/components/Routes/RoutesPages/Contato.tsx rename to src/components/Main/Routes/RoutesPages/Contato.tsx index 81e3e12..f4eb92e 100644 --- a/src/components/Routes/RoutesPages/Contato.tsx +++ b/src/components/Main/Routes/RoutesPages/Contato.tsx @@ -1,16 +1,16 @@ import React from "react"; -import { InstitucionalForm } from "../../InstitucionalForm/InstitucionalForm"; - import styles from "./RoutesPages.module.scss"; +import { RegistrationForm } from "../../../Form/RegistrationForm"; + const Contato = () => { return (

Preencha o Formulário

- +
); } diff --git a/src/components/Routes/RoutesPages/Entrega.tsx b/src/components/Main/Routes/RoutesPages/Entrega.tsx similarity index 100% rename from src/components/Routes/RoutesPages/Entrega.tsx rename to src/components/Main/Routes/RoutesPages/Entrega.tsx diff --git a/src/components/Routes/RoutesPages/FormaDePagamento.tsx b/src/components/Main/Routes/RoutesPages/FormaDePagamento.tsx similarity index 100% rename from src/components/Routes/RoutesPages/FormaDePagamento.tsx rename to src/components/Main/Routes/RoutesPages/FormaDePagamento.tsx diff --git a/src/components/Routes/RoutesPages/RoutesPages.module.scss b/src/components/Main/Routes/RoutesPages/RoutesPages.module.scss similarity index 96% rename from src/components/Routes/RoutesPages/RoutesPages.module.scss rename to src/components/Main/Routes/RoutesPages/RoutesPages.module.scss index 15ffb30..f08702b 100644 --- a/src/components/Routes/RoutesPages/RoutesPages.module.scss +++ b/src/components/Main/Routes/RoutesPages/RoutesPages.module.scss @@ -1,4 +1,4 @@ -@use '../../../variables'; +@use '../../../../variables'; .institucional__content { width: 100%; diff --git a/src/components/Routes/RoutesPages/SegurancaEPrivacidade.tsx b/src/components/Main/Routes/RoutesPages/SegurancaEPrivacidade.tsx similarity index 100% rename from src/components/Routes/RoutesPages/SegurancaEPrivacidade.tsx rename to src/components/Main/Routes/RoutesPages/SegurancaEPrivacidade.tsx diff --git a/src/components/Routes/RoutesPages/Sobre.tsx b/src/components/Main/Routes/RoutesPages/Sobre.tsx similarity index 100% rename from src/components/Routes/RoutesPages/Sobre.tsx rename to src/components/Main/Routes/RoutesPages/Sobre.tsx diff --git a/src/components/Routes/RoutesPages/TrocaEDevolucao.tsx b/src/components/Main/Routes/RoutesPages/TrocaEDevolucao.tsx similarity index 100% rename from src/components/Routes/RoutesPages/TrocaEDevolucao.tsx rename to src/components/Main/Routes/RoutesPages/TrocaEDevolucao.tsx diff --git a/src/components/Newsletter/Newsletter.module.scss b/src/components/Newsletter/Newsletter.module.scss index 69d026a..6eb38d3 100644 --- a/src/components/Newsletter/Newsletter.module.scss +++ b/src/components/Newsletter/Newsletter.module.scss @@ -8,6 +8,7 @@ align-items: center; border-top: 1px solid variables.$black; border-bottom: 1px solid variables.$black; + padding: 0 100px; } &__form { diff --git a/src/components/TitlePrincipal/TitlePrincipal.tsx b/src/components/TitlePrincipal/TitlePrincipal.tsx deleted file mode 100644 index f13c422..0000000 --- a/src/components/TitlePrincipal/TitlePrincipal.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import React from "react"; - -interface Title { - text: string; - titleClassName?: string; -} - -const TitlePrincipal = ( props: Title) => { - const { text, titleClassName } = props; - - return

{ text }

; -}; - -export { TitlePrincipal }; diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx index 797ef2d..b0a9211 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home.tsx @@ -2,12 +2,9 @@ import React from "react"; import styles from "./Home.module.scss"; -import { HeaderTop } from "../components/HeaderTop/HeaderTop"; -import { HeaderBottom } from "../components/HeaderBottom/HeaderBottom"; +import { Header } from "../components/Header/Header"; import { Main } from "../components/Main/Main"; -import { Newsletter } from "../components/Newsletter/Newsletter"; -import { FooterTop } from "../components/FooterTop/FooterTop"; -import { FooterBottom } from "../components/FooterBottom/FooterBottom"; +import { Footer } from "../components/Footer/Footer"; import { WhatsAppAndScrollTop } from "../components/WhatsAppAndScrollTop/WhatsAppAndScrollTop"; const Home = () => { @@ -15,8 +12,7 @@ const Home = () => { return ( <>
- - +
@@ -24,11 +20,10 @@ const Home = () => {