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.

Sign up for GitHub

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

Jump to bottom

Merge Stage into Main #217

Merged
merged 33 commits into from
Sep 25, 2024
Merged

Merge Stage into Main #217

merged 33 commits into from
Sep 25, 2024

Conversation

fe-lix-
Copy link
Collaborator

@fe-lix- fe-lix- commented Sep 25, 2024

Please always provide the GitHub issue(s) your PR is for, as well as test URLs where your change can be observed (before and after):

Fix #

Test URLs:

miakobchuk and others added 30 commits August 6, 2024 13:36
@miakobchuk
#181 Fix styles of pet-tags/tag-quote and pet-tags/tag-select (#182)
fb0871d
@miakobchuk
hotfix for change domain
7ad2286
@miakobchuk
adding additional environment entry to config
4c4d79b
@miakobchuk
updated trusted site block
19b96ad
@miakobchuk
Menu links refactoring (#188)
7c16136 
* merge stage into main

* changed links decoration approach
@miakobchuk
PM-361
760d840
@miakobchuk
PM-361
ec80ebd
@BaDos
Merge remote-tracking branch 'refs/remotes/origin/stage' into develop
61de609 
# Conflicts:
#	blocks/footer/footer.js
#	blocks/header/header.js
#	scripts/scripts.js
@miakobchuk
updated document-based footer
4f3a98a
@miakobchuk
added x icon for footer
c646d3a
@miakobchuk
removed external icon for petmicrochiplookup.org link
dd27d15
@BaDos
Merge remote-tracking branch 'refs/remotes/origin/stage' into develop
472442a
@BaDos
Merge remote-tracking branch 'refs/remotes/origin/main' into stage
3f7a07e
@BaDos
Merge remote-tracking branch 'refs/remotes/origin/stage' into develop
433f2fd
@BaDos
Merge remote-tracking branch 'refs/remotes/origin/main' into stage
9b9a03e
@BaDos
Merge remote-tracking branch 'refs/remotes/origin/stage' into develop
941bf8c
@hero-dokane @BaDos @mikeweis
24PW: Post Purchase Thank You Page - EDS Build (#201)
ba32c40 
* Add svg icons

* Fix svg icon name

* Fix svg icon

* Fix svg icon

* Added gray column

* Added autocomplite functionality

* Added fix for autocomplite functionality

* Added validagtors for promocode and zipcode, added loader animation

* Added some validators

* Added some validators

* Handlers/validators refactoring

* enhanced for Canada

* Canadian legal and Canadian icons

* the beginning of the submit execution

* the middle of the submit execution

* the completion of the submit execution

* fix JavaScript linting

* Fix validators for subbmit button

* allow for re-entering Step 1

* Fix validators for breed input

* honor a query param of 'petId' when re-entering Step 1

* strengthen our client API

* Fix validators for zipCode and async problem

* Separate js for the first page

* Fix zip code handler

* Some part of summary-quote

* Added button "Proceed to Payment"

* Small css fixes

* Small fixes for lpm-plus

* Fixed svg classes and added the icon for lpm-plus

* Added fragments with additional info to summary page

* Added loader.js

* Small refctoring

* Move the form to form.js

* Added the form to summary page

* Remove wrong div

* Fixed icons in fragments

* Small cleaning

* Form cleaning

* Improved the chip number validator

* Added isSummaryPage

* Added isSummaryPage

* Improve loader

* Added loader to summary page

* Added isSummaryPage to the form

* Intermediate code for adding a pet on the summary page

* Fix issue with styled icons

* Added form functionality to summary page

* Added pet removing functionality to summary page

* Hide promocode field on summary page

* Fix flow id

* Fix css

* Fix css

* Fixes for CA

* Fixes for linters

* Added promo code functionality

* Fixed parameter for payment url

* Fix promo code functionality

* Fix typo

* Fix styles

* Added header with only logo

* Fix styles

* Improvments for zip code handler

* WIP on feature/post-purchase-thank-you-page

* Fix zip code handler for CA

* Promocode fixes

* Promocode fixes

* WIP on feature/post-purchase-thank-you-page

* Added minus for discount

* WIP on feature/post-purchase-thank-you-page

* WIP on feature/post-purchase-thank-you-page

* WIP on feature/post-purchase-thank-you-page

* Remove a comment

* Fixed birthday for pets

* WIP on feature/post-purchase-thank-you-page

* Fixed birthday for pets

* Fixed birthday for pets

---------

Co-authored-by: Bohdan Korablov <korablov@adobe.com>
Co-authored-by: Mike Weis <miweis@magento.com>
Co-authored-by: Mike Weis <miweis@adobe.com>
@hero-dokane @BaDos @mikeweis
24PW: Post Purchase Thank You Page - EDS Build - QA Feedback Updates (#…
ef8d162 
…203)

* Add svg icons

* Fix svg icon name

* Fix svg icon

* Fix svg icon

* Added gray column

* Added autocomplite functionality

* Added fix for autocomplite functionality

* Added validagtors for promocode and zipcode, added loader animation

* Added some validators

* Added some validators

* Handlers/validators refactoring

* enhanced for Canada

* Canadian legal and Canadian icons

* the beginning of the submit execution

* the middle of the submit execution

* the completion of the submit execution

* fix JavaScript linting

* Fix validators for subbmit button

* allow for re-entering Step 1

* Fix validators for breed input

* honor a query param of 'petId' when re-entering Step 1

* strengthen our client API

* Fix validators for zipCode and async problem

* Separate js for the first page

* Fix zip code handler

* Some part of summary-quote

* Added button "Proceed to Payment"

* Small css fixes

* Small fixes for lpm-plus

* Fixed svg classes and added the icon for lpm-plus

* Added fragments with additional info to summary page

* Added loader.js

* Small refctoring

* Move the form to form.js

* Added the form to summary page

* Remove wrong div

* Fixed icons in fragments

* Small cleaning

* Form cleaning

* Improved the chip number validator

* Added isSummaryPage

* Added isSummaryPage

* Improve loader

* Added loader to summary page

* Added isSummaryPage to the form

* Intermediate code for adding a pet on the summary page

* Fix issue with styled icons

* Added form functionality to summary page

* Added pet removing functionality to summary page

* Hide promocode field on summary page

* Fix flow id

* Fix css

* Fix css

* Fixes for CA

* Fixes for linters

* Added promo code functionality

* Fixed parameter for payment url

* Fix promo code functionality

* Fix typo

* Fix styles

* Added header with only logo

* Fix styles

* Improvments for zip code handler

* WIP on feature/post-purchase-thank-you-page

* Fix zip code handler for CA

* Promocode fixes

* Promocode fixes

* WIP on feature/post-purchase-thank-you-page

* Added minus for discount

* WIP on feature/post-purchase-thank-you-page

* WIP on feature/post-purchase-thank-you-page

* WIP on feature/post-purchase-thank-you-page

* Remove a comment

* Fixed birthday for pets

* WIP on feature/post-purchase-thank-you-page

* Fixed birthday for pets

* Fixed birthday for pets

* QA feedback updates

* Fix lint issue

---------

Co-authored-by: Bohdan Korablov <korablov@adobe.com>
Co-authored-by: Mike Weis <miweis@magento.com>
Co-authored-by: Mike Weis <miweis@adobe.com>
@hero-dokane @BaDos @mikeweis
24PW: Post Purchase Thank You Page - EDS Build - QA Feedback Updates (#…
dc21b70 
…204)

* Add svg icons

* Fix svg icon name

* Fix svg icon

* Fix svg icon

* Added gray column

* Added autocomplite functionality

* Added fix for autocomplite functionality

* Added validagtors for promocode and zipcode, added loader animation

* Added some validators

* Added some validators

* Handlers/validators refactoring

* enhanced for Canada

* Canadian legal and Canadian icons

* the beginning of the submit execution

* the middle of the submit execution

* the completion of the submit execution

* fix JavaScript linting

* Fix validators for subbmit button

* allow for re-entering Step 1

* Fix validators for breed input

* honor a query param of 'petId' when re-entering Step 1

* strengthen our client API

* Fix validators for zipCode and async problem

* Separate js for the first page

* Fix zip code handler

* Some part of summary-quote

* Added button "Proceed to Payment"

* Small css fixes

* Small fixes for lpm-plus

* Fixed svg classes and added the icon for lpm-plus

* Added fragments with additional info to summary page

* Added loader.js

* Small refctoring

* Move the form to form.js

* Added the form to summary page

* Remove wrong div

* Fixed icons in fragments

* Small cleaning

* Form cleaning

* Improved the chip number validator

* Added isSummaryPage

* Added isSummaryPage

* Improve loader

* Added loader to summary page

* Added isSummaryPage to the form

* Intermediate code for adding a pet on the summary page

* Fix issue with styled icons

* Added form functionality to summary page

* Added pet removing functionality to summary page

* Hide promocode field on summary page

* Fix flow id

* Fix css

* Fix css

* Fixes for CA

* Fixes for linters

* Added promo code functionality

* Fixed parameter for payment url

* Fix promo code functionality

* Fix typo

* Fix styles

* Added header with only logo

* Fix styles

* Improvments for zip code handler

* WIP on feature/post-purchase-thank-you-page

* Fix zip code handler for CA

* Promocode fixes

* Promocode fixes

* WIP on feature/post-purchase-thank-you-page

* Added minus for discount

* WIP on feature/post-purchase-thank-you-page

* WIP on feature/post-purchase-thank-you-page

* WIP on feature/post-purchase-thank-you-page

* Remove a comment

* Fixed birthday for pets

* WIP on feature/post-purchase-thank-you-page

* Fixed birthday for pets

* Fixed birthday for pets

* QA feedback updates

* Fix lint issue

* QA feedback updates

---------

Co-authored-by: Bohdan Korablov <korablov@adobe.com>
Co-authored-by: Mike Weis <miweis@magento.com>
Co-authored-by: Mike Weis <miweis@adobe.com>
@BaDos
Fixes for the form issues (#205)
f155c78
@hero-dokane @BaDos @mikeweis
Feature/post purchase thank you page (#206)
d06bf4d 
* Add svg icons

* Fix svg icon name

* Fix svg icon

* Fix svg icon

* Added gray column

* Added autocomplite functionality

* Added fix for autocomplite functionality

* Added validagtors for promocode and zipcode, added loader animation

* Added some validators

* Added some validators

* Handlers/validators refactoring

* enhanced for Canada

* Canadian legal and Canadian icons

* the beginning of the submit execution

* the middle of the submit execution

* the completion of the submit execution

* fix JavaScript linting

* Fix validators for subbmit button

* allow for re-entering Step 1

* Fix validators for breed input

* honor a query param of 'petId' when re-entering Step 1

* strengthen our client API

* Fix validators for zipCode and async problem

* Separate js for the first page

* Fix zip code handler

* Some part of summary-quote

* Added button "Proceed to Payment"

* Small css fixes

* Small fixes for lpm-plus

* Fixed svg classes and added the icon for lpm-plus

* Added fragments with additional info to summary page

* Added loader.js

* Small refctoring

* Move the form to form.js

* Added the form to summary page

* Remove wrong div

* Fixed icons in fragments

* Small cleaning

* Form cleaning

* Improved the chip number validator

* Added isSummaryPage

* Added isSummaryPage

* Improve loader

* Added loader to summary page

* Added isSummaryPage to the form

* Intermediate code for adding a pet on the summary page

* Fix issue with styled icons

* Added form functionality to summary page

* Added pet removing functionality to summary page

* Hide promocode field on summary page

* Fix flow id

* Fix css

* Fix css

* Fixes for CA

* Fixes for linters

* Added promo code functionality

* Fixed parameter for payment url

* Fix promo code functionality

* Fix typo

* Fix styles

* Added header with only logo

* Fix styles

* Improvments for zip code handler

* WIP on feature/post-purchase-thank-you-page

* Fix zip code handler for CA

* Promocode fixes

* Promocode fixes

* WIP on feature/post-purchase-thank-you-page

* Added minus for discount

* WIP on feature/post-purchase-thank-you-page

* WIP on feature/post-purchase-thank-you-page

* WIP on feature/post-purchase-thank-you-page

* Remove a comment

* Fixed birthday for pets

* WIP on feature/post-purchase-thank-you-page

* Fixed birthday for pets

* Fixed birthday for pets

* QA feedback updates

* Fix lint issue

* QA feedback updates

* QA feedback updates

---------

Co-authored-by: Bohdan Korablov <korablov@adobe.com>
Co-authored-by: Mike Weis <miweis@magento.com>
Co-authored-by: Mike Weis <miweis@adobe.com>
@BaDos
Sync develop into stage (#207)
9217777
@hero-dokane
24PW: Membership V2 Paid Page - EDS Build (#208)
9c7dc18 
* WIP on feature/membership-v2-paid-page

* WIP on feature/membership-v2-paid-page

* WIP on feature/membership-v2-paid-page

* WIP on feature/membership-v2-paid-page

* Datalayer updates for feature/membership-v2-paid-page

* Datalayer updates for feature/membership-v2-paid-page

* Fix lint issues on feature/membership-v2-paid-page
@hero-dokane
24PW: Membership V2 Paid Page - QA Updates (#209)
e386258 
* WIP on feature/membership-v2-paid-page

* WIP on feature/membership-v2-paid-page

* WIP on feature/membership-v2-paid-page

* WIP on feature/membership-v2-paid-page

* Datalayer updates for feature/membership-v2-paid-page

* Datalayer updates for feature/membership-v2-paid-page

* Fix lint issues on feature/membership-v2-paid-page

* QA feedback updates on feature/membership-v2-paid-page

* QA feedback updates on feature/membership-v2-paid-page
@hero-dokane
Add page /paid/lost-pet-protection (#194)
9dc8710 
* WIP on feature/lost-pet-protection-paid-page

* WIP on feature/lost-pet-protection-paid-page

* WIP on feature/lost-pet-protection-paid-page

* WIP on feature/lost-pet-protection-paid-page

* WIP on feature/lost-pet-protection-paid-page
@hero-dokane
24PW: Membership V2 Paid Page - QA Updates (#211)
1f49990 
* WIP on feature/membership-v2-paid-page

* WIP on feature/membership-v2-paid-page

* WIP on feature/membership-v2-paid-page

* WIP on feature/membership-v2-paid-page

* Datalayer updates for feature/membership-v2-paid-page

* Datalayer updates for feature/membership-v2-paid-page

* Fix lint issues on feature/membership-v2-paid-page

* QA feedback updates on feature/membership-v2-paid-page

* QA feedback updates on feature/membership-v2-paid-page

* QA feedback updates on feature/membership-v2-paid-page

* QA feedback updates on feature/membership-v2-paid-page
@BaDos
Fix config matching (#212)
95c0d6b
@BaDos
Merge remote-tracking branch 'origin/stage' into develop
510df5e
@hero-dokane
24PW: Lost Pet Recovery Paid Page - EDS Build (#210)
866cd49 
* WIP on feature/lost-pet-recovery-paid-page

* WIP on feature/lost-pet-recovery-paid-page

* WIP on feature/lost-pet-recovery-paid-page

* WIP on feature/lost-pet-recovery-paid-page

* Fix lint issue
@BaDos
Sync develop into stage (#213)
d53e374
@aem-code-sync AEM Code Sync
Copy link

aem-code-sync bot commented Sep 25, 2024

Hello, I'm the AEM Code Sync Bot and I will run some actions to deploy your branch and validate page speed.
In case there are problems, just click a checkbox below to rerun the respective action.

  • Re-run PSI checks
  • Re-sync branch
Commits

@fe-lix- fe-lix- changed the title Stage Merge Stage into Main Sep 25, 2024
@aem-code-sync AEM Code Sync
Copy link

aem-code-sync bot commented Sep 25, 2024

Page Scores Audits Google
📱 / PERFORMANCE A11Y SEO BEST PRACTICES SI FCP LCP TBT CLS PSI
🖥️ / PERFORMANCE A11Y SEO BEST PRACTICES SI FCP LCP TBT CLS PSI

@fe-lix-
Copy link
Collaborator Author

fe-lix- commented Sep 25, 2024

Approved wiht customer on the call.

@fe-lix- fe-lix- merged commit 9b6a1be into main Sep 25, 2024
1 of 2 checks passed
@fe-lix- fe-lix- deleted the stage branch September 25, 2024 14:15
@fe-lix- fe-lix- restored the stage branch September 25, 2024 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BaDos BaDos BaDos approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@fe-lix- @BaDos @miakobchuk @hero-dokane