diff --git a/content/friends.md b/content/friends.md index 4f931567..0db911c8 100644 --- a/content/friends.md +++ b/content/friends.md @@ -7,5 +7,5 @@ type: timeless In lovely, nostalgic web 1.0 style, here are some links to the websites of friends of mine. Please enjoy, and get in touch with them if you like what they've built! -* [Words by Vernacchia](https://words.byvernacchia.com) — a superlative senior staff engineer at Deliveroo with me, exploring front-end technologies outside of our work remit. -* [Jamie Tanna](https://www.jvt.me) — another superb once-upon-a-Deliveroo engineer, his keen attention to the IndieWeb movement inspired many of the changes to this site. +* {{< friend av >}} — a superlative senior staff engineer at Deliveroo with me, exploring front-end technologies outside of our work remit. +* {{< friend jvt >}} — another superb once-upon-a-Deliveroo engineer, his keen attention to the IndieWeb movement inspired many of the changes to this site. diff --git a/content/instagram-posts/2xbszgnklj5jl2yis4gehwhp5u/index.md b/content/instagram-posts/2xbszgnklj5jl2yis4gehwhp5u/index.md index 9aa77385..5161fe3c 100644 --- a/content/instagram-posts/2xbszgnklj5jl2yis4gehwhp5u/index.md +++ b/content/instagram-posts/2xbszgnklj5jl2yis4gehwhp5u/index.md @@ -7,4 +7,4 @@ draft: false tags: - yvette --- -Enjoying a G&T on the balcony. Lovely ☺️ When are you getting home [Yvette](/tags/yvette)? There's one waiting\! 😁 +Enjoying a G&T on the balcony. Lovely ☺️ When are you getting home {{< friend yvette >}}? There's one waiting\! 😁 diff --git a/content/instagram-posts/5nths3tw5udoh5yior3owljrse/index.md b/content/instagram-posts/5nths3tw5udoh5yior3owljrse/index.md index 059b01a2..87676d20 100644 --- a/content/instagram-posts/5nths3tw5udoh5yior3owljrse/index.md +++ b/content/instagram-posts/5nths3tw5udoh5yior3owljrse/index.md @@ -7,4 +7,4 @@ draft: false tags: - yvette --- -Last night \(drunken\) creativity with [Yvette](/tags/yvette) ☺️ +Last night \(drunken\) creativity with {{< friend yvette >}} ☺️ diff --git a/content/instagram-posts/6j2toj7mqeiffdfkzwlkyzupyu/index.md b/content/instagram-posts/6j2toj7mqeiffdfkzwlkyzupyu/index.md index 02932b18..a2018652 100644 --- a/content/instagram-posts/6j2toj7mqeiffdfkzwlkyzupyu/index.md +++ b/content/instagram-posts/6j2toj7mqeiffdfkzwlkyzupyu/index.md @@ -7,7 +7,7 @@ draft: false tags: - yvette --- -An amazing early birthday present from [Yvette](/tags/yvette) — a tour of the disused parts of Charing Cross underground station\! +An amazing early birthday present from {{< friend yvette >}} — a tour of the disused parts of Charing Cross underground station\! diff --git a/content/instagram-posts/agdrc5uqkljnzwiwzvm63zfmqq/index.md b/content/instagram-posts/agdrc5uqkljnzwiwzvm63zfmqq/index.md index 1fcc1d13..7b3bc82b 100644 --- a/content/instagram-posts/agdrc5uqkljnzwiwzvm63zfmqq/index.md +++ b/content/instagram-posts/agdrc5uqkljnzwiwzvm63zfmqq/index.md @@ -7,4 +7,4 @@ draft: false tags: - yvette --- -Sunny late Sunday relaxation; boardgames & G&T with [Yvette](/tags/yvette) at home ☺️ +Sunny late Sunday relaxation; boardgames & G&T with {{< friend yvette >}} at home ☺️ diff --git a/content/instagram-posts/dmo67qvrdjs3r37wfy4berccwy/index.md b/content/instagram-posts/dmo67qvrdjs3r37wfy4berccwy/index.md index 2b9fbde5..c25ef59d 100644 --- a/content/instagram-posts/dmo67qvrdjs3r37wfy4berccwy/index.md +++ b/content/instagram-posts/dmo67qvrdjs3r37wfy4berccwy/index.md @@ -9,4 +9,4 @@ tags: - chris - rose --- -Watching Tales from the Loop with [Yvette](/tags/yvette), and with [Chris](/tags/chris) and [Rose](/tags/rose) from afar — holy pants this is an excellent series\! +Watching Tales from the Loop with {{< friend yvette >}}, and with [Chris](/tags/chris) and [Rose](/tags/rose) from afar — holy pants this is an excellent series\! diff --git a/content/instagram-posts/f2pb6rykdctvj2qqdkaexkx7ui/index.md b/content/instagram-posts/f2pb6rykdctvj2qqdkaexkx7ui/index.md index 8b895704..404fc2fb 100644 --- a/content/instagram-posts/f2pb6rykdctvj2qqdkaexkx7ui/index.md +++ b/content/instagram-posts/f2pb6rykdctvj2qqdkaexkx7ui/index.md @@ -8,4 +8,4 @@ draft: false tags: - yvette --- -It's been a good afternoon\! French apple \(and rum\) cake, and a garlic miso butter roast chicken \(shared with the ever-lovely [Yvette](/tags/yvette) 😘\) +It's been a good afternoon\! French apple \(and rum\) cake, and a garlic miso butter roast chicken \(shared with the ever-lovely {{< friend yvette >}} 😘\) diff --git a/content/instagram-posts/glmc4azueglc4b3fc2m4n3rdom/index.md b/content/instagram-posts/glmc4azueglc4b3fc2m4n3rdom/index.md index 5b352ecd..d7ede35c 100644 --- a/content/instagram-posts/glmc4azueglc4b3fc2m4n3rdom/index.md +++ b/content/instagram-posts/glmc4azueglc4b3fc2m4n3rdom/index.md @@ -12,4 +12,4 @@ This is the face of a man very excited for the second *delicious* course of the . -📷[Yvette](/tags/yvette) [#accidentallywesanderson](/tags/accidentallywesanderson) +📷{{< friend yvette >}} [#accidentallywesanderson](/tags/accidentallywesanderson) diff --git a/content/instagram-posts/jzskpnpinmq63xbbr2cxbbf45a/index.md b/content/instagram-posts/jzskpnpinmq63xbbr2cxbbf45a/index.md index 6dceab3d..1dd1b26c 100644 --- a/content/instagram-posts/jzskpnpinmq63xbbr2cxbbf45a/index.md +++ b/content/instagram-posts/jzskpnpinmq63xbbr2cxbbf45a/index.md @@ -7,4 +7,4 @@ draft: false tags: - yvette --- -A staggeringly wonderful wedding day for Fiona and Carter, a delightful birthday for me, and a beautiful moment captured here with [Yvette](/tags/yvette) and I ☺️ +A staggeringly wonderful wedding day for Fiona and Carter, a delightful birthday for me, and a beautiful moment captured here with {{< friend yvette >}} and I ☺️ diff --git a/content/instagram-posts/oss2zkq2ahqxu3lwnucce6zxda/index.md b/content/instagram-posts/oss2zkq2ahqxu3lwnucce6zxda/index.md index 8d04ce63..0d30fd7e 100644 --- a/content/instagram-posts/oss2zkq2ahqxu3lwnucce6zxda/index.md +++ b/content/instagram-posts/oss2zkq2ahqxu3lwnucce6zxda/index.md @@ -9,4 +9,4 @@ tags: --- A most satisfying Saturday morning in bed. -Couple goals with [Yvette](/tags/yvette). +Couple goals with {{< friend yvette >}}. diff --git a/content/instagram-posts/tizusecbhytjlozs77jnqdl27i/index.md b/content/instagram-posts/tizusecbhytjlozs77jnqdl27i/index.md index ba08e3ff..25e3a83d 100644 --- a/content/instagram-posts/tizusecbhytjlozs77jnqdl27i/index.md +++ b/content/instagram-posts/tizusecbhytjlozs77jnqdl27i/index.md @@ -7,4 +7,4 @@ draft: false tags: - yvette --- -We couldn't find playing cards amongst the flat-move-put-on-indefinite-hold box piles, but [Yvette](/tags/yvette) and I *did* find blank cards… +We couldn't find playing cards amongst the flat-move-put-on-indefinite-hold box piles, but {{< friend yvette >}} and I *did* find blank cards… diff --git a/content/instagram-posts/x4l5dnzlgb2m2zcd5leivmrrii/index.md b/content/instagram-posts/x4l5dnzlgb2m2zcd5leivmrrii/index.md index b729b85a..fb58c180 100644 --- a/content/instagram-posts/x4l5dnzlgb2m2zcd5leivmrrii/index.md +++ b/content/instagram-posts/x4l5dnzlgb2m2zcd5leivmrrii/index.md @@ -12,7 +12,7 @@ draft: false tags: - yvette --- -Experiments in dithering \(with [Yvette](/tags/yvette) and JP\) +Experiments in dithering \(with {{< friend yvette >}} and JP\) diff --git a/content/now/index.md b/content/now/index.md index 845bd3d4..5beab43b 100644 --- a/content/now/index.md +++ b/content/now/index.md @@ -11,7 +11,7 @@ I'm a little apprehensive about being _too_ openly public with lots of personal --- -I live in a lovely flat in North London with my fiancé Yvette. We still feel like we're only recently home from our travelling Sabbatical, which took us through South America, Western Canada, Japan, and Singapore — we're missing the travel enormously! We were blogging (for part of that trip) at [adventure.awaits.us](https://adventure.awaits.us). +I live in a lovely flat in North London with my fiancé {{< friend yvette >}}. We still feel like we're only recently home from our travelling Sabbatical, which took us through South America, Western Canada, Japan, and Singapore — we're missing the travel enormously! We were blogging (for part of that trip) at [adventure.awaits.us](https://adventure.awaits.us). The biggest news from that trip was [Yvette proposing to me](https://adventure.awaits.us/a-patagonian-love-story/) at the top of the Torres del Paine mountains — I'm so excited to be marrying her, even if the wedding planning is triply complex because of our mixed nationalities! diff --git a/data/friends/av.yaml b/data/friends/av.yaml new file mode 100644 index 00000000..98ca6f53 --- /dev/null +++ b/data/friends/av.yaml @@ -0,0 +1,3 @@ +name: Alex Vernacchia +site: https://words.byvernacchia.com +xfn: friend met colleague diff --git a/data/friends/jvt.yaml b/data/friends/jvt.yaml new file mode 100644 index 00000000..3bdb2262 --- /dev/null +++ b/data/friends/jvt.yaml @@ -0,0 +1,3 @@ +name: Jamie Tanna +site: https://www.jvt.me +xfn: met colleague diff --git a/data/friends/yvette.yaml b/data/friends/yvette.yaml new file mode 100644 index 00000000..7378314e --- /dev/null +++ b/data/friends/yvette.yaml @@ -0,0 +1,3 @@ +name: Yvette +site: https://instagram.com/yvetteedrei +xfn: met spouse sweetheart diff --git a/layouts/instagram-posts/single.html b/layouts/instagram-posts/single.html index 98e3041a..9a4ede8a 100644 --- a/layouts/instagram-posts/single.html +++ b/layouts/instagram-posts/single.html @@ -22,10 +22,6 @@ {{ partial "tags.html" .Params.tags }} {{ partial "categories.html" . }} - {{- if .GitInfo }} -

{{ .GitInfo.AbbreviatedHash }} @ {{ if .Site.Params.dateformNum }}{{ dateFormat .Site.Params.dateformNum .GitInfo.AuthorDate.Local }}{{ else }}{{ dateFormat "2006-01-02" .GitInfo.AuthorDate.Local }}{{ end }}

- {{- end }} -

@@ -36,16 +32,6 @@ {{ dateFormat .Site.Params.dateformNumTime .Date }} - - {{ if .Lastmod }} - {{ if not (eq .Lastmod .Date )}} - {{ if .Site.Params.dateformNumTime }} - ({{ i18n "lastModified" }}: {{ dateFormat .Site.Params.dateformNumTime .Lastmod.Local }}) - {{ else }} - ({{ i18n "lastModified" }}: {{ dateFormat "2006-01-02 15:04" .Lastmod.Local }}) - {{ end }} - {{ end }} - {{ end }}

{{ partial "pagination-single.html" . }} diff --git a/layouts/shortcodes/friend.html b/layouts/shortcodes/friend.html new file mode 100644 index 00000000..1f589699 --- /dev/null +++ b/layouts/shortcodes/friend.html @@ -0,0 +1,5 @@ +{{ with index .Site.Data.friends (.Get 0) }} + {{.name}} +{{ else }} + {{ errorf "Could not display friend %s" (.Get 0) }} +{{ end }}