Merge pull request #600 from matthieu-rolland/rel-0.1.7

Release 0.2.0

Author: nicosomb

CONTRIBUTING.md

@@ -3,9 +3,9 @@
 ### Understanding
 
 Before getting started, you should read our article introducing the project:
-[We're Building A Starter Theme For PrestaShop 1.7.8 and 8](https://build.prestashop.com/news/new-theme-announce/).
+[We're Building A Starter Theme For PrestaShop 1.7.8 and 8](https://build.prestashop-project.org/news/2022/new-theme-announce/).
 
-If you are contributing to this theme, you are probably interested in PrestaShop development as well. Please the following article to get familiar with [PrestaShop branching model](http://build.prestashop.com/news/introducing-new-branching-model-prestashop/).
+If you are contributing to this theme, you are probably interested in PrestaShop development as well. Please the following article to get familiar with [PrestaShop branching model](https://build.prestashop-project.org/news/2015/introducing-new-branching-model-prestashop/).
 
 You got any questions ? Join the open source slack.
 
@@ -15,10 +15,10 @@ You got any questions ? Join the open source slack.
 
 There are few things to do before you are ready to contribute.
 
-1. Check your _Git_ configuration. Read [Set Up Your Git For Contributing](http://build.prestashop.com/howtos/misc/set-up-your-git-for-contributing/)
+1. Check your _Git_ configuration. Read [Set Up Your Git For Contributing](https://build.prestashop-project.org/howtos/misc/set-up-your-git-for-contributing/)
 2. Check your editor configuration. The rules are defined in `.editorconfig`. Do it manually or [install the available plugin](http://editorconfig.org/#download).
 3. Make sure you at least have [NodeJS 14](https://nodejs.org/en/download/) installed.
-4. You should install the theme inside a PrestaShop instance, please refer to [the developers docummentation of the project](https://devdocs.prestashop.com/1.7/basics/installation/).
+4. You should install the theme inside a PrestaShop instance, please refer to [the developers docummentation of the project](https://devdocs.prestashop-project.org/1.7/basics/installation/).
 
 ### How to build the theme
 
@@ -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-project.org/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...

README.md

@@ -1,6 +1,6 @@
 # Hummingbird theme
 
-This is a PrestaShop's theme we are working on. Please, if you work on this theme, use the `8.0.x` branch of PrestaShop to make sure this theme is compatible with the latest `8.x` version.
+This is a PrestaShop's theme we are working on. Please, if you work on this theme, use the `8.1.x` branch of PrestaShop to make sure this theme is compatible with the latest `8.1.x` version.
 
 [Read more](https://build.prestashop.com/news/new-theme-announce/) about this theme on the blog.
 
@@ -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 14.x** and **NPM 7** in order to build the project.
+Same as the PrestaShop project, you need at least **NodeJS 16.x** and **NPM 8** in order to build the project.
 
 First you need to install every node module:
 

config/theme.yml

@@ -1,6 +1,6 @@
-name: hummingbird 
+name: hummingbird
 display_name: Hummingbird
-version: 0.1.5
+version: 0.2.0
 author:
   name: "PrestaShop Team"
   email: "pub@prestashop.com"
@@ -59,6 +59,7 @@ global_settings:
         - blockwishlist
       displayCustomerAccount:
         - blockwishlist
+        - psgdpr
       displayMyAccountBlock:
         - blockwishlist
       displayNav1:

modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl

@@ -9,9 +9,7 @@
 >
   <div
     class="wishlist-modal modal fade"
-    {literal}
-      :class="{show: !isHidden}"
-    {/literal}
+    :class="{ldelim}show: !isHidden{rdelim}"
     tabindex="-1"
     role="dialog"
     aria-modal="true"
@@ -26,8 +24,7 @@
             @click="toggleModal"
             data-dismiss="modal"
             aria-label="{l s='Close' d='Modules.Blockwishlist.Shop'}"
-          >
-          </button>
+          ></button>
         </div>
 
         <div class="modal-body">
@@ -39,24 +36,20 @@
             url="{$url}"
             add-url="{$addUrl}"
             empty-text="{l s='No list found.' d='Modules.Blockwishlist.Shop'}"
-          >
-          </choose-list>
+          ></choose-list>
         </div>
 
         <div class="modal-footer">
-          <a @click="openNewWishlistModal" class="wishlist-add-to-new text-primary">
+          <div role="button" @click="openNewWishlistModal" class="wishlist-add-to-new text-primary">
             <i class="material-icons text-primary" aria-hidden="true">add_circle_outline</i> {$newWishlistCTA}
-          </a>
+          </div>
         </div>
       </div>
     </div>
   </div>
 
-  <div 
+  <div
     class="modal-backdrop fade"
-    {literal}
-      :class="{in: !isHidden}"
-    {/literal}
-  >
-  </div>
+    :class="{ldelim}show: !isHidden{rdelim}"
+  ></div>
 </div>

modules/blockwishlist/views/templates/components/modals/create.tpl

@@ -15,9 +15,7 @@
 >
   <div
     class="wishlist-modal modal fade"
-    {literal}
-      :class="{show: !isHidden}"
-    {/literal}
+    :class="{ldelim}show: !isHidden{rdelim}"
     tabindex="-1"
     role="dialog"
     aria-modal="true"
@@ -32,8 +30,7 @@
             @click="toggleModal"
             data-dismiss="modal"
             aria-label="Close"
-          >
-          </button>
+          ></button>
         </div>
         <div class="modal-body">
           <div class="form-group form-group-lg">
@@ -53,27 +50,20 @@
             class="modal-cancel btn btn-secondary"
             data-dismiss="modal"
             @click="toggleModal"
-          >
-            ((cancelText))
-          </button>
+          >((cancelText))</button>
 
           <button
             type="button"
             class="btn btn-primary"
             @click="createWishlist"
-          >
-            ((createText))
-          </button>
+          >((createText))</button>
         </div>
       </div>
     </div>
   </div>
 
-  <div 
+  <div
     class="modal-backdrop fade"
-    {literal}
-      :class="{in: !isHidden}"
-    {/literal}
-  >
-  </div>
+    :class="{ldelim}show: !isHidden{rdelim}"
+  ></div>
 </div>

modules/blockwishlist/views/templates/components/modals/delete.tpl

@@ -20,9 +20,7 @@
 >
   <div
     class="wishlist-modal modal fade"
-    {literal}
-      :class="{show: !isHidden}"
-    {/literal}
+    :class="{ldelim}show: !isHidden{rdelim}"
     tabindex="-1"
     role="dialog"
     aria-modal="true"
@@ -37,39 +35,31 @@
             @click="toggleModal"
             data-dismiss="modal"
             aria-label="Close"
-          >
-          </button>
+          ></button>
         </div>
         <div class="modal-body" v-if="productId">
-          <p class="modal-text">((confirmMessage))</p> 
+          <p class="modal-text">((confirmMessage))</p>
         </div>
         <div class="modal-footer">
           <button
             type="button"
             class="modal-cancel btn btn-secondary"
             data-dismiss="modal"
             @click="toggleModal"
-          >
-            ((cancelText))
-          </button>
+          >((cancelText))</button>
 
           <button
             type="button"
             class="btn btn-primary"
             @click="deleteWishlist"
-          >
-            ((modalDeleteText))
-          </button>
+          >((modalDeleteText))</button>
         </div>
       </div>
     </div>
   </div>
 
-  <div 
+  <div
     class="modal-backdrop fade"
-    {literal}
-      :class="{in: !isHidden}"
-    {/literal}
-  >
-  </div>
+    :class="{ldelim}show: !isHidden{rdelim}"
+  ></div>
 </div>

modules/blockwishlist/views/templates/components/modals/login.tpl

@@ -10,9 +10,7 @@
 >
   <div
     class="wishlist-modal modal fade"
-    {literal}
-      :class="{show: !isHidden}"
-    {/literal}
+    :class="{ldelim}show: !isHidden{rdelim}"
     tabindex="-1"
     role="dialog"
     aria-modal="true"
@@ -27,8 +25,7 @@
             @click="toggleModal"
             data-dismiss="modal"
             aria-label="Close"
-          >
-          </button>
+          ></button>
         </div>
         <div class="modal-body">
           <p class="modal-text">{l s='You need to be logged in to save products in your wishlist.' d='Modules.Blockwishlist.Shop'}</p>
@@ -39,26 +36,19 @@
             class="modal-cancel btn btn-secondary"
             data-dismiss="modal"
             @click="toggleModal"
-          >
-            ((cancelText))
-          </button>
+          >((cancelText))</button>
 
           <a
             class="btn btn-primary"
             :href="prestashop.urls.pages.authentication"
-          >
-            ((loginText))
-          </a>
+          >((loginText))</a>
         </div>
       </div>
     </div>
   </div>
 
   <div
     class="modal-backdrop fade"
-    {literal}
-      :class="{in: !isHidden}"
-    {/literal}
-  >
-  </div>
+    :class="{ldelim}show: !isHidden{rdelim}"
+  ></div>
 </div>

modules/blockwishlist/views/templates/components/modals/rename.tpl

@@ -14,9 +14,7 @@
 >
   <div
     class="wishlist-modal modal fade"
-    {literal}
-      :class="{show: !isHidden}"
-    {/literal}
+    :class="{ldelim}show: !isHidden{rdelim}"
     tabindex="-1"
     role="dialog"
     aria-modal="true"
@@ -31,8 +29,7 @@
             @click="toggleModal"
             data-dismiss="modal"
             aria-label="Close"
-          >
-          </button>
+          ></button>
         </div>
         <div class="modal-body">
           <div class="form-group form-group-lg">
@@ -51,26 +48,19 @@
             class="modal-cancel btn btn-secondary"
             data-dismiss="modal"
             @click="toggleModal"
-          >
-            ((cancelText))
-          </button>
+          >((cancelText))</button>
           <button
             type="button"
             class="btn btn-primary"
             @click="renameWishlist"
-          >
-            ((renameText))
-          </button>
+          >((renameText))</button>
         </div>
       </div>
     </div>
   </div>
 
-  <div 
+  <div
     class="modal-backdrop fade"
-    {literal}
-      :class="{in: !isHidden}"
-    {/literal}
-  >
-  </div>
+    :class="{ldelim}show: !isHidden{rdelim}"
+  ></div>
 </div>

modules/blockwishlist/views/templates/components/modals/share.tpl

@@ -14,9 +14,7 @@
 >
   <div
     class="wishlist-modal modal fade"
-    {literal}
-      :class="{show: !isHidden}"
-    {/literal}
+    :class="{ldelim}show: !isHidden{rdelim}"
     tabindex="-1"
     role="dialog"
     aria-modal="true"
@@ -31,8 +29,7 @@
             @click="toggleModal"
             data-dismiss="modal"
             aria-label="Close"
-          >
-          </button>
+          ></button>
         </div>
         <div class="modal-body">
           <div class="form-group form-group-lg">
@@ -52,27 +49,20 @@
             class="modal-cancel btn btn-secondary"
             data-dismiss="modal"
             @click="toggleModal"
-          >
-            ((cancelText))
-          </button>
+          >((cancelText))</button>
 
           <button
             type="button"
             class="btn btn-primary"
             @click="copyLink"
-          >
-            (( actionText ))
-          </button>
+          >(( actionText ))</button>
         </div>
       </div>
     </div>
   </div>
 
-  <div 
+  <div
     class="modal-backdrop fade"
-    {literal}
-      :class="{in: !isHidden}"
-    {/literal}
-  >
-  </div>
+    :class="{ldelim}show: !isHidden{rdelim}"
+  ></div>
 </div>