From 69bfe1697e5513d49b3dcf1e64a0e82c512cbdc8 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Tue, 8 Aug 2023 10:00:43 -0300 Subject: css, content: transformContent: separate images from container --- src/content/dependencies/transformContent.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/content') diff --git a/src/content/dependencies/transformContent.js b/src/content/dependencies/transformContent.js index eed00882..fef74e8c 100644 --- a/src/content/dependencies/transformContent.js +++ b/src/content/dependencies/transformContent.js @@ -351,14 +351,14 @@ export default { return { type: 'image', data: - image.slots({ - src, - class: 'content-image', - link: link ?? true, - width: width ?? null, - height: height ?? null, - thumb: slots.thumb, - }), + html.tag('div', {class: 'content-image'}, + image.slots({ + src, + link: link ?? true, + width: width ?? null, + height: height ?? null, + thumb: slots.thumb, + })), }; } -- cgit 1.3.0-6-gf8a5 From 4236b4f348e14be2b78496c8d1c1c60942aa3515 Mon Sep 17 00:00:00 2001 From: "(quasar) nebula" Date: Tue, 8 Aug 2023 11:21:46 -0300 Subject: content: generateCommentaryIndexPage --- .../dependencies/generateCommentaryIndexPage.js | 102 +++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 src/content/dependencies/generateCommentaryIndexPage.js (limited to 'src/content') diff --git a/src/content/dependencies/generateCommentaryIndexPage.js b/src/content/dependencies/generateCommentaryIndexPage.js new file mode 100644 index 00000000..0cb5a408 --- /dev/null +++ b/src/content/dependencies/generateCommentaryIndexPage.js @@ -0,0 +1,102 @@ +import {accumulateSum, stitchArrays} from '../../util/sugar.js'; +import {filterMultipleArrays, sortChronologically} from '../../util/wiki-data.js'; + +export default { + contentDependencies: ['generatePageLayout', 'linkAlbumCommentary'], + extraDependencies: ['html', 'language', 'wikiData'], + + sprawl({albumData}) { + return {albumData}; + }, + + query(sprawl) { + const query = {}; + + query.albums = + sortChronologically(sprawl.albumData.slice()); + + const entries = + query.albums.map(album => + [album, ...album.tracks] + .filter(({commentary}) => commentary) + .map(({commentary}) => commentary)); + + query.wordCounts = + entries.map(entries => + accumulateSum( + entries, + entry => entry.split(' ').length)); + + query.entryCounts = + entries.map(entries => entries.length); + + filterMultipleArrays(query.albums, query.wordCounts, query.entryCounts, + (album, wordCount, entryCount) => entryCount >= 1); + + return query; + }, + + relations(relation, query) { + return { + layout: + relation('generatePageLayout'), + + albumLinks: + query.albums + .map(album => relation('linkAlbumCommentary', album)), + }; + }, + + data(query) { + return { + wordCounts: query.wordCounts, + entryCounts: query.entryCounts, + + totalWordCount: accumulateSum(query.wordCounts), + totalEntryCount: accumulateSum(query.entryCounts), + }; + }, + + generate(data, relations, {html, language}) { + return relations.layout.slots({ + title: language.$('commentaryIndex.title'), + + headingMode: 'static', + + mainClasses: ['long-content'], + mainContent: [ + html.tag('p', language.$('commentaryIndex.infoLine', { + words: + html.tag('b', + language.formatWordCount(data.totalWordCount, {unit: true})), + + entries: + html.tag('b', + language.countCommentaryEntries(data.totalEntryCount, {unit: true})), + })), + + html.tag('p', + language.$('commentaryIndex.albumList.title')), + + html.tag('ul', + stitchArrays({ + albumLink: relations.albumLinks, + wordCount: data.wordCounts, + entryCount: data.entryCounts, + }).map(({albumLink, wordCount, entryCount}) => + html.tag('li', + language.$('commentaryIndex.albumList.item', { + album: albumLink, + words: language.formatWordCount(wordCount, {unit: true}), + entries: language.countCommentaryEntries(entryCount, {unit: true}), + })))), + ], + + navLinkStyle: 'hierarchical', + navLinks: [ + {auto: 'home'}, + {auto: 'current'}, + ], + }); + }, +}; -- cgit 1.3.0-6-gf8a5