diff --git a/.eleventy.js b/.eleventy.js index b9ffa39d..f34dc2be 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -3,6 +3,7 @@ const tablerIcons = require('eleventy-plugin-tabler-icons') const pluginUnfurl = require('eleventy-plugin-unfurl') const pluginRss = require('@11ty/eleventy-plugin-rss') const embedYouTube = require('eleventy-plugin-youtube-embed') +const postGraph = require('@rknightuk/eleventy-plugin-post-graph') const markdownIt = require('markdown-it') const markdownItAnchor = require('markdown-it-anchor') @@ -11,7 +12,7 @@ const markdownItFootnote = require('markdown-it-footnote') const filters = require('./config/filters/index.js') const { slugifyString } = require('./config/utils') const { svgToJpeg } = require('./config/events/index.js') -const { tagList, tagMap } = require('./config/collections/index.js') +const { tagList, tagMap, postStats } = require('./config/collections/index.js') const CleanCSS = require('clean-css') const { execSync } = require('child_process') @@ -39,6 +40,15 @@ module.exports = function (eleventyConfig) { 'lite.js.path': 'src/assets/scripts/yt-lite.js', }, }) + eleventyConfig.addPlugin(postGraph, { + boxColorLight: '#e5e7eb', + highlightColorLight: '#2563eb', + textColorLight: '#1f2937', + + boxColorDark: '#374151', + highlightColorDark: '#60a5fa', + textColorDark: '#fff', + }) // quiet build output eleventyConfig.setQuietMode(true) @@ -70,6 +80,7 @@ module.exports = function (eleventyConfig) { // collections eleventyConfig.addCollection('tagList', tagList) eleventyConfig.addCollection('tagMap', tagMap) + eleventyConfig.addCollection('postStats', postStats) const md = markdownIt({ html: true, linkify: true }) md.use(markdownItAnchor, { diff --git a/config/collections/index.js b/config/collections/index.js index 294f96cb..e0a2c8ed 100644 --- a/config/collections/index.js +++ b/config/collections/index.js @@ -1,4 +1,6 @@ +const { DateTime } = require('luxon') const tagAliases = require('../data/tag-aliases.json') +const { makeYearStats, processPostFile } = require('./utils') const tagList = (collection) => { const tagsSet = new Set() @@ -36,7 +38,135 @@ const tagMap = (collection) => { return tags } +const postStats = (collectionApi) => { + const oneDayMilliseconds = 1000 * 60 * 60 * 24 + const statsObject = { + avgDays: 0, + avgCharacterCount: 0, + avgCodeBlockCount: 0, + avgParagraphCount: 0, + avgWordCount: 0, + totalWordCount: 0, + totalCodeBlockCount: 0, + postCount: 0, + firstPostDate: new Date(), + lastPostDate: new Date(), + highPostCount: 0, + years: [], + postsByDay: {}, + } + + let avgDays = 0 + let totalDays = 0 + let totalPostCount = 0 + let totalCharacterCount = 0 + let totalCodeBlockCount = 0 + let totalParagraphCount = 0 + let totalWordCount = 0 + let yearCharacterCount = 0 + let yearCodeBlockCount = 0 + let yearParagraphCount = 0 + let yearWordCount = 0 + let yearPostCount = 0 + let yearPostDays = 0 + let highPostCount = 0 + let yearProgress = 0 + + const posts = collectionApi.getFilteredByGlob('src/posts/**/*.md').sort((a, b) => { + return a.date - b.date + }) + + const postCount = posts.length + if (postCount < 1) { + console.log(`No articles found`) + return statsObject + } + + statsObject.postCount = postCount + statsObject.firstPostDate = posts[0].data.page.date + statsObject.lastPostDate = posts[postCount - 1].data.page.date + + let prevPostDate = posts[0].data.page.date + let currentYear = prevPostDate.getFullYear() + + for (let post of posts) { + let postDate = post.data.page.date + const dateIndexKey = `${DateTime.fromISO(postDate).year}-${DateTime.fromISO(postDate).ordinal}` + if (!statsObject.postsByDay[dateIndexKey]) { + statsObject.postsByDay[dateIndexKey] = 0 + } + statsObject.postsByDay[dateIndexKey]++ + let daysBetween = (postDate - prevPostDate) / oneDayMilliseconds + let thisYear = postDate.getFullYear() + if (thisYear != currentYear) { + avgDays = yearPostDays / yearPostCount + highPostCount = Math.max(highPostCount, yearPostCount) + yearProgress = (yearPostCount / highPostCount) * 100 + statsObject.years.push( + makeYearStats( + currentYear, + yearPostCount, + yearWordCount, + yearCodeBlockCount, + avgDays, + yearCharacterCount, + yearParagraphCount, + yearProgress + ) + ) + yearCharacterCount = 0 + yearCodeBlockCount = 0 + yearParagraphCount = 0 + yearWordCount = 0 + yearPostCount = 0 + yearPostDays = 0 + currentYear = thisYear + } + prevPostDate = postDate + totalDays += daysBetween + yearPostDays += daysBetween + totalPostCount++ + yearPostCount++ + const postStats = processPostFile(post.page.inputPath) + totalCharacterCount += postStats.characterCount + yearCharacterCount += postStats.characterCount + totalCodeBlockCount += postStats.codeBlockCount + yearCodeBlockCount += postStats.codeBlockCount + totalParagraphCount += postStats.paragraphCount + yearParagraphCount += postStats.paragraphCount + totalWordCount += postStats.wordCount + yearWordCount += postStats.wordCount + } + if (yearPostCount > 0) { + avgDays = yearPostDays / yearPostCount + highPostCount = Math.max(highPostCount, yearPostCount) + yearProgress = (yearPostCount / highPostCount) * 100 + statsObject.years.push( + makeYearStats( + currentYear, + yearPostCount, + yearWordCount, + yearCodeBlockCount, + avgDays, + yearCharacterCount, + yearParagraphCount, + yearProgress + ) + ) + } + statsObject.avgDays = parseFloat((totalDays / totalPostCount).toFixed(2)) + statsObject.avgCharacterCount = parseFloat((totalCharacterCount / totalPostCount).toFixed(2)) + statsObject.avgCodeBlockCount = parseFloat((totalCodeBlockCount / totalPostCount).toFixed(2)) + statsObject.avgParagraphCount = parseFloat((totalParagraphCount / totalPostCount).toFixed(2)) + statsObject.avgWordCount = parseFloat((totalWordCount / totalPostCount).toFixed(2)) + statsObject.totalWordCount = totalWordCount + statsObject.totalCodeBlockCount = totalCodeBlockCount + statsObject.highPostCount = highPostCount + return statsObject +} + module.exports = { tagList, tagMap, + postStats, } diff --git a/config/collections/utils.js b/config/collections/utils.js new file mode 100644 index 00000000..7a17698d --- /dev/null +++ b/config/collections/utils.js @@ -0,0 +1,64 @@ +const fs = require('fs') +const writingStats = require('writing-stats') + +const processPostFile = (filePath) => { + try { + let content = fs.readFileSync(filePath, 'utf8') + // remove front matter + content = content.replace(/---\n.*?\n---/s, '') + // remove empty lines + content = content.replace(/^\s*[\r\n]/gm, '') + const codeBlockMatches = content.match(/```(.*?)```/gis) + const codeBlocks = codeBlockMatches ? codeBlockMatches.length : 0 + // remove code blocks + content = content.replace(/(```.+?```)/gms, '') + const stats = writingStats(content) + return { + characterCount: stats.characterCount, + codeBlockCount: codeBlocks, + paragraphCount: stats.paragraphCount, + wordCount: stats.wordCount, + } + } catch (err) { + console.error(err) + return { + characterCount: 0, + codeBlockCount: 0, + paragraphCount: 0, + wordCount: 0, + } + } +} + +const makeYearStats = ( + currentYear, + yearPostCount, + yearWordCount, + yearCodeBlockCount, + avgDays, + yearCharacterCount, + yearParagraphCount, + yearProgress +) => { + const daysInYear = + (currentYear % 4 === 0 && currentYear % 100 > 0) || currentYear % 400 == 0 ? 366 : 365 + + return { + year: currentYear, + daysInYear: daysInYear, + postCount: yearPostCount, + wordCount: yearWordCount, + codeBlockCount: yearCodeBlockCount, + avgDays: parseFloat(avgDays.toFixed(2)), + avgCharacterCount: parseFloat((yearCharacterCount / yearPostCount).toFixed(2)), + avgCodeBlockCount: parseFloat((yearCodeBlockCount / yearPostCount).toFixed(2)), + avgParagraphCount: parseFloat((yearParagraphCount / yearPostCount).toFixed(2)), + avgWordCount: parseFloat((yearWordCount / yearPostCount).toFixed(2)), + yearProgress, + } +} + +module.exports = { + processPostFile, + makeYearStats, +} diff --git a/package-lock.json b/package-lock.json index 8ace3a22..ad8c7f05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "@catppuccin/tailwindcss": "^0.1.6", "@commitlint/cli": "^18.4.3", "@commitlint/config-conventional": "^18.4.3", + "@rknightuk/eleventy-plugin-post-graph": "^1.0.1", "@tailwindcss/aspect-ratio": "^0.4.2", "@tailwindcss/line-clamp": "^0.4.4", "@tailwindcss/typography": "^0.5.10", @@ -55,7 +56,8 @@ "slugify": "^1.6.6", "striptags": "^3.2.0", "tailwind-scrollbar": "^3.0.5", - "tailwindcss": "^3.4.0" + "tailwindcss": "^3.4.0", + "writing-stats": "^1.0.6" } }, "node_modules/@11ty/dependency-tree": { @@ -1199,6 +1201,16 @@ "url": "https://opencollective.com/unts" } }, + "node_modules/@rknightuk/eleventy-plugin-post-graph": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@rknightuk/eleventy-plugin-post-graph/-/eleventy-plugin-post-graph-1.0.1.tgz", + "integrity": "sha512-AhT2U1g/onZhekcGDTi7skDLK81p6UC+XaSDyY/yXV8+W+L2skkaad42tRNubaKx+58/eus69aNa4FI3fwfTFA==", + "dev": true, + "dependencies": { + "@11ty/eleventy": "^2.0.1", + "moment": "^2.29.4" + } + }, "node_modules/@sindresorhus/slugify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@sindresorhus/slugify/-/slugify-1.1.2.tgz", @@ -11756,6 +11768,12 @@ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true }, + "node_modules/writing-stats": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/writing-stats/-/writing-stats-1.0.6.tgz", + "integrity": "sha512-Oq3dijwFuKo7MQbgqFaBSONjYB/uP1SfvFC1qSP8mHuHH9DHf2jap/QLxXqVi8/HUeqzNJx8RAUdMNN3RqnVFw==", + "dev": true + }, "node_modules/ws": { "version": "8.14.2", "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", diff --git a/package.json b/package.json index fb84b9de..f71cd29e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "2.8.0", + "version": "2.9.0", "description": "The source for my personal site, blog and portfolio. Built using 11ty and hosted on Netlify.", "main": "index.html", "scripts": { @@ -27,6 +27,7 @@ "@catppuccin/tailwindcss": "^0.1.6", "@commitlint/cli": "^18.4.3", "@commitlint/config-conventional": "^18.4.3", + "@rknightuk/eleventy-plugin-post-graph": "^1.0.1", "@tailwindcss/aspect-ratio": "^0.4.2", "@tailwindcss/line-clamp": "^0.4.4", "@tailwindcss/typography": "^0.5.10", @@ -64,7 +65,8 @@ "slugify": "^1.6.6", "striptags": "^3.2.0", "tailwind-scrollbar": "^3.0.5", - "tailwindcss": "^3.4.0" + "tailwindcss": "^3.4.0", + "writing-stats": "^1.0.6" }, "lint-staged": { "**/*.{js,ts,json}": [ diff --git a/src/_data/analytics.js b/src/_data/analytics.js index 200e3da1..2c8bf32e 100644 --- a/src/_data/analytics.js +++ b/src/_data/analytics.js @@ -14,5 +14,5 @@ module.exports = async function () { }, }).catch() const pages = await res - return pages.results.filter((p) => p.page.includes('posts')).splice(0, 5) + return pages.results.filter((p) => p.page.includes('posts')) } diff --git a/src/_includes/partials/popular-posts.liquid b/src/_includes/partials/popular-posts.liquid index 72ded891..c0afc16a 100644 --- a/src/_includes/partials/popular-posts.liquid +++ b/src/_includes/partials/popular-posts.liquid @@ -5,7 +5,7 @@ Popular posts