Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
3ab5e17
product page - gallery zoom photoswipe
JBLach Jan 20, 2023
f05e33c
Language selection not displaying correctly because of the currency b…
JBLach Feb 21, 2023
bc4fb3f
lint correction
JBLach Feb 21, 2023
3731ec5
Removing the wrong solution and adding a more correct one
JBLach Feb 24, 2023
3e9f5d3
Fix stripping parameters
Hlavtox Jan 31, 2023
500ccd2
Adapt theme to dynamic sitemap URLs
Hlavtox Mar 2, 2023
12be4d2
fix subcategories images
Mar 3, 2023
56957f5
Merge pull request #468 from SharakPL/fix-subcategories
Hlavtox Mar 3, 2023
5fedf7e
Merge pull request #452 from Hlavtox/fix-url-param
matthieu-rolland Mar 6, 2023
e1429f3
Merge pull request #464 from Hlavtox/adapt-sitemap
kpodemski Mar 13, 2023
27d6d39
run npm audit fix
tswfi Mar 30, 2023
4678e69
Merge pull request #481 from tswfi/npm_audit_fix_20230330
Hlavtox Mar 30, 2023
e1b60e6
Reproducible installs with npm
tswfi Mar 30, 2023
cc70ea0
ok, there are more of this around. fixed all of the 'npm i'
tswfi Mar 30, 2023
7fe56d3
use steup-node v3, up node to 16
tswfi Mar 31, 2023
ec45500
Merge pull request #462 from JBLach/fix/459
kpodemski Mar 31, 2023
34e15d0
Merge pull request #480 from tswfi/use_npm_ci
kpodemski Mar 31, 2023
54f1260
refactor(product): simplify code
davidglezz Apr 23, 2023
2985351
Merge pull request #492 from davidglezz/simplify-product-ts
Hlavtox Apr 24, 2023
c21d2e2
fix: bug fix for url properties after product deletion in cart
GytisZum Apr 27, 2023
7cdb81d
fix: added types on functions
GytisZum Apr 28, 2023
b669cb7
Merge pull request #493 from GytisZum/url-fix-after-removing-product-…
Hlavtox May 2, 2023
bde44dd
fix: added fix for carrier dynamic extra content on prestahop event
GytisZum May 3, 2023
7548e96
fix: whitespaces added and some typo corrections
GytisZum May 3, 2023
562e9ac
feat: added transition stylings
GytisZum May 4, 2023
0e6f948
fix: scss linter fix
GytisZum May 4, 2023
7f139f4
feat: added corect extra content on page load
GytisZum May 4, 2023
ce1cbce
fix: filter search bar on category pages then resize mobile
ga-devfront May 4, 2023
7265b25
fix: slider facetedsearch then we resize the window
ga-devfront May 4, 2023
7b808e0
fix: tests for responsive toggler and type in selectors
ga-devfront May 5, 2023
07f3b16
Merge pull request #495 from ga-devfront/ticket_483/fix_filtering
kpodemski May 11, 2023
27c96d3
Merge pull request #496 from GytisZum/carrier-dynamic-extra-content-fix
nicosomb May 23, 2023
e51ba3f
Fix facets search-filters ID name
PululuK May 30, 2023
4188f09
Bump theme compatibility
kpodemski May 30, 2023
aed84d9
Merge pull request #499 from PululuK/fix-facets-search-filters-id-name
mflasquin May 30, 2023
53ebdcd
Fix smarty deprecation stripslashes
lmeyer1 May 25, 2023
7e32423
Merge pull request #500 from PrestaShop/bump-compatibility
matks Jun 1, 2023
82d5ac7
fix: fixed several bugs on cart related with quantity input
GytisZum Jun 6, 2023
665d439
fix: lint fix
GytisZum Jun 6, 2023
c60d11b
fix: fixed if statement into more readable
GytisZum Jun 7, 2023
20142e1
fix: fixed searchbar offcanvas on mobile screen
GytisZum Jun 9, 2023
36c0e85
Accessibility: add aria-hidden (and some aria-label)
yannicka Jun 11, 2023
65ca22c
Merge pull request #505 from GytisZum/mobile-searchbar-canvas-bug-fix
kpodemski Jun 11, 2023
91b776e
Merge pull request #506 from yannicka/a11y
Hlavtox Jun 13, 2023
8e6400e
Show/Hide Password: Accessibility on the button
yannicka Jun 13, 2023
ad95609
JS: use object destructuring
yannicka Jun 15, 2023
07c8fb9
JS: remove spaces around brackets
yannicka Jun 15, 2023
de7c7a2
Accessibility: add aria-hidden, title and remove uppercase
yannicka Jun 15, 2023
34022da
Format templates "cms"
yannicka Jun 15, 2023
b6ceb84
Merge pull request #511 from yannicka/format-tpl-cms
kpodemski Jun 16, 2023
f9ed001
Merge pull request #510 from yannicka/a11y-some-arias
kpodemski Jun 16, 2023
cdded11
Merge pull request #498 from lmeyer1/fix-smarty-deprecation
kpodemski Jun 16, 2023
b85fd7c
Merge pull request #508 from yannicka/a11y-password-visibility
nicosomb Jun 20, 2023
906a754
fix: icon color on hover inside hompeage cta
ga-devfront Jun 22, 2023
1905b7c
fix: product miniatures infos alignment
ga-devfront Jun 22, 2023
a10e9ed
feat: init typo file
tblivet Jun 22, 2023
a972174
fix: hn blockwishlist
tblivet Jun 22, 2023
52eb007
fix: hn blockreassurance
tblivet Jun 22, 2023
3157b26
feat: update typo styles
tblivet Jun 22, 2023
ba3fbf2
fix: hn contactform
tblivet Jun 22, 2023
2aba53b
feat: update typo styles
tblivet Jun 22, 2023
b50e17b
fix: hn productcomments
tblivet Jun 22, 2023
54da907
fix: hn section title component
tblivet Jun 22, 2023
abcd069
fix: hn ps_checkpayment
tblivet Jun 22, 2023
2f0b67b
fix: hn ps_contactinfo
tblivet Jun 22, 2023
022e5e5
fix: hn ps_facetedsearch
tblivet Jun 22, 2023
cb8c5cf
Merge pull request #514 from ga-devfront/fix/cta_icon_on_focus
kpodemski Jun 22, 2023
c5cf608
fix: product miniatures responsive
ga-devfront Jun 23, 2023
2f93c7f
fix: scss lint
ga-devfront Jun 23, 2023
bb8ed76
fix: hn ps_legalcompliance
tblivet Jun 23, 2023
c1e390d
fix: basic left column block layout & ps_linklist
tblivet Jun 23, 2023
ac0950f
fix: hn ps_mainmenu
tblivet Jun 23, 2023
ce086fc
fix: hn ps_shoppingcart
tblivet Jun 23, 2023
81e69c1
fix: hn ps_wirepayment
tblivet Jun 23, 2023
403b997
fix: hn psgdpr
tblivet Jun 23, 2023
8a4c986
fix: H1 semantic
tblivet Jun 23, 2023
f772c13
fix: H2 semantic
tblivet Jun 23, 2023
1049d1e
Merge pull request #501 from GytisZum/ticket_488/several_bugs_fix_in_…
kpodemski Jun 23, 2023
f081c99
remove display: flex for active class
kpodemski Jun 25, 2023
555cb89
Merge pull request #436 from JBLach/gallery-product-page-photoswipe-zoom
kpodemski Jun 25, 2023
e3dbe8b
fix: H3 semantic
tblivet Jun 26, 2023
ee39309
fix: H4 semantic
tblivet Jun 26, 2023
05a4655
fix: H5 semantic
tblivet Jun 26, 2023
b570291
fix: H6 semantic
tblivet Jun 26, 2023
a2f0459
feat: add H1 on checkout steps
tblivet Jun 26, 2023
8f5da85
feat: add typo styles
tblivet Jun 26, 2023
c9e964b
Merge pull request #515 from ga-devfront/fix/product_listing_responsive
nicosomb Jun 26, 2023
c926a9b
fix: remove custom typography rules
tblivet Jun 29, 2023
64a1f7e
fix: replace custom class by BS class
tblivet Jun 29, 2023
23b505a
fix: edit condition
tblivet Jun 30, 2023
1a9638c
Merge pull request #524 from tblivet/rework-hn-semantic
kpodemski Jun 30, 2023
471c11d
fix: remove breadcrumb on the homepage without CSS
tblivet Jun 30, 2023
7133782
fix: improve jsonld for product brand
tblivet Jun 30, 2023
941cab6
fix: slider loading attribute optimization
tblivet Jun 30, 2023
94f1116
fix: responsive pagination on category pages
tblivet Jun 30, 2023
9b674ea
fix: lint
tblivet Jun 30, 2023
76b884c
Merge pull request #526 from tblivet/theme-improvements
kpodemski Jul 3, 2023
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
16 changes: 8 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

name: Build ZIP File
on:
on:
pull_request:
push:
workflow_dispatch:
Expand All @@ -16,10 +16,10 @@ jobs:
- name: Setup node env
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 16

- name: Install dependencies
run: npm i
run: npm ci

- name: Copy Webpack config
run: cp ./webpack/.env-example ./webpack/.env
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
rm postcss.config.js
rm tsconfig.json
rm webpack.config.js

- name: Create & Upload artifact
uses: actions/upload-artifact@v1
with:
Expand All @@ -65,17 +65,17 @@ jobs:
uses: actions/download-artifact@v1
with:
name: ${{ github.event.repository.name }}

- id: release_info
uses: toolmantim/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Prepare for Release
run: |
cd ${{ github.event.repository.name }}
zip -r ${{ github.event.repository.name }}.zip ${{ github.event.repository.name }}

- name: Clean existing assets
shell: bash
run: |
Expand All @@ -87,7 +87,7 @@ jobs:
done
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Publish to GitHub Release
uses: actions/upload-release-asset@v1.0.1
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [14]
node: [16]

steps:
- name: Checkout
uses: actions/checkout@master

- name: Setup node env
uses: actions/setup-node@v2.1.2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}

- name: Install dependencies
run: npm i
run: npm ci

- name: Generate
run: npm run build-storybook
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ jobs:
- uses: actions/checkout@v2

- name: Setup Node
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '14.x'
node-version: 16

- name: Lint scss
run: npm install && npm run scss-lint
run: npm ci && npm run scss-lint
eslint:
name: ESLint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup Node
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '14.x'
node-version: 16

- name: Lint js
run: touch ./webpack/.env && npm install && npm run lint
run: touch ./webpack/.env && npm ci && npm run lint
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ jobs:
name: Run unit tests
strategy:
matrix:
js: [ '14' ]
js: [ '16' ]
steps:
- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.js }}

Expand All @@ -24,5 +24,5 @@ jobs:
restore-keys: ${{ runner.os }}-node-

- name: Run tests
run: npm install && npm run test
run: npm ci && npm run test
working-directory: ./
6 changes: 3 additions & 3 deletions .github/workflows/typecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
- uses: actions/checkout@v2

- name: Setup Node
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '14.x'
node-version: 16

- name: Build and check types
run: touch ./webpack/.env && npm install && npm run build
run: touch ./webpack/.env && npm ci && npm run build
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ There are few things to do before you are ready to contribute.

First you need to install every node module:

`npm i`
`npm ci`

then create a `.env` file inside the *webpack* folder by copying `webpack/.env-example` and complete it with your environment's informations. Please use a free tcp port.

Expand All @@ -35,7 +35,7 @@ then build assets:
### Good practices

- Follow the BEM convention
- Be careful about creating SCSS files in the right folder, refer to the [documentation](https://build.prestashop.com/hummingbird/) for further informations.
- Be careful about creating SCSS files in the right folder, refer to the [documentation](https://build.prestashop.com/hummingbird/) for further informations.
- When you want to submit a PR, please make sure that you ran both linters using `npm run lint-fix && npm run scss-fix` and fixed every lint issues.
- If your PR is a work in progress, make sure that you use the Github draft mode.
- Fill the PR template as much as possible, it's important to speed the process of testing, reviewing...
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Same as the PrestaShop project, you need at least **NodeJS 14.x** and **NPM 7**

First you need to install every node module:

`npm i`
`npm ci`

then create a `.env` file inside the *webpack* folder by copying `webpack/.env-example` and complete it with your environment's informations. Please use a free tcp port.

Expand All @@ -39,6 +39,6 @@ When develop is merged into master, the Storybook is delivered almost instantly

## License

This theme is released under the [Academic Free License 3.0][AFL-3.0]
This theme is released under the [Academic Free License 3.0][AFL-3.0]

[AFL-3.0]: https://opensource.org/licenses/AFL-3.0
2 changes: 1 addition & 1 deletion config/theme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ author:

meta:
compatibility:
from: 8.0.0
from: 8.1.0
to: ~

available_layouts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header px-3">
<h5 class="modal-title">{l s='Add to wishlist' d='Modules.Blockwishlist.Shop'}</h5>
<p class="h5 modal-title">{l s='Add to wishlist' d='Modules.Blockwishlist.Shop'}</p>
<button
type="button"
class="btn-close"
Expand All @@ -45,7 +45,7 @@

<div class="modal-footer">
<a @click="openNewWishlistModal" class="wishlist-add-to-new text-primary">
<i class="material-icons text-primary">add_circle_outline</i> {$newWishlistCTA}
<i class="material-icons text-primary" aria-hidden="true">add_circle_outline</i> {$newWishlistCTA}
</a>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header px-3">
<h5 class="modal-title">((title))</h5>
<p class="h5 modal-title">((title))</p>
<button
type="button"
class="btn-close"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header px-3">
<h5 class="modal-title">((modalTitle))</h5>
<p class="h5 modal-title">((modalTitle))</p>
<button
type="button"
class="btn-close"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header px-3">
<h5 class="modal-title">{l s='Sign in' d='Modules.Blockwishlist.Shop'}</h5>
<p class="h5 modal-title">{l s='Sign in' d='Modules.Blockwishlist.Shop'}</p>
<button
type="button"
class="btn-close"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header px-3">
<h5 class="modal-title">((title))</h5>
<p class="h5 modal-title">((title))</p>
<button
type="button"
class="btn-close"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header px-3">
<h5 class="modal-title">((title))</h5>
<p class="h5 modal-title">((title))</p>
<button
type="button"
class="btn-close"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<a class="col-md-6 col-lg-4{if $urls.current_url === $url} active{/if}" id="wishlist-link" href="{$url}">
<span class="link-item">
<i class="material-icons">favorite</i>
<i class="material-icons" aria-hidden="true">favorite</i>
{$wishlistsTitlePage}
</span>
</a>
4 changes: 2 additions & 2 deletions modules/productcomments/views/templates/hook/alert-modal.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h2>
<p class="h2">
<i class="material-icons {$icon}" data-icon="{$icon}"></i>
{$modal_title}
</h2>
</p>
</div>
<div class="modal-body">
<div class="row">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h2>
<p class="h2">
<i class="material-icons {$icon}" data-icon="{$icon}"></i>
{$modal_title}
</h2>
</p>
</div>
<div class="modal-body">
<div id="{$modal_id}-message">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div id="empty-product-comment" class="product-comment-list-item">
{if $post_allowed}
<button class="btn btn-primary btn-with-icon post-product-comment">
<i class="material-icons">&#xE3C9;</i>
<i class="material-icons" aria-hidden="true">&#xE3C9;</i>
{l s='Be the first to write your review' d='Modules.Productcomments.Shop'}
</button>
{else}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
{/if}
</div>
<div class="col-sm-4">
<h3>{$product.name}</h3>
<p class="h3">{$product.name}</p>
{block name='product_description_short'}
<div itemprop="description">{$product.description_short nofilter}</div>
{/block}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="row">
<div class="col-md-12 col-sm-12" id="product-comments-list-header">
<div class="comments-nb">
<i class="material-icons" data-icon="chat"></i>
<i class="material-icons" data-icon="chat" aria-hidden="true"></i>
{l s='Comments' d='Modules.Productcomments.Shop'} ({$nb_comments})
</div>
{include file='module:productcomments/views/templates/hook/average-grade-stars.tpl' grade=$average_grade}
Expand All @@ -33,7 +33,7 @@
<div id="product-comments-list-pagination"></div>
{if $post_allowed && $nb_comments != 0}
<button class="btn btn-primary btn-with-icon post-product-comment">
<i class="material-icons" data-icon="edit"></i>
<i class="material-icons" data-icon="edit" aria-hidden="true"></i>
{l s='Write your review' d='Modules.Productcomments.Shop'}
</button>
{/if}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{include file="catalog/_partials/productlist.tpl" products=$products productClass="col-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">&#xE315;</i>
{l s='All best sellers' d='Shop.Theme.Catalog'}<i class="material-icons rtl-flip" aria-hidden="true">&#xE315;</i>
</a>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
aria-haspopup="true"
aria-expanded="false">
{l s='All brands' d='Shop.Theme.Catalog'}
<i class="material-icons float-end">arrow_drop_down</i>
<i class="material-icons float-end" aria-hidden="true">arrow_drop_down</i>
</button>
<div class="dropdown-menu dropdown-menu-start">
{foreach from=$brands item=brand}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

<div class="card border-1 mb-3">
<div class="card-body">
<h4 class="h4">{l s='Payment information' d='Shop.Theme.Checkout'}</h4>
<h6 class="card-subtitle mb-3 text-muted">{l s='Pay by Check' d='Modules.Checkpayment.Shop'}</h6>
<p class="h4">{l s='Payment information' d='Shop.Theme.Checkout'}</p>
<p class="fw-bold card-subtitle mb-3 text-muted">{l s='Pay by Check' d='Modules.Checkpayment.Shop'}</p>
{if $status === 'ok'}
<p>
{l s='You have chosen payment by check.' d='Modules.Checkpayment.Shop'}<br/>
Expand Down
12 changes: 6 additions & 6 deletions modules/ps_contactinfo/ps_contactinfo-rich.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,36 @@
* file that was distributed with this source code.
*}
<div class="contact__details">
<h2 class="contact__title">{l s='Store information' d='Shop.Theme.Global'}</h4>
<p class="h2 contact__title">{l s='Store information' d='Shop.Theme.Global'}</p>
<div class="contact__item">
<i class="material-icons">&#xE55F;</i>
<i class="material-icons" aria-hidden="true">&#xE55F;</i>
<div class="contact__info">{$contact_infos.address.formatted nofilter}</div>
</div>
{if $contact_infos.phone}
<hr/>
<div class="contact__item">
<i class="material-icons">&#xE0CD;</i>
<i class="material-icons" aria-hidden="true">&#xE0CD;</i>
<div class="contact__info"><a href="tel:{$contact_infos.phone}">{$contact_infos.phone}</a></div>
</div>
{/if}
{if $contact_infos.fax}
<hr/>
<div class="contact__item">
<i class="material-icons">&#xE0DF;</i>
<i class="material-icons" aria-hidden="true">&#xE0DF;</i>
<div class="contact__info">{$contact_infos.fax}</div>
</div>
{/if}
{if $contact_infos.email && $display_email}
<hr/>
<div class="contact__item">
<i class="material-icons">&#xE158;</i>
<i class="material-icons" aria-hidden="true">&#xE158;</i>
<div class="contact__info contact__info--email">{mailto address=$contact_infos.email encode="javascript"}</div>
</div>
{/if}
{if !empty($contact_infos.details)}
<hr/>
<div class="contact__item">
<i class="material-icons">&#xE88E;</i>
<i class="material-icons" aria-hidden="true">&#xE88E;</i>
<div class="contact__info">{$contact_infos.details|nl2br nofilter}</div>
</div>
{/if}
Expand Down
Loading