From 5b5d03097cdb1ff6218ee189bd0aa4e585f19f50 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 17 Jul 2023 09:46:16 -0400 Subject: [PATCH 1/7] CSR-1530 fix multi-error displaying. --- src/layouts/vin-lookup/vin-lookup.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 709029459..41583308e 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -79,7 +79,7 @@ :manualHeadline="AlertPerfectMatchInsuranceVerifiedHeader" :manualCopy="AlertPerfectMatchInsuranceVerifiedBody" v-model="customAlertData" - v-if="vinPopulatedOnPageLoad && isInsuranceVerified && !displayInvalidZipAlert" + v-if="vinPopulatedOnPageLoad && isInsuranceVerified && !displayInvalidZipAlert && !displayNonServiceableZipAlert" alertClass="alert-success" /> Date: Mon, 17 Jul 2023 09:49:03 -0400 Subject: [PATCH 2/7] Code format. --- src/layouts/vin-lookup/vin-lookup.vue | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 41583308e..a6b902c09 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -79,7 +79,12 @@ :manualHeadline="AlertPerfectMatchInsuranceVerifiedHeader" :manualCopy="AlertPerfectMatchInsuranceVerifiedBody" v-model="customAlertData" - v-if="vinPopulatedOnPageLoad && isInsuranceVerified && !displayInvalidZipAlert && !displayNonServiceableZipAlert" + v-if=" + vinPopulatedOnPageLoad && + isInsuranceVerified && + !displayInvalidZipAlert && + !displayNonServiceableZipAlert + " alertClass="alert-success" /> Date: Mon, 17 Jul 2023 10:45:51 -0400 Subject: [PATCH 3/7] CSR-1483: styling fixes --- .../date-picker/date-picker.vue | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index a20884d40..2149a9cd5 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -56,15 +56,15 @@ :class="[!isLoading ? 'date-picker-hidden' : '']" loaderColor="blue" loaderPosition="center" /> + - @@ -660,27 +660,22 @@ export default { max-height: 0; } .date-picker { - overflow: hidden; position: relative; flex-grow: 1; display: flex; flex-direction: column; fieldset { - overflow-y: auto; flex-grow: 1; position: relative; - padding-bottom: 6rem; // arbitrary amount to provide enough spacing for scroll animation - max-height: 21.25rem; // 340px... arbitrary amount to not push View More link out of view on iphones } .loader { - position: absolute; height: 2rem; - width: 2rem; + width: calc(100% - 1.5rem); &::after { - width: 100%; - height: 100%; + width: 1.5rem; + height: 1.5rem; } } .calendar-grid-container { @@ -813,9 +808,9 @@ export default { display: flex; justify-content: center; align-items: center; - width: 3rem; + min-width: 2.5rem; + width: 2.5rem; height: 2.5rem; - min-width: 3rem; span { &.small { From 4e975f008d6eae06b8f1f95ee3efcf8c39937e20 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 17 Jul 2023 12:53:15 -0400 Subject: [PATCH 4/7] CSR-1541 fix spacing in funnel-sub-header. --- src/fmg-components/funnel-sub-header/funnel-sub-header.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fmg-components/funnel-sub-header/funnel-sub-header.vue b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue index 6beeaf321..a5cdf5c0b 100644 --- a/src/fmg-components/funnel-sub-header/funnel-sub-header.vue +++ b/src/fmg-components/funnel-sub-header/funnel-sub-header.vue @@ -2,7 +2,7 @@
-
+
{{ text }} From 3455c685cfb6eb97d5d5b77f7ef620cd2052c33d Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Mon, 17 Jul 2023 13:59:47 -0400 Subject: [PATCH 5/7] CSR-1483: updates to scroll animation --- .../date-picker/date-picker.vue | 57 ++++++++----------- 1 file changed, 23 insertions(+), 34 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index 2149a9cd5..8cd4faaac 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -60,6 +60,7 @@ v-if="calendarViewDirection === 'future' && !disableViewMoreDatesButton" type="button" class="btn btn-link" + id="viewMoreDates" :disabled="isLoading" @click="showAnotherMonth"> View more dates @@ -615,37 +616,27 @@ export default { }); }); }, - scrollToElement(elementId, speed, easing) { - // TODO - needs to be cleaned up & refactored - function scrollTopSmooth(wrapper, target, duration = 300, timingName = "linear") { - const initY = wrapper.scrollTop; - const wrapperRect = wrapper.getBoundingClientRect(); - const targetRect = target.getBoundingClientRect(); - const targetY = targetRect.top - wrapperRect.top - BUFFER_OFFSET; - const timingFunc = TIMINGFUNC_MAP[timingName]; - let start = null; - - const step = (timestamp) => { - start = start || timestamp; - const progress = timestamp - start, - // Growing from 0 to 1 - time = Math.min(1, (timestamp - start) / duration); - const percentageNew = timingFunc(time); - const distanceToGo = targetY; - const thisDistance = percentageNew * distanceToGo; - - wrapper.scrollTo(0, initY + thisDistance); - if (percentageNew < 1) { - window.requestAnimationFrame(step); - } - }; - window.requestAnimationFrame(step); - } - - const wrapper = document.getElementById("date-picker-fieldset"); - const targetMonth = document.getElementById(elementId); - - scrollTopSmooth(wrapper, targetMonth, 800, "ease-in-out"); + scrollToElement(elementId, duration = 800, easing = "ease-in-out") { + const wrapper = document.querySelector(".page-container-grouped-styles"); + const target = document.getElementById(elementId); + const initY = wrapper.scrollTop; + const wrapperRect = wrapper.getBoundingClientRect(); + const targetRect = target.getBoundingClientRect(); + const targetY = targetRect.top - wrapperRect.top - BUFFER_OFFSET; + const timingFunc = TIMINGFUNC_MAP[easing]; + let start = null; + const step = (timestamp) => { + start = start || timestamp; + const time = Math.min(1, (timestamp - start) / duration); + const percentageNew = timingFunc(time); + const distanceToGo = targetY; + const thisDistance = percentageNew * distanceToGo; + wrapper.scrollTo(0, initY + thisDistance); + if (percentageNew < 1) { + window.requestAnimationFrame(step); + } + }; + window.requestAnimationFrame(step); }, }, components: { @@ -655,6 +646,7 @@ export default { diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index e40dd13ba..d14a3345f 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -18,6 +18,7 @@ v-model="selectedDate" class="text-link-small" :customSelectableDatesCallback="getAvailableDatesMethod" + validationRules="date-required" @date-clicked="openInshopTimeSlotsModal" />