diff --git a/.eleventy.js b/.eleventy.js index 4d3c2e78..8d732c94 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -9,7 +9,7 @@ import markdownItPrism from "markdown-it-prism"; import syntaxHighlight from "@11ty/eleventy-plugin-syntaxhighlight"; import tablerIcons from "@cdransf/eleventy-plugin-tabler-icons"; import { minifyJsComponents } from "./config/events/index.js"; -import { albumReleasesCalendar } from "./config/collections/index.js"; +import { popularPosts, albumReleasesCalendar } from "./config/collections/index.js"; import { cssConfig } from "./config/plugins/css-config.js"; // load .env @@ -48,6 +48,7 @@ export default async function (eleventyConfig) { "assets/scripts/components/youtube-video-element.js", }); + eleventyConfig.addCollection("popularPosts", popularPosts); eleventyConfig.addCollection("albumReleasesCalendar", albumReleasesCalendar); const md = markdownIt({ html: true, linkify: true }); diff --git a/.env b/.env index 706bf394..a999c62f 100644 --- a/.env +++ b/.env @@ -1,4 +1,5 @@ ACCOUNT_ID_PLEX= +API_KEY_PLAUSIBLE= SUPABASE_URL= SUPABASE_KEY= CF_ACCOUNT_ID= diff --git a/config/collections/index.js b/config/collections/index.js index f8c82641..fdfea4a1 100644 --- a/config/collections/index.js +++ b/config/collections/index.js @@ -1,6 +1,22 @@ import { DateTime } from "luxon"; import ics from "ics"; +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.page.includes(post.url))) return true; + }) + .sort((a, b) => { + const visitors = (page) => + analytics.filter((p) => p.page.includes(page.url)).pop()?.visitors; + return visitors(b) - visitors(a); + }); +}; + export const albumReleasesCalendar = (collection) => { const collectionData = collection.getAll()[0]; const { data } = collectionData; diff --git a/package-lock.json b/package-lock.json index 8c8ede6a..26ad27b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,15 @@ { "name": "coryd.dev", - "version": "2.3.3", + "version": "2.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "2.3.3", + "version": "2.4.0", "license": "MIT", "dependencies": { + "@11ty/eleventy-fetch": "4.0.1", "@cdransf/api-text": "^1.7.0", "@cdransf/select-pagination": "^1.3.1", "@cdransf/theme-toggle": "^3.2.0", @@ -170,6 +171,25 @@ "url": "https://opencollective.com/11ty" } }, + "node_modules/@11ty/eleventy-fetch": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@11ty/eleventy-fetch/-/eleventy-fetch-4.0.1.tgz", + "integrity": "sha512-yIiLM5ziBmg86i4TlXpBdcIygJHvh/GgPJyAiFOckO9H4y9cQDM8eIcJCUQ4Mum0NEVui/OjhEut2R08xw0vlQ==", + "license": "MIT", + "dependencies": { + "debug": "^4.3.4", + "flat-cache": "^3.0.4", + "node-fetch": "^2.6.7", + "p-queue": "^6.6.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/11ty" + } + }, "node_modules/@11ty/eleventy-plugin-bundle": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@11ty/eleventy-plugin-bundle/-/eleventy-plugin-bundle-3.0.0.tgz", @@ -709,9 +729,9 @@ "peer": true }, "node_modules/@types/node": { - "version": "22.8.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.1.tgz", - "integrity": "sha512-k6Gi8Yyo8EtrNtkHXutUu2corfDf9su95VYVP10aGYMMROM6SAItZi0w1XszA6RtWTHSVp5OeFof37w0IEqCQg==", + "version": "22.8.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.2.tgz", + "integrity": "sha512-NzaRNFV+FZkvK/KLCsNdTvID0SThyrs5SHB6tsD/lajr22FGC73N2QeDPM2wHtVde8mgcXuSsHQkH5cX1pbPLw==", "license": "MIT", "dependencies": { "undici-types": "~6.19.8" @@ -927,7 +947,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, "license": "MIT" }, "node_modules/bcp-47": { @@ -1038,7 +1057,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -1298,7 +1316,6 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, "license": "MIT" }, "node_modules/content-disposition": { @@ -2179,6 +2196,63 @@ "dev": true, "license": "MIT" }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flat-cache/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/flat-cache/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/flatted": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "license": "ISC" + }, "node_modules/follow-redirects": { "version": "1.15.9", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", @@ -2250,6 +2324,12 @@ "node": ">= 0.6" } }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "license": "ISC" + }, "node_modules/fsevents": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", @@ -2645,11 +2725,21 @@ "yup": "^1.2.0" } }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true, "license": "ISC" }, "node_modules/ipaddr.js": { @@ -2840,6 +2930,12 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "license": "MIT" + }, "node_modules/junk": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/junk/-/junk-1.0.3.tgz", @@ -2850,6 +2946,15 @@ "node": ">=0.10.0" } }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -3207,7 +3312,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" @@ -3318,6 +3422,26 @@ "tslib": "^2.0.3" } }, + "node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/node-releases": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", @@ -3457,6 +3581,52 @@ "node": ">= 0.8" } }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/p-queue": { + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz", + "integrity": "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==", + "license": "MIT", + "dependencies": { + "eventemitter3": "^4.0.4", + "p-timeout": "^3.2.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-timeout": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz", + "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==", + "license": "MIT", + "dependencies": { + "p-finally": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/package-json-from-dist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", @@ -3557,6 +3727,15 @@ "tslib": "^2.0.3" } }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -5175,7 +5354,6 @@ "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true, "license": "MIT" }, "node_modules/truncate-html": { @@ -5321,14 +5499,12 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true, "license": "BSD-2-Clause" }, "node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dev": true, "license": "MIT", "dependencies": { "tr46": "~0.0.3", @@ -5449,6 +5625,12 @@ "node": ">=8" } }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" + }, "node_modules/ws": { "version": "8.18.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", diff --git a/package.json b/package.json index e8e0cdd5..64dacd1b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "2.3.3", + "version": "2.4.0", "description": "The source for my personal site. Built using 11ty (and other tools).", "type": "module", "engines": { @@ -26,6 +26,7 @@ "author": "Cory Dransfeldt", "license": "MIT", "dependencies": { + "@11ty/eleventy-fetch": "4.0.1", "@cdransf/api-text": "^1.7.0", "@cdransf/select-pagination": "^1.3.1", "@cdransf/theme-toggle": "^3.2.0", diff --git a/queries/views/globals/pages.psql b/queries/views/globals/pages.psql index 1b9ccca6..d645e2a3 100644 --- a/queries/views/globals/pages.psql +++ b/queries/views/globals/pages.psql @@ -23,6 +23,8 @@ SELECT json_build_object('type', pb.collection, 'text', md.text) WHEN pb.collection = 'divider' THEN json_build_object('type', pb.collection, 'markup', d.markup) + WHEN pb.collection = 'addon_links' THEN + json_build_object('type', pb.collection, 'addon_links', d.title) ELSE json_build_object('type', pb.collection) END ORDER BY pb.sort) diff --git a/src/assets/scripts/index.js b/src/assets/scripts/index.js index 9154610d..cabc1c2b 100644 --- a/src/assets/scripts/index.js +++ b/src/assets/scripts/index.js @@ -118,6 +118,7 @@ window.addEventListener("load", () => { const $fallback = document.querySelector(".search__form--fallback"); const $input = document.querySelector(".search__form--input"); const $results = document.querySelector(".search__results"); + const $addonLinks = document.querySelector(".addon-links"); const $loadMoreButton = document.querySelector(".search__load-more"); const $typeCheckboxes = document.querySelectorAll( '.search__form--type input[type="checkbox"]' @@ -179,6 +180,7 @@ window.addEventListener("load", () => { resultHTML || '
  • No results found.
    • '; $results.style.display = "block"; + $addonLinks.style.display = results.length === 0 ? "grid" : "none"; }; const loadSearchIndex = async (query, types, page) => { @@ -243,6 +245,7 @@ window.addEventListener("load", () => { if (!query) { renderSearchResults([]); $loadMoreButton.style.display = "none"; + $addonLinks.style.display = "grid"; return; } @@ -271,5 +274,7 @@ window.addEventListener("load", () => { currentResults = [...currentResults, ...nextResults]; updateSearchResults(nextResults); }); + + $addonLinks.style.display = "grid"; })(); }); diff --git a/src/assets/styles/base/index.css b/src/assets/styles/base/index.css index fe0294e3..020e82c9 100644 --- a/src/assets/styles/base/index.css +++ b/src/assets/styles/base/index.css @@ -315,7 +315,7 @@ article { border-bottom: var(--border-gray); &:last-of-type { - border-bottom: none; + border-bottom: 0; } &.intro p { diff --git a/src/assets/styles/components/addon-links.css b/src/assets/styles/components/addon-links.css new file mode 100644 index 00000000..e00ba0d2 --- /dev/null +++ b/src/assets/styles/components/addon-links.css @@ -0,0 +1,24 @@ +.addon-links { + display: grid; + gap: var(--sizing-base); + grid-template-columns: var(--grid-columns-one); + + @media screen and (min-width: 768px) { + grid-template-columns: var(--grid-columns-two); + } + + h3 { + margin-top: 0; + } + + & article { + border-bottom: 0; + margin-bottom: 0; + + & ol, + ul { + padding: 0; + margin-bottom: 0; + } + } +} diff --git a/src/assets/styles/defaults/vars.css b/src/assets/styles/defaults/vars.css index 7d905511..901d69ec 100644 --- a/src/assets/styles/defaults/vars.css +++ b/src/assets/styles/defaults/vars.css @@ -127,6 +127,7 @@ --aspect-ratio-banner: 3/2; /* grid columns */ + --grid-columns-one: repeat(1, minmax(0, 1fr)); --grid-columns-two: repeat(2, minmax(0, 1fr)); --grid-columns-three: repeat(3, minmax(0, 1fr)); --grid-columns-four: repeat(4, minmax(0, 1fr)); diff --git a/src/assets/styles/index.css b/src/assets/styles/index.css index ccc87284..f39d03f7 100644 --- a/src/assets/styles/index.css +++ b/src/assets/styles/index.css @@ -25,6 +25,7 @@ @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 new file mode 100644 index 00000000..3f6d8946 --- /dev/null +++ b/src/data/analytics.js @@ -0,0 +1,18 @@ +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")); +} diff --git a/src/includes/blocks/addon-links.liquid b/src/includes/blocks/addon-links.liquid new file mode 100644 index 00000000..fb5a8b06 --- /dev/null +++ b/src/includes/blocks/addon-links.liquid @@ -0,0 +1,9 @@ + +
    + {%- if popularPosts.size > 0 -%} + {% render "blocks/popular-posts.liquid", popularPosts:popularPosts %} + {%- endif -%} + {%- if links.size > 0 -%} + {% render "blocks/recent-links.liquid", links:links %} + {%- endif -%} +
    \ No newline at end of file diff --git a/src/includes/blocks/index.liquid b/src/includes/blocks/index.liquid index 9c742799..45d01c34 100644 --- a/src/includes/blocks/index.liquid +++ b/src/includes/blocks/index.liquid @@ -14,5 +14,7 @@ {{ block.text | markdown }} {%- when 'divider' -%} {{ block.markup | markdown }} + {%- when 'addon_links' -%} + {% render "blocks/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} {%- endcase -%} {%- endfor -%} \ No newline at end of file diff --git a/src/includes/blocks/popular-posts.liquid b/src/includes/blocks/popular-posts.liquid new file mode 100644 index 00000000..17f18bdc --- /dev/null +++ b/src/includes/blocks/popular-posts.liquid @@ -0,0 +1,15 @@ +{%- if popularPosts.size > 0 -%} +
    +

    + {% tablericon "chart-bar-popular" "Popular" %} + Popular posts +

    +
      + {%- for post in popularPosts limit: 5 -%} +
    1. + {{ post.title }} +
      2. + {%- endfor -%} +
    +
    +{%- endif -%} \ No newline at end of file diff --git a/src/includes/blocks/recent-links.liquid b/src/includes/blocks/recent-links.liquid new file mode 100644 index 00000000..0a3789a3 --- /dev/null +++ b/src/includes/blocks/recent-links.liquid @@ -0,0 +1,18 @@ +{%- if links.size > 0 -%} +
    +

    + {% tablericon "link" "Links" %} + Recent links +

    + +
    +{%- endif -%} \ No newline at end of file diff --git a/src/pages/page.html b/src/pages/page.html index 35d782c6..8dcaa35d 100644 --- a/src/pages/page.html +++ b/src/pages/page.html @@ -9,4 +9,9 @@ image: "{{ page.open_graph_image | prepend: globals.cdn_url | default: globals.a updated: "{{ page.updated | default: null }}" schema: page --- -{% render "blocks/index.liquid", blocks:page.blocks, globals:globals %} \ No newline at end of file +{% render "blocks/index.liquid", + blocks:page.blocks, + globals:globals, + collections:collections, + links:links +%} \ No newline at end of file diff --git a/src/pages/posts/post.html b/src/pages/posts/post.html index c525a797..804e5071 100644 --- a/src/pages/posts/post.html +++ b/src/pages/posts/post.html @@ -51,5 +51,6 @@ schema: blog shows: post.shows %} {% render "blocks/banners/coffee.liquid" %} + {% render "blocks/addon-links.liquid", popularPosts:collections.popularPosts, links:links %} \ No newline at end of file