Skip to content

Commit

Permalink
Merge branch 'release/2.23.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Lakeyzer committed Apr 12, 2024
2 parents b83e13f + 9493f55 commit 540bd2c
Show file tree
Hide file tree
Showing 71 changed files with 1,944 additions and 711 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"version": "2.22.2",
"name": "harmless_key",
"version": "2.23.0",
"name": "shieldmaiden",
"description": "A Dungeons and Dragons Combat Tracker",
"productName": "Harmless Key",
"productName": "Shieldmaiden",
"private": true,
"scripts": {
"serve": "quasar dev",
Expand Down
Binary file removed public/harmless_key_logo_full.png
Binary file not shown.
Binary file modified public/linkedin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/shieldmaiden_logo_full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/sitemap.xml

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions quasar.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ module.exports = function (/* ctx */) {
clientsClaim: true,
},
manifest: {
name: "Harmless Key",
short_name: "Harmless Key",
name: "Shieldmaiden",
short_name: "Shieldmaiden",
start_url: ".",
description:
"Harmless Key is the initiative tracker for D&D 5e. We keep track of everything in encounters so even during combat you can give your players the attention they deserve.",
"Shieldmaiden is the initiative tracker for D&D 5e. We keep track of everything in encounters so even during combat you can give your players the attention they deserve.",
orientation: "any",
theme_color: "#191a1c",
background_color: "#191a1c",
Expand Down
4 changes: 2 additions & 2 deletions src-pwa/custom-service-worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
* quasar.conf > pwa > workboxPluginMode is set to "InjectManifest"
*/
self.addEventListener('message', (event) => {
if(event.origin !== "https://harmlesskey.com" && event.origin !== "https://staging.harmlesskey.com")
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: "harmlesskey"});
workbox.core.setCacheNameDetails({prefix: "shieldmaiden"});

// Precache array of routes (precacheManifest = this array)
// https://developers.google.com/web/tools/workbox/modules/workbox-precaching
Expand Down
24 changes: 12 additions & 12 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export default {
name: "description",
content:
this.$route.meta.description ||
"Harmless Key, a combat tracker for D&D 5e. The online tool, for offline play.",
"Shieldmaiden, a combat tracker for D&D 5e. The online tool, for offline play.",
},
// TWITTER
Expand All @@ -102,17 +102,17 @@ export default {
},
twitterTitle: {
name: "twitter:title",
content: this.$route.meta.title || "D&D Combat Tracker | Harmless Key",
content: this.$route.meta.title || "D&D Combat Tracker | Shieldmaiden",
},
twitterDescription: {
name: "twitter:description",
content:
this.$route.meta.description ||
"Harmless Key, a combat tracker for D&D 5e. The online tool, for offline play.",
"Shieldmaiden, a combat tracker for D&D 5e. The online tool, for offline play.",
},
twitterImage: {
name: "twitter:image",
content: "https://harmlesskey.com/harmless_key_logo_full.png",
content: "https://shieldmaiden.app/shieldmaiden_logo_full.png",
},
twitterSite: {
name: "twitter:site",
Expand All @@ -122,37 +122,37 @@ export default {
// OG
ogTitle: {
property: "og:title",
content: this.$route.meta.title || "D&D Combat Tracker | Harmless Key",
content: this.$route.meta.title || "D&D Combat Tracker | Shieldmaiden",
},
ogDescription: {
property: "og:description",
content:
this.$route.meta.description ||
"Harmless Key, a combat tracker for D&D 5e. The online tool, for offline play.",
"Shieldmaiden, a combat tracker for D&D 5e. The online tool, for offline play.",
},
ogSiteName: {
property: "og:site_name",
content: "Harmless Key",
content: "Shieldmaiden",
},
ogType: {
property: "og:type",
content: "website",
},
ogUrl: {
property: "og:url",
content: `https://harmlesskey.com${this.$route.path}`,
content: `https://shieldmaiden.app${this.$route.path}`,
},
ogImage: {
property: "og:image",
content: `https://harmlesskey.com/linkedin.png`,
content: `https://shieldmaiden.app/linkedin.png`,
},
ogImageType: {
property: "og:image:type",
content: "image/png",
},
ogImageAlt: {
property: "og:image:alt",
content: "Harmless Key Logo",
content: "Shieldmaiden Logo",
},
};
Expand All @@ -166,11 +166,11 @@ export default {
return {
title: this.$route.meta.title || "D&D Combat Tracker",
titleTemplate: (title) => `${title} | Harmless Key`,
titleTemplate: (title) => `${title} | Shieldmaiden`,
link: {
canonical: {
rel: "canonical",
href: `https://harmlesskey.com${this.$route.path}`,
href: `https://shieldmaiden.app${this.$route.path}`,
},
},
meta: meta,
Expand Down
Binary file modified src/assets/_img/home/multitargeting.mp4
Binary file not shown.
Loading

0 comments on commit 540bd2c

Please sign in to comment.