From 2205b7104dce02a5b5e8c34f9cba4f215ab5869d Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Wed, 28 Feb 2024 19:14:29 +0530 Subject: [PATCH 1/3] CSR-1993 Green tint privacy --- src/assets/img/tints/Glass-NoShade-GreenTint-Privacy.svg | 1 + src/constants/tint-mapper.js | 1 + 2 files changed, 2 insertions(+) create mode 100644 src/assets/img/tints/Glass-NoShade-GreenTint-Privacy.svg diff --git a/src/assets/img/tints/Glass-NoShade-GreenTint-Privacy.svg b/src/assets/img/tints/Glass-NoShade-GreenTint-Privacy.svg new file mode 100644 index 000000000..fecc16e63 --- /dev/null +++ b/src/assets/img/tints/Glass-NoShade-GreenTint-Privacy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/constants/tint-mapper.js b/src/constants/tint-mapper.js index 519de0855..e5d1a3b30 100644 --- a/src/constants/tint-mapper.js +++ b/src/constants/tint-mapper.js @@ -33,6 +33,7 @@ const tintMap = { { name: "green tint", src: "Glass-NoShade-GreenTint.svg" }, { name: "gray tint privacy", src: "Glass-NoShade-GrayTint.svg" }, { name: "blue tint", src: "Glass-NoShade-BlueTint.svg" }, + { name: "green tint privacy", src: "Glass-NoShade-GreenTint-Privacy.svg" }, // No shade or tint { name: "clear", src: "Glass-NoShade-NoTint.svg" }, From ad4c113c2681410fa77cc4c33db5e30f9544ea11 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Wed, 28 Feb 2024 09:38:26 -0500 Subject: [PATCH 2/3] Fix svg image. --- src/assets/img/tints/Glass-NoShade-GreenTint.svg | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/assets/img/tints/Glass-NoShade-GreenTint.svg b/src/assets/img/tints/Glass-NoShade-GreenTint.svg index 5f5b99de0..cdf96aa3d 100644 --- a/src/assets/img/tints/Glass-NoShade-GreenTint.svg +++ b/src/assets/img/tints/Glass-NoShade-GreenTint.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file From 3ebffb11289eadb6acd2074a77529df068f328c0 Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Fri, 1 Mar 2024 18:48:04 +0530 Subject: [PATCH 3/3] tint image optional tint image optional --- .../img/tints/Glass-NoShade-GreenTint-Privacy.svg | 1 - src/assets/img/tints/Glass-NoShade-GreenTint.svg | 4 +++- src/constants/tint-mapper.js | 1 - .../glass-part-question/glass-part-question.vue | 15 +++++---------- src/ux-components/list-card/list-card.vue | 1 + 5 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 src/assets/img/tints/Glass-NoShade-GreenTint-Privacy.svg diff --git a/src/assets/img/tints/Glass-NoShade-GreenTint-Privacy.svg b/src/assets/img/tints/Glass-NoShade-GreenTint-Privacy.svg deleted file mode 100644 index fecc16e63..000000000 --- a/src/assets/img/tints/Glass-NoShade-GreenTint-Privacy.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/img/tints/Glass-NoShade-GreenTint.svg b/src/assets/img/tints/Glass-NoShade-GreenTint.svg index cdf96aa3d..5f5b99de0 100644 --- a/src/assets/img/tints/Glass-NoShade-GreenTint.svg +++ b/src/assets/img/tints/Glass-NoShade-GreenTint.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/src/constants/tint-mapper.js b/src/constants/tint-mapper.js index e5d1a3b30..519de0855 100644 --- a/src/constants/tint-mapper.js +++ b/src/constants/tint-mapper.js @@ -33,7 +33,6 @@ const tintMap = { { name: "green tint", src: "Glass-NoShade-GreenTint.svg" }, { name: "gray tint privacy", src: "Glass-NoShade-GrayTint.svg" }, { name: "blue tint", src: "Glass-NoShade-BlueTint.svg" }, - { name: "green tint privacy", src: "Glass-NoShade-GreenTint-Privacy.svg" }, // No shade or tint { name: "clear", src: "Glass-NoShade-NoTint.svg" }, diff --git a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue index 25a73e112..280edfc6c 100644 --- a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue +++ b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue @@ -95,19 +95,14 @@ export default { }, tintSelectionOptions() { - let tintOptions = []; - - Object.keys(this.featureListData).forEach((tintOption) => { - tintOptions.push({ + const tintOptions = Object.keys(this.featureListData).map((tintOption) => { + const buttonImage = this.getTintSourceImage(this.glassLocation, tintOption); + return { value: tintOption, buttonLabel: tintOption, - buttonImage: require(`@/assets/img/tints/${this.getTintSourceImage( - this.glassLocation, - tintOption - )}`), - }); + buttonImage: buttonImage ? require(`@/assets/img/tints/${buttonImage}`) : null, + }; }); - return tintOptions; }, diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue index 902baa1e1..ffdf4efc0 100644 --- a/src/ux-components/list-card/list-card.vue +++ b/src/ux-components/list-card/list-card.vue @@ -10,6 +10,7 @@ class="d-flex w-100 align-items-center px-2 h-100 list-card-content button-content rounded-3" :class="labelClasses">