jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into defect/CSR-934

Browse source
This commit is contained in:
Leah Schumann 2023-01-20 09:22:21 -05:00
commit 0ff8ac7aac
41 changed files with 47 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/digital-components/base-input-button/button-functionality-props.js
View file

@ -4,8 +4,15 @@ export const inputButtonProps = {
required: true, required: true,
}, },
modelValue: { modelValue: {
type: [Array, String, Number],
required: true, required: true,
validator: function (prop) {
return (
prop === null ||
Array.isArray(prop) ||
typeof prop === "string" ||
(typeof prop === "number" && !Number.isNaN(prop))
);
},
}, },
isMultiSelect: Boolean, isMultiSelect: Boolean,
groupName: { groupName: {

16
src/digital-components/button-question/button-question.vue
View file

@ -1,4 +1,5 @@
<!-- Documented in confluence https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Component --> <!-- Documented in confluence
https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Component -->
<template> <template>
<div <div
:class=" :class="
@ -68,16 +69,19 @@
</fieldset> </fieldset>
</div> </div>
<div class="row form-test-error mt-1"> <div class="row form-test-error mt-1">
<error-message :name="formatString(groupName)" v-if="!suppressError"></error-message> <error-message
class="small"
:name="formatString(groupName)"
v-if="!suppressError"></error-message>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import listButton from "@/fmg-components/ux-components/list-button/list-button"; import listButton from "@/ux-components/list-button/list-button";
import listButtonHorizontal from "@/fmg-components/ux-components/list-button-horizontal/list-button-horizontal"; import listButtonHorizontal from "@/ux-components/list-button-horizontal/list-button-horizontal";
import listCard from "@/fmg-components/ux-components/list-card/list-card"; import listCard from "@/ux-components/list-card/list-card";
import radio from "@/fmg-components/ux-components/radio/radio"; import radio from "@/ux-components/radio/radio";
import { ErrorMessage } from "vee-validate"; import { ErrorMessage } from "vee-validate";
export default { export default {

2
src/digital-components/modal/modal.vue
View file

@ -42,7 +42,7 @@
</template> </template>
<script> <script>
import buttonMain from "@/fmg-components/ux-components/button-main/button-main"; import buttonMain from "@/ux-components/button-main/button-main";
export default { export default {
name: "modal", name: "modal",

4
src/digital-components/textbox-question/textbox-question.vue
View file

@ -32,8 +32,8 @@
@focus="$emit('focus', $event.target.value)" /> @focus="$emit('focus', $event.target.value)" />
<button v-if="includeSearchIcon" type="submit" aria-label="Search button" /> <button v-if="includeSearchIcon" type="submit" aria-label="Search button" />
</div> </div>
<div v-show="errorMessage" class="row my-2 form-test-error"> <div v-show="errorMessage" class="row my-1 form-test-error">
<span class="d-inline-flex mt-0" role="alert">{{ errorMessage }}</span> <span class="d-inline-flex small mt-0" role="alert">{{ errorMessage }}</span>
</div> </div>
</div> </div>
</template> </template>

4
src/fmg-components/funnel-footer/funnel-footer.vue
View file

@ -29,8 +29,8 @@
</template> </template>
<script> <script>
import textLink from "@/fmg-components/ux-components/text-link/text-link"; import textLink from "@/ux-components/text-link/text-link";
import buttonMain from "@/fmg-components/ux-components/button-main/button-main"; import buttonMain from "@/ux-components/button-main/button-main";
export default { export default {
name: "funnelFooter", name: "funnelFooter",

2
src/fmg-components/funnel-header/funnel-header.vue
View file

@ -16,7 +16,7 @@
</template> </template>
<script> <script>
import alert from "@/fmg-components/ux-components/alert/alert"; import alert from "@/ux-components/alert/alert";
import eventBus from "@/helpers/event-bus/event-bus"; import eventBus from "@/helpers/event-bus/event-bus";
import { globalEvents } from "@/constants/events"; import { globalEvents } from "@/constants/events";
import menuModal from "@/fmg-components/funnel-header/menu-modal/menu-modal"; import menuModal from "@/fmg-components/funnel-header/menu-modal/menu-modal";

2
src/fmg-components/funnel-header/menu-modal/menu-modal.vue
View file

@ -78,7 +78,7 @@
</template> </template>
<script> <script>
import textLink from "@/fmg-components/ux-components/text-link/text-link"; import textLink from "@/ux-components/text-link/text-link";
export default { export default {
name: "menuModal", name: "menuModal",
data() { data() {

2
src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue
View file

@ -37,7 +37,7 @@
// Components // Components
import funnelHeader from "@/fmg-components/funnel-header/funnel-header"; import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner"; import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
import alert from "@/fmg-components/ux-components/alert/alert"; import alert from "@/ux-components/alert/alert";
import questionChain from "@/digital-components/question-chain/question-chain"; import questionChain from "@/digital-components/question-chain/question-chain";
import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header"; import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer"; import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";

2
src/layouts/address-lookup/address-lookup.vue
View file

@ -86,7 +86,7 @@ import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner"; import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header"; import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
import customerQuestions from "@/layouts/address-lookup/customer-questions/customer-questions"; import customerQuestions from "@/layouts/address-lookup/customer-questions/customer-questions";
import alert from "@/fmg-components/ux-components/alert/alert"; import alert from "@/ux-components/alert/alert";
import textboxQuestion from "@/digital-components/textbox-question/textbox-question"; import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
import { Form, defineRule } from "vee-validate"; import { Form, defineRule } from "vee-validate";

2
src/layouts/address-lookup/customer-questions/address-questions/address-questions.spec.js
View file

@ -1,6 +1,6 @@
// Components // Components
import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions"; import addressQuestions from "@/layouts/address-lookup/customer-questions/address-questions/address-questions";
import alert from "@/fmg-components/ux-components/alert/alert"; import alert from "@/ux-components/alert/alert";
// Supporting Files // Supporting Files
import { mount, shallowMount } from "@vue/test-utils"; import { mount, shallowMount } from "@vue/test-utils";

2
src/layouts/address-lookup/customer-questions/address-questions/address-questions.vue
View file

@ -73,7 +73,7 @@
<script> <script>
import textboxQuestion from "@/digital-components/textbox-question/textbox-question"; import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
import dropdownQuestion from "@/digital-components/dropdown-question/dropdown-question"; import dropdownQuestion from "@/digital-components/dropdown-question/dropdown-question";
import alert from "@/fmg-components/ux-components/alert/alert"; import alert from "@/ux-components/alert/alert";
import { applicationConfig } from "@/constants/application-config.js"; import { applicationConfig } from "@/constants/application-config.js";
import { defineRule } from "vee-validate"; import { defineRule } from "vee-validate";
import { required, regex } from "@/helpers/validation-rules"; import { required, regex } from "@/helpers/validation-rules";

2
src/layouts/address-vehicles/address-vehicles-question/address-vehicles-question.vue
View file

@ -22,7 +22,7 @@
<script> <script>
import buttonQuestion from "@/digital-components/button-question/button-question"; import buttonQuestion from "@/digital-components/button-question/button-question";
import alert from "@/fmg-components/ux-components/alert/alert"; import alert from "@/ux-components/alert/alert";
// Supporting files // Supporting files
import { getDamageString } from "@/helpers/damage-helper"; import { getDamageString } from "@/helpers/damage-helper";

2
src/layouts/address-vehicles/address-vehicles.vue
View file

@ -50,7 +50,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer"; import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner"; import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header"; import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
import alert from "@/fmg-components/ux-components/alert/alert"; import alert from "@/ux-components/alert/alert";
import addressVehiclesQuestion from "@/layouts/address-vehicles/address-vehicles-question/address-vehicles-question"; import addressVehiclesQuestion from "@/layouts/address-vehicles/address-vehicles-question/address-vehicles-question";
// Supporting files // Supporting files

2
src/layouts/estimate/estimate.vue
View file

@ -89,7 +89,7 @@ import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner"; import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header"; import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
import buttonQuestion from "@/digital-components/button-question/button-question"; import buttonQuestion from "@/digital-components/button-question/button-question";
import alert from "@/fmg-components/ux-components/alert/alert"; import alert from "@/ux-components/alert/alert";
import textboxQuestion from "@/digital-components/textbox-question/textbox-question"; import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
import textBlock from "@/digital-components/text-block/text-block"; import textBlock from "@/digital-components/text-block/text-block";
import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue"; import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";

2
src/layouts/license-plate-lookup/license-plate-lookup.vue
View file

@ -95,7 +95,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer"; import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner"; import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header"; import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
import alert from "@/fmg-components/ux-components/alert/alert"; import alert from "@/ux-components/alert/alert";
import textboxQuestion from "@/digital-components/textbox-question/textbox-question"; import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
import textBlock from "@/digital-components/text-block/text-block"; import textBlock from "@/digital-components/text-block/text-block";

2
src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
View file

@ -52,7 +52,7 @@
<script> <script>
import baseInputButton from "@/digital-components/base-input-button/base-input-button"; import baseInputButton from "@/digital-components/base-input-button/base-input-button";
import textLink from "@/fmg-components/ux-components/text-link/text-link"; import textLink from "@/ux-components/text-link/text-link";
import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin"; import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
import { import {
getLinkDisplayTextFromCopy, getLinkDisplayTextFromCopy,

2
src/layouts/vehicle-damage/vehicle-damage.vue
View file

@ -67,7 +67,7 @@ import sideDoorOptions from "@/layouts/vehicle-damage/side-door-options/side-doo
import damageLocationQuestion from "@/layouts/vehicle-damage/damage-location-question/damage-location-question"; import damageLocationQuestion from "@/layouts/vehicle-damage/damage-location-question/damage-location-question";
import windshieldOptions from "@/layouts/vehicle-damage/windshield-options/windshield-options"; import windshieldOptions from "@/layouts/vehicle-damage/windshield-options/windshield-options";
import replaceOptionsQuestion from "@/layouts/vehicle-damage/replace-options-question/replace-options-question"; import replaceOptionsQuestion from "@/layouts/vehicle-damage/replace-options-question/replace-options-question";
import alert from "@/fmg-components/ux-components/alert/alert"; import alert from "@/ux-components/alert/alert";
// Supporting files // Supporting files
import { fetchCmsContentForPage } from "@/helpers/cms-content-helper"; import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";

2
src/layouts/vehicle-damage/windshield-options/windshield-options.vue
View file

@ -42,7 +42,7 @@
import windshieldDamageTypeQuestion from "@/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question"; import windshieldDamageTypeQuestion from "@/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question";
import windshieldChipCountQuestion from "@/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question"; import windshieldChipCountQuestion from "@/layouts/vehicle-damage/windshield-options/windshield-chip-count-question/windshield-chip-count-question";
import replaceOptionsQuestion from "@/layouts/vehicle-damage/replace-options-question/replace-options-question"; import replaceOptionsQuestion from "@/layouts/vehicle-damage/replace-options-question/replace-options-question";
import alert from "@/fmg-components/ux-components/alert/alert"; import alert from "@/ux-components/alert/alert";
import { defineRule } from "vee-validate"; import { defineRule } from "vee-validate";
import { required } from "@/helpers/validation-rules"; import { required } from "@/helpers/validation-rules";

2
src/layouts/vehicle-parts/vehicle-parts.vue
View file

@ -49,7 +49,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner"; import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header"; import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer"; import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
import alert from "@/fmg-components/ux-components/alert/alert"; import alert from "@/ux-components/alert/alert";
import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue"; import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
// Supporting Files // Supporting Files
import { fetchCmsContentForPage } from "@/helpers/cms-content-helper"; import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";

2
src/layouts/vin-lookup/vin-information/vin-information.vue
View file

@ -11,7 +11,7 @@
</template> </template>
<script> <script>
import textLink from "@/fmg-components/ux-components/text-link/text-link"; import textLink from "@/ux-components/text-link/text-link";
//Supporting files //Supporting files
import { settleAllPromises } from "@/helpers/layout-helper"; import { settleAllPromises } from "@/helpers/layout-helper";
export default { export default {

2
src/layouts/vin-lookup/vin-lookup.vue
View file

@ -114,7 +114,7 @@ import funnelHeader from "@/fmg-components/funnel-header/funnel-header";
import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer"; import funnelFooter from "@/fmg-components/funnel-footer/funnel-footer";
import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner"; import vehicleBanner from "@/fmg-components/vehicle-banner/vehicle-banner";
import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header"; import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
import alert from "@/fmg-components/ux-components/alert/alert"; import alert from "@/ux-components/alert/alert";
import textboxQuestion from "@/digital-components/textbox-question/textbox-question"; import textboxQuestion from "@/digital-components/textbox-question/textbox-question";
import vinInformation from "@/layouts/vin-lookup/vin-information/vin-information"; import vinInformation from "@/layouts/vin-lookup/vin-information/vin-information";
import textBlock from "@/digital-components/text-block/text-block"; import textBlock from "@/digital-components/text-block/text-block";

8
src/mixins/input-button-wrapper-mixin.spec.js
View file

@ -1,10 +1,10 @@
import { mount } from "@vue/test-utils"; import { mount } from "@vue/test-utils";
import baseInputButton from "@/digital-components/base-input-button/base-input-button"; import baseInputButton from "@/digital-components/base-input-button/base-input-button";
import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin"; import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";
import listButtonHorizontal from "@/fmg-components/ux-components/list-button-horizontal/list-button-horizontal"; import listButtonHorizontal from "@/ux-components/list-button-horizontal/list-button-horizontal";
import listButton from "@/fmg-components/ux-components/list-button/list-button"; import listButton from "@/ux-components/list-button/list-button";
import listCard from "@/fmg-components/ux-components/list-card/list-card"; import listCard from "@/ux-components/list-card/list-card";
import radio from "@/fmg-components/ux-components/radio/radio"; import radio from "@/ux-components/radio/radio";
describe("input-button-wrapper-mixin", () => { describe("input-button-wrapper-mixin", () => {
describe("mouse clicks", () => { describe("mouse clicks", () => {

2
src/styles/common-typography-styles.scss
View file

@ -42,7 +42,7 @@ h6,
.small { .small {
font-size: 0.875rem; font-size: 0.875rem;
line-height: 1.7; line-height: 1.7142857143;
font-weight: 400; font-weight: 400;
} }

0
src/fmg-components/ux-components/alert/alert.spec.js → src/ux-components/alert/alert.spec.js
View file

0
src/fmg-components/ux-components/alert/alert.vue → src/ux-components/alert/alert.vue
View file

0
src/fmg-components/ux-components/button-main/button-main.spec.js → src/ux-components/button-main/button-main.spec.js
View file

2
src/fmg-components/ux-components/button-main/button-main.vue → src/ux-components/button-main/button-main.vue
View file

@ -17,7 +17,7 @@
</template> </template>
<script> <script>
import loader from "@/fmg-components/ux-components/loader/loader"; import loader from "@/ux-components/loader/loader";
export default { export default {
name: "buttonMain", name: "buttonMain",

0
src/fmg-components/ux-components/checkbox/checkbox.spec.js → src/ux-components/checkbox/checkbox.spec.js
View file

0
src/fmg-components/ux-components/checkbox/checkbox.vue → src/ux-components/checkbox/checkbox.vue
View file

0
src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.spec.js → src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
View file

0
src/fmg-components/ux-components/list-button-horizontal/list-button-horizontal.vue → src/ux-components/list-button-horizontal/list-button-horizontal.vue
View file

0
src/fmg-components/ux-components/list-button/list-button.spec.js → src/ux-components/list-button/list-button.spec.js
View file

2
src/fmg-components/ux-components/list-button/list-button.vue → src/ux-components/list-button/list-button.vue
View file

@ -23,7 +23,7 @@
</template> </template>
<script> <script>
import loader from "@/fmg-components/ux-components/loader/loader"; import loader from "@/ux-components/loader/loader";
import baseInputButton from "@/digital-components/base-input-button/base-input-button"; import baseInputButton from "@/digital-components/base-input-button/base-input-button";
import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin"; import inputButtonWrapperMixin from "@/mixins/input-button-wrapper-mixin";

0
src/fmg-components/ux-components/list-card/list-card.spec.js → src/ux-components/list-card/list-card.spec.js
View file

0
src/fmg-components/ux-components/list-card/list-card.vue → src/ux-components/list-card/list-card.vue
View file

0
src/fmg-components/ux-components/loader/loader.spec.js → src/ux-components/loader/loader.spec.js
View file

2
src/fmg-components/ux-components/loader/loader.vue → src/ux-components/loader/loader.vue
View file

@ -42,7 +42,7 @@ export default {
//Spinner basics //Spinner basics
&:after { &:after {
content: ""; content: "";
mask: url(../../../assets/img/icons/spinner.svg); mask: url(../../assets/img/icons/spinner.svg);
mask-size: cover; mask-size: cover;
position: relative; position: relative;
width: 1rem; width: 1rem;

0
src/fmg-components/ux-components/radio/radio.spec.js → src/ux-components/radio/radio.spec.js
View file

0
src/fmg-components/ux-components/radio/radio.vue → src/ux-components/radio/radio.vue
View file

0
src/fmg-components/ux-components/text-link/text-link.spec.js → src/ux-components/text-link/text-link.spec.js
View file

0
src/fmg-components/ux-components/text-link/text-link.vue → src/ux-components/text-link/text-link.vue
View file