Rhayllon_Daudt/m3-academy-template-checkout-Rhayllon-Daudt
1
0
Fork 0
forked from M3-Academy/m3-academy-template-checkout
Code Issues Pull Requests Packages Projects Releases Wiki Activity

develop #6

Merged
Rhayllon_Daudt merged 13 commits from develop into main 2022-12-19 02:54:38 +00:00
Conversation 0 Commits 13 Files Changed 14 +128 -13
6 changed files with 128 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9244276d1f - Show all commits

46
checkout/src/arquivos/js/components/Footer.js
View File

@ -8,12 +8,16 @@ export default class Footer {
async init() { async init() {
await this.selectors(); await this.selectors();
// this.onUpdate(); // this.onUpdate();
this.addIconsCardAndVtxpci();
this.addIconVtexAndM3();
} }
async selectors() { async selectors() {
//Para verificar se o carrinho está vazio e remover a prateleira de produtos: //Para verificar se o carrinho está vazio e remover a prateleira de produtos:
// vocês devem olhar a doc fornecida no Desafio para aprender a usar o waitElement // vocês devem olhar a doc fornecida no Desafio para aprender a usar o waitElement
this.checkoutVazio = await waitElement(".empty-cart-content"); this.checkoutVazio = await waitElement(".empty-cart-content");
this.iconesCartoesAndVtexpci = await waitElement(".footerCheckout__stamps");
this.iconsVtexAndM3 = await waitElement(".footerCheckout__developedBy");
} }
onUpdate() { onUpdate() {
@ -37,4 +41,46 @@ export default class Footer {
slidesToScroll: 1, slidesToScroll: 1,
}); });
} }
addIconVtexAndM3() {
if (this.iconsVtexAndM3 && window.innerWidth > 1024) {
this.iconsVtexAndM3.innerHTML = `
<li>
<a class="Link1" href="https://vtex.com/br-pt/">
<span>Powered By</span>
<img class="Link1__footer-imgs-logoVtex" src="https://agenciamagma.vteximg.com.br/arquivos/logoVTEXM3Academy.png" alt="Img Icone Vtex" />
</a>
</li>
<li>
<a href="https://agenciam3.com/">
<span>Developed By</span>
<img class="footer-imgs-logoM3" src="https://agenciamagma.vteximg.com.br/arquivos/logoM3M3Academy.png" alt="Img Icone M3" />
</a>
</li>
`;
}
}
addIconsCardAndVtxpci() {
if (this.iconesCartoesAndVtexpci && window.innerWidth > 1024) {
this.iconesCartoesAndVtexpci.innerHTML = `
<li>
<span class="footerCheckout__payments"><img class="footer-imgs-cards" src="https://agenciamagma.vteximg.com.br/arquivos/masterCardM3Academy.png" alt="Img bandeira Mastercard" />
<img class="footer-imgs-cards" src="https://agenciamagma.vteximg.com.br/arquivos/visaM3Academy.png" alt="Img bandeira Visa" />
<img class="footer-imgs-cards" src="https://agenciamagma.vteximg.com.br/arquivos/amexM3Academy.png" alt="adad" />
<img class="footer-imgs-cards" src="https://agenciamagma.vteximg.com.br/arquivos/eloM3Academy.png" alt="Img bandeira Elo" />
<img class="footer-imgs-cards" src="https://agenciamagma.vteximg.com.br/arquivos/hiperCardM3Academy.png" alt="Img bandeira Hipercard" />
<img class="footer-imgs-cards" src="https://agenciamagma.vteximg.com.br/arquivos/payPalM3Academy.png" alt="Img Paypal" />
<img class="footer-imgs-cards-final" src="https://agenciamagma.vteximg.com.br/arquivos/boletoM3Academy.png" alt="Img Boleto" /></span>
</li>
<li>
<span class="footerCheckout__stamps__divider"></span>
</li>
<li>
<span class="footerCheckout__payments"><img class="footer-imgs-vtexpci" src="https://agenciamagma.vteximg.com.br/arquivos/vtexPCIM3Academy.png" alt="Img Vtxpci" /></span>
</li>
`;
}
}
} }

6
checkout/src/arquivos/js/components/Header.js
View File

@ -17,5 +17,11 @@ export default class Header {
timeout: 5000, // vai esperar 5 segundos antes de rejeitar a promise timeout: 5000, // vai esperar 5 segundos antes de rejeitar a promise
interval: 1000, // vai verificar a cada 1 segundo se o elemento existe interval: 1000, // vai verificar a cada 1 segundo se o elemento existe
}); });
this.progressBar = await waitElement("#progressBar");
} }
progressBarCronstructor (){
}
} }

22
checkout/src/arquivos/sass/checkout/_checkout-vazio.scss
View File

@ -9,16 +9,21 @@
} }
} }
&-message{
display: none;
}
&-title { &-title {
font-size: 20px; margin: 170px 0 32px 0;
font-size: 24px;
line-height: 33px;
} }
&-links { &-links {
.link-choose-products { .link-choose-products {
background: $color-black; border: 1px solid $color-black;
border: none; border-radius: 0;
border-radius: 5px; // transition: ease-in 0.22s all;
transition: ease-in 0.22s all;
outline: none; outline: none;
font-family: $font-family; font-family: $font-family;
font-style: normal; font-style: normal;
@ -27,11 +32,14 @@
line-height: 16px; line-height: 16px;
text-align: center; text-align: center;
letter-spacing: 0.05em; letter-spacing: 0.05em;
color: $color-white; color: $color-black;
text-transform: uppercase; text-transform: uppercase;
margin: 0 0 0 0;
width: 31.74%;
padding: 15px 0;
&:hover { &:hover {
background: lighten($color-black, 5); background: lighten($color-white, 5);
} }
} }
} }

29
checkout/src/arquivos/sass/checkout/_checkout.scss
View File

@ -9,14 +9,28 @@ html {
} }
footer .footerCheckout__wrapper { footer .footerCheckout__wrapper {
width: 94.9734%; width: 100%;
margin: auto auto 0 auto; margin: auto auto 0 auto;
border-top: 1px solid black;
.container{
display: flex;
align-items: center;
width: 94.9734%;
}
} }
footer .footerCheckout__prateleira, footer .footerCheckout__prateleira,
header { header {
width: 79.53125%; width: 100%;
margin: 0 auto; margin: 0 auto;
} }
header{
border-bottom: 1px solid black;
padding: 29px 0;
}
.headerCheckout__safeBuy{
display: flex;
gap: 8px;
}
body { body {
display: flex; display: flex;
@ -52,13 +66,16 @@ body {
width: 80%; width: 80%;
} }
} }
.row-fluid .full-cart.active{
margin-bottom: 0;
}
.btn-success { .btn-success {
background: $color-black; background: $color-white;
text-shadow: none; text-shadow: none;
&:hover { &:hover {
background: lighten($color-black, 15%); background: lighten($color-white, 15%);
} }
} }
@ -81,6 +98,10 @@ body {
margin-left: 30px; margin-left: 30px;
} }
} }
#cart-title{
display: none !important;
}
.dropdown { .dropdown {
&__content { &__content {

35
checkout/src/arquivos/sass/partials/_footer.scss
View File

@ -10,6 +10,7 @@
} }
&__address { &__address {
color: $color-gray2; color: $color-gray2;
font-family: $font-family; font-family: $font-family;
font-style: normal; font-style: normal;
@ -17,7 +18,11 @@
font-size: 10px; font-size: 10px;
line-height: 12px; line-height: 12px;
text-transform: capitalize; text-transform: capitalize;
max-width: 40%; width: 33%;
&::after{
content: ".";
}
@include mq(md, max) { @include mq(md, max) {
margin-bottom: 24px; margin-bottom: 24px;
@ -30,12 +35,27 @@
display: flex; display: flex;
justify-self: center; justify-self: center;
list-style: none; list-style: none;
margin: 0;
width: 33%;
justify-content: center;
@include mq(md, max) { @include mq(md, max) {
align-self: center; align-self: center;
margin-bottom: 12px; margin-bottom: 12px;
} }
.footer-imgs-cards {
width: 10.01%;
margin-right: 12px;
&-final{
width: 10.01%;
margin-right: 0px
}
}
.footer-imgs-vtexpci{
width: 84.4%;
}
&__divider { &__divider {
background-color: $color-gray4; background-color: $color-gray4;
display: inline-block; display: inline-block;
@ -50,6 +70,19 @@
display: flex; display: flex;
list-style-type: none; list-style-type: none;
margin: 0; margin: 0;
width: 33%;
justify-content: flex-end;
.Link1{
justify-content: end;
&__footer-imgs-logoVtex{
width: 20%;
}
}
.footer-imgs-logoM3{
width: 17%;
}
li:last-child { li:last-child {
margin-left: 16px; margin-left: 16px;

3
checkout/src/arquivos/sass/partials/_header.scss
View File

@ -1,7 +1,8 @@
/* _header.scss */ /* _header.scss */
.headerCheckout { .headerCheckout {
.container { .container {
width: auto !important; width: 79.53125%;
margin: 0 auto;
} }
&__wrapper { &__wrapper {
align-items: center; align-items: center;