diff --git a/.eleventy.js b/.eleventy.js index 39c5c636..ba912a75 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -78,7 +78,7 @@ export default async function (eleventyConfig) { 'node_modules/@daviddarnes/mastodon-post/mastodon-post.js': 'assets/scripts/components/mastodon-post.js' }) eleventyConfig.addPassthroughCopy({ - 'node_modules/@daviddarnes/share-button/share-button.js': 'assets/scripts/components/share-button.js' + 'node_modules/@zachleat/webcare-webshare/webcare-webshare.js': 'assets/scripts/components/webcare-webshare.js' }) // enable merging of tags diff --git a/package-lock.json b/package-lock.json index d9b70036..8f3f723f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,18 @@ { "name": "coryd.dev", - "version": "6.3.11", + "version": "6.4.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "6.3.11", + "version": "6.4.3", "license": "MIT", "dependencies": { "@daviddarnes/mastodon-post": "^1.1.1", - "@daviddarnes/share-button": "^1.1.2", "@remy/webmention": "^1.5.0", - "@zachleat/pagefind-search": "^1.0.3" + "@zachleat/pagefind-search": "^1.0.3", + "@zachleat/webcare-webshare": "^1.0.3" }, "devDependencies": { "@11ty/eleventy": "3.0.0-alpha.5", @@ -1232,11 +1232,6 @@ "resolved": "https://registry.npmjs.org/@daviddarnes/mastodon-post/-/mastodon-post-1.1.1.tgz", "integrity": "sha512-qkVOJkCzsMASuvcvlv9cG/hdDwMp9uVnfFS7YhQ0JPmls4g6eVQNjLBxUT+iINFU+yBZj/zPwovDhO79gnOPEQ==" }, - "node_modules/@daviddarnes/share-button": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@daviddarnes/share-button/-/share-button-1.1.2.tgz", - "integrity": "sha512-FV89mgFwG9+97VvkHzrE3SR3p9BzM31SuDtpWFJIfw/aThVvoQj7zM71FJ+QBAfUMF1Wwm7Jufvh6h4hEdA1uA==" - }, "node_modules/@emnapi/runtime": { "version": "0.45.0", "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-0.45.0.tgz", @@ -2911,6 +2906,11 @@ "resolved": "https://registry.npmjs.org/@zachleat/pagefind-search/-/pagefind-search-1.0.3.tgz", "integrity": "sha512-WKBkvx6gOSgbPcAKjhT1NLT8OXxrSKhgUUhWIdp1DfG3C8l13Cg3+mSC1ZMOEBVwUKRrwBYElJVju/Te/NrHAA==" }, + "node_modules/@zachleat/webcare-webshare": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@zachleat/webcare-webshare/-/webcare-webshare-1.0.3.tgz", + "integrity": "sha512-xqRY49B2fhVlJGPVfufASDqxlLwQlGRlr/qLzrEgR037Wexlsd0nIQYTejD/tJWQpZxgGVXN/UZDs0VQ5VurKA==" + }, "node_modules/a-sync-waterfall": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz", @@ -3951,14 +3951,14 @@ } }, "node_modules/es-set-tostringtag": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", - "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.2", - "has-tostringtag": "^1.0.0", - "hasown": "^2.0.0" + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" }, "engines": { "node": ">= 0.4" diff --git a/package.json b/package.json index be0a8817..d455708c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "6.4.3", + "version": "6.5.4", "description": "The source for my personal site. Built using 11ty and hosted on Netlify.", "type": "module", "scripts": { @@ -21,9 +21,9 @@ "license": "MIT", "dependencies": { "@daviddarnes/mastodon-post": "^1.1.1", - "@daviddarnes/share-button": "^1.1.2", "@remy/webmention": "^1.5.0", - "@zachleat/pagefind-search": "^1.0.3" + "@zachleat/pagefind-search": "^1.0.3", + "@zachleat/webcare-webshare": "^1.0.3" }, "devDependencies": { "@11ty/eleventy": "3.0.0-alpha.5", diff --git a/src/_data/books.js b/src/_data/books.js index c89c0c9a..29303bd0 100644 --- a/src/_data/books.js +++ b/src/_data/books.js @@ -36,8 +36,7 @@ export default async function () { if (!data[i]) { data.push({ title: titles[i]?.textContent }) data.push({ author: authors[i]?.textContent }) - data.push({ - image: images[i].src.replace( + data.push({ image: images[i].src.replace( 'https://cdn.thestorygraph.com', 'https://cd-books.b-cdn.net' ), @@ -56,7 +55,7 @@ export default async function () { data[i]['image'] = images[i]?.src.replace( 'https://cdn.thestorygraph.com', 'https://cd-books.b-cdn.net' - ) + ), data[i]['url'] = `https://app.thestorygraph.com${urls[i]?.href}` data[i]['percentage'] = percentages[i]?.textContent data[i]['dateAdded'] = date diff --git a/src/_includes/partials/now/playing.liquid b/src/_includes/partials/now/playing.liquid index f0dcd6ba..82ed387d 100644 --- a/src/_includes/partials/now/playing.liquid +++ b/src/_includes/partials/now/playing.liquid @@ -1,4 +1,2 @@ -
- -
\ No newline at end of file + \ No newline at end of file diff --git a/src/_includes/partials/share-button.liquid b/src/_includes/partials/share-button.liquid index 588f6bfc..9a1034a7 100644 --- a/src/_includes/partials/share-button.liquid +++ b/src/_includes/partials/share-button.liquid @@ -2,22 +2,7 @@ {% render "../../assets/styles/components/share-button.css" %} {% endcapture %} - - - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/src/_includes/post.liquid b/src/_includes/post.liquid index 4f52ff4f..d38f4dc5 100644 --- a/src/_includes/post.liquid +++ b/src/_includes/post.liquid @@ -18,7 +18,7 @@ schema: blog {{ date | readableDate }} • - {% render "partials/share-button.liquid", url:postUrl %} + {% render "partials/share-button.liquid", url: postUrl, title: title, tagMap: collections.tagMap %}
diff --git a/src/assets/scripts/components/now-playing.js b/src/assets/scripts/components/now-playing.js index 523deb28..bd3303d7 100644 --- a/src/assets/scripts/components/now-playing.js +++ b/src/assets/scripts/components/now-playing.js @@ -28,6 +28,11 @@ class NowPlaying extends HTMLElement { const { key } = slot.dataset const value = data[key] + if (!value || value === typeof undefined) { + slot.style.opacity = '0' + slot.style.display = 'none' + } + if (cache) { if (key === 'loading') { slot.style.opacity = '0' diff --git a/src/assets/styles/components/share-button.css b/src/assets/styles/components/share-button.css index 142a039d..24ea452d 100644 --- a/src/assets/styles/components/share-button.css +++ b/src/assets/styles/components/share-button.css @@ -1,3 +1,8 @@ +webcare-webshare { + font-size: var(--font-size-sm); + line-height: var(--line-height-sm); +} + button { background: transparent; padding: 0; @@ -12,10 +17,4 @@ input { border-radius: var(--rounded-md); padding: .25rem; border: 1px solid var(--gray-light); -} - -label { - font-size: var(--font-size-sm); - line-height: var(--line-height-sm); - height: 1rem; } \ No newline at end of file