Merge branch 'develop' into feature/CSR-1109

src/digital-components/text-block/text-block.vue

@@ -1,7 +1,7 @@
 <template>
     <div
-        class="text-block w-100"
+        class="text-block w-100 mt-2"
-        :class="[justifyText, typeStyle, fontWeight, margin]"
+        :class="[justifyText, typeStyle, fontWeight]"
         v-html="this.TextBlockCopy"></div>
 </template>
 
@@ -11,11 +11,6 @@ export default {
     props: {
         customText: String, // used to allow the insert of token values into textblock
         justifyText: String, // left, right, center
-        margin: {
-            // bootstrap margin to apply to the block.
-            type: String,
-            default: "mt-2",
-        },
         typeStyle: String, // h1-h6, body, small, label, caption (see Figma or Confluence documentation)
         fontWeight: String, // bold=500, default is 400
         cmsWidgetName: String,

src/layouts/review/review.spec.js

@@ -1,3 +0,0 @@
-describe("Review Page", () => {
-    test.todo("Add more tests as specific functionality is added.");
-});

src/layouts/review/review.vue

@@ -1,102 +0,0 @@
-<template>
-    <Form @submit="onSubmit" @invalid-submit="onInvalidSubmit" ref="theForm">
-        <!-- When customer-details is added: v-slot="{ meta }" -->
-        <div class="page-container-grouped-styles">
-            <funnelHeader cmsWidgetName="FunnelHeaderWidget" />
-            <vehicleBanner
-                cmsWidgetName="VehicleBannerWidget"
-                :displayGenericVehicleImage="false" />
-
-            <textBlock
-                :customText="subHeaderTitle"
-                typeStyle="h5"
-                justifyText="text-center"
-                margin="mt-1"
-                class="dark-header" />
-            <textBlock
-                :customText="subHeaderBody"
-                typeStyle="body"
-                justifyText="left"
-                margin="mt-0 mb-2" />
-
-            <buttonMain
-                ref="buttonMain"
-                isPrimary
-                :buttonText="forwardButtonText"
-                loaderColor="white"
-                @click-event="forwardButtonAction" />
-
-            <funnelFooter
-                cmsWidgetName="FunnelFooterWidget"
-                @back-clicked="backButtonAction"
-                @ForwardClicked="forwardButtonAction" />
-        </div>
-    </Form>
-</template>
-
-<script>
-import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
-import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
-import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
-import buttonMain from "@/ux-components/button-main/button-main";
-import textBlock from "@/digital-components/text-block/text-block";
-
-import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
-import { settleAllPromises } from "@/helpers/layout-helper";
-
-export default {
-    name: "review",
-    async beforeRouteEnter(to, from, next) {
-        // Call APIs
-        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
-
-        // Settle promises and get results
-        const promiseResultMap = [
-            {
-                resultKey: "cmsContent",
-                promise: cmsContentPromise,
-            },
-        ];
-
-        const resultMap = await settleAllPromises(promiseResultMap);
-
-        next((vm) => {
-            vm.setCmsContent(resultMap.cmsContent);
-        });
-    },
-    data() {
-        return {};
-    },
-    methods: {
-        arePagePrerequisitesValid() {
-            return true;
-        },
-        backButtonAction() {},
-        forwardButtonAction() {},
-    },
-    computed: {
-        subHeaderTitle() {
-            return this.getCmsContent("FunnelSubHeaderWidget", "HeaderText");
-        },
-        subHeaderBody() {
-            return this.getCmsContent("FunnelSubHeaderWidget", "BodyText");
-        },
-        forwardButtonText() {
-            return this.getCmsContent("FunnelFooterWidget", "ForwardButtonText");
-        },
-    },
-    components: {
-        funnelHeader,
-        funnelFooter,
-        vehicleBanner,
-        buttonMain,
-        textBlock,
-    },
-};
-</script>
-
-<style lang="scss" scoped>
-.dark-header {
-    color: $black;
-}
-</style>

src/layouts/service-location/shop-question/shop-question.spec.js

@@ -179,19 +179,19 @@ describe("shop-question.vue", () => {
         expect(wrapper.vm.answers).toEqual([
             {
                 buttonBodyCopy: "4403 Executive Pkwy, Westerville, OH 43081",
-                buttonLabel: "4403 Executive Pkwy",
+                buttonLabel: "Westerville",
                 buttonLabelSubCopy: "5 mi",
                 value: "003335",
             },
             {
                 buttonBodyCopy: "760 Dearborn Park Ln, Worthington, OH 43085",
-                buttonLabel: "760 Dearborn Park Ln",
+                buttonLabel: "Worthington",
                 buttonLabelSubCopy: "10.5 mi",
                 value: "001820",
             },
             {
                 buttonBodyCopy: "5015 N High St, Columbus, OH 43214",
-                buttonLabel: "5015 N High St",
+                buttonLabel: "Columbus",
                 buttonLabelSubCopy: "11.5 mi",
                 value: "003343",
             },
@@ -320,19 +320,19 @@ describe("shop-question.vue", () => {
         const displayedAnswers = [
             {
                 buttonBodyCopy: "4403 Executive Pkwy, Westerville, OH 43081",
-                buttonLabel: "4403 Executive Pkwy",
+                buttonLabel: "Westerville",
                 buttonLabelSubCopy: "5 mi",
                 value: "003335",
             },
             {
                 buttonBodyCopy: "760 Dearborn Park Ln, Worthington, OH 43085",
-                buttonLabel: "760 Dearborn Park Ln",
+                buttonLabel: "Worthington",
                 buttonLabelSubCopy: "10.5 mi",
                 value: "001820",
             },
             {
                 buttonBodyCopy: "5015 N High St, Columbus, OH 43214",
-                buttonLabel: "5015 N High St",
+                buttonLabel: "Columbus",
                 buttonLabelSubCopy: "11.5 mi",
                 value: "003343",
             },
@@ -388,37 +388,37 @@ describe("shop-question.vue", () => {
         expect(wrapper.vm.answers).toEqual([
             {
                 buttonBodyCopy: "4403 Executive Pkwy, Westerville, OH 43081",
-                buttonLabel: "4403 Executive Pkwy",
+                buttonLabel: "Westerville",
                 buttonLabelSubCopy: "5 mi",
                 value: "003335",
             },
             {
                 buttonBodyCopy: "760 Dearborn Park Ln, Worthington, OH 43085",
-                buttonLabel: "760 Dearborn Park Ln",
+                buttonLabel: "Worthington",
                 buttonLabelSubCopy: "10.5 mi",
                 value: "001820",
             },
             {
                 buttonBodyCopy: "5015 N High St, Columbus, OH 43214",
-                buttonLabel: "5015 N High St",
+                buttonLabel: "Columbus",
                 buttonLabelSubCopy: "11.5 mi",
                 value: "003343",
             },
             {
                 buttonBodyCopy: "1670 Harmon Ave, Columbus, OH 43223",
-                buttonLabel: "1670 Harmon Ave",
+                buttonLabel: "Columbus",
                 buttonLabelSubCopy: "16 mi",
                 value: "006747",
             },
             {
                 buttonBodyCopy: "3938 Powell Rd, Powell, OH 43065",
-                buttonLabel: "3938 Powell Rd",
+                buttonLabel: "Powell",
                 buttonLabelSubCopy: "16.5 mi",
                 value: "003341",
             },
             {
                 buttonBodyCopy: "4580 W Broad St, Columbus, OH 43228",
-                buttonLabel: "4580 W Broad St",
+                buttonLabel: "Columbus",
                 buttonLabelSubCopy: "19.5 mi",
                 value: "003342",
             },

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

@@ -146,7 +146,7 @@ export default {
                 const availabilityRatingCallback = getAvailabilityRating;
 
                 return {
-                    buttonLabel: streetAddress,
+                    buttonLabel: city,
                     buttonLabelSubCopy: `${distanceInMiles} mi`,
                     buttonBodyCopy: `${streetAddress}, ${city}, ${state} ${zipCode}`,
                     //buttonAuxillaryCopy: availabilityRating,

src/router/index.js

@@ -31,7 +31,6 @@ import { applicationConfig } from "../constants/application-config";
 // Components
 import datePicker from "@/digital-components/date-picker/date-picker.vue";
 import demoDatePicker from "@/layouts/demo-date-picker/demo-date-picker.vue";
-import review from "@/layouts/review/review";
 
 const routes = [
     {
@@ -44,11 +43,6 @@ const routes = [
         name: "date-picker",
         component: datePicker,
     },
-    {
-        path: "/review", // This is a temporary route for testing.
-        name: "review",
-        component: review,
-    },
     {
         path: "/",
         name: "root",