From daaa56c66e1dcfaf793ca954cf103c0bbe6bd3b9 Mon Sep 17 00:00:00 2001 From: Soufiane Date: Sat, 11 Jul 2020 11:56:08 +0200 Subject: [PATCH 01/94] Change template imports ase in default theme --- App.vue | 4 ++-- CHANGELOG.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/App.vue b/App.vue index 8ea13921a..41d5856f8 100644 --- a/App.vue +++ b/App.vue @@ -8,8 +8,8 @@ + + From 68b775b8a590ec312935c483c78c63ced6ef204e Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Fri, 22 Jan 2021 18:57:33 +0530 Subject: [PATCH 17/94] Updated: the changelog file(#434) --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64bbadb96..b151bfb43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.0.5] - UNRELEASED + +### Changed / Improved +- Updated: code to make the tab index work on the authentication modals(#434) + ## [1.0.4] - 04.01.2020 ### Added From 986e4444f17d10985318b5c018045fbde3770d37 Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Sat, 27 Feb 2021 15:09:43 +0530 Subject: [PATCH 18/94] Improved: the error message for the zip-code field on shipping and payment page(#589) --- components/organisms/o-payment.vue | 2 +- components/organisms/o-shipping.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/organisms/o-payment.vue b/components/organisms/o-payment.vue index ae4be3252..632e720a1 100644 --- a/components/organisms/o-payment.vue +++ b/components/organisms/o-payment.vue @@ -89,7 +89,7 @@ :error-message=" !$v.payment.zipCode.required ? $t('Field is required') - : $t('Name must have at least 3 letters.') + : $t('Zip-code must have at least 3 letters.') " @blur="$v.payment.zipCode.$touch()" /> diff --git a/components/organisms/o-shipping.vue b/components/organisms/o-shipping.vue index 68dd4b553..3cd4e1a46 100644 --- a/components/organisms/o-shipping.vue +++ b/components/organisms/o-shipping.vue @@ -83,7 +83,7 @@ :error-message=" !$v.shipping.zipCode.required ? $t('Field is required') - : $t('Name must have at least 3 letters.') + : $t('Zip-code must have at least 3 letters.') " @blur="$v.shipping.zipCode.$touch()" /> From f5201e319d264e36a9c3c867bb45fea90cc2215c Mon Sep 17 00:00:00 2001 From: Yash Maheshwari Date: Sat, 27 Feb 2021 15:16:45 +0530 Subject: [PATCH 19/94] Updated: the changelog file(#589) --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64bbadb96..42f9f95fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.0.5] - UNRELEASED + +### Changed / Improved +- Improved: the error message for the zip-code field on shipping and payment page(#589) + ## [1.0.4] - 04.01.2020 ### Added From a20c87dae8c055761f1630203e59d190ba1cc143 Mon Sep 17 00:00:00 2001 From: Aishwary Shrivastava Date: Tue, 13 Apr 2021 17:21:15 +0530 Subject: [PATCH 20/94] Added: Changelog for improving the height of microcart(#576) --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bff55673f..ea6757c27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added `VueObserveVisibility` and `VueLazyload` dependency + +### Changed / Improved +- Improved: Height for the micro cart on mobile (#576) + + ## [1.0.4] - 04.01.2020 ### Added From 1788cbd9cbf56cb40aa5464808baf050f6529d4e Mon Sep 17 00:00:00 2001 From: Aishwary Shrivastava Date: Tue, 13 Apr 2021 17:34:59 +0530 Subject: [PATCH 21/94] Added: Changelog for improved Z-index for dropdowns(#536) --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bff55673f..084c6ef26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added `VueObserveVisibility` and `VueLazyload` dependency + +### Changed / Improved +- Improved: Z-index for dropdowns(#536) + ## [1.0.4] - 04.01.2020 ### Added From 34b172edf0d4bde4ad577ba23e97fcbea68f30f9 Mon Sep 17 00:00:00 2001 From: Aishwary Shrivastava Date: Tue, 13 Apr 2021 17:49:17 +0530 Subject: [PATCH 22/94] Added: Changelog for safe Area of Elements in the Bottom Elements(#499) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bff55673f..0a820e275 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added `VueObserveVisibility` and `VueLazyload` dependency +- Added safe Area of Elements in the Bottom Elements(#499) ## [1.0.4] - 04.01.2020 From 3468753f6c65fabf819774f00a2111406d212d23 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Mon, 26 Apr 2021 10:09:38 +0530 Subject: [PATCH 23/94] Improved:Updated o-personal-details to match latest design (#601) --- components/organisms/o-personal-details.vue | 277 +++++++++----------- 1 file changed, 131 insertions(+), 146 deletions(-) diff --git a/components/organisms/o-personal-details.vue b/components/organisms/o-personal-details.vue index de5d044c5..be16447bb 100644 --- a/components/organisms/o-personal-details.vue +++ b/components/organisms/o-personal-details.vue @@ -1,22 +1,22 @@ -
- - {{ - $t(isVirtualCart ? "Continue to payment" : "Continue to shipping") - }} - - - {{ $t("or login to your account") }} - -
+ + + {{ $t(isVirtualCart ? "Continue to payment" : "Continue to shipping") }} + + From 544db73b29cbc5c71a61d92c90bc517f7e656345 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Mon, 26 Apr 2021 11:48:05 +0530 Subject: [PATCH 24/94] Added:Changelog (#601) --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bff55673f..b136bcccd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,13 +8,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.0.5] - ??? ### Added + - Added `VueObserveVisibility` and `VueLazyload` dependency +### Changed / Improved + +- Updated o-personal-details to match latest designs(#601) + ## [1.0.4] - 04.01.2020 ### Added ### Changed / Improved + - Improved spacing around product carousal on home page(#471) - Improved navbar layout (#467) - Improved heading in search panel (#478) @@ -56,7 +62,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Used sku instead of product_id while preparing order line items product (#415) - Replaced deprecated action product/list call with findProducts (#417) - Fix hydration errors with fresh installation (#462) -- Fixed console warning related to value of key 'Sort by' is not a string (#476) +- Fixed console warning related to value of key 'Sort by' is not a string (#476) - Update pwacompat to avoid loading multiple favicons (https://github.com/DivanteLtd/vue-storefront/issues/4559) - Fixed changing and deleting shipping details on MyAccount (#4499) - Corrected displayed price when choosing configurable product second time (#493) @@ -64,6 +70,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.0.2] - 03.07.2020 ### Added + ### Changed / Improved - Update sfui version to 0.7.11 @@ -77,6 +84,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.0.1] - 2020.06.02 ### Added + ### Changed / Improved - Support theme configuration via CLI (#369) From ade0404e0b079e67ac15ac28f24275d6da8aee37 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Mon, 26 Apr 2021 14:50:33 +0530 Subject: [PATCH 25/94] Removed auto format changes in JS and updated changelog entries --- CHANGELOG.md | 5 +- components/organisms/o-personal-details.vue | 78 ++++++++++----------- 2 files changed, 41 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b136bcccd..5a9114b50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed / Improved -- Updated o-personal-details to match latest designs(#601) +- Updated css styling by replacing flexbox to css grid(#601) +- Updated spacing between the form elements(#601) +- Updated spacing around login button and details heading(#601) +- Updated width and position of login button on mobile(#601) ## [1.0.4] - 04.01.2020 diff --git a/components/organisms/o-personal-details.vue b/components/organisms/o-personal-details.vue index be16447bb..63822561e 100644 --- a/components/organisms/o-personal-details.vue +++ b/components/organisms/o-personal-details.vue @@ -2,9 +2,11 @@

- {{ $t("Enjoy these perks with your free account!") }} + {{ $t('Enjoy these perks with your free account!') }}

From eddf38f7ef2cbf15bdc08f4cbd1f5890542f4226 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Mon, 26 Apr 2021 15:20:34 +0530 Subject: [PATCH 26/94] Removed auto format changes in JS and updated changelog entries --- CHANGELOG.md | 2 ++ components/organisms/o-personal-details.vue | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a9114b50..b9a7133c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated spacing between the form elements(#601) - Updated spacing around login button and details heading(#601) - Updated width and position of login button on mobile(#601) +- Improved HTML markup by spacing between elements(#601) +- Improved CSS styling by using shorthand methods (#601) ## [1.0.4] - 04.01.2020 diff --git a/components/organisms/o-personal-details.vue b/components/organisms/o-personal-details.vue index 63822561e..33d402d2e 100644 --- a/components/organisms/o-personal-details.vue +++ b/components/organisms/o-personal-details.vue @@ -209,10 +209,10 @@ export default { /(?=[a-z])/.test(value), /(?=[A-Z])/.test(value), /(?=[0-9])/.test(value), - /(?=\W)/.test(value), + /(?=\W)/.test(value) ].filter((result) => result).length >= 3 ); - }, + } }, rPassword: { required, From 510fa3d14dcd8edbdc4e01ed166a7b1a3ac4446b Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Tue, 27 Apr 2021 12:52:49 +0530 Subject: [PATCH 27/94] Updated m-update-personal-data to match the latest design (#604) --- .../molecules/m-update-personal-data.vue | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/components/molecules/m-update-personal-data.vue b/components/molecules/m-update-personal-data.vue index bf870faf0..66b3c848f 100644 --- a/components/molecules/m-update-personal-data.vue +++ b/components/molecules/m-update-personal-data.vue @@ -3,28 +3,30 @@

{{ $t('Feel free to edit any of your details below so your account is always up to date') }}

+
+

{{ $t('At Brand name, we attach great importance to privacy issues and are committed to protecting the personal data of our users. Learn more about how we care and use your personal data in the') }} {{ $t('Privacy Policy') }}. @@ -119,51 +122,48 @@ export default { From df6935a3847898438b32a0876380baa7814cd83b Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Tue, 27 Apr 2021 13:02:13 +0530 Subject: [PATCH 28/94] Added: Changelog(#604) --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bff55673f..d072c9167 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added `VueObserveVisibility` and `VueLazyload` dependency +### Changed / Improved +- Improved css styling by replacing flexbox to css grid(#604) +- Improved spacing between the form elements through grid gap(#604) +- Improved button width on desktop(#604) +- Removed maximum width of notice text(#604) +- Updated color of hover text(#604) +- Improved HTML markup by spacing between elements(#604) +- Improved CSS styling by using shorthand methods (#604) + + ## [1.0.4] - 04.01.2020 ### Added From 85ec05cee51ea55ecfaefbaf54de32b84d2a941d Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Tue, 27 Apr 2021 16:08:38 +0530 Subject: [PATCH 29/94] Updated m-update-password to match latest design (#606) --- CHANGELOG.md | 9 +++ components/molecules/m-update-password.vue | 72 ++++++++++------------ 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bff55673f..2fd872d56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added `VueObserveVisibility` and `VueLazyload` dependency +### Changed / Improved +- Improved css styling by replacing flexbox to css grid(#606) +- Improved spacing between the form elements through grid gap(#606) +- Improved button width on desktop(#606) +- Improved line height of message text(#606) +- Removed styling of 'a' tag as their was no 'a' tag in the file(#606) +- Improved HTML markup by spacing between elements(#606) +- Improved CSS styling by using shorthand methods (#606) + ## [1.0.4] - 04.01.2020 ### Added diff --git a/components/molecules/m-update-password.vue b/components/molecules/m-update-password.vue index 9ed245cbd..0e45ef69a 100644 --- a/components/molecules/m-update-password.vue +++ b/components/molecules/m-update-password.vue @@ -4,33 +4,35 @@ {{ $t('If you want to change the password to access your account, enter the following information:') }}

+
- + + {{ $t('Update password') }}
@@ -104,46 +106,36 @@ export default { From 0d346e293a89288a6a50dfdb6e05a2893c3b1d30 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Tue, 27 Apr 2021 16:28:36 +0530 Subject: [PATCH 30/94] Improved margin property of message class (#606) --- components/molecules/m-update-password.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/components/molecules/m-update-password.vue b/components/molecules/m-update-password.vue index 0e45ef69a..d785b41b4 100644 --- a/components/molecules/m-update-password.vue +++ b/components/molecules/m-update-password.vue @@ -110,28 +110,28 @@ export default { @import "~@storefront-ui/shared/styles/helpers/breakpoints"; .message { - margin-bottom: var(--spacer-xl); color: var(--c-dark-variant); line-height: 1.4; + margin: 0 0 var(--spacer-xl) 0; } .form { display: grid; - grid: "cpwd" "npwd" "rpwd"; + grid: "current" "new" "repeat"; grid-gap: var(--spacer-base) var(--spacer-lg); align-items: center; } -.current-password { grid-area: cpwd; } +.current-password { grid-area: current; } -.new-password { grid-area: npwd; } +.new-password { grid-area: new; } -.repeat-password { grid-area: rpwd; } +.repeat-password { grid-area: repeat; } @include for-desktop { .form { - grid: "cpwd cpwd" - "npwd rpwd"; + grid: "current current" + "new repeat"; } .action { From 9f0bafb2ad8f604957a2ce5a4a927efad304908b Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Tue, 27 Apr 2021 16:48:45 +0530 Subject: [PATCH 31/94] Improved margin property of message class (#604) --- components/molecules/m-update-personal-data.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/molecules/m-update-personal-data.vue b/components/molecules/m-update-personal-data.vue index 66b3c848f..70fbb8e89 100644 --- a/components/molecules/m-update-personal-data.vue +++ b/components/molecules/m-update-personal-data.vue @@ -128,7 +128,7 @@ export default { .message { color: var(--c-dark-variant); line-height: 1.4; - margin-bottom: var(--spacer-xl); + margin: 0 0 var(--spacer-xl) 0; } .form { From 0ee87ed8e431656deec5f97031d77060331d0eb5 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Wed, 28 Apr 2021 13:23:06 +0530 Subject: [PATCH 32/94] Refactored add/update address form styling of o-my-account-shipping-details (#608) --- CHANGELOG.md | 8 ++ .../o-my-account-shipping-details.vue | 127 +++++++++++------- 2 files changed, 83 insertions(+), 52 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bff55673f..8b3bf63fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added `VueObserveVisibility` and `VueLazyload` dependency +### Changed / Improved +- Improved css styling by replacing flexbox to css grid(#608) +- Improved spacing between the form elements through grid gap(#608) +- Fixed: Dropdown overflow(#608) +- Improved aligning of form items(#608) +- Improved button width on desktop(#608) +- Improved HTML markup by spacing between elements(#608) + ## [1.0.4] - 04.01.2020 ### Added diff --git a/components/organisms/o-my-account-shipping-details.vue b/components/organisms/o-my-account-shipping-details.vue index 7c03bd50e..76f9fb276 100644 --- a/components/organisms/o-my-account-shipping-details.vue +++ b/components/organisms/o-my-account-shipping-details.vue @@ -11,9 +11,11 @@

{{ $t('Keep your addresses and contact details updated.') }}

+
+ {{ $t('Update the address') }}
+ From 1b075a08282f7dbbf7640dc2897fe1f29c6d838e Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Wed, 28 Apr 2021 19:42:07 +0530 Subject: [PATCH 33/94] Refactored shipping details styling of o-my-account-shipping -details (#610) --- .../o-my-account-shipping-details.vue | 129 +++++++++--------- 1 file changed, 63 insertions(+), 66 deletions(-) diff --git a/components/organisms/o-my-account-shipping-details.vue b/components/organisms/o-my-account-shipping-details.vue index 7c03bd50e..ba3228ae2 100644 --- a/components/organisms/o-my-account-shipping-details.vue +++ b/components/organisms/o-my-account-shipping-details.vue @@ -119,44 +119,43 @@

{{ $t('Manage all the shipping addresses you want (work place, home address ...) This way you won\'t have to enter the shipping address manually with each order.') }}

- + +
-
-

- {{ address.firstname }} {{ address.lastname }}
- {{ address.street.join(' ') }}
- {{ address.postcode }} - {{ address.city }},
{{ getCountryById(address.country_id) }} -

-

- {{ address.telephone }} -

-
-
+ +
+

+ {{ address.firstname }} {{ address.lastname }}
+ {{ address.street.join(' ') }}
+ {{ address.postcode }} + {{ address.city }},
{{ getCountryById(address.country_id) }} +

+

+ {{ address.telephone }} +

+
+ + + - - {{ $t('Change') }} - - - {{ $t('Delete') }} - -
+
+ {{ $t('Add new address') }} @@ -309,51 +308,49 @@ export default { From cb21664b3337895610b7143ba27327913857f7b8 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Mon, 3 May 2021 10:40:10 +0530 Subject: [PATCH 41/94] Removed padding property from mobile styling(#613) --- components/organisms/o-search-panel.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/components/organisms/o-search-panel.vue b/components/organisms/o-search-panel.vue index 41c03f592..2bc3156ba 100644 --- a/components/organisms/o-search-panel.vue +++ b/components/organisms/o-search-panel.vue @@ -196,7 +196,6 @@ export default { } @include for-mobile { flex-direction: column; - padding: 0 var(--spacer-sm); } } From f581f6923d97086eb26bc7a738953d6cd145e6df Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Mon, 3 May 2021 20:07:30 +0530 Subject: [PATCH 42/94] Refactor styling of category page (#617) --- pages/Category.vue | 265 +++++++++++++++++++++++---------------------- 1 file changed, 137 insertions(+), 128 deletions(-) diff --git a/pages/Category.vue b/pages/Category.vue index 88c8eb101..ac5956055 100644 --- a/pages/Category.vue +++ b/pages/Category.vue @@ -7,29 +7,34 @@ -
-
- + +
+
+
-
+ +
- + {{ $t("Filters") }}
+
- {{ $t("Sort By") }}: + {{ $t("Sort By") }}: {{ $t('Sort By') }}
+
- + {{ $t("Products found") }}: {{ getCategoryProductsTotal }} - + {{ $t("{count} items", { count: getCategoryProductsTotal }) }}
-
-
-
+ +
+
+
+ @@ -623,12 +627,14 @@ export default { grid: "navbar" "products"; @include for-desktop{ + // Add or reorder desktop content elements here. grid: "title navbar" "categories products" / 15% 1fr; } } +// Title of categories .title { grid-area: title; padding: var(--spacer-sm); @@ -637,6 +643,8 @@ export default { } .navbar { + // To add more items to the navbar, add their grid-area to the template. + // The mobile navbar shouldn't have more than 3 items at a time, so replace rather than add. grid-area: navbar; display: grid; grid:"filter counter sort" / 1fr minmax( auto, max-content) 1fr; @@ -647,6 +655,7 @@ export default { border-width: 0 0 1px 0; @include for-desktop { + // Add or reorder desktop navbar elements here. grid: "filter sort counter" / max-content max-content auto; grid-column-gap: var(--spacer-2xl); padding: var(--spacer-xs) var(--spacer-xl); @@ -704,6 +713,7 @@ export default { justify-self: end; } + // It is useful when we will implement a grid/list view switcher. &__view { display: flex; align-items: center; @@ -718,12 +728,14 @@ export default { } } +// Styling the text of sort-by and counter of navbar. .label { font: var(--font-normal) var(--font-base) / 1.6 var(--font-family-secondary); color: var(--c-link); margin-right: var(--spacer-2xs); } +// Counter items .count { color: var(--c-text-muted); } @@ -826,6 +838,7 @@ export default { } } +// Sidebar filters styling .sidebar-filters { --sidebar-title-display: none; --sidebar-top-padding: 0; From 8cee6af7df95cc2acc05e61fb6a71604acf6e4e2 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Tue, 4 May 2021 17:02:33 +0530 Subject: [PATCH 47/94] Added: Changelog(#619) --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bff55673f..8841d0eba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added `VueObserveVisibility` and `VueLazyload` dependency +### Changed / Improved +- Replaced icon size, font styling, margin and padding's hard coded values with variables(#619) + ## [1.0.4] - 04.01.2020 ### Added From cdc921099531f11ddf6ce5e1ab65a81e7ba543dd Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Tue, 4 May 2021 20:58:48 +0530 Subject: [PATCH 48/94] Replaced SFUI 10.x font variales with SFUI 7 variables (#619) --- components/atoms/a-promo-code.vue | 2 +- components/atoms/a-static.vue | 4 ++-- components/atoms/a-wishlist-icon.vue | 2 +- components/molecules/m-menu.vue | 2 +- components/molecules/m-price-summary.vue | 2 +- components/organisms/o-confirm-order.vue | 4 ++-- components/organisms/o-header.vue | 2 +- components/organisms/o-microcart-panel.vue | 4 ++-- components/organisms/o-my-account-order-details.vue | 4 ++-- components/organisms/o-my-account-orders-history.vue | 2 +- components/organisms/o-my-account-placeholder.vue | 2 +- components/organisms/o-order-confirmation.vue | 4 ++-- components/organisms/o-order-review.vue | 4 ++-- components/organisms/o-personal-details.vue | 2 +- components/organisms/o-search-panel.vue | 2 +- pages/Category.vue | 4 ++-- pages/MyAccount.vue | 2 +- 17 files changed, 24 insertions(+), 24 deletions(-) diff --git a/components/atoms/a-promo-code.vue b/components/atoms/a-promo-code.vue index 123b83c8f..decace5bc 100644 --- a/components/atoms/a-promo-code.vue +++ b/components/atoms/a-promo-code.vue @@ -78,7 +78,7 @@ export default { } &__button { --button-height: 2rem; - --button-font-size: var(--font-size--xs); + --button-font-size: var(--font-2xs); } } diff --git a/components/atoms/a-static.vue b/components/atoms/a-static.vue index 342481514..2565151da 100644 --- a/components/atoms/a-static.vue +++ b/components/atoms/a-static.vue @@ -45,9 +45,9 @@ export default { diff --git a/components/organisms/o-personal-details.vue b/components/organisms/o-personal-details.vue index 0810268b7..7113ed052 100644 --- a/components/organisms/o-personal-details.vue +++ b/components/organisms/o-personal-details.vue @@ -306,7 +306,7 @@ export default { @include for-mobile { &__checkbox { --checkbox-font-family: var(--font-family-primary); - --checkbox-font-weight: var(--font-weight--light); + --checkbox-font-weight: var(--font-light); --checkbox-font-size: var(--font-sm); } } diff --git a/components/organisms/o-search-panel.vue b/components/organisms/o-search-panel.vue index 5d65b0f77..99cb2f388 100644 --- a/components/organisms/o-search-panel.vue +++ b/components/organisms/o-search-panel.vue @@ -209,7 +209,7 @@ export default { padding: var(--spacer-2xs) 0; } .sf-menu-item.selected { - --menu-item-font-weight: var(--font-weight--medium); + --menu-item-font-weight: var(--font-medium); text-decoration: underline; } } diff --git a/pages/Category.vue b/pages/Category.vue index 40c4de1d9..50a141680 100644 --- a/pages/Category.vue +++ b/pages/Category.vue @@ -653,7 +653,7 @@ export default { &__filters-button { display: flex; align-items: center; - font-size: var(--font-size--base); + font-size: var(--font-base); grid-column: 1; justify-self: start; &:hover { @@ -678,7 +678,7 @@ export default { } &__label { font-family: var(--font-family-secondary); - font-weight: var(--font-weight--normal); + font-weight: var(--font-normal); color: var(--c-text-muted); margin: 0 var(--spacer-2xs) 0 0; @include for-mobile { diff --git a/pages/MyAccount.vue b/pages/MyAccount.vue index 37e15fb0d..cf1df5096 100644 --- a/pages/MyAccount.vue +++ b/pages/MyAccount.vue @@ -115,7 +115,7 @@ export default { } } @include for-mobile { - --content-pages-sidebar-category-title-font-weight: var(--font-weight--normal); + --content-pages-sidebar-category-title-font-weight: var(--font-normal); --content-pages-sidebar-category-title-margin: var(--spacer-sm) var(--spacer-sm) var(--spacer-sm) var(--spacer-base); } @include for-desktop { From fca281cea6a4b7200f745f5d5c75999147545db9 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Wed, 5 May 2021 11:32:38 +0530 Subject: [PATCH 49/94] Updated comments of styling part(#617) --- pages/Category.vue | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pages/Category.vue b/pages/Category.vue index 3d7a2c346..4a19434c6 100644 --- a/pages/Category.vue +++ b/pages/Category.vue @@ -634,7 +634,8 @@ export default { } } -// Title of categories +// Title + .title { grid-area: title; padding: var(--spacer-sm); @@ -642,6 +643,8 @@ export default { border-width: 1px 1px 1px 0; } +// Navbar + .navbar { // To add more items to the navbar, add their grid-area to the template. // The mobile navbar shouldn't have more than 3 items at a time, so replace rather than add. @@ -713,7 +716,7 @@ export default { justify-self: end; } - // It is useful when we will implement a grid/list view switcher. + // Grid/list view switcher. &__view { display: flex; align-items: center; @@ -728,14 +731,12 @@ export default { } } -// Styling the text of sort-by and counter of navbar. .label { font: var(--font-normal) var(--font-base) / 1.6 var(--font-family-secondary); color: var(--c-link); margin-right: var(--spacer-2xs); } -// Counter items .count { color: var(--c-text-muted); } @@ -767,6 +768,8 @@ export default { } } +//Categories + .categories { grid-area: categories; padding: var(--spacer-sm); @@ -782,6 +785,8 @@ export default { } } +//Products + .products { grid-area: products; box-sizing: border-box; @@ -838,7 +843,8 @@ export default { } } -// Sidebar filters styling +// Sidebar + .sidebar-filters { --sidebar-title-display: none; --sidebar-top-padding: 0; From 18eedca0333bdf68cbab6ff62502f69d79783dc3 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Wed, 5 May 2021 12:06:55 +0530 Subject: [PATCH 50/94] Made navbar visible while scrolling (#622) --- CHANGELOG.md | 4 ++++ pages/Category.vue | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bff55673f..aeecd69aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added `VueObserveVisibility` and `VueLazyload` dependency +### Changed / Improved +- Made navbar visible while scrolling(#622) +- Added background blur effect(#622) + ## [1.0.4] - 04.01.2020 ### Added diff --git a/pages/Category.vue b/pages/Category.vue index 88c8eb101..c0b6da290 100644 --- a/pages/Category.vue +++ b/pages/Category.vue @@ -616,7 +616,14 @@ export default { padding: var(--spacer-base) var(--spacer-base) var(--spacer-base) var(--spacer-sm); } .navbar { - position: relative; + // Made it visible while scrolling. + position: sticky; + top: 0; + z-index: 2; + // Added background blur effect while scrolling. + background: rgba(255, 255, 255, 0.75); + backdrop-filter: blur(10px); + display: flex; border: 1px solid var(--c-light); border-width: 0 0 1px 0; From 7af86a950981ed518f3bcca6dd062117c9033203 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Wed, 5 May 2021 12:46:37 +0530 Subject: [PATCH 51/94] Navbar visible while scrolling only on mobile view (#622) --- CHANGELOG.md | 4 ++-- pages/Category.vue | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aeecd69aa..3ebc69806 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,8 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added `VueObserveVisibility` and `VueLazyload` dependency ### Changed / Improved -- Made navbar visible while scrolling(#622) -- Added background blur effect(#622) +- Made navbar visible while scrolling on mobile(#622) +- Added background blur effect on mobile(#622) ## [1.0.4] - 04.01.2020 diff --git a/pages/Category.vue b/pages/Category.vue index c0b6da290..b745e4a70 100644 --- a/pages/Category.vue +++ b/pages/Category.vue @@ -616,20 +616,21 @@ export default { padding: var(--spacer-base) var(--spacer-base) var(--spacer-base) var(--spacer-sm); } .navbar { - // Made it visible while scrolling. - position: sticky; - top: 0; - z-index: 2; - // Added background blur effect while scrolling. - background: rgba(255, 255, 255, 0.75); - backdrop-filter: blur(10px); - display: flex; border: 1px solid var(--c-light); border-width: 0 0 1px 0; @include for-desktop { border-width: 1px 0 1px 0; } + @include for-mobile{ + // Made it visible while scrolling. + position: sticky; + top: 0; + z-index: 2; + // Added background blur effect while scrolling. + background: rgba(255, 255, 255, 0.75); + backdrop-filter: blur(10px); + } &.section { padding: var(--spacer-sm); @include for-desktop { From b39d430af58001944b026f83e36a0ebaab1474e8 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Wed, 5 May 2021 15:14:21 +0530 Subject: [PATCH 52/94] Navbar visible while scrolling only on mobile view (#622) --- pages/Category.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/Category.vue b/pages/Category.vue index b745e4a70..666a54e52 100644 --- a/pages/Category.vue +++ b/pages/Category.vue @@ -622,7 +622,7 @@ export default { @include for-desktop { border-width: 1px 0 1px 0; } - @include for-mobile{ + @include for-mobile { // Made it visible while scrolling. position: sticky; top: 0; From 506905b868a2e7fd25670f06e3ba76069dfcd607 Mon Sep 17 00:00:00 2001 From: azkyakhan Date: Wed, 5 May 2021 15:34:32 +0530 Subject: [PATCH 53/94] Improved speed of carousel in m-product-carousel (#623) --- CHANGELOG.md | 3 +++ components/molecules/m-product-carousel.vue | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bff55673f..6f1d5eb9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added `VueObserveVisibility` and `VueLazyload` dependency +### Changed / Improved +- Improved speed of carousel in m-product-carousel(#623) + ## [1.0.4] - 04.01.2020 ### Added diff --git a/components/molecules/m-product-carousel.vue b/components/molecules/m-product-carousel.vue index ffdf8cafb..a12ec5324 100644 --- a/components/molecules/m-product-carousel.vue +++ b/components/molecules/m-product-carousel.vue @@ -2,8 +2,8 @@ From 0ef4dbe8a5b11e121e883b5cb3e15c2aeea5f7e5 Mon Sep 17 00:00:00 2001 From: Fifciuu Date: Wed, 9 Jun 2021 12:15:03 +0200 Subject: [PATCH 54/94] fix --- store/ui/modals.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store/ui/modals.ts b/store/ui/modals.ts index a95cb388a..67ca599df 100644 --- a/store/ui/modals.ts +++ b/store/ui/modals.ts @@ -15,7 +15,7 @@ export enum ModalList { /** * List of modal components files */ -export const modalComponents = new Map([ +export const modalComponents = new Map([ [ModalList.Review, () => import(/* webpackChunkName: "vsf-modals" */ 'theme/components/molecules/modals/m-modal-review.vue')], [ModalList.Auth, () => import(/* webpackChunkName: "vsf-modals" */ 'theme/components/molecules/modals/m-modal-authentication.vue')], [ModalList.SizeGuide, () => import(/* webpackChunkName: "vsf-modals" */ 'theme/components/molecules/modals/m-modal-size-guide.vue')], From 43fa17d4eb4291342e403f2029e06929f54d8dcc Mon Sep 17 00:00:00 2001 From: Fifciuu Date: Wed, 9 Jun 2021 12:17:14 +0200 Subject: [PATCH 55/94] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64bbadb96..7ed9dc885 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Removed: Overridden logo height (#490) - Fixed: duplicate image issue in offine mode (#498) - Fixed: Blank prices field on checkout in offline mode (#513) +- Fixed: modalComponents map type errors ## [1.0.3] - 20.09.2020 From c62e4f356c205d21d843db9d80a599a524859bc8 Mon Sep 17 00:00:00 2001 From: Fifciuu Date: Wed, 9 Jun 2021 12:35:33 +0200 Subject: [PATCH 56/94] fix versions --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bff55673f..166cf8acc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [1.0.5] - ??? +## [1.1.0] - ? ### Added - Added `VueObserveVisibility` and `VueLazyload` dependency From 9e02516e337e7a69b38a695fce0f8e0bfe9c7e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz?= Date: Wed, 9 Jun 2021 14:14:39 +0200 Subject: [PATCH 57/94] fix: remove product from Cart on Desktop --- CHANGELOG.md | 5 +++++ components/organisms/o-microcart-panel.vue | 20 +++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ed9dc885..0e9646e2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.0.5] - ? + +### Changed / Improved +- Fixed: remove product from Cart on Desktop + ## [1.0.4] - 04.01.2020 ### Added diff --git a/components/organisms/o-microcart-panel.vue b/components/organisms/o-microcart-panel.vue index 2e750f5d6..bc12e7bef 100644 --- a/components/organisms/o-microcart-panel.vue +++ b/components/organisms/o-microcart-panel.vue @@ -25,7 +25,6 @@ :stock="10" :qty="product.qty" class="collected-product" - @click:remove="removeHandler(product)" @input="changeQuantity(product, $event)" > + @@ -116,7 +128,8 @@ import { SfPrice, SfImage, SfHeading, - SfSidebar + SfSidebar, + SfCircleIcon } from '@storefront-ui/vue'; export default { @@ -127,7 +140,8 @@ export default { SfPrice, SfImage, SfHeading, - SfSidebar + SfSidebar, + SfCircleIcon }, mixins: [VueOfflineMixin, onEscapePress], data () { From 9afe30f9f1f0673fb16d9523399b9a6afce2f2f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20J=C4=99drasik?= Date: Wed, 9 Jun 2021 14:21:59 +0200 Subject: [PATCH 58/94] Update CHANGELOG.md --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ed9dc885..c3c4d15c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.0.5] - ? + +### Added + +### Changed / Improved +- Fixed: modalComponents map type errors + ## [1.0.4] - 04.01.2020 ### Added @@ -27,7 +34,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Removed: Overridden logo height (#490) - Fixed: duplicate image issue in offine mode (#498) - Fixed: Blank prices field on checkout in offline mode (#513) -- Fixed: modalComponents map type errors ## [1.0.3] - 20.09.2020 From 8791f652ccb9215de064f89d1acda9ee5722c350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz?= Date: Wed, 9 Jun 2021 14:32:03 +0200 Subject: [PATCH 59/94] fix: close mega menu after clicking on the category --- CHANGELOG.md | 1 + components/organisms/o-header.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19343ed17..a78bf0ca2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed / Improved - Fixed: modalComponents map type errors - Fixed: remove product from Cart on Desktop +- Fixed: close Mega Menu after clicking on the Category ## [1.0.4] - 04.01.2020 diff --git a/components/organisms/o-header.vue b/components/organisms/o-header.vue index 7afa33d03..44cb18337 100644 --- a/components/organisms/o-header.vue +++ b/components/organisms/o-header.vue @@ -22,6 +22,7 @@ :key="category.id" @mouseover="isHoveredMenu = true" @mouseleave="isHoveredMenu = false" + @click="isHoveredMenu = false" > Date: Wed, 9 Jun 2021 15:34:33 +0200 Subject: [PATCH 60/94] fix: wrong product img on PDP after clicked on filtered product from PLP --- CHANGELOG.md | 1 + components/molecules/m-product-gallery.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a78bf0ca2..76a5d5d80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed: modalComponents map type errors - Fixed: remove product from Cart on Desktop - Fixed: close Mega Menu after clicking on the Category +- Fixed: wrong product image on PDP after clicked on filtered product from PLP ## [1.0.4] - 04.01.2020 diff --git a/components/molecules/m-product-gallery.vue b/components/molecules/m-product-gallery.vue index 6e0b9901d..97acab2e3 100644 --- a/components/molecules/m-product-gallery.vue +++ b/components/molecules/m-product-gallery.vue @@ -3,6 +3,7 @@
From 0cdb34205a3822eb5b13ecf7f480837b08114bb9 Mon Sep 17 00:00:00 2001 From: Fifciuu Date: Wed, 16 Jun 2021 10:50:05 +0200 Subject: [PATCH 61/94] fix: capy --- CHANGELOG.md | 4 ++++ components/molecules/m-menu.vue | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 166cf8acc..cebad8945 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added `VueObserveVisibility` and `VueLazyload` dependency +### Changed / Improved +- Fix broken mega menu. Requires one change in the config. ([#509](https://github.com/vuestorefront/vsf-capybara/issues/509)) + + ## [1.0.4] - 04.01.2020 ### Added diff --git a/components/molecules/m-menu.vue b/components/molecules/m-menu.vue index 970d108d0..b6ec1621c 100644 --- a/components/molecules/m-menu.vue +++ b/components/molecules/m-menu.vue @@ -61,6 +61,11 @@ export default { default: () => [] } }, + methods: { + positionSort (a, b) { + return a.position - b.position; + } + }, computed: { ...mapState({ isWebpSupported: state => state.ui.isWebpSupported @@ -71,12 +76,11 @@ export default { getPromotedOffers: 'promoted/getPromotedOffers' }), categories () { - const positionSort = (a, b) => a.position - b.position; return this.categoriesIds .map(category => { const subCategories = category.children_data .map(subCategory => prepareCategoryMenuItem(subCategory)) - .sort(positionSort) + .sort(this.positionSort) const subheader = prepareCategoryMenuItem(category); const viewAllMenuItem = { @@ -90,7 +94,7 @@ export default { items: [viewAllMenuItem, ...subCategories] }; }) - .sort(positionSort); + .sort(this.positionSort); }, currentCategoryTitle () { return this.getCurrentCategory.name || '' From 883487906c7e641a96ce7443846c0b860e7c3559 Mon Sep 17 00:00:00 2001 From: Fifciuu Date: Wed, 16 Jun 2021 11:40:51 +0200 Subject: [PATCH 62/94] migration guide --- MIGRATION_GUIDE.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 MIGRATION_GUIDE.md diff --git a/MIGRATION_GUIDE.md b/MIGRATION_GUIDE.md new file mode 100644 index 000000000..c93dcdeec --- /dev/null +++ b/MIGRATION_GUIDE.md @@ -0,0 +1,5 @@ +# Migration Guide + +## [1.1.0] + +- Add `"children_data.*"` to the `config.entities.category.includeFields` in your PWA's config to fix the mega menu. ([#509](https://github.com/vuestorefront/vsf-capybara/issues/509)) \ No newline at end of file From 83f5948c60f3c2f8e4bc99eee6859c3c724d0ab2 Mon Sep 17 00:00:00 2001 From: Fifciuu Date: Wed, 16 Jun 2021 11:49:44 +0200 Subject: [PATCH 63/94] changelog update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cebad8945..fea1d115f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added `VueObserveVisibility` and `VueLazyload` dependency ### Changed / Improved -- Fix broken mega menu. Requires one change in the config. ([#509](https://github.com/vuestorefront/vsf-capybara/issues/509)) +- Fix broken mega menu. Requires [one change](https://github.com/vuestorefront/vsf-capybara/issues/509#issuecomment-862174222) in the config. ([#509](https://github.com/vuestorefront/vsf-capybara/issues/509)) ## [1.0.4] - 04.01.2020 From 89d5c01c0a9b763f903031e87b3762e09d540e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz?= Date: Wed, 16 Jun 2021 13:19:09 +0200 Subject: [PATCH 64/94] fix: calculation prices after coupon --- CHANGELOG.md | 2 +- components/organisms/o-microcart-panel.vue | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fea1d115f..fa0a750f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed / Improved - Fix broken mega menu. Requires [one change](https://github.com/vuestorefront/vsf-capybara/issues/509#issuecomment-862174222) in the config. ([#509](https://github.com/vuestorefront/vsf-capybara/issues/509)) - +- Used helper for calculating product prices in Cart/Checkout ## [1.0.4] - 04.01.2020 diff --git a/components/organisms/o-microcart-panel.vue b/components/organisms/o-microcart-panel.vue index b288ffe69..05435cf2d 100644 --- a/components/organisms/o-microcart-panel.vue +++ b/components/organisms/o-microcart-panel.vue @@ -20,8 +20,8 @@ :key="product.id" :image="getThumbnailForProductExtend(product)" :title="product.name" - :regular-price="getProductPrice(product).regular" - :special-price="getProductPrice(product).special" + :regular-price="!!getProductPrice(product).regular ? formatPrice(getProductPrice(product).regular) : null" + :special-price="!!getProductPrice(product).special ? formatPrice(getProductPrice(product).special) : null" :stock="10" :qty="product.qty" class="collected-product" @@ -104,8 +104,8 @@ import { mapState, mapGetters } from 'vuex'; import { localizedRoute } from '@vue-storefront/core/lib/multistore'; import { onlineHelper } from '@vue-storefront/core/helpers'; -import { getThumbnailForProduct } from '@vue-storefront/core/modules/cart/helpers'; -import { getProductPrice, getProductPriceFromTotals } from 'theme/helpers'; +import { getThumbnailForProduct, getProductPrice } from '@vue-storefront/core/modules/cart/helpers'; +import { price } from '@vue-storefront/core/filters'; import VueOfflineMixin from 'vue-offline/mixin'; import onEscapePress from '@vue-storefront/core/mixins/onEscapePress'; @@ -169,9 +169,10 @@ export default { return getThumbnailForProduct(product); }, getProductPrice (product) { - return onlineHelper.isOnline && product.totals && product.totals.options - ? getProductPriceFromTotals(product) - : getProductPrice(product); + return getProductPrice(product) + }, + formatPrice (value) { + return value ? price(value) : '' }, getProductOptions (product) { return onlineHelper.isOnline && product.totals && product.totals.options From 604cdef77b787bffa74ff18cb91bb24f12098ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20J=C4=99drasik?= Date: Thu, 17 Jun 2021 11:40:59 +0200 Subject: [PATCH 65/94] Update CHANGELOG.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Filip Jędrasik --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa0a750f5..9e6dfda01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed / Improved - Fix broken mega menu. Requires [one change](https://github.com/vuestorefront/vsf-capybara/issues/509#issuecomment-862174222) in the config. ([#509](https://github.com/vuestorefront/vsf-capybara/issues/509)) -- Used helper for calculating product prices in Cart/Checkout +- Using `getProductPrice` helper for calculating product prices in Cart/Checkout ## [1.0.4] - 04.01.2020 From 97a852056aff76fa18093d5f41c6a82c34676333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20J=C4=99drasik?= Date: Thu, 17 Jun 2021 11:42:13 +0200 Subject: [PATCH 66/94] Update components/organisms/o-microcart-panel.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Filip Jędrasik --- components/organisms/o-microcart-panel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/organisms/o-microcart-panel.vue b/components/organisms/o-microcart-panel.vue index 05435cf2d..debf87e43 100644 --- a/components/organisms/o-microcart-panel.vue +++ b/components/organisms/o-microcart-panel.vue @@ -20,7 +20,7 @@ :key="product.id" :image="getThumbnailForProductExtend(product)" :title="product.name" - :regular-price="!!getProductPrice(product).regular ? formatPrice(getProductPrice(product).regular) : null" + :regular-price=" formatPrice(getProductPrice(product).regular)" :special-price="!!getProductPrice(product).special ? formatPrice(getProductPrice(product).special) : null" :stock="10" :qty="product.qty" From 412d8c97a3996295d8289b890b40297b39bbc9f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20J=C4=99drasik?= Date: Thu, 17 Jun 2021 11:42:20 +0200 Subject: [PATCH 67/94] Update components/organisms/o-microcart-panel.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Filip Jędrasik --- components/organisms/o-microcart-panel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/organisms/o-microcart-panel.vue b/components/organisms/o-microcart-panel.vue index debf87e43..b76ebe2c8 100644 --- a/components/organisms/o-microcart-panel.vue +++ b/components/organisms/o-microcart-panel.vue @@ -21,7 +21,7 @@ :image="getThumbnailForProductExtend(product)" :title="product.name" :regular-price=" formatPrice(getProductPrice(product).regular)" - :special-price="!!getProductPrice(product).special ? formatPrice(getProductPrice(product).special) : null" + :special-price="formatPrice(getProductPrice(product).special)" :stock="10" :qty="product.qty" class="collected-product" From 329ef5b13bb3b23d02c513c1d5da0b811402c41e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20J=C4=99drasik?= Date: Thu, 17 Jun 2021 11:52:40 +0200 Subject: [PATCH 68/94] Update components/organisms/o-microcart-panel.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Filip Jędrasik --- components/organisms/o-microcart-panel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/organisms/o-microcart-panel.vue b/components/organisms/o-microcart-panel.vue index b76ebe2c8..0c7f941b1 100644 --- a/components/organisms/o-microcart-panel.vue +++ b/components/organisms/o-microcart-panel.vue @@ -20,7 +20,7 @@ :key="product.id" :image="getThumbnailForProductExtend(product)" :title="product.name" - :regular-price=" formatPrice(getProductPrice(product).regular)" + :regular-price="formatPrice(getProductPrice(product).regular)" :special-price="formatPrice(getProductPrice(product).special)" :stock="10" :qty="product.qty" From 22f8536f20ed8cf1d3669d257f725c3af5172288 Mon Sep 17 00:00:00 2001 From: ljedrasik Date: Wed, 23 Jun 2021 14:22:11 +0200 Subject: [PATCH 69/94] fix: missing required for phoneNumber --- CHANGELOG.md | 1 + components/organisms/o-payment.vue | 6 ++++++ components/organisms/o-shipping.vue | 6 ++++++ 3 files changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76a5d5d80..2ce680844 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed: remove product from Cart on Desktop - Fixed: close Mega Menu after clicking on the Category - Fixed: wrong product image on PDP after clicked on filtered product from PLP +- Fixed: missing `phoneNumber` on the Checkout ## [1.0.4] - 04.01.2020 diff --git a/components/organisms/o-payment.vue b/components/organisms/o-payment.vue index ae4be3252..d64803f79 100644 --- a/components/organisms/o-payment.vue +++ b/components/organisms/o-payment.vue @@ -116,6 +116,9 @@ class="form__element" name="phone" :label="$t('Phone Number')" + :required="true" + :valid="!$v.payment.phoneNumber.$error" + :error-message="$t('Field is required')" />
Date: Wed, 23 Jun 2021 14:25:39 +0200 Subject: [PATCH 70/94] update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ce680844..cb62cfe02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed: remove product from Cart on Desktop - Fixed: close Mega Menu after clicking on the Category - Fixed: wrong product image on PDP after clicked on filtered product from PLP -- Fixed: missing `phoneNumber` on the Checkout +- Fixed: set missing required for `phoneNumber` on the Checkout ## [1.0.4] - 04.01.2020 From 8f553d5d24f84f40119c59aa75ab5678f17d4958 Mon Sep 17 00:00:00 2001 From: ljedrasik Date: Wed, 23 Jun 2021 14:26:17 +0200 Subject: [PATCH 71/94] update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb62cfe02..fb46bee9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed: remove product from Cart on Desktop - Fixed: close Mega Menu after clicking on the Category - Fixed: wrong product image on PDP after clicked on filtered product from PLP -- Fixed: set missing required for `phoneNumber` on the Checkout +- Fixed: set missing require for `phoneNumber` on the Checkout ## [1.0.4] - 04.01.2020 From c7b11e795b4c62335bbddf10ea355de62e1cffb8 Mon Sep 17 00:00:00 2001 From: ljedrasik Date: Wed, 23 Jun 2021 14:46:03 +0200 Subject: [PATCH 72/94] refactor --- components/organisms/o-payment.vue | 21 +++++++++++---------- components/organisms/o-shipping.vue | 17 +++++++++-------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/components/organisms/o-payment.vue b/components/organisms/o-payment.vue index d64803f79..783458113 100644 --- a/components/organisms/o-payment.vue +++ b/components/organisms/o-payment.vue @@ -24,7 +24,7 @@ class="form__element form__element--half" name="first-name" :label="$t('First name')" - :required="true" + required :valid="!$v.payment.firstName.$error" :error-message=" !$v.payment.firstName.required @@ -38,7 +38,7 @@ class="form__element form__element--half form__element--half-even" name="last-name" :label="$t('Last name')" - :required="true" + required :valid="!$v.payment.lastName.$error" :error-message="$t('Field is required')" @blur="$v.payment.lastName.$touch()" @@ -48,7 +48,7 @@ class="form__element" name="street-address" :label="$t('Street name')" - :required="true" + required :valid="!$v.payment.streetAddress.$error" :error-message="$t('Field is required')" @blur="$v.payment.streetAddress.$touch()" @@ -58,7 +58,7 @@ class="form__element" name="apartment-number" :label="$t('House/Apartment number')" - :required="true" + required :valid="!$v.payment.apartmentNumber.$error" :error-message="$t('Field is required')" @blur="$v.payment.apartmentNumber.$touch()" @@ -68,7 +68,7 @@ class="form__element form__element--half" name="city" :label="$t('City')" - :required="true" + required :valid="!$v.payment.city.$error" :error-message="$t('Field is required')" @blur="$v.payment.city.$touch()" @@ -84,7 +84,7 @@ class="form__element form__element--half" name="zipCode" :label="$t('Zip-code')" - :required="true" + required :valid="!$v.payment.zipCode.$error" :error-message=" !$v.payment.zipCode.required @@ -98,7 +98,7 @@ class="form__element form__element--half form__element--half-even form__select sf-select--underlined" name="countries" :label="$t('Country')" - :required="true" + required :valid="!$v.payment.country.$error" :error-message="$t('Field is required')" @change="changeCountry" @@ -116,8 +116,9 @@ class="form__element" name="phone" :label="$t('Phone Number')" - :required="true" + required :valid="!$v.payment.phoneNumber.$error" + @blur="$v.payment.phoneNumber.$touch()" :error-message="$t('Field is required')" />
From 62b869c92f097cad15f331191f774f17f773a21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20J=C4=99drasik?= Date: Wed, 23 Jun 2021 15:09:06 +0200 Subject: [PATCH 73/94] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb46bee9d..73a9723e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [1.0.5] - ? +## [1.0.5] - 23.06.2021 ### Added From 57488ab7489547a7d696fe72e5f9aa1926db70c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20J=C4=99drasik?= Date: Wed, 23 Jun 2021 15:18:19 +0200 Subject: [PATCH 74/94] Update components/organisms/o-microcart-panel.vue --- components/organisms/o-microcart-panel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/organisms/o-microcart-panel.vue b/components/organisms/o-microcart-panel.vue index bc12e7bef..895195801 100644 --- a/components/organisms/o-microcart-panel.vue +++ b/components/organisms/o-microcart-panel.vue @@ -51,7 +51,7 @@ Remove{{ $t('Remove') }}