diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 37ee7d27..574b61fb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -82,5 +82,8 @@ stages: appDeployVariables: __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__) __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/package-lock.json b/package-lock.json index a4cfe0a1..93875c8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3571,9 +3571,9 @@ "dev": true }, "bootstrap": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.1.tgz", - "integrity": "sha512-UQi3v2NpVPEi1n35dmRRzBJFlgvWHYwyem6yHhuT6afYF+sziEt46McRbT//kVXZ7b1YUYEVGdXEH74Nx3xzGA==" + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.2.tgz", + "integrity": "sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ==" }, "brace-expansion": { "version": "1.1.11", diff --git a/package.json b/package.json index 08f73fe1..9b586f69 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "dependencies": { "@popperjs/core": "^2.10.2", "axios": "^0.27.2", - "bootstrap": "^5.1.1", + "bootstrap": "^5.2.2", "jest-junit": "^13.0.0", "maska": "^1.5.0", "pinia": "^2.0.22", diff --git a/public/index.html b/public/index.html index 3e5a1396..5f556395 100644 --- a/public/index.html +++ b/public/index.html @@ -1,6 +1,10 @@ + + @@ -8,6 +12,12 @@ <%= htmlWebpackPlugin.options.title %> + + + diff --git a/src/common-components/site-sub-header/site-sub-header.spec.js b/src/common-components/site-sub-header/site-sub-header.spec.js index fd35c00c..d38fa323 100644 --- a/src/common-components/site-sub-header/site-sub-header.spec.js +++ b/src/common-components/site-sub-header/site-sub-header.spec.js @@ -3,14 +3,14 @@ import { shallowMount } from "@vue/test-utils"; describe("site sub header", () => { - const subHeaderText = "

let's fix your glass

"; + const subHeaderText = "let's fix your glass"; const mockMixin = { methods: { getCmsContent: jest.fn().mockImplementation(()=> { return subHeaderText; }) } - } + }; it("should contain the cms content", () => { const wrapper = shallowMount(siteSubHeader, { @@ -18,10 +18,9 @@ describe("site sub header", () => { }); wrapper.getCmsContent = jest.fn(); - const actual = wrapper.find("p"); - - expect(actual.html()).toBe(subHeaderText); - }) + const actual = wrapper.find("span"); + expect(actual.html()).toContain(subHeaderText); + }); }); diff --git a/src/common-components/site-sub-header/site-sub-header.vue b/src/common-components/site-sub-header/site-sub-header.vue index a48b9f19..22064035 100644 --- a/src/common-components/site-sub-header/site-sub-header.vue +++ b/src/common-components/site-sub-header/site-sub-header.vue @@ -1,8 +1,14 @@ + + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index ff0f0e2f..711243cb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,7 +11,7 @@ const routes = [ async beforeEnter(to, from, next) { try { - to.query.issPage = !to.query.issPage ? issPageValues.WELCOME_PAGE : to.query.issPage; + to.query.issPage = !to.query.issPage ? issPageValues.VEHICLE_YEAR : to.query.issPage; if (router.hasRoute(to.query.issPage)) { return next({ name: to.query.issPage, query: to.query, params: to.params }); diff --git a/vue.config.js b/vue.config.js index 97730661..3c474a35 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,6 +1,12 @@ process.env.VUE_APP_CONSUMER_CF_DISTRO ="https://digitalapi.dev.safelite.io"; process.env.VUE_APP_CURRENT_ENVIRONMENT = "Localhost"; + +// GA & GTM +// NOTE: Using the old ISS site GTM Cotnainer ID for now, will create a new one soon. +process.env.VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY = "(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','GTM-KKNWZ3');"; +process.env.VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC = "https://www.googletagmanager.com/ns.html?id=GTM-KKNWZ3>m_auth=amlAYNhxUxuskQo7jmjadg>m_preview=env-38>m_cookies_win=x"; + module.exports = { publicPath: "/", css: { diff --git a/vue.release.config.js b/vue.release.config.js index 49511e62..93af085c 100644 --- a/vue.release.config.js +++ b/vue.release.config.js @@ -1,6 +1,10 @@ process.env.VUE_APP_CONSUMER_CF_DISTRO = "__VUE_APP_CONSUMER_CF_DISTRO__"; process.env.VUE_APP_CURRENT_ENVIRONMENT = "__VUE_APP_CURRENT_ENVIRONMENT__"; +// GA & GTM +process.env.VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY = "__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__"; +process.env.VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC = "__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__" + module.exports = { publicPath: "/", css: {