From c9736f6d4ba921c86c9bbceed9ddb07fce73eeb8 Mon Sep 17 00:00:00 2001
From: Matt Caimi <matt.caimi@safelite.com>
Date: Fri, 27 Jan 2023 14:08:49 -0500
Subject: [PATCH] CSR-1012 | content group modals on quote page

---
 .../content-group-modal.vue                   | 24 ---------
 src/layouts/quote/quote.vue                   | 14 ++---
 .../mobile-location-modal-questions.vue       | 11 ++--
 .../vehicle-protected-question.vue            |  4 +-
 .../service-zip-modal-question.vue            | 54 +++++++++----------
 5 files changed, 39 insertions(+), 68 deletions(-)

diff --git a/src/fmg-components/content-group-modal/content-group-modal.vue b/src/fmg-components/content-group-modal/content-group-modal.vue
index ab0bdee86..f0d2ba75a 100644
--- a/src/fmg-components/content-group-modal/content-group-modal.vue
+++ b/src/fmg-components/content-group-modal/content-group-modal.vue
@@ -60,27 +60,3 @@ export default {
     },
 };
 </script>
-
-<style lang="scss">
-.modal {
-    &.modal-component {
-        .modal-dialog {
-            .modal-content {
-                .modal-body {
-                    .modal-sub-body {
-                        color: $gray-600;
-                    }
-                    ul {
-                        margin-bottom: 0;
-                    }
-                    p {
-                        &:last-child {
-                            margin-bottom: 0;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-</style>
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 21f5753bb..620310d5e 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -29,11 +29,11 @@ digital
                     cmsWidgetName="quoteDisclaimer"
                     justifyText="left"
                     typeStyle="caption"
-                    class="mt-7" />
-                <modal cmsWidgetName="RainDefenseModal" />
-                <modal cmsWidgetName="FrontWiperModal" />
-                <modal cmsWidgetName="RearWiperModal" />
-                <modal cmsWidgetName="RecalModal" />
+                    class="mt-4" />
+                <contentGroupModal cmsWidgetName="RainDefenseModal" />
+                <contentGroupModal cmsWidgetName="FrontWiperModal" />
+                <contentGroupModal cmsWidgetName="RearWiperModal" />
+                <contentGroupModal cmsWidgetName="RecalModal" />
                 <funnel-footer
                     cmsWidgetName="FunnelFooterWidget"
                     :isForwardActionDisabled="!meta.valid"
@@ -54,7 +54,7 @@ import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-heade
 import cashOrInsuranceQuestion from "./cash-or-insurance-question/cash-or-insurance-question";
 import servicePackageQuestion from "./service-package-question/service-package-question";
 import textBlock from "@/digital-components/text-block/text-block";
-import modal from "@/digital-components/modal/modal";
+import contentGroupModal from "@/fmg-components/content-group-modal/content-group-modal";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import baseMixin from "@/mixins/base-mixin.js";
 import vehicleQuestionsMixin from "../../mixins/vehicle-questions-mixin";
@@ -202,7 +202,7 @@ export default {
         textBlock,
         cashOrInsuranceQuestion,
         servicePackageQuestion,
-        modal,
+        contentGroupModal,
         loadingModal,
     },
 };
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 3a82b0362..6fa8728ba 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -27,7 +27,7 @@
             ref="addressQuestions"
             v-model="mobileQuestionModel.addressQuestions"
             captureApartmentNumberOrBusinessName="true" />
-        <vehicleProtectedQuestion v-model="mobileQuestionModel.selectedValue"/>
+        <vehicleProtectedQuestion v-model="mobileQuestionModel.selectedValue" />
         <textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
     </modal>
 </template>
@@ -49,7 +49,7 @@ import { required, regex } from "@/helpers/validation-rules";
 import { errorMessages } from "@/constants/error-messages";
 import { storeActions } from "@/constants/store-actions.js";
 import baseMixin from "@/mixins/base-mixin.js";
-import TextBlock from '../../../digital-components/text-block/text-block.vue';
+import TextBlock from "../../../digital-components/text-block/text-block.vue";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -105,9 +105,7 @@ export default {
                 input.focus();
             });
         },
-        saveMobileLocationData() {
-
-        },
+        saveMobileLocationData() {},
     },
     computed: {
         getModalId() {
@@ -127,7 +125,6 @@ export default {
                 this.$emit("update:modelValue", newValue);
             },
         },
-
     },
     mounted() {},
     components: {
@@ -135,7 +132,7 @@ export default {
         modal,
         addressQuestions,
         vehicleProtectedQuestion,
-        textBlock
+        textBlock,
     },
 };
 </script>
diff --git a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
index b8c795d5f..68dc5e7b4 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/vehicle-protected-question/vehicle-protected-question.vue
@@ -18,7 +18,7 @@ export default {
     name: "vehicle-protected-question",
     data() {
         return {
-            answers: [ "Yes", "No" ],
+            answers: ["Yes", "No"],
         };
     },
     props: {
@@ -50,4 +50,4 @@ export default {
         },
     },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
index 478ac8766..be33ddb86 100644
--- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
+++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue
@@ -22,31 +22,31 @@
         :onModalOpenedCallback="onModalOpened"
         :footerButtonText="footerButtonText"
         @footer-button-event="setZip">
-            <textboxQuestion
-                ref="zipInputTextQuestion"
-                :cmsWidgetName="this.textboxQuestionWidgetName"
-                v-model="serviceZipCodeInput"
-                inputId="serviceZipCodeInput"
-                questionAlignment="center"
-                mask="#####"
-                isRequired
-                disableAutoFill
-                validationRules="zip-required|zip-format" />
-            <alert
-                ref="alertInvalidZip"
-                v-if="displayInvalidZipAlert"
-                class="my-4"
-                :cmsWidgetName="this.alertInvalidZipWidgetName"
-                alertClass="alert-danger"
-                v-bind:isDismissible="false" />
-            <alert
-                ref="alertNonServiceableZip"
-                v-if="displayNonServiceableZipAlert"
-                class="my-4"
-                :cmsWidgetName="this.alertNonServiceableZipWidgetName"
-                :manualHeadline="AlertNonServiceableZipHeader"
-                alertClass="alert-danger"
-                v-bind:isDismissible="false" />
+        <textboxQuestion
+            ref="zipInputTextQuestion"
+            :cmsWidgetName="this.textboxQuestionWidgetName"
+            v-model="serviceZipCodeInput"
+            inputId="serviceZipCodeInput"
+            questionAlignment="center"
+            mask="#####"
+            isRequired
+            disableAutoFill
+            validationRules="zip-required|zip-format" />
+        <alert
+            ref="alertInvalidZip"
+            v-if="displayInvalidZipAlert"
+            class="my-4"
+            :cmsWidgetName="this.alertInvalidZipWidgetName"
+            alertClass="alert-danger"
+            v-bind:isDismissible="false" />
+        <alert
+            ref="alertNonServiceableZip"
+            v-if="displayNonServiceableZipAlert"
+            class="my-4"
+            :cmsWidgetName="this.alertNonServiceableZipWidgetName"
+            :manualHeadline="AlertNonServiceableZipHeader"
+            alertClass="alert-danger"
+            v-bind:isDismissible="false" />
     </modal>
 </template>
 
@@ -152,9 +152,7 @@ export default {
             if (this.serviceZip && this.serviceZip != 0) {
                 return this.serviceZipState + ", " + this.serviceZip;
             }
-            return (
-                this.getCmsContent(this.cmsWidgetName, "SubheaderText") || "Enter your service ZIP"
-            );
+            return this.getCmsContent(this.cmsWidgetName, "SubheaderText");
         },
         footerButtonText() {
             return this.getCmsContent(this.cmsWidgetName, "FooterText");