diff --git a/src/components/CustomInput/CustomInput.tsx b/src/components/CustomInput/CustomInput.tsx deleted file mode 100644 index 99a9c25..0000000 --- a/src/components/CustomInput/CustomInput.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import React from "react"; -import { useField } from "formik"; -import InputMask from "react-input-mask"; - -interface InputProps { - mask?: string; - id: string; - name: string; - placeholder: string; -} - -const CustomInput = (props: InputProps) => { - const { mask } = props; - const [field] = useField(props); - - return ( - <> - - - ); -}; - -export { CustomInput }; diff --git a/src/components/About/About.module.scss b/src/components/MainLayout/About/About.module.scss similarity index 86% rename from src/components/About/About.module.scss rename to src/components/MainLayout/About/About.module.scss index 7b937e2..4549eb8 100644 --- a/src/components/About/About.module.scss +++ b/src/components/MainLayout/About/About.module.scss @@ -1,20 +1,24 @@ .section-container { margin-left: 30px; - padding: 10px 0; + padding: 10px 0 26.56px; + + @media screen and (width >= 2500px) { + padding-bottom: 40px; + } @media screen and (width <= 1024px) { - padding: 0; + padding: 0 0 26px; margin: 0; } .section-title { + margin: 0 0 12px; font-family: "Roboto"; font-style: normal; font-weight: 700; font-size: 24px; line-height: 28px; - color: #292929; // #000000 ?? - margin: 0 0 12px; + color: #292929; @media screen and (width >= 2500px) { font-size: 48px; @@ -30,16 +34,17 @@ height: 223px; display: flex; flex-direction: column; - justify-content: space-between; + gap: 21.5px; + overflow: auto; @media screen and (width >= 2500px) { height: 376px; + gap: 23px; } @media screen and (width <= 1024px) { height: 142px; gap: 20px; - overflow: scroll; } @media screen and (width <= 480px) { @@ -47,14 +52,14 @@ } .section-content { + margin: 0; + padding-right: 2px; font-family: "Roboto"; font-style: normal; font-weight: 400; font-size: 13px; line-height: 15px; color: #7d7d7d; - margin: 0; - padding-right: 2px; @media screen and (width >= 2500px) { font-size: 26px; @@ -62,10 +67,10 @@ } @media screen and (width <= 1024px) { + padding-right: 1px; font-size: 12px; line-height: 18px; text-align: justify; - padding-right: 1px; } } } diff --git a/src/components/About/About.tsx b/src/components/MainLayout/About/About.tsx similarity index 100% rename from src/components/About/About.tsx rename to src/components/MainLayout/About/About.tsx diff --git a/src/components/MainLayout/Breadcrumbs/Breadcrumbs.module.scss b/src/components/MainLayout/Breadcrumbs/Breadcrumbs.module.scss index a8e5fac..5576130 100644 --- a/src/components/MainLayout/Breadcrumbs/Breadcrumbs.module.scss +++ b/src/components/MainLayout/Breadcrumbs/Breadcrumbs.module.scss @@ -1,8 +1,8 @@ .breadcrumbs { - display: flex; - gap: 9.72px; - align-items: center; margin-bottom: 80px; + display: flex; + align-items: center; + gap: 9.72px; @media screen and (width >= 2500px) { gap: 12px; @@ -35,15 +35,15 @@ } .current-location { + margin: 0; font-family: "Roboto"; font-style: normal; font-weight: 400; font-size: 12px; - text-transform: uppercase; color: #c4c4c4; - margin: 0; - // padding: 0; - + text-transform: uppercase; + text-decoration: none; + @media screen and (width >= 2500px) { font-size: 24px; } diff --git a/src/components/MainLayout/Breadcrumbs/Breadcrumbs.tsx b/src/components/MainLayout/Breadcrumbs/Breadcrumbs.tsx index a0381e1..24c16e7 100644 --- a/src/components/MainLayout/Breadcrumbs/Breadcrumbs.tsx +++ b/src/components/MainLayout/Breadcrumbs/Breadcrumbs.tsx @@ -1,20 +1,23 @@ import React from "react"; - -import styles from "./Breadcrumbs.module.scss"; +import { Link } from "react-router-dom"; import homeIcon from "./assets/home-icon.svg"; import arrowIcon from "./assets/arrow-icon.svg"; +import styles from "./Breadcrumbs.module.scss"; + const Breadcrumbs = () => { return (
-
+ Ícone da Home -
+
Ícone de seta para a direita
-

Institucional

+ + Institucional +
); }; diff --git a/src/components/Contact/Contact.module.scss b/src/components/MainLayout/Contact/Contact.module.scss similarity index 89% rename from src/components/Contact/Contact.module.scss rename to src/components/MainLayout/Contact/Contact.module.scss index ad2cb87..d74bf8c 100644 --- a/src/components/Contact/Contact.module.scss +++ b/src/components/MainLayout/Contact/Contact.module.scss @@ -1,20 +1,20 @@ .section-container { margin-left: 30px; - padding: 10px 0; + padding: 10px 0 0; @media screen and (width <= 1024px) { - padding: 0; margin: 0; + padding: 0; } .section-title { + margin: 0 0 12px; font-family: "Roboto"; font-style: normal; font-weight: 700; font-size: 24px; line-height: 28px; - color: #000000; // #292929 ?? - margin: 0 0 12px; + color: #000000; @media screen and (width >= 2500px) { font-size: 48px; diff --git a/src/components/Contact/Contact.tsx b/src/components/MainLayout/Contact/Contact.tsx similarity index 54% rename from src/components/Contact/Contact.tsx rename to src/components/MainLayout/Contact/Contact.tsx index a89f9e9..e26f404 100644 --- a/src/components/Contact/Contact.tsx +++ b/src/components/MainLayout/Contact/Contact.tsx @@ -1,7 +1,6 @@ import React from "react"; -import { ContactForm } from "../ContactForm/ContactForm"; -// import { Formik, Form, Field, ErrorMessage, FormikHelpers } from "formik"; -// import FormSchema from "../../schema/FormSchema"; + +import { ContactForm } from "./ContactForm/ContactForm"; import styles from "./Contact.module.scss"; @@ -9,7 +8,6 @@ const Contact = () => { return (

Preencha o formulário

- {/*
*/}
); diff --git a/src/components/ContactForm/ContactForm.module.scss b/src/components/MainLayout/Contact/ContactForm/ContactForm.module.scss similarity index 79% rename from src/components/ContactForm/ContactForm.module.scss rename to src/components/MainLayout/Contact/ContactForm/ContactForm.module.scss index 275086d..9b5fb9b 100644 --- a/src/components/ContactForm/ContactForm.module.scss +++ b/src/components/MainLayout/Contact/ContactForm/ContactForm.module.scss @@ -2,14 +2,7 @@ width: 100%; padding-bottom: 26.56px; position: relative; - // max-width: 720px; - // min-height: 100vh; - // margin: 0 auto; - // padding: 0 12px; - // display: flex; - // justify-content: center; - // align-items: center; @media screen and (width >= 2500px) { padding-bottom: 40px; } @@ -19,19 +12,19 @@ } .form-col { + margin-bottom: 12px; position: relative; display: flex; flex-direction: column; - margin-bottom: 12px; label { + padding: 0 15px 12px; font-family: "Roboto"; font-style: normal; font-weight: 400; font-size: 14px; line-height: 16px; color: #100d0e; - padding: 0 15px 12px; @media screen and (width >= 2500px) { font-size: 28px; @@ -40,17 +33,18 @@ } input { - background: #ffffff; + padding: 15px 20px; border: 1px solid #100d0e; border-radius: 25px; - padding: 15px 20px; + outline: 0; + background: #ffffff; + font-family: "Roboto"; font-style: normal; font-weight: 400; font-size: 14px; line-height: 16px; - color: #000000; //#b9b7b7? #100d0e? - outline: 0; + color: #000000; @media screen and (width >= 2500px) { font-size: 28px; @@ -64,39 +58,41 @@ } .invalid-form-feedback { + position: absolute; + top: 15px; + right: 20px; + font-family: "Roboto"; font-style: normal; font-weight: 400; font-size: 12px; line-height: 14px; color: #ff0000; - position: absolute; - top: 15px; - right: 20px; @media screen and (width >= 2500px) { + top: 17px; font-size: 24px; line-height: 28px; - top: 17px; } } .terms-col { margin: 1.58px 0 12.6px; - text-align: center; + display: flex; + align-items: center; + justify-content: center; + font-family: "Roboto"; font-style: normal; font-weight: 400; font-size: 14px; line-height: 16px; - display: flex; - align-items: center; - justify-content: center; + text-align: center; @media screen and (width >= 2500px) { + margin: 0 0 12.85px; font-size: 28px; line-height: 33px; - margin: 0 0 12.85px; } span { @@ -108,24 +104,11 @@ text-decoration: underline; } - // .custom-checkbox { - // border: 1px solid #000000; - // border-radius: 3px; - // width: 34.4px; - // height: 33.15px; - // margin: 0 0 0 4.28px; - - // // display: inline-block; - // // position: absolute; - // // bottom: 2.2px; - // } - input { - // talvez tenha que substituir o checkbox original - não tá pegando as bordas direito e o alinhamento está errado, tem que ser no underline. considerar as bordas na medida do input original ou do custom? + margin: 0 0 0 4.28px; width: 18.64px; height: 18px; - margin: 0 0 0 4.28px; - // opacity: 0; + border-radius: 3px; @media screen and (width >= 2500px) { width: 36.4px; @@ -135,44 +118,47 @@ } .submit-button { - background: #000000; + width: 100%; + padding: 17px 0; + border: 0; border-radius: 25px; + outline: 0; + background: #000000; + font-family: "Roboto"; font-style: normal; font-weight: 400; font-size: 16px; line-height: 19px; - width: 100%; - padding: 17px 0; letter-spacing: 0.05em; color: #ffffff; text-transform: uppercase; - border: 0; - outline: 0; + cursor: pointer; transition: all 0.2s ease-in-out; + &:hover { + filter: brightness(0.5); + } + @media screen and (width >= 2500px) { font-size: 32px; line-height: 38px; } - - &:hover { - background: #292929; - } } .success-wrapper { .success-message { + position: absolute; + bottom: 0; + left: 0; + font-family: "Roboto"; font-style: normal; font-weight: 400; font-size: 12px; line-height: 14px; color: #008000; - position: absolute; - bottom: 0; - left: 0; @media screen and (width >= 2500px) { font-size: 24px; diff --git a/src/components/ContactForm/ContactForm.tsx b/src/components/MainLayout/Contact/ContactForm/ContactForm.tsx similarity index 86% rename from src/components/ContactForm/ContactForm.tsx rename to src/components/MainLayout/Contact/ContactForm/ContactForm.tsx index f36d518..da0c606 100644 --- a/src/components/ContactForm/ContactForm.tsx +++ b/src/components/MainLayout/Contact/ContactForm/ContactForm.tsx @@ -1,12 +1,12 @@ import React from "react"; import { Formik, Form, Field, ErrorMessage, FormikHelpers } from "formik"; -import FormSchema from "../../schema/FormSchema"; +import FormSchema from "../../../../schema/FormSchema"; import { CustomInput } from "../CustomInput/CustomInput"; import styles from "./ContactForm.module.scss"; -interface FormValues { +export interface FormValues { name: string; email: string; cpf: string; @@ -36,8 +36,10 @@ const ContactForm = () => { console.log(values); clientsList.push(values); console.log(clientsList); - resetForm(); - setTimeout(() => setSubmitting(false), 3000); + setTimeout(() => { + setSubmitting(false); + resetForm(); + }, 2000); }; return ( @@ -47,9 +49,7 @@ const ContactForm = () => { initialValues={initialValues} validationSchema={FormSchema} > - {({ - isSubmitting, - }) => ( + {({ isSubmitting }) => (
@@ -66,11 +66,7 @@ const ContactForm = () => {
- + {
* - {/*
*/} - +