From 825e27413d229baa25969e66a40d92b13ae3b132 Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Wed, 2 Jul 2025 14:38:18 -0400 Subject: [PATCH 1/6] CASH-845: prettier formatting --- src/router/methods/helpers/handle-heritage-return.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/router/methods/helpers/handle-heritage-return.js b/src/router/methods/helpers/handle-heritage-return.js index 7ad61adf9..6d8c60a58 100644 --- a/src/router/methods/helpers/handle-heritage-return.js +++ b/src/router/methods/helpers/handle-heritage-return.js @@ -15,9 +15,7 @@ export async function handleHeritageReturn(to, from) { await loadSessionIfPresent(true, routeData.SCHEDULE.name); // Temporary redirect until URLs to old service-location page can be updated in Heritage - if ( - to.fullPath.includes("fmgPage=service-location") - ) { + if (to.fullPath.includes("fmgPage=service-location")) { // Redirect to Schedule page router.push({ name: routeData.SCHEDULE.name, From b311f6d41c26eec32e13694901d6d8e668bf8d31 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Thu, 3 Jul 2025 10:33:25 -0400 Subject: [PATCH 2/6] CASH-959 update hop font-weights. --- public/css/hop-styling.css | 9 +++++---- public/scss/hop-styling.scss | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/public/css/hop-styling.css b/public/css/hop-styling.css index a79c2f049..41fc1edd5 100644 --- a/public/css/hop-styling.css +++ b/public/css/hop-styling.css @@ -12,7 +12,7 @@ body { padding: 8px; } body h3 { - font-weight: 600; + font-weight: 700; } body .validation-info { display: none; @@ -35,7 +35,7 @@ body .form-group { body .headerlinecontainer .headerline1 { font-size: 20px; line-height: 32px; - font-weight: 500; + font-weight: 400; margin: 24px 0; text-align: center; } @@ -96,7 +96,7 @@ body .creditCardSpecific div .headerlinecontainer { display: none; } body .creditCardSpecific div label { - font-weight: 600; + font-weight: 500; } body .creditCardSpecific #infoRow2 { margin-bottom: 0; @@ -140,6 +140,7 @@ body .buttonContainer button { border-radius: 8px; color: #fff; justify-content: center; + font-family: Urbanist, Arial, Helvetica, sans-serif; font-weight: 500; font-size: 16px; height: 48px; @@ -272,7 +273,7 @@ body .cc-error-container #alert-message { #fmg-checkout-shared #other-payments-container label span.paymentOptionText { margin: auto 0; padding-left: 0; - font-weight: 600; + font-weight: 400; } #fmg-checkout-shared #other-payments-container #afterpayParentLink label > span:first-of-type { width: 100%; diff --git a/public/scss/hop-styling.scss b/public/scss/hop-styling.scss index 3d30255cc..bb38cf6b9 100644 --- a/public/scss/hop-styling.scss +++ b/public/scss/hop-styling.scss @@ -12,7 +12,7 @@ body { padding: 8px; h3 { - font-weight: 600; + font-weight: 700; } .validation-info { @@ -42,7 +42,7 @@ body { .headerline1 { font-size: 20px; line-height: 32px; - font-weight: 500; + font-weight: 400; margin: 24px 0; text-align: center; } @@ -103,7 +103,7 @@ body { display: none; } label { - font-weight: 600; + font-weight: 500; } } #infoRow2 { @@ -151,6 +151,7 @@ body { border-radius: 8px; color: #fff; justify-content: center; + font-family: Urbanist, Arial, Helvetica, sans-serif; font-weight: 500; font-size: 16px; height: 48px; @@ -330,7 +331,7 @@ body { &.paymentOptionText { margin: auto 0; padding-left: 0; - font-weight: 600; + font-weight: 400; } } } From e3e6b27148c531941290b37b5704d07e10ad7cd5 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Thu, 3 Jul 2025 13:01:32 -0400 Subject: [PATCH 3/6] CASH-1127 update hop font. --- public/css/hop-styling.css | 2 ++ public/scss/hop-styling.scss | 2 ++ 2 files changed, 4 insertions(+) diff --git a/public/css/hop-styling.css b/public/css/hop-styling.css index 41fc1edd5..0318d52ff 100644 --- a/public/css/hop-styling.css +++ b/public/css/hop-styling.css @@ -51,6 +51,8 @@ body select { font-size: 16px; color: #000; background-color: #fff; + font-family: Urbanist, Arial, Helvetica, sans-serif; + font-weight: 400; } body input:focus, body input:focus-visible, body select:focus, diff --git a/public/scss/hop-styling.scss b/public/scss/hop-styling.scss index bb38cf6b9..aae9913e2 100644 --- a/public/scss/hop-styling.scss +++ b/public/scss/hop-styling.scss @@ -61,6 +61,8 @@ body { font-size: 16px; color: #000; background-color: #fff; + font-family: Urbanist, Arial, Helvetica, sans-serif; + font-weight: 400; &:focus, &:focus-visible { box-shadow: 0 0 0 2.5px #1574a1; From 76d67981f6a6e3dd430a1ddbb9288062f519bac8 Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Thu, 3 Jul 2025 14:44:39 -0400 Subject: [PATCH 4/6] CASH-845 router change refactor --- src/router/constants/routes.js | 9 ++++----- src/router/methods/helpers/handle-heritage-return.js | 9 --------- src/router/methods/route-logic/service-location.js | 8 ++++++++ src/router/methods/routes.js | 4 ++-- 4 files changed, 14 insertions(+), 16 deletions(-) create mode 100644 src/router/methods/route-logic/service-location.js diff --git a/src/router/constants/routes.js b/src/router/constants/routes.js index 45fdfb243..6fec2455d 100644 --- a/src/router/constants/routes.js +++ b/src/router/constants/routes.js @@ -55,11 +55,10 @@ export const routeData = { name: "insurance-company", path: "/insurance-company", }, - // TODO: REMOVE THIS COMMENT AND BELOW, ONCE CASH-803 (SERVICE-LOCATION AND SCHEDULE PAGE COMBINATION) HAS BEEN VETTED - // SERVICE_LOCATION: { - // name: "service-location", - // path: "/service-location", - // }, + SERVICE_LOCATION: { // keep even though this page has been removed from the regular flow bc Heritage still points to it + name: "service-location", + path: "/service-location", + }, HERITAGE: { name: "heritage", path: "/virtual/heritage", diff --git a/src/router/methods/helpers/handle-heritage-return.js b/src/router/methods/helpers/handle-heritage-return.js index 6d8c60a58..74a1ce62a 100644 --- a/src/router/methods/helpers/handle-heritage-return.js +++ b/src/router/methods/helpers/handle-heritage-return.js @@ -1,7 +1,6 @@ import { queryStrings } from "@/constants/query-strings"; import { consumeReferralQuerystrings } from "@/router/methods/helpers/consume-referral-info"; import { loadSessionIfPresent } from "@/helpers/heritage-integration/order-helper"; -import router from "@/router"; import { routeData } from "@/router/constants/routes"; export async function handleHeritageReturn(to, from) { @@ -13,13 +12,5 @@ export async function handleHeritageReturn(to, from) { // load session with new cookie await loadSessionIfPresent(true, routeData.SCHEDULE.name); - - // Temporary redirect until URLs to old service-location page can be updated in Heritage - if (to.fullPath.includes("fmgPage=service-location")) { - // Redirect to Schedule page - router.push({ - name: routeData.SCHEDULE.name, - }); - } } } diff --git a/src/router/methods/route-logic/service-location.js b/src/router/methods/route-logic/service-location.js new file mode 100644 index 000000000..ecaebe149 --- /dev/null +++ b/src/router/methods/route-logic/service-location.js @@ -0,0 +1,8 @@ +import { routeData } from "@/router/constants/routes"; + +export async function serviceLocationBeforeEnter(to, from) { + return { + name: routeData.SCHEDULE.name, + replace: true, + }; +} diff --git a/src/router/methods/routes.js b/src/router/methods/routes.js index 83fbb3811..97af04068 100644 --- a/src/router/methods/routes.js +++ b/src/router/methods/routes.js @@ -12,6 +12,7 @@ import { errorBeforeEnter } from "@/router/methods/route-logic/error"; import { restartBeforeEnter } from "@/router/methods/route-logic/restart"; import { paymentMethodBeforeEnter } from "@/router/methods/route-logic/payment-method"; import { paymentBeforeEnter } from "@/router/methods/route-logic/payment"; +import { serviceLocationBeforeEnter } from "@/router/methods/route-logic/service-location"; export const routes = [ // Non-virtual pages. @@ -29,8 +30,7 @@ export const routes = [ createRoute(routeData.CAPABILITY_QUESTIONS), createRoute(routeData.QUOTE, quoteBeforeEnter), createRoute(routeData.INSURANCE_COMPANY, insuranceCompanyBeforeEnter), - // TODO: REMOVE THIS COMMENT AND BELOW, ONCE CASH-803 (SERVICE-LOCATION AND SCHEDULE PAGE COMBINATION) HAS BEEN VETTED - // createRoute(routeData.SERVICE_LOCATION), + createRoute(routeData.SERVICE_LOCATION, serviceLocationBeforeEnter), createRoute(routeData.SCHEDULE), createRoute(routeData.CUSTOMER_DETAILS), createRoute(routeData.PAYMENT_METHOD, paymentMethodBeforeEnter), From 13b8e7f7373d95b42c1e2bff8a03d5b4994070f6 Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Thu, 3 Jul 2025 14:46:48 -0400 Subject: [PATCH 5/6] CASH-845 restore handle-heritage-return completely --- src/router/methods/helpers/handle-heritage-return.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/methods/helpers/handle-heritage-return.js b/src/router/methods/helpers/handle-heritage-return.js index 74a1ce62a..7914c8e0e 100644 --- a/src/router/methods/helpers/handle-heritage-return.js +++ b/src/router/methods/helpers/handle-heritage-return.js @@ -11,6 +11,6 @@ export async function handleHeritageReturn(to, from) { await consumeReferralQuerystrings(); // load session with new cookie - await loadSessionIfPresent(true, routeData.SCHEDULE.name); + await loadSessionIfPresent(true, routeData.SERVICE_LOCATION.name); } } From fc088ecd08a65907e61171bc3d7c5140b0a575ec Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite Date: Thu, 3 Jul 2025 14:49:59 -0400 Subject: [PATCH 6/6] CASH-845: prettier change --- src/router/constants/routes.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/router/constants/routes.js b/src/router/constants/routes.js index 6fec2455d..5632fe357 100644 --- a/src/router/constants/routes.js +++ b/src/router/constants/routes.js @@ -55,7 +55,8 @@ export const routeData = { name: "insurance-company", path: "/insurance-company", }, - SERVICE_LOCATION: { // keep even though this page has been removed from the regular flow bc Heritage still points to it + SERVICE_LOCATION: { + // keep even though this page has been removed from the regular flow bc Heritage still points to it name: "service-location", path: "/service-location", },