From 1ed15c40c28a4f9121b23410503d7735062a3e99 Mon Sep 17 00:00:00 2001 From: hugo Date: Sun, 22 Feb 2026 14:48:53 +0100 Subject: [PATCH] feat: more work on calendar - now with heatmap --- src/main/engine/assets/calendarRuntime.ts | 87 +++++++++++++++++-- .../templates/partials/menu-items.liquid | 45 ++++++++++ .../engine/templates/partials/menu.liquid | 47 +--------- .../engine/templates/partials/styles.liquid | 51 +++++++---- tests/engine/BlogGenerationEngine.test.ts | 7 ++ 5 files changed, 166 insertions(+), 71 deletions(-) diff --git a/src/main/engine/assets/calendarRuntime.ts b/src/main/engine/assets/calendarRuntime.ts index 26e10a6..8b478a4 100644 --- a/src/main/engine/assets/calendarRuntime.ts +++ b/src/main/engine/assets/calendarRuntime.ts @@ -18,6 +18,9 @@ export const CALENDAR_RUNTIME_JS = String.raw`(() => { let years = {}; let months = {}; let days = {}; + let maxYearCount = 0; + let maxMonthCount = 0; + let maxDayCount = 0; function pad2(value) { return String(value).padStart(2, '0'); @@ -40,6 +43,29 @@ export const CALENDAR_RUNTIME_JS = String.raw`(() => { return map; } + function computeMaxCount(value) { + const counts = Object.values(value || {}); + if (counts.length === 0) { + return 0; + } + return Math.max(...counts.map((count) => Number(count) || 0)); + } + + function applyHeatStyle(target, count, maxCount) { + if (!(target instanceof HTMLElement) || !Number.isFinite(count) || count <= 0 || !Number.isFinite(maxCount) || maxCount <= 0) { + target?.style?.setProperty('--blog-calendar-heat-alpha', '0'); + target?.style?.setProperty('--blog-calendar-heat-hue', '210'); + return; + } + + const normalized = Math.min(1, count / maxCount); + const hue = Math.round(210 - (210 * normalized)); + const alpha = (0.30 + normalized * 0.65).toFixed(3); + + target.style.setProperty('--blog-calendar-heat-hue', String(hue)); + target.style.setProperty('--blog-calendar-heat-alpha', alpha); + } + function navigateTo(pathname) { if (!pathname) { return; @@ -57,6 +83,9 @@ export const CALENDAR_RUNTIME_JS = String.raw`(() => { years = normalizeCountMap(parsed?.years); months = normalizeCountMap(parsed?.months); days = normalizeCountMap(parsed?.days); + maxYearCount = computeMaxCount(years); + maxMonthCount = computeMaxCount(months); + maxDayCount = computeMaxCount(days); } function getDateFromClickEvent(event) { @@ -97,21 +126,61 @@ export const CALENDAR_RUNTIME_JS = String.raw`(() => { return; } - const existing = buttonEl.querySelector('.blog-calendar-post-count'); - if (existing) { - existing.remove(); - } - if (count <= 0) { dateEl.removeAttribute('data-blog-calendar-has-posts'); + applyHeatStyle(buttonEl, 0, maxDayCount); return; } dateEl.setAttribute('data-blog-calendar-has-posts', 'true'); - const marker = document.createElement('span'); - marker.className = 'blog-calendar-post-count'; - marker.textContent = String(count); - buttonEl.appendChild(marker); + applyHeatStyle(buttonEl, count, maxDayCount); + }, + onCreateMonthEls(self, monthEl) { + if (!(monthEl instanceof HTMLElement)) { + return; + } + + const monthIndex = Number(monthEl.dataset.vcMonthsMonth); + const selectedYear = Number(self?.context?.selectedYear); + if (!Number.isInteger(monthIndex) || !Number.isInteger(selectedYear)) { + monthEl.removeAttribute('data-blog-calendar-has-posts'); + applyHeatStyle(monthEl, 0, maxMonthCount); + return; + } + + const monthKey = String(selectedYear) + '-' + pad2(monthIndex + 1); + const count = Number(months[monthKey] || 0); + if (count <= 0) { + monthEl.removeAttribute('data-blog-calendar-has-posts'); + applyHeatStyle(monthEl, 0, maxMonthCount); + return; + } + + monthEl.setAttribute('data-blog-calendar-has-posts', 'true'); + applyHeatStyle(monthEl, count, maxMonthCount); + }, + onCreateYearEls(_self, yearEl) { + if (!(yearEl instanceof HTMLElement)) { + return; + } + + const yearValue = Number(yearEl.dataset.vcYearsYear); + if (!Number.isInteger(yearValue)) { + yearEl.removeAttribute('data-blog-calendar-has-posts'); + applyHeatStyle(yearEl, 0, maxYearCount); + return; + } + + const yearKey = String(yearValue); + const count = Number(years[yearKey] || 0); + if (count <= 0) { + yearEl.removeAttribute('data-blog-calendar-has-posts'); + applyHeatStyle(yearEl, 0, maxYearCount); + return; + } + + yearEl.setAttribute('data-blog-calendar-has-posts', 'true'); + applyHeatStyle(yearEl, count, maxYearCount); }, onClickDate(_self, event) { const dateKey = getDateFromClickEvent(event); diff --git a/src/main/engine/templates/partials/menu-items.liquid b/src/main/engine/templates/partials/menu-items.liquid index c7ef16a..db564df 100644 --- a/src/main/engine/templates/partials/menu-items.liquid +++ b/src/main/engine/templates/partials/menu-items.liquid @@ -13,4 +13,49 @@ {% endif %} {% endfor %} + + {% if include_calendar %} +
  • + + + +
    • + {% endif %} diff --git a/src/main/engine/templates/partials/menu.liquid b/src/main/engine/templates/partials/menu.liquid index 0a05ecf..33ffd69 100644 --- a/src/main/engine/templates/partials/menu.liquid +++ b/src/main/engine/templates/partials/menu.liquid @@ -1,48 +1,7 @@ diff --git a/src/main/engine/templates/partials/styles.liquid b/src/main/engine/templates/partials/styles.liquid index d742268..cd8d3be 100644 --- a/src/main/engine/templates/partials/styles.liquid +++ b/src/main/engine/templates/partials/styles.liquid @@ -6,8 +6,9 @@ [data-theme='dark'] { --pico-background-color: #13171f; } body { max-width: 960px; margin: 0 auto; padding: 2rem 1rem 4rem; background: var(--pico-background-color, var(--background-color)); color: var(--pico-color, var(--color)); } main { display: grid; gap: 1rem; } - .blog-menu { position: relative; display: flex; align-items: center; justify-content: space-between; gap: .75rem; border-top: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); border-bottom: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); padding: .4rem 0; margin: -.15rem 0 .2rem; } - .blog-menu-list { list-style: none; display: flex; flex-wrap: wrap; gap: .25rem .75rem; margin: 0; padding: 0; } + .blog-menu { position: relative; display: flex; align-items: baseline; justify-content: space-between; gap: .75rem; border-top: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); border-bottom: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); padding: .4rem 0; margin: -.15rem 0 .2rem; } + .blog-menu > .blog-menu-list { width: 100%; } + .blog-menu-list { list-style: none; display: flex; flex-wrap: wrap; align-items: baseline; gap: .25rem .75rem; margin: 0; padding: 0; } .blog-menu-item { position: relative; } .blog-menu-link { display: inline-flex; align-items: center; color: var(--pico-muted-color, var(--muted-color)); text-decoration: none; font-size: .94rem; line-height: 1.4; padding: .2rem .1rem; } .blog-menu-item-with-children > .blog-menu-link::after { content: '▾'; font-size: .7em; margin-left: .38rem; opacity: .72; } @@ -17,30 +18,44 @@ .blog-menu-submenu .blog-menu-list { flex-direction: column; flex-wrap: nowrap; gap: .2rem; } .blog-menu-item-with-children:hover > .blog-menu-submenu, .blog-menu-item-with-children:focus-within > .blog-menu-submenu { display: block; } - .blog-menu-calendar { position: relative; display: inline-flex; align-items: center; justify-content: center; margin-left: auto; align-self: center; } - .blog-menu-calendar-button { display: inline-flex; align-items: center; justify-content: center; width: auto; height: auto; padding: .2rem .1rem; border: 0; background: transparent; color: var(--pico-muted-color, var(--muted-color)); border-radius: 0; cursor: pointer; font-size: .94rem; line-height: 1.4; } - .blog-menu-calendar-button svg { display: block; width: .94rem; height: .94rem; fill: none; stroke: currentColor; transform: translateY(1px); } + .blog-menu-calendar { position: relative; display: inline-flex; align-items: baseline; justify-content: center; margin-left: auto; align-self: baseline; flex-shrink: 0; } + .blog-menu-calendar-button { display: inline-flex; align-items: center; justify-content: center; width: auto; height: auto; margin: 0; padding: .2rem .1rem; border: 0; background: transparent; color: var(--pico-muted-color, var(--muted-color)); border-radius: 0; cursor: pointer; font: inherit; font-size: .94rem; line-height: 1.4; appearance: none; -webkit-appearance: none; vertical-align: baseline; } + .blog-menu-calendar-button svg { display: block; width: .9rem; height: .9rem; fill: none; stroke: currentColor; transform: translateY(2px); } .blog-menu-calendar-button:hover, .blog-menu-calendar-button:focus-visible { color: var(--pico-color, var(--color)); } - .blog-calendar-panel { position: absolute; top: calc(100% + .2rem); right: 0; width: min(19rem, 92vw); border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); background: var(--pico-card-background-color, var(--card-background-color)); padding: .4rem; z-index: 30; } - .blog-calendar-header { display: flex; align-items: center; justify-content: space-between; margin-bottom: .2rem; } - .blog-calendar-close { border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); background: transparent; color: var(--pico-muted-color, var(--muted-color)); width: 1.55rem; height: 1.55rem; border-radius: .2rem; padding: 0; cursor: pointer; } + .blog-calendar-panel { position: absolute; top: calc(100% + .15rem); right: 0; width: min(17.5rem, 92vw); border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); background: var(--pico-card-background-color, var(--card-background-color)); padding: .32rem; z-index: 30; } + .blog-calendar-header { display: flex; align-items: center; justify-content: space-between; margin-bottom: .1rem; } + .blog-calendar-header strong { font-size: .9rem; line-height: 1.2; } + .blog-calendar-close { border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); background: transparent; color: var(--pico-muted-color, var(--muted-color)); width: 1.35rem; height: 1.35rem; border-radius: .2rem; padding: 0; cursor: pointer; line-height: 1; } .blog-calendar-close:hover, .blog-calendar-close:focus-visible { color: var(--pico-color, var(--color)); border-color: var(--pico-color, var(--color)); } - .blog-calendar-content { display: grid; gap: .18rem; } - .blog-calendar-status { margin: .2rem 0 0; color: var(--pico-muted-color, var(--muted-color)); font-size: .78rem; } - [data-blog-calendar-root] [data-vc=header] { margin-bottom: .2rem; } + .blog-calendar-content { display: grid; gap: .08rem; } + .blog-calendar-status { margin: .1rem 0 0; color: var(--pico-muted-color, var(--muted-color)); font-size: .74rem; } + [data-blog-calendar-root] { font-size: .86rem; } + [data-blog-calendar-root] [data-vc=header] { margin-bottom: .08rem; } [data-blog-calendar-root] [data-vc=month], - [data-blog-calendar-root] [data-vc=year] { padding: .15rem .25rem; } + [data-blog-calendar-root] [data-vc=year] { padding: .08rem .18rem; font-size: .9rem; line-height: 1.15; } [data-blog-calendar-root] [data-vc=months], - [data-blog-calendar-root] [data-vc=years] { row-gap: .5rem; } + [data-blog-calendar-root] [data-vc=years] { row-gap: .32rem; } + [data-blog-calendar-root] [data-vc=years] { grid-template-columns: repeat(4, minmax(0, 1fr)); } [data-blog-calendar-root] [data-vc-months-month], - [data-blog-calendar-root] [data-vc-years-year] { height: 2rem; } - [data-blog-calendar-root] [data-vc-week=days] { margin-bottom: .25rem; } + [data-blog-calendar-root] [data-vc-years-year] { height: 1.72rem; } + [data-blog-calendar-root] [data-vc-months-month], + [data-blog-calendar-root] [data-vc-years-year] { word-break: normal; white-space: nowrap; } + [data-blog-calendar-root] [data-vc-years-year] { min-width: 2.5rem; font-size: .7rem; line-height: 1; } + [data-blog-calendar-root] [data-vc-week=days] { margin-bottom: .08rem; } + [data-blog-calendar-root] [data-vc-week-day] { font-size: .68rem; line-height: .9rem; min-width: 1.45rem; } [data-blog-calendar-root] [data-vc-date] { padding-top: 0; padding-bottom: 0; } - [data-blog-calendar-root] [data-vc-date-btn] { min-height: 1.65rem; min-width: 1.65rem; } - [data-blog-calendar-has-posts='true'] [data-vc-date-btn] { border-color: var(--pico-primary, var(--pico-color, var(--color))); } - .blog-calendar-post-count { display: inline-flex; align-items: center; justify-content: center; min-width: .95rem; height: .95rem; margin-left: .16rem; border-radius: 999px; font-size: .56rem; line-height: 1; border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); color: var(--pico-color, var(--color)); } + [data-blog-calendar-root] [data-vc-date-btn] { min-height: 1.45rem; min-width: 1.45rem; font-size: .68rem; line-height: .9rem; } + [data-blog-calendar-has-posts='true'] [data-vc-date-btn] { + border-color: hsl(var(--blog-calendar-heat-hue, 210) 85% 42% / .95); + background-color: hsl(var(--blog-calendar-heat-hue, 210) 88% 52% / var(--blog-calendar-heat-alpha, 0)); + } + [data-blog-calendar-root] [data-vc-months-month][data-blog-calendar-has-posts='true'], + [data-blog-calendar-root] [data-vc-years-year][data-blog-calendar-has-posts='true'] { + background-color: hsl(var(--blog-calendar-heat-hue, 210) 88% 52% / var(--blog-calendar-heat-alpha, 0)); + border-color: hsl(var(--blog-calendar-heat-hue, 210) 85% 42% / .95); + } .post { border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); padding: 1rem; background: var(--pico-card-background-color, var(--card-background-color)); min-width: 0; } .post pre { position: relative; overflow-x: auto; max-width: 100%; border: 1px solid var(--pico-muted-border-color, var(--muted-border-color)); border-radius: .3rem; margin: .9rem 0; padding: .85rem .9rem; background: var(--pico-code-background-color, rgba(33, 38, 45, .82)); box-sizing: border-box; } .post pre code { display: block; font-size: .88rem; line-height: 1.5; white-space: pre; } diff --git a/tests/engine/BlogGenerationEngine.test.ts b/tests/engine/BlogGenerationEngine.test.ts index 92d7b5d..f670be6 100644 --- a/tests/engine/BlogGenerationEngine.test.ts +++ b/tests/engine/BlogGenerationEngine.test.ts @@ -400,6 +400,13 @@ describe('BlogGenerationEngine', () => { expect(indexHtml).toContain('href="/assets/vanilla-calendar.min.css"'); expect(indexHtml).toContain('src="/assets/vanilla-calendar.min.js"'); expect(indexHtml).toContain('src="/assets/calendar-runtime.js"'); + + const calendarRuntime = await readFile(path.join(tempDir, 'html', 'assets', 'calendar-runtime.js'), 'utf-8'); + expect(calendarRuntime).toContain('--blog-calendar-heat-hue'); + expect(calendarRuntime).toContain('--blog-calendar-heat-alpha'); + expect(calendarRuntime).toContain('onCreateMonthEls'); + expect(calendarRuntime).toContain('onCreateYearEls'); + expect(calendarRuntime).not.toContain('blog-calendar-post-count'); }); it('generates root index.html for published posts', async () => {