From 51bc26dd31de80953ad8a3cc8b4aec4241b41202 Mon Sep 17 00:00:00 2001 From: sheena Date: Thu, 13 Apr 2023 15:53:21 +0530 Subject: [PATCH 1/6] SSR-391 Removed focus border --- src/ux-components/button-main/button-main.vue | 7 ++----- src/ux-components/modal-button-main/modal-button-main.vue | 8 +++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue index eb217eb0..cbedb407 100644 --- a/src/ux-components/button-main/button-main.vue +++ b/src/ux-components/button-main/button-main.vue @@ -68,14 +68,11 @@ export default { @media (hover: hover) { background: linear-gradient(270deg, $blue 0%, $blue-800 100%); } - &:focus { - box-shadow: 0 0 0 3px, 0 0 0 5.5px $blue-700; - } - &:focus, // Mouse, touch, stylus focus + // Mouse, touch, stylus focus &:focus-visible { // Keyboard focus for accessibility outline: none; - box-shadow: 0 0 0 3px, 0 0 0 5.5px $blue-700; + box-shadow: 0 0 0 3px, 0 0 0 5.5px; color: $white; background: linear-gradient(270deg, rgba(6, 87, 124, 1) 0%, rgba(6, 87, 124, 1) 100%); } diff --git a/src/ux-components/modal-button-main/modal-button-main.vue b/src/ux-components/modal-button-main/modal-button-main.vue index 3cf8f7a2..a9ce22ae 100644 --- a/src/ux-components/modal-button-main/modal-button-main.vue +++ b/src/ux-components/modal-button-main/modal-button-main.vue @@ -75,14 +75,12 @@ export default { @media (hover: hover) { background: linear-gradient(270deg, $blue 0%, $blue-800 100%); } - &:focus { - box-shadow: 0 0 0 3px, 0 0 0 5.5px $blue-700; - } - &:focus, // Mouse, touch, stylus focus + + // Mouse, touch, stylus focus &:focus-visible { // Keyboard focus for accessibility outline: none; - box-shadow: 0 0 0 3px, 0 0 0 5.5px $blue-700; + box-shadow: 0 0 0 3px, 0 0 0 5.5px; color: $white; background: linear-gradient(270deg, rgba(6, 87, 124, 1) 0%, rgba(6, 87, 124, 1) 100%); } From ca0fa0c36f408f091e8fb6ee401657823d416c00 Mon Sep 17 00:00:00 2001 From: "US\\katie.kroell" Date: Thu, 13 Apr 2023 11:56:48 -0400 Subject: [PATCH 2/6] shell for schedule-page --- src/layouts/schedule-page/schedule-page.vue | 81 +++++++++++++++++++ src/router/router-constants/issPage-values.js | 1 + src/router/router-constants/routing-table.js | 10 +++ 3 files changed, 92 insertions(+) create mode 100644 src/layouts/schedule-page/schedule-page.vue diff --git a/src/layouts/schedule-page/schedule-page.vue b/src/layouts/schedule-page/schedule-page.vue new file mode 100644 index 00000000..e54d28ce --- /dev/null +++ b/src/layouts/schedule-page/schedule-page.vue @@ -0,0 +1,81 @@ + + + diff --git a/src/router/router-constants/issPage-values.js b/src/router/router-constants/issPage-values.js index b660f98f..0b6f73c6 100644 --- a/src/router/router-constants/issPage-values.js +++ b/src/router/router-constants/issPage-values.js @@ -19,6 +19,7 @@ export const issPageValues = { COVERAGE_STATEMENT: "coverage-statement", PROVIDER_PREFERENCE: "provider-preference", SERVICE_LOCATION: "service-location", + SCHEDULE_PAGE: "schedule-page", REVEAL: "reveal", ESTIMATE: "estimate", ADDRESS_VEHICLES: "address-vehicles", diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index ef72bec4..57b173a3 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -450,6 +450,16 @@ const routingTable = function(store) { ], }, + { + issPageValue: issPageValues.SCHEDULE_PAGE, + maps: [ + { + scenario: navigationScenarios.CLICKED_BACK, + destinationIssPageValue: issPageValues.SERVICE_LOCATION, + }, + + ], + }, ]; }; From 0f85033fddc0214cc74bb4aec958e3d2ebda8ec9 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 14 Apr 2023 08:54:07 -0400 Subject: [PATCH 3/6] SSR-403 Fix issue where page doesn't load at top... of next page when changing routes. --- src/router/index.js | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index bc8579c6..a497a375 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -35,7 +35,7 @@ const routes = [ await runExperiments(to.query.issPage); } - + // Process ISS cookie. updateOrCreateISSCookie(); @@ -74,9 +74,13 @@ const routes = [ const router = createRouter({ history: createWebHistory("/"), routes, + scrollBehavior(to, from, savedPosition) { + // always scroll to top + return { top: 0 } + }, }); -router.afterEach((to, from) => { +router.afterEach((to, from) => { const store = useMainStore(); // Update lastPageVisited in the store @@ -95,12 +99,12 @@ router.afterEach((to, from) => { // Get route information by page name. // This will reach out to the Cms and there is a 1:1 relationship between page names and route names. async function GetRouteInfoFromPageName(pageName) { - + const response = await useMainStore().getRouteInfo(pageName); const jsonFromResponse = JSON.parse(response.data.Result); let routeData = []; - + // Add our route data and return our array. Object.keys(jsonFromResponse).forEach((key) => { routeData.push({ @@ -137,7 +141,7 @@ router.overrideNavigation = ( router.navigate = (scenario, currentRoute, optionalQuery = {}, optionalParams = {}, optionalPageData = {}) => { navigate(scenario, currentRoute, optionalQuery, optionalParams, optionalPageData); - + } // Navigate to the next route, depending on the scenario. @@ -152,11 +156,11 @@ function navigate (scenario, currentRoute, optionalQuery = {}, optionalParams = if (!matchingScenarioMap){ console.error("No matching scenario found. Please review the routing table."); - return; - } + return; + } if (matchingScenarioMap.destinationIssPageValue) { - + // Update page data to the store for next page if provided. Otherwise, keep existing page data or set to empty object const existingPageDataForPage = useMainStore().pageData(matchingScenarioMap.destinationIssPageValue); baseMixin.methods.savePageDataToStore( @@ -183,11 +187,11 @@ function navigate (scenario, currentRoute, optionalQuery = {}, optionalParams = function navigateToUrl(url, optionalQuery = {}) { // possibly show some loading screen in the future here. let externalUrl = new URL(url); - + for (const queryKey in optionalQuery) { externalUrl.searchParams.append(queryKey, optionalQuery[queryKey]); } - + window.location.assign(externalUrl); }; @@ -204,14 +208,14 @@ function getNavigationMap (scenario, currentRoute) { ); let maps = matchedQueryValue ? matchedQueryValue.map((m) => m.maps.filter((map) => map.scenario === scenario))[0] : undefined; - + return maps ? maps.filter(x => x.filter === true || x.filter === undefined)[0] : undefined; } catch (e) { console.error(e); return undefined; } - + }; function GoToStartOn404(next) { @@ -260,4 +264,4 @@ async function runExperiments(nextPage) { }); } -export default router; \ No newline at end of file +export default router; From 38f59d0c0f2f22a5300a87d37a62ee5f838b1471 Mon Sep 17 00:00:00 2001 From: sheena Date: Mon, 17 Apr 2023 17:07:24 +0530 Subject: [PATCH 4/6] SSR-391 Removed Focus onClick --- src/styles/client-customizations.scss | 4 +--- src/ux-components/button-main/button-main.vue | 4 ++-- src/ux-components/modal-button-main/modal-button-main.vue | 5 ++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/styles/client-customizations.scss b/src/styles/client-customizations.scss index 87bf3701..5e0db1ec 100644 --- a/src/styles/client-customizations.scss +++ b/src/styles/client-customizations.scss @@ -33,9 +33,7 @@ $limu-button-color: #A9E3E9; color: $limu-button-text-color !important; box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $limu-button-color !important; } - &:focus { - box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $limu-button-color !important; - } + } } diff --git a/src/ux-components/button-main/button-main.vue b/src/ux-components/button-main/button-main.vue index cbedb407..3ff1648d 100644 --- a/src/ux-components/button-main/button-main.vue +++ b/src/ux-components/button-main/button-main.vue @@ -72,7 +72,7 @@ export default { &:focus-visible { // Keyboard focus for accessibility outline: none; - box-shadow: 0 0 0 3px, 0 0 0 5.5px; + box-shadow: 0 0 0 3px, 0 0 0 5.5px $blue-700; color: $white; background: linear-gradient(270deg, rgba(6, 87, 124, 1) 0%, rgba(6, 87, 124, 1) 100%); } @@ -90,7 +90,7 @@ export default { &.has-loader { color: $white; background: $blue-700; - box-shadow: 0 0 0 3px, 0 0 0 5.5px $blue-700; + } &.delay { // fixes flicker while transitioning between states diff --git a/src/ux-components/modal-button-main/modal-button-main.vue b/src/ux-components/modal-button-main/modal-button-main.vue index a9ce22ae..b8255af7 100644 --- a/src/ux-components/modal-button-main/modal-button-main.vue +++ b/src/ux-components/modal-button-main/modal-button-main.vue @@ -80,7 +80,7 @@ export default { &:focus-visible { // Keyboard focus for accessibility outline: none; - box-shadow: 0 0 0 3px, 0 0 0 5.5px; + box-shadow: 0 0 0 3px, 0 0 0 5.5px $blue-700; color: $white; background: linear-gradient(270deg, rgba(6, 87, 124, 1) 0%, rgba(6, 87, 124, 1) 100%); } @@ -97,8 +97,7 @@ export default { } &.has-loader { color: $white; - background: $blue-700; - box-shadow: 0 0 0 3px, 0 0 0 5.5px $blue-700; + background: $blue-700; pointer-events: none; } &.delay { From 758eb00d38bf9c480bb3422c200b15a02e88cfc5 Mon Sep 17 00:00:00 2001 From: Reddy Date: Mon, 17 Apr 2023 17:56:15 +0530 Subject: [PATCH 5/6] SSR-400 Front end for contact details page --- .../contact-details/contact-details.vue | 81 +++++++++++++++++++ src/router/router-constants/issPage-values.js | 1 + src/router/router-constants/routing-table.js | 10 +++ 3 files changed, 92 insertions(+) create mode 100644 src/layouts/contact-details/contact-details.vue diff --git a/src/layouts/contact-details/contact-details.vue b/src/layouts/contact-details/contact-details.vue new file mode 100644 index 00000000..e5b09827 --- /dev/null +++ b/src/layouts/contact-details/contact-details.vue @@ -0,0 +1,81 @@ + + + diff --git a/src/router/router-constants/issPage-values.js b/src/router/router-constants/issPage-values.js index 0b6f73c6..119f19b7 100644 --- a/src/router/router-constants/issPage-values.js +++ b/src/router/router-constants/issPage-values.js @@ -20,6 +20,7 @@ export const issPageValues = { PROVIDER_PREFERENCE: "provider-preference", SERVICE_LOCATION: "service-location", SCHEDULE_PAGE: "schedule-page", + CONTACT_DETAILS: "contact-details", REVEAL: "reveal", ESTIMATE: "estimate", ADDRESS_VEHICLES: "address-vehicles", diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 57b173a3..8145eedb 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -460,6 +460,16 @@ const routingTable = function(store) { ], }, + { + issPageValue: issPageValues.CONTACT_DETAILS, + maps: [ + { + scenario: navigationScenarios.CLICKED_BACK, + destinationIssPageValue: issPageValues.SCHEDULE_PAGE, + }, + + ], + }, ]; }; From a1db722aff85c1946540f87fbc1620d1de03fc33 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Wed, 19 Apr 2023 09:44:31 -0400 Subject: [PATCH 6/6] SSR-348 unsticky service location page header. --- .../service-location/service-location.vue | 76 ++++++++++--------- 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index 36fe02e1..48d8c69f 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -1,30 +1,38 @@