@@ -23,6 +23,8 @@ import funnelSubHeader from "@/common-components/funnel-sub-header/funnel-sub-he
// Supporting files
import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
import { settleAllPromises } from "@/helpers/layout-helper";
+import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
+
export default {
name: "vehicle-year",
data() {
@@ -67,7 +69,7 @@ export default {
watch: {
selectedYear(year) {
this.$store.commit(this.storeMutations.UPDATE_YEAR, year);
- this.$router.push('?fmgPage=vehicle-make');
+ this.$router.navigate(navigationScenarios.SELECTED_YEAR, this.$route);
}
},
diff --git a/src/router/index.js b/src/router/index.js
index a93fe6e54..c135d60c1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -3,7 +3,6 @@ import { storeActions } from "@/constants/store-actions.js";
import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js";
import { routingTable } from "@/router/router-constants/routing-table.js";
import ComponentTest from "@/layouts/component-test/component-test.vue";
-import LoaderDemo from "@/layouts/loader-demo/loader-demo.vue";
import NotFound from "@/layouts/not-found/not-found.vue";
import store from "@/store";
@@ -18,11 +17,6 @@ const routes = [
name: "ComponentTest",
component: ComponentTest,
},
- {
- path: "/loader-demo", // This is a temporary route for testing.
- name: "LoaderDemo",
- component: LoaderDemo,
- },
{
path: "/",
beforeEnter(to, from, next) {
diff --git a/src/router/router-constants/fmgPage-values.js b/src/router/router-constants/fmgPage-values.js
index e84d9e9ea..38486e111 100644
--- a/src/router/router-constants/fmgPage-values.js
+++ b/src/router/router-constants/fmgPage-values.js
@@ -1,6 +1,8 @@
const fmgPageValues = {
VEHICLE_YEAR: "vehicle-year",
VEHICLE_MAKE: "vehicle-make",
+ VEHICLE_MODEL: "vehicle-model",
+ VEHICLE_STYLE: "vehicle-style",
};
export { fmgPageValues };
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 3fc642d65..65947744e 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -1,5 +1,8 @@
const navigationScenarios = {
SELECTED_YEAR: "SELECTED_YEAR",
+ SELECTED_MODEL: "SELECTED_MODEL",
+ SELECTED_MAKE: "SELECTED_MAKE",
+ CLICKED_BACK: "CLICKED_BACK",
};
export { navigationScenarios };
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 7f3f3d0d1..826357f63 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -11,6 +11,32 @@ const routingTable = [
},
],
},
+ {
+ fmgPageValue: fmgPageValues.VEHICLE_MAKE,
+ maps: [
+ {
+ scenario: navigationScenarios.SELECTED_MAKE,
+ destinationFmgPageValue: fmgPageValues.VEHICLE_MODEL,
+ },
+ {
+ scenario: navigationScenarios.CLICKED_BACK,
+ destinationFmgPageValue: fmgPageValues.VEHICLE_YEAR,
+ }
+ ],
+ },
+ {
+ fmgPageValue: fmgPageValues.VEHICLE_MODEL,
+ maps: [
+ {
+ scenario: navigationScenarios.SELECTED_MODEL,
+ destinationFmgPageValue: fmgPageValues.VEHICLE_STYLE,
+ },
+ {
+ scenario: navigationScenarios.CLICKED_BACK,
+ destinationFmgPageValue: fmgPageValues.VEHICLE_MAKE,
+ }
+ ],
+ },
];
export { routingTable };
diff --git a/src/styles/common-list-styles.scss b/src/styles/common-list-styles.scss
index 4eb174a02..0d74a4258 100644
--- a/src/styles/common-list-styles.scss
+++ b/src/styles/common-list-styles.scss
@@ -1,6 +1,7 @@
.list-group {
&.list-button {
- input[type="radio"] {
+ input[type="radio"],
+ input[type="checkbox"] {
opacity: 0;
position: fixed;
width: 0;
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js b/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
index ac8dc3202..b7ae7ef49 100644
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
+++ b/src/ux-components/list-button-horizontal/list-button-horizontal.spec.js
@@ -31,7 +31,6 @@ describe("list-button.vue", () => {
});
expect(label.attributes()).toEqual({
- role: "radio",
tabindex: "-1",
for: "2023",
class: "d-flex flex-column justify-content-center py-3 px-4 last-item",
@@ -42,6 +41,6 @@ describe("list-button.vue", () => {
expect(paragraph.text()).toEqual("2023");
- expect(wrapper.vm.display).toBe(true);
+ expect(wrapper.vm.isLoaderDisplayed).toBe(true);
});
});
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
index 315a18995..b267f2bbb 100644
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.vue
+++ b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
@@ -1,13 +1,22 @@
-