From 85fd8eb831b14cb6e970aaa982515eb7f1025e88 Mon Sep 17 00:00:00 2001 From: vagnerbarbosant Date: Wed, 12 Jun 2024 02:37:43 -0300 Subject: [PATCH 1/7] feat(natds-react): added theme forcaDeVendas casaEestilo_v2 affects: @naturacosmeticos/natds-react DSY-4393 --- packages/react/.storybook/globalTypes/index.js | 2 ++ packages/react/package.json | 2 +- packages/react/src/brandTypes/brandTypes.ts | 2 ++ yarn.lock | 8 ++++---- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/react/.storybook/globalTypes/index.js b/packages/react/.storybook/globalTypes/index.js index f5bf5e31d..bc1606491 100644 --- a/packages/react/.storybook/globalTypes/index.js +++ b/packages/react/.storybook/globalTypes/index.js @@ -11,9 +11,11 @@ export const globalTypes = { { value: 'natura', title: 'Natura' }, { value: 'theBodyShop', title: 'The Body Shop' }, { value: 'consultoriaDeBeleza', title: 'Consultoria de Beleza' }, + { value: 'forcaDeVendas', title: 'Força de Vendas' }, { value: 'natura_v2', title: 'Natura V2' }, { value: 'natura_v3', title: 'Natura V3' }, { value: 'casaEestilo', title: 'Casa & Estilo' }, + { value: 'casaEestilo_v2', title: 'Casa & Estilo' }, { value: 'avon_v2', title: 'Avon V2' }, ], }, diff --git a/packages/react/package.json b/packages/react/package.json index bbc4f1348..1ee7ba6c5 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -58,7 +58,7 @@ }, "dependencies": { "@naturacosmeticos/natds-icons": "1.25.1", - "@naturacosmeticos/natds-themes": "0.75.1", + "@naturacosmeticos/natds-themes": "0.76.0", "react-jss": "10.9.0" }, "devDependencies": { diff --git a/packages/react/src/brandTypes/brandTypes.ts b/packages/react/src/brandTypes/brandTypes.ts index 0d9e8da9c..550e3ea7e 100644 --- a/packages/react/src/brandTypes/brandTypes.ts +++ b/packages/react/src/brandTypes/brandTypes.ts @@ -4,6 +4,8 @@ export type BrandTypes = 'aesop' | 'natura' | 'theBodyShop' | 'consultoriaDeBeleza' +| 'forcaDeVendas' | 'natura_v2' | 'natura_v3' | 'casaEestilo' +| 'casaEestilo_v2' diff --git a/yarn.lock b/yarn.lock index 36f2b5a45..e46d2e5d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2707,10 +2707,10 @@ svg2vectordrawable "2.6.26" webp-converter "^2.3.3" -"@naturacosmeticos/natds-themes@0.75.1": - version "0.75.1" - resolved "https://registry.yarnpkg.com/@naturacosmeticos/natds-themes/-/natds-themes-0.75.1.tgz#40b242289b919dcc0774c7107c64d46ef84625cd" - integrity sha512-arqN7qEBzeH00k5L010DCC4qT1pgCsfP4235D/NGZC6VQTkt4Wkasce9YOkLf/HcW8CWha8l9o6q4mSoTN5LrQ== +"@naturacosmeticos/natds-themes@0.76.0": + version "0.76.0" + resolved "https://registry.yarnpkg.com/@naturacosmeticos/natds-themes/-/natds-themes-0.76.0.tgz#d8af277dda71223ad77120cccdc7065d0ffdfe00" + integrity sha512-HyuwN0FPITiVT5f4rfaGKo++9DvWv5wt8JWBMjyW/gLS+aXWS3FOMt4jKmY6dS2gnopDsKmXHjGNQwe0JUY+HQ== dependencies: open-color "^1.8.0" svg2vectordrawable "2.6.26" From 0edad472b833ae47707273c9a28be632633b6de7 Mon Sep 17 00:00:00 2001 From: Natura Design System Team Date: Wed, 12 Jun 2024 05:43:13 +0000 Subject: [PATCH 2/7] chore(release): bump natds-js packages via lerna [skip-ci] - @naturacosmeticos/natds-react@2.61.0-alpha.DSY-4393.1.0 --- packages/react/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/package.json b/packages/react/package.json index 1ee7ba6c5..1b57f0739 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -2,7 +2,7 @@ "name": "@naturacosmeticos/natds-react", "displayName": "NatDS-React", "description": "A collection of components from Natura Design System for React", - "version": "2.60.0", + "version": "2.61.0-alpha.DSY-4393.1.0", "private": false, "keywords": [ "design-system", From 8790b5a8b4568a78e66f61bd73772118fa61f3a2 Mon Sep 17 00:00:00 2001 From: vagnerbarbosant Date: Wed, 12 Jun 2024 03:02:47 -0300 Subject: [PATCH 3/7] feat(natds-react): added stories brand forcaDeVendas casaEestilo_v2 affects: @naturacosmeticos/natds-react DSY-4393 --- .../react/.storybook/globalTypes/index.js | 2 +- .../GayaButton/GayaButton.stories.tsx | 33 ++++++++++++------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/packages/react/.storybook/globalTypes/index.js b/packages/react/.storybook/globalTypes/index.js index bc1606491..bb21d6059 100644 --- a/packages/react/.storybook/globalTypes/index.js +++ b/packages/react/.storybook/globalTypes/index.js @@ -15,7 +15,7 @@ export const globalTypes = { { value: 'natura_v2', title: 'Natura V2' }, { value: 'natura_v3', title: 'Natura V3' }, { value: 'casaEestilo', title: 'Casa & Estilo' }, - { value: 'casaEestilo_v2', title: 'Casa & Estilo' }, + { value: 'casaEestilo_v2', title: 'Casa & Estilo V2' }, { value: 'avon_v2', title: 'Avon V2' }, ], }, diff --git a/packages/react/src/components/GayaButton/GayaButton.stories.tsx b/packages/react/src/components/GayaButton/GayaButton.stories.tsx index 1a9306a27..b8b1422f8 100644 --- a/packages/react/src/components/GayaButton/GayaButton.stories.tsx +++ b/packages/react/src/components/GayaButton/GayaButton.stories.tsx @@ -66,7 +66,18 @@ export const Brands: Story = (args) => ( - + + + + + + + + + + + + @@ -94,6 +105,12 @@ export const Brands: Story = (args) => ( + + + + + + @@ -101,16 +118,10 @@ export const Brands: Story = (args) => ( - - - - - - - - - - + + + + ) From 726b88ab986d60d90f6e1c6f0b5cd16f05fb2796 Mon Sep 17 00:00:00 2001 From: Natura Design System Team Date: Wed, 12 Jun 2024 06:07:13 +0000 Subject: [PATCH 4/7] chore(release): bump natds-js packages via lerna [skip-ci] - @naturacosmeticos/natds-react@2.61.0-alpha.DSY-4393.3.0 --- packages/react/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/package.json b/packages/react/package.json index 1b57f0739..a48df8bc6 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -2,7 +2,7 @@ "name": "@naturacosmeticos/natds-react", "displayName": "NatDS-React", "description": "A collection of components from Natura Design System for React", - "version": "2.61.0-alpha.DSY-4393.1.0", + "version": "2.61.0-alpha.DSY-4393.3.0", "private": false, "keywords": [ "design-system", From 9edcfe59fa38b838824d2aed45c67b3e4c1ae30c Mon Sep 17 00:00:00 2001 From: vagnerbarbosant Date: Tue, 18 Jun 2024 12:45:09 -0300 Subject: [PATCH 5/7] =?UTF-8?q?feat(natds-react):=20=20added=20logo=20For?= =?UTF-8?q?=C3=A7a=20de=20Vendas=E2=80=A8affects:=20@naturacosmeticos/natd?= =?UTF-8?q?s-react=20DSY-4393?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/react/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react/package.json b/packages/react/package.json index a48df8bc6..509e9fc8f 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -58,7 +58,7 @@ }, "dependencies": { "@naturacosmeticos/natds-icons": "1.25.1", - "@naturacosmeticos/natds-themes": "0.76.0", + "@naturacosmeticos/natds-themes": "0.77.0", "react-jss": "10.9.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index e46d2e5d5..c1f9050ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2707,10 +2707,10 @@ svg2vectordrawable "2.6.26" webp-converter "^2.3.3" -"@naturacosmeticos/natds-themes@0.76.0": - version "0.76.0" - resolved "https://registry.yarnpkg.com/@naturacosmeticos/natds-themes/-/natds-themes-0.76.0.tgz#d8af277dda71223ad77120cccdc7065d0ffdfe00" - integrity sha512-HyuwN0FPITiVT5f4rfaGKo++9DvWv5wt8JWBMjyW/gLS+aXWS3FOMt4jKmY6dS2gnopDsKmXHjGNQwe0JUY+HQ== +"@naturacosmeticos/natds-themes@0.77.0": + version "0.77.0" + resolved "https://registry.yarnpkg.com/@naturacosmeticos/natds-themes/-/natds-themes-0.77.0.tgz#d474b3f4335bcfb16f8ae1aecf47480aa68497a8" + integrity sha512-xGBgxFj7k5PGw3413WMzKbP0TXO+JktrCZdPs6luveD120FFMdxnt4V0/UvJMFAUm8sTGMdoNH2wXkkVkqomfw== dependencies: open-color "^1.8.0" svg2vectordrawable "2.6.26" From fc19291c99f83221c66825bb16523db634b2a2ad Mon Sep 17 00:00:00 2001 From: vagnerbarbosant Date: Tue, 18 Jun 2024 13:54:31 -0300 Subject: [PATCH 6/7] fix(natds-react): change path logo FV affects: @naturacosmeticos/natds-react DSY-4393 --- packages/react/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react/package.json b/packages/react/package.json index 509e9fc8f..c593c1abc 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -58,7 +58,7 @@ }, "dependencies": { "@naturacosmeticos/natds-icons": "1.25.1", - "@naturacosmeticos/natds-themes": "0.77.0", + "@naturacosmeticos/natds-themes": "0.77.1", "react-jss": "10.9.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index c1f9050ff..827f08d23 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2707,10 +2707,10 @@ svg2vectordrawable "2.6.26" webp-converter "^2.3.3" -"@naturacosmeticos/natds-themes@0.77.0": - version "0.77.0" - resolved "https://registry.yarnpkg.com/@naturacosmeticos/natds-themes/-/natds-themes-0.77.0.tgz#d474b3f4335bcfb16f8ae1aecf47480aa68497a8" - integrity sha512-xGBgxFj7k5PGw3413WMzKbP0TXO+JktrCZdPs6luveD120FFMdxnt4V0/UvJMFAUm8sTGMdoNH2wXkkVkqomfw== +"@naturacosmeticos/natds-themes@0.77.1": + version "0.77.1" + resolved "https://registry.yarnpkg.com/@naturacosmeticos/natds-themes/-/natds-themes-0.77.1.tgz#9bee7b6766366805bc8b0b062e603d7b5cebb772" + integrity sha512-POFmT9/uZHxLZyFwE9lIkCLPaRqk2lCs7MW4PgRfTdap0lkhl3TeMYWtVhEtBN7x8rE1tVgfuQf7xS6hxDZv8g== dependencies: open-color "^1.8.0" svg2vectordrawable "2.6.26" From 51c6b19d8853663cfa97c2ad169d7a4cb5043077 Mon Sep 17 00:00:00 2001 From: vagnerbarbosant Date: Thu, 20 Jun 2024 02:38:09 -0300 Subject: [PATCH 7/7] fix(natds-react): fixed svg forcaDeVendas-custom-a affects: @naturacosmeticos/natds-react DSY-4393 --- packages/react/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/react/package.json b/packages/react/package.json index c593c1abc..bd15cf96b 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -58,7 +58,7 @@ }, "dependencies": { "@naturacosmeticos/natds-icons": "1.25.1", - "@naturacosmeticos/natds-themes": "0.77.1", + "@naturacosmeticos/natds-themes": "0.77.2", "react-jss": "10.9.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 827f08d23..17684e1b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2707,10 +2707,10 @@ svg2vectordrawable "2.6.26" webp-converter "^2.3.3" -"@naturacosmeticos/natds-themes@0.77.1": - version "0.77.1" - resolved "https://registry.yarnpkg.com/@naturacosmeticos/natds-themes/-/natds-themes-0.77.1.tgz#9bee7b6766366805bc8b0b062e603d7b5cebb772" - integrity sha512-POFmT9/uZHxLZyFwE9lIkCLPaRqk2lCs7MW4PgRfTdap0lkhl3TeMYWtVhEtBN7x8rE1tVgfuQf7xS6hxDZv8g== +"@naturacosmeticos/natds-themes@0.77.2": + version "0.77.2" + resolved "https://registry.yarnpkg.com/@naturacosmeticos/natds-themes/-/natds-themes-0.77.2.tgz#323a7e2a6404e628379c71b0fe4ec1d87dc56b1d" + integrity sha512-Ra+i27S2jv1ZBCU0RpF1sdcS6eHYUNl+b11MW/YfhjdFxgzjC3Uvc1cw1c5lA8vvKIrbaJqDdQV0cRflk2ljLw== dependencies: open-color "^1.8.0" svg2vectordrawable "2.6.26"