From 98303b15b8f09557005030642dbf72fe58e5ce82 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Tue, 18 Jan 2022 17:18:12 -0500 Subject: [PATCH 1/6] CSR-254: fix checkbox valid issue --- src/layouts/form-test/form-test.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/layouts/form-test/form-test.vue b/src/layouts/form-test/form-test.vue index 4d9db67f4..9a0b7f6c0 100644 --- a/src/layouts/form-test/form-test.vue +++ b/src/layouts/form-test/form-test.vue @@ -195,7 +195,7 @@ -
+
@@ -250,10 +250,10 @@ export default { return { schema: Yup.object().shape({ demo: Yup.string().required('Please select chip(s)'), - demo2: Yup.array().required('Please select a windshield part'), + demo2: Yup.array().required('Please select a windshield part').min(1, 'Please select a windshield part'), demo3: Yup.string().required('Invalid VIN. Please enter X, Y, Z...'), demo4: Yup.string().matches('^[0-9]*$', 'Invalid Entry. Must enter only numbers, no letters.'), - demo5: Yup.array().required('Please select damage location'), + demo5: Yup.array().required('Please select damage location').min(1, 'Please select damage location'), demo6: Yup.string() .when('demo5', function (demo5, schema, value) { if (demo5) { From dd99a541ec399ecfd3eb83bde3567a11207c5d37 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Tue, 18 Jan 2022 17:44:12 -0500 Subject: [PATCH 2/6] CSR-254: fixes and tweaks --- src/layouts/form-test/form-test.vue | 38 ++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/src/layouts/form-test/form-test.vue b/src/layouts/form-test/form-test.vue index 9a0b7f6c0..894c684ca 100644 --- a/src/layouts/form-test/form-test.vue +++ b/src/layouts/form-test/form-test.vue @@ -4,9 +4,11 @@ @submit="onSubmit" @invalid-submit="onInvalidSubmit" v-slot="{ values, meta }" + class="w-50" >

FORM VALIDATION TEST

+

NOTE: This page is testing functionality only; styling will not match Figma mocks.

@@ -103,7 +105,7 @@
-
+

demo5: Where's your damage? (Required)

@@ -247,13 +249,25 @@ import listButtonHorizontal from "@/ux-components/list-button-horizontal/list-bu export default { name: "App", data() { + const errorMessages = { + demo: 'Please select chip(s)', + demo2: 'Please select a windshield part', + demo3: 'You entered an invalid VIN. Please check to make sure that you inserted a 17 digit, alpha-numeric number. VINs do not contain the letters I, O or Q.', + demo4: 'Invalid Entry. Must enter only numbers, no letters.', + demo5: 'Please select damage location', + }; return { schema: Yup.object().shape({ - demo: Yup.string().required('Please select chip(s)'), - demo2: Yup.array().required('Please select a windshield part').min(1, 'Please select a windshield part'), - demo3: Yup.string().required('Invalid VIN. Please enter X, Y, Z...'), - demo4: Yup.string().matches('^[0-9]*$', 'Invalid Entry. Must enter only numbers, no letters.'), - demo5: Yup.array().required('Please select damage location').min(1, 'Please select damage location'), + demo: Yup.string().required(errorMessages.demo), + demo2: Yup.array().required(errorMessages.demo2).min(1, errorMessages.demo2), + demo3: Yup.string() + .uppercase() + .required('Please enter a VIN.') + .min(17, errorMessages.demo3) + .max(17, errorMessages.demo3) + .matches('^[^IOQ]+$', errorMessages.demo3), + demo4: Yup.string().matches('^[0-9]*$', errorMessages.demo4), + demo5: Yup.array().required(errorMessages.demo5).min(1, errorMessages.demo5), demo6: Yup.string() .when('demo5', function (demo5, schema, value) { if (demo5) { @@ -267,11 +281,11 @@ export default { return schema; }), demoX: Yup.string().notRequired(), - // // PASSWORD EXAMPLE, NOT BEING USED NOW - //password: Yup.string().min(6).required(), - //passwordConfirmation: Yup.string() - // .required() - // .oneOf([Yup.ref("password")], "Passwords do not match"), + // PASSWORD EXAMPLE, NOT BEING USED NOW + password: Yup.string().min(6).required(), + passwordConfirmation: Yup.string() + .required() + .oneOf([Yup.ref("password")], "Passwords do not match"), }).test('repair-replace-conflict', null, // need to pass null as error message so it won't get added to list of errors function(value) { From 9f58e600b6009b79a2b46d23a8971e225faab402 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Tue, 18 Jan 2022 21:35:56 -0500 Subject: [PATCH 3/6] CSR-254: remove unused validation rules preventing form from valid status --- src/layouts/form-test/form-test.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/layouts/form-test/form-test.vue b/src/layouts/form-test/form-test.vue index 894c684ca..c3e0f0cdd 100644 --- a/src/layouts/form-test/form-test.vue +++ b/src/layouts/form-test/form-test.vue @@ -266,7 +266,7 @@ export default { .min(17, errorMessages.demo3) .max(17, errorMessages.demo3) .matches('^[^IOQ]+$', errorMessages.demo3), - demo4: Yup.string().matches('^[0-9]*$', errorMessages.demo4), + // demo4: Yup.string().matches('^[0-9]*$', errorMessages.demo4), demo5: Yup.array().required(errorMessages.demo5).min(1, errorMessages.demo5), demo6: Yup.string() .when('demo5', function (demo5, schema, value) { @@ -282,10 +282,10 @@ export default { }), demoX: Yup.string().notRequired(), // PASSWORD EXAMPLE, NOT BEING USED NOW - password: Yup.string().min(6).required(), - passwordConfirmation: Yup.string() - .required() - .oneOf([Yup.ref("password")], "Passwords do not match"), + // password: Yup.string().min(6).required(), + // passwordConfirmation: Yup.string() + // .required() + // .oneOf([Yup.ref("password")], "Passwords do not match"), }).test('repair-replace-conflict', null, // need to pass null as error message so it won't get added to list of errors function(value) { From 82b7cdbf99fe5501ce554056def2b6fafdf242b5 Mon Sep 17 00:00:00 2001 From: bmauger Date: Wed, 19 Jan 2022 08:57:39 -0500 Subject: [PATCH 4/6] Update link styles. --- src/layouts/component-test/component-test.vue | 12 ++++++--- src/styles/common-styles.scss | 27 ++++++++++++++++++- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/src/layouts/component-test/component-test.vue b/src/layouts/component-test/component-test.vue index eada5a2df..9c567aead 100644 --- a/src/layouts/component-test/component-test.vue +++ b/src/layouts/component-test/component-test.vue @@ -606,12 +606,18 @@
-

Text Link

+

Links

-
- Text Link +
+ Text Link (default text link behavior) +

+ Text Link Small (.small) +

+ Footer Link (.footer-link) +

+ Navigation Link (.navigation-link)
diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss index 5e1993716..78e82afcb 100644 --- a/src/styles/common-styles.scss +++ b/src/styles/common-styles.scss @@ -14,8 +14,33 @@ body { color: $blue; text-decoration: none; border-bottom: 1px solid $blue; + line-height: 26px; + padding: 0 0 4px 0; + font-weight: 500; &:hover { - color: $blue-400; + color: $blue; + font-weight: 700; + } + &.small { + line-height: 24px; + } + &.navigation-link { + color: $black; + border-bottom: 1px solid $black; + line-height: 26px; + } + &.footer-link { + color: $gray-500; + text-decoration: none; + border-bottom: 1px solid transparent; + line-height: 20px; + padding: 0 0 2px 0; + font-weight: 400; + font-size: .75rem; + &:hover { + border-bottom: 1px solid $gray-500; + padding: 0 0 2px 0; + } } } .pointer { From 284fc7afe25e0a8cad7c7e733850fd9de77a7d7b Mon Sep 17 00:00:00 2001 From: bmauger Date: Wed, 19 Jan 2022 12:26:18 -0500 Subject: [PATCH 5/6] Add font-weight 700. --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 35da253dd..b926ca739 100644 --- a/public/index.html +++ b/public/index.html @@ -7,7 +7,7 @@ - + <%= htmlWebpackPlugin.options.title %> From 70082762bee5763867b68b2ee053ec4b36ae75c3 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Wed, 19 Jan 2022 15:23:04 -0500 Subject: [PATCH 6/6] CSR-302: fix styles and make sure loader is set to be enabled --- src/common-components/button-question/button-question.vue | 2 ++ src/styles/common-list-styles.scss | 3 +++ src/ux-components/list-button/list-button.vue | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue index 849f5a353..6c82ab6bb 100644 --- a/src/common-components/button-question/button-question.vue +++ b/src/common-components/button-question/button-question.vue @@ -12,6 +12,7 @@ :buttonID="answer" @mouseup="chooseAnswer(answer)" @keyup.space="chooseAnswer(answer)" + :loaderEnabled="true" loaderColor="blue" loaderPosition="right" sizeInRem="1.5" @@ -52,6 +53,7 @@ export default {