commit e05f4b47ecd0cb0dac273afc420b51768bedcc5e parent 8a0464bcf2582084bd765f67de6f283545af2c7d Author: Martin Ashby <martin@ashbysoft.com> Date: Sat, 10 Aug 2024 20:19:17 +0100 Migrate to zine 0.3.0 Diffstat:
94 files changed, 190 insertions(+), 195 deletions(-)
diff --git a/static/css/fonts.css b/assets/static/css/fonts.css diff --git a/static/css/style.css b/assets/static/css/style.css diff --git a/build.zig b/build.zig @@ -2,10 +2,14 @@ const std = @import("std"); const zine = @import("zine"); pub fn build(b: *std.Build) !void { - try zine.addWebsite(b, .{ + zine.website(b, .{ .layouts_dir_path = "layouts", .content_dir_path = "content", - .static_dir_path = "static", + .assets_dir_path = "assets", + .static_assets = &.{ + "static/css/fonts.css", + "static/css/style.css", + }, .host_url = "https://mfashby.net", .title = "mfashby.net", }); diff --git a/build.zig.zon b/build.zig.zon @@ -3,10 +3,8 @@ .version = "0.0.0", .dependencies = .{ .zine = .{ - // TODO switch back to kristoff-it when https://github.com/kristoff-it/zine/pull/36 is merged - .url = "git+https://github.com/veggiemonk/zine.git#1de396698c2f336371668d18c87fee1d32c98e05", - .hash = "1220b10ab22d344339c4178565f981e7273d38ee702fbf9b18c1ae67da5eea81f34d", - //.path = "../zine", + .url = "https://github.com/kristoff-it/zine/archive/refs/tags/v0.3.0.zip", + .hash = "122082799c345efd9630f2f8c55c8a4093125fd10f0f8a7ecd7d768c06c831955483", }, }, .paths = .{"."}, diff --git a/comments/build.zig.zon b/comments/build.zig.zon @@ -2,8 +2,8 @@ .name = "comments", .version = "0.0.1", .dependencies = .{ .pg = .{ - .url = "https://github.com/MFAshby/pg.zig/archive/148cbe78ad8ed23b7d71ffab2e1e4537dd8a65e6.tar.gz", - .hash = "122093dd239eefdaf3112933a35bb55851e487dac392b8ad92e4c874aea21bd41244", + .url = "https://github.com/karlseguin/pg.zig/archive/239a4468163a49d8c0d03285632eabe96003e9e2.tar.gz", + .hash = "1220a1d7e51e2fa45e547c76a9e099c09d06e14b0b9bfc6baa89367f56f1ded399a0", //.path = "../../pg.zig" }, .smtp = .{ .url = "https://code.mfashby.net/smtp-zig/snapshot/smtp-zig-main.tar.xz", diff --git a/content/about/cv.md b/content/about/cv.md @@ -2,7 +2,7 @@ .title = "CV", .author = "Martin Ashby", .date = @date("2024-04-19T20:38:00Z"), -.layout = "single.html", +.layout = "single.shtml", --- # Martin Ashby - Software Engineer diff --git a/content/about/index.md b/content/about/index.md @@ -2,7 +2,7 @@ .title = "About", .author = "Martin Ashby", .date = @date("2024-03-01T23:59:52Z"), -.layout = "list.html", +.layout = "list.shtml", --- Hi, my name's Martin. diff --git a/content/index.md b/content/index.md @@ -2,5 +2,5 @@ .title = "Home", .author = "Martin Ashby", .date = @date("2024-03-27T20:26:45+00:00"), -.layout = "redirect.html", +.layout = "redirect.shtml", --- \ No newline at end of file diff --git a/content/posts/2018-05-31-new-site.md b/content/posts/2018-05-31-new-site.md @@ -2,7 +2,7 @@ .title = "New Site", .author = "Martin Ashby", .date = @date("2018-05-31T17:51:07+0100"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2018-06-01-mailu.md b/content/posts/2018-06-01-mailu.md @@ -2,13 +2,13 @@ .title = "Mailu", .author = "Martin Ashby", .date = @date("2018-06-01T20:17:00+0100"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- ## My search for an email server - + A big theme in the news recently is data protection, how your personal data is being used (and abused), and taking back control of your data. Part of the problem is that people's personal data is kept in huge private corporate networks, and historically companies have been able to do (essentially) whatever they like with it. I started investigating how difficult it would be to really re-take control of my personal data - beginning with my email. diff --git a/content/posts/assets/mailu_screenshot.png b/content/posts/2018-06-01-mailu/mailu_screenshot.png Binary files differ. diff --git a/content/posts/2018-06-02-unicornpaint.md b/content/posts/2018-06-02-unicornpaint.md @@ -2,12 +2,12 @@ .title = "Unicorn Paint", .author = "Martin Ashby", .date = @date("2018-06-02T22:33:00+0100"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- See [unicornpaint] for details. I'll write about this later... - + [unicornpaint]:https://unicorn.mfashby.net diff --git a/content/posts/assets/unicorn.gif b/content/posts/2018-06-02-unicornpaint/unicorn.gif Binary files differ. diff --git a/content/posts/2021-09-17-restart.md b/content/posts/2021-09-17-restart.md @@ -2,7 +2,7 @@ .title = "Restart", .author = "Martin Ashby", .date = @date("2021-09-17T23:41:39+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2021-09-18-maddy.md b/content/posts/2021-09-18-maddy.md @@ -2,7 +2,7 @@ .title = "Maddy", .author = "Martin Ashby", .date = @date("2021-09-18T22:05:32+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2021-09-19-longboard-setup.md b/content/posts/2021-09-19-longboard-setup.md @@ -2,11 +2,11 @@ .title = "Longboard Setup", .author = "Martin Ashby", .date = @date("2021-09-19T10:20:49+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- - + I recently picked up longboarding. I enjoy snowboarding, but in the current pandemic + climate change it's looking less sustainable as a hobby, so I'm learning downhill longboarding. diff --git a/content/posts/assets/longboard.jpg b/content/posts/2021-09-19-longboard-setup/longboard.jpg Binary files differ. diff --git a/content/posts/2021-09-21-manjaro.md b/content/posts/2021-09-21-manjaro.md @@ -2,7 +2,7 @@ .title = "Manjaro", .author = "Martin Ashby", .date = @date("2021-09-21T20:03:48+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2021-09-26-pine64.md b/content/posts/2021-09-26-pine64.md @@ -2,7 +2,7 @@ .title = "Pine64", .author = "Martin Ashby", .date = @date("2021-09-26T16:39:28+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2021-09-29-bike.md b/content/posts/2021-09-29-bike.md @@ -2,7 +2,7 @@ .title = "Bike", .author = "Martin Ashby", .date = @date("2021-10-01T12:27:26+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- @@ -14,4 +14,4 @@ For my daughter, I fitted an [Oxford little explorer](https://www.argos.co.uk/pr Probably the next thing I'll need to upgrade are some lights. I bought some small silicone ones but these quickly died as they allowed water into the battery compartment. I'll likely get some helmet mounted ones as well as ones for the actual bike, and reflective strips for the back seat to try to maximise visibility. After that I would also like to upgrade the brakes. I've got rim-brakes with fairly large pads, but something with a bit more stopping power would be nice. - + diff --git a/content/posts/assets/bike.jpg b/content/posts/2021-09-29-bike/bike.jpg Binary files differ. diff --git a/content/posts/2021-09-29-recipe.md b/content/posts/2021-09-29-recipe.md @@ -2,7 +2,7 @@ .title = "Recipe", .author = "Martin Ashby", .date = @date("2021-09-29T22:56:01+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2021-10-01-blog.md b/content/posts/2021-10-01-blog.md @@ -2,7 +2,7 @@ .title = "Blog", .author = "Martin Ashby", .date = @date("2021-10-01T19:34:15+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2021-10-06-clojure.md b/content/posts/2021-10-06-clojure.md @@ -2,7 +2,7 @@ .title = "Clojure", .author = "Martin Ashby", .date = @date("2021-10-06T21:35:37+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2021-10-30-openbsd.md b/content/posts/2021-10-30-openbsd.md @@ -2,7 +2,7 @@ .title = "OpenBSD", .author = "Martin Ashby", .date = @date("2021-10-30T20:25:43+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2021-11-05-postgres-query-rewrite.md b/content/posts/2021-11-05-postgres-query-rewrite.md @@ -2,7 +2,7 @@ .title = "Postgres Query Rewrite", .author = "Martin Ashby", .date = @date("2021-11-05T11:57:12Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2021-11-09-longboard-2.md b/content/posts/2021-11-09-longboard-2.md @@ -2,7 +2,7 @@ .title = "Longboard 2", .author = "Martin Ashby", .date = @date("2021-11-09T21:56:41Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2021-11-14-backups.md b/content/posts/2021-11-14-backups.md @@ -2,7 +2,7 @@ .title = "Backups", .author = "Martin Ashby", .date = @date("2021-11-14T11:12:44Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2021-12-04-contacts.md b/content/posts/2021-12-04-contacts.md @@ -2,7 +2,7 @@ .title = "Contacts", .author = "Martin Ashby", .date = @date("2021-12-04T15:05:47Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2021-12-28-chat-server-protocol.md b/content/posts/2021-12-28-chat-server-protocol.md @@ -2,7 +2,7 @@ .title = "Chat Server Protocol", .author = "Martin Ashby", .date = @date("2021-12-28T22:22:01Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-02-11-philosophy-software-dev.md b/content/posts/2022-02-11-philosophy-software-dev.md @@ -2,7 +2,7 @@ .title = "Book - Philosophy Of Software Design", .author = "Martin Ashby", .date = @date("2022-02-11T19:18:07Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-02-23-wordle.md b/content/posts/2022-02-23-wordle.md @@ -2,7 +2,7 @@ .title = "Wordle", .author = "Martin Ashby", .date = @date("2022-02-23T13:41:22Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-03-19-wildcard.md b/content/posts/2022-03-19-wildcard.md @@ -2,7 +2,7 @@ .title = "Wildcard", .author = "Martin Ashby", .date = @date("2022-03-19T13:17:26Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-03-27-fossil.md b/content/posts/2022-03-27-fossil.md @@ -2,7 +2,7 @@ .title = "Fossil", .author = "Martin Ashby", .date = @date("2022-03-27T11:28:31+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-04-30-longboard-3.md b/content/posts/2022-04-30-longboard-3.md @@ -2,7 +2,7 @@ .title = "Longboard 3", .author = "Martin Ashby", .date = @date("2022-04-30T19:49:39+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- Since my [last post](/2021-11-09-longboard-2/) on longboarding, I've become a lot more comfortable with push-up and coleman slides, and now I aim to learn [toeside pendulum slide](https://youtu.be/a5B_XaubQNE). I have had limited success so far, and one bad high-side attempting it (fall down-hill direction, as opposed to low-side falling in the uphill direction). Luckily my helmet did it's job, I'll be trying again in the future. @@ -18,6 +18,6 @@ This particular board has caliber II (reverse king pin) trucks. I've swapped the Much more importantly, I've found a fellow longboarder to skate with, and a couple of new spots nearby. Videos to follow! - - + + diff --git a/content/posts/assets/apex_1.jpg b/content/posts/2022-04-30-longboard-3/apex_1.jpg Binary files differ. diff --git a/content/posts/assets/apex_2.jpg b/content/posts/2022-04-30-longboard-3/apex_2.jpg Binary files differ. diff --git a/content/posts/2022-05-07-stolen-focus.md b/content/posts/2022-05-07-stolen-focus.md @@ -2,7 +2,7 @@ .title = "Book - Stolen Focus", .author = "Martin Ashby", .date = @date("2022-05-07T15:18:58+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-06-09-rustlings.md b/content/posts/2022-06-09-rustlings.md @@ -2,7 +2,7 @@ .title = "Rustlings", .author = "Martin Ashby", .date = @date("2022-06-09T21:58:40+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-07-09-longboard-4.md b/content/posts/2022-07-09-longboard-4.md @@ -2,7 +2,7 @@ .title = "Longboard 4", .author = "Martin Ashby", .date = @date("2022-07-09T22:00:07+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-07-30-fossil2.md b/content/posts/2022-07-30-fossil2.md @@ -2,7 +2,7 @@ .title = "Fossil 2", .author = "Martin Ashby", .date = @date("2022-07-30T22:57:38+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-09-09-serverless.md b/content/posts/2022-09-09-serverless.md @@ -2,7 +2,7 @@ .title = "Serverless", .author = "Martin Ashby", .date = @date("2022-09-09T21:48:19+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-09-25-back-to-git.md b/content/posts/2022-09-25-back-to-git.md @@ -2,7 +2,7 @@ .title = "Back to Git", .author = "Martin Ashby", .date = @date("2022-09-25T21:09:31+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-10-07-blocky.md b/content/posts/2022-10-07-blocky.md @@ -2,7 +2,7 @@ .title = "Blocky", .author = "Martin Ashby", .date = @date("2022-10-07T20:24:03+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-10-09-quine.md b/content/posts/2022-10-09-quine.md @@ -2,7 +2,7 @@ .title = "Quine", .author = "Martin Ashby", .date = @date("2022-10-09T13:11:52+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-10-09-skateboard-1.md b/content/posts/2022-10-09-skateboard-1.md @@ -2,7 +2,7 @@ .title = "Skateboard 1", .author = "Martin Ashby", .date = @date("2022-10-09T13:21:00+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- @@ -14,6 +14,6 @@ I went through several sets of bushings until finally settling on [bones hardcor Finally; I bought a skate-tool. Previously I'd been carrying a socket-wrench around in my bag, and it wasn't super convenient. The skate tool fits in my pocket so I can pack lighter :) - + <iframe title="drop-in" width="560" height="315" src="https://tube.spdns.org/videos/embed/637ab1fd-2ad4-4a88-9010-a0a04bd4a33a" frameborder="0" allowfullscreen="" sandbox="allow-same-origin allow-scripts allow-popups"></iframe> \ No newline at end of file diff --git a/content/posts/assets/skateboard.jpg b/content/posts/2022-10-09-skateboard-1/skateboard.jpg Binary files differ. diff --git a/content/posts/2022-10-14-blogsite.md b/content/posts/2022-10-14-blogsite.md @@ -2,7 +2,7 @@ .title = "Blogsite", .author = "Martin Ashby", .date = @date("2022-10-14T22:59:01+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-10-14-caddy.md b/content/posts/2022-10-14-caddy.md @@ -2,7 +2,7 @@ .title = "Caddy", .author = "Martin Ashby", .date = @date("2022-10-14T22:58:22+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-10-15-blogsite2.md b/content/posts/2022-10-15-blogsite2.md @@ -2,7 +2,7 @@ .title = "Blogsite 2", .author = "Martin Ashby", .date = @date("2022-10-15T22:39:18+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-12-04-aoc.md b/content/posts/2022-12-04-aoc.md @@ -2,7 +2,7 @@ .title = "Advent of Code", .author = "Martin Ashby", .date = @date("2022-12-04T08:54:56Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-12-20-longboard-5.md b/content/posts/2022-12-20-longboard-5.md @@ -2,7 +2,7 @@ .title = "Longboard 5", .author = "Martin Ashby", .date = @date("2022-12-20T14:16:49Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-12-26-spotifyd.md b/content/posts/2022-12-26-spotifyd.md @@ -2,7 +2,7 @@ .title = "Spotifyd", .author = "Martin Ashby", .date = @date("2022-12-26T23:08:03Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-12-30-comments.md b/content/posts/2022-12-30-comments.md @@ -2,7 +2,7 @@ .title = "Comments", .author = "Martin Ashby", .date = @date("2022-12-30T17:53:00Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2022-12-31-cgit.md b/content/posts/2022-12-31-cgit.md @@ -2,7 +2,7 @@ .title = "Cgit", .author = "Martin Ashby", .date = @date("2022-12-31T23:39:38Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2023-01-31-oso.md b/content/posts/2023-01-31-oso.md @@ -2,7 +2,7 @@ .title = "Authorization and search operations", .author = "Martin Ashby", .date = @date("2023-01-31T21:14:06Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2023-02-05-book-site-reliability-engineering.md b/content/posts/2023-02-05-book-site-reliability-engineering.md @@ -2,7 +2,7 @@ .title = "Book - Site Reliability Engineering", .author = "Martin Ashby", .date = @date("2023-02-05T15:53:43Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2023-02-05-semantic-dissonance.md b/content/posts/2023-02-05-semantic-dissonance.md @@ -2,7 +2,7 @@ .title = "Semantic Dissonance", .author = "Martin Ashby", .date = @date("2023-02-05T16:38:55Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2023-04-09-designing-data-intensive-applications.md b/content/posts/2023-04-09-designing-data-intensive-applications.md @@ -2,7 +2,7 @@ .title = "Book - Designing Data Intensive Applications", .author = "Martin Ashby", .date = @date("2023-04-09T21:45:01+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2023-06-16-bike.md b/content/posts/2023-06-16-bike.md @@ -2,7 +2,7 @@ .title = "Bike 2", .author = "Martin Ashby", .date = @date("2023-06-16T21:04:31+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- @@ -12,5 +12,5 @@ Firstly; the [freehub](https://en.wikipedia.org/wiki/Freehub) broke, which put i The other difference is a recently purchased [followme tandem](https://www.thelittlebikecompany.co.uk/product/followme-tandem/) set to connect my daughter's bike to mine. She is outgrowing the seat on my cycle but she's too young to ride on roads and not confident to ride her own yet. The followme seems like a good bridge to get her used to pedalling and having her own seat, but we can still cover a good distance for a day out. I was inspired by the review from [cyclesprog](https://www.cyclesprog.co.uk/carrying-kids-on-bikes/bike-towbars/followme-cycle-hitch-full-review/). We tested it out today with a friend! - + diff --git a/content/posts/assets/bike2.jpg b/content/posts/2023-06-16-bike/bike2.jpg Binary files differ. diff --git a/content/posts/2023-08-11-4-eyes.md b/content/posts/2023-08-11-4-eyes.md @@ -2,7 +2,7 @@ .title = "Four Eyes", .author = "Martin Ashby", .date = @date("2023-08-11T22:50:43+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2023-08-22-comments-2.md b/content/posts/2023-08-22-comments-2.md @@ -2,7 +2,7 @@ .title = "Comments 2", .author = "Martin Ashby", .date = @date("2023-08-22T14:48:41+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2023-09-12-mcl.md b/content/posts/2023-09-12-mcl.md @@ -2,7 +2,7 @@ .title = "Mcl (minecraft launcher)", .author = "Martin Ashby", .date = @date("2023-09-12T07:03:15+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2023-10-01-parable-of-the-sower.md b/content/posts/2023-10-01-parable-of-the-sower.md @@ -2,7 +2,7 @@ .title = "Book - Parable of the Sower / Parable of the Talents", .author = "Martin Ashby", .date = @date("2023-10-01T22:23:00+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2023-10-07-zipdl.md b/content/posts/2023-10-07-zipdl.md @@ -2,7 +2,7 @@ .title = "Zipdl", .author = "Martin Ashby", .date = @date("2023-10-07T23:28:16+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2023-11-25-roc.md b/content/posts/2023-11-25-roc.md @@ -2,7 +2,7 @@ .title = "Roc", .author = "Martin Ashby", .date = @date("2023-11-25T21:19:27Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2023-11-26-skateboard-2.md b/content/posts/2023-11-26-skateboard-2.md @@ -2,7 +2,7 @@ .title = "Skateboard 2", .author = "Martin Ashby", .date = @date("2023-11-26T20:33:27Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2023-12-01-aoc2023.md b/content/posts/2023-12-01-aoc2023.md @@ -2,7 +2,7 @@ .title = "Advent of Code 2023", .author = "Martin Ashby", .date = @date("2023-12-01T21:42:21Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2024-01-26-data-oriented-design.md b/content/posts/2024-01-26-data-oriented-design.md @@ -2,7 +2,7 @@ .title = "Book - Data Oriented Design", .author = "Martin Ashby", .date = @date("2024-01-26T20:19:31Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2024-01-26-dyn.md b/content/posts/2024-01-26-dyn.md @@ -2,7 +2,7 @@ .title = "Dynamic DNS", .author = "Martin Ashby", .date = @date("2024-01-26T00:02:35Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2024-02-01-1brc.md b/content/posts/2024-02-01-1brc.md @@ -2,7 +2,7 @@ .title = "1brc", .author = "Martin Ashby", .date = @date("2024-02-01T13:58:47Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2024-02-05-phones.md b/content/posts/2024-02-05-phones.md @@ -2,7 +2,7 @@ .title = "Fairphone", .author = "Martin Ashby", .date = @date("2024-02-05T19:56:17Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2024-03-01-communication.md b/content/posts/2024-03-01-communication.md @@ -2,7 +2,7 @@ .title = "Communication", .author = "Martin Ashby", .date = @date("2024-03-01T14:40:50Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2024-03-03-catb.md b/content/posts/2024-03-03-catb.md @@ -2,7 +2,7 @@ .title = "Book - The Cathedral and the Bazaar", .author = "Martin Ashby", .date = @date("2024-03-03T19:31:27Z"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, .description = "Book review 'The Cathedral and the Bazaar'" --- diff --git a/content/posts/2024-03-27-zine.md b/content/posts/2024-03-27-zine.md @@ -3,7 +3,7 @@ .author = "Martin Ashby", .description = "I converted my blog from [hugo](https://gohugo.io/) to [zine](https://zine-ssg.io/).", .date = @date("2024-03-27T20:26:45+00:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2024-03-31-stranger-times.md b/content/posts/2024-03-31-stranger-times.md @@ -3,7 +3,7 @@ .author = "Martin Ashby", .description = "I read [The Stranger Times](https://thestrangertimes.co.uk/) series by Caimh McDonnell, TL; DR they're great.", .date = @date("2024-03-31T20:29:31+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/2024-05-23-zigvm.md b/content/posts/2024-05-23-zigvm.md @@ -2,7 +2,7 @@ .title = "zigvm", .author = "Martin Ashby", .date = @date("2024-05-23T22:24:34+01:00"), -.layout = "single.html", +.layout = "single.shtml", .custom = {"comments": true}, --- diff --git a/content/posts/index.md b/content/posts/index.md @@ -2,7 +2,7 @@ .title = "mfashby.net", .author = "Martin Ashby", .date = @date("1900-01-01T00:00:00Z"), -.layout = "list.html", +.layout = "list.shtml", .alternatives = [{ .layout = "rss.xml", .output = "index.xml", diff --git a/content/projects/index.md b/content/projects/index.md @@ -2,5 +2,5 @@ .title = "About", .author = "Martin Ashby", .date = @date("2024-03-01T23:59:52Z"), -.layout = "list.html", +.layout = "list.shtml", --- diff --git a/content/projects/zigvm.md b/content/projects/zigvm.md @@ -2,7 +2,7 @@ .title = "zigvm", .author = "Martin Ashby", .date = @date("2024-05-28T20:18:54+01:00"), -.layout = "single.html", +.layout = "single.shtml", --- A tool to download and manage versions of the [zig](https://ziglang.org/) compiler. diff --git a/content/projects/zipdl.md b/content/projects/zipdl.md @@ -2,7 +2,7 @@ .title = "zipdl", .author = "Martin Ashby", .date = @date("2024-05-28T20:18:54+01:00"), -.layout = "single.html", +.layout = "single.shtml", --- A program for downloading individual files from a remote ZIP file on a http server that supports [Range](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Range) requests. diff --git a/layouts/404.html b/layouts/404.html @@ -1,5 +0,0 @@ -{{ partial "header.html" . }} - -404 NOT FOUND - -{{ partial "footer.html" . }} diff --git a/layouts/404.shtml b/layouts/404.shtml @@ -0,0 +1,5 @@ +{{ partial "header.html" . }} + +404 NOT FOUND + +{{ partial "footer.html" . }} +\ No newline at end of file diff --git a/layouts/list.html b/layouts/list.html @@ -1,13 +0,0 @@ -<extend template="main.html"/> -<div id="main"> - <h1 var="$page.title"></h1> - - <p var="$page.content"></p> - - <ul loop="$page.subpages()"> - <li> - <span class="date" var="$loop.it.date.format('2006/01/02')"></span> - <a href="$loop.it.permalink()" var="$loop.it.title"></a> - </li> - </ul> -</div> -\ No newline at end of file diff --git a/layouts/list.shtml b/layouts/list.shtml @@ -0,0 +1,11 @@ +<extend template="main.shtml"> +<div id="main"> + <h1 var="$page.title"></h1> + <p var="$page.content"></p> + <ul loop="$page.subpages()"> + <li> + <span class="date" var="$loop.it.date.format('2006/01/02')"></span> + <a href="$loop.it.link()" var="$loop.it.title"></a> + </li> + </ul> +</div> +\ No newline at end of file diff --git a/layouts/redirect.html b/layouts/redirect.html @@ -1,14 +0,0 @@ -<!DOCTYPE HTML> -<html lang="en-US"> - <head> - <meta charset="UTF-8"> - <meta http-equiv="refresh" content="0; url=/posts/"> - <script type="text/javascript"> - window.location.href = "/posts/" - </script> - <title>Page Redirection</title> - </head> - <body> - If you are not redirected automatically, follow this <a href='/post/'>link</a>. - </body> -</html> diff --git a/layouts/redirect.shtml b/layouts/redirect.shtml @@ -0,0 +1,15 @@ +<!DOCTYPE HTML> +<html lang="en-US"> + <head> + <meta charset="UTF-8"> + <meta http-equiv="refresh" content="0; url=/posts/"> + <script type="text/javascript"> + window.location.href = "/posts/" + </script> + <title>Page Redirection</title> + </head> + <body> + If you are not redirected automatically, follow this + <a href='/post/'>link</a>. + </body> +</html> +\ No newline at end of file diff --git a/layouts/rss.xml b/layouts/rss.xml @@ -10,9 +10,9 @@ <atom:link href="https://mfashby.net/index.xml" rel="self" type="application/rss+xml"/> <item inline-loop="$page.subpages()"> <title var="$loop.it.title"></title> - <link var="$loop.it.permalink()"></link> + <link var="$loop.it.link()"></link> <pubDate var="$loop.it.date.formatHTTP()"></pubDate> - <guid isPermaLink="true" var="$loop.it.permalink()"></guid> + <guid isPermaLink="true" var="$loop.it.link()"></guid> <description var="$loop.it.description"></description> <content:encoded var="$loop.it.content"></content:encoded> <!-- This doesn't work, an empty tag is emitted --> </item> diff --git a/layouts/single.html b/layouts/single.html @@ -1,16 +0,0 @@ -<extend template="main.html"/> -<div id="main"> - <div class="article-meta"> - <h1><span class="title" var="$page.title"></span></h1> - </div> - - <main var="$page.content"></main> - - <footer> - <div class="article-meta"> - <span class="author">Author <span var="$page.author"></span></span><br/> - <span>Updated <span class="date" var="$page.date.format('2006/01/02')"></span></span><br/> - </div> - </footer> - -</div> -\ No newline at end of file diff --git a/layouts/single.shtml b/layouts/single.shtml @@ -0,0 +1,15 @@ +<extend template="main.shtml"> +<div id="main"> + <div class="article-meta"> + <h1><span class="title" var="$page.title"></span></h1> + </div> + <main var="$page.content"></main> + <footer> + <div class="article-meta"> + <span class="author">Author + <span var="$page.author"></span></span><br> + <span>Updated + <span class="date" var="$page.date.format('2006/01/02')"></span></span><br> + </div> + </footer> +</div> +\ No newline at end of file diff --git a/layouts/templates/main.html b/layouts/templates/main.html @@ -1,53 +0,0 @@ -<!DOCTYPE html> -<html lang="en-GB"> - <head> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title var="$page.title.suffix('|', $site.title)"></title> - <link rel="stylesheet" href="/css/style.css"/> - <link rel="stylesheet" href="/css/fonts.css"/> - </head> - - <body> - <nav> - <ul class="menu"> - <li><a href="/posts">home</a></li> - <li><a href="/about">about</a></li> - <li><a href="/projects">projects</a></li> - <li><a href="/index.xml">rss</a></li> - </ul> - <hr/> - </nav> - - <div id="main"> - <super/> - </div> - - <footer> - <div if="$page.custom.get('comments', false)"> - <h2>comments</h2> - <div style="visibility: hidden" id="comments">comments go here</div> - <div style="visibility: hidden" id="comment_form">comment form goes here</div> - <script> - let comments = document.getElementById("comments"); - let urlParam = new URLSearchParams(); - urlParam.append("url", document.location.href); - fetch(document.location.origin + "/api/comment?" + urlParam.toString()) - .then((response) => response.text()) - .then((data) => { - comments.innerHTML = data; - comments.style.visibility = "visible"; - }); - let form = document.getElementById("comment_form"); - fetch(document.location.origin + "/api/form?" + urlParam.toString()) - .then((response) => response.text()) - .then((data) => { - form.innerHTML = data; - form.style.visibility = "visible"; - }); - </script> - <noscript>Comments disabled without javascript!</noscript> - </div> - </footer> - </body> -</html> diff --git a/layouts/templates/main.shtml b/layouts/templates/main.shtml @@ -0,0 +1,50 @@ +<!DOCTYPE html> +<html lang="en-GB"> + <head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <title var="$page.title.suffix('|', $site.title)"></title> + <link rel="stylesheet" href="/css/style.css"> + <link rel="stylesheet" href="/css/fonts.css"> + </head> + <body> + <nav> + <ul class="menu"> + <li><a href="/posts">home</a></li> + <li><a href="/about">about</a></li> + <li><a href="/projects">projects</a></li> + <li><a href="/index.xml">rss</a></li> + </ul> + <hr> + </nav> + <div id="main"> + <super> + </div> + <footer> + <div if="$page.custom.get('comments', false)"> + <h2>comments</h2> + <div style="visibility: hidden" id="comments">comments go here</div> + <div style="visibility: hidden" id="comment_form">comment form goes here</div> + <script> + let comments = document.getElementById("comments"); + let urlParam = new URLSearchParams(); + urlParam.append("url", document.location.href); + fetch(document.location.origin + "/api/comment?" + urlParam.toString()) + .then((response) => response.text()) + .then((data) => { + comments.innerHTML = data; + comments.style.visibility = "visible"; + }); + let form = document.getElementById("comment_form"); + fetch(document.location.origin + "/api/form?" + urlParam.toString()) + .then((response) => response.text()) + .then((data) => { + form.innerHTML = data; + form.style.visibility = "visible"; + }); + </script> + <noscript>Comments disabled without javascript!</noscript> + </div> + </footer> + </body> +</html> +\ No newline at end of file diff --git a/layouts/video.html b/layouts/video.html @@ -1,5 +0,0 @@ -<video class="video-shortcode" preload="{{ .Get "preload" }}" controls> - <source src="{{ .Get "src" }}" type="{{ .Get "type" }}"> - There should have been a video here but your browser does not seem - to support it. -</video>
