1.3.78

.vscode/extensions.json

@@ -1,4 +1,8 @@
 {
-  "recommendations": ["astro-build.astro-vscode"],
+  "recommendations": [
+    "astro-build.astro-vscode",
+    "dbaeumer.vscode-eslint",
+    "esbenp.prettier-vscode"
+  ],
   "unwantedRecommendations": []
 }

README.md

@@ -28,6 +28,7 @@ $ pnpm i
 | `pnpm run build`    | generate static files to `dist` directory      |
 | `pnpm run deploy`   | upload to my server                            |
 | `pnpm run prep:now` | back up and clear current `now page` constants |
+| `pnpm run patch:build:deploy` | increment version, build, then upload |
 
 ## Deployment
 

eslint.config.mjs

@@ -5,7 +5,7 @@ import tseslint from 'typescript-eslint'
 import astroSwGlobals from '@ayco/astro-sw/globals'
 import astroParser from 'astro-eslint-parser'
 
-import { includeIgnoreFile } from '@eslint/compat'
+import { includeIgnoreFile } from '@eslint/config-helpers'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ayco/personal-website",
   "type": "module",
-  "version": "1.3.65",
+  "version": "1.3.78",
   "private": true,
   "scripts": {
     "astro": "astro",
@@ -15,33 +15,36 @@
     "check": "npm run format && npm run lint",
     "deploy": "eval $(grep '^HOST' .env) && scp -r dist ayo@$HOST:~/ayco.io-flask",
     "patch:build:deploy": "npm version patch && npm run build && npm run deploy",
+    "pbd": "npm run patch:build:deploy",
     "build:preview": "npm run build && astro preview",
     "build:deploy": "npm run build && npm run deploy",
     "copy:dist": "npm run build && cp -R dist ../ayco.io-flask/",
     "prepare": "husky",
-    "prep:now": "npx jiti ./commands/prep-now.js"
+    "prep:now": "npx jiti ./commands/prep-now.js",
+    "test": "vitest run ."
   },
   "devDependencies": {
     "@astrojs/sitemap": "^3.7.2",
-    "@ayco/astro-sw": "^0.10.1",
+    "@ayco/astro-sw": "^1.0.0",
     "@eslint/compat": "^2.1.0",
+    "@eslint/config-helpers": "^0.6.0",
     "@eslint/js": "^10.0.1",
     "@iconify-json/mdi": "^1.2.3",
-    "@iconify-json/simple-icons": "^1.2.81",
-    "@iconify-json/tabler": "^1.2.34",
-    "@typescript-eslint/parser": "^8.59.2",
-    "astro": "^6.3.1",
+    "@iconify-json/simple-icons": "^1.2.82",
+    "@iconify-json/tabler": "^1.2.35",
+    "@typescript-eslint/parser": "^8.59.3",
+    "astro": "^6.3.3",
     "astro-eslint-parser": "^1.4.0",
     "astro-github-stats": "^0.8.0",
     "astro-icon": "^1.1.5",
     "consola": "^3.4.2",
-    "eslint": "^10.3.0",
+    "eslint": "^10.4.0",
     "eslint-plugin-astro": "^1.7.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "globals": "^17.6.0",
     "husky": "^9.1.7",
     "jiti": "^2.7.0",
-    "lint-staged": "^17.0.2",
+    "lint-staged": "^17.0.4",
     "pathe": "^2.0.3",
     "prettier": "^3.8.3",
     "prettier-plugin-astro": "^0.14.1",
@@ -50,9 +53,11 @@
     "remark-rehype": "^11.1.2",
     "tslib": "^2.8.1",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.59.2",
+    "typescript-eslint": "^8.59.3",
     "unified": "^11.0.5",
-    "vite-plugin-static-copy": "^4.1.0"
+    "vite-plugin-static-copy": "^4.1.0",
+    "vitest": "^4.1.7",
+    "vitest-dom": "^0.1.1"
   },
   "lint-staged": {
     "*.{js,mjs,astro,ts}": [
@@ -63,7 +68,7 @@
       "prettier --write"
     ]
   },
-  "packageManager": "pnpm@10.33.2",
+  "packageManager": "pnpm@11.2.2",
   "dependencies": {
     "@ayo-run/status-indicator": "^2.1.2",
     "web-component-base": "^4.1.2"

pnpm-workspace.yaml

@@ -0,0 +1,4 @@
+allowBuilds:
+  esbuild: false
+  sharp: false
+  web-component-base: false

public/publickey.asc

@@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEahs0NhYJKwYBBAHaRw8BAQdAV2CfblniKxklPgW9eYt2gBl0jMHLwtjrQaY+
+BQoWdIa0FkF5byBBeWNvIDxheW9AYXljby5pbz6ImQQTFgoAQRYhBBfxPV6P9zcr
+E1RcOGXmv2QVKTxlBQJqGzQ2AhsDBQkB4TOABQsJCAcCAiICBhUKCQgLAgQWAgMB
+Ah4HAheAAAoJEGXmv2QVKTxlIeYA/2WLvkDapBbVmGXoACAhqcTN93/CoPyzUbhN
+hHE6mmAUAQDHsgCHmh3S/Rn4NRE3Gb41kiPTBWHrlYLTj3Kiw0ASB7g4BGobNDYS
+CisGAQQBl1UBBQEBB0C6OEKEIPLaNDOM6JYhvvq0Q4Mk/B1eyZBKF/b4fQvlGgMB
+CAeIfgQYFgoAJhYhBBfxPV6P9zcrE1RcOGXmv2QVKTxlBQJqGzQ2AhsMBQkB4TOA
+AAoJEGXmv2QVKTxlMSQBAP5ta1kUFp3HAYwcun8qmoiVq1dEJSN1LnI7HlX4ucTl
+AP0YLC768PFTBm9CM5T1BE0xjJ7s4dZSrVoI4n8RSe1nCA==
+=MTsv
+-----END PGP PUBLIC KEY BLOCK-----

src/components/Footer.astro

@@ -45,7 +45,7 @@ const year = new Date().getFullYear()
   <p>
     Copyright &#169; 2022-{year}
     <a href="/">Ayo Ayco</a>. This website <a
-      href="https://ayos.blog/stopped-tracking-on-my-sites"
+      href="https://v1.ayos.blog/stopped-tracking-on-my-sites"
       >does not track users</a
     >. See the <a href="https://git.ayo.run/ayo/ayco.io-astro">source code.</a>
   </p>

src/components/Head.astro

@@ -65,7 +65,8 @@ const baseURL = Astro.site?.toString().slice(0, -1) // ?? 'https://ayo.ayco.io'
     }
   </script>
   <script type="module">
+    // importing is enough to register the elements
+    // eslint-disable-next-line
     import StatusIndicator from 'status-indicator'
-    customElements.define('status-indicator', StatusIndicator)
   </script>
 </head>

src/layouts/variables.css

@@ -26,8 +26,4 @@
   --bg-dark: #343a40;
   --bg-darker: #212529;
   --bg-darkest: #000;
-
-  --pill-border-color: rgba(255, 255, 255, 0.2);
-  --pill-border-radius: 40px;
-  --pill-padding: 8px 4px;
 }

src/pages/about.astro

@@ -36,8 +36,9 @@ import Footer from '../components/Footer.astro'
     <p>
       In my spare time, I find it fun building <a href="/showcase">projects</a>,
       running self-hosted services at <a href="https://ayo.run">ayo.run</a>, and
-      volunteering to <a href="https://ayos.blog/why-fediverse/" target="_blank"
-        >Fediverse</a
+      volunteering to <a
+        href="https://v1.ayos.blog/why-fediverse/"
+        target="_blank">Fediverse</a
       > projects like <a href="https://elk.zone">elk.zone</a>,
       <a href="https://m.webtoo.ls/public/local">webtoo.ls</a>, and <a
         href="https://m.webtoo.ls/@vitest">vitest's fedi presence</a
@@ -52,11 +53,9 @@ import Footer from '../components/Footer.astro'
     <h2 id="contact">Contact info</h2>
     <p>My inbox is open to everyone.</p>
     <ul>
-      <li>✉️ Email me: <a href="mailto:hi@ayo.run">hi@ayo.run</a></li>
       <li>
-        💬 Let's chat: <a href="https://chat.ayo.run/join/7IKG-h3nW-pD1H"
-          >chat.ayo.run</a
-        >
+        ✉️ Email me: <a href="mailto:ayo@ayco.io">ayo@ayco.io</a> &middot
+        <small> (<a href="/pgp">PGP key</a>)</small>
       </li>
       <li>
         💬 Signal: <a
@@ -68,11 +67,11 @@ import Footer from '../components/Footer.astro'
     </ul>
   </main>
   <Footer />
-</Layout>
 
-<style>
-  ul {
-    list-style: none;
-    padding-left: 0;
-  }
-</style>
+  <style>
+    ul {
+      list-style: none;
+      padding-left: 0;
+    }
+  </style>
+</Layout>

src/pages/index.astro

@@ -36,21 +36,11 @@ const avatarSize = 150
         <h1 title="Ayo Ayco | Software Engineer + Web Developer">
           Hi, I'm <span class="heavy-text">Ayo</span>!
         </h1>
-        <!--a href="https://forms.ayo.run/form/tnz7FybY" class="now-wrapper"-->
 
-        <a href="/now" class="now-wrapper pill">
+        <a href="/now" class="now-wrapper action primary">
           <span class="now-label">now</span>
           <span class="status">{now.title}</span>
         </a>
-
-        <a
-          href="https://chat.ayo.run/join/7IKG-h3nW-pD1H"
-          class="chat-link pill"
-        >
-          <status-indicator id="chat-link" pulse status="positive">
-            Chat
-          </status-indicator>
-        </a>
       </div>
     </div>
   </section>
@@ -60,9 +50,6 @@ const avatarSize = 150
         I care about the <em>Web</em>, and I love to <em>create</em> stuff to <em
           >inspire</em
         > and <em>serve</em> others.
-        <!--
-          <a href="/about">More?</a>
-        -->
       </p>
     </section>
     <section class="cards-section">
@@ -96,13 +83,30 @@ const avatarSize = 150
     color: white;
   }
 
-  .pill {
+  .action {
     margin-right: 0.5rem;
-    padding: var(--pill-padding);
+    padding: 8px 4px;
     color: white;
     font-size: var(--font-size-sm);
     text-decoration: none;
     font-weight: normal;
+
+    &.primary {
+      border: 1px solid rgba(255, 255, 255, 0.2);
+      border-radius: 40px;
+    }
+  }
+
+  .now-wrapper {
+    display: inline-block;
+    max-width: 390px;
+    white-space: nowrap;
+    overflow: clip;
+    text-overflow: ellipsis;
+
+    .status {
+      max-width: 300px;
+    }
   }
 
   .now-label {
@@ -202,7 +206,7 @@ const avatarSize = 150
   }
 
   @media only screen and (max-device-width: 360px) {
-    .pill {
+    .action.primary {
       border: 0px;
       border-radius: 0;
       font-size: var(--font-size-sm);
@@ -233,6 +237,12 @@ const avatarSize = 150
   }
 
   @media only screen and (min-device-width: 280px) and (max-device-width: 653px) {
+    .action {
+      display: block;
+    }
+    .now-wrapper {
+      max-width: 600px;
+    }
     .highlighted-section__content {
       padding: 1rem;
     }

src/pages/now/and-then/posts/2026-04-11.astro

@@ -37,7 +37,6 @@ publishedOn = publishedOn === '' ? publishDate : publishedOn
     </p>
 
     <Fragment set:html={content} />
-
   </main>
   <Footer />
 </Layout>

src/pages/pgp.astro

@@ -0,0 +1,124 @@
+---
+import Layout from '../layouts/Layout.astro'
+import Footer from '../components/Footer.astro'
+
+const title = 'PGP public key'
+const description =
+  'Use to verify my digital signature or to encrypt messages intended only for me.'
+---
+
+<Layout title={"Ayo's " + title} description={description}>
+  <main>
+    <h1>My {title}</h1>
+    <p>{description}</p>
+
+    <div class="key-block" role="region" aria-labelledby="public-key">
+      <div class="btn-wrapper">
+        <button class="copy-btn btn" aria-label="Copy key to clipboard"
+          >Copy</button
+        >
+        <a href="/publickey.asc" class="btn">Download</a>
+      </div>
+      <pre
+        id="public-key"><code>
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEahs0NhYJKwYBBAHaRw8BAQdAV2CfblniKxklPgW9eYt2gBl0jMHLwtjrQaY+
+BQoWdIa0FkF5byBBeWNvIDxheW9AYXljby5pbz6ImQQTFgoAQRYhBBfxPV6P9zcr
+E1RcOGXmv2QVKTxlBQJqGzQ2AhsDBQkB4TOABQsJCAcCAiICBhUKCQgLAgQWAgMB
+Ah4HAheAAAoJEGXmv2QVKTxlIeYA/2WLvkDapBbVmGXoACAhqcTN93/CoPyzUbhN
+hHE6mmAUAQDHsgCHmh3S/Rn4NRE3Gb41kiPTBWHrlYLTj3Kiw0ASB7g4BGobNDYS
+CisGAQQBl1UBBQEBB0C6OEKEIPLaNDOM6JYhvvq0Q4Mk/B1eyZBKF/b4fQvlGgMB
+CAeIfgQYFgoAJhYhBBfxPV6P9zcrE1RcOGXmv2QVKTxlBQJqGzQ2AhsMBQkB4TOA
+AAoJEGXmv2QVKTxlMSQBAP5ta1kUFp3HAYwcun8qmoiVq1dEJSN1LnI7HlX4ucTl
+AP0YLC768PFTBm9CM5T1BE0xjJ7s4dZSrVoI4n8RSe1nCA==
+=MTsv
+-----END PGP PUBLIC KEY BLOCK-----
+          </code></pre>
+    </div>
+    <p>Expiry Date: 2027-05-30</p>
+    <p>
+      Fingerprint: <code
+        >17F1 3D5E 8FF7 372B 1354 5C38 65E6 BF64 1529 3C65</code>
+    </p>
+
+    <p></p>
+  </main>
+  <Footer />
+</Layout>
+
+<script>
+  /* Clipboard copy logic */
+  document.querySelector('.copy-btn').addEventListener('click', async () => {
+    const keyText = document.querySelector('#public-key code').innerText.trim()
+    try {
+      await navigator.clipboard.writeText(keyText)
+      const btn = document.querySelector('.copy-btn')
+      const original = btn.textContent
+      btn.textContent = 'Copied!'
+      setTimeout(() => {
+        btn.textContent = original
+      }, 2000)
+    } catch (err) {
+      console.error('Copy failed', err)
+      alert('Unable to copy the key. Please copy it manually.')
+    }
+  })
+</script>
+
+<style>
+  code {
+    font-size: var(--font-size-sm);
+  }
+
+  .key-block {
+    position: relative;
+    background: #272822;
+    color: #f8f8f2;
+    font-family: monospace;
+    font-size: 0.9rem;
+    line-height: 1.4;
+    padding: 1rem 1rem 1rem 1.5rem;
+    border-radius: 4px;
+    overflow-x: auto;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+    margin: 1em 0;
+  }
+
+  .key-block code {
+    display: block;
+  }
+
+  /* buttons */
+  .btn-wrapper {
+    position: absolute;
+    top: 0.5rem;
+    right: 0.5rem;
+  }
+
+  .btn {
+    display: inline-block;
+    position: relative;
+    background: var(--color-brand-blue-1);
+    color: #fff;
+    border: none;
+    border-radius: 4px;
+    padding: 0.3rem 0.6rem;
+    font-size: 0.8rem;
+    cursor: pointer;
+    opacity: 0.9;
+    transition: opacity 0.2s;
+    text-decoration: none;
+  }
+
+  .btn:hover,
+  .btn:focus {
+    opacity: 1;
+  }
+
+  .btn:focus {
+    outline: 2px solid #0056b3;
+    outline-offset: 2px;
+  }
+</style>

src/pages/showcase.astro

@@ -11,8 +11,8 @@ import Card from '../components/Card.astro'
   <main>
     <h1><span class="text-gradient">Hobby Projects</span></h1>
     <p>
-      See more of my previous projects at <a href="https://ayos.blog"
-        >my blog</a
+      See more of my previous projects at <a
+        href="https://v1.ayos.blog/projects">my blog</a
       >.
     </p>
     <ul>

tests/prep-now.test.ts

@@ -0,0 +1,121 @@
+import { readFileSync, writeFileSync, copyFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+import { dirname, resolve } from 'node:path'
+
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import { consola } from 'consola'
+
+import newNow from '../commands/prep-now'
+
+// Mock file system operations
+vi.mock('path', () => ({
+  resolve: vi.fn(),
+  readFileSync: vi.fn(),
+  writeFileSync: vi.fn(),
+  copyFileSync: vi.fn(),
+}))
+
+// Mock consola
+vi.mock('consola', () => ({
+  consola: {
+    box: vi.fn(),
+    start: vi.fn(),
+    success: vi.fn(),
+    fail: vi.fn(),
+    error: vi.fn(),
+  },
+}))
+
+// Mock mdToHTML
+vi.mock('../command/md-to-html', () => ({
+  mdToHTML: vi.fn(),
+}))
+
+describe('prep-now', () => {
+  //   const mockNow = {
+  //     title: 'Test Title',
+  //     description: 'Test Description',
+  //     publishedOn: '2023-01-01',
+  //     publishDate: '2023-01-01',
+  //     publishState: 'draft',
+  //     content: '# Test Content',
+  //   }
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    vi.mocked(resolve).mockImplementation((...paths) => paths.join('/'))
+    vi.mocked(readFileSync).mockReturnValue('template content')
+    vi.mocked(writeFileSync).mockImplementation(() => {})
+    vi.mocked(copyFileSync).mockImplementation(() => {})
+    vi.mocked(consola.box).mockImplementation(() => {})
+    vi.mocked(consola.start).mockImplementation(() => {})
+    vi.mocked(consola.success).mockImplementation(() => {})
+    vi.mocked(consola.fail).mockImplementation(() => {})
+    vi.mocked(consola.error).mockImplementation(() => {})
+  })
+
+  it('should create a new now page and clear the original files', async () => {
+    // Mock the mdToHTML function
+    const { mdToHTML } = await import('../utils/md-to-html')
+    vi.mocked(mdToHTML).mockResolvedValue('<h1>Test Content</h1>')
+
+    // Mock file paths
+    vi.mocked(resolve)
+      .mockReturnValueOnce('/src/constants/now.md')
+      .mockReturnValueOnce('/src/constants/now.json')
+      .mockReturnValueOnce('/src/pages/now/and-then/posts/2023-01-01.astro')
+      .mockReturnValueOnce('/src/constants/bkup/2023-01-01.md')
+      .mockReturnValueOnce('/src/constants/bkup/2023-01-01.json')
+
+    // Mock file content
+    vi.mocked(readFileSync)
+      .mockReturnValueOnce('template content')
+      .mockReturnValueOnce('# Test Content')
+
+    // Mock file paths
+    const __filename = '/src/commands/prep-now.ts'
+    const __dirname = '/src/commands'
+    vi.mocked(fileURLToPath).mockReturnValue(__filename)
+    vi.mocked(dirname).mockReturnValue(__dirname)
+
+    // Execute the function
+    await newNow()
+
+    // Verify file operations
+    expect(writeFileSync).toHaveBeenCalledTimes(2)
+    expect(copyFileSync).toHaveBeenCalledTimes(2)
+    expect(consola.success).toHaveBeenCalledWith('now.md cleared')
+    expect(consola.success).toHaveBeenCalledWith(
+      'You may now update your Now content and props.\n'
+    )
+  })
+
+  it('should handle errors gracefully', async () => {
+    // Mock an error
+    vi.mocked(writeFileSync).mockImplementation(() => {
+      throw new Error('Write failed')
+    })
+
+    // Mock file paths
+    vi.mocked(resolve)
+      .mockReturnValueOnce('/src/constants/now.md')
+      .mockReturnValueOnce('/src/constants/now.json')
+      .mockReturnValueOnce('/src/pages/now/and-then/posts/2023-01-01.astro')
+      .mockReturnValueOnce('/src/constants/bkup/2023-01-01.md')
+      .mockReturnValueOnce('/src/constants/bkup/2023-01-01.json')
+
+    // Mock file content
+    vi.mocked(readFileSync)
+      .mockReturnValueOnce('template content')
+      .mockReturnValueOnce('# Test Content')
+
+    // Execute the function
+    await newNow()
+
+    // Verify error handling
+    expect(consola.fail).toHaveBeenCalledWith(
+      'Failed to create a new post from Now'
+    )
+    expect(consola.error).toHaveBeenCalled()
+  })
+})

tests/sw.test.js

@@ -0,0 +1,91 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import { install } from 'vitest-dom'
+
+// Install DOM environment for vitest
+install()
+
+// Mock the service worker globals
+global.caches = {
+  keys: vi.fn(),
+  delete: vi.fn(),
+  open: vi.fn(),
+  match: vi.fn(),
+}
+
+// Mock the global self object
+global.self = {
+  skipWaiting: vi.fn(),
+  addEventListener: vi.fn(),
+}
+
+// Mock the fetch function
+global.fetch = vi.fn()
+
+// Import the service worker module
+// Note: We need to use dynamic import to avoid module loading issues
+let swModule
+
+beforeEach(async () => {
+  // Clear all mocks
+  vi.clearAllMocks()
+
+  // Mock the module
+  swModule = await import('../src/sw.mjs')
+})
+
+describe('Service Worker', () => {
+  describe('cleanOldCaches', () => {
+    it('should delete old caches', async () => {
+      const cacheName = 'app-v000'
+      const oldCacheName = 'app-v001'
+
+      global.caches.keys.mockResolvedValue([cacheName, oldCacheName])
+      global.caches.delete.mockResolvedValue(true)
+
+      await swModule.cleanOldCaches()
+
+      expect(global.caches.delete).toHaveBeenCalledWith(oldCacheName)
+    })
+  })
+
+  describe('addResourcesToCache', () => {
+    it('should add resources to cache', async () => {
+      const resources = ['/index.html', '/style.css']
+      const cache = { addAll: vi.fn() }
+
+      global.caches.open.mockResolvedValue(cache)
+
+      await swModule.addResourcesToCache(resources)
+
+      expect(cache.addAll).toHaveBeenCalledWith(resources)
+    })
+  })
+
+  describe('networkFirst', () => {
+    it('should return network response when available', async () => {
+      const request = new Request('/test')
+      const networkResponse = new Response('network content')
+
+      global.fetch.mockResolvedValue(networkResponse)
+      global.caches.open.mockResolvedValue({ put: vi.fn() })
+
+      const result = await swModule.networkFirst({ request })
+
+      expect(result).toEqual(networkResponse)
+    })
+
+    it('should return cached response when network fails', async () => {
+      const request = new Request('/test')
+      const cachedResponse = new Response('cached content')
+
+      global.fetch.mockRejectedValue(new Error('Network error'))
+      global.caches.open.mockResolvedValue({
+        match: vi.fn().mockResolvedValue(cachedResponse),
+      })
+
+      const result = await swModule.networkFirst({ request })
+
+      expect(result).toEqual(cachedResponse)
+    })
+  })
+})