Merge branch 'release/2.35.0' into main

Author: Lakeyzer

package-lock.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.34.0",
+	"version": "2.35.0",
 	"name": "shieldmaiden",
 	"description": "A Dungeons and Dragons Combat Tracker",
 	"productName": "Shieldmaiden",
@@ -16,6 +16,7 @@
 		"prepare": "husky install"
 	},
 	"dependencies": {
+		"@egjs/vue-flicking": "^4.12.0",
 		"@gtm-support/vue2-gtm": "^1.3.0",
 		"@octokit/rest": "^19.0.5",
 		"@quasar/extras": "^1.16.12",

package.json

@@ -3,33 +3,38 @@
  * is picked up by the build system ONLY if
  * quasar.conf > pwa > workboxPluginMode is set to "InjectManifest"
  */
-self.addEventListener('message', (event) => {
-  if(event.origin !== "https://shieldmaiden.app" && event.origin !== "https://staging.shieldmaiden.app") 
-    return;
-    
-  if (event.data && event.data.type === 'SKIP_WAITING') {
-    self.skipWaiting();
-  }
+self.addEventListener("message", (event) => {
+	if (
+		event.origin !== "https://shieldmaiden.app" &&
+		event.origin !== "https://staging.shieldmaiden.app"
+	)
+		return;
+
+	if (event.data && event.data.type === "SKIP_WAITING") {
+		self.skipWaiting();
+	}
 });
 
-workbox.core.setCacheNameDetails({prefix: "shieldmaiden"});
+workbox.core.setCacheNameDetails({ prefix: "shieldmaiden" });
 
 // Precache array of routes (precacheManifest = this array)
 // https://developers.google.com/web/tools/workbox/modules/workbox-precaching
-self.__precacheManifest = [{ url: "/200.html", revision: Date.now() }].concat(self.__precacheManifest || []);
+self.__precacheManifest = [{ url: "/200.html", revision: Date.now() }].concat(
+	self.__precacheManifest || []
+);
 workbox.precaching.precacheAndRoute(self.__precacheManifest, {});
 
 // This assumes /200.html has been precached.
 // https://developers.google.com/web/tools/workbox/modules/workbox-routing#how_to_register_a_navigation_route
 workbox.routing.registerNavigationRoute(workbox.precaching.getCacheKeyForURL("200.html"), {
-  blacklist: [
-    /^\/compendium/,
-    /^\/admin/,
-    /^\/patreon/,
-    /^\/user/,
-    /^\/about-us/,
-    /^\/documentation/,
-    /^\/privacy-policy/,
-    /^\/demo/
-  ],
-});
+	blacklist: [
+		/^\/compendium/,
+		/^\/admin/,
+		/^\/pricing/,
+		/^\/user/,
+		/^\/about-us/,
+		/^\/documentation/,
+		/^\/privacy-policy/,
+		/^\/demo/,
+	],
+});

public/sitemap.xml

@@ -14,13 +14,14 @@
 					"
 					:small-screen="small_screen"
 				/>
-				<q-scroll-area
+				<div
+					:is="$route.name === 'home' ? 'div' : 'q-scroll-area'"
 					class="scrollable-content"
 					:dark="$store.getters.theme === 'dark'"
 					:thumb-style="{ width: '5px' }"
 				>
 					<router-view />
-				</q-scroll-area>
+				</div>
 			</div>
 		</div>
 		<transition