diff --git a/.eleventy.js b/.eleventy.js index 3317f495..b8c3653a 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -7,7 +7,7 @@ import markdownItFootnote from 'markdown-it-footnote' import htmlmin from 'html-minifier-terser' import filters from './config/filters/index.js' import { minifyJsComponents } from './config/events/index.js' -import { allContent, searchIndex } from './config/collections/index.js' +import { allContent, popularPosts, searchIndex } from './config/collections/index.js' import { DateTime } from 'luxon' // load .env @@ -56,6 +56,7 @@ export default async function (eleventyConfig) { // collections eleventyConfig.addCollection('allContent', allContent) + eleventyConfig.addCollection('popularPosts', popularPosts) eleventyConfig.addCollection('searchIndex', searchIndex) const md = markdownIt({ html: true, linkify: true }) diff --git a/config/collections/index.js b/config/collections/index.js index 2f94fdb5..66156923 100644 --- a/config/collections/index.js +++ b/config/collections/index.js @@ -1,4 +1,5 @@ import { DateTime } from 'luxon' +import slugify from 'slugify' const BASE_URL = 'https://coryd.dev' @@ -97,4 +98,19 @@ export const allContent = (collection) => { const dateB = b['date'] ? DateTime.fromISO(b['date']) : DateTime.fromMillis(0) return dateB - dateA }) +} + +export const popularPosts = (collection) => { + const collectionData = collection.getAll()[0] + const { data } = collectionData + const { posts, analytics } = data + + return posts + .filter((post) => { + if (analytics.find((p) => p.url.includes(post.slug))) return true + }) + .sort((a, b) => { + const visitors = (page) => analytics.filter((p) => p.url.includes(page.slug)).pop()?.value + return visitors(b) - visitors(a) + }) } \ No newline at end of file diff --git a/config/filters/index.js b/config/filters/index.js index 139ad0b6..5f44233c 100644 --- a/config/filters/index.js +++ b/config/filters/index.js @@ -1,6 +1,5 @@ import { DateTime } from 'luxon' import { URL } from 'url' -import slugify from 'slugify' import markdownIt from 'markdown-it' import sanitizeHtml from 'sanitize-html'; @@ -29,28 +28,11 @@ export default { return !!normalizedPage && normalizedPage.includes(category) && !/\d+/.test(normalizedPage); }, - // analytics - getPopularPosts: (posts, analytics) => { - return posts - .filter((post) => { - if (analytics.find((p) => p.url.includes(slugify(post.title).toLowerCase()))) return true - }) - .sort((a, b) => { - const visitors = (page) => analytics.filter((p) => p.url.includes(slugify(page.title).toLowerCase())).pop().value - return visitors(b) - visitors(a) - }) - }, - // posts filterByPostType: (posts, postType) => { if (postType === 'featured') return shuffleArray(posts.filter(post => post.featured === true)).slice(0, 3) return posts.slice(0, 5) }, - slugifyPost: (title) => slugify(title, { - replacement: '-', - remove: /[#,&,+()$~%.'":*?<>{}\[\]\/\\|`!@\^\—]/g, - lower: true, - }), // watching featuredWatching: (watching, count) => shuffleArray(watching.filter(watch => watch.favorite === true)).slice(0, count), diff --git a/package.json b/package.json index bc31c761..4f0075e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "18.9.10", + "version": "18.10.11", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/_includes/partials/widgets/addon-links.liquid b/src/_includes/partials/widgets/addon-links.liquid index dd896035..e9100759 100644 --- a/src/_includes/partials/widgets/addon-links.liquid +++ b/src/_includes/partials/widgets/addon-links.liquid @@ -1,6 +1,6 @@
- {%- if analytics.size > 0 -%} -
{% render "partials/widgets/popular-posts.liquid", posts:posts, analytics:analytics %}
+ {%- if popularPosts.size > 0 -%} +
{% render "partials/widgets/popular-posts.liquid", popularPosts:popularPosts %}
{%- endif -%} {%- if links.size > 0 -%}
{% render "partials/widgets/recent-links.liquid", links:links %}
diff --git a/src/_includes/partials/widgets/popular-posts.liquid b/src/_includes/partials/widgets/popular-posts.liquid index 777ca6d2..c8c80116 100644 --- a/src/_includes/partials/widgets/popular-posts.liquid +++ b/src/_includes/partials/widgets/popular-posts.liquid @@ -1,11 +1,10 @@ -{% assign postData = posts | getPopularPosts: analytics %} -{% if postData.size > 0 %} +{% if popularPosts.size > 0 %}

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

- {% render "partials/widgets/addon-links.liquid", posts:posts, analytics:analytics, links:collections.links %} + {% render "partials/widgets/addon-links.liquid", popularPosts:collections.popularPosts, 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 21023da2..2a907f06 100644 --- a/src/pages/main/posts/post.html +++ b/src/pages/main/posts/post.html @@ -22,4 +22,5 @@ schema: blog {{ post.content | markdown }} {% render "partials/posts/blocks.liquid", blocks:post.blocks %} - \ No newline at end of file + +{% render "partials/widgets/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} \ No newline at end of file diff --git a/src/pages/main/search.html b/src/pages/main/search.html index c5780649..70655eef 100644 --- a/src/pages/main/search.html +++ b/src/pages/main/search.html @@ -55,4 +55,4 @@ permalink: /search.html -{% render "partials/widgets/addon-links.liquid", posts:posts, analytics:analytics, links:links %} \ No newline at end of file +{% render "partials/widgets/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} \ No newline at end of file diff --git a/src/pages/secondary/contact/success.html b/src/pages/secondary/contact/success.html index 40453c95..b786e313 100644 --- a/src/pages/secondary/contact/success.html +++ b/src/pages/secondary/contact/success.html @@ -9,4 +9,4 @@ description: I'll be in touch soon. Thanks for your message! I'll be in touch soon! Head home
-{% render "partials/widgets/addon-links.liquid", posts:posts, analytics:analytics, links:links %} \ No newline at end of file +{% render "partials/widgets/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} \ No newline at end of file