Merge pull request #670 from PrestaShop/develop

Release v1.0.1
PrestaShop · Jan 29, 2025 · f66bc52 · f66bc52
2 parents f80683a + 1da8227
commit f66bc52
Show file tree

Hide file tree

Showing 155 changed files with 27,507 additions and 53,992 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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
@@ -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: ./
@@ -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 }}
 
@@ -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
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node: [16]
+        node: [20]
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -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
@@ -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
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -6,7 +6,7 @@ jobs:
     name: Run unit tests
     strategy:
       matrix:
-        js: [ '16' ]
+        js: [ '20' ]
     steps:
       - name: Setup Node
         uses: actions/setup-node@v3

diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
@@ -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
diff --git a/.stylelintrc b/.stylelintrc
@@ -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

diff --git a/README.md b/README.md
@@ -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:
 

diff --git a/composer.json b/composer.json
@@ -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"
+  }
+}
diff --git a/config/theme.yml b/config/theme.yml
@@ -1,6 +1,6 @@
 name: hummingbird
 display_name: Hummingbird
-version: 0.2.0
+version: 1.0.1
 author:
   name: "PrestaShop Team"
   email: "[email protected]"
@@ -10,6 +10,7 @@ meta:
   compatibility:
       from: 8.1.0
       to: ~
+      framework: 'bootstrap-v5.2.0'
 
   available_layouts:
     layout-full-width:
@@ -87,6 +88,8 @@ global_settings:
         - ps_customeraccountlinks
         - ps_contactinfo
         - blockwishlist
+      displayFooterProduct:
+        - productcomments
       displayLeftColumn:
         - ps_categorytree
         - ps_facetedsearch
@@ -100,6 +103,9 @@ global_settings:
         - ps_searchbar
       displayProductAdditionalInfo:
         - ps_sharebuttons
+        - productcomments
+      displayProductListReviews:
+        - productcomments
       displayOrderConfirmation2:
         - ps_featuredproducts
       displayCrossSellingShoppingCart:

diff --git a/modules/productcomments/views/templates/hook/alert-modal.tpl b/modules/productcomments/views/templates/hook/alert-modal.tpl
@@ -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">
@@ -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>

diff --git a/modules/productcomments/views/templates/hook/confirm-modal.tpl b/modules/productcomments/views/templates/hook/confirm-modal.tpl
@@ -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">
@@ -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>

diff --git a/modules/productcomments/views/templates/hook/empty-product-comment.tpl b/modules/productcomments/views/templates/hook/empty-product-comment.tpl
@@ -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>