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.

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

Release v1.0.1 #670

Merged
merged 108 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
f1cd766
productcomments - Make rating mandatory
leemyongpakvn Jan 24, 2024
40a2e9d
Accessibility: add "autocomplete" to the email/password fields on the…
yannicka Feb 8, 2024
34c9266
Accessibility: add some "aria-label"
yannicka Feb 8, 2024
0dc1dc7
Accessibility: add "aria-label" on search link
yannicka Feb 8, 2024
4025c22
Merge pull request #591 from yannicka/accessibility-autocomplete
Hlavtox Feb 23, 2024
733a70c
Merge pull request #592 from yannicka/accessibility-aria
Hlavtox Feb 23, 2024
782c262
Templates: double quotes => single quote (for Smarty strings)
yannicka Feb 23, 2024
7f191e7
Templates: add some spacing
yannicka Feb 23, 2024
4e285ed
Search: fix string for translation
yannicka Feb 23, 2024
a3647ed
Search: use `$search_string` instead of `$smarty.get.s`
yannicka Feb 23, 2024
fdbfebb
Merge pull request #603 from yannicka/search-translation
Hlavtox Feb 23, 2024
204533b
Merge pull request #602 from yannicka/tpl-spacing
kpodemski Feb 26, 2024
14b39b2
Merge remote-tracking branch 'upstream/develop' into tpl-quotes
yannicka Feb 26, 2024
9446868
Merge pull request #601 from yannicka/tpl-quotes
Hlavtox Feb 29, 2024
4393658
Replace "else if" by "elseif"
Klemart3D Mar 1, 2024
32fe798
Replace "else if" by "elseif"
Klemart3D Mar 1, 2024
8078593
Replace "else if" by "elseif"
Klemart3D Mar 1, 2024
898132d
Merge pull request #605 from Klemart3D/patch-1
kpodemski Mar 5, 2024
6ec8f3d
Delete product in cart when we set zero qty and submit with Enter key
boherm Mar 8, 2024
353e86b
Fix logo size
boherm Mar 8, 2024
a5f1476
Merge pull request #606 from boherm/fix-logo-size
SharakPL Mar 14, 2024
4e202d9
Merge pull request #607 from boherm/fix-zero-qty-in-cart
nicosomb Mar 15, 2024
0d083dc
Merge pull request #577 from leemyongpakvn/make_rating_mandatory
nicosomb Mar 18, 2024
8b0aa87
correct .env instruction link
leemyongpakva Mar 19, 2024
06ff161
Merge pull request #610 from leemyongpakva/correct_instruction_link
matthieu-rolland Mar 19, 2024
a3eeccb
Fix minimum qty input on products listing and product detail pages
boherm Mar 14, 2024
3186a65
Merge pull request #609 from boherm/fix-min-qty-input
nicosomb Apr 18, 2024
b1bb4a0
Overwriting productListingComments.js with the correct product selector
chrisai-dev Apr 23, 2024
0459cfd
adding missing hook configuration to the theme.yml file
chrisai-dev Apr 24, 2024
b315255
fix: incorrect address call
tblivet Apr 26, 2024
cebd520
adding missing hook configuration to the theme.yml file
chrisai-dev Apr 26, 2024
d336145
Merge pull request #620 from tblivet/fix-incorrect-address-call
Hlavtox Apr 30, 2024
f5bfd59
fix: issue-616 and issue-615
tblivet May 15, 2024
ac55b46
fix: issue-611
tblivet May 17, 2024
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
b51983a
Prepare Hummingbird to be published on Packagist
nicosomb May 20, 2024
8e1c265
Update composer.json
nicosomb May 20, 2024
0006167
Merge pull request #628 from nicosomb/prepare-hb-packagist
jolelievre May 20, 2024
1950578
fix: add download link on mobile and harmonize tags
tblivet May 20, 2024
1678cba
fix: style product price block
tblivet May 21, 2024
2c1f730
fix: improve discount table
tblivet May 21, 2024
1516c35
Merge pull request #631 from matthieu-rolland/rel-0.1.7
nicosomb May 21, 2024
f555513
overwriting the .js is no longer needer as it was fixed in the module…
chrisai-dev May 22, 2024
975579d
fix: remove zoom on modal and move zoom to allow update
tblivet May 22, 2024
eb4e115
feat: improve guest account creation option
tblivet Jun 3, 2024
2ef39b2
Merge pull request #621 from tblivet/issue-616-615
nicosomb Jun 4, 2024
15d13c0
Merge pull request #626 from tblivet/issue-611
nicosomb Jun 5, 2024
60d1e51
Merge pull request #630 from tblivet/issue-491
nicosomb Jun 5, 2024
bbd04ba
feat: add "autocomplete" on password
tblivet Jun 6, 2024
9674ff6
Merge pull request #627 from tblivet/issue-340
tblivet Jun 6, 2024
33e86ee
feat: improve variants display
tblivet Jun 6, 2024
473d247
chore: lint
tblivet Jun 6, 2024
199a5c1
Merge pull request #635 from tblivet/issue-582
tblivet Jun 6, 2024
06f4e14
Merge pull request #619 from chrisai-dev/fix-product-comments
jolelievre Jun 7, 2024
0ef2d0f
Merge pull request #636 from tblivet/issue-559
nicosomb Jun 7, 2024
251ae15
Merge pull request #634 from tblivet/issue-590
nicosomb Jun 10, 2024
88aca6c
feat: add product removal alert on cart
tblivet Jun 11, 2024
a10cba3
feat: style category tree
tblivet Jun 12, 2024
da5c836
feat: harmonize left col
tblivet Jun 12, 2024
ff7ea90
fix: escape issue + improvement
tblivet Jun 12, 2024
3a496bb
fix: update blue color on hover
tblivet Jun 12, 2024
1b64188
fix: blue color hover
tblivet Jun 12, 2024
824f925
Merge pull request #638 from tblivet/issue-522
tblivet Jun 12, 2024
3da316f
Merge pull request #639 from tblivet/issue-490
tblivet Jun 12, 2024
6ddcf78
feat: improve productcomments styles
tblivet Jun 13, 2024
554d043
fix: open modal when clicking "write your review"
tblivet Jun 17, 2024
6e9fbef
feat: handle scroll offset
tblivet Jun 17, 2024
fff3128
fix: add spacing
tblivet Jun 17, 2024
1d6a9e8
Merge pull request #640 from tblivet/issue-494
tblivet Jun 26, 2024
3491039
Merge pull request #641 from tblivet/feat/scroll_padding
tblivet Jun 26, 2024
3f34ea9
Merge pull request #632 from tblivet/issue-567
nicosomb Jun 27, 2024
57438c6
fix: listener for qtyInput in product page
boherm Jul 1, 2024
30938c0
Replace Twitter logos by X
Klemart3D Jul 1, 2024
55999f5
Merge pull request #642 from boherm/#36456-fix-qte-input-behaviour-in…
boherm Jul 1, 2024
31b651a
Merge pull request #643 from Klemart3D/develop
boherm Jul 1, 2024
632ee35
Removed .env configuration
nicosomb May 21, 2024
84455a7
Remove the exit when env file is not available
nicosomb May 31, 2024
103cdde
try to fix ui test
nicosomb Jun 4, 2024
063b4dc
Merge pull request #629 from nicosomb/remove-env-config
nicosomb Jul 4, 2024
77780e9
feat: allow multi rows on mainmenu
tblivet Jul 16, 2024
59cf998
Merge pull request #646 from tblivet/issue-637
boherm Jul 19, 2024
535f38d
Fix default no image url
jolelievre Aug 20, 2024
80e2e45
Add meta framework into theme
matks Aug 20, 2024
13fa0d9
Merge pull request #649 from matks/matks-patch-1
jolelievre Aug 20, 2024
1087868
Merge pull request #648 from jolelievre/fix-flags
jolelievre Aug 29, 2024
07fe6e1
Put back double quotes in template inclusion with var
maxime-aknin Sep 6, 2024
38694f0
Update ps_supplierlist.tpl
maxime-aknin Sep 6, 2024
a8bd473
Remove meta keywords
Hlavtox Sep 10, 2024
9b81ed2
Merge pull request #653 from Hlavtox/remove-keywords
Hlavtox Sep 12, 2024
ad3f1ae
Use category cover
Hlavtox Sep 16, 2024
60fcfee
Use category thumbnail
Hlavtox Sep 16, 2024
813304d
Merge pull request #654 from Hlavtox/prepare-thumbnails
Hlavtox Sep 17, 2024
46d0ed1
chore(deps): upgrade some packages (test for node 20)
mattgoud Sep 27, 2024
5af9481
chore: fix eslint errors, unset stylint rule selector-id-pattern, upd…
mattgoud Sep 27, 2024
d45be6b
chore: [ci/cd] - upgrade actions/upload(download)-artifact to v4
mattgoud Sep 27, 2024
5f0be62
chore: update readme (node 20 required), userPasswordPolicy.ts :delet…
mattgoud Sep 30, 2024
48a6a85
Merge pull request #655 from mattgoud/update-for-node-iron-lts
jolelievre Sep 30, 2024
573ea8b
Format availability
Hlavtox Oct 31, 2024
68fee1e
Merge pull request #652 from maxime-aknin/patch-1
kpodemski Nov 17, 2024
e4d6e20
Fixed translation domain
nicosomb Nov 29, 2024
fbb97bc
Merge pull request #663 from nicosomb/fix-domain-translation
nicosomb Nov 29, 2024
acf25ff
Fix issue #664
marsaldev Dec 2, 2024
d38b7be
Merge pull request #658 from Hlavtox/availability
Hlavtox Dec 2, 2024
a30420a
Merge pull request #665 from marsaldev/develop
Hlavtox Dec 4, 2024
d8a45d1
Bump version 1.0.1
jolelievre Jan 29, 2025
1da8227
Merge pull request #669 from jolelievre/bump-version
jolelievre Jan 29, 2025
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
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup node env
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: Install dependencies
run: npm ci
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
rm webpack.config.js

- name: Create & Upload artifact
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: ${{ github.event.repository.name }}
path: ./
Expand All @@ -62,7 +62,7 @@ jobs:
if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
steps:
- name: Download artifact
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: ${{ github.event.repository.name }}

Expand Down Expand Up @@ -96,4 +96,4 @@ jobs:
upload_url: ${{ steps.release_info.outputs.upload_url }}
asset_path: ./${{ github.event.repository.name }}/${{ github.event.repository.name }}.zip
asset_name: ${{ github.event.repository.name }}.zip
asset_content_type: application/zip
asset_content_type: application/zip
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [16]
node: [20]

steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: Lint scss
run: npm ci && npm run scss-lint
Expand All @@ -23,7 +23,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: Lint js
run: touch ./webpack/.env && npm ci && npm run lint
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
name: Run unit tests
strategy:
matrix:
js: [ '16' ]
js: [ '20' ]
steps:
- name: Setup Node
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typecheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: Build and check types
run: touch ./webpack/.env && npm ci && npm run build
2 changes: 1 addition & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
],
"customSyntax": "postcss-scss",
"rules": {
"selector-id-pattern": null,
"selector-max-id": null,
"selector-max-class": null,
"selector-max-type": null,
"selector-max-compound-selectors": null,
"selector-no-qualifying-type": null,
"selector-max-combinators": null,
"selector-class-pattern": null,
"selector-descendant-combinator-no-non-space": null,
"function-disallowed-list": null,
"scss/dollar-variable-default": null,
"property-disallowed-list": null
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This is a PrestaShop's theme we are working on. Please, if you work on this them

## How to build assets

Same as the PrestaShop project, you need at least **NodeJS 16.x** and **NPM 8** in order to build the project.
Same as the PrestaShop project, you need at least **NodeJS 20.x** and **NPM 8** in order to build the project.

First you need to install every node module:

Expand Down
21 changes: 21 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "prestashop/hummingbird",
"description": "Hummingbird theme for develop PrestaShop version",
"type": "prestashop-theme",
"license": "AFL-3.0",
"authors": [
{
"name": "PrestaShop SA",
"email": "[email protected]"
},
{
"name": "PrestaShop Community",
"homepage": "https://contributors.prestashop-project.org/"
}
],
"minimum-stability": "dev",
"require-dev": {
"symfony/yaml": "~4.4 || ^5.0 || ^6.4",
"symfony/console": "~4.4 || ^5.0 || ^6.4"
}
}
8 changes: 7 additions & 1 deletion config/theme.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: hummingbird
display_name: Hummingbird
version: 0.2.0
version: 1.0.1
author:
name: "PrestaShop Team"
email: "[email protected]"
Expand All @@ -10,6 +10,7 @@ meta:
compatibility:
from: 8.1.0
to: ~
framework: 'bootstrap-v5.2.0'

available_layouts:
layout-full-width:
Expand Down Expand Up @@ -87,6 +88,8 @@ global_settings:
- ps_customeraccountlinks
- ps_contactinfo
- blockwishlist
displayFooterProduct:
- productcomments
displayLeftColumn:
- ps_categorytree
- ps_facetedsearch
Expand All @@ -100,6 +103,9 @@ global_settings:
- ps_searchbar
displayProductAdditionalInfo:
- ps_sharebuttons
- productcomments
displayProductListReviews:
- productcomments
displayOrderConfirmation2:
- ps_featuredproducts
displayCrossSellingShoppingCart:
Expand Down
16 changes: 9 additions & 7 deletions modules/productcomments/views/templates/hook/alert-modal.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* file that was distributed with this source code.
*}

{assign var='icon' value=$icon|default:'check_circle'}
{assign var='icon' value=$icon|default:'check'}
{assign var='modal_message' value=$modal_message|default:''}

<script type="text/javascript">
Expand All @@ -19,22 +19,24 @@
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<p class="h2">
<p class="h2 mb-0">
<i class="material-icons {$icon}" data-icon="{$icon}"></i>
{$modal_title}
</p>
</div>

<div class="modal-body">
<div class="row">
<div class="col-md-12 col-sm-12" id="{$modal_id}-message">
{$modal_message}
</div>
</div>
<div class="modal-footer post-comment-buttons">
<button type="button" class="btn btn-primary" data-bs-dismiss="modal" aria-label="{l s='OK' d='Modules.Productcomments.Shop'}">
{l s='OK' d='Modules.Productcomments.Shop'}
</button>
</div>
</div>

<div class="modal-footer">
<button type="button" class="btn btn-primary" data-bs-dismiss="modal" aria-label="{l s='OK' d='Modules.Productcomments.Shop'}">
{l s='OK' d='Modules.Productcomments.Shop'}
</button>
</div>
</div>
</div>
Expand Down
22 changes: 11 additions & 11 deletions modules/productcomments/views/templates/hook/confirm-modal.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* file that was distributed with this source code.
*}

{assign var='icon' value=$icon|default:'check_circle'}
{assign var='icon' value=$icon|default:'check'}
{assign var='modal_message' value=$modal_message|default:''}

<script type="text/javascript">
Expand Down Expand Up @@ -32,20 +32,20 @@
{$modal_title}
</p>
</div>

<div class="modal-body">
<div id="{$modal_id}-message">
{$modal_message}
</div>
<div class="modal-footer">
<div class="post-comment-buttons">
<button type="button" class="btn btn-outline-primary me-2 refuse-button" data-bs-dismiss="modal" aria-label="{l s='No' d='Modules.Productcomments.Shop'}">
{l s='No' d='Modules.Productcomments.Shop'}
</button>
<button type="button" class="btn btn-primary confirm-button" data-bs-dismiss="modal" aria-label="{l s='Yes' d='Modules.Productcomments.Shop'}">
{l s='Yes' d='Modules.Productcomments.Shop'}
</button>
</div>
</div>
</div>

<div class="modal-footer">
<button type="button" class="btn btn-outline-primary me-2 refuse-button" data-bs-dismiss="modal" aria-label="{l s='No' d='Modules.Productcomments.Shop'}">
{l s='No' d='Modules.Productcomments.Shop'}
</button>
<button type="button" class="btn btn-primary confirm-button" data-bs-dismiss="modal" aria-label="{l s='Yes' d='Modules.Productcomments.Shop'}">
{l s='Yes' d='Modules.Productcomments.Shop'}
</button>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<div id="empty-product-comment" class="product-comment-list-item py-3">
{if $post_allowed}
<button class="btn btn-primary btn-with-icon post-product-comment">
<button class="btn btn-outline-primary btn-with-icon post-product-comment">
<i class="material-icons" aria-hidden="true">&#xE3C9;</i>
{l s='Be the first to write your review' d='Modules.Productcomments.Shop'}
</button>
Expand Down
Loading
Loading