Merge branch 'release/2.28.0' into main

.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "develop"
+    ignore:
+      - dependency-name: "@quasar/app"

package.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.27.4",
+	"version": "2.28.0",
 	"name": "shieldmaiden",
 	"description": "A Dungeons and Dragons Combat Tracker",
 	"productName": "Shieldmaiden",
@@ -37,10 +37,8 @@
 		"splitpanes": "^2.4.1",
 		"vee-validate": "^3.4.14",
 		"vue": "2.7.16",
-		"vue-analytics": "^5.22.1",
 		"vue-cookies": "^1.8.4",
 		"vue-croppa": "^1.3.8",
-		"vue-gtag": "^1.16.1",
 		"vue-numeral-filter": "^2.2.0",
 		"vue-qr": "^4.0.9",
 		"vue-shortkey": "^3.1.7",

src/App.vue

@@ -34,7 +34,6 @@
 		<q-no-ssr>
 			<vue-snotify />
 			<HkRolls />
-			<CookieConsent />
 		</q-no-ssr>
 
 		<!-- Announcements -->
@@ -62,7 +61,6 @@ import { db } from "./firebase";
 import Header from "./components/Header.vue";
 import Sidebar from "./components/Sidebar.vue";
 import Drawer from "./components/Drawer.vue";
-import CookieConsent from "./components/CookieConsent.vue";
 import { mapActions, mapGetters } from "vuex";
 import HkRolls from "./components/hk-components/hk-rolls";
 import { general } from "./mixins/general";
@@ -78,7 +76,6 @@ export default {
 		navMain: Header,
 		Sidebar,
 		Drawer,
-		CookieConsent,
 		HkRolls,
 		Home,
 	},

src/boot/plugins.js

@@ -1,6 +1,5 @@
 import VueFire from "vuefire";
 import VueCookies from "vue-cookies";
-import VueGtag from "vue-gtag";
 import numeral from "vue-numeral-filter";
 import "animate.css";
 import Croppa from "vue-croppa";
@@ -21,22 +20,14 @@ export default async ({ router, Vue }) => {
 
 	require("../functions.js");
 
-	Vue.use(
-		VueGtag,
-		{
-			config: { id: "G-KDSNCEK6X7" },
-			bootstrap: !!Cookies.get("cookie_consent"),
-		},
-		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)
+		enabled: true, // defaults to true. Plugin can be disabled by setting this to false for Ex: enabled: !!GDPR_Cookie (optional)
+		debug: false, // 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)

src/components/CookieConsent.vue

@@ -16,7 +16,6 @@
 
 <script>
 import { Cookies } from "quasar";
-import { bootstrap } from "vue-gtag";
 
 export default {
 	name: "CookieConsent",
@@ -36,9 +35,6 @@ export default {
 					Cookies.remove(cookie, { domain: ".shieldmaiden.app", path: "/" });
 				}
 			} else {
-				bootstrap().then((gtag) => {
-					console.log("bootstrapped", gtag);
-				});
 				this.$gtm.enable(true);
 			}
 			this.show_banner = false;

src/components/Tiers.vue

@@ -65,6 +65,7 @@
 								target="_blank"
 								rel="noopener"
 								class="btn btn-block btn-square bg-patreon-red"
+								@click="selectTier(t)"
 								>Join {{ t.price }} tier</a
 							>
 						</div>
@@ -135,6 +136,17 @@ export default {
 			type = type === "npcs" ? type.slice(0, -1).toUpperCase() : type.slice(0, -1).capitalize();
 			return count === "infinite" || count > 1 ? `${type}s` : type;
 		},
+		selectTier(t) {
+			console.log(t.name);
+			this.$gtm.trackEvent({
+				event: "subscribe",
+				category: "Subscription",
+				action: "click",
+				label: "Started subscription process",
+				value: t.name,
+				noninteraction: false, // Optional
+			});
+		},
 	},
 };
 </script>