Final adjustments and excuse photos

# Conflicts:
#	src/content/blog/year2024.mdx

.astro/types.d.ts

@@ -1,204 +1,346 @@
+declare module 'astro:content' {
+	interface Render {
+		'.mdx': Promise<{
+			Content: import('astro').MarkdownInstance<{}>['Content'];
+			headings: import('astro').MarkdownHeading[];
+			remarkPluginFrontmatter: Record<string, any>;
+		}>;
+	}
+}
+
+declare module 'astro:content' {
+	interface Render {
+		'.md': Promise<{
+			Content: import('astro').MarkdownInstance<{}>['Content'];
+			headings: import('astro').MarkdownHeading[];
+			remarkPluginFrontmatter: Record<string, any>;
+		}>;
+	}
+}
+
 declare module 'astro:content' {
 	export { z } from 'astro/zod';
-	export type CollectionEntry<C extends keyof typeof entryMap> =
+
-		(typeof entryMap)[C][keyof (typeof entryMap)[C]] & Render;
+	type Flatten<T> = T extends { [K: string]: infer U } ? U : never;
+
+	export type CollectionKey = keyof AnyEntryMap;
+	export type CollectionEntry<C extends CollectionKey> = Flatten<AnyEntryMap[C]>;
+
+	export type ContentCollectionKey = keyof ContentEntryMap;
+	export type DataCollectionKey = keyof DataEntryMap;
+
+	// This needs to be in sync with ImageMetadata
+	export type ImageFunction = () => import('astro/zod').ZodObject<{
+		src: import('astro/zod').ZodString;
+		width: import('astro/zod').ZodNumber;
+		height: import('astro/zod').ZodNumber;
+		format: import('astro/zod').ZodUnion<
+			[
+				import('astro/zod').ZodLiteral<'png'>,
+				import('astro/zod').ZodLiteral<'jpg'>,
+				import('astro/zod').ZodLiteral<'jpeg'>,
+				import('astro/zod').ZodLiteral<'tiff'>,
+				import('astro/zod').ZodLiteral<'webp'>,
+				import('astro/zod').ZodLiteral<'gif'>,
+				import('astro/zod').ZodLiteral<'svg'>,
+				import('astro/zod').ZodLiteral<'avif'>,
+			]
+		>;
+	}>;
 
 	type BaseSchemaWithoutEffects =
 		| import('astro/zod').AnyZodObject
-		| import('astro/zod').ZodUnion<import('astro/zod').AnyZodObject[]>
+		| import('astro/zod').ZodUnion<[BaseSchemaWithoutEffects, ...BaseSchemaWithoutEffects[]]>
 		| import('astro/zod').ZodDiscriminatedUnion<string, import('astro/zod').AnyZodObject[]>
-		| import('astro/zod').ZodIntersection<
+		| import('astro/zod').ZodIntersection<BaseSchemaWithoutEffects, BaseSchemaWithoutEffects>;
-				import('astro/zod').AnyZodObject,
-				import('astro/zod').AnyZodObject
-		  >;
 
 	type BaseSchema =
 		| BaseSchemaWithoutEffects
 		| import('astro/zod').ZodEffects<BaseSchemaWithoutEffects>;
 
-	type BaseCollectionConfig<S extends BaseSchema> = {
+	export type SchemaContext = { image: ImageFunction };
-		schema?: S;
+
-		slug?: (entry: {
+	type DataCollectionConfig<S extends BaseSchema> = {
-			id: CollectionEntry<keyof typeof entryMap>['id'];
+		type: 'data';
-			defaultSlug: string;
+		schema?: S | ((context: SchemaContext) => S);
-			collection: string;
+	};
-			body: string;
+
-			data: import('astro/zod').infer<S>;
+	type ContentCollectionConfig<S extends BaseSchema> = {
-		}) => string | Promise<string>;
+		type?: 'content';
-	};
+		schema?: S | ((context: SchemaContext) => S);
-	export function defineCollection<S extends BaseSchema>(
+	};
-		input: BaseCollectionConfig<S>
+
-	): BaseCollectionConfig<S>;
+	type CollectionConfig<S> = ContentCollectionConfig<S> | DataCollectionConfig<S>;
+
+	export function defineCollection<S extends BaseSchema>(
+		input: CollectionConfig<S>
+	): CollectionConfig<S>;
 
-	type EntryMapKeys = keyof typeof entryMap;
 	type AllValuesOf<T> = T extends any ? T[keyof T] : never;
-	type ValidEntrySlug<C extends EntryMapKeys> = AllValuesOf<(typeof entryMap)[C]>['slug'];
+	type ValidContentEntrySlug<C extends keyof ContentEntryMap> = AllValuesOf<
+		ContentEntryMap[C]
+	>['slug'];
 
 	export function getEntryBySlug<
-		C extends keyof typeof entryMap,
+		C extends keyof ContentEntryMap,
-		E extends ValidEntrySlug<C> | (string & {})
+		E extends ValidContentEntrySlug<C> | (string & {}),
 	>(
 		collection: C,
 		// Note that this has to accept a regular string too, for SSR
 		entrySlug: E
-	): E extends ValidEntrySlug<C>
+	): E extends ValidContentEntrySlug<C>
 		? Promise<CollectionEntry<C>>
 		: Promise<CollectionEntry<C> | undefined>;
-	export function getCollection<C extends keyof typeof entryMap, E extends CollectionEntry<C>>(
+
+	export function getDataEntryById<C extends keyof DataEntryMap, E extends keyof DataEntryMap[C]>(
+		collection: C,
+		entryId: E
+	): Promise<CollectionEntry<C>>;
+
+	export function getCollection<C extends keyof AnyEntryMap, E extends CollectionEntry<C>>(
 		collection: C,
 		filter?: (entry: CollectionEntry<C>) => entry is E
 	): Promise<E[]>;
+	export function getCollection<C extends keyof AnyEntryMap>(
+		collection: C,
+		filter?: (entry: CollectionEntry<C>) => unknown
+	): Promise<CollectionEntry<C>[]>;
 
-	type InferEntrySchema<C extends keyof typeof entryMap> = import('astro/zod').infer<
+	export function getEntry<
-		Required<ContentConfig['collections'][C]>['schema']
+		C extends keyof ContentEntryMap,
+		E extends ValidContentEntrySlug<C> | (string & {}),
+	>(entry: {
+		collection: C;
+		slug: E;
+	}): E extends ValidContentEntrySlug<C>
+		? Promise<CollectionEntry<C>>
+		: Promise<CollectionEntry<C> | undefined>;
+	export function getEntry<
+		C extends keyof DataEntryMap,
+		E extends keyof DataEntryMap[C] | (string & {}),
+	>(entry: {
+		collection: C;
+		id: E;
+	}): E extends keyof DataEntryMap[C]
+		? Promise<DataEntryMap[C][E]>
+		: Promise<CollectionEntry<C> | undefined>;
+	export function getEntry<
+		C extends keyof ContentEntryMap,
+		E extends ValidContentEntrySlug<C> | (string & {}),
+	>(
+		collection: C,
+		slug: E
+	): E extends ValidContentEntrySlug<C>
+		? Promise<CollectionEntry<C>>
+		: Promise<CollectionEntry<C> | undefined>;
+	export function getEntry<
+		C extends keyof DataEntryMap,
+		E extends keyof DataEntryMap[C] | (string & {}),
+	>(
+		collection: C,
+		id: E
+	): E extends keyof DataEntryMap[C]
+		? Promise<DataEntryMap[C][E]>
+		: Promise<CollectionEntry<C> | undefined>;
+
+	/** Resolve an array of entry references from the same collection */
+	export function getEntries<C extends keyof ContentEntryMap>(
+		entries: {
+			collection: C;
+			slug: ValidContentEntrySlug<C>;
+		}[]
+	): Promise<CollectionEntry<C>[]>;
+	export function getEntries<C extends keyof DataEntryMap>(
+		entries: {
+			collection: C;
+			id: keyof DataEntryMap[C];
+		}[]
+	): Promise<CollectionEntry<C>[]>;
+
+	export function reference<C extends keyof AnyEntryMap>(
+		collection: C
+	): import('astro/zod').ZodEffects<
+		import('astro/zod').ZodString,
+		C extends keyof ContentEntryMap
+			? {
+					collection: C;
+					slug: ValidContentEntrySlug<C>;
+			  }
+			: {
+					collection: C;
+					id: keyof DataEntryMap[C];
+			  }
+	>;
+	// Allow generic `string` to avoid excessive type errors in the config
+	// if `dev` is not running to update as you edit.
+	// Invalid collection names will be caught at build time.
+	export function reference<C extends string>(
+		collection: C
+	): import('astro/zod').ZodEffects<import('astro/zod').ZodString, never>;
+
+	type ReturnTypeOrOriginal<T> = T extends (...args: any[]) => infer R ? R : T;
+	type InferEntrySchema<C extends keyof AnyEntryMap> = import('astro/zod').infer<
+		ReturnTypeOrOriginal<Required<ContentConfig['collections'][C]>['schema']>
 	>;
 
-	type Render = {
+	type ContentEntryMap = {
-		render(): Promise<{
-			Content: import('astro').MarkdownInstance<{}>['Content'];
-			headings: import('astro').MarkdownHeading[];
-			remarkPluginFrontmatter: Record<string, any>;
-		}>;
-	};
-
-	const entryMap: {
 		"blog": {
 "summer.mdx": {
-  id: "summer.mdx",
+	id: "summer.mdx";
-  slug: "summer",
+  slug: "summer";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "week1.mdx": {
-  id: "week1.mdx",
+	id: "week1.mdx";
-  slug: "week1",
+  slug: "week1";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "week2.mdx": {
-  id: "week2.mdx",
+	id: "week2.mdx";
-  slug: "week2",
+  slug: "week2";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "week3.mdx": {
-  id: "week3.mdx",
+	id: "week3.mdx";
-  slug: "week3",
+  slug: "week3";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "week4.mdx": {
-  id: "week4.mdx",
+	id: "week4.mdx";
-  slug: "week4",
+  slug: "week4";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "week5-6.mdx": {
-  id: "week5-6.mdx",
+	id: "week5-6.mdx";
-  slug: "week5-6",
+  slug: "week5-6";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "week7-8.mdx": {
-  id: "week7-8.mdx",
+	id: "week7-8.mdx";
-  slug: "week7-8",
+  slug: "week7-8";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "week9-10.mdx": {
-  id: "week9-10.mdx",
+	id: "week9-10.mdx";
-  slug: "week9-10",
+  slug: "week9-10";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "work1.mdx": {
-  id: "work1.mdx",
+	id: "work1.mdx";
-  slug: "work1",
+  slug: "work1";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "work2.mdx": {
-  id: "work2.mdx",
+	id: "work2.mdx";
-  slug: "work2",
+  slug: "work2";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "work3.mdx": {
-  id: "work3.mdx",
+	id: "work3.mdx";
-  slug: "work3",
+  slug: "work3";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "work4.mdx": {
-  id: "work4.mdx",
+	id: "work4.mdx";
-  slug: "work4",
+  slug: "work4";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "work5.mdx": {
-  id: "work5.mdx",
+	id: "work5.mdx";
-  slug: "work5",
+  slug: "work5";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "work6.mdx": {
-  id: "work6.mdx",
+	id: "work6.mdx";
-  slug: "work6",
+  slug: "work6";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "year2022-1.mdx": {
-  id: "year2022-1.mdx",
+	id: "year2022-1.mdx";
-  slug: "year2022-1",
+  slug: "year2022-1";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "year2022-end.mdx": {
-  id: "year2022-end.mdx",
+	id: "year2022-end.mdx";
-  slug: "year2022-end",
+  slug: "year2022-end";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "year2022-w1.mdx": {
-  id: "year2022-w1.mdx",
+	id: "year2022-w1.mdx";
-  slug: "year2022-w1",
+  slug: "year2022-w1";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "year2022-w2.mdx": {
-  id: "year2022-w2.mdx",
+	id: "year2022-w2.mdx";
-  slug: "year2022-w2",
+  slug: "year2022-w2";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
 "year2022-w3.mdx": {
-  id: "year2022-w3.mdx",
+	id: "year2022-w3.mdx";
-  slug: "year2022-w3",
+  slug: "year2022-w3";
-  body: string,
+  body: string;
-  collection: "blog",
+  collection: "blog";
   data: InferEntrySchema<"blog">
-},
+} & { render(): Render[".mdx"] };
-},
+"year2023-1.mdx": {
+	id: "year2023-1.mdx";
+  slug: "year2023-1";
+  body: string;
+  collection: "blog";
+  data: InferEntrySchema<"blog">
+} & { render(): Render[".mdx"] };
+"year2024.mdx": {
+	id: "year2024.mdx";
+  slug: "year2024";
+  body: string;
+  collection: "blog";
+  data: InferEntrySchema<"blog">
+} & { render(): Render[".mdx"] };
+};
 
 	};
 
+	type DataEntryMap = {
+		
+	};
+
+	type AnyEntryMap = ContentEntryMap & DataEntryMap;
+
 	type ContentConfig = typeof import("../src/content/config");
 }

.vscode/extensions.json

@@ -1,4 +1,7 @@
 {
-  "recommendations": ["astro-build.astro-vscode"],
+  "recommendations": [
+    "astro-build.astro-vscode",
+    "unifiedjs.vscode-mdx"
+  ],
   "unwantedRecommendations": []
 }

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

README.md

@@ -1,12 +1,20 @@
-# Welcome to [Astro](https://astro.build)
+# Nozzy House News website code
 
-[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/withastro/astro/tree/latest/examples/basics)
+This website is built using [Astro](https://astro.build)
-[![Open with CodeSandbox](https://assets.codesandbox.io/github/button-edit-lime.svg)](https://codesandbox.io/s/github/withastro/astro/tree/latest/examples/basics)
 
-> 🧑‍🚀 **Seasoned astronaut?** Delete this file. Have fun!
+## 🧞 Commands
 
-![basics](https://user-images.githubusercontent.com/4677417/186188965-73453154-fdec-4d6b-9c34-cb35c248ae5b.png)
+All commands are run from the root of the project, from a terminal:
 
+| Command                | Action                                             |
+| :--------------------- | :------------------------------------------------- |
+| `npm i -g yarn`        | Installs yarn (if needed)                          |
+| `yarn`                 | Installs dependencies                              |
+| `yarn dev`             | Starts local dev server at `localhost:3000`        |
+| `yarn build`           | Build your production site to `./dist/`            |
+| `yarn preview`         | Preview your build locally, before deploying       |
+| `yarn astro ...`       | Run CLI commands like `astro add`, `astro preview` |
+| `yarn astro --help`    | Get help using the Astro CLI                       |
 
 ## 🚀 Project Structure
 
@@ -32,18 +40,6 @@ There's nothing special about `src/components/`, but that's where we like to put
 
 Any static assets, like images, can be placed in the `public/` directory.
 
-## 🧞 Commands
-
-All commands are run from the root of the project, from a terminal:
-
-| Command                | Action                                             |
-| :--------------------- | :------------------------------------------------- |
-| `npm install`          | Installs dependencies                              |
-| `npm run dev`          | Starts local dev server at `localhost:3000`        |
-| `npm run build`        | Build your production site to `./dist/`            |
-| `npm run preview`      | Preview your build locally, before deploying       |
-| `npm run astro ...`    | Run CLI commands like `astro add`, `astro preview` |
-| `npm run astro --help` | Get help using the Astro CLI                       |
 
 ## 👀 Want to learn more?
 

astro.config.mjs

@@ -1,5 +1,4 @@
 import { defineConfig } from "astro/config";
-
 // https://astro.build/config
 import mdx from "@astrojs/mdx";
 

package.json

@@ -11,12 +11,15 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astrojs/mdx": "^0.15.0",
+    "@astrojs/mdx": "^2.0.2",
+    "@astrojs/react": "^3.0.8",
     "@astrojs/rss": "^2.1.0",
-    "astro": "^2.0.0",
+    "@rollup/plugin-dynamic-import-vars": "^2.1.2",
+    "astro": "^4.0.7",
     "astrojs-service-worker": "^0.0.9"
   },
   "devDependencies": {
     "sass": "^1.57.1"
-  }
+  },
+  "packageManager": "yarn@4.5.1"
 }

src/components/Card.astro

@@ -1,18 +1,31 @@
 ---
 export interface Props {
-  title: string;
+  imageData: ImageData,
-  src: string;
+  optimize?: boolean
 }
 
-const { title, src } = Astro.props;
+import { Picture } from 'astro:assets'
+import type { ImageData } from './types';
+import { importImage } from './images';
+
+const { imageData } = Astro.props;
+
+const image = importImage(imageData);
 ---
 
 <div class="col">
   <div class="card">
     <div class="card-body">
-      <b class="card-title">{title}</b>
+      <b class="card-title">{imageData.title}</b>
     </div>
-    <img src={`/images/${src}`} alt={title} />
+    {typeof image === 'string' && <img src={image} alt={imageData.title} class="pic"/>}
+    {typeof image !== 'string' && 
+    <Picture 
+      src={image} 
+      alt={imageData.title}
+      class:list={'pic'} />
+    
+    }
   </div>
 </div>
 
@@ -20,4 +33,8 @@ const { title, src } = Astro.props;
   .card {
     margin-bottom: 20px;
   }
+  .pic {
+      height: 100%;
+      width: 100%;
+    }
 </style>

src/components/Cards.astro

@@ -1,8 +1,9 @@
 ---
 import Card from "./Card.astro";
+import type { ImageData } from "./types";
 
 export interface Props {
-  images: { title: string; src: string }[];
+  images: ImageData[];
 }
 
 const { images } = Astro.props;
@@ -10,6 +11,8 @@ const { images } = Astro.props;
 
 <div class="container">
   <div class="row row-cols-1 row-cols-md-2">
-    {images.map((i) => <Card title={i.title} src={i.src} />)}
+    {images.map((i) => 
+      <Card imageData={i}  />
+    )}
   </div>
 </div>

src/components/FrontPageLink.astro

@@ -1,20 +1,26 @@
 ---
 export interface Props {
-  title: string;
   description: string;
-  imageSrc: string;
+  imageData: ImageData;
   href: string;
 }
+import { Picture } from "astro:assets";
+import type { ImageData } from './types';
+import { importImage } from "./images";
+const { href, imageData, description } = Astro.props;
 
-const { href, title, imageSrc, description } = Astro.props;
+const optImage = importImage(imageData);
 ---
 
 <div class="col">
   <a href={href} class="fp-link">
     <div class="card">
-      <img src={`/images/${imageSrc}`} class="card-img-top" />
+      <Picture 
+        src={optImage} 
+        alt={`in which ${description}`} 
+        class:list={['card-img-top', 'pic']}/>
       <div class="card-body">
-        <h5 class="card-title">{title}</h5>
+        <h5 class="card-title">{imageData.title}</h5>
         <p class="card-text">in which {description}</p>
       </div>
     </div>
@@ -58,5 +64,10 @@ const { href, title, imageSrc, description } = Astro.props;
     .card-text {
       font-size: medium;
     }
+
+    .pic {
+      height: 100%;
+      width: 100%;
+    }
   }
 </style>

src/components/Hero.astro

@@ -1,23 +1,28 @@
 ---
 export interface Props {
-  title: string;
   date?: Date;
-  image: string;
+  imageData: ImageData;
   bold?: boolean;
 }
 
-const { title, date, image, bold = false } = Astro.props;
+import { Picture } from 'astro:assets'
+import type { ImageData } from './types';
+import { importImage } from './images';
+
+const { date, imageData, bold = false } = Astro.props;
+
+const optImage = importImage(imageData);
+
 const actualDate = date ? new Date(date) : undefined;
 const dateString = actualDate?.toISOString()?.slice(0, 10);
 ---
 
 <div class:list={[{ "page-hero": !bold, "index-hero": bold }]}>
   <div class="title-text text-center">
-    <h1 class:list={[{ "fw-bold": bold, "display-5": bold }]}>{title}</h1>
+    <h1 class:list={[{ "fw-bold": bold, "display-5": bold }]}>{imageData.title}</h1>
     {date && <div class="col-auto date align-self-end">{dateString}</div>}
   </div>
-
+  <Picture src={optImage} alt={imageData.title} />
-  <img src={`/images/${image}`} />
 </div>
 
 <style lang="scss">
@@ -44,6 +49,7 @@ const dateString = actualDate?.toISOString()?.slice(0, 10);
 
     img {
       width: 100%;
+      height: 100%;
       object-fit: cover;
     }
     .title-text {

src/components/NextPrev.astro

@@ -11,7 +11,7 @@ const { prev, next } = Astro.props;
   <div class="col-5 d-flex justify-content-center">
     {
       prev && (
-        <a class="btn btn-outline-dark" href={prev}>
+        <a class="btn btn-outline-dark" href={'/' + prev}>
           &lt; Prev
         </a>
       )
@@ -21,7 +21,7 @@ const { prev, next } = Astro.props;
   <div class="col-5 d-flex justify-content-center">
     {
       next && (
-        <a class="btn btn-outline-dark" href={next}>
+        <a class="btn btn-outline-dark" href={'/' + next}>
           Next &gt;
         </a>
       )

src/components/Solocard.astro

@@ -1,9 +1,10 @@
 ---
 import Card from "./Card.astro";
+import type { ImageFileType } from "./types";
 
 export interface Props {
   title: string;
-  src: string;
+  src: {dir: string, name:string, fileType?: ImageFileType}
 }
 
 const { title, src } = Astro.props;
@@ -11,6 +12,13 @@ const { title, src } = Astro.props;
 
 <div class="container solocard-container">
   <div class="row">
-    <Card title={title} src={src} />
+    <Card imageData={{
+      title: title,
+      src: {
+        dir: src.dir,
+        name: src.name,
+        fileType: src.fileType
+      }
+    }} />
   </div>
 </div>

src/components/images.ts

@@ -0,0 +1,19 @@
+import type { ImageData } from "./types";
+
+export function importImage(d: ImageData) {
+  if (!(d.src.optimise ?? true)) {
+    return d.src.name;
+  }
+
+  switch (d.src.fileType) {
+    case "jpeg":
+      return import(`../images/${d.src.dir}/${d.src.name}.jpeg`);
+    case "png":
+      return import(`../images/${d.src.dir}/${d.src.name}.png`);
+    case "gif":
+      return import(`../images/${d.src.dir}/${d.src.name}.gif`);
+    case "jpg":
+    default:
+      return import(`../images/${d.src.dir}/${d.src.name}.jpg`);
+  }
+}

src/components/types.ts

@@ -0,0 +1,11 @@
+export type ImageData = {
+  title: string;
+  src: {
+    dir: string;
+    name: string;
+    fileType?: ImageFileType;
+    optimise?: boolean;
+  };
+};
+
+export type ImageFileType = "jpg" | "jpeg" | "png" | "gif";

src/content/blog/summer.mdx

@@ -2,16 +2,18 @@
 layout: ../../layouts/LayoutMdx.astro
 title: Weeks 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 & 27
 date: 2021-09-18
-image: summer/kayak.jpg
+dir: summer
+image: kayak
 description: we take a break
 ---
 
-import Cards from "../../components/Cards.astro";
+import { generateImageHyrdationFunction } from "../../utils";
-import Solocard from "../../components/Solocard.astro";
+import Cards from "@components/Cards.astro";
-import NextPrev from "../../components/NextPrev.astro";
+import Solocard from "@components/Solocard.astro";
-import Progress from "../../components/Progress.astro";
+import NextPrev from "@components/NextPrev.astro";
-import YTVideo from "../../components/YTVideo.astro";
+import Progress from "@components/Progress.astro";
-export const s = (s) => `summer/${s}`;
+import YTVideo from "@components/YTVideo.astro";
+export const s = generateImageHyrdationFunction("summer");
 
 Look at that! So many weeks! I didn't even know that summer was this long!
 
@@ -55,8 +57,8 @@ We really appreciated the flowers and gifts that people sent. Thank you very muc
 
 <Cards
   images={[
-    { title: "Desperate to get outside", src: s("outside.jpg") },
+    { title: "Desperate to get outside", src: s("outside") },
-    { title: "With them in spirit 🔥", src: s("camping.jpg") },
+    { title: "With them in spirit 🔥", src: s("camping") },
   ]}
 />
 
@@ -68,18 +70,21 @@ This isn't really house news - it's more of an excuse as to why there isn't much
 
 <Cards
   images={[
-    { title: "Going on a bike ride", src: s("bikeride.jpg") },
+    { title: "Going on a bike ride", src: s("bikeride") },
-    { title: "Rambling round the countryside", src: s("signpost.jpg") },
+    { title: "Rambling round the countryside", src: s("signpost") },
-    { title: "Enjoying our new kayak", src: s("kayak.jpg") },
+    { title: "Enjoying our new kayak", src: s("kayak") },
-    { title: "Visiting Dyrham Park", src: s("dyrham.jpg") },
+    { title: "Visiting Dyrham Park", src: s("dyrham") },
-    { title: "The Red Arrows at Abingdon Air Show", src: s("red_arrows.png") },
+    {
+      title: "The Red Arrows at Abingdon Air Show",
+      src: s("red_arrows", "png"),
+    },
     {
       title: "Beaulieu Motor Mueseum (our first live gig since You Know What)",
-      src: s("car.jpg"),
+      src: s("car"),
     },
-    { title: "Entertaining guests", src: s("naughtyGuest.jpg") },
+    { title: "Entertaining guests", src: s("naughtyGuest") },
-    { title: "Feasting on garden produce", src: s("garden_produce.jpg") },
+    { title: "Feasting on garden produce", src: s("garden_produce") },
-    { title: "Testing our projection room", src: s("bigscreen.jpg") },
+    { title: "Testing our projection room", src: s("bigscreen") },
   ]}
 />
 
@@ -91,11 +96,11 @@ The selling of Harrow continues. We're on buyer number three. This one made an o
   images={[
     {
       title: "Cutting the grass prior to viewings",
-      src: s("harrow_grass.jpg"),
+      src: s("harrow_grass"),
     },
     {
       title: "Our subsidence could be worse it seems",
-      src: s("subsidence.jpg"),
+      src: s("subsidence"),
     },
   ]}
 />
@@ -104,7 +109,7 @@ The selling of Harrow continues. We're on buyer number three. This one made an o
 
 To justify this page I'll leave you with the only bit of home improvement that we actually did over the summer
 
-<Solocard title="We put up our coat rack" src={s("shelf.jpg")} />
+<Solocard title="We put up our coat rack" src={s("shelf")} />
 
 Tune in next time for some actual work 😄
 

src/content/blog/week1.mdx

@@ -2,15 +2,17 @@
 layout: ../../layouts/LayoutMdx.astro
 title: Week 1
 date: 2021-03-13
-image: week1/cards.jpg
+dir: week1
+image: cards
 description: we camped in the house
 ---
 
+import { generateImageHyrdationFunction } from "../../utils";
 import Cards from "../../components/Cards.astro";
 import Solocard from "../../components/Solocard.astro";
 import NextPrev from "../../components/NextPrev.astro";
 import YTVideo from "../../components/YTVideo.astro";
-export const s = (s) => `week1/${s}`;
+export const s = generateImageHyrdationFunction("week1");
 
 ## Initial Tour
 
@@ -39,21 +41,21 @@ Loads has happened this week so I'm just going to do a bullet point update
 - Fixed the leaking tap in the top bathroom
 - Got our internet transfered which removed our dialtone, then organised another visit from an engineer to fix that. Which means my servers are now back up and running
 
-<Solocard title="Up and running" src={s("internet.jpg")} />
+<Solocard title="Up and running" src={s("internet")} />
 
 - Got most of the blue room sorted. It's now white with yellow curtains
 
-<Solocard title="Yellow curtains not pictured" src={s("5r.jpg")} />
+<Solocard title="Yellow curtains not pictured" src={s("5r")} />
 
 - Stripped the wallpaper in the top guest room in preparation for painting. Wallpaper steamers are actually magic! It would have taken a million times longer without one
 
-<Solocard title="So quick 🪄" src={s("5f.jpg")} />
+<Solocard title="So quick 🪄" src={s("5f")} />
 
 - Made sure each bathroom has soap, a towel, bog brush, and a bin
 - Got a replacement lock, installed it, found it had a fault, removed it, and reinstalled the old one again :(
 - Built some shelves for the cupboards in the master bedroom. This is Nikki load-testing the first shelf
 
-<Solocard title="Not sure it would make it" src={s("shelves.jpg")} />
+<Solocard title="Not sure it would make it" src={s("shelves")} />
 
 - Stopped the honky toilet from honking
 - Scrubbed all the fluff out of the utility room
@@ -61,7 +63,7 @@ Loads has happened this week so I'm just going to do a bullet point update
 - Figured out the bins
 - Got some lovely housewarming cards
 
-<Solocard title="Thank you!" src={s("cards.jpg")} />
+<Solocard title="Thank you!" src={s("cards")} />
 
 - Said hi to the neighbours :) They all seem nice
 - Changed our address in so. many. places.
@@ -69,11 +71,11 @@ Loads has happened this week so I'm just going to do a bullet point update
 - Checked out a couple of takeaways. Not only have they been delicious, they've helped us keep the washing up to a minimum whilst we don't have our dishwasher
 - We're feeling a definite lack of comfortable chairs. Currently we're making do with a couple of deckchairs
 
-<Solocard title="Looking forward to our sofas" src={s("lounge.jpg")} />
+<Solocard title="Looking forward to our sofas" src={s("lounge")} />
 
 - Finally, we saw a rainbow today 🌈
 
-<Solocard title="🌈 !" src={s("rainbow.jpg")} />
+<Solocard title="🌈 !" src={s("rainbow")} />
 
 ## Summary
 

src/content/blog/week2.mdx

@@ -2,14 +2,16 @@
 layout: ../../layouts/LayoutMdx.astro
 title: Week 2
 date: 2021-03-20
-image: week2/stripping-0.jpg
+dir: week2
+image: stripping-0
 description: we painted some stuff
 ---
 
+import { generateImageHyrdationFunction } from "../../utils";
 import Cards from "../../components/Cards.astro";
 import Solocard from "../../components/Solocard.astro";
 import NextPrev from "../../components/NextPrev.astro";
-export const s = (s) => `week2/${s}`;
+export const s = generateImageHyrdationFunction("week2");
 
 ## Calming down
 
@@ -19,7 +21,7 @@ For a brief 6 hours or so I was enjoyed a lack of any open orders with Screwfix
 
 We got an _amazing_ card from G&G!
 
-<Solocard title="Amazing!" src={s("g&g-card.jpg")} />
+<Solocard title="Amazing!" src={s("g&g-card")} />
 
 ## Stats about the house
 
@@ -35,20 +37,20 @@ One of the mega tasks for this week was painting the front door. We've decided t
 
 <Cards
   images={[
-    { title: "Starting photo", src: s("door.PNG") },
+    { title: "Starting photo", src: s("door", "png") },
     {
       title: "Testing out the paint stripper in an inconspicuous area",
-      src: s("paint-stripper-test.jpg"),
+      src: s("paint-stripper-test"),
     },
-    { title: "Safety first", src: s("stripping-0.jpg") },
+    { title: "Safety first", src: s("stripping-0") },
-    { title: "Stripping", src: s("stripping-1.jpg") },
+    { title: "Stripping", src: s("stripping-1") },
-    { title: "Stripping", src: s("stripping-2.jpg") },
+    { title: "Stripping", src: s("stripping-2") },
-    { title: "Definite improvement", src: s("stripping-3.jpg") },
+    { title: "Definite improvement", src: s("stripping-3") },
-    { title: "Wrapping up warm", src: s("stripping-4.jpg") },
+    { title: "Wrapping up warm", src: s("stripping-4") },
-    { title: "Priming the primer", src: s("primer-0.jpg") },
+    { title: "Priming the primer", src: s("primer-0") },
-    { title: "Primer 1", src: s("primer-1.jpg") },
+    { title: "Primer 1", src: s("primer-1") },
-    { title: "Primer 2", src: s("primer-2.jpg") },
+    { title: "Primer 2", src: s("primer-2") },
-    { title: "Topcoat 1", src: s("topcoat-1.jpg") },
+    { title: "Topcoat 1", src: s("topcoat-1") },
   ]}
 />
 
@@ -58,27 +60,27 @@ Nikki didn't manage to quite finish the painting before the end of the week, but
 
 Whilst Nikki was enjoying herself with improving the front door, I was working in the guest bedroom. Last week I was extolling the virtues of the wallpaper stripper and while it was very good, there was still an enormous amount of fiddly little bits that needed to be taken off with a damp cloth and patience. Some bits needed removing with brute force and a willingness to polyfilla later. Once a suitable amount of pollyfilla had been scraped on and sanded down we could move on to the painting.
 
-<Solocard title="Polyfilla" src={s("polyfilla.jpg")} />
+<Solocard title="Polyfilla" src={s("polyfilla")} />
 
 I (Ozzy) really don't like painting. I appreciate the results of it, but I don't like the actual activity of rolling or brushing. I don't mind masking things off though so I bought myself a new toy to help speed things along 😁
 
 <video controls style="max-width:100%">
-  <source src={`./src/images/${s("pew.mp4")}`} type="video/mp4" />
+  <source src="/videos/week2/pew.mp4" type="video/mp4" />
 </video>
 
 This was the first time using the paint sprayer and it didn't go quite to plan. I failed to dilute the paint so we ended up with a super thick layer of paint that took ages to dry. Fortunately not enough to cause drips, but not far off 😬
 
-<Solocard title="😬" src={s("5f-coat-1.jpg")} />
+<Solocard title="😬" src={s("5f-coat-1")} />
 
 At some point in the future I'm hoping someone invents some sort of paint grenade that I can just throw in a room and shut the door.
 
 ## Master Bedroom
 
-<Solocard title="Eurgh, yuck" src={s("yuk.jpg")} />
+<Solocard title="Eurgh, yuck" src={s("yuk")} />
 
 The master bedroom has my least favourite light fitting in the house (and there's quite a variety of bad ones). This week I removed it, expecting the replacement to arrive later that day. The replacement has been delayed, but we both think a lack of light fitting is still progress in this case.
 
-<Solocard title="Still progress" src={s("bedroom.jpg")} />
+<Solocard title="Still progress" src={s("bedroom")} />
 
 We also put up some curtains. The centre curtain pole support broke in half during this, and our woodglue is still in Harrow :( But finally we can use cloth to block out the light instead of just wood.
 
@@ -90,7 +92,7 @@ We also got a variety of smaller things done as well
 - Organised damp-proofers and roofers (Damp-pRoofers?) to get started on keeping our house dry
 - Finishing off the office ready for work
 
-<Solocard title="Readier than we are" src={s("office.jpg")} />
+<Solocard title="Readier than we are" src={s("office")} />
 
 - Finished off the shelves in the master bedroom. They can support all of the clothes we've currently got in the house.
 - Cleaned some more windows.
@@ -98,15 +100,15 @@ We also got a variety of smaller things done as well
 - Tried out woodfiller for various fittings that have stripped their screwholes
 - Played some fun games of magnetic fishing trying to figure out where we can put ethernet cables with the minimum of fuss
 
-<Solocard title="🎣 Fishing for internet 🎣" src={s("fishing.jpg")} />
+<Solocard title="🎣 Fishing for internet 🎣" src={s("fishing")} />
 
 - Enjoyed our first trip to the local tip to get rid of all the old carpet we pulled up
 
-<Solocard title="Traditional Monday activity" src={s("tip.jpg")} />
+<Solocard title="Traditional Monday activity" src={s("tip")} />
 
 - Not quite a house task - Replaced the rear windscreen wiper
 
-<Solocard title="Bulking out the update" src={s("windscreen-wiper.jpg")} />
+<Solocard title="Bulking out the update" src={s("windscreen-wiper")} />
 
 ## Summary
 
@@ -120,7 +122,7 @@ Next week we've got two whole days of gainful employment to look forward to, fol
 
 The magnolia in our front garden is starting to bloom 😊
 
-<Solocard title="😊" src={s("magnolia.jpg")} />
+<Solocard title="😊" src={s("magnolia")} />
 
 Like and subscribe ❤
 

src/content/blog/week3.mdx

@@ -2,30 +2,32 @@
 layout: ../../layouts/LayoutMdx.astro
 title: Week 3
 date: 2021-03-28
-image: week3/dishwasher.jpg
+dir: week3
+image: dishwasher
 description: we got all of our stuff moved
 ---
 
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("week3");
 import Cards from "../../components/Cards.astro";
 import Solocard from "../../components/Solocard.astro";
 import NextPrev from "../../components/NextPrev.astro";
 import Progress from "../../components/Progress.astro";
 import YTVideo from "../../components/YTVideo.astro";
-export const s = (s) => `week3/${s}`;
 
 ## Finishing Off Last Week
 
 The front door has had its final topcoat and is looking quite a bit smarter.
 
-<Solocard title="🚪" src={s("door1.jpg")} />
+<Solocard title="🚪" src={s("door1")} />
 
 The light fitting for the bedroom has arrived and been installed.
 
-<Solocard title="💡" src={s("bedroom-light.jpg")} />
+<Solocard title="💡" src={s("bedroom-light")} />
 
 I realised that I can't spray paint through a radiator, so I removed it to paint behind it. I didn't take an after photo, but you can bask in the glory of the various wallpapers.
 
-<Solocard title="Eurgh" src={s("sans-radiator.jpg")} />
+<Solocard title="Eurgh" src={s("sans-radiator")} />
 
 ## Back to work
 
@@ -33,7 +35,7 @@ This week we had two days back at work. Going back was a bit of a shock after a
 
 <Solocard
   title="Professional level ethernet wiring for the office"
-  src={s("ethernet.jpg")}
+  src={s("ethernet")}
 />
 
 Working from home has its benefits though. One sunny afternoon we decided to walk into Bath and catch up on work in the evening. What a productive walk! We picked up our only Screwfix order of the week (new peephole for the front door), registered at the doctors, found our local escape rooms (obviously closed), and patronised a [Pastel de Nata](https://en.wikipedia.org/wiki/Pastel_de_nata) shop. Extremely tasty, and fortunately not too close to the house.
@@ -47,7 +49,7 @@ The big event of this week though is getting all our stuff moved from Harrow! We
 
 Back in Bath the next day the movers arrived at 0900 and unpacked everything by lunchtime. They weren't too impressed by a 5 storey house. They did make one critical error though. They packed our stuff into two Lutons and obviously the tea things are the last things to be packed, but when they were unpacking they started with the Luton without the tea things in it! Fools! It probably meant that our unpacking went even faster though.
 
-<Solocard title="We can finally sit comfily!" src={s("sofa-with-boxes.jpg")} />
+<Solocard title="We can finally sit comfily!" src={s("sofa-with-boxes")} />
 
 ## 📦📦📦📦 Boxes Boxes Boxes 📦📦📦📦
 
@@ -66,13 +68,13 @@ Things I've learned
 
 There's still so many things that we don't have a home for yet. We planned to put some of the bookcases in the basement, but the ceiling isn't high enough 🤦‍♂️ The music room is a complete mess. We haven't figured out where the TV is going to live. There's nowhere obvious to store the coats. And on and on and on 😁 We'll sort it out eventually.
 
-<Solocard title="The true highlight of the week" src={s("dishwasher.jpg")} />
+<Solocard title="The true highlight of the week" src={s("dishwasher")} />
 
 ## Bathroom design
 
 We've had the first design for the master bathroom back and we're currently pondering it. Obviously they won't give us proper diagrams until we pay them, so here's a sketch of the general plan.
 
-<Solocard title="The Plan" src={s("bathroom-design.jpg")} />
+<Solocard title="The Plan" src={s("bathroom-design")} />
 
 The general idea is to split the bathroom into a WC and a wetroom. I think it works quite well, but we're concerned about blocking the window from the doors. There's a glass screen/wall between the toilet and the shower.
 

src/content/blog/week4.mdx

@@ -2,16 +2,18 @@
 layout: ../../layouts/LayoutMdx.astro
 title: Week 4
 date: 2021-04-04
-image: week4/walk.jpg
+dir: week4
+image: walk
 description: we start unpacking
 ---
 
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("week4");
 import Cards from "../../components/Cards.astro";
 import Solocard from "../../components/Solocard.astro";
 import NextPrev from "../../components/NextPrev.astro";
 import Progress from "../../components/Progress.astro";
 import YTVideo from "../../components/YTVideo.astro";
-export const s = (s) => `week4/${s}`;
 
 ## Settling in
 
@@ -31,11 +33,11 @@ One of the downsides of using packers is that they tend to label the boxes based
 
 We have progressed our bathroom plans slightly. We have paid the deposit for the plans and products. We had a talk with the recommended installer to see if the plans were actually possible in the room, and they are. Plenty of modifications were suggested to the design and we're going to have to figure out what we want. The installer isn't going to be available to fit anything until September though, so we've got plenty of time. (Did we mention we're phasing out weekly updates??)
 
-<Solocard title="Design" src={s("bathroom.png")} />
+<Solocard title="Design" src={s("bathroom", "png")} />
 
 In other bathroom news, we thought we might tackle a more manageable bathroom project ourselves. The chilly toilet - which is much less chilly now that the radiator is actually radiating. We feel that the obvious theming for such a room is 🐘 Elephant 🐘, so we're going all in. Nothing's changed yet as we're still in the design-and-acquire stage but here's some of the fittings Nikki found.
 
-<Solocard title="🐘🐘" src={s("elephant.jpg")} />
+<Solocard title="🐘🐘" src={s("elephant")} />
 
 ## Kitchen update
 
@@ -43,7 +45,7 @@ We have also progressed our kitchen plans slightly. We went to our second stage
 
 <Solocard
   title="Something we had, just you know, lying around"
-  src={s("kitchen.jpg")}
+  src={s("kitchen")}
 />
 
 ## Exploring the countryside
@@ -56,8 +58,8 @@ Our trekky adventures have taken us on a walk up the hill to visit the rest of L
 
 <Cards
   images={[
-    { title: "Lovely countryside", src: s("walk2.jpg") },
+    { title: "Lovely countryside", src: s("walk2") },
-    { title: ":)", src: s("walk.jpg") },
+    { title: ":)", src: s("walk") },
   ]}
 />
 
@@ -67,18 +69,18 @@ The springiness appears to be affecting our garden too. The previous owner reall
 
 <Cards
   images={[
-    { title: "Roses in the front garden", src: s("rose.jpg") },
+    { title: "Roses in the front garden", src: s("rose") },
     {
       title: "Magnolia (These seem to be everywhere in Bath)",
-      src: s("magnolia.jpg"),
+      src: s("magnolia"),
     },
-    { title: "Cherry(?) in the back garden", src: s("cherry.jpg") },
+    { title: "Cherry(?) in the back garden", src: s("cherry") },
   ]}
 />
 
 With the nicer weather comes opportunity for outdoor food. We have had our first Bath-beque in this house, yum yum yum. Ozzy might lack the required patience for our charcoal BBQ - Nikki's in charge of BBQs now
 
-<Solocard title="Yum" src={s("bbq.jpg")} />
+<Solocard title="Yum" src={s("bbq")} />
 
 It's really cool to finally live near some of our friends again. We had an afternoon cream tea in the garden with Tom and Laura, followed by a walk down the canal. If we were having a weekly update next week (which we're not) we might show you the mound of rhubarb related baking that we will be doing with their gift.
 
@@ -90,7 +92,7 @@ Ozzy has been dealing with the frustrating issue of where to put our ethernet ca
 
 The guest room now has a brand-spanking-new curtain pole and curtains. These curtains are temporary as we still have grand plans to do up the room properly (the carpet 🤮 ). The room definitely feels more welcoming with homely touches like a bed and some curtains. Maybe soon we'll even get a proper light fitting. Guests are so fussy ;)
 
-<Solocard title="Privacy" src={s("5f.jpg")} />
+<Solocard title="Privacy" src={s("5f")} />
 
 ## Closing thoughts
 

src/content/blog/week5-6.mdx

@@ -2,16 +2,19 @@
 layout: ../../layouts/LayoutMdx.astro
 title: Weeks 5 & 6
 date: 2021-04-18
-image: week5-6/design.png
+dir: week5-6
+image: design
+fileType: png
 description: we start defluffing
 ---
 
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("week5-6");
 import Cards from "../../components/Cards.astro";
 import Solocard from "../../components/Solocard.astro";
 import NextPrev from "../../components/NextPrev.astro";
 import Progress from "../../components/Progress.astro";
 import YTVideo from "../../components/YTVideo.astro";
-export const s = (s) => `week5-6/${s}`;
 
 ## We're back!
 
@@ -37,9 +40,9 @@ We've implemented a time-share scheme for the dishwasher and washing machine for
 
 <Cards
   images={[
-    { title: "Going", src: s("utility1.jpg") },
+    { title: "Going", src: s("utility1") },
-    { title: "Going", src: s("utility2.jpg") },
+    { title: "Going", src: s("utility2") },
-    { title: "Red?", src: s("utility3.jpg") },
+    { title: "Red?", src: s("utility3") },
   ]}
 />
 
@@ -59,8 +62,8 @@ Woo! One of the biggest contra dance series in the country is London Barndance w
 
 <Cards
   images={[
-    { title: "Onstage", src: s("gig1.jpg") },
+    { title: "Onstage", src: s("gig1") },
-    { title: "As the audience", src: s("gig2.jpg") },
+    { title: "As the audience", src: s("gig2") },
   ]}
 />
 
@@ -74,15 +77,15 @@ Now that the cable was in place we need to terminate it. In the office this was
 
 <Cards
   images={[
-    { title: "Cutting the hole", src: s("eth1.jpg") },
+    { title: "Cutting the hole", src: s("eth1") },
-    { title: "Terminating the cable", src: s("eth2.jpg") },
+    { title: "Terminating the cable", src: s("eth2") },
-    { title: "Putting everything together", src: s("eth3.jpg") },
+    { title: "Putting everything together", src: s("eth3") },
   ]}
 />
 
 Buoyed by that success we headed back down to the lounge to terminate the other end of the cable. I picked a likely sounding hollow spot next to a socket and started cutting out a hole...
 
-<Solocard title="What's all this?" src={s("pipes.jpg")} />
+<Solocard title="What's all this?" src={s("pipes")} />
 
 Hmm, this was a bit of an issue. I knew there would be pipes there, but I thought that they would be deeper into the wall. The wood also poses a bit of a problem. It means that I wouldn't be able to use the plasterboard-clamp style of backbox. Ok, I thought, there's a bit of wood there - let's just use a standard metal backbox. Nope! There's not even enough room for the shallowest box.
 
@@ -92,9 +95,9 @@ Hmm. What to do? I considered shaving the wood back to create enough room, but I
 
 <Cards
   images={[
-    { title: "Design", src: s("design.png") },
+    { title: "Design", src: s("design", "png") },
-    { title: "Print", src: s("print.jpg") },
+    { title: "Print", src: s("print") },
-    { title: "Fit", src: s("fit.jpg") },
+    { title: "Fit", src: s("fit") },
   ]}
 />
 
@@ -110,14 +113,14 @@ The office continues to gradually evolve. We've finally got enough office chairs
 
 <Cards
   images={[
-    { title: "New office chair for Ozzy", src: s("office-ozzy.jpg") },
+    { title: "New office chair for Ozzy", src: s("office-ozzy") },
-    { title: "New monitor+arm for Nikki", src: s("office-nikki.jpg") },
+    { title: "New monitor+arm for Nikki", src: s("office-nikki") },
-    { title: "Window cleaning never ceases", src: s("windows.jpg") },
+    { title: "Window cleaning never ceases", src: s("windows") },
     {
       title: "We gave a bay tree a haircut, so now we've got some indoor bay",
-      src: s("bae.jpg"),
+      src: s("bae"),
     },
-    { title: "On a walk we found a midlife crisis tree", src: s("crisis.jpg") },
+    { title: "On a walk we found a midlife crisis tree", src: s("crisis") },
   ]}
 />
 

src/content/blog/week7-8.mdx

@@ -2,16 +2,18 @@
 layout: ../../layouts/LayoutMdx.astro
 title: Weeks 7 & 8
 date: 2021-05-03
-image: week7-8/roof3.jpg
+dir: week7-8
+image: roof3
 description: we get the people in
 ---
 
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("week7-8");
 import Cards from "../../components/Cards.astro";
 import Solocard from "../../components/Solocard.astro";
 import NextPrev from "../../components/NextPrev.astro";
 import Progress from "../../components/Progress.astro";
 import YTVideo from "../../components/YTVideo.astro";
-export const s = (s) => `week7-8/${s}`;
 
 ## Hello!
 
@@ -23,10 +25,7 @@ We're baaaack. We keep thinking there's nothing to update the newsletter with, b
 
 Woohoo! Actual progress this time. 6 more boxes unpacked! We are starting to plan out our storage so there's places for our least used rubbish to live. On this note, we have bought a set of shelves for our cupboard under the (many) stairs, so our tools are a lot more organised. This is great because we keep getting more tools.
 
-<Solocard
+<Solocard title="🎉🎉🎉 Tools are our favourite 🎉🎉🎉" src={s("shelves")} />
-  title="🎉🎉🎉 Tools are our favourite 🎉🎉🎉"
-  src={s("shelves.jpg")}
-/>
 
 ## Roofers
 
@@ -34,9 +33,9 @@ The roofers have been and gone! The whole process took only 5 days, which was ju
 
 <Cards
   images={[
-    { title: "Disintegrated felt", src: s("roof1.jpg") },
+    { title: "Disintegrated felt", src: s("roof1") },
-    { title: "More disintegrated felt", src: s("roof2.jpg") },
+    { title: "More disintegrated felt", src: s("roof2") },
-    { title: "What we want to avoid (not our roof)", src: s("notourroof.jpg") },
+    { title: "What we want to avoid (not our roof)", src: s("notourroof") },
   ]}
 />
 
@@ -44,19 +43,19 @@ We didn't know beforehand how much work the roofers would need to do, as they wo
 
 <Cards
   images={[
-    { title: "Replacement felt", src: s("roof3.jpg") },
+    { title: "Replacement felt", src: s("roof3") },
-    { title: "New ridge tiles", src: s("roof4.jpg") },
+    { title: "New ridge tiles", src: s("roof4") },
-    { title: "Slate tiles on the front", src: s("roof5.jpg") },
+    { title: "Slate tiles on the front", src: s("roof5") },
   ]}
 />
 
 We also needed our lead flashing replacing. The roofers kept the rolls of lead in our house overnight and I thought that they were putting on a show with all the huffing and puffing it took to get them inside. Nope! We were amazed by how much heavier they were than we expected! Just a small roll weighed more than a person! 91kg!
 
-<Solocard title="⚓Extra heavy⚓" src={s("lead.jpg")} />
+<Solocard title="⚓Extra heavy⚓" src={s("lead")} />
 
 I had an exciting trip up the scaffolding, which was extremely nerve-wracking. The scaffolding itself was very solid, but the roofers seemed to have found the bounciest ladders possible to scale it. While I was up there holding on tight and Sean was showing me what they'd done, some of the other roofers were perfectly happy to sit on the handrail of the scaffolding with nothing behind them 😬 Luckily we have our access hatch if we ever need to go up again.
 
-<Solocard title="Nice view though" src={s("scaf1.jpg")} />
+<Solocard title="Nice view though" src={s("scaf1")} />
 
 The roofers themselves were a bunch of loud cheery lads, but they were really good at turning up on time and letting us know the progress on all fronts.
 
@@ -76,12 +75,12 @@ The vault cabling is vaguely aspirational at the moment as we still don't really
 
 <Cards
   images={[
-    { title: "Extra protection", src: s("protection.jpg") },
+    { title: "Extra protection", src: s("protection") },
     {
       title: "New fusebox with unfinished cables for the utility room + vaults",
-      src: s("fusebox1.jpg"),
+      src: s("fusebox1"),
     },
-    { title: "With no labels 😡", src: s("fusebox2.jpg") },
+    { title: "With no labels 😡", src: s("fusebox2") },
   ]}
 />
 
@@ -95,9 +94,9 @@ Argh, the damp proofers! Definitely my least favourite set of people to deal wit
 
 <Cards
   images={[
-    { title: "Starting the slurrying", src: s("damp1.jpg") },
+    { title: "Starting the slurrying", src: s("damp1") },
-    { title: "Mess everywhere", src: s("damp2.jpg") },
+    { title: "Mess everywhere", src: s("damp2") },
-    { title: "Finished...", src: s("damp3.jpg") },
+    { title: "Finished...", src: s("damp3") },
   ]}
 />
 
@@ -105,7 +104,7 @@ The plumbers will be back this week to reinstate the plumbing that was removed s
 
 Because 🎉🎉🎉 tools are our favourite 🎉🎉🎉 I can't resist sharing one of the damp-proofer's tools. In order to be able to add a damp-proofing slurry layer to a previous layer you need to have a rough surface for it to key into. Normally they would just use a paintbrush and stipple the surface and call it good. Apparently that wouldn't be enough for here so they brought the big guns. Specifically this flick-slurry-all-over-the-place gun.
 
-<Solocard title="Splattergun" src={s("splattergun.jpg")} />
+<Solocard title="Splattergun" src={s("splattergun")} />
 
 After seeing what a state they'd left the entire room in after using that tool they did explain that it's easier to remove the excessively flicked slurry once it's dried, but I still wasn't pleased by having all our nice new electrics slurry-flicked.
 
@@ -117,7 +116,7 @@ Really, we'll just be very relieved once it's all properly sorted.
 
 It's done! The cable has been terminated on the other end in our sitting room, and everything is nice and tidy (haha). The router will live here permanently (which needs to live near the phone line), and anything else we want to be centrally placed in the house. This is not going to be its final form, we're on the lookout for a console table.
 
-<Solocard title="Finished and tidy" src={s("ethernet.jpg")} />
+<Solocard title="Finished and tidy" src={s("ethernet")} />
 
 All the servers that were living in the music room have now been moved to the office, though still on the floor in a mess. We might get a similar console table for them to live on, or just stick them in the cupboard. It has moved far enough down the priority list that we're leaving it be for now.
 
@@ -127,10 +126,10 @@ There's an update on this! The company we're using (Shaker & May) has just opene
 
 <Cards
   images={[
-    { title: "Plan", src: s("kitchen1.jpg") },
+    { title: "Plan", src: s("kitchen1") },
-    { title: "View from across the island", src: s("kitchen2.jpg") },
+    { title: "View from across the island", src: s("kitchen2") },
-    { title: "View of the back wall", src: s("kitchen3.jpg") },
+    { title: "View of the back wall", src: s("kitchen3") },
-    { title: "View from the back wall", src: s("kitchen4.jpg") },
+    { title: "View from the back wall", src: s("kitchen4") },
   ]}
 />
 
@@ -144,7 +143,7 @@ We've also got a new trolley which should make reinstalling the washing machine
 
 Our 'outside toilet' is something we have been planning on renovating by ourselves, so we have been researching how to plumb (having neither done any before), and buying 🎉tools🎉 to help cut copper pipes and PEX. Now the proper works have settled down, we've got a bit more energy to muck up part of the house again. To be honest, this seems like a perfect My First Plumbing job as all the pipes that we want to move are accessible from the garden store below.
 
-<Solocard title="No need to tear anything up!" src={s("pipes.jpg")} />
+<Solocard title="No need to tear anything up!" src={s("pipes")} />
 
 ## A scary story 👻
 
@@ -162,7 +161,7 @@ To escape all the scary stories, tradespeople, and endless todo lists we visited
 
 We also went on a really lovely walk with some of our more local friends. It turns out that a house with stairs doesn't immediately turn you into a champion walker. Maybe more stairs are required? Some of them came back for a picnic after and shared their planty knowledge with us. We failed to take it all in but came away with "If you're not sure it's probably a rose" as a start. I think we'll need to make some kind of garden map with labels.
 
-<Solocard title="Walking through Windows XP with friends" src={s("walk.jpg")} />
+<Solocard title="Walking through Windows XP with friends" src={s("walk")} />
 
 ## In conclusion
 
@@ -170,7 +169,7 @@ Having lots of things going on at once is very tiring and stressful. Once this b
 
 In order to relax ourselves we bought some cat prints to hang around the house
 
-<Solocard title="CATLOL" src={s("catlol.jpg")} />
+<Solocard title="CATLOL" src={s("catlol")} />
 
 Hope everyone's doing ok and enjoying the beautiful weather!
 

src/content/blog/week9-10.mdx

@@ -2,16 +2,18 @@
 layout: ../../layouts/LayoutMdx.astro
 title: Weeks 9 & 10
 date: 2021-05-18
-image: week9-10/cat-3.jpg
+dir: week9-10
+image: cat-3
 description: we have many visitors
 ---
 
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("week9-10");
 import Cards from "../../components/Cards.astro";
 import Solocard from "../../components/Solocard.astro";
 import NextPrev from "../../components/NextPrev.astro";
 import Progress from "../../components/Progress.astro";
 import YTVideo from "../../components/YTVideo.astro";
-export const s = (s) => `week9-10/${s}`;
 
 ## Visitors to the house
 
@@ -39,10 +41,10 @@ The first thing to do for tiling a floor is to try and make the floor level. Thi
   images={[
     {
       title: "Power stirring making us feel like proper builders",
-      src: s("spinny-tool.jpg"),
+      src: s("spinny-tool"),
     },
-    { title: "Just like glazing a cake", src: s("self-level-1.jpg") },
+    { title: "Just like glazing a cake", src: s("self-level-1") },
-    { title: "Not quite enough", src: s("self-level-2.jpg") },
+    { title: "Not quite enough", src: s("self-level-2") },
   ]}
 />
 
@@ -56,8 +58,8 @@ This seems to imply that some parts of the plaster are dry enough to soak up all
 
 <Cards
   images={[
-    { title: "Starting the mist coat", src: s("mist-coat.jpg") },
+    { title: "Starting the mist coat", src: s("mist-coat") },
-    { title: "Flakey paint", src: s("dodgy-paint.jpg") },
+    { title: "Flakey paint", src: s("dodgy-paint") },
   ]}
 />
 
@@ -75,14 +77,14 @@ We managed to get 18 tiles in on the first session. These were all the whole til
 
 <Cards
   images={[
-    { title: "Tiles tiles tiles", src: s("tiling-1.jpg") },
+    { title: "Tiles tiles tiles", src: s("tiling-1") },
-    { title: "Tiles tiles tiles", src: s("tiling-2.jpg") },
+    { title: "Tiles tiles tiles", src: s("tiling-2") },
   ]}
 />
 
 While Nikki was laying out the tiles, I was trying to use the 🎉 tool 🎉 that we'd bought to trim a little of the end of one of the tiles. A nice straight line. How hard could it be?
 
-<Solocard title="Argh" src={s("wonk.jpg")} />
+<Solocard title="Argh" src={s("wonk")} />
 
 It was impossible. We both tried various combinations of scoring, levering, malleting, and swearing - none of them worked. It was time for a 🎉 new tool! 🎉 We'd also managed to use the entire bucket of glue+grout on about half the tiles it said it would do.
 
@@ -90,7 +92,7 @@ Back to Wickes we go!
 
 We came back with a new tub of glue+grout and a motorized wet tile saw. The saw is amazing given how much it cost (£45). It's super loud, tends to spray silty water everywhere, and says that you shouldn't use it outdoors - but it does result in tiles being cut in a controllable way.
 
-<Solocard title="Nice!" src={s("straight.jpg")} />
+<Solocard title="Nice!" src={s("straight")} />
 
 After another session of tiling we'd managed to get 95% of the floor covered, but we'd managed to run out of glue+grout again. Argh!
 
@@ -114,7 +116,7 @@ Anyway, at that point it was done! Woo! It's by no means perfect. Most of the ti
 
 It's currently supporting the washer-drier and looking a whole lot better than it did, and that's pretty much all we need it to do.
 
-<Solocard title="Finished!" src={s("finished.jpg")} />
+<Solocard title="Finished!" src={s("finished")} />
 
 So yeah, lots of lessons learned in the process.
 
@@ -133,7 +135,7 @@ The utility room light looks amazing! We're really pleased with the results.
 
 The wiring inspection was pretty interesting too. The house doesn't quite meet Certified Good Electrics standards, but it wasn't actually far off. Astonishing given the age of the property (and previous encumbent). There are some batty wiring decisions though. There are three lighting circuits: floor 1, floor 2 and floors 3-4-5. Great news if the lights go off and we're stuck on the top floor. We also discovered that there is a single socket in our kitchen that's on its own ring, completely unnecessarily.
 
-<Solocard title="Totally rad! 😎" src={s("breakers.jpg")} />
+<Solocard title="Totally rad! 😎" src={s("breakers")} />
 
 Most of the 'rings' aren't actually rings according to the sparky - it's unlikely to be an issue for us but it does mean that the total amperage ratings are lower. The only rooms where that might be an issue are the utility room and the kitchen, both of which will be wired correctly when they're finished.
 
@@ -153,10 +155,7 @@ It was nice to be able to build the shape of our new kitchen using our mountain
 
 Hooray! We have another room! The dining table that was sat in our living room now has its own room, and our living room no longer feels as much of a studio apartment that has to fill every purpose.
 
-<Solocard
+<Solocard title="Dining room looking like a dining room" src={s("layout")} />
-  title="Dining room looking like a dining room"
-  src={s("layout.jpg")}
-/>
 
 Much better!
 
@@ -168,8 +167,8 @@ We've also added a little latch to stop the saloon-y doors swinging open while y
 
 <Cards
   images={[
-    { title: "Shower", src: s("shower.jpg") },
+    { title: "Shower", src: s("shower") },
-    { title: "The ultimate in privacy and security 🔒", src: s("privacy.jpg") },
+    { title: "The ultimate in privacy and security 🔒", src: s("privacy") },
   ]}
 />
 
@@ -181,14 +180,14 @@ We had been planning on starting work in the 'outside' toilet this time, but com
 
 We found a painting hidden behind a radiator
 
-<Solocard title="Secret painting" src={s("painting.jpg")} />
+<Solocard title="Secret painting" src={s("painting")} />
 
 Flowers in the garden are pretty. We're gradually learning what the names of the plants are based on what our guests can remember. We'll sort out a proper map at some point.
 
 <Cards
   images={[
-    { title: "Flowers", src: s("garden-1.jpg") },
+    { title: "Flowers", src: s("garden-1") },
-    { title: "In the garden", src: s("garden-2.jpg") },
+    { title: "In the garden", src: s("garden-2") },
   ]}
 />
 It's been a week of mixed feelings. On the one hand it's nice to not have a load
@@ -197,9 +196,9 @@ can cause stress. On balance I'd say it's been pretty good.
 
 <Cards
   images={[
-    { title: "Exploring", src: s("cat-1.jpg") },
+    { title: "Exploring", src: s("cat-1") },
-    { title: "Inspecting", src: s("cat-2.jpg") },
+    { title: "Inspecting", src: s("cat-2") },
-    { title: "Obstructing", src: s("cat-3.jpg") },
+    { title: "Obstructing", src: s("cat-3") },
   ]}
 />
 

src/content/blog/work1.mdx

@@ -2,16 +2,18 @@
 layout: ../../layouts/LayoutMdx.astro
 title: Works 1
 date: 2021-09-21
-image: work1/bathroomfloorup.jpg
+dir: work1
+image: bathroomfloorup
 description: we get more people in
 ---
 
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("work1");
 import Cards from "../../components/Cards.astro";
 import Solocard from "../../components/Solocard.astro";
 import NextPrev from "../../components/NextPrev.astro";
 import Progress from "../../components/Progress.astro";
 import YTVideo from "../../components/YTVideo.astro";
-export const s = (s) => `work1/${s}`;
 
 ## Preparations
 
@@ -27,7 +29,7 @@ Once we'd cleared everything out, the electrician got to work. He needed to get
 
 The ceiling is going to be overboarded with plasterboard because lath-and-plaster ceilings tend to disintegrate if you ever have to remove a light fitting.
 
-<Solocard title="Ceiling with holes" src={s("diningroomholes.jpg")} />
+<Solocard title="Ceiling with holes" src={s("diningroomholes")} />
 
 Drilling holes in the ceiling was very noisy, especially if you happen to be sitting on the other side. It's also extremely dusty. The electrician sealed the space as best as possible, but we did wake up to some dusty paw prints roaming around the house... 🐈
 
@@ -35,7 +37,7 @@ The hallway floor had to be pulled up for electrical access. It's right above ou
 
 <Solocard
   title="Glad I don't have deal with this (yet)"
-  src={s("junctionbox.jpg")}
+  src={s("junctionbox")}
 />
 
 During the week, we had a site visit from our kitchen designer to finalise paint colours for the units. We've chosen a very dark blue for the island and an off-white for the floor to ceiling cupboards, as we think dark blue for everything would be a bit much.
@@ -44,8 +46,8 @@ The last thing that has been done is the doorway between the kitchen and dining
 
 <Cards
   images={[
-    { title: "From the new kitchen", src: s("holefromdining.jpg") },
+    { title: "From the new kitchen", src: s("holefromdining") },
-    { title: "From the old kitchen", src: s("holefromkitchen.jpg") },
+    { title: "From the old kitchen", src: s("holefromkitchen") },
   ]}
 />
 
@@ -57,7 +59,7 @@ One of the builders (his name is Will) was telling us about how none of the wall
 
 To jog your memory, here is what the bathroom originally looked like:
 
-<Solocard title="🦢🦢🦢 Before 🦢🦢🦢" src={s("initialbathroom.png")} />
+<Solocard title="🦢🦢🦢 Before 🦢🦢🦢" src={s("initialbathroom", "png")} />
 
 The bathroom has changed quite dramatically since the builders have arrived. The carpet came up first of all, hooray! We hated that carpet and were glad to see it go. However, it didn't go as far away as we'd like and is now being used as carpet protector for our other carpets that we don't like.
 
@@ -65,8 +67,8 @@ Next to go were the cupboards. The bathroom looked even larger with them gone. F
 
 <Cards
   images={[
-    { title: "They didn't go very far either", src: s("flytipping.jpg") },
+    { title: "They didn't go very far either", src: s("flytipping") },
-    { title: "Unearthed more terrible wallpaper", src: s("eurgh.jpg") },
+    { title: "Unearthed more terrible wallpaper", src: s("eurgh") },
   ]}
 />
 
@@ -74,18 +76,18 @@ All week we have been having bathroom stuff delivered, which have then been left
 
 <Cards
   images={[
-    { title: "Cistern made of duplo", src: s("duplotoilet.jpg") },
+    { title: "Cistern made of duplo", src: s("duplotoilet") },
-    { title: "ɥʇɐq uʍop ǝpᴉsdn", src: s("bath.jpg") },
+    { title: "ɥʇɐq uʍop ǝpᴉsdn", src: s("bath") },
   ]}
 />
 
 Day 2 & 3 of the builders being round, the floorboards were up. These have been taken downstairs to use in the restoration of the new kitchen floor. Instead in the bathroom, there will be an underflooring that won't wobble as much as the floorboards. This will provide a better base for the underfloor heating and tiling.
 
-<Solocard title="Nothing left" src={s("bathroomfloorup.jpg")} />
+<Solocard title="Nothing left" src={s("bathroomfloorup")} />
 
 Under the floorboards we found a pretty cool thing.
 
-<Solocard title="Pretty Cool Thing" src={s("bellpull.jpg")} />
+<Solocard title="Pretty Cool Thing" src={s("bellpull")} />
 
 We think that it was a servant bell mechanism for one of the upper floors. It goes around the hearthstone, under the floorboards, then disappears up the wall. As a computer programmer I always find it interesting to see the analog way of doing things. It will stay there until the next owners of this house dig for treasure under the floors.
 
@@ -93,7 +95,7 @@ This is what the bathroom now looks like:
 
 <Solocard
   title="Pretty different. Looks even more like a bedroom"
-  src={s("currentbathroom.jpg")}
+  src={s("currentbathroom")}
 />
 
 The flooring isn't yet fixed down. It's just being cut to size. We're told it will look very similar for a while as the next steps are plumbing and electrics (and not because they're slacking).
@@ -106,7 +108,7 @@ On the other hand, it's good to properly try out the guest bedroom so we can mak
 
 <Solocard
   title="Pretty different. Looks less like a bedroom. With extra snazzy flooring"
-  src={s("toolroom.jpg")}
+  src={s("toolroom")}
 />
 
 We have been very impressed so far with our builders. It's a bit different here than in London where everyone needs to have reviews and an internet presence to get work (or we never found the good ones from being In The Know) - but we are glad we trusted them. Everything to date has been done well and Simon and Will are very punctual and nice. ☕
@@ -115,9 +117,6 @@ We have been very impressed so far with our builders. It's a bit different here
 
 It's been nice to have a respite from workers in the house at weekends - we climbed up Solsbury Hill which we can see from our house, and have had the song in our heads ever since.
 
-<Solocard
+<Solocard title="🎵 Climbing up on Solsbury Hill 🎵" src={s("climbingup")} />
-  title="🎵 Climbing up on Solsbury Hill 🎵"
-  src={s("climbingup.jpg")}
-/>
 
 <NextPrev prev="summer" next="work2" />

src/content/blog/work2.mdx

@@ -2,16 +2,18 @@
 layout: ../../layouts/LayoutMdx.astro
 title: Works 2
 date: 2021-10-09
-image: work2/tap.jpg
+dir: work2
+image: tap
 description: the bathroom is built
 ---
 
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("work2");
 import Cards from "../../components/Cards.astro";
 import Solocard from "../../components/Solocard.astro";
 import NextPrev from "../../components/NextPrev.astro";
 import Progress from "../../components/Progress.astro";
 import YTVideo from "../../components/YTVideo.astro";
-export const s = (s) => `work2/${s}`;
 
 It's now been 4 weeks since our works started, so it's time for another update.
 
@@ -21,26 +23,26 @@ But once they'd completed that they got to move on to more exciting bits! We're
 
 <Cards
   images={[
-    { title: "Starting the studwork", src: s("bathroom1.jpg") },
+    { title: "Starting the studwork", src: s("bathroom1") },
-    { title: "Building the monolith", src: s("bathroom2.jpg") },
+    { title: "Building the monolith", src: s("bathroom2") },
-    { title: "Buildy buildy buildy", src: s("bathroom3.jpg") },
+    { title: "Buildy buildy buildy", src: s("bathroom3") },
-    { title: "Buildy buildy buildy", src: s("bathroom4.jpg") },
+    { title: "Buildy buildy buildy", src: s("bathroom4") },
-    { title: "The controls for the shower", src: s("showerDetail.jpg") },
+    { title: "The controls for the shower", src: s("showerDetail") },
-    { title: "... Stuff", src: s("bathroom5.jpg") },
+    { title: "... Stuff", src: s("bathroom5") },
-    { title: "Shower, toilet, and two alcoves", src: s("bathroom6.jpg") },
+    { title: "Shower, toilet, and two alcoves", src: s("bathroom6") },
-    { title: "Where the bath is going to go", src: s("bathroom7.jpg") },
+    { title: "Where the bath is going to go", src: s("bathroom7") },
     {
       title:
         "Plumbing that would have been neater if our hot and cold were the correct way round",
-      src: s("backwardsPlumbing.jpg"),
+      src: s("backwardsPlumbing"),
     },
-    { title: "This expertise is why we pay for builders", src: s("wood.jpg") },
+    { title: "This expertise is why we pay for builders", src: s("wood") },
     {
       title:
         "Much progress has been made, the bath is now the right way up, but the toilet isn't",
-      src: s("bath.jpg"),
+      src: s("bath"),
     },
-    { title: "A bath tap in disguise", src: s("tap.jpg") },
+    { title: "A bath tap in disguise", src: s("tap") },
   ]}
 />
 
@@ -50,8 +52,8 @@ Speaking of opportunities for exciting photos - even less has been happening on
 
 <Cards
   images={[
-    { title: "Exciting ...", src: s("plaster1.jpg") },
+    { title: "Exciting ...", src: s("plaster1") },
-    { title: "... Stuff", src: s("plaster2.jpg") },
+    { title: "... Stuff", src: s("plaster2") },
   ]}
 />
 
@@ -59,8 +61,8 @@ The room's also been painted - contract white for the moment but we're testing o
 
 <Cards
   images={[
-    { title: "Even more ...", src: s("contractWhite.jpg") },
+    { title: "Even more ...", src: s("contractWhite") },
-    { title: "... exciting stuff", src: s("pickingColours.jpg") },
+    { title: "... exciting stuff", src: s("pickingColours") },
   ]}
 />
 
@@ -74,7 +76,7 @@ Speaking of dishwashers, we noticed the other day that our current dishwasher ou
 
 **LVGO is back!** The London Video Game Orchestra is back up and running after a long hiatus! We've been travelling back and forth to London every week to go to rehearsals and we're really enjoying it! It's definitely the thing that we're going to miss most about London.
 
-<Solocard title="🎵 LVGO is back! 🎵" src={s("lvgo.jpg")} />
+<Solocard title="🎵 LVGO is back! 🎵" src={s("lvgo")} />
 
 Due to covidy restrictions we're strugging to find somewhere suitable as a concert venue, so it looks like our next concert will be in our rehearsal venue. We're provisionally aiming for November 13th, so keep that clear if you want to come :D
 
@@ -82,8 +84,8 @@ We went round Bath Abbey one rainy afternoon and found the manliest name ever. W
 
 <Cards
   images={[
-    { title: "💪 Manley Power 💪", src: s("manleyPower.jpg") },
+    { title: "💪 Manley Power 💪", src: s("manleyPower") },
-    { title: 'Anne "Less manly" Power', src: s("annePower.jpg") },
+    { title: 'Anne "Less manly" Power', src: s("annePower") },
   ]}
 />
 

src/content/blog/work3.mdx

@@ -2,16 +2,18 @@
 layout: ../../layouts/LayoutMdx.astro
 title: Works 3
 date: 2021-10-28
-image: work3/bathroom7.jpg
+dir: work3
+image: bathroom7
 description: we're absolutely floored
 ---
 
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("work3");
 import Cards from "../../components/Cards.astro";
 import Solocard from "../../components/Solocard.astro";
 import NextPrev from "../../components/NextPrev.astro";
 import Progress from "../../components/Progress.astro";
 import YTVideo from "../../components/YTVideo.astro";
-export const s = (s) => `work3/${s}`;
 
 Right! It's time for the traditional 6 and a half week update on everything that's going on. Some things have been going well, some things been going less well, and some things have been going abroad.
 
@@ -23,38 +25,38 @@ The bathroom continues apace. It's certainly starting to feel a lot more like a
   images={[
     {
       title: "All the plasterboarding is finished and coated in some primer",
-      src: s("bathroom1.jpg"),
+      src: s("bathroom1"),
     },
     {
       title:
         "Laying down a membrane to allow the house to move without moving the tiles",
-      src: s("bathroom2.jpg"),
+      src: s("bathroom2"),
     },
     {
       title: "Laying down the underfloor heating wire (very satisfying)",
-      src: s("bathroom3.jpg"),
+      src: s("bathroom3"),
     },
-    { title: "First of the floor tiles!", src: s("bathroom4.jpg") },
+    { title: "First of the floor tiles!", src: s("bathroom4") },
     {
       title:
         "Top tip!  Remember to remove any inward opening doors before you increase the height of the floor in a room!",
-      src: s("bathroom5.jpg"),
+      src: s("bathroom5"),
     },
-    { title: "Tiles tiles tiles", src: s("bathroom6.jpg") },
+    { title: "Tiles tiles tiles", src: s("bathroom6") },
     {
       title: "Even more tiles, plus a demo of some of the lighting",
-      src: s("bathroom7.jpg"),
+      src: s("bathroom7"),
     },
     {
       title: "The sort of tile I'm happy to pay other people to cut and lay",
-      src: s("bathroom9.jpg"),
+      src: s("bathroom9"),
     },
   ]}
 />
 
 Obviously the only metric for progress in a bathroom is how close the bath is to the room. I'm happy to share that the bath has made it out of our lounge and into our bedroom
 
-<Solocard title="Progress!" src={s("bathroom8.jpg")} />
+<Solocard title="Progress!" src={s("bathroom8")} />
 
 Not everything is going smoothly. We've been hit by supplier issues for the towel radiator, and Simon would like the radiator before he tiles the wall behind in order to hide the cable as best as possible. We've found another radiator that's pretty similar but we still have to wait at least a week for it. The mirror we've chosen has also been delayed. If we do something like this again I'm just going to ask to have all the products sent to our house straightaway - we've got enough space to store it and it would give a much larger buffer for these supply chain issues.
 
@@ -72,29 +74,29 @@ The kitchen work has been a bit more exciting than it was last time. Certainly m
   images={[
     {
       title: "Removing the hearthstone that was on top of the carpet",
-      src: s("fireplace1.jpg"),
+      src: s("fireplace1"),
     },
     {
       title: "Using specialist equipment to lower the fireplace",
-      src: s("fireplace3.jpg"),
+      src: s("fireplace3"),
     },
-    { title: "Mission Accomplished!", src: s("fireplace2.jpg") },
+    { title: "Mission Accomplished!", src: s("fireplace2") },
     {
       title: "Bringing the electricity and water up through the floorboards",
-      src: s("kitchen1.jpg"),
+      src: s("kitchen1"),
     },
-    { title: "Looks like some sort of plant", src: s("kitchen2.jpg") },
+    { title: "Looks like some sort of plant", src: s("kitchen2") },
     {
       title: "A core sample of the stone of the house (to let the drain out)",
-      src: s("coreSample.jpg"),
+      src: s("coreSample"),
     },
     {
       title: "The flooring people fixing the worst of the damaged floorboards",
-      src: s("kitchen3.jpg"),
+      src: s("kitchen3"),
     },
     {
       title: "Refurbished floor, new paint, new radiator",
-      src: s("kitchen4.jpg"),
+      src: s("kitchen4"),
     },
   ]}
 />
@@ -115,8 +117,8 @@ Just as we were celebrating not having to deal with Harrow anymore, the 👻 Gho
 
 <Cards
   images={[
-    { title: "Trying to fish the gunk out", src: s("gutter1.jpg") },
+    { title: "Trying to fish the gunk out", src: s("gutter1") },
-    { title: "Too much gunk", src: s("gutter2.jpg") },
+    { title: "Too much gunk", src: s("gutter2") },
   ]}
 />
 
@@ -124,7 +126,7 @@ High on our priority list is now a way to sort this out without having to climb
 
 Continuing with the theme of water getting in the wrong places, our dishwasher "solution" from last installment has proved insufficient. There was just too much water not going down the downpipe, and we're not sure where it ends up going... Our new solution is a large bucket that we need to empty after each dishwasher usage - Bring on the new kitchen!
 
-<Solocard title="Trial and Improvement" src={s("dishwasher.jpg")} />
+<Solocard title="Trial and Improvement" src={s("dishwasher")} />
 
 ## Nozzy Things
 
@@ -132,9 +134,9 @@ In more exciting news, Nikki and I played for our first in-person Contra dance l
 
 <Cards
   images={[
-    { title: "Palace of Luxembourg, France 🇫🇷", src: s("france1.jpg") },
+    { title: "Palace of Luxembourg, France 🇫🇷", src: s("france1") },
-    { title: "Tasty food, France 🇫🇷", src: s("france2.jpg") },
+    { title: "Tasty food, France 🇫🇷", src: s("france2") },
-    { title: "Statue of Liberty, France 🇫🇷", src: s("france3.jpg") },
+    { title: "Statue of Liberty, France 🇫🇷", src: s("france3") },
   ]}
 />
 
@@ -142,10 +144,10 @@ I was a bit miffed that I couldn't use the gorgeous Steinway as my piano for the
 
 <Cards
   images={[
-    { title: "Nozzy playing for a gig, France 🇫🇷", src: s("dance1.jpg") },
+    { title: "Nozzy playing for a gig, France 🇫🇷", src: s("dance1") },
     {
       title: "With people that we can see dancing along!",
-      src: s("dance2.jpg"),
+      src: s("dance2"),
     },
   ]}
 />

src/content/blog/work4.mdx

@@ -2,16 +2,18 @@
 layout: ../../layouts/LayoutMdx.astro
 title: Works 4
 date: 2021-11-07
-image: work4/kitchenwoo2.jpg
+dir: work4
+image: kitchenwoo2
 description: it's all coming together
 ---
 
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("work4");
 import Cards from "../../components/Cards.astro";
 import Solocard from "../../components/Solocard.astro";
 import NextPrev from "../../components/NextPrev.astro";
 import Progress from "../../components/Progress.astro";
 import YTVideo from "../../components/YTVideo.astro";
-export const s = (s) => `work4/${s}`;
 
 Wow! Things are moving quickly now! It's only been a week since the last update but it feels like there's a lot of visible progress.
 
@@ -21,8 +23,8 @@ A milestone has been reached! This room can be accurately referred to as a bath
 
 <Cards
   images={[
-    { title: "Bath in a room!", src: s("bathroom0.jpg") },
+    { title: "Bath in a room!", src: s("bathroom0") },
-    { title: "Tiling the monolith", src: s("bathroom1.jpg") },
+    { title: "Tiling the monolith", src: s("bathroom1") },
   ]}
 />
 
@@ -30,16 +32,13 @@ We were particularly impressed that our builders remembered to put the bath in i
 
 **Top Tip!** Don't bathblock yourself.
 
-<Solocard title="Bathroom!" src={s("bathroom2.jpg")} />
+<Solocard title="Bathroom!" src={s("bathroom2")} />
 
 The bathroom is now fully grouted and it makes so much of a difference - it feels polished, clean and beautiful. Add this to having proper light fittings and it's so nearly finished! We are really pleased with the lights but we didn't realise how bright the bulbs would be (they're only 7W). They might also feel even brighter than they are because we keep looking directly at them thinking 'hmm they look very bright don't they'.
 
 The alcove lights have ended up being a bit more customisable than we really need - it means that we can have a 🕺 **disco bathroom party** 🕺 once it's all completed!
 
-<Solocard
+<Solocard title="Hmm they look very bright don't they 🤔" src={s("lights")} />
-  title="Hmm they look very bright don't they 🤔"
-  src={s("lights.jpg")}
-/>
 
 We're definitely in the final stretch now. Just missing a toilet, a sink, the handles and the glass. And the mirror. And one box of tiles. And the countertop. And and and... We're expecting these to mostly arrive/be installed next week.
 
@@ -47,13 +46,13 @@ One other thing that we're missing is decent water pressure. We're hoping to get
 
 <Cards
   images={[
-    { title: "Bathmonster", src: s("bath.jpg") },
+    { title: "Bathmonster", src: s("bath") },
     {
       title: 'Currently using the "Nozzy Dishwasher" drainage method',
-      src: s("sink.jpg"),
+      src: s("sink"),
     },
-    { title: "Invisible toilet", src: s("toilet.jpg") },
+    { title: "Invisible toilet", src: s("toilet") },
-    { title: "Toasty toes", src: s("underfloorHeating.jpg") },
+    { title: "Toasty toes", src: s("underfloorHeating") },
   ]}
 />
 
@@ -65,10 +64,10 @@ Monday the 1st November came around and it was kitchen delivery day! They were h
 
 <Cards
   images={[
-    { title: "Half a kitchen in a van", src: s("van.jpg") },
+    { title: "Half a kitchen in a van", src: s("van") },
     {
       title: "Happy kitchen fitters (it didn't rain tooo much)",
-      src: s("garden.jpg"),
+      src: s("garden"),
     },
   ]}
 />
@@ -79,12 +78,12 @@ The kitchen units were built in the workshop, so this week has been mainly Shaun
 
 <Cards
   images={[
-    { title: "Protecting the floor", src: s("kitchen1.jpg") },
+    { title: "Protecting the floor", src: s("kitchen1") },
-    { title: "End of day one - a load of carcasses", src: s("kitchen2.jpg") },
+    { title: "End of day one - a load of carcasses", src: s("kitchen2") },
-    { title: "Things are going up!", src: s("kitchen4.jpg") },
+    { title: "Things are going up!", src: s("kitchen4") },
-    { title: "One run up", src: s("kitchen5.jpg") },
+    { title: "One run up", src: s("kitchen5") },
-    { title: "Starting on the island", src: s("kitchen6.jpg") },
+    { title: "Starting on the island", src: s("kitchen6") },
-    { title: "The same, from the back", src: s("kitchen7.jpg") },
+    { title: "The same, from the back", src: s("kitchen7") },
   ]}
 />
 
@@ -95,14 +94,14 @@ We are so impressed with the quality of everything, and there's plenty of nice l
     {
       title:
         "Magnetic back panel so you can access all the electrics once the top is on",
-      src: s("magneticbackboard.jpg"),
+      src: s("magneticbackboard"),
     },
     {
       title:
         "Dimpled water mat under the sink to catch leaks before it soaks into the wood",
-      src: s("undersinkmatting.jpg"),
+      src: s("undersinkmatting"),
     },
-    { title: "Branded tape to hold everything together", src: s("tape.jpg") },
+    { title: "Branded tape to hold everything together", src: s("tape") },
   ]}
 />
 
@@ -110,7 +109,7 @@ Yet another reason we're glad we didn't fork out to get the hob and dishwasher s
 
 On Friday the bloke from the worktop company came out to template the quartz for our worktops. He had a very nifty tool for measuring things. Basically it's a laser rangefinder on a sensitive gimbal. Shaun was pretty chuffed when the island was pronounced to be only a single millimetre off being square.
 
-<Solocard title="🎉 Tools are our favourite! 🎉" src={s("tool.jpg")} />
+<Solocard title="🎉 Tools are our favourite! 🎉" src={s("tool")} />
 
 We're now allowed to start moving some stuff into the drawers. Shaun says that this is the point when people start forking out for all new pots/pans/cutlery/the works - but we're pretty happy with what we have 😄
 
@@ -118,9 +117,9 @@ We're now allowed to start moving some stuff into the drawers. Shaun says that t
   images={[
     {
       title: "Shaun has given us some example drawer usage to get started",
-      src: s("drawers.jpg"),
+      src: s("drawers"),
     },
-    { title: "Load testing our new drawers", src: s("drawertesting.jpg") },
+    { title: "Load testing our new drawers", src: s("drawertesting") },
   ]}
 />
 
@@ -130,8 +129,8 @@ As an inveterate fiddler, it's been terrible having our appliances in place but
 
 <Cards
   images={[
-    { title: "Woo!", src: s("kitchenwoo1.jpg") },
+    { title: "Woo!", src: s("kitchenwoo1") },
-    { title: "!ooW", src: s("kitchenwoo2.jpg") },
+    { title: "!ooW", src: s("kitchenwoo2") },
   ]}
 />
 
@@ -147,10 +146,10 @@ Ozzy's desk is a bit more involved. He got a huge beautiful walnut worktop which
 
 <Cards
   images={[
-    { title: "Nikki desk - clean and beautiful", src: s("nikkidesk.jpg") },
+    { title: "Nikki desk - clean and beautiful", src: s("nikkidesk") },
     {
       title: "Ozzy desk - cleaned especially for the photo and storagey",
-      src: s("ozzydesk.jpg"),
+      src: s("ozzydesk"),
     },
   ]}
 />
@@ -161,7 +160,7 @@ This means that Ozzy has finally been able to realise his dream of having a stat
 
 Poor Shaun had a bit of a jumpscare one day - a loud banging/smashing noise and a cry from outside. He was very concerned that someone had tripped on our stairs and had horribly injured themselves.... however it turned out to be a neighbourhood cat scuffle and they'd somehow managed to explode our cat flap. It's letting a big breeze in now. Off to get a replacement then...
 
-<Solocard title="Cat flap carnage" src={s("catflapcarnage.jpg")} />
+<Solocard title="Cat flap carnage" src={s("catflapcarnage")} />
 
 On the whole, everything is coming together so well that each evening we just wander around the house, admiring, grinning and fiddling with things. We feel very lucky. Next weekend we are looking forward to our LVGO concert. _Tune in_ next time for more Nozzy News 🎵
 

src/content/blog/work5.mdx

@@ -2,16 +2,18 @@
 layout: ../../layouts/LayoutMdx.astro
 title: Works 5
 date: 2021-11-25
-image: work5/kitchen.jpg
+dir: work5
+image: kitchen
 description: things dragon 🐉
 ---
 
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("work5");
 import Cards from "../../components/Cards.astro";
 import Solocard from "../../components/Solocard.astro";
 import NextPrev from "../../components/NextPrev.astro";
 import Progress from "../../components/Progress.astro";
 import YTVideo from "../../components/YTVideo.astro";
-export const s = (s) => `work5/${s}`;
 
 Hmmm! It's been two weeks since the last update. I was kind of hoping that this would be the last major update for the kitchen and bathroom, but it looks like things are going to 🐉 drag on 🐉 a bit more. This seems to happen for every project - it always takes a completely disproportionate amount of time to get the last 5% done.
 
@@ -25,19 +27,19 @@ At the time of writing, the plumbers (who have pushed back their arrival many ti
 
 <Solocard
   title="Toilet, sink, and mirror are now complete"
-  src={s("bathroom1.jpg")}
+  src={s("bathroom1")}
 />
 
 <Cards
   images={[
     {
       title: "The support for the monolith and the lovely warm towel rail",
-      src: s("bathroom2.jpg"),
+      src: s("bathroom2"),
     },
     {
       title:
         "Stop trying to run underfloor heating and a towel rail on a lighting circuit",
-      src: s("rewiring.jpg"),
+      src: s("rewiring"),
     },
   ]}
 />
@@ -54,21 +56,18 @@ The kitchen has come along a lot since the last update. It's been a bit hectic w
 
 <Cards
   images={[
-    { title: "First meal cooked in the new kitchen", src: s("yum.jpg") },
+    { title: "First meal cooked in the new kitchen", src: s("yum") },
-    { title: "More load testing", src: s("loadtesting.jpg") },
+    { title: "More load testing", src: s("loadtesting") },
-    { title: "Picking the floor colour", src: s("floorcolours.jpg") },
+    { title: "Picking the floor colour", src: s("floorcolours") },
-    { title: "🔊 Speakers and lights 💡", src: s("speakersandlights.jpg") },
+    { title: "🔊 Speakers and lights 💡", src: s("speakersandlights") },
-    { title: "Half a worktop", src: s("worktop1.jpg") },
+    { title: "Half a worktop", src: s("worktop1") },
-    { title: "Lining up the other half", src: s("worktop2.jpg") },
+    { title: "Lining up the other half", src: s("worktop2") },
   ]}
 />
 
 The lights have been a particularly great milestone. However, as the pendant holes had been made before the island was in place, we didn't notice that they weren't aligned correctly until after they had been installed. 😲 Luckily the electrician was able to move them, with much less trouble and mess than we feared! The spotlights and pendants are both dimmable for cooking moodily.
 
-<Solocard
+<Solocard title="Neeeeearly complete island #grammable" src={s("kitchen")} />
-  title="Neeeeearly complete island #grammable"
-  src={s("kitchen.jpg")}
-/>
 
 We had a couple of people over from Shaker & May to touch things up and sign things off, and as a result two of the cupboard doors are being sent back for imperfections that they spotted rather than we did. The dishwasher door still needs adjustment so that it can open fully.
 
@@ -76,8 +75,14 @@ The electrics have all been fitted now that the worktop is in place. We tried ou
 
 <Cards
   images={[
-    { title: "Sluuurrrrpp", src: s("hobextraction.gif") },
+    {
-    { title: "😋 Ozzy Cooks Food! 😋", src: s("ozzycooksfood.png") },
+      title: "Sluuurrrrpp",
+      src: {
+        optimise: false,
+        name: "/images/work5/hobextraction.gif",
+      },
+    },
+    { title: "😋 Ozzy Cooks Food! 😋", src: s("ozzycooksfood", "png") },
   ]}
 />
 
@@ -85,10 +90,10 @@ Simon mentioned at the beginning that you can get clear sockets that are designe
 
 <Cards
   images={[
-    { title: "Socket with card to be painted", src: s("socket1.jpg") },
+    { title: "Socket with card to be painted", src: s("socket1") },
-    { title: "Socket with card painted", src: s("socket2.jpg") },
+    { title: "Socket with card painted", src: s("socket2") },
-    { title: "Nearly invisible socket", src: s("socket3.jpg") },
+    { title: "Nearly invisible socket", src: s("socket3") },
-    { title: "Super shiny socket 😞", src: s("socket4.jpg") },
+    { title: "Super shiny socket 😞", src: s("socket4") },
   ]}
 />
 
@@ -104,7 +109,7 @@ We're still waiting on the sink and dishwasher to be plumbed in, but everything'
 
 What with everything being nearly completed and Simon no longer coming in every day, I've been looking forward to moving back into our proper bedroom...
 
-<Solocard title="Oh wait..." src={s("bedroom.jpg")} />
+<Solocard title="Oh wait..." src={s("bedroom")} />
 
 It turns out that the best time to paint a room is when you aren't using it - so it'll be at least a few more nights before we manage to escape the spare room. We're having to fit painting in around work and weekends away, so it's taking longer than it might otherwise.
 

src/content/blog/work6.mdx

@@ -2,17 +2,19 @@
 layout: ../../layouts/LayoutMdx.astro
 title: End of 2021
 date: 2022-01-03
-image: work6/pressies.jpg
+dir: work6
+image: pressies
 description: water misbehaves
 ---
 
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("work6");
 import Cards from "../../components/Cards.astro";
 import Callout from "../../components/Callout.astro";
 import Solocard from "../../components/Solocard.astro";
 import NextPrev from "../../components/NextPrev.astro";
 import Progress from "../../components/Progress.astro";
 import YTVideo from "../../components/YTVideo.astro";
-export const s = (s) => `work6/${s}`;
 
 According to my watch it's been well over a month since the last update. Unfortunately, this is going to be one of those updates that contains very little in the way of house improvements. I don't know how many of you watch any house restoration channels on Youtube, but this update is going to be the annoying Christmas episode where they don't do much updating, but instead they have a lot of slow panning shots of their Christmas decorations, and an awful lot of talking.
 
@@ -44,8 +46,8 @@ Eventually we got the plumber back and he managed to fix both the issues. The re
 
 <Cards
   images={[
-    { title: "What we thought it was", src: s("plumbing1.png") },
+    { title: "What we thought it was", src: s("plumbing1", "png") },
-    { title: "What it actually was", src: s("plumbing2.png") },
+    { title: "What it actually was", src: s("plumbing2", "png") },
   ]}
 />
 
@@ -99,8 +101,8 @@ Now that the **BEEG FREEDGE** is up and running we had our first load of ice cre
 
 <Cards
   images={[
-    { title: "🍦 First ice cream", src: s("icecream.jpg") },
+    { title: "🍦 First ice cream", src: s("icecream") },
-    { title: "🧊 First ice cube", src: s("icecube.jpg") },
+    { title: "🧊 First ice cube", src: s("icecube") },
   ]}
 />
 
@@ -108,8 +110,8 @@ We discovered that it's really annoying to buy barstools. It seems to be an item
 
 <Cards
   images={[
-    { title: "Adjusting the height", src: s("stool1.jpg") },
+    { title: "Adjusting the height", src: s("stool1") },
-    { title: "Post- and Pre- adjustment", src: s("stool2.jpg") },
+    { title: "Post- and Pre- adjustment", src: s("stool2") },
   ]}
 />
 
@@ -117,10 +119,10 @@ Our old kitchen has finally been removed! It managed to sit on our front garden
 
 <Cards
   images={[
-    { title: "Going", src: s("going1.jpg") },
+    { title: "Going", src: s("going1") },
-    { title: "Going", src: s("going2.jpg") },
+    { title: "Going", src: s("going2") },
-    { title: "Gone", src: s("gone.jpg") },
+    { title: "Gone", src: s("gone") },
-    { title: "Snazzy grout!", src: s("grout.jpg") },
+    { title: "Snazzy grout!", src: s("grout") },
   ]}
 />
 
@@ -128,7 +130,7 @@ During the removal we found that the grout had previously been bright red! A ver
 
 We pulled up some of the lino floor to see what was beneath, and it was more lino. So we pulled up some more of the lino floor to see what was beneath beneath, and it looks like it's flagstones! We haven't yet escavated the entire floor, but we think that around 80% of the floor will be flagstones, and the other 20% will be rubbish.
 
-<Solocard title="Flagstones" src={s("flagstone.jpg")} />
+<Solocard title="Flagstones" src={s("flagstone")} />
 
 This is going to be our future dining room but we don't have a plan for how we'll renovate it yet.
 
@@ -138,7 +140,7 @@ We've finally moved back into the master bedroom! Woo!
 
 That doesn't mean that we're finished decorating it, it just means that we now sleep in a larger temporary room. It's a lot greener than it was, but it still needs more green.
 
-<Solocard title="Needs more green" src={s("green.jpg")} />
+<Solocard title="Needs more green" src={s("green")} />
 
 We had planned to finish it in the weird bit of time between Christmas and New Years, but we ran out of paint and the paint shop is closed. That's also the reason why the barstool legs are still silvery and not brassy/goldy to match the ✨bling tap✨. I wasn't quite prepared for how many of the independent shops close at this time of year, but it's really cool to have them and they deserve some time off. Once we've refuelled our paint reserves we'll get back to trying to finish it.
 
@@ -152,14 +154,14 @@ We spent a surprisingly arduous afternoon making marmalade from Ozzy's granddad'
 
 <Cards
   images={[
-    { title: "Ready to go", src: s("m1.jpg") },
+    { title: "Ready to go", src: s("m1") },
-    { title: "The tedious bit", src: s("m2.jpg") },
+    { title: "The tedious bit", src: s("m2") },
-    { title: "Just a pinch of sugar", src: s("m3.jpg") },
+    { title: "Just a pinch of sugar", src: s("m3") },
-    { title: "We had to quickly source some extra jars", src: s("m4.jpg") },
+    { title: "We had to quickly source some extra jars", src: s("m4") },
   ]}
 />
 
-<Solocard title="Om nom nom!" src={s("m5.jpg")} />
+<Solocard title="Om nom nom!" src={s("m5")} />
 
 We're so proud of ourselves - the marmalade is delicious! We will enter it into the family competition and it will get 🏆 first place 🏆 (prove us wrong, family!)
 
@@ -171,8 +173,8 @@ It works reasonably well! We are thinking of upgrading certain bits that we thin
 
 <Cards
   images={[
-    { title: "Cinema room setup", src: s("cinema1.jpg") },
+    { title: "Cinema room setup", src: s("cinema1") },
-    { title: "We can watch films!", src: s("cinema2.jpg") },
+    { title: "We can watch films!", src: s("cinema2") },
   ]}
 />
 
@@ -182,11 +184,11 @@ Christmas and New Years! Woo! It's great to have a holiday again and see people.
 
 <Cards
   images={[
-    { title: "Christmas tree height adjustment", src: s("tree1.jpg") },
+    { title: "Christmas tree height adjustment", src: s("tree1") },
-    { title: "Presents waiting to go", src: s("pressies.jpg") },
+    { title: "Presents waiting to go", src: s("pressies") },
     {
       title: "New Years Walk, with New Years fish and chips",
-      src: s("walk.jpg"),
+      src: s("walk"),
     },
   ]}
 />

src/content/blog/year2022-1.mdx

@@ -2,10 +2,13 @@
 layout: ../../layouts/LayoutMdx.astro
 title: Most of 2022
 date: 2022-08-22
-image: year2022-1/toilet5.jpg
+dir: year2022-1
+image: toilet5
 description: most of a year happens
 ---
-export const s = (s) => `year2022-1/${s}`;
+
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("year2022-1");
 
 import Cards from "../../components/Cards.astro";
 import Callout from "../../components/Callout.astro";
@@ -17,15 +20,17 @@ import Quote from "../../components/Quote.astro";
 
 We're baaaaack! It's been quite a while since the last update and while we can make up lots of excuses for this, no one wants to hear them and they're not very good.
 
-<Cards images={[
+<Cards
-    {title: "Excuse no. 1", src: s("excuse1.jpg")},
+  images={[
-    {title: "Excuse no. 2", src: s("excuse2.jpg")},
+    { title: "Excuse no. 1", src: s("excuse1") },
-    {title: "Excuse no. 43", src: s("excuse4.jpg")},
+    { title: "Excuse no. 2", src: s("excuse2") },
-    {title: "Excuse no. 57", src: s("excuse6.jpg")},
+    { title: "Excuse no. 43", src: s("excuse4") },
-    {title: "Excuse no. 3463a", src: s("excuse48.jpg")},
+    { title: "Excuse no. 57", src: s("excuse6") },
-    {title: "Excuse no. 3463b", src: s("excuse5.jpg")},
+    { title: "Excuse no. 3463a", src: s("excuse48") },
-    {title: "Excuse no. 574568468", src: s("excuse3576.jpg")},
+    { title: "Excuse no. 3463b", src: s("excuse5") },
-]} />
+    { title: "Excuse no. 574568468", src: s("excuse3576") },
+  ]}
+/>
 
 We're about to kick off another load of work on the house, but before we can get to any of that we need to get you all up to date with what's been going on in the....
 
@@ -37,8 +42,9 @@ The shower glass was the last thing to go in. We now consider this room done\* (
 
 <Cards images={[
 
-    {title: "Glass in. No more wet feet on the toilet 😬", src: s("bathroom2.jpg")},
+    {title: "Glass in. No more wet feet on the toilet 😬", src: s("bathroom2")},
-    {title: "Done*", src: s("bathroom1.jpg")},
+    {title: "Done*", src: s("bathroom1")},
+
 ]} />
 
 ## The Bedroom
@@ -51,8 +57,9 @@ The cinema is a lot nicer than it was. We upgraded the seating when Ozzy bought
 
 <Cards images={[
 
-    {title: "Before", src: s("cine-1.jpg")},
+    {title: "Before", src: s("cine-1")},
-    {title: "After", src: s("cine-2.jpg")},
+    {title: "After", src: s("cine-2")},
+
 ]} />
 
 We took a large step sideways when we became custodians of Henry's exercise bike and rowing machine to turn our cinema into a gymena (that word is much more fun to say than to type). When we tried out this arrangement for the first time it began very well, but as the projector warmed up it quickly became unpleasant on the bike as the projector belches hot air straight into your face. We solved this by buying a **BIG FAN**, which we probably should have had anyway as there isn't a lot of airflow in the basement.
@@ -67,9 +74,10 @@ It is hard to paint a tube with a brush. It looks _okaayy_.
 
 <Cards images={[
 
-    {title: "Spray painting the legs", src: s("legs0.jpg")},
+    {title: "Spray painting the legs", src: s("legs0")},
-    {title: "Spray painting the legs a bit more", src: s("legs1.jpg")},
+    {title: "Spray painting the legs a bit more", src: s("legs1")},
-    {title: "After the latest paint", src: s("legs2.jpg")},
+    {title: "After the latest paint", src: s("legs2")},
+
 ]} />
 
 If we knew what we knew now, we'd have either bought the legs already ✨bling✨ed, or been satisfied with the legs as they were. It wasn't really worth the amount of effort we had to put in to change them.
@@ -82,8 +90,9 @@ A quick little project we fancied was to create an outdoor balconette seating ar
 
 <Cards images={[
 
-    {title: "Flooring in", src: s("balcony1.jpg")},
+    {title: "Flooring in", src: s("balcony1")},
-    {title: "Done*", src: s("balcony2.jpg")},
+    {title: "Done*", src: s("balcony2")},
+
 ]} />
 
 ## Sash window
@@ -102,8 +111,9 @@ The crowbar went in, and after a little scare where we thought the wood had brok
 
 <Cards images={[
 
-    {title: "Crowbars and windows shouldn't be mixed", src: s("window1.jpg")},
+    {title: "Crowbars and windows shouldn't be mixed", src: s("window1")},
-    {title: "A big hole in our house", src: s("window2.jpg")},
+    {title: "A big hole in our house", src: s("window2")},
+
 ]} />
 
 Next was trying to access the weights compartment. This was not successful. We just couldn't find a way to remove the cover without looking like we would damage the wood in such a way that the window would no longer smoothly run over it.
@@ -122,16 +132,18 @@ Remember what it was like?
 
 <Cards images={[
 
-    {title: "Eurgh", src: s("toilet-eurgh.jpg")},
+    {title: "Eurgh", src: s("toilet-eurgh")},
-    {title: "Yuck", src: s("toilet-yuck.jpg")},
+    {title: "Yuck", src: s("toilet-yuck")},
+
 ]} />
 
 First off, demolition. It was pretty easy to remove the backsplash tiles and sink. The tiles were attached to wallpaper, which was attached to expanded polystyrene, which was not very attached to wall. There was a large amount of polyfillering, sanding, then more polyfillering to do once the old tiles and sink had been ripped out.
 
 <Cards images={[
 
-    {title: "Forever", src: s("toilet-destroy.jpg")},
+    {title: "Forever", src: s("toilet-destroy")},
-    {title: "Polyfillering", src: s("toilet-polyfiller.jpg")},
+    {title: "Polyfillering", src: s("toilet-polyfiller")},
+
 ]} />
 
 Next, painting. We thought it was fitting that, as the previous colour was leftover blue paint from what our office was, the new colour is the leftover green paints from our bedroom and front door. Clearly it is too small a room for anyone to bother buying new paint! In fact, it was so small a room that Ozzy decided it would be _far too_ crowded for more than one person to do the painting, so Nikki had to do it all (oh no 🙃).
@@ -140,27 +152,27 @@ Next next, we installed the sink, toilet seat, new light, elephant fittings and
 
 <Cards images={[
 
-    {title: "Painting", src: s("toilet-painting.jpg")},
+    {title: "Painting", src: s("toilet-painting")},
-    {title: "More painting", src: s("toilet-painting2.jpg")},
+    {title: "More painting", src: s("toilet-painting2")},
-    {title: "Sinkholes", src: s("toilet1.jpg")},
+    {title: "Sinkholes", src: s("toilet1")},
-    {title: "Sink", src: s("toilet2.jpg")},
+    {title: "Sink", src: s("toilet2")},
-    {title: "Elephant fittings", src: s("toilet-fittings.jpg")},
+    {title: "Elephant fittings", src: s("toilet-fittings")},
-    {title: "Waiting for our jungle print", src: s("toilet4.jpg")},
+    {title: "Waiting for our jungle print", src: s("toilet4")},
-    {title: "Jungle print!", src: s("toilet5.jpg")},
+    {title: "Jungle print!", src: s("toilet5")},
+
 ]} />
 
 Next next next was a fair amount of plumbing planning. We had already bought some plumbing supplies, but more were needed, and we wanted to be certain we could get the job fully done once we started.
 
-<Solocard title="Totally fits ⁔" src={s("car.jpg")} />
+<Solocard title="Totally fits ⁔" src={s("car")} />
 
 In went the lego pipes for hot and cold. After the requisite testing, splashing, swearing and fixing, we had the sink input complete and the sink output briefly set up using the fêted (fetid?) "Nozzy Dishwasher" drainage method (a bucket underneath, for those who don't remember). We connected the waste properly shortly afterwards and painted them to blend into the walls.
 
-<Solocard title="Pre-painted plumbing picture" src={s("toilet3.jpg")} />
+<Solocard title="Pre-painted plumbing picture" src={s("toilet3")} />
-
 
 Next next next next was the floor. We had a sample set of vinyl planks from Nikki's parents which were fine, except we thought we'd like a colour that more closely matched the kitchen floor. In they went. Silicon went round the edges and the room is now a _lot_ less woodlousey and spidery than it was. The vinyl planks were easy to score and snap, but it would have been a lot simpler to work with had the room been less entirely made of edges, none of which were square.
 
-<Solocard title="Looking done*!" src={s("toilet6.jpg")} />
+<Solocard title="Looking done*!" src={s("toilet6")} />
 
 All in all, we would class this room as a huge success for us, even though it took so long to work ourselves up to it. The plumbing job took a while to plan for, but because we had planned so hard it was pretty straightforward to actually do. This is a dangerous lesson, as we are generally a bit prone to overanalysing instead of getting on with things.
 
@@ -169,14 +181,15 @@ All in all, we would class this room as a huge success for us, even though it to
 One of the joys of having this blog is being able to relive the past and reminisce about what the house used to be like and how far we've come. Unfortunately, that joy comes with the ability to read sentences like the following
 
 <Quote person="Ozzy" date="Oct 2021">
-    High on our priority list is now a way to sort this out without having to climb on the roof
+  High on our priority list is now a way to sort this out without having to
+  climb on the roof
 </Quote>
 
 Look at that! That's me declaring a high priority item from nearly a year ago.
 
 As you may have guessed, we haven't fixed this one yet and after the recent heavy rain our house rained inside again. Aaargghgh! We need to be able to sort this out. We are looking at methods of preventing the gutter from filling up with debris, and ways of clearing out the internal gutter. Seeing as how it was summer Ozzy found an appropriately summery solution - a bucket and spade. Expect more updates on this in the future.
 
-<Solocard title="Bucket and spade" src={s("summer.jpg")} />
+<Solocard title="Bucket and spade" src={s("summer")} />
 
 ## Study sofabed
 
@@ -184,15 +197,16 @@ We're planning to have more sleepovers at our house going forward, and given the
 
 <Cards images={[
 
-    {title: "Great engineering", src: s("sofabed-engineering.jpg")},
+    {title: "Great engineering", src: s("sofabed-engineering")},
-    {title: "For a very sunny sofabed", src: s("sofabed.jpg")},
+    {title: "For a very sunny sofabed", src: s("sofabed")},
+
 ]} />
 
 ## Any other updates?
 
 There is one cool housey news thing that's too good not to share. One of our neighbours pointed out one of the roses in our garden and gave us a bit of its history. It's a variety called Whiter Shade of Pale, and it was planted here because the previous owner's husband was [Denny Cordell](https://en.wikipedia.org/wiki/Denny_Cordell) - the producer for Procol Harum, as well as some early Moody Blues albums 😄
 
-<Solocard title="Whiter shade of paaaale 🎶" src={s("rose.jpg")} />
+<Solocard title="Whiter shade of paaaale 🎶" src={s("rose")} />
 
 We also marked another important milestone - We made our first apple crumble from the apples in our garden. Yum yum yum
 
@@ -202,9 +216,7 @@ We are in the calm before the storm. Sept-Oct-Nov are currently all booked with
 
 Clearly this isn't enough housey upheaval because we've decided that we're going to tackle a little utility room improvement ourselves before/at the same time.
 
-<Callout>
+<Callout>Nikki and Ozzy are not the wisest</Callout>
-  Nikki and Ozzy are not the wisest
-</Callout>
 
 We've finally managed to learn that nothing is ever really **done** done, it's only done\*, and it's just a matter of priorities for when you decide enough is enough and it's time to move onto the next thing for now.
 

src/content/blog/year2022-end.mdx

@@ -2,10 +2,13 @@
 layout: ../../layouts/LayoutMdx.astro
 title: 2022 Christmas Episode
 date: 2022-12-25
-image: year2022-end/winterwonderland.jpg
+dir: year2022-end
+image: winterwonderland
 description: the bathroom is usable finally
 ---
-export const s = (s) => `year2022-end/${s}`;
+
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("year2022-end");
 
 import Cards from "../../components/Cards.astro";
 import Callout from "../../components/Callout.astro";
@@ -15,8 +18,9 @@ import Progress from "../../components/Progress.astro";
 import YTVideo from "../../components/YTVideo.astro";
 import Quote from "../../components/Quote.astro";
 
-<h4 style="text-align:center;margin-bottom:20px">🎄 House News - Festive 2022 edition! 
+<h4 style="text-align:center;margin-bottom:20px">
- 🎄</h4>
+  🎄 House News - Festive 2022 edition! 🎄
+</h4>
 
 As we come up to two years in our house, it's so nice for us to look back on what it was, and how far it's come. It really feels like home, and every improvement we make helps us feel warm and comfy and cosy. 😊
 
@@ -27,30 +31,34 @@ Here's what's been done since November.
 Progress! It's been about a month since the last update and Simon and Will have been absent for most of it. There just wasn't enough work that they were able to progress due to a lack of product. Time for another quote from the Ghost of Nozzy Past that we haven't fully taken to heart.
 
 <Quote person="Nikki and Ozzy" date="Oct 2021">
-    If we do something like this again I'm just going to ask to have all the products sent to our house straightaway - we've got enough space to store it and it would give a much larger buffer for these supply chain issues.
+  If we do something like this again I'm just going to ask to have all the
+  products sent to our house straightaway - we've got enough space to store it
+  and it would give a much larger buffer for these supply chain issues.
 </Quote>
 
 At the end of our last update, they had installed the vanity and created wooden templates for the stone which was to go in the window ledges, niches and the countertop.
 
-<Cards images={[
+<Cards
-    {title: "Vanity unit", src: s("bathroom-vanity.jpg")},
+  images={[
-    {title: "Templates", src: s("bathroom-templating.jpg")},
+    { title: "Vanity unit", src: s("bathroom-vanity") },
-]} />
+    { title: "Templates", src: s("bathroom-templating") },
+  ]}
+/>
 
 After many delays with deliveries on so many of the products that we ordered in June, we finally received the last of our bathroom fittings. Unfortunately the part we were still missing was the stone - which we couldn't have ordered in advance because it depended on accurate measurements of the tiling. This meant that we couldn't install the sink which rested upon it, we couldn't use the toilet as there was nowhere to wash our hands, and the shower wasn't useable because there was exposed wood/plasterboard in the niches. So even if the products _had_ turned up on time it wouldn't have helped us use the bathroom any sooner.
 
 We were down to the wire. It was the run up to Christmas and New Year, when all the factories and bathroom shops shut until January. The bathroom designer had already left for the holidays, so we and Simon talked directly to the stone manufacturers. We like to think of them as alchemists that transfigure the wooden templates into stone. We were assured the stone would be delivered around 8am, the last Thursday before Christmas. We spent a rather restless morning waiting for them to appear. At noon, the manufacturer office closed for the holidays and were unreachable by phone. The stone arrived at 1pm 😬. To say we were relieved is a massive understatement!!
 
-<Solocard title="Present from Santa 🎅" src={s("bathroom-santa.jpg")} />
+<Solocard title="Present from Santa 🎅" src={s("bathroom-santa")} />
 
 In the span of a day and a half, Simon and Will installed everything: our shower glass, the mirror, ledges, countertop, sink, backsplash and radiator. We can now have this bathroom available for guests coming in the next few weeks. We are so so pleased with how it looks. Bling!
 
 <Cards images={[
 
-    {title: "Bathroom!", src: s("bathroom1.jpg")},
+    {title: "Bathroom!", src: s("bathroom1")},
-    {title: "Bathroom!", src: s("bathroom2.jpg")},
+    {title: "Bathroom!", src: s("bathroom2")},
-]} />
 
+]} />
 
 The silicon was still curing as we left to head off for Christmas, but when we get back we'll be able to have the first test shower! An excellent Christmas present to us 🎁
 
@@ -63,33 +71,33 @@ The hallway is done\*!
 Last time, we said that the last remaining things were:
 
 <Quote person="Nikki and Ozzy" date="Nov 2022">
-    A stair runner, boxing in the electrics, getting a solution for coat and shoe storage.
+  A stair runner, boxing in the electrics, getting a solution for coat and shoe
+  storage.
 </Quote>
 
 We are delighted to tell you that we succeeded on all fronts.
 
 <Cards images={[
 
-    {title: "Stair runner", src: s("hallway-finished.jpg")},
+    {title: "Stair runner", src: s("hallway-finished")},
-    {title: "Boxing in the electrics, solution for coat storage", src: s("hallway-coatrackboxing.jpg")},
+    {title: "Boxing in the electrics, solution for coat storage", src: s("hallway-coatrackboxing")},
-    {title: ".. and a solution for shoe storage.", src: s("hallway-shoerack.jpg")},
+    {title: ".. and a solution for shoe storage.", src: s("hallway-shoerack")},
-]} />
 
+]} />
 
 Ok so we didn't quite get there by the end of the year. We are on the lookout for a nice bench with storage. It's pretty functional now already despite the shoes everywhere.
 
 The only part of this that we actually did ourselves was the coat rack. Nikki found some nice hooks in a local shop, found a suitable bit of wood in the basement and set about routing the edges down and giving it a nice coat of paint. (the first coat it would have on, hehe)
 
-<Solocard title="Check where you drill...... 😬" src={s("hallway-oopscable.jpg")} />
+<Solocard title="Check where you drill...... 😬" src={s("hallway-oopscable")} />
 
 We unluckily chose a spot right where a hidden cable sits in the wall, but noticed before any zapping occurred. We moved the fixing a little to the left, and the offset will hopefully not be noticeable once we paint over the screwheads.
 
 <Cards images={[
 
-  {title: "A good tip for keeping mess to a minimum when drilling holes in the wall - Post-its!", src: s("hallway-nicetip.jpg")},
+{title: "A good tip for keeping mess to a minimum when drilling holes in the wall - Post-its!", src: s("hallway-nicetip")},
 ]} />
 
-
 ## Utility Room
 
 The utility room is pretty cold at this time of year. Unrelatedly, we haven't progressed this much since the last update.
@@ -100,10 +108,10 @@ Next, we needed to seal it. We used a hardwax oil, wiped it around and buffed it
 
 <Cards images={[
 
-    {title: "First coat going on", src: s("hardwaxoil1.jpg")},
+    {title: "First coat going on", src: s("hardwaxoil1")},
-    {title: "🦭", src: s("hardwaxoil2.jpg")},
+    {title: "🦭", src: s("hardwaxoil2")},
-]} />
 
+]} />
 
 The finished worktop went back in the cold utility room, we shut the door, and now we can forget about it until after the new year.
 
@@ -111,11 +119,17 @@ The finished worktop went back in the cold utility room, we shut the door, and n
 
 Having sorted out the heat problem elsewhere in the house, we had four radiators with faulty TRVs (thermostatic radiator valves) which we needed to deal with. Wiggling with pliers no longer did anything. We did some research, bought some new TRVs off Screwfix, and set about draining the radiators to fit them. We're no strangers to this process so we were feeling pretty confident.
 
-<Solocard title="Our house comes with useful drainage holes" src={s("radiator-drainagesystem.jpg")} />
+<Solocard
+  title="Our house comes with useful drainage holes"
+  src={s("radiator-drainagesystem")}
+/>
 
 It turns out that TRVs aren't quite as interchangable as we'd thought...
 
-<Solocard title="New-fangled wireless heating..." src={s("radiator-streeeeetch.jpg")} />
+<Solocard
+  title="New-fangled wireless heating..."
+  src={s("radiator-streeeeetch")}
+/>
 
 Aaarggh!
 
@@ -126,7 +140,7 @@ Well, we're basically plumbing experts now - why not break out the pex pipes and
 We asked Simon for his advice, and he suggested soldering some extra copper pipe on, with a collar to join over the gap. This was a bit more than we were prepared for (or had the tools for!), but Simon offered to do it for us. We were fortunate he was there!
 
 <Callout title="💡 Simon's Top Tip for Soldering 💡">
-    The important bit is not to set things on fire
+  The important bit is not to set things on fire
 </Callout>
 
 Not all of the pipes required extending. The ones that didn't, however, had a different challenge in the form of an olive. These are rings of copper or brass which compression fit when you tighten the bolts between the valve and the pipe. To get a new valve on, we had to take the old olives off without damaging the pipe. This involves sawing through part of the olive (but not the pipe), then turn a screwdriver in the resulting groove to ping it off (with suitable eye protection).
@@ -135,10 +149,10 @@ Annoyingly, we had issues with the other end of the TRVs as well. It turns out t
 
 <Cards images={[
 
-    {title: "Removing old radiator tail", src: s("radiator-wrench.jpg")},
+    {title: "Removing old radiator tail", src: s("radiator-wrench")},
-    {title: "All replaced!", src: s("radiator-dead-valves.jpg")},
+    {title: "All replaced!", src: s("radiator-dead-valves")},
-]} />
 
+]} />
 
 Eventually we got everything back together and spent the next week bleeding the bleedin' radiators, but now we've got a lovely toasty house 🔥🏠🔥
 
@@ -150,17 +164,23 @@ To the professionals!
 
 After we had rung what seemed like every gardener in the South West only to find them all busy, we had a recommendation of someone who does another neighbour's garden. We booked them for a one-off garden blitz to help us get things under control.
 
-<Solocard title="They filled this entire skip with cuttings" src={s("garden-skip.jpg")} />
+<Solocard
+  title="They filled this entire skip with cuttings"
+  src={s("garden-skip")}
+/>
 
 The blitz was a much bigger transformation than we thought it would be. We found an entire patio below the dodgy willow. The fir by the secret stair came down. The mock orange by the gate has been cut right back down. All in all it is our same garden but tidy and more open. We are looking forward to when the verdure comes back, to screen the sections from each other.
 
 We also found this bistro set in a local market so we can sit further down the garden on sunnier days.
 
-<Solocard title="Perfect for a cup of tea on our excavated patio (tat not included)" src={s("garden-bistro.jpg")} />
+<Solocard
+  title="Perfect for a cup of tea on our excavated patio (tat not included)"
+  src={s("garden-bistro")}
+/>
 
 The guys who came round to do the blitz were great, really chatty, knowledgeable and did a fantastic job. They came just in time!
 
-<Solocard title="The very next day" src={s("winterwonderland.jpg")} />
+<Solocard title="The very next day" src={s("winterwonderland")} />
 
 We're going to get them back next year to help us grow the garden back with a little more thought and direction.
 
@@ -170,8 +190,8 @@ In this time we have also done some assorted small jobs. The lightswitch in our
 
 We're starting to plan our priorities for house improvements for the coming year. Probably some more painting, maybe the stairs, you'll have to stay tuned to find out ;)
 
-<Solocard title="🎄 Feeling very Christmassy 🎄" src={s("christmas.jpg")} />
+<Solocard title="🎄 Feeling very Christmassy 🎄" src={s("christmas")} />
 
 Merry Christmas with love from us both, and a very happy New Year to you all.
 
-<NextPrev prev="year2022-w3" />
+<NextPrev prev="year2022-w3" next="year2023-1" />

src/content/blog/year2022-w1.mdx

@@ -2,10 +2,13 @@
 layout: ../../layouts/LayoutMdx.astro
 title: 2022 Autumn Works 1
 date: 2022-09-15
-image: year2022-w1/utility-progress.jpg
+dir: year2022-w1
+image: utility-progress
 description: we get the people back
 ---
-export const s = (s) => `year2022-w1/${s}`;
+
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("year2022-w1");
 
 import Cards from "../../components/Cards.astro";
 import Callout from "../../components/Callout.astro";
@@ -23,7 +26,7 @@ As we hinted last time, we have been beavering away on our own project: reinstat
 
 Cast your mind back, to the days of yore, when ceilings were fluffy and mould ran amok.
 
-<Solocard title="What it was like pre-moving in" src={s("utility-original.jpg")} />
+<Solocard title="What it was like pre-moving in" src={s("utility-original")} />
 
 We already had a layout in mind, and as we were going to install everything ourselves, we went with an IKEA kitchen - the instructions are always very good and there are lots of resources online for others doing the same sort of thing.
 
@@ -33,7 +36,7 @@ Delivery was pants. The drivers seemed to be gig-economy self-employed, liable f
 
 First off - extra storage. Another 8 of the parcels were boxes for these shelves. Very useful! We will have to come up with more wacky drawer combinations, like our coffee-and-cheesegrater drawer, or the cat-food-and-sewing-machine cupboard. The shelving unit fitted in with only a few millimetres to spare. Optimal!!
 
-<Solocard title="🥳 More Storaaaage 🥳" src={s("utility-storage.jpg")} />
+<Solocard title="🥳 More Storaaaage 🥳" src={s("utility-storage")} />
 
 Next we started tackling the sink side. The much more exciting side!
 
@@ -41,32 +44,36 @@ One of the things to note about using IKEA kitchens is that they are notorious f
 
 When we'd measured the wall-to-wall width, it was approx 2m70 - easily enough room for 2 x 40cm drawer units, a 60cm sink unit and 2 x 60cm machines. BUT WAIT, we needed room for cover boards to make the sides of the machines look nicer. Each of these adds another 1.5cm width. BUT WAIT, the machines need extra to get them in and out of their holes. BUT WAIT, the walls have sticky-outy bits that eat into the room width. Getting the cabinets to fit around the wide variety of obstacles was pretty difficult: shutoff taps, gas pipes, wonky walls, dodgy tiling jobs... We made good use of our router and jigsaw.
 
-<Cards images={[
+<Cards
-    {title: "Channelling", src: s("utility-channelling.jpg")},
+  images={[
-    {title: "Fitting", src: s("utility-fitting.jpg")},
+    { title: "Channelling", src: s("utility-channelling") },
-    {title: "Cutouts for everything", src: s("utility-tap-access.jpg")},
+    { title: "Fitting", src: s("utility-fitting") },
-]} />
+    { title: "Cutouts for everything", src: s("utility-tap-access") },
+  ]}
+/>
 
 We really pushed our luck with fitting as much as we could sideways on both sides of the room. It somehow turned out fine, living on the wild side ;)
 
 The sink cabinet needed extra adjustments. We still had the old butler sink - but on closer inspection it was a non-standard slightly-too-big size, needed a lot of cleaning and restoring and was mega heavy. In the end we decided it wasn't worth the effort. We ordered a new very similar, but lighter, sink and then got to work on the cabinet. IKEA don't expect you to use a sink that they haven't sold you, so this is where we really made use of the online resources. Big cut-outs on the sides, wood platform to sit the sink on, drill a hole for the waste, drill holes at the back for the pipes. (new tool! 🎉🎉🎉). Is it really yours if you don't drill holes in it?
 
-<Cards images={[
+<Cards
-    {title: "Cut-outs", src: s("utility-cutout.jpg")},
+  images={[
-    {title: "Wood platform and waste hole", src: s("utility-wastecut.jpg")},
+    { title: "Cut-outs", src: s("utility-cutout") },
-    {title: "Pipe holes, new tool!! 🎉🎉🎉", src: s("holesaw.gif")},
+    { title: "Wood platform and waste hole", src: s("utility-wastecut") },
-    {title: "Installing the pipes", src: s("utility-pipes.jpg")},
+    { title: "Pipe holes, new tool!! 🎉🎉🎉", src: s("holesaw", "gif") },
-]} />
+    { title: "Installing the pipes", src: s("utility-pipes") },
+  ]}
+/>
 
 Next was a lot of painting. Ozzy hates painting as we have all heard, so Nikki did it all. Painting the cabinets may have been a mistake - the finish isn't strong enough and the paint scratches easily. Looks nice though. Painty painty paint.
 
-<Solocard title="Painty painty" src={s("utility-painty.jpg")} />
+<Solocard title="Painty painty" src={s("utility-painty")} />
 
 We installed the water supply pipes and the sink, sink waste and a 3-armed trap for also draining the washing machine and tumble dryer. The sink and machines are now operational again! We've also ordered the worktop but this isn't likely to arrive until the end of the month.
 
 There's still a good few things to do but we're really really pleased with how it's going so far.
 
-<Solocard title="Current progress" src={s("utility-progress.jpg")} />
+<Solocard title="Current progress" src={s("utility-progress")} />
 
 ## Builders Part II - Scraping Boogaloo
 
@@ -80,7 +87,7 @@ Another mystery, the 'why would you paint a Bath stone fireplace with textured p
 
 _\*That counts as ok when you're not the person doing it_
 
-<Solocard title="Stone!" src={s("dining-stone.jpg")} />
+<Solocard title="Stone!" src={s("dining-stone")} />
 
 A quick win was to chisel the window edges so that it could be crowbarred open (what is it with windows and crowbars?) Success!! We'll need to get this window properly restored at some point as one of the panes contains one of those horrible vent windmill things - might get that glazier in as part of these works.
 
@@ -92,14 +99,19 @@ It is every bit as annoying a job as it looked, which means we are not looking f
 
 The hallway's version of the 'what's underneath all this lino' mystery has also been solved - it's proper floorboards which we can sand and stain to match the kitchen (fingers crossed!!)
 
-<Cards images={[
+<Cards
-    {title: "🎵 look at the floor, see how there's floorboards too 🎵", src: s("hallway-floorboard.jpg")},
+  images={[
-    {title: "🎵 and it was all yellow 🎵", src: s("hallway-yellow.jpg")},
+    {
-]} />
+      title: "🎵 look at the floor, see how there's floorboards too 🎵",
+      src: s("hallway-floorboard"),
+    },
+    { title: "🎵 and it was all yellow 🎵", src: s("hallway-yellow") },
+  ]}
+/>
 
 It's always really lovely to uncover some of the human history of the house. Sam & Bill, I hope you're still happy out there!
 
-<Solocard title="Yay for Sam & Bill" src={s("hallway-graffiti.jpg")} />
+<Solocard title="Yay for Sam & Bill" src={s("hallway-graffiti")} />
 
 We expect them to start work on the upstairs bathroom in another week or so.
 
@@ -113,11 +125,11 @@ The lesson learned here is: Be careful if you're using a laser level near light
 
 <Cards images={[
 
-    {title: "Getting the floorboards up (crowbar seeing a lot of use)", src: s("floorboards-up.jpg")},
+    {title: "Getting the floorboards up (crowbar seeing a lot of use)", src: s("floorboards-up")},
-    {title: "Happy wifi", src: s("happy-wifi.jpg")},
+    {title: "Happy wifi", src: s("happy-wifi")},
-    {title: "Laser levelling", src: s("laserlevelling.gif")},
+    {title: "Laser levelling", src: s("laserlevelling","gif")},
-]} />
 
+]} />
 
 ## Gutters
 
@@ -131,12 +143,12 @@ In the end I think we're going to end up with the same approach as everyone else
 
 <Cards images={[
 
-    {title: "Guttersweeps", src: s("guttersweep.jpg")},
+    {title: "Guttersweeps", src: s("guttersweep")},
-    {title: "Gutters in action", src: s("guttersweeping.jpg")},
+    {title: "Gutters in action", src: s("guttersweeping")},
-    {title: "Previous attempt", src: s("gutterPreviousAttempt.jpg")},
+    {title: "Previous attempt", src: s("gutterPreviousAttempt")},
-    {title: "Our solution", src: s("gutterSolution.png")},
+    {title: "Our solution", src: s("gutterSolution","png")},
-]} />
 
+]} />
 
 ## Cat cat cat
 

src/content/blog/year2022-w2.mdx

@@ -2,10 +2,13 @@
 layout: ../../layouts/LayoutMdx.astro
 title: 2022 Works 2
 date: 2022-10-08
-image: year2022-w2/hall_nightclub.jpg
+dir: year2022-w2
+image: hall_nightclub
 description: things go dark
 ---
-export const s = (s) => `year2022-w2/${s}`;
+
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("year2022-w2");
 
 import Cards from "../../components/Cards.astro";
 import Callout from "../../components/Callout.astro";
@@ -23,13 +26,16 @@ We made so much progress in the last update, getting all the cabinets built and
 
 We installed the kickboard under the cabinets. Not sure if this was really worth it as there's only one angle to view it without falling on the floor.
 
-<Solocard title="Kickboard is there, honest" src={s("utility_kickboard.jpg")} />
+<Solocard title="Kickboard is there, honest" src={s("utility_kickboard")} />
 
 Our worktop was delivered to the front of the house (though we asked for it to be delivered to the back). This was a bit annoying because the worktop was too long to fit down the stairs. We managed to convince Will that what he really wanted to do was help us move it, so Ozzy and Will then had to carry the very heavy worktop all around the houses and back up through the garden to get to the basement where we were going to cut it.
 
 First we made a cardboard template of the worktop. This was a really really good idea.
 
-<Solocard title="Cardboard worktop - not very durable" src={s("worktop_templating.jpg")} />
+<Solocard
+  title="Cardboard worktop - not very durable"
+  src={s("worktop_templating")}
+/>
 
 Next was transferring the template to the worktop. We lopped off some bits to get the back edge and length closer to size, then it only just fit for us both to carry it between the utility room and the basement between cuts.
 
@@ -39,17 +45,17 @@ As you may know 🎉🎉🎉 tools are our favourite 🎉🎉🎉 so we couldn't
 
 **Hoover** Another useful-but-not-exciting tool. It sucks dust. The snazziness of this hoover is that you plug your corded power tools into it, and the hoover automatically turns on when it detects you're using the tool. **Rating:** Kind of cool 😎
 
-<Solocard title="Fancy tracksaw" src={s("worktop_tracksaw.jpg")} />
+<Solocard title="Fancy tracksaw" src={s("worktop_tracksaw")} />
 
 **Tracksaw** This one is really useful. It's definitely one that we've seen lots of professionals use. The tracks are nice and solid - you can daisy chain them together. The tracks also have a slot in the underside to accomodate the clamps, so you don't need to worry about the clamps getting in the way of the saw. The saw itself cuts immediately next to the tracks, so you don't have to worry about adding 34mm on the side of the line you actually want to cut. **Rating:** Really, really useful 👍👍👍
 
-<Solocard title="Fancy jigsaw" src={s("worktop_jigsaw.jpg")} />
+<Solocard title="Fancy jigsaw" src={s("worktop_jigsaw")} />
 
 **Jigsaw** This one is good, but perhaps we don't quite understand it yet. The 'trigger' is an on-off button rather than something you have to continuously hold down. That's interesting, but it means that if you want to change the blade you need to remove the battery because otherwise it would be far too easy to accidentally turn it on. The blade itself has its own proprietary connection (boo!) which seems to just make it super awkward to attach. It's also got a built in light that strobes in time with the blade once it's at full speed, so that it looks like the blade isn't moving... We don't really get the point of that feature...
 
 I tried to film it, but it doesn't show up very well.
 
-<Solocard title="Slo-mo Strobe" src={s("strobe.gif")} />
+<Solocard title="Slo-mo Strobe" src={s("strobe", "gif")} />
 
 It does leave a very nice finish though. **Rating:** A bit weird but 👌
 
@@ -61,11 +67,13 @@ We wanted to have finished this bit before writing the update, but our builders
 
 This is arguably the most dramatic change - the hallway has changed from a very bright yellow to a very dark green, by way of a lot of wall filler and white undercoats.
 
-<Cards images={[
+<Cards
-    {title: "Undercoats", src: s("hallway_white.jpg")},
+  images={[
-    {title: "All the testers look black", src: s("hallway_testers.jpg")},
+    { title: "Undercoats", src: s("hallway_white") },
-    {title: "Dark green!", src: s("hall_nightclub.jpg")},
+    { title: "All the testers look black", src: s("hallway_testers") },
-]} />
+    { title: "Dark green!", src: s("hall_nightclub") },
+  ]}
+/>
 
 As the hallway gets no natural light, we thought we'd lean into it and make it _really_ dark. We didn't want it to feel like a poorly lit whiteish room, so we're aiming for a moodily lit passage to lighter rooms. We are going to be installing wall lights along the stairs, but at time of writing we haven't sourced any we like. We need to make sure the lights don't come out too far from the wall or they'll get in the way.
 
@@ -83,20 +91,21 @@ Rob the Electrician came over to install the wiring for new spotlights, pendants
 
 <Cards images={[
 
-    {title: "Building out the wall and ceiling", src: s("dining_studs.jpg")},
+    {title: "Building out the wall and ceiling", src: s("dining_studs")},
-    {title: "Lots of holes in the ceiling again", src: s("dining_electrics.jpg")},
+    {title: "Lots of holes in the ceiling again", src: s("dining_electrics")},
-]} />
 
+]} />
 
 Just as he was packing up (extra stuff always happens when you're just packing up) we heard a bang and all the electrics in the house went off! Very concerned, we went down to see what had happened. Luckily Rob was still alive.
 
 The consumer unit has a flap that you have to lift up to access the switches beneath which is hinged with some metal tabs. These tabs have a stupidly sharp edge. Because of our arrangement of consumer units we've got an 💪armoured cable💪 supplying this one, and those wires inside are very stiff - very difficult to get where you want them, and then very resistant to moving again. The neutral wire was curved up a little too close to the front of the box and this meant that every time the lid was replaced, the hinge-tab dug a little bit further through the insulation. Until...
 
-<Cards images={[
+<Cards
-    {title: "⚡⚡⚡ BZZZT ⚡⚡⚡", src: s("bzzt.jpg")},
+  images={[
-    {title: "⚡⚡⚡ BZZZT ⚡⚡⚡", src: s("bzzt2.jpg")},
+    { title: "⚡⚡⚡ BZZZT ⚡⚡⚡", src: s("bzzt") },
-]} />
+    { title: "⚡⚡⚡ BZZZT ⚡⚡⚡", src: s("bzzt2") },
-
+  ]}
+/>
 
 It was pretty dramatic. The 80A whole-house-fuse blew. Rob is pretty annoyed with the unit manufacturers for having such a dangerous hinge design. Especially as the dangerous tabs are right next to captive screws that are blunted to avoid this sort of issue.
 
@@ -112,14 +121,15 @@ He's going to come back with either a new front for us or a whole new unit. Ther
 
 Simon then installed some new pipes for the radiators, then up went some plasterboard. After that we had Dan the Plasterer over for a few days to cover up the awful textured paint and fill in all the holes left by the kitchen uninstall.
 
-<Cards images={[
+<Cards
-    {title: "Some pipes", src: s("dining_pipes.jpg")},
+  images={[
-    {title: "Some plasterboard", src: s("dining_plasterboardshapes.jpg")},
+    { title: "Some pipes", src: s("dining_pipes") },
-    {title: "Getting a bit plastered", src: s("dining_plasteredhalf.jpg")},
+    { title: "Some plasterboard", src: s("dining_plasterboardshapes") },
-    {title: "Completely plastered", src: s("dining_plastered.jpg")},
+    { title: "Getting a bit plastered", src: s("dining_plasteredhalf") },
-    {title: "Plastered all over the walls", src: s("dining_plastered2.jpg")},
+    { title: "Completely plastered", src: s("dining_plastered") },
-]} />
+    { title: "Plastered all over the walls", src: s("dining_plastered2") },
-
+  ]}
+/>
 
 We can really see this room coming together after the plastering. It will soon be painted dark green to match the hallway, and should become a really cosy room. Looking forward to some dinner parties!
 
@@ -129,24 +139,29 @@ Works have started in the bathroom. With our builder slot being three months lon
 
 For those of you that haven't seen, or can't remember, what our guest bathroom looked like, here's a refresher
 
-<Solocard title="So refreshing" src={s("guest_bathroom_before.jpg")} />
+<Solocard title="So refreshing" src={s("guest_bathroom_before")} />
 
 Will had so much fun stripping woodchip wallpaper that he was thrilled to find the bathroom covered with more of the same, but even more annoying because it was covered with a shinier bathroom paint. Some of this can be left behind the stud wall instead of removed. Stud walls to the rescue again!
 
-<Cards images={[
+<Cards
-    {title: "Bringing down the ceiling", src: s("bathroom_ceilidhstuds.jpg")},
+  images={[
-    {title: "Studwork for shower and toilet wall", src: s("bathroom_studs.jpg")},
+    { title: "Bringing down the ceiling", src: s("bathroom_ceilidhstuds") },
-]} />
+    {
-
+      title: "Studwork for shower and toilet wall",
+      src: s("bathroom_studs"),
+    },
+  ]}
+/>
 
 I don't think we've yet shared the design for the top floor bathroom on here. The main idea is that the shower will be at the back, and the toilet and sink on the wall in a line.
 
-<Cards images={[
+<Cards
-    {title: "Floorplan", src: s("bathroom_plan2.jpg")},
+  images={[
-    {title: "Design", src: s("bathroom_plan1.jpg")},
+    { title: "Floorplan", src: s("bathroom_plan2") },
-    {title: "Materials moodboard", src: s("bathroom_moodboard.jpg")},
+    { title: "Design", src: s("bathroom_plan1") },
-]} />
+    { title: "Materials moodboard", src: s("bathroom_moodboard") },
-
+  ]}
+/>
 
 There have been quite a few discussions on how far the raised platform comes out from the back wall. In the original design (above) it just encompasses the shower. But given Nikki's abhorrence of shower doors we decided to pull the platform all the way out to include the toilet as well, so that any extra water splashing from the shower could flow back in.
 
@@ -163,7 +178,7 @@ When our electrics went off with a bang, our server didn't immediately start bac
 We offer our unreserved apologies for the slight down-time of the Nozzy House News website - which we are sure was noticed by everybody.
 
 <Callout type="warning" title="⚠️🛎️ Public Service Announcement 🛎️⚠️">
-    Backups are important!
+  Backups are important!
 </Callout>
 
 ## 🍏 Apples 🍏

src/content/blog/year2022-w3.mdx

@@ -2,10 +2,13 @@
 layout: ../../layouts/LayoutMdx.astro
 title: 2022 Works 3
 date: 2022-11-18
-image: year2022-w3/skyline_walk.jpg
+dir: year2022-w3
+image: skyline_walk
 description: the people are nearly done
 ---
-export const s = (s) => `year2022-w3/${s}`;
+
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("year2022-w3");
 
 import Cards from "../../components/Cards.astro";
 import Callout from "../../components/Callout.astro";
@@ -31,17 +34,23 @@ Speaking of back roads, Naples seems to only have two types of road - either a 3
 
 Pompeii and Vesuvius were definitely worth a visit. They were both crowded with tourists, but still very enjoyable. Pompeii is truly a fantastic place. It especially made us think about the permanance of things.
 
-<Cards images={[
+<Cards
-    {title: "The Large Theatre", src: s("italy_pompeii3.jpg")},
+  images={[
-    {title: "The Forum and Pompeii's Downfall 🌋", src: s("italy_pompeii2.jpg")},
+    { title: "The Large Theatre", src: s("italy_pompeii3") },
-]} />
+    {
+      title: "The Forum and Pompeii's Downfall 🌋",
+      src: s("italy_pompeii2"),
+    },
+  ]}
+/>
 
 Rome was also good. Speaking of impressive buildings, Ozzy was particularly awed by the Victor Emmanuel II Monument. It's just ridiculously big.
 
 <Cards images={[
 
-    {title: "IT'S BIG", src: s("italy_big.jpg")},
+    {title: "IT'S BIG", src: s("italy_big")},
-    {title: "The Colosseum (ALSO BIG)", src: s("italy_colosseum.jpg")},
+    {title: "The Colosseum (ALSO BIG)", src: s("italy_colosseum")},
+
 ]} />
 
 The Colosseum is just one of those things that you have to do - and it's worth it. Ozzy's favourite fact about the Colosseum is that at one point it was known as the 🥮 **Frangipane Fortress** 🥮
@@ -50,8 +59,9 @@ To try and draw this section somewhat closer to the Nozzy House we'll give you a
 
 <Cards images={[
 
-    {title: "Colosseum columns", src: s("colo_columns.jpg")},
+    {title: "Colosseum columns", src: s("colo_columns")},
-    {title: "Bath Circus columns", src: s("bath_columns.jpg")},
+    {title: "Bath Circus columns", src: s("bath_columns")},
+
 ]} />
 
 Unfortunately on our return, Nikki caught Covid for the second time and Ozzy managed to avoid catching it for the second time. She's all better now with no lasting symptoms, but this rather slowed down our house-things-rate. The builders continued unabated.
@@ -60,7 +70,7 @@ Unfortunately on our return, Nikki caught Covid for the second time and Ozzy man
 
 The dining room is now nearly complete. Since the last update, the plaster was painted, floor sealed and lights, ceiling speakers and radiators installed. There are a couple of finishing touches left to do, but essentially this room is done\*.
 
-<Solocard title="Painting in progress" src={s("dining_painting.jpg")} />
+<Solocard title="Painting in progress" src={s("dining_painting")} />
 
 All that remains is to add furniture and decorate!
 
@@ -68,15 +78,16 @@ We have gradually been acquiring new bits and bobs for the dining room over the
 
 <Cards images={[
 
-    {title: "Bits", src: s("dining_lampshade.jpg")},
+    {title: "Bits", src: s("dining_lampshade")},
-    {title: "Bobs", src: s("dining_chair.jpg")},
+    {title: "Bobs", src: s("dining_chair")},
+
 ]} />
 
 We have already had a couple of sets of local friends over to try it out. It's not perfect yet but we think it looks marvellous so far.
 
 We've already committed to hosting a dinner for ten - we'll have to see how that one goes. It'll be snug but we're hoping everyone will at least have some elbow room. At the moment, while the room is full of hard surfaces, it can easily get very echoey. We're sure that adding a few soft things will help absorb that noise, e.g. guests.
 
-<Solocard title="Maaarrvellous" src={s("dining_decorated.jpg")} />
+<Solocard title="Maaarrvellous" src={s("dining_decorated")} />
 
 ## Hallway
 
@@ -86,13 +97,14 @@ The floorboards in the hallway were in an okay state, and Simon and Will have do
 
 For sanding, they opted to use a handheld orbital sander instead of a proper floorboard drum sander. This worked okayy, but it doesn't sand down the boards completely evenly - the harder knots tend to resist. Despite all attempts at dust management, extra steps had to be taken.
 
-<Solocard title="Fire safety - Always use protective equipment" src={s("safety.jpg")} />
+<Solocard
+  title="Fire safety - Always use protective equipment"
+  src={s("safety")}
+/>
 
 A single pass would have been fine, but despite him using the same stain as in the kitchen, the floorboards have been sanded, stained and oiled many many times in an attempt to try and match the finish of the adjacent kitchen floor. We think this has made the knots more pronounced.
 
-<Callout title="Lesson">
+<Callout title="Lesson">Use the right tool for the job</Callout>
-Use the right tool for the job
-</Callout>
 
 In the end it looks okayyy. We can definitely see the difference between the finish in the hallway versus the kitchen floor, but it's close enough not to grate and will probably change over time.
 
@@ -100,8 +112,9 @@ The wall lights have been installed, which we think look great (better than okay
 
 <Cards images={[
 
-    {title: "Lights", src: s("hall_lights.jpg")},
+    {title: "Lights", src: s("hall_lights")},
-    {title: "Floorboards", src: s("hall_floorboards.jpg")},
+    {title: "Floorboards", src: s("hall_floorboards")},
+
 ]} />
 
 Rob also came back (though still traumatised) to replace our consumer unit front.
@@ -114,9 +127,10 @@ The bathroom is taking shape! Much of the work has been the same as when we had
 
 <Cards images={[
 
-    {title: "Mermaid paint", src: s("bathroom_mermaid.jpg")},
+    {title: "Mermaid paint", src: s("bathroom_mermaid")},
-    {title: "Underfloor heating", src: s("bathroom_underfloorheating.jpg")},
+    {title: "Underfloor heating", src: s("bathroom_underfloorheating")},
-    {title: "Floor tiles", src: s("bathroom_floortiles.jpg")},
+    {title: "Floor tiles", src: s("bathroom_floortiles")},
+
 ]} />
 
 We did have one little scare. We only thought to test the underfloor heating once all the floor tiles were down and settled. After 12 hours of leaving it on it was clear that no heating was happening... Fortunately the issue was that the underfloor wires had been connected to the towel rail connections on the controller - a quick rewire and everything is nice and warm :)
@@ -127,16 +141,17 @@ Luckily we're getting to the end of all of our major projects, so if we annoy th
 
 <Cards images={[
 
-    {title: "Cutting makes builders complain", src: s("bathroom_cutting.jpg")},
+    {title: "Cutting makes builders complain", src: s("bathroom_cutting")},
-    {title: "Herringbone looks cool though", src: s("bathroom_herringbone.jpg")},
+    {title: "Herringbone looks cool though", src: s("bathroom_herringbone")},
-    {title: "No compromises", src: s("bathroom_tilewidth.jpg")},
+    {title: "No compromises", src: s("bathroom_tilewidth")},
+
 ]} />
 
 We're waiting on a few supply issues for the next steps. The countertop needs templating and sending off to the manufacturers, but our designer lost the notes of what we agreed it would be made out of 🤦‍♂️. We also are waiting to see our towel radiator and the shower glass (which was accidentally made in the wrong colour and had to be remade).
 
 However, we can spend the waiting time admiring the tiles now they're grouted.
 
-<Solocard title="Tiling all grouted" src={s("bathroom_tiles.jpg")} />
+<Solocard title="Tiling all grouted" src={s("bathroom_tiles")} />
 
 ## Utility Room
 
@@ -150,7 +165,10 @@ In one very productive evening, we cut out all the front sections and now we can
 
 As a side note, we had to use our own tools this time as Simon had already taken most of his away. As such, we're upgrading the rating of the hoover - dust collection is incredibly important. If it's not controlled it makes tasks miserable (especially for Ozzy who has a sensitive face)
 
-<Solocard title="🎶 And at last we seee the siiiink 🎶" src={s("utility_worktop.jpg")} />
+<Solocard
+  title="🎶 And at last we seee the siiiink 🎶"
+  src={s("utility_worktop")}
+/>
 
 The tap is just there for show at the moment. We've still got to round off some more corners, seal everything and finish off the plumbing.
 
@@ -160,8 +178,8 @@ It's that time of year again. Our central heating turned on for the first time t
 
 There are several things in London that we simply never got around to doing despite being there for so many years. We managed to remove one item from our Bath list by going on the Bath Skyline Walk with our local friends. It was lovely :)
 
-<Solocard title="Walky walky" src={s("skyline_walk2.jpg")} />
+<Solocard title="Walky walky" src={s("skyline_walk2")} />
-<Solocard title="Walky walky" src={s("skyline_walk.jpg")} />
+<Solocard title="Walky walky" src={s("skyline_walk")} />
 
 We had our first mince pies the other day. Is it too early?
 

src/content/blog/year2023-1.mdx

@@ -0,0 +1,271 @@
+---
+layout: ../../layouts/LayoutMdx.astro
+title: "2023"
+date: 2023-09-11
+dir: year2023-1
+image: kayak-pub
+description: the progress happens much slower
+---
+
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("year2023-1");
+
+import Cards from "../../components/Cards.astro";
+import Callout from "../../components/Callout.astro";
+import Solocard from "../../components/Solocard.astro";
+import NextPrev from "../../components/NextPrev.astro";
+import Progress from "../../components/Progress.astro";
+import YTVideo from "../../components/YTVideo.astro";
+import Quote from "../../components/Quote.astro";
+
+House news! Back again! After another extended break. Tell a friend.
+
+It seems that we've slowed down enough to where we just don't have enough to make this a more regular feature! (That's probably a good thing)
+
+## Hallway
+
+The hallway has been our major project this year. From our front door all the way to the top of the house the walls have been covered in off-white woodchip wallpaper. Sound familiar, anyone? Yes, we had this at Harrow too.
+
+When we were dealing with the off-white woodchip in our Harrow flat, we found one wall was very stuck on. It was so frustrating to remove that we ended up leaving it in a half-removed glue-y state for almost a year before caving and getting plasterers in to skim it.
+
+<Solocard title="What we're trying to avoid 🤮" src={s("harrow-hallway")} />
+
+This time we were determined that it would not be left in such an awful state for any extended period, so we got Simon and Will back again to redecorate it for us. This hallway is in constant use and we wanted any inconveniences to happen quickly and then be gone. Plus, it's an enormous surface area to decorate with high ceilings over stairs, and they could work on it full time with the proper equipment (or the 'proper equipment').
+
+Here's a little reminder of what we started with.
+
+<Cards
+  images={[
+    { title: "Before", src: s("hallfront-before") },
+    { title: "Before", src: s("hallback-before") },
+    { title: "Before", src: s("hall-during2") },
+  ]}
+/>
+
+Not too terrible from a distance.
+
+#### Removal of the wallpaper and carpet
+
+For the first week, Simon was on holiday in Sicily 🏝️ so we only had Will. We suspect this was a deliberate plan so he could get out of steaming wallpaper. Karma came back to bite him in the form of temperatures in the 40-50°C range and his airport burning down just before he was due back. He must have really really really wanted to avoid the woodchip.
+
+Simon needn't have worried though - We were pleasantly surprised with just how quickly the woodchip went, but what was left was dark and dingy and not in a good way (unlike our lower hallway). The feeling it gave us every time we entered the house helped confirm that we wanted it light and airy.
+
+<Cards
+  images={[
+    { title: "During", src: s("hallfront-during") },
+    { title: "During", src: s("hallback-during") },
+    { title: "During", src: s("hall-during-23") },
+    { title: "During", src: s("hall-stripped1") },
+  ]}
+/>
+
+Whilst Simon was off in Sicily (potentially committing woodchip-avoidant arson?), we had our own little emergency back home. As the woodchip started disappearing up the house, we heard a big 'SHIT' from the hallway. What with so much steam, Will accidentally let water condense and dribble into our bathroom thermostat controller, which promptly caught on fire 🔥
+
+<Solocard
+  title="⚡+ 💦 = 🔥 (+ horrible smells)"
+  src={s("zapped-thermostat")}
+/>
+
+Luckily the only damage was to the thermostat and that was easily replaced - but it was a nice opportunity to ask them to replace it with a white one which then would match better with the hallway. (Previously we had a black one that would have matched the master bathroom fittings, had it been inside the master bathroom 🤦)
+
+Once Simon got back and Will had explained what happened we were treated to a few trademan's stories of fires in lath-and-plaster walls that were started by plumbers soldering, or electrical faults 😬. Apparently it's very hard to put out a fire you can't access. Fortunately, Bath stone is less flammable, but it did make us go and check that we knew where our fire extinguisher was 🧯
+
+<Cards
+  images={[
+    {
+      title:
+        "Lesson learned - Carefully masked off **and** disconnected at the consumer unit",
+      src: s("zapped-thermostat-tape"),
+    },
+  ]}
+/>
+
+#### Making it pretty
+
+Once all the paper had been removed, the next thing to do was to get the walls spruced back up. They were covered in a thin layer of plaster filler and then sanded to even out all the lumps and bumps, and then they started getting their base coats of paint.
+
+The aforementioned 'Proper Equipment' ended up being Simon on a stepladder which Will held up. They started off a lot safer, building sturdy platforms out of battens and ply, but slowly descended into madness. That's what woodchip wallpaper does to you, be careful kids.
+
+<Cards
+  images={[
+    { title: "Starting off well", src: s("hall-safety3") },
+    { title: "Definitely safe?", src: s("hall-safety2") },
+    { title: "'Proper Equipment'", src: s("hall-safety1") },
+  ]}
+/>
+
+#### The Upper Stairs
+
+Ever since we moved in we've noticed that one or two of the stairs on the upper staircase were a bit more mobile than the others. It appeared to have pulled away from the wall and was in an area where the water leaks down when the gutters are blocked. Given that mobility isn't a feature we look for in a staircase we asked Simon and Will to have a look at it whilst they were here.
+
+<Solocard title="Cracking stuff" src={s("stair-crack")} />
+
+Simon cut a hole in the plaster to have a better look at what was going on. We found out that the construction of the stairs was a lot more chunky that we had suspected. The stair was actually very firmly attached to the wall, but the issue seemed to be that it wasn't very firmly attached to the other steps next to it and so was flexing at a different rate. Simon put a load of beefy screws in to make sure the steps flexed together and we're much more confident they won't all fall down. We will keep an eye on it and if the cracks return we will get someone proper to have a look.
+
+<Cards
+  images={[
+    { title: "Investigate and beefily screw", src: s("stair-crack-hole") },
+    { title: "Cover up and leave it", src: s("stair-crack-fix") },
+  ]}
+/>
+
+#### Other fittings 💡
+
+We spent a while searching for some lights we liked and eventually settled for lantern style pendants that we found online.
+
+<Cards
+  images={[
+    {
+      title: "Building a model to check the scale",
+      src: s("proto-lights"),
+    },
+    { title: "Can't even tell them apart!", src: s("proto-lights-2") },
+  ]}
+/>
+
+The inside of the pendant was only available in chrome, which isn't what we wanted, so Nikki picked up some black spray paint and got to work.
+
+<Cards
+  images={[
+    {
+      title: "🎶I see a chrome light and I want it painted black🎶",
+      src: s("hall-lights-before"),
+    },
+    {
+      title: "🎶No colours anymore, I want them to turn black🎶",
+      src: s("hall-lights-after"),
+    },
+  ]}
+/>
+
+We weren't sure it would work very well but it turned out fine. It just needed care when installing to make sure the finish wasn't scratched. Most people aren't going to be looking too closely anyway 👀
+
+#### Other fittings 🌡️
+
+Nicer radiators! Simon and Will have finally found a decent plumber that they're happy to work with. We got them in to do the radiators and they did a proper job 😁 No stain marks on the ceiling, no leaky hot water tanks. We'll definitely be using them in future and go nowhere near our nightmare boiler people!
+
+#### Carpet
+
+We went with the same people to do the carpet as with the lower hallway and they managed to get it all done in one day...
+
+<Solocard title="Well, nearly all" src={s("carpet-during-2")} />
+
+They ran out of carpet for the last 5 steps and had to come back the next week to finish it off.
+
+We're pretty pleased with it. It's nice to walk on, looks good and should be durable.
+
+<Solocard title="The sorts of decisions you have to make" src={s("carpet-2")} />
+
+We think the hallway looks so much better but it's currently very bare and impersonal. It's a blank canvas on which to add photos, pictures and knick-knacks - which we are bad at getting around to putting up.
+
+<Cards
+  images={[
+    { title: "Looks lovely 😄", src: s("hall-done-1") },
+    { title: "Bit bare though", src: s("hall-done-2") },
+    { title: "Lights look bright, don't they!", src: s("hall-done-3") },
+  ]}
+/>
+
+## Garden Plants
+
+Since getting some gardeners to help cut back the overgrowth, we've had them back semi-regularly for maintenance. Unfortunately some of our trees didn't survive the winter and had to be removed, so we have been investigating the local garden centres (and their cafes! 🍰) for new plants (and cake! 🍰). These have now been planted and we hope in future to have some jasmine nicely trained around the patio and wisteria on our archway.
+
+<Cards
+  images={[
+    { title: "Getting plants home", src: s("plants-transport1") },
+    { title: "Fits in the car?", src: s("plants-transport2") },
+  ]}
+/>
+
+Whilst at the garden centre, we bought some herbs for the kitchen balconet 'breakfast bar'. They are doing amazingly well so far, but we will see if we can keep up the watering schedule long term. It's really convenient to have fresh herbs readily available when cooking, plus we can cadge a cheeky smell during breakfast.
+
+<Cards
+  images={[
+    { title: "Herbidacious!", src: s("herbedacious") },
+    {
+      title:
+        "The 🪄 water wizards 🪄 that look after our plants when we're away",
+      src: s("water-wizards"),
+    },
+  ]}
+/>
+
+It's been really good seeing the garden getting tamed and being able to start influencing it ourselves.
+
+## Garden Gate
+
+Our garden gate has been getting steadily less and less secure. The lock was dangling by a single screw in a slowly rotting screwhole and would probably have given way with a good shove or a slight breeze. We thought this less than ideal, so we bought a new garden gate lock. It was a bit annoying to install, avoiding existing rusty screws and holes and the doorframe, but we managed it with (on average) half our tempers lost.
+
+<Cards
+  images={[
+    { title: "Less secure", src: s("gardengate") },
+    { title: "More secure", src: s("gardengate2") },
+  ]}
+/>
+
+## Shoe storage
+
+Last time, we said that:
+
+<Quote person="Nikki and Ozzy" date="Dec 2022">
+  We are on the lookout for a nice bench with storage.
+</Quote>
+
+Well, we are delighted to announce we actually did order one at the beginning of this year. It was made to order, so it took several months to arrive. One of the reasons we went with this company was that they could use the exact same shade of paint as our walls.
+
+<Solocard title="Shoe bench!" src={s("shoerack")} />
+
+Woohoo finally. It is very useful to sit on to put shoes on. It is very long, can fit many shoes and has a little basket with spare slippers that our visitors can use.
+
+Ozzy still picks his shoes up and goes upstairs to put his shoes on. Habits are hard to break.
+
+## Tusks
+
+The 3d printer has come in clutch many times during our house renovation - remember the <a href='/week5-6#ethernet'>electrical backbox</a>? - but it also has uses for the frivolous. On the list of prints has been proper tusks for our elephant toilet who had been dealing with split ends for a long time.
+
+<Cards
+  images={[
+    { title: "Printing", src: s("tusks") },
+    { title: "Anti-poaching", src: s("toilet") },
+  ]}
+/>
+
+Every so often I wonder whether the 3d printer was worth it and do some sort of cost-benefit analysis of printing vs buying. Now that I can print elephant tusks I think I've covered the entire cost of the printer in a single print 🐘
+
+## Kayaks
+
+Two years ago, when Nikki had Covid, she bought an inflatable tandem kayak while dreaming of getting back outside and having adventures. We've used this kayak quite a few times now, on the river near us and on holiday in Windermere, but there are certain aspects of it which mean we don't use it as much as we'd like.
+
+First off: Ozzy grew up a keen kayaker and his paddling technique is very good - if you are in a proper kayak. If you are in an inflatable one with no spraydeck then it is less good and the kayak ends up with a layer of cold water at the bottom that you have to sit in. This water was conspicuously absent when Nikki tried the kayak with a different copilot. We solved this issue by getting two single kayaks and Ozzy can have a closed cockpit one by himself.
+
+Second off: Inflatable kayaks are a little wider than normal kayaks and don't track as well. They track a lot better than a cardboard box would but not as well as a nicer kayak. Ozzy, as a keen kayaker, actually notices the difference.
+
+Third off: we saw these awesome origami kayaks and we couldn't stop wanting to get one. We would go through repeated phases of 'can't justify the price', 'do we use the kayak enough', 'let's not buy them', 'they look so cool though'.
+
+So we bought some anyway with our personal fun money.
+
+<Cards
+  images={[
+    { title: "📦 Down 📦", src: s("kayak-down") },
+    { title: "🛶 Up 🛶", src: s("kayak-up") },
+    { title: "Pub on the river", src: s("kayak-pub") },
+  ]}
+/>
+
+The biggest downside so far is that they are so cool that everyone we pass in them has to ask us about them.
+
+This also means we have a spare inflatable tandem kayak if anyone wants to come join us in a flotilla down the river!
+
+## Closing Thoughts
+
+It's been really interesting having people round again to do work. I must admit that my patience for them has gone down considerably compared to the last major projects. I think this is because 1) They were very much in the way all the time, and 2) There were no interesting techniques or cool tools (and as you know 🎉🎉🎉 tools are our favourite 🎉🎉🎉)
+
+We absolutely don't regret getting people in though. If we'd been doing this ourselves it would have taken many times longer and we would have been grumpy the whole time. All in all, it's been a big success.
+
+As a final sign-off, Nikki will be running the Bath Half Marathon this October and her runner's number has just arrived in the post. If you feel like sponsoring her, she's raising money for <a href="https://www.justgiving.com/page/nicola-osborne-1692702949098" target='_blank'>the Brain Tumour charity</a> in memory of Laurie Brokenshire.
+
+<Solocard title="Looks all official and stuff" src={s("race")} />
+
+See you next time!
+
+<NextPrev prev="year2022-end" next="year2024" />

src/content/blog/year2024.mdx

@@ -0,0 +1,223 @@
+---
+layout: ../../layouts/LayoutMdx.astro
+title: "2024"
+date: 2024-12-13
+dir: year2024
+image: garden-furniture
+description: we look to the outside
+---
+
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("year2024");
+
+import Cards from "../../components/Cards.astro";
+import Callout from "../../components/Callout.astro";
+import Solocard from "../../components/Solocard.astro";
+import NextPrev from "../../components/NextPrev.astro";
+import Progress from "../../components/Progress.astro";
+import YTVideo from "../../components/YTVideo.astro";
+import Quote from "../../components/Quote.astro";
+
+It's been quite a while since we've done one of these! We've got to the point where each individual job isn't very big, so we haven't bothered documenting them.
+
+The theme for this year's works is 🌤️*outside*🌤️. We're running out of large-scale things to do inside, but there was plenty of scope outside for improvement.
+
+However, we've still accumulated quite a few other small jobs since the last update! Bim bim bam let's go
+
+## The Back
+
+Even since we arrived in Bath we struggled to fully enjoy our patio. It was a bit of an awkward shape and the floor was <sup>all</sup> _over_ <sub>the</sub> place. We also had issues with the drain, which would fill up with a big puddle in the lightest of rains.
+
+<Solocard
+  title="Still a huge improvement on what we had in Harrow..."
+  src={s("patio-before")}
+/>
+
+Well, we decided that it could be so much better and got some people in to come and build us a new one. As always, Ozzy was astonished at the speed at which demolition happens, and after a couple of days in early June we were left with a big mess in the back garden where we used to have a patio.
+
+<Cards
+  images={[
+    { title: "A big mess", src: s("patio-mess") },
+    {
+      title: "Trying to imagine what it would look like",
+      src: s("patio-thinking"),
+    },
+  ]}
+/>
+
+Work tends to go fast when you're using the right tools, and given that 🎉🎉🎉 tools are our favourite things 🎉🎉🎉, we couldn't pass up giving you a quick overview.
+
+<Solocard title="Power-Wheelbarrow and MiniDigger" src={s("patio-progress")} />
+
+The **Power-Wheelbarrow** has a weight capacity of half a ton, and can lift and tilt its bucket into a skip. Super useful when you're having to take all the spoil down the full length of our garden. The tank-style tracks have an amazing capacity for churning up lawns, and it churned up ours with gusto.
+
+The **MiniDigger** is just pretty cute. It can tuck in its treads so that it can be driven straight through a house - we didn't feel the need for a demonstration. They also didn't let us have a go as its quite a bit more tippy than a standard digger.
+
+Between them they made very quick work on removing our old patio slabs of pennant stone. They dropped them halfway down the garden, in a very neat way, that happened to expand our mid-garden patio by the 'orchard'. 😁
+
+Whilst the demolition was quick, it wasn't entirely smooth. We'd decided to have the treads of the stairs match the patio, and when they came to remove the old concrete treads, a fair part of the rest of the stairs came with them turning them into a bit of a slide.
+
+<Cards images={[
+
+    {title: "Not quite as neat as we'd hoped", src: s("stair-slide-2")},
+    {title: "Wheee", src: s("stair-slide")},
+
+]} />
+
+We had a big ol' conversation about various options on how to proceed, but we didn't really like any of the options presented. We could see that there had been several attempts at bodging this staircase previously with assorted bits of wire and cement. The lowest stair was half missing, and was instead made of soil and plant roots. In the end, we decided to get some stonemasonry people to come and fix things properly. Of course this adds more time as we need to organise more people, but we thought that it would be worth it.
+
+In the meantime, work continued on the main patio, and by the end of June it was done\*. We chose a porcelain tile as these would be very hardwearing, but mainly: flat (a feature we <sup>were</sup> _looking_ <sub>forward</sub> to). We would have relain the pennant stone if there was enough, but half of it was missing and replaced with concrete or broken.
+
+<Solocard title="Done*  (Carefully framed photo)" src={s("patio-done")} />
+
+We were so pleased with finally having a _flat patio_ that we decided to cash in a wedding present from Ozzy's parents - a garden furniture voucher. We couldn't see any expiry date, which is good considering we were over ten years late redeeming it 😀
+
+<Solocard
+  title="The voucher gained interest, hehe"
+  src={s("garden-furniture")}
+/>
+
+You can see the start of the work that the stonemasons were doing to the stairs here. They were so unsure about what might need to be done that they refused to give us a quote and instead agreed a day-rate. Watching them work was an education in stairbuilding technique.
+
+We found out that each stair is almost entirely supported by the large party wall and the stair beneath - the smaller wall beneath the stairs was a much later addition. This ruled out replacing any of the stairs because we _really_ didn't want to do anything with the shared garden wall, so instead we opted to extend each step forward a bit - increasing the overlap between each step.
+
+<Cards
+  images={[
+    {
+      title: "You can see the diagonal line that would have been unsupported",
+      src: s("stair-construction"),
+    },
+    { title: "Adding a new face and backfilling", src: s("stair-rebuild") },
+  ]}
+/>
+
+By the time the masons had finished it was already late July. Now we just had to organise a time to get the original bloke back to place the stair treads.
+
+Then, we had to get someone else to come and fix the railing. During deconstruction of the stairs, we had to cut out a few of the supports for the railing. This left it in such a wobbly state that if you did need to use it, not only would it fail to prevent your fall, it would probably fall on top of you afterwards. Fortunately, there's a really good ironmongers just down the road from us, so we got them to come and fix it up for us - it only took a few weeks, but that pushed us into September.
+
+Lastly we just needed to tackle sanding and repainting the railing. I feel that having to wait a few weeks to get someone in to do something is generally considered an encouraging sign of competence - well in that case Nikki and Ozzy must be bloody amazing at painting railings! We had to wait ages for them to start!
+
+<Cards images={[
+
+    {title: "Before", src: s("rail-before")},
+    {title: "Using bit of old railing to keep the tarps down 😎", src: s("rail-during")},
+    {title: "Looking pretty smart!", src: s("rail-after")}
+
+]} />
+
+Now we just need to wait until spring for the plants to grow back in and it'll be done! We've planted rosemary, some lavender, a peony, a rudbeckia, lots of bulbs and two climbing roses. Bets are on for how many will survive the winter. We'll share some more photos when everything's grown in a bit.
+
+DONE DONE DONE! It only took 7 months - no wonder our updates are slowing down!
+
+## The Front
+
+Whilst all this was going on, we were having some work done at the front as well. Our front garden wall has been looking a bit fally-downy ever since we got here - another similarity to Harrow 🙂 Given what Bath is like, and the visibility of this change, we decided to take our first dip into the wonderful world of planning permission and listed building consent - Yay.
+
+Fortunately, it was far easier than we expected it to be. We knew that numbers 4-7 of our house block had got their front walls repaired and re-railed a few years before we moved in. What we didn't know was that their consent forms included our house too! And because their work was started within 5 years of the permission being granted, planning for ours hadn't lapsed so we didn't need to do anything! Nice!
+
+Full steam ahead then! We had our favourite stonemason friends come round and take the unoriginal bits off, stabilise the lower course, then add a few courses of Bath stone.
+
+<Cards images={[
+
+    {title: "All in all it's just a massive crack in the wall", src: s("borked-wall")},
+    {title: "Wall down to base", src: s("front-wall")},
+    {title: "Wall built", src: s("front-wall-done")}
+
+]} />
+
+Our favourite ironmonger friends came back to add in the railings. They have a massive lead time so we had to wait a while before the railings could be installed. They drilled holes in our nice new wall, then the railings were stuck in with lead.
+
+<Cards images={[
+
+    {title: "Massive lead time", src: s("wall-lead")},
+    {title: "Front with railings", src: s("front-wall-donedone")}
+
+]} />
+
+Time for another done\*
+
+It all looks great, but the surface of the garden path is so uneven that it's not possible to close the front gate 🤦 We're choosing to think about how this shows how welcoming we are, rather than anything else.
+
+## The Others
+
+Time for the bim bim bam section of all the other small jobs!
+
+### Lounge
+
+We moved the mirror to the other side of the room, and painted the walls and bookshelves a bit. We also replaced the radiators as the old ones stopped working. We don't have a huge number of 'before' photos because we forgot.
+
+<Solocard title="In progress" src={s("lounge.MP")} />
+
+We also forgot to take 'after' photos, and we've got our Christmas decorations up now so you'll have to wait.
+
+We got a footstool which has a bed in it - we had a bit of a mixup with the delivery where we received a completely different colour in a mislabeled box - fun fun fun
+
+It's really cosy now, but it's still far from done.
+
+### Shelves
+
+<Cards images={[
+
+    {title: "Bathroom shelf", src: s("bathroom-shelf")},
+    {title: "Hallway shelf", src: s("hallway")}
+
+]} />
+
+### Basement
+
+The basement continues to be pretty uninspiring compared to the rest of the house. We are mainly using it for storage, though now we've moved the sofa bed down there. We bought some moving straps (😭) which are rated for very heavy things, and spent about an hour carrying the sofa to the basement. 💪 We had to go out of the front door, all around the side road and up the garden, as the sofa doesn't fit down our stairs. When we were halfway down the road, we got an offer from our next-door-neighbour to throw the sofa over the garden fence if it would help... (It wouldn't)
+
+The sofabed was intended for watching films in the cinema and as accommodation for guests, but it came in very handy for us to sleep in when there was a heatwave!
+
+<Cards images={[{ title: "Handy", src: s("basement-sofa") }]} />
+
+Ozzy's second love in life is big plastic storage boxes, and we've reworked a lot of our shelves to accommodate these. They aren't the prettiest, but it's useful to have contained areas for storing stuff, and it's easier to see what's in them than in cardboard boxes.
+
+Which means we can now return to the .....
+
+<Progress value={67} max={67} />
+
+WHAT'S THAT?? We've unpacked every box!! This means we've now officially moved in. Well done us! 🎉
+
+Or rather, we've just transferred things from cardboard boxes into plastic boxes.
+
+<Cards
+  images={[
+    {
+      title: "Clutter library - but now you can see what we're storing",
+      src: s("basement-storage"),
+    },
+  ]}
+/>
+
+We've also done a couple of jobs in the basement bathroom - replacing the old loud extractor fan with a quieter one, replacing the light with one that wasn't falling out of the ceiling, and repainting and covering the louvre doors with burlap to help a little with privacy. We also "repaired" the slightly leaky shower by turning it off at the stopcock. This bathroom is likely to be a future project - either ripping it out or replacing it in some way. Stay tuned to find out!
+
+## Excuses
+
+That's pretty much it for this year. As always, we've been ~distracted~ busy with other things as well. 😄
+
+<Cards images={[
+
+    {title: "Being a Disney Princess in Madeira", src: s("madeira")},
+    {title: "Visiting Bath in Belgium", src: s("belgium")},
+    {title: "Sailing ourselves around the Norfolk Broads (RIP hat 😢, lost at sea)", src: s("norfolk")},
+    {title: "Kayaking in France after a weekend of playing for Contra dancing", src: s("ande")},
+    {title: "Camping with friends in Devon", src: s("devon")},
+    {title: "More sailing on the Solent (and saw this pretty boat)", src: s("sailing")},
+    {title: "Enjoying art at Giverny", src: s("giverny")},
+    {title: "Something something Cheddar Gorge", src: s("cheddar")},
+    {title: "Awesome LVGO concert", src: s("lvgo")},
+
+]} />
+
+This LVGO concert deserves a special mention as Nikki arranged one of the pieces for it. It was used as the finale and encore and everyone loved it 🥳😮‍💨. Afterwards the composer gave Nikki two limited edition copies of the original game as a thank you. Massive sigh of relief, and definitely worth all the trouble taken!
+
+We also got a drone! Please enjoy some quick shots from our last couple of trips away in Wales and Weston-super-Mare. The unnecessarily epic music is a requirement for drone footage.
+
+<YTVideo src="Hsj6rON1nO4" />
+
+Let us know if you want any gutters inspected 😄
+
+See you all next year!
+
+<NextPrev prev="year2023-1" />

src/content/config.ts

@@ -4,7 +4,16 @@ const blogCollection = defineCollection({
   schema: z.object({
     title: z.string(),
     description: z.string(),
+    dir: z.string(),
     image: z.string(),
+    fileType: z.optional(
+      z.union([
+        z.literal("jpg"),
+        z.literal("jpeg"),
+        z.literal("gif"),
+        z.literal("png"),
+      ])
+    ),
     date: z.date(),
   }),
 });