Skip to content
This repository was archived by the owner on Jan 26, 2024. It is now read-only.

Commit 42b3714

Browse files
author
Tomasz Kostuch
authored
Merge pull request #411 from DivanteLtd/hotfix/v1.0.2
Hotfix/v1.0.2
2 parents 39635b9 + d3e871f commit 42b3714

25 files changed

+71
-43
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [1.0.2] - 03.07.2020
9+
10+
### Added
11+
### Changed / Improved
12+
13+
- Update sfui version to 0.7.11
14+
- Changed the banner links to correct path (#379)
15+
- Improved the background of MegaMenu (#401)
16+
- fix problem with changing product color - should be changed product image
17+
fix close sidebar when push esc button
18+
add cacheTags to pages
19+
remove Home page mixin - (#410)
20+
821
## [1.0.1] - 2020.06.02
922

1023
### Added

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ To be able to use new Capybara theme in your Vue Storefront installation, you ne
6464
1. Configure `vsf-capybara` repository as a git submodule in theme path of your Vue Storefront workspace, and then track `master` branch:
6565

6666
```
67-
git submodule add -b master git@github.com:DivanteLtd/vsf-capybara.git src/themes/capybara
67+
git submodule add -b master https://github.com/DivanteLtd/vsf-capybara.git src/themes/capybara
6868
```
6969

7070
1. Fetch all the data:

components/molecules/m-login.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export default {
7575
}),
7676
switchElem (to) {
7777
this.$v.$reset();
78-
this.openModal({name: ModalList.Auth, payload: to})
78+
this.openModal({ name: ModalList.Auth, payload: to })
7979
},
8080
login () {
8181
this.$v.$touch();
@@ -103,7 +103,7 @@ export default {
103103
this.onFailure(result);
104104
} else {
105105
this.onSuccess(i18n.t('You are logged in!'));
106-
this.closeModal({name: ModalList.Auth});
106+
this.closeModal({ name: ModalList.Auth });
107107
}
108108
})
109109
.catch(err => {

components/molecules/m-menu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div class="m-menu sf-mega-menu">
2+
<div class="m-menu sf-mega-menu bg-white">
33
<SfMegaMenu
44
:title="title || currentCategoryTitle"
55
:visible="visible"

components/molecules/m-product-gallery.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ export default {
5353
selectThis = false
5454
}
5555
}
56-
return selectThis || (image.id && image.id.color === this.configuration.color.id)
56+
return selectThis || (image.id && image.id.color && String(image.id.color) === String(this.configuration.color.id))
5757
})
5858
5959
if (!variantImage) {
6060
variantImage = this.gallery.find(image => {
6161
return typeof image.id.color !== 'undefined' &&
6262
typeof this.configuration.color !== 'undefined' &&
63-
image.id.color === this.configuration.color.id
63+
String(image.id.color) === String(this.configuration.color.id)
6464
})
6565
}
6666

components/molecules/m-register.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export default {
7878
}),
7979
switchElem (to) {
8080
this.$v.$reset();
81-
this.openModal({name: ModalList.Auth, payload: to})
81+
this.openModal({ name: ModalList.Auth, payload: to })
8282
},
8383
register () {
8484
this.$v.$touch();
@@ -111,7 +111,7 @@ export default {
111111
password: this.password
112112
});
113113
this.onSuccess(i18n.t('You are logged in!'));
114-
this.closeModal({name: ModalList.Auth});
114+
this.closeModal({ name: ModalList.Auth });
115115
}
116116
})
117117
.catch(err => {

components/molecules/m-reset-password.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export default {
5757
}),
5858
switchElem (to) {
5959
this.$v.$reset();
60-
this.openModal({name: ModalList.Auth, payload: to})
60+
this.openModal({ name: ModalList.Auth, payload: to })
6161
},
6262
resetPassword () {
6363
this.$v.$touch();

components/organisms/o-bottom-navigation.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export default {
4949
return (icon) => {
5050
switch (icon) {
5151
case 'home': {
52-
const isHomepage = this.$route.name === this.localizedRoute({name: 'home', path: '/'}).name
52+
const isHomepage = this.$route.name === this.localizedRoute({ name: 'home', path: '/' }).name
5353
return isHomepage && !this.isMobileMenu && !this.isSearchPanelVisible
5454
}
5555
case 'menu': {
@@ -93,7 +93,7 @@ export default {
9393
if (this.isLoggedIn) {
9494
this.$router.push(this.localizedRoute('/my-account'))
9595
} else {
96-
this.openModal({name: ModalList.Auth, payload: 'login'})
96+
this.openModal({ name: ModalList.Auth, payload: 'login' })
9797
}
9898
},
9999
goToCart () {

components/organisms/o-footer.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ export default {
108108
{
109109
name: 'My account',
110110
...this.isLoggedIn
111-
? {link: '/my-account'}
112-
: {clickHandler: () => this.openModal({name: ModalList.Auth, payload: 'login'})}
111+
? { link: '/my-account' }
112+
: { clickHandler: () => this.openModal({ name: ModalList.Auth, payload: 'login' }) }
113113
},
114114
{ name: 'Delivery', link: '/delivery' },
115115
{ name: 'Return policy', link: '/returns' }
@@ -145,7 +145,7 @@ export default {
145145
openModal: 'openModal'
146146
}),
147147
showLanguageSwitcher () {
148-
this.openModal({name: ModalList.LanguageSwitcher})
148+
this.openModal({ name: ModalList.LanguageSwitcher })
149149
}
150150
}
151151
};

components/organisms/o-microcart-panel.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ export default {
156156
},
157157
methods: {
158158
closeMicrocartExtend () {
159-
this.$store.dispatch('ui/toggleMicrocart');
159+
this.$store.dispatch('ui/closeMicrocart')
160160
},
161161
onEscapePress () {
162162
this.closeMicrocartExtend();

0 commit comments

Comments
 (0)