From 4dc6887560a3b3f6571d153d21b817f1d079bd5d Mon Sep 17 00:00:00 2001 From: Michaela Brydon Date: Wed, 17 Jul 2024 16:42:18 -0400 Subject: [PATCH 1/8] Mostly done --- .../cart-dropdown/cart-dropdown.vue | 2 +- .../content-group-modal.vue | 1 + .../coverage-statement/coverage-statement.vue | 73 ++++++-------- .../recal-modal/recal-modal.spec.js | 66 ------------- .../recal-modal/recal-modal.vue | 89 ----------------- .../review-dropdown/review-dropdown.vue | 2 +- .../provider-preference.vue | 96 +++++++++---------- src/router/index.js | 6 +- src/styles/common-typography-styles.scss | 2 +- 9 files changed, 83 insertions(+), 254 deletions(-) delete mode 100644 src/layouts/coverage-statement/recal-modal/recal-modal.spec.js delete mode 100644 src/layouts/coverage-statement/recal-modal/recal-modal.vue diff --git a/src/iss-components/cart-dropdown/cart-dropdown.vue b/src/iss-components/cart-dropdown/cart-dropdown.vue index 887a99f5..2013d0af 100644 --- a/src/iss-components/cart-dropdown/cart-dropdown.vue +++ b/src/iss-components/cart-dropdown/cart-dropdown.vue @@ -492,7 +492,7 @@ export default { :deep(a) { padding-bottom: 0 !important; - line-height: 1.625 !important; + line-height: 1.625rem !important; text-underline-offset: auto !important; } diff --git a/src/iss-components/content-group-modal/content-group-modal.vue b/src/iss-components/content-group-modal/content-group-modal.vue index b66a5113..5c2651fa 100644 --- a/src/iss-components/content-group-modal/content-group-modal.vue +++ b/src/iss-components/content-group-modal/content-group-modal.vue @@ -61,6 +61,7 @@ export default { }, methods: { openModal() { + console.log(JSON.stringify(this.$refs)); this.$refs[this.ModalName].openModal(); }, diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index eda94e71..d0d89d24 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -4,7 +4,7 @@ v-slot="{ meta }" @submit="onSubmit" @invalidSubmit="onInvalidSubmit"> -
+
- + cmsWidgetName="RecalModal" /> diff --git a/src/layouts/payment-method/review-dropdown/review-dropdown.vue b/src/layouts/payment-method/review-dropdown/review-dropdown.vue index 6979983b..5e836e82 100644 --- a/src/layouts/payment-method/review-dropdown/review-dropdown.vue +++ b/src/layouts/payment-method/review-dropdown/review-dropdown.vue @@ -163,7 +163,7 @@ export default { .label { color: $black; font-weight: 500; - line-height: 1.625; + line-height: 1.625rem; } } diff --git a/src/layouts/provider-preference/provider-preference.vue b/src/layouts/provider-preference/provider-preference.vue index 355d5364..6c51ea04 100644 --- a/src/layouts/provider-preference/provider-preference.vue +++ b/src/layouts/provider-preference/provider-preference.vue @@ -3,7 +3,7 @@ ref="theForm" @submit="onSubmit" @invalidSubmit="onInvalidSubmit"> -
+
- - - -
+ + + + + diff --git a/src/router/index.js b/src/router/index.js index 53dfb91f..2e3bd657 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -57,7 +57,7 @@ const routes = [ // If the saved session has timed out, clear the session, execute 404 logic. if (getISSCookie() !== null && !isSavedSessionStillActive()) { // await baseMixin.methods.dispatchStoreAction(storeActions.RESET_STATE); - await GoToStartOn404(next); + await GoToStartOn404(next); // TODO maybe here } // Process ISS cookie. @@ -73,7 +73,7 @@ const routes = [ } if (!arePagePrerequisitesValid(component)) { - await GoToStartOn404(next); + await GoToStartOn404(next); // TODO maybe here } return next({ name: issPageToUse, query: to.query, params: to.params }); @@ -113,7 +113,7 @@ const routes = [ }); } catch (error) { window.console.warn(error); - await GoToStartOn404(next); + await GoToStartOn404(next); // TODO maybe here } return null; } diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss index 30368d39..8d7d4210 100644 --- a/src/styles/common-typography-styles.scss +++ b/src/styles/common-typography-styles.scss @@ -2,7 +2,7 @@ p, body { font-size: 1rem; - line-height: 1.625; + line-height: 1.625rem; font-weight: 400; } From c4648df1f5a3a042bb89276d8c4f4cf95ed7554b Mon Sep 17 00:00:00 2001 From: Michaela Brydon Date: Wed, 17 Jul 2024 17:14:39 -0400 Subject: [PATCH 2/8] More tweaks --- src/iss-components/cart-dropdown/cart-dropdown.vue | 12 ++++++++---- .../provider-preference/provider-preference.vue | 10 ++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/iss-components/cart-dropdown/cart-dropdown.vue b/src/iss-components/cart-dropdown/cart-dropdown.vue index 2013d0af..654be120 100644 --- a/src/iss-components/cart-dropdown/cart-dropdown.vue +++ b/src/iss-components/cart-dropdown/cart-dropdown.vue @@ -93,7 +93,7 @@ linkType="text" :text="item?.name ?? ''" href="javascript:void(0)" - @clickEvent="openModal(recyclingModalCmsWidgetName)" /> + @clickEvent="openModal(RECYCLING_MODAL_REF_NAME)" /> {{ item?.name ?? '' }} {{ formatAmountInDollars(item?.subTotal ?? 0) }} @@ -146,7 +146,7 @@
@@ -178,6 +178,7 @@ import { import { getPriceOfLineItems, getTaxOfLineItems } from '@/helpers/price-calculator'; const VERIFYING_COVERAGE = 'Verifying coverage'; +const RECYCLING_MODAL_REF_NAME = "RecycleModal"; export default { name: 'cart-dropdown', @@ -209,7 +210,8 @@ export default { servicePackage: 'ServicePackageTitle', vapsItemDescriptions: 'VapsItemDescriptions' }, - cartItemType + cartItemType, + RECYCLING_MODAL_REF_NAME }; }, computed: { @@ -467,6 +469,8 @@ export default {