Skip to content

Commit

Permalink
Add example counter for tags and contributors, cleanup (#45)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tbreuss
tbreuss authored Nov 6, 2021
1 parent 177ea7f commit b631866
Show file tree
Hide file tree
Showing 6 changed files with 115 additions and 75 deletions.
158 changes: 98 additions & 60 deletions .eleventy.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
const { DateTime } = require("luxon");
const fs = require("fs");
const pluginRss = require("@11ty/eleventy-plugin-rss");
const pluginSyntaxHighlight = require("@11ty/eleventy-plugin-syntaxhighlight");
const pluginNavigation = require("@11ty/eleventy-navigation");
const markdownIt = require("markdown-it");
const markdownItAnchor = require("markdown-it-anchor");
const { DateTime } = require('luxon');
const fs = require('fs');
const pluginRss = require('@11ty/eleventy-plugin-rss');
const pluginNavigation = require('@11ty/eleventy-navigation');
const markdownIt = require('markdown-it');
const markdownItAnchor = require('markdown-it-anchor');
const {decode} = require('html-entities');
const util = require('util')

Expand All @@ -16,31 +15,30 @@ module.exports = function(eleventyConfig) {

// Add plugins
eleventyConfig.addPlugin(pluginRss);
// eleventyConfig.addPlugin(pluginSyntaxHighlight);
eleventyConfig.addPlugin(pluginNavigation);

// https://www.11ty.dev/docs/data-deep-merge/
eleventyConfig.setDataDeepMerge(true);

// Alias `layout: post` to `layout: layouts/post.njk`
// eleventyConfig.addLayoutAlias("example", "layouts/example.html");
// eleventyConfig.addLayoutAlias('example', 'layouts/example.html');

// see https://rob.cogit8.org/posts/2020-10-28-simple-11ty-cache-busting/
eleventyConfig.addFilter("bust", (url) => {
const [urlPart, paramPart] = url.split("?");
const params = new URLSearchParams(paramPart || "");
params.set("v", DateTime.local().toFormat("X"));
eleventyConfig.addFilter('bust', (url) => {
const [urlPart, paramPart] = url.split('?');
const params = new URLSearchParams(paramPart || '');
params.set('v', DateTime.local().toFormat('X'));
return `${urlPart}?${params}`;
});

eleventyConfig.addFilter("stringify", (csvString) => {
eleventyConfig.addFilter('stringify', (csvString) => {
if (!Array.isArray(csvString)) {
return '[]';
}
return JSON.stringify(csvString);
});

eleventyConfig.addFilter("add_link_to_flems", (content, title, flemsSelected, flemsFiles, flemsLinks, version) => {
eleventyConfig.addFilter('add_link_to_flems', (content, title, flemsSelected, flemsFiles, flemsLinks, version) => {

if (!flemsSelected || flemsSelected === '') {
flemsSelected = '.js';
Expand Down Expand Up @@ -212,8 +210,8 @@ module.exports = function(eleventyConfig) {
return content + html;
});

eleventyConfig.addFilter("readableDate", dateObj => {
return DateTime.fromJSDate(dateObj, {zone: 'utc'}).toFormat("dd LLLL yyyy");
eleventyConfig.addFilter('readableDate', dateObj => {
return DateTime.fromJSDate(dateObj, {zone: 'utc'}).toFormat('dd LLLL yyyy');
});

// https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#valid-date-string
Expand All @@ -222,7 +220,7 @@ module.exports = function(eleventyConfig) {
});

// Get the first `n` elements of a collection.
eleventyConfig.addFilter("head", (array, n) => {
eleventyConfig.addFilter('head', (array, n) => {
if(!Array.isArray(array) || array.length === 0) {
return [];
}
Expand All @@ -234,15 +232,15 @@ module.exports = function(eleventyConfig) {
});

// Return the smallest number argument
eleventyConfig.addFilter("min", (...numbers) => {
eleventyConfig.addFilter('min', (...numbers) => {
return Math.min.apply(null, numbers);
});

function filterTagList(tags) {
return (tags || []).filter(tag => ["all", "nav", "post", "posts"].indexOf(tag) === -1);
return (tags || []).filter(tag => ['all', 'nav', 'post', 'posts'].indexOf(tag) === -1);
}

eleventyConfig.addFilter("filterTagList", filterTagList)
eleventyConfig.addFilter('filterTagList', filterTagList)

eleventyConfig.addFilter('filterByAuthor', function(collection, author) {
if (!author) return collection;
Expand All @@ -254,40 +252,80 @@ module.exports = function(eleventyConfig) {
return collection.filter(item => item.data.tags.indexOf(tag) !== -1)
});

eleventyConfig.addCollection("authorList", function(collection) {
let authorSet = new Set();
collection.getAll().forEach(item => {
if (item.data.author && item.data.author.length > 0) {
authorSet.add(item.data.author)
eleventyConfig.addCollection('authorMap', function(collection) {
let map = new Map();
collection.getFilteredByGlob('./examples/*.*').forEach(item => {
let key = item.data.author
if (!key || key.length <= 0) {
return
}
key = key.toLowerCase()
let author = {
name: item.data.author,
count: 1
}
if (map.has(key)) {
let count = map.get(key).count
author.count = count + 1
}
map.set(key, author)
}
});
);
return [...map.entries()];
});

eleventyConfig.addCollection('authorList', function(collection) {
let authorSet = new Set();
collection.getFilteredByGlob('./examples/*.*').forEach(item => {
if (item.data.author && item.data.author.length > 0) {
authorSet.add(item.data.author)
}
});
return [...authorSet];
});

eleventyConfig.addCollection('tagMap', function(collection) {
let map = new Map();
collection.getFilteredByGlob('./examples/*.*').forEach(item => {
(item.data.tags || []).forEach(tag => {
let key = tag
if (!key || key.length <= 0) {
return
}
key = key.toLowerCase()
let tagObj = {
name: tag,
count: 1
}
if (map.has(key)) {
let count = map.get(key).count
tagObj.count = count + 1
}
map.set(key, tagObj)
});
});
return [...map.entries()];
});

// Create an array of all tags
eleventyConfig.addCollection("tagList", function(collection) {
eleventyConfig.addCollection('tagList', function(collection) {
let tagSet = new Set();
collection.getAll().forEach(item => {
(item.data.tags || []).forEach(tag => tagSet.add(tag));
});

collection.getFilteredByGlob('./examples/*.*').forEach(item => {
(item.data.tags || []).forEach(tag => tagSet.add(tag));
});
return filterTagList([...tagSet]);
});

eleventyConfig.addCollection('examplesLatest', collection => {
return collection
.getFilteredByGlob('./examples/*.md')
.sort(function(a, b) {
return collection.getFilteredByGlob('./examples/*.md').sort(function(a, b) {
if (a.data.date > b.data.date) return -1;
else if (a.data.date < b.data.date) return 1;
else return 0;
});
});

eleventyConfig.addCollection('examples', collection => {
return collection
.getFilteredByGlob('./examples/*.md')
.sort(function(a, b) {
return collection.getFilteredByGlob('./examples/*.md').sort(function(a, b) {
let nameA = a.data.title.toUpperCase();
let nameB = b.data.title.toUpperCase();
if (nameA < nameB) return -1;
Expand All @@ -297,10 +335,10 @@ module.exports = function(eleventyConfig) {
});

// Copy the `img` and `css` folders to the output
eleventyConfig.addPassthroughCopy("img");
eleventyConfig.addPassthroughCopy("css");
eleventyConfig.addPassthroughCopy(".htaccess");
eleventyConfig.addPassthroughCopy("robots.txt");
eleventyConfig.addPassthroughCopy('img');
eleventyConfig.addPassthroughCopy('css');
eleventyConfig.addPassthroughCopy('.htaccess');
eleventyConfig.addPassthroughCopy('robots.txt');

// Customize Markdown library and settings:
let markdownLibrary = markdownIt({
Expand All @@ -309,24 +347,24 @@ module.exports = function(eleventyConfig) {
linkify: true
}).use(markdownItAnchor, {
permalink: markdownItAnchor.permalink.ariaHidden({
placement: "after",
class: "direct-link",
symbol: "#",
placement: 'after',
class: 'direct-link',
symbol: '#',
level: [1,2,3,4],
}),
slugify: eleventyConfig.getFilter("slug")
slugify: eleventyConfig.getFilter('slug')
});
eleventyConfig.setLibrary("md", markdownLibrary);
eleventyConfig.setLibrary('md', markdownLibrary);

// Override Browsersync defaults (used only with --serve)
eleventyConfig.setBrowserSyncConfig({
callbacks: {
ready: function(err, browserSync) {
const content_404 = fs.readFileSync('_site/404.html');

browserSync.addMiddleware("*", (req, res) => {
browserSync.addMiddleware('*', (req, res) => {
// Provides the 404 content without redirect.
res.writeHead(404, {"Content-Type": "text/html; charset=UTF-8"});
res.writeHead(404, {'Content-Type': 'text/html; charset=UTF-8'});
res.write(content_404);
res.end();
});
Expand All @@ -340,10 +378,10 @@ module.exports = function(eleventyConfig) {
// Control which files Eleventy will process
// e.g.: *.md, *.njk, *.html, *.liquid
templateFormats: [
"md",
"njk",
"html",
"liquid"
'md',
'njk',
'html',
'liquid'
],

// -----------------------------------------------------------------
Expand All @@ -357,24 +395,24 @@ module.exports = function(eleventyConfig) {
// You can also pass this in on the command line using `--pathprefix`

// Optional (default is shown)
pathPrefix: "/",
pathPrefix: '/',
// -----------------------------------------------------------------

// Pre-process *.md files with: (default: `liquid`)
markdownTemplateEngine: "njk",
markdownTemplateEngine: 'njk',

// Pre-process *.html files with: (default: `liquid`)
htmlTemplateEngine: "njk",
htmlTemplateEngine: 'njk',

// Opt-out of pre-processing global data JSON files: (default: `liquid`)
dataTemplateEngine: false,

// These are all optional (defaults are shown):
dir: {
input: ".",
includes: "_includes",
data: "_data",
output: "_site"
input: '.',
includes: '_includes',
data: '_data',
output: '_site'
}
};
};
7 changes: 4 additions & 3 deletions api/contributors.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ permalink: /api/contributors.json
eleventyExcludeFromCollections: true
---
[
{%- for author in collections.authorList | sort %}
{%- set authorUrl %}/contributors/{{ author | slug }}/{% endset %}
{%- for key, author in collections.authorMap | sort %}
{%- set authorUrl %}/contributors/{{ author.name | slug }}/{% endset %}
{
"name": "{{ author }}",
"name": "{{ author.name }}",
"examples": {{ author.count }},
"url": "{{ authorUrl | url }}"
}{{ '' if loop.last else ',' }}
{%- endfor %}
Expand Down
7 changes: 4 additions & 3 deletions api/tags.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ permalink: /api/tags.json
eleventyExcludeFromCollections: true
---
[
{%- for tag in collections.tagList | sort %}
{%- set tagUrl %}/tags/{{ tag | slug }}/{% endset %}
{%- for key, tag in collections.tagMap | sort %}
{%- set tagUrl %}/tags/{{ tag.name | slug }}/{% endset %}
{
"name": "{{ tag }}",
"name": "{{ tag.name }}",
"examples": {{ tag.count }},
"url": "{{ tagUrl | url }}"
}{{ '' if loop.last else ',' }}
{%- endfor %}
Expand Down
8 changes: 4 additions & 4 deletions contributors-list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
key: Contributors
order: 3
---
<h1>{{ collections.authorList.length }} Contributors</h1>
<h1>{{ collections.authorMap.length }} Contributors</h1>

<ul class="postlist">
{% for author in collections.authorList | sort %}
{% set authorUrl %}/contributors/{{ author | slug }}/{% endset %}
<li><a href="{{ authorUrl | url }}" class="postlist-link">{{ author }}</a></li>
{% for key, author in collections.authorMap | sort %}
{% set authorUrl %}/contributors/{{ author.name | slug }}/{% endset %}
<li><a href="{{ authorUrl | url }}" class="postlist-link">{{ author.name }} ({{ author.count }})</a></li>
{% endfor %}
</ul>

Expand Down
2 changes: 1 addition & 1 deletion sitemap.xml.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ eleventyExcludeFromCollections: true
<?xml version="1.0" encoding="utf-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
{%- for page in collections.all %}
{% set absoluteUrl %}{{ page.url | url | absoluteUrl(metadata.url) }}{% endset %}
{%- set absoluteUrl %}{{ page.url | url | absoluteUrl(metadata.url) }}{% endset %}
<url>
<loc>{{ absoluteUrl }}</loc>
<lastmod>{{ page.date | htmlDateString }}</lastmod>
Expand Down
8 changes: 4 additions & 4 deletions tags-list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
key: Tags
order: 2
---
<h1>{{ collections.tagList.length }} Tags</h1>
<h1>{{ collections.tagMap.length }} Tags</h1>

<p>
{% for tag in collections.tagList | sort %}
{% set tagUrl %}/tags/{{ tag | slug }}/{% endset %}
<a href="{{ tagUrl | url }}" class="post-tag">{{ tag }}</a>
{% for key, tag in collections.tagMap | sort %}
{% set tagUrl %}/tags/{{ tag.name | slug }}/{% endset %}
<a href="{{ tagUrl | url }}" class="post-tag">{{ tag.name }} ({{ tag.count }})</a>
{% endfor %}
</p>

Expand Down

0 comments on commit b631866

Please sign in to comment.