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.

Sign up for GitHub

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

Jump to bottom

fix: pagination and per page fixed #5341

Closed
wants to merge 4 commits into from
Closed

fix: pagination and per page fixed #5341

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
361990f
fix: pagination and per page fixed
justyna-13 Dec 17, 2020
0ae3fa7
fix: conflict resolved
justyna-13 Dec 30, 2020
ebada0c
Merge branch 'next' into fix/5327-nopagination-per-page-on-plp
justyna-13 Feb 23, 2021
a59bd13
updated ui version
justyna-13 Feb 23, 2021
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
1 change: 1 addition & 0 deletions packages/core/docs/commercetools/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## 1.1.0 (not released)
- fix getOrders api ([#5328](https://github.com/DivanteLtd/vue-storefront/issues/5328))
- added bottom margin to fix visibility of last footer category ([#5253](https://github.com/DivanteLtd/vue-storefront/issues/5253))
- fixed pagination and per page on category page ([#5327](https://github.com/DivanteLtd/vue-storefront/issues/5327))
- [BREAKING] refactored names of many factory methods and composable methods, details in linked PR ([#5299](https://github.com/DivanteLtd/vue-storefront/pull/5299))
- [BREAKING] changed signatures of factory methods to always 2 arguments, details in linked PR ([#5299](https://github.com/DivanteLtd/vue-storefront/pull/5299))
- [BREAKING] removed `totalOrders` and `totalProducts` ([#5330](https://github.com/vuestorefront/vue-storefront/pull/5330))
Expand Down
1 change: 1 addition & 0 deletions packages/core/docs/contributing/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## 2.2.0 (not released)
- added bottom margin to fix visibility of last footer category ([#5253](https://github.com/DivanteLtd/vue-storefront/issues/5253))
- fixed pagination and per page on category page ([#5327](https://github.com/DivanteLtd/vue-storefront/issues/5327))
- [BREAKING] refactored names of many factory methods and composable methods, details in linked PR ([#5299](https://github.com/DivanteLtd/vue-storefront/pull/5299))
- [BREAKING] changed signatures of factory methods to always 2 arguments, details in linked PR ([#5299](https://github.com/DivanteLtd/vue-storefront/pull/5299))
- [BREAKING] composables are always returning one field for the response, removed `totalOrders` and `totalProducts`, `useCartFactory` and `useUserFactory` are returning only composables ([#5330](https://github.com/vuestorefront/vue-storefront/pull/5330))
Expand Down
4 changes: 2 additions & 2 deletions packages/core/nuxt-theme-module/theme/pages/Category.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
<span class="products__show-on-page__label">{{ $t('Show on page') }}</span>
<LazyHydrate on-interaction>
<SfSelect
:value="pagination.itemsPerPage"
:value="pagination.itemsPerPage.toString()"
class="products__items-per-page"
@input="th.changeItemsPerPage"
>
Expand Down Expand Up @@ -387,7 +387,7 @@ export default {
const breadcrumbs = computed(() => facetGetters.getBreadcrumbs(result.value));
const sortBy = computed(() => facetGetters.getSortOptions(result.value));
const facets = computed(() => facetGetters.getGrouped(result.value, ['color', 'size']));
const pagination = computed(() => facetGetters.getPagination(result.value).toString());
const pagination = computed(() => facetGetters.getPagination(result.value));
const activeCategory = computed(() => {
const items = categoryTree.value.items;

Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2240,9 +2240,9 @@
defu "^3.2.2"
normalize-path "^3.0.0"

"@nuxtjs/composition-api@git+https://github.com/andrzejewsky/composition-api.git#ssr-ref-concurrent-fix":
"@nuxtjs/composition-api@https://github.com/andrzejewsky/composition-api.git#ssr-ref-concurrent-fix":
version "0.16.4"
resolved "git+https://github.com/andrzejewsky/composition-api.git#f1908d57a18f18feffcec0fd44de949c5dab65d3"
resolved "https://github.com/andrzejewsky/composition-api.git#f1908d57a18f18feffcec0fd44de949c5dab65d3"
dependencies:
"@vue/composition-api" "1.0.0-beta.21"
defu "^3.2.2"
Expand Down