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

Merge branch 'develop' into feature/CSR-803-refactoring-2

Browse source
This commit is contained in:
Adam Caouette 2022-11-08 15:16:56 -05:00
commit 35368a2c07
3 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common-components/loading-modal/loading-modal.vue
View file

@ -13,19 +13,19 @@
<div class="col"> <div class="col">
<div class="text-container slide"> <div class="text-container slide">
<p> <p>
Assessing your damage Finding shops near you
<span class="dot-1">.</span> <span class="dot-1">.</span>
<span class="dot-2">.</span> <span class="dot-2">.</span>
<span class="dot-3">.</span> <span class="dot-3">.</span>
</p> </p>
<p> <p>
Finding your glass Looking for dates
<span class="dot-1">.</span> <span class="dot-1">.</span>
<span class="dot-2">.</span> <span class="dot-2">.</span>
<span class="dot-3">.</span> <span class="dot-3">.</span>
</p> </p>
<p> <p>
Generating your quote Searching for times
<span class="dot-1">.</span> <span class="dot-1">.</span>
<span class="dot-2">.</span> <span class="dot-2">.</span>
<span class="dot-3">.</span> <span class="dot-3">.</span>

4
src/common-components/textbox-question/textbox-question.spec.js
View file

@ -53,7 +53,7 @@ describe("textboxQuestion.vue", () => {
expect(paragraph.attributes("class")).toContain("rounded-pill"); expect(paragraph.attributes("class")).toContain("rounded-pill");
}); });
it.only("Should return text-center class", async () => { it.only("Should return form-control class", async () => {
// Act // Act
const wrapper = shallowMount(textboxQuestion, { const wrapper = shallowMount(textboxQuestion, {
global: { global: {
@ -70,7 +70,7 @@ describe("textboxQuestion.vue", () => {
// Assert // Assert
const paragraph = wrapper.find("input"); const paragraph = wrapper.find("input");
expect(paragraph.attributes("class")).toContain("text-center"); expect(paragraph.attributes("class")).toContain("form-control");
}); });
it("Should render the 'questionText' data value as the label text when disableAutoFill is false.", async () => { it("Should render the 'questionText' data value as the label text when disableAutoFill is false.", async () => {

17
src/common-components/textbox-question/textbox-question.vue
View file

@ -4,7 +4,6 @@
:for="inputId" :for="inputId"
:aria-label="questionText" :aria-label="questionText"
class="form-label" class="form-label"
:class="[questionAlignment ? 'mx-auto' : '']"
v-html="labelText"></label> v-html="labelText"></label>
<div class="input-wrapper" :class="[includeSearchIcon ? 'has-search-icon' : '']"> <div class="input-wrapper" :class="[includeSearchIcon ? 'has-search-icon' : '']">
<input <input
@ -23,8 +22,8 @@
:class="[ :class="[
hasIcon ? 'has-icon' : '', hasIcon ? 'has-icon' : '',
iconRight ? 'icon-right' : '', iconRight ? 'icon-right' : '',
questionAlignment ? 'text-center' : '', questionAlignment === 'center' ? 'text-center' : '',
isRoundedPill ? 'rounded-pill' : '', cornerStyle === 'rounded' ? 'rounded-pill' : '',
]" ]"
:validationRules="validationRules" :validationRules="validationRules"
@change="handleChange" @change="handleChange"
@ -66,9 +65,9 @@ export default {
}, },
validationRules: String, validationRules: String,
cmsWidgetName: String, cmsWidgetName: String,
maxLength: String, // Left or center. Default is left maxLength: String,
questionAlignment: String, // Left or center. Default is left questionAlignment: String, // Left or center. Left is default.
cornerStyle: String, // Left or center. Default is left cornerStyle: String, // Rounded or square. Square is default.
includeSearchIcon: Boolean, includeSearchIcon: Boolean,
}, },
setup(props) { setup(props) {
@ -107,12 +106,6 @@ export default {
}; };
}, },
computed: { computed: {
isRoundedPill() {
return this.cornerStyle === "rounded";
},
isQuestionAlignment() {
return this.questionAlignment === "text";
},
questionText() { questionText() {
return this.getCmsContent(this.cmsWidgetName, "QuestionText"); return this.getCmsContent(this.cmsWidgetName, "QuestionText");
}, },