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

Merge Stage into Main #228

Open
wants to merge 37 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
fb0871d
#181 Fix styles of pet-tags/tag-quote and pet-tags/tag-select (#182)
miakobchuk Aug 6, 2024
7ad2286
hotfix for change domain
miakobchuk Aug 7, 2024
4c4d79b
adding additional environment entry to config
miakobchuk Aug 8, 2024
19b96ad
updated trusted site block
miakobchuk Aug 8, 2024
7c16136
Menu links refactoring (#188)
miakobchuk Aug 9, 2024
760d840
PM-361
miakobchuk Aug 13, 2024
ec80ebd
PM-361
miakobchuk Aug 13, 2024
61de609
Merge remote-tracking branch 'refs/remotes/origin/stage' into develop
BaDos Aug 14, 2024
4f3a98a
updated document-based footer
miakobchuk Aug 16, 2024
c646d3a
added x icon for footer
miakobchuk Aug 16, 2024
dd27d15
removed external icon for petmicrochiplookup.org link
miakobchuk Aug 16, 2024
472442a
Merge remote-tracking branch 'refs/remotes/origin/stage' into develop
BaDos Aug 22, 2024
3f7a07e
Merge remote-tracking branch 'refs/remotes/origin/main' into stage
BaDos Aug 30, 2024
433f2fd
Merge remote-tracking branch 'refs/remotes/origin/stage' into develop
BaDos Aug 30, 2024
9b9a03e
Merge remote-tracking branch 'refs/remotes/origin/main' into stage
BaDos Sep 10, 2024
941bf8c
Merge remote-tracking branch 'refs/remotes/origin/stage' into develop
BaDos Sep 10, 2024
ba32c40
24PW: Post Purchase Thank You Page - EDS Build (#201)
hero-dokane Sep 11, 2024
ef8d162
24PW: Post Purchase Thank You Page - EDS Build - QA Feedback Updates …
hero-dokane Sep 12, 2024
dc21b70
24PW: Post Purchase Thank You Page - EDS Build - QA Feedback Updates …
hero-dokane Sep 13, 2024
f155c78
Fixes for the form issues (#205)
BaDos Sep 16, 2024
d06bf4d
Feature/post purchase thank you page (#206)
hero-dokane Sep 16, 2024
9217777
Sync develop into stage (#207)
BaDos Sep 16, 2024
9c7dc18
24PW: Membership V2 Paid Page - EDS Build (#208)
hero-dokane Sep 17, 2024
e386258
24PW: Membership V2 Paid Page - QA Updates (#209)
hero-dokane Sep 17, 2024
9dc8710
Add page /paid/lost-pet-protection (#194)
hero-dokane Sep 18, 2024
1f49990
24PW: Membership V2 Paid Page - QA Updates (#211)
hero-dokane Sep 18, 2024
95c0d6b
Fix config matching (#212)
BaDos Sep 18, 2024
510df5e
Merge remote-tracking branch 'origin/stage' into develop
BaDos Sep 18, 2024
866cd49
24PW: Lost Pet Recovery Paid Page - EDS Build (#210)
hero-dokane Sep 18, 2024
d53e374
Sync develop into stage (#213)
BaDos Sep 18, 2024
909c0f5
Sync develop into stage (#213) (#214)
BaDos Sep 18, 2024
9f26a83
Fix css (#216)
BaDos Sep 25, 2024
510aede
Merge branch 'develop' into stage
fe-lix- Sep 25, 2024
c1a242e
Merge remote-tracking branch 'origin/main' into stage
BaDos Oct 3, 2024
316c81e
Sync develop into stage (#220)
hero-dokane Oct 4, 2024
d533307
Sync develop into stage (#223)
hero-dokane Oct 7, 2024
d5d7dbe
Sync develop into stage (#227)
hero-dokane Oct 8, 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
41 changes: 41 additions & 0 deletions blocks/article-cta/article-cta.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
.article-cta-wrapper {
border-radius: 0.5rem;
box-shadow: 0 2px 8px 0 rgb(0 0 0 / 25%);
padding: 1rem;
}

.article-cta h2 {
font-size: 1.5rem;
font-weight: 700;
line-height: 1.25;
margin-top: 0.5rem;
text-align: left;
}

.article-cta span {
font-size: 1rem;
line-height: 0.5;
}

.article-cta button {
display: flex;
margin-top: 2rem;
justify-content: center;
align-items: center;
height: 2.5rem;
width: 100%;
font-size: 1.25rem;
font-weight: normal;
border-radius: 0.5rem;
background-color: var(--button-primary-color);
}

/* .article-cta button::after {
content: '';
-webkit-mask: url("../../icons/arrow.svg") center / 100% 100%;
mask: url("../../icons/arrow.svg") center / 100% 100%;
background-color: #fff;
padding: 0.5rem;
margin-left: 1rem;
display: inline-block;
} */
36 changes: 36 additions & 0 deletions blocks/article-cta/article-cta.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { isMobile, isTablet } from '../../scripts/scripts.js';

// TODO: this will come in as a fragment at a later date
export default async function decorate(block) {
const heading = document.createElement('h2');
const img = document.createElement('img');
const details = document.createElement('span');
const button = document.createElement('button');

heading.textContent = 'Pet Insurance: A Pet Care Must Have';
details.textContent = 'Compare the top pet insurance plans all in one place to find the one that works best for you and your pet';

img.classList.add('article-cta-img');
img.width = 322;
img.height = 184;
if (isMobile()) {
img.src = '/icons/compare-plans-screen.svg';
} else if (isTablet()) {
img.src = '/icons/compare-plans-tablet.svg';
img.width = 672;
img.height = 184;
} else {
img.src = '/icons/compare-plans-screen.svg';
}

button.textContent = 'Get Started';
button.addEventListener('click', (e) => {
e.preventDefault();
window.open('/lost-pet-protection/membership', '_blank');
});

block.append(heading);
block.append(img);
block.append(details);
block.append(button);
}
1 change: 1 addition & 0 deletions blocks/callout-get-a-quote/callout-get-a-quote.css
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* eslint-disable no-empty-source */
Empty file.
3 changes: 2 additions & 1 deletion blocks/carousel/carousel.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ main .carousel img {
margin: 0 auto;
}

.section.pet-tags > .carousel-wrapper > div {
.section.pet-tags > .carousel-wrapper > div,
.section.pawpack-carousel > .carousel-wrapper > div {
margin: 3rem;
}

Expand Down
5 changes: 5 additions & 0 deletions blocks/columns/columns.css
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ main .lost-pet-data > div div {
border: none;
}

.columns-home-pumpkin-wellness .button-container ~ p {
font-size: 0.625rem;
color: #333F48;
}

.columns.transfer-microchip-registration-how-to > div {
align-items: self-start;
flex-direction: column-reverse;
Expand Down
1 change: 1 addition & 0 deletions blocks/header/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,7 @@ export default async function decorate(block) {
if (membershipsHoverContent.style.display === 'flex') {
membershipsHoverContent.style.display = 'none';
membershipDiv.className = 'before-click';
toggleMenu(nav, nav);
} else {
registerHoverContent.style.display = 'none';
registerDiv.className = 'before-click';
Expand Down
234 changes: 234 additions & 0 deletions blocks/pawpack/pawpack.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,234 @@
/* stylelint-disable no-descending-specificity */

div[class*="pawpack"] {
--heading-font-size-xs: 1.3125rem; /* 21px */
--heading-line-height-xs: 1.938rem; /* 31px */
--heading-font-size-s: 1.625rem; /* 26px */
--heading-line-height-s: 2.25rem; /* 36px */
--heading-font-size-m: 2.188rem; /* 35px */
--heading-line-height-m: 2.8125rem; /* 45px */
--heading-font-size-xl: 3rem; /* 48px */
--heading-line-height-xl: 3.625rem; /* 58px */
--body-font-size-xs: .75rem; /* 12px */
--body-line-height-xs: 1.3125rem; /* 21px */
--body-line-height-l: 2.125rem; /* 34px */
--body-font-size-xl: 1.75rem; /* 28px */
--body-line-height-xl: 2.375rem; /* 38px */
}


.packpack-container {
display: none;
}

/* Hero */
.pawpack-hero {
h1 {
position: absolute;
top: auto;
overflow: hidden;
clip: rect(1px, 1px, 1px, 1px);
width: 1px;
height: 1px;
white-space: nowrap;
}

h2 {
font-family: var(--body-font-family);
font-size: var(--body-font-size-l);
line-height: var(--body-line-height-l);

@media (min-width: 768px) {
font-size: var(--body-font-size-xl);
line-height: var(--body-line-height-xl);
}
}

.button-container a {
margin-top: 32px;
}
}

/* Callout */
.pawpack-callout {
.default-content-wrapper {
display: flex;
align-items: center;
padding-block: 32px;

@media (min-width: 768px) {
gap: 38px;
}

> p,
> h2 {
margin: 0;
}

h2 {
font-size: var(--heading-font-size-xs);
line-height: var(--heading-line-height-xs);

@media (min-width: 768px) {
font-size: var(--heading-font-size-m);
line-height: var(--heading-line-height-m);
text-align: left;
}
}

@media (max-width: 767px) {
flex-direction: column;
}
}
}

/* Dog / Cat */
.pawpack-dog,
.pawpack-cat {
.columns > div {
@media (max-width: 767px) {
flex-direction: column-reverse;
}
}

h2, h3 {
font-size: var(--heading-font-size-m);
line-height: var(--heading-line-height-m);
}

h2 {
@media (min-width: 768px) {
font-size: var(--heading-font-size-xl);
line-height: var(--heading-line-height-xl);
}
}

h2 + p {
font-size: var(--body-font-size-l);
line-height: var(--body-line-height-l);
}

h3 + p {
font-size: 1.25rem; /* 20px */
line-height: 1.5625rem; /* 25px */
}

.button-container + h4 {
margin-top: 56px;
padding: 8px 0;
font-size: var(--body-font-size-l);
line-height: var(--body-line-height-l);
color: #007680;
border-top: 1px solid #000;
border-bottom: 1px solid #000;

@media (min-width: 768px) {
margin-top: 0;
}
}

ul ~ p {
font-size: var(--body-font-size-xs);
line-height: var(--body-line-height-xs);
}
}

.pawpack-cat {
background-color: #ECEDEE;
}

/* Last Carousel */
.pawpack-cat + .pawpack-carousel {
padding-bottom: 0;

.carousel-wrapper + .default-content-wrapper picture {
display: flex;
justify-content: center;
}
}

/* Carousel */
.pawpack-carousel {
.default-content-wrapper {
text-align: center;

h2 {
font-size: var(--heading-font-size-s);
line-height: var(--heading-line-height-s);

@media (min-width: 768px) {
font-size: 2.375rem; /* 38px */
line-height: 2.4375rem; /* 39px */
}
}

> p,
> h2 {
margin: 0;
}

> h2 + p,
> .button-container {
margin-top: 32px;
}

> h2 + p {
font-size: var(--body-font-size-l);
line-height: var(--body-line-height-l);
}
}

.carousel-wrapper {
margin-top: 34px;
border: 1px solid #666A6C;

h2 {
color: #007680;

@media (min-width: 768px) {
font-size: var(--heading-font-size-s); /* 26px */
line-height: var(--heading-line-height-s); /* 36px */
}
}

h2 ~ p {
font-size: 1.125rem; /* 18px */
font-weight: 350;
line-height: 1.75rem; /* 28px */
}

h2 ~ p:last-of-type em {
font-size: 1.125rem; /* 18px */
line-height: 1.75rem; /* 28px */
font-weight: 700;
color: #000;
}

img {
height: 165px;

@media (min-width: 768px) {
height: 302px;
}
}
}

.carousel > .active {
@media (max-width: 767px) {
grid-template-rows: 2fr 4fr;
}
}

.carousel > .active > div:first-child {
> * {
text-align: left;
}
}

.carousel > .active > div:last-child {
display: flex;
align-items: center;
justify-content: center;
min-height: 252px;
}
}
Empty file added blocks/pawpack/pawpack.js
Empty file.
7 changes: 7 additions & 0 deletions blocks/plans-quote/summary-quote.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export default async function decorateSummaryQuote(block, apiBaseUrl) {
let petsList = [];
let selectedProducts = [];
let purchaseSummary = {};
let totalShipping = 0;

// eslint-disable-next-line no-shadow
async function getPurchaseSummary(ownerId) {
Expand Down Expand Up @@ -62,6 +63,11 @@ export default async function decorateSummaryQuote(block, apiBaseUrl) {

try {
purchaseSummary = await getPurchaseSummary(ownerData.id);

totalShipping = purchaseSummary.petSummaries.reduce((sum, pet) => {
const shipping = pet.nonInsurancePetSummary?.shipping || 0;
return sum + shipping;
}, 0);
} catch (status) {
// eslint-disable-next-line no-console
console.log('Failed to get the purchase summary for owner:', ownerData.id, ' status:', status);
Expand Down Expand Up @@ -175,6 +181,7 @@ export default async function decorateSummaryQuote(block, apiBaseUrl) {
<div>Monthly Fee</div>
<div>$0.00</div>
</div>
${(totalShipping > 0) ? `<div><div>Shipping of Tag</div><div>$${totalShipping.toFixed(2)}</div></div>` : ''}
<div>
<div>Subtotal</div>
<div>$${purchaseSummary.summary.subTotal}</div>
Expand Down
9 changes: 9 additions & 0 deletions blocks/widget-aggregator/widget-aggregator.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.widget-aggregator iframe {
border: 0;
width: 100%;
height: 350px;

@media (max-width: 812px) {
height: 750px;
}
}
Loading
Loading