diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js index 47d6a0a9..f1930ac0 100644 --- a/src/constants/error-messages.js +++ b/src/constants/error-messages.js @@ -32,7 +32,7 @@ const errorMessages = { LOSS_CAUSE_REQUIRED: "Please enter loss cause", LOSS_CITY_REQUIRED: "Please enter a city", LOSS_STATE_REQUIRED: "Please select an option", - LOSS_DATE_REQUIRED: "Please enter a loss date", + LOSS_DATE_REQUIRED: "Please select a date. Format must be MM/DD/YYYY and the date must be not in the future", DAMAGE_OPTION_REQUIRED: "Please select an option", POLICYHOLDER_FIRST_NAME_REQUIRED: "Please enter the policyholder first name", diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue index 628b7c48..c7840b98 100644 --- a/src/digital-components/button-question/button-question.vue +++ b/src/digital-components/button-question/button-question.vue @@ -67,7 +67,7 @@ -
+
diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue index 578e1243..e4294c2e 100644 --- a/src/digital-components/textbox-question/textbox-question.vue +++ b/src/digital-components/textbox-question/textbox-question.vue @@ -229,6 +229,17 @@ input[type="date"]::-webkit-calendar-picker-indicator { color: $black; font-weight: 500; } + span{ + font-weight:400; + font-size:14px; + color: #4D5151; + } + .form-test-error span{ + color: #d4281c; + font-size: 0.875rem; + font-weight: 500; + } + .input-wrapper { position: relative; &.has-search-icon { diff --git a/src/iss-components/site-header/menu-modal/menu-modal.spec.js b/src/iss-components/site-header/menu-modal/menu-modal.spec.js index 5d461bc3..22f598f5 100644 --- a/src/iss-components/site-header/menu-modal/menu-modal.spec.js +++ b/src/iss-components/site-header/menu-modal/menu-modal.spec.js @@ -56,12 +56,12 @@ describe("menu-modal.vue", () => { expect(icon.attributes('alt')).toBe('Your privacy choices'); }); - it("Should returnDo not sell my information text link text", async () => { + it("Should return Warranty text link text", async () => { // Act const wrapper = shallowMount(menuModal); // Expect - expect(wrapper.html()).toContain("Do not sell my information"); + expect(wrapper.html()).toContain("Warranty"); }); - + }); diff --git a/src/iss-components/site-header/menu-modal/menu-modal.vue b/src/iss-components/site-header/menu-modal/menu-modal.vue index 1b92ad6f..5e4fe973 100644 --- a/src/iss-components/site-header/menu-modal/menu-modal.vue +++ b/src/iss-components/site-header/menu-modal/menu-modal.vue @@ -1,155 +1,166 @@ +
+
+ +
+ + + + + + +
+
+ © {{new Date().getFullYear()}} Safelite Group +
+
+
+
+ - +} + - +} + diff --git a/src/iss-components/site-header/site-header.vue b/src/iss-components/site-header/site-header.vue index 39862840..d9d485be 100644 --- a/src/iss-components/site-header/site-header.vue +++ b/src/iss-components/site-header/site-header.vue @@ -5,13 +5,13 @@
+ v-if="displayGlobalAlert" + class="position-absolute rounded-0 w-100 border-0 shadow-sm start-0" + cmsWidgetName="GlobalAlert" + :manualHeadline="globalAlertMessage.messageHeadline" + :manualCopy="globalAlertMessage.messageCopy" + :alertClass="globalAlertMessage.type" + v-bind:isDismissible="globalAlertMessage.isDismissible" /> @@ -21,60 +21,60 @@ import alert from "@/ux-components/alert/alert"; import eventBus from "@/helpers/event-bus/event-bus"; import { globalEvents } from "@/constants/events"; - export default({ - name: "siteHeader", - data() { +export default({ + name: "siteHeader", + data() { + return { + displayGlobalAlert: false, + globalAlertMessage: { + isDismissible: false, + messageCopy: "", + messageHeadline: "", + type: "", + }, + headerAnswers: null + }; + }, + props: { + cmsWidgetName: String, + }, + computed: { + imageSrc() + { + return this.headerAnswers ? this.headerAnswers.AnswerImageUrl : ""; + }, + altText() + { + return this.headerAnswers ? this.headerAnswers.AltText : ""; + }, + logoBackgroundStyle() { return { - displayGlobalAlert: false, - globalAlertMessage: { - isDismissible: false, - messageCopy: "", - messageHeadline: "", - type: "", - }, - headerAnswers: null + "background-color": this.headerAnswers ? this.headerAnswers.HexCode : "#FFFFFF" }; }, - props: { - cmsWidgetName: String, - }, - computed: { - imageSrc() - { - return this.headerAnswers ? this.headerAnswers.AnswerImageUrl : ""; - }, - altText() - { - return this.headerAnswers ? this.headerAnswers.AltText : ""; - }, - logoBackgroundStyle() { - return { - "background-color": this.headerAnswers ? this.headerAnswers.HexCode : "#FFFFFF" - }; - }, - }, - mounted() { - const answers = this.getCmsContent(this.cmsWidgetName, "Answers"); - this.headerAnswers = Array.isArray(answers) - ? answers.filter(x => x.AccountNumber == this.mainStore.issConfig.accountNumber)[0] - : null; - - // Check if alert event is on the bus - const alertEvent = eventBus.readAndPopEventFromBus( - globalEvents.Categories.GLOBAL_ALERT, - globalEvents.SubCategories.PAGE_NOT_FOUND - ); - // If alert event is on the bus, then display the alert - if (alertEvent !== undefined) { - this.displayGlobalAlert = true; - this.globalAlertMessage = alertEvent; - } + }, + mounted() { + const answers = this.getCmsContent(this.cmsWidgetName, "Answers"); + this.headerAnswers = Array.isArray(answers) + ? answers.filter(x => x.AccountNumber == this.mainStore.issConfig.accountNumber)[0] + : null; - //load client customization overrides - const clientOverrideClass = this.mainStore.issConfig.styleSheet.trim(); - if(clientOverrideClass - && clientOverrideClass != "" - && !document.getElementsByTagName("body")[0].className.split(" ").includes(clientOverrideClass)) + // Check if alert event is on the bus + const alertEvent = eventBus.readAndPopEventFromBus( + globalEvents.Categories.GLOBAL_ALERT, + globalEvents.SubCategories.PAGE_NOT_FOUND + ); + // If alert event is on the bus, then display the alert + if (alertEvent !== undefined) { + this.displayGlobalAlert = true; + this.globalAlertMessage = alertEvent; + } + + //load client customization overrides + const clientOverrideClass = this.mainStore.issConfig.styleSheet.trim(); + if(clientOverrideClass + && clientOverrideClass != "" + && !document.getElementsByTagName("body")[0].className.split(" ").includes(clientOverrideClass)) { document.getElementsByTagName("body")[0].className += " " + clientOverrideClass; } @@ -84,15 +84,18 @@ import { globalEvents } from "@/constants/events"; alert }, }) - + - \ No newline at end of file + #siteHeaderImage { + height: 2.5rem; + } + diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue index df3620bc..a2a61ae9 100644 --- a/src/layouts/welcome-page/welcome-page.vue +++ b/src/layouts/welcome-page/welcome-page.vue @@ -48,7 +48,7 @@ inputId="damageCauseQuestionField" :options="DamageCauseOptions" disableAutoFill - validationRules="loss-cause-required" + validationRules="damage-option-required" placeHolderText="Select an option" /> @@ -159,7 +159,7 @@ defineRule("loss-date-required", required(errorMessages.LOSS_DATE_REQUIRED)); defineRule("loss-state-required", required(errorMessages.LOSS_STATE_REQUIRED)); defineRule("loss-city-required", required(errorMessages.LOSS_CITY_REQUIRED)); - defineRule("phone-number-required", required(errorMessages.PHONE_NUMBER_REQUIRED)); + defineRule("phone-number-required", required(errorMessages.PHONE_NUMBER_FORMAT)); defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIRED)); defineRule("damage-option-required", required(errorMessages.DAMAGE_OPTION_REQUIRED));