ci: improve pipeline

2025-01-27 13:10:15 +00:00
91 changed files with 2184 additions and 14106 deletions
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@ -0,0 +1,74 @@
+
+name: Create and publish a Docker image
+
+# Configures this workflow to run every time a change is pushed to the branch called `release`.
+on:
+  push:
+    branches: ['main']
+
+# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+      
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+
+      - name: Install node dependencies
+        run: npm ci
+      - name: Build
+        run: npm run build
+      - name: Test
+        run: npm run test
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+    
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push Docker image
+        id: push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+      
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
+          subject-digest: ${{ steps.push.outputs.digest }}
+          push-to-registry: true
+      
--- a/.gitignore
+++ b/.gitignore
@ -34,7 +34,3 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
-
-deploy-vars.sh
-node_modules
-.env
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1 @@
-v23.4.0
+v18.20.5
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -33,10 +33,6 @@
    "editor.defaultFormatter": "vscode.typescript-language-features"
  },
  "[javascriptreact]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  },
-  "liveServer.settings.multiRootWorkspaceName": "www-aaronjy-2024",
-  "[css]": {
-    "editor.defaultFormatter": "vscode.css-language-features"
+    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
  }
 }
--- a/test/components/Article.test.jsx
+++ b/test/components/Article.test.jsx
@ -0,0 +1,46 @@
+/* eslint-env jest */
+import { render } from '@testing-library/react'
+import Article from '../../src/components/Article/Article'
+import '@testing-library/jest-dom'
+import { formatDate } from '@/lib/helpers'
+
+describe('Article', () => {
+  it('renders title', () => {
+    const props = generateArticleProps()
+    const { getByText } = render(<Article {...props} />)
+    const titleElement = getByText(props.attributes.title)
+    expect(titleElement).toBeInTheDocument()
+  })
+
+  it('renders description', () => {
+    const props = generateArticleProps()
+    const { getByText } = render(<Article {...props} />)
+    const descriptionElement = getByText(props.attributes.desc)
+    expect(descriptionElement).toBeInTheDocument()
+  })
+
+  it('renders pubdate if available', () => {
+    const props = generateArticleProps()
+    const { getByText } = render(<Article {...props} />)
+    const pubdateElement = getByText(formatDate(props.attributes.pubdate))
+    expect(pubdateElement).toBeInTheDocument()
+  })
+
+  it('renders content', () => {
+    const props = generateArticleProps()
+    const { container } = render(<Article {...props} />)
+    const contentElement = container.querySelector('[data-test=content]')
+    expect(contentElement.innerHTML).toBe(props.html)
+  })
+})
+
+function generateArticleProps () {
+  return {
+    attributes: {
+      title: 'My title',
+      desc: 'My description',
+      pubdate: new Date().toUTCString()
+    },
+    html: '<p>This is my content!</p>'
+  }
+}
--- a/test/components/ExsternalLink.test.jsx
+++ b/test/components/ExsternalLink.test.jsx
@ -0,0 +1,28 @@
+/* eslint-env jest */
+import { render, screen } from '@testing-library/react'
+import ExternalLink from '../../src/components/ExternalLink/ExternalLink'
+import '@testing-library/jest-dom'
+
+describe('ExternalLink', () => {
+  const props = {
+    href: 'https://example.com',
+    children: 'Test Link'
+  }
+
+  it('renders without crashing', () => {
+    render(<ExternalLink {...props} />)
+  })
+
+  it('renders correct href and rel attributes', () => {
+    render(<ExternalLink {...props} />)
+    const link = screen.getByText(props.children)
+    expect(link).toHaveAttribute('href', props.href)
+    expect(link).toHaveAttribute('rel', 'nofollow noopener')
+    expect(link).toHaveAttribute('target', '_blank')
+  })
+
+  it('renders children correctly', () => {
+    render(<ExternalLink {...props} />)
+    expect(screen.getByText(props.children)).toBeInTheDocument()
+  })
+})
--- a/test/components/Footer.test.jsx
+++ b/test/components/Footer.test.jsx
@ -0,0 +1,10 @@
+/* eslint-env jest */
+import { render } from '@testing-library/react'
+import '@testing-library/jest-dom'
+import Footer from '@/components/Footer/Footer'
+
+describe('Footer', () => {
+  it('renders without crashing', () => {
+    render(<Footer />)
+  })
+})
--- a/test/components/Grid.test.jsx
+++ b/test/components/Grid.test.jsx
@ -0,0 +1,16 @@
+/* eslint-env jest */
+import { render } from '@testing-library/react'
+import '@testing-library/jest-dom'
+import Grid from '@/components/Grid/Grid'
+
+describe('Grid', () => {
+  it('renders without crashing', () => {
+    const { container } = render(<Grid />)
+    expect(container.firstChild).toHaveClass('grid')
+  })
+
+  it('renders its children', () => {
+    const { getByText } = render(<Grid><div>Child</div></Grid>)
+    expect(getByText('Child')).toBeInTheDocument()
+  })
+})
--- a/test/components/Header.test.jsx
+++ b/test/components/Header.test.jsx
@ -0,0 +1,19 @@
+/* eslint-env jest */
+import { render, screen } from '@testing-library/react'
+import Header from '../../src/components/Header/Header'
+import '@testing-library/jest-dom'
+
+describe('Header', () => {
+  it('renders without crashing', () => {
+    render(
+      <Header />)
+  })
+
+  it('renders correct navigation links', () => {
+    render(<Header />)
+    const links = ['Home', 'Writing', 'CV']
+    links.forEach(link => {
+      expect(screen.getByText(link)).toBeInTheDocument()
+    })
+  })
+})
--- a/test/components/Resume.test.jsx
+++ b/test/components/Resume.test.jsx
@ -0,0 +1,63 @@
+/* eslint-env jest */
+import { render } from '@testing-library/react'
+import Resume from '../../src/components/Resume/Resume'
+import '@testing-library/jest-dom'
+
+describe('Resume', () => {
+  const props = {
+    competencies: ['Competency 1', 'Competency 2'],
+    education: 'My education history',
+    certifications: ['Certification 1', 'Certification 2'],
+    languages: [{ name: 'English', proficiency: 'Fluent' }],
+    experience: [
+      {
+        employer: 'Employer 1',
+        position: 'Position 1',
+        start: 'Start date 1',
+        end: 'End date 1',
+        desc: 'Description 1'
+      }
+    ]
+  }
+
+  it('renders without crashing', () => {
+    render(<Resume {...props} />)
+  })
+
+  it('renders competencies', () => {
+    const { getByText } = render(<Resume {...props} />)
+    props.competencies.forEach(competency => {
+      expect(getByText(competency)).toBeInTheDocument()
+    })
+  })
+
+  it('renders education', () => {
+    const { getByText } = render(<Resume {...props} />)
+    expect(getByText(props.education)).toBeInTheDocument()
+  })
+
+  it('renders certifications', () => {
+    const { getByText } = render(<Resume {...props} />)
+    props.certifications.forEach(certification => {
+      expect(getByText(certification)).toBeInTheDocument()
+    })
+  })
+
+  it('renders languages', () => {
+    const { getByText } = render(<Resume {...props} />)
+    props.languages.forEach(language => {
+      expect(getByText(`${language.name} - ${language.proficiency}`)).toBeInTheDocument()
+    })
+  })
+
+  it('renders experience', () => {
+    const { getByText } = render(<Resume {...props} />)
+    props.experience.forEach(exp => {
+      expect(getByText(exp.employer)).toBeInTheDocument()
+      expect(getByText(exp.position)).toBeInTheDocument()
+      expect(getByText(exp.start)).toBeInTheDocument()
+      expect(getByText(exp.end)).toBeInTheDocument()
+      expect(getByText(exp.desc)).toBeInTheDocument()
+    })
+  })
+})
--- a/test/layouts/DefaultLayout.test.jsx
+++ b/test/layouts/DefaultLayout.test.jsx
@ -0,0 +1,29 @@
+/* eslint-env jest */
+import { render, screen } from '@testing-library/react'
+import DefaultLayout from '../../src/layouts/DefaultLayout/DefaultLayout'
+import '@testing-library/jest-dom'
+
+describe('DefaultLayout', () => {
+  const props = {
+    children: <div>Test Content</div>
+  }
+
+  it('renders without crashing', () => {
+    render(<DefaultLayout {...props} />)
+  })
+
+  it('renders Header', () => {
+    render(<DefaultLayout {...props} />)
+    expect(screen.getByTestId('header')).toBeInTheDocument()
+  })
+
+  it('renders Footer', () => {
+    render(<DefaultLayout {...props} />)
+    expect(screen.getByTestId('footer')).toBeInTheDocument()
+  })
+
+  it('renders children correctly', () => {
+    render(<DefaultLayout {...props} />)
+    expect(screen.getByText('Test Content')).toBeInTheDocument()
+  })
+})
--- a/test/pages/Writing.test.jsx
+++ b/test/pages/Writing.test.jsx
@ -0,0 +1,69 @@
+/* eslint-env jest */
+import { render } from '@testing-library/react'
+import '@testing-library/jest-dom'
+import Writing, { Title, Description } from '../../src/pages/writing'
+
+jest.mock('next/head', () => {
+  return {
+    __esModule: true,
+    default: ({ children }) => {
+      return <>{children}</>
+    }
+  }
+})
+
+describe('Writing', () => {
+  it('renders without crashing', () => {
+    render(
+      getStubWritingComponent())
+  })
+
+  it('renders meta title', async () => {
+    const { container } = render(getStubWritingComponent())
+    expect(container.querySelector('title')).toHaveTextContent(Title)
+  })
+
+  it('renders opengraph title', () => {
+    const { container } = render(getStubWritingComponent())
+    expect(container.querySelector('meta[property="og:title"]'))
+      .toHaveAttribute('content', Title)
+  })
+
+  it('renders meta description', () => {
+    const { container } = render(getStubWritingComponent())
+    expect(container.querySelector('meta[name="description"]'))
+      .toHaveAttribute('content', Description)
+  })
+
+  it('renders opengraph description', () => {
+    const { container } = render(getStubWritingComponent())
+
+    expect(container.querySelector('meta[property="og:description"]'))
+      .toHaveAttribute('content', Description)
+  })
+})
+
+function getStubWritingComponent () {
+  const entries = [
+    {
+      attributes: {
+        title: 'My title one',
+        pubdate: 'Mon, 18 Mar 2024 16:47:32 GMT',
+        desc: 'This is my description.'
+      },
+      html: '<p>This is some content</p>',
+      slug: 'my-title-one'
+    },
+    {
+      attributes: {
+        title: 'My title Two',
+        pubdate: 'Mon, 19 Mar 2024 16:47:32 GMT',
+        desc: 'This is my description.'
+      },
+      html: '<p>This is some content</p>',
+      slug: 'my-title-two'
+    }
+  ]
+
+  return <Writing entries={entries} urlPrefix='/' />
+}
--- a/content/books/1984.md
+++ b/content/books/1984.md
@ -1,10 +0,0 @@
---
-title: '1984'
-author: George Orwell
-stars: 3
-readDate: 2023-07-31T23:00:00.000Z
-url: 'https://app.thestorygraph.com/books/6ff3f487-8d37-4ac5-8190-6622d6562639'
-thumbnailUrl: 'https://cdn.thestorygraph.com/v43bj24inkwioiogb5uz8nqmpnpw'
-tags: 'fiction, dystopian, classics'
---
-
--- a/content/books/A-Monster-Calls.md
+++ b/content/books/A-Monster-Calls.md
@ -1,10 +0,0 @@
---
-title: A Monster Calls
-author: Patrick Ness
-stars: 4
-readDate: 2024-05-31T23:00:00.000Z
-url: 'https://app.thestorygraph.com/books/170c1204-1410-4246-babb-c80e31aebea9'
-thumbnailUrl: 'https://cdn.thestorygraph.com/50qkuazqx2lidfd0hk74ltifz9nf'
-tags: 'fiction, young adult'
---
-
--- a/content/books/Diary-of-An-Oxygen-Thief.md
+++ b/content/books/Diary-of-An-Oxygen-Thief.md
@ -1,10 +0,0 @@
---
-title: Diary of An Oxygen Thief
-author: Anonymous
-stars: 4
-readDate: 2024-03-01T00:00:00.000Z
-url: 'https://app.thestorygraph.com/books/9ce581f2-d9ac-4be1-abf7-4597684bab7f'
-thumbnailUrl: 'https://cdn.thestorygraph.com/l5zkpt8v2wj76ri6nkq7ismqsskl'
-tags: 'romance, fiction'
---
-
--- a/content/books/No-God-But-God.md
+++ b/content/books/No-God-But-God.md
@ -1,10 +0,0 @@
---
-title: No God But God
-author: Reza Aslan
-stars: 4
-readDate: 2023-01-01T00:00:00.000Z
-url: 'https://app.thestorygraph.com/books/27cb3f11-77c6-4eca-9344-d64885e6f1c4'
-thumbnailUrl: 'https://cdn.thestorygraph.com/gf3c92roqrgdbdsgphns5n111t93'
-tags: 'non-fiction, religion, history'
---
-
--- a/content/books/On-Tyranny.md
+++ b/content/books/On-Tyranny.md
@ -1,10 +0,0 @@
---
-title: On Tyranny
-author: Timothy Snyder
-stars: 4
-readDate: 2025-02-28T00:00:00.000Z
-url: 'https://app.thestorygraph.com/books/e36e1a7c-90d5-4fca-92cc-20b225228db9'
-thumbnailUrl: 'https://cdn.thestorygraph.com/dejgj7kypzdfvcszr2uwqrrcm8uh'
-tags: 'non-fiction, politics, history'
---
-
--- a/content/books/Sex--Punishment.md
+++ b/content/books/Sex--Punishment.md
@ -1,10 +0,0 @@
---
-title: Sex & Punishment
-author: Eric Berkowitz
-stars: 3
-readDate: 2024-05-31T23:00:00.000Z
-url: 'https://app.thestorygraph.com/books/79ffd129-2325-45d0-826d-c6969a09e239'
-thumbnailUrl: 'https://cdn.thestorygraph.com/lqtuj9d7fdj1qw1lei01yby42h9z'
-tags: 'non-fiction, history'
---
-
--- a/content/books/The-Dangers-of-Smoking-in-Bed-.md
+++ b/content/books/The-Dangers-of-Smoking-in-Bed-.md
@ -1,10 +0,0 @@
---
-title: 'The Dangers of Smoking in Bed '
-author: 'Mariana Enríquez '
-stars: 3.5
-readDate: 2024-07-31T23:00:00.000Z
-url: 'https://app.thestorygraph.com/books/0934ee12-7ca4-4137-bd44-22aa3acee43c'
-thumbnailUrl: 'https://cdn.thestorygraph.com/x8q91nifuth4g021iao1mw4y6ptf'
-tags: 'fiction, horror, short stories'
---
-
--- a/content/books/The-Nature-of-Alexander.md
+++ b/content/books/The-Nature-of-Alexander.md
@ -1,10 +0,0 @@
---
-title: The Nature of Alexander
-author: Mary Renault
-stars: 4.5
-readDate: 2023-03-31T23:00:00.000Z
-url: 'https://app.thestorygraph.com/books/bc111e8b-1b3f-466a-9efd-c3316ae4b533'
-thumbnailUrl: 'https://cdn.thestorygraph.com/68zjkhp67u2bi6qh3melbyqaly06'
-tags: 'non-fiction, history, biography'
---
-
--- a/content/books/The-Time-Machine.md
+++ b/content/books/The-Time-Machine.md
@ -1,11 +0,0 @@
---
-title: The Time Machine
-author: H.G. Wells
-stars: 4.5
-readDate: 2025-03-30T00:00:00.000Z
-url: 'https://app.thestorygraph.com/books/77fcb338-d56d-4fee-9c47-51b490cf4167'
-thumbnailUrl: 'https://cdn.thestorygraph.com/ldpiatx7jwvm6t7mnrob580ytlzx'
-tags: 'fiction, classics, science fiction'
---
-
-I couldn't put this one down. I was a little apprehensive coming into it that I didn't much care for H.G. Wells; I ended up putting The War of the Worlds down half-way through, but this was totally different. Part sci-fi, party mystery, part social criticism, this book checked a lot of boxes for me. I also really like his writing style! He gives just enough to paint a vivid picture without being caught in the usual trap of describing everything in unnecessary detail. Can definitely recommend!
--- a/content/books/Wintering-The-Power-of-Rest-and-Retreat-in-Difficult-Times.md
+++ b/content/books/Wintering-The-Power-of-Rest-and-Retreat-in-Difficult-Times.md
@ -1,10 +0,0 @@
---
-title: 'Wintering: The Power of Rest and Retreat in Difficult Times'
-author: Katherine May
-stars: 3.75
-readDate: 2025-03-30T00:00:00.000Z
-url: 'https://app.thestorygraph.com/books/449d6a0c-5704-4000-a196-57f1272f70f9'
-thumbnailUrl: 'https://cdn.thestorygraph.com/dbopdfc5lnrqlb8tlkqymuo5d0ak'
-tags: 'non-fiction, memoir'
---
-
--- a/content/books/a-night-to-remember.md
+++ b/content/books/a-night-to-remember.md
@ -1,10 +0,0 @@
---
-tags: 'non-fiction, classics, history'
-title: A Night To Remember
-author: Walter Lord
-stars: 3.5
-readDate: 2024-06-30T23:00:00.000Z
-url: 'https://app.thestorygraph.com/books/5192ee9e-ffb2-4c72-a7c3-8051d950d66f'
-thumbnailUrl: 'https://cdn.thestorygraph.com/pdwshwni6jyc7ivp55j6tsxzngfl'
---
-
--- a/content/books/alice-in-wonderland.md
+++ b/content/books/alice-in-wonderland.md
@ -1,10 +0,0 @@
---
-title: Alice's Adventures in Wonderland
-author: Lewis Carroll
-stars: 3
-readDate: 2023-04-30T23:00:00.000Z
-url: 'https://app.thestorygraph.com/books/83b0e44a-06fe-4042-9d2d-e4f41244fb9c'
-thumbnailUrl: 'https://cdn.thestorygraph.com/l83t3e6wh6tq7dqxbvrba34ee2nb'
-tags: 'fiction, classics, fantasy'
---
-
--- a/content/books/animal-farm.md
+++ b/content/books/animal-farm.md
@ -1,10 +0,0 @@
---
-title: Animal Farm
-author: George Orwell
-stars: 4
-readDate: 2023-01-01T00:00:00.000Z
-url: 'https://app.thestorygraph.com/books/f4b706d9-4ed9-4b15-85e0-2493581de818'
-thumbnailUrl: 'https://cdn.thestorygraph.com/jztibk5xvnynw7mh7hfw0orhbzuh'
-tags: 'fiction, classics, dystopian'
---
-
--- a/content/books/cities-that-shaped-the-ancient-world.md
+++ b/content/books/cities-that-shaped-the-ancient-world.md
@ -1,10 +0,0 @@
---
-title: Cities That Shaped The Ancient World
-author: John Julius Norwich
-stars: 3.5
-readDate: 2023-02-01T00:00:00.000Z
-url: 'https://app.thestorygraph.com/books/20bc1ff4-56bb-4e88-a403-bc150d45f9d2'
-thumbnailUrl: 'https://cdn.thestorygraph.com/i8znw2yrd6p4m76dx6rvyuyd48h2'
-tags: 'non-fiction, history'
---
-
--- a/content/books/song-of-achilles.md
+++ b/content/books/song-of-achilles.md
@ -1,11 +0,0 @@
---
-title: The Song of Achilles
-author: Madline Miller
-stars: 2.5
-readDate: 2025-03-22T00:00:00.000Z
-url: 'https://app.thestorygraph.com/books/9202845d-26cd-4a85-b15f-408116117028'
-thumbnailUrl: 'https://cdn.thestorygraph.com/m8cw3kb3qx4h2jl8kg0u4m3txhie'
-tags: 'fiction, fantasy, romance'
---
-
-This one really tailed off half-way through. I found the characters very one-dimensional (Patrcolus pines after Achilles, Achilles has muscles and can swing a sword fast), but the story took me at least up until the half-way mark. Weirdly I wasn't interested too much when the actual Iliad story line started to get going - maybe because I've heard it a million times before - and their essentially non-existent romance (more accurately an inch-deep obsession, I'd argue) didn't exactly inspire me to carry on reading.
--- a/content/books/starmaker.md
+++ b/content/books/starmaker.md
@ -1,10 +0,0 @@
---
-title: Star Maker
-author: Olaf Stapledon
-stars: 4.5
-readDate: 2023-03-01T00:00:00.000Z
-url: 'https://app.thestorygraph.com/books/c1d60727-8e24-4a1f-9f0e-974d68a934d2'
-thumbnailUrl: 'https://cdn.thestorygraph.com/bln6q5k1v7ealnwss4msv0jixlhk'
-tags: 'fiction, classics, science fiction'
---
-
--- a/content/books/stasiland.md
+++ b/content/books/stasiland.md
@ -1,10 +0,0 @@
---
-title: 'Stasiland: Stories from Behind the Berlin Wall'
-author: Anna Funder
-stars: 4
-readDate: 2023-02-01T00:00:00.000Z
-url: 'https://app.thestorygraph.com/books/9202845d-26cd-4a85-b15f-408116117028'
-thumbnailUrl: 'https://cdn.thestorygraph.com/gphzjvwbhr8d5agrieobx0yy2xhb'
-tags: 'non-fiction, history, politics'
---
-
--- a/content/books/stray-reflections.md
+++ b/content/books/stray-reflections.md
@ -1,10 +0,0 @@
---
-title: Stray Reflections
-author: Muhammad Iqbal
-stars: 5
-readDate: 2023-03-01T00:00:00.000Z
-url: null
-thumbnailUrl: null
-tags: 'non-fiction, politics, philosophy'
---
-
--- a/content/books/the-marmalade-diaries.md
+++ b/content/books/the-marmalade-diaries.md
@ -1,10 +0,0 @@
---
-title: The Marmalade Diaries
-author: Ben Aitken
-stars: 4.5
-readDate: 2023-01-01T00:00:00.000Z
-url: 'https://app.thestorygraph.com/books/406fe719-07de-44ba-b4e7-86714f638cf9'
-thumbnailUrl: 'https://cdn.thestorygraph.com/ou589mae0cxxup4cqq1mlnqdaj62'
-tags: non-fiction
---
-
--- a/content/books/the-midnight-library.md
+++ b/content/books/the-midnight-library.md
@ -1,10 +0,0 @@
---
-title: The Midnight Library
-author: Matt Haig
-stars: 4
-readDate: 2024-06-30T23:00:00.000Z
-url: 'https://app.thestorygraph.com/books/d9c7ed04-6148-4e01-a118-d96cba16f507'
-thumbnailUrl: 'https://cdn.thestorygraph.com/b9g1h8bhrqz7qs2fagzhsixbp6xy'
-tags: 'fiction, literary, science fiction'
---
-
--- a/content/books/to-be-taught-if-fortunate.md
+++ b/content/books/to-be-taught-if-fortunate.md
@ -1,11 +0,0 @@
---
-title: 'To Be Taught, If Fortunate'
-author: Becky Chambers
-stars: 4.5
-readDate: 2025-03-22T00:00:00.000Z
-url: 'https://app.thestorygraph.com/books/fca2631f-b3e2-4b9d-a2fd-4c1ec5e4d3f7'
-thumbnailUrl: 'https://cdn.thestorygraph.com/8ep9zjc581zefkzfyhtizqjnz8u5'
-tags: 'fiction, science fiction'
---
-
-Really enjoyed this! It was reflective yet lighthearted. I also love this specific flavour of sci-fi, where vastly different species of aliens and worlds are thought up and articulated beautifully by the author.
--- a/content/books/when-the-moon-hits-your-eye.md
+++ b/content/books/when-the-moon-hits-your-eye.md
@ -1,11 +0,0 @@
---
-title: When the Moon Hits Your Eye
-author: John Scalzi
-stars: 2.5
-readDate: 2025-03-26T00:00:00.000Z
-url: 'https://app.thestorygraph.com/books/4f3c3b02-3d2b-4765-93ac-4656133bbec5'
-thumbnailUrl: 'https://cdn.thestorygraph.com/718cb49yqfu02zekeq22yl8lgm8v'
-tags: 'fiction, science fiction'
---
-
-Some interesting chapters in here exploring how governments and various public/private institutions could deal with the moon randomly turning to choose, but a lot of fluff in between them. Can't really recommend, unless you want to skip to the good bits like I did.
--- a/content/pages/cv.yml
+++ b/content/pages/cv.yml
@ -27,14 +27,16 @@ experience:
    start: Feb. 2024
    end: Present
    desc: >-
-      * Directly line manage 3 other engineers
+      * Leading a technical delivery on a UK public sector project for the Department for Education (DfE)
+      
+      * Designing and documenting architectural changes in line with GDS architectural and technology standards
+      
+      * Planning and managing releases to production

-      * Worked as the Technical Lead on a UK public sector project for the Department for Education (DfE)
-          * Directly managed a 7-man, cross-functional technical team including engineers, testers and technical architects
-          * Planned and implemented a migration from a 10+ repo microservice architecture to a monolothic monorepo, making it easier to develop and deploy changes
-          * Cut deployment times from 1-2 days to 20 minutes on average
-          * Designed and documented architectural changes in line with GDS architectural and technology standards
-    skills: "ASP.NET Core · Microsoft Azure · Azure Data Factory · Git · C# · Full-Stack Development · Umbraco · Web Development · Microsoft SQL Server · Cloud Development ·  Microservices · Technical Requirements · Agile Methodologies"
+      * Working with key stakeholders at both the project and policy level to explain, advise on and plan key decisions 
+
+      
+      **Skills:** ASP.NET Core · Microsoft Azure · Azure Data Factory · Git · C# · Full-Stack Development · Umbraco · Web Development · Microsoft SQL Server · Cloud Development ·  Microservices · Technical Requirements · Agile Methodologies
  - position: Software Development Tutor
    employer: Yarbz Digital Ltd
    start: Sep. 2023
@ -47,36 +49,61 @@ experience:
    start: Aug. 2021
    end: Mar. 2024
    desc: >-
-      * Designed the architecture for and developed the MVP for a recruitment platform and accompanying browser extension, which was used to pull in and process 1,000+ user profiles, proving its feasibility
+      * Designed and developed the front-end and back-end of the innovative
+      recruitment platform "Radr" using Angular 13, Node.js, TypeScript,
+      MongoDB, and hosted on Google Cloud Platform.

-      * Developed Fifty Five and Five's flagship website (fiftyfiveandfive.com), improving their Google PageSpeed Insights score to near-100s across the board (Performance, Accessibility, Best Practices and SEO)
+      * Developed Fifty Five and Five's flagship website (fiftyfiveandfive.com) using PHP, WordPress, and Tailwind, enhancing its online presence.

-      * Built front-end of sportank.com, a social network for American Football enthusiasts and athletes
+      * Built front-end of sportank.com, a dynamic social network catering to American Football enthusiasts and athletes, using Angular 10, Tailwind, SCSS, and TypeScript.

-      * Designed and built a proof-of-concept gRPC web client, proving real-time voice input streaming from web browsers to medical speech recognition software.
+      * Designed and built a proof-of-concept using Angular, Node.js, and gRPC, enabling real-time voice input streaming from web browsers to medical speech recognition software, leading to its active use by doctors for efficient communication.

-      * Maintained and improved the Integra Planner event management platform used by thousands of people for multi-day event
-    skills: "ASP.NET · Amazon Elastic Container Registry (ECR) · Angular · TypeScript · Amazon ECS · Python (Programming Language) · Node.js · ASP.NET MVC · Content Management Systems (CMS) · Amazon Web Services (AWS) · Next.js · Microsoft Azure · Git · React.js · C# · Full-Stack Development · Umbraco · WordPress · Web Development · JavaScript · Front-End Development · MySQL · Microsoft SQL Server · Cloud Development · PHP · NoSQL · AWS Lambda · HTML · Microservices · Technical Requirements · Firebase · ASP.NET Core · Agile Methodologies · Google Cloud Platform (GCP) · MongoDB · User Interface Programming"
+      * Maintained and improved the Integra Planner event management platform used by thousands of people for multi-day events, specifically for GALA Choruses.
+
+      * Enabled efficient event planning and management by utilizing Angular, Ionic for mobile apps, AWS, SQL Server, and .NET Core.
+
+
+      **Skills:** ASP.NET · Amazon Elastic Container Registry (ECR) · Angular · TypeScript · Amazon ECS · Python (Programming Language) · Node.js · ASP.NET MVC · Content Management Systems (CMS) · Amazon Web Services (AWS) · Next.js · Microsoft Azure · Git · React.js · C# · Full-Stack Development · Umbraco · WordPress · Web Development · JavaScript · Front-End Development · MySQL · Microsoft SQL Server · Cloud Development · PHP · NoSQL · AWS Lambda · HTML · Microservices · Technical Requirements · Firebase · ASP.NET Core · Agile Methodologies · Google Cloud Platform (GCP) · MongoDB · User Interface Programming
  - position: Contract Software Engineer
    employer: The Data Shed
    start: Jan. 2023
    end: Aug. 2023
    desc: >-
-      * Designed and built the front-end of a bespoke fund recovery system, which allowed more than 100,000 customers affected to recover funds lost by loan mis-selling
-    skills: "Amazon Elastic Container Registry (ECR) · TypeScript · Amazon ECS · Tailwind CSS · Node.js · Amazon Web Services (AWS) · Next.js · React.js · docker · Front-End Development · NoSQL · AWS Lambda · HTML · Agile Methodologies · User Interface Programming"
+      * Facilitated the recovery of funds for more than 100,000 customers
+      affected by loan mis-selling by developing a robust web application using
+      Next.js, TypeScript, React, Node.js, AWS Cognito, and AWS ECS.
+
+      * Implemented a wide range of features, including voting, bank details collection, messaging functionality, claims processing, and document management.
+
+
+      **Skills:** Amazon Elastic Container Registry (ECR) · TypeScript · Amazon ECS · Tailwind CSS · Node.js · Amazon Web Services (AWS) · Next.js · React.js · docker · Front-End Development · NoSQL · AWS Lambda · HTML · Agile Methodologies · User Interface Programming
  - position: Software Architect
    employer: T101
-    start: Feb. 2020
+    start: Sep. 2020
    end: Jul. 2021
    desc: >-
-      * Lead on the complete platform re-architecture and development for Recon, UK-based dating app with 200,000 monthly active users
-
-      * Directly managed a team of 5 software engineers
-
-      * Architected and lead on the implementation of key features, including authentication, authorisation, instant messaging, user profiles, galleries, and geocoding
+      * As well as fulfilling the engineering responsibilities required by my
+      previous role, my responsibilities now additionally entail designing,
+      documenting and leading on architectural changes.As well as fulfilling the
+      engineering responsibilities required by my previous role, my
+      responsibilities now additionally entail designing, documenting and
+      leading on architectural changes.


-    skills: "ASP.NET · Angular · TypeScript · Amazon ECS · ASP.NET MVC · Kubernetes · Amazon Web Services (AWS) · Git · C# · Full-Stack Development · Web Development · JavaScript · Front-End Development · MySQL · Microsoft SQL Server · Cloud Development · NoSQL · HTML · .NET Core · Microservices · Technical Requirements · ASP.NET Core · Agile Methodologies · Google Cloud Platform (GCP) · User Interface Programming"
+      **Skills:** ASP.NET · Angular · TypeScript · Amazon ECS · ASP.NET MVC · Kubernetes · Amazon Web Services (AWS) · Git · C# · Full-Stack Development · Web Development · JavaScript · Front-End Development · MySQL · Microsoft SQL Server · Cloud Development · NoSQL · HTML · .NET Core · Microservices · Technical Requirements · ASP.NET Core · Agile Methodologies · Google Cloud Platform (GCP) · User Interface Programming
+  - position: Senior Full-stack Developer
+    employer: T101
+    start: Feb. 2020
+    end: Sep. 2020
+    desc: >-
+      * Drove the complete platform re-architecture and development for Recon, a
+      UK-based dating app with 200,000 monthly active users.
+
+      * Modernized and scaled the app by using .NET Core, Firestore, SignalR, Angular 10/TypeScript, gRPC, SQL Server, MySQL, microservices and Kubernetes on GCP.
+
+
+      **Skills:** ASP.NET · Angular · TypeScript · Amazon ECS · ASP.NET MVC · Kubernetes · Git · C# · Full-Stack Development · Web Development · JavaScript · Front-End Development · MySQL · Microsoft SQL Server · Cloud Development · NoSQL · HTML · .NET Core · Microservices · Technical Requirements · Agile Methodologies · User Interface Programming
  - position: Senior Software Developer
    employer: Datatrial
    start: Apr. 2019
@ -87,7 +114,7 @@ experience:
      facilitating clinical trials.


-    skills: "ASP.NET · TypeScript · ASP.NET MVC · Git · C# · Full-Stack Development · Web Development · JavaScript · Front-End Development · MySQL · Microsoft SQL Server · Aurelia · HTML · Agile Methodologies · User Interface Programming"
+      **Skills:** ASP.NET · TypeScript · ASP.NET MVC · Git · C# · Full-Stack Development · Web Development · JavaScript · Front-End Development · MySQL · Microsoft SQL Server · Aurelia · HTML · Agile Methodologies · User Interface Programming
  - position: Software Engineer
    employer: pipdig
    start: Aug 2018
@ -101,7 +128,7 @@ experience:
      efficiency across a wide range of small, fast-paced projects.


-    skills: "TypeScript · Content Management Systems (CMS) · Git · Full-Stack Development · WordPress · Web Development · JavaScript · Front-End Development · MySQL · Microsoft SQL Server · Cloud Development · PHP · HTML · Agile Methodologies · User Interface Programming"
+      **Skills:** TypeScript · Content Management Systems (CMS) · Git · Full-Stack Development · WordPress · Web Development · JavaScript · Front-End Development · MySQL · Microsoft SQL Server · Cloud Development · PHP · HTML · Agile Methodologies · User Interface Programming
  - position: Senior Software Developer
    employer: The Works
    start: Apr. 2018
@ -111,7 +138,7 @@ experience:
      University, enhancing it by developing key features.


-    skills: "ASP.NET · ASP.NET MVC · Content Management Systems (CMS) · Git · C# · Full-Stack Development · Web Development · JavaScript · Front-End Development · Microsoft SQL Server · HTML · Agile Methodologies · User Interface Programming · Umbraco"
+      **Skills:** ASP.NET · ASP.NET MVC · Content Management Systems (CMS) · Git · C# · Full-Stack Development · Web Development · JavaScript · Front-End Development · Microsoft SQL Server · HTML · Agile Methodologies · User Interface Programming · Umbraco
  - position: Software Developer
    employer: Orangebus
    start: Jan. 2017
@ -121,7 +148,7 @@ experience:
      different projects across different industries.


-    skills: "ASP.NET MVC · Git · C# · Full-Stack Development · JavaScript · Front-End Development · Microsoft SQL Server · HTML · Agile Methodologies · User Interface Programming"
+      **Skills:** ASP.NET MVC · Git · C# · Full-Stack Development · JavaScript · Front-End Development · Microsoft SQL Server · HTML · Agile Methodologies · User Interface Programming
  - position: Junior Software Developer
    employer: True Potential LLP
    start: Oct. 2015
@ -133,7 +160,7 @@ experience:
      million clients as of November 2016.


-    skills: "ASP.NET MVC · Git · C# · Full-Stack Development · Web Development · JavaScript · Visual Basic .NET (VB.NET) · Front-End Development · Microsoft SQL Server · HTML · Agile Methodologies · User Interface Programming"
+      **Skills:** ASP.NET MVC · Git · C# · Full-Stack Development · Web Development · JavaScript · Visual Basic .NET (VB.NET) · Front-End Development · Microsoft SQL Server · HTML · Agile Methodologies · User Interface Programming
  - position: IT Support / Trainee Software Developer
    employer: Innovation Property (UK)
    start: Jan. 2013
@ -147,4 +174,4 @@ experience:
      appointments for external staff and contact clients.


-    skills: "ASP.NET MVC · Git · C# · Full-Stack Development · JavaScript · Front-End Development · Microsoft SQL Server · HTML · Agile Methodologies · User Interface Programming"
+      **Skills:** ASP.NET MVC · Git · C# · Full-Stack Development · JavaScript · Front-End Development · Microsoft SQL Server · HTML · Agile Methodologies · User Interface Programming
--- a/content/writing/attitudes-to-reading.md
+++ b/content/writing/attitudes-to-reading.md
@ -1,17 +0,0 @@
---
-title: Attitudes to reading, and how mine have changed
-pubdate: 2025-03-18T00:00:00.000Z
-desc: I was discussing reading habits with my good friend Beth, specifically around reading multiple books at once vs. reading a single book at a time...
-tags:
-  - reading
-  - books
---
-I was discussing reading habits with my good friend Beth, specifically around reading multiple books at once vs. reading a single book at a time (we're both very members of the former group), and it got me thinking as to why there seems to me to be this split in reading habits, and where it might come from.
-
-My own reading habits have changed throughout the course of my life. As a child, I used to read and re-read space and dinosaur encyclopaedias, magazines, manga, and all sorts of written media. This tailed off, however, in my teenage years until it seemed the only time I had a book in my hands was in a classroom. For me, I believe this tail-off was largely due to the kinds of literature we were made to read in school: Twilight by Stephenie Meyer, a book I wouldn't extinguish were I to find it alight today; assortments of poetry of varying qualities, though specifically to study literary devices (Iambic Pentameter be damned); An Inspector Calls, which arguably isn't the worst introduction to screenplays, though a character's Suicide By Bleach was sadly my only takeaway (that, and the definition of metrosexual) as I remember precious little else.
-
-Suffice to say, the material the English education system put in front of me sadly did more to dissuade than it did to inspire me to read. I didn't start reading again regularly until I picked up a copy of Mary Renault's 'The Nature of Alexander' off the back of a podcast recommendation, and I haven't stopped since. History books were my way of reconnecting with the joy of reading that died in me in my adolescence, and now - happily - I read anything and everything I can. From history to philosophy, science fiction to theology, I maintain a modest yet eclectic collection of books (both physical and digital), and prefer to read a handful of them at a time!
-
-School offers us a very specific and uninspiring idea of what reading should be: books are a means to an end, must be scrutinised in painful detail, and must be read from cover-to-cover. My 27-year-old post-educational view stands in complete contrast: I read to enjoy and pass the time, scrutinise or not (depending on many factors: my mood, the type of book, the subject matter, ...), and I rarely read a book from cover to cover.
-
-All of this isn't to say that the sole reason for England's [falling literacy levels](https://literacytrust.org.uk/parents-and-families/adult-literacy/what-do-adult-literacy-levels-mean/) (in 2016, 16.4% were functionally illiterate, meanwhile rising to 18% since 2024) are purely down to what schools are offering up to read, but I do wonder whether it would've taken me so long to pick a book up again (or whether I'd have stopped reading at all) had I been tasked with reading something I really wanted to read, rather than some dire, overhyped Wattpad cringefest (Stephenie Meyer, get to fuck)
--- a/content/writing/moving-from-github-to-forgejo.md
+++ b/content/writing/moving-from-github-to-forgejo.md
@ -1,125 +0,0 @@
---
-title: Migrating from GitHub to Forgejo
-pubdate: 2025-03-16T00:00:00.000Z
-desc: I recently moved all of my reposfrom GitHub to a self-hosted Forgejo instance running on my own servers.
-tags: 
-    - tech
-    - hosting
---
-
-I recently moved all of my repos (public and private) from GitHub to a self-hosted [Forgejo](https://forgejo.org/) instance running on my own servers.
-
-There were a few reasons for this:
- I believe it's important to own and control my own data
- I do not want my private repositories to be used to train LLMs
- In protest of the current (2025) USA administration, I am reducing my usage and reliance on US products and services
-
-Hopefully this post can serve as a guide for anybody who wants to do the same!
-
-## The setup
-
-My overall setup looks like this:
- Ubuntu VPS in Germany, hosted with [Hetzner](https://www.hetzner.com/) (a German VPS provider)
- A Forgejo instance running on Docker
- [Caddy](https://caddyserver.com/) as a reverse proxy routing `git.aaronjy.me` to the Forgejo Docker container
-
-## The process
-
-The overall process was pretty simple:
-1. Get a list of all of my public and private repos
-2. Use a script to call Forgejo's `/api/repos/migrate` endpoint to copy the repo from GitHub to Forgejo
-3. Delete the repo on GitHub
-
-### Step 1 - Get a list of all my repos
-
-I used the [GitHub CLI](https://cli.github.com/) for this, using the `gh repos list` command. I wanted to move my private repos across first, so I wrote two commands: one for private repos, and one for public ones. Both commands write the JSON output to a respective JSON file.
-```sh
-# Get all private repos
-gh repo list --visibility=private --json id,name,owner,sshUrl,url --limit 200 > gh-private-repos
-
-# Get all public repos
-gh repo list --visibility=public --json id,name,owner,sshUrl,url --limit 200 > gh-public-repos
-```
-
-The output looks like this:
-```json
-[
-	{
-	    "id": "R_kgDOOCEBIw",
-	    "name": "kielder-commerce",
-	    "owner": {
-	      "id": "MDQ6VXNlcjM4NTU4MTk=",
-	      "login": "AaronJY"
-	    },
-	    "sshUrl": "git@github.com:AaronJY/kielder-commerce.git",
-	    "url": "https://github.com/AaronJY/kielder-commerce"
-	},
-	...
-]
-```
-
-## Step 2 - Use Forgejo's API to migrate from GitHub
-
-Usefully, Forgejo has a build-in endpoint for migrating GitHub repos: `/api/repos/migrate`
-
-All I had to do was write a script that sent each repo from the JSON to the endpoint to start the migration process, and Forgejo handles the rest.
-
-My (nodejs) script ended up looking like this:
-
-```js
-require('dotenv').config()
-const fetch = require("node-fetch");
-const repos = require("./github-private-repos.json"); // <- migrate your public or private repos
-
-const forgejoAccessToken = process.env.FORGEJO_ACCESS_TOKEN; // <- You need to generate an access token on Forgejo
-if (!forgejoAccessToken) {
-    console.error("Forgejo access token not set.");
-    process.exit(1);
-}
-
-for (const repo of repos) {
-    const reqBody = {
-        clone_addr: `${repo.url}.git`,
-        repo_name: repo.name,
-        private: true, // <- set to `false` if migrating public repos
-        service: "github",
-        auth_token: process.env.GITHUB_TOKEN, // <- You need to generate a GitHub access token
-        repo_owner: "aaron"// <- the name of your Forgejo user
-    };
-
-    console.log(`Migrating ${repo.name}...`);
-    console.log(reqBody);
-
-    fetch("https://git.aaronjy.me/api/v1/repos/migrate", {
-        method: "POST",
-        body: JSON.stringify(reqBody),
-        headers: {
-            "Authorization": "token " + forgejoAccessToken,
-            "Content-Type": "application/json"
-        }
-    }).then(response => {
-        response.json().then(data => {
-            console.log(data);
-        })
-
-        if (!response.ok) {
-            throw "Failed with status code: " + response.status;
-        }
-
-        console.log("Successfully migrated " + repo.url);
-    }).catch(error => {
-        console.error("Migrate API request failed: " + error);
-    });
-}
-```
-
-## Step 3 - Delete repos from GitHub
-
-Once everything was moved across (and a quick sanity check was done), I looped through all of my repos in the JSON files and called the `gh repo delete` command on the GitHub CLI.
-```sh
-gh repo delete https://github.com/AaronJY/kielder-commerce --yes
-```
-
-## Still to do...
-
-I still need to route SSH traffic to Forgejo's internal SSH server to allow SSH operations with repos, rather than relying on HTTPS interactions. Caddy can't be used for this as it's an HTTP proxy only, and therefore doesn't understand the SSH protocol. It might be possible to use an experimental add-on for Caddy called [caddy-l4](https://github.com/mholt/caddy-l4) that enables layer 4 proxying (on the TCP/UDP level), though it might be easier to tweak my server's IP tables to forward traffic from a custom port to the SSH port on Foregejo's Docker container.
--- a/content/writing/performance-considerations-tcp-game-server.md
+++ b/content/writing/performance-considerations-tcp-game-server.md
@ -1,105 +0,0 @@
---
-title: Performance considerations when writing a TCP game server in dotnet
-pubdate: 2025-02-23T21:12:37.864Z
-moddate: 2025-03-21T21:12:47.864Z
-desc: While writing a TCP game server in dotnet for a hobby project, I learned a few ways to improve the efficiency and scalability of the server while running into some performance issues. Here's what I learned!
-tags: 
-    - tech
-    - programming
-    - dotnet
---
-
-While writing a TCP game server in dotnet for a hobby project (check it out [here](https://github.com/AaronJY/GServer)), I learned a few ways to improve the efficiency and scalability of the server while running into some performance issues.
-
-Here's what I learned!
-
-## 1. Use ConcurrentDictionary to main a thread-safe record of connect clients
-
-The [ConcurrentDictionary<TKey, TValue>](https://learn.microsoft.com/en-us/dotnet/api/system.collections.concurrent.concurrentdictionary-2?view=net-9.0) class is a thread-safe dictionary class provided by dotnet. It differs from the standard `Dictionary<TKey, TValue>` class in that it supports thread-safe read and write access by multiple threads concurrently. As my game server utilises the dotnet thread pool (through async/await), it's vital to use a thread-safe dictionary implementation to keep track of connected clients, as many threads in the thread pool will be used as more and more clients connect, meaning many threads will be reading from/writing to the dictionary I use to track connected clients.
-
-I define my dictionary, which creates a pairing between a connected TcpClient and a `ClientState` instance I use to track client-specific state, such as the player's username, last heartbeat, etc.
-
-```csharp
-private readonly ConcurrentDictionary<TcpClient, ClientState> _clients = new();
-```
-
-When a client connects, I add them to the dictionary.
-
-```csharp
-TcpClient client = await _tcpListener.AcceptTcpClientAsync();
-
-ClientState clientState = new(client);
-_clients.TryAdd(client, clientState);
-
-// Handle client asynchronously using the thread pool
-_ = Task.Run(() => HandleClientAsync(client, clientState));
-```
- 
-## 2. Use async await to utilise a thread pool to handle connections at scale
-
-My first iteration of the game server relied on manually creating a worker thread for each connected client. While this may be find for handling a small handful of clients (100-500 perhaps), I want my game server to be as performant and scalable as possible.
-
-The bottlenecks introduced by this approach are memory usage and CPU load:
-
-**Memory usage**
-
-When creating a new thread in dotnet, the OS assigns it its own memory region called the 'stack' which is used for holding thread-specific memory such as variables, execution state, and other bits. The default stack size (as configured by the OS) is usually 1MB. Using a thread per connection means allocating a 1MB per connection for each thread stack, which in practice means 1000 connections * 1MB per stack = 1GB of memory. This puts a massive bottleneck on the number of connections my server can handle! 
-
-**CPU load**
-
-Spawning thousands of threads also introduced a CPU load bottleneck in the form of 'context switching'. The CPU can only handle so many threads simultaneoulsy, roughly equal to the number of logical cores (e.g. 4 CPU cores = 4 threads, 8 with hyper threading = 16 threads, etc.) When the number of threads exceeds the number of cores avaialble, the CPU starts to 'context switch' which essentially means it flicks through all of the running threads giving them all a chance to run. This switching requires the CPU to work, which increases CPU load which would be better used processing game server requests (rather than switching between thosands of running threads!)
-
-```csharp
-TcpClient client = await _tcpListener.AcceptTcpClientAsync(); // <-- Async accpept TCP client
-
-ClientState clientState = new(client);
-_ = _clients.TryAdd(client, clientState);
-
-_ = HandleClientAsync(client, clientState).ContinueWith(t =>
-{
-    if (t.Exception != null)
-    {
-        Console.WriteLine($"Error handling client: {t.Exception.InnerException?.Message}");
-    }
-}, TaskContinuationOptions.OnlyOnFaulted);
-```
-
-## 3. Use ArrayPool for memory-efficient storage of buffers
-
-When reading data sent by a TCP client to the server (in my case, the game client has sent a load of data to the server that I want to read), the standard approach is to create a 'buffer', which is essentially a place in-memory we reserve to store our client's data for processing.
-
-My initial approach was to create a new buffer of type `byte[]` and store the data in there. While this may not be a problem for lower-traffic game servers, I want my game server to be as performant as possible! The downside of this approach is that we allocate a new place in memory every time we process data sent b the client, which means:
-1. We have to reserve a new chunk of memory every time a client sends us data, and...
-2. The garbage collector has to dispose of each buffer (i.e. free up that memory) every time it finishes processing said data
-
-A great way to optimise this approach is by using dotnet's `ArrayPool<T>`, which is a dotnet-manged pool of arrays of any given type. This way, we ask dotnet for one of its arrays every time we want to store client data in a buffer for processing, and we simply release it (i.e. give it back to the pool) when we're done. Because dotnet manages this pool--the memory is already allocated and managed by dotnet for the arrays in its pool--we don't have to reserve and release memory for every buffer, releieving pressure on both our server's memory and CPU too, as the garbage collector has nothing to clean up!
-
-```csharp
-// Get a new array for the buffer from the pool
-byte[] buffer = ArrayPool<byte>.Shared.Rent(client.ReceiveBufferSize);
-
-try
-{
-    while (client.Connected)
-    {
-        int bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length);
-        if (bytesRead == 0)
-            break;
-
-        await messageHandler.HandleMessageAsync(stream.Socket, new MessageMemoryStream(buffer), state);
-    }
-}
-catch (Exception e)
-{
-    Console.WriteLine($"Error occured reading buffer: {e.Message}");
-}
-finally
-{
-    // Give the array back to the pool!
-    ArrayPool<byte>.Shared.Return(buffer);
-}
-```
-
-## Source code
-
-You can find the source code for the game server on GitHub: https://github.com/AaronJY/GServer
--- a/content/writing/quick-reflection-katherine-may.md
+++ b/content/writing/quick-reflection-katherine-may.md
@ -1,10 +0,0 @@
---
-title: "Quickwrite: A reflection on Wintering by Katherine May"
-pubdate: 2025-03-09T00:00:00.000Z
-desc: "Katherine May draws a unique parallel in her book ‘Wintering’ between the coming of and living through the winter months, and those liminal times in your life – when a gap opens up underfoot and swallows us whole...."
-tags: 
-  - books
-  - reading
---
-
-Katherine May draws a unique parallel in her book ‘Wintering’ between the coming of and living through the winter months, and those liminal times in your life – when a gap opens up underfoot and swallows us whole. It’s never clear when such a gap appears to steal us away, and how long exactly we’ll spend in the liminality we fall into, and most of us claw at the walls in an attempt to scale up and out, back into the warm light of day – how things used to be. Katherine’s book is an account of how she learned to see it more as a wave to ride than a locked room to break free from. Her ultimate message is an argument to reframe it, or to see it for what it really is; not as a bleak, timeless realm devoid of hope and light, but of a necessary state we all find ourselves in at various points in our lives, and that this realm offers its own medicines for those who care to look. These seasonal and spiritual changes Katherine refers to as ‘Wintering’ – aptly a verb to articulate its ephemeral nature – serve much in the same way a good night’s sleep does: while a deep and peaceful sleep purges metabolic waste and toxins from our brains, a wintering can offer a more spiritual cleanse; a hibernation after a hot and unrelenting summer; a mirror held up in front to break our blind and frenzied sprint towards a goal we’ve long forgotten; a beloved teacher from our school days with a soft voice, reassuring smile and placations to calm our nerves.
--- a/content/writing/static-site-on-google-cloud.md
+++ b/content/writing/static-site-on-google-cloud.md
@ -2,9 +2,6 @@
 title: Deploying aaronjy.me on a Google Storage bucket
 pubdate: 2024-05-01T00:00:00.000Z
 desc: "Google Cloud Storage is an effective solution for hosting static sites, offering a simple and scalable way to manage web assets. A manual deployment strategy involves four key steps: backing up existing files to a backup bucket, removing sensitive files for security, uploading the latest site files from the build directory, and invalidating Google’s global cache to ensure users access updated content."
-tags: 
-  - tech
-  - hosting
 ---
 Google actually has [documentation](https://cloud.google.com/storage/docs/hosting-static-website) on how to deploy a static site to a storage bucket, but I wanted to talk about how I handle deployments, as Google doesn't covert that!

@ -37,7 +34,7 @@ The script consists of 4 deployment steps:

 Before we do anything, we need to back up what we have already. I created a storage bucket specifically for holding backup files for this purpose, and use the gcloud CLI to copy the live files across to the backup bucket.

-```sh
+```
 BUCKET_URL="gs://aaronjy-www"
 BACKUP_BUCKET_URL="gs://aaronjy-www-backup"

@ -55,7 +52,7 @@ The backed-up files are copied into a dated folder, and the `--delete-from` flag

 Because I'm using Decap CMS for content management locally, I need to manually remove the `admin/` folder where Decap lives, as I don't want that to be available on the live site.

-```sh
+```
 echo "------------------------------"
 echo "REMOVE SENSITIVE FILES"
 echo "------------------------------"
@ -67,7 +64,7 @@ rm -rfv ./out/admin/

 Now we come to actually uploading the new files to the live site. I take everything from the `/out` directory (where Next.js throws its build output) and upload them directly to the hosting bucket.

-```sh
+```
 echo "------------------------------"
 echo "UPLOADING NEW SITE FILES"
 echo "------------------------------"
@ -81,7 +78,7 @@ The `--gzip-in-flight-all` is a handy edition, as the cli will apply gzip compre

 As Google uses a global cache for bucket files, we must invalidate it to ensure users get the latest website version.

-```sh
+```
 echo "------------------------------"
 echo "INVALIDATING GLOBAL CACHE"
 echo "------------------------------"
@ -97,7 +94,7 @@ This can take anywhere between 7-10 minutes, so the `--async` flag has been appl

 Here's the deployment script in full:

-```sh
+```
 BUCKET_URL="gs://aaronjy-www"
 BACKUP_BUCKET_URL="gs://aaronjy-www-backup"

--- a/content/writing/support-content-filte-structure-changes-on-a-static-site.md
+++ b/content/writing/support-content-filte-structure-changes-on-a-static-site.md
@ -2,8 +2,6 @@
 title: Supporting content file structure changes on a static site
 pubdate: 2024-03-18T16:47:32.150Z
 desc: Static site generators (SSGs) convert complex site sources into HTML, CSS, and JS, allowing flexible hosting options. While they offer benefits like speed and low costs, updating content can be challenging for non-technical users. A solution involves assigning unique identifiers to articles and creating a URL mapping file to simplify restructuring and managing content links.
-tags: 
-    - tech
 ---
 Static site generators (SSGs) are great. They take your complex site source and distil it down to the web's native language: HTML, CSS and JS. You can host your files anywhere: in cloud-native storage buckets; on low-cost CPanel hosting; on global CDNs; your old Lenovo ThinkPad in your cupboard running an Apache server that hasn't been patched since 2008; the list goes on. Wanna go further and throw away your CMS? Cool, you can use markdown files and a text editor as your CMS. 

@ -15,7 +13,7 @@ Say you have an SSG that uses MD files for the site's content. In order to edit

 Your folder structure could look like this:

-```text
+```
 site/
 ├─ content/
 │  ├─ index.md <-- homepage
@ -56,7 +54,7 @@ Here's the gist of it:

 Carrying on from our previous example, this is what our mapping file might look like:

-```text
+```json
 {
    "892c5a5c-1f77-43ce-a13a-b9d8bd02971c": [
        "yummy/recipes", <-- The canonical/latest path
--- a/deploy.sh
+++ b/deploy.sh
@ -1,13 +0,0 @@
-source ./deploy-vars.sh
-
-echo "Host: $SSH_HOST"
-echo "Path: $SSH_UPLOAD_PATH"
-
-echo "Building..."
-npm run build
-
-echo "Deploying..."
-
-rsync -r --delete ./out/ root@$SSH_HOST:$SSH_UPLOAD_PATH
-
-echo "Done!"
--- a/jsconfig.json
+++ b/jsconfig.json
@ -2,8 +2,6 @@
  "compilerOptions": {
    "paths": {
      "@/*": ["./src/*"]
-    },
-    "checkJs": true,
-    "jsx": "preserve"
+    }
  }
 }
--- a/next-sitemap.config.cjs
+++ b/next-sitemap.config.cjs
@ -1,70 +1,6 @@
-const fs = require('fs')
-const fm = require('front-matter')
-
 /** @type {import('next-sitemap').IConfig} */
 module.exports = {
  siteUrl: process.env.SITE_URL || 'https://www.aaronjy.me',
-  changefreq: 'weekly',
-  generateRobotsTxt: true,
-  autoLastmod: false,
-  generateIndexSitemap: false,
-  robotsTxtOptions: {
-    policies: [
-      {
-        userAgent: '*',
-        allow: '/'
-      }
-    ]
-  },
-  transform: async (config, path) => {
-    const metadata = {
-      loc: path
-    }
-
-    if (isHomepage(path)) {
-      metadata.priority = 1
-    } else if (isBasePage(path)) {
-      metadata.priority = 0.8
-    } else {
-      if (isArticle(path)) {
-        metadata.priority = 0.6
-        const attributes = getArticleAttibutes(`content${path}.md`)
-        console.log(attributes)
-        if (!attributes) { return null }
-
-        metadata.lastmod = attributes.moddate ?? attributes.pubdate ?? null
-
-        console.log('Calculated sitemap dates for article', path)
-      }
-    }
-
-    return metadata
-  }
-}
-
-function isHomepage (path) {
-  return path === '/'
-}
-
-function isBasePage (path) {
-  return path.split('/').length === 2
-}
-
-function isArticle (path) {
-  return path.startsWith('/writing/')
-}
-
-function getArticleAttibutes (path) {
-  const fileContents = fs.readFileSync(path, {
-    encoding: 'utf-8'
-  })
-
-  // @ts-ignore
-  const { attributes } = fm(fileContents)
-
-  return {
-    ...attributes,
-    pubdate: attributes.pubdate?.toUTCString() ?? null,
-    moddate: attributes.moddate?.toUTCString() ?? null
-  }
+  generateRobotsTxt: true // (optional)
+  // ...other options
 }
--- a/next.config.mjs
+++ b/next.config.mjs
@ -1,11 +1,8 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
  reactStrictMode: true,
-  output: 'export',
-  trailingSlash: true, // ensure pages get their own directory in output
-  images: {
-    unoptimized: true
-  }
+  output: 'standalone',
+  trailingSlash: true // ensure pages get their own directory in output
 }

 export default nextConfig
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,33 +1,29 @@
 {
-  "name": "www-aaronjy-me",
-  "version": "1.7.4.0",
+  "name": "www-aaronjy-2024",
+  "version": "1.0.0",
  "private": true,
  "type": "module",
  "scripts": {
-    "dev": "TINA_PUBLIC_IS_LOCAL=true tinacms dev -c \"next dev\"",
+    "dev": "next dev",
+    "server": "npx decap-server",
    "build": "next build",
+    "docker:build": "docker build -t www-aaronjy-2024 .",
    "postbuild": "next-sitemap --config next-sitemap.config.cjs",
    "start": "next start",
    "link": "npx standard",
    "format": "npx standard --fix",
    "prepare": "husky",
-    "test": "jest --verbose --passWithNoTests",
+    "deploy": "./util/pre-deploy.sh && ./util/deploy-gcloud.sh",
+    "test": "jest --verbose",
    "lint": "next lint"
  },
-  "standard": {
-    "ignore": [
-      "/tina/**/*"
-    ]
-  },
  "dependencies": {
-    "@highlightjs/cdn-assets": "^11.11.1",
    "date-fns": "^4.1.0",
-    "highlight.js": "^11.11.0",
+    "feather-icons": "^4.29.2",
    "next": "^14.2.6",
    "next-seo": "^6.5.0",
    "react": "^18",
-    "react-dom": "^18",
-    "tinacms": "^2.7.3"
+    "react-dom": "^18"
  },
  "devDependencies": {
    "@babel/core": "^7.24.0",
@ -37,7 +33,6 @@
    "@commitlint/config-conventional": "^19.1.0",
    "@testing-library/jest-dom": "^6.4.2",
    "@testing-library/react": "^16.0.0",
-    "@tinacms/cli": "^1.9.3",
    "@types/jest": "^29.5.12",
    "babel-jest": "^29.7.0",
    "eslint": "^9.9.0",
--- a/public/admin/.gitignore
+++ b/public/admin/.gitignore
@ -1,2 +0,0 @@
-index.html
-assets/
--- a/public/admin/config.yml
+++ b/public/admin/config.yml
@ -0,0 +1,79 @@
+local_backend: true
+backend:
+  name: git-gateway
+  branch: main # Branch to update (optional; defaults to master)
+media_folder: public/img
+public_folder: img
+collections:
+  - name: recipes
+    label: Recipes
+    folder: content/recipes
+    create: true
+    fields:
+      - {label: Title, name: title, widget: string}
+      - {label: "Publish Date", name: pubdate, widget: datetime, required: false, default: "" }
+      - {label: Description, name: desc, widget: text}
+      - {label: Body, name: body, widget: markdown }
+
+  - name: writing
+    label: Writing
+    folder: content/writing
+    create: true
+    fields:
+      - {label: Title, name: title, widget: string}
+      - {label: "Publish Date", name: pubdate, widget: datetime, required: false, default: "" }
+      - {label: Description, name: desc, widget: text}
+      - {label: Body, name: body, widget: markdown }
+
+  - name: fun
+    label: Fun
+    folder: content/fun
+    create: true
+    fields:
+      - {label: Title, name: title, widget: string}
+      - {label: "Publish Date", name: pubdate, widget: datetime, required: false, default: "" }
+      - {label: Description, name: desc, widget: text}
+      - {label: Body, name: body, widget: markdown }
+      
+  - name: "pages"
+    label: "Pages"
+    files:
+      - label: "CV"
+        name: "cv"
+        file: "content/pages/cv.yml"
+        fields:
+          - label: Core competencies
+            widget: list
+            name: competencies
+            allow_add: true
+          - label: Education history
+            widget: list
+            name: education
+            allow_add: true
+          - label: Certifications
+            widget: list
+            name: certifications
+            allow_add: true
+          - label: Languages
+            widget: list
+            name: languages
+            allow_add: true
+            fields:
+              - {label: "Name", name: name, widget: string }
+              - {label: "Proficiency", name: proficiency, widget: string }
+          - label: Technical skills
+            widget: list
+            name: tech-skills
+          - label: Professional experience
+            name: experience
+            widget: list
+            fields:
+              - { label: Position, name: position, widget: string }
+              - { label: Employer, name: employer, widget: string }
+              - { label: Start date, name: start, widget: string }
+              - { label: End date, name: end, widget: string }
+              - { label: Description, name: desc, widget: markdown }
+
+           
+
+
--- a/public/admin/index.html
+++ b/public/admin/index.html
@ -0,0 +1,13 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Content Manager</title>
+  <!-- <script src="https://identity.netlify.com/v1/netlify-identity-widget.js"></script> -->
+</head>
+<body>
+  <!-- Include the script that builds the page and powers Decap CMS -->
+  <script src="https://unpkg.com/decap-cms@^3.0.0/dist/decap-cms.js"></script>
+</body>
+</html>
--- a/public/img/bg.svg
+++ b/public/img/bg.svg
@ -0,0 +1,3 @@
+<svg class="topography-shape js-shape" width="1200px" height="580px" viewBox="0 0 1200 580" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+      <path d="M734.567 34.372c-28.692 61.724-23.266 100.422 16.275 116.094 59.313 23.508 200.347 32.911 259.299 83.906 58.95 50.994 238.697 11.572 269.438-75.95C1310.32 70.9 1365.669-64 1073.808-64c-194.576 0-307.654 32.79-339.24 98.372h-.001z" fill="#FFFA72" fill-rule="nonzero"></path>
+    <path d="M734.567 34.372c-28.692 61.724-23.266 100.422 16.275 116.094 59.313 23.508 200.347 32.911 259.299 83.906 58.95 50.994 238.697 11.572 269.438-75.95C1310.32 70.9 1365.669-64 1073.808-64c-194.576 0-307.654 32.79-339.24 98.372h-.001z" fill="#FFFA72" fill-rule="nonzero" style="position: relative; z-index: 0; fill: rgb(214, 242, 255);" transform="translate(-1800, 60) scale(2.8, 2.8) skewX(30) "></path><path d="M734.567 34.372c-28.692 61.724-23.266 100.422 16.275 116.094 59.313 23.508 200.347 32.911 259.299 83.906 58.95 50.994 238.697 11.572 269.438-75.95C1310.32 70.9 1365.669-64 1073.808-64c-194.576 0-307.654 32.79-339.24 98.372h-.001z" fill="#FFFA72" fill-rule="nonzero" style="position: relative; z-index: 1; fill: rgb(199, 225, 243);" transform="translate(-1650, 55) scale(2.65, 2.65) skewX(27.5) "></path><path d="M734.567 34.372c-28.692 61.724-23.266 100.422 16.275 116.094 59.313 23.508 200.347 32.911 259.299 83.906 58.95 50.994 238.697 11.572 269.438-75.95C1310.32 70.9 1365.669-64 1073.808-64c-194.576 0-307.654 32.79-339.24 98.372h-.001z" fill="#FFFA72" fill-rule="nonzero" style="position: relative; z-index: 2; fill: rgb(184, 207, 230);" transform="translate(-1500, 50) scale(2.5, 2.5) skewX(25) "></path><path d="M734.567 34.372c-28.692 61.724-23.266 100.422 16.275 116.094 59.313 23.508 200.347 32.911 259.299 83.906 58.95 50.994 238.697 11.572 269.438-75.95C1310.32 70.9 1365.669-64 1073.808-64c-194.576 0-307.654 32.79-339.24 98.372h-.001z" fill="#FFFA72" fill-rule="nonzero" style="position: relative; z-index: 3; fill: rgb(169, 190, 218);" transform="translate(-1350, 45) scale(2.3499999999999996, 2.3499999999999996) skewX(22.5) "></path><path d="M734.567 34.372c-28.692 61.724-23.266 100.422 16.275 116.094 59.313 23.508 200.347 32.911 259.299 83.906 58.95 50.994 238.697 11.572 269.438-75.95C1310.32 70.9 1365.669-64 1073.808-64c-194.576 0-307.654 32.79-339.24 98.372h-.001z" fill="#FFFA72" fill-rule="nonzero" style="position: relative; z-index: 4; fill: rgb(154, 173, 206);" transform="translate(-1200, 40) scale(2.2, 2.2) skewX(20) "></path><path d="M734.567 34.372c-28.692 61.724-23.266 100.422 16.275 116.094 59.313 23.508 200.347 32.911 259.299 83.906 58.95 50.994 238.697 11.572 269.438-75.95C1310.32 70.9 1365.669-64 1073.808-64c-194.576 0-307.654 32.79-339.24 98.372h-.001z" fill="#FFFA72" fill-rule="nonzero" style="position: relative; z-index: 5; fill: rgb(139, 155, 193);" transform="translate(-1050, 35) scale(2.05, 2.05) skewX(17.5) "></path><path d="M734.567 34.372c-28.692 61.724-23.266 100.422 16.275 116.094 59.313 23.508 200.347 32.911 259.299 83.906 58.95 50.994 238.697 11.572 269.438-75.95C1310.32 70.9 1365.669-64 1073.808-64c-194.576 0-307.654 32.79-339.24 98.372h-.001z" fill="#FFFA72" fill-rule="nonzero" style="position: relative; z-index: 6; fill: rgb(125, 138, 181);" transform="translate(-900, 30) scale(1.9, 1.9) skewX(15) "></path><path d="M734.567 34.372c-28.692 61.724-23.266 100.422 16.275 116.094 59.313 23.508 200.347 32.911 259.299 83.906 58.95 50.994 238.697 11.572 269.438-75.95C1310.32 70.9 1365.669-64 1073.808-64c-194.576 0-307.654 32.79-339.24 98.372h-.001z" fill="#FFFA72" fill-rule="nonzero" style="position: relative; z-index: 7; fill: rgb(110, 121, 169);" transform="translate(-750, 25) scale(1.75, 1.75) skewX(12.5) "></path><path d="M734.567 34.372c-28.692 61.724-23.266 100.422 16.275 116.094 59.313 23.508 200.347 32.911 259.299 83.906 58.95 50.994 238.697 11.572 269.438-75.95C1310.32 70.9 1365.669-64 1073.808-64c-194.576 0-307.654 32.79-339.24 98.372h-.001z" fill="#FFFA72" fill-rule="nonzero" style="position: relative; z-index: 8; fill: rgb(95, 103, 156);" transform="translate(-600, 20) scale(1.6, 1.6) skewX(10) "></path><path d="M734.567 34.372c-28.692 61.724-23.266 100.422 16.275 116.094 59.313 23.508 200.347 32.911 259.299 83.906 58.95 50.994 238.697 11.572 269.438-75.95C1310.32 70.9 1365.669-64 1073.808-64c-194.576 0-307.654 32.79-339.24 98.372h-.001z" fill="#FFFA72" fill-rule="nonzero" style="position: relative; z-index: 9; fill: rgb(80, 86, 144);" transform="translate(-450, 15) scale(1.45, 1.45) skewX(7.5) "></path><path d="M734.567 34.372c-28.692 61.724-23.266 100.422 16.275 116.094 59.313 23.508 200.347 32.911 259.299 83.906 58.95 50.994 238.697 11.572 269.438-75.95C1310.32 70.9 1365.669-64 1073.808-64c-194.576 0-307.654 32.79-339.24 98.372h-.001z" fill="#FFFA72" fill-rule="nonzero" style="position: relative; z-index: 10; fill: rgb(65, 69, 132);" transform="translate(-300, 10) scale(1.3, 1.3) skewX(5) "></path><path d="M734.567 34.372c-28.692 61.724-23.266 100.422 16.275 116.094 59.313 23.508 200.347 32.911 259.299 83.906 58.95 50.994 238.697 11.572 269.438-75.95C1310.32 70.9 1365.669-64 1073.808-64c-194.576 0-307.654 32.79-339.24 98.372h-.001z" fill="#FFFA72" fill-rule="nonzero" style="position: relative; z-index: 11; fill: rgb(50, 51, 119);" transform="translate(-150, 5) scale(1.15, 1.15) skewX(2.5) "></path></svg>
--- a/public/img/book-placeholder.jpg
+++ b/public/img/book-placeholder.jpg
--- a/public/img/image-27-10-2024-at-12.10.jpg
+++ b/public/img/image-27-10-2024-at-12.10.jpg
--- a/public/img/image-27-10-2024-at-12.13.jpg
+++ b/public/img/image-27-10-2024-at-12.13.jpg
--- a/public/img/image-27-10-2024-at-12.18.jpg
+++ b/public/img/image-27-10-2024-at-12.18.jpg
--- a/public/img/tech-debt-steps.jpeg
+++ b/public/img/tech-debt-steps.jpeg
--- a/public/img/techdebt-board.jpg
+++ b/public/img/techdebt-board.jpg
--- a/public/sitemap-0.xml
+++ b/public/sitemap-0.xml
@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:mobile="http://www.google.com/schemas/sitemap-mobile/1.0" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">
-<url><loc>https://www.aaronjy.me/</loc><priority>1</priority></url>
-<url><loc>https://www.aaronjy.me/about/</loc><priority>0.8</priority></url>
-<url><loc>https://www.aaronjy.me/cv/</loc><priority>0.8</priority></url>
-<url><loc>https://www.aaronjy.me/tags/</loc><priority>0.8</priority></url>
-<url><loc>https://www.aaronjy.me/writing/</loc><priority>0.8</priority></url>
-<url><loc>https://www.aaronjy.me/writing/attitudes-to-reading/</loc><priority>0.6</priority><pubdate>Tue, 18 Mar 2025 00:00:00 GMT</pubdate></url>
-<url><loc>https://www.aaronjy.me/writing/moving-from-github-to-forgejo/</loc><priority>0.6</priority><pubdate>Sun, 16 Mar 2025 00:00:00 GMT</pubdate></url>
-<url><loc>https://www.aaronjy.me/writing/performance-considerations-tcp-game-server/</loc><priority>0.6</priority><pubdate>Sun, 23 Feb 2025 21:12:37 GMT</pubdate></url>
-<url><loc>https://www.aaronjy.me/writing/quick-reflection-katherine-may/</loc><priority>0.6</priority><pubdate>Sun, 09 Mar 2025 00:00:00 GMT</pubdate></url>
-<url><loc>https://www.aaronjy.me/writing/static-site-on-google-cloud/</loc><priority>0.6</priority><pubdate>Wed, 01 May 2024 00:00:00 GMT</pubdate></url>
-<url><loc>https://www.aaronjy.me/writing/support-content-filte-structure-changes-on-a-static-site/</loc><priority>0.6</priority><pubdate>Mon, 18 Mar 2024 16:47:32 GMT</pubdate></url>
+<url><loc>https://www.aaronjy.me/</loc><lastmod>2025-01-27T13:04:24.469Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
+<url><loc>https://www.aaronjy.me/cv/</loc><lastmod>2025-01-27T13:04:24.469Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
+<url><loc>https://www.aaronjy.me/writing/</loc><lastmod>2025-01-27T13:04:24.469Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
+<url><loc>https://www.aaronjy.me/writing/static-site-on-google-cloud/</loc><lastmod>2025-01-27T13:04:24.469Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
+<url><loc>https://www.aaronjy.me/writing/support-content-filte-structure-changes-on-a-static-site/</loc><lastmod>2025-01-27T13:04:24.469Z</lastmod><changefreq>daily</changefreq><priority>0.7</priority></url>
 </urlset>
--- a/public/sitemap.xml
+++ b/public/sitemap.xml
@ -1,37 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:mobile="http://www.google.com/schemas/sitemap-mobile/1.0" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1">
-<url><loc>https://www.aaronjy.me/</loc><priority>1</priority></url>
-<url><loc>https://www.aaronjy.me/about/</loc><priority>0.8</priority></url>
-<url><loc>https://www.aaronjy.me/cv/</loc><priority>0.8</priority></url>
-<url><loc>https://www.aaronjy.me/library/</loc><priority>0.8</priority></url>
-<url><loc>https://www.aaronjy.me/tags/</loc><priority>0.8</priority></url>
-<url><loc>https://www.aaronjy.me/writing/</loc><priority>0.8</priority></url>
-<url><loc>https://www.aaronjy.me/library/1984/</loc></url>
-<url><loc>https://www.aaronjy.me/library/A-Monster-Calls/</loc></url>
-<url><loc>https://www.aaronjy.me/library/Diary-of-An-Oxygen-Thief/</loc></url>
-<url><loc>https://www.aaronjy.me/library/No-God-But-God/</loc></url>
-<url><loc>https://www.aaronjy.me/library/On-Tyranny/</loc></url>
-<url><loc>https://www.aaronjy.me/library/Sex--Punishment/</loc></url>
-<url><loc>https://www.aaronjy.me/library/The-Dangers-of-Smoking-in-Bed-/</loc></url>
-<url><loc>https://www.aaronjy.me/library/The-Nature-of-Alexander/</loc></url>
-<url><loc>https://www.aaronjy.me/library/The-Time-Machine/</loc></url>
-<url><loc>https://www.aaronjy.me/library/Wintering-The-Power-of-Rest-and-Retreat-in-Difficult-Times/</loc></url>
-<url><loc>https://www.aaronjy.me/library/a-night-to-remember/</loc></url>
-<url><loc>https://www.aaronjy.me/library/alice-in-wonderland/</loc></url>
-<url><loc>https://www.aaronjy.me/library/animal-farm/</loc></url>
-<url><loc>https://www.aaronjy.me/library/cities-that-shaped-the-ancient-world/</loc></url>
-<url><loc>https://www.aaronjy.me/library/song-of-achilles/</loc></url>
-<url><loc>https://www.aaronjy.me/library/starmaker/</loc></url>
-<url><loc>https://www.aaronjy.me/library/stasiland/</loc></url>
-<url><loc>https://www.aaronjy.me/library/stray-reflections/</loc></url>
-<url><loc>https://www.aaronjy.me/library/the-marmalade-diaries/</loc></url>
-<url><loc>https://www.aaronjy.me/library/the-midnight-library/</loc></url>
-<url><loc>https://www.aaronjy.me/library/to-be-taught-if-fortunate/</loc></url>
-<url><loc>https://www.aaronjy.me/library/when-the-moon-hits-your-eye/</loc></url>
-<url><loc>https://www.aaronjy.me/writing/attitudes-to-reading/</loc><lastmod>Tue, 18 Mar 2025 00:00:00 GMT</lastmod><priority>0.6</priority></url>
-<url><loc>https://www.aaronjy.me/writing/moving-from-github-to-forgejo/</loc><lastmod>Sun, 16 Mar 2025 00:00:00 GMT</lastmod><priority>0.6</priority></url>
-<url><loc>https://www.aaronjy.me/writing/performance-considerations-tcp-game-server/</loc><lastmod>Fri, 21 Mar 2025 21:12:47 GMT</lastmod><priority>0.6</priority></url>
-<url><loc>https://www.aaronjy.me/writing/quick-reflection-katherine-may/</loc><lastmod>Sun, 09 Mar 2025 00:00:00 GMT</lastmod><priority>0.6</priority></url>
-<url><loc>https://www.aaronjy.me/writing/static-site-on-google-cloud/</loc><lastmod>Wed, 01 May 2024 00:00:00 GMT</lastmod><priority>0.6</priority></url>
-<url><loc>https://www.aaronjy.me/writing/support-content-file-structure-changes-on-a-static-site/</loc><lastmod>Mon, 18 Mar 2024 16:47:32 GMT</lastmod><priority>0.6</priority></url>
-</urlset>
+<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+<sitemap><loc>https://www.aaronjy.me/sitemap-0.xml</loc></sitemap>
+</sitemapindex>
--- a/src/components/Article/Article.jsx
+++ b/src/components/Article/Article.jsx
@ -1,40 +1,38 @@
 import { formatDate } from '@/lib/helpers'
 import { NextSeo } from 'next-seo'
 import Link from 'next/link'
-import React, { useEffect } from 'react'
-
-import 'highlight.js/styles/atom-one-dark.css'
-import hljs from 'highlight.js'
+import React from 'react'
+import * as feather from 'feather-icons'

 function Article ({ attributes, html }) {
-  useEffect(() => {
-    hljs.highlightAll()
-  }, [attributes, html])
  return (
-    <>
-      <h1>{attributes.title}</h1>
-      <article>
-        <NextSeo
-          title={attributes.title} description={attributes.desc} openGraph={
-            {
-              title: attributes.title,
-              description: attributes.desc,
-              type: 'article',
-              article: {
-                publishedTime: attributes.pubdate ?? null
-              }
-            }
+    <section>
+      <NextSeo
+        title={attributes.title} description={attributes.desc} openGraph={
+        {
+          title: attributes.title,
+          description: attributes.desc,
+          type: 'article',
+          article: {
+            publishedTime: attributes.pubdate ?? null
          }
-        />
-        <div>
-          <Link href='./'>Back...</Link>
-          {attributes.pubdate && <p>{formatDate(attributes.pubdate)}</p>}
-          <div data-test='content' dangerouslySetInnerHTML={{ __html: html }} />
-          {attributes.tags && <p>Tags: {attributes.tags.join(', ')}</p>}
-        </div>
-      </article>
-    </>
-
+        }
+      }
+      />
+      <div>
+        <Link href='./'>
+          <p className='row'>
+            <span className='icon icon-left' dangerouslySetInnerHTML={{ __html: feather.icons['arrow-left'].toSvg() }} />
+            <span>Go back</span>
+          </p>
+        </Link>
+        <h1>{attributes.title}</h1>
+        <p>{attributes.desc}</p>
+        {attributes.pubdate && <p>{formatDate(attributes.pubdate)}</p>}
+        <hr />
+        <div data-test='content' dangerouslySetInnerHTML={{ __html: html }} />
+      </div>
+    </section>
  )
 }

--- a/src/components/Book/Book.jsx
+++ b/src/components/Book/Book.jsx
@ -1,50 +0,0 @@
-import { formatDate } from '@/lib/helpers'
-import { NextSeo } from 'next-seo'
-import Image from 'next/image'
-import Link from 'next/link'
-import React from 'react'
-import style from './Book.module.css'
-import ExternalLink from '../ExternalLink/ExternalLink'
-
-function Book ({ attributes, html }) {
-  return (
-    <>
-      <h1>{attributes.title}<br /><small>by {attributes.author}</small></h1>
-      <Link href='./'>Back...</Link>
-
-      <article>
-        <NextSeo
-          title={attributes.title} description={attributes.desc} openGraph={
-            {
-              title: attributes.title,
-              description: attributes.desc,
-              type: 'article',
-              article: {
-                publishedTime: attributes.pubdate ?? null
-              }
-            }
-          }
-        />
-
-        <div>
-          <div className={style.layout}>
-            {attributes.thumbnailUrl &&
-              <Image src={attributes.thumbnailUrl} width={250} height={580} alt='' className={style.thumbnail} />}
-            <div>
-              <div data-test='content' dangerouslySetInnerHTML={{ __html: html || '<p>(no review)</p>' }} />
-              <p>
-                <span className='bold'>Genres:</span>&nbsp;{attributes.tags}<br />
-                <span className='bold'>Rating:</span>&nbsp;{attributes.stars}/5<br />
-                <span className='bold'>Read on:</span>&nbsp;{formatDate(attributes.readDate)}
-              </p>
-              <p><ExternalLink href={attributes.url}>View on The StoryGraph</ExternalLink></p>
-            </div>
-          </div>
-        </div>
-      </article>
-    </>
-
-  )
-}
-
-export default Book
--- a/src/components/Book/Book.module.css
+++ b/src/components/Book/Book.module.css
@ -1,34 +0,0 @@
-
-.layout {
-  display: flex;
-  flex-direction: row;
-  gap: 1.25rem;
-  margin: 1.25rem 0;
-}
-
-.layout:first-child {
-  flex-grow: 0;
-  flex-shrink: 0;
-}
-
-.layout:last-child {
-  flex-grow: 1;
-}
-
-.layout p:first-child {
-  margin-top: 0;
-}
-
-.thumbnail {
-  border-radius: 8px;
-}
-
-@media screen and (max-width: 650px) {
-  .layout {
-    flex-direction: column-reverse;
-  }
-
-  .thumbnail {
-    width: 100%;
-  }
-}
--- a/src/components/BookListItem/BookListItem.jsx
+++ b/src/components/BookListItem/BookListItem.jsx
@ -1,35 +0,0 @@
-import style from './BookListItem.module.css'
-import Link from 'next/link'
-
-export default function BookListItem ({ href, title, author, stars, readDate, url, thumbnailUrl, tags, review }) {
-  return (
-    <div className={style.item}>
-      <Link href={href}>
-        <div
-          className={style.thumb} style={{
-            backgroundImage: `url(${thumbnailUrl ?? '/img/book-placeholder.jpg'})`
-          }}
-        ><div className={style.rating}><Star />&nbsp;{stars}</div>
-        </div>
-      </Link>
-      <div>
-        <h2 className={style.heading}>
-          <Link href={href}>{title}</Link>
-        </h2>
-        <p className={style.author}>{author}</p>
-        <p>{tags}</p>
-      </div>
-    </div>
-  )
-}
-
-function Star () {
-  return (
-    <svg
-      style={{
-        fill: 'currentColor'
-      }} height='15' width='15' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 47.94 47.94' xmlSpace='preserve'
-    ><path d='m26.285 2.486 5.407 10.956a2.58 2.58 0 0 0 1.944 1.412l12.091 1.757c2.118.308 2.963 2.91 1.431 4.403l-8.749 8.528a2.582 2.582 0 0 0-.742 2.285l2.065 12.042c.362 2.109-1.852 3.717-3.746 2.722l-10.814-5.685a2.585 2.585 0 0 0-2.403 0l-10.814 5.685c-1.894.996-4.108-.613-3.746-2.722l2.065-12.042a2.582 2.582 0 0 0-.742-2.285L.783 21.014c-1.532-1.494-.687-4.096 1.431-4.403l12.091-1.757a2.58 2.58 0 0 0 1.944-1.412l5.407-10.956c.946-1.919 3.682-1.919 4.629 0z' />
-    </svg>
-  )
-}
--- a/src/components/BookListItem/BookListItem.module.css
+++ b/src/components/BookListItem/BookListItem.module.css
@ -1,40 +0,0 @@
-.item {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  flex-grow: 1;
-}
-
-.heading {
-  font-size: 1rem;
-  margin-bottom: 5px;
-}
-
-.author {
-  margin-top: 5px;
-  /* font-weight: bold; */
-}
-
-
-.thumb {
-  width: auto;
-  height: 290px;
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: cover;
-  border-radius: 6px;
-  position: relative;
-}
-
-.rating {
-  position: absolute;
-  right: 0.5rem;
-  bottom: 0.5rem;
-  background-color: var(--light);
-  padding: 0.25rem 0.5rem;
-  border-radius: 0.25rem;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  pointer-events: none;
-}
--- a/src/components/Footer/Footer.jsx
+++ b/src/components/Footer/Footer.jsx
@ -2,34 +2,47 @@ import React from 'react'

 import style from './Footer.module.css'

-// @ts-ignore
-import pck from '../../../package.json'
-
 function Footer () {
  return (
    <footer className={style.footer} data-testid='footer'>
-      <hr />
      <nav>
-        <div>
-          <span>
+        <ul>
+          <li>
            <a href='#'>Back to top</a>
-          </span>{', '}
-          <span>
-            <a href='/static/pgp.txt'>PGP key</a>
-          </span>{', '}
-          <span>
+          </li>
+          <li>
+            <a href='/static/pgp.txt'>pgp key</a>
+          </li>
+          <li>
            <a href='mailto:me@aaronjy.me'>Send me an email</a>
-          </span>{', '}
-          <span>
-            <a href='https://git.aaronjy.me/aaron/aaronjy-me' target='_blank' rel='nofollow noopener noreferrer'>View site src</a>
-          </span>
-        </div>
-
-        <div>
-          <small>2025 Aaron Yarborough, <span title='major.minior.patch.content'>v{pck.version}</span></small>
-        </div>
+          </li>
+        </ul>
      </nav>

+      <nav>
+        <ul>
+          <li>
+            <small>
+              2024 Aaron Yarborough, made with{' '}
+              <a
+                target='_blank'
+                rel='nofollow noopener noreferrer'
+                href='https://nextjs.org/'
+              >
+                Next.js
+              </a>{' '}
+              and{' '}
+              <a
+                target='_blank'
+                rel='nofollow noopener noreferrer'
+                href='https://yegor256.github.io/tacit/'
+              >
+                Tacit
+              </a>
+            </small>
+          </li>
+        </ul>
+      </nav>
    </footer>
  )
 }
--- a/src/components/Footer/Footer.module.css
+++ b/src/components/Footer/Footer.module.css
@ -0,0 +1,7 @@
+.footer nav:first-child a {
+  text-transform: lowercase;
+}
+
+.footer nav li {
+  margin-bottom: 0;
+}
--- a/src/components/Grid/Grid.jsx
+++ b/src/components/Grid/Grid.jsx
@ -1,11 +1,11 @@
+import React from 'react'
+
 import style from './Grid.module.css'

-export default function Grid ({ columns, children }) {
+function Grid ({ children }) {
  return (
-    <div
-      className={style.grid}
-    >
-      {children}
-    </div>
+    <div className={style.grid}>{children}</div>
  )
 }
+
+export default Grid
--- a/src/components/Grid/Grid.module.css
+++ b/src/components/Grid/Grid.module.css
@ -1,5 +1,5 @@
 .grid {
  display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
-  gap: 1rem;
-}
+  grid-template-columns: repeat(3, 1fr);
+  gap: 32px;
+}
--- a/src/components/Header/Header.jsx
+++ b/src/components/Header/Header.jsx
@ -7,12 +7,9 @@ function Header () {
  return (
    <header className={styles.header} data-testid='header'>
      <nav>
-        <Link href='/'>Home</Link>{', '}
-        <Link href='/writing'>Writing</Link>{', '}
-        <Link href='/tags'>Tags</Link>{', '}
-        <Link href='/cv'>CV</Link>{', '}
-        <Link href='/library'>Library</Link>{', '}
-        <Link href='/about'>About</Link>
+        <Link href='/'>Home</Link>
+        <Link href='/writing'>Writing</Link>
+        <Link href='/cv'>CV</Link>
      </nav>
    </header>
  )
--- a/src/components/Header/Header.module.css
+++ b/src/components/Header/Header.module.css
@ -1,3 +1,9 @@
-.header {
-    margin-top: 20px;
+.header nav {
+    display: flex;
+    justify-content: center;
+    gap: 20px;
+}
+
+.header a {
+    text-transform: lowercase;
 }
--- a/src/components/Resume/Resume.jsx
+++ b/src/components/Resume/Resume.jsx
@ -11,50 +11,22 @@ function Resume ({
 }) {
  return (
    <div className={style.cv}>
-      <ol>
-        <li><a href='#experience'>Professional experience</a></li>
-        <li><a href='#competencies'>Competencies</a></li>
-        <li><a href='#competencies'>Certifications</a></li>
-        <li><a href='#languages'>Languages</a></li>
-        <li><a href='#education'>Education</a></li>
-      </ol>
      <div>
-        <h2 id='experience'>Professional experience</h2>
-
-        {experience.map((exp, i) => (
-          <div key={i}>
-            <WorkExperience
-              employer={exp.employer}
-              position={exp.position}
-              start={exp.start}
-              end={exp.end}
-            >
-              {exp.desc}
-            </WorkExperience>
-            <details>
-              <summary>Competencies</summary>
-              <>{exp.skills}</>
-            </details>
-          </div>
-
-        ))}
-      </div>
-      <div className='sidebar'>
-        <h2 id='competencies'>Competencies</h2>
+        <h2>Core competencies</h2>
        <ul>
          {competencies.sort().map((c, i) => (
            <li key={i}>{c}</li>
          ))}
        </ul>

-        <h2 id='certifications'>Certifications</h2>
+        <h2>Certifications</h2>
        <ul>
          {certifications.sort().map((c, i) => (
            <li key={i}>{c}</li>
          ))}
        </ul>

-        <h2 className='languages'>Languages</h2>
+        <h2>Languages</h2>
        <ul>
          {languages.sort().map((c, i) => (
            <li key={i}>
@ -63,10 +35,24 @@ function Resume ({
          ))}
        </ul>

-        <h2 className='education'>Education</h2>
+        <h2>Education history</h2>
        <p>{education}</p>
      </div>
+      <div>
+        <h2>Professional experience</h2>

+        {experience.map((exp, i) => (
+          <WorkExperience
+            key={i}
+            employer={exp.employer}
+            position={exp.position}
+            start={exp.start}
+            end={exp.end}
+          >
+            {exp.desc}
+          </WorkExperience>
+        ))}
+      </div>
    </div>
  )
 }
@ -77,7 +63,7 @@ function WorkExperience ({ position, employer, start, end, children }) {
  return (
    <div className={style['work-experience']}>
      <div>
-        <h3 id={position}>
+        <h3>
          {position}
          <br />
          <small>{employer}</small>
--- a/src/components/Resume/Resume.module.css
+++ b/src/components/Resume/Resume.module.css
@ -0,0 +1,25 @@
+.cv {
+  display: flex;
+  flex-direction: row;
+  gap: 25px;
+}
+
+.cv > div:first-child {
+  flex: 1;
+}
+
+.cv > div:last-child {
+  flex: 2;
+}
+
+.cv .work-experience >div:first-child {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+@media (max-width: 768px) {
+  .cv {
+    flex-direction: column;
+  }
+}
--- a/src/components/StaticContentList/StaticContentList.jsx
+++ b/src/components/StaticContentList/StaticContentList.jsx
@ -1,19 +0,0 @@
-import { formatDate } from '@/lib/helpers'
-import Link from 'next/link'
-
-export default function StaticContentList ({ entries, urlPrefix, max = 0 }) {
-  return (
-    <table>
-      <tbody>
-        {entries.map((e) => (
-          <tr key={e.slug}>
-            <td>{!!e.attributes.pubdate && <span>{formatDate(e.attributes.pubdate)}</span>}</td>
-            <td>
-              <Link href={`${urlPrefix}${e.slug}`}>{e.attributes.title}</Link>
-            </td>
-          </tr>
-        )).slice(0, max > 0 ? max : entries.length)}
-      </tbody>
-    </table>
-  )
-}
--- a/src/layouts/DefaultLayout/DefaultLayout.jsx
+++ b/src/layouts/DefaultLayout/DefaultLayout.jsx
@ -8,7 +8,7 @@ function DefaultLayout ({ children }) {
  return (
    <main className={`${style.layout}`}>
      <Header />
-      <>{children}</>
+      <article>{children}</article>
      <Footer />
    </main>
  )
--- a/src/layouts/DefaultLayout/DefaultLayout.module.css
+++ b/src/layouts/DefaultLayout/DefaultLayout.module.css
@ -0,0 +1,9 @@
+.layout {
+    display: flex;
+    flex-direction: column;
+    min-height: 100dvh;
+}
+
+.layout main {
+    flex-grow: 1;
+}
--- a/src/lib/content.js
+++ b/src/lib/content.js
@ -21,8 +21,8 @@ export function getMarkdownEntry (path) {
  return {
    attributes: {
      ...attributes,
-      pubdate: attributes.pubdate?.toUTCString() ?? null,
-      moddate: attributes.moddate?.toUTCString() ?? null
+      pubdate: attributes.pubdate?.toUTCString() ?? null
+
    },
    html,
    slug
@ -52,25 +52,11 @@ export function getStaticEntryProps (contentPath, { params }) {
  return { props: { ...entry, attributes } }
 }

-export function getStaticEntries (contentPath) {
-  const directoryItems = fs.readdirSync(contentPath, { withFileTypes: true })
-  return directoryItems.map((dirent) =>
+export function getStaticEntryListProps (contentPath, urlPrefix) {
+  const fun = fs.readdirSync(contentPath, { withFileTypes: true })
+  const entries = fun.map((dirent) =>
    getMarkdownEntry(`${dirent.path}/${dirent.name}`)
-  )
-}
-
-export function getContentTags (contentPath) {
-  const allTags = {}
-
-  const entries = getStaticEntries(contentPath)
-  for (const entry of entries) {
-    if (!entry.attributes.tags) { continue }
-
-    const tags = entry.attributes.tags
-    for (const tag of tags) {
-      allTags[tag] = !allTags[tag] ? 1 : allTags[tag] + 1
-    }
-  }
-
-  return allTags
+  ).sort((a, b) => new Date(b.attributes.pubdate) - new Date(a.attributes.pubdate))
+
+  return { props: { entries, urlPrefix } }
 }
--- a/src/lib/helpers.js
+++ b/src/lib/helpers.js
@ -7,13 +7,3 @@ export function toSlug (input) {
 export function formatDate (date) {
  return dateFns.format(Date.parse(date), 'PPP')
 }
-
-/**
- * Silliness to make sure dates don't get passed to the
- * page function below as [object Object]
- * @param {*} obj
- * @returns
- */
-export function stringifyAndParse (obj) {
-  return JSON.parse(JSON.stringify(obj))
-}
--- a/src/pages/_app.js
+++ b/src/pages/_app.js
@ -1,6 +1,7 @@
-import { DefaultSeo } from 'next-seo'
 import '@/styles/globals.css'

+import { DefaultSeo } from 'next-seo'
+
 export default function App ({ Component, pageProps }) {
  return (
    <>
--- a/src/pages/_document.js
+++ b/src/pages/_document.js
@ -4,8 +4,7 @@ export default function Document () {
  return (
    <Html lang='en'>
      <Head>
-        <link rel='stylesheet' href='https://neat.joeldare.com/neat.css' />
-        <script defer data-domain='aaronjy.me' src='https://analytics.aaronjy.me/js/script.js' />
+        <link rel='stylesheet' href='https://cdn.jsdelivr.net/gh/yegor256/tacit@gh-pages/tacit-css-1.7.1.min.css' />
      </Head>
      <body>
        <Main />
--- a/src/pages/about/index.js
+++ b/src/pages/about/index.js
@ -1,83 +0,0 @@
-import ExternalLink from '@/components/ExternalLink/ExternalLink'
-import DefaultLayout from '@/layouts/DefaultLayout/DefaultLayout'
-import { NextSeo } from 'next-seo'
-
-const Title = 'About me'
-
-export default function About () {
-  return (
-    <DefaultLayout>
-      <NextSeo
-        title={Title} openGraph={
-              {
-                title: Title
-              }
-            }
-      />
-      <h1>{Title}</h1>
-      <h2>Where to find me</h2>
-      <section>
-
-        <ul>
-          <li>
-            <strong>
-              <ExternalLink href='https://letterboxd.com/aaronyarbz/'>
-                Letterboxd
-              </ExternalLink>
-            </strong>{' '}
-            is a social platform for film lovers to rate, review, and discover
-            movies, akin to &quot;Goodreads for film.&quot;
-          </li>
-          <li>
-            <strong>
-              <ExternalLink href='https://github.com/AaronJY'>
-                GitHub
-              </ExternalLink>
-            </strong>{' '}
-            is a web-based platform for version control and collaboration on
-            software development projects. Find out what I&apos;ve been working
-            on here!
-          </li>
-          <li>
-            <strong>
-              <ExternalLink href='https://www.linkedin.com/in/aaronjyarborough/'>
-                LinkedIn
-              </ExternalLink>
-            </strong>
-            , unfortunately. A social network for professionals.
-          </li>
-        </ul>
-      </section>
-
-      <h2>Tech I Like</h2>
-      <section>
-        <ul>
-          <li>
-            <strong>Web Development:</strong> I primarily use Node.js with TypeScript
-            (or JavaScript for smaller projects) alongside Next.js to build websites
-            and applications.
-          </li>
-          <li>
-            <strong>Scripting:</strong> My preferred scripting languages are Python
-            and JavaScript, as I&apos;m well-versed in them and they offer extensive
-            libraries that typically cover my needs.
-          </li>
-          <li>
-            <strong>API and Backend Development:</strong> For more robust API or backend
-            architecture, I often choose .NET Core with C# and ASP.NET. The strongly-typed
-            nature of C# and the structured framework of ASP.NET help maintain clean and
-            organised code.
-          </li>
-          <li>
-            <strong>Cloud Hosting:</strong> When possible, I opt for hosting on a
-            DigitalOcean droplet. If more extensive cloud services are required, I usually
-            opt for Google Cloud Platform (GCP), which I find more user-friendly than Azure
-            or AWS. I also self-host services on shared server hosting running Ubuntu Server, typically with Hetzner.
-          </li>
-        </ul>
-
-      </section>
-    </DefaultLayout>
-
-  )
-}
--- a/src/pages/cv/index.js
+++ b/src/pages/cv/index.js
@ -7,6 +7,7 @@ import { NextSeo } from 'next-seo'
 import Resume from '@/components/Resume/Resume'

 export const Title = 'CV'
+export const Description = 'Read about my professional experience as a software engineer, core competencies, and certifications.'

 function ResumePage ({
  competencies,
@ -18,13 +19,17 @@ function ResumePage ({
  return (
    <DefaultLayout>
      <NextSeo
-        title={Title} openGraph={
+        title={Title} description={Description} openGraph={
        {
-          title: Title
+          Title,
+          Description
        }
      }
      />
-      <h1>{Title}</h1>
+      <section>
+        <h1>{Title} 💼</h1>
+        <p>{Description}</p>
+      </section>
      <section>
        <Resume
          competencies={competencies}
@ -47,14 +52,12 @@ export function getStaticProps () {

  const MDConverter = new showdown.Converter()

-  // @ts-ignore
  data.experience = data.experience.map((exp) => ({
    ...exp,
    desc: MDConverter.makeHtml(exp.desc)
  }))

  return {
-    // @ts-ignore
    props: { ...data }
  }
 }
--- a/src/pages/index.js
+++ b/src/pages/index.js
@ -1,26 +1,21 @@
 import Head from 'next/head'
 import DefaultLayout from '@/layouts/DefaultLayout/DefaultLayout'
+import ExternalLink from '@/components/ExternalLink/ExternalLink'
 import Link from 'next/link'

-import StaticContentList from '@/components/StaticContentList/StaticContentList'
-import { getStaticEntries } from '@/lib/content'
+import { Title as WritingTitle, Description as WritingDescription } from './writing'
+import { Title as CvTitle, Description as CvDescription } from './cv'

-export const getStaticProps = () => ({
-  props: {
-    postEntries: getStaticEntries('content/writing')
-  }
-})
-
-export default function Home ({ postEntries }) {
+export default function Home () {
  return (
    <DefaultLayout>
      <Head>
        <meta name='viewport' content='width=device-width, initial-scale=1' />
        <link rel='icon' href='/favicon.ico' />
      </Head>
-      <h1>Hello!</h1>

      <section>
+        <h1>Hello! 👋🏻</h1>
        <p>
          I&apos;m Aaron, a Brit living in Newcastle-upon-tyne, UK. I
          work professionally as a Software Engineer, and study
@ -29,13 +24,92 @@ export default function Home ({ postEntries }) {
        <p>
          I current work as a Lead Consultant at Hippo Digital, working on public sector project for the Department of Education. You can find out more about my work history <Link href='/cv'>on my CV</Link>.
        </p>
+
+        <div className='row'>
+          <div className='box'>
+            <Link href='/writing' className='box-title'>{WritingTitle}</Link>
+            <p className='box-text'>{WritingDescription}</p>
+            <Link href='/writing' className='box-link'>Read more...</Link>
+          </div>
+
+          <div className='box'>
+            <Link href='/cv' className='box-title'>{CvTitle}</Link>
+            <p className='box-text'>{CvDescription}</p>
+            <Link href='/cv' className='box-link'>Read more...</Link>
+          </div>
+        </div>
      </section>

      <section>
-        <h2>Recent posts</h2>
-        <StaticContentList entries={postEntries} urlPrefix='writing/' max={5} />
+        <h2>Tech I Like</h2>
+        <ul>
+          <li>
+            <strong>Web Development:</strong> I primarily use Node.js with TypeScript
+            (or JavaScript for smaller projects) alongside Next.js to build websites
+            and applications.
+          </li>
+          <li>
+            <strong>Scripting:</strong> My preferred scripting languages are Python
+            and JavaScript, as I&apos;m well-versed in them and they offer extensive
+            libraries that typically cover my needs.
+          </li>
+          <li>
+            <strong>API and Backend Development:</strong> For more robust API or backend
+            architecture, I often choose .NET Core with C# and ASP.NET. The strongly-typed
+            nature of C# and the structured framework of ASP.NET help maintain clean and
+            organised code.
+          </li>
+          <li>
+            <strong>Cloud Hosting:</strong> When possible, I opt for hosting on a
+            DigitalOcean droplet. If more extensive cloud services are required, I usually
+            opt for Google Cloud Platform (GCP), which I find more user-friendly than Azure
+            or AWS. I also self-host services on shared server hosting running Ubuntu Server, typically with Hetzner.
+          </li>
+        </ul>
+
      </section>

+      <section>
+        <h2>Where to find me</h2>
+
+        <ul>
+          <li>
+            <strong>
+              <ExternalLink href='https://letterboxd.com/aaronyarbz/'>
+                Letterboxd
+              </ExternalLink>
+            </strong>{' '}
+            is a social platform for film lovers to rate, review, and discover
+            movies, akin to &quot;Goodreads for film.&quot;
+          </li>
+          <li>
+            <strong>
+              <ExternalLink href='https://github.com/AaronJY'>
+                GitHub
+              </ExternalLink>
+            </strong>{' '}
+            is a web-based platform for version control and collaboration on
+            software development projects. Find out what I&apos;ve been working
+            on here!
+          </li>
+          <li>
+            <strong>
+              <ExternalLink href='https://www.linkedin.com/in/aaronjyarborough/'>
+                LinkedIn
+              </ExternalLink>
+            </strong>
+            , unfortunately. A social network for professionals.
+          </li>
+        </ul>
+      </section>
+
+      <section>
+        <h2>About this site</h2>
+        <p>www.aaronjy.me is a static site (i.e. a bunch of HTML, JS, CSS and image files) written in JavaScript using Next.js. Tacit is being used as a micro CSS framework, and various smaller bits of custom CSS have been applied on top.</p>
+        <p>The site is hosted inside a Google Cloud Storage bucket with a load balancer sat in front of it. The load balancer is required as Cloud Storage doesn&apos;t support a) custom domains, b) HTTPS out of the box or c) a global CDN solution.</p>
+        <p>One of the biggest benefits of a website made of simple static files and assets is that I can deploy it easily, almost anywhere, and for very little money.</p>
+
+      </section>
    </DefaultLayout>
  )
 }
--- a/src/pages/library/[slug].js
+++ b/src/pages/library/[slug].js
@ -1,17 +0,0 @@
-import React from 'react'
-import DefaultLayout from '@/layouts/DefaultLayout/DefaultLayout'
-import { getStaticEntryPaths, getStaticEntryProps } from '@/lib/content'
-import Book from '@/components/Book/Book'
-import { stringifyAndParse } from '@/lib/helpers'
-
-export const getStaticPaths = () => getStaticEntryPaths('./content/books')
-export const getStaticProps = (ctx) =>
-  stringifyAndParse(getStaticEntryProps('./content/books', ctx))
-
-export default function LibrarySingle ({ attributes, html }) {
-  return (
-    <DefaultLayout>
-      <Book attributes={attributes} html={html} />
-    </DefaultLayout>
-  )
-}
--- a/src/pages/library/index.js
+++ b/src/pages/library/index.js
@ -1,46 +0,0 @@
-import BookListItem from '@/components/BookListItem/BookListItem'
-import Grid from '@/components/Grid/Grid'
-import DefaultLayout from '@/layouts/DefaultLayout/DefaultLayout'
-import { getStaticEntries } from '@/lib/content'
-import { stringifyAndParse } from '@/lib/helpers'
-import { NextSeo } from 'next-seo'
-
-export const Title = 'Library'
-
-export const getStaticProps = () => {
-  const bookEntries = getStaticEntries('./content/books')
-    .sort((a, b) => {
-      return b.attributes.readDate - a.attributes.readDate
-    })
-
-  return {
-    props: {
-      bookEntries: stringifyAndParse(bookEntries)
-    }
-  }
-}
-
-export default function Library ({ bookEntries }) {
-  return (
-    <DefaultLayout>
-      <NextSeo
-        title={Title}
-        openGraph={
-          {
-            title: Title
-          }
-        }
-      />
-
-      <h1>{Title}</h1>
-
-      <section>
-        <Grid columns={5}>
-          {bookEntries.map((entry, _) => (
-            <BookListItem key={entry.attributes.title} {...entry.attributes} href={`/library/${entry.slug}`} />
-          ))}
-        </Grid>
-      </section>
-    </DefaultLayout>
-  )
-}
--- a/src/pages/tags/index.js
+++ b/src/pages/tags/index.js
@ -1,55 +0,0 @@
-import DefaultLayout from '@/layouts/DefaultLayout/DefaultLayout'
-import { getContentTags, getStaticEntries } from '@/lib/content'
-import { NextSeo } from 'next-seo'
-import Link from 'next/link'
-import React from 'react'
-
-export const getStaticProps = () => ({
-  props: {
-    tags: getContentTags('./content/writing'),
-    postEntries: getStaticEntries('./content/writing')
-  }
-})
-
-export const Title = 'Tags'
-
-export default function Tags ({ tags, postEntries }) {
-  return (
-    <DefaultLayout>
-      <NextSeo
-        title={Title}
-        openGraph={
-          {
-            title: Title
-          }
-        }
-      />
-
-      <h1>{Title}</h1>
-
-      <section>
-        {Object.keys(tags).sort().map(tag => {
-          const posts = postEntries
-            .filter(p => p.attributes.tags.includes(tag))
-            .sort((a, b) => b.attributes.title > -a.attributes.title)
-
-          return (
-            <React.Fragment key={tag}>
-              <h2>{tag}</h2>
-              <ul>
-                {posts.map((post, _) => {
-                  return (
-                    <li key={post.slug}>
-                      <Link href={`/writing/${post.slug}`}>{post.attributes.title}</Link>
-                    </li>
-                  )
-                })}
-              </ul>
-            </React.Fragment>
-          )
-        })}
-      </section>
-
-    </DefaultLayout>
-  )
-}
--- a/src/pages/writing/index.js
+++ b/src/pages/writing/index.js
@ -1,35 +1,45 @@
 import DefaultLayout from '@/layouts/DefaultLayout/DefaultLayout'
 import React from 'react'
-import { getStaticEntries } from '@/lib/content'
+import Link from 'next/link'
+import { getStaticEntryListProps } from '@/lib/content'
 import { NextSeo } from 'next-seo'
-import StaticContentList from '@/components/StaticContentList/StaticContentList'
+import { formatDate } from '@/lib/helpers'

-export const getStaticProps = () => ({
-  props: {
-    postEntries: getStaticEntries('./content/writing')
-      .sort((a, b) =>
-        new Date(b.attributes.pubdate).getTime() - new Date(a.attributes.pubdate).getTime()
-      )
-  }
-})
+export const getStaticProps = () => getStaticEntryListProps('./content/writing', '/writing/')

 export const Title = 'Writing'
+export const Description = 'A collection of writing and musings on various topics that interest me, as well as technical writing.'

-export default function Writing ({ postEntries }) {
+export default function Writing ({ entries, urlPrefix }) {
  return (
    <DefaultLayout>
      <NextSeo
        title={Title}
+        description={Description}
        openGraph={
          {
-            title: Title
+            Title,
+            Description
          }
        }
      />
-      <h1>{Title}</h1>
+      <section>
+        <h1>{Title} ✍🏻</h1>
+        <p>{Description}</p>
+      </section>

      <section>
-        <StaticContentList entries={postEntries} urlPrefix='writing/' />
+        {entries.map((e) => (
+          <div key={e.attributes.title}>
+            <h2>
+              <Link href={`${urlPrefix}${e.slug}`}>{e.attributes.title}</Link>
+            </h2>
+            {!!e.attributes.pubdate && <p>{formatDate(e.attributes.pubdate)}</p>}
+
+            <p>{e.attributes.desc}</p>
+            <Link href={`${urlPrefix}${e.slug}`}>Read more</Link>
+          </div>
+        ))}
      </section>
    </DefaultLayout>
  )
--- a/src/styles/Home.module.css
+++ b/src/styles/Home.module.css
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@ -1,24 +1,118 @@
+:root {
+  --color-default: #1f3470;
+  --color-primary: #5172cf;
+  --color-tertiary: grey;
+  --color-bg: #fbfbfb;
+}
+
+html, body {
+  margin: 0;
+}
+
+body {
+  position: relative;
+  background-color: var(--color-bg);
+  color: var(--color-default);
+}
+
+body::after {
+  content: '';
+  position: absolute;
+  bottom: 2vh;
+  right: 0;
+  width: 100vw;
+  height: 100%;
+  opacity: 0.2;
+  background-repeat: no-repeat;
+  background-position: bottom;
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' version='1.1' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:svgjs='http://svgjs.dev/svgjs' width='1440' height='360' preserveAspectRatio='none' viewBox='0 0 1440 360'%3e%3cg mask='url(%26quot%3b%23SvgjsMask1038%26quot%3b)' fill='none'%3e%3cpath d='M -47.398109710771735%2c191 C 48.6%2c178 240.6%2c108.8 432.60189028922827%2c126 C 624.6%2c143.2 720.6%2c282.4 912.6018902892283%2c277 C 1104.6%2c271.6 1200.6%2c93.6 1392.6018902892283%2c99 C 1584.6%2c104.4 1863.12%2c292.6 1872.6018902892283%2c304 C 1882.08%2c315.4 1526.52%2c185.6 1440%2c156' stroke='rgba(122%2c 122%2c 122%2c 0.58)' stroke-width='2'%3e%3c/path%3e%3cpath d='M -191.9102853036337%2c280 C -95.91%2c256.8 96.09%2c173.2 288.0897146963663%2c164 C 480.09%2c154.8 576.09%2c246.8 768.0897146963663%2c234 C 960.09%2c221.2 1056.09%2c108.2 1248.0897146963662%2c100 C 1440.09%2c91.8 1689.71%2c189.6 1728.0897146963662%2c193 C 1766.47%2c196.4 1497.62%2c132.2 1440%2c117' stroke='rgba(122%2c 122%2c 122%2c 0.58)' stroke-width='2'%3e%3c/path%3e%3cpath d='M -851.6383122526047%2c117 C -755.64%2c157.8 -563.64%2c331.2 -371.63831225260463%2c321 C -179.64%2c310.8 -83.64%2c67.8 108.36168774739537%2c66 C 300.36%2c64.2 396.36%2c296.4 588.3616877473953%2c312 C 780.36%2c327.6 898.03%2c143.4 1068.3616877473953%2c144 C 1238.69%2c144.6 1365.67%2c280.8 1440%2c315' stroke='rgba(122%2c 122%2c 122%2c 0.58)' stroke-width='2'%3e%3c/path%3e%3c/g%3e%3cdefs%3e%3cmask id='SvgjsMask1038'%3e%3crect width='1440' height='360' fill='white'%3e%3c/rect%3e%3c/mask%3e%3c/defs%3e%3c/svg%3e");
+  z-index: -1;
+}
+
+h1, h2, h3 {
+  font-weight: 600;
+  color: var(--color-default)
+}
+
+a {
+  color: var(--color-primary)
+}
+
+ul {
+  margin-left: 0;
+  list-style: inside;
+  list-style-type: circle;
+}
+
+ul li:not(:last-child) {
+  margin-bottom: 10px;
+}
+
+article {
+  border: none;
+  background: none;
+}
+
+article img {
+  border: 1px solid var(--color-default);
+}
+
 pre {
-    padding: 0;
-    border-radius: 5px;
+  background-color: var(--color-default);
+  border-radius: 5px;
+  padding: 18px;
 }

-tbody {
-    vertical-align: top;
+pre code {
+  color: var(--color-bg);
 }

-tr {
-    text-align: left;
+code:not(pre > code) {
+  background-color: var(--color-default);
+  color: var(--color-bg)
 }

-td:first-child {
-    padding-right: 20px;
+.row {
+  display: flex;
+  align-items: center;
 }

-.form-group {
-    margin: 20px 0;
+.icon {
+  display: inline-flex;
 }

-.bold {
-    font-weight: 700;
+.icon-left {
+  margin-right: 5px;
+}
+
+.row {
+  display: flex;
+  flex-direction: row;
+  gap: 1.5rem;
+}
+
+.box {
+  flex-grow: 1;
+  /* border: 1px solid var(--color-default); */
+  /* padding: 1.2rem;  */
+  display: flex;
+  align-items: left;
+  justify-content: center;
+  flex-shrink: 0;
+  flex-basis: 0;
+  flex-direction: column;
+}
+
+.box-title {
+  font-weight: 600;
+}
+
+.box-text {
+  margin: 0.8rem 0;
+}
+
+@media only screen and (max-width: 640px) {
+  .row {
+    flex-direction: column;
+  }
 }
--- a/tina/.gitignore
+++ b/tina/.gitignore
@ -1 +0,0 @@
-__generated__
--- a/tina/config.js
+++ b/tina/config.js
@ -1,136 +0,0 @@
-import { defineConfig } from 'tinacms'
-
-// Your hosting provider likely exposes this as an environment variable
-const branch =
-  process.env.GITHUB_BRANCH ||
-  process.env.VERCEL_GIT_COMMIT_REF ||
-  process.env.HEAD ||
-  'main'
-
-export default defineConfig({
-  branch,
-
-  // Get this from tina.io
-  clientId: process.env.NEXT_PUBLIC_TINA_CLIENT_ID,
-  // Get this from tina.io
-  token: process.env.TINA_TOKEN,
-
-  build: {
-    outputFolder: 'admin',
-    publicFolder: 'public'
-  },
-  media: {
-    tina: {
-      mediaRoot: '',
-      publicFolder: 'public'
-    }
-  },
-  // See docs on content modeling for more info on how to setup new content models: https://tina.io/docs/schema/
-  schema: {
-    collections: [
-      {
-        name: 'books',
-        label: 'Library',
-        path: 'content/books',
-        match: {
-          include: '*'
-        },
-        format: 'md',
-        fields: [
-          {
-            type: 'string',
-            name: 'title',
-            label: 'Title',
-            isTitle: true,
-            required: true
-          },
-          {
-            type: 'string',
-            name: 'author',
-            label: 'Author',
-            required: true
-          },
-          {
-            type: 'number',
-            name: 'stars',
-            label: 'Stars',
-            required: true
-          },
-          {
-            type: 'datetime',
-            name: 'readDate',
-            label: 'Read date',
-            required: false
-          },
-          {
-            type: 'string',
-            name: 'url',
-            label: 'URL',
-            required: false
-          },
-          {
-            type: 'string',
-            name: 'thumbnailUrl',
-            label: 'Thumbnail URL',
-            required: false
-          },
-          {
-            type: 'string',
-            name: 'tags',
-            label: 'Tags',
-            required: true
-          },
-          {
-            type: 'rich-text',
-            name: 'body',
-            label: 'Body',
-            isBody: true
-          }
-        ]
-      },
-      {
-        name: 'writing',
-        label: 'Writing',
-        path: 'content/writing',
-        match: {
-          include: '*'
-        },
-        format: 'md',
-        fields: [
-          {
-            type: 'string',
-            name: 'title',
-            label: 'Title',
-            isTitle: true,
-            required: true
-          },
-          {
-            type: 'datetime',
-            name: 'pubdate',
-            label: 'Publish Date'
-          },
-          {
-            type: 'string',
-            ui: {
-              component: 'textarea'
-            },
-            name: 'desc',
-            label: 'Description'
-          },
-          {
-            type: 'string',
-            name: 'tags',
-            label: 'Tags',
-            list: true
-          },
-          {
-            type: 'rich-text',
-            name: 'body',
-            label: 'Body',
-            isBody: true
-          }
-        ]
-      }
-    ]
-  }
-})
--- a/tina/tina-lock.json
+++ b/tina/tina-lock.json