diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml new file mode 100644 index 0000000..5fe81d5 --- /dev/null +++ b/.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" \ No newline at end of file diff --git a/astro.config.mjs b/astro.config.mjs index 9a5e30b..201919b 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -42,6 +42,7 @@ export default defineConfig({ "girlthi.ng", "lenooby09.tech", "ackwell.au", + "ari.express" ], }, markdown: { diff --git a/package.json b/package.json index 9f750cc..5e9f208 100644 --- a/package.json +++ b/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" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3847f49..338e1ae 100644 --- a/pnpm-lock.yaml +++ b/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 diff --git a/public/static/img/88x31/Button.png b/public/static/img/88x31/Button.png new file mode 100644 index 0000000..02e672e Binary files /dev/null and b/public/static/img/88x31/Button.png differ diff --git a/public/static/img/88x31/PWsbutton.png b/public/static/img/88x31/PWsbutton.png new file mode 100644 index 0000000..96c92b1 Binary files /dev/null and b/public/static/img/88x31/PWsbutton.png differ diff --git a/src/components/Donations.astro b/src/components/Donations.astro new file mode 100644 index 0000000..875638d --- /dev/null +++ b/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"; +--- + + +

Feel free to fund me at these places:

+ + diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 64296bd..3ac3a8b 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -18,7 +18,7 @@ const COMMIT = `${execSync(`git log -1 --pr > RSS Feed | blog for robots! AI Honeypot~ | + > AI Honeypot~ |

diff --git a/src/components/NavHeader.astro b/src/components/NavHeader.astro index 283fdaa..0e3fb33 100644 --- a/src/components/NavHeader.astro +++ b/src/components/NavHeader.astro @@ -47,5 +47,6 @@ const optimizedBackgroundLQ = await getImage({ Other Pages | Portfolio | + Donate |

diff --git a/src/components/Social.astro b/src/components/Social.astro index 2942213..4cd6aed 100644 --- a/src/components/Social.astro +++ b/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) +
  • + Bluesky Backup - +
  • Discord 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"); + }); + } diff --git a/src/content/albums/aria-board/4-Synergia-frame-1.jpg b/src/content/albums/aria-board/4-Synergia-frame-1.jpg new file mode 100644 index 0000000..64b8562 Binary files /dev/null and b/src/content/albums/aria-board/4-Synergia-frame-1.jpg differ diff --git a/src/content/albums/aria-board/4-Synergia-frame-10.jpg b/src/content/albums/aria-board/4-Synergia-frame-10.jpg new file mode 100644 index 0000000..5ce5857 Binary files /dev/null and b/src/content/albums/aria-board/4-Synergia-frame-10.jpg differ diff --git a/src/content/albums/aria-board/4-Synergia-frame-2.jpg b/src/content/albums/aria-board/4-Synergia-frame-2.jpg new file mode 100644 index 0000000..28fcf1e Binary files /dev/null and b/src/content/albums/aria-board/4-Synergia-frame-2.jpg differ diff --git a/src/content/albums/aria-board/4-Synergia-frame-3.jpg b/src/content/albums/aria-board/4-Synergia-frame-3.jpg new file mode 100644 index 0000000..bcdc1dd Binary files /dev/null and b/src/content/albums/aria-board/4-Synergia-frame-3.jpg differ diff --git a/src/content/albums/aria-board/4-Synergia-frame-4.jpg b/src/content/albums/aria-board/4-Synergia-frame-4.jpg new file mode 100644 index 0000000..e467c46 Binary files /dev/null and b/src/content/albums/aria-board/4-Synergia-frame-4.jpg differ diff --git a/src/content/albums/aria-board/4-Synergia-frame-5.jpg b/src/content/albums/aria-board/4-Synergia-frame-5.jpg new file mode 100644 index 0000000..83ec20b Binary files /dev/null and b/src/content/albums/aria-board/4-Synergia-frame-5.jpg differ diff --git a/src/content/albums/aria-board/4-Synergia-frame-6.jpg b/src/content/albums/aria-board/4-Synergia-frame-6.jpg new file mode 100644 index 0000000..71cc80a Binary files /dev/null and b/src/content/albums/aria-board/4-Synergia-frame-6.jpg differ diff --git a/src/content/albums/aria-board/4-Synergia-frame-7.jpg b/src/content/albums/aria-board/4-Synergia-frame-7.jpg new file mode 100644 index 0000000..a50ffc8 Binary files /dev/null and b/src/content/albums/aria-board/4-Synergia-frame-7.jpg differ diff --git a/src/content/albums/aria-board/4-Synergia-frame-8.jpg b/src/content/albums/aria-board/4-Synergia-frame-8.jpg new file mode 100644 index 0000000..abb896d Binary files /dev/null and b/src/content/albums/aria-board/4-Synergia-frame-8.jpg differ diff --git a/src/content/albums/aria-board/4-Synergia-frame-9.png b/src/content/albums/aria-board/4-Synergia-frame-9.png new file mode 100644 index 0000000..d41556f Binary files /dev/null and b/src/content/albums/aria-board/4-Synergia-frame-9.png differ diff --git a/src/pages/about.astro b/src/pages/about.astro index 671c51e..2dc827a 100644 --- a/src/pages/about.astro +++ b/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";
    • +