From 29c409b5dede797fb89d7c8da0c62d054eff52d6 Mon Sep 17 00:00:00 2001 From: pedrumond Date: Mon, 3 Jun 2024 13:53:04 -0300 Subject: [PATCH 1/4] refactor: standardize titles style --- Frontend/public/assets/store_icon.svg | 3 +++ Frontend/src/pages/Maps.css | 6 +++++- Frontend/src/pages/Sobre.css | 2 +- Frontend/src/pages/Store.css | 14 ++++++++++++-- Frontend/src/pages/Store.jsx | 9 ++++++++- 5 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 Frontend/public/assets/store_icon.svg diff --git a/Frontend/public/assets/store_icon.svg b/Frontend/public/assets/store_icon.svg new file mode 100644 index 0000000..a6718c3 --- /dev/null +++ b/Frontend/public/assets/store_icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/Frontend/src/pages/Maps.css b/Frontend/src/pages/Maps.css index a4a059c..b46289e 100644 --- a/Frontend/src/pages/Maps.css +++ b/Frontend/src/pages/Maps.css @@ -2,7 +2,7 @@ display: flex; flex-direction: column; background-color: #dfddd2; - padding: 5%; + padding: 3rem 1rem; align-items: center; } @@ -46,6 +46,10 @@ } @media screen and (min-width: 500px) { + .maps__container { + padding: 4rem 2rem; + } + .maps { width: 500px; height: 250px; diff --git a/Frontend/src/pages/Sobre.css b/Frontend/src/pages/Sobre.css index be8970f..f43bd9b 100644 --- a/Frontend/src/pages/Sobre.css +++ b/Frontend/src/pages/Sobre.css @@ -10,7 +10,7 @@ display: flex; align-items: center; justify-content: center; - padding-top: 2rem; + padding-top: 4rem; padding-bottom: 5rem; } diff --git a/Frontend/src/pages/Store.css b/Frontend/src/pages/Store.css index e82bcb2..fc746d8 100644 --- a/Frontend/src/pages/Store.css +++ b/Frontend/src/pages/Store.css @@ -7,10 +7,17 @@ margin: auto; } +.lojamain__title-box { + display: flex; + gap: 20px; + align-items: center; + padding-bottom: 1rem; + justify-content: center; +} + .lojamain__title { font-weight: 400; font-size: 1.5rem; - padding-bottom: 1rem; } .lojamain__card-list { @@ -57,8 +64,11 @@ padding: 4rem 2rem; } - .lojamain__title { + .lojamain__title-box { padding-bottom: 3rem; + } + + .lojamain__title { font-size: 2rem; } diff --git a/Frontend/src/pages/Store.jsx b/Frontend/src/pages/Store.jsx index 01b4e86..e495f12 100644 --- a/Frontend/src/pages/Store.jsx +++ b/Frontend/src/pages/Store.jsx @@ -82,7 +82,14 @@ function Store() { return ( <>
-

PRODUTOS DE NOSSOS PARCEIROS

+
+ Icone de uma loja +

PRODUTOS

+
CATEGORIAS: From 66e680654b99b56423fd2e00f2157016280b8424 Mon Sep 17 00:00:00 2001 From: pedrumond Date: Mon, 3 Jun 2024 14:03:23 -0300 Subject: [PATCH 2/4] refactor: update favicon --- Frontend/index.html | 4 ++-- Frontend/public/assets/logo-GC.svg | 35 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 Frontend/public/assets/logo-GC.svg diff --git a/Frontend/index.html b/Frontend/index.html index 2c20db3..a9cae5a 100644 --- a/Frontend/index.html +++ b/Frontend/index.html @@ -1,8 +1,8 @@ - + - + Green Cycle diff --git a/Frontend/public/assets/logo-GC.svg b/Frontend/public/assets/logo-GC.svg new file mode 100644 index 0000000..f5bb718 --- /dev/null +++ b/Frontend/public/assets/logo-GC.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + From b001e53876bdcf584c1e83c11a2ab4a3c931a058 Mon Sep 17 00:00:00 2001 From: pedrumond Date: Mon, 3 Jun 2024 15:00:39 -0300 Subject: [PATCH 3/4] refactor: update checkout styles --- Frontend/src/pages/Checkout.css | 31 ++++++++++++++++++++----------- Frontend/src/pages/Checkout.jsx | 10 +++++----- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/Frontend/src/pages/Checkout.css b/Frontend/src/pages/Checkout.css index 4886921..d57f5ca 100644 --- a/Frontend/src/pages/Checkout.css +++ b/Frontend/src/pages/Checkout.css @@ -6,8 +6,9 @@ } .checkout__title { - padding: 1rem 0; + padding: 36px 0 16px; text-decoration: underline; + font-weight: 400; } .checkout__form { @@ -20,11 +21,17 @@ } .checkout__wrapper { width: 100%; - border: 1px solid gray; margin: auto; border-radius: 8px; - padding-block: 1.5rem; + padding-bottom: 36px; +} + +.checkout__save { + display: flex; + justify-content: center; + padding-top: 10px; + gap: 4px; } .checkout__fit { @@ -69,28 +76,31 @@ .checkout__image { width: 100px; height: 100px; - border-radius: 1rem; + border-radius: 5px; + border: 1px solid #454545; + margin-right: 1.5rem; } .checkout__items { display: flex; justify-content: space-around; flex-direction: column; - row-gap: 1rem; + row-gap: 2rem; + padding-top: 36px; } .checkout__item { display: flex; - justify-content: space-between; - column-gap: 0.5rem; - align-items: flex-start; + align-items: center; } .checkout__details { display: flex; flex-direction: column; justify-content: space-between; text-align: left; + margin-right: auto; } + .checkout__total { width: 70%; padding: 2rem 0; @@ -128,6 +138,7 @@ align-items: self-start; justify-content: space-around; column-gap: 3rem; + padding: 5rem 2rem; } .checkout__wrapper { width: 45%; @@ -146,9 +157,7 @@ width: 100%; } .checkout__save { - display: flex; justify-content: flex-end; - padding-right: 1rem; - padding-top: 8px; + padding-right: 2rem; } } diff --git a/Frontend/src/pages/Checkout.jsx b/Frontend/src/pages/Checkout.jsx index 4dd48fc..14951e0 100644 --- a/Frontend/src/pages/Checkout.jsx +++ b/Frontend/src/pages/Checkout.jsx @@ -57,7 +57,7 @@ function Checkout() { {' '}
-

ENDEREÇO

+

ENDEREÇO DE ENTREGA

{item.name} {item.quantity} un
- R${parseFloat(item.price).toFixed(2)} + R$ {parseFloat(item.price).toFixed(2)} ))} @@ -239,16 +239,16 @@ function Checkout() {

Subtotal:

{' '} - R${calculateSubtotal()} + R$ {calculateSubtotal()}
{' '}

Frete:

- R$20,00 + R$ 20,00
-

Total:

R${calculateTotal()} +

Total:

R$ {calculateTotal()}
@@ -100,6 +102,8 @@ function Checkout() { placeholder='Complemento' value={formData.complemento} onChange={handleInputChange} + minLength={1} + maxLength={10} />
@@ -110,6 +114,8 @@ function Checkout() { placeholder='Cidade' value={formData.cidade} onChange={handleInputChange} + minLength={1} + maxLength={30} />
@@ -120,6 +126,8 @@ function Checkout() { placeholder='Bairro' value={formData.bairro} onChange={handleInputChange} + minLength={1} + maxLength={30} />
@@ -157,6 +165,8 @@ function Checkout() { placeholder='Validade (MM/AA)' value={formData.dataValidade} onChange={handleInputChange} + minLength={4} + maxLength={4} />
@@ -178,6 +188,8 @@ function Checkout() { placeholder='Nome no cartão' value={formData.nomeCartao} onChange={handleInputChange} + minLength={2} + maxLength={50} />
@@ -188,6 +200,8 @@ function Checkout() { placeholder='Cidade' value={formData.cidade} onChange={handleInputChange} + minLength={1} + maxLength={30} />
@@ -198,6 +212,8 @@ function Checkout() { placeholder='Bairro' value={formData.bairro} onChange={handleInputChange} + minLength={1} + maxLength={30} />
diff --git a/Frontend/src/pages/Register.jsx b/Frontend/src/pages/Register.jsx index 02e959b..7143116 100644 --- a/Frontend/src/pages/Register.jsx +++ b/Frontend/src/pages/Register.jsx @@ -86,6 +86,8 @@ function Register() { placeholder='Nome Completo' value={regData.name} onChange={handleChange} + minLength={10} + maxLength={40} /> {errors.name && (

{errors.name}

@@ -112,6 +114,8 @@ function Register() { placeholder='E-mail' value={regData.email} onChange={handleChange} + minLength={5} + maxLength={50} /> {errors.email && (

{errors.email}

@@ -138,6 +142,8 @@ function Register() { placeholder='Senha' value={regData.password} onChange={handleChange} + minLength={8} + maxLength={12} /> {errors.password && (

{errors.password}