Skip to content

Commit

Permalink
Merge pull request #528 from PrestaShop/develop
Browse files Browse the repository at this point in the history
Release 0.1.6
  • Loading branch information
Hlavtox authored Jul 20, 2023
2 parents f9839bf + 76b884c commit 484309c
Show file tree
Hide file tree
Showing 138 changed files with 39,457 additions and 30,675 deletions.
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/[email protected]
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

0 comments on commit 484309c

Please sign in to comment.