diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f11da4951..c8184f93f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -127,4 +127,45 @@ stages: indexDeployVariables: __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__) __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__) + cfDistributionId: $(cfDistributionId) + + # Prod Build/Deploy + - stage: Prod + condition: eq(variables['Build.SourceBranch'], variables['prod-branch'] ) + variables: + - group: FixMyGlassProd + jobs: + - deployment: prodBuildDeployment + displayName: Build and Deploy FMG - Prod + environment: digitalCloud-prod + container: node + workspace: + clean: all + strategy: + runOnce: + deploy: + steps: + - checkout: self + clean: true + - template: templates/digital/step-build-vue.yml@AzureDevOps + parameters: + buildOutputDir: dist + - template: templates/digital/step-deploy-vue.yml@AzureDevOps + parameters: + artifactName: vueDist + awsProfile: $(prodDeploymentProfile) + outputPath: /fmg/ + deployBuckets: + safelite-prod-fmg-us-east-1: + clearFolder: true + deployFolder: '' + region: us-east-1 + appDeployVariables: + __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__) + __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__) + __VUE_APP_HERITAGE_FUNNEL__: $(__VUE_APP_HERITAGE_FUNNEL__) + __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__) + indexDeployVariables: + __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__) + __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__) cfDistributionId: $(cfDistributionId) \ No newline at end of file diff --git a/src/assets/img/FMGTransitionAnimation.svg b/src/assets/img/FMGTransitionAnimation.svg new file mode 100644 index 000000000..b3548305d --- /dev/null +++ b/src/assets/img/FMGTransitionAnimation.svg @@ -0,0 +1 @@ +Assessing your damageFinding your glassGenerating your quote \ No newline at end of file diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue index a2e3f9625..20ad2b2f8 100644 --- a/src/common-components/button-question/button-question.vue +++ b/src/common-components/button-question/button-question.vue @@ -41,7 +41,7 @@
- +
diff --git a/src/common-components/loading-modal/loading-modal.vue b/src/common-components/loading-modal/loading-modal.vue index 741800792..31058951e 100644 --- a/src/common-components/loading-modal/loading-modal.vue +++ b/src/common-components/loading-modal/loading-modal.vue @@ -3,14 +3,7 @@
- Loading - -
-
- Please wait... -
-
- This process can take up to 20 seconds. + Loading
@@ -60,23 +53,15 @@ box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2); border-radius: 4px; top: 48px; - height: 246px; + height: 186px; width: 327px; } - .loading-modal-body { - position: relative; - padding: 20px 10px; - } - .loading-modal-text { padding: 0 24px 0 24px; } .modal-icon-container { - position: relative; - width: 75px; - height: 75px; margin: 15px auto; padding-bottom: 26px; } @@ -85,6 +70,8 @@ position: absolute; vertical-align: middle; border: 0; + width: 327px; + height: 186px; left: 50%; top: 50%; transform: translate(-50%, -50%); diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index a9cf1bd53..cedc140d2 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -286,9 +286,11 @@ export default { } } else if (carsFound.length > 1) { // if multiple cars were found - if (carsFound.find(car => car.vehicle.carId === carEntered.carId)) { + const matchingCar = carsFound.find(car => car.vehicle.carId === carEntered.carId); + if (matchingCar) { // and one of them matches the car id entered this.$refs.loadingModal.showModal(); + this.updateVehicleInfo(matchingCar.vin, matchingCar.vehicle); navigateAfterSaveToHeritageFunnel(this.$route); } else { // and there is no match, navigate to "address-vehicles" page diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index 5e7fdc2c1..3fa8a953c 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -46,25 +46,25 @@ import alert from "@/ux-components/alert/alert"; import textboxQuestion from "@/common-components/textbox-question/textbox-question"; import loadingModal from '@/common-components/loading-modal/loading-modal.vue'; // Supporting files -import { - fetchCmsContentForPage +import { + fetchCmsContentForPage } from "@/helpers/cms-content-helper"; import { - settleAllPromises + settleAllPromises } from "@/helpers/layout-helper"; import store from "@/store"; import baseMixin from "@/mixins/base-mixin.js"; import { - storeActions + storeActions } from "@/constants/store-actions"; import { - storeMutations + storeMutations } from "@/constants/store-mutations"; import { - errorMessages + errorMessages } from "@/constants/error-messages"; -import { - navigateAfterSaveToHeritageFunnel +import { + navigateAfterSaveToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper"; import { getDamageString, @@ -256,7 +256,7 @@ export default { vinLookup.data.vehicle, zipValidation.data.state ); - + this.navigateForward(); }, navigateForward() { @@ -335,4 +335,4 @@ export default { loadingModal, }, }; - \ No newline at end of file + diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 6e3a83653..5ae8a913b 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -77,7 +77,7 @@ :manualHeadline="MatchedDifferentVehicleAlertHeader" :manualCopy="MatchedDifferentVehicleAlertBody" v-model="customAlertData" - v-if="isCarIdDifferent" + v-if="isCarIdDifferent && !vinNotFound && !perfectMatchNewVinAlert" alertClass="alert-warning" />