Merge branch 'main' into ci/sftp

.github/workflows/docker-image.yml

@@ -1,63 +0,0 @@
-
-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
-
-      - 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
-      

__test__/components/Article.test.jsx

@@ -1,46 +0,0 @@
-/* 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>'
-  }
-}

__test__/components/ExsternalLink.test.jsx

@@ -1,28 +0,0 @@
-/* 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()
-  })
-})

__test__/components/Footer.test.jsx

@@ -1,10 +0,0 @@
-/* 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 />)
-  })
-})

__test__/components/Grid.test.jsx

@@ -1,16 +0,0 @@
-/* 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()
-  })
-})

__test__/components/Header.test.jsx

@@ -1,19 +0,0 @@
-/* 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()
-    })
-  })
-})

__test__/components/Resume.test.jsx

@@ -1,63 +0,0 @@
-/* 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()
-    })
-  })
-})

__test__/layouts/DefaultLayout.test.jsx

@@ -1,29 +0,0 @@
-/* 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()
-  })
-})

__test__/pages/Writing.test.jsx

@@ -1,69 +0,0 @@
-/* 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='/' />
-}

next.config.mjs

@@ -1,7 +1,7 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
-  output: 'standalone',
+  output: 'export',
   trailingSlash: true // ensure pages get their own directory in output
 }
 

package.json

@@ -14,7 +14,7 @@
     "format": "npx standard --fix",
     "prepare": "husky",
     "deploy": "./util/pre-deploy.sh && ./util/deploy-gcloud.sh",
-    "test": "jest --verbose",
+    "test": "jest --verbose --passWithNoTests",
     "lint": "next lint"
   },
   "dependencies": {

public/sitemap-0.xml

@@ -1,10 +1,11 @@
 <?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><lastmod>2025-03-09T12:11:53.510Z</lastmod><changefreq>weekly</changefreq><priority>0.7</priority></url>
+<url><loc>https://www.aaronjy.me/</loc><lastmod>2025-03-09T18:28:59.153Z</lastmod><changefreq>weekly</changefreq><priority>0.7</priority></url>
-<url><loc>https://www.aaronjy.me/cv/</loc><lastmod>2025-03-09T12:11:53.511Z</lastmod><changefreq>weekly</changefreq><priority>0.7</priority></url>
+<url><loc>https://www.aaronjy.me/about/</loc><lastmod>2025-03-09T18:28:59.153Z</lastmod><changefreq>weekly</changefreq><priority>0.7</priority></url>
-<url><loc>https://www.aaronjy.me/writing/</loc><lastmod>2025-03-09T12:11:53.511Z</lastmod><changefreq>weekly</changefreq><priority>0.7</priority></url>
+<url><loc>https://www.aaronjy.me/cv/</loc><lastmod>2025-03-09T18:28:59.153Z</lastmod><changefreq>weekly</changefreq><priority>0.7</priority></url>
-<url><loc>https://www.aaronjy.me/writing/performance-considerations-tcp-game-server/</loc><lastmod>2025-03-09T12:11:53.511Z</lastmod><changefreq>weekly</changefreq><priority>0.7</priority></url>
+<url><loc>https://www.aaronjy.me/writing/</loc><lastmod>2025-03-09T18:28:59.153Z</lastmod><changefreq>weekly</changefreq><priority>0.7</priority></url>
-<url><loc>https://www.aaronjy.me/writing/quick-reflection-katherine-may/</loc><lastmod>2025-03-09T12:11:53.511Z</lastmod><changefreq>weekly</changefreq><priority>0.7</priority></url>
+<url><loc>https://www.aaronjy.me/writing/performance-considerations-tcp-game-server/</loc><lastmod>2025-03-09T18:28:59.153Z</lastmod><changefreq>weekly</changefreq><priority>0.7</priority></url>
-<url><loc>https://www.aaronjy.me/writing/static-site-on-google-cloud/</loc><lastmod>2025-03-09T12:11:53.511Z</lastmod><changefreq>weekly</changefreq><priority>0.7</priority></url>
+<url><loc>https://www.aaronjy.me/writing/quick-reflection-katherine-may/</loc><lastmod>2025-03-09T18:28:59.153Z</lastmod><changefreq>weekly</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-03-09T12:11:53.511Z</lastmod><changefreq>weekly</changefreq><priority>0.7</priority></url>
+<url><loc>https://www.aaronjy.me/writing/static-site-on-google-cloud/</loc><lastmod>2025-03-09T18:28:59.153Z</lastmod><changefreq>weekly</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-03-09T18:28:59.153Z</lastmod><changefreq>weekly</changefreq><priority>0.7</priority></url>
 </urlset>