From 2bf2fba325bc073d9918549a2b17bd9b9e1644f1 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Sat, 10 Aug 2024 18:54:06 -0700 Subject: [PATCH] feat: bye analytics --- .eleventy.js | 3 +- .env | 1 - config/collections/index.js | 13 ------- package-lock.json | 4 +- package.json | 3 +- src/assets/styles/base/index.css | 4 ++ src/assets/styles/components/addon-links.css | 29 -------------- src/assets/styles/index.css | 1 - src/data/analytics.js | 18 --------- src/includes/base.liquid | 4 +- .../partials/blocks/addon-links.liquid | 8 ---- src/includes/partials/blocks/index.liquid | 2 - .../partials/blocks/popular-posts.liquid | 15 ------- .../partials/blocks/recent-links.liquid | 16 -------- src/pages/dynamic/blogroll.html | 2 +- src/pages/dynamic/posts/post.html | 5 +-- src/pages/static/contact.html | 15 +------ src/pages/static/search.html | 4 +- workers/analytics/index.js | 39 ------------------- workers/analytics/wrangler.template.toml | 13 ------- 20 files changed, 14 insertions(+), 185 deletions(-) delete mode 100644 src/assets/styles/components/addon-links.css delete mode 100644 src/data/analytics.js delete mode 100644 src/includes/partials/blocks/addon-links.liquid delete mode 100644 src/includes/partials/blocks/popular-posts.liquid delete mode 100644 src/includes/partials/blocks/recent-links.liquid delete mode 100644 workers/analytics/index.js delete mode 100644 workers/analytics/wrangler.template.toml diff --git a/.eleventy.js b/.eleventy.js index 10e5bd6d..d1750a9a 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -6,7 +6,7 @@ import markdownItAnchor from 'markdown-it-anchor' import markdownItFootnote from 'markdown-it-footnote' import filters from './config/filters/index.js' import { copyErrorPages } from './config/events/index.js' -import { popularPosts, processContent, albumReleasesCalendar } from './config/collections/index.js' +import { processContent, albumReleasesCalendar } from './config/collections/index.js' import { DateTime } from 'luxon' // load .env @@ -52,7 +52,6 @@ export default async function (eleventyConfig) { }) // collections - eleventyConfig.addCollection('popularPosts', popularPosts) eleventyConfig.addCollection('allContent', (collection) => { const { allContent } = processContent(collection) return allContent diff --git a/.env b/.env index 348e5e6d..04ccc42a 100644 --- a/.env +++ b/.env @@ -1,4 +1,3 @@ -API_KEY_PLAUSIBLE= ACCOUNT_ID_PLEX= SUPABASE_URL= SUPABASE_KEY= diff --git a/config/collections/index.js b/config/collections/index.js index ce105be0..47b71d1a 100644 --- a/config/collections/index.js +++ b/config/collections/index.js @@ -191,17 +191,4 @@ export const albumReleasesCalendar = (collection) => { } return value -} - -export const popularPosts = (collection) => { - const collectionData = collection.getAll()[0] - const { data } = collectionData - const { posts, analytics } = data - - return posts - .filter((post) => analytics.find((p) => p.page.includes(post.slug))) - .sort((a, b) => { - 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 08f7547d..b6ea2320 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "21.10.3", + "version": "22.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "21.10.3", + "version": "22.0.0", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.4.0", diff --git a/package.json b/package.json index f4b6b71d..ab49ba1a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "21.10.3", + "version": "22.0.0", "description": "The source for my personal site. Built using 11ty (and other tools).", "type": "module", "scripts": { @@ -9,7 +9,6 @@ "build": "ELEVENTY_PRODUCTION=true eleventy", "update:deps": "npm upgrade && ncu", "debug": "DEBUG=Eleventy* npx @11ty/eleventy --serve", - "publish:analytics": "node scripts/worker-build.mjs analytics && wrangler deploy --env production --config workers/analytics/wrangler.toml", "publish:contact": "node scripts/worker-build.mjs contact && wrangler deploy --env production --config workers/contact/wrangler.toml", "publish:playing": "node scripts/worker-build.mjs playing && wrangler deploy --env production --config workers/playing/wrangler.toml", "publish:rebuild": "node scripts/worker-build.mjs rebuild && wrangler deploy --env production --config workers/rebuild/wrangler.toml", diff --git a/src/assets/styles/base/index.css b/src/assets/styles/base/index.css index ce316fb2..f94557a6 100644 --- a/src/assets/styles/base/index.css +++ b/src/assets/styles/base/index.css @@ -430,6 +430,10 @@ main { .home-status, article { margin-bottom: var(--sizing-base); +} + +.home-status, +.posts-wrapper article { border-bottom: 1px solid var(--gray-light); } diff --git a/src/assets/styles/components/addon-links.css b/src/assets/styles/components/addon-links.css deleted file mode 100644 index d744bb68..00000000 --- a/src/assets/styles/components/addon-links.css +++ /dev/null @@ -1,29 +0,0 @@ -.addon-links { - display: grid; - gap: var(--sizing-sm); - grid-template-columns: repeat(1, 1fr); - - & div { - & > h3 { - margin-top: 0; - } - - &:last-of-type h3 { - margin-top: var(--sizing-base); - } - } - - & .link-list { - margin-bottom: 0; - } -} - -@media screen and (min-width: 768px) { - .addon-links { - grid-template-columns: repeat(2, 1fr); - - & div:last-of-type h3 { - margin-top: 0; - } - } -} \ No newline at end of file diff --git a/src/assets/styles/index.css b/src/assets/styles/index.css index 0dbf6b08..43c50f6d 100644 --- a/src/assets/styles/index.css +++ b/src/assets/styles/index.css @@ -25,7 +25,6 @@ @import url('./pages/webrings.css') layer(page); /* component styles */ -@import url('./components/addon-links.css') layer(components); @import url('./components/badge-grid.css') layer(components); @import url('./components/banners.css') layer(components); @import url('./components/buttons.css') layer(components); diff --git a/src/data/analytics.js b/src/data/analytics.js deleted file mode 100644 index 0b6ee31b..00000000 --- a/src/data/analytics.js +++ /dev/null @@ -1,18 +0,0 @@ -import EleventyFetch from '@11ty/eleventy-fetch' - -export default async function () { - 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 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 08bd4c9b..75702fe5 100644 --- a/src/includes/base.liquid +++ b/src/includes/base.liquid @@ -107,8 +107,7 @@ - - + {{ content }} - \ No newline at end of file diff --git a/src/includes/partials/blocks/addon-links.liquid b/src/includes/partials/blocks/addon-links.liquid deleted file mode 100644 index 56e33af6..00000000 --- a/src/includes/partials/blocks/addon-links.liquid +++ /dev/null @@ -1,8 +0,0 @@ -
- {%- if popularPosts.size > 0 -%} -
{% render "partials/blocks/popular-posts.liquid", popularPosts:popularPosts %}
- {%- endif -%} - {%- if links.size > 0 -%} -
{% render "partials/blocks/recent-links.liquid", links:links %}
- {%- endif -%} -
\ No newline at end of file diff --git a/src/includes/partials/blocks/index.liquid b/src/includes/partials/blocks/index.liquid index 86c2d557..b8081ffa 100644 --- a/src/includes/partials/blocks/index.liquid +++ b/src/includes/partials/blocks/index.liquid @@ -13,7 +13,5 @@ {{ block.text | markdown }} {%- elsif block.type == 'divider' -%} {{ block.markup | markdown }} - {%- elsif block.type == 'addon_links' -%} - {% render "partials/blocks/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} {%- endif -%} {%- endfor -%} \ No newline at end of file diff --git a/src/includes/partials/blocks/popular-posts.liquid b/src/includes/partials/blocks/popular-posts.liquid deleted file mode 100644 index bb79aea6..00000000 --- a/src/includes/partials/blocks/popular-posts.liquid +++ /dev/null @@ -1,15 +0,0 @@ -{%- if popularPosts.size > 0 -%} -

- {% tablericon "flame" "Popular" %} - Popular posts -

- -{%- endif -%} \ No newline at end of file diff --git a/src/includes/partials/blocks/recent-links.liquid b/src/includes/partials/blocks/recent-links.liquid deleted file mode 100644 index 8bc3b76d..00000000 --- a/src/includes/partials/blocks/recent-links.liquid +++ /dev/null @@ -1,16 +0,0 @@ -{%- if links.size > 0 -%} - - -{%- endif -%} diff --git a/src/pages/dynamic/blogroll.html b/src/pages/dynamic/blogroll.html index 73f4276d..2cd5d06c 100644 --- a/src/pages/dynamic/blogroll.html +++ b/src/pages/dynamic/blogroll.html @@ -5,7 +5,7 @@ permalink: /blogroll.html description: These are awesome blogs that I enjoy and you may enjoy too. ---

{{ title }}

-

You can Download OPML +

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/dynamic/posts/post.html b/src/pages/dynamic/posts/post.html index 44f709ad..46768185 100644 --- a/src/pages/dynamic/posts/post.html +++ b/src/pages/dynamic/posts/post.html @@ -7,7 +7,7 @@ pagination: permalink: "{{ post.slug }}/index.html" schema: blog --- -
+
{% tablericon "calendar-month" "Date" %}
-
-{% render "partials/blocks/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/static/contact.html b/src/pages/static/contact.html index 57f77356..820177e3 100644 --- a/src/pages/static/contact.html +++ b/src/pages/static/contact.html @@ -32,17 +32,4 @@ description: How to contact me. - - \ No newline at end of file + \ No newline at end of file diff --git a/src/pages/static/search.html b/src/pages/static/search.html index 29e4834f..020f3a6a 100644 --- a/src/pages/static/search.html +++ b/src/pages/static/search.html @@ -32,7 +32,6 @@ permalink: /search.html const query = $input.value const results = (query.length > 1) ? getSearchResults(query) : [] if (query === '') renderSearchResults([]) - if (results && typeof plausible === 'function') plausible('Search', { props: { query: query } }); renderSearchResults(results) }) @@ -58,5 +57,4 @@ permalink: /search.html - -{% render "partials/blocks/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} \ No newline at end of file + \ No newline at end of file diff --git a/workers/analytics/index.js b/workers/analytics/index.js deleted file mode 100644 index f3b2b04b..00000000 --- a/workers/analytics/index.js +++ /dev/null @@ -1,39 +0,0 @@ -const scriptName = '/js/script.js' -const endpoint = '/api/event' - -addEventListener("fetch", (event) => { - event.passThroughOnException() - event.respondWith(handleRequest(event)) -}) - -async function handleRequest(event) { - const url = new URL(event.request.url) - const pathname = url.pathname - - if (pathname === scriptName) { - return getScript(event) - } else if (pathname === endpoint) { - return postData(event) - } - return new Response(null, { status: 404 }) -} - -async function getScript(event) { - const cache = caches.default - let response = await cache.match(event.request) - - if (!response) { - const scriptUrl = - 'https://plausible.io/js/plausible.outbound-links.tagged-events.js' - response = await fetch(scriptUrl) - if (response.ok) event.waitUntil(cache.put(event.request, response.clone())) - } - - return response -} - -async function postData(event) { - const request = new Request(event.request) - request.headers.delete('cookie') - return await fetch('https://plausible.io/api/event', request) -} \ No newline at end of file diff --git a/workers/analytics/wrangler.template.toml b/workers/analytics/wrangler.template.toml deleted file mode 100644 index 5b395041..00000000 --- a/workers/analytics/wrangler.template.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "analytics-worker" -main = "./index.js" -compatibility_date = "2023-01-01" - -account_id = "${CF_ACCOUNT_ID}" -workers_dev = true - -[env.production] -name = "analytics-worker-production" -routes = [ - { pattern = "coryd.dev/js/*", zone_id = "${CF_ZONE_ID}" }, - { pattern = "coryd.dev/api/event", zone_id = "${CF_ZONE_ID}" } -] \ No newline at end of file