From 179a1c61a64c000fe5722f4f57e534ae836a922d Mon Sep 17 00:00:00 2001 From: linguist <22963968+lowlighter@users.noreply.github.com> Date: Mon, 28 Dec 2020 22:43:55 +0100 Subject: [PATCH] Fix calendar display for repository template --- src/templates/repository/image.svg | 2 +- src/templates/repository/template.mjs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/templates/repository/image.svg b/src/templates/repository/image.svg index a485d237..9a06c61a 100644 --- a/src/templates/repository/image.svg +++ b/src/templates/repository/image.svg @@ -4,7 +4,7 @@ + (!!plugins.followup)*68 + (!!base.metadata)*28 + (!!plugins.projects)*22 + (plugins.projects?.list?.length ?? 0)*60 + (!!plugins.projects?.error)*22 - + Math.max(0, ((!!base.header)+(!!base.metadata)+(!!plugins.followup)+(!!plugins.projects))-1))*4 + + Math.max(0, ((!!base.header)+(!!base.metadata)+(!!plugins.followup)+(!!plugins.projects))-1)*4 %>"> diff --git a/src/templates/repository/template.mjs b/src/templates/repository/template.mjs index 89e42157..4b7972a9 100644 --- a/src/templates/repository/template.mjs +++ b/src/templates/repository/template.mjs @@ -19,7 +19,7 @@ //Get commit activity console.debug(`metrics/compute/${login}/${repo} > querying api for commits`) const commits = [] - for (let page = 0; page < 1; page++) { + for (let page = 0; page < 100; page++) { console.debug(`metrics/compute/${login}/${repo} > loading page ${page}`) const {data} = await rest.repos.listCommits({owner:login, repo, per_page:100, page}) if (!data.length) { @@ -39,11 +39,12 @@ //Compute relative date for each contribution const now = new Date() now.setHours(0, 0, 0, 0) - const contributions = commits.map(({commit}) => Math.abs(Math.ceil((now - new Date(commit.committer.date))/(24*60*60*1000)))).slice(0, days) + const contributions = commits.map(({commit}) => Math.abs(Math.ceil((now - new Date(commit.committer.date))/(24*60*60*1000)))) //Count contributions per relative day const calendar = new Array(days).fill(0) for (const day of contributions) calendar[day]++ + calendar.splice(days) const max = Math.max(...calendar) //Override contributions calendar data.user.calendar.contributionCalendar.weeks = calendar.map(commit => ({contributionDays:{color:commit ? `var(--color-calendar-graph-day-L${Math.ceil(commit/max/0.25)}-bg)` : "var(--color-calendar-graph-day-bg)"}}))