diff --git a/.env b/.env index 903201a1..be52ab0f 100644 --- a/.env +++ b/.env @@ -1,5 +1,4 @@ -SITE_ID_CLICKY= -SITE_KEY_CLICKY= +API_KEY_PLAUSIBLE= ACCOUNT_ID_PLEX= SUPABASE_URL= SUPABASE_KEY= \ No newline at end of file diff --git a/_redirects b/_redirects index 30dc4813..107024e9 100644 --- a/_redirects +++ b/_redirects @@ -106,6 +106,5 @@ https://cdme.netlify.app https://coryd.dev 301! /media/* https://f001.backblazeb2.com/file/coryd-dev/:splat 200! # analytics -/23af0256fe76a.js http://static.getclicky.com/js?in=/2842c5ddc46e5 200! -/2842c5ddc46e5 https://in.getclicky.com/in.php 200! -/7afb285ad050d http://in.getclicky.com/101449513ns.gif 200! +/js/script.js https://plausible.io/js/script.tagged-events.outbound-links.js 200 +/api/event https://plausible.io/api/event 200 \ No newline at end of file diff --git a/config/collections/index.js b/config/collections/index.js index 66156923..640c7013 100644 --- a/config/collections/index.js +++ b/config/collections/index.js @@ -107,10 +107,10 @@ export const popularPosts = (collection) => { return posts .filter((post) => { - if (analytics.find((p) => p.url.includes(post.slug))) return true + if (analytics.find((p) => p.page.includes(post.slug))) return true }) .sort((a, b) => { - const visitors = (page) => analytics.filter((p) => p.url.includes(page.slug)).pop()?.value + const visitors = (page) => analytics.filter((p) => p.page.includes(page.slug)).pop()?.visitors return visitors(b) - visitors(a) }) } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2c3a3768..ad002ea1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "18.11.13", + "version": "18.12.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "18.11.13", + "version": "18.12.13", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.4.0", @@ -31,7 +31,7 @@ "markdown-it-footnote": "^4.0.0", "sanitize-html": "^2.13.0", "slugify": "^1.6.6", - "terser": "^5.31.0" + "terser": "^5.31.1" } }, "node_modules/@11ty/dependency-tree": { @@ -532,9 +532,9 @@ "peer": true }, "node_modules/@types/node": { - "version": "20.14.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.1.tgz", - "integrity": "sha512-T2MzSGEu+ysB/FkWfqmhV3PLyQlowdptmmgD20C6QxsS8Fmv5SjpZ1ayXaEC0S21/h5UJ9iA6W/5vSNU5l00OA==", + "version": "20.14.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz", + "integrity": "sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==", "dev": true, "license": "MIT", "dependencies": { @@ -822,9 +822,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001627", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001627.tgz", - "integrity": "sha512-4zgNiB8nTyV/tHhwZrFs88ryjls/lHiqFhrxCW4qSTeuRByBVnPYpDInchOIySWknznucaf31Z4KYqjfbrecVw==", + "version": "1.0.30001629", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001629.tgz", + "integrity": "sha512-c3dl911slnQhmxUIT4HhYzT7wnBK/XYpGnYLOj4nJBaRiw52Ibe7YxlDaAeRECvA786zCuExhxIUJ2K7nHMrBw==", "dev": true, "funding": [ { @@ -1146,9 +1146,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.4.789", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.789.tgz", - "integrity": "sha512-0VbyiaXoT++Fi2vHGo2ThOeS6X3vgRCWrjPeO2FeIAWL6ItiSJ9BqlH8LfCXe3X1IdcG+S0iLoNaxQWhfZoGzQ==", + "version": "1.4.792", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.792.tgz", + "integrity": "sha512-rkg5/N3L+Y844JyfgPUyuKK0Hk0efo3JNxUDKvz3HgP6EmN4rNGhr2D8boLsfTV/hGo7ZGAL8djw+jlg99zQyA==", "dev": true, "license": "ISC" }, @@ -3310,9 +3310,9 @@ } }, "node_modules/terser": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz", - "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==", + "version": "5.31.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz", + "integrity": "sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { diff --git a/package.json b/package.json index d826f4f3..247819a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "18.11.13", + "version": "18.12.13", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { @@ -41,6 +41,6 @@ "markdown-it-footnote": "^4.0.0", "sanitize-html": "^2.13.0", "slugify": "^1.6.6", - "terser": "^5.31.0" + "terser": "^5.31.1" } } diff --git a/src/_data/analytics.js b/src/_data/analytics.js index 44aa80da..0cb1007e 100644 --- a/src/_data/analytics.js +++ b/src/_data/analytics.js @@ -1,15 +1,18 @@ import EleventyFetch from '@11ty/eleventy-fetch' export default async function () { - const SITE_ID_CLICKY = process.env.SITE_ID_CLICKY - const SITE_KEY_CLICKY = process.env.SITE_KEY_CLICKY - const url = `https://api.clicky.com/api/stats/4?site_id=${SITE_ID_CLICKY}&sitekey=${SITE_KEY_CLICKY}&type=pages&output=json` + const API_KEY_PLAUSIBLE = process.env.API_KEY_PLAUSIBLE + const url = + 'https://plausible.io/api/v1/stats/breakdown?site_id=coryd.dev&period=6mo&property=event:page&limit=30' const res = EleventyFetch(url, { duration: '1h', type: 'json', + fetchOptions: { + headers: { + Authorization: `Bearer ${API_KEY_PLAUSIBLE}`, + }, + }, }).catch() - const data = await res - const pages = data[0].dates[0].items - - return pages.filter((p) => p.url.includes('posts')) + const pages = await res + return pages.results.filter((p) => p.page.includes('posts')) } \ No newline at end of file diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid index 70ca6a4c..1d8c46f2 100644 --- a/src/_includes/base.liquid +++ b/src/_includes/base.liquid @@ -76,7 +76,6 @@ {{ pageTitle }} - @@ -100,6 +99,8 @@ + + diff --git a/src/pages/errors/400.html b/src/pages/errors/400.html index d2f4be0e..900cdb62 100644 --- a/src/pages/errors/400.html +++ b/src/pages/errors/400.html @@ -7,4 +7,5 @@ permalink: /400.html

{{ title }}

Nah, that's a bad request.

-
\ No newline at end of file + + \ No newline at end of file diff --git a/src/pages/errors/404.html b/src/pages/errors/404.html index f02c6aae..0684b5cc 100644 --- a/src/pages/errors/404.html +++ b/src/pages/errors/404.html @@ -31,4 +31,5 @@ image: /assets/img/404.jpg
{% render "partials/widgets/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} - \ No newline at end of file + + \ No newline at end of file diff --git a/src/pages/main/search.html b/src/pages/main/search.html index 70655eef..da7abcdf 100644 --- a/src/pages/main/search.html +++ b/src/pages/main/search.html @@ -32,7 +32,7 @@ permalink: /search.html const query = $input.value const results = (query.length > 1) ? getSearchResults(query) : [] if (query === '') renderSearchResults([]) - if (results && window.clicky) clicky.log('/search', query, 'click') + if (results && typeof plausible === 'function') plausible('Search', { props: { query: query } }); renderSearchResults(results) }) diff --git a/src/pages/secondary/blogroll.html b/src/pages/secondary/blogroll.html index f5004093..e8569e57 100644 --- a/src/pages/secondary/blogroll.html +++ b/src/pages/secondary/blogroll.html @@ -5,7 +5,8 @@ permalink: /blogroll.html description: These are awesome blogs that I enjoy and you may enjoy too. ---

{{ title }}

-

You can download an OPML file containing all of these feeds and import them into your RSS reader.

+

You can Download OPML + download an OPML file containing all of these feeds and import them into your RSS reader.

diff --git a/src/pages/secondary/contact/index.md b/src/pages/secondary/contact/index.md index 7b536dc4..3e11ca35 100644 --- a/src/pages/secondary/contact/index.md +++ b/src/pages/secondary/contact/index.md @@ -15,7 +15,7 @@ description: How to contact me.
  • File an issue on the appropriate repo over at GitHub
    • - + diff --git a/src/pages/secondary/save.md b/src/pages/secondary/save.md index fea84251..d86dd73f 100644 --- a/src/pages/secondary/save.md +++ b/src/pages/secondary/save.md @@ -9,13 +9,11 @@ description: Save a little bit on services that I also use. 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 index 554791f8..490fafb0 100644 --- a/src/pages/secondary/uses.md +++ b/src/pages/secondary/uses.md @@ -56,18 +56,17 @@ Software and services that I use for work and my own enjoyment.

    Services

    -- Fastmail: the best, most reliable email, calendar and contacts provider around. -- 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. -- Bunny.net: a powerful and affordable CDN. I use it to serve assets on my personal site (most notable my now page — raw assets are fetched by Eleventy and then optimized to webp). +- Fastmail: the best, most reliable email, calendar and contacts provider around. +- 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. - [Netlify](https://netlify.com): I use their hosting, forms and webhooks. It's a reliable and feature-rich platform. -- Clicky: not the _prettiest_ analytics, but very feature rich. -- 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. +- [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. - [Instapaper](https://instapaper.com): slow to change and often better for it — a reliable and steady read it later service. - [forwardemail.net](https://forwardemail.net): a simple and reliable service for forwarding and routing emails from a few of the domains I own. - [Backblaze](https://backblaze.com): It backs up my MacBook Air and attached storage drive and I don't have to think about it. -- Proton: a reliable, trustworthy VPN with all of the features you'd expect from such a service. +- Proton: a reliable, trustworthy VPN with all of the features you'd expect from such a service.
    Name