From e3fbd68ba3fb9ae4b210e4bee50a4bb2bff2db96 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 14 Jan 2022 14:50:27 -0500 Subject: [PATCH 1/4] Adding language attribute to the html tag --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 9047c9643..35da253dd 100644 --- a/public/index.html +++ b/public/index.html @@ -1,5 +1,5 @@ - + From e89f33a0eb98e38f459ccf69aaac31af3461f07e Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 14 Jan 2022 16:02:32 -0500 Subject: [PATCH 2/4] Removing unneeded class and updating const name to be more specific --- src/layouts/vehicle-damage/vehicle-damage.vue | 5 ++--- src/layouts/vehicle-make/vehicle-make.vue | 1 - src/layouts/vehicle-model/vehicle-model.vue | 1 - src/layouts/vehicle-style/vehicle-style.vue | 1 - src/layouts/vehicle-year/vehicle-year.vue | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue index abf24e998..ea77b4494 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.vue +++ b/src/layouts/vehicle-damage/vehicle-damage.vue @@ -3,7 +3,6 @@ @@ -26,7 +25,7 @@ export default ({ beforeRouteEnter(to, from, next) { // Call APIs const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage); - const damageOptions = baseMixin.methods.dispatchNonBlockingStoreAction(storeActions.GET_DAMAGE_OPTIONS, {carId: store.getters.vehicle.carId}); + const damageOptionsPromise = baseMixin.methods.dispatchNonBlockingStoreAction(storeActions.GET_DAMAGE_OPTIONS, {carId: store.getters.vehicle.carId}); // Settle promises and get results const promiseResultMap = [ @@ -36,7 +35,7 @@ export default ({ }, { resultKey: "damageOptions", - promise: damageOptions + promise: damageOptionsPromise }, ]; diff --git a/src/layouts/vehicle-make/vehicle-make.vue b/src/layouts/vehicle-make/vehicle-make.vue index e641c4c73..031ffb20b 100644 --- a/src/layouts/vehicle-make/vehicle-make.vue +++ b/src/layouts/vehicle-make/vehicle-make.vue @@ -9,7 +9,6 @@ :hasBackButton="true" backButtonAccessibleText="Change Vehicle Year" @click-event="backButtonAction" - class="Header" /> diff --git a/src/layouts/vehicle-model/vehicle-model.vue b/src/layouts/vehicle-model/vehicle-model.vue index c682e9e24..8d99afdb8 100644 --- a/src/layouts/vehicle-model/vehicle-model.vue +++ b/src/layouts/vehicle-model/vehicle-model.vue @@ -9,7 +9,6 @@ :hasBackButton="true" backButtonAccessibleText="Change Vehicle Make" @click-event="backButtonAction" - class="Header" /> diff --git a/src/layouts/vehicle-style/vehicle-style.vue b/src/layouts/vehicle-style/vehicle-style.vue index ea3300036..a9ac67ef5 100644 --- a/src/layouts/vehicle-style/vehicle-style.vue +++ b/src/layouts/vehicle-style/vehicle-style.vue @@ -9,7 +9,6 @@ :hasBackButton="true" backButtonAccessibleText="Change Vehicle Model" @click-event="backButtonAction" - class="Header" /> diff --git a/src/layouts/vehicle-year/vehicle-year.vue b/src/layouts/vehicle-year/vehicle-year.vue index c5c85675e..e95865f57 100644 --- a/src/layouts/vehicle-year/vehicle-year.vue +++ b/src/layouts/vehicle-year/vehicle-year.vue @@ -5,7 +5,6 @@
From d038b44198a3052d101d5bb456b39314ffc50e70 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Mon, 17 Jan 2022 14:21:34 -0500 Subject: [PATCH 3/4] CSR-302: move certain scss files to avoid prepend duplications --- src/App.vue | 8 ++++++++ vue.config.js | 5 ----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/App.vue b/src/App.vue index a44ab87b7..3d665312e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,3 +1,11 @@ + + \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 9d9b2401b..0c1664eb5 100644 --- a/vue.config.js +++ b/vue.config.js @@ -14,11 +14,6 @@ module.exports = { @import "./node_modules/bootstrap/scss/variables"; @import "./node_modules/bootstrap/scss/mixins"; @import "@/styles/mixins/customMixins"; - @import "./node_modules/bootstrap/scss/bootstrap"; - @import "@/styles/common-styles.scss"; - @import "@/styles/common-button-styles.scss"; - @import "@/styles/common-list-styles.scss"; - @import "@/styles/common-typography-styles.scss"; `, }, }, From 045a77b11acf4214b8558000693b0890371cf0f0 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Mon, 17 Jan 2022 14:35:45 -0500 Subject: [PATCH 4/4] CSR-302: add comments and also put change on vue.release.config.js --- vue.config.js | 1 + vue.release.config.js | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/vue.config.js b/vue.config.js index 0c1664eb5..316656ed1 100644 --- a/vue.config.js +++ b/vue.config.js @@ -8,6 +8,7 @@ module.exports = { loaderOptions: { sass: { // Load Order Matters!!! + // Note: only include functions, variables and mixins here prependData: ` @import "./node_modules/bootstrap/scss/functions"; @import "@/styles/ux-variables.scss"; diff --git a/vue.release.config.js b/vue.release.config.js index c4b18d5dd..43fffb47f 100644 --- a/vue.release.config.js +++ b/vue.release.config.js @@ -7,17 +7,13 @@ module.exports = { loaderOptions: { sass: { // Load Order Matters!!! + // Note: only include functions, variables and mixins here prependData: ` @import "./node_modules/bootstrap/scss/functions"; @import "@/styles/ux-variables.scss"; @import "./node_modules/bootstrap/scss/variables"; @import "./node_modules/bootstrap/scss/mixins"; - @import "@/styles/mixins/customMixins"; - @import "./node_modules/bootstrap/scss/bootstrap"; - @import "@/styles/common-styles.scss"; - @import "@/styles/common-button-styles.scss"; - @import "@/styles/common-list-styles.scss"; - @import "@/styles/common-typography-styles.scss"; + @import "@/styles/mixins/customMixins"; `, }, },