diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c94a22456..0a8122121 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -114,6 +114,7 @@ stages: __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_HERITAGE_URL__: $(__VUE_APP_HERITAGE_URL__) __VUE_APP_SAFELITE_HOP__: $(__VUE_APP_SAFELITE_HOP__) __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__) __VUE_APP_MY_ACCOUNT__: $(__VUE_APP_MY_ACCOUNT__) @@ -175,6 +176,7 @@ stages: __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_HERITAGE_URL__: $(__VUE_APP_HERITAGE_URL__) __VUE_APP_SAFELITE_HOP__: $(__VUE_APP_SAFELITE_HOP__) __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__) __VUE_APP_MY_ACCOUNT__: $(__VUE_APP_MY_ACCOUNT__) @@ -236,6 +238,7 @@ stages: __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_HERITAGE_URL__: $(__VUE_APP_HERITAGE_URL__) __VUE_APP_SAFELITE_HOP__: $(__VUE_APP_SAFELITE_HOP__) __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__) __VUE_APP_MY_ACCOUNT__: $(__VUE_APP_MY_ACCOUNT__) @@ -297,6 +300,7 @@ stages: __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_HERITAGE_URL__: $(__VUE_APP_HERITAGE_URL__) __VUE_APP_SAFELITE_HOP__: $(__VUE_APP_SAFELITE_HOP__) __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__) __VUE_APP_MY_ACCOUNT__: $(__VUE_APP_MY_ACCOUNT__) diff --git a/src/constants/application-config.js b/src/constants/application-config.js index 788de3fd7..9d758754d 100644 --- a/src/constants/application-config.js +++ b/src/constants/application-config.js @@ -5,7 +5,7 @@ const applicationConfig = { SAVED_SESSION_TIMEOUT_DAYS: 45, COOKIE_PATH: "/", CURRENT_ENVIRONMENT: process.env.VUE_APP_CURRENT_ENVIRONMENT, // "Localhost", "Dev", "QA", and "Prod" - HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_FUNNEL, + HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_URL, SAFELITE_HOP: process.env.VUE_APP_SAFELITE_HOP, APPLICATION_NAME: "FixMyGlass", ANALYTICS_APPLICATION_NAME: "FixMyGlassNextGen", diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index 90f9593b9..6007e82eb 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -42,11 +42,11 @@ export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLo } if ( - (process.env.VUE_APP_HERITAGE_FUNNEL.includes("fixmyglasstest") && + (process.env.VUE_APP_HERITAGE_URL.includes("fixmyglasstest") && process.env.VUE_APP_CURRENT_ENVIRONMENT === "Localhost") || - (process.env.VUE_APP_HERITAGE_FUNNEL.includes("fixmyglassdev") && + (process.env.VUE_APP_HERITAGE_URL.includes("fixmyglassdev") && process.env.VUE_APP_CURRENT_ENVIRONMENT === "Localhost") || - (process.env.VUE_APP_HERITAGE_FUNNEL.includes("localhost") && + (process.env.VUE_APP_HERITAGE_URL.includes("localhost") && process.env.VUE_APP_CURRENT_ENVIRONMENT === "Localhost") ) { heritageParms["forceEndToEndInsurance"] = true; diff --git a/src/router/constants/externalUrl-values.js b/src/router/constants/externalUrl-values.js index 5516095c4..2c780db56 100644 --- a/src/router/constants/externalUrl-values.js +++ b/src/router/constants/externalUrl-values.js @@ -1,5 +1,5 @@ const externalUrls = { - HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_FUNNEL, + HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_URL, SAFELITE_HOP: process.env.VUE_APP_SAFELITE_HOP, }; diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss index bec02081f..c0a69a112 100644 --- a/src/styles/ux-variables.scss +++ b/src/styles/ux-variables.scss @@ -123,8 +123,8 @@ $body-color: $gray-600; //Fonts $font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif; -$font-family-monospace: - UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; +$font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", + monospace; // stylelint-enable value-keyword-case $font-family-base: $font-family-sans-serif; $font-family-code: $font-family-monospace; diff --git a/vue.config.js b/vue.config.js index d8cb42355..507e5e831 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,6 +1,7 @@ process.env.VUE_APP_CONSUMER_CF_DISTRO = "https://digitalapi.dev.safelite.io"; //process.env.VUE_APP_HERITAGE_FUNNEL = "http://localhost:38000/default.aspx"; process.env.VUE_APP_HERITAGE_FUNNEL = "https://fixmyglassdev.safelite.com/default.aspx"; +process.env.VUE_APP_HERITAGE_URL = "https://fixmyglassdev.safelite.com/default.aspx"; process.env.VUE_APP_GOOGLE_PLACES_API_KEY = "AIzaSyDptGCkOPgN2uWJOy4ou4M33phRD4MAoJo"; process.env.VUE_APP_CURRENT_ENVIRONMENT = "Localhost"; process.env.VUE_APP_MY_ACCOUNT = "https://myaccountdev.safelite.com/"; diff --git a/vue.release.config.js b/vue.release.config.js index 350a78ce3..eeb52b939 100644 --- a/vue.release.config.js +++ b/vue.release.config.js @@ -1,6 +1,7 @@ process.env.VUE_APP_CONSUMER_CF_DISTRO = "__VUE_APP_CONSUMER_CF_DISTRO__"; process.env.VUE_APP_GOOGLE_PLACES_API_KEY = "__VUE_APP_GOOGLE_PLACES_API_KEY__"; process.env.VUE_APP_HERITAGE_FUNNEL = "__VUE_APP_HERITAGE_FUNNEL__"; +process.env.VUE_APP_HERITAGE_URL = "__VUE_APP_HERITAGE_URL__"; process.env.VUE_APP_CURRENT_ENVIRONMENT = "__VUE_APP_CURRENT_ENVIRONMENT__"; process.env.VUE_APP_MY_ACCOUNT = "__VUE_APP_MY_ACCOUNT__"; process.env.VUE_APP_SAFELITE_HOP = "__VUE_APP_SAFELITE_HOP__";