Compare commits
No commits in common. "main" and "add-decap" have entirely different histories.
93 changed files with 2078 additions and 22817 deletions
|
|
@ -1,7 +0,0 @@
|
|||
Dockerfile
|
||||
.dockerignore
|
||||
node_modules
|
||||
npm-debug.log
|
||||
README.md
|
||||
.next
|
||||
.git
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
"extends": "next/core-web-vitals",
|
||||
"rules": {
|
||||
"@stylistic/jsx/jsx-pascal-case": "off",
|
||||
"@next/next/no-html-link-for-pages": "off"
|
||||
"@stylistic/jsx/jsx-pascal-case": "off"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -34,7 +34,3 @@ yarn-error.log*
|
|||
# typescript
|
||||
*.tsbuildinfo
|
||||
next-env.d.ts
|
||||
|
||||
deploy-vars.sh
|
||||
node_modules
|
||||
.env
|
||||
|
|
@ -1 +0,0 @@
|
|||
npx --no -- commitlint --edit $1
|
||||
1
.nvmrc
1
.nvmrc
|
|
@ -1 +0,0 @@
|
|||
v23.4.0
|
||||
40
.vscode/settings.json
vendored
40
.vscode/settings.json
vendored
|
|
@ -1,42 +1,6 @@
|
|||
{
|
||||
"cSpell.words": [
|
||||
"aaronjy",
|
||||
"apos",
|
||||
"Aurelia",
|
||||
"Datatrial",
|
||||
"Dirents",
|
||||
"doesn",
|
||||
"fiftyfiveandfive",
|
||||
"Firestore",
|
||||
"Goodreads",
|
||||
"helpdesk",
|
||||
"Hetzner",
|
||||
"Integra",
|
||||
"Levantine",
|
||||
"opengraph",
|
||||
"Orangebus",
|
||||
"pipdig",
|
||||
"pubdate",
|
||||
"quot",
|
||||
"Radr",
|
||||
"Recon",
|
||||
"Sitecore",
|
||||
"sportank",
|
||||
"Umbraco",
|
||||
"Yarbz"
|
||||
],
|
||||
"files.autoSave": "off",
|
||||
"standard.autoFixOnSave": true,
|
||||
"prettier.enable": false,
|
||||
"editor.defaultFormatter": "standard.vscode-standard",
|
||||
"[javascript]": {
|
||||
"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"
|
||||
}
|
||||
"Sitecore"
|
||||
]
|
||||
}
|
||||
68
Dockerfile
68
Dockerfile
|
|
@ -1,68 +0,0 @@
|
|||
FROM node:18-alpine AS base
|
||||
|
||||
# Install dependencies only when needed
|
||||
FROM base AS deps
|
||||
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
|
||||
RUN apk add --no-cache libc6-compat
|
||||
WORKDIR /app
|
||||
|
||||
# Install dependencies based on the preferred package manager
|
||||
COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
|
||||
RUN \
|
||||
if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
|
||||
elif [ -f package-lock.json ]; then npm ci; \
|
||||
elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm i --frozen-lockfile; \
|
||||
else echo "Lockfile not found." && exit 1; \
|
||||
fi
|
||||
|
||||
|
||||
# Rebuild the source code only when needed
|
||||
FROM base AS builder
|
||||
WORKDIR /app
|
||||
COPY --from=deps /app/node_modules ./node_modules
|
||||
COPY . .
|
||||
|
||||
# Next.js collects completely anonymous telemetry data about general usage.
|
||||
# Learn more here: https://nextjs.org/telemetry
|
||||
# Uncomment the following line in case you want to disable telemetry during the build.
|
||||
ENV NEXT_TELEMETRY_DISABLED=1
|
||||
|
||||
RUN \
|
||||
if [ -f yarn.lock ]; then yarn run build; \
|
||||
elif [ -f package-lock.json ]; then npm run build; \
|
||||
elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm run build; \
|
||||
else echo "Lockfile not found." && exit 1; \
|
||||
fi
|
||||
|
||||
# Production image, copy all the files and run next
|
||||
FROM base AS runner
|
||||
WORKDIR /app
|
||||
|
||||
ENV NODE_ENV=production
|
||||
# Uncomment the following line in case you want to disable telemetry during runtime.
|
||||
ENV NEXT_TELEMETRY_DISABLED=1s
|
||||
|
||||
RUN addgroup --system --gid 1001 nodejs
|
||||
RUN adduser --system --uid 1001 nextjs
|
||||
|
||||
COPY --from=builder /app/public ./public
|
||||
|
||||
# Set the correct permission for prerender cache
|
||||
RUN mkdir .next
|
||||
RUN chown nextjs:nodejs .next
|
||||
|
||||
# Automatically leverage output traces to reduce image size
|
||||
# https://nextjs.org/docs/advanced-features/output-file-tracing
|
||||
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
|
||||
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
|
||||
|
||||
USER nextjs
|
||||
|
||||
EXPOSE 3000
|
||||
|
||||
ENV PORT=3000
|
||||
|
||||
# server.js is created by next build from the standalone output
|
||||
# https://nextjs.org/docs/pages/api-reference/next-config-js/output
|
||||
ENV HOSTNAME="0.0.0.0"
|
||||
CMD ["node", "server.js"]
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
// eslint-disable-next-line import/no-anonymous-default-export
|
||||
export default { extends: ['@commitlint/config-conventional'] }
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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!
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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.
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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
|
||||
---
|
||||
|
||||
|
|
@ -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'
|
||||
---
|
||||
|
||||
|
|
@ -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.
|
||||
|
|
@ -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.
|
||||
|
|
@ -6,7 +6,8 @@ competencies:
|
|||
- Team Leadership
|
||||
- Recruitment and Onboarding
|
||||
- Web Application Development
|
||||
- Cloud Hosting (AWS, GCP)
|
||||
- Cloud Hosting (AWS
|
||||
- GCP)
|
||||
- Database Management
|
||||
- User Interface Design
|
||||
- Project Management
|
||||
|
|
@ -22,61 +23,73 @@ languages:
|
|||
- name: Arabic (Levantine)
|
||||
proficiency: Elementary
|
||||
experience:
|
||||
- position: Lead Consultant
|
||||
employer: Hippo
|
||||
start: Feb. 2024
|
||||
end: Present
|
||||
desc: >-
|
||||
* Directly line manage 3 other engineers
|
||||
|
||||
* 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"
|
||||
- position: Software Development Tutor
|
||||
employer: Yarbz Digital Ltd
|
||||
start: Sep. 2023
|
||||
end: Mar. 2024
|
||||
desc: I taught students of all levels modern software development, including
|
||||
desc: I teach students of all levels modern software development, including
|
||||
coding fundamentals, computer science theory and modern software
|
||||
technologies.
|
||||
technologies. I also help them prepare for tech interviews!
|
||||
- position: Freelance Software Consultant
|
||||
employer: Yarbz Digital Ltd
|
||||
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 GARA 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"
|
||||
- position: Software Architect
|
||||
* 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 Architecht
|
||||
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 +100,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 +114,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 +124,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 +134,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,18 +146,18 @@ 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
|
||||
end: Sep. 2015
|
||||
desc: >-
|
||||
* I worked as an IT Support Technician and Developer Trainee. My
|
||||
responsibilities included dealing with IT issues via an IT help desk
|
||||
responsibilities included dealing with IT issues via an IT helpdesk
|
||||
system. I also worked on improvements to internally-developed software
|
||||
that was used by our Arboricultural staff. I also provided updates to an
|
||||
internal MVC application used by office staff to log data, arrange
|
||||
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
|
||||
|
|
|
|||
16
content/recipes/manakish-pan.md
Normal file
16
content/recipes/manakish-pan.md
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
---
|
||||
title: Manakish (pan)
|
||||
description: Yummy yummy!
|
||||
you-will-need: |-
|
||||
* flower
|
||||
* 1tbsp sugar
|
||||
* 1 tsp yeast
|
||||
* 1/4 cup vegetable oil
|
||||
* 1/2 tsp baking powder
|
||||
* cheese (mozarella, akkawi) or za'atar for filling
|
||||
---
|
||||
1. Mix the flower, sugar and yeast together in a bowl, and add a 1 cup of warm water. Keep mixing until it turns to a goo-like consistency
|
||||
2. Cover the bowl for 10 minutes
|
||||
3. Add the oil, baking powder and a further 1.5 cup of flower, and stir
|
||||
4. Once the dough comes together, knead it until it is combined fully, and separate it into small blobs of dough.
|
||||
5. Roll each blob out and fry it for 2 minutes on either side in the pan, adding your preferred filling on top while it's cooking (cheese or za'atar, or both)
|
||||
|
|
@ -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)
|
||||
|
|
@ -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.
|
||||
|
|
@ -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
|
||||
|
|
@ -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.
|
||||
|
|
@ -1,136 +0,0 @@
|
|||
---
|
||||
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!
|
||||
|
||||
## Networking
|
||||
|
||||
This site is just a collection of static assets (HTML, JS, CSS and images) that live inside a Google Cloud Storage bucket. When you load the site, the below route is taken once your request reaches GCP.
|
||||
|
||||
|
||||
|
||||
1. As you can see, you:
|
||||
2. Hit a load balancer, which then
|
||||
3. Directs you to a backend service, which then
|
||||
4. Decides either to either a) serve content directly from the storage bucket, or
|
||||
b) service it from the cache (if available)
|
||||
|
||||
The setup is pretty simple, and doesn't really deviate from Google's suggested setup configuration for static sites hosted from a bucket.
|
||||
|
||||
## Deploying
|
||||
|
||||
Setting up a seamless deployment strategy gets a little tricker, however. I opted to set up a manual deployment strategy, which involves calling `npm run deploy` to kick off the deployment. This in turn calls a bash script that handles the deployment.
|
||||
|
||||
The script consists of 4 deployment steps:
|
||||
|
||||
1. Backup existing bucket files to a backup bucket
|
||||
2. Remove sensitive files before deploying (e.g. `admin/index.html` for Decap CMS)
|
||||
3. Upload the latest files to the hosting bucket
|
||||
4. Invalidate Google's cache, so users receive the latest version of the site
|
||||
|
||||
### Step 1 - Backing up existing files
|
||||
|
||||
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"
|
||||
|
||||
echo "------------------------------"
|
||||
echo "BACKUP CURRENT SITE FILES"
|
||||
echo "------------------------------"
|
||||
|
||||
TIMESTAMP=$(date +%Y-%m-%d_%H:%M:%S)
|
||||
gcloud transfer jobs create $BUCKET_URL $BACKUP_BUCKET_URL/$(date +%Y-%m-%d_%H:%M:%S)/ --no-async --delete-from=source-after-transfer;
|
||||
```
|
||||
|
||||
The backed-up files are copied into a dated folder, and the `--delete-from` flag ensures the live websites files are deleted from the hosting bucket once they've been backed up.
|
||||
|
||||
### Step 2 - Removing sensitive files
|
||||
|
||||
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 "------------------------------"
|
||||
|
||||
rm -rfv ./out/admin/
|
||||
```
|
||||
|
||||
### Step 3 - Upload files to hosting bucket
|
||||
|
||||
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 "------------------------------"
|
||||
|
||||
gcloud storage cp --recursive ./out/* $BUCKET_URL --gzip-in-flight-all
|
||||
```
|
||||
|
||||
The `--gzip-in-flight-all` is a handy edition, as the cli will apply gzip compression locally, and Google will uncompress them before dumping them in the bucket on the other end, resulting in a lower upload size/quicker deployment time.
|
||||
|
||||
### Step 3 - Invalidate the global cache
|
||||
|
||||
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 "------------------------------"
|
||||
|
||||
echo "WARNING: This is an async operation that can take upwards of 10 minutes depending on how fast Google Cloud CDN invalidates its cache. It does take around 10 minutes on average."
|
||||
|
||||
gcloud compute url-maps invalidate-cdn-cache lb-aaronjy-www --path "/*" --async
|
||||
```
|
||||
|
||||
This can take anywhere between 7-10 minutes, so the `--async` flag has been applied because we don't need to sit and wait for it.
|
||||
|
||||
### Full deployment script
|
||||
|
||||
Here's the deployment script in full:
|
||||
|
||||
```sh
|
||||
BUCKET_URL="gs://aaronjy-www"
|
||||
BACKUP_BUCKET_URL="gs://aaronjy-www-backup"
|
||||
|
||||
echo "------------------------------"
|
||||
echo "BACKUP CURRENT SITE FILES"
|
||||
echo "------------------------------"
|
||||
|
||||
TIMESTAMP=$(date +%Y-%m-%d_%H:%M:%S)
|
||||
gcloud transfer jobs create $BUCKET_URL $BACKUP_BUCKET_URL/$(date +%Y-%m-%d_%H:%M:%S)/ --no-async --delete-from=source-after-transfer;
|
||||
|
||||
echo "------------------------------"
|
||||
echo "REMOVE SENSITIVE FILES"
|
||||
echo "------------------------------"
|
||||
|
||||
rm -rfv ./out/admin/
|
||||
|
||||
echo "Removed all sensitive files."
|
||||
|
||||
echo "------------------------------"
|
||||
echo "UPLOADING NEW SITE FILES"
|
||||
echo "------------------------------"
|
||||
|
||||
gcloud storage cp --recursive ./out/* $BUCKET_URL --gzip-in-flight-all
|
||||
|
||||
echo "------------------------------"
|
||||
echo "INVALIDATING GLOBAL CACHE"
|
||||
echo "------------------------------"
|
||||
|
||||
echo "WARNING: This is an async operation that can take upwards of 10 minutes depending on how fast Google Cloud CDN invalidates its cache. It does take around 10 minutes on average."
|
||||
|
||||
gcloud compute url-maps invalidate-cdn-cache lb-aaronjy-www --path "/*" --async
|
||||
|
||||
echo "------------------------------"
|
||||
echo "DONE!"
|
||||
echo "------------------------------"
|
||||
```
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
---
|
||||
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.
|
||||
|
||||
Simplicity is great, and SSGs bring loads of benefits (speed, a great developer experience, low cost overheads), but they're not a silver bullet, and can present a bit of a learning curve to the non-technical tasked with updating your site's content.
|
||||
|
||||
## The problem
|
||||
|
||||
Say you have an SSG that uses MD files for the site's content. In order to edit the site's content, you simply edit the MD files, build the site, and upload your new HTML/JS/CSS files.
|
||||
|
||||
Your folder structure could look like this:
|
||||
|
||||
```text
|
||||
site/
|
||||
├─ content/
|
||||
│ ├─ index.md <-- homepage
|
||||
│ ├─ recipes/
|
||||
│ │ ├─ pizza.md
|
||||
│ │ ├─ chilli.md
|
||||
├─ src/ <-- site source code
|
||||
├─ public/ <-- static assets (images, videos, PDFs, etc.)
|
||||
```
|
||||
|
||||
And your `content/index.md` looks like this:
|
||||
|
||||
```md
|
||||
# Welcome!
|
||||
|
||||
This is my site! Want some fire recipes? Check [/recipes](these bad boys out)
|
||||
```
|
||||
|
||||
Your site homepage would contain a link to the recipe listing page at `/recipes` using Markdown to generate the anchor tag.
|
||||
|
||||
Assuming your `content/` folder informs your site's URL structure, there must be a file at `content/recipes/index.md`, or the link would send you to a 404.
|
||||
|
||||
Now, imagine you want to restructure your site's link hierarchy. Maybe you want to house all of your recipes under a new URL: `www.site.com/yummy/recipes` With a small site like ours, the time required to do this would be trivial. We'd lift and shift everything under `content/recipes/` to `content/yummy/recipes`, and we'd also have to manually update the link in `content/index.md` to `/yummy/recipes`; no big deal.
|
||||
|
||||
But what if we had hundreds of files, and we wanted to restructure our file system in the same way? We'd potentially have hundreds of MD files that all need to be manually updated to have their links point to a new URL. For a developer, we could probably write some funky regex or do a mass find & replace to find and update the links en masse, but what if a non-technical editor wants to make the same change? They would potentially have to manually work through each MD file and update the links by hand.
|
||||
|
||||
## Map those URLs!
|
||||
|
||||
Essentially, the problem is that there's no way to uniquely identify a particlar piece of content/article *other than* its link, and the link changes based on the content's position in the file system.
|
||||
|
||||
The solution is to give each article a uniqiue identifier, and keep track of any previous links. Then all we need to do is tell our SSG to generate static files for both the current link and *all previous links*.
|
||||
|
||||
Here's the gist of it:
|
||||
|
||||
* **Generate unique IDs:** Instead of relying on file paths, assign a unique identifier (an "id" property) to the [frontmatter](https://dpericich.medium.com/what-is-front-matter-and-how-is-it-used-to-create-dynamic-webpages-9d8dc053b457) of each markdown file.
|
||||
* **URL mapping for flexibility:** Create a central mapping file that acts like a translator, mapping each content ID to all the different URLs (slugs/paths) that can access it.
|
||||
* **Say goodbye to path dependence:** When a visitor requests a URL, the system checks the url-map.json file. If it finds a matching ID, it grabs the "canonical path" (the preferred URL) and uses that to locate the actual file. This lets you access the same content through multiple URLs!
|
||||
|
||||
Carrying on from our previous example, this is what our mapping file might look like:
|
||||
|
||||
```text
|
||||
{
|
||||
"892c5a5c-1f77-43ce-a13a-b9d8bd02971c": [
|
||||
"yummy/recipes", <-- The canonical/latest path
|
||||
"recipes" <-- The previous path
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
There's some work in keeping the mapping file up-to-date, but depending on your workflow, you could automate this using Git hooks or a CI pipeline like GitHub actions or Drone.
|
||||
13
deploy.sh
13
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!"
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
import nextJest from 'next/jest.js'
|
||||
|
||||
const createJestConfig = nextJest({
|
||||
// Provide the path to your Next.js app to load next.config.js and .env files in your test environment
|
||||
dir: './'
|
||||
})
|
||||
|
||||
// Add any custom config to be passed to Jest
|
||||
const config = {
|
||||
coverageProvider: 'v8',
|
||||
testEnvironment: 'jsdom'
|
||||
// Add more setup options before each test is run
|
||||
// setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
|
||||
}
|
||||
|
||||
// createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
|
||||
export default createJestConfig(config)
|
||||
|
|
@ -2,8 +2,6 @@
|
|||
"compilerOptions": {
|
||||
"paths": {
|
||||
"@/*": ["./src/*"]
|
||||
},
|
||||
"checkJs": true,
|
||||
"jsx": "preserve"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
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
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +1,6 @@
|
|||
/** @type {import('next').NextConfig} */
|
||||
const nextConfig = {
|
||||
reactStrictMode: true,
|
||||
output: 'export',
|
||||
trailingSlash: true, // ensure pages get their own directory in output
|
||||
images: {
|
||||
unoptimized: true
|
||||
}
|
||||
reactStrictMode: true
|
||||
}
|
||||
|
||||
export default nextConfig
|
||||
|
|
|
|||
22476
package-lock.json
generated
22476
package-lock.json
generated
File diff suppressed because it is too large
Load diff
44
package.json
44
package.json
|
|
@ -1,54 +1,30 @@
|
|||
{
|
||||
"name": "www-aaronjy-me",
|
||||
"version": "1.7.4.0",
|
||||
"name": "www-aaronjy-2024",
|
||||
"version": "0.1.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",
|
||||
"postbuild": "next-sitemap --config next-sitemap.config.cjs",
|
||||
"start": "next start",
|
||||
"link": "npx standard",
|
||||
"format": "npx standard --fix",
|
||||
"prepare": "husky",
|
||||
"test": "jest --verbose --passWithNoTests",
|
||||
"lint": "next lint"
|
||||
},
|
||||
"standard": {
|
||||
"ignore": [
|
||||
"/tina/**/*"
|
||||
]
|
||||
"prepare": "husky"
|
||||
},
|
||||
"dependencies": {
|
||||
"@highlightjs/cdn-assets": "^11.11.1",
|
||||
"date-fns": "^4.1.0",
|
||||
"highlight.js": "^11.11.0",
|
||||
"next": "^14.2.6",
|
||||
"next": "14.1.1",
|
||||
"next-seo": "^6.5.0",
|
||||
"react": "^18",
|
||||
"react-dom": "^18",
|
||||
"tinacms": "^2.7.3"
|
||||
"react-dom": "^18"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.24.0",
|
||||
"@babel/preset-env": "^7.25.4",
|
||||
"@babel/preset-react": "^7.24.7",
|
||||
"@commitlint/cli": "^19.1.0",
|
||||
"@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",
|
||||
"front-matter": "^4.0.2",
|
||||
"@babel/preset-react": "^7.23.3",
|
||||
"eslint": "^8",
|
||||
"eslint-config-next": "14.1.1",
|
||||
"frontmatter-markdown-loader": "^3.7.0",
|
||||
"husky": "^9.0.11",
|
||||
"jest": "^29.7.0",
|
||||
"jest-environment-jsdom": "^29.7.0",
|
||||
"js-yaml": "^4.1.0",
|
||||
"next-sitemap": "^4.0.9",
|
||||
"react-test-renderer": "^18.3.1",
|
||||
"showdown": "^2.1.0",
|
||||
"standard": "^17.1.0"
|
||||
}
|
||||
|
|
|
|||
2
public/admin/.gitignore
vendored
2
public/admin/.gitignore
vendored
|
|
@ -1,2 +0,0 @@
|
|||
index.html
|
||||
assets/
|
||||
59
public/admin/config.yml
Normal file
59
public/admin/config.yml
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
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: "Description", name: "description", widget: "string"}
|
||||
- {label: Image, name: image, widget: image, required: false}
|
||||
- {label: "You Will Need", name: "you-will-need", widget: "markdown" }
|
||||
- {label: "Recipe", 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 }
|
||||
|
||||
|
||||
|
||||
|
||||
13
public/admin/index.html
Normal file
13
public/admin/index.html
Normal file
|
|
@ -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>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 25 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 78 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 132 KiB |
1
public/next.svg
Normal file
1
public/next.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
|
||||
|
After Width: | Height: | Size: 1.3 KiB |
|
|
@ -1,9 +0,0 @@
|
|||
# *
|
||||
User-agent: *
|
||||
Allow: /
|
||||
|
||||
# Host
|
||||
Host: https://www.aaronjy.me
|
||||
|
||||
# Sitemaps
|
||||
Sitemap: https://www.aaronjy.me/sitemap.xml
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
<?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>
|
||||
</urlset>
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
<?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>
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: BCPG v1.63
|
||||
|
||||
mQSuBGYs08wRDACGpe++RJHa0CmDnvo3001U19EUxv5xDo1cJk6crcX91KD2HrZu
|
||||
jO4/MGC3N93v/6NvvRgv9gxYqr4tvcc4euj1WbsyNJ5HEsDXkoi5ibUAQmDRQyIj
|
||||
l2AR5mDbrwXXRTxGgItoqK+mUqPCQL3OBRa1EMHcL28IhLS/bvhviA1My0u83B3d
|
||||
qFUm6lli4SIAOmubBytIF8kulx5Vn6SwXzlfmpJ7kyFr2dmd9tAF2l28zL/L2qbj
|
||||
6Q03EmCpvcWshiRuUjt8VnuBH+nuuY3YkEzCFZwa0kryKcoWpsQja7nACMZInWAr
|
||||
oTLAZVI9mJx8qnA8j8+gKE5rnkDibKkMKifiA9xX/392ufnxQ09sL0vq11d6iWFz
|
||||
v2hyq0h6Pj1MZ+QgQnVBmJiLnAQZq+B2OZcUPBD/pk+vX4FAqbfAATbLoZ1x/M3l
|
||||
kbmYvzgGNIowH+VaR8FEn3RGx/sqMsLihy7oanQVbBHWRvT+M7D7t8VCRkBkFb+X
|
||||
8OHAVsANbrg4O68BAP908xlKj9XOpQMr39FRPP3ZpbtMZA1FI9eh9POWvtgZC/9P
|
||||
wJDKnugYjV4rlMdiaAEFYkw9FEIWBKfjqvJbg0OedCz85qAqZZhLcEKz68J+PfIC
|
||||
QwnehW24CQMG3lFYlO/cXGz4HsYAQNkphc5RupksvnhLJxcf7ZOu79AMn2gxTW/u
|
||||
TnMGsJLD2S/ieToetG+xIXhAJ5+KSON+kMK1joxxJhwM3bYEQLRwtWv1EQjhFci0
|
||||
tEm19dp625MIWh6mometDRDobRwRdcsoD0xUY2mVQwDER0TjqUlJVvyS7QhvQHmg
|
||||
REFDdIaQbFpx6Ri3XTrHBX/2Z4Aaw/4m8ARZ8wXdN5f6ZjAgWmzBWMJyYst6mqeZ
|
||||
jZihmhz2CffknrveUSvBqv42As1feqScsmZZh5NjVMOpqBTToaWddKTSlmeg77kC
|
||||
x8k8lgZXQtGTpCKX2dWDfx63RbmvT3CeulK72a/UmkfgCvw0VRFE7d/nEr4yhg+1
|
||||
wxrI8l82HlEs5D1Gd9SiGlF7Naq54Hs7Njncmgx9//emYdftaommYDburHpu+E4L
|
||||
/12+HpIrPyAkUv1m58BcHpgRRoM1xD/3bIni21LXl/k2DLFhEQj7r4z405htdy43
|
||||
HYuneVGOYvM4ja3bOn8XSJyHFXLN5s6w2GrNgEo0cPtXLbAWiaC4gucxIkRv/LW4
|
||||
063qZ6sRIhzRgmSogGwhS5WJ09enxXj9N1EaIXmUH8AVStJbg72ema7PzZJkOWHK
|
||||
y12dTQJvJSFNnU2e4kny/XHZxk7rBOk7N6jEuCci1EbUj7+GSR5BqDm2TnrqQkAg
|
||||
BGCOnfQ/vOyjF8YWh5nBy66zQ/meTy5gzainDi8XOPRlmf1cqoQEoLdEh/MMY3pW
|
||||
W8Bd6wKt5NCnVSPWB1f48jXJrgx0iUR58EWqnCvDjojZlqI7uZUI7z5+Q3b4p8eF
|
||||
jqErsF1EKEaHBZcgb4ScwomKfZRIZj1ciPveLKQB4jd7bNN7GlICPJi25KKHemqy
|
||||
CIFWUYxJRWVbhGpMVkR/4IJmFuqj01/ApbZZVATDBRl2jdMBcIQ58TH0W6G/qULg
|
||||
k7QgQWFyb24gWWFyYm9yb3VnaCA8bWVAYWFyb25qeS5tZT6IXgQTEQoABgUCZizT
|
||||
zAAKCRB2asy1Uw4clqXGAP0YS2fW78sDrsUKP/9G67+PNYmf7x3hgz/wHPctdZF6
|
||||
MAD/X5q9506+vYoxPzIjg/WQs393eFhEPgv7FP+zI+8iJXK5AQ0EZizTzBAEAP//
|
||||
////////yQ/aoiFowjTExmKLgNwc0SkCTgiKZ8x0Agu+pjsTmyJRSgh5jjQE3e+V
|
||||
GbPNOkMbMCsKbfJfFDdP4TVtbVHCReSFtXZiXn7G9ExC6aY37WsL/1y29Aa37e44
|
||||
a/taiZ+lrp8kEXxLH+ZJKGZR7OZTgf//////////AAICA/0YD77y3YkEP8zVCDDi
|
||||
Tfjco7NOWoHSSbk0q8iHhrbfN9RMOQQVs1FXHCInyXGmmTc79g5PjqIN5n/+agXS
|
||||
0BGwbygN0/hMh0EnvmMLCfzRTAPufInrDN4/tKVrGxXMAT9Gnh1RDjSBzh7H/0vr
|
||||
63UNVLiQeRX1JIXAbuWB1dp6D4heBBgRCgAGBQJmLNPMAAoJEHZqzLVTDhyWxMEB
|
||||
AL0AMD/6SZsCgV6wV2NsCD/6TnErJjIiszJNSVOw4vpuAP4oriEQ2zTw1leT9DKA
|
||||
bRZce4ZhaHXiVBufyfiPIC3Jsw==
|
||||
=7Ll3
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
1
public/vercel.svg
Normal file
1
public/vercel.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>
|
||||
|
After Width: | Height: | Size: 629 B |
|
|
@ -1,41 +0,0 @@
|
|||
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'
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
}
|
||||
/>
|
||||
<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>
|
||||
</>
|
||||
|
||||
)
|
||||
}
|
||||
|
||||
export default Article
|
||||
|
|
@ -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> {attributes.tags}<br />
|
||||
<span className='bold'>Rating:</span> {attributes.stars}/5<br />
|
||||
<span className='bold'>Read on:</span> {formatDate(attributes.readDate)}
|
||||
</p>
|
||||
<p><ExternalLink href={attributes.url}>View on The StoryGraph</ExternalLink></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
</>
|
||||
|
||||
)
|
||||
}
|
||||
|
||||
export default Book
|
||||
|
|
@ -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%;
|
||||
}
|
||||
}
|
||||
|
|
@ -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 /> {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>
|
||||
)
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
56
src/components/CV/CV.jsx
Normal file
56
src/components/CV/CV.jsx
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
import React from 'react'
|
||||
|
||||
import style from './CV.module.css'
|
||||
|
||||
function CV ({ competencies, education, certifications, languages, experience }) {
|
||||
return (
|
||||
<div className={style.cv}>
|
||||
<div>
|
||||
<h2>Core competencies</h2>
|
||||
<ul>
|
||||
{competencies.sort().map(c => <li key={c}>{c}</li>)}
|
||||
</ul>
|
||||
|
||||
<h2>Certifications</h2>
|
||||
<ul>
|
||||
{certifications.sort().map(c => <li key={c}>{c}</li>)}
|
||||
</ul>
|
||||
|
||||
<h2>Languages</h2>
|
||||
<ul>
|
||||
{languages.sort().map(c => <li key={c}>{c.name} - {c.proficiency}</li>)}
|
||||
</ul>
|
||||
|
||||
<h2>Education history</h2>
|
||||
<p>{education}</p>
|
||||
</div>
|
||||
<div>
|
||||
<h2>Professional experience</h2>
|
||||
|
||||
{experience.map((exp, i) => (
|
||||
<CVWorkExperience key={i} employer={exp.employer} position={exp.position} start={exp.start} end={exp.end}>{exp.desc}</CVWorkExperience>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default CV
|
||||
|
||||
function CVWorkExperience ({ position, employer, start, end, children }) {
|
||||
return (
|
||||
<div className={style['work-experience']}>
|
||||
<div>
|
||||
<h3>
|
||||
{position}
|
||||
<br />
|
||||
<small>{employer}</small>
|
||||
</h3>
|
||||
<div>
|
||||
<time>{start}</time>-<time>{end}</time>
|
||||
</div>
|
||||
</div>
|
||||
<div dangerouslySetInnerHTML={{ __html: children }} />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
29
src/components/CV/CV.module.css
Normal file
29
src/components/CV/CV.module.css
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
.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;
|
||||
}
|
||||
|
||||
.cv ul {
|
||||
margin-left: 0;
|
||||
list-style: inside;
|
||||
list-style-type: circle;
|
||||
}
|
||||
|
||||
.cv ul li:not(:last-child) {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
|
@ -2,34 +2,44 @@ 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 />
|
||||
<footer className={style.footer}>
|
||||
<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='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>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
.footer nav:first-child a {
|
||||
text-transform: lowercase;
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -5,14 +5,11 @@ import styles from './Header.module.css'
|
|||
|
||||
function Header () {
|
||||
return (
|
||||
<header className={styles.header} data-testid='header'>
|
||||
<header className={styles.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>
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
.header {
|
||||
margin-top: 20px;
|
||||
.header nav {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
gap: 20px;
|
||||
}
|
||||
|
||||
.header a {
|
||||
text-transform: lowercase;
|
||||
}
|
||||
|
|
@ -1,95 +0,0 @@
|
|||
import React from 'react'
|
||||
|
||||
import style from './Resume.module.css'
|
||||
|
||||
function Resume ({
|
||||
competencies,
|
||||
education,
|
||||
certifications,
|
||||
languages,
|
||||
experience
|
||||
}) {
|
||||
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>
|
||||
<ul>
|
||||
{competencies.sort().map((c, i) => (
|
||||
<li key={i}>{c}</li>
|
||||
))}
|
||||
</ul>
|
||||
|
||||
<h2 id='certifications'>Certifications</h2>
|
||||
<ul>
|
||||
{certifications.sort().map((c, i) => (
|
||||
<li key={i}>{c}</li>
|
||||
))}
|
||||
</ul>
|
||||
|
||||
<h2 className='languages'>Languages</h2>
|
||||
<ul>
|
||||
{languages.sort().map((c, i) => (
|
||||
<li key={i}>
|
||||
{c.name} - {c.proficiency}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
|
||||
<h2 className='education'>Education</h2>
|
||||
<p>{education}</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default Resume
|
||||
|
||||
function WorkExperience ({ position, employer, start, end, children }) {
|
||||
return (
|
||||
<div className={style['work-experience']}>
|
||||
<div>
|
||||
<h3 id={position}>
|
||||
{position}
|
||||
<br />
|
||||
<small>{employer}</small>
|
||||
</h3>
|
||||
<small>
|
||||
<time>{start}</time> - <time>{end}</time>
|
||||
</small>
|
||||
</div>
|
||||
<div
|
||||
data-test='children'
|
||||
dangerouslySetInnerHTML={{ __html: children }}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
@ -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>
|
||||
)
|
||||
}
|
||||
|
|
@ -4,13 +4,17 @@ import style from './DefaultLayout.module.css'
|
|||
import Header from '@/components/Header/Header'
|
||||
import Footer from '@/components/Footer/Footer'
|
||||
|
||||
import { Barlow } from 'next/font/google'
|
||||
|
||||
const fontMain = Barlow({ subsets: ['latin'], weight: ['400', '600'] })
|
||||
|
||||
function DefaultLayout ({ children }) {
|
||||
return (
|
||||
<main className={`${style.layout}`}>
|
||||
<div className={style.layout}>
|
||||
<Header />
|
||||
<>{children}</>
|
||||
<main className={`${fontMain.className}`}>{children}</main>
|
||||
<Footer />
|
||||
</main>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
.layout {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
min-height: 100dvh;
|
||||
}
|
||||
|
||||
.layout main {
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
import fs from 'fs'
|
||||
import fm from 'front-matter'
|
||||
import showdown from 'showdown'
|
||||
import { toSlug } from './helpers'
|
||||
|
||||
export function getMarkdownEntry (path) {
|
||||
const fileContents = fs.readFileSync(path, {
|
||||
encoding: 'utf-8'
|
||||
})
|
||||
|
||||
const { attributes, body } = fm(fileContents)
|
||||
|
||||
const converter = new showdown.Converter({
|
||||
tables: true,
|
||||
tablesHeaderId: true
|
||||
})
|
||||
const html = converter.makeHtml(body)
|
||||
|
||||
const slug = toSlug(path.substring(path.lastIndexOf('/') + 1))
|
||||
|
||||
return {
|
||||
attributes: {
|
||||
...attributes,
|
||||
pubdate: attributes.pubdate?.toUTCString() ?? null,
|
||||
moddate: attributes.moddate?.toUTCString() ?? null
|
||||
},
|
||||
html,
|
||||
slug
|
||||
}
|
||||
}
|
||||
|
||||
export function getStaticEntryPaths (contentPath) {
|
||||
const entries = fs.readdirSync(contentPath, { withFileTypes: true })
|
||||
|
||||
const paths = entries.map((dirent) => ({
|
||||
params: {
|
||||
slug: toSlug(dirent.name)
|
||||
}
|
||||
}))
|
||||
|
||||
return {
|
||||
fallback: false,
|
||||
paths
|
||||
}
|
||||
}
|
||||
|
||||
export function getStaticEntryProps (contentPath, { params }) {
|
||||
const path = `${contentPath}/${params.slug}.md`
|
||||
const entry = getMarkdownEntry(path)
|
||||
const { attributes } = entry
|
||||
|
||||
return { props: { ...entry, attributes } }
|
||||
}
|
||||
|
||||
export function getStaticEntries (contentPath) {
|
||||
const directoryItems = fs.readdirSync(contentPath, { withFileTypes: true })
|
||||
return directoryItems.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
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
import * as dateFns from 'date-fns'
|
||||
|
||||
export function toSlug (input) {
|
||||
return input.substring(0, input.indexOf('.')).trim()
|
||||
}
|
||||
|
||||
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))
|
||||
}
|
||||
|
|
@ -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 (
|
||||
<>
|
||||
|
|
|
|||
|
|
@ -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 />
|
||||
|
|
|
|||
|
|
@ -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 "Goodreads for film."
|
||||
</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'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'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>
|
||||
|
||||
)
|
||||
}
|
||||
|
|
@ -1,14 +1,11 @@
|
|||
import CV from '@/components/CV/CV'
|
||||
import DefaultLayout from '@/layouts/DefaultLayout/DefaultLayout'
|
||||
import React from 'react'
|
||||
import yaml from 'js-yaml'
|
||||
import fs from 'fs'
|
||||
import showdown from 'showdown'
|
||||
import { NextSeo } from 'next-seo'
|
||||
import Resume from '@/components/Resume/Resume'
|
||||
|
||||
export const Title = 'CV'
|
||||
|
||||
function ResumePage ({
|
||||
function CVPage ({
|
||||
competencies,
|
||||
education,
|
||||
certifications,
|
||||
|
|
@ -17,16 +14,12 @@ function ResumePage ({
|
|||
}) {
|
||||
return (
|
||||
<DefaultLayout>
|
||||
<NextSeo
|
||||
title={Title} openGraph={
|
||||
{
|
||||
title: Title
|
||||
}
|
||||
}
|
||||
/>
|
||||
<h1>{Title}</h1>
|
||||
<section>
|
||||
<Resume
|
||||
<h1>CV</h1>
|
||||
</section>
|
||||
<section>
|
||||
{/* eslint-disable-next-line react/jsx-pascal-case */}
|
||||
<CV
|
||||
competencies={competencies}
|
||||
education={education}
|
||||
certifications={certifications}
|
||||
|
|
@ -47,16 +40,14 @@ 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 }
|
||||
}
|
||||
}
|
||||
|
||||
export default ResumePage
|
||||
export default CVPage
|
||||
|
|
|
|||
|
|
@ -1,41 +1,76 @@
|
|||
import Head from 'next/head'
|
||||
import ExternalLink from '@/components/ExternalLink'
|
||||
import DefaultLayout from '@/layouts/DefaultLayout/DefaultLayout'
|
||||
import Link from 'next/link'
|
||||
|
||||
import StaticContentList from '@/components/StaticContentList/StaticContentList'
|
||||
import { getStaticEntries } from '@/lib/content'
|
||||
|
||||
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'm Aaron, a Brit living in Newcastle-upon-tyne, UK. I
|
||||
work professionally as a Software Engineer, and study
|
||||
languages, history and philosophy in my spare time.
|
||||
I'm Aaron. I'm a Brit living in Newcastle-upon-tyne, UK. I
|
||||
work professionally as a Software Engineer and Tutor, and study
|
||||
languages in my spare time.
|
||||
</p>
|
||||
<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>.
|
||||
This is my little corner of the web! I've always had a habit of
|
||||
'lurking' online; I barely interact with the content I
|
||||
consume, and you'll rarely if ever catch me posting or commenting
|
||||
on something. That said, this little site endeavours to pull me by my
|
||||
ankles out of the weeds in the great digital park we find ourselves,
|
||||
and encourage me to share a bit more about myself online.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2>Recent posts</h2>
|
||||
<StaticContentList entries={postEntries} urlPrefix='writing/' max={5} />
|
||||
</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 "Goodreads for film."
|
||||
</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'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>
|
||||
|
||||
{/* <p>
|
||||
<strong>Yarbz Tutoring</strong> is my tutoring site. You can read a
|
||||
bit more about my tutoring and general software develpment experience,
|
||||
and book a class if it suits you.
|
||||
</p>
|
||||
<p>
|
||||
<ExternalLink href='https://tutoring.yarbz.digital'>
|
||||
Read more about my tutoring side-gig.
|
||||
</ExternalLink>
|
||||
</p> */}
|
||||
</section>
|
||||
</DefaultLayout>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
)
|
||||
}
|
||||
|
|
@ -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>
|
||||
)
|
||||
}
|
||||
46
src/pages/recipes/index.js
Normal file
46
src/pages/recipes/index.js
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
// import Grid from '@/components/Grid/Grid'
|
||||
// import DefaultLayout from '@/layouts/DefaultLayout/DefaultLayout'
|
||||
// import React from 'react'
|
||||
// import path from 'path'
|
||||
// import fs from 'fs'
|
||||
|
||||
// function Recipes ({ recipes }) {
|
||||
// return (
|
||||
// <DefaultLayout>
|
||||
// <section>
|
||||
// <h1>Recipes</h1>
|
||||
// <Grid>
|
||||
// {recipes.length &&
|
||||
// recipes.map((recipe) => (
|
||||
// <div key={recipe.name}>{recipe.name ?? 'unknown'}</div>
|
||||
// ))}
|
||||
// </Grid>
|
||||
// </section>
|
||||
// </DefaultLayout>
|
||||
// )
|
||||
// }
|
||||
|
||||
// export default Recipes
|
||||
|
||||
// export async function getStaticProps () {
|
||||
// const recipeDirents = await fs.promises
|
||||
// .readdir('./content/recipes', {
|
||||
// recursive: false,
|
||||
// withFileTypes: true
|
||||
// })
|
||||
|
||||
// const recipes = [{
|
||||
// name: 'lol'
|
||||
// }]
|
||||
|
||||
// for (const recipe of recipeDirents) {
|
||||
// // const recipePath = path.join('./', recipe.path, recipe.name)
|
||||
// // const recipeContent = fs.readFileSync(recipePath, { encoding: 'utf-8' })
|
||||
|
||||
// console.log(recipeFm)
|
||||
// }
|
||||
|
||||
// return {
|
||||
// props: { recipes }
|
||||
// }
|
||||
// }
|
||||
|
|
@ -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>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
import React from 'react'
|
||||
import DefaultLayout from '@/layouts/DefaultLayout/DefaultLayout'
|
||||
import { getStaticEntryPaths, getStaticEntryProps } from '@/lib/content'
|
||||
import Article from '@/components/Article/Article'
|
||||
|
||||
export const getStaticPaths = () => getStaticEntryPaths('./content/writing')
|
||||
export const getStaticProps = (ctx) => getStaticEntryProps('./content/writing', ctx)
|
||||
|
||||
export default function WritingSingle ({ attributes, html }) {
|
||||
return (
|
||||
<DefaultLayout>
|
||||
<Article attributes={attributes} html={html} />
|
||||
</DefaultLayout>
|
||||
)
|
||||
}
|
||||
|
|
@ -1,35 +1,13 @@
|
|||
import DefaultLayout from '@/layouts/DefaultLayout/DefaultLayout'
|
||||
import React from 'react'
|
||||
import { getStaticEntries } from '@/lib/content'
|
||||
import { NextSeo } from 'next-seo'
|
||||
import StaticContentList from '@/components/StaticContentList/StaticContentList'
|
||||
|
||||
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 Title = 'Writing'
|
||||
|
||||
export default function Writing ({ postEntries }) {
|
||||
export default function Writing () {
|
||||
return (
|
||||
<DefaultLayout>
|
||||
<NextSeo
|
||||
title={Title}
|
||||
openGraph={
|
||||
{
|
||||
title: Title
|
||||
}
|
||||
}
|
||||
/>
|
||||
<h1>{Title}</h1>
|
||||
|
||||
<section>
|
||||
<StaticContentList entries={postEntries} urlPrefix='writing/' />
|
||||
<h1>Writing</h1>
|
||||
</section>
|
||||
<section>
|
||||
<i>Nothing to see here yet!</i>
|
||||
</section>
|
||||
</DefaultLayout>
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,24 +1,8 @@
|
|||
pre {
|
||||
padding: 0;
|
||||
border-radius: 5px;
|
||||
html, body {
|
||||
margin: 0;
|
||||
padding: 0 15px;
|
||||
}
|
||||
|
||||
tbody {
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
tr {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
td:first-child {
|
||||
padding-right: 20px;
|
||||
}
|
||||
|
||||
.form-group {
|
||||
margin: 20px 0;
|
||||
}
|
||||
|
||||
.bold {
|
||||
font-weight: 700;
|
||||
h1, h2, h3 {
|
||||
font-weight: 600;
|
||||
}
|
||||
1
tina/.gitignore
vendored
1
tina/.gitignore
vendored
|
|
@ -1 +0,0 @@
|
|||
__generated__
|
||||
136
tina/config.js
136
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
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
})
|
||||
File diff suppressed because one or more lines are too long
Loading…
Add table
Reference in a new issue