Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add footer #56

Open
wants to merge 32 commits into
base: feature/VH2-10
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
0b41ea7
feat(produto): finaliza os ajustes da pdp
LucasFrM3 Apr 13, 2022
793ca35
feat(produto): ajuste de contraste na pdp
LucasFrM3 Apr 13, 2022
891d95d
feat(projeto): volta com configs
LucasFrM3 Apr 13, 2022
086ba72
feat(projeto): remove imports que não são usados no momento
LucasFrM3 Apr 13, 2022
83933a2
Merge branch 'master' of https://github.com/vtex-sites/beauty.store i…
LucasFrM3 Apr 13, 2022
90d1ffa
Merge branch 'feature/VH2-10' of github.com:vtex-sites/beauty.store i…
heraldo-ecard Apr 13, 2022
413da1c
feat(bump): version
LucasFrM3 Apr 13, 2022
1c55bd7
Merge pull request #48 from vtex-sites/feature/VH2-18
birnayt Apr 13, 2022
0128dde
feat:(projeto): colocar overflow para galeria de imagem
LucasFrM3 Apr 13, 2022
5c2c5fd
Merge pull request #51 from vtex-sites/feature/fix-image
birnayt Apr 13, 2022
0eadf7d
hotfix(scanner): adiciona skeleton no ScannerPresenter
GabrielNogueiraEXT Apr 21, 2022
a6bc6f6
Merge pull request #52 from vtex-sites/hotfix/reduce-img-size
danielschuabramos May 9, 2022
9ebe355
Merge pull request #50 from vtex-sites/hotfix/institucional
danielschuabramos May 9, 2022
141633b
feat(produto): conserta swiper da pdp e outro ajuste fino
birnayt May 9, 2022
1c1ad28
Merge pull request #53 from vtex-sites/fix/image-gallery
danielschuabramos May 9, 2022
5225aa5
feat(produto): conserta scroll no mobile da imagem
birnayt May 9, 2022
5af97f7
Merge pull request #54 from vtex-sites/fix/image-gallery
birnayt May 9, 2022
c4a4c80
Update README.md
georgebrindeiro May 12, 2022
afc79b0
Merge pull request #55 from vtex-sites/fix/readme
georgebrindeiro May 12, 2022
a434e43
Releases Build: 63fced5d07e167cf79648a9b-32956
vtexgithubbot Feb 27, 2023
b8b0f52
Releases Build: 640202452316288e67adc184-33589
vtexgithubbot Mar 3, 2023
59e5bc7
Releases Build: 640202452316288e67adc184-33589
vtexgithubbot Mar 3, 2023
efee203
Releases Build: 640204ab2316288e67adc18d-33596
vtexgithubbot Mar 3, 2023
355678d
Releases Build: 64022178e23e6fe559dfc7d6-33622
vtexgithubbot Mar 3, 2023
a2fd481
Releases Build: 64022ed65d52bc5ccd7628cc-33632
vtexgithubbot Mar 3, 2023
da79d83
Releases Build: 640242b32dd41eb48d670bd2-33657
vtexgithubbot Mar 3, 2023
7cd6e54
Releases Build: 640243b22dd41eb48d670bd4-33661
vtexgithubbot Mar 3, 2023
c63fdec
Releases Build: 640244a32dd41eb48d670bd5-33663
vtexgithubbot Mar 3, 2023
1d8215c
Releases Build: 640750b46f8a2964285fbafc-33917
vtexgithubbot Mar 7, 2023
27b3ef6
Releases Build: 64077b0ad16d17895a6bb366-33971
vtexgithubbot Mar 7, 2023
74bec11
Releases Build: 64089669e8f8fe4e4b72714d-34125
vtexgithubbot Mar 8, 2023
2b75bf4
force rebuild
Aug 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
380 changes: 2 additions & 378 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "beauty.store",
"private": true,
"version": "0.237.0",
"version": "0.249.0",
"license": "MIT",
"browserslist": "supports es6-module and not dead",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,18 @@
letter-spacing: 0.256px;
white-space: nowrap;

&:visited {
color: var(--color-neutral-4);
}

&--active {
color: var(--color-neutral-0);
background-color: var(--color-secondary-4);
border-radius: var(--border-radius-regular);

&:visited {
color: var(--color-neutral-0);
}
}
}
}
Expand Down
15 changes: 14 additions & 1 deletion src/components/sections/ProductDetails/product-details.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
background: #ffffff;
border-radius: 30px;

[data-store-quantity-selector] {
width: 7.18rem;
height: var(--space-6);
}

@include media(">=notebook") {
max-width: 501px;
}
Expand All @@ -64,6 +69,11 @@
position: relative;
max-width: 680px;
margin: 0 auto;
overflow: hidden;

@include media("<=notebook") {
max-width: 244px;
}

[data-gatsby-image-wrapper] {
@include media(">=tablet") {
Expand All @@ -80,7 +90,10 @@

.product-details__content {
margin-top: var(--space-3);
.product-details__description .title-subsection { margin-bottom: var(--space-3); }

.product-details__description .title-subsection {
margin-bottom: var(--space-3);
}
}

.product-details__title {
Expand Down
56 changes: 40 additions & 16 deletions src/components/sections/ScannerPresenter/ScannerPresenter.tsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,57 @@
import React from 'react'
import CtaButton from 'src/components/ui/CtaButton'
import { Banner, BannerImage } from '@faststore/ui'
import { useStepper } from 'src/contexts/StepperContext'
import SkeletonElement from 'src/components/skeletons/SkeletonElement'
import { useWidescreen } from 'src/sdk/ui/useWidescreen'

interface Props {
title: string
message: string
img: string
imgDesktop: string
imgMobile: string
buttonText: string
}

function ScannerPresenter({ title, message, img, buttonText }: Props) {
function ScannerPresenter({
title,
message,
imgDesktop,
imgMobile,
buttonText,
}: Props) {
const { goToNextStep } = useStepper()
const { isWidescreen } = useWidescreen('(max-width: 960px)')

return (
<section className="scanner">
<div className="scanner__img-wrapper">
<img
className="scanner__img"
width={1440}
height={1228}
src={img}
alt="Scanner"
/>
</div>
<div className="scanner-cta">
<h1 className="scanner-cta__title">{title}</h1>
<p className="scanner-cta__msg">{message}</p>
<CtaButton text={buttonText} handleClick={goToNextStep} />
</div>
<SkeletonElement type="full" loading={isWidescreen === null} shimmer>
<div className="scanner__img-wrapper">
<Banner>
<BannerImage>
<img
loading="eager"
src={isWidescreen ? imgMobile : imgDesktop}
alt="Scanner"
width={isWidescreen ? 375 : 1440}
height={isWidescreen ? 745 : 840}
/>
</BannerImage>
</Banner>
{/* <img
className="scanner__img"
width={1440}
height={1228}
src={img}
alt="Scanner"
/> */}
</div>
<div className="scanner-cta">
<h1 className="scanner-cta__title">{title}</h1>
<p className="scanner-cta__msg">{message}</p>
<CtaButton text={buttonText} handleClick={goToNextStep} />
</div>
</SkeletonElement>
</section>
)
}
Expand Down
55 changes: 44 additions & 11 deletions src/components/sections/ScannerPresenter/scanner-presenter.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,19 @@
position: relative;
width: 100%;

&__img {
width: 100%;
[data-store-banner] {
height: 100%;
object-fit: cover;
padding: 0;

&-wrapper {
[data-banner-image] {
height: 100%;

img {
display: block;
width: 100%;
height: 100%;
object-fit: cover;
}
}
}

Expand All @@ -35,16 +41,43 @@
> div {
height: 100%;
}
}

[data-store-skeleton-element] {
width: 100%;
height: 597px;

@media only screen and (min-width: 1400px) {
height: 840px;
}

@media only screen and (min-width: 1600px) {
height: 930px;
}

@media only screen and (min-width: 1800px) {
height: 1050px;
}

[data-store-skeleton-element] {
@media only screen and (min-width: 2000px) {
height: 1200px;
}

@media only screen and (min-width: 2400px) {
height: 1450px;
}

@media only screen and (max-width: 960px) {
height: 1300px;
}

@media only screen and (max-width: 380px) {
height: 745px;
}

[data-skeleton-element-content] {
width: 100%;
height: 100%;
padding: 8px;

[data-skeleton-element-content] {
width: 100%;
height: 100%;
}
}
}
}
Expand Down
9 changes: 2 additions & 7 deletions src/components/ui/ImageGallery/image-gallery.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
// @import "swiper/scss";
// @import "swiper/scss/pagination";
// @import "swiper/scss/navigation";
// @import "swiper/scss/free-mode";
// @import "swiper/scss/thumbs";

.swiper-image-gallery {
max-height: 680px;

&.swiper-vertical {
img {
max-width: 680px;
max-width: 100%;
object-fit: cover;
}
}

Expand Down
2 changes: 0 additions & 2 deletions src/components/ui/QuantitySelector/quantity-selector.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@

[data-quantity-selector-button] {
width: 100%;
min-width: 48px;
height: 100%;
min-height: 48px;
padding: var(--space-0);
background-color: transparent;
border: 0;
Expand Down
5 changes: 2 additions & 3 deletions src/components/ui/SkuSelector/SkuSelector.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { RadioGroup, RadioOption } from '@faststore/ui'
import React, { useState } from 'react'
import { Image } from 'src/components/ui/Image'
import type { ChangeEventHandler } from 'react'
import Text from 'src/components/common/Text'

Expand Down Expand Up @@ -125,8 +124,8 @@ function SkuSelector({
</span>
)}
{variant === 'image' && 'src' in option && (
<Image
src={option.src}
<img
src={option.src.replace('http:', 'https:')}
alt={option.alt}
width={49}
height={49}
Expand Down
30 changes: 22 additions & 8 deletions src/components/ui/SkuSelector/sku-selector.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
@import "src/styles/scaffold";

@mixin sku-selector-focus-ring {
@media not all and (min-resolution: .001dpcm) { // Target only Safari browsers
@supports (-webkit-appearance:none) {
@media not all and (min-resolution: 0.001dpcm) {
// Target only Safari browsers
@supports (-webkit-appearance: none) {
// Use `focus` instead of `focus-visible` due to Safari's lack of support
&:focus + span {
border-color: var(--color-border-input-selected);
Expand Down Expand Up @@ -61,12 +62,15 @@
border: 1px solid #e5e5e5;
border-radius: 100%;
}

input {
cursor: pointer;
}
}

[data-store-radio-option] {
position: relative;
display: block;
width: var(--space-7);

span {
margin-top: var(--space-0);
Expand Down Expand Up @@ -117,22 +121,32 @@
}

&[data-variant="label"] input {
&:hover:not(:disabled) + span { background-color: var(--bg-secondary-light); }
&:checked + span { background-color: var(--bg-secondary-light); }
&:hover:not(:disabled) + span {
background-color: var(--bg-secondary-light);
}

&:checked + span {
background-color: var(--bg-secondary-light);
}
}

&[data-variant="color"] {
[data-sku-selector-color] {
width: var(--space-6);
height: var(--space-6);
border-radius: var(--border-radius-small);
transition: transform .2s ease;
transition: transform 0.2s ease;
transform-origin: center center;
}

input {
&:hover:not(:disabled):not(:checked) + span [data-sku-selector-color] { transform: scale(.95); }
&:checked + span [data-sku-selector-color] { transform: scale(.85); }
&:hover:not(:disabled):not(:checked) + span [data-sku-selector-color] {
transform: scale(0.95);
}

&:checked + span [data-sku-selector-color] {
transform: scale(0.85);
}
}
}
}
13 changes: 4 additions & 9 deletions src/pages/scanner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import ScannerResults from 'src/components/sections/ScannerResults'
import { StepperProvider } from 'src/contexts/StepperContext'
import { ScannerProvider } from 'src/contexts/ScannerContext'
import Stepper from 'src/components/common/Stepper'
import { useWidescreen } from 'src/sdk/ui/useWidescreen'
import { Helmet } from 'react-helmet'

export type Props = PageProps<ScannerPageQuery>
Expand All @@ -22,12 +21,6 @@ function Page(props: Props) {
} = props

const { locale } = useSession()
const { isWidescreen } = useWidescreen('(min-width: 724px)')
let imgSrc = '/scanner-presentation.png'

if (!isWidescreen) {
imgSrc = '/scanner-presentation-mobile.png'
}

const title = site?.siteMetadata?.title ?? ''
const siteUrl = `https://${host}${pathname}`
Expand Down Expand Up @@ -273,7 +266,8 @@ function Page(props: Props) {
<ScannerPresenter
title="Vamos descobrir seu perfil de beleza?"
message="Agora, realizaremos algumas perguntas sobre a sua pele para entendermos as características individuais da sua pele."
img={imgSrc}
imgDesktop="/scanner-presentation.png"
imgMobile="/scanner-presentation-mobile.png"
buttonText="Começar"
/>

Expand Down Expand Up @@ -325,7 +319,8 @@ function Page(props: Props) {
<ScannerPresenter
title="Seu perfil de pele está pronto"
message="Através do nosso teste conseguimos definir a melhor rotina para o seu perfil de beleza. Aproveite os descontos e dicas."
img={imgSrc}
imgDesktop="/scanner-presentation.png"
imgMobile="/scanner-presentation-mobile.png"
buttonText="Acessar"
/>
<ScannerResults />
Expand Down
3 changes: 0 additions & 3 deletions src/styles/global/components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
// Search
@import "src/components/search/Filter/filter.scss";
@import "src/components/search/Filter/FilterButton/filter-button.scss";
@import "src/components/search/History/search-history.scss";
@import "src/components/search/SuggestionProductCard/suggestion-product-card.scss";
@import "src/components/search/Suggestions/suggestions.scss";

// Sections
@import "src/components/sections/BannerImg/banner-img.scss";
Expand Down
2 changes: 0 additions & 2 deletions src/styles/pages/category.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
@import "src/components/sections/SkinCareInfocard/skincare-infocard.scss";
@import "src/components/ui/InfocardIcon/infocard-icon.scss";
@import "src/components/sections/BannerImg/banner-img.scss";
@import "src/components/search/History/search-history.scss";
@import "src/components/search/SuggestionProductCard/suggestion-product-card.scss";
@import "src/components/search/Suggestions/suggestions.scss";
@import "src/components/ui/Checkbox/checkbox.scss";
@import "src/components/ui/EmptyState/empty-state.scss";
@import "src/components/ui/Select/select.scss";
Loading