Merge branch 'develop' into feature/digital/SSR-390

src/digital-components/button-question/button-question.vue

@@ -233,16 +233,6 @@ export default {
 </script>
 
 <style lang="scss">
-// .button-question-overflow {
-//     height: calc(100vh - 274px);
-//
-//     .overflow-scroll {
-//         // Height will be determined by overall height of content above list
-//         height: calc(100% - 400px);
-//         overflow-x: hidden !important;
-//         -webkit-overflow-scrolling: touch;
-//     }
-// }
 .button-question {
     color: $black;
 

src/iss-components/questions-page-layout/questions-page-layout.vue

@@ -103,19 +103,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
-.fade-on-route-transition {
-    margin-bottom: 100px;
-}
-.page-container-grouped-styles {
-    overflow: auto;
-}
-
-.modal-open {
-    .page-container-grouped-styles {
-        overflow: hidden;
-    }
-}
 .questions-page {
     .question-text {
         margin-bottom: 0.5rem;

src/layouts/address-lookup/address-lookup.vue

@@ -352,17 +352,3 @@ components: {
 },
 };
 </script>
-<style lang="scss" scoped>
-.fade-on-route-transition {
-    margin-bottom: 100px;
-}
-.page-container-grouped-styles {
-    overflow: auto;
-}
-
-.modal-open {
-    .page-container-grouped-styles {
-        overflow: hidden;
-    }
-}
-</style>

src/layouts/coverage-statement/coverage-statement.vue

@@ -149,19 +149,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
-.fade-on-route-transition {
-    margin-bottom: 100px;
-}
-.page-container-grouped-styles {
-    overflow: auto;
-}
-
-.modal-open {
-    .page-container-grouped-styles {
-        overflow: hidden;
-    }
-}
 ol {
     margin-left: -1rem;
     li {

src/layouts/license-plate-lookup/license-plate-lookup.vue

@@ -316,19 +316,7 @@ export default {
     };
     </script>
 
-    <style lang="scss" scoped>
+    <style lang="scss">
-    .fade-on-route-transition {
-        margin-bottom: 100px;
-    }
-    .page-container-grouped-styles {
-        overflow: auto;
-    }
-
-    .modal-open {
-        .page-container-grouped-styles {
-            overflow: hidden;
-        }
-    }
     #license-plate-question-wrapper .form-test-error {
         /**
         Override extra margin-bottom in the error message in TextboxQuestion

src/layouts/policy-holder-details/policy-holder-details.vue

@@ -135,17 +135,6 @@ export default {
     }
     </script>
     <style lang="scss">
-    .fade-on-route-transition {
-        height: calc(100% - 120px);
-        overflow: scroll;
-        overflow-x: hidden;
-    }
-
-    .modal-open {
-        .fade-on-route-transition {
-            overflow: hidden;
-        }
-    }
     .alert.alert-warning
     {
         margin-top: 20px;

src/layouts/provider-preference/provider-preference.vue

@@ -3,12 +3,13 @@
         <div class="page-container-grouped-styles">
             <div class="fade-on-route-transition position-relative">
                 <siteHeader cmsWidgetName="SiteHeaderWidget" />
+                <siteSubHeader cmsWidgetName="SiteSubHeader" id="sub-header" />
                 <div class="select-car">
                     <div class="container-fluid pb-2">
                         <div class="row px-3">
                             <div class="col">
                                 <div class="select-car-form rounded">
-                                    <div v-html="ProviderPreferenceHeaderText"  class="text-center mb-4 modal-link" ></div>
+                                    <div v-html="ProviderPreferenceHeaderText"  class="text-center mb-5 modal-link" ></div>
                                     <div
                                     v-html="ProviderPreferenceBodyText"
                                     class="mt-0 body-text"
@@ -125,33 +126,21 @@ export default {
     },
 };
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
-.fade-on-route-transition {
-    margin-bottom: 100px;
-}
-.page-container-grouped-styles {
-    overflow: auto;
-}
-
-.modal-open {
-    .page-container-grouped-styles {
-        overflow: hidden;
-    }
-}
 #sub-header span{
-color: $black;
+    color: $black;
 }
 .body-text {
-color: $darker-gray;
+    color: $darker-gray;
-p, li {
+    p, li {
-margin-bottom: 0.5rem;
+        margin-bottom: 0.5rem;
-}
+    }
 }
 .modal-link a{
-  color: $blue-700;
+    color: $blue-700;
-  font-size: 14px;
+    font-size: 14px;
-  line-height: 24px;
+    line-height: 24px;
-  font-weight: 500;
+    font-weight: 500;
 }
 .question-text {
     margin-top: 0;

src/layouts/service-location/service-location.vue

@@ -1,14 +1,23 @@
 <template>
     <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm"  v-slot="{ meta }" >
-        <div class="page-container-grouped-styles">
+        <div class="page-container-grouped-styles">  
-            <div class="fade-on-route-transition position-relative">
+            <siteHeader cmsWidgetName="SiteHeaderWidget" class="siteHeader"/>
-                <siteHeader cmsWidgetName="SiteHeaderWidget" />
+            <siteSubHeader cmsWidgetName="SiteSubHeaderWidget" id="sub-header" /> 
+            <div class="fade-on-route-transition position-relative px-5 choose-option">
+
+                <buttonQuestion 
+                    cmsWidgetName="ServiceTypeQuestionWidget" 
+                    :questionText="questionText" 
+                    :answers="answersFromCms" 
+                    buttonTypeString="listCard" 
+                    isRequired 
+                    v-model="selectedValues" 
+                    validationRules="selection-required"/>
                 <div class="select-car">
                     <div class="container-fluid pb-2">
                         <div class="row px-3">
                             <div class="col">
                                 <div class="select-car-form rounded">
-                                    <p>Placeholder for service-location page</p>
                                     <siteFooter
                                     cmsWidgetName="SiteFooterWidget"
                                     :isForwardActionDisabled="!meta.valid"
@@ -26,22 +35,30 @@
     </Form>
 </template>
 <script>
-// Import Supporting Files
+  // Import Supporting Files
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
+import { required } from "@/helpers/validation-rules";
+import { errorMessages } from "@/constants/error-messages";
+import buttonQuestion from "@/digital-components/button-question/button-question";
+
 // Import Component
 import baseFormMixin from "@/mixins/base-form-mixin";
-import { Form } from "vee-validate";
+import { Form, defineRule } from "vee-validate";
 import siteFooter from "@/iss-components/site-footer/site-footer.vue";
 import siteHeader from "@/iss-components/site-header/site-header.vue";
 import siteSubHeader from "@/iss-components/site-sub-header/site-sub-header.vue";
+
+// DEFINE VALIDATION RULES
+defineRule("selection-required", required(errorMessages.OPTION_REQUIRED));
 export default {
-    name: "provider-preference",
+    name: "service-location",
     mixins: [baseFormMixin],
     components: {
         siteFooter,
         siteHeader,
         siteSubHeader,
+        buttonQuestion,
         Form,
     },
     data() {
@@ -50,25 +67,31 @@ export default {
     async beforeRouteEnter(to, from, next) {
         const cmsContentPromise = fetchCmsContentForPage(to.query.issPage);
         // Settle promises and get results
-        const promiseResultMap = [
+        const promiseResultMap = [{
-            {
+            resultKey: "cmsContent",
-                resultKey: "cmsContent",
+            promise: cmsContentPromise,
-                promise: cmsContentPromise,
+        }, ];
-            },
-        ];
         const resultMap = await settleAllPromises(promiseResultMap);
         next((vm) => {
             vm.setCmsContent(resultMap.cmsContent);
         });
     },
+    computed: {
+        questionText() {
+            return this.getCmsContent("ServiceTypeQuestionWidget", "QuestionText");
+        },
+        answersFromCms() {
+            return this.getCmsContent("ServiceTypeQuestionWidget", "Answers");
+        },        
+    },
     methods: {
         arePagePrerequisiteValid() {
             return true;
         },
         backButtonAction() {
             /**
-            * this.navigationScenarios comes from base-mixin
+             * this.navigationScenarios comes from base-mixin
-            */
+             */
             this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route);
         },
         async forwardButtonAction() {},
@@ -77,7 +100,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .fade-on-route-transition {
     margin-bottom: 100px;
 }
@@ -90,4 +113,40 @@ export default {
         overflow: hidden;
     }
 }
-</style>
+#sub-header span {
+    color: $black;
+}
+.question-text {
+   & > span {
+        line-height: 1.500rem;
+    }
+}
+.list-card-content p {
+    &:first-of-type {
+    line-height: 1.5rem;
+    }
+    &:not(:nth-of-type(1)){
+    line-height: 1.250rem;
+    }
+}
+.siteHeader{
+    .site-header{
+        margin-bottom: 1.25rem !important;
+    }
+    
+}
+.choose-option{
+        .button-question >div {
+            &:first-of-type {
+        margin-bottom: 0.95rem;
+        line-height: 1.500rem;
+            }
+    }
+}
+.button-question{
+    .row.form-test-error{
+        line-height:1.500rem;
+        padding-left: 0rem !important;
+    }
+}
+</style>

src/layouts/vehicle-damage/vehicle-damage.vue

@@ -478,18 +478,3 @@ export default {
         },
     };
     </script>
-
-<style lang="scss" scoped>
-.fade-on-route-transition {
-    margin-bottom: 100px;
-}
-.page-container-grouped-styles {
-    overflow: auto;
-}
-
-.modal-open {
-    .page-container-grouped-styles {
-        overflow: hidden;
-    }
-}
-</style>

src/layouts/vehicle-lookup/vehicle-lookup.vue

@@ -106,18 +106,3 @@ export default {
     },
 };
 </script>
-
-<style lang="scss" scoped>
-.fade-on-route-transition {
-    margin-bottom: 100px;
-}
-.page-container-grouped-styles {
-    overflow: auto;
-}
-
-.modal-open {
-    .page-container-grouped-styles {
-        overflow: hidden;
-    }
-}
-</style>

src/layouts/vehicle-make/vehicle-make.vue

@@ -100,18 +100,3 @@ export default {
     }
 };
 </script>
-
-<style lang="scss" scoped>
-.fade-on-route-transition {
-    margin-bottom: 80px;
-}
-.page-container-grouped-styles {
-    overflow: auto;
-}
-
-.modal-open {
-    .page-container-grouped-styles {
-        overflow: hidden;
-    }
-}
-</style>

src/layouts/vehicle-model/vehicle-model.vue

@@ -109,21 +109,3 @@ export default {
     },
 };
 </script>
-
-<style lang="scss" scoped>
-.container-fluid {
-    margin-bottom: 80px;
-}
-.fade-on-route-transition {
-    margin-bottom: 80px;
-}
-.page-container-grouped-styles {
-    overflow: auto;
-}
-
-.modal-open {
-    .page-container-grouped-styles {
-        overflow: hidden;
-    }
-}
-</style>

src/layouts/vehicle-parts/vehicle-parts.vue

@@ -232,20 +232,7 @@ components: {
 },
 };
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
-.fade-on-route-transition {
-    margin-bottom: 100px;
-}
-.page-container-grouped-styles {
-    overflow: auto;
-}
-
-.modal-open {
-    .page-container-grouped-styles {
-        overflow: hidden;
-    }
-}
-
 #vehicle-parts-alert {
     .alert-heading {
         margin-top: 0.25rem !important;

src/layouts/vehicle-style/vehicle-style.vue

@@ -122,21 +122,3 @@ export default {
     }
 };
 </script>
-
-<style lang="scss" scoped>
-.container-fluid {
-    margin-bottom: 80px;
-}
-.fade-on-route-transition {
-    margin-bottom: 80px;
-}
-.page-container-grouped-styles {
-    overflow: auto;
-}
-
-.modal-open {
-    .page-container-grouped-styles {
-        overflow: hidden;
-    }
-}
-</style>

src/layouts/vehicle-year/vehicle-year.vue

@@ -99,18 +99,3 @@ export default {
     },
 };
 </script>
-
-<style lang="scss" scoped>
-.fade-on-route-transition {
-    margin-bottom: 80px;
-}
-.page-container-grouped-styles {
-    overflow: auto;
-}
-
-.modal-open {
-    .page-container-grouped-styles {
-        overflow: hidden;
-    }
-}
-</style>

src/layouts/vin-lookup/vin-lookup.vue

@@ -254,18 +254,3 @@ export default {
     },
 };
 </script>
-
-<style lang="scss" scoped>
-.fade-on-route-transition {
-    margin-bottom: 100px;
-}
-.page-container-grouped-styles {
-    overflow: auto;
-}
-
-.modal-open {
-    .page-container-grouped-styles {
-        overflow: hidden;
-    }
-}
-</style>

src/layouts/welcome-page/welcome-page.vue

@@ -348,19 +348,7 @@ export default {
 </script>
 
 <style lang="scss">
-
+.my-2 {
-.fade-on-route-transition {
-    height: calc(100% - 80px);
-    overflow: scroll;
-}
-
-.modal-open {
-    .fade-on-route-transition {
-        overflow: hidden;
-    }
-}
-.my-2
-{
     margin-bottom: 0rem !important;
 }
 @-moz-document url-prefix() {

src/styles/common-styles.scss

@@ -5,56 +5,62 @@ body {
     background-color: #fff;
     color: #4D5151;
     .container-fluid {
-      max-width: 576px; //Remove once desktop app is complete
+        max-width: 576px; //Remove once desktop app is complete
-      &.container-shadow {
+        &.container-shadow {
-        box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.15); //Use instead of Bootstrap's helper
+            box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.15); //Use instead of Bootstrap's helper
-      }
+        }
-      &.make-tall {
+        &.make-tall {
-        height: 100vh;
+            height: 100vh;
-        display: flex;
+            display: flex;
-        flex-direction: column;
+            flex-direction: column;
-      }
+        }
-      .prevent-squish{
+        .prevent-squish{
-        overflow-x: unset;
+            overflow-x: unset;
-      }
+        }
     }
     .pointer {
-      cursor: pointer;
+        cursor: pointer;
     }
     .container,
     .container-fluid {
-      overflow: hidden;
+        overflow: hidden;
     }
-
     .sub-container{
-      &.make-tall {
+        &.make-tall {
-        height: 100%;
+            height: 100%;
-        width: 100%;
+            width: 100%;
-        display: flex;
+            display: flex;
-        flex-direction: column;
+            flex-direction: column;
-        overflow-x: hidden;
+            overflow-x: hidden;
-      }
+        }
     }
-
     .sr-only {
-      position: absolute;
+        position: absolute;
-      left: -10000px;
+        left: -10000px;
-      top: auto;
+        top: auto;
-      width: 1px;
+        width: 1px;
-      height: 1px;
+        height: 1px;
-      overflow: hidden;
+        overflow: hidden;
     }
-
     .page-container-grouped-styles {
-      @extend .container-fluid, .shadow, .p-0, .position-relative, .make-tall;
+        @extend .container-fluid, .shadow, .p-0, .position-relative, .make-tall;
     }
-
     //Footer modal backdrop adjustments for positioning
     .modal-backdrop {
-      left: 50%;
+        left: 50%;
-      transform: translateX(-50%);
+        transform: translateX(-50%);
-      max-width: 576px;
+        max-width: 576px;
-      height: calc(100% - 72px);
+        height: calc(100% - 72px);
     }
-
+    // Scroll page when modal isn't open
-  }
+    .fade-on-route-transition {
+        height: calc(100% - 80px);
+        overflow: auto;
+    }
+    // Prevent scroll when modal is open
+    .modal-open {
+        .fade-on-route-transition {
+            overflow: hidden;
+        }
+    }
+}