Skip to content

Commit

Permalink
Merge branch 'hotfix/2.27.4' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Lakeyzer committed Jun 28, 2024
2 parents bf342ce + 5340350 commit 8a2367d
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 4 deletions.
34 changes: 32 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.27.3",
"version": "2.27.4",
"name": "shieldmaiden",
"description": "A Dungeons and Dragons Combat Tracker",
"productName": "Shieldmaiden",
Expand All @@ -16,13 +16,14 @@
"prepare": "husky install"
},
"dependencies": {
"@gtm-support/vue2-gtm": "^1.3.0",
"@octokit/rest": "^19.0.5",
"@quasar/extras": "^1.16.11",
"ajv": "^8.13.0",
"ajv-formats": "^2.1.1",
"animate.css": "^4.1.1",
"core-js": "^3.37.0",
"axios": "^0.28.1",
"core-js": "^3.37.0",
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"firebase": "^8.0.0",
Expand Down
14 changes: 14 additions & 0 deletions src/boot/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import "animate.css";
import Croppa from "vue-croppa";
import { Cookies } from "quasar";
import { Splitpanes, Pane } from "splitpanes";
import VueGtm from "@gtm-support/vue2-gtm";

export default async ({ router, Vue }) => {
Vue.config.productionTip = false;
Expand All @@ -28,4 +29,17 @@ export default async ({ router, Vue }) => {
},
router
);
Vue.use(VueGtm, {
id: "GTM-5XJCCDMS",
queryParams: {},
defer: false, // Script can be set to `defer` to speed up page load at the cost of less accurate results (in case visitor leaves before script is loaded, which is unlikely but possible). Defaults to false, so the script is loaded `async` by default
compatibility: false, // Will add `async` and `defer` to the script tag to not block requests for old browsers that do not support `async`
nonce: "2726c7f26c", // Will add `nonce` to the script tag
enabled: !!Cookies.get("cookie_consent"), // defaults to true. Plugin can be disabled by setting this to false for Ex: enabled: !!GDPR_Cookie (optional)
debug: true, // Whether or not display console logs debugs (optional)
loadScript: true, // Whether or not to load the GTM Script (Helpful if you are including GTM manually, but need the dataLayer functionality in your components) (optional)
vueRouter: router, // Pass the router instance to automatically sync with router (optional)
ignoredViews: [], // Don't trigger events for specified router names (optional)
trackOnNextTick: false, // Whether or not call trackView in Vue.nextTick
});
};
1 change: 1 addition & 0 deletions src/components/CookieConsent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export default {
bootstrap().then((gtag) => {
console.log("bootstrapped", gtag);
});
this.$gtm.enable(true);
}
this.show_banner = false;
},
Expand Down

0 comments on commit 8a2367d

Please sign in to comment.