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 0.2.0 #600

Merged
merged 72 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from 70 commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
fdafdc4
Preload material icons, allow to preload other fonts
Oksydan Jan 8, 2023
6153048
Removed unused var
Oksydan Jan 9, 2023
7806eb8
package-lock update
Oksydan Apr 3, 2023
6472545
Swiper dependencies removed
Oksydan May 8, 2023
487a768
Bump version to 0.1.6
Hlavtox Jul 20, 2023
6a17a18
Merge pull request #530 from PrestaShop/Hlavtox-patch-2
Hlavtox Jul 20, 2023
81522f2
Do not truncate store day
Hlavtox Jul 25, 2023
3fd702b
Merge pull request #532 from Hlavtox/truncatestore
Hlavtox Jul 27, 2023
bad22db
feat: edit payment option to work with ps_checkout
tblivet Jul 28, 2023
b743a1b
fix: remove ps_checkout specific rules
tblivet Jul 31, 2023
4fccbaa
Merge pull request #427 from Oksydan/preload-material-icons-font
kpodemski Jul 31, 2023
34fe1bc
Merge pull request #533 from tblivet/payment_option_ps_checkout
nicosomb Aug 4, 2023
7dad1c6
fix: issue 535
tblivet Aug 8, 2023
81e8204
fix: issue 534
tblivet Aug 8, 2023
482bc85
fix: delete cart product when click on minus
tblivet Aug 10, 2023
87a5d9e
fix: issue 540
tblivet Aug 10, 2023
158dbe5
Merge pull request #538 from tblivet/issue-535
Hlavtox Aug 10, 2023
d74b09d
Merge pull request #539 from tblivet/issue-534
jolelievre Aug 10, 2023
04eee2d
fix: remove compiled file
tblivet Aug 25, 2023
fd55b60
fix: input change on cart qty below 1
tblivet Aug 31, 2023
a4bd5ce
refacto: remove console log
tblivet Aug 31, 2023
fd439cc
chore: lint
tblivet Aug 31, 2023
b6c0f6b
Add classes to make menu elements tall as parent
rodriciru Sep 5, 2023
6b1f899
feat: change qty input min and value t o match with minimal quantity
ga-devfront Sep 6, 2023
614edd4
Apply suggestions from tblivet
rodriciru Sep 7, 2023
e669588
Merge pull request #542 from tblivet/issue-536
nicosomb Sep 7, 2023
8fbbb22
fix: change selector map object
ga-devfront Sep 7, 2023
c08088d
Merge pull request #541 from tblivet/issue-540
ga-devfront Sep 7, 2023
3136aa0
Merge pull request #548 from PrestaShop/ticket_545/fix_product_card_m…
nicosomb Sep 8, 2023
4f112be
Merge pull request #547 from rodriciru/FixMenuDropdownLargeLogo
nicosomb Sep 12, 2023
d53be35
fix: multiple slider update on facetsearch
tblivet Sep 28, 2023
9367e34
Improve accessibilites
pawelkierklo Sep 30, 2023
70c54c1
Merge pull request #552 from pawelkierklo/develop
matthieu-rolland Oct 4, 2023
5e17e46
feat: add 2 old hooks
tblivet Oct 17, 2023
fe47af7
Merge pull request #556 from tblivet/issue-555
ga-devfront Oct 18, 2023
5a2401b
Fixed OLD urls
nicosomb Oct 20, 2023
986d1a2
Merge pull request #557 from PrestaShop/fixed-url
matks Oct 20, 2023
a67ebe8
Change pager scrolling behaviour, Fixes #562
tswfi Nov 28, 2023
32cf0d0
Be consistent in mobile view for product listing one by line / two by…
tswfi Nov 28, 2023
ead8f3b
lint
tswfi Nov 28, 2023
6fe6641
Merge pull request #566 from tswfi/consistent_columns_for_product_list
nicosomb Dec 1, 2023
4a29900
use querySelector and listTop
tswfi Dec 5, 2023
0d48b07
fix: productcomments
tblivet Dec 15, 2023
9903af4
Fix: Separate product reference and manufacturer
dennispw Dec 19, 2023
fc229a1
Add 'Back to Home page' button on not-found page, fixes #554
tswfi Dec 20, 2023
c08fd4c
Usability improvements for search widget
tswfi Dec 20, 2023
5f2af06
lint
tswfi Dec 20, 2023
3a39582
add psgdpr displayCustomerAccount, fixes #525
tswfi Dec 20, 2023
a41001b
Merge pull request #573 from tswfi/add_psgdpr
SharakPL Jan 2, 2024
eae37ec
Update templates/catalog/_partials/product-details.tpl
dennispw Jan 2, 2024
5bf760d
Merge pull request #570 from dennispw/fix-prod-manu-ref
SharakPL Jan 4, 2024
562f517
Merge pull request #571 from tswfi/back_to_index_btn_on_not_found_page
boherm Jan 4, 2024
3d20f3e
Merge pull request #572 from tswfi/search_icon_click_focus_on_search_…
boherm Jan 4, 2024
6711c8b
Merge pull request #550 from tblivet/fix/facetsearch
nicosomb Jan 4, 2024
ec089f5
Merge pull request #568 from tblivet/fix/productcomments
nicosomb Jan 4, 2024
8412f7a
Merge pull request #565 from tswfi/pager_scroll_to_top_of_products
nicosomb Jan 30, 2024
7e89658
Fix <img > ending on order-confirmation-table.tpl
sharkooon Jan 30, 2024
2262c67
Merge pull request #583 from sharkooon/patch-1
Hlavtox Jan 30, 2024
7d37dfd
fix missing add to wishlist button
SharakPL Jan 31, 2024
547aa41
remove extra whitespaces
SharakPL Feb 1, 2024
d602e92
fix backdrop, remove literals
SharakPL Feb 1, 2024
98928f3
Address card: add border
yannicka Feb 2, 2024
9bd3873
Checkout address card: avoid border jump on select
yannicka Feb 2, 2024
240c711
Checkout address card: border with the same gray as in the account
yannicka Feb 2, 2024
5f313f0
refactor: changed lazyloading with fetchpriority
buggyzap Feb 5, 2024
5d33762
Merge pull request #584 from SharakPL/fix-blockwishlist
SharakPL Feb 6, 2024
5c2490c
Merge pull request #585 from yannicka/address-border
boherm Feb 7, 2024
00320b5
Merge pull request #587 from buggyzap/patch-1
Hlavtox Feb 9, 2024
a02d6e4
Bump version
Hlavtox Feb 22, 2024
4e8c8fd
Merge pull request #597 from Hlavtox/bump-version
matthieu-rolland Feb 22, 2024
51d40ba
Fixed version for nodeJS and npm
nicosomb May 17, 2024
cd74796
Bump to 0.2.0
nicosomb May 20, 2024
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
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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

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-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...
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
3 changes: 2 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.1.5
version: 0.1.7
author:
name: "PrestaShop Team"
email: "[email protected]"
Expand Down Expand Up @@ -59,6 +59,7 @@ global_settings:
- blockwishlist
displayCustomerAccount:
- blockwishlist
- psgdpr
displayMyAccountBlock:
- blockwishlist
displayNav1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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">
Expand All @@ -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>
24 changes: 7 additions & 17 deletions modules/blockwishlist/views/templates/components/modals/create.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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">
Expand All @@ -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>
26 changes: 8 additions & 18 deletions modules/blockwishlist/views/templates/components/modals/delete.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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>
22 changes: 6 additions & 16 deletions modules/blockwishlist/views/templates/components/modals/login.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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>
Expand All @@ -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>
24 changes: 7 additions & 17 deletions modules/blockwishlist/views/templates/components/modals/rename.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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">
Expand All @@ -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>
24 changes: 7 additions & 17 deletions modules/blockwishlist/views/templates/components/modals/share.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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">
Expand All @@ -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>
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{**
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*}

{if $nb_comments != 0}
<div class="comments-note">
<div class="grade-stars" data-grade="{$grade}"></div>
{if isset($showNbComments) && $showNbComments}
<div class="comments-number">({$nb_comments})</div>
{elseif isset($showGradeAverage) && $showGradeAverage}
<div class="average-grade">({$grade|number_format:1})</div>
{/if}
</div>
{/if}
Loading
Loading