Skip to content

Feature/3630 #3811

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

Merged
merged 9 commits into from
Nov 25, 2019
Merged

Feature/3630 #3811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6529322
theme config added
lysy-vlc Nov 13, 2019
fd8f10b
importing theme config instead of prototype
lysy-vlc Nov 14, 2019
55d1541
category loads 50 products per page
lysy-vlc Nov 14, 2019
57c3898
change log updated
lysy-vlc Nov 14, 2019
a4e38b2
3630 theme.config exchanged for theme constant
lysy-vlc Nov 18, 2019
9c5392e
Merge branch 'feature/3630' of github.com:AdKamil/vue-storefront into…
lysy-vlc Nov 18, 2019
edeab04
3630 default 30 per page
lysy-vlc Nov 19, 2019
96edaab
Merge branch 'release/v1.11' into feature/3630
andrzejewsky Nov 22, 2019
b3771c5
Merge branch 'release/v1.11' into feature/3630
andrzejewsky Nov 25, 2019
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add unit tests for `core/modules/user` - @dz3n (#3470)
- Add to cart from Wishlist and Product listing for simple products - @Dnd-Dboy, @dz3n (#2637)
- Add global Category and Breadcrumb filters, defined in local.json - @grimasod (#3691)
- Add constant which conditions the number of products loading per page - @AdKamil (#3630)

### Fixed
- Fixed problem with cutting image height in category page on 1024px+ screen res - @AdKamil (#3781)
Expand Down
5 changes: 4 additions & 1 deletion src/themes/default/pages/Category.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,16 @@ import { catalogHooksExecutors } from '@vue-storefront/core/modules/catalog-next
import { localizedRoute, currentStoreView } from '@vue-storefront/core/lib/multistore'
import { htmlDecode } from '@vue-storefront/core/filters'

const THEME_PAGE_SIZE = 50

const composeInitialPageState = async (store, route, forceLoad = false) => {
try {
const filters = getSearchOptionsFromRouteParams(route.params)
const cachedCategory = store.getters['category-next/getCategoryFrom'](route.path)
const currentCategory = cachedCategory && !forceLoad ? cachedCategory : await store.dispatch('category-next/loadCategory', { filters })
await store.dispatch('category-next/loadCategoryProducts', {route, category: currentCategory})
await store.dispatch('category-next/loadCategoryProducts', {route, category: currentCategory, pageSize: THEME_PAGE_SIZE})
const breadCrumbsLoader = store.dispatch('category-next/loadCategoryBreadcrumbs', { category: currentCategory, currentRouteName: currentCategory.name, omitCurrent: true })

if (isServer) await breadCrumbsLoader
catalogHooksExecutors.categoryPageVisited(currentCategory)
} catch (e) {
Expand Down