From 108e1343436181720c098bd5f7c1a17f321380ea Mon Sep 17 00:00:00 2001 From: Bad Manners Date: Fri, 20 Sep 2024 21:00:48 -0300 Subject: [PATCH] ViewTransitions again for SPA look --- package-lock.json | 10 +++++----- package.json | 2 +- src/components/DarkModeScriptInline.astro | 2 +- src/layouts/BaseLayout.astro | 13 ++++++++----- src/pages/404.astro | 2 +- src/pages/about.astro | 21 +++++++++++++-------- src/pages/index.astro | 17 +++++++++-------- src/pages/sam_brendan.astro | 21 +++++++++++++-------- src/pages/terms_of_service.astro | 2 +- src/pages/work.astro | 2 +- 10 files changed, 53 insertions(+), 39 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0dd61b5..9f1772e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "badmanners.xyz", - "version": "2.1.13", + "version": "2.1.14", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "badmanners.xyz", - "version": "2.1.13", + "version": "2.1.14", "hasInstallScript": true, "dependencies": { "@astrojs/check": "^0.9.3", @@ -7380,9 +7380,9 @@ } }, "node_modules/vite": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.5.tgz", - "integrity": "sha512-pXqR0qtb2bTwLkev4SE3r4abCNioP3GkjvIDLlzziPpXtHgiJIjuKl+1GN6ESOT3wMjG3JTeARopj2SwYaHTOA==", + "version": "5.4.7", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.7.tgz", + "integrity": "sha512-5l2zxqMEPVENgvzTuBpHer2awaetimj2BGkhBPdnwKbPNOlHsODU+oiazEZzLK7KhAnOrO+XGYJYn4ZlUhDtDQ==", "license": "MIT", "dependencies": { "esbuild": "^0.21.3", diff --git a/package.json b/package.json index 1369b5f..70f1a3e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "badmanners.xyz", "type": "module", - "version": "2.1.13", + "version": "2.1.14", "scripts": { "postinstall": "astro sync", "dev": "astro dev", diff --git a/src/components/DarkModeScriptInline.astro b/src/components/DarkModeScriptInline.astro index 7adce1f..a53cf7b 100644 --- a/src/components/DarkModeScriptInline.astro +++ b/src/components/DarkModeScriptInline.astro @@ -1,4 +1,4 @@ --- --- - + diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro index 3da68d5..770ddd9 100644 --- a/src/layouts/BaseLayout.astro +++ b/src/layouts/BaseLayout.astro @@ -1,10 +1,11 @@ --- -import "../styles/base.css"; -import "../styles/fonts.css"; +import { ViewTransitions } from "astro:transitions"; import DarkModeScript from "@components/DarkModeScript.astro"; import NavHeader from "@components/NavHeader.astro"; import { IconSun, IconMoon } from "@components/icons"; import AgeRestrictedModal from "@components/AgeRestrictedModal.astro"; +import "../styles/base.css"; +import "../styles/fonts.css"; type Props = { pageTitle?: string; @@ -31,6 +32,7 @@ const title = pageTitle ? `${pageTitle} | Bad Manners` : "Bad Manners"; +
@@ -46,11 +48,12 @@ const title = pageTitle ? `${pageTitle} | Bad Manners` : "Bad Manners";
- +
- - + + diff --git a/src/pages/404.astro b/src/pages/404.astro index 15c3e85..5b1fabc 100644 --- a/src/pages/404.astro +++ b/src/pages/404.astro @@ -4,7 +4,7 @@ import BaseLayout from "@layouts/BaseLayout.astro"; -
+

404 – Not found

diff --git a/src/pages/about.astro b/src/pages/about.astro index 60fea85..0a15d12 100644 --- a/src/pages/about.astro +++ b/src/pages/about.astro @@ -7,7 +7,7 @@ import { ImageSamStickerJuicebox } from "@assets/images"; -

+

About me

@@ -69,11 +69,16 @@ import { ImageSamStickerJuicebox } from "@assets/images"; import tippy from "tippy.js"; import "tippy.js/dist/tippy.css"; - const tooltipItems = document.querySelectorAll("[title][data-tooltip]"); - tooltipItems.forEach((el) => el.setAttribute("data-tooltip", el.title)); - tippy(tooltipItems, { - content: (el) => (el as HTMLElement).dataset.tooltip!, - theme: "bm", - }); - tooltipItems.forEach((el) => el.removeAttribute("title")); + const initTooltips = () => { + const tooltipItems = document.querySelectorAll("[title][data-tooltip]"); + tooltipItems.forEach((el) => el.setAttribute("data-tooltip", el.title)); + tippy(tooltipItems, { + content: (el) => (el as HTMLElement).dataset.tooltip!, + theme: "bm", + }); + tooltipItems.forEach((el) => el.removeAttribute("title")); + }; + + document.addEventListener("astro:page-load", initTooltips); + initTooltips(); diff --git a/src/pages/index.astro b/src/pages/index.astro index 7eab12f..4a4ebe9 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -51,7 +51,7 @@ const sshKey = await readFile("./public/ssh.pub", { encoding: "utf-8" }); title="Gallery feed" /> -

+

Hi, I'm Bad Manners!

@@ -251,18 +251,18 @@ const sshKey = await readFile("./public/ssh.pub", { encoding: "utf-8" });
  • -

    badmanners.vore@gmail.com

    +

    google@badmanners.xyz
  • @@ -620,5 +620,6 @@ const sshKey = await readFile("./public/ssh.pub", { encoding: "utf-8" }); }); }; + document.addEventListener("astro:page-load", initIndexIcons); initIndexIcons(); diff --git a/src/pages/sam_brendan.astro b/src/pages/sam_brendan.astro index ad233b9..ca5c8c0 100644 --- a/src/pages/sam_brendan.astro +++ b/src/pages/sam_brendan.astro @@ -7,7 +7,7 @@ import { ImageSamAllStickers, ImageSamRefsheet } from "@assets/images"; -
    +

    Sam Brendan

    @@ -199,11 +199,16 @@ import { ImageSamAllStickers, ImageSamRefsheet } from "@assets/images"; import tippy from "tippy.js"; import "tippy.js/dist/tippy.css"; - const tooltipItems = document.querySelectorAll("[title][data-tooltip]"); - tooltipItems.forEach((el) => el.setAttribute("data-tooltip", el.title)); - tippy(tooltipItems, { - content: (el) => (el as HTMLElement).dataset.tooltip!, - theme: "bm", - }); - tooltipItems.forEach((el) => el.removeAttribute("title")); + const initTooltips = () => { + const tooltipItems = document.querySelectorAll("[title][data-tooltip]"); + tooltipItems.forEach((el) => el.setAttribute("data-tooltip", el.title)); + tippy(tooltipItems, { + content: (el) => (el as HTMLElement).dataset.tooltip!, + theme: "bm", + }); + tooltipItems.forEach((el) => el.removeAttribute("title")); + }; + + document.addEventListener("astro:page-load", initTooltips); + initTooltips(); diff --git a/src/pages/terms_of_service.astro b/src/pages/terms_of_service.astro index 0de90b0..a97f30b 100644 --- a/src/pages/terms_of_service.astro +++ b/src/pages/terms_of_service.astro @@ -10,7 +10,7 @@ import { TOS_COMMISSION_STATUS, TOS_UPDATED_AT } from "@data/tos"; -

    +

    Terms of Service for story commissions

    diff --git a/src/pages/work.astro b/src/pages/work.astro index 42ab220..d7720d4 100644 --- a/src/pages/work.astro +++ b/src/pages/work.astro @@ -30,7 +30,7 @@ import { SUBSCRIBESTAR_ENABLED } from "@data/subscribestar"; title="Gallery feed" /> -
    +

    My work