diff --git a/react-ts/src/assets/images/AmericaCard.svg b/react-ts/src/assets/images/AmericaCard.svg deleted file mode 100644 index 5956357..0000000 --- a/react-ts/src/assets/images/AmericaCard.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/AmericaCardMobile.svg b/react-ts/src/assets/images/AmericaCardMobile.svg deleted file mode 100644 index bbeb0c1..0000000 --- a/react-ts/src/assets/images/AmericaCardMobile.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/AmericaEx.png b/react-ts/src/assets/images/AmericaEx.png new file mode 100644 index 0000000..e07547c Binary files /dev/null and b/react-ts/src/assets/images/AmericaEx.png differ diff --git a/react-ts/src/assets/images/Boleto.png b/react-ts/src/assets/images/Boleto.png new file mode 100644 index 0000000..3a68969 Binary files /dev/null and b/react-ts/src/assets/images/Boleto.png differ diff --git a/react-ts/src/assets/images/Boleto.svg b/react-ts/src/assets/images/Boleto.svg deleted file mode 100644 index 5d80109..0000000 --- a/react-ts/src/assets/images/Boleto.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/BoletoMobile.svg b/react-ts/src/assets/images/BoletoMobile.svg deleted file mode 100644 index 09e0e61..0000000 --- a/react-ts/src/assets/images/BoletoMobile.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/EloCard.png b/react-ts/src/assets/images/EloCard.png new file mode 100644 index 0000000..f8945cd Binary files /dev/null and b/react-ts/src/assets/images/EloCard.png differ diff --git a/react-ts/src/assets/images/EloCard.svg b/react-ts/src/assets/images/EloCard.svg deleted file mode 100644 index b93be6f..0000000 --- a/react-ts/src/assets/images/EloCard.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/EloCardMobile.svg b/react-ts/src/assets/images/EloCardMobile.svg deleted file mode 100644 index 623678a..0000000 --- a/react-ts/src/assets/images/EloCardMobile.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/HiperCard.png b/react-ts/src/assets/images/HiperCard.png new file mode 100644 index 0000000..dd3f15d Binary files /dev/null and b/react-ts/src/assets/images/HiperCard.png differ diff --git a/react-ts/src/assets/images/HiperCard.svg b/react-ts/src/assets/images/HiperCard.svg deleted file mode 100644 index 7a7474f..0000000 --- a/react-ts/src/assets/images/HiperCard.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/HiperCardMobile.svg b/react-ts/src/assets/images/HiperCardMobile.svg deleted file mode 100644 index 6b0ba29..0000000 --- a/react-ts/src/assets/images/HiperCardMobile.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/MasterCard.png b/react-ts/src/assets/images/MasterCard.png new file mode 100644 index 0000000..774e581 Binary files /dev/null and b/react-ts/src/assets/images/MasterCard.png differ diff --git a/react-ts/src/assets/images/MasterCard.svg b/react-ts/src/assets/images/MasterCard.svg deleted file mode 100644 index f10d568..0000000 --- a/react-ts/src/assets/images/MasterCard.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/MasterCardMobile.svg b/react-ts/src/assets/images/MasterCardMobile.svg deleted file mode 100644 index eb98d23..0000000 --- a/react-ts/src/assets/images/MasterCardMobile.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/MasterCardPNG.png b/react-ts/src/assets/images/MasterCardPNG.png deleted file mode 100644 index 792a73b..0000000 Binary files a/react-ts/src/assets/images/MasterCardPNG.png and /dev/null differ diff --git a/react-ts/src/assets/images/PayPal.png b/react-ts/src/assets/images/PayPal.png new file mode 100644 index 0000000..f69976b Binary files /dev/null and b/react-ts/src/assets/images/PayPal.png differ diff --git a/react-ts/src/assets/images/PayPal.svg b/react-ts/src/assets/images/PayPal.svg deleted file mode 100644 index 3c14215..0000000 --- a/react-ts/src/assets/images/PayPal.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/PayPalMobile.svg b/react-ts/src/assets/images/PayPalMobile.svg deleted file mode 100644 index 9550baf..0000000 --- a/react-ts/src/assets/images/PayPalMobile.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/VisaCard.png b/react-ts/src/assets/images/VisaCard.png new file mode 100644 index 0000000..7c4567c Binary files /dev/null and b/react-ts/src/assets/images/VisaCard.png differ diff --git a/react-ts/src/assets/images/VisaCard.svg b/react-ts/src/assets/images/VisaCard.svg deleted file mode 100644 index 77a4de3..0000000 --- a/react-ts/src/assets/images/VisaCard.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/VisaCardMobile.svg b/react-ts/src/assets/images/VisaCardMobile.svg deleted file mode 100644 index aa2346a..0000000 --- a/react-ts/src/assets/images/VisaCardMobile.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/vtex-pci.png b/react-ts/src/assets/images/vtex-pci.png new file mode 100644 index 0000000..4dce994 Binary files /dev/null and b/react-ts/src/assets/images/vtex-pci.png differ diff --git a/react-ts/src/assets/images/vtex-pci.svg b/react-ts/src/assets/images/vtex-pci.svg deleted file mode 100644 index d2d6925..0000000 --- a/react-ts/src/assets/images/vtex-pci.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/assets/images/vtex-pciMobile.svg b/react-ts/src/assets/images/vtex-pciMobile.svg deleted file mode 100644 index 23acac6..0000000 --- a/react-ts/src/assets/images/vtex-pciMobile.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/react-ts/src/components/Cards/Entrega.module.scss b/react-ts/src/components/Cards/Entrega.module.scss index 8ecef2b..d56ffc8 100644 --- a/react-ts/src/components/Cards/Entrega.module.scss +++ b/react-ts/src/components/Cards/Entrega.module.scss @@ -25,4 +25,28 @@ color: $color-grey4; } } +} + +@media only screen and (max-width: 1024px) { + .container { + &__h1 { + text-align: center; + margin-top: 30px; + } + } +} + +@media only screen and (min-width: 2500px) { + .container { + &__h1 { + line-height: 56px; + font-size: 48px; + } + &__p { + p { + font-size: 26px; + line-height: 30px; + } + } + } } \ No newline at end of file diff --git a/react-ts/src/components/Cards/FormaDePagamento.module.scss b/react-ts/src/components/Cards/FormaDePagamento.module.scss index 8ecef2b..ae5db4b 100644 --- a/react-ts/src/components/Cards/FormaDePagamento.module.scss +++ b/react-ts/src/components/Cards/FormaDePagamento.module.scss @@ -25,4 +25,27 @@ color: $color-grey4; } } +} + +@media only screen and (max-width: 1024px) { + .container { + &__h1 { + text-align: center; + margin-top: 30px; + } + } +} +@media only screen and (min-width: 2500px) { + .container { + &__h1 { + line-height: 56px; + font-size: 48px; + } + &__p { + p { + font-size: 26px; + line-height: 30px; + } + } + } } \ No newline at end of file diff --git a/react-ts/src/components/Cards/Seguranca.module.scss b/react-ts/src/components/Cards/Seguranca.module.scss index 8ecef2b..ae5db4b 100644 --- a/react-ts/src/components/Cards/Seguranca.module.scss +++ b/react-ts/src/components/Cards/Seguranca.module.scss @@ -25,4 +25,27 @@ color: $color-grey4; } } +} + +@media only screen and (max-width: 1024px) { + .container { + &__h1 { + text-align: center; + margin-top: 30px; + } + } +} +@media only screen and (min-width: 2500px) { + .container { + &__h1 { + line-height: 56px; + font-size: 48px; + } + &__p { + p { + font-size: 26px; + line-height: 30px; + } + } + } } \ No newline at end of file diff --git a/react-ts/src/components/Cards/Sobre.module.scss b/react-ts/src/components/Cards/Sobre.module.scss index 8ecef2b..ae5db4b 100644 --- a/react-ts/src/components/Cards/Sobre.module.scss +++ b/react-ts/src/components/Cards/Sobre.module.scss @@ -25,4 +25,27 @@ color: $color-grey4; } } +} + +@media only screen and (max-width: 1024px) { + .container { + &__h1 { + text-align: center; + margin-top: 30px; + } + } +} +@media only screen and (min-width: 2500px) { + .container { + &__h1 { + line-height: 56px; + font-size: 48px; + } + &__p { + p { + font-size: 26px; + line-height: 30px; + } + } + } } \ No newline at end of file diff --git a/react-ts/src/components/Cards/Troca.module.scss b/react-ts/src/components/Cards/Troca.module.scss index 8ecef2b..b781549 100644 --- a/react-ts/src/components/Cards/Troca.module.scss +++ b/react-ts/src/components/Cards/Troca.module.scss @@ -25,4 +25,27 @@ color: $color-grey4; } } +} + +@media only screen and (max-width: 1024px) { + .container { + &__h1 { + text-align: center; + margin-top: 30px; + } + } +} +@media only screen and (min-width: 2500px) { + .container { + &__h1 { + font-size: 48px; + line-height: 56px; + } + &__p { + p { + font-size: 26px; + line-height: 30px; + } + } + } } \ No newline at end of file diff --git a/react-ts/src/components/CardsSelect/CardsSelect.module.scss b/react-ts/src/components/CardsSelect/CardsSelect.module.scss index d025867..8ed5751 100644 --- a/react-ts/src/components/CardsSelect/CardsSelect.module.scss +++ b/react-ts/src/components/CardsSelect/CardsSelect.module.scss @@ -30,7 +30,8 @@ display: flex; flex-direction: column; width: 100%; - button { + &__component { + background-color: transparent; max-width: 302px; height: 39px; border: none; @@ -62,4 +63,53 @@ color: $color-white1; } } -} \ No newline at end of file +} + +@media only screen and (max-width: 1024px) { + .container { + padding: 0 16px; + &__wrapper { + flex-direction: column; + &__button { + max-width: unset; + border-right: none; + height: 224px; + &__wrapper { + flex-direction: column; + width: 100%; + button { + max-width: unset; + width: 100%; + } + } + } + &__cards { + margin-left: unset; + } + } + } +} + +@media only screen and (min-width: 2500px) { + + .container { + &__h1 { + font-size: 48px; + line-height: 56px; + } + &__wrapper { + &__button { + max-width: 590px; + height: 465px; + &__wrapper { + &__component { + max-width: 590px; + height: 58px; + font-size: 32px; + line-height: 38px; + } + } + } + } + } +} \ No newline at end of file diff --git a/react-ts/src/components/CardsSelect/CardsSelect.tsx b/react-ts/src/components/CardsSelect/CardsSelect.tsx index 4eb5ff3..abba691 100644 --- a/react-ts/src/components/CardsSelect/CardsSelect.tsx +++ b/react-ts/src/components/CardsSelect/CardsSelect.tsx @@ -8,37 +8,64 @@ import Troca from '../Cards/Troca'; import Seguranca from '../Cards/Seguranca'; import ContactForm from '../ContactForm/ContactForm'; -const CardSelect = () => { +const buttonToRender = [ + { + label : 'Sobre', + id : 0, + }, + { + label : 'Forma de Pagamento', + id : 1, + }, + { + label : 'Entrega', + id : 2, + }, + { + label : 'Troca e Devolução', + id : 3, + }, + { + label : 'Segurança e Privacidade', + id : 4, + }, + { + label : 'Contato', + id : 5, + } +] - const [render, setRender] = useState ("Sobre"); - + const CardSelect = () => { + + const [render, setRender] = useState ("Sobre"); + + const button = () => { + return buttonToRender.map(( + button + ) => ( + + ) ) + } return ( -
+

institucional

- - - - - - + {button()}
-
- {render === "Sobre" && } - {render === "Forma de Pagamento" && } - {render === "Entrega" && } - {render === "Troca e Devolução" && } - {render === "Segurança e Privacidade" && } - {render === "Contato" && } -
+
+ {render === "Sobre" && } + {render === "Forma de Pagamento" && } + {render === "Entrega" && } + {render === "Troca e Devolução" && } + {render === "Segurança e Privacidade" && } + {render === "Contato" && }
- - +
)} export default CardSelect; diff --git a/react-ts/src/components/ContactForm/ContactForm.module.scss b/react-ts/src/components/ContactForm/ContactForm.module.scss index e7eacc2..cc90214 100644 --- a/react-ts/src/components/ContactForm/ContactForm.module.scss +++ b/react-ts/src/components/ContactForm/ContactForm.module.scss @@ -129,11 +129,26 @@ border-color: $color-red1; } } +@media only screen and (min-width: 375px) { + .container { + &__checkbox { + max-width: 992px; + &__errorCheck { + right: 92px !important; + top: 17px + } + } + } +} + @media only screen and (max-width: 1024px) { .container { max-width: 992px; &__form { + max-width: 992px; + width: 100%; + margin-top: 30px; &__title { text-align: center; } @@ -166,6 +181,7 @@ max-width: 1680px; width: 100%; &__form { + max-width: 1680px; &__title { font-size: 48px; line-height: 56px; diff --git a/react-ts/src/components/Footer/Footer.module.scss b/react-ts/src/components/Footer/Footer.module.scss index b58a84f..20d5f97 100644 --- a/react-ts/src/components/Footer/Footer.module.scss +++ b/react-ts/src/components/Footer/Footer.module.scss @@ -21,10 +21,17 @@ &__payments { display: flex; column-gap: 12px; + align-items: center; + &__row { + border-right: 1px solid $color-grey1; + height: 25px; + } img { - &:nth-child(8) { - border-left: 1px solid $color-grey1; - padding-left: 12px; + height: 20px; + width: 36px; + &:nth-child(9) { + width: 54.61px; + height: 34px; } } } @@ -48,6 +55,46 @@ } } +@media only screen and (max-width: 1024px) { + .footer { + &__container { + display: flex; + align-items: unset; + justify-content: unset; + flex-direction: column; + row-gap: 15px; + &__text { + display: flex; + order: 2; + } + + &__text2 { + order: 3; + } + &__payments { + column-gap: 11px; + img { + width: 30px; + height: 17px; + &:nth-child(9) { + width: 45px; + height: 28px; + } + } + } + } + &__contact { + display: flex; + flex-direction: column; + row-gap: 5px; + position: absolute; + right: 16px; + margin-top: 12px; + } + } +} + + @media only screen and (max-width: 1024px) { .footer { padding: 15px 16px; @@ -63,9 +110,6 @@ display: flex; order: 2; } - &__payments{ - display: none; - } &__text2 { order: 3; } @@ -94,9 +138,11 @@ display: flex; column-gap: 12px; img { - &:nth-child(8) { - border-left: 1px solid $color-grey1; - padding-left: 12px; + width: 70px; + height: 39.27px; + &:nth-child(9) { + width: 106px; + height: 66px; } } } diff --git a/react-ts/src/components/Footer/Footer.tsx b/react-ts/src/components/Footer/Footer.tsx index 544ba7a..cd60efe 100644 --- a/react-ts/src/components/Footer/Footer.tsx +++ b/react-ts/src/components/Footer/Footer.tsx @@ -2,16 +2,16 @@ import styles from './Footer.module.scss'; import ScrollTop from '../ScrollTop/ScrollTop'; import Whatsap from '../Whatsapp/WhatsApp'; -import FooterCardsMobile from './FooterCardsMobile'; -import MasterCard from '../../assets/images/MasterCard.svg'; -import VisaCard from '../../assets/images/VisaCard.svg'; -import AmericaCard from '../../assets/images/AmericaCard.svg'; -import EloCard from '../../assets/images/EloCard.svg'; -import HiperCard from '../../assets/images/HiperCard.svg'; -import PayPal from '../../assets/images/PayPal.svg'; -import Boleto from '../../assets/images/Boleto.svg'; -import VtexPci from '../../assets/images/vtex-pci.svg'; + +import MasterCard from '../../assets/images/MasterCard.png'; +import VisaCard from '../../assets/images/VisaCard.png'; +import AmericaCard from '../../assets/images/AmericaEx.png'; +import EloCard from '../../assets/images/EloCard.png'; +import HiperCard from '../../assets/images/HiperCard.png'; +import PayPal from '../../assets/images/PayPal.png'; +import Boleto from '../../assets/images/Boleto.png'; +import VtexPci from '../../assets/images/vtex-pci.png'; import Vtex from '../../assets/images/vtex.svg'; import M3 from '../../assets/images/M3.svg'; @@ -19,20 +19,20 @@ const Footer = () => { return (