From def94c927506fdba72af1fbf4f28eec7296fa844 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 13 Feb 2023 15:40:52 -0500 Subject: [PATCH 1/2] Create CSM entries and markup for coverage statement page. Remove hard-coded margin-bottom from vehicleBanner and replace it at the component level. "Recalibration" link at bottom of page is for testing only and will be removed when textLink functionality is added to the CMS. --- .../text-block/text-block.vue | 5 +- .../questions-page-layout.vue | 2 +- .../vehicle-banner/vehicle-banner.vue | 6 +- src/layouts/address-lookup/address-lookup.vue | 9 +-- .../address-vehicles/address-vehicles.vue | 3 +- .../capability-questions.vue | 9 +-- .../coverage-statement/coverage-statement.vue | 58 ++++++++++++++----- .../license-plate-lookup.vue | 17 +++--- src/layouts/vehicle-damage/vehicle-damage.vue | 11 ++-- src/layouts/vehicle-lookup/vehicle-lookup.vue | 1 + src/layouts/vehicle-make/vehicle-make.vue | 28 ++++----- src/layouts/vehicle-model/vehicle-model.vue | 21 ++++--- src/layouts/vehicle-parts/vehicle-parts.vue | 1 + src/layouts/vehicle-style/vehicle-style.vue | 8 +-- src/layouts/vehicle-year/vehicle-year.vue | 33 +++++------ src/layouts/vin-lookup/vin-lookup.vue | 41 ++++++------- src/layouts/welcome-page/welcome-page.vue | 2 +- src/styles/common-typography-styles.scss | 4 +- 18 files changed, 150 insertions(+), 109 deletions(-) diff --git a/src/digital-components/text-block/text-block.vue b/src/digital-components/text-block/text-block.vue index 33854e14..d042113e 100644 --- a/src/digital-components/text-block/text-block.vue +++ b/src/digital-components/text-block/text-block.vue @@ -1,6 +1,6 @@ @@ -25,12 +25,15 @@ export default { \ No newline at end of file + diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue index d25d958a..23ba630f 100644 --- a/src/layouts/capability-questions/capability-questions.vue +++ b/src/layouts/capability-questions/capability-questions.vue @@ -11,6 +11,7 @@ - -
-

Placeholder for coverage-statement page

- +
+ + + + + Recalibration + + + diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index cba7bf6a..a3896f85 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -1,11 +1,12 @@ - - + - \ No newline at end of file diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue index 06780711..61415037 100644 --- a/src/layouts/vehicle-parts/vehicle-parts.vue +++ b/src/layouts/vehicle-parts/vehicle-parts.vue @@ -3,6 +3,7 @@
diff --git a/src/layouts/vehicle-style/vehicle-style.vue b/src/layouts/vehicle-style/vehicle-style.vue index e8b3e942..893de9d0 100644 --- a/src/layouts/vehicle-style/vehicle-style.vue +++ b/src/layouts/vehicle-style/vehicle-style.vue @@ -3,7 +3,7 @@
- +
-
@@ -65,7 +65,7 @@ export default { ]; const resultMap = await settleAllPromises(promiseResultMap); - + const visitedVehicleDamage = useMainStore().pageData(issPageValues.VEHICLE_DAMAGE) ? true : false; // If we have exactly one style then navigate directly to vehicle-damage @@ -117,7 +117,7 @@ export default { }, computed: { - backButtonAccessibleText() + backButtonAccessibleText() { return this.getCmsContent(this.cmsWidgetName, "BackButtonAccessibleText") } diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue index 598e4728..10ea7b52 100644 --- a/src/layouts/vehicle-year/vehicle-year.vue +++ b/src/layouts/vehicle-year/vehicle-year.vue @@ -3,23 +3,23 @@
- +
-
-
- + - \ No newline at end of file diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index d3751f1f..c54c2b7e 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -9,6 +9,7 @@ cmsWidgetName="SiteHeaderWidget" /> @@ -82,7 +83,7 @@ export default { activeVehicleLookupAlertType: null, needToLookupVehicle: true, vehicleFromLookup: null, - vin: null, + vin: null, }; }, provide() { @@ -130,7 +131,7 @@ export default { this.resetActiveAlert(); // Temp solution to reset the 'disabled' style on the Continue button this.$refs.siteFooter.enableForwardAction(); - + if (this.needToLookupVehicle) { const vehicleLookupResponse = await this.lookupVehicleByVin(this.vin); @@ -146,29 +147,29 @@ export default { } // Add vin bcs the response from the service doesn't contain vin - this.vehicleFromLookup = Object.assign(vehicleLookupResponse.data, { vin: this.vin }); + this.vehicleFromLookup = Object.assign(vehicleLookupResponse.data, { vin: this.vin }); } - if (this.needToLookupVehicle && this.isCarIdDifferentFromTheStore) { - this.activeVehicleLookupAlertType = vehicleLookupAlertTypes.NOT_MATCHED; - + if (this.needToLookupVehicle && this.isCarIdDifferentFromTheStore) { + this.activeVehicleLookupAlertType = vehicleLookupAlertTypes.NOT_MATCHED; + const vehicleYearMakeModel = `${this.vehicleFromLookup.year} ${this.vehicleFromLookup.make} ${this.vehicleFromLookup.model}`; this.$refs.siteFooter.updateButtonText(`Continue with ${vehicleYearMakeModel}`); this.$refs.siteFooter.removeLoader(); - + this.needToLookupVehicle = false; return; } - let isSelectedGlassAvailableForVehicle = true; - if (this.isCarIdDifferentFromTheStore) { - isSelectedGlassAvailableForVehicle = - await isGlassAvailableForCarId(this.vehicleFromLookup.carId); - } - + let isSelectedGlassAvailableForVehicle = true; + if (this.isCarIdDifferentFromTheStore) { + isSelectedGlassAvailableForVehicle = + await isGlassAvailableForCarId(this.vehicleFromLookup.carId); + } + // navigate back to vehicle-damage - if (this.isCarIdDifferentFromTheStore && !isSelectedGlassAvailableForVehicle) { + if (this.isCarIdDifferentFromTheStore && !isSelectedGlassAvailableForVehicle) { this.mainStore.updateVehicle(this.vehicleFromLookup); this.$router.navigate( this.navigationScenarios.SELECTED_VIN_WITH_MISMATCHED_GLASS, @@ -179,8 +180,8 @@ export default { // navigate() doesn't stop the processing flow return; - } - + } + this.mainStore.updateVehicle(this.vehicleFromLookup); const partsOrQuestionsResponse = await this.getPartsOrQuestions(); if (partsOrQuestionsResponse.error) { @@ -194,7 +195,7 @@ export default { await this.navigateForward(partsOrQuestionsResponse.data.partsOrQuestions, this); }, async getPartsOrQuestions() { - try { + try { const response = await this.mainStore.getPartsOrQuestions(); return response; @@ -209,15 +210,15 @@ export default { async lookupVehicleByVin(vin) { try { return await this.mainStore.lookupVehicleByVin(vin); - } - catch (responseError) { + } + catch (responseError) { return { error: { status: responseError.status, }, }; } - }, + }, resetActiveAlert() { this.activeVehicleLookupAlertType = null; }, diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue index c527d65f..79aef739 100644 --- a/src/layouts/welcome-page/welcome-page.vue +++ b/src/layouts/welcome-page/welcome-page.vue @@ -34,7 +34,7 @@
- +
diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss index 9ee9aa28..a593092e 100644 --- a/src/styles/common-typography-styles.scss +++ b/src/styles/common-typography-styles.scss @@ -25,7 +25,7 @@ h4,.h4 { font-weight: 300; } h5,.h5 { - line-height: 1.325; + line-height: 1.6; font-weight: 400; } h6,.h6 { @@ -64,4 +64,4 @@ caption, font-size: 1rem !important; line-height: 1.4; font-weight: 500; -} \ No newline at end of file +} From e8e88133a80546e5168e617dbe398a0b2843d9bf Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 14 Feb 2023 11:10:46 -0500 Subject: [PATCH 2/2] Update font size/weight. --- src/layouts/coverage-statement/coverage-statement.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index 6c38f0ff..e73ff61b 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -27,8 +27,7 @@ />