From 6ab9c412dc3d58382d6e0b14025064fba2198ac2 Mon Sep 17 00:00:00 2001 From: Michaela Brydon Date: Wed, 29 Nov 2023 10:40:32 -0500 Subject: [PATCH 01/18] Partial modification of tpa-submit --- src/layouts/tpa-search/tpa-search.vue | 1 + .../review-block/review-block.spec.js | 0 .../tpa-submit/review-block/review-block.vue | 69 ++++++++++ src/layouts/tpa-submit/tpa-submit.spec.js | 3 + src/layouts/tpa-submit/tpa-submit.vue | 125 +++++++++++++++--- 5 files changed, 179 insertions(+), 19 deletions(-) create mode 100644 src/layouts/tpa-submit/review-block/review-block.spec.js create mode 100644 src/layouts/tpa-submit/review-block/review-block.vue create mode 100644 src/layouts/tpa-submit/tpa-submit.spec.js diff --git a/src/layouts/tpa-search/tpa-search.vue b/src/layouts/tpa-search/tpa-search.vue index 6c3941e0..dd6e4b2e 100644 --- a/src/layouts/tpa-search/tpa-search.vue +++ b/src/layouts/tpa-search/tpa-search.vue @@ -380,6 +380,7 @@ export default { } } }; + diff --git a/src/layouts/tpa-submit/tpa-submit.spec.js b/src/layouts/tpa-submit/tpa-submit.spec.js new file mode 100644 index 00000000..c730f97f --- /dev/null +++ b/src/layouts/tpa-submit/tpa-submit.spec.js @@ -0,0 +1,3 @@ +// TODO +// Write test cases +// implement tests diff --git a/src/layouts/tpa-submit/tpa-submit.vue b/src/layouts/tpa-submit/tpa-submit.vue index 2ddcf5b8..9e289407 100644 --- a/src/layouts/tpa-submit/tpa-submit.vue +++ b/src/layouts/tpa-submit/tpa-submit.vue @@ -1,5 +1,64 @@ diff --git a/src/layouts/tpa-submit/review-block/review-block.vue b/src/layouts/tpa-submit/review-block/review-block.vue index f22ce199..1bc7133c 100644 --- a/src/layouts/tpa-submit/review-block/review-block.vue +++ b/src/layouts/tpa-submit/review-block/review-block.vue @@ -1,18 +1,16 @@ diff --git a/src/layouts/tpa-submit/tpa-submit.vue b/src/layouts/tpa-submit/tpa-submit.vue index 9e289407..09f0a70f 100644 --- a/src/layouts/tpa-submit/tpa-submit.vue +++ b/src/layouts/tpa-submit/tpa-submit.vue @@ -1,7 +1,8 @@ diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index 3a03cf51..937d42b9 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -68,6 +68,12 @@ const navigationScenarios = Object.freeze({ CLICKED_FORWARD_WITH_SAFELITE_SHOP: 'CLICKED_FORWARD_WITH_SAFELITE_SHOP', CLICKED_FORWARD_WITH_NON_SAFELITE_SHOP: 'CLICKED_FORWARD_WITH_NON_SAFELITE_SHOP', + // TPA Submit + EDIT_VEHICLE: 'EDIT_VEHICLE', + EDIT_DAMAGE: 'EDIT_DAMAGE', + EDIT_PREFERRED_SHOP: 'EDIT_PREFERRED_SHOP', + EDIT_CONTACT_DETAILS: 'EDIT_CONTACT_DETAILS', + // Provider Preference CLICKED_FORWARD_WITH_SAFELITE: 'CLICKED_FORWARD_WITH_SAFELITE', CLICKED_FORWARD_WITH_TPA_ENABLED: 'CLICKED_FORWARD_WITH_TPA_ENABLED', diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 7f064f9b..69762bc8 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -637,6 +637,22 @@ const routingTable = () => [ { issPageValue: issPageValues.TPA_SUBMIT, maps: [ + { + scenario: navigationScenarios.EDIT_VEHICLE, + destinationIssPageValue: issPageValues.VEHICLE_SELECTION + }, + { + scenario: navigationScenarios.EDIT_DAMAGE, + destinationIssPageValue: issPageValues.VEHICLE_DAMAGE + }, + { + scenario: navigationScenarios.EDIT_PREFERRED_SHOP, + destinationIssPageValue: issPageValues.PROVIDER_PREFERENCE + }, + { + scenario: navigationScenarios.EDIT_CONTACT_DETAILS, + destinationIssPageValue: issPageValues.CONTACT_DETAILS + }, { scenario: navigationScenarios.CLICKED_BACK, destinationIssPageValue: issPageValues.TPA_SEARCH diff --git a/src/store/index.js b/src/store/index.js index c15e0bb9..7d4c8c25 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -115,7 +115,9 @@ const getDefaultState = () => ({ state: null, zipCode: null, zipCodeCtu: null - } + }, + companyName: null, // TODO set + phoneNumber: null // TODO set } }, lineItems: { diff --git a/src/styles/common-typography-styles.scss b/src/styles/common-typography-styles.scss index 162f4a16..30368d39 100644 --- a/src/styles/common-typography-styles.scss +++ b/src/styles/common-typography-styles.scss @@ -51,6 +51,12 @@ h6, font-weight: 400; } +.small-strong { + font-size: .875rem; + line-height: 1.7; + font-weight: 500; +} + label, .label { font-size: 1rem; @@ -63,16 +69,4 @@ caption, font-size: .75rem; line-height: 1.7; font-weight: 400; -} - - -// Font size -.fs-5 { - line-height: 2; -} - -.fs-6 { - font-size: 1rem !important; - line-height: 1.4; - font-weight: 500; } \ No newline at end of file diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss index a67e7c76..218bf477 100644 --- a/src/styles/ux-variables.scss +++ b/src/styles/ux-variables.scss @@ -52,6 +52,7 @@ $yellow-900: #331a00; $gray-100: #f5f5f5; // Used in theme $gray-200: #e3e4e4; // Used in theme $gray-300: #d2d4d4; +$gray-350: #b3b4b5; // Used for hr $gray: #b0b3b3; // Default Gray $gray-500: #8e9292; // Used in theme $gray-550: #727676; // Used in theme @@ -123,9 +124,18 @@ $font-family-base: $font-family-sans-serif; $font-family-code: $font-family-monospace; $font-size-base: 1rem; // Assumes the browser default, typically `16px` +//Headings +$h1-font-size: $font-size-base * 3; +$h2-font-size: $font-size-base * 2.625; +$h3-font-size: $font-size-base * 2; +$h4-font-size: $font-size-base * 1.625; +$h5-font-size: $font-size-base * 1.25; +$h6-font-size: $font-size-base * 0.875; + //Custom Font size (extra small) $font-size-xsm: $font-size-base * 0.75; $font-sizes: ( + 5: $h5-font-size, 7: $font-size-xsm, ); @@ -136,13 +146,6 @@ $font-weight-normal: 400; $font-weight-bold: 500; $font-weight-bolder: bolder; -//Headings -$h1-font-size: $font-size-base * 3; -$h2-font-size: $font-size-base * 2.625; -$h3-font-size: $font-size-base * 2; -$h4-font-size: $font-size-base * 1.625; -$h5-font-size: $font-size-base * 1.25; -$h6-font-size: $font-size-base * 0.875; //Border Radius // Helper classes are rounded, rounded-1, rounded-2, rounded-3 @@ -173,6 +176,9 @@ $spacers: ( 8: $spacer * 3, ); +//Line Height + + //Grid breakpoints $grid-breakpoints: ( xs: 0, From 0bf200e01d840b739f20f15b31d210ff49538bf0 Mon Sep 17 00:00:00 2001 From: Michaela Brydon Date: Mon, 4 Dec 2023 20:34:30 -0500 Subject: [PATCH 03/18] Forgot --- src/layouts/tpa-search/tpa-search.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/layouts/tpa-search/tpa-search.vue b/src/layouts/tpa-search/tpa-search.vue index dd7e4d18..f71d8d7e 100644 --- a/src/layouts/tpa-search/tpa-search.vue +++ b/src/layouts/tpa-search/tpa-search.vue @@ -100,7 +100,7 @@ @@ -140,6 +140,7 @@ import BaseFormMixin from '@/mixins/base-form-mixin.js'; import globalRules from '@/constants/global-rules.js'; import widgetFields from '@/constants/cms-widget-fields.js'; import { shallowRef } from 'vue'; +import { toTitleCase } from '@/helpers/text-helper.js'; export default { name: 'tpa-search', From 8492c6b050cf1ebd4f602a5942964f79606be355 Mon Sep 17 00:00:00 2001 From: Michaela Brydon Date: Mon, 4 Dec 2023 21:23:45 -0500 Subject: [PATCH 04/18] Delete test line --- .../tpa-recal-modal/tpa-recal-toggle/tpa-recal-toggle.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/layouts/provider-preference/tpa-recal-modal/tpa-recal-toggle/tpa-recal-toggle.vue b/src/layouts/provider-preference/tpa-recal-modal/tpa-recal-toggle/tpa-recal-toggle.vue index dfde755a..a16de0f6 100644 --- a/src/layouts/provider-preference/tpa-recal-modal/tpa-recal-toggle/tpa-recal-toggle.vue +++ b/src/layouts/provider-preference/tpa-recal-modal/tpa-recal-toggle/tpa-recal-toggle.vue @@ -4,7 +4,6 @@ class="tpa-toggle" :class="[isDetailVisible ? 'active' : '']" @click="handleClickToggle"> - Date: Mon, 4 Dec 2023 21:26:34 -0500 Subject: [PATCH 05/18] Reverting change --- src/layouts/tpa-search/tpa-search.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/layouts/tpa-search/tpa-search.vue b/src/layouts/tpa-search/tpa-search.vue index 814f712b..1ccd1926 100644 --- a/src/layouts/tpa-search/tpa-search.vue +++ b/src/layouts/tpa-search/tpa-search.vue @@ -90,14 +90,14 @@ alertClass="alert-warning" :isDismissible="false" :manualHeadline="noNetworkShopsAlertHeaderText" /> -
- -
+ +
+
From 17c40b058cc7fdf119be7088516fa414eb1a4448 Mon Sep 17 00:00:00 2001 From: Michaela Brydon Date: Mon, 4 Dec 2023 23:14:19 -0500 Subject: [PATCH 06/18] Minor adjustment --- .../textbox-question/textbox-question.vue | 2 +- src/layouts/tpa-search/tpa-search.vue | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue index 86bcfeea..31d912a0 100644 --- a/src/digital-components/textbox-question/textbox-question.vue +++ b/src/digital-components/textbox-question/textbox-question.vue @@ -265,7 +265,7 @@ input[type='date']::-webkit-calendar-picker-indicator { } span { font-weight: 400; - font-size: 14px; + font-size: 0.875rem; color: #4d5151; } .form-test-error span { diff --git a/src/layouts/tpa-search/tpa-search.vue b/src/layouts/tpa-search/tpa-search.vue index 1ccd1926..f7e9ecfe 100644 --- a/src/layouts/tpa-search/tpa-search.vue +++ b/src/layouts/tpa-search/tpa-search.vue @@ -13,7 +13,7 @@