From d3515654995215eb8a084814f8a37bb74ef67717 Mon Sep 17 00:00:00 2001 From: Jeremy Zimmerman Date: Wed, 26 Oct 2022 13:19:20 -0400 Subject: [PATCH 1/6] Initial values for Google Tag Manager for ISS. --- azure-pipelines.yml | 3 +++ public/index.html | 10 ++++++++++ vue.config.js | 6 ++++++ vue.release.config.js | 4 ++++ 4 files changed, 23 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index caca6e33..7aa73313 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -78,5 +78,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/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/vue.config.js b/vue.config.js index 97730661..f5be82e4 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+ '>m_auth=amlAYNhxUxuskQo7jmjadg>m_preview=env-38>m_cookies_win=x';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: { From b90499a35388d1f1418425bfbe2e742bae456622 Mon Sep 17 00:00:00 2001 From: Jeremy Zimmerman Date: Wed, 26 Oct 2022 14:06:41 -0400 Subject: [PATCH 2/6] Updating tag script. --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index f5be82e4..3c474a35 100644 --- a/vue.config.js +++ b/vue.config.js @@ -4,7 +4,7 @@ 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+ '>m_auth=amlAYNhxUxuskQo7jmjadg>m_preview=env-38>m_cookies_win=x';f.parentNode.insertBefore(j,f);})(window,document,'script','dataLayer','GTM-KKNWZ3');"; +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 = { From fd0b7d7c8c1321db2bc335b9e67d17659cb92871 Mon Sep 17 00:00:00 2001 From: Kulbhushan Kaushik Date: Fri, 28 Oct 2022 10:00:55 -0400 Subject: [PATCH 3/6] fixed styling for subheader --- package-lock.json | 6 ++--- package.json | 2 +- .../site-sub-header/site-sub-header.vue | 22 ++++++++++++++----- 3 files changed, 20 insertions(+), 10 deletions(-) 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/src/common-components/site-sub-header/site-sub-header.vue b/src/common-components/site-sub-header/site-sub-header.vue index a48b9f19..db6f1b16 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 From 026ff5612a73ec62c3bb9c0dd466c5303c82fda3 Mon Sep 17 00:00:00 2001 From: Kulbhushan Kaushik Date: Fri, 28 Oct 2022 10:04:35 -0400 Subject: [PATCH 4/6] commit --- src/common-components/site-sub-header/site-sub-header.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 db6f1b16..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,7 +1,7 @@