diff --git a/package-lock.json b/package-lock.json index 1b6f1a28..dec97e6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "20.3.3", + "version": "20.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "20.3.3", + "version": "20.4.0", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.4.0", @@ -845,9 +845,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001641", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001641.tgz", - "integrity": "sha512-Phv5thgl67bHYo1TtMY/MurjkHhV4EDaCosezRXgZ8jzA/Ub+wjxAvbGvjoFENStinwi5kCyOYV3mi5tOGykwA==", + "version": "1.0.30001642", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001642.tgz", + "integrity": "sha512-3XQ0DoRgLijXJErLSl+bLnJ+Et4KqV1PY6JJBGAFlsNsz31zeAIncyeZfLCabHK/jtSh+671RM9YMldxjUPZtA==", "dev": true, "funding": [ { diff --git a/package.json b/package.json index 3dca69e2..d246e039 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "20.3.3", + "version": "20.4.0", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/_data/albumReleases.js b/src/_data/albumReleases.js index 9f068a67..55ff8115 100644 --- a/src/_data/albumReleases.js +++ b/src/_data/albumReleases.js @@ -37,7 +37,7 @@ const fetchAlbumReleases = async () => { timestamp: DateTime.fromISO(album['release_date']).toSeconds(), type: 'album-release' } - )).sort((a, b) => a.timestamp - b.timestamp) + )).sort((a, b) => a['timestamp'] - b['timestamp']) } export default async function () { diff --git a/src/_data/analytics.js b/src/_data/analytics.js index 0cb1007e..0b6ee31b 100644 --- a/src/_data/analytics.js +++ b/src/_data/analytics.js @@ -14,5 +14,5 @@ export default async function () { }, }).catch() const pages = await res - return pages.results.filter((p) => p.page.includes('posts')) + return pages['results'].filter((p) => p['page'].includes('posts')) } \ No newline at end of file diff --git a/src/_data/books.js b/src/_data/books.js index 4a738a56..43dd10a5 100644 --- a/src/_data/books.js +++ b/src/_data/books.js @@ -37,7 +37,7 @@ async function fetchAllBooks() { } for (const book of data) { - book.tags = await fetchTagsForBook(book.id) + book.tags = await fetchTagsForBook(book['id']) } books = books.concat(data) diff --git a/src/_data/genres.js b/src/_data/genres.js index 31247a76..bb1b2edb 100644 --- a/src/_data/genres.js +++ b/src/_data/genres.js @@ -30,9 +30,9 @@ const fetchGenresWithArtists = async () => { } data.forEach(genre => { - genre.artists = genre.artists.map(artist => ({ + genre['artists'] = genre['artists'].map(artist => ({ ...artist, - country: parseCountryField(artist.country) + country: parseCountryField(artist['country']) })) }) diff --git a/src/_data/links.js b/src/_data/links.js index c52464e9..cf5f449a 100644 --- a/src/_data/links.js +++ b/src/_data/links.js @@ -40,8 +40,8 @@ const fetchAllLinks = async () => { if (data.length < PAGE_SIZE) fetchMore = false for (const link of data) { - link.tags = await fetchTagsForLink(link.id) - link.type = 'link' + link['tags'] = await fetchTagsForLink(link.id) + link['type'] = 'link' } links = links.concat(data) diff --git a/src/_data/nav.js b/src/_data/nav.js index 96703ae6..9289a332 100644 --- a/src/_data/nav.js +++ b/src/_data/nav.js @@ -1,30 +1,50 @@ -export default async function () { - return { - menu: [ - { name: 'Posts', url: '/posts', icon: 'article'}, - { name: 'Music', url: '/music', icon: 'headphones' }, - { name: 'Watching', url: '/watching', icon: 'device-tv' }, - { name: 'Books', url: '/books', icon: 'books' }, - { name: 'Links', icon: 'link' }, - { name: 'About', url: '/about', icon: 'info-circle' }, - { name: 'Search', icon: 'search' }, - { name: 'Feeds', icon: 'rss' }, - { name: 'Mastodon', icon: 'brand-mastodon' }, - ], - footer: [ - { name: 'Uses' }, - { name: 'Colophon' }, - { name: 'Blogroll' }, - { name: 'Save' }, - ], - social: [ - { name: 'Email', url: '/contact', icon: 'at' }, - { name: 'GitHub', url: 'https://github.com/cdransf', icon: 'brand-github' }, - { name: 'npm', url: 'https://www.npmjs.com/~cdransf', icon: 'brand-npm'}, - { name: 'Mastodon', url: 'https://social.lol/@cory', icon: 'brand-mastodon' }, - { name: 'Coffee', url: 'https://buymeacoffee.com/cory', icon: 'coffee' }, - { name: 'Now', url: '/now', icon: 'clock-hour-3' }, - { name: 'Webrings', url: '/webrings', icon: 'heart-handshake' }, - ], +import { createClient } from '@supabase/supabase-js' + +const SUPABASE_URL = process.env.SUPABASE_URL +const SUPABASE_KEY = process.env.SUPABASE_KEY +const supabase = createClient(SUPABASE_URL, SUPABASE_KEY) + +const fetchAllNavigation = async () => { + const { data, error } = await supabase + .from('navigation') + .select(` + *, + pages(title, permalink) + `) + + if (error) { + console.error('Error fetching navigation data:', error) + return null } + + const menu = {} + data.forEach(item => { + const menuItem = item.pages ? { + title: item.pages.title, + permalink: item.pages.permalink, + icon: item.icon, + position: item.position + } : { + title: item.title, + permalink: item.permalink, + icon: item.icon, + position: item.position + } + + if (!menu[item.menu_location]) { + menu[item.menu_location] = [menuItem] + } else { + menu[item.menu_location].push(menuItem) + } + }) + + Object.keys(menu).forEach(location => { + menu[location].sort((a, b) => a.position - b.position) + }) + + return menu } + +export default async function () { + return await fetchAllNavigation() +} \ No newline at end of file diff --git a/src/_data/pages.js b/src/_data/pages.js new file mode 100644 index 00000000..1115a94f --- /dev/null +++ b/src/_data/pages.js @@ -0,0 +1,82 @@ +import { createClient } from '@supabase/supabase-js' + +const SUPABASE_URL = process.env.SUPABASE_URL +const SUPABASE_KEY = process.env.SUPABASE_KEY +const supabase = createClient(SUPABASE_URL, SUPABASE_KEY) + +const PAGE_SIZE = 50 + +const fetchBlockData = async (collection, itemId) => { + const { data, error } = await supabase + .from(collection) + .select(collection === 'hero' ? '*, image(filename_disk)' : '*') + .eq('id', itemId) + .single() + + if (error) { + console.error(`Error fetching data from ${collection} for item ${itemId}:`, error) + return null + } + + return data +} + +const fetchBlocksForPage = async (pageId) => { + const { data, error } = await supabase + .from('pages_blocks') + .select('collection, item') + .eq('pages_id', pageId) + + if (error) { + console.error(`Error fetching blocks for page ${pageId}:`, error) + return [] + } + + const blocks = await Promise.all(data.map(async block => { + const blockData = await fetchBlockData(block.collection, block.item) + + return { + type: block['collection'], + ...blockData + } + })) + + return blocks +} + +const fetchAllPages = async () => { + let pages = [] + let page = 0 + let fetchMore = true + + while (fetchMore) { + const { data, error } = await supabase + .from('pages') + .select(` + *, + open_graph_image(filename_disk) + `) + .range(page * PAGE_SIZE, (page + 1) * PAGE_SIZE - 1) + + if (error) { + console.error('Error fetching pages:', error) + return pages + } + + if (data.length < PAGE_SIZE) fetchMore = false + + for (const page of data) { + page['blocks'] = await fetchBlocksForPage(page['id']) + if (page['open_graph_image']) page['open_graph_image'] = page['open_graph_image']['filename_disk'] + pages.push(page) + } + + page++ + } + + return pages +} + +export default async function () { + return await fetchAllPages() +} \ No newline at end of file diff --git a/src/_data/robots.js b/src/_data/robots.js index c2e5e557..bcf8129b 100644 --- a/src/_data/robots.js +++ b/src/_data/robots.js @@ -26,7 +26,7 @@ const fetchAllRobots = async () => { if (data.length < PAGE_SIZE) break } - return robots.map(robot => robot.user_agent) + return robots.map(robot => robot['user_agent']) } export default async function () { diff --git a/src/_data/status.js b/src/_data/status.js index c7b62795..9e165fbd 100644 --- a/src/_data/status.js +++ b/src/_data/status.js @@ -8,5 +8,5 @@ export default async function () { }).catch() const status = await res - return status.response['statuses'][0] + return status['response']['statuses'][0] } diff --git a/src/_data/tv.js b/src/_data/tv.js index 681ecbf2..5188015f 100644 --- a/src/_data/tv.js +++ b/src/_data/tv.js @@ -47,20 +47,20 @@ const fetchAllShows = async () => { const prepareShowData = (show) => { return { ...show, - image: show.art?.filename_disk ? `/${show.art.filename_disk}` : '', - backdrop: show.backdrop?.filename_disk ? `/${show.backdrop.filename_disk}` : '' + image: show['art']?.['filename_disk'] ? `/${show['art']['filename_disk']}` : '', + backdrop: show['backdrop']?.['filename_disk'] ? `/${show['backdrop']['filename_disk']}` : '' } } const prepareEpisodeData = (show) => { - return show.episodes.map(episode => ({ + return show['episodes'].map(episode => ({ ...episode, - show_title: show.title, - show_tmdb_id: show.tmdb_id, - collected: show.collected, - favorite: show.favorite, - image: show.image, - backdrop: show.backdrop + show_title: show['title'], + show_tmdb_id: show['tmdb_id'], + collected: show['collected'], + favorite: show['favorite'], + image: show['image'], + backdrop: show['backdrop'] })) } @@ -76,15 +76,15 @@ export default async function () { const showEpisodesMap = {} episodes.forEach(episode => { - const showTitle = episode.show_title - const showTmdbId = episode.show_tmdb_id - const episodeNumber = episode.episode_number - const seasonNumber = episode.season_number - const lastWatchedAt = episode.last_watched_at - const collected = episode.collected - const favorite = episode.favorite - const image = episode.image - const backdrop = episode.backdrop + const showTitle = episode['show_title'] + const showTmdbId = episode['show_tmdb_id'] + const episodeNumber = episode['episode_number'] + const seasonNumber = episode['season_number'] + const lastWatchedAt = episode['last_watched_at'] + const collected = episode['collected'] + const favorite = episode['favorite'] + const image = episode['image'] + const backdrop = episode['backdrop'] if (!showEpisodesMap[showTmdbId]) { showEpisodesMap[showTmdbId] = { @@ -115,16 +115,16 @@ export default async function () { }) }) - const sortedShows = Object.values(showEpisodesMap).sort((a, b) => new Date(b.episodes[0].lastWatchedAt) - new Date(a.episodes[0].lastWatchedAt)) + const sortedShows = Object.values(showEpisodesMap).sort((a, b) => new Date(b.episodes[0]['lastWatchedAt']) - new Date(a.episodes[0]['lastWatchedAt'])) const episodeData = [] sortedShows.forEach(show => { - const startingEpisode = show.episodes[show.episodes.length - 1].episode - const startingSeason = show.episodes[show.episodes.length - 1].season - const endingEpisode = show.episodes[0].episode - const endingSeason = show.episodes[0].season + const startingEpisode = show['episodes'][show['episodes'].length - 1]['episode'] + const startingSeason = show['episodes'][show['episodes'].length - 1]['season'] + const endingEpisode = show['episodes'][0].episode + const endingSeason = show['episodes'][0].season - if (show.episodes.length > 1) { + if (show['episodes'].length > 1) { episodeData.push({ name: show.title, url: `/watching/shows/${show.tmdbId}`, @@ -141,11 +141,11 @@ export default async function () { backdrop: show.backdrop }) } else { - const singleEpisode = show.episodes[0] - singleEpisode.collected = show.collected - singleEpisode.favorite = show.favorite - singleEpisode.image = show.image - singleEpisode.backdrop = show.backdrop + const singleEpisode = show['episodes'][0] + singleEpisode.collected = show['collected'] + singleEpisode.favorite = show['favorite'] + singleEpisode.image = show['image'] + singleEpisode.backdrop = show['backdrop'] episodeData.push(singleEpisode) } }) @@ -153,12 +153,12 @@ export default async function () { return episodeData } - const favoriteShows = shows.filter(show => show.favorite) + const favoriteShows = shows.filter(show => show['favorite']) return { shows, watchHistory: formatEpisodeData(episodes), recentlyWatched: formatEpisodeData(episodes.slice(0, 225)), - favorites: formatEpisodeData(favoriteShows.flatMap(prepareEpisodeData)).sort((a, b) => a.name.localeCompare(b.name)) + favorites: formatEpisodeData(favoriteShows.flatMap(prepareEpisodeData)).sort((a, b) => a['name'].localeCompare(b['name'])) } } \ No newline at end of file diff --git a/src/_includes/main.liquid b/src/_includes/main.liquid index 36e725cf..f704f2e2 100644 --- a/src/_includes/main.liquid +++ b/src/_includes/main.liquid @@ -3,5 +3,5 @@ layout: base ---
{{ content }}
- {% render "partials/footer.liquid", page:page, nav:nav, updated:updated %} + {% render "partials/footer.liquid", page:page, nav:nav, updated:page.updated %}
\ No newline at end of file diff --git a/src/_includes/partials/blocks/hero.liquid b/src/_includes/partials/blocks/hero.liquid new file mode 100644 index 00000000..ff4341db --- /dev/null +++ b/src/_includes/partials/blocks/hero.liquid @@ -0,0 +1,19 @@ +{{ alt }} \ No newline at end of file diff --git a/src/_includes/partials/posts/blocks.liquid b/src/_includes/partials/blocks/index.liquid similarity index 59% rename from src/_includes/partials/posts/blocks.liquid rename to src/_includes/partials/blocks/index.liquid index 9bc9e67a..89e6bbae 100644 --- a/src/_includes/partials/posts/blocks.liquid +++ b/src/_includes/partials/blocks/index.liquid @@ -7,5 +7,11 @@ {% render "partials/banners/npm.liquid", url:block.url, command:block.command %} {% elsif block.type == 'rss_banner' %} {% render "partials/banners/rss.liquid", url:block.url, text:block.text %} + {% elsif block.type == 'hero' %} + {% render "partials/blocks/hero.liquid", image:block.image.filename_disk, alt:block.alt_text %} + {% elsif block.type == 'markdown' %} + {{ block.text | markdown }} + {% elsif block.type == 'addon_links' %} +
{% render "partials/widgets/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} {% endif %} {% endfor %} \ No newline at end of file diff --git a/src/_includes/partials/footer.liquid b/src/_includes/partials/footer.liquid index 0bb8d609..30bfa663 100644 --- a/src/_includes/partials/footer.liquid +++ b/src/_includes/partials/footer.liquid @@ -1,14 +1,16 @@ - {% if updated %}

This page was last updated on {{ updated | date: "%B %-d, %-I:%M%p", "America/Los_Angeles" }}.

{% endif %} + {% if updated %} +

This page was last updated on {{ updated | date: "%B %-d, %-I:%M%p", "America/Los_Angeles" }}.

+ {% endif %} - + \ No newline at end of file diff --git a/src/_includes/partials/nav/link.liquid b/src/_includes/partials/nav/link.liquid index 046e3690..261984f6 100644 --- a/src/_includes/partials/nav/link.liquid +++ b/src/_includes/partials/nav/link.liquid @@ -1,20 +1,20 @@ -{%- assign categoryUrl = "/" | append: link | downcase -%} +{%- assign categoryUrl = url | downcase -%} {% if categoryUrl | isLinkActive: page.url %} {% if icon %} - {% tablericon icon link %} - {{ link }} + {% tablericon icon title %} + {{ title }} {% else %} - {{ link }} + {{ title }} {% endif %} {% else %} {% if icon %} - {% tablericon icon link %} - {{ link }} + {% tablericon icon title %} + {{ title }} {% else %} - {{ link }} + {{ title }} {% endif %} {% endif %} \ No newline at end of file diff --git a/src/_includes/partials/nav/linked-icon.liquid b/src/_includes/partials/nav/linked-icon.liquid index 51d4d88f..df8220ed 100644 --- a/src/_includes/partials/nav/linked-icon.liquid +++ b/src/_includes/partials/nav/linked-icon.liquid @@ -1,8 +1,8 @@ - {% tablericon icon name %} + {% tablericon icon title %} \ No newline at end of file diff --git a/src/_includes/partials/nav/menu.liquid b/src/_includes/partials/nav/menu.liquid index faf25867..15adfb4b 100644 --- a/src/_includes/partials/nav/menu.liquid +++ b/src/_includes/partials/nav/menu.liquid @@ -9,8 +9,8 @@ {% render "partials/nav/theme-toggle.liquid" %} diff --git a/src/pages/errors/1000.html b/src/pages/errors/1000.html deleted file mode 100644 index 95e22e29..00000000 --- a/src/pages/errors/1000.html +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: Error -description: Nah, that's no good. -layout: default -permalink: /1000.html ---- -
-

{{ title }}

-

Nah, that's no good.

-
- ::CLOUDFLARE_ERROR_1000S_BOX:: -
- \ No newline at end of file diff --git a/src/pages/errors/404.html b/src/pages/errors/404.html deleted file mode 100644 index 770fe7e9..00000000 --- a/src/pages/errors/404.html +++ /dev/null @@ -1,34 +0,0 @@ ---- -title: 404 -description: What kind of idiots do you have working here? Hurry up and skip out on the room service bill! -layout: default -permalink: /404.html -image: https://cdn.coryd.dev/{{ globals.page_404 }} ---- -{{ alt }} -
-

{{ title }}

-

What kind of idiots do you have working here?

-

Hurry up and skip out on the room service bill!

-
-
-{% render "partials/widgets/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} - \ No newline at end of file diff --git a/src/pages/errors/500.html b/src/pages/errors/500.html deleted file mode 100644 index 03c74ebb..00000000 --- a/src/pages/errors/500.html +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: Error -description: Nah, that's no good. -layout: default -permalink: /500.html ---- -
-

{{ title }}

-

Nah, that's no good.

-
- ::CLOUDFLARE_ERROR_500S_BOX:: -
- \ No newline at end of file diff --git a/src/pages/errors/broken.html b/src/pages/errors/broken.html deleted file mode 100644 index 5105658c..00000000 --- a/src/pages/errors/broken.html +++ /dev/null @@ -1,34 +0,0 @@ ---- -title: Broken -description: Hey! That's broken. Try again later. -layout: default -permalink: /broken.html -image: https://cdn.coryd.dev/{{ globals.page_broken }} ---- -{{ alt }} -
-

{{ title }}

-

Hey! That's broken. Try again later.

-

Go read something instead.

-
-
-{% render "partials/widgets/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} - \ No newline at end of file diff --git a/src/pages/errors/captcha.html b/src/pages/errors/captcha.html deleted file mode 100644 index 82bd985b..00000000 --- a/src/pages/errors/captcha.html +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: Error -description: Nah, that's no good. -layout: default -permalink: /captcha.html ---- -
-

{{ title }}

-

Nah, that's no good.

-
- ::CAPTCHA_BOX:: -
- \ No newline at end of file diff --git a/src/pages/errors/error.html b/src/pages/errors/error.html deleted file mode 100644 index 0089dc39..00000000 --- a/src/pages/errors/error.html +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: Error -description: Nah, that's no good. -layout: default -permalink: /error.html ---- -
-

{{ title }}

-

Nah, that's no good.

-
- \ No newline at end of file diff --git a/src/pages/errors/js-challenge.html b/src/pages/errors/js-challenge.html deleted file mode 100644 index aea635f2..00000000 --- a/src/pages/errors/js-challenge.html +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: Error -description: Nah, that's no good. -layout: default -permalink: /js-challenge.html ---- -
-

{{ title }}

-

Nah, that's no good.

-
- ::IM_UNDER_ATTACK_BOX:: -
- \ No newline at end of file diff --git a/src/pages/errors/not-allowed.html b/src/pages/errors/not-allowed.html deleted file mode 100644 index 8824df18..00000000 --- a/src/pages/errors/not-allowed.html +++ /dev/null @@ -1,34 +0,0 @@ ---- -title: Not allowed -description: Sometimes mildly inconvenient things happen to people. That's not allowed. -layout: default -permalink: /not-allowed.html -image: https://cdn.coryd.dev/{{ globals.page_not_allowed }} ---- -{{ alt }} -
-

{{ title }}

-

Sometimes mildly inconvenient things happen to people.

-

Go read something instead.

-
-
-{% render "partials/widgets/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} - \ No newline at end of file diff --git a/src/pages/errors/rate-limit.html b/src/pages/errors/rate-limit.html deleted file mode 100644 index 061a436f..00000000 --- a/src/pages/errors/rate-limit.html +++ /dev/null @@ -1,34 +0,0 @@ ---- -title: Rate limit -description: Hey! Stop that. Try again later. -layout: default -permalink: /rate-limit.html -image: https://cdn.coryd.dev/{{ globals.page_stop }} ---- -{{ alt }} -
-

{{ title }}

-

Hey! Stop that. Try again later.

-

Go read something instead.

-
-
-{% render "partials/widgets/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} - \ No newline at end of file diff --git a/src/pages/main/feeds.md b/src/pages/main/feeds.md deleted file mode 100644 index 3e22f9f6..00000000 --- a/src/pages/main/feeds.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: Feeds -layout: page -permalink: /feeds.html -description: Content feeds exposed by and generated from my site. ---- -

{{ title }}

- -These are web feeds, also known as RSS feeds. Subscribe by copying a URL into your newsreader. - -- Posts ([RSS](https://feedpress.me/coryd) or [JSON](https://feedpress.me/coryd.json)): posts from my site. -- Links ([RSS](https://feedpress.me/coryd-links) or [JSON](https://feedpress.me/coryd-links.json)): links I've liked. -- Books ([RSS](https://feedpress.me/coryd-books) or [JSON](https://feedpress.me/coryd-books.json)): books I've finished recently. -- Movies ([RSS](https://feedpress.me/coryd-movies) or [JSON](https://feedpress.me/coryd-books.json)): movies I've watched recently. -- All ([RSS](https://feedpress.me/coryd-all) or [JSON](https://feedpress.me/coryd-all.json)): all of the posts and activity from my site. diff --git a/src/pages/main/now.html b/src/pages/main/now.html deleted file mode 100644 index a10f4a6b..00000000 --- a/src/pages/main/now.html +++ /dev/null @@ -1,21 +0,0 @@ ---- -title: Now -layout: default -permalink: /now.html -description: See what I'm doing now. -updated: 2024-05-18T15:49:00Z ---- -

{{ title }}

-

Family

-

Hanging out with and spending as much time as possible with my lovely wife, kids and rescue dogs (we've got a guinea pig too).

-

Getting tattooed

-

It's been an ongoing process of recovering from sessions, resuming my exercising routine and returning for the next session. I have two chest pieces, a new piece above my left knee and we've been working away on my right arm.

-

Making

-

Scrobbling and data ownership: I've been building and improving my self-hosted scrobbling solution. I've been working to bring my movie, TV and reading data in-house too.

-

Ad and tracker-blocking: I've been updating and maintaining a list of ad and tracker-blocking tools that I'm happy to take contributions to. Modern advertising is awful and intrusive. Do what you can to block it.

-

Fiddling with simple web components: I've been working on and incorporating some web components into this site. I've built a theme toggle, select-based pagination and one that loads text from an API (used on my home page).

-

Encouraging folks to block AI web crawlers: they're insidious, abusive and should be blocked. I'm happy to take contributions, once again, as we encourage folks to block them as best they can.

-

Mentoring

-

I've been mentoring through Underdog Devs on and off for a few years now and find it incredibly rewarding.

-
-

This is a now page, and if you have your own site, you should make one too.

\ No newline at end of file diff --git a/src/pages/main/page.html b/src/pages/main/page.html new file mode 100644 index 00000000..bde9bc24 --- /dev/null +++ b/src/pages/main/page.html @@ -0,0 +1,12 @@ +--- +layout: default +pagination: + data: pages + size: 1 + alias: page +description: "{{ page.description | default: globals.site_description }}" +permalink: "{{ page.permalink }}/index.html" +image: "{{ page.open_graph_image | prepend: 'https://cdn.coryd.dev/' | default: globals.meta_data.opengraph_default }}" +updated: {{ page.updated | default: null }} +--- +{% render "partials/blocks/index.liquid", blocks:page.blocks, collections:collections, links:links %} \ No newline at end of file diff --git a/src/pages/main/posts/post.html b/src/pages/main/posts/post.html index 8199616c..824599c7 100644 --- a/src/pages/main/posts/post.html +++ b/src/pages/main/posts/post.html @@ -39,7 +39,7 @@ schema: blog /> {%- endif -%} {{ post.content | markdown }} - {% render "partials/posts/blocks.liquid", blocks:post.blocks %} + {% render "partials/blocks/index.liquid", blocks:post.blocks %} {% render "partials/widgets/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} \ No newline at end of file diff --git a/src/pages/secondary/colophon.md b/src/pages/secondary/colophon.md deleted file mode 100644 index 2078e124..00000000 --- a/src/pages/secondary/colophon.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: Colophon -layout: page -permalink: /colophon.html -description: The tools I use to build and maintain this site. ---- -

{{ title }}

- -This site is built and maintained using a number of tools. - -- The frontend of the site is built using [11ty](https://www.11ty.dev) and the source for that is openly available on [GitHub](https://github.com/cdransf/coryd.dev). - - The frontend is hosted on [Cloudflare Pages](https://pages.cloudflare.com) and rebuilds hourly. -- Posts, links and media data (music, watching and books) are stored at [Supabase](https://supabase.com) and managed via a [Directus](https://directus.io) instance hosted at DigitalOcean. - - My contact form is submitted to [Supabase](https://supabase.com) using a Cloudflare worker and entries are available to read in [Directus](https://directus.io). - - Posts are composed in [Obsidian](https://obsidian.md) before being saved in [Directus](https://directus.io). -- Images are hosted on [Backblaze](https://backblaze.com) B2 and served by bunny.net. -- I use DNSimple to register my domains and [DNSControl](https://dnscontrol.org) to configure and manage records. -- I use [Plausible](https://plausible.io) for analytics. -- Feedpress helps normalize my feeds and provides lightweight feed insights. diff --git a/src/pages/secondary/save.md b/src/pages/secondary/save.md deleted file mode 100644 index 69f547cf..00000000 --- a/src/pages/secondary/save.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: Save -layout: page -permalink: /save.html -description: Save a little bit on services that I also use. ---- -

{{ title }}

- -Referral links for services I use. I save some money, and you do as well if you choose to use them. - - diff --git a/src/pages/secondary/uses.md b/src/pages/secondary/uses.md deleted file mode 100644 index 5c2ad650..00000000 --- a/src/pages/secondary/uses.md +++ /dev/null @@ -1,76 +0,0 @@ ---- -title: Uses -layout: page -permalink: /uses.html -description: Software, tools and services that I use regularly. ---- -

{{ title }}

- -Software and services that I use for work and my own enjoyment. - -

Computer setup

- -- Midnight MacBook Air (2022 - M2) -- 27" Dell Monitor -- Apple Magic Keyboard with Touch ID + number pad -- Apple Magic Trackpad -- Homepod Mini for audio - -

Desk and chair

- -- My desk is a custom made corner desk I bought on Etsy years ago. It's sturdy, has tons of storage and finally arrived with a chip on the surface to add some character after the first one got lost by the freight company on the journey from Michigan to Los Angeles. I probably _wouldn't_ repeat the experience, but I do love the desk. -- [Herman Miller Aeron chair](https://www.hermanmiller.com/products/seating/office-chairs/aeron-chairs/): it's pretty comfortable and makes swiveling around my corner desk easy. - -

macOS + iOS

- -- [Vivaldi](https://vivaldi.net): a flexible, reliable and privacy focused browser. -- [Fantastical](https://flexibits.com/fantastical): a powerful calendar app that continues to outpace Apple's calendar app. -- [Obsidian](https://obsidian.md): fast and configurable (or minimal) as you'd like, I use it for all of my notes and writing. -- [Plexamp](https://www.plex.tv/plexamp/): Plex's flexible and delightful music player. -- [Ivory](https://tapbots.com/ivory/): the best, most polished Mastodon client for macOS and iOS. -- [Reeder](https://reeder.app): flexible and universal — it makes it easy to triage my feeds and save things over to Matter. -- [Parcel](https://parcelapp.net): the most flexible and reliable package tracker for Apple's ecosystem. -- [Flighty](https://flightyapp.com): I don't travel a ton but Flighty makes doing so a fair bit less stressful. - -

iOS

- -- [Matter](https://getmatter.com): my favorite read it later service. It's thoughtful, beautifully designed and it's text to speech features are the best out there. -- [status.log](https://apps.apple.com/us/app/status-log/id6444921793): a fantastic client for status.lol that provides an outstanding native experience for the service. -- [Working Copy](https://workingcopy.app): an incredible, fully-featured git client. -- [Secure Shellfish](https://secureshellfish.app): the _best_ ssh client for iOS, complete with Codeapaces support and Files.app integration. -- [Runestone](https://runestone.app): a superb, lightweight text editor for iOS that works beautifully with Working Copy and Secure Shellfish via Files.app. -- [FontCase](https://apps.apple.com/us/app/fontcase-manage-your-type/id1205074470): for managing/installing fonts. - -

macOS

- -- [Rectangle](https://rectangleapp.com): to quickly move around/organize/snap application windows. Using a Mac without it now feels like it's broken. -- [AirBuddy](https://v2.airbuddy.app): finer-grained control over AirPods and other wireless devices. -- [Meta](https://www.nightbirdsevolve.com/meta): the _best_ utility for tagging and organizing music files on macOS. -- [Permute](https://software.charliemonroe.net/permute): a useful utility for quickly converting files to different formats. -- [noTunes](https://github.com/tombonez/noTunes): a lightweight utility that prevents Music.app from launching. It also allows you to set a new default music player. - -

Dev tools

- -- [VS Code](https://code.visualstudio.com): it's the industry standard — for better or worse. -- [Catppuccin](https://github.com/catppuccin): nearly as ubiquitous as Dracula but lighter and more playful, I've started using this theme wherever I'm looking at/reading/writing code. -- [Mono Lisa](https://monolisa.dev): a relatively new find, I've been enjoying how pleasant and readable this font is (and have even gone so far as to install it on iOS via [FontCase](https://apps.apple.com/us/app/fontcase-manage-your-type/id1205074470)). - -

Services

- -- Proton: the premier encrypted mail service with a number of other features like calendars and a reliable VPN. -- NextDNS: a privacy-focused, set it and forget it DNS service. I use their security features on my home network and a profile with strict ad-blocking rules on all of my devices. -- DNSimple: a robust, user-friendly DNS provider and registrar. I moved my domains here after my old provider was acquired. -- [Cloudflare](https://cloudfllare.com): I use their pages hosting, workers and myriad other features. -- [Supabase](https://supabase.com): an easy to use and robust database platform built on postgres. -- [Directus](https://directus.io): an extremely flexible backend application that I use as the content management system for this site. -- bunny.net: an affordable and altogether user-friendly CDN. I host the images for my site with them and use their optimizer/transforms heavily. -- [Plausible](https://plausible.io): lightweight, privacy-friendly analytics. -- Feedpress: they've been around for a while now and don't change much (nor do they need to), but look no further for reliable, helpful feed analytics. -- [Feedbin](https://feedbin.com): performant, open and super reliable RSS. -- Matter: a newer read it later service, but a rapidly developed and extremely powerful one. It's text to speech features are _excellent_. -- [forwardemail.net](https://forwardemail.net): a simple and reliable service for forwarding and routing emails from a few of the domains I own. -- [Arq](https://arqbackup.com): It backs up my MacBook Air and attached storage drive to Backblaze B2 and a Hetzner storage box. - -
- -Check out [uses.tech](https://uses.tech) for more lists like this one.