diff --git a/.env b/.env index 471ea57b..4840fddb 100644 --- a/.env +++ b/.env @@ -2,8 +2,7 @@ ACCESS_KEY_B2= SECRET_KEY_B2= BUCKET_B2= API_KEY_LASTFM= -SITE_ID= -API_KEY_NETLIFY= +API_KEY_FATHOM= API_KEY_TRAKT= API_KEY_MOVIEDB= API_TOKEN_READWISE= diff --git a/config/filters/index.js b/config/filters/index.js index 6f9bb6a9..4f3b6a0a 100644 --- a/config/filters/index.js +++ b/config/filters/index.js @@ -47,11 +47,11 @@ export default { getPopularPosts: (posts, analytics) => { return posts .filter((post) => { - if (analytics.find((p) => p.resource === post.url)) return true + if (analytics.find((p) => p.pathname === post.url)) return true }) .sort((a, b) => { - const count = (page) => analytics.filter((p) => p.resource === page.url).pop().count - return count(b) - count(a) + const visitors = (page) => analytics.filter((p) => p.pathname === page.url).pop().visitors + return visitors(b) - visitors(a) }) }, diff --git a/package.json b/package.json index 807d4f47..10fca9eb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "8.5.1", + "version": "8.6.1", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/_data/analytics.js b/src/_data/analytics.js index 18661548..322cb3fa 100644 --- a/src/_data/analytics.js +++ b/src/_data/analytics.js @@ -1,23 +1,18 @@ import EleventyFetch from '@11ty/eleventy-fetch' export default async function () { - const API_KEY_NETLIFY = process.env.API_KEY_NETLIFY - const SITE_ID = process.env.SITE_ID - const endDate = new Date(); - const startDate = new Date(new Date().setDate(endDate.getDate() - 30)); - const timezoneOffset = new Date().getTimezoneOffset() / 60; + const API_KEY_FATHOM = process.env.API_KEY_FATHOM const url = - `https://analytics.services.netlify.com/v2/${SITE_ID}/ranking/pages?from=${startDate.getTime()}&to=${endDate.getTime()}&timezone=-0${timezoneOffset}00&limit=50` + 'https://api.usefathom.com/v1/aggregations?entity=pageview&entity_id=CWSVCDJC&aggregates=pageviews&field_grouping=pathname&sort_by=pageviews:desc&limit=10' const res = EleventyFetch(url, { duration: '1h', type: 'json', fetchOptions: { headers: { - Authorization: `Bearer ${API_KEY_NETLIFY}`, + Authorization: `Bearer ${API_KEY_FATHOM}`, }, }, }).catch() - const responseObject = await res - const pages = responseObject['data'] - return pages.filter((p) => p.resource.includes('posts')) -} + const pages = await res + return pages.filter((p) => p.pathname.includes('posts')) +} \ No newline at end of file diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid index 6e1e2ed1..e35dcd37 100644 --- a/src/_includes/base.liquid +++ b/src/_includes/base.liquid @@ -15,6 +15,7 @@ {% render "../assets/styles/index.css" %} {% endcapture %} + diff --git a/src/_includes/partials/addon-links.liquid b/src/_includes/partials/addon-links.liquid index 26a70e0a..466804dd 100644 --- a/src/_includes/partials/addon-links.liquid +++ b/src/_includes/partials/addon-links.liquid @@ -3,6 +3,10 @@ {% endcapture %}
+ {%- if analytics.size > 0 -%}
{% render "partials/popular-posts.liquid", posts:posts, analytics:analytics %}
+ {%- endif -%} + {%- if links.size > 0 -%}
{% render "partials/recent-links.liquid", links:links %}
+ {%- endif -%}
\ No newline at end of file diff --git a/src/_includes/partials/popular-posts.liquid b/src/_includes/partials/popular-posts.liquid index 8f932b8b..89b49b52 100644 --- a/src/_includes/partials/popular-posts.liquid +++ b/src/_includes/partials/popular-posts.liquid @@ -1,4 +1,5 @@ {% assign posts = posts | getPopularPosts: analytics %} +{% if posts.size > 0 %}

{% tablericon "flame" "Popular" %} Popular posts @@ -11,4 +12,5 @@ {% endfor %} - \ No newline at end of file + +{% endif %} \ No newline at end of file diff --git a/src/assets/scripts/search.js b/src/assets/scripts/search.js index 247860fb..91613977 100644 --- a/src/assets/scripts/search.js +++ b/src/assets/scripts/search.js @@ -29,6 +29,7 @@ const query = $input.value const results = (query.length > 1) ? getSearchResults(query) : [] if (query === '') renderSearchResults([]) + if (results && fathom) fathom?.trackEvent(`Search query: ${query}`) renderSearchResults(results) }) diff --git a/src/pages/blogroll.html b/src/pages/blogroll.html index 6bf9928a..1098c407 100644 --- a/src/pages/blogroll.html +++ b/src/pages/blogroll.html @@ -9,7 +9,7 @@ description: 'These are awesome blogs that I enjoy and you may enjoy too.' {% endcapture %}

{{ title }}

-

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

+

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

{% for blog in blogroll %}
diff --git a/src/pages/referrals.md b/src/pages/referrals.md index a8bd712e..a97ab0d0 100644 --- a/src/pages/referrals.md +++ b/src/pages/referrals.md @@ -8,9 +8,12 @@ description: 'Referral links for services that I use.' Referral links for services I use. I save some money, and you do as well if you choose to use them. -- [NextDNS](https://nextdns.io/?from=m56mt3z6) -- [DNSimple](https://dnsimple.com/r/3a7cbb9e15df8f) -- [Bunny.net](https://bunny.net?ref=revw3mehej) -- [Feedpress](https://feedpress.com/?affid=34370) -- [Proton](https://pr.tn/ref/X775YX40Z50G) -- [DigitalOcean](https://m.do.co/c/3635bf99aee2) \ No newline at end of file + \ No newline at end of file diff --git a/src/pages/uses.md b/src/pages/uses.md index 4513b5b0..9df117fe 100644 --- a/src/pages/uses.md +++ b/src/pages/uses.md @@ -60,11 +60,12 @@ Software and services that I use for work and my own enjoyment.

Services

- [HEY](https://hey.com): it's the email service that works best for me and I quite enjoy their calendar. -- [NextDNS](https://nextdns.io/?from=m56mt3z6): 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](https://dnsimple.com/r/3a7cbb9e15df8f): a robust, user-friendly DNS provider and registrar. I moved my domains here after my old provider was acquired. -- [Bunny.net](https://bunny.net?ref=revw3mehej): 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). -- [Netlify](https://netlify.com): I use their hosting, forms, webhooks and analytics. It's a reliable and feature-rich platform. -- [Feedpress](https://feedpress.com/?affid=34370): 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. +- Fathom Analytics: privacy-friendly, lightweight and nicely designed analytics. +- 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). +- [Netlify](https://netlify.com): I use their hosting, forms and webhooks. It's a reliable and feature-rich platform. +- 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. - [Kagi](https://kagi.com): the only search engine at this point (or so it seems) that's interested in surfacing quality results. - [Readwise Reader](https://readwise.io/read): an impressive RSS reader that handles all the functionality you'd expect from a read it later app beautifully. It's as powerful as it is flexible. - [Todoist](https://todoist.com): the task manager I always return to for it's flexibility and endless integrations. @@ -75,6 +76,6 @@ Software and services that I use for work and my own enjoyment. - [Slack](http://slack.com): I have a family Slack set up to avoid group text messages and am in a few other community Slacks. - [Discord](http://discord.com): I don't _like_ Discord but, for better or worse, it's where some communities I frequent are. - [Backblaze](https://backblaze.com): It backs up my MacBook Air and attached storage drive and I don't have to think about it. -- [Proton VPN](https://pr.tn/ref/X775YX40Z50G): a reliable, trustworthy VPN with all of the features you'd expect from such a service. +- Proton VPN: a reliable, trustworthy VPN with all of the features you'd expect from such a service. Check out [uses.tech](https://uses.tech) for more lists like this one. diff --git a/src/posts/2022/apple-centric-digital-privacy-tools.md b/src/posts/2022/apple-centric-digital-privacy-tools.md index 7e0823f8..472c8671 100644 --- a/src/posts/2022/apple-centric-digital-privacy-tools.md +++ b/src/posts/2022/apple-centric-digital-privacy-tools.md @@ -11,7 +11,7 @@ A rundown of privacy tools that work well with Apple's technology ecosystem.