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: issue-340 #627

Merged
merged 3 commits into from
Jun 6, 2024
Merged

Fix: issue-340 #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
479f98e
feat: improve product list display
tblivet May 17, 2024
5ede008
feat: improve pagination
tblivet May 17, 2024
b3752eb
feat: reducing the breakpoint value
tblivet May 20, 2024
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
2 changes: 1 addition & 1 deletion modules/ps_bestsellers/views/templates/hook/ps_bestsellers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<section class="best-sellers-products mt-3">
<div class="container">
{include file='components/section-title.tpl' title={l s='Best Sellers' d='Shop.Theme.Catalog'}}
{include file='catalog/_partials/productlist.tpl' products=$products productClass='col-6 col-lg-4 col-xl-3'}
{include file='catalog/_partials/productlist.tpl' products=$products productClass='col-12 col-xs-6 col-lg-4 col-xl-3'}
<div class="best-sellers-products-footer text-center">
<a class="all-product-link btn btn-outline-primary" href="{$allBestSellers}">
{l s='All best sellers' d='Shop.Theme.Catalog'}<i class="material-icons rtl-flip" aria-hidden="true">&#xE315;</i>
Expand Down
2 changes: 1 addition & 1 deletion modules/ps_categoryproducts/views/templates/hook/ps_categoryproducts.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
{include file='components/section-title.tpl' title={l s='%s other products in the same category' sprintf=[$products|@count] d='Shop.Theme.Catalog'}}
{/if}

{include file='catalog/_partials/productlist.tpl' products=$products productClass='col-6 col-lg-4 col-xl-3'}
{include file='catalog/_partials/productlist.tpl' products=$products productClass='col-12 col-xs-6 col-lg-4 col-xl-3'}
</div>
</section>
2 changes: 1 addition & 1 deletion modules/ps_crossselling/views/templates/hook/ps_crossselling.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<section class="featured-products mt-3">
<div class="container">
{include file='components/section-title.tpl' title={l s='Customers who bought this product also bought:' d='Shop.Theme.Catalog'}}
{include file='catalog/_partials/productlist.tpl' products=$products productClass='col-6 col-lg-4 col-xl-3'}
{include file='catalog/_partials/productlist.tpl' products=$products productClass='col-12 col-xs-6 col-lg-4 col-xl-3'}
</div>
</section>
2 changes: 1 addition & 1 deletion modules/ps_featuredproducts/views/templates/hook/ps_featuredproducts.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<section class="featured-products">
<div class="container">
{include file='components/section-title.tpl' title={l s='Popular Products' d='Shop.Theme.Catalog'}}
{include file='catalog/_partials/productlist.tpl' products=$products productClass='col-6 col-lg-4 col-xl-3'}
{include file='catalog/_partials/productlist.tpl' products=$products productClass='col-12 col-xs-6 col-lg-4 col-xl-3'}
</div>

<div class="featured-products-footer text-center">
Expand Down
2 changes: 1 addition & 1 deletion modules/ps_newproducts/views/templates/hook/ps_newproducts.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<section class="new-products mt-3">
<div class="container">
{include file='components/section-title.tpl' title={l s='New products' d='Shop.Theme.Catalog'}}
{include file='catalog/_partials/productlist.tpl' products=$products productClass='col-6 col-lg-4 col-xl-3'}
{include file='catalog/_partials/productlist.tpl' products=$products productClass='col-12 col-xs-6 col-lg-4 col-xl-3'}
<div class="new-products-footer text-center">
<a class="all-product-link btn btn-outline-primary" href="{$allNewProductsLink}">
{l s='All new products' d='Shop.Theme.Catalog'}<i class="material-icons rtl-flip" aria-hidden="true">&#xE315;</i>
Expand Down
2 changes: 1 addition & 1 deletion modules/ps_specials/views/templates/hook/ps_specials.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<section class="sale-products mt-3">
<div class="container">
{include file='components/section-title.tpl' title={l s='On sale' d='Shop.Theme.Catalog'}}
{include file='catalog/_partials/productlist.tpl' products=$products productClass='col-6 col-lg-4 col-xl-3'}
{include file='catalog/_partials/productlist.tpl' products=$products productClass='col-12 col-xs-6 col-lg-4 col-xl-3'}
<div class="sale-products-footer text-center">
<a class="all-product-link btn btn-outline-primary" href="{$allSpecialProductsLink}">
{l s='All sale products' d='Shop.Theme.Catalog'}<i class="material-icons rtl-flip" aria-hidden="true">&#xE315;</i>
Expand Down
2 changes: 1 addition & 1 deletion modules/ps_viewedproduct/views/templates/hook/ps_viewedproduct.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
<section class="viewed-products mt-3">
<div class="container">
{include file='components/section-title.tpl' title={l s='Viewed products' d='Shop.Theme.Catalog'}}
{include file='catalog/_partials/productlist.tpl' products=$products productClass='col-6 col-lg-4 col-xl-3'}
{include file='catalog/_partials/productlist.tpl' products=$products productClass='col-12 col-xs-6 col-lg-4 col-xl-3'}
</div>
</section>
29 changes: 11 additions & 18 deletions src/scss/abstract/variables/overrides/_overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,15 @@
// IT IS FORBIDDEN TO USE REFERENCES TO BS5 VARIABLES BECAUSE THEY ARE NOT YET DECLARED.
//$primary: #16181c;
//secondary: #f39d72;
//success: #21834d;
//warning: #ff9a52;
//danger: #ff4c4c;
// Bootstrap variables, maps overrides

//gray-100: #f6f6f6;
//gray-200: #eaebec;
//gray-300: #b3c7cd;
//gray-600: #7a7a7a;
//gray-700: #697180;
//gray-800: #363a41;
//gray-900: #232323;

// THESE ARE FINE BECAUSE WE ARE REDEFINING THEM IN THIS SHEET
//text-muted: $gray-600;

//body-color: $gray-800;
// Breakpoints
$grid-breakpoints: (
"xxs": 0,
"xs": 360px, // Add breakpoint to give us flexibility on small devices
"sm": 576px,
"md": 768px,
"lg": 992px,
"xl": 1200px,
"xxl": 1400px
);

// Toasts
$toast-border-width: 0;
Expand Down
54 changes: 54 additions & 0 deletions src/scss/custom/components/category/_pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,58 @@ $component-name: pagination;
font-size: 1rem;
color: var(--bs-gray-600);
}

@include media-breakpoint-down(sm) {
position: relative;
margin-bottom: 3.5rem;

.page-item {
&:nth-child(2) {
.page-link {
border-top-left-radius: var(--bs-pagination-border-radius);
border-bottom-left-radius: var(--bs-pagination-border-radius);
}
}

&:nth-last-child(2) {
.page-link {
border-top-right-radius: var(--bs-pagination-border-radius);
border-bottom-right-radius: var(--bs-pagination-border-radius);
}
}

&.disabled {
.page-link {
padding-inline: 0.375rem;
}
}

&:has(.previous),
&:has(.next) {
position: absolute;
top: calc(100% + 0.5rem);
transform-origin: center;
}

&:has(.previous) {
left: 50%;
transform: translateX(calc(-100% - 0.25rem));
}

&:has(.next) {
right: 50%;
transform: translateX(calc(100% + 0.25rem));
}
}

.page-link {
padding-inline: 0.625rem;

&.previous,
&.next {
padding: 0.5rem;
border-radius: 50%;
}
}
}
}
43 changes: 29 additions & 14 deletions templates/_partials/pagination.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,40 @@
<nav aria-label="{l s='Products pagination' d='Shop.Theme.Catalog'}">
{if $pagination.should_be_displayed}
<ul class="pagination">
{foreach from=$pagination.pages item="page"}
{foreach from=$pagination.pages item="page" name="paginationLoop"}
{if $page@iteration === 1}
<li class="page-item">
<a rel="prev" href="{$page.url}"
class="page-link btn-with-icon previous {['disabled' => !$page.clickable, 'js-pager-link' => true]|classnames}">
<i class="material-icons rtl-flip" aria-hidden="true">&#xE314;</i>
<span class="d-none d-xl-flex">{l s='Previous' d='Shop.Theme.Actions'}</span>
</a>
</li>

{if $page.type === 'previous'}
{continue}
{/if}
{/if}

{if $page.type === 'spacer'}
<li class="page-item disabled">
<span class="page-link">&hellip;</span>
</li>
{else}
{else if $page.type != "prev" && $page.type != "next"}
<li class="page-item{if $page.current} active{/if}" {if $page.current}aria-current="page" {/if}>
<a rel="{if $page.type === 'previous'}prev{elseif $page.type === 'next'}next{else}nofollow{/if}"
href="{$page.url}"
class="page-link btn-with-icon {if $page.type === 'previous'}previous {elseif $page.type === 'next'}next {/if}{['disabled' => !$page.clickable, 'js-pager-link' => true]|classnames}">
{if $page.type === 'previous'}
<i class="material-icons rtl-flip" aria-hidden="true">&#xE314;</i>
<span class="d-none d-md-flex">{l s='Previous' d='Shop.Theme.Actions'}</span>
{elseif $page.type === 'next'}
<span class="d-none d-md-flex">{l s='Next' d='Shop.Theme.Actions'}</span>
<i class="material-icons rtl-flip" aria-hidden="true">&#xE315;</i>
{else}
{$page.page}
{/if}
<a rel="nofollow" href="{$page.url}"
class="page-link btn-with-icon {['disabled' => !$page.clickable, 'js-pager-link' => true]|classnames}">
{$page.page}
</a>
</li>
{/if}

{if $smarty.foreach.paginationLoop.last}
<li class="page-item">
<a rel="next" href="{$page.url}"
class="page-link btn-with-icon next {['disabled' => !$page.clickable, 'js-pager-link' => true]|classnames}">
<span class="d-none d-xl-flex">{l s='Next' d='Shop.Theme.Actions'}</span>
<i class="material-icons rtl-flip" aria-hidden="true">&#xE315;</i>
</a>
</li>
{/if}
Expand Down
2 changes: 1 addition & 1 deletion templates/catalog/_partials/product-accessories.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
*}
<section class="product-accessories mt-3">
{include file='components/section-title.tpl' title={l s='You might also like' d='Shop.Theme.Catalog'}}
{include file='catalog/_partials/productlist.tpl' products=$accessories productClass='col-6 col-lg-4 col-xl-3'}
{include file='catalog/_partials/productlist.tpl' products=$accessories productClass='col-12 col-xs-6 col-lg-4 col-xl-3'}
</section>
2 changes: 1 addition & 1 deletion templates/catalog/_partials/productlist.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*}
{capture assign="productClasses"}{if !empty($productClass)}{$productClass}{else}col-6 col-xl-4{/if}{/capture}
{capture assign="productClasses"}{if !empty($productClass)}{$productClass}{else}col-12 col-xs-6 col-xl-4{/if}{/capture}

<div class="products{if !empty($cssClass)} {$cssClass}{else} row{/if}">
{foreach from=$products item='product' key='position'}
Expand Down
11 changes: 10 additions & 1 deletion templates/catalog/listing/product-list.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,16 @@
{/block}

{block name='product_list'}
{include file='catalog/_partials/products.tpl' listing=$listing productClass='col-6 col-xl-4'}
{if isset($page.body_classes['layout-full-width'])}
{assign var="classes" value="col-12 col-xs-6 col-lg-4 col-xl-3"}
{elseif isset($page.body_classes['layout-left-column']) || isset($page.body_classes['layout-right-column'])}
{assign var="classes" value="col-12 col-xs-6 col-xl-4"}
{elseif isset($page.body_classes['layout-both-columns'])}
{assign var="classes" value="col-12 col-xs-6 col-md-12 col-lg-6"}
{else}
{assign var="classes" value="col-12 col-xs-6 col-lg-4 col-xl-3"}
{/if}
{include file='catalog/_partials/products.tpl' listing=$listing productClass=$classes}
{/block}

{block name='product_list_bottom'}
Expand Down
2 changes: 1 addition & 1 deletion templates/catalog/listing/search.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{extends file='catalog/listing/product-list.tpl'}

{block name='product_list'}
{include file='catalog/_partials/products.tpl' listing=$listing productClass='col-6 col-md-4 col-xl-3'}
{include file='catalog/_partials/products.tpl' listing=$listing productClass='col-12 col-xs-6 col-md-4 col-xl-3'}
{/block}

{block name='error_content'}
Expand Down
Loading