From 4ae9f1fe266a4a088ee3a7bb31f356e88f6a773a Mon Sep 17 00:00:00 2001 From: bmauger Date: Thu, 27 Jan 2022 14:17:40 -0500 Subject: [PATCH 1/5] Set aria-required to true for Bindu test. --- src/layouts/vehicle-year/year-question/year-question.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/layouts/vehicle-year/year-question/year-question.vue b/src/layouts/vehicle-year/year-question/year-question.vue index d189bb54a..792e6d848 100644 --- a/src/layouts/vehicle-year/year-question/year-question.vue +++ b/src/layouts/vehicle-year/year-question/year-question.vue @@ -7,6 +7,7 @@ textPosition="text-start" :loaderEnabled="true" v-model="modelValue" + isRequired=true /> @@ -44,4 +45,4 @@ export default { } }, }; - \ No newline at end of file + From 30fcdbefce7c0494cdbbf6aa228d4f7e75a01fa8 Mon Sep 17 00:00:00 2001 From: bmauger Date: Thu, 27 Jan 2022 14:41:55 -0500 Subject: [PATCH 2/5] CSR-262 update file name per Mark's request. --- src/App.vue | 2 +- src/styles/{error-styles.scss => common-error-styles.scss} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/styles/{error-styles.scss => common-error-styles.scss} (100%) diff --git a/src/App.vue b/src/App.vue index f64aad6aa..a11e5a9f7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,5 +7,5 @@ @import "@/styles/common-styles.scss"; @import "@/styles/common-list-styles.scss"; @import "@/styles/common-typography-styles.scss"; - @import "@/styles/error-styles.scss"; + @import "@/styles/common-error-styles.scss"; diff --git a/src/styles/error-styles.scss b/src/styles/common-error-styles.scss similarity index 100% rename from src/styles/error-styles.scss rename to src/styles/common-error-styles.scss From 21d2ba883d9e6afc632b7ad19aa1adf3720b8602 Mon Sep 17 00:00:00 2001 From: bmauger Date: Thu, 27 Jan 2022 14:54:10 -0500 Subject: [PATCH 3/5] Move list-button styles to component. Delete common-list-styles.scss. --- src/App.vue | 1 - src/styles/common-list-styles.scss | 44 ------------------- src/ux-components/list-button/list-button.vue | 34 ++++++++++++++ 3 files changed, 34 insertions(+), 45 deletions(-) delete mode 100644 src/styles/common-list-styles.scss diff --git a/src/App.vue b/src/App.vue index a11e5a9f7..76a01d29c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,7 +5,6 @@ diff --git a/src/styles/common-list-styles.scss b/src/styles/common-list-styles.scss deleted file mode 100644 index 9e232f54d..000000000 --- a/src/styles/common-list-styles.scss +++ /dev/null @@ -1,44 +0,0 @@ -.list-group { - &.list-button { - input[type="radio"], - input[type="checkbox"] { - opacity: 0; - position: fixed; - width: 0; - &:focus-visible + label { - box-shadow: 0 0 0 2.5px $blue inset; - } - &:focus + label { - box-shadow: 0 0 0 2.5px $blue inset; - } - &:checked + label { - color: $black; - font-weight: 500; - background: $blue-100; - box-shadow: 0 0 0 1px $blue; - } - &:checked + label p:first-child { - font-weight: 500; - } - } - label { - color: $gray-600; - position: relative; - background: $white; - transition: all 150ms linear; - border-radius: $border-radius-lg; - border: 1px solid $gray-500; - width: 100%; - - &:hover { - @include media-breakpoint-up(sm) { - box-shadow: 0 0 0 4px $blue-100; - } - cursor: pointer; - } - + p { - display: none; - } - } - } -} diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue index 5fa285c31..7349ee6b3 100644 --- a/src/ux-components/list-button/list-button.vue +++ b/src/ux-components/list-button/list-button.vue @@ -77,6 +77,40 @@ export default { position: static; //override bootstrap height: 0; } + &:focus-visible + label { + box-shadow: 0 0 0 2.5px $blue inset; + } + &:focus + label { + box-shadow: 0 0 0 2.5px $blue inset; + } + &:checked + label { + color: $black; + font-weight: 500; + background: $blue-100; + box-shadow: 0 0 0 1px $blue; + } + &:checked + label p:first-child { + font-weight: 500; + } + } + label { + color: $gray-600; + position: relative; + background: $white; + transition: all 150ms linear; + border-radius: $border-radius-lg; + border: 1px solid $gray-500; + width: 100%; + + &:hover { + @include media-breakpoint-up(sm) { + box-shadow: 0 0 0 4px $blue-100; + } + cursor: pointer; + } + + p { + display: none; + } } } From 209850826c792cdf2d59a8c23a99093437401539 Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Thu, 27 Jan 2022 15:35:21 -0500 Subject: [PATCH 4/5] trying to fix params --- src/router/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/router/index.js b/src/router/index.js index 2a80032f6..978157016 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -35,6 +35,7 @@ const routes = [ }, { path: "/", + name: "root", async beforeEnter(to, from, next) { // If we have no query string, or we don't have the FmgPage query string. if (to.query.fmgPage === undefined) { @@ -97,7 +98,7 @@ router.navigate = ( if (matchingScenarioMap.destinationFmgPageValue !== undefined) { // We're always pushing the same path, just changing query strings. Make sure our optional query strings get combined with our fmgPage one. router.push({ - path: "/", + name: "root", query: Object.assign(optionalQuery, { fmgPage: matchingScenarioMap.destinationFmgPageValue, }), From 19136a04c08755cc39945f58b720e34400fa85a8 Mon Sep 17 00:00:00 2001 From: Mark Harris Date: Thu, 27 Jan 2022 15:58:35 -0500 Subject: [PATCH 5/5] transmitting params in router --- src/router/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 978157016..79894066e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -45,7 +45,7 @@ const routes = [ try { // If we already have our route, go to it. if (router.hasRoute(to.query.fmgPage)) { - return next({ name: to.query.fmgPage, query: to.query }); + return next({ name: to.query.fmgPage, query: to.query, params: to.params }); } // Get route info for the given url. Names will have a 1:1 relationship with names in the Cms. @@ -59,7 +59,7 @@ const routes = [ }); // Assign current query string parameters, as well as our fmgPage one. - next({ name: routeData[0].name, query: Object.assign(to.query, { fmgPage: routeData[0].name }) }); + next({ name: routeData[0].name, query: Object.assign(to.query, { fmgPage: routeData[0].name }), params: to.params }); } catch (error) { console.log(error);