feature/desafio-react-e-typescript #1

Merged
EleonoraOtz merged 19 commits from feature/desafio-react-e-typescript into main 2023-01-17 12:15:43 +00:00
4 changed files with 133 additions and 72 deletions
Showing only changes of commit 91cb35e36e - Show all commits

View File

@ -1,3 +0,0 @@
<svg width="25" height="13" viewBox="0 0 25 13" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M23.7428 11.3959C23.741 11.6959 23.6177 11.9953 23.373 12.226L23.3728 12.2261C22.8668 12.7035 22.037 12.7035 21.5311 12.2261L21.5232 12.2345L21.5311 12.2261L12.3457 3.5599L12.0712 3.30091L11.7967 3.5599L2.61178 12.2258C2.10549 12.7033 1.27571 12.7032 0.769767 12.2259L0.769708 12.2258C0.525704 11.9957 0.402467 11.6972 0.400037 11.398C0.401876 11.0981 0.525111 10.7986 0.769782 10.5678L0.769785 10.5678L11.1506 0.773762C11.4013 0.537307 11.7333 0.415846 12.0712 0.415846C12.4093 0.415846 12.7415 0.537566 12.9922 0.773969L23.3728 10.568L23.3729 10.5681C23.6171 10.7983 23.7403 11.0968 23.7428 11.3959Z" fill="white" stroke="white" stroke-width="0.8"/>
</svg>

View File

@ -1,10 +1,12 @@
<svg width="66" height="66" viewBox="0 0 66 66" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_4136_1027)">
<svg width="66" height="137" viewBox="0 0 66 137" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M66 104C66 122.225 51.2254 137 33 137C14.7746 137 0 122.225 0 104C0 85.7746 14.7746 71 33 71C51.2254 71 66 85.7746 66 104Z" fill="#C4C4C4"/>
<path d="M44.7428 107.396C44.741 107.696 44.6177 107.995 44.373 108.226L44.3728 108.226C43.8668 108.704 43.037 108.703 42.5311 108.226L42.5232 108.235L42.5311 108.226L33.3457 99.5599L33.0712 99.3009L32.7967 99.5599L23.6118 108.226C23.1055 108.703 22.2757 108.703 21.7698 108.226L21.7697 108.226C21.5257 107.996 21.4025 107.697 21.4 107.398C21.4019 107.098 21.5251 106.799 21.7698 106.568L21.7698 106.568L32.1506 96.7738C32.4013 96.5373 32.7333 96.4158 33.0712 96.4158C33.4093 96.4158 33.7415 96.5376 33.9922 96.774L44.3728 106.568L44.3729 106.568C44.6171 106.798 44.7403 107.097 44.7428 107.396Z" fill="white" stroke="white" stroke-width="0.8"/>
<g clip-path="url(#clip0_4136_1036)">
<path d="M33.0083 0H32.9917C14.7964 0 0 14.8005 0 33C0 40.2188 2.3265 46.9095 6.28237 52.3421L2.16975 64.6016L14.8541 60.5468C20.0723 64.0035 26.2969 66 33.0083 66C51.2036 66 66 51.1954 66 33C66 14.8046 51.2036 0 33.0083 0Z" fill="#4CAF50"/>
<path d="M52.2103 46.6001C51.4142 48.8483 48.2544 50.7128 45.734 51.2573C44.0098 51.6244 41.7575 51.9173 34.1758 48.774C24.4779 44.7563 18.2326 34.9016 17.7459 34.2623C17.2798 33.6229 13.8271 29.0441 13.8271 24.3086C13.8271 19.5731 16.232 17.2673 17.2014 16.2773C17.9975 15.4646 19.3134 15.0934 20.5756 15.0934C20.984 15.0934 21.3511 15.114 21.6811 15.1305C22.6505 15.1718 23.1373 15.2295 23.7766 16.7599C24.5728 18.678 26.5115 23.4135 26.7425 23.9003C26.9776 24.387 27.2128 25.047 26.8828 25.6864C26.5734 26.3464 26.3011 26.6393 25.8144 27.2003C25.3276 27.7613 24.8656 28.1903 24.3789 28.7925C23.9334 29.3164 23.4301 29.8774 23.9911 30.8468C24.5521 31.7955 26.4909 34.9594 29.3454 37.5004C33.029 40.7798 36.0155 41.8275 37.0839 42.273C37.88 42.603 38.8288 42.5246 39.4104 41.9059C40.1488 41.1098 41.0604 39.7898 41.9885 38.4904C42.6485 37.5581 43.4818 37.4426 44.3563 37.7726C45.2473 38.082 49.9622 40.4126 50.9315 40.8953C51.9009 41.382 52.5403 41.613 52.7754 42.0214C53.0064 42.4298 53.0064 44.3479 52.2103 46.6001Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0_4136_1027">
<clipPath id="clip0_4136_1036">
<rect width="66" height="66" fill="white"/>
</clipPath>
</defs>

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@ -22,6 +22,10 @@ import Boleto from "../../assets/svgs/boleto.svg";
import PCIVtex from "../../assets/svgs/vtex-pci-200.svg";
// Botão flutuante
import Whatsapp from "../../assets/svgs/whatsapp.svg";
// Vtex e M3 logo
import Vtex from "../../assets/svgs/vtex-logo.svg";
@ -87,13 +91,13 @@ const Footer = () => {
<ul>
<li>
<p className={styles["atendimento"]}>
Atendimento ao Consumidor
Atendimento ao Consumidor
</p>
</li>
</li>
<li>(11) 4159 9504</li>
<li>
<p className={styles["atendimento"]}>Atendimento Online</p>
</li>
</li>
<li>(11) 99433-8825</li>
</ul>
</div>
@ -138,61 +142,69 @@ const Footer = () => {
<section className={styles["footer-bottom"]}>
<div className={styles["footer-bottom__wrapper"]}>
<div className={styles["address"]}>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
eiusmod tempor
</p>
</div>
<ul className={styles["stamps"]}>
<li className={styles["creditcard"]}>
<img src={MasterCard} alt="Mastercard" />
</li>
<li className={styles["creditcard"]}>
<img src={Visa} alt="Visa" />
</li>
<li className={styles["creditcard"]}>
<img src={Amex} alt="American Express" />
</li>
<li className={styles["creditcard"]}>
<img src={Elo} alt="Elo" />
</li>
<li className={styles["creditcard"]}>
<img src={Hipercard} alt="Hipercard" />
</li>
<li className={styles["creditcard"]}>
<img src={PayPal} alt="PayPal" />
</li>
<li className={styles["creditcard"]}>
<img src={Boleto} alt="Boleto" />
</li>
<li>
<span className={styles["stamps__divider"]}></span>
</li>
<li className={styles["vtex"]} >
<img className={styles["vtex-pci"]} src={PCIVtex} alt="PCI VTEX" />
</li>
</ul>
<ul className={styles["developedBy"]}>
<li>
<div className={styles["by-vtex"]}>
<a href="https://vtex.com.br-pt/">
<span>Powered By</span>
</a>
<img className={styles["vtex-logo"]} src={Vtex} alt="VTEX" />
</div>
</li>
<li>
<div className={styles["by-m3"]}>
<a href="https://m3ecommerce.com/">
<span>Developed By</span>
</a>
<img className={styles["m3-logo"]} src={M3} alt="M3" />
</div>
</li>
</ul>
<div className={styles["address"]}>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
eiusmod tempor
</p>
</div>
<ul className={styles["stamps"]}>
<li className={styles["creditcard"]}>
<img src={MasterCard} alt="Mastercard" />
</li>
<li className={styles["creditcard"]}>
<img src={Visa} alt="Visa" />
</li>
<li className={styles["creditcard"]}>
<img src={Amex} alt="American Express" />
</li>
<li className={styles["creditcard"]}>
<img src={Elo} alt="Elo" />
</li>
<li className={styles["creditcard"]}>
<img src={Hipercard} alt="Hipercard" />
</li>
<li className={styles["creditcard"]}>
<img src={PayPal} alt="PayPal" />
</li>
<li className={styles["creditcard"]}>
<img src={Boleto} alt="Boleto" />
</li>
<li>
<span className={styles["stamps__divider"]}></span>
</li>
<li className={styles["vtex"]}>
<img
className={styles["vtex-pci"]}
src={PCIVtex}
alt="PCI VTEX"
/>
</li>
</ul>
<ul className={styles["developedBy"]}>
<li>
<div className={styles["by-vtex"]}>
<a href="https://vtex.com.br-pt/">
<span>Powered By</span>
</a>
<img className={styles["vtex-logo"]} src={Vtex} alt="VTEX" />
</div>
</li>
<li>
<div className={styles["by-m3"]}>
<a href="https://m3ecommerce.com/">
<span>Developed By</span>
</a>
<img className={styles["m3-logo"]} src={M3} alt="M3" />
</div>
</li>
</ul>
</div>
</section>
<div className={styles["whatsapp-button"]}>
<a href="https://wa.me/5579995657055?text=Olá! Tudo bem? Quero conhecer o M3 Academy." rel="noreferrer" target={"_blank"}><img src={Whatsapp} alt="Fale conosco pelo Whatsapp" /></a>
</div>
</div>
);
};

View File

@ -109,6 +109,11 @@
}
.footer-top {
@media (max-width: 1024px) {
width: 100%;
}
&__menu-list {
display: flex;
margin: 38px 100px 38px;
@ -117,6 +122,12 @@
@media (min-width: 2500px) {
}
@media (max-width: 1024px) {
flex-direction: column;
justify-content: flex-start;
margin: 24px 16px 18px 16px;
}
.menu {
h3 {
font-weight: 500;
@ -130,6 +141,18 @@
font-size: 28px;
line-height: 33px;
}
@media (max-width: 1024px) {
text-transform: capitalize;
margin: 0 0 12px;
display: flex;
justify-content: space-between;
&::after {
content: "+";
cursor: pointer;
}
}
}
ul {
@ -164,6 +187,10 @@
text-decoration: underline;
}
}
@media (max-width: 1024px) {
display: none;
}
}
}
}
@ -198,6 +225,10 @@
font-size: 28px;
line-height: 33px;
}
@media (max-width: 1024px) {
display: none;
}
}
}
}
@ -256,7 +287,7 @@
@media (max-width: 1024px) {
order: 2;
margin: 0 0 17px 16px;
width: 27.083%;
width: 234px;
}
}
@ -282,14 +313,14 @@
@media (min-width: 376px) and (max-width: 767px) {
width: 87%;
margin: 22px 0 23px 8px;
margin: 22px 0 23px 16px;
}
@media (max-width: 375px) {
width: 91.2%;
order: 1;
gap: 4px;
margin: 22px 0 23px 8px;
margin: 22px 0 23px 16px;
}
.creditcard {
@ -322,6 +353,7 @@
}
.developedBy {
width: 226.58px;
align-items: center;
display: flex;
list-style-type: none;
@ -330,7 +362,6 @@
padding: 0;
@media (max-width: 1024px) {
width: 26.2%;
order: 3;
margin: 0;
margin: 0 0 17px 16px;
@ -372,13 +403,13 @@
gap: 13px;
}
li:last-child {
margin-left: 13px;
// li:last-child {
// margin-left: 13px;
@media (max-width: 1024px) {
margin: 0;
}
}
// @media (max-width: 1024px) {
// margin: 0;
// }
// }
a {
align-items: center;
@ -404,3 +435,22 @@
}
}
}
.whatsapp-button {
position: fixed;
bottom: 229px;
right: 16px;
z-index: 9999;
img {
@media (max-width: 1024px) {
width: 34px;
}
}
@media (max-width: 1024px) {
bottom: 27px;
right: 17px;
}
}