Increase badge size by 3px to match text size

.forgejo/workflows/deploy.yaml

@@ -0,0 +1,61 @@
+name: Deploy to Web Server
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: docker
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install SSH key
+        uses: https://github.com/shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.SSH_KEY }}
+          name: aria-coffee-deploy # optional
+          known_hosts: ${{ secrets.KNOWN_HOSTS }}
+          if_key_exists: fail
+
+      - name: Install pnpm
+        uses: https://github.com/pnpm/action-setup@v4
+        with:
+          version: 10
+
+      - name: Install Node.js
+        uses: https://github.com/actions/setup-node@v4
+        with:
+          node-version: 23.11.0
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Build website
+        run: pnpm run build-action
+
+      - name: Create folder if not exists
+        continue-on-error: true
+        run: |
+          ssh -i ~/.ssh/aria-coffee-deploy ${{ vars.SERVER_USER }}@${{ vars.SERVER_HOST }} "mkdir -p /var/www/Aria/"
+
+      - name: Clear old backup
+        continue-on-error: true
+        run: |
+          ssh -i ~/.ssh/aria-coffee-deploy ${{ vars.SERVER_USER }}@${{ vars.SERVER_HOST }} "[ -d "/var/www/Aria/dist-old" ] && rm -r /var/www/Aria/dist-old"
+
+      - name: Backup current install
+        continue-on-error: true
+        run: |
+          ssh -i ~/.ssh/aria-coffee-deploy ${{ vars.SERVER_USER }}@${{ vars.SERVER_HOST }} "[ -d "/var/www/Aria/dist" ] && mv /var/www/Aria/dist /var/www/Aria/dist-old"
+
+      - name: Copy over new build-action
+        run: |
+          scp -i ~/.ssh/aria-coffee-deploy -rv ./dist ${{ vars.SERVER_USER }}@${{ vars.SERVER_HOST }}:/var/www/Aria
+      
+      - name: Set permissions on the deployed files
+        run: |
+          ssh -i ~/.ssh/aria-coffee-deploy ${{ vars.SERVER_USER }}@${{ vars.SERVER_HOST }} "chmod -R 755 /var/www/Aria/dist"

astro.config.mjs

@@ -42,6 +42,7 @@ export default defineConfig({
             "girlthi.ng",
             "lenooby09.tech",
             "ackwell.au",
+            "ari.express"
         ],
     },
     markdown: {

package.json

@@ -5,6 +5,7 @@
   "scripts": {
     "dev": "astro dev",
     "build": "astro check && astro build && ./compress-images.sh",
+    "build-action": "astro build",
     "preview": "astro preview",
     "astro": "astro"
   },
@@ -24,10 +25,13 @@
     "typescript": "^5.8.3"
   },
   "devDependencies": {
+    "@iconify-json/cib": "^1.2.2",
+    "@iconify-json/hugeicons": "^1.2.5",
     "@iconify-json/mdi": "^1.2.3",
     "@iconify-json/meteor-icons": "^1.2.1",
     "@iconify-json/tabler": "^1.2.17",
     "@tailwindcss/typography": "^0.5.16",
+    "@iconify-json/token": "^1.2.16",
     "vite": "^6.3.3"
   }
 }

pnpm-lock.yaml

@@ -48,6 +48,12 @@ importers:
         specifier: ^5.8.3
         version: 5.8.3
     devDependencies:
+      '@iconify-json/cib':
+        specifier: ^1.2.2
+        version: 1.2.2
+      '@iconify-json/hugeicons':
+        specifier: ^1.2.5
+        version: 1.2.5
       '@iconify-json/mdi':
         specifier: ^1.2.3
         version: 1.2.3
@@ -57,6 +63,9 @@ importers:
       '@iconify-json/tabler':
         specifier: ^1.2.17
         version: 1.2.17
+      '@iconify-json/token':
+        specifier: ^1.2.16
+        version: 1.2.16
       '@tailwindcss/typography':
         specifier: ^0.5.16
         version: 0.5.16(tailwindcss@3.4.17)
@@ -410,6 +419,12 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@iconify-json/cib@1.2.2':
+    resolution: {integrity: sha512-WevYDdIm0x3I3YZyoIgdSu4uurbzs2b2gsMLUj8/EMKMoPIx6GF+t0VcaCgFY4a0rIdUY18MYP6m9XgcOhOtFg==}
+
+  '@iconify-json/hugeicons@1.2.5':
+    resolution: {integrity: sha512-luPAFcmQU7eQFHzjtYdYbF5j2h8/6SCv+FGQP7FNJNVBjVGQOyuyum5wXDFEx13F8lGk/AGPVWGqMHp7+HdmJg==}
+
   '@iconify-json/mdi@1.2.3':
     resolution: {integrity: sha512-O3cLwbDOK7NNDf2ihaQOH5F9JglnulNDFV7WprU2dSoZu3h3cWH//h74uQAB87brHmvFVxIOkuBX2sZSzYhScg==}
 
@@ -419,6 +434,9 @@ packages:
   '@iconify-json/tabler@1.2.17':
     resolution: {integrity: sha512-Jfk20IC/n7UOQQSXM600BUhAwEfg8KU1dNUF+kg4eRhbET5w1Ktyax7CDx8Z8y0H6+J/8//AXpJOEgG8YoP8rw==}
 
+  '@iconify-json/token@1.2.16':
+    resolution: {integrity: sha512-SSAcsY2Gz6WSbInwHSGj6hbk5kgWluOOQunG4L7Gfri1hEb3vCQjl5VMKgTojKd8jqLZw5NykNeRokw5FssATw==}
+
   '@iconify/tools@4.1.2':
     resolution: {integrity: sha512-q6NzLQYEN9zkDfcyBqD3vItHcZw97w/s++3H3TBxUORr57EfHxj6tOW6fyufDjMq+Vl56WXWaPx1csBPYlI5CA==}
 
@@ -3290,6 +3308,14 @@ snapshots:
   '@esbuild/win32-x64@0.25.3':
     optional: true
 
+  '@iconify-json/cib@1.2.2':
+    dependencies:
+      '@iconify/types': 2.0.0
+
+  '@iconify-json/hugeicons@1.2.5':
+    dependencies:
+      '@iconify/types': 2.0.0
+
   '@iconify-json/mdi@1.2.3':
     dependencies:
       '@iconify/types': 2.0.0
@@ -3302,6 +3328,10 @@ snapshots:
     dependencies:
       '@iconify/types': 2.0.0
 
+  '@iconify-json/token@1.2.16':
+    dependencies:
+      '@iconify/types': 2.0.0
+
   '@iconify/tools@4.1.2':
     dependencies:
       '@iconify/types': 2.0.0

src/components/Donations.astro

@@ -0,0 +1,89 @@
+---
+const kofi = "https://ko-fi.com/buymyaria";
+const buymeacoffee = "https://buymeacoffee.com/buymymojo";
+
+
+import Partition from "../components/Partition.astro";
+
+import { Icon } from "astro-icon/components";
+---
+
+<Partition>
+    <h1>Feel free to fund me at these places:</h1>
+    <ul class="list-disc p-4 whitespace-nowrap">
+        <li>
+            <a href={kofi} class="p-1" target="_blank"
+                ><Icon name="hugeicons:ko-fi" class={"svg-inline"} /> Ko-Fi</a>
+        </li>
+        <li>
+            <a href={buymeacoffee} class="p-1" target="_blank"
+                ><Icon name="cib:buy-me-a-coffee" class={"svg-inline"} /> Buy Me a Coffee</a>
+        </li>
+        <li>
+            <Icon name="token:xmr" class={"svg-inline"} /> XMR: <textarea
+                onclick="this.select()"
+                readonly
+                cols="95"
+                rows="1"
+                class="rounded backdrop-brightness-0"
+                style="background-color: var(--third-colour); resize: none;"
+                >48NZQ5rYpiNEjNtsWKbyniVY3FpJ9kLVA815cxfSMPF5gvjrBiHH9x5JLr3aBYhvKvENCdhrYgzQ9LhBnR5NoinWDCGBzNm</textarea
+            >
+        </li>
+        <li>
+            <Icon name="token:btc" class={"svg-inline"} /> BTC: <textarea
+                onclick="this.select()"
+                readonly
+                cols="42"
+                rows="1"
+                class="rounded backdrop-brightness-0"
+                style="background-color: var(--third-colour); resize: none;"
+                >bc1qeqz2fswpn4hjjy373gyvjgkq63hv7mknwd6cau</textarea
+            >
+        </li>
+        <li>
+            <Icon name="token:ltc" class={"svg-inline"} /> LTC: <textarea
+                onclick="this.select()"
+                readonly
+                cols="34"
+                rows="1"
+                class="rounded backdrop-brightness-0"
+                style="background-color: var(--third-colour); resize: none;"
+                >LW4tGWNzYQ21eJ8G2LZaLqroYU67nSNwnY</textarea
+            >
+        </li>
+        <li>
+            <Icon name="token:eth" class={"svg-inline"} /> ETH: <textarea
+                onclick="this.select()"
+                readonly
+                cols="42"
+                rows="1"
+                class="rounded backdrop-brightness-0"
+                style="background-color: var(--third-colour); resize: none;"
+                >0xDd947270bCE2bBB3a3E3eCc4eA5095c14aa9ec58</textarea
+            >
+        </li>
+        <li>
+            <Icon name="token:usdc" class={"svg-inline"} /> USDC(ETH): <textarea
+                onclick="this.select()"
+                readonly
+                cols="42"
+                rows="1"
+                class="rounded backdrop-brightness-0"
+                style="background-color: var(--third-colour); resize: none;"
+                >0xDd947270bCE2bBB3a3E3eCc4eA5095c14aa9ec58</textarea
+            >
+        </li>
+        <li>
+            <Icon name="token:usdt" class={"svg-inline"} /> USDT(ETH): <textarea
+                onclick="this.select()"
+                readonly
+                cols="42"
+                rows="1"
+                class="rounded backdrop-brightness-0"
+                style="background-color: var(--third-colour); resize: none;"
+                >0xDd947270bCE2bBB3a3E3eCc4eA5095c14aa9ec58</textarea
+            >
+        </li>
+    </ul>
+</Partition>

src/components/Footer.astro

@@ -18,7 +18,7 @@ const COMMIT = `<a href=${commitURL} target="_blank">${execSync(`git log -1 --pr
                 > <Icon name="mdi:rss" class={"svg-inline"}/>RSS Feed</a
             > | <span class="tooltip"><a href="/special_blog"
             > <Icon name="mdi:rss" class={"svg-inline"}/>blog for robots!</a
-        > <span class="tooltiptext"><nobr>AI Honeypot~</nobr></span></span> |
+        > <span class="tooltiptext"><nobr>AI Honeypot~</nobr></span></span> | <img src="https://git.aria.coffee/BuyMyAria/aria.coffee/badges/workflows/deploy.yaml/badge.svg" width="130px" height="23" style="display: inline-block;" />
         </p>
     </div>
     <div class="flex">

src/components/NavHeader.astro

@@ -47,5 +47,6 @@ const optimizedBackgroundLQ = await getImage({
     <!-- <a href="/friends" class="nav-btn">Friends</a> | -->
     <a href="/directory" class="nav-btn">Other Pages</a> |
     <a href="/portfolio" class="nav-btn">Portfolio</a> |
+    <a href="/pay-me" class="nav-btn">Donate</a> |
     </p>
 </Partition>

src/components/Social.astro

@@ -4,6 +4,7 @@ const discord = "https://discord.com/users/383507911160233985";
 const github = "https://github.com/BuyMyMojo";
 const steam = "https://steamcommunity.com/profiles/76561198227003516";
 const bsky = "https://bsky.app/profile/did:plc:bzrn33tcfgjxnsanvg6py3xn";
+const bskybackup = "https://bsky.app/profile/did:plc:valun42etpm73we7bgyh64ge";
 const bskyArchive = "https://buymymojo.net/bsky/";
 
 import { Icon } from "astro-icon/components";
@@ -18,6 +19,13 @@ import { Icon } from "astro-icon/components";
             >@aria.coffee (Click to copy DID)</button
         >
     </li>
+    <li>
+        <a href={bskybackup} class="p-1" target="_blank"
+            ><Icon name="meteor-icons:bluesky" class={"svg-inline"} /> Bluesky Backup</a
+        > - <button id="bskypid-backup"
+            >@aria.pds.witchcraft.systems (Click to copy DID)</button
+        >
+    </li>
     <li>
         <a href={discord} target="_blank"
             ><Icon name="meteor-icons:discord" class={"svg-inline"}/> Discord</a
@@ -51,10 +59,17 @@ import { Icon } from "astro-icon/components";
 
 <script>
     const bskypid = document.querySelector("#bskypid");
+    const bskypidbackup = document.querySelector("#bskypid-backup");
 
     if (bskypid != null) {
         bskypid.addEventListener("click", () => {
             navigator.clipboard.writeText("did:plc:bzrn33tcfgjxnsanvg6py3xn");
         });
     }
+
+    if (bskypidbackup != null) {
+        bskypidbackup.addEventListener("click", () => {
+            navigator.clipboard.writeText("did:plc:valun42etpm73we7bgyh64ge");
+        });
+    }
 </script>

src/pages/about.astro

@@ -1,6 +1,7 @@
 ---
 import FriendLink from "../components/FriendLink.astro";
 import Partition from "../components/Partition.astro";
+import Donations from "../components/Donations.astro";
 import BaseLayout from "../layouts/BaseLayout.astro";
 import "../styles/aria.css";
 
@@ -183,6 +184,7 @@ const skillColor = "#F5A8B7";
             </li>
         </ul>
     </Partition>
+    <Donations />
 </BaseLayout>
 
 <style define:vars={{ skillColor }}>

src/pages/directory.astro

@@ -12,6 +12,7 @@ const pageTitle = "A bunch of other pages!";
         <p>Here are some other pages I have for various reasons!</p>
 
         <ul class=" list-disc px-8">
+            <li><a href="/albums">Albums and Gallerys</a></li>
             <li><a href="/jxl-testing">JpegXL Decoder Test</a></li>
             <li><a href="/other buttons">Extra 88x31 buttons</a></li>
             <li><a href="/extreme-format-test">Goofy video format test</a></li>

src/pages/gallery/[id].astro

@@ -43,15 +43,16 @@ const sorted = images.sort((a, b) => a.src.localeCompare(b.src));
     >
         {
             sorted.map((image) => (
-                <Picture
+                <a href={image.src}><Picture
                     src={image}
                     alt={`Image from ${album.data.title} album`}
-                    formats={["avif", "webp", "jpeg"]}
-                    quality={95}
+                    formats={["avif", "webp"]}
+                    fallbackFormat="jpeg"
+                    quality={93}
                     class="rounded-sm mb-4 border border-transparent hover:border-gray-300 transition-all duration-300 ease-in-out hover:shadow-lg"
                     loading="lazy"
                     decoding="async"
-                />
+                /></a>
             ))
         }
     </div>

src/pages/index.astro

@@ -137,6 +137,18 @@ const age = seconds / 31556952;
                 image="https://ackwell.au/assets/88x31/ackwell-coil.png"
                 target="https://ackwell.au"
             />
+            <div class="outline-dashed flex outline-3 mx-1">
+                <FriendLink
+                name="witchcraft.systems"
+                image="https://ari.express/assets/PWsbutton.png"
+                target="https://pds.witchcraft.systems/"
+            />
+            <FriendLink
+                name="Ari"
+                image="https://ari.express/assets/Button.png"
+                target="https://ari.express/"
+            />
+            </div>
         </div>
         <br />
         <a href="/other buttons">Extra 88x31 buttons!</a>

src/pages/pay-me.astro

@@ -0,0 +1,12 @@
+---
+import Donations from "../components/Donations.astro";
+import BaseLayout from "../layouts/BaseLayout.astro";
+import "../styles/aria.css";
+
+const pageTitle = "Give Aria money";
+const description = "Hey look sometime you gotta give your wealth to a cute girl";
+---
+
+<BaseLayout pageTitle={pageTitle} description={description}>
+    <Donations />
+</BaseLayout>