jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
CarlNation 2022-02-03 06:11:15 -05:00
commit 8bb6619050
5 changed files with 35 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/common-components/button-question/button-question.vue
View file

@ -11,7 +11,7 @@
:is="buttonType"
v-for="answer in answers"
:key="answer.Name ? answer.Name : answer"
@isChecked="handleCheckedChanged"
@isCheckedChanged="handleCheckedChanged"
:buttonID="answer.Name ? answer.Name : answer"
:value="answer.Name ? answer.Name : answer"
:buttonLabel="answer.Text ? answer.Text : answer"
@ -108,13 +108,14 @@ export default {
if(Array.isArray(this.answers) && this.answers.length === 1) {
this.modelValueAnswers.push(typeof(this.answers[0]) === 'object' ? this.answers[0].Name : this.answers[0]);
this.$emit("update:modelValue", this.modelValueAnswers);
};
}
},
methods: {
handleCheckedChanged(val) {
// Add or remove item to array of data to emit
val.isChecked ? this.modelValueAnswers.push(val.buttonId) : this.modelValueAnswers.splice(this.modelValueAnswers.indexOf(val.buttonId), 1);
this.$emit("update:modelValue", this.modelValueAnswers.length ? this.modelValueAnswers : undefined);
const answersToEmit = this.modelValueAnswers.length ? this.modelValueAnswers : undefined;
this.$emit("update:modelValue", answersToEmit);
},
},
components: {

6
src/common-components/funnel-footer/funnel-footer.vue
View file

@ -65,6 +65,9 @@ export default {
this.$nextTick(() => {
window.addEventListener('resize', this.onResize);
})
setTimeout(function(){ // Give it a moment to set the date
document.getElementById('years').innerHTML += new Date().getFullYear();
}, 100);
},
beforeUnmount() {
window.removeEventListener('resize', this.onResize);
@ -75,7 +78,4 @@ export default {
}
}
};
setTimeout(function(){ // Give it a moment to set the date
document.getElementById('years').innerHTML += new Date().getFullYear();
}, 100);
</script>

7
src/ux-components/list-button-horizontal/list-button-horizontal.vue
View file

@ -69,7 +69,7 @@ export default {
type: String,
default: "",
},
modelValue: false,
modelValue: [Array, String],
},
data() {
return {
@ -77,6 +77,9 @@ export default {
checkValue: Boolean,
};
},
created(){
this.checkValue = this.modelValue ? this.modelValue.includes(this.buttonID) : false;
},
methods: {
displayLoader() {
this.isLoaderDisplayed = true;
@ -90,7 +93,7 @@ export default {
},
watch: {
checkValue(){
this.$emit('isChecked', {isChecked: this.checkValue, buttonId: this.buttonID});
this.$emit('isCheckedChanged', {isChecked: this.checkValue, buttonId: this.buttonID});
}
},
components: {

2
src/ux-components/list-button/list-button.vue
View file

@ -95,7 +95,7 @@ export default {
},
watch: {
checkValue(){
this.$emit('isChecked', {isChecked: this.checkValue, buttonId: this.buttonID});
this.$emit('isCheckedChanged', {isChecked: this.checkValue, buttonId: this.buttonID});
}
},
components: {

44
src/ux-components/list-card/list-card.vue
View file

@ -1,32 +1,32 @@
<template>
<div :class="'col' + colLength">
<div class="list-card w-100 rounded-3 d-flex align-items-center h-100"
:class="isWide ? 'horizontal' : ''"
@mouseup="handleChange(value)"
<div class="list-card w-100 rounded-3 d-flex align-items-center h-100"
:class="isWide ? 'horizontal' : ''"
@mouseup="handleChange(value)"
@keyup.space="handleChange(value)">
<input
:type="isMultiSelect ? 'checkbox' : 'radio'"
:id="buttonID"
:name="groupName"
:value="buttonID"
:aria-required="isRequired"
:data-focus-target="groupName"
<input
:type="isMultiSelect ? 'checkbox' : 'radio'"
:id="buttonID"
:name="groupName"
:value="buttonID"
:aria-required="isRequired"
:data-focus-target="groupName"
v-model="checkValue"
/>
<label
:for="buttonID"
class="d-flex w-100 align-items-center px-2 h-100"
<label
:for="buttonID"
class="d-flex w-100 align-items-center px-2 h-100"
:class="getLabelClasses" tabindex="-1"
>
<img
:id="buttonImageId"
:class="!isWide ? 'order-1' : 'ms-auto order-3'"
:src="buttonImage"
<img
:id="buttonImageId"
:class="!isWide ? 'order-1' : 'ms-auto order-3'"
:src="buttonImage"
:alt="altText"
/>
<p
v-if="!isWide"
class="small order-3"
<p
v-if="!isWide"
class="small order-3"
:class="isMultiSelect ? 'm-0' : 'mt-2 mb-0'"
>
{{buttonLabel}}
@ -78,7 +78,7 @@ export default {
}
},
created(){
this.checkValue = this.modelValue.includes(this.buttonID);
this.checkValue = this.modelValue ? this.modelValue.includes(this.buttonID) : false;
},
computed: {
getLabelClasses() {
@ -95,7 +95,7 @@ export default {
},
watch: {
checkValue(){
this.$emit('isChecked', {isChecked: this.checkValue, buttonId: this.buttonID});
this.$emit('isCheckedChanged', {isChecked: this.checkValue, buttonId: this.buttonID});
}
},
setup(props) {