From 9fd24bc37df306f5a0ada6dd4ba32c2a225d55e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 16 Jun 2023 18:53:04 +0300
Subject: [PATCH 001/138] Create new page

---
 options/locale/locale_en-US.ini  |   2 +
 options/locale/locale_tr-TR.ini  |   3 +
 routers/web/repo/contributors.go |  66 +++++++++
 routers/web/web.go               |   5 +
 templates/repo/contributors.tmpl | 242 +++++++++++++++++++++++++++++++
 templates/repo/header.tmpl       |   6 +
 6 files changed, 324 insertions(+)
 create mode 100644 routers/web/repo/contributors.go
 create mode 100644 templates/repo/contributors.tmpl

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 0cf8810702025..fbbbeb8798231 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1903,6 +1903,8 @@ activity.git_stats_and_deletions = and
 activity.git_stats_deletion_1 = %d deletion
 activity.git_stats_deletion_n = %d deletions
 
+contributors = Contributors
+
 search = Search
 search.search_repo = Search repository
 search.type.tooltip = Search type
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
index 71b92cbee111e..ca3f57e993f88 100644
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
@@ -1850,6 +1850,9 @@ activity.git_stats_and_deletions=ve
 activity.git_stats_deletion_1=%d silme oldu
 activity.git_stats_deletion_n=%d silme oldu
 
+
+contributors = Katkıda Bulunanlar
+
 search=Ara
 search.search_repo=Depo ara
 search.type.tooltip=Arama türü
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
new file mode 100644
index 0000000000000..e111dd05d6d63
--- /dev/null
+++ b/routers/web/repo/contributors.go
@@ -0,0 +1,66 @@
+package repo
+
+import (
+	"net/http"
+	"time"
+
+	activities_model "code.gitea.io/gitea/models/activities"
+	"code.gitea.io/gitea/models/unit"
+	"code.gitea.io/gitea/modules/base"
+	"code.gitea.io/gitea/modules/context"
+)
+
+const (
+	tplContributors base.TplName = "repo/contributors"
+)
+
+// Contributors render the page to show repository contributors graph
+func Contributors(ctx *context.Context) {
+	ctx.Data["Title"] = ctx.Tr("repo.activity")
+	ctx.Data["PageIsContributors"] = true
+
+	ctx.Data["Period"] = ctx.Params("period")
+
+	timeUntil := time.Now()
+	var timeFrom time.Time
+
+	switch ctx.Data["Period"] {
+	case "daily":
+		timeFrom = timeUntil.Add(-time.Hour * 24)
+	case "halfweekly":
+		timeFrom = timeUntil.Add(-time.Hour * 72)
+	case "weekly":
+		timeFrom = timeUntil.Add(-time.Hour * 168)
+	case "monthly":
+		timeFrom = timeUntil.AddDate(0, -1, 0)
+	case "quarterly":
+		timeFrom = timeUntil.AddDate(0, -3, 0)
+	case "semiyearly":
+		timeFrom = timeUntil.AddDate(0, -6, 0)
+	case "yearly":
+		timeFrom = timeUntil.AddDate(-1, 0, 0)
+	default:
+		ctx.Data["Period"] = "weekly"
+		timeFrom = timeUntil.Add(-time.Hour * 168)
+	}
+	ctx.Data["DateFrom"] = timeFrom.UTC().Format(time.RFC3339)
+	ctx.Data["DateUntil"] = timeUntil.UTC().Format(time.RFC3339)
+	ctx.Data["PeriodText"] = ctx.Tr("repo.activity.period." + ctx.Data["Period"].(string))
+
+	var err error
+	if ctx.Data["Activity"], err = activities_model.GetActivityStats(ctx, ctx.Repo.Repository, timeFrom,
+		ctx.Repo.CanRead(unit.TypeReleases),
+		ctx.Repo.CanRead(unit.TypeIssues),
+		ctx.Repo.CanRead(unit.TypePullRequests),
+		ctx.Repo.CanRead(unit.TypeCode)); err != nil {
+		ctx.ServerError("GetActivityStats", err)
+		return
+	}
+
+	if ctx.PageData["repoActivityTopAuthors"], err = activities_model.GetActivityStatsTopAuthors(ctx, ctx.Repo.Repository, timeFrom, 10); err != nil {
+		ctx.ServerError("GetActivityStatsTopAuthors", err)
+		return
+	}
+
+	ctx.HTML(http.StatusOK, tplContributors)
+}
diff --git a/routers/web/web.go b/routers/web/web.go
index a7573b38f559f..72fd3af420177 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1244,6 +1244,11 @@ func registerRoutes(m *web.Route) {
 			m.Get("/{period}", repo.ActivityAuthors)
 		}, context.RepoRef(), repo.MustBeNotEmpty, context.RequireRepoReaderOr(unit.TypeCode))
 
+		m.Group("/contributors", func() {
+			m.Get("", repo.Contributors)
+			m.Get("/{period}", repo.Contributors)
+		}, context.RepoRef(), repo.MustBeNotEmpty, context.RequireRepoReaderOr(unit.TypePullRequests, unit.TypeIssues, unit.TypeReleases))
+
 		m.Group("/archive", func() {
 			m.Get("/*", repo.Download)
 			m.Post("/*", repo.InitiateDownload)
diff --git a/templates/repo/contributors.tmpl b/templates/repo/contributors.tmpl
new file mode 100644
index 0000000000000..9af856937fbb1
--- /dev/null
+++ b/templates/repo/contributors.tmpl
@@ -0,0 +1,242 @@
+{{template "base/head" .}}
+<div role="main" aria-label="{{.Title}}" class="page-content repository commits">
+	{{template "repo/header" .}}
+	<p>Contributors</p>
+	<div class="ui container">
+		<h2 class="ui header">{{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}}
+			<div class="ui right">
+				<!-- Period -->
+				<div class="ui floating dropdown jump filter">
+					<div class="ui basic compact button">
+						<span class="text">
+							{{.locale.Tr "repo.activity.period.filter_label"}} <strong>{{.PeriodText}}</strong>
+							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+						</span>
+					</div>
+					<div class="menu">
+						<a class="{{if eq .Period "daily"}}active {{end}}item" href="{{$.RepoLink}}/activity/daily">{{.locale.Tr "repo.activity.period.daily"}}</a>
+						<a class="{{if eq .Period "halfweekly"}}active {{end}}item" href="{{$.RepoLink}}/activity/halfweekly">{{.locale.Tr "repo.activity.period.halfweekly"}}</a>
+						<a class="{{if eq .Period "weekly"}}active {{end}}item" href="{{$.RepoLink}}/activity/weekly">{{.locale.Tr "repo.activity.period.weekly"}}</a>
+						<a class="{{if eq .Period "monthly"}}active {{end}}item" href="{{$.RepoLink}}/activity/monthly">{{.locale.Tr "repo.activity.period.monthly"}}</a>
+						<a class="{{if eq .Period "quarterly"}}active {{end}}item" href="{{$.RepoLink}}/activity/quarterly">{{.locale.Tr "repo.activity.period.quarterly"}}</a>
+						<a class="{{if eq .Period "semiyearly"}}active {{end}}item" href="{{$.RepoLink}}/activity/semiyearly">{{.locale.Tr "repo.activity.period.semiyearly"}}</a>
+						<a class="{{if eq .Period "yearly"}}active {{end}}item" href="{{$.RepoLink}}/activity/yearly">{{.locale.Tr "repo.activity.period.yearly"}}</a>
+					</div>
+				</div>
+			</div>
+		</h2>
+		<div class="ui divider"></div>
+
+		{{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}}
+		<h4 class="ui top attached header">{{.locale.Tr "repo.activity.overview"}}</h4>
+		<div class="ui attached segment two column grid">
+			{{if .Permission.CanRead $.UnitTypePullRequests}}
+				<div class="column">
+					{{if gt .Activity.ActivePRCount 0}}
+					<div class="stats-table">
+						<a href="#merged-pull-requests" class="table-cell tiny background purple" style="width: {{.Activity.MergedPRPerc}}{{if ne .Activity.MergedPRPerc 0}}%{{end}}"></a>
+						<a href="#proposed-pull-requests" class="table-cell tiny background green"></a>
+					</div>
+					{{else}}
+					<div class="stats-table">
+						<a class="table-cell tiny background light grey"></a>
+					</div>
+					{{end}}
+					{{.locale.TrN .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n" .Activity.ActivePRCount | Safe}}
+				</div>
+			{{end}}
+			{{if .Permission.CanRead $.UnitTypeIssues}}
+				<div class="column">
+					{{if gt .Activity.ActiveIssueCount 0}}
+					<div class="stats-table">
+						<a href="#closed-issues" class="table-cell tiny background red" style="width: {{.Activity.ClosedIssuePerc}}{{if ne .Activity.ClosedIssuePerc 0}}%{{end}}"></a>
+						<a href="#new-issues" class="table-cell tiny background green"></a>
+					</div>
+					{{else}}
+					<div class="stats-table">
+						<a class="table-cell tiny background light grey"></a>
+					</div>
+					{{end}}
+					{{.locale.TrN .Activity.ActiveIssueCount "repo.activity.active_issues_count_1" "repo.activity.active_issues_count_n" .Activity.ActiveIssueCount | Safe}}
+				</div>
+			{{end}}
+		</div>
+		<div class="ui attached segment horizontal segments">
+			{{if .Permission.CanRead $.UnitTypePullRequests}}
+				<a href="#merged-pull-requests" class="ui attached segment text center">
+					<span class="text purple">{{svg "octicon-git-pull-request"}}</span> <strong>{{.Activity.MergedPRCount}}</strong><br>
+					{{.locale.TrN .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n"}}
+				</a>
+				<a href="#proposed-pull-requests" class="ui attached segment text center">
+					<span class="text green">{{svg "octicon-git-branch"}}</span> <strong>{{.Activity.OpenedPRCount}}</strong><br>
+					{{.locale.TrN .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n"}}
+				</a>
+			{{end}}
+			{{if .Permission.CanRead $.UnitTypeIssues}}
+				<a href="#closed-issues" class="ui attached segment text center">
+					<span class="text red">{{svg "octicon-issue-closed"}}</span> <strong>{{.Activity.ClosedIssueCount}}</strong><br>
+					{{.locale.TrN .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n"}}
+				</a>
+				<a href="#new-issues" class="ui attached segment text center">
+					<span class="text green">{{svg "octicon-issue-opened"}}</span> <strong>{{.Activity.OpenedIssueCount}}</strong><br>
+					{{.locale.TrN .Activity.OpenedIssueCount "repo.activity.new_issues_count_1" "repo.activity.new_issues_count_n"}}
+				</a>
+			{{end}}
+		</div>
+		{{end}}
+
+		{{if .Permission.CanRead $.UnitTypeCode}}
+			{{if eq .Activity.Code.CommitCountInAllBranches 0}}
+				<div class="ui center aligned segment">
+				<h4 class="ui header">{{.locale.Tr "repo.activity.no_git_activity"}}</h4>
+				</div>
+			{{end}}
+			{{if gt .Activity.Code.CommitCountInAllBranches 0}}
+				<div class="ui attached segment horizontal segments">
+					<div class="ui attached segment text">
+						{{.locale.Tr "repo.activity.git_stats_exclude_merges"}}
+						<strong>{{.locale.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_author_1" "repo.activity.git_stats_author_n" .Activity.Code.AuthorCount}}</strong>
+						{{.locale.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_pushed_1" "repo.activity.git_stats_pushed_n"}}
+						<strong>{{.locale.TrN .Activity.Code.CommitCount "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCount}}</strong>
+						{{.locale.Tr "repo.activity.git_stats_push_to_branch" .Repository.DefaultBranch}}
+						<strong>{{.locale.TrN .Activity.Code.CommitCountInAllBranches "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCountInAllBranches}}</strong>
+						{{.locale.Tr "repo.activity.git_stats_push_to_all_branches"}}
+						{{.locale.Tr "repo.activity.git_stats_on_default_branch" .Repository.DefaultBranch}}
+						<strong>{{.locale.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_file_1" "repo.activity.git_stats_file_n" .Activity.Code.ChangedFiles}}</strong>
+						{{.locale.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_files_changed_1" "repo.activity.git_stats_files_changed_n"}}
+						{{.locale.Tr "repo.activity.git_stats_additions"}}
+						<strong class="text green">{{.locale.TrN .Activity.Code.Additions "repo.activity.git_stats_addition_1" "repo.activity.git_stats_addition_n" .Activity.Code.Additions}}</strong>
+						{{.locale.Tr "repo.activity.git_stats_and_deletions"}}
+						<strong class="text red">{{.locale.TrN .Activity.Code.Deletions "repo.activity.git_stats_deletion_1" "repo.activity.git_stats_deletion_n" .Activity.Code.Deletions}}</strong>.
+					</div>
+					<div class="ui attached segment">
+						<div id="repo-activity-top-authors-chart"></div>
+					</div>
+				</div>
+			{{end}}
+		{{end}}
+
+		{{if gt .Activity.PublishedReleaseCount 0}}
+			<h4 class="ui horizontal divider header" id="published-releases">
+				<span class="text">{{svg "octicon-tag"}}</span>
+				{{.locale.Tr "repo.activity.title.releases_published_by"
+					(.locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount)
+					(.locale.TrN .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.PublishedReleaseAuthorCount)
+				}}
+			</h4>
+			<div class="list">
+				{{range .Activity.PublishedReleases}}
+					<p class="desc">
+						<span class="ui green label">{{$.locale.Tr "repo.activity.published_release_label"}}</span>
+						{{.TagName}}
+						{{if not .IsTag}}
+							<a class="title" href="{{$.RepoLink}}/src/{{.TagName | PathEscapeSegments}}">{{.Title | RenderEmoji $.Context}}</a>
+						{{end}}
+						{{TimeSinceUnix .CreatedUnix $.locale}}
+					</p>
+				{{end}}
+			</div>
+		{{end}}
+
+		{{if gt .Activity.MergedPRCount 0}}
+			<h4 class="ui horizontal divider header" id="merged-pull-requests">
+				<span class="text">{{svg "octicon-git-pull-request"}}</span>
+				{{.locale.Tr "repo.activity.title.prs_merged_by"
+					(.locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount)
+					(.locale.TrN .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.MergedPRAuthorCount)
+				}}
+			</h4>
+			<div class="list">
+				{{range .Activity.MergedPRs}}
+					<p class="desc">
+						<span class="ui purple label">{{$.locale.Tr "repo.activity.merged_prs_label"}}</span>
+						#{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
+						{{TimeSinceUnix .MergedUnix $.locale}}
+					</p>
+				{{end}}
+			</div>
+		{{end}}
+
+		{{if gt .Activity.OpenedPRCount 0}}
+			<h4 class="ui horizontal divider header" id="proposed-pull-requests">
+				<span class="text">{{svg "octicon-git-branch"}}</span>
+				{{.locale.Tr "repo.activity.title.prs_opened_by"
+					(.locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount)
+					(.locale.TrN .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedPRAuthorCount)
+				}}
+			</h4>
+			<div class="list">
+				{{range .Activity.OpenedPRs}}
+					<p class="desc">
+						<span class="ui green label">{{$.locale.Tr "repo.activity.opened_prs_label"}}</span>
+						#{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
+						{{TimeSinceUnix .Issue.CreatedUnix $.locale}}
+					</p>
+				{{end}}
+			</div>
+		{{end}}
+
+		{{if gt .Activity.ClosedIssueCount 0}}
+			<h4 class="ui horizontal divider header" id="closed-issues">
+				<span class="text">{{svg "octicon-issue-closed"}}</span>
+				{{.locale.Tr "repo.activity.title.issues_closed_from"
+					(.locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount)
+					(.locale.TrN .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.ClosedIssueAuthorCount)
+				}}
+			</h4>
+			<div class="list">
+				{{range .Activity.ClosedIssues}}
+					<p class="desc">
+						<span class="ui red label">{{$.locale.Tr "repo.activity.closed_issue_label"}}</span>
+						#{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
+						{{TimeSinceUnix .ClosedUnix $.locale}}
+					</p>
+				{{end}}
+			</div>
+		{{end}}
+
+		{{if gt .Activity.OpenedIssueCount 0}}
+			<h4 class="ui horizontal divider header" id="new-issues">
+				<span class="text">{{svg "octicon-issue-opened"}}</span>
+				{{.locale.Tr "repo.activity.title.issues_created_by"
+					(.locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount)
+					(.locale.TrN .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedIssueAuthorCount)
+				}}
+			</h4>
+			<div class="list">
+				{{range .Activity.OpenedIssues}}
+					<p class="desc">
+						<span class="ui green label">{{$.locale.Tr "repo.activity.new_issue_label"}}</span>
+						#{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
+						{{TimeSinceUnix .CreatedUnix $.locale}}
+					</p>
+				{{end}}
+			</div>
+		{{end}}
+
+		{{if gt .Activity.UnresolvedIssueCount 0}}
+			<h4 class="ui horizontal divider header" id="unresolved-conversations">
+				<span class="text">{{svg "octicon-comment-discussion"}}</span>
+				{{.locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}
+			</h4>
+			<div class="text center desc">
+				{{.locale.Tr "repo.activity.unresolved_conv_desc"}}
+			</div>
+			<div class="list">
+				{{range .Activity.UnresolvedIssues}}
+					<p class="desc">
+						<span class="ui green label">{{$.locale.Tr "repo.activity.unresolved_conv_label"}}</span>
+						#{{.Index}}
+						{{if .IsPull}}
+						<a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
+						{{else}}
+						<a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
+						{{end}}
+						{{TimeSinceUnix .UpdatedUnix $.locale}}
+					</p>
+				{{end}}
+			</div>
+		{{end}}
+	</div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index c1d4676d6800e..ea86490e86421 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -233,6 +233,12 @@
 					</a>
 				{{end}}
 
+				{{if and (.Permission.CanReadAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsEmptyRepo)}}
+					<a class="{{if .PageIsContributors}}active {{end}}item" href="{{.RepoLink}}/contributors">
+						{{svg "octicon-graph"}} {{.locale.Tr "repo.contributors"}}
+					</a>
+				{{end}}
+
 				{{template "custom/extra_tabs" .}}
 
 				{{if .Permission.IsAdmin}}

From 3975abdba19dbfcd853365771f8284a96be994b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Mon, 19 Jun 2023 00:10:51 +0300
Subject: [PATCH 002/138] Implement simple api

---
 modules/git/repo_commit.go       | 86 ++++++++++++++++++++++++++++++++
 modules/structs/repo_commit.go   |  8 +++
 routers/api/v1/api.go            |  1 +
 routers/api/v1/repo/commits.go   | 60 ++++++++++++++++++++++
 routers/web/repo/contributors.go |  4 +-
 5 files changed, 157 insertions(+), 2 deletions(-)

diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index 6fc3063629115..bc682bb525d9f 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -5,13 +5,17 @@
 package git
 
 import (
+	"bufio"
 	"bytes"
+	"context"
 	"encoding/hex"
 	"fmt"
 	"io"
+	"os"
 	"strconv"
 	"strings"
 
+	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/cache"
 	"code.gitea.io/gitea/modules/setting"
 )
@@ -220,6 +224,88 @@ type CommitsByFileAndRangeOptions struct {
 	Page     int
 }
 
+
+// ContributorsCommitStats return the list of api.ContributorsCommitStats struct for drawing graph
+func (repo *Repository) ContributorsCommitStats(revision string, limit int) ([]*api.ContributorsCommitStats, error) {
+	var baseCommit *Commit
+	baseCommit, err := repo.GetCommit(revision)
+	stdoutReader, stdoutWriter, err := os.Pipe()
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		_ = stdoutReader.Close()
+		_ = stdoutWriter.Close()
+	}()
+
+	gitCmd := NewCommand(repo.Ctx, "log", "--shortstat", "--no-merges", "--pretty=format:%aN%n%aE%n%as")
+		// AddOptionFormat("--max-count=%d", limit)
+	gitCmd.AddDynamicArguments(baseCommit.ID.String())
+
+
+	var contributors_commit_stats []*api.ContributorsCommitStats
+	stderr := new(strings.Builder)
+	err = gitCmd.Run(&RunOpts{
+		Dir:    repo.Path,
+		Stdout: stdoutWriter,
+		Stderr: stderr,
+		PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error {
+			_ = stdoutWriter.Close()
+			scanner := bufio.NewScanner(stdoutReader)
+			scanner.Split(bufio.ScanLines)
+
+			for scanner.Scan() {
+				author_name := strings.TrimSpace(scanner.Text())
+				scanner.Scan()
+				author_email := strings.TrimSpace(scanner.Text())
+				scanner.Scan()
+				date := strings.TrimSpace(scanner.Text())
+				scanner.Scan()
+				stats := strings.TrimSpace(scanner.Text())
+				if author_name == "" || author_email == "" || date == "" || stats == "" {
+					// FIXME: find a better way to parse the output so that we will handle this properly
+					fmt.Println("Something is wrong with git log output, skipping...")
+					continue
+				}
+				//  1 file changed, 1 insertion(+), 1 deletion(-)
+				fields := strings.Split(stats, ",")
+
+				commit_stats := api.CommitStats{}
+				for _, field := range fields[1:] {
+					parts := strings.Split(strings.TrimSpace(field), " ")
+					value, type_ := parts[0], parts[1]
+					amount, _ := strconv.Atoi(value)
+
+					if strings.HasPrefix(type_, "insertion") {
+						commit_stats.Additions = amount
+
+					} else {
+						commit_stats.Deletions = amount
+					}
+				}
+				commit_stats.Total = commit_stats.Additions + commit_stats.Deletions
+				scanner.Scan()
+				scanner.Text() // empty line at the end
+
+				res := &api.ContributorsCommitStats{
+					Date: date,
+					Name:  author_name,
+					Email: author_email,
+					Stats: &commit_stats,
+				}
+				contributors_commit_stats = append(contributors_commit_stats, res)
+
+				}
+			_ = stdoutReader.Close()
+			return nil
+		},
+	})
+	if err != nil {
+		return nil, fmt.Errorf("Failed to get ContributorsCommitStats for repository.\nError: %w\nStderr: %s", err, stderr)
+	}
+	return contributors_commit_stats, nil
+}
+
 // CommitsByFileAndRange return the commits according revision file and the page
 func (repo *Repository) CommitsByFileAndRange(opts CommitsByFileAndRangeOptions) ([]*Commit, error) {
 	skip := (opts.Page - 1) * setting.Git.CommitsRangeSize
diff --git a/modules/structs/repo_commit.go b/modules/structs/repo_commit.go
index b3e98df1953d0..fc155a0a1c9f5 100644
--- a/modules/structs/repo_commit.go
+++ b/modules/structs/repo_commit.go
@@ -58,6 +58,14 @@ type Commit struct {
 	Stats      *CommitStats           `json:"stats"`
 }
 
+// ContributorsCommitStats contains information for generating contributor graphs from commit stats
+type ContributorsCommitStats struct {
+	Date  	string				`json:"date"`
+	Name    string				`json:"name" binding:"MaxSize(100)"`
+	Email   string				`json:"email" binding:"MaxSize(254)"`
+	Stats	  *CommitStats  `json:"stats"`
+}
+
 // CommitDateOptions store dates for GIT_AUTHOR_DATE and GIT_COMMITTER_DATE
 type CommitDateOptions struct {
 	// swagger:strfmt date-time
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index be66cc5240812..c1b4e53e3c38d 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -1091,6 +1091,7 @@ func Routes() *web.Route {
 				}, reqRepoReader(unit.TypeCode))
 				m.Group("/commits", func() {
 					m.Get("", context.ReferencesGitRepo(), repo.GetAllCommits)
+					m.Get("/stats", context.ReferencesGitRepo(), repo.GetAllCommitsStats)
 					m.Group("/{ref}", func() {
 						m.Get("/status", repo.GetCombinedCommitStatusByRef)
 						m.Get("/statuses", repo.GetCommitStatusesByRef)
diff --git a/routers/api/v1/repo/commits.go b/routers/api/v1/repo/commits.go
index 20d4405d6d4f6..7987cb4fbab5f 100644
--- a/routers/api/v1/repo/commits.go
+++ b/routers/api/v1/repo/commits.go
@@ -279,6 +279,66 @@ func GetAllCommits(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, &apiCommits)
 }
 
+
+// GetAllCommitsStats get all commits via
+func GetAllCommitsStats(ctx *context.APIContext) {
+	// swagger:operation GET /repos/{owner}/{repo}/commits/stats repository repoGetAllCommitsStats
+	// ---
+	// summary: Get a list of all commits stats from a repository
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// - name: sha
+	//   in: query
+	//   description: SHA or branch to start listing commits from (usually 'master')
+	//   type: string
+	// responses:
+	//   "200":
+	//     "$ref": "#/responses/CommitList"
+	//   "404":
+	//     "$ref": "#/responses/notFound"
+	//   "409":
+	//     "$ref": "#/responses/EmptyRepository"
+
+	if ctx.Repo.Repository.IsEmpty {
+		ctx.JSON(http.StatusConflict, api.APIError{
+			Message: "Git Repository is empty.",
+			URL:     setting.API.SwaggerURL,
+		})
+		return
+	}
+
+	sha := ctx.FormString("sha")
+
+	var (
+		commits           []*api.ContributorsCommitStats
+		err               error
+	)
+
+	if len(sha) == 0 {
+		sha = ctx.Repo.Repository.DefaultBranch
+	}
+
+	commits, err = ctx.Repo.GitRepo.ContributorsCommitStats(sha, 6000)
+
+	if err != nil {
+		ctx.Error(http.StatusInternalServerError, "ContributorsCommitStats", err)
+		return
+	}
+
+	ctx.JSON(http.StatusOK, &commits)
+}
+
 // DownloadCommitDiffOrPatch render a commit's raw diff or patch
 func DownloadCommitDiffOrPatch(ctx *context.APIContext) {
 	// swagger:operation GET /repos/{owner}/{repo}/git/commits/{sha}.{diffType} repository repoDownloadCommitDiffOrPatch
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index e111dd05d6d63..6bbb3d764edf3 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -57,8 +57,8 @@ func Contributors(ctx *context.Context) {
 		return
 	}
 
-	if ctx.PageData["repoActivityTopAuthors"], err = activities_model.GetActivityStatsTopAuthors(ctx, ctx.Repo.Repository, timeFrom, 10); err != nil {
-		ctx.ServerError("GetActivityStatsTopAuthors", err)
+	if ctx.PageData["repoContributorsCommitStats"], err = ctx.Repo.GitRepo.ContributorsCommitStats("main", 6000); err != nil {
+		ctx.ServerError("ContributorsCommitStats", err)
 		return
 	}
 

From 19deef6fdee8309fcf96babe7f89028bfb2178ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Mon, 19 Jun 2023 09:19:31 +0300
Subject: [PATCH 003/138] Implement basic graph render

---
 package-lock.json                             | 41 +++++++++++++
 package.json                                  |  4 ++
 routers/web/repo/contributors.go              |  4 +-
 templates/repo/contributors.tmpl              |  2 +-
 .../js/components/RepoActivityTopAuthors.vue  | 59 ++++++++++++++++++-
 5 files changed, 107 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e808ccf2a8ffd..ff81006cb53cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,8 +19,11 @@
         "add-asset-webpack-plugin": "2.0.1",
         "ansi-to-html": "0.7.2",
         "asciinema-player": "3.4.0",
+        "chart.js": "4.3.0",
+        "chartjs-adapter-dayjs-4": "1.0.4",
         "clippie": "4.0.1",
         "css-loader": "6.8.1",
+        "dayjs": "1.11.8",
         "dropzone": "6.0.0-beta.2",
         "easymde": "2.18.0",
         "esbuild-loader": "3.0.1",
@@ -45,6 +48,7 @@
         "uint8-to-base64": "0.2.0",
         "vue": "3.3.4",
         "vue-bar-graph": "2.0.0",
+        "vue-chartjs": "5.2.0",
         "vue-loader": "17.2.2",
         "vue3-calendar-heatmap": "2.0.5",
         "webpack": "5.87.0",
@@ -1115,6 +1119,11 @@
         "jsep": "^0.4.0||^1.0.0"
       }
     },
+    "node_modules/@kurkle/color": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz",
+      "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw=="
+    },
     "node_modules/@mcaptcha/core-glue": {
       "version": "0.1.0-alpha-5",
       "resolved": "https://registry.npmjs.org/@mcaptcha/core-glue/-/core-glue-0.1.0-alpha-5.tgz",
@@ -2942,6 +2951,29 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/chart.js": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.3.0.tgz",
+      "integrity": "sha512-ynG0E79xGfMaV2xAHdbhwiPLczxnNNnasrmPEXriXsPJGjmhOBYzFVEsB65w2qMDz+CaBJJuJD0inE/ab/h36g==",
+      "dependencies": {
+        "@kurkle/color": "^0.3.0"
+      },
+      "engines": {
+        "pnpm": ">=7"
+      }
+    },
+    "node_modules/chartjs-adapter-dayjs-4": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/chartjs-adapter-dayjs-4/-/chartjs-adapter-dayjs-4-1.0.4.tgz",
+      "integrity": "sha512-yy9BAYW4aNzPVrCWZetbILegTRb7HokhgospPoC3b5iZ5qdlqNmXts2KdSp6AqnjkPAp/YWyHDxLvIvwt5x81w==",
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "chart.js": ">=4.0.1",
+        "dayjs": "^1.9.7"
+      }
+    },
     "node_modules/check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
@@ -10684,6 +10716,15 @@
         "vue": "^3.2.37"
       }
     },
+    "node_modules/vue-chartjs": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/vue-chartjs/-/vue-chartjs-5.2.0.tgz",
+      "integrity": "sha512-d3zpKmGZr2OWHQ1xmxBcAn5ShTG917+/UCLaSpaCDDqT0U7DBsvFzTs69ZnHCgKoXT55GZDW8YEj9Av+dlONLA==",
+      "peerDependencies": {
+        "chart.js": "^4.1.1",
+        "vue": "^3.0.0-0 || ^2.7.0"
+      }
+    },
     "node_modules/vue-eslint-parser": {
       "version": "9.3.1",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.3.1.tgz",
diff --git a/package.json b/package.json
index 0701862cc2a65..98f702d4de44a 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,11 @@
     "add-asset-webpack-plugin": "2.0.1",
     "ansi-to-html": "0.7.2",
     "asciinema-player": "3.4.0",
+    "chart.js": "4.3.0",
+    "chartjs-adapter-dayjs-4": "1.0.4",
     "clippie": "4.0.1",
     "css-loader": "6.8.1",
+    "dayjs": "1.11.8",
     "dropzone": "6.0.0-beta.2",
     "easymde": "2.18.0",
     "esbuild-loader": "3.0.1",
@@ -44,6 +47,7 @@
     "uint8-to-base64": "0.2.0",
     "vue": "3.3.4",
     "vue-bar-graph": "2.0.0",
+    "vue-chartjs": "5.2.0",
     "vue-loader": "17.2.2",
     "vue3-calendar-heatmap": "2.0.5",
     "webpack": "5.87.0",
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index 6bbb3d764edf3..60c9a60f2d42e 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -57,7 +57,9 @@ func Contributors(ctx *context.Context) {
 		return
 	}
 
-	if ctx.PageData["repoContributorsCommitStats"], err = ctx.Repo.GitRepo.ContributorsCommitStats("main", 6000); err != nil {
+	default_branch, _ := ctx.Repo.GitRepo.GetDefaultBranch()
+	if ctx.PageData["repoContributorsCommitStats"], err = ctx.Repo.GitRepo.ContributorsCommitStats(
+		default_branch, 6000); err != nil {
 		ctx.ServerError("ContributorsCommitStats", err)
 		return
 	}
diff --git a/templates/repo/contributors.tmpl b/templates/repo/contributors.tmpl
index 9af856937fbb1..5bbcc44dd1848 100644
--- a/templates/repo/contributors.tmpl
+++ b/templates/repo/contributors.tmpl
@@ -110,7 +110,7 @@
 						<strong class="text red">{{.locale.TrN .Activity.Code.Deletions "repo.activity.git_stats_deletion_1" "repo.activity.git_stats_deletion_n" .Activity.Code.Deletions}}</strong>.
 					</div>
 					<div class="ui attached segment">
-						<div id="repo-activity-top-authors-chart"></div>
+						<div id="repo-contributors-master-chart"></div>
 					</div>
 				</div>
 			{{end}}
diff --git a/web_src/js/components/RepoActivityTopAuthors.vue b/web_src/js/components/RepoActivityTopAuthors.vue
index 294ee6f7bcce8..a4a18ac40181f 100644
--- a/web_src/js/components/RepoActivityTopAuthors.vue
+++ b/web_src/js/components/RepoActivityTopAuthors.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    <Line :data="graphData" :options="data.options" />
     <div class="activity-bar-graph" ref="style" style="width: 0; height: 0;"/>
     <div class="activity-bar-graph-alt" ref="altStyle" style="width: 0; height: 0;"/>
     <vue-bar-graph
@@ -52,15 +53,50 @@
 <script>
 import VueBarGraph from 'vue-bar-graph';
 import {createApp} from 'vue';
+import {
+  Chart as ChartJS,
+  Title,
+  Tooltip,
+  Legend,
+  BarElement,
+  CategoryScale,
+  LinearScale,
+  TimeScale,
+  PointElement,
+  LineElement,
+  Filler
+} from 'chart.js'
+import { Bar, Line } from 'vue-chartjs'
+import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm';
+
+ChartJS.register(TimeScale, CategoryScale, LinearScale, BarElement, Title, Tooltip, Legend, PointElement, LineElement, Filler)
 
 const sfc = {
-  components: {VueBarGraph},
+  components: {VueBarGraph, Line},
   data: () => ({
     colors: {
       barColor: 'green',
       textColor: 'black',
       textAltColor: 'white',
     },
+    data: {
+      options: {
+        responsive: true,
+        scales: {
+            x: {
+                // min: '2021-11-06',
+                type: 'time',
+                time: {
+                    // unit: 'year'
+                    minUnit: 'day'
+                }
+            },
+            y: {
+               min: 0
+            }
+        }
+      }
+    },
 
     // possible keys:
     // * avatar_link: (...)
@@ -69,8 +105,25 @@ const sfc = {
     // * login: (...)
     // * name: (...)
     activityTopAuthors: window.config.pageData.repoActivityTopAuthors || [],
+    contributorsCommitsStats: window.config.pageData.repoContributorsCommitStats|| [],
   }),
   computed: {
+    graphData() {
+      return {
+        datasets: [{
+          label: 'Number of additions',
+          data: this.contributorsCommitsStats.map((item) => {
+            return {x: item.date, y: item.stats.additions}
+          }),
+          pointRadius: 0,
+          pointHitRadius: 0,
+          fill: 'start',
+          borderColor: 'rgb(75, 192, 192)',
+          backgroundColor: 'rgba(65, 182, 182, 0.3)',
+          tension: 0.2
+        }]
+      }
+    },
     graphPoints() {
       return this.activityTopAuthors.map((item) => {
         return {
@@ -106,6 +159,10 @@ export function initRepoActivityTopAuthorsChart() {
   if (el) {
     createApp(sfc).mount(el);
   }
+  const el2 = document.getElementById('repo-contributors-master-chart');
+  if (el2) {
+    createApp(sfc).mount(el2);
+  }
 }
 
 export default sfc; // activate the IDE's Vue plugin

From 715fc1557854f21a939d023a38ed46e3cd482722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Mon, 19 Jun 2023 15:51:22 +0300
Subject: [PATCH 004/138] Handle dates by grouping them into weeks

---
 models/contributors/contributors_graph.go     | 118 ++++++++++++++++++
 modules/git/repo_commit.go                    |  25 ++--
 modules/structs/repo_commit.go                |   8 +-
 modules/util/dates.go                         |  69 ++++++++++
 routers/api/v1/repo/commits.go                |   4 +-
 routers/web/repo/contributors.go              |   7 +-
 .../js/components/RepoActivityTopAuthors.vue  |   4 +-
 7 files changed, 212 insertions(+), 23 deletions(-)
 create mode 100644 models/contributors/contributors_graph.go
 create mode 100644 modules/util/dates.go

diff --git a/models/contributors/contributors_graph.go b/models/contributors/contributors_graph.go
new file mode 100644
index 0000000000000..65270a100c302
--- /dev/null
+++ b/models/contributors/contributors_graph.go
@@ -0,0 +1,118 @@
+package contributors
+
+import (
+	"code.gitea.io/gitea/modules/json"
+	"context"
+	"fmt"
+	repo_model "code.gitea.io/gitea/models/repo"
+	user_model "code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/git"
+	util "code.gitea.io/gitea/modules/util"
+)
+
+type WeekData struct {
+	Additions int `json:"additions"`
+	Deletions int `json:"deletions"`
+	Commits int `json:"commits"`
+}
+
+// ContributorData represents statistical git commit count data
+type ContributorData struct {
+	Name       string               `json:"name"`
+	Login      string               `json:"login"`
+	AvatarLink string               `json:"avatar_link"`
+	HomeLink   string               `json:"home_link"`
+	Total      int64                `json:"total"`
+	Weeks      map[string]*WeekData `json:"weeks"`
+}
+
+func CreateWeeks(sundays []string) map[string]*WeekData {
+	weeks := make(map[string]*WeekData)
+	for _, week := range sundays {
+		weeks[week] = &WeekData{
+			Additions: 0,
+			Deletions: 0,
+			Commits: 0,
+		}
+	}
+	return weeks
+}
+
+// GetContributorStats returns contributors stats for git commits
+func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[string]*ContributorData, error) {
+	gitRepo, closer, err := git.RepositoryFromContextOrOpen(ctx, repo.RepoPath())
+	if err != nil {
+		return nil, fmt.Errorf("OpenRepository: %w", err)
+	}
+	defer closer.Close()
+
+	default_branch, _ := gitRepo.GetDefaultBranch()
+	extended_commit_stats, err := gitRepo.ExtendedCommitStats(default_branch, 6000)
+	if err != nil {
+		return nil, fmt.Errorf("ExtendedCommitStats: %w", err)
+	}
+
+	initial_commit_date := extended_commit_stats[0].Author.Date
+	last_commit_date := extended_commit_stats[len(extended_commit_stats)-1].Author.Date
+
+	starting_sunday, _ := util.FindLastSundayBeforeDate(initial_commit_date)
+	ending_sunday, _ := util.FindFirstSundayAfterDate(last_commit_date)
+
+	sundays, _ := util.ListSundaysBetween(starting_sunday, ending_sunday)
+
+	unknownUserAvatarLink := user_model.NewGhostUser().AvatarLink(ctx)
+	contributors_commit_stats := make(map[string]*ContributorData)
+	contributors_commit_stats[""] = &ContributorData{
+		Name:       "Total",
+		AvatarLink: unknownUserAvatarLink,
+		Weeks:      CreateWeeks(sundays),
+	}
+
+	for _, v := range extended_commit_stats {
+		if len(v.Author.Email) == 0 {
+			continue
+		}
+		if _, ok := contributors_commit_stats[v.Author.Email]; !ok {
+			u, err := user_model.GetUserByEmail(ctx, v.Author.Email)
+			if u == nil || user_model.IsErrUserNotExist(err) {
+				contributors_commit_stats[v.Author.Email] = &ContributorData{
+					Name:       v.Author.Name,
+					AvatarLink: unknownUserAvatarLink,
+					Weeks:      CreateWeeks(sundays),
+				}
+			} else {
+				contributors_commit_stats[v.Author.Email] = &ContributorData{
+					Name:       u.DisplayName(),
+					Login:      u.LowerName,
+					AvatarLink: u.AvatarLink(ctx),
+					HomeLink:   u.HomeLink(),
+					Weeks:      CreateWeeks(sundays),
+				}
+
+			}
+		}
+		// Update user statistics
+		user, _ := contributors_commit_stats[v.Author.Email]
+		starting_of_week, _ := util.FindLastSundayBeforeDate(v.Author.Date)
+		user.Weeks[starting_of_week].Additions += v.Stats.Additions
+		user.Weeks[starting_of_week].Deletions += v.Stats.Deletions
+		user.Weeks[starting_of_week].Commits++
+		user.Total++
+
+		// Update overall statistics
+		total, _ := contributors_commit_stats[""]
+		total.Weeks[starting_of_week].Additions += v.Stats.Additions
+		total.Weeks[starting_of_week].Deletions += v.Stats.Deletions
+		total.Weeks[starting_of_week].Commits++
+		total.Total++
+	}
+
+	fmt.Printf("users are: %s", prettyPrint(contributors_commit_stats))
+
+	return contributors_commit_stats, nil
+}
+
+func prettyPrint(i interface{}) string {
+	s, _ := json.MarshalIndent(i, "", "\t")
+	return string(s)
+}
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index bc682bb525d9f..ddf28ffa3b814 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -225,8 +225,8 @@ type CommitsByFileAndRangeOptions struct {
 }
 
 
-// ContributorsCommitStats return the list of api.ContributorsCommitStats struct for drawing graph
-func (repo *Repository) ContributorsCommitStats(revision string, limit int) ([]*api.ContributorsCommitStats, error) {
+// ExtendedCommitStats return the list of *api.ExtendedCommitStats for the given revision
+func (repo *Repository) ExtendedCommitStats(revision string, limit int) ([]*api.ExtendedCommitStats, error) {
 	var baseCommit *Commit
 	baseCommit, err := repo.GetCommit(revision)
 	stdoutReader, stdoutWriter, err := os.Pipe()
@@ -238,12 +238,12 @@ func (repo *Repository) ContributorsCommitStats(revision string, limit int) ([]*
 		_ = stdoutWriter.Close()
 	}()
 
-	gitCmd := NewCommand(repo.Ctx, "log", "--shortstat", "--no-merges", "--pretty=format:%aN%n%aE%n%as")
+	gitCmd := NewCommand(repo.Ctx, "log", "--shortstat", "--no-merges", "--pretty=format:%aN%n%aE%n%as", "--reverse")
 		// AddOptionFormat("--max-count=%d", limit)
 	gitCmd.AddDynamicArguments(baseCommit.ID.String())
 
 
-	var contributors_commit_stats []*api.ContributorsCommitStats
+	var extended_commit_stats []*api.ExtendedCommitStats
 	stderr := new(strings.Builder)
 	err = gitCmd.Run(&RunOpts{
 		Dir:    repo.Path,
@@ -287,13 +287,17 @@ func (repo *Repository) ContributorsCommitStats(revision string, limit int) ([]*
 				scanner.Scan()
 				scanner.Text() // empty line at the end
 
-				res := &api.ContributorsCommitStats{
-					Date: date,
-					Name:  author_name,
-					Email: author_email,
+				res := &api.ExtendedCommitStats{
+					Author: &api.CommitUser{
+						Identity: api.Identity{
+							Name: author_name,
+							Email: author_email,
+						},
+						Date: date,
+					},
 					Stats: &commit_stats,
 				}
-				contributors_commit_stats = append(contributors_commit_stats, res)
+				extended_commit_stats = append(extended_commit_stats, res)
 
 				}
 			_ = stdoutReader.Close()
@@ -303,7 +307,8 @@ func (repo *Repository) ContributorsCommitStats(revision string, limit int) ([]*
 	if err != nil {
 		return nil, fmt.Errorf("Failed to get ContributorsCommitStats for repository.\nError: %w\nStderr: %s", err, stderr)
 	}
-	return contributors_commit_stats, nil
+
+	return extended_commit_stats, nil
 }
 
 // CommitsByFileAndRange return the commits according revision file and the page
diff --git a/modules/structs/repo_commit.go b/modules/structs/repo_commit.go
index fc155a0a1c9f5..86cfcee0be136 100644
--- a/modules/structs/repo_commit.go
+++ b/modules/structs/repo_commit.go
@@ -58,11 +58,9 @@ type Commit struct {
 	Stats      *CommitStats           `json:"stats"`
 }
 
-// ContributorsCommitStats contains information for generating contributor graphs from commit stats
-type ContributorsCommitStats struct {
-	Date  	string				`json:"date"`
-	Name    string				`json:"name" binding:"MaxSize(100)"`
-	Email   string				`json:"email" binding:"MaxSize(254)"`
+// ExtendedCommitStats contains information for commit stats with author data
+type ExtendedCommitStats struct {
+	Author  *CommitUser   `json:"author"`
 	Stats	  *CommitStats  `json:"stats"`
 }
 
diff --git a/modules/util/dates.go b/modules/util/dates.go
new file mode 100644
index 0000000000000..fcd8f0c68060f
--- /dev/null
+++ b/modules/util/dates.go
@@ -0,0 +1,69 @@
+package util
+
+import (
+	"time"
+)
+
+func ListSundaysBetween(startStr, endStr string) ([]string, error) {
+	layout := "2006-01-02"
+	startDate, err := time.Parse(layout, startStr)
+	if err != nil {
+		return nil, err
+	}
+
+	endDate, err := time.Parse(layout, endStr)
+	if err != nil {
+		return nil, err
+	}
+
+	// Ensure the start date is a Sunday
+	for startDate.Weekday() != time.Sunday {
+		startDate = startDate.AddDate(0, 0, 1)
+	}
+
+	var sundays []string
+
+	// Iterate from start date to end date and find all Sundays
+	for currentDate := startDate; currentDate.Before(endDate); currentDate = currentDate.AddDate(0, 0, 7) {
+		sundays = append(sundays, currentDate.Format(layout))
+	}
+
+	return sundays, nil
+}
+
+func FindLastSundayBeforeDate(dateStr string) (string, error) {
+	layout := "2006-01-02"
+
+	date, err := time.Parse(layout, dateStr)
+	if err != nil {
+		return "", err
+	}
+
+	weekday := date.Weekday()
+	daysToSubtract := int(weekday) - int(time.Sunday)
+	if daysToSubtract < 0 {
+		daysToSubtract += 7
+	}
+
+	last_sunday := date.AddDate(0, 0, -daysToSubtract)
+	return last_sunday.Format(layout), nil
+}
+
+
+func FindFirstSundayAfterDate(dateStr string) (string, error) {
+	layout := "2006-01-02"
+
+	date, err := time.Parse(layout, dateStr)
+	if err != nil {
+		return "", err
+	}
+
+	weekday := date.Weekday()
+  daysToAdd := int(time.Sunday) - int(weekday)
+  if daysToAdd <= 0 {
+    daysToAdd += 7
+  }
+
+	first_sunday := date.AddDate(0, 0, daysToAdd)
+	return first_sunday.Format(layout), nil
+}
diff --git a/routers/api/v1/repo/commits.go b/routers/api/v1/repo/commits.go
index 7987cb4fbab5f..917f0d0ec5417 100644
--- a/routers/api/v1/repo/commits.go
+++ b/routers/api/v1/repo/commits.go
@@ -321,7 +321,7 @@ func GetAllCommitsStats(ctx *context.APIContext) {
 	sha := ctx.FormString("sha")
 
 	var (
-		commits           []*api.ContributorsCommitStats
+		commits           []*api.ExtendedCommitStats
 		err               error
 	)
 
@@ -329,7 +329,7 @@ func GetAllCommitsStats(ctx *context.APIContext) {
 		sha = ctx.Repo.Repository.DefaultBranch
 	}
 
-	commits, err = ctx.Repo.GitRepo.ContributorsCommitStats(sha, 6000)
+	commits, err = ctx.Repo.GitRepo.ExtendedCommitStats(sha, 6000)
 
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "ContributorsCommitStats", err)
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index 60c9a60f2d42e..3b6e3aea51c34 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	activities_model "code.gitea.io/gitea/models/activities"
+	contributors_model "code.gitea.io/gitea/models/contributors"
 	"code.gitea.io/gitea/models/unit"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
@@ -57,10 +58,8 @@ func Contributors(ctx *context.Context) {
 		return
 	}
 
-	default_branch, _ := ctx.Repo.GitRepo.GetDefaultBranch()
-	if ctx.PageData["repoContributorsCommitStats"], err = ctx.Repo.GitRepo.ContributorsCommitStats(
-		default_branch, 6000); err != nil {
-		ctx.ServerError("ContributorsCommitStats", err)
+	if ctx.PageData["repoContributorsCommitStats"], err = contributors_model.GetContributorStats(ctx, ctx.Repo.Repository); err != nil {
+		ctx.ServerError("GetContributorStats", err)
 		return
 	}
 
diff --git a/web_src/js/components/RepoActivityTopAuthors.vue b/web_src/js/components/RepoActivityTopAuthors.vue
index a4a18ac40181f..3d7054c06d1cc 100644
--- a/web_src/js/components/RepoActivityTopAuthors.vue
+++ b/web_src/js/components/RepoActivityTopAuthors.vue
@@ -112,8 +112,8 @@ const sfc = {
       return {
         datasets: [{
           label: 'Number of additions',
-          data: this.contributorsCommitsStats.map((item) => {
-            return {x: item.date, y: item.stats.additions}
+          data: Object.entries(this.contributorsCommitsStats[""].weeks).map(([date, stats]) => {
+            return {x: date, y: stats.commits}
           }),
           pointRadius: 0,
           pointHitRadius: 0,

From 136d8be94877a05d59bd744de25477797273c50e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Mon, 19 Jun 2023 16:43:09 +0300
Subject: [PATCH 005/138] Split vue file into meaningful pieces

---
 .../js/components/RepoActivityTopAuthors.vue  | 59 +-------------
 web_src/js/components/RepoContributors.vue    | 79 +++++++++++++++++++
 web_src/js/index.js                           |  2 +
 3 files changed, 82 insertions(+), 58 deletions(-)
 create mode 100644 web_src/js/components/RepoContributors.vue

diff --git a/web_src/js/components/RepoActivityTopAuthors.vue b/web_src/js/components/RepoActivityTopAuthors.vue
index 3d7054c06d1cc..294ee6f7bcce8 100644
--- a/web_src/js/components/RepoActivityTopAuthors.vue
+++ b/web_src/js/components/RepoActivityTopAuthors.vue
@@ -1,6 +1,5 @@
 <template>
   <div>
-    <Line :data="graphData" :options="data.options" />
     <div class="activity-bar-graph" ref="style" style="width: 0; height: 0;"/>
     <div class="activity-bar-graph-alt" ref="altStyle" style="width: 0; height: 0;"/>
     <vue-bar-graph
@@ -53,50 +52,15 @@
 <script>
 import VueBarGraph from 'vue-bar-graph';
 import {createApp} from 'vue';
-import {
-  Chart as ChartJS,
-  Title,
-  Tooltip,
-  Legend,
-  BarElement,
-  CategoryScale,
-  LinearScale,
-  TimeScale,
-  PointElement,
-  LineElement,
-  Filler
-} from 'chart.js'
-import { Bar, Line } from 'vue-chartjs'
-import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm';
-
-ChartJS.register(TimeScale, CategoryScale, LinearScale, BarElement, Title, Tooltip, Legend, PointElement, LineElement, Filler)
 
 const sfc = {
-  components: {VueBarGraph, Line},
+  components: {VueBarGraph},
   data: () => ({
     colors: {
       barColor: 'green',
       textColor: 'black',
       textAltColor: 'white',
     },
-    data: {
-      options: {
-        responsive: true,
-        scales: {
-            x: {
-                // min: '2021-11-06',
-                type: 'time',
-                time: {
-                    // unit: 'year'
-                    minUnit: 'day'
-                }
-            },
-            y: {
-               min: 0
-            }
-        }
-      }
-    },
 
     // possible keys:
     // * avatar_link: (...)
@@ -105,25 +69,8 @@ const sfc = {
     // * login: (...)
     // * name: (...)
     activityTopAuthors: window.config.pageData.repoActivityTopAuthors || [],
-    contributorsCommitsStats: window.config.pageData.repoContributorsCommitStats|| [],
   }),
   computed: {
-    graphData() {
-      return {
-        datasets: [{
-          label: 'Number of additions',
-          data: Object.entries(this.contributorsCommitsStats[""].weeks).map(([date, stats]) => {
-            return {x: date, y: stats.commits}
-          }),
-          pointRadius: 0,
-          pointHitRadius: 0,
-          fill: 'start',
-          borderColor: 'rgb(75, 192, 192)',
-          backgroundColor: 'rgba(65, 182, 182, 0.3)',
-          tension: 0.2
-        }]
-      }
-    },
     graphPoints() {
       return this.activityTopAuthors.map((item) => {
         return {
@@ -159,10 +106,6 @@ export function initRepoActivityTopAuthorsChart() {
   if (el) {
     createApp(sfc).mount(el);
   }
-  const el2 = document.getElementById('repo-contributors-master-chart');
-  if (el2) {
-    createApp(sfc).mount(el2);
-  }
 }
 
 export default sfc; // activate the IDE's Vue plugin
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
new file mode 100644
index 0000000000000..96ad22de49adb
--- /dev/null
+++ b/web_src/js/components/RepoContributors.vue
@@ -0,0 +1,79 @@
+<template>
+  <div>
+    <Line :data="graphData" :options="data.options" />
+  </div>
+</template>
+
+<script>
+import {createApp} from 'vue';
+import {
+  Chart as ChartJS,
+  Title,
+  Tooltip,
+  Legend,
+  BarElement,
+  CategoryScale,
+  LinearScale,
+  TimeScale,
+  PointElement,
+  LineElement,
+  Filler
+} from 'chart.js'
+import { Bar, Line } from 'vue-chartjs'
+import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm';
+
+ChartJS.register(TimeScale, CategoryScale, LinearScale, BarElement, Title, Tooltip, Legend, PointElement, LineElement, Filler)
+
+const sfc = {
+  components: {Line},
+  data: () => ({
+    data: {
+      options: {
+        responsive: true,
+        scales: {
+            x: {
+                // min: '2021-11-06',
+                type: 'time',
+                time: {
+                    // unit: 'year'
+                    minUnit: 'day'
+                }
+            },
+            y: {
+               min: 0
+            }
+        }
+      }
+    },
+
+    contributorsCommitsStats: window.config.pageData.repoContributorsCommitStats|| [],
+  }),
+  computed: {
+    graphData() {
+      return {
+        datasets: [{
+          label: 'Number of additions',
+          data: Object.entries(this.contributorsCommitsStats[""].weeks).map(([date, stats]) => {
+            return {x: date, y: stats.commits}
+          }),
+          pointRadius: 0,
+          pointHitRadius: 0,
+          fill: 'start',
+          borderColor: 'rgb(75, 192, 192)',
+          backgroundColor: 'rgba(65, 182, 182, 0.3)',
+          tension: 0.2
+        }]
+      }
+    },
+  },
+};
+
+export function initRepoContributorsChart() {
+  const el = document.getElementById('repo-contributors-master-chart');
+  if (el) {
+    createApp(sfc).mount(el);
+  }
+}
+
+export default sfc; // activate the IDE's Vue plugin
+</script>
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 0c786f96fbef2..b1945653c140c 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -2,6 +2,7 @@
 import './bootstrap.js';
 
 import {initRepoActivityTopAuthorsChart} from './components/RepoActivityTopAuthors.vue';
+import {initRepoContributorsChart} from './components/RepoContributors.vue';
 import {initScopedAccessTokenCategories} from './components/ScopedAccessTokenSelector.vue';
 import {initDashboardRepoList} from './components/DashboardRepoList.vue';
 
@@ -136,6 +137,7 @@ onDomReady(() => {
   initOrgTeamSettings();
 
   initRepoActivityTopAuthorsChart();
+  initRepoContributorsChart();
   initRepoArchiveLinks();
   initRepoBranchButton();
   initRepoCodeView();

From be50ead81de86930272386cd4f1314949f901e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Mon, 19 Jun 2023 16:51:36 +0300
Subject: [PATCH 006/138] Remove non-needed code

---
 templates/repo/contributors.tmpl | 201 -------------------------------
 1 file changed, 201 deletions(-)

diff --git a/templates/repo/contributors.tmpl b/templates/repo/contributors.tmpl
index 5bbcc44dd1848..99b25201e9f11 100644
--- a/templates/repo/contributors.tmpl
+++ b/templates/repo/contributors.tmpl
@@ -1,7 +1,6 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository commits">
 	{{template "repo/header" .}}
-	<p>Contributors</p>
 	<div class="ui container">
 		<h2 class="ui header">{{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}}
 			<div class="ui right">
@@ -27,88 +26,9 @@
 		</h2>
 		<div class="ui divider"></div>
 
-		{{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}}
-		<h4 class="ui top attached header">{{.locale.Tr "repo.activity.overview"}}</h4>
-		<div class="ui attached segment two column grid">
-			{{if .Permission.CanRead $.UnitTypePullRequests}}
-				<div class="column">
-					{{if gt .Activity.ActivePRCount 0}}
-					<div class="stats-table">
-						<a href="#merged-pull-requests" class="table-cell tiny background purple" style="width: {{.Activity.MergedPRPerc}}{{if ne .Activity.MergedPRPerc 0}}%{{end}}"></a>
-						<a href="#proposed-pull-requests" class="table-cell tiny background green"></a>
-					</div>
-					{{else}}
-					<div class="stats-table">
-						<a class="table-cell tiny background light grey"></a>
-					</div>
-					{{end}}
-					{{.locale.TrN .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n" .Activity.ActivePRCount | Safe}}
-				</div>
-			{{end}}
-			{{if .Permission.CanRead $.UnitTypeIssues}}
-				<div class="column">
-					{{if gt .Activity.ActiveIssueCount 0}}
-					<div class="stats-table">
-						<a href="#closed-issues" class="table-cell tiny background red" style="width: {{.Activity.ClosedIssuePerc}}{{if ne .Activity.ClosedIssuePerc 0}}%{{end}}"></a>
-						<a href="#new-issues" class="table-cell tiny background green"></a>
-					</div>
-					{{else}}
-					<div class="stats-table">
-						<a class="table-cell tiny background light grey"></a>
-					</div>
-					{{end}}
-					{{.locale.TrN .Activity.ActiveIssueCount "repo.activity.active_issues_count_1" "repo.activity.active_issues_count_n" .Activity.ActiveIssueCount | Safe}}
-				</div>
-			{{end}}
-		</div>
-		<div class="ui attached segment horizontal segments">
-			{{if .Permission.CanRead $.UnitTypePullRequests}}
-				<a href="#merged-pull-requests" class="ui attached segment text center">
-					<span class="text purple">{{svg "octicon-git-pull-request"}}</span> <strong>{{.Activity.MergedPRCount}}</strong><br>
-					{{.locale.TrN .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n"}}
-				</a>
-				<a href="#proposed-pull-requests" class="ui attached segment text center">
-					<span class="text green">{{svg "octicon-git-branch"}}</span> <strong>{{.Activity.OpenedPRCount}}</strong><br>
-					{{.locale.TrN .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n"}}
-				</a>
-			{{end}}
-			{{if .Permission.CanRead $.UnitTypeIssues}}
-				<a href="#closed-issues" class="ui attached segment text center">
-					<span class="text red">{{svg "octicon-issue-closed"}}</span> <strong>{{.Activity.ClosedIssueCount}}</strong><br>
-					{{.locale.TrN .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n"}}
-				</a>
-				<a href="#new-issues" class="ui attached segment text center">
-					<span class="text green">{{svg "octicon-issue-opened"}}</span> <strong>{{.Activity.OpenedIssueCount}}</strong><br>
-					{{.locale.TrN .Activity.OpenedIssueCount "repo.activity.new_issues_count_1" "repo.activity.new_issues_count_n"}}
-				</a>
-			{{end}}
-		</div>
-		{{end}}
-
 		{{if .Permission.CanRead $.UnitTypeCode}}
-			{{if eq .Activity.Code.CommitCountInAllBranches 0}}
-				<div class="ui center aligned segment">
-				<h4 class="ui header">{{.locale.Tr "repo.activity.no_git_activity"}}</h4>
-				</div>
-			{{end}}
 			{{if gt .Activity.Code.CommitCountInAllBranches 0}}
 				<div class="ui attached segment horizontal segments">
-					<div class="ui attached segment text">
-						{{.locale.Tr "repo.activity.git_stats_exclude_merges"}}
-						<strong>{{.locale.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_author_1" "repo.activity.git_stats_author_n" .Activity.Code.AuthorCount}}</strong>
-						{{.locale.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_pushed_1" "repo.activity.git_stats_pushed_n"}}
-						<strong>{{.locale.TrN .Activity.Code.CommitCount "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCount}}</strong>
-						{{.locale.Tr "repo.activity.git_stats_push_to_branch" .Repository.DefaultBranch}}
-						<strong>{{.locale.TrN .Activity.Code.CommitCountInAllBranches "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCountInAllBranches}}</strong>
-						{{.locale.Tr "repo.activity.git_stats_push_to_all_branches"}}
-						{{.locale.Tr "repo.activity.git_stats_on_default_branch" .Repository.DefaultBranch}}
-						<strong>{{.locale.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_file_1" "repo.activity.git_stats_file_n" .Activity.Code.ChangedFiles}}</strong>
-						{{.locale.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_files_changed_1" "repo.activity.git_stats_files_changed_n"}}
-						{{.locale.Tr "repo.activity.git_stats_additions"}}
-						<strong class="text green">{{.locale.TrN .Activity.Code.Additions "repo.activity.git_stats_addition_1" "repo.activity.git_stats_addition_n" .Activity.Code.Additions}}</strong>
-						{{.locale.Tr "repo.activity.git_stats_and_deletions"}}
-						<strong class="text red">{{.locale.TrN .Activity.Code.Deletions "repo.activity.git_stats_deletion_1" "repo.activity.git_stats_deletion_n" .Activity.Code.Deletions}}</strong>.
-					</div>
 					<div class="ui attached segment">
 						<div id="repo-contributors-master-chart"></div>
 					</div>
@@ -116,127 +36,6 @@
 			{{end}}
 		{{end}}
 
-		{{if gt .Activity.PublishedReleaseCount 0}}
-			<h4 class="ui horizontal divider header" id="published-releases">
-				<span class="text">{{svg "octicon-tag"}}</span>
-				{{.locale.Tr "repo.activity.title.releases_published_by"
-					(.locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount)
-					(.locale.TrN .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.PublishedReleaseAuthorCount)
-				}}
-			</h4>
-			<div class="list">
-				{{range .Activity.PublishedReleases}}
-					<p class="desc">
-						<span class="ui green label">{{$.locale.Tr "repo.activity.published_release_label"}}</span>
-						{{.TagName}}
-						{{if not .IsTag}}
-							<a class="title" href="{{$.RepoLink}}/src/{{.TagName | PathEscapeSegments}}">{{.Title | RenderEmoji $.Context}}</a>
-						{{end}}
-						{{TimeSinceUnix .CreatedUnix $.locale}}
-					</p>
-				{{end}}
-			</div>
-		{{end}}
-
-		{{if gt .Activity.MergedPRCount 0}}
-			<h4 class="ui horizontal divider header" id="merged-pull-requests">
-				<span class="text">{{svg "octicon-git-pull-request"}}</span>
-				{{.locale.Tr "repo.activity.title.prs_merged_by"
-					(.locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount)
-					(.locale.TrN .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.MergedPRAuthorCount)
-				}}
-			</h4>
-			<div class="list">
-				{{range .Activity.MergedPRs}}
-					<p class="desc">
-						<span class="ui purple label">{{$.locale.Tr "repo.activity.merged_prs_label"}}</span>
-						#{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .MergedUnix $.locale}}
-					</p>
-				{{end}}
-			</div>
-		{{end}}
-
-		{{if gt .Activity.OpenedPRCount 0}}
-			<h4 class="ui horizontal divider header" id="proposed-pull-requests">
-				<span class="text">{{svg "octicon-git-branch"}}</span>
-				{{.locale.Tr "repo.activity.title.prs_opened_by"
-					(.locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount)
-					(.locale.TrN .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedPRAuthorCount)
-				}}
-			</h4>
-			<div class="list">
-				{{range .Activity.OpenedPRs}}
-					<p class="desc">
-						<span class="ui green label">{{$.locale.Tr "repo.activity.opened_prs_label"}}</span>
-						#{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .Issue.CreatedUnix $.locale}}
-					</p>
-				{{end}}
-			</div>
-		{{end}}
-
-		{{if gt .Activity.ClosedIssueCount 0}}
-			<h4 class="ui horizontal divider header" id="closed-issues">
-				<span class="text">{{svg "octicon-issue-closed"}}</span>
-				{{.locale.Tr "repo.activity.title.issues_closed_from"
-					(.locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount)
-					(.locale.TrN .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.ClosedIssueAuthorCount)
-				}}
-			</h4>
-			<div class="list">
-				{{range .Activity.ClosedIssues}}
-					<p class="desc">
-						<span class="ui red label">{{$.locale.Tr "repo.activity.closed_issue_label"}}</span>
-						#{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .ClosedUnix $.locale}}
-					</p>
-				{{end}}
-			</div>
-		{{end}}
-
-		{{if gt .Activity.OpenedIssueCount 0}}
-			<h4 class="ui horizontal divider header" id="new-issues">
-				<span class="text">{{svg "octicon-issue-opened"}}</span>
-				{{.locale.Tr "repo.activity.title.issues_created_by"
-					(.locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount)
-					(.locale.TrN .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedIssueAuthorCount)
-				}}
-			</h4>
-			<div class="list">
-				{{range .Activity.OpenedIssues}}
-					<p class="desc">
-						<span class="ui green label">{{$.locale.Tr "repo.activity.new_issue_label"}}</span>
-						#{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .CreatedUnix $.locale}}
-					</p>
-				{{end}}
-			</div>
-		{{end}}
-
-		{{if gt .Activity.UnresolvedIssueCount 0}}
-			<h4 class="ui horizontal divider header" id="unresolved-conversations">
-				<span class="text">{{svg "octicon-comment-discussion"}}</span>
-				{{.locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}
-			</h4>
-			<div class="text center desc">
-				{{.locale.Tr "repo.activity.unresolved_conv_desc"}}
-			</div>
-			<div class="list">
-				{{range .Activity.UnresolvedIssues}}
-					<p class="desc">
-						<span class="ui green label">{{$.locale.Tr "repo.activity.unresolved_conv_label"}}</span>
-						#{{.Index}}
-						{{if .IsPull}}
-						<a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-						{{else}}
-						<a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-						{{end}}
-						{{TimeSinceUnix .UpdatedUnix $.locale}}
-					</p>
-				{{end}}
-			</div>
-		{{end}}
 	</div>
 </div>
 {{template "base/footer" .}}

From 32114172d9177aa7fbf084eee7ad8f752b3ba79f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 21 Jun 2023 00:56:51 +0300
Subject: [PATCH 007/138] Implement contributors graph

---
 routers/web/repo/contributors.go           |   7 +-
 templates/repo/contributors.tmpl           |  10 +-
 web_src/js/components/RepoContributors.vue | 164 ++++++++++++++++-----
 3 files changed, 138 insertions(+), 43 deletions(-)

diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index 3b6e3aea51c34..b9a48c34eb4f8 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -58,10 +58,15 @@ func Contributors(ctx *context.Context) {
 		return
 	}
 
-	if ctx.PageData["repoContributorsCommitStats"], err = contributors_model.GetContributorStats(ctx, ctx.Repo.Repository); err != nil {
+
+	if contributor_stats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository); err != nil {
 		ctx.ServerError("GetContributorStats", err)
 		return
+	} else{
+		ctx.PageData["repoContributorsCommitStats"] = contributor_stats
+		// contributor_stats[""].Weeks.(map[string]interface{})
 	}
 
+
 	ctx.HTML(http.StatusOK, tplContributors)
 }
diff --git a/templates/repo/contributors.tmpl b/templates/repo/contributors.tmpl
index 99b25201e9f11..3c175b2b2e1f7 100644
--- a/templates/repo/contributors.tmpl
+++ b/templates/repo/contributors.tmpl
@@ -27,13 +27,11 @@
 		<div class="ui divider"></div>
 
 		{{if .Permission.CanRead $.UnitTypeCode}}
-			{{if gt .Activity.Code.CommitCountInAllBranches 0}}
-				<div class="ui attached segment horizontal segments">
-					<div class="ui attached segment">
-						<div id="repo-contributors-master-chart"></div>
-					</div>
+			<div class="ui attached segment horizontal segments">
+				<div class="ui attached segment">
+					<div id="repo-contributors-master-chart"></div>
 				</div>
-			{{end}}
+			</div>
 		{{end}}
 
 	</div>
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 96ad22de49adb..4d0aa89df9c94 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -1,11 +1,46 @@
 <template>
   <div>
-    <Line :data="graphData" :options="data.options" />
+    <Line :data="mainGraphData" :options="data.options" />
+
+    <div class="ui attached segment two column grid">
+      <div
+        v-for="(contributor, index) in individualGraphData"
+        :key="index"
+        class="column stats-table"
+      >
+        <div class="ui top attached header gt-df gt-f1">
+          <a :href="contributor.home_link">
+            <img
+              height="40"
+              width="40"
+              :href="contributor.avatar_link"
+              :src="contributor.avatar_link"
+            />
+          </a>
+          <div class="gt-ml-3">
+            <a :href="contributor.home_link"
+              ><h4>{{ contributor.name }}</h4></a
+            >
+            <p class="gt-font-12">
+              <strong>{{ contributor.total }} commits </strong>
+              <strong class="text green"
+                >{{ additions(contributor.weeks) }}++ </strong>
+              <strong class="text red">
+                {{ deletions(contributor.weeks) }}--</strong
+              >
+            </p>
+          </div>
+        </div>
+        <div class="ui attached segment">
+          <Line :data="graph(contributor.weeks)" :options="data.options" />
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
-import {createApp} from 'vue';
+import { createApp } from "vue";
 import {
   Chart as ChartJS,
   Title,
@@ -17,59 +52,116 @@ import {
   TimeScale,
   PointElement,
   LineElement,
-  Filler
-} from 'chart.js'
-import { Bar, Line } from 'vue-chartjs'
-import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm';
+  Filler,
+} from "chart.js";
+import { Bar, Line } from "vue-chartjs";
+import "chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm";
 
-ChartJS.register(TimeScale, CategoryScale, LinearScale, BarElement, Title, Tooltip, Legend, PointElement, LineElement, Filler)
+ChartJS.register(
+  TimeScale,
+  CategoryScale,
+  LinearScale,
+  BarElement,
+  Title,
+  Tooltip,
+  Legend,
+  PointElement,
+  LineElement,
+  Filler
+);
 
 const sfc = {
-  components: {Line},
+  components: { Line },
   data: () => ({
     data: {
       options: {
         responsive: true,
         scales: {
-            x: {
-                // min: '2021-11-06',
-                type: 'time',
-                time: {
-                    // unit: 'year'
-                    minUnit: 'day'
-                }
+          x: {
+            // min: '2021-11-06',
+            type: "time",
+            time: {
+              // unit: 'year'
+              minUnit: "day",
             },
-            y: {
-               min: 0
-            }
-        }
-      }
+          },
+          y: {
+            min: 0,
+          },
+        },
+      },
     },
 
-    contributorsCommitsStats: window.config.pageData.repoContributorsCommitStats|| [],
+    masterChartData:
+      window.config.pageData.repoContributorsCommitStats[""] || [],
+    individualChartsData:
+      window.config.pageData.repoContributorsCommitStats || [],
   }),
   computed: {
-    graphData() {
+    mainGraphData() {
+      return {
+        datasets: [
+          {
+            label: "Number of commits",
+            data: Object.entries(this.masterChartData.weeks).map(
+              ([date, stats]) => {
+                return { x: date, y: stats.commits };
+              }
+            ),
+            pointRadius: 0,
+            pointHitRadius: 0,
+            fill: "start",
+            borderColor: "rgb(75, 192, 192)",
+            borderWidth: 0,
+            backgroundColor: "rgba(137, 191, 154, 0.6)",
+            tension: 0.3,
+          },
+        ],
+      };
+    },
+    individualGraphData() {
+      let { "": _, ...rest } = this.individualChartsData;
+      console.log(rest)
+      const data = Object.values(rest).sort((a, b) => a.total > b.total ? -1 : (a.total == b.total ? 0 : 1)).slice(0, 100);
+      console.log(data)
+      return data
+    },
+  },
+  methods: {
+    additions(data) {
+      return Object.values(data).reduce((acc, item) => {
+        return acc + item.additions;
+      }, 0);
+    },
+    deletions(data) {
+      return Object.values(data).reduce((acc, item) => {
+        return acc + item.deletions;
+      }, 0);
+    },
+    graph(data) {
       return {
-        datasets: [{
-          label: 'Number of additions',
-          data: Object.entries(this.contributorsCommitsStats[""].weeks).map(([date, stats]) => {
-            return {x: date, y: stats.commits}
-          }),
-          pointRadius: 0,
-          pointHitRadius: 0,
-          fill: 'start',
-          borderColor: 'rgb(75, 192, 192)',
-          backgroundColor: 'rgba(65, 182, 182, 0.3)',
-          tension: 0.2
-        }]
-      }
+        datasets: [
+          {
+            label: "Number of commits",
+            data: Object.entries(data).map(([date, stats]) => {
+              return { x: date, y: stats.commits };
+            }),
+            pointRadius: 0,
+            pointHitRadius: 0,
+            fill: "start",
+            borderColor: "rgb(75, 192, 192)",
+            backgroundColor: "rgba(96, 153, 38, 0.7)",
+            borderWidth: 0,
+            tension: 0.3,
+          },
+        ],
+      };
     },
   },
 };
 
 export function initRepoContributorsChart() {
-  const el = document.getElementById('repo-contributors-master-chart');
+  const el = document.getElementById("repo-contributors-master-chart");
   if (el) {
     createApp(sfc).mount(el);
   }

From 88247fdef88225f3f2ecb0f603d57b19a3b40168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 21 Jun 2023 01:11:17 +0300
Subject: [PATCH 008/138] Switch to unix timestamp

---
 models/contributors/contributors_graph.go  | 55 +++++++++++++---------
 modules/util/dates.go                      |  6 +--
 templates/repo/contributors.tmpl           |  2 +-
 web_src/js/components/RepoContributors.vue | 30 ++++++------
 4 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/models/contributors/contributors_graph.go b/models/contributors/contributors_graph.go
index 65270a100c302..a8a83f51013c3 100644
--- a/models/contributors/contributors_graph.go
+++ b/models/contributors/contributors_graph.go
@@ -1,39 +1,43 @@
 package contributors
 
 import (
-	"code.gitea.io/gitea/modules/json"
-	"context"
-	"fmt"
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/json"
 	util "code.gitea.io/gitea/modules/util"
+	"context"
+	"fmt"
+	"time"
 )
 
 type WeekData struct {
-	Additions int `json:"additions"`
-	Deletions int `json:"deletions"`
-	Commits int `json:"commits"`
+	Week      int64 `json:"week"`
+	Additions int    `json:"additions"`
+	Deletions int    `json:"deletions"`
+	Commits   int    `json:"commits"`
 }
 
 // ContributorData represents statistical git commit count data
 type ContributorData struct {
-	Name       string               `json:"name"`
-	Login      string               `json:"login"`
-	AvatarLink string               `json:"avatar_link"`
-	HomeLink   string               `json:"home_link"`
-	Total      int64                `json:"total"`
-	Weeks      map[string]*WeekData `json:"weeks"`
+	Name       string      `json:"name"`
+	Login      string      `json:"login"`
+	AvatarLink string      `json:"avatar_link"`
+	HomeLink   string      `json:"home_link"`
+	Total      int64       `json:"total"`
+	Weeks      []*WeekData `json:"weeks"`
 }
 
-func CreateWeeks(sundays []string) map[string]*WeekData {
-	weeks := make(map[string]*WeekData)
+func CreateWeeks(sundays []int64) []*WeekData {
+	var weeks []*WeekData
 	for _, week := range sundays {
-		weeks[week] = &WeekData{
+		weeks = append(weeks, &WeekData{
+			Week:      week,
 			Additions: 0,
 			Deletions: 0,
-			Commits: 0,
-		}
+			Commits:   0,
+		},
+		)
 	}
 	return weeks
 }
@@ -94,16 +98,21 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 		// Update user statistics
 		user, _ := contributors_commit_stats[v.Author.Email]
 		starting_of_week, _ := util.FindLastSundayBeforeDate(v.Author.Date)
-		user.Weeks[starting_of_week].Additions += v.Stats.Additions
-		user.Weeks[starting_of_week].Deletions += v.Stats.Deletions
-		user.Weeks[starting_of_week].Commits++
+
+		layout := "2006-01-02"
+    val, _ := time.Parse(layout, starting_of_week)
+		starting_sunday_p, _ := time.Parse(layout, starting_sunday)
+		idx := int(val.Sub(starting_sunday_p).Hours()/24)/7
+		user.Weeks[idx].Additions += v.Stats.Additions
+		user.Weeks[idx].Deletions += v.Stats.Deletions
+		user.Weeks[idx].Commits++
 		user.Total++
 
 		// Update overall statistics
 		total, _ := contributors_commit_stats[""]
-		total.Weeks[starting_of_week].Additions += v.Stats.Additions
-		total.Weeks[starting_of_week].Deletions += v.Stats.Deletions
-		total.Weeks[starting_of_week].Commits++
+		total.Weeks[idx].Additions += v.Stats.Additions
+		total.Weeks[idx].Deletions += v.Stats.Deletions
+		total.Weeks[idx].Commits++
 		total.Total++
 	}
 
diff --git a/modules/util/dates.go b/modules/util/dates.go
index fcd8f0c68060f..c111c74759a9f 100644
--- a/modules/util/dates.go
+++ b/modules/util/dates.go
@@ -4,7 +4,7 @@ import (
 	"time"
 )
 
-func ListSundaysBetween(startStr, endStr string) ([]string, error) {
+func ListSundaysBetween(startStr, endStr string) ([]int64, error) {
 	layout := "2006-01-02"
 	startDate, err := time.Parse(layout, startStr)
 	if err != nil {
@@ -21,11 +21,11 @@ func ListSundaysBetween(startStr, endStr string) ([]string, error) {
 		startDate = startDate.AddDate(0, 0, 1)
 	}
 
-	var sundays []string
+	var sundays []int64
 
 	// Iterate from start date to end date and find all Sundays
 	for currentDate := startDate; currentDate.Before(endDate); currentDate = currentDate.AddDate(0, 0, 7) {
-		sundays = append(sundays, currentDate.Format(layout))
+		sundays = append(sundays, currentDate.Unix())
 	}
 
 	return sundays, nil
diff --git a/templates/repo/contributors.tmpl b/templates/repo/contributors.tmpl
index 3c175b2b2e1f7..d76bb47612704 100644
--- a/templates/repo/contributors.tmpl
+++ b/templates/repo/contributors.tmpl
@@ -29,7 +29,7 @@
 		{{if .Permission.CanRead $.UnitTypeCode}}
 			<div class="ui attached segment horizontal segments">
 				<div class="ui attached segment">
-					<div id="repo-contributors-master-chart"></div>
+					<div id="repo-contributors-chart"></div>
 				</div>
 			</div>
 		{{end}}
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 4d0aa89df9c94..e97bb6177ce47 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -24,7 +24,8 @@
             <p class="gt-font-12">
               <strong>{{ contributor.total }} commits </strong>
               <strong class="text green"
-                >{{ additions(contributor.weeks) }}++ </strong>
+                >{{ additions(contributor.weeks) }}++
+              </strong>
               <strong class="text red">
                 {{ deletions(contributor.weeks) }}--</strong
               >
@@ -92,8 +93,7 @@ const sfc = {
       },
     },
 
-    masterChartData:
-      window.config.pageData.repoContributorsCommitStats[""] || [],
+    masterChartData: window.config.pageData.repoContributorsCommitStats || [],
     individualChartsData:
       window.config.pageData.repoContributorsCommitStats || [],
   }),
@@ -103,11 +103,9 @@ const sfc = {
         datasets: [
           {
             label: "Number of commits",
-            data: Object.entries(this.masterChartData.weeks).map(
-              ([date, stats]) => {
-                return { x: date, y: stats.commits };
-              }
-            ),
+            data: this.masterChartData[""].weeks.map((i) => {
+              return { x: i.week, y: i.commits };
+            }),
             pointRadius: 0,
             pointHitRadius: 0,
             fill: "start",
@@ -121,10 +119,12 @@ const sfc = {
     },
     individualGraphData() {
       let { "": _, ...rest } = this.individualChartsData;
-      console.log(rest)
-      const data = Object.values(rest).sort((a, b) => a.total > b.total ? -1 : (a.total == b.total ? 0 : 1)).slice(0, 100);
-      console.log(data)
-      return data
+      console.log(rest);
+      const data = Object.values(rest)
+        .sort((a, b) => (a.total > b.total ? -1 : a.total == b.total ? 0 : 1))
+        .slice(0, 100);
+      console.log(data);
+      return data;
     },
   },
   methods: {
@@ -143,8 +143,8 @@ const sfc = {
         datasets: [
           {
             label: "Number of commits",
-            data: Object.entries(data).map(([date, stats]) => {
-              return { x: date, y: stats.commits };
+            data: data.map((i) => {
+              return { x: i.week, y: i.commits };
             }),
             pointRadius: 0,
             pointHitRadius: 0,
@@ -161,7 +161,7 @@ const sfc = {
 };
 
 export function initRepoContributorsChart() {
-  const el = document.getElementById("repo-contributors-master-chart");
+  const el = document.getElementById("repo-contributors-chart");
   if (el) {
     createApp(sfc).mount(el);
   }

From a3930932a696ad064796baa3ef06c41b5d31a839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 21 Jun 2023 01:17:06 +0300
Subject: [PATCH 009/138] Show contributor rank

---
 web_src/js/components/RepoContributors.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index e97bb6177ce47..12d0d42bdaf21 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -9,6 +9,7 @@
         class="column stats-table"
       >
         <div class="ui top attached header gt-df gt-f1">
+          <b class="ui right">#{{index + 1}}</b>
           <a :href="contributor.home_link">
             <img
               height="40"

From e8e0e34824e94d1094aaf353140f9edb61cb7618 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 21 Jun 2023 01:23:05 +0300
Subject: [PATCH 010/138] Multiply x with 1000 to make it milliseconds

---
 web_src/js/components/RepoContributors.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 12d0d42bdaf21..a46583fcdcd33 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -105,7 +105,7 @@ const sfc = {
           {
             label: "Number of commits",
             data: this.masterChartData[""].weeks.map((i) => {
-              return { x: i.week, y: i.commits };
+              return { x: i.week * 1000, y: i.commits };
             }),
             pointRadius: 0,
             pointHitRadius: 0,
@@ -145,7 +145,7 @@ const sfc = {
           {
             label: "Number of commits",
             data: data.map((i) => {
-              return { x: i.week, y: i.commits };
+              return { x: i.week * 1000, y: i.commits };
             }),
             pointRadius: 0,
             pointHitRadius: 0,

From ff17e01306c1216a9c9381c7ec027df0bf0b5a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 21 Jun 2023 01:32:56 +0300
Subject: [PATCH 011/138] Remove legend, format numbers

---
 web_src/js/components/RepoContributors.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index a46583fcdcd33..f7170d5a02d08 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -23,12 +23,12 @@
               ><h4>{{ contributor.name }}</h4></a
             >
             <p class="gt-font-12">
-              <strong>{{ contributor.total }} commits </strong>
+              <strong>{{ contributor.total.toLocaleString() }} commits </strong>
               <strong class="text green"
-                >{{ additions(contributor.weeks) }}++
+                >{{ additions(contributor.weeks).toLocaleString() }}++
               </strong>
               <strong class="text red">
-                {{ deletions(contributor.weeks) }}--</strong
+                {{ deletions(contributor.weeks).toLocaleString() }}--</strong
               >
             </p>
           </div>
@@ -78,6 +78,11 @@ const sfc = {
     data: {
       options: {
         responsive: true,
+        plugins: {
+          legend: {
+            display: false,
+          }
+        },
         scales: {
           x: {
             // min: '2021-11-06',
@@ -103,7 +108,6 @@ const sfc = {
       return {
         datasets: [
           {
-            label: "Number of commits",
             data: this.masterChartData[""].weeks.map((i) => {
               return { x: i.week * 1000, y: i.commits };
             }),
@@ -143,7 +147,6 @@ const sfc = {
       return {
         datasets: [
           {
-            label: "Number of commits",
             data: data.map((i) => {
               return { x: i.week * 1000, y: i.commits };
             }),

From 664747a6cfcac1bb72c47a7ac220dfa21ceab19c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 21 Jun 2023 02:14:12 +0300
Subject: [PATCH 012/138] Implement contribution type selection

---
 options/locale/locale_en-US.ini  |  4 ++++
 options/locale/locale_tr-TR.ini  |  4 ++++
 routers/web/repo/contributors.go | 27 ++++++---------------------
 routers/web/web.go               |  2 +-
 templates/repo/contributors.tmpl | 14 +++++---------
 5 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index fbbbeb8798231..21c8204f85e46 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1904,6 +1904,10 @@ activity.git_stats_deletion_1 = %d deletion
 activity.git_stats_deletion_n = %d deletions
 
 contributors = Contributors
+contributors.contribution_type.filter_label = Contribution type:
+contributors.contribution_type.commits = Commits
+contributors.contribution_type.additions = Additions
+contributors.contribution_type.deletions = Deletions
 
 search = Search
 search.search_repo = Search repository
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
index ca3f57e993f88..bd46bade5d9fd 100644
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
@@ -1852,6 +1852,10 @@ activity.git_stats_deletion_n=%d silme oldu
 
 
 contributors = Katkıda Bulunanlar
+contributors.contribution_type.filter_label = Katkı tipi:
+contributors.contribution_type.commits = İşlemeler
+contributors.contribution_type.additions = Eklemeler
+contributors.contribution_type.deletions = Silmeler
 
 search=Ara
 search.search_repo=Depo ara
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index b9a48c34eb4f8..4572ea49b2db6 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -20,33 +20,18 @@ func Contributors(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("repo.activity")
 	ctx.Data["PageIsContributors"] = true
 
-	ctx.Data["Period"] = ctx.Params("period")
+	ctx.Data["ContributionType"] = ctx.Params("contribution_type")
+	if ctx.Data["ContributionType"] == "" {
+		ctx.Data["ContributionType"] = "commits"
+	}
 
 	timeUntil := time.Now()
 	var timeFrom time.Time
 
-	switch ctx.Data["Period"] {
-	case "daily":
-		timeFrom = timeUntil.Add(-time.Hour * 24)
-	case "halfweekly":
-		timeFrom = timeUntil.Add(-time.Hour * 72)
-	case "weekly":
-		timeFrom = timeUntil.Add(-time.Hour * 168)
-	case "monthly":
-		timeFrom = timeUntil.AddDate(0, -1, 0)
-	case "quarterly":
-		timeFrom = timeUntil.AddDate(0, -3, 0)
-	case "semiyearly":
-		timeFrom = timeUntil.AddDate(0, -6, 0)
-	case "yearly":
-		timeFrom = timeUntil.AddDate(-1, 0, 0)
-	default:
-		ctx.Data["Period"] = "weekly"
-		timeFrom = timeUntil.Add(-time.Hour * 168)
-	}
+	timeFrom = timeUntil.Add(-time.Hour * 24)
 	ctx.Data["DateFrom"] = timeFrom.UTC().Format(time.RFC3339)
 	ctx.Data["DateUntil"] = timeUntil.UTC().Format(time.RFC3339)
-	ctx.Data["PeriodText"] = ctx.Tr("repo.activity.period." + ctx.Data["Period"].(string))
+	ctx.Data["ContributionTypeText"] = ctx.Tr("repo.contributors.contribution_type." + ctx.Data["ContributionType"].(string))
 
 	var err error
 	if ctx.Data["Activity"], err = activities_model.GetActivityStats(ctx, ctx.Repo.Repository, timeFrom,
diff --git a/routers/web/web.go b/routers/web/web.go
index 72fd3af420177..03a1a99e62130 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1246,7 +1246,7 @@ func registerRoutes(m *web.Route) {
 
 		m.Group("/contributors", func() {
 			m.Get("", repo.Contributors)
-			m.Get("/{period}", repo.Contributors)
+			m.Get("/{contribution_type}", repo.Contributors)
 		}, context.RepoRef(), repo.MustBeNotEmpty, context.RequireRepoReaderOr(unit.TypePullRequests, unit.TypeIssues, unit.TypeReleases))
 
 		m.Group("/archive", func() {
diff --git a/templates/repo/contributors.tmpl b/templates/repo/contributors.tmpl
index d76bb47612704..8317ef5360a12 100644
--- a/templates/repo/contributors.tmpl
+++ b/templates/repo/contributors.tmpl
@@ -4,22 +4,18 @@
 	<div class="ui container">
 		<h2 class="ui header">{{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}}
 			<div class="ui right">
-				<!-- Period -->
+				<!-- Contribution type -->
 				<div class="ui floating dropdown jump filter">
 					<div class="ui basic compact button">
 						<span class="text">
-							{{.locale.Tr "repo.activity.period.filter_label"}} <strong>{{.PeriodText}}</strong>
+							{{.locale.Tr "repo.contributors.contribution_type.filter_label"}} <strong>{{.ContributionTypeText}}</strong>
 							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 						</span>
 					</div>
 					<div class="menu">
-						<a class="{{if eq .Period "daily"}}active {{end}}item" href="{{$.RepoLink}}/activity/daily">{{.locale.Tr "repo.activity.period.daily"}}</a>
-						<a class="{{if eq .Period "halfweekly"}}active {{end}}item" href="{{$.RepoLink}}/activity/halfweekly">{{.locale.Tr "repo.activity.period.halfweekly"}}</a>
-						<a class="{{if eq .Period "weekly"}}active {{end}}item" href="{{$.RepoLink}}/activity/weekly">{{.locale.Tr "repo.activity.period.weekly"}}</a>
-						<a class="{{if eq .Period "monthly"}}active {{end}}item" href="{{$.RepoLink}}/activity/monthly">{{.locale.Tr "repo.activity.period.monthly"}}</a>
-						<a class="{{if eq .Period "quarterly"}}active {{end}}item" href="{{$.RepoLink}}/activity/quarterly">{{.locale.Tr "repo.activity.period.quarterly"}}</a>
-						<a class="{{if eq .Period "semiyearly"}}active {{end}}item" href="{{$.RepoLink}}/activity/semiyearly">{{.locale.Tr "repo.activity.period.semiyearly"}}</a>
-						<a class="{{if eq .Period "yearly"}}active {{end}}item" href="{{$.RepoLink}}/activity/yearly">{{.locale.Tr "repo.activity.period.yearly"}}</a>
+						<a class="{{if eq .ContributionType "commits"}}active {{end}}item" href="{{$.RepoLink}}/contributors/commits">{{.locale.Tr "repo.contributors.contribution_type.commits"}}</a>
+						<a class="{{if eq .ContributionType "additions"}}active {{end}}item" href="{{$.RepoLink}}/contributors/additions">{{.locale.Tr "repo.contributors.contribution_type.additions"}}</a>
+						<a class="{{if eq .ContributionType "deletions"}}active {{end}}item" href="{{$.RepoLink}}/contributors/deletions">{{.locale.Tr "repo.contributors.contribution_type.deletions"}}</a>
 					</div>
 				</div>
 			</div>

From 2c567ea152f70d66ebff18bd2b765905a8b8310d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 21 Jun 2023 02:29:57 +0300
Subject: [PATCH 013/138] Draw charts basaed on selected contribution type

---
 routers/web/repo/contributors.go           | 1 +
 web_src/js/components/RepoContributors.vue | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index 4572ea49b2db6..c8f741ca52e26 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -24,6 +24,7 @@ func Contributors(ctx *context.Context) {
 	if ctx.Data["ContributionType"] == "" {
 		ctx.Data["ContributionType"] = "commits"
 	}
+	ctx.PageData["contributionType"] = ctx.Data["ContributionType"]
 
 	timeUntil := time.Now()
 	var timeFrom time.Time
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index f7170d5a02d08..30175b4b154a0 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -100,6 +100,7 @@ const sfc = {
     },
 
     masterChartData: window.config.pageData.repoContributorsCommitStats || [],
+    type: window.config.pageData.contributionType,
     individualChartsData:
       window.config.pageData.repoContributorsCommitStats || [],
   }),
@@ -109,7 +110,7 @@ const sfc = {
         datasets: [
           {
             data: this.masterChartData[""].weeks.map((i) => {
-              return { x: i.week * 1000, y: i.commits };
+              return { x: i.week * 1000, y: i[this.type] };
             }),
             pointRadius: 0,
             pointHitRadius: 0,
@@ -148,7 +149,7 @@ const sfc = {
         datasets: [
           {
             data: data.map((i) => {
-              return { x: i.week * 1000, y: i.commits };
+              return { x: i.week * 1000, y: i[this.type] };
             }),
             pointRadius: 0,
             pointHitRadius: 0,

From 8ef0c35ceb27de2eadd0de1b0a4d86ede27a058b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 21 Jun 2023 02:42:11 +0300
Subject: [PATCH 014/138] Show all sundays until today instead of latest commit

---
 models/contributors/contributors_graph.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/models/contributors/contributors_graph.go b/models/contributors/contributors_graph.go
index a8a83f51013c3..298ab26a18622 100644
--- a/models/contributors/contributors_graph.go
+++ b/models/contributors/contributors_graph.go
@@ -56,11 +56,12 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 		return nil, fmt.Errorf("ExtendedCommitStats: %w", err)
 	}
 
+	layout := "2006-01-02"
 	initial_commit_date := extended_commit_stats[0].Author.Date
-	last_commit_date := extended_commit_stats[len(extended_commit_stats)-1].Author.Date
+
 
 	starting_sunday, _ := util.FindLastSundayBeforeDate(initial_commit_date)
-	ending_sunday, _ := util.FindFirstSundayAfterDate(last_commit_date)
+	ending_sunday, _ := util.FindFirstSundayAfterDate(time.Now().Format(layout))
 
 	sundays, _ := util.ListSundaysBetween(starting_sunday, ending_sunday)
 
@@ -99,7 +100,6 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 		user, _ := contributors_commit_stats[v.Author.Email]
 		starting_of_week, _ := util.FindLastSundayBeforeDate(v.Author.Date)
 
-		layout := "2006-01-02"
     val, _ := time.Parse(layout, starting_of_week)
 		starting_sunday_p, _ := time.Parse(layout, starting_sunday)
 		idx := int(val.Sub(starting_sunday_p).Hours()/24)/7

From bc396c08b899dbaf15fbf7f974e5ec5188305bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 21 Jun 2023 02:55:17 +0300
Subject: [PATCH 015/138] Show date range in title

---
 modules/util/dates.go                      |  2 +-
 routers/web/repo/contributors.go           | 24 +++++-----------------
 web_src/js/components/RepoContributors.vue |  4 ++--
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/modules/util/dates.go b/modules/util/dates.go
index c111c74759a9f..5843293ac24a9 100644
--- a/modules/util/dates.go
+++ b/modules/util/dates.go
@@ -25,7 +25,7 @@ func ListSundaysBetween(startStr, endStr string) ([]int64, error) {
 
 	// Iterate from start date to end date and find all Sundays
 	for currentDate := startDate; currentDate.Before(endDate); currentDate = currentDate.AddDate(0, 0, 7) {
-		sundays = append(sundays, currentDate.Unix())
+		sundays = append(sundays, currentDate.UnixMilli())
 	}
 
 	return sundays, nil
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index c8f741ca52e26..7ab6057c8c4fe 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -4,9 +4,7 @@ import (
 	"net/http"
 	"time"
 
-	activities_model "code.gitea.io/gitea/models/activities"
 	contributors_model "code.gitea.io/gitea/models/contributors"
-	"code.gitea.io/gitea/models/unit"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
 )
@@ -26,30 +24,18 @@ func Contributors(ctx *context.Context) {
 	}
 	ctx.PageData["contributionType"] = ctx.Data["ContributionType"]
 
-	timeUntil := time.Now()
-	var timeFrom time.Time
-
-	timeFrom = timeUntil.Add(-time.Hour * 24)
-	ctx.Data["DateFrom"] = timeFrom.UTC().Format(time.RFC3339)
-	ctx.Data["DateUntil"] = timeUntil.UTC().Format(time.RFC3339)
 	ctx.Data["ContributionTypeText"] = ctx.Tr("repo.contributors.contribution_type." + ctx.Data["ContributionType"].(string))
 
-	var err error
-	if ctx.Data["Activity"], err = activities_model.GetActivityStats(ctx, ctx.Repo.Repository, timeFrom,
-		ctx.Repo.CanRead(unit.TypeReleases),
-		ctx.Repo.CanRead(unit.TypeIssues),
-		ctx.Repo.CanRead(unit.TypePullRequests),
-		ctx.Repo.CanRead(unit.TypeCode)); err != nil {
-		ctx.ServerError("GetActivityStats", err)
-		return
-	}
-
-
 	if contributor_stats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository); err != nil {
 		ctx.ServerError("GetContributorStats", err)
 		return
 	} else{
 		ctx.PageData["repoContributorsCommitStats"] = contributor_stats
+		timeUntil := time.Now()
+		timeFrom := time.UnixMilli(contributor_stats[""].Weeks[0].Week)
+
+		ctx.Data["DateFrom"] = timeFrom.UTC().Format(time.RFC3339)
+		ctx.Data["DateUntil"] = timeUntil.UTC().Format(time.RFC3339)
 		// contributor_stats[""].Weeks.(map[string]interface{})
 	}
 
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 30175b4b154a0..cca771aa92ab6 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -110,7 +110,7 @@ const sfc = {
         datasets: [
           {
             data: this.masterChartData[""].weeks.map((i) => {
-              return { x: i.week * 1000, y: i[this.type] };
+              return { x: i.week, y: i[this.type] };
             }),
             pointRadius: 0,
             pointHitRadius: 0,
@@ -149,7 +149,7 @@ const sfc = {
         datasets: [
           {
             data: data.map((i) => {
-              return { x: i.week * 1000, y: i[this.type] };
+              return { x: i.week, y: i[this.type] };
             }),
             pointRadius: 0,
             pointHitRadius: 0,

From 630c2dde3061cd104e7831e30a4addbc8904663f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 21 Jun 2023 15:34:11 +0300
Subject: [PATCH 016/138] Add zoom/pan support to charts

---
 package-lock.json                          | 20 +++++++
 package.json                               |  1 +
 web_src/js/components/RepoContributors.vue | 65 +++++++++++++++++-----
 3 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ff81006cb53cf..0c039bb590781 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,6 +21,7 @@
         "asciinema-player": "3.4.0",
         "chart.js": "4.3.0",
         "chartjs-adapter-dayjs-4": "1.0.4",
+        "chartjs-plugin-zoom": "2.0.1",
         "clippie": "4.0.1",
         "css-loader": "6.8.1",
         "dayjs": "1.11.8",
@@ -2974,6 +2975,17 @@
         "dayjs": "^1.9.7"
       }
     },
+    "node_modules/chartjs-plugin-zoom": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/chartjs-plugin-zoom/-/chartjs-plugin-zoom-2.0.1.tgz",
+      "integrity": "sha512-ogOmLu6e+Q7E1XWOCOz9YwybMslz9qNfGV2a+qjfmqJYpsw5ZMoRHZBUyW+NGhkpQ5PwwPA/+rikHpBZb7PZuA==",
+      "dependencies": {
+        "hammerjs": "^2.0.8"
+      },
+      "peerDependencies": {
+        "chart.js": ">=3.2.0"
+      }
+    },
     "node_modules/check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
@@ -5636,6 +5648,14 @@
       "resolved": "https://registry.npmjs.org/gsap/-/gsap-3.12.1.tgz",
       "integrity": "sha512-FXtb2YbBE9l8I9Pl5DFLpCMedaiMPztRlr0Ln0CMSnJn+pbTaeKlzgth8cLNPc7PzNwIZe+SEQiBBAWaBKJdVA=="
     },
+    "node_modules/hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/hard-rejection": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
diff --git a/package.json b/package.json
index 98f702d4de44a..6a4bd863ef5ad 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "asciinema-player": "3.4.0",
     "chart.js": "4.3.0",
     "chartjs-adapter-dayjs-4": "1.0.4",
+    "chartjs-plugin-zoom": "2.0.1",
     "clippie": "4.0.1",
     "css-loader": "6.8.1",
     "dayjs": "1.11.8",
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index cca771aa92ab6..c8cccf23501b0 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Line :data="mainGraphData" :options="data.options" />
+    <Line :data="mainGraphData" :options="options" />
 
     <div class="ui attached segment two column grid">
       <div
@@ -9,7 +9,7 @@
         class="column stats-table"
       >
         <div class="ui top attached header gt-df gt-f1">
-          <b class="ui right">#{{index + 1}}</b>
+          <b class="ui right">#{{ index + 1 }}</b>
           <a :href="contributor.home_link">
             <img
               height="40"
@@ -34,7 +34,7 @@
           </div>
         </div>
         <div class="ui attached segment">
-          <Line :data="graph(contributor.weeks)" :options="data.options" />
+          <Line :data="graph(contributor.weeks)" :options="options" />
         </div>
       </div>
     </div>
@@ -56,6 +56,7 @@ import {
   LineElement,
   Filler,
 } from "chart.js";
+import zoomPlugin from "chartjs-plugin-zoom";
 import { Bar, Line } from "vue-chartjs";
 import "chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm";
 
@@ -69,23 +70,55 @@ ChartJS.register(
   Legend,
   PointElement,
   LineElement,
-  Filler
+  Filler,
+  zoomPlugin
 );
 
 const sfc = {
   components: { Line },
   data: () => ({
     data: {
-      options: {
+    },
+
+    masterChartData: window.config.pageData.repoContributorsCommitStats || [],
+    type: window.config.pageData.contributionType,
+    individualChartsData:
+      window.config.pageData.repoContributorsCommitStats || [],
+  }),
+  computed: {
+    options() {
+      return {
         responsive: true,
         plugins: {
           legend: {
             display: false,
-          }
+          },
+          zoom: {
+            pan: {
+              enabled: true,
+              mode: "x",
+              threshold: 20,
+            },
+            limits: {
+              x: {
+                min: "original",
+                max: "original",
+                minRange: 1000000000,
+              },
+            },
+            zoom: {
+              wheel: {
+                enabled: true,
+              },
+              pinch: {
+                enabled: true,
+              },
+              mode: "x",
+            },
+          },
         },
         scales: {
           x: {
-            // min: '2021-11-06',
             type: "time",
             time: {
               // unit: 'year'
@@ -94,17 +127,11 @@ const sfc = {
           },
           y: {
             min: 0,
+            max: this.maxMainGraph(),
           },
         },
-      },
+      }
     },
-
-    masterChartData: window.config.pageData.repoContributorsCommitStats || [],
-    type: window.config.pageData.contributionType,
-    individualChartsData:
-      window.config.pageData.repoContributorsCommitStats || [],
-  }),
-  computed: {
     mainGraphData() {
       return {
         datasets: [
@@ -134,6 +161,14 @@ const sfc = {
     },
   },
   methods: {
+    maxMainGraph() {
+      const maxValue = Math.max(...this.masterChartData[""].weeks.map(o => o[this.type]))
+      const [cooefficient, exp] = maxValue.toExponential().split('e')
+      if (Number(cooefficient) % 1 == 0) {
+        return maxValue
+      }
+      return (1 - Number(cooefficient) % 1) * 10 ** Number(exp) + maxValue
+    },
     additions(data) {
       return Object.values(data).reduce((acc, item) => {
         return acc + item.additions;

From d293f243fce3f3d6e97f3ada81bfdba54425c735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 21 Jun 2023 20:23:23 +0300
Subject: [PATCH 017/138] Sync charts on zoom/pan events

---
 web_src/js/components/RepoContributors.vue | 42 ++++++++++++++++++----
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index c8cccf23501b0..407c8def57471 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -77,8 +77,7 @@ ChartJS.register(
 const sfc = {
   components: { Line },
   data: () => ({
-    data: {
-    },
+    data: {},
 
     masterChartData: window.config.pageData.repoContributorsCommitStats || [],
     type: window.config.pageData.contributionType,
@@ -98,6 +97,19 @@ const sfc = {
               enabled: true,
               mode: "x",
               threshold: 20,
+
+              onPan: function (event) {
+                var minVal = event.chart.options.scales.x.min;
+                var maxVal = event.chart.options.scales.x.max;
+
+                Object.values(ChartJS.instances).forEach(function (instance) {
+                  if (instance !== event.chart){
+                    instance.options.scales.x.min = minVal;
+                    instance.options.scales.x.max = maxVal;
+                    instance.update();
+                  }
+                });
+              },
             },
             limits: {
               x: {
@@ -114,6 +126,20 @@ const sfc = {
                 enabled: true,
               },
               mode: "x",
+
+              onZoomComplete: function (event) {
+                var minVal = event.chart.options.scales.x.min;
+                var maxVal = event.chart.options.scales.x.max;
+
+                Object.values(ChartJS.instances).forEach(function (instance) {
+                  if (instance !== event.chart){
+                    instance.options.scales.x.min = minVal;
+                    instance.options.scales.x.max = maxVal;
+                    instance.update();
+                  }
+                });
+              },
+
             },
           },
         },
@@ -130,7 +156,7 @@ const sfc = {
             max: this.maxMainGraph(),
           },
         },
-      }
+      };
     },
     mainGraphData() {
       return {
@@ -162,12 +188,14 @@ const sfc = {
   },
   methods: {
     maxMainGraph() {
-      const maxValue = Math.max(...this.masterChartData[""].weeks.map(o => o[this.type]))
-      const [cooefficient, exp] = maxValue.toExponential().split('e')
+      const maxValue = Math.max(
+        ...this.masterChartData[""].weeks.map((o) => o[this.type])
+      );
+      const [cooefficient, exp] = maxValue.toExponential().split("e");
       if (Number(cooefficient) % 1 == 0) {
-        return maxValue
+        return maxValue;
       }
-      return (1 - Number(cooefficient) % 1) * 10 ** Number(exp) + maxValue
+      return (1 - (Number(cooefficient) % 1)) * 10 ** Number(exp) + maxValue;
     },
     additions(data) {
       return Object.values(data).reduce((acc, item) => {

From 2304a5d688b03d1a2a5f67aab014e6d66dff144d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 21 Jun 2023 22:29:35 +0300
Subject: [PATCH 018/138] Format everything with gofmt

---
 models/contributors/contributors_graph.go | 11 +++++------
 modules/git/repo_commit.go                | 10 ++++------
 modules/structs/repo_commit.go            |  4 ++--
 modules/util/dates.go                     |  9 ++++-----
 routers/api/v1/repo/commits.go            |  5 ++---
 routers/web/repo/contributors.go          |  3 +--
 6 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/models/contributors/contributors_graph.go b/models/contributors/contributors_graph.go
index 298ab26a18622..a01eebb898cea 100644
--- a/models/contributors/contributors_graph.go
+++ b/models/contributors/contributors_graph.go
@@ -13,9 +13,9 @@ import (
 
 type WeekData struct {
 	Week      int64 `json:"week"`
-	Additions int    `json:"additions"`
-	Deletions int    `json:"deletions"`
-	Commits   int    `json:"commits"`
+	Additions int   `json:"additions"`
+	Deletions int   `json:"deletions"`
+	Commits   int   `json:"commits"`
 }
 
 // ContributorData represents statistical git commit count data
@@ -59,7 +59,6 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 	layout := "2006-01-02"
 	initial_commit_date := extended_commit_stats[0].Author.Date
 
-
 	starting_sunday, _ := util.FindLastSundayBeforeDate(initial_commit_date)
 	ending_sunday, _ := util.FindFirstSundayAfterDate(time.Now().Format(layout))
 
@@ -100,9 +99,9 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 		user, _ := contributors_commit_stats[v.Author.Email]
 		starting_of_week, _ := util.FindLastSundayBeforeDate(v.Author.Date)
 
-    val, _ := time.Parse(layout, starting_of_week)
+		val, _ := time.Parse(layout, starting_of_week)
 		starting_sunday_p, _ := time.Parse(layout, starting_sunday)
-		idx := int(val.Sub(starting_sunday_p).Hours()/24)/7
+		idx := int(val.Sub(starting_sunday_p).Hours()/24) / 7
 		user.Weeks[idx].Additions += v.Stats.Additions
 		user.Weeks[idx].Deletions += v.Stats.Deletions
 		user.Weeks[idx].Commits++
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index ddf28ffa3b814..544b35fcccc21 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -15,9 +15,9 @@ import (
 	"strconv"
 	"strings"
 
-	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/cache"
 	"code.gitea.io/gitea/modules/setting"
+	api "code.gitea.io/gitea/modules/structs"
 )
 
 // GetBranchCommitID returns last commit ID string of given branch.
@@ -224,7 +224,6 @@ type CommitsByFileAndRangeOptions struct {
 	Page     int
 }
 
-
 // ExtendedCommitStats return the list of *api.ExtendedCommitStats for the given revision
 func (repo *Repository) ExtendedCommitStats(revision string, limit int) ([]*api.ExtendedCommitStats, error) {
 	var baseCommit *Commit
@@ -239,10 +238,9 @@ func (repo *Repository) ExtendedCommitStats(revision string, limit int) ([]*api.
 	}()
 
 	gitCmd := NewCommand(repo.Ctx, "log", "--shortstat", "--no-merges", "--pretty=format:%aN%n%aE%n%as", "--reverse")
-		// AddOptionFormat("--max-count=%d", limit)
+	// AddOptionFormat("--max-count=%d", limit)
 	gitCmd.AddDynamicArguments(baseCommit.ID.String())
 
-
 	var extended_commit_stats []*api.ExtendedCommitStats
 	stderr := new(strings.Builder)
 	err = gitCmd.Run(&RunOpts{
@@ -290,7 +288,7 @@ func (repo *Repository) ExtendedCommitStats(revision string, limit int) ([]*api.
 				res := &api.ExtendedCommitStats{
 					Author: &api.CommitUser{
 						Identity: api.Identity{
-							Name: author_name,
+							Name:  author_name,
 							Email: author_email,
 						},
 						Date: date,
@@ -299,7 +297,7 @@ func (repo *Repository) ExtendedCommitStats(revision string, limit int) ([]*api.
 				}
 				extended_commit_stats = append(extended_commit_stats, res)
 
-				}
+			}
 			_ = stdoutReader.Close()
 			return nil
 		},
diff --git a/modules/structs/repo_commit.go b/modules/structs/repo_commit.go
index 86cfcee0be136..9139bbd641218 100644
--- a/modules/structs/repo_commit.go
+++ b/modules/structs/repo_commit.go
@@ -60,8 +60,8 @@ type Commit struct {
 
 // ExtendedCommitStats contains information for commit stats with author data
 type ExtendedCommitStats struct {
-	Author  *CommitUser   `json:"author"`
-	Stats	  *CommitStats  `json:"stats"`
+	Author *CommitUser  `json:"author"`
+	Stats  *CommitStats `json:"stats"`
 }
 
 // CommitDateOptions store dates for GIT_AUTHOR_DATE and GIT_COMMITTER_DATE
diff --git a/modules/util/dates.go b/modules/util/dates.go
index 5843293ac24a9..9f8ccb58c2406 100644
--- a/modules/util/dates.go
+++ b/modules/util/dates.go
@@ -49,7 +49,6 @@ func FindLastSundayBeforeDate(dateStr string) (string, error) {
 	return last_sunday.Format(layout), nil
 }
 
-
 func FindFirstSundayAfterDate(dateStr string) (string, error) {
 	layout := "2006-01-02"
 
@@ -59,10 +58,10 @@ func FindFirstSundayAfterDate(dateStr string) (string, error) {
 	}
 
 	weekday := date.Weekday()
-  daysToAdd := int(time.Sunday) - int(weekday)
-  if daysToAdd <= 0 {
-    daysToAdd += 7
-  }
+	daysToAdd := int(time.Sunday) - int(weekday)
+	if daysToAdd <= 0 {
+		daysToAdd += 7
+	}
 
 	first_sunday := date.AddDate(0, 0, daysToAdd)
 	return first_sunday.Format(layout), nil
diff --git a/routers/api/v1/repo/commits.go b/routers/api/v1/repo/commits.go
index 917f0d0ec5417..acfa52d533aff 100644
--- a/routers/api/v1/repo/commits.go
+++ b/routers/api/v1/repo/commits.go
@@ -279,7 +279,6 @@ func GetAllCommits(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, &apiCommits)
 }
 
-
 // GetAllCommitsStats get all commits via
 func GetAllCommitsStats(ctx *context.APIContext) {
 	// swagger:operation GET /repos/{owner}/{repo}/commits/stats repository repoGetAllCommitsStats
@@ -321,8 +320,8 @@ func GetAllCommitsStats(ctx *context.APIContext) {
 	sha := ctx.FormString("sha")
 
 	var (
-		commits           []*api.ExtendedCommitStats
-		err               error
+		commits []*api.ExtendedCommitStats
+		err     error
 	)
 
 	if len(sha) == 0 {
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index 7ab6057c8c4fe..8e9baca983821 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -29,7 +29,7 @@ func Contributors(ctx *context.Context) {
 	if contributor_stats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository); err != nil {
 		ctx.ServerError("GetContributorStats", err)
 		return
-	} else{
+	} else {
 		ctx.PageData["repoContributorsCommitStats"] = contributor_stats
 		timeUntil := time.Now()
 		timeFrom := time.UnixMilli(contributor_stats[""].Weeks[0].Week)
@@ -39,6 +39,5 @@ func Contributors(ctx *context.Context) {
 		// contributor_stats[""].Weeks.(map[string]interface{})
 	}
 
-
 	ctx.HTML(http.StatusOK, tplContributors)
 }

From a047e074f0c3837c59f94e7ffeafced191f30d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 22 Jun 2023 00:34:54 +0300
Subject: [PATCH 019/138] Disable animations for performance

---
 web_src/js/components/RepoContributors.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 407c8def57471..91dedf4e2a92c 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -88,6 +88,7 @@ const sfc = {
     options() {
       return {
         responsive: true,
+        animation: false,
         plugins: {
           legend: {
             display: false,

From 34f9d92caf41e7a7d34e764b22de2841a5d5c878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 22 Jun 2023 00:39:16 +0300
Subject: [PATCH 020/138] Reset zoom when clicking on chart

---
 web_src/js/components/RepoContributors.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 91dedf4e2a92c..6bcef05d54f1b 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -89,6 +89,9 @@ const sfc = {
       return {
         responsive: true,
         animation: false,
+        onClick: (e) => {
+          e.chart.resetZoom()
+        },
         plugins: {
           legend: {
             display: false,

From f210a513fd0823d565f66aae2f62ba599191c26a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 22 Jun 2023 11:03:23 +0300
Subject: [PATCH 021/138] Disable grid for x axis

---
 web_src/js/components/RepoContributors.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 6bcef05d54f1b..e0a11430143dc 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -150,6 +150,9 @@ const sfc = {
         scales: {
           x: {
             type: "time",
+            grid: {
+              display: false,
+            },
             time: {
               // unit: 'year'
               minUnit: "day",

From 9af88ecc5a0dec155405f820cd143c5d04c04901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 22 Jun 2023 12:14:34 +0300
Subject: [PATCH 022/138] Refactor

---
 models/contributors/contributors_graph.go  |  38 ++--
 modules/git/repo_commit.go                 |   3 +-
 routers/api/v1/repo/commits.go             |   2 +-
 routers/web/repo/contributors.go           |  14 +-
 web_src/js/components/RepoContributors.vue | 222 +++++++++------------
 5 files changed, 119 insertions(+), 160 deletions(-)

diff --git a/models/contributors/contributors_graph.go b/models/contributors/contributors_graph.go
index a01eebb898cea..c15bd724179bc 100644
--- a/models/contributors/contributors_graph.go
+++ b/models/contributors/contributors_graph.go
@@ -1,14 +1,14 @@
 package contributors
 
 import (
+	"context"
+	"fmt"
+	"time"
+
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/json"
 	util "code.gitea.io/gitea/modules/util"
-	"context"
-	"fmt"
-	"time"
 )
 
 type WeekData struct {
@@ -20,12 +20,12 @@ type WeekData struct {
 
 // ContributorData represents statistical git commit count data
 type ContributorData struct {
-	Name       string      `json:"name"`
-	Login      string      `json:"login"`
-	AvatarLink string      `json:"avatar_link"`
-	HomeLink   string      `json:"home_link"`
-	Total      int64       `json:"total"`
-	Weeks      []*WeekData `json:"weeks"`
+	Name         string      `json:"name"`
+	Login        string      `json:"login"`
+	AvatarLink   string      `json:"avatar_link"`
+	HomeLink     string      `json:"home_link"`
+	TotalCommits int64       `json:"total_commits"`
+	Weeks        []*WeekData `json:"weeks"`
 }
 
 func CreateWeeks(sundays []int64) []*WeekData {
@@ -51,7 +51,7 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 	defer closer.Close()
 
 	default_branch, _ := gitRepo.GetDefaultBranch()
-	extended_commit_stats, err := gitRepo.ExtendedCommitStats(default_branch, 6000)
+	extended_commit_stats, err := gitRepo.ExtendedCommitStats(default_branch)
 	if err != nil {
 		return nil, fmt.Errorf("ExtendedCommitStats: %w", err)
 	}
@@ -66,11 +66,12 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 
 	unknownUserAvatarLink := user_model.NewGhostUser().AvatarLink(ctx)
 	contributors_commit_stats := make(map[string]*ContributorData)
-	contributors_commit_stats[""] = &ContributorData{
+	contributors_commit_stats["Total"] = &ContributorData{
 		Name:       "Total",
 		AvatarLink: unknownUserAvatarLink,
 		Weeks:      CreateWeeks(sundays),
 	}
+	total, _ := contributors_commit_stats["Total"]
 
 	for _, v := range extended_commit_stats {
 		if len(v.Author.Email) == 0 {
@@ -92,7 +93,6 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 					HomeLink:   u.HomeLink(),
 					Weeks:      CreateWeeks(sundays),
 				}
-
 			}
 		}
 		// Update user statistics
@@ -105,22 +105,14 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 		user.Weeks[idx].Additions += v.Stats.Additions
 		user.Weeks[idx].Deletions += v.Stats.Deletions
 		user.Weeks[idx].Commits++
-		user.Total++
+		user.TotalCommits++
 
 		// Update overall statistics
-		total, _ := contributors_commit_stats[""]
 		total.Weeks[idx].Additions += v.Stats.Additions
 		total.Weeks[idx].Deletions += v.Stats.Deletions
 		total.Weeks[idx].Commits++
-		total.Total++
+		total.TotalCommits++
 	}
 
-	fmt.Printf("users are: %s", prettyPrint(contributors_commit_stats))
-
 	return contributors_commit_stats, nil
 }
-
-func prettyPrint(i interface{}) string {
-	s, _ := json.MarshalIndent(i, "", "\t")
-	return string(s)
-}
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index 544b35fcccc21..bf42b4f798ae1 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -225,7 +225,7 @@ type CommitsByFileAndRangeOptions struct {
 }
 
 // ExtendedCommitStats return the list of *api.ExtendedCommitStats for the given revision
-func (repo *Repository) ExtendedCommitStats(revision string, limit int) ([]*api.ExtendedCommitStats, error) {
+func (repo *Repository) ExtendedCommitStats(revision string /*, limit int */) ([]*api.ExtendedCommitStats, error) {
 	var baseCommit *Commit
 	baseCommit, err := repo.GetCommit(revision)
 	stdoutReader, stdoutWriter, err := os.Pipe()
@@ -276,7 +276,6 @@ func (repo *Repository) ExtendedCommitStats(revision string, limit int) ([]*api.
 
 					if strings.HasPrefix(type_, "insertion") {
 						commit_stats.Additions = amount
-
 					} else {
 						commit_stats.Deletions = amount
 					}
diff --git a/routers/api/v1/repo/commits.go b/routers/api/v1/repo/commits.go
index acfa52d533aff..1d8a5ab9aad63 100644
--- a/routers/api/v1/repo/commits.go
+++ b/routers/api/v1/repo/commits.go
@@ -328,7 +328,7 @@ func GetAllCommitsStats(ctx *context.APIContext) {
 		sha = ctx.Repo.Repository.DefaultBranch
 	}
 
-	commits, err = ctx.Repo.GitRepo.ExtendedCommitStats(sha, 6000)
+	commits, err = ctx.Repo.GitRepo.ExtendedCommitStats(sha)
 
 	if err != nil {
 		ctx.Error(http.StatusInternalServerError, "ContributorsCommitStats", err)
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index 8e9baca983821..112272a945f84 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -15,7 +15,7 @@ const (
 
 // Contributors render the page to show repository contributors graph
 func Contributors(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("repo.activity")
+	ctx.Data["Title"] = ctx.Tr("repo.contributors")
 	ctx.Data["PageIsContributors"] = true
 
 	ctx.Data["ContributionType"] = ctx.Params("contribution_type")
@@ -30,13 +30,17 @@ func Contributors(ctx *context.Context) {
 		ctx.ServerError("GetContributorStats", err)
 		return
 	} else {
-		ctx.PageData["repoContributorsCommitStats"] = contributor_stats
+		total_stats, ok := contributor_stats["Total"]
+		if ok {
+			delete(contributor_stats, "Total")
+		}
+		ctx.PageData["repoTotalStats"] = total_stats
+		ctx.PageData["repoContributorsStats"] = contributor_stats
+
+		timeFrom := time.UnixMilli(total_stats.Weeks[0].Week)
 		timeUntil := time.Now()
-		timeFrom := time.UnixMilli(contributor_stats[""].Weeks[0].Week)
-
 		ctx.Data["DateFrom"] = timeFrom.UTC().Format(time.RFC3339)
 		ctx.Data["DateUntil"] = timeUntil.UTC().Format(time.RFC3339)
-		// contributor_stats[""].Weeks.(map[string]interface{})
 	}
 
 	ctx.HTML(http.StatusOK, tplContributors)
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index e0a11430143dc..9dc400ef638be 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
-    <Line :data="mainGraphData" :options="options" />
+    <Line :data="toGraphData(totalStats.weeks, 'main')" :options="getOptions('main')"/>
 
     <div class="ui attached segment two column grid">
       <div
-        v-for="(contributor, index) in individualGraphData"
+        v-for="(contributor, index) in contributorGraphData"
         :key="index"
         class="column stats-table"
       >
@@ -16,25 +16,21 @@
               width="40"
               :href="contributor.avatar_link"
               :src="contributor.avatar_link"
-            />
+            >
           </a>
           <div class="gt-ml-3">
-            <a :href="contributor.home_link"
-              ><h4>{{ contributor.name }}</h4></a
-            >
+            <a :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a>
             <p class="gt-font-12">
-              <strong>{{ contributor.total.toLocaleString() }} commits </strong>
-              <strong class="text green"
-                >{{ additions(contributor.weeks).toLocaleString() }}++
+              <strong>{{ contributor.total_commits.toLocaleString() }} commits </strong>
+              <strong class="text green">{{ additions(contributor.weeks).toLocaleString() }}++
               </strong>
               <strong class="text red">
-                {{ deletions(contributor.weeks).toLocaleString() }}--</strong
-              >
+                {{ deletions(contributor.weeks).toLocaleString() }}--</strong>
             </p>
           </div>
         </div>
         <div class="ui attached segment">
-          <Line :data="graph(contributor.weeks)" :options="options" />
+          <Line :data="toGraphData(contributor.weeks, 'contributor')" :options="getOptions('contributor')"/>
         </div>
       </div>
     </div>
@@ -42,9 +38,9 @@
 </template>
 
 <script>
-import { createApp } from "vue";
+import {createApp} from 'vue';
 import {
-  Chart as ChartJS,
+  Chart,
   Title,
   Tooltip,
   Legend,
@@ -55,12 +51,12 @@ import {
   PointElement,
   LineElement,
   Filler,
-} from "chart.js";
-import zoomPlugin from "chartjs-plugin-zoom";
-import { Bar, Line } from "vue-chartjs";
-import "chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm";
+} from 'chart.js';
+import zoomPlugin from 'chartjs-plugin-zoom';
+import {Line} from 'vue-chartjs';
+import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm';
 
-ChartJS.register(
+Chart.register(
   TimeScale,
   CategoryScale,
   LinearScale,
@@ -75,22 +71,81 @@ ChartJS.register(
 );
 
 const sfc = {
-  components: { Line },
+  components: {Line},
   data: () => ({
-    data: {},
-
-    masterChartData: window.config.pageData.repoContributorsCommitStats || [],
+    totalStats: window.config.pageData.repoTotalStats || [],
     type: window.config.pageData.contributionType,
-    individualChartsData:
-      window.config.pageData.repoContributorsCommitStats || [],
+    contributorsStats:
+      window.config.pageData.repoContributorsStats || [],
   }),
   computed: {
-    options() {
+    contributorGraphData() {
+      return Object.values(this.contributorsStats)
+        .sort((a, b) => (a.total_commits > b.total_commits ? -1 : a.total_commits === b.total_commits ? 0 : 1))
+        .slice(0, 100);
+    },
+  },
+  methods: {
+    maxMainGraph() {
+      const maxValue = Math.max(
+        ...this.totalStats.weeks.map((o) => o[this.type])
+      );
+      const [cooefficient, exp] = maxValue.toExponential().split('e').map(Number);
+      if (cooefficient % 1 === 0) {
+        return maxValue;
+      }
+      return (1 - (cooefficient % 1)) * 10 ** exp + maxValue;
+    },
+    additions(data) {
+      return Object.values(data).reduce((acc, item) => {
+        return acc + item.additions;
+      }, 0);
+    },
+    deletions(data) {
+      return Object.values(data).reduce((acc, item) => {
+        return acc + item.deletions;
+      }, 0);
+    },
+
+    toGraphData(data, type) {
+      return {
+        datasets: [
+          {
+            data: data.map((i) => {
+              return {x: i.week, y: i[this.type]};
+            }),
+            pointRadius: 0,
+            pointHitRadius: 0,
+            fill: 'start',
+            backgroundColor: type === 'main' ? 'rgba(137, 191, 154, 0.6)' : 'rgba(96, 153, 38, 0.7)',
+            borderWidth: 0,
+            tension: 0.3,
+          },
+        ],
+      };
+    },
+
+    updateOtherCharts(event) {
+      const minVal = event.chart.options.scales.x.min;
+      const maxVal = event.chart.options.scales.x.max;
+
+      for (const instance of Object.values(Chart.instances)) {
+        if (instance !== event.chart) {
+          instance.options.scales.x.min = minVal;
+          instance.options.scales.x.max = maxVal;
+          instance.update();
+        }
+      }
+    },
+
+    getOptions(type) {
       return {
         responsive: true,
         animation: false,
         onClick: (e) => {
-          e.chart.resetZoom()
+          if (type === 'main') {
+            e.chart.resetZoom();
+          }
         },
         plugins: {
           legend: {
@@ -99,63 +154,39 @@ const sfc = {
           zoom: {
             pan: {
               enabled: true,
-              mode: "x",
+              mode: 'x',
               threshold: 20,
 
-              onPan: function (event) {
-                var minVal = event.chart.options.scales.x.min;
-                var maxVal = event.chart.options.scales.x.max;
-
-                Object.values(ChartJS.instances).forEach(function (instance) {
-                  if (instance !== event.chart){
-                    instance.options.scales.x.min = minVal;
-                    instance.options.scales.x.max = maxVal;
-                    instance.update();
-                  }
-                });
-              },
+              onPan: this.updateOtherCharts
             },
             limits: {
               x: {
-                min: "original",
-                max: "original",
+                min: 'original',
+                max: 'original',
                 minRange: 1000000000,
               },
             },
             zoom: {
               wheel: {
-                enabled: true,
+                enabled: type === 'main',
               },
               pinch: {
-                enabled: true,
-              },
-              mode: "x",
-
-              onZoomComplete: function (event) {
-                var minVal = event.chart.options.scales.x.min;
-                var maxVal = event.chart.options.scales.x.max;
-
-                Object.values(ChartJS.instances).forEach(function (instance) {
-                  if (instance !== event.chart){
-                    instance.options.scales.x.min = minVal;
-                    instance.options.scales.x.max = maxVal;
-                    instance.update();
-                  }
-                });
+                enabled: type === 'main',
               },
+              mode: 'x',
 
+              onZoomComplete: this.updateOtherCharts
             },
           },
         },
         scales: {
           x: {
-            type: "time",
+            type: 'time',
             grid: {
               display: false,
             },
             time: {
-              // unit: 'year'
-              minUnit: "day",
+              minUnit: 'day',
             },
           },
           y: {
@@ -165,78 +196,11 @@ const sfc = {
         },
       };
     },
-    mainGraphData() {
-      return {
-        datasets: [
-          {
-            data: this.masterChartData[""].weeks.map((i) => {
-              return { x: i.week, y: i[this.type] };
-            }),
-            pointRadius: 0,
-            pointHitRadius: 0,
-            fill: "start",
-            borderColor: "rgb(75, 192, 192)",
-            borderWidth: 0,
-            backgroundColor: "rgba(137, 191, 154, 0.6)",
-            tension: 0.3,
-          },
-        ],
-      };
-    },
-    individualGraphData() {
-      let { "": _, ...rest } = this.individualChartsData;
-      console.log(rest);
-      const data = Object.values(rest)
-        .sort((a, b) => (a.total > b.total ? -1 : a.total == b.total ? 0 : 1))
-        .slice(0, 100);
-      console.log(data);
-      return data;
-    },
-  },
-  methods: {
-    maxMainGraph() {
-      const maxValue = Math.max(
-        ...this.masterChartData[""].weeks.map((o) => o[this.type])
-      );
-      const [cooefficient, exp] = maxValue.toExponential().split("e");
-      if (Number(cooefficient) % 1 == 0) {
-        return maxValue;
-      }
-      return (1 - (Number(cooefficient) % 1)) * 10 ** Number(exp) + maxValue;
-    },
-    additions(data) {
-      return Object.values(data).reduce((acc, item) => {
-        return acc + item.additions;
-      }, 0);
-    },
-    deletions(data) {
-      return Object.values(data).reduce((acc, item) => {
-        return acc + item.deletions;
-      }, 0);
-    },
-    graph(data) {
-      return {
-        datasets: [
-          {
-            data: data.map((i) => {
-              return { x: i.week, y: i[this.type] };
-            }),
-            pointRadius: 0,
-            pointHitRadius: 0,
-            fill: "start",
-            borderColor: "rgb(75, 192, 192)",
-            backgroundColor: "rgba(96, 153, 38, 0.7)",
-            borderWidth: 0,
-            tension: 0.3,
-          },
-        ],
-      };
-    },
   },
 };
 
 export function initRepoContributorsChart() {
-  const el = document.getElementById("repo-contributors-chart");
+  const el = document.getElementById('repo-contributors-chart');
   if (el) {
     createApp(sfc).mount(el);
   }

From 4399890c573f81a87c7a52d6315c70cc5298d32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 22 Jun 2023 12:57:54 +0300
Subject: [PATCH 023/138] Remove unused api endpoint

---
 routers/api/v1/api.go          |  1 -
 routers/api/v1/repo/commits.go | 59 ----------------------------------
 2 files changed, 60 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index c1b4e53e3c38d..be66cc5240812 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -1091,7 +1091,6 @@ func Routes() *web.Route {
 				}, reqRepoReader(unit.TypeCode))
 				m.Group("/commits", func() {
 					m.Get("", context.ReferencesGitRepo(), repo.GetAllCommits)
-					m.Get("/stats", context.ReferencesGitRepo(), repo.GetAllCommitsStats)
 					m.Group("/{ref}", func() {
 						m.Get("/status", repo.GetCombinedCommitStatusByRef)
 						m.Get("/statuses", repo.GetCommitStatusesByRef)
diff --git a/routers/api/v1/repo/commits.go b/routers/api/v1/repo/commits.go
index 1d8a5ab9aad63..20d4405d6d4f6 100644
--- a/routers/api/v1/repo/commits.go
+++ b/routers/api/v1/repo/commits.go
@@ -279,65 +279,6 @@ func GetAllCommits(ctx *context.APIContext) {
 	ctx.JSON(http.StatusOK, &apiCommits)
 }
 
-// GetAllCommitsStats get all commits via
-func GetAllCommitsStats(ctx *context.APIContext) {
-	// swagger:operation GET /repos/{owner}/{repo}/commits/stats repository repoGetAllCommitsStats
-	// ---
-	// summary: Get a list of all commits stats from a repository
-	// produces:
-	// - application/json
-	// parameters:
-	// - name: owner
-	//   in: path
-	//   description: owner of the repo
-	//   type: string
-	//   required: true
-	// - name: repo
-	//   in: path
-	//   description: name of the repo
-	//   type: string
-	//   required: true
-	// - name: sha
-	//   in: query
-	//   description: SHA or branch to start listing commits from (usually 'master')
-	//   type: string
-	// responses:
-	//   "200":
-	//     "$ref": "#/responses/CommitList"
-	//   "404":
-	//     "$ref": "#/responses/notFound"
-	//   "409":
-	//     "$ref": "#/responses/EmptyRepository"
-
-	if ctx.Repo.Repository.IsEmpty {
-		ctx.JSON(http.StatusConflict, api.APIError{
-			Message: "Git Repository is empty.",
-			URL:     setting.API.SwaggerURL,
-		})
-		return
-	}
-
-	sha := ctx.FormString("sha")
-
-	var (
-		commits []*api.ExtendedCommitStats
-		err     error
-	)
-
-	if len(sha) == 0 {
-		sha = ctx.Repo.Repository.DefaultBranch
-	}
-
-	commits, err = ctx.Repo.GitRepo.ExtendedCommitStats(sha)
-
-	if err != nil {
-		ctx.Error(http.StatusInternalServerError, "ContributorsCommitStats", err)
-		return
-	}
-
-	ctx.JSON(http.StatusOK, &commits)
-}
-
 // DownloadCommitDiffOrPatch render a commit's raw diff or patch
 func DownloadCommitDiffOrPatch(ctx *context.APIContext) {
 	// swagger:operation GET /repos/{owner}/{repo}/git/commits/{sha}.{diffType} repository repoDownloadCommitDiffOrPatch

From a4b6666ebb292fe00d9646e18888cff94ca11463 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 22 Jun 2023 16:32:27 +0300
Subject: [PATCH 024/138] Use a better name for variable

---
 web_src/js/components/RepoContributors.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 9dc400ef638be..548fff7a4ab40 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -4,7 +4,7 @@
 
     <div class="ui attached segment two column grid">
       <div
-        v-for="(contributor, index) in contributorGraphData"
+        v-for="(contributor, index) in sortedContributors"
         :key="index"
         class="column stats-table"
       >
@@ -79,7 +79,7 @@ const sfc = {
       window.config.pageData.repoContributorsStats || [],
   }),
   computed: {
-    contributorGraphData() {
+    sortedContributors() {
       return Object.values(this.contributorsStats)
         .sort((a, b) => (a.total_commits > b.total_commits ? -1 : a.total_commits === b.total_commits ? 0 : 1))
         .slice(0, 100);

From c75b7a55f18c16bd78a1133faee511ee3d508d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 22 Jun 2023 19:08:44 +0300
Subject: [PATCH 025/138] Implement new endpoint for fetching contributors data

---
 models/contributors/contributors_graph.go | 43 +++++++-----------
 modules/structs/repo_collaborator.go      | 17 ++++++++
 routers/api/v1/api.go                     |  1 +
 routers/api/v1/repo/collaborators.go      | 53 +++++++++++++++++++++++
 routers/api/v1/swagger/repo.go            |  5 +++
 routers/web/repo/contributors.go          |  2 +-
 templates/swagger/v1_json.tmpl            | 47 +++++++++++++++++++-
 7 files changed, 138 insertions(+), 30 deletions(-)

diff --git a/models/contributors/contributors_graph.go b/models/contributors/contributors_graph.go
index c15bd724179bc..c12fc8d1a9d23 100644
--- a/models/contributors/contributors_graph.go
+++ b/models/contributors/contributors_graph.go
@@ -8,30 +8,15 @@ import (
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/git"
+	api "code.gitea.io/gitea/modules/structs"
 	util "code.gitea.io/gitea/modules/util"
 )
 
-type WeekData struct {
-	Week      int64 `json:"week"`
-	Additions int   `json:"additions"`
-	Deletions int   `json:"deletions"`
-	Commits   int   `json:"commits"`
-}
-
-// ContributorData represents statistical git commit count data
-type ContributorData struct {
-	Name         string      `json:"name"`
-	Login        string      `json:"login"`
-	AvatarLink   string      `json:"avatar_link"`
-	HomeLink     string      `json:"home_link"`
-	TotalCommits int64       `json:"total_commits"`
-	Weeks        []*WeekData `json:"weeks"`
-}
-
-func CreateWeeks(sundays []int64) []*WeekData {
-	var weeks []*WeekData
+// CreateWeeks converts list of sundays to list of *api.WeekData
+func CreateWeeks(sundays []int64) []*api.WeekData {
+	var weeks []*api.WeekData
 	for _, week := range sundays {
-		weeks = append(weeks, &WeekData{
+		weeks = append(weeks, &api.WeekData{
 			Week:      week,
 			Additions: 0,
 			Deletions: 0,
@@ -42,16 +27,18 @@ func CreateWeeks(sundays []int64) []*WeekData {
 	return weeks
 }
 
-// GetContributorStats returns contributors stats for git commits
-func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[string]*ContributorData, error) {
+// GetContributorStats returns contributors stats for git commits for given revision or default branch
+func GetContributorStats(ctx context.Context, repo *repo_model.Repository, revision string) (map[string]*api.ContributorData, error) {
 	gitRepo, closer, err := git.RepositoryFromContextOrOpen(ctx, repo.RepoPath())
 	if err != nil {
 		return nil, fmt.Errorf("OpenRepository: %w", err)
 	}
 	defer closer.Close()
 
-	default_branch, _ := gitRepo.GetDefaultBranch()
-	extended_commit_stats, err := gitRepo.ExtendedCommitStats(default_branch)
+	if len(revision) == 0 {
+		revision = repo.DefaultBranch
+	}
+	extended_commit_stats, err := gitRepo.ExtendedCommitStats(revision)
 	if err != nil {
 		return nil, fmt.Errorf("ExtendedCommitStats: %w", err)
 	}
@@ -65,8 +52,8 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 	sundays, _ := util.ListSundaysBetween(starting_sunday, ending_sunday)
 
 	unknownUserAvatarLink := user_model.NewGhostUser().AvatarLink(ctx)
-	contributors_commit_stats := make(map[string]*ContributorData)
-	contributors_commit_stats["Total"] = &ContributorData{
+	contributors_commit_stats := make(map[string]*api.ContributorData)
+	contributors_commit_stats["Total"] = &api.ContributorData{
 		Name:       "Total",
 		AvatarLink: unknownUserAvatarLink,
 		Weeks:      CreateWeeks(sundays),
@@ -80,13 +67,13 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository) (map[
 		if _, ok := contributors_commit_stats[v.Author.Email]; !ok {
 			u, err := user_model.GetUserByEmail(ctx, v.Author.Email)
 			if u == nil || user_model.IsErrUserNotExist(err) {
-				contributors_commit_stats[v.Author.Email] = &ContributorData{
+				contributors_commit_stats[v.Author.Email] = &api.ContributorData{
 					Name:       v.Author.Name,
 					AvatarLink: unknownUserAvatarLink,
 					Weeks:      CreateWeeks(sundays),
 				}
 			} else {
-				contributors_commit_stats[v.Author.Email] = &ContributorData{
+				contributors_commit_stats[v.Author.Email] = &api.ContributorData{
 					Name:       u.DisplayName(),
 					Login:      u.LowerName,
 					AvatarLink: u.AvatarLink(ctx),
diff --git a/modules/structs/repo_collaborator.go b/modules/structs/repo_collaborator.go
index 946a6ec7e78e0..7c7134e370b7b 100644
--- a/modules/structs/repo_collaborator.go
+++ b/modules/structs/repo_collaborator.go
@@ -14,3 +14,20 @@ type RepoCollaboratorPermission struct {
 	RoleName   string `json:"role_name"`
 	User       *User  `json:"user"`
 }
+
+type WeekData struct {
+	Week      int64 `json:"week"`
+	Additions int   `json:"additions"`
+	Deletions int   `json:"deletions"`
+	Commits   int   `json:"commits"`
+}
+
+// ContributorData represents statistical git commit count data
+type ContributorData struct {
+	Name         string      `json:"name"`
+	Login        string      `json:"login"`
+	AvatarLink   string      `json:"avatar_link"`
+	HomeLink     string      `json:"home_link"`
+	TotalCommits int64       `json:"total_commits"`
+	Weeks        []*WeekData `json:"weeks"`
+}
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index be66cc5240812..8ccf2b76ed342 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -1096,6 +1096,7 @@ func Routes() *web.Route {
 						m.Get("/statuses", repo.GetCommitStatusesByRef)
 					}, context.ReferencesGitRepo())
 				}, reqRepoReader(unit.TypeCode))
+				m.Get("/contributors", context.ReferencesGitRepo(), reqRepoReader(unit.TypeCode), repo.GetAllContributorsStats)
 				m.Group("/git", func() {
 					m.Group("/commits", func() {
 						m.Get("/{sha}", repo.GetSingleCommit)
diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index 942d4c799fbd3..654c9ab942d9c 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -9,12 +9,14 @@ import (
 	"net/http"
 
 	"code.gitea.io/gitea/models"
+	contributors_model "code.gitea.io/gitea/models/contributors"
 	"code.gitea.io/gitea/models/perm"
 	access_model "code.gitea.io/gitea/models/perm/access"
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/context"
 	repo_module "code.gitea.io/gitea/modules/repository"
+	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/web"
 	"code.gitea.io/gitea/routers/api/v1/utils"
@@ -349,3 +351,54 @@ func GetAssignees(ctx *context.APIContext) {
 	}
 	ctx.JSON(http.StatusOK, convert.ToUsers(ctx, ctx.Doer, assignees))
 }
+
+// GetAllContributorsStats retrieves a map of contributors along with their weekly commit statistics
+func GetAllContributorsStats(ctx *context.APIContext) {
+	// swagger:operation GET /repos/{owner}/{repo}/contributors repository repoGetAllContributorsStats
+	// ---
+	// summary: Get a map of all contributors along with their weekly commit statistics from a repository
+	// produces:
+	// - application/json
+	// parameters:
+	// - name: owner
+	//   in: path
+	//   description: owner of the repo
+	//   type: string
+	//   required: true
+	// - name: repo
+	//   in: path
+	//   description: name of the repo
+	//   type: string
+	//   required: true
+	// - name: sha
+	//   in: query
+	//   description: SHA or branch to start listing commits from (usually 'master')
+	//   type: string
+	// responses:
+	//   "200":
+	//     "$ref": "#/responses/ContributorDataMap"
+	//   "404":
+	//     "$ref": "#/responses/notFound"
+	//   "409":
+	//     "$ref": "#/responses/EmptyRepository"
+
+	if ctx.Repo.Repository.IsEmpty {
+		ctx.JSON(http.StatusConflict, api.APIError{
+			Message: "Git Repository is empty.",
+			URL:     setting.API.SwaggerURL,
+		})
+		return
+	}
+
+	sha := ctx.FormString("sha")
+
+	if len(sha) == 0 {
+		sha = ctx.Repo.Repository.DefaultBranch
+	}
+
+	if contributor_stats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository, sha); err != nil {
+		ctx.Error(http.StatusInternalServerError, "GetContributorStats", err)
+	} else {
+		ctx.JSON(http.StatusOK, &contributor_stats)
+	}
+}
diff --git a/routers/api/v1/swagger/repo.go b/routers/api/v1/swagger/repo.go
index 3e23aa4d5a5ac..bbb5b871d8693 100644
--- a/routers/api/v1/swagger/repo.go
+++ b/routers/api/v1/swagger/repo.go
@@ -253,6 +253,11 @@ type swaggerCommitList struct {
 	Body []api.Commit `json:"body"`
 }
 
+type swaggerContributorDataMap struct {
+	// in: body
+	Body map[string]*api.ContributorData `json:"body"`
+}
+
 // ChangedFileList
 // swagger:response ChangedFileList
 type swaggerChangedFileList struct {
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index 112272a945f84..752c3042de5de 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -26,7 +26,7 @@ func Contributors(ctx *context.Context) {
 
 	ctx.Data["ContributionTypeText"] = ctx.Tr("repo.contributors.contribution_type." + ctx.Data["ContributionType"].(string))
 
-	if contributor_stats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository); err != nil {
+	if contributor_stats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository, ""); err != nil {
 		ctx.ServerError("GetContributorStats", err)
 		return
 	} else {
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index e78c077fc3b32..eca0be26b4335 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -4339,6 +4339,51 @@
         }
       }
     },
+    "/repos/{owner}/{repo}/contributors": {
+      "get": {
+        "produces": [
+          "application/json"
+        ],
+        "tags": [
+          "repository"
+        ],
+        "summary": "Get a map of all contributors along with their weekly commit statistics from a repository",
+        "operationId": "repoGetAllContributorsStats",
+        "parameters": [
+          {
+            "type": "string",
+            "description": "owner of the repo",
+            "name": "owner",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "name of the repo",
+            "name": "repo",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "description": "SHA or branch to start listing commits from (usually 'master')",
+            "name": "sha",
+            "in": "query"
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/ContributorDataMap"
+          },
+          "404": {
+            "$ref": "#/responses/notFound"
+          },
+          "409": {
+            "$ref": "#/responses/EmptyRepository"
+          }
+        }
+      }
+    },
     "/repos/{owner}/{repo}/diffpatch": {
       "post": {
         "consumes": [
@@ -22923,4 +22968,4 @@
       "TOTPHeader": []
     }
   ]
-}
+}
\ No newline at end of file

From e29efb2667df3fd3a5acc82e8d06591d215e4fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 22 Jun 2023 20:26:52 +0300
Subject: [PATCH 026/138] Use new endpoint for fetching contributors data

---
 routers/web/repo/contributors.go           | 19 +-----
 web_src/js/components/RepoContributors.vue | 67 +++++++++++++++++-----
 2 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index 752c3042de5de..e7cbcc23c5ffa 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -2,9 +2,7 @@ package repo
 
 import (
 	"net/http"
-	"time"
 
-	contributors_model "code.gitea.io/gitea/models/contributors"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
 )
@@ -26,22 +24,7 @@ func Contributors(ctx *context.Context) {
 
 	ctx.Data["ContributionTypeText"] = ctx.Tr("repo.contributors.contribution_type." + ctx.Data["ContributionType"].(string))
 
-	if contributor_stats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository, ""); err != nil {
-		ctx.ServerError("GetContributorStats", err)
-		return
-	} else {
-		total_stats, ok := contributor_stats["Total"]
-		if ok {
-			delete(contributor_stats, "Total")
-		}
-		ctx.PageData["repoTotalStats"] = total_stats
-		ctx.PageData["repoContributorsStats"] = contributor_stats
-
-		timeFrom := time.UnixMilli(total_stats.Weeks[0].Week)
-		timeUntil := time.Now()
-		ctx.Data["DateFrom"] = timeFrom.UTC().Format(time.RFC3339)
-		ctx.Data["DateUntil"] = timeUntil.UTC().Format(time.RFC3339)
-	}
+	ctx.PageData["repoLink"] = ctx.Repo.RepoLink
 
 	ctx.HTML(http.StatusOK, tplContributors)
 }
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 548fff7a4ab40..2fd68b7b0ecd6 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -1,6 +1,10 @@
 <template>
   <div>
-    <Line :data="toGraphData(totalStats.weeks, 'main')" :options="getOptions('main')"/>
+    <Line
+      v-if="Object.keys(totalStats).length !== 0"
+      :data="toGraphData(totalStats.weeks, 'main')"
+      :options="getOptions('main')"
+    />
 
     <div class="ui attached segment two column grid">
       <div
@@ -21,7 +25,8 @@
           <div class="gt-ml-3">
             <a :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a>
             <p class="gt-font-12">
-              <strong>{{ contributor.total_commits.toLocaleString() }} commits </strong>
+              <strong>{{ contributor.total_commits.toLocaleString() }} commits
+              </strong>
               <strong class="text green">{{ additions(contributor.weeks).toLocaleString() }}++
               </strong>
               <strong class="text red">
@@ -30,7 +35,10 @@
           </div>
         </div>
         <div class="ui attached segment">
-          <Line :data="toGraphData(contributor.weeks, 'contributor')" :options="getOptions('contributor')"/>
+          <Line
+            :data="toGraphData(contributor.weeks, 'contributor')"
+            :options="getOptions('contributor')"
+          />
         </div>
       </div>
     </div>
@@ -56,6 +64,8 @@ import zoomPlugin from 'chartjs-plugin-zoom';
 import {Line} from 'vue-chartjs';
 import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm';
 
+const {pageData} = window.config;
+
 Chart.register(
   TimeScale,
   CategoryScale,
@@ -72,25 +82,51 @@ Chart.register(
 
 const sfc = {
   components: {Line},
-  data: () => ({
-    totalStats: window.config.pageData.repoTotalStats || [],
-    type: window.config.pageData.contributionType,
-    contributorsStats:
-      window.config.pageData.repoContributorsStats || [],
-  }),
+  data: () => {
+    return {
+      isLoading: false,
+      totalStats: {},
+      repoLink: pageData.repoLink || [],
+      type: pageData.contributionType,
+      contributorsStats: [],
+    };
+  },
+  mounted() {
+    this.fetchGraphData();
+  },
   computed: {
     sortedContributors() {
       return Object.values(this.contributorsStats)
-        .sort((a, b) => (a.total_commits > b.total_commits ? -1 : a.total_commits === b.total_commits ? 0 : 1))
+        .sort((a, b) =>
+          a.total_commits > b.total_commits ?
+            -1 :
+            a.total_commits === b.total_commits ?
+              0 :
+              1
+        )
         .slice(0, 100);
     },
   },
   methods: {
+    async fetchGraphData() {
+      this.isLoading = true;
+      fetch(`/api/v1/repos/${this.repoLink}/contributors`)
+        .then((response) => response.json())
+        .then((data) => {
+          const {Total, ...rest} = data;
+          this.contributorsStats = rest;
+          this.totalStats = Total;
+          this.isLoading = false;
+        });
+    },
     maxMainGraph() {
       const maxValue = Math.max(
         ...this.totalStats.weeks.map((o) => o[this.type])
       );
-      const [cooefficient, exp] = maxValue.toExponential().split('e').map(Number);
+      const [cooefficient, exp] = maxValue
+        .toExponential()
+        .split('e')
+        .map(Number);
       if (cooefficient % 1 === 0) {
         return maxValue;
       }
@@ -117,7 +153,10 @@ const sfc = {
             pointRadius: 0,
             pointHitRadius: 0,
             fill: 'start',
-            backgroundColor: type === 'main' ? 'rgba(137, 191, 154, 0.6)' : 'rgba(96, 153, 38, 0.7)',
+            backgroundColor:
+              type === 'main' ?
+                'rgba(137, 191, 154, 0.6)' :
+                'rgba(96, 153, 38, 0.7)',
             borderWidth: 0,
             tension: 0.3,
           },
@@ -157,7 +196,7 @@ const sfc = {
               mode: 'x',
               threshold: 20,
 
-              onPan: this.updateOtherCharts
+              onPan: this.updateOtherCharts,
             },
             limits: {
               x: {
@@ -175,7 +214,7 @@ const sfc = {
               },
               mode: 'x',
 
-              onZoomComplete: this.updateOtherCharts
+              onZoomComplete: this.updateOtherCharts,
             },
           },
         },

From b516a67459af7d3147928d61ab39954b7f2aef22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 22 Jun 2023 21:20:56 +0300
Subject: [PATCH 027/138] Introduce a new endpoint for fetching data in
 frontend

---
 routers/web/repo/contributors.go           | 10 ++++++++++
 routers/web/web.go                         |  1 +
 web_src/js/components/RepoContributors.vue |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index e7cbcc23c5ffa..364acee061755 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -3,6 +3,7 @@ package repo
 import (
 	"net/http"
 
+	contributors_model "code.gitea.io/gitea/models/contributors"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
 )
@@ -28,3 +29,12 @@ func Contributors(ctx *context.Context) {
 
 	ctx.HTML(http.StatusOK, tplContributors)
 }
+
+// ContributorsData renders JSON of contributors along with their weekly commit statistics
+func ContributorsData(ctx *context.Context) {
+	if contributor_stats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository, ""); err != nil {
+		ctx.ServerError("GetContributorStats", err)
+	} else {
+		ctx.JSON(http.StatusOK, contributor_stats)
+	}
+}
diff --git a/routers/web/web.go b/routers/web/web.go
index 374e08232554d..63c7c71add7a3 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1247,6 +1247,7 @@ func registerRoutes(m *web.Route) {
 		m.Group("/contributors", func() {
 			m.Get("", repo.Contributors)
 			m.Get("/{contribution_type}", repo.Contributors)
+			m.Get("/data", repo.ContributorsData)
 		}, context.RepoRef(), repo.MustBeNotEmpty, context.RequireRepoReaderOr(unit.TypePullRequests, unit.TypeIssues, unit.TypeReleases))
 
 		m.Group("/archive", func() {
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 2fd68b7b0ecd6..d3f30ac690a82 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -110,7 +110,7 @@ const sfc = {
   methods: {
     async fetchGraphData() {
       this.isLoading = true;
-      fetch(`/api/v1/repos/${this.repoLink}/contributors`)
+      fetch(`${this.repoLink}/contributors/data`)
         .then((response) => response.json())
         .then((data) => {
           const {Total, ...rest} = data;

From 4ee972c59472c4db34b0a15485cbe432945a302f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 23 Jun 2023 08:31:53 +0300
Subject: [PATCH 028/138] Apply suggestions from code review

Co-authored-by: silverwind <me@silverwind.io>
---
 web_src/js/components/RepoContributors.vue | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index d3f30ac690a82..36d100b55ba4f 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -96,15 +96,9 @@ const sfc = {
   },
   computed: {
     sortedContributors() {
-      return Object.values(this.contributorsStats)
-        .sort((a, b) =>
-          a.total_commits > b.total_commits ?
-            -1 :
-            a.total_commits === b.total_commits ?
-              0 :
-              1
-        )
-        .slice(0, 100);
+      return Object.values(this.contributorsStats).sort((a, b) =>
+        a.total_commits > b.total_commits ? -1 : a.total_commits === b.total_commits ? 0 : 1
+      ).slice(0, 100);
     },
   },
   methods: {
@@ -133,14 +127,10 @@ const sfc = {
       return (1 - (cooefficient % 1)) * 10 ** exp + maxValue;
     },
     additions(data) {
-      return Object.values(data).reduce((acc, item) => {
-        return acc + item.additions;
-      }, 0);
+      return Object.values(data).reduce((acc, item) => acc + item.additions, 0);
     },
     deletions(data) {
-      return Object.values(data).reduce((acc, item) => {
-        return acc + item.deletions;
-      }, 0);
+      return Object.values(data).reduce((acc, item) => acc + item.deletions, 0);
     },
 
     toGraphData(data, type) {
@@ -213,7 +203,6 @@ const sfc = {
                 enabled: type === 'main',
               },
               mode: 'x',
-
               onZoomComplete: this.updateOtherCharts,
             },
           },

From 90e3d5008beb63fd560894550e1d5b7612fa7080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 23 Jun 2023 08:37:22 +0300
Subject: [PATCH 029/138] Do not use hard-coded colors

---
 web_src/js/components/RepoContributors.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 36d100b55ba4f..7ef9cc5334a84 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -134,6 +134,9 @@ const sfc = {
     },
 
     toGraphData(data, type) {
+      var style = getComputedStyle(document.body);
+      const colorName = this.type === "commits" ? '--color-primary-alpha-60' : (this.type === "additions" ? '--color-green-badge-hover-bg' : '--color-red-badge-hover-bg')
+      var color = style.getPropertyValue(colorName);
       return {
         datasets: [
           {
@@ -143,10 +146,7 @@ const sfc = {
             pointRadius: 0,
             pointHitRadius: 0,
             fill: 'start',
-            backgroundColor:
-              type === 'main' ?
-                'rgba(137, 191, 154, 0.6)' :
-                'rgba(96, 153, 38, 0.7)',
+            backgroundColor: color,
             borderWidth: 0,
             tension: 0.3,
           },

From 0dfd908a1adf629c138d3e7014eb0b709eec4a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sat, 24 Jun 2023 09:52:24 +0300
Subject: [PATCH 030/138] Make object key snake_case

---
 models/contributors/contributors_graph.go  | 4 ++--
 web_src/js/components/RepoContributors.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/models/contributors/contributors_graph.go b/models/contributors/contributors_graph.go
index c12fc8d1a9d23..e2fd1b3f0df54 100644
--- a/models/contributors/contributors_graph.go
+++ b/models/contributors/contributors_graph.go
@@ -53,12 +53,12 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository, revis
 
 	unknownUserAvatarLink := user_model.NewGhostUser().AvatarLink(ctx)
 	contributors_commit_stats := make(map[string]*api.ContributorData)
-	contributors_commit_stats["Total"] = &api.ContributorData{
+	contributors_commit_stats["total"] = &api.ContributorData{
 		Name:       "Total",
 		AvatarLink: unknownUserAvatarLink,
 		Weeks:      CreateWeeks(sundays),
 	}
-	total, _ := contributors_commit_stats["Total"]
+	total, _ := contributors_commit_stats["total"]
 
 	for _, v := range extended_commit_stats {
 		if len(v.Author.Email) == 0 {
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 7ef9cc5334a84..92ddbcc2b0e3e 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -107,9 +107,9 @@ const sfc = {
       fetch(`${this.repoLink}/contributors/data`)
         .then((response) => response.json())
         .then((data) => {
-          const {Total, ...rest} = data;
+          const {total, ...rest} = data;
           this.contributorsStats = rest;
-          this.totalStats = Total;
+          this.totalStats = total;
           this.isLoading = false;
         });
     },

From 2c174d6c6ffb7cc49e1c7a80d773493fa90f21ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sat, 24 Jun 2023 11:26:59 +0300
Subject: [PATCH 031/138] Add copyright header

---
 models/contributors/contributors_graph.go | 3 +++
 modules/util/dates.go                     | 3 +++
 routers/web/repo/contributors.go          | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/models/contributors/contributors_graph.go b/models/contributors/contributors_graph.go
index e2fd1b3f0df54..905b63a856a30 100644
--- a/models/contributors/contributors_graph.go
+++ b/models/contributors/contributors_graph.go
@@ -1,3 +1,6 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package contributors
 
 import (
diff --git a/modules/util/dates.go b/modules/util/dates.go
index 9f8ccb58c2406..4d4d4166649c8 100644
--- a/modules/util/dates.go
+++ b/modules/util/dates.go
@@ -1,3 +1,6 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package util
 
 import (
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index 364acee061755..a8ccf231e8480 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -1,3 +1,6 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
 package repo
 
 import (

From 730368e81c40b1691c74db3e24463805d5ea3131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sat, 24 Jun 2023 11:59:51 +0300
Subject: [PATCH 032/138] Fix linting errors

---
 models/contributors/contributors_graph.go  | 36 +++++------
 modules/git/repo_commit.go                 | 36 +++++------
 modules/util/dates.go                      |  8 +--
 routers/api/v1/repo/collaborators.go       |  4 +-
 routers/api/v1/swagger/repo.go             |  2 +
 routers/web/repo/contributors.go           |  4 +-
 templates/swagger/v1_json.tmpl             | 73 +++++++++++++++++++++-
 web_src/js/components/RepoContributors.vue | 12 ++--
 8 files changed, 124 insertions(+), 51 deletions(-)

diff --git a/models/contributors/contributors_graph.go b/models/contributors/contributors_graph.go
index 905b63a856a30..2bfaa2e27a43b 100644
--- a/models/contributors/contributors_graph.go
+++ b/models/contributors/contributors_graph.go
@@ -41,42 +41,42 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository, revis
 	if len(revision) == 0 {
 		revision = repo.DefaultBranch
 	}
-	extended_commit_stats, err := gitRepo.ExtendedCommitStats(revision)
+	extendedCommitStats, err := gitRepo.ExtendedCommitStats(revision)
 	if err != nil {
 		return nil, fmt.Errorf("ExtendedCommitStats: %w", err)
 	}
 
 	layout := "2006-01-02"
-	initial_commit_date := extended_commit_stats[0].Author.Date
+	initialCommitDate := extendedCommitStats[0].Author.Date
 
-	starting_sunday, _ := util.FindLastSundayBeforeDate(initial_commit_date)
-	ending_sunday, _ := util.FindFirstSundayAfterDate(time.Now().Format(layout))
+	startingSunday, _ := util.FindLastSundayBeforeDate(initialCommitDate)
+	endingSunday, _ := util.FindFirstSundayAfterDate(time.Now().Format(layout))
 
-	sundays, _ := util.ListSundaysBetween(starting_sunday, ending_sunday)
+	sundays, _ := util.ListSundaysBetween(startingSunday, endingSunday)
 
 	unknownUserAvatarLink := user_model.NewGhostUser().AvatarLink(ctx)
-	contributors_commit_stats := make(map[string]*api.ContributorData)
-	contributors_commit_stats["total"] = &api.ContributorData{
+	contributorsCommitStats := make(map[string]*api.ContributorData)
+	contributorsCommitStats["total"] = &api.ContributorData{
 		Name:       "Total",
 		AvatarLink: unknownUserAvatarLink,
 		Weeks:      CreateWeeks(sundays),
 	}
-	total, _ := contributors_commit_stats["total"]
+	total := contributorsCommitStats["total"]
 
-	for _, v := range extended_commit_stats {
+	for _, v := range extendedCommitStats {
 		if len(v.Author.Email) == 0 {
 			continue
 		}
-		if _, ok := contributors_commit_stats[v.Author.Email]; !ok {
+		if _, ok := contributorsCommitStats[v.Author.Email]; !ok {
 			u, err := user_model.GetUserByEmail(ctx, v.Author.Email)
 			if u == nil || user_model.IsErrUserNotExist(err) {
-				contributors_commit_stats[v.Author.Email] = &api.ContributorData{
+				contributorsCommitStats[v.Author.Email] = &api.ContributorData{
 					Name:       v.Author.Name,
 					AvatarLink: unknownUserAvatarLink,
 					Weeks:      CreateWeeks(sundays),
 				}
 			} else {
-				contributors_commit_stats[v.Author.Email] = &api.ContributorData{
+				contributorsCommitStats[v.Author.Email] = &api.ContributorData{
 					Name:       u.DisplayName(),
 					Login:      u.LowerName,
 					AvatarLink: u.AvatarLink(ctx),
@@ -86,12 +86,12 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository, revis
 			}
 		}
 		// Update user statistics
-		user, _ := contributors_commit_stats[v.Author.Email]
-		starting_of_week, _ := util.FindLastSundayBeforeDate(v.Author.Date)
+		user := contributorsCommitStats[v.Author.Email]
+		startingOfWeek, _ := util.FindLastSundayBeforeDate(v.Author.Date)
 
-		val, _ := time.Parse(layout, starting_of_week)
-		starting_sunday_p, _ := time.Parse(layout, starting_sunday)
-		idx := int(val.Sub(starting_sunday_p).Hours()/24) / 7
+		val, _ := time.Parse(layout, startingOfWeek)
+		startingSundayParsed, _ := time.Parse(layout, startingSunday)
+		idx := int(val.Sub(startingSundayParsed).Hours()/24) / 7
 		user.Weeks[idx].Additions += v.Stats.Additions
 		user.Weeks[idx].Deletions += v.Stats.Deletions
 		user.Weeks[idx].Commits++
@@ -104,5 +104,5 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository, revis
 		total.TotalCommits++
 	}
 
-	return contributors_commit_stats, nil
+	return contributorsCommitStats, nil
 }
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index bf42b4f798ae1..2280bbf5885f1 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -16,6 +16,7 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/modules/cache"
+	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 )
@@ -226,8 +227,7 @@ type CommitsByFileAndRangeOptions struct {
 
 // ExtendedCommitStats return the list of *api.ExtendedCommitStats for the given revision
 func (repo *Repository) ExtendedCommitStats(revision string /*, limit int */) ([]*api.ExtendedCommitStats, error) {
-	var baseCommit *Commit
-	baseCommit, err := repo.GetCommit(revision)
+	baseCommit, _ := repo.GetCommit(revision)
 	stdoutReader, stdoutWriter, err := os.Pipe()
 	if err != nil {
 		return nil, err
@@ -241,7 +241,7 @@ func (repo *Repository) ExtendedCommitStats(revision string /*, limit int */) ([
 	// AddOptionFormat("--max-count=%d", limit)
 	gitCmd.AddDynamicArguments(baseCommit.ID.String())
 
-	var extended_commit_stats []*api.ExtendedCommitStats
+	var extendedCommitStats []*api.ExtendedCommitStats
 	stderr := new(strings.Builder)
 	err = gitCmd.Run(&RunOpts{
 		Dir:    repo.Path,
@@ -253,48 +253,48 @@ func (repo *Repository) ExtendedCommitStats(revision string /*, limit int */) ([
 			scanner.Split(bufio.ScanLines)
 
 			for scanner.Scan() {
-				author_name := strings.TrimSpace(scanner.Text())
+				authorName := strings.TrimSpace(scanner.Text())
 				scanner.Scan()
-				author_email := strings.TrimSpace(scanner.Text())
+				authorEmail := strings.TrimSpace(scanner.Text())
 				scanner.Scan()
 				date := strings.TrimSpace(scanner.Text())
 				scanner.Scan()
 				stats := strings.TrimSpace(scanner.Text())
-				if author_name == "" || author_email == "" || date == "" || stats == "" {
+				if authorName == "" || authorEmail == "" || date == "" || stats == "" {
 					// FIXME: find a better way to parse the output so that we will handle this properly
-					fmt.Println("Something is wrong with git log output, skipping...")
+					log.Warn("Something is wrong with git log output, skipping...")
 					continue
 				}
 				//  1 file changed, 1 insertion(+), 1 deletion(-)
 				fields := strings.Split(stats, ",")
 
-				commit_stats := api.CommitStats{}
+				commitStats := api.CommitStats{}
 				for _, field := range fields[1:] {
 					parts := strings.Split(strings.TrimSpace(field), " ")
-					value, type_ := parts[0], parts[1]
+					value, contributionType := parts[0], parts[1]
 					amount, _ := strconv.Atoi(value)
 
-					if strings.HasPrefix(type_, "insertion") {
-						commit_stats.Additions = amount
+					if strings.HasPrefix(contributionType, "insertion") {
+						commitStats.Additions = amount
 					} else {
-						commit_stats.Deletions = amount
+						commitStats.Deletions = amount
 					}
 				}
-				commit_stats.Total = commit_stats.Additions + commit_stats.Deletions
+				commitStats.Total = commitStats.Additions + commitStats.Deletions
 				scanner.Scan()
 				scanner.Text() // empty line at the end
 
 				res := &api.ExtendedCommitStats{
 					Author: &api.CommitUser{
 						Identity: api.Identity{
-							Name:  author_name,
-							Email: author_email,
+							Name:  authorName,
+							Email: authorEmail,
 						},
 						Date: date,
 					},
-					Stats: &commit_stats,
+					Stats: &commitStats,
 				}
-				extended_commit_stats = append(extended_commit_stats, res)
+				extendedCommitStats = append(extendedCommitStats, res)
 
 			}
 			_ = stdoutReader.Close()
@@ -305,7 +305,7 @@ func (repo *Repository) ExtendedCommitStats(revision string /*, limit int */) ([
 		return nil, fmt.Errorf("Failed to get ContributorsCommitStats for repository.\nError: %w\nStderr: %s", err, stderr)
 	}
 
-	return extended_commit_stats, nil
+	return extendedCommitStats, nil
 }
 
 // CommitsByFileAndRange return the commits according revision file and the page
diff --git a/modules/util/dates.go b/modules/util/dates.go
index 4d4d4166649c8..aafa329048fb5 100644
--- a/modules/util/dates.go
+++ b/modules/util/dates.go
@@ -48,8 +48,8 @@ func FindLastSundayBeforeDate(dateStr string) (string, error) {
 		daysToSubtract += 7
 	}
 
-	last_sunday := date.AddDate(0, 0, -daysToSubtract)
-	return last_sunday.Format(layout), nil
+	lastSunday := date.AddDate(0, 0, -daysToSubtract)
+	return lastSunday.Format(layout), nil
 }
 
 func FindFirstSundayAfterDate(dateStr string) (string, error) {
@@ -66,6 +66,6 @@ func FindFirstSundayAfterDate(dateStr string) (string, error) {
 		daysToAdd += 7
 	}
 
-	first_sunday := date.AddDate(0, 0, daysToAdd)
-	return first_sunday.Format(layout), nil
+	firstSunday := date.AddDate(0, 0, daysToAdd)
+	return firstSunday.Format(layout), nil
 }
diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index 654c9ab942d9c..c02aae42fd9fd 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -396,9 +396,9 @@ func GetAllContributorsStats(ctx *context.APIContext) {
 		sha = ctx.Repo.Repository.DefaultBranch
 	}
 
-	if contributor_stats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository, sha); err != nil {
+	if contributorStats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository, sha); err != nil {
 		ctx.Error(http.StatusInternalServerError, "GetContributorStats", err)
 	} else {
-		ctx.JSON(http.StatusOK, &contributor_stats)
+		ctx.JSON(http.StatusOK, &contributorStats)
 	}
 }
diff --git a/routers/api/v1/swagger/repo.go b/routers/api/v1/swagger/repo.go
index bbb5b871d8693..a4e35b260f033 100644
--- a/routers/api/v1/swagger/repo.go
+++ b/routers/api/v1/swagger/repo.go
@@ -253,6 +253,8 @@ type swaggerCommitList struct {
 	Body []api.Commit `json:"body"`
 }
 
+// ContributorDataMap
+// swagger:response ContributorDataMap
 type swaggerContributorDataMap struct {
 	// in: body
 	Body map[string]*api.ContributorData `json:"body"`
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index a8ccf231e8480..d595c6c05a6a4 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -35,9 +35,9 @@ func Contributors(ctx *context.Context) {
 
 // ContributorsData renders JSON of contributors along with their weekly commit statistics
 func ContributorsData(ctx *context.Context) {
-	if contributor_stats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository, ""); err != nil {
+	if contributorStats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository, ""); err != nil {
 		ctx.ServerError("GetContributorStats", err)
 	} else {
-		ctx.JSON(http.StatusOK, contributor_stats)
+		ctx.JSON(http.StatusOK, contributorStats)
 	}
 }
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index eca0be26b4335..f07670508d35d 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -16476,6 +16476,41 @@
       },
       "x-go-package": "code.gitea.io/gitea/modules/structs"
     },
+    "ContributorData": {
+      "description": "ContributorData represents statistical git commit count data",
+      "type": "object",
+      "properties": {
+        "avatar_link": {
+          "type": "string",
+          "x-go-name": "AvatarLink"
+        },
+        "home_link": {
+          "type": "string",
+          "x-go-name": "HomeLink"
+        },
+        "login": {
+          "type": "string",
+          "x-go-name": "Login"
+        },
+        "name": {
+          "type": "string",
+          "x-go-name": "Name"
+        },
+        "total_commits": {
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "TotalCommits"
+        },
+        "weeks": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/WeekData"
+          },
+          "x-go-name": "Weeks"
+        }
+      },
+      "x-go-package": "code.gitea.io/gitea/modules/structs"
+    },
     "CreateAccessTokenOption": {
       "description": "CreateAccessTokenOption options when create access token",
       "type": "object",
@@ -21837,6 +21872,32 @@
       },
       "x-go-package": "code.gitea.io/gitea/modules/structs"
     },
+    "WeekData": {
+      "type": "object",
+      "properties": {
+        "additions": {
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "Additions"
+        },
+        "commits": {
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "Commits"
+        },
+        "deletions": {
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "Deletions"
+        },
+        "week": {
+          "type": "integer",
+          "format": "int64",
+          "x-go-name": "Week"
+        }
+      },
+      "x-go-package": "code.gitea.io/gitea/modules/structs"
+    },
     "WikiCommit": {
       "description": "WikiCommit page commit/revision",
       "type": "object",
@@ -22149,6 +22210,15 @@
         "$ref": "#/definitions/ContentsResponse"
       }
     },
+    "ContributorDataMap": {
+      "description": "ContributorDataMap",
+      "schema": {
+        "type": "object",
+        "additionalProperties": {
+          "$ref": "#/definitions/ContributorData"
+        }
+      }
+    },
     "CronList": {
       "description": "CronList",
       "schema": {
@@ -22968,4 +23038,5 @@
       "TOTPHeader": []
     }
   ]
-}
\ No newline at end of file
+}
+
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 92ddbcc2b0e3e..da8199fa3287c 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -2,7 +2,7 @@
   <div>
     <Line
       v-if="Object.keys(totalStats).length !== 0"
-      :data="toGraphData(totalStats.weeks, 'main')"
+      :data="toGraphData(totalStats.weeks)"
       :options="getOptions('main')"
     />
 
@@ -36,7 +36,7 @@
         </div>
         <div class="ui attached segment">
           <Line
-            :data="toGraphData(contributor.weeks, 'contributor')"
+            :data="toGraphData(contributor.weeks)"
             :options="getOptions('contributor')"
           />
         </div>
@@ -133,10 +133,10 @@ const sfc = {
       return Object.values(data).reduce((acc, item) => acc + item.deletions, 0);
     },
 
-    toGraphData(data, type) {
-      var style = getComputedStyle(document.body);
-      const colorName = this.type === "commits" ? '--color-primary-alpha-60' : (this.type === "additions" ? '--color-green-badge-hover-bg' : '--color-red-badge-hover-bg')
-      var color = style.getPropertyValue(colorName);
+    toGraphData(data) {
+      const style = getComputedStyle(document.body);
+      const colorName = this.type === 'commits' ? '--color-primary-alpha-60' : (this.type === 'additions' ? '--color-green-badge-hover-bg' : '--color-red-badge-hover-bg');
+      const color = style.getPropertyValue(colorName);
       return {
         datasets: [
           {

From 32fe51e7dd8917e97c177bd3fdeb13f27b80c61a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sat, 24 Jun 2023 13:38:53 +0300
Subject: [PATCH 033/138] Use actual commit ID instead of empty string

Suggestion by @6543 from code review
---
 routers/web/repo/contributors.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index d595c6c05a6a4..762aa3adcdbe1 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -35,7 +35,7 @@ func Contributors(ctx *context.Context) {
 
 // ContributorsData renders JSON of contributors along with their weekly commit statistics
 func ContributorsData(ctx *context.Context) {
-	if contributorStats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository, ""); err != nil {
+	if contributorStats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository, ctx.Repo.CommitID); err != nil {
 		ctx.ServerError("GetContributorStats", err)
 	} else {
 		ctx.JSON(http.StatusOK, contributorStats)

From 0dd9095d23fa5f1a67d4aa1c351172e874ea3b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sat, 24 Jun 2023 20:14:32 +0300
Subject: [PATCH 034/138] Generate swagger

---
 templates/swagger/v1_json.tmpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index f07670508d35d..fedc29e71aa47 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -23038,5 +23038,4 @@
       "TOTPHeader": []
     }
   ]
-}
-
+}
\ No newline at end of file

From 3196641f4d3f1230195e03ad4f9dd90baa1ffc27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sat, 24 Jun 2023 21:43:17 +0300
Subject: [PATCH 035/138] Lower height of graph

---
 templates/repo/contributors.tmpl           |  4 +---
 web_src/js/components/RepoContributors.vue | 25 +++++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/templates/repo/contributors.tmpl b/templates/repo/contributors.tmpl
index 8317ef5360a12..63c2d6a9393af 100644
--- a/templates/repo/contributors.tmpl
+++ b/templates/repo/contributors.tmpl
@@ -23,11 +23,9 @@
 		<div class="ui divider"></div>
 
 		{{if .Permission.CanRead $.UnitTypeCode}}
-			<div class="ui attached segment horizontal segments">
-				<div class="ui attached segment">
+				<div class="ui container" >
 					<div id="repo-contributors-chart"></div>
 				</div>
-			</div>
 		{{end}}
 
 	</div>
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index da8199fa3287c..fab67564109bb 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -1,12 +1,14 @@
 <template>
   <div>
-    <Line
-      v-if="Object.keys(totalStats).length !== 0"
-      :data="toGraphData(totalStats.weeks)"
-      :options="getOptions('main')"
-    />
+    <div style="height: 380px">
+      <Line
+        v-if="Object.keys(totalStats).length !== 0"
+        :data="toGraphData(totalStats.weeks)"
+        :options="getOptions('main')"
+      />
+    </div>
 
-    <div class="ui attached segment two column grid">
+    <div class="ui attached two column grid">
       <div
         v-for="(contributor, index) in sortedContributors"
         :key="index"
@@ -35,10 +37,12 @@
           </div>
         </div>
         <div class="ui attached segment">
-          <Line
-            :data="toGraphData(contributor.weeks)"
-            :options="getOptions('contributor')"
-          />
+          <div>
+            <Line
+              :data="toGraphData(contributor.weeks)"
+              :options="getOptions('contributor')"
+            />
+          </div>
         </div>
       </div>
     </div>
@@ -170,6 +174,7 @@ const sfc = {
     getOptions(type) {
       return {
         responsive: true,
+        maintainAspectRatio: false,
         animation: false,
         onClick: (e) => {
           if (type === 'main') {

From a886f57be2b96bb01d5f23c75e9a7d2243cfe478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Mon, 26 Jun 2023 10:09:47 +0300
Subject: [PATCH 036/138] Remove translation to other languages

---
 options/locale/locale_tr-TR.ini | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
index bd46bade5d9fd..71b92cbee111e 100644
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
@@ -1850,13 +1850,6 @@ activity.git_stats_and_deletions=ve
 activity.git_stats_deletion_1=%d silme oldu
 activity.git_stats_deletion_n=%d silme oldu
 
-
-contributors = Katkıda Bulunanlar
-contributors.contribution_type.filter_label = Katkı tipi:
-contributors.contribution_type.commits = İşlemeler
-contributors.contribution_type.additions = Eklemeler
-contributors.contribution_type.deletions = Silmeler
-
 search=Ara
 search.search_repo=Depo ara
 search.type.tooltip=Arama türü

From f278598ee7c9667703b0b726e3b971940ee6737b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Mon, 26 Jun 2023 10:11:17 +0300
Subject: [PATCH 037/138] Add newline at end of swagger file

---
 templates/swagger/v1_json.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index fedc29e71aa47..f07670508d35d 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -23038,4 +23038,5 @@
       "TOTPHeader": []
     }
   ]
-}
\ No newline at end of file
+}
+

From beb73827a3b04251065105231b50c16f5f4e45c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Mon, 26 Jun 2023 12:39:17 +0300
Subject: [PATCH 038/138] Move header from Go template to Vue

---
 templates/repo/contributors.tmpl           | 25 +----------
 web_src/js/components/RepoContributors.vue | 51 +++++++++++++++++++++-
 2 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/templates/repo/contributors.tmpl b/templates/repo/contributors.tmpl
index 63c2d6a9393af..67d41cad6e646 100644
--- a/templates/repo/contributors.tmpl
+++ b/templates/repo/contributors.tmpl
@@ -2,32 +2,9 @@
 <div role="main" aria-label="{{.Title}}" class="page-content repository commits">
 	{{template "repo/header" .}}
 	<div class="ui container">
-		<h2 class="ui header">{{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}}
-			<div class="ui right">
-				<!-- Contribution type -->
-				<div class="ui floating dropdown jump filter">
-					<div class="ui basic compact button">
-						<span class="text">
-							{{.locale.Tr "repo.contributors.contribution_type.filter_label"}} <strong>{{.ContributionTypeText}}</strong>
-							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-						</span>
-					</div>
-					<div class="menu">
-						<a class="{{if eq .ContributionType "commits"}}active {{end}}item" href="{{$.RepoLink}}/contributors/commits">{{.locale.Tr "repo.contributors.contribution_type.commits"}}</a>
-						<a class="{{if eq .ContributionType "additions"}}active {{end}}item" href="{{$.RepoLink}}/contributors/additions">{{.locale.Tr "repo.contributors.contribution_type.additions"}}</a>
-						<a class="{{if eq .ContributionType "deletions"}}active {{end}}item" href="{{$.RepoLink}}/contributors/deletions">{{.locale.Tr "repo.contributors.contribution_type.deletions"}}</a>
-					</div>
-				</div>
-			</div>
-		</h2>
-		<div class="ui divider"></div>
-
 		{{if .Permission.CanRead $.UnitTypeCode}}
-				<div class="ui container" >
-					<div id="repo-contributors-chart"></div>
-				</div>
+				<div id="repo-contributors-chart"></div>
 		{{end}}
-
 	</div>
 </div>
 {{template "base/footer" .}}
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index fab67564109bb..7b49265a4e965 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -1,5 +1,48 @@
 <template>
   <div>
+    <h2 class="ui header">
+      <relative-time
+        v-if="dateFrom !== null"
+        format="datetime"
+        year="numeric"
+        month="short"
+        day="numeric"
+        weekday=""
+        :datetime="dateFrom"
+      >
+        {{ dateFrom }}
+      </relative-time>
+      -
+      <relative-time
+        v-if="dateUntil !== null"
+        format="datetime"
+        year="numeric"
+        month="short"
+        day="numeric"
+        weekday=""
+        :datetime="dateUntil"
+      >
+        {{ dateUntil }}
+      </relative-time>
+
+      <div class="ui right">
+        <!-- Contribution type -->
+        <div class="ui dropdown simple">
+          <div class="ui basic compact button">
+            <span class="text">
+              Contribution type: <strong>{{ type }}</strong>
+              <svg-icon name="octicon-triangle-down" :size="14"/>
+            </span>
+          </div>
+          <div class="menu">
+            <a :class="type === 'commits' ? 'active item' : 'item'" :href="`${repoLink}/contributors/commits`">Commits</a>
+            <a :class="type === 'additions' ? 'active item' : 'item'" :href="`${repoLink}/contributors/additions`">Additions</a>
+            <a :class="type === 'deletions' ? 'active item' : 'item'" :href="`${repoLink}/contributors/deletions`">Deletions</a>
+          </div>
+        </div>
+      </div>
+    </h2>
+    <div class="ui divider"/>
     <div style="height: 380px">
       <Line
         v-if="Object.keys(totalStats).length !== 0"
@@ -7,6 +50,7 @@
         :options="getOptions('main')"
       />
     </div>
+    <div class="ui divider"/>
 
     <div class="ui attached two column grid">
       <div
@@ -51,6 +95,7 @@
 
 <script>
 import {createApp} from 'vue';
+import {SvgIcon} from '../svg.js';
 import {
   Chart,
   Title,
@@ -85,7 +130,7 @@ Chart.register(
 );
 
 const sfc = {
-  components: {Line},
+  components: {Line, SvgIcon},
   data: () => {
     return {
       isLoading: false,
@@ -93,6 +138,8 @@ const sfc = {
       repoLink: pageData.repoLink || [],
       type: pageData.contributionType,
       contributorsStats: [],
+      dateFrom: null,
+      dateUntil: null,
     };
   },
   mounted() {
@@ -114,6 +161,8 @@ const sfc = {
           const {total, ...rest} = data;
           this.contributorsStats = rest;
           this.totalStats = total;
+          this.dateFrom = new Date(total.weeks[0].week).toISOString();
+          this.dateUntil = new Date().toISOString();
           this.isLoading = false;
         });
     },

From 8dce94731cdaba5b99c05e4c3fd069add751972c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 28 Jun 2023 07:54:50 +0300
Subject: [PATCH 039/138] Fix package-lock.json

---
 package-lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 28a1bc3b72ea1..304a16d2a1819 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "asciinema-player": "3.5.0",
         "chart.js": "4.3.0",
         "chartjs-adapter-dayjs-4": "1.0.4",
-        "chartjs-plugin-zoom": "2.0.1
+        "chartjs-plugin-zoom": "2.0.1",
         "clippie": "4.0.1",
         "css-loader": "6.8.1",
         "dayjs": "1.11.8",

From 4f7493283d9bdd40a236ceae46312c317e0c2131 Mon Sep 17 00:00:00 2001
From: hiifong <i@hiif.ong>
Date: Wed, 28 Jun 2023 17:59:50 +0800
Subject: [PATCH 040/138] Adjust the location of the contributors page

---
 options/locale/locale_en-US.ini            |   2 +
 routers/web/repo/activity.go               |   3 +
 routers/web/repo/contributors.go           |   5 +-
 routers/web/web.go                         |  11 +-
 templates/repo/activity.tmpl               | 240 +--------------------
 templates/repo/contributors.tmpl           |  13 +-
 templates/repo/header.tmpl                 |   6 -
 templates/repo/navbar.tmpl                 |   8 +
 templates/repo/pulse.tmpl                  | 233 ++++++++++++++++++++
 web_src/js/components/RepoContributors.vue |  21 +-
 web_src/js/features/contributors.js        |  16 ++
 web_src/js/index.js                        |   4 +-
 12 files changed, 288 insertions(+), 274 deletions(-)
 create mode 100644 templates/repo/navbar.tmpl
 create mode 100644 templates/repo/pulse.tmpl
 create mode 100644 web_src/js/features/contributors.js

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 18e18de7b2bfe..b5ed6f3637026 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1840,6 +1840,8 @@ wiki.page_name_desc = Enter a name for this Wiki page. Some special names are: '
 wiki.original_git_entry_tooltip = View original Git file instead of using friendly link.
 
 activity = Activity
+activity.navber.pulse = Pulse
+activity.navber.contributors = Contributors
 activity.period.filter_label = Period:
 activity.period.daily = 1 day
 activity.period.halfweekly = 3 days
diff --git a/routers/web/repo/activity.go b/routers/web/repo/activity.go
index 3d030edaca065..53742e1a29265 100644
--- a/routers/web/repo/activity.go
+++ b/routers/web/repo/activity.go
@@ -22,6 +22,9 @@ func Activity(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("repo.activity")
 	ctx.Data["PageIsActivity"] = true
 
+	ctx.Data["PageIsPulse"] = true
+	ctx.Data["PageIsContributors"] = false
+
 	ctx.Data["Period"] = ctx.Params("period")
 
 	timeUntil := time.Now()
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index 762aa3adcdbe1..18df7b82f56b3 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -12,12 +12,15 @@ import (
 )
 
 const (
-	tplContributors base.TplName = "repo/contributors"
+	tplContributors base.TplName = "repo/activity"
 )
 
 // Contributors render the page to show repository contributors graph
 func Contributors(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("repo.contributors")
+
+	ctx.Data["PageIsActivity"] = true
+	ctx.Data["PageIsPulse"] = false
 	ctx.Data["PageIsContributors"] = true
 
 	ctx.Data["ContributionType"] = ctx.Params("contribution_type")
diff --git a/routers/web/web.go b/routers/web/web.go
index 63c7c71add7a3..ccd9491509d0a 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1237,6 +1237,11 @@ func registerRoutes(m *web.Route) {
 		m.Group("/activity", func() {
 			m.Get("", repo.Activity)
 			m.Get("/{period}", repo.Activity)
+			m.Group("/contributors", func() {
+				m.Get("", repo.Contributors)
+				m.Get("/{contribution_type}", repo.Contributors)
+				m.Get("/data", repo.ContributorsData)
+			})
 		}, context.RepoRef(), repo.MustBeNotEmpty, context.RequireRepoReaderOr(unit.TypePullRequests, unit.TypeIssues, unit.TypeReleases))
 
 		m.Group("/activity_author_data", func() {
@@ -1244,12 +1249,6 @@ func registerRoutes(m *web.Route) {
 			m.Get("/{period}", repo.ActivityAuthors)
 		}, context.RepoRef(), repo.MustBeNotEmpty, context.RequireRepoReaderOr(unit.TypeCode))
 
-		m.Group("/contributors", func() {
-			m.Get("", repo.Contributors)
-			m.Get("/{contribution_type}", repo.Contributors)
-			m.Get("/data", repo.ContributorsData)
-		}, context.RepoRef(), repo.MustBeNotEmpty, context.RequireRepoReaderOr(unit.TypePullRequests, unit.TypeIssues, unit.TypeReleases))
-
 		m.Group("/archive", func() {
 			m.Get("/*", repo.Download)
 			m.Post("/*", repo.InitiateDownload)
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl
index ed29ece137811..3c731fbad74da 100644
--- a/templates/repo/activity.tmpl
+++ b/templates/repo/activity.tmpl
@@ -1,240 +1,14 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository commits">
 	{{template "repo/header" .}}
-	<div class="ui container">
-		<h2 class="ui header activity-header">
-			<span>{{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}}</span>
-			<!-- Period -->
-			<div class="ui floating dropdown jump filter">
-				<div class="ui basic compact button">
-					<span class="text">
-						{{.locale.Tr "repo.activity.period.filter_label"}} <strong>{{.PeriodText}}</strong>
-						{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-					</span>
-				</div>
-				<div class="menu">
-					<a class="{{if eq .Period "daily"}}active {{end}}item" href="{{$.RepoLink}}/activity/daily">{{.locale.Tr "repo.activity.period.daily"}}</a>
-					<a class="{{if eq .Period "halfweekly"}}active {{end}}item" href="{{$.RepoLink}}/activity/halfweekly">{{.locale.Tr "repo.activity.period.halfweekly"}}</a>
-					<a class="{{if eq .Period "weekly"}}active {{end}}item" href="{{$.RepoLink}}/activity/weekly">{{.locale.Tr "repo.activity.period.weekly"}}</a>
-					<a class="{{if eq .Period "monthly"}}active {{end}}item" href="{{$.RepoLink}}/activity/monthly">{{.locale.Tr "repo.activity.period.monthly"}}</a>
-					<a class="{{if eq .Period "quarterly"}}active {{end}}item" href="{{$.RepoLink}}/activity/quarterly">{{.locale.Tr "repo.activity.period.quarterly"}}</a>
-					<a class="{{if eq .Period "semiyearly"}}active {{end}}item" href="{{$.RepoLink}}/activity/semiyearly">{{.locale.Tr "repo.activity.period.semiyearly"}}</a>
-					<a class="{{if eq .Period "yearly"}}active {{end}}item" href="{{$.RepoLink}}/activity/yearly">{{.locale.Tr "repo.activity.period.yearly"}}</a>
-				</div>
-			</div>
-		</h2>
-		<div class="ui divider"></div>
-
-		{{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}}
-		<h4 class="ui top attached header">{{.locale.Tr "repo.activity.overview"}}</h4>
-		<div class="ui attached segment two column grid">
-			{{if .Permission.CanRead $.UnitTypePullRequests}}
-				<div class="column">
-					{{if gt .Activity.ActivePRCount 0}}
-					<div class="stats-table">
-						<a href="#merged-pull-requests" class="table-cell tiny background purple" style="width: {{.Activity.MergedPRPerc}}{{if ne .Activity.MergedPRPerc 0}}%{{end}}"></a>
-						<a href="#proposed-pull-requests" class="table-cell tiny background green"></a>
-					</div>
-					{{else}}
-					<div class="stats-table">
-						<a class="table-cell tiny background light grey"></a>
-					</div>
-					{{end}}
-					{{.locale.TrN .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n" .Activity.ActivePRCount | Safe}}
-				</div>
-			{{end}}
-			{{if .Permission.CanRead $.UnitTypeIssues}}
-				<div class="column">
-					{{if gt .Activity.ActiveIssueCount 0}}
-					<div class="stats-table">
-						<a href="#closed-issues" class="table-cell tiny background red" style="width: {{.Activity.ClosedIssuePerc}}{{if ne .Activity.ClosedIssuePerc 0}}%{{end}}"></a>
-						<a href="#new-issues" class="table-cell tiny background green"></a>
-					</div>
-					{{else}}
-					<div class="stats-table">
-						<a class="table-cell tiny background light grey"></a>
-					</div>
-					{{end}}
-					{{.locale.TrN .Activity.ActiveIssueCount "repo.activity.active_issues_count_1" "repo.activity.active_issues_count_n" .Activity.ActiveIssueCount | Safe}}
-				</div>
-			{{end}}
+	<div class="ui container stackable grid">
+		<div class="four wide column">
+			{{template "repo/navbar" .}}
 		</div>
-		<div class="ui attached segment horizontal segments">
-			{{if .Permission.CanRead $.UnitTypePullRequests}}
-				<a href="#merged-pull-requests" class="ui attached segment text center">
-					<span class="text purple">{{svg "octicon-git-pull-request"}}</span> <strong>{{.Activity.MergedPRCount}}</strong><br>
-					{{.locale.TrN .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n"}}
-				</a>
-				<a href="#proposed-pull-requests" class="ui attached segment text center">
-					<span class="text green">{{svg "octicon-git-branch"}}</span> <strong>{{.Activity.OpenedPRCount}}</strong><br>
-					{{.locale.TrN .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n"}}
-				</a>
-			{{end}}
-			{{if .Permission.CanRead $.UnitTypeIssues}}
-				<a href="#closed-issues" class="ui attached segment text center">
-					<span class="text red">{{svg "octicon-issue-closed"}}</span> <strong>{{.Activity.ClosedIssueCount}}</strong><br>
-					{{.locale.TrN .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n"}}
-				</a>
-				<a href="#new-issues" class="ui attached segment text center">
-					<span class="text green">{{svg "octicon-issue-opened"}}</span> <strong>{{.Activity.OpenedIssueCount}}</strong><br>
-					{{.locale.TrN .Activity.OpenedIssueCount "repo.activity.new_issues_count_1" "repo.activity.new_issues_count_n"}}
-				</a>
-			{{end}}
+		<div class="twelve wide column">
+			{{if .PageIsPulse}}{{template "repo/pulse" .}}{{end}}
+			{{if .PageIsContributors}}{{template "repo/contributors" .}}{{end}}
 		</div>
-		{{end}}
-
-		{{if .Permission.CanRead $.UnitTypeCode}}
-			{{if eq .Activity.Code.CommitCountInAllBranches 0}}
-				<div class="ui center aligned segment">
-				<h4 class="ui header">{{.locale.Tr "repo.activity.no_git_activity"}}</h4>
-				</div>
-			{{end}}
-			{{if gt .Activity.Code.CommitCountInAllBranches 0}}
-				<div class="ui attached segment horizontal segments">
-					<div class="ui attached segment text">
-						{{.locale.Tr "repo.activity.git_stats_exclude_merges"}}
-						<strong>{{.locale.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_author_1" "repo.activity.git_stats_author_n" .Activity.Code.AuthorCount}}</strong>
-						{{.locale.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_pushed_1" "repo.activity.git_stats_pushed_n"}}
-						<strong>{{.locale.TrN .Activity.Code.CommitCount "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCount}}</strong>
-						{{.locale.Tr "repo.activity.git_stats_push_to_branch" .Repository.DefaultBranch}}
-						<strong>{{.locale.TrN .Activity.Code.CommitCountInAllBranches "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCountInAllBranches}}</strong>
-						{{.locale.Tr "repo.activity.git_stats_push_to_all_branches"}}
-						{{.locale.Tr "repo.activity.git_stats_on_default_branch" .Repository.DefaultBranch}}
-						<strong>{{.locale.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_file_1" "repo.activity.git_stats_file_n" .Activity.Code.ChangedFiles}}</strong>
-						{{.locale.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_files_changed_1" "repo.activity.git_stats_files_changed_n"}}
-						{{.locale.Tr "repo.activity.git_stats_additions"}}
-						<strong class="text green">{{.locale.TrN .Activity.Code.Additions "repo.activity.git_stats_addition_1" "repo.activity.git_stats_addition_n" .Activity.Code.Additions}}</strong>
-						{{.locale.Tr "repo.activity.git_stats_and_deletions"}}
-						<strong class="text red">{{.locale.TrN .Activity.Code.Deletions "repo.activity.git_stats_deletion_1" "repo.activity.git_stats_deletion_n" .Activity.Code.Deletions}}</strong>.
-					</div>
-					<div class="ui attached segment">
-						<div id="repo-activity-top-authors-chart"></div>
-					</div>
-				</div>
-			{{end}}
-		{{end}}
-
-		{{if gt .Activity.PublishedReleaseCount 0}}
-			<h4 class="ui horizontal divider header" id="published-releases">
-				<span class="text">{{svg "octicon-tag"}}</span>
-				{{.locale.Tr "repo.activity.title.releases_published_by"
-					(.locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount)
-					(.locale.TrN .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.PublishedReleaseAuthorCount)
-				}}
-			</h4>
-			<div class="list">
-				{{range .Activity.PublishedReleases}}
-					<p class="desc">
-						<span class="ui green label">{{$.locale.Tr "repo.activity.published_release_label"}}</span>
-						{{.TagName}}
-						{{if not .IsTag}}
-							<a class="title" href="{{$.RepoLink}}/src/{{.TagName | PathEscapeSegments}}">{{.Title | RenderEmoji $.Context}}</a>
-						{{end}}
-						{{TimeSinceUnix .CreatedUnix $.locale}}
-					</p>
-				{{end}}
-			</div>
-		{{end}}
-
-		{{if gt .Activity.MergedPRCount 0}}
-			<h4 class="ui horizontal divider header" id="merged-pull-requests">
-				<span class="text">{{svg "octicon-git-pull-request"}}</span>
-				{{.locale.Tr "repo.activity.title.prs_merged_by"
-					(.locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount)
-					(.locale.TrN .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.MergedPRAuthorCount)
-				}}
-			</h4>
-			<div class="list">
-				{{range .Activity.MergedPRs}}
-					<p class="desc">
-						<span class="ui purple label">{{$.locale.Tr "repo.activity.merged_prs_label"}}</span>
-						#{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .MergedUnix $.locale}}
-					</p>
-				{{end}}
-			</div>
-		{{end}}
-
-		{{if gt .Activity.OpenedPRCount 0}}
-			<h4 class="ui horizontal divider header" id="proposed-pull-requests">
-				<span class="text">{{svg "octicon-git-branch"}}</span>
-				{{.locale.Tr "repo.activity.title.prs_opened_by"
-					(.locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount)
-					(.locale.TrN .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedPRAuthorCount)
-				}}
-			</h4>
-			<div class="list">
-				{{range .Activity.OpenedPRs}}
-					<p class="desc">
-						<span class="ui green label">{{$.locale.Tr "repo.activity.opened_prs_label"}}</span>
-						#{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .Issue.CreatedUnix $.locale}}
-					</p>
-				{{end}}
-			</div>
-		{{end}}
-
-		{{if gt .Activity.ClosedIssueCount 0}}
-			<h4 class="ui horizontal divider header" id="closed-issues">
-				<span class="text">{{svg "octicon-issue-closed"}}</span>
-				{{.locale.Tr "repo.activity.title.issues_closed_from"
-					(.locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount)
-					(.locale.TrN .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.ClosedIssueAuthorCount)
-				}}
-			</h4>
-			<div class="list">
-				{{range .Activity.ClosedIssues}}
-					<p class="desc">
-						<span class="ui red label">{{$.locale.Tr "repo.activity.closed_issue_label"}}</span>
-						#{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .ClosedUnix $.locale}}
-					</p>
-				{{end}}
-			</div>
-		{{end}}
-
-		{{if gt .Activity.OpenedIssueCount 0}}
-			<h4 class="ui horizontal divider header" id="new-issues">
-				<span class="text">{{svg "octicon-issue-opened"}}</span>
-				{{.locale.Tr "repo.activity.title.issues_created_by"
-					(.locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount)
-					(.locale.TrN .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedIssueAuthorCount)
-				}}
-			</h4>
-			<div class="list">
-				{{range .Activity.OpenedIssues}}
-					<p class="desc">
-						<span class="ui green label">{{$.locale.Tr "repo.activity.new_issue_label"}}</span>
-						#{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-						{{TimeSinceUnix .CreatedUnix $.locale}}
-					</p>
-				{{end}}
-			</div>
-		{{end}}
-
-		{{if gt .Activity.UnresolvedIssueCount 0}}
-			<h4 class="ui horizontal divider header" id="unresolved-conversations">
-				<span class="text">{{svg "octicon-comment-discussion"}}</span>
-				{{.locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}
-			</h4>
-			<div class="text center desc">
-				{{.locale.Tr "repo.activity.unresolved_conv_desc"}}
-			</div>
-			<div class="list">
-				{{range .Activity.UnresolvedIssues}}
-					<p class="desc">
-						<span class="ui green label">{{$.locale.Tr "repo.activity.unresolved_conv_label"}}</span>
-						#{{.Index}}
-						{{if .IsPull}}
-						<a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-						{{else}}
-						<a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-						{{end}}
-						{{TimeSinceUnix .UpdatedUnix $.locale}}
-					</p>
-				{{end}}
-			</div>
-		{{end}}
 	</div>
 </div>
-{{template "base/footer" .}}
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/repo/contributors.tmpl b/templates/repo/contributors.tmpl
index 67d41cad6e646..387870dde7324 100644
--- a/templates/repo/contributors.tmpl
+++ b/templates/repo/contributors.tmpl
@@ -1,10 +1,3 @@
-{{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository commits">
-	{{template "repo/header" .}}
-	<div class="ui container">
-		{{if .Permission.CanRead $.UnitTypeCode}}
-				<div id="repo-contributors-chart"></div>
-		{{end}}
-	</div>
-</div>
-{{template "base/footer" .}}
+{{if .Permission.CanRead $.UnitTypeCode}}
+	<div id="repo-contributors-chart"></div>
+{{end}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index ea86490e86421..c1d4676d6800e 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -233,12 +233,6 @@
 					</a>
 				{{end}}
 
-				{{if and (.Permission.CanReadAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsEmptyRepo)}}
-					<a class="{{if .PageIsContributors}}active {{end}}item" href="{{.RepoLink}}/contributors">
-						{{svg "octicon-graph"}} {{.locale.Tr "repo.contributors"}}
-					</a>
-				{{end}}
-
 				{{template "custom/extra_tabs" .}}
 
 				{{if .Permission.IsAdmin}}
diff --git a/templates/repo/navbar.tmpl b/templates/repo/navbar.tmpl
new file mode 100644
index 0000000000000..1f0a02b1af9b9
--- /dev/null
+++ b/templates/repo/navbar.tmpl
@@ -0,0 +1,8 @@
+<div class="ui fluid vertical menu">
+    <a class="{{if .PageIsPulse}}active{{end}} item" href="{{.RepoLink}}/activity">
+        {{.locale.Tr "repo.activity.navber.pulse"}}
+    </a>
+    <a class="{{if .PageIsContributors}}active{{end}} item" href="{{.RepoLink}}/activity/contributors">
+        {{.locale.Tr "repo.activity.navber.contributors"}}
+    </a>
+</div>
\ No newline at end of file
diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl
new file mode 100644
index 0000000000000..ecae985c630c8
--- /dev/null
+++ b/templates/repo/pulse.tmpl
@@ -0,0 +1,233 @@
+<h2 class="ui header activity-header">
+    <span>{{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}}</span>
+    <!-- Period -->
+    <div class="ui floating dropdown jump filter">
+        <div class="ui basic compact button">
+            <span class="text">
+                {{.locale.Tr "repo.activity.period.filter_label"}} <strong>{{.PeriodText}}</strong>
+                {{svg "octicon-triangle-down" 14 "dropdown icon"}}
+            </span>
+        </div>
+        <div class="menu">
+            <a class="{{if eq .Period "daily"}}active {{end}}item" href="{{$.RepoLink}}/activity/daily">{{.locale.Tr "repo.activity.period.daily"}}</a>
+            <a class="{{if eq .Period "halfweekly"}}active {{end}}item" href="{{$.RepoLink}}/activity/halfweekly">{{.locale.Tr "repo.activity.period.halfweekly"}}</a>
+            <a class="{{if eq .Period "weekly"}}active {{end}}item" href="{{$.RepoLink}}/activity/weekly">{{.locale.Tr "repo.activity.period.weekly"}}</a>
+            <a class="{{if eq .Period "monthly"}}active {{end}}item" href="{{$.RepoLink}}/activity/monthly">{{.locale.Tr "repo.activity.period.monthly"}}</a>
+            <a class="{{if eq .Period "quarterly"}}active {{end}}item" href="{{$.RepoLink}}/activity/quarterly">{{.locale.Tr "repo.activity.period.quarterly"}}</a>
+            <a class="{{if eq .Period "semiyearly"}}active {{end}}item" href="{{$.RepoLink}}/activity/semiyearly">{{.locale.Tr "repo.activity.period.semiyearly"}}</a>
+            <a class="{{if eq .Period "yearly"}}active {{end}}item" href="{{$.RepoLink}}/activity/yearly">{{.locale.Tr "repo.activity.period.yearly"}}</a>
+        </div>
+    </div>
+</h2>
+<div class="ui divider"></div>
+
+{{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}}
+<h4 class="ui top attached header">{{.locale.Tr "repo.activity.overview"}}</h4>
+<div class="ui attached segment two column grid">
+    {{if .Permission.CanRead $.UnitTypePullRequests}}
+        <div class="column">
+            {{if gt .Activity.ActivePRCount 0}}
+            <div class="stats-table">
+                <a href="#merged-pull-requests" class="table-cell tiny background purple" style="width: {{.Activity.MergedPRPerc}}{{if ne .Activity.MergedPRPerc 0}}%{{end}}"></a>
+                <a href="#proposed-pull-requests" class="table-cell tiny background green"></a>
+            </div>
+            {{else}}
+            <div class="stats-table">
+                <a class="table-cell tiny background light grey"></a>
+            </div>
+            {{end}}
+            {{.locale.TrN .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n" .Activity.ActivePRCount | Safe}}
+        </div>
+    {{end}}
+    {{if .Permission.CanRead $.UnitTypeIssues}}
+        <div class="column">
+            {{if gt .Activity.ActiveIssueCount 0}}
+            <div class="stats-table">
+                <a href="#closed-issues" class="table-cell tiny background red" style="width: {{.Activity.ClosedIssuePerc}}{{if ne .Activity.ClosedIssuePerc 0}}%{{end}}"></a>
+                <a href="#new-issues" class="table-cell tiny background green"></a>
+            </div>
+            {{else}}
+            <div class="stats-table">
+                <a class="table-cell tiny background light grey"></a>
+            </div>
+            {{end}}
+            {{.locale.TrN .Activity.ActiveIssueCount "repo.activity.active_issues_count_1" "repo.activity.active_issues_count_n" .Activity.ActiveIssueCount | Safe}}
+        </div>
+    {{end}}
+</div>
+<div class="ui attached segment horizontal segments">
+    {{if .Permission.CanRead $.UnitTypePullRequests}}
+        <a href="#merged-pull-requests" class="ui attached segment text center">
+            <span class="text purple">{{svg "octicon-git-pull-request"}}</span> <strong>{{.Activity.MergedPRCount}}</strong><br>
+            {{.locale.TrN .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n"}}
+        </a>
+        <a href="#proposed-pull-requests" class="ui attached segment text center">
+            <span class="text green">{{svg "octicon-git-branch"}}</span> <strong>{{.Activity.OpenedPRCount}}</strong><br>
+            {{.locale.TrN .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n"}}
+        </a>
+    {{end}}
+    {{if .Permission.CanRead $.UnitTypeIssues}}
+        <a href="#closed-issues" class="ui attached segment text center">
+            <span class="text red">{{svg "octicon-issue-closed"}}</span> <strong>{{.Activity.ClosedIssueCount}}</strong><br>
+            {{.locale.TrN .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n"}}
+        </a>
+        <a href="#new-issues" class="ui attached segment text center">
+            <span class="text green">{{svg "octicon-issue-opened"}}</span> <strong>{{.Activity.OpenedIssueCount}}</strong><br>
+            {{.locale.TrN .Activity.OpenedIssueCount "repo.activity.new_issues_count_1" "repo.activity.new_issues_count_n"}}
+        </a>
+    {{end}}
+</div>
+{{end}}
+
+{{if .Permission.CanRead $.UnitTypeCode}}
+    {{if eq .Activity.Code.CommitCountInAllBranches 0}}
+        <div class="ui center aligned segment">
+        <h4 class="ui header">{{.locale.Tr "repo.activity.no_git_activity"}}</h4>
+        </div>
+    {{end}}
+    {{if gt .Activity.Code.CommitCountInAllBranches 0}}
+        <div class="ui attached segment horizontal segments">
+            <div class="ui attached segment text">
+                {{.locale.Tr "repo.activity.git_stats_exclude_merges"}}
+                <strong>{{.locale.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_author_1" "repo.activity.git_stats_author_n" .Activity.Code.AuthorCount}}</strong>
+                {{.locale.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_pushed_1" "repo.activity.git_stats_pushed_n"}}
+                <strong>{{.locale.TrN .Activity.Code.CommitCount "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCount}}</strong>
+                {{.locale.Tr "repo.activity.git_stats_push_to_branch" .Repository.DefaultBranch}}
+                <strong>{{.locale.TrN .Activity.Code.CommitCountInAllBranches "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCountInAllBranches}}</strong>
+                {{.locale.Tr "repo.activity.git_stats_push_to_all_branches"}}
+                {{.locale.Tr "repo.activity.git_stats_on_default_branch" .Repository.DefaultBranch}}
+                <strong>{{.locale.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_file_1" "repo.activity.git_stats_file_n" .Activity.Code.ChangedFiles}}</strong>
+                {{.locale.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_files_changed_1" "repo.activity.git_stats_files_changed_n"}}
+                {{.locale.Tr "repo.activity.git_stats_additions"}}
+                <strong class="text green">{{.locale.TrN .Activity.Code.Additions "repo.activity.git_stats_addition_1" "repo.activity.git_stats_addition_n" .Activity.Code.Additions}}</strong>
+                {{.locale.Tr "repo.activity.git_stats_and_deletions"}}
+                <strong class="text red">{{.locale.TrN .Activity.Code.Deletions "repo.activity.git_stats_deletion_1" "repo.activity.git_stats_deletion_n" .Activity.Code.Deletions}}</strong>.
+            </div>
+            <div class="ui attached segment">
+                <div id="repo-activity-top-authors-chart"></div>
+            </div>
+        </div>
+    {{end}}
+{{end}}
+
+{{if gt .Activity.PublishedReleaseCount 0}}
+    <h4 class="ui horizontal divider header" id="published-releases">
+        <span class="text">{{svg "octicon-tag"}}</span>
+        {{.locale.Tr "repo.activity.title.releases_published_by"
+            (.locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount)
+            (.locale.TrN .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.PublishedReleaseAuthorCount)
+        }}
+    </h4>
+    <div class="list">
+        {{range .Activity.PublishedReleases}}
+            <p class="desc">
+                <span class="ui green label">{{$.locale.Tr "repo.activity.published_release_label"}}</span>
+                {{.TagName}}
+                {{if not .IsTag}}
+                    <a class="title" href="{{$.RepoLink}}/src/{{.TagName | PathEscapeSegments}}">{{.Title | RenderEmoji $.Context}}</a>
+                {{end}}
+                {{TimeSinceUnix .CreatedUnix $.locale}}
+            </p>
+        {{end}}
+    </div>
+{{end}}
+
+{{if gt .Activity.MergedPRCount 0}}
+    <h4 class="ui horizontal divider header" id="merged-pull-requests">
+        <span class="text">{{svg "octicon-git-pull-request"}}</span>
+        {{.locale.Tr "repo.activity.title.prs_merged_by"
+            (.locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount)
+            (.locale.TrN .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.MergedPRAuthorCount)
+        }}
+    </h4>
+    <div class="list">
+        {{range .Activity.MergedPRs}}
+            <p class="desc">
+                <span class="ui purple label">{{$.locale.Tr "repo.activity.merged_prs_label"}}</span>
+                #{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
+                {{TimeSinceUnix .MergedUnix $.locale}}
+            </p>
+        {{end}}
+    </div>
+{{end}}
+
+{{if gt .Activity.OpenedPRCount 0}}
+    <h4 class="ui horizontal divider header" id="proposed-pull-requests">
+        <span class="text">{{svg "octicon-git-branch"}}</span>
+        {{.locale.Tr "repo.activity.title.prs_opened_by"
+            (.locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount)
+            (.locale.TrN .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedPRAuthorCount)
+        }}
+    </h4>
+    <div class="list">
+        {{range .Activity.OpenedPRs}}
+            <p class="desc">
+                <span class="ui green label">{{$.locale.Tr "repo.activity.opened_prs_label"}}</span>
+                #{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
+                {{TimeSinceUnix .Issue.CreatedUnix $.locale}}
+            </p>
+        {{end}}
+    </div>
+{{end}}
+
+{{if gt .Activity.ClosedIssueCount 0}}
+    <h4 class="ui horizontal divider header" id="closed-issues">
+        <span class="text">{{svg "octicon-issue-closed"}}</span>
+        {{.locale.Tr "repo.activity.title.issues_closed_from"
+            (.locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount)
+            (.locale.TrN .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.ClosedIssueAuthorCount)
+        }}
+    </h4>
+    <div class="list">
+        {{range .Activity.ClosedIssues}}
+            <p class="desc">
+                <span class="ui red label">{{$.locale.Tr "repo.activity.closed_issue_label"}}</span>
+                #{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
+                {{TimeSinceUnix .ClosedUnix $.locale}}
+            </p>
+        {{end}}
+    </div>
+{{end}}
+
+{{if gt .Activity.OpenedIssueCount 0}}
+    <h4 class="ui horizontal divider header" id="new-issues">
+        <span class="text">{{svg "octicon-issue-opened"}}</span>
+        {{.locale.Tr "repo.activity.title.issues_created_by"
+            (.locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount)
+            (.locale.TrN .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedIssueAuthorCount)
+        }}
+    </h4>
+    <div class="list">
+        {{range .Activity.OpenedIssues}}
+            <p class="desc">
+                <span class="ui green label">{{$.locale.Tr "repo.activity.new_issue_label"}}</span>
+                #{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
+                {{TimeSinceUnix .CreatedUnix $.locale}}
+            </p>
+        {{end}}
+    </div>
+{{end}}
+
+{{if gt .Activity.UnresolvedIssueCount 0}}
+    <h4 class="ui horizontal divider header" id="unresolved-conversations">
+        <span class="text">{{svg "octicon-comment-discussion"}}</span>
+        {{.locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}
+    </h4>
+    <div class="text center desc">
+        {{.locale.Tr "repo.activity.unresolved_conv_desc"}}
+    </div>
+    <div class="list">
+        {{range .Activity.UnresolvedIssues}}
+            <p class="desc">
+                <span class="ui green label">{{$.locale.Tr "repo.activity.unresolved_conv_label"}}</span>
+                #{{.Index}}
+                {{if .IsPull}}
+                <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
+                {{else}}
+                <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
+                {{end}}
+                {{TimeSinceUnix .UpdatedUnix $.locale}}
+            </p>
+        {{end}}
+    </div>
+{{end}}
\ No newline at end of file
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 7b49265a4e965..18a230db438e4 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -35,9 +35,9 @@
             </span>
           </div>
           <div class="menu">
-            <a :class="type === 'commits' ? 'active item' : 'item'" :href="`${repoLink}/contributors/commits`">Commits</a>
-            <a :class="type === 'additions' ? 'active item' : 'item'" :href="`${repoLink}/contributors/additions`">Additions</a>
-            <a :class="type === 'deletions' ? 'active item' : 'item'" :href="`${repoLink}/contributors/deletions`">Deletions</a>
+            <a :class="type === 'commits' ? 'active item' : 'item'" :href="`${repoLink}/activity/contributors/commits`">Commits</a>
+            <a :class="type === 'additions' ? 'active item' : 'item'" :href="`${repoLink}/activity/contributors/additions`">Additions</a>
+            <a :class="type === 'deletions' ? 'active item' : 'item'" :href="`${repoLink}/activity/contributors/deletions`">Deletions</a>
           </div>
         </div>
       </div>
@@ -94,7 +94,6 @@
 </template>
 
 <script>
-import {createApp} from 'vue';
 import {SvgIcon} from '../svg.js';
 import {
   Chart,
@@ -129,7 +128,7 @@ Chart.register(
   zoomPlugin
 );
 
-const sfc = {
+export default {
   components: {Line, SvgIcon},
   data: () => {
     return {
@@ -155,7 +154,7 @@ const sfc = {
   methods: {
     async fetchGraphData() {
       this.isLoading = true;
-      fetch(`${this.repoLink}/contributors/data`)
+      fetch(`${this.repoLink}/activity/contributors/data`)
         .then((response) => response.json())
         .then((data) => {
           const {total, ...rest} = data;
@@ -273,20 +272,10 @@ const sfc = {
           },
           y: {
             min: 0,
-            max: this.maxMainGraph(),
           },
         },
       };
     },
   },
 };
-
-export function initRepoContributorsChart() {
-  const el = document.getElementById('repo-contributors-chart');
-  if (el) {
-    createApp(sfc).mount(el);
-  }
-}
-
-export default sfc; // activate the IDE's Vue plugin
 </script>
diff --git a/web_src/js/features/contributors.js b/web_src/js/features/contributors.js
new file mode 100644
index 0000000000000..eab4ec584cc9a
--- /dev/null
+++ b/web_src/js/features/contributors.js
@@ -0,0 +1,16 @@
+import {createApp} from 'vue';
+import RepoContributors from '../components/RepoContributors.vue';
+
+export function initRepoContributors() {
+  const el = document.getElementById('repo-contributors-chart');
+  if (!el) return;
+
+  try {
+    const View = createApp(RepoContributors);
+
+    View.mount(el);
+  } catch (err) {
+    console.error('RepoContributors failed to load', err);
+    el.textContent = 'RepoContributors failed to load';
+  }
+}
\ No newline at end of file
diff --git a/web_src/js/index.js b/web_src/js/index.js
index b1945653c140c..ffa994f1ce873 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -2,7 +2,6 @@
 import './bootstrap.js';
 
 import {initRepoActivityTopAuthorsChart} from './components/RepoActivityTopAuthors.vue';
-import {initRepoContributorsChart} from './components/RepoContributors.vue';
 import {initScopedAccessTokenCategories} from './components/ScopedAccessTokenSelector.vue';
 import {initDashboardRepoList} from './components/DashboardRepoList.vue';
 
@@ -84,6 +83,7 @@ import {initGiteaFomantic} from './modules/fomantic.js';
 import {onDomReady} from './utils/dom.js';
 import {initRepoIssueList} from './features/repo-issue-list.js';
 import {initCommonIssueListQuickGoto} from './features/common-issue-list.js';
+import {initRepoContributors} from './features/contributors.js';
 
 // Init Gitea's Fomantic settings
 initGiteaFomantic();
@@ -137,7 +137,6 @@ onDomReady(() => {
   initOrgTeamSettings();
 
   initRepoActivityTopAuthorsChart();
-  initRepoContributorsChart();
   initRepoArchiveLinks();
   initRepoBranchButton();
   initRepoCodeView();
@@ -169,6 +168,7 @@ onDomReady(() => {
   initRepoWikiForm();
   initRepository();
   initRepositoryActionView();
+  initRepoContributors();
 
   initCommitStatuses();
   initCaptcha();

From 1cbeabf4f0ed5633a48ff82e359c881f88cb110a Mon Sep 17 00:00:00 2001
From: hiifong <i@hiif.ong>
Date: Wed, 28 Jun 2023 19:04:13 +0800
Subject: [PATCH 041/138] fix lint

---
 templates/repo/activity.tmpl               |   3 +-
 templates/repo/navbar.tmpl                 |  14 +-
 templates/repo/pulse.tmpl                  | 405 +++++++++++----------
 web_src/js/components/RepoContributors.vue |  14 +-
 web_src/js/features/contributors.js        |   2 +-
 5 files changed, 220 insertions(+), 218 deletions(-)

diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl
index 3c731fbad74da..f99d14782c61b 100644
--- a/templates/repo/activity.tmpl
+++ b/templates/repo/activity.tmpl
@@ -11,4 +11,5 @@
 		</div>
 	</div>
 </div>
-{{template "base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
+
diff --git a/templates/repo/navbar.tmpl b/templates/repo/navbar.tmpl
index 1f0a02b1af9b9..cf3bd572ce9bb 100644
--- a/templates/repo/navbar.tmpl
+++ b/templates/repo/navbar.tmpl
@@ -1,8 +1,8 @@
 <div class="ui fluid vertical menu">
-    <a class="{{if .PageIsPulse}}active{{end}} item" href="{{.RepoLink}}/activity">
-        {{.locale.Tr "repo.activity.navber.pulse"}}
-    </a>
-    <a class="{{if .PageIsContributors}}active{{end}} item" href="{{.RepoLink}}/activity/contributors">
-        {{.locale.Tr "repo.activity.navber.contributors"}}
-    </a>
-</div>
\ No newline at end of file
+	<a class="{{if .PageIsPulse}}active{{end}} item" href="{{.RepoLink}}/activity">
+		{{.locale.Tr "repo.activity.navber.pulse"}}
+	</a>
+	<a class="{{if .PageIsContributors}}active{{end}} item" href="{{.RepoLink}}/activity/contributors">
+		{{.locale.Tr "repo.activity.navber.contributors"}}
+	</a>
+</div>
diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl
index ecae985c630c8..0d1c9864dcf63 100644
--- a/templates/repo/pulse.tmpl
+++ b/templates/repo/pulse.tmpl
@@ -1,233 +1,234 @@
 <h2 class="ui header activity-header">
-    <span>{{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}}</span>
-    <!-- Period -->
-    <div class="ui floating dropdown jump filter">
-        <div class="ui basic compact button">
-            <span class="text">
-                {{.locale.Tr "repo.activity.period.filter_label"}} <strong>{{.PeriodText}}</strong>
-                {{svg "octicon-triangle-down" 14 "dropdown icon"}}
-            </span>
-        </div>
-        <div class="menu">
-            <a class="{{if eq .Period "daily"}}active {{end}}item" href="{{$.RepoLink}}/activity/daily">{{.locale.Tr "repo.activity.period.daily"}}</a>
-            <a class="{{if eq .Period "halfweekly"}}active {{end}}item" href="{{$.RepoLink}}/activity/halfweekly">{{.locale.Tr "repo.activity.period.halfweekly"}}</a>
-            <a class="{{if eq .Period "weekly"}}active {{end}}item" href="{{$.RepoLink}}/activity/weekly">{{.locale.Tr "repo.activity.period.weekly"}}</a>
-            <a class="{{if eq .Period "monthly"}}active {{end}}item" href="{{$.RepoLink}}/activity/monthly">{{.locale.Tr "repo.activity.period.monthly"}}</a>
-            <a class="{{if eq .Period "quarterly"}}active {{end}}item" href="{{$.RepoLink}}/activity/quarterly">{{.locale.Tr "repo.activity.period.quarterly"}}</a>
-            <a class="{{if eq .Period "semiyearly"}}active {{end}}item" href="{{$.RepoLink}}/activity/semiyearly">{{.locale.Tr "repo.activity.period.semiyearly"}}</a>
-            <a class="{{if eq .Period "yearly"}}active {{end}}item" href="{{$.RepoLink}}/activity/yearly">{{.locale.Tr "repo.activity.period.yearly"}}</a>
-        </div>
-    </div>
+	<span>{{DateTime "long" .DateFrom}} - {{DateTime "long" .DateUntil}}</span>
+	<!-- Period -->
+	<div class="ui floating dropdown jump filter">
+		<div class="ui basic compact button">
+			<span class="text">
+				{{.locale.Tr "repo.activity.period.filter_label"}} <strong>{{.PeriodText}}</strong>
+				{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+			</span>
+		</div>
+		<div class="menu">
+			<a class="{{if eq .Period "daily"}}active {{end}}item" href="{{$.RepoLink}}/activity/daily">{{.locale.Tr "repo.activity.period.daily"}}</a>
+			<a class="{{if eq .Period "halfweekly"}}active {{end}}item" href="{{$.RepoLink}}/activity/halfweekly">{{.locale.Tr "repo.activity.period.halfweekly"}}</a>
+			<a class="{{if eq .Period "weekly"}}active {{end}}item" href="{{$.RepoLink}}/activity/weekly">{{.locale.Tr "repo.activity.period.weekly"}}</a>
+			<a class="{{if eq .Period "monthly"}}active {{end}}item" href="{{$.RepoLink}}/activity/monthly">{{.locale.Tr "repo.activity.period.monthly"}}</a>
+			<a class="{{if eq .Period "quarterly"}}active {{end}}item" href="{{$.RepoLink}}/activity/quarterly">{{.locale.Tr "repo.activity.period.quarterly"}}</a>
+			<a class="{{if eq .Period "semiyearly"}}active {{end}}item" href="{{$.RepoLink}}/activity/semiyearly">{{.locale.Tr "repo.activity.period.semiyearly"}}</a>
+			<a class="{{if eq .Period "yearly"}}active {{end}}item" href="{{$.RepoLink}}/activity/yearly">{{.locale.Tr "repo.activity.period.yearly"}}</a>
+		</div>
+	</div>
 </h2>
 <div class="ui divider"></div>
 
 {{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}}
 <h4 class="ui top attached header">{{.locale.Tr "repo.activity.overview"}}</h4>
 <div class="ui attached segment two column grid">
-    {{if .Permission.CanRead $.UnitTypePullRequests}}
-        <div class="column">
-            {{if gt .Activity.ActivePRCount 0}}
-            <div class="stats-table">
-                <a href="#merged-pull-requests" class="table-cell tiny background purple" style="width: {{.Activity.MergedPRPerc}}{{if ne .Activity.MergedPRPerc 0}}%{{end}}"></a>
-                <a href="#proposed-pull-requests" class="table-cell tiny background green"></a>
-            </div>
-            {{else}}
-            <div class="stats-table">
-                <a class="table-cell tiny background light grey"></a>
-            </div>
-            {{end}}
-            {{.locale.TrN .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n" .Activity.ActivePRCount | Safe}}
-        </div>
-    {{end}}
-    {{if .Permission.CanRead $.UnitTypeIssues}}
-        <div class="column">
-            {{if gt .Activity.ActiveIssueCount 0}}
-            <div class="stats-table">
-                <a href="#closed-issues" class="table-cell tiny background red" style="width: {{.Activity.ClosedIssuePerc}}{{if ne .Activity.ClosedIssuePerc 0}}%{{end}}"></a>
-                <a href="#new-issues" class="table-cell tiny background green"></a>
-            </div>
-            {{else}}
-            <div class="stats-table">
-                <a class="table-cell tiny background light grey"></a>
-            </div>
-            {{end}}
-            {{.locale.TrN .Activity.ActiveIssueCount "repo.activity.active_issues_count_1" "repo.activity.active_issues_count_n" .Activity.ActiveIssueCount | Safe}}
-        </div>
-    {{end}}
+	{{if .Permission.CanRead $.UnitTypePullRequests}}
+		<div class="column">
+			{{if gt .Activity.ActivePRCount 0}}
+			<div class="stats-table">
+				<a href="#merged-pull-requests" class="table-cell tiny background purple" style="width: {{.Activity.MergedPRPerc}}{{if ne .Activity.MergedPRPerc 0}}%{{end}}"></a>
+				<a href="#proposed-pull-requests" class="table-cell tiny background green"></a>
+			</div>
+			{{else}}
+			<div class="stats-table">
+				<a class="table-cell tiny background light grey"></a>
+			</div>
+			{{end}}
+			{{.locale.TrN .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n" .Activity.ActivePRCount | Safe}}
+		</div>
+	{{end}}
+	{{if .Permission.CanRead $.UnitTypeIssues}}
+		<div class="column">
+			{{if gt .Activity.ActiveIssueCount 0}}
+			<div class="stats-table">
+				<a href="#closed-issues" class="table-cell tiny background red" style="width: {{.Activity.ClosedIssuePerc}}{{if ne .Activity.ClosedIssuePerc 0}}%{{end}}"></a>
+				<a href="#new-issues" class="table-cell tiny background green"></a>
+			</div>
+			{{else}}
+			<div class="stats-table">
+				<a class="table-cell tiny background light grey"></a>
+			</div>
+			{{end}}
+			{{.locale.TrN .Activity.ActiveIssueCount "repo.activity.active_issues_count_1" "repo.activity.active_issues_count_n" .Activity.ActiveIssueCount | Safe}}
+		</div>
+	{{end}}
 </div>
 <div class="ui attached segment horizontal segments">
-    {{if .Permission.CanRead $.UnitTypePullRequests}}
-        <a href="#merged-pull-requests" class="ui attached segment text center">
-            <span class="text purple">{{svg "octicon-git-pull-request"}}</span> <strong>{{.Activity.MergedPRCount}}</strong><br>
-            {{.locale.TrN .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n"}}
-        </a>
-        <a href="#proposed-pull-requests" class="ui attached segment text center">
-            <span class="text green">{{svg "octicon-git-branch"}}</span> <strong>{{.Activity.OpenedPRCount}}</strong><br>
-            {{.locale.TrN .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n"}}
-        </a>
-    {{end}}
-    {{if .Permission.CanRead $.UnitTypeIssues}}
-        <a href="#closed-issues" class="ui attached segment text center">
-            <span class="text red">{{svg "octicon-issue-closed"}}</span> <strong>{{.Activity.ClosedIssueCount}}</strong><br>
-            {{.locale.TrN .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n"}}
-        </a>
-        <a href="#new-issues" class="ui attached segment text center">
-            <span class="text green">{{svg "octicon-issue-opened"}}</span> <strong>{{.Activity.OpenedIssueCount}}</strong><br>
-            {{.locale.TrN .Activity.OpenedIssueCount "repo.activity.new_issues_count_1" "repo.activity.new_issues_count_n"}}
-        </a>
-    {{end}}
+	{{if .Permission.CanRead $.UnitTypePullRequests}}
+		<a href="#merged-pull-requests" class="ui attached segment text center">
+			<span class="text purple">{{svg "octicon-git-pull-request"}}</span> <strong>{{.Activity.MergedPRCount}}</strong><br>
+			{{.locale.TrN .Activity.MergedPRCount "repo.activity.merged_prs_count_1" "repo.activity.merged_prs_count_n"}}
+		</a>
+		<a href="#proposed-pull-requests" class="ui attached segment text center">
+			<span class="text green">{{svg "octicon-git-branch"}}</span> <strong>{{.Activity.OpenedPRCount}}</strong><br>
+			{{.locale.TrN .Activity.OpenedPRCount "repo.activity.opened_prs_count_1" "repo.activity.opened_prs_count_n"}}
+		</a>
+	{{end}}
+	{{if .Permission.CanRead $.UnitTypeIssues}}
+		<a href="#closed-issues" class="ui attached segment text center">
+			<span class="text red">{{svg "octicon-issue-closed"}}</span> <strong>{{.Activity.ClosedIssueCount}}</strong><br>
+			{{.locale.TrN .Activity.ClosedIssueCount "repo.activity.closed_issues_count_1" "repo.activity.closed_issues_count_n"}}
+		</a>
+		<a href="#new-issues" class="ui attached segment text center">
+			<span class="text green">{{svg "octicon-issue-opened"}}</span> <strong>{{.Activity.OpenedIssueCount}}</strong><br>
+			{{.locale.TrN .Activity.OpenedIssueCount "repo.activity.new_issues_count_1" "repo.activity.new_issues_count_n"}}
+		</a>
+	{{end}}
 </div>
 {{end}}
 
 {{if .Permission.CanRead $.UnitTypeCode}}
-    {{if eq .Activity.Code.CommitCountInAllBranches 0}}
-        <div class="ui center aligned segment">
-        <h4 class="ui header">{{.locale.Tr "repo.activity.no_git_activity"}}</h4>
-        </div>
-    {{end}}
-    {{if gt .Activity.Code.CommitCountInAllBranches 0}}
-        <div class="ui attached segment horizontal segments">
-            <div class="ui attached segment text">
-                {{.locale.Tr "repo.activity.git_stats_exclude_merges"}}
-                <strong>{{.locale.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_author_1" "repo.activity.git_stats_author_n" .Activity.Code.AuthorCount}}</strong>
-                {{.locale.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_pushed_1" "repo.activity.git_stats_pushed_n"}}
-                <strong>{{.locale.TrN .Activity.Code.CommitCount "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCount}}</strong>
-                {{.locale.Tr "repo.activity.git_stats_push_to_branch" .Repository.DefaultBranch}}
-                <strong>{{.locale.TrN .Activity.Code.CommitCountInAllBranches "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCountInAllBranches}}</strong>
-                {{.locale.Tr "repo.activity.git_stats_push_to_all_branches"}}
-                {{.locale.Tr "repo.activity.git_stats_on_default_branch" .Repository.DefaultBranch}}
-                <strong>{{.locale.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_file_1" "repo.activity.git_stats_file_n" .Activity.Code.ChangedFiles}}</strong>
-                {{.locale.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_files_changed_1" "repo.activity.git_stats_files_changed_n"}}
-                {{.locale.Tr "repo.activity.git_stats_additions"}}
-                <strong class="text green">{{.locale.TrN .Activity.Code.Additions "repo.activity.git_stats_addition_1" "repo.activity.git_stats_addition_n" .Activity.Code.Additions}}</strong>
-                {{.locale.Tr "repo.activity.git_stats_and_deletions"}}
-                <strong class="text red">{{.locale.TrN .Activity.Code.Deletions "repo.activity.git_stats_deletion_1" "repo.activity.git_stats_deletion_n" .Activity.Code.Deletions}}</strong>.
-            </div>
-            <div class="ui attached segment">
-                <div id="repo-activity-top-authors-chart"></div>
-            </div>
-        </div>
-    {{end}}
+	{{if eq .Activity.Code.CommitCountInAllBranches 0}}
+		<div class="ui center aligned segment">
+		<h4 class="ui header">{{.locale.Tr "repo.activity.no_git_activity"}}</h4>
+		</div>
+	{{end}}
+	{{if gt .Activity.Code.CommitCountInAllBranches 0}}
+		<div class="ui attached segment horizontal segments">
+			<div class="ui attached segment text">
+				{{.locale.Tr "repo.activity.git_stats_exclude_merges"}}
+				<strong>{{.locale.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_author_1" "repo.activity.git_stats_author_n" .Activity.Code.AuthorCount}}</strong>
+				{{.locale.TrN .Activity.Code.AuthorCount "repo.activity.git_stats_pushed_1" "repo.activity.git_stats_pushed_n"}}
+				<strong>{{.locale.TrN .Activity.Code.CommitCount "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCount}}</strong>
+				{{.locale.Tr "repo.activity.git_stats_push_to_branch" .Repository.DefaultBranch}}
+				<strong>{{.locale.TrN .Activity.Code.CommitCountInAllBranches "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n" .Activity.Code.CommitCountInAllBranches}}</strong>
+				{{.locale.Tr "repo.activity.git_stats_push_to_all_branches"}}
+				{{.locale.Tr "repo.activity.git_stats_on_default_branch" .Repository.DefaultBranch}}
+				<strong>{{.locale.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_file_1" "repo.activity.git_stats_file_n" .Activity.Code.ChangedFiles}}</strong>
+				{{.locale.TrN .Activity.Code.ChangedFiles "repo.activity.git_stats_files_changed_1" "repo.activity.git_stats_files_changed_n"}}
+				{{.locale.Tr "repo.activity.git_stats_additions"}}
+				<strong class="text green">{{.locale.TrN .Activity.Code.Additions "repo.activity.git_stats_addition_1" "repo.activity.git_stats_addition_n" .Activity.Code.Additions}}</strong>
+				{{.locale.Tr "repo.activity.git_stats_and_deletions"}}
+				<strong class="text red">{{.locale.TrN .Activity.Code.Deletions "repo.activity.git_stats_deletion_1" "repo.activity.git_stats_deletion_n" .Activity.Code.Deletions}}</strong>.
+			</div>
+			<div class="ui attached segment">
+				<div id="repo-activity-top-authors-chart"></div>
+			</div>
+		</div>
+	{{end}}
 {{end}}
 
 {{if gt .Activity.PublishedReleaseCount 0}}
-    <h4 class="ui horizontal divider header" id="published-releases">
-        <span class="text">{{svg "octicon-tag"}}</span>
-        {{.locale.Tr "repo.activity.title.releases_published_by"
-            (.locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount)
-            (.locale.TrN .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.PublishedReleaseAuthorCount)
-        }}
-    </h4>
-    <div class="list">
-        {{range .Activity.PublishedReleases}}
-            <p class="desc">
-                <span class="ui green label">{{$.locale.Tr "repo.activity.published_release_label"}}</span>
-                {{.TagName}}
-                {{if not .IsTag}}
-                    <a class="title" href="{{$.RepoLink}}/src/{{.TagName | PathEscapeSegments}}">{{.Title | RenderEmoji $.Context}}</a>
-                {{end}}
-                {{TimeSinceUnix .CreatedUnix $.locale}}
-            </p>
-        {{end}}
-    </div>
+	<h4 class="ui horizontal divider header" id="published-releases">
+		<span class="text">{{svg "octicon-tag"}}</span>
+		{{.locale.Tr "repo.activity.title.releases_published_by"
+			(.locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount)
+			(.locale.TrN .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.PublishedReleaseAuthorCount)
+		}}
+	</h4>
+	<div class="list">
+		{{range .Activity.PublishedReleases}}
+			<p class="desc">
+				<span class="ui green label">{{$.locale.Tr "repo.activity.published_release_label"}}</span>
+				{{.TagName}}
+				{{if not .IsTag}}
+					<a class="title" href="{{$.RepoLink}}/src/{{.TagName | PathEscapeSegments}}">{{.Title | RenderEmoji $.Context}}</a>
+				{{end}}
+				{{TimeSinceUnix .CreatedUnix $.locale}}
+			</p>
+		{{end}}
+	</div>
 {{end}}
 
 {{if gt .Activity.MergedPRCount 0}}
-    <h4 class="ui horizontal divider header" id="merged-pull-requests">
-        <span class="text">{{svg "octicon-git-pull-request"}}</span>
-        {{.locale.Tr "repo.activity.title.prs_merged_by"
-            (.locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount)
-            (.locale.TrN .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.MergedPRAuthorCount)
-        }}
-    </h4>
-    <div class="list">
-        {{range .Activity.MergedPRs}}
-            <p class="desc">
-                <span class="ui purple label">{{$.locale.Tr "repo.activity.merged_prs_label"}}</span>
-                #{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
-                {{TimeSinceUnix .MergedUnix $.locale}}
-            </p>
-        {{end}}
-    </div>
+	<h4 class="ui horizontal divider header" id="merged-pull-requests">
+		<span class="text">{{svg "octicon-git-pull-request"}}</span>
+		{{.locale.Tr "repo.activity.title.prs_merged_by"
+			(.locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount)
+			(.locale.TrN .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.MergedPRAuthorCount)
+		}}
+	</h4>
+	<div class="list">
+		{{range .Activity.MergedPRs}}
+			<p class="desc">
+				<span class="ui purple label">{{$.locale.Tr "repo.activity.merged_prs_label"}}</span>
+				#{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
+				{{TimeSinceUnix .MergedUnix $.locale}}
+			</p>
+		{{end}}
+	</div>
 {{end}}
 
 {{if gt .Activity.OpenedPRCount 0}}
-    <h4 class="ui horizontal divider header" id="proposed-pull-requests">
-        <span class="text">{{svg "octicon-git-branch"}}</span>
-        {{.locale.Tr "repo.activity.title.prs_opened_by"
-            (.locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount)
-            (.locale.TrN .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedPRAuthorCount)
-        }}
-    </h4>
-    <div class="list">
-        {{range .Activity.OpenedPRs}}
-            <p class="desc">
-                <span class="ui green label">{{$.locale.Tr "repo.activity.opened_prs_label"}}</span>
-                #{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
-                {{TimeSinceUnix .Issue.CreatedUnix $.locale}}
-            </p>
-        {{end}}
-    </div>
+	<h4 class="ui horizontal divider header" id="proposed-pull-requests">
+		<span class="text">{{svg "octicon-git-branch"}}</span>
+		{{.locale.Tr "repo.activity.title.prs_opened_by"
+			(.locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount)
+			(.locale.TrN .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedPRAuthorCount)
+		}}
+	</h4>
+	<div class="list">
+		{{range .Activity.OpenedPRs}}
+			<p class="desc">
+				<span class="ui green label">{{$.locale.Tr "repo.activity.opened_prs_label"}}</span>
+				#{{.Index}} <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Issue.Title | RenderEmoji $.Context}}</a>
+				{{TimeSinceUnix .Issue.CreatedUnix $.locale}}
+			</p>
+		{{end}}
+	</div>
 {{end}}
 
 {{if gt .Activity.ClosedIssueCount 0}}
-    <h4 class="ui horizontal divider header" id="closed-issues">
-        <span class="text">{{svg "octicon-issue-closed"}}</span>
-        {{.locale.Tr "repo.activity.title.issues_closed_from"
-            (.locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount)
-            (.locale.TrN .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.ClosedIssueAuthorCount)
-        }}
-    </h4>
-    <div class="list">
-        {{range .Activity.ClosedIssues}}
-            <p class="desc">
-                <span class="ui red label">{{$.locale.Tr "repo.activity.closed_issue_label"}}</span>
-                #{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-                {{TimeSinceUnix .ClosedUnix $.locale}}
-            </p>
-        {{end}}
-    </div>
+	<h4 class="ui horizontal divider header" id="closed-issues">
+		<span class="text">{{svg "octicon-issue-closed"}}</span>
+		{{.locale.Tr "repo.activity.title.issues_closed_from"
+			(.locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount)
+			(.locale.TrN .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.ClosedIssueAuthorCount)
+		}}
+	</h4>
+	<div class="list">
+		{{range .Activity.ClosedIssues}}
+			<p class="desc">
+				<span class="ui red label">{{$.locale.Tr "repo.activity.closed_issue_label"}}</span>
+				#{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
+				{{TimeSinceUnix .ClosedUnix $.locale}}
+			</p>
+		{{end}}
+	</div>
 {{end}}
 
 {{if gt .Activity.OpenedIssueCount 0}}
-    <h4 class="ui horizontal divider header" id="new-issues">
-        <span class="text">{{svg "octicon-issue-opened"}}</span>
-        {{.locale.Tr "repo.activity.title.issues_created_by"
-            (.locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount)
-            (.locale.TrN .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedIssueAuthorCount)
-        }}
-    </h4>
-    <div class="list">
-        {{range .Activity.OpenedIssues}}
-            <p class="desc">
-                <span class="ui green label">{{$.locale.Tr "repo.activity.new_issue_label"}}</span>
-                #{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-                {{TimeSinceUnix .CreatedUnix $.locale}}
-            </p>
-        {{end}}
-    </div>
+	<h4 class="ui horizontal divider header" id="new-issues">
+		<span class="text">{{svg "octicon-issue-opened"}}</span>
+		{{.locale.Tr "repo.activity.title.issues_created_by"
+			(.locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount)
+			(.locale.TrN .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedIssueAuthorCount)
+		}}
+	</h4>
+	<div class="list">
+		{{range .Activity.OpenedIssues}}
+			<p class="desc">
+				<span class="ui green label">{{$.locale.Tr "repo.activity.new_issue_label"}}</span>
+				#{{.Index}} <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
+				{{TimeSinceUnix .CreatedUnix $.locale}}
+			</p>
+		{{end}}
+	</div>
 {{end}}
 
 {{if gt .Activity.UnresolvedIssueCount 0}}
-    <h4 class="ui horizontal divider header" id="unresolved-conversations">
-        <span class="text">{{svg "octicon-comment-discussion"}}</span>
-        {{.locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}
-    </h4>
-    <div class="text center desc">
-        {{.locale.Tr "repo.activity.unresolved_conv_desc"}}
-    </div>
-    <div class="list">
-        {{range .Activity.UnresolvedIssues}}
-            <p class="desc">
-                <span class="ui green label">{{$.locale.Tr "repo.activity.unresolved_conv_label"}}</span>
-                #{{.Index}}
-                {{if .IsPull}}
-                <a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-                {{else}}
-                <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
-                {{end}}
-                {{TimeSinceUnix .UpdatedUnix $.locale}}
-            </p>
-        {{end}}
-    </div>
-{{end}}
\ No newline at end of file
+	<h4 class="ui horizontal divider header" id="unresolved-conversations">
+		<span class="text">{{svg "octicon-comment-discussion"}}</span>
+		{{.locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}
+	</h4>
+	<div class="text center desc">
+		{{.locale.Tr "repo.activity.unresolved_conv_desc"}}
+	</div>
+	<div class="list">
+		{{range .Activity.UnresolvedIssues}}
+			<p class="desc">
+				<span class="ui green label">{{$.locale.Tr "repo.activity.unresolved_conv_label"}}</span>
+				#{{.Index}}
+				{{if .IsPull}}
+				<a class="title" href="{{$.RepoLink}}/pulls/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
+				{{else}}
+				<a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Title | RenderEmoji $.Context}}</a>
+				{{end}}
+				{{TimeSinceUnix .UpdatedUnix $.locale}}
+			</p>
+		{{end}}
+	</div>
+{{end}}
+
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 18a230db438e4..bb8df4c6593c5 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -44,7 +44,7 @@
     </h2>
     <div class="ui divider"/>
     <div style="height: 380px">
-      <Line
+      <CLine
         v-if="Object.keys(totalStats).length !== 0"
         :data="toGraphData(totalStats.weeks)"
         :options="getOptions('main')"
@@ -82,7 +82,7 @@
         </div>
         <div class="ui attached segment">
           <div>
-            <Line
+            <CLine
               :data="toGraphData(contributor.weeks)"
               :options="getOptions('contributor')"
             />
@@ -109,7 +109,7 @@ import {
   Filler,
 } from 'chart.js';
 import zoomPlugin from 'chartjs-plugin-zoom';
-import {Line} from 'vue-chartjs';
+import {Line as CLine} from 'vue-chartjs';
 import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm';
 
 const {pageData} = window.config;
@@ -129,7 +129,7 @@ Chart.register(
 );
 
 export default {
-  components: {Line, SvgIcon},
+  components: {CLine, SvgIcon},
   data: () => {
     return {
       isLoading: false,
@@ -141,9 +141,6 @@ export default {
       dateUntil: null,
     };
   },
-  mounted() {
-    this.fetchGraphData();
-  },
   computed: {
     sortedContributors() {
       return Object.values(this.contributorsStats).sort((a, b) =>
@@ -151,6 +148,9 @@ export default {
       ).slice(0, 100);
     },
   },
+  mounted() {
+    this.fetchGraphData();
+  },
   methods: {
     async fetchGraphData() {
       this.isLoading = true;
diff --git a/web_src/js/features/contributors.js b/web_src/js/features/contributors.js
index eab4ec584cc9a..5a2fa75e4ffae 100644
--- a/web_src/js/features/contributors.js
+++ b/web_src/js/features/contributors.js
@@ -13,4 +13,4 @@ export function initRepoContributors() {
     console.error('RepoContributors failed to load', err);
     el.textContent = 'RepoContributors failed to load';
   }
-}
\ No newline at end of file
+}

From e0474585ad34730c44a997331dc3604cc0d5bc6e Mon Sep 17 00:00:00 2001
From: hiifong <i@hiif.ong>
Date: Wed, 28 Jun 2023 19:37:26 +0800
Subject: [PATCH 042/138] make generate-swagger

---
 templates/swagger/v1_json.tmpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index f07670508d35d..871901a19a955 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -23039,4 +23039,3 @@
     }
   ]
 }
-

From 49eaf6df28a1fce2b0cb7933ce883b3635b79011 Mon Sep 17 00:00:00 2001
From: hiifong <i@hiif.ong>
Date: Wed, 28 Jun 2023 19:43:44 +0800
Subject: [PATCH 043/138] fix typo

---
 options/locale/locale_en-US.ini | 4 ++--
 templates/repo/navbar.tmpl      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index b5ed6f3637026..236018f3c586e 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1840,8 +1840,8 @@ wiki.page_name_desc = Enter a name for this Wiki page. Some special names are: '
 wiki.original_git_entry_tooltip = View original Git file instead of using friendly link.
 
 activity = Activity
-activity.navber.pulse = Pulse
-activity.navber.contributors = Contributors
+activity.navbar.pulse = Pulse
+activity.navbar.contributors = Contributors
 activity.period.filter_label = Period:
 activity.period.daily = 1 day
 activity.period.halfweekly = 3 days
diff --git a/templates/repo/navbar.tmpl b/templates/repo/navbar.tmpl
index cf3bd572ce9bb..9dbf46daf6b16 100644
--- a/templates/repo/navbar.tmpl
+++ b/templates/repo/navbar.tmpl
@@ -1,8 +1,8 @@
 <div class="ui fluid vertical menu">
 	<a class="{{if .PageIsPulse}}active{{end}} item" href="{{.RepoLink}}/activity">
-		{{.locale.Tr "repo.activity.navber.pulse"}}
+		{{.locale.Tr "repo.activity.navbar.pulse"}}
 	</a>
 	<a class="{{if .PageIsContributors}}active{{end}} item" href="{{.RepoLink}}/activity/contributors">
-		{{.locale.Tr "repo.activity.navber.contributors"}}
+		{{.locale.Tr "repo.activity.navbar.contributors"}}
 	</a>
 </div>

From 3e156abb49fc68439a33dbdb6406fb27d88b7878 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 29 Jun 2023 14:24:22 +0200
Subject: [PATCH 044/138] Cherry-pick 64f2d7026 and resolve conflicts

This commit was needed because some of the changes by 64f2d7026 were
overwritten by me in previous merge commit. Details of 64f2d7026 as
follows:

Replace fomantic divider module with our own (#25539)

Should look exactly like before for normal dividers. "Horizontal" ones
look better because they no longer use image backgrounds.

<img width="917" alt="Screenshot 2023-06-27 at 19 07 56"
src="https://github.com/go-gitea/gitea/assets/115237/d97d8dec-6859-44a8-85ba-e4549b4dd9df">

<img width="914" alt="Screenshot 2023-06-27 at 19 05 58"
src="https://github.com/go-gitea/gitea/assets/115237/8bf98544-2d82-4ebf-ac68-d6dc237bd6b2">

<img width="1246" alt="Screenshot 2023-06-27 at 19 00 42"
src="https://github.com/go-gitea/gitea/assets/115237/36a6bb21-6029-4f53-8bee-535f55c66fed">

<img width="344" alt="Screenshot 2023-06-27 at 18 58 15"
src="https://github.com/go-gitea/gitea/assets/115237/a9e70aee-8e6b-4ea1-9e93-19c9f96aec6e">
<img width="823" alt="Screenshot 2023-06-27 at 18 56 22"
src="https://github.com/go-gitea/gitea/assets/115237/e7a497cd-f262-4683-8872-23c3c8cce32f">

<img width="330" alt="Screenshot 2023-06-27 at 19 21 11"
src="https://github.com/go-gitea/gitea/assets/115237/42f24149-a655-4c7e-bd26-8ab52db6446b">
---
 templates/package/view.tmpl | 19 +++++++++++--------
 templates/repo/pulse.tmpl   | 29 +++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl
index 6064db1b4c03e..043e8ca0121c7 100644
--- a/templates/package/view.tmpl
+++ b/templates/package/view.tmpl
@@ -84,14 +84,17 @@
 					{{end}}
 					</div>
 				{{end}}
-				<div class="divider"></div>
-				<strong>{{.locale.Tr "packages.versions"}} ({{.TotalVersionCount}})</strong>
-				<a class="ui right" href="{{$.PackageDescriptor.PackageWebLink}}/versions">{{.locale.Tr "packages.versions.view_all"}}</a>
-				<div class="ui relaxed list">
-				{{range .LatestVersions}}
-					<div class="item gt-df">
-						<a class="gt-f1" href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .LowerVersion}}">{{.Version}}</a>
-						<span class="text small">{{DateTime "short" .CreatedUnix}}</span>
+				{{if .LatestVersions}}
+					<div class="divider"></div>
+					<strong>{{.locale.Tr "packages.versions"}} ({{.TotalVersionCount}})</strong>
+					<a class="ui right" href="{{$.PackageDescriptor.PackageWebLink}}/versions">{{.locale.Tr "packages.versions.view_all"}}</a>
+					<div class="ui relaxed list">
+					{{range .LatestVersions}}
+						<div class="item gt-df">
+							<a class="gt-f1" href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .LowerVersion}}">{{.Version}}</a>
+							<span class="text small">{{DateTime "short" .CreatedUnix}}</span>
+						</div>
+					{{end}}
 					</div>
 				{{end}}
 				</div>
diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl
index 0d1c9864dcf63..f4a16a92c69d6 100644
--- a/templates/repo/pulse.tmpl
+++ b/templates/repo/pulse.tmpl
@@ -19,7 +19,7 @@
 		</div>
 	</div>
 </h2>
-<div class="ui divider"></div>
+<div class="divider"></div>
 
 {{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}}
 <h4 class="ui top attached header">{{.locale.Tr "repo.activity.overview"}}</h4>
@@ -111,8 +111,8 @@
 {{end}}
 
 {{if gt .Activity.PublishedReleaseCount 0}}
-	<h4 class="ui horizontal divider header" id="published-releases">
-		<span class="text">{{svg "octicon-tag"}}</span>
+	<h4 class="divider divider-text gt-normal-case" id="published-releases">
+		{{svg "octicon-tag" 16 "gt-mr-3"}}
 		{{.locale.Tr "repo.activity.title.releases_published_by"
 			(.locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount)
 			(.locale.TrN .Activity.PublishedReleaseAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.PublishedReleaseAuthorCount)
@@ -133,8 +133,8 @@
 {{end}}
 
 {{if gt .Activity.MergedPRCount 0}}
-	<h4 class="ui horizontal divider header" id="merged-pull-requests">
-		<span class="text">{{svg "octicon-git-pull-request"}}</span>
+	<h4 class="divider divider-text gt-normal-case" id="merged-pull-requests">
+		{{svg "octicon-git-pull-request" 16 "gt-mr-3"}}
 		{{.locale.Tr "repo.activity.title.prs_merged_by"
 			(.locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount)
 			(.locale.TrN .Activity.MergedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.MergedPRAuthorCount)
@@ -152,8 +152,8 @@
 {{end}}
 
 {{if gt .Activity.OpenedPRCount 0}}
-	<h4 class="ui horizontal divider header" id="proposed-pull-requests">
-		<span class="text">{{svg "octicon-git-branch"}}</span>
+	<h4 class="divider divider-text gt-normal-case" id="proposed-pull-requests">
+		{{svg "octicon-git-branch" 16 "gt-mr-3"}}
 		{{.locale.Tr "repo.activity.title.prs_opened_by"
 			(.locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount)
 			(.locale.TrN .Activity.OpenedPRAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedPRAuthorCount)
@@ -171,8 +171,8 @@
 {{end}}
 
 {{if gt .Activity.ClosedIssueCount 0}}
-	<h4 class="ui horizontal divider header" id="closed-issues">
-		<span class="text">{{svg "octicon-issue-closed"}}</span>
+	<h4 class="divider divider-text gt-normal-case" id="closed-issues">
+		{{svg "octicon-issue-closed" 16 "gt-mr-3"}}
 		{{.locale.Tr "repo.activity.title.issues_closed_from"
 			(.locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount)
 			(.locale.TrN .Activity.ClosedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.ClosedIssueAuthorCount)
@@ -190,8 +190,8 @@
 {{end}}
 
 {{if gt .Activity.OpenedIssueCount 0}}
-	<h4 class="ui horizontal divider header" id="new-issues">
-		<span class="text">{{svg "octicon-issue-opened"}}</span>
+	<h4 class="divider divider-text gt-normal-case" id="new-issues">
+		{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
 		{{.locale.Tr "repo.activity.title.issues_created_by"
 			(.locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount)
 			(.locale.TrN .Activity.OpenedIssueAuthorCount "repo.activity.title.user_1" "repo.activity.title.user_n" .Activity.OpenedIssueAuthorCount)
@@ -209,13 +209,10 @@
 {{end}}
 
 {{if gt .Activity.UnresolvedIssueCount 0}}
-	<h4 class="ui horizontal divider header" id="unresolved-conversations">
-		<span class="text">{{svg "octicon-comment-discussion"}}</span>
+	<h4 class="divider divider-text gt-normal-case" id="unresolved-conversations" data-tooltip-content="{{.locale.Tr "repo.activity.unresolved_conv_desc"}}">
+		{{svg "octicon-comment-discussion" 16 "gt-mr-3"}}
 		{{.locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}
 	</h4>
-	<div class="text center desc">
-		{{.locale.Tr "repo.activity.unresolved_conv_desc"}}
-	</div>
 	<div class="list">
 		{{range .Activity.UnresolvedIssues}}
 			<p class="desc">

From 7947bf92ecdc8f21641d5e7be9f99e66c3cd44c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 30 Jun 2023 11:29:44 +0300
Subject: [PATCH 045/138] Try updating date range when zoom or pan occurs

---
 web_src/js/components/RepoContributors.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index bb8df4c6593c5..35061c608e881 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -209,6 +209,10 @@ export default {
     updateOtherCharts(event) {
       const minVal = event.chart.options.scales.x.min;
       const maxVal = event.chart.options.scales.x.max;
+      if (minVal) {
+        this.dateFrom = new Date(minVal).toISOString();
+        this.dateUntil = new Date(maxVal).toISOString();
+      }
 
       for (const instance of Object.values(Chart.instances)) {
         if (instance !== event.chart) {

From 3d62edc4e431120e4d0927058e838a852ccc9fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 30 Jun 2023 21:05:49 +0300
Subject: [PATCH 046/138] Use v-memo to avoid unnecessary re-render

---
 web_src/js/components/RepoContributors.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 35061c608e881..6dbfeabd96c56 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -45,6 +45,7 @@
     <div class="ui divider"/>
     <div style="height: 380px">
       <CLine
+        v-memo="[totalStats.weeks]"
         v-if="Object.keys(totalStats).length !== 0"
         :data="toGraphData(totalStats.weeks)"
         :options="getOptions('main')"
@@ -57,6 +58,7 @@
         v-for="(contributor, index) in sortedContributors"
         :key="index"
         class="column stats-table"
+        v-memo="[sortedContributors]"
       >
         <div class="ui top attached header gt-df gt-f1">
           <b class="ui right">#{{ index + 1 }}</b>

From e5537ccde685ebbb96af51faff6c07ec647f8064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 30 Jun 2023 21:24:29 +0300
Subject: [PATCH 047/138] Preparation step for sorting contributor graphs

---
 web_src/js/components/RepoContributors.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 6dbfeabd96c56..b2b653e5069da 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -44,7 +44,7 @@
     </h2>
     <div class="ui divider"/>
     <div style="height: 380px">
-      <CLine
+      <Line
         v-memo="[totalStats.weeks]"
         v-if="Object.keys(totalStats).length !== 0"
         :data="toGraphData(totalStats.weeks)"
@@ -84,7 +84,7 @@
         </div>
         <div class="ui attached segment">
           <div>
-            <CLine
+            <Line
               :data="toGraphData(contributor.weeks)"
               :options="getOptions('contributor')"
             />
@@ -111,7 +111,7 @@ import {
   Filler,
 } from 'chart.js';
 import zoomPlugin from 'chartjs-plugin-zoom';
-import {Line as CLine} from 'vue-chartjs';
+import {Line} from 'vue-chartjs';
 import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm';
 
 const {pageData} = window.config;
@@ -131,11 +131,12 @@ Chart.register(
 );
 
 export default {
-  components: {CLine, SvgIcon},
+  components: {Line, SvgIcon},
   data: () => {
     return {
       isLoading: false,
       totalStats: {},
+      sortedContributors: {},
       repoLink: pageData.repoLink || [],
       type: pageData.contributionType,
       contributorsStats: [],
@@ -143,17 +144,15 @@ export default {
       dateUntil: null,
     };
   },
-  computed: {
-    sortedContributors() {
-      return Object.values(this.contributorsStats).sort((a, b) =>
-        a.total_commits > b.total_commits ? -1 : a.total_commits === b.total_commits ? 0 : 1
-      ).slice(0, 100);
-    },
-  },
   mounted() {
     this.fetchGraphData();
   },
   methods: {
+    sortContributors() {
+      this.sortedContributors =  Object.values(this.contributorsStats).sort((a, b) =>
+        a.total_commits > b.total_commits ? -1 : a.total_commits === b.total_commits ? 0 : 1
+      ).slice(0, 100);
+    },
     async fetchGraphData() {
       this.isLoading = true;
       fetch(`${this.repoLink}/activity/contributors/data`)
@@ -161,6 +160,7 @@ export default {
         .then((data) => {
           const {total, ...rest} = data;
           this.contributorsStats = rest;
+          this.sortContributors()
           this.totalStats = total;
           this.dateFrom = new Date(total.weeks[0].week).toISOString();
           this.dateUntil = new Date().toISOString();

From 7a69f2ec1c76a30e083dc4e39df57a9c78b3c6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 30 Jun 2023 22:15:38 +0300
Subject: [PATCH 048/138] Update contributor graphs based on selected date
 range

---
 web_src/js/components/RepoContributors.vue | 43 +++++++++++++++-------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index b2b653e5069da..3c37adbb25630 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -149,7 +149,8 @@ export default {
   },
   methods: {
     sortContributors() {
-      this.sortedContributors =  Object.values(this.contributorsStats).sort((a, b) =>
+      const contributors = this.filterContributorWeeksByDateRange()
+      this.sortedContributors =  Object.values(contributors).sort((a, b) =>
         a.total_commits > b.total_commits ? -1 : a.total_commits === b.total_commits ? 0 : 1
       ).slice(0, 100);
     },
@@ -160,13 +161,31 @@ export default {
         .then((data) => {
           const {total, ...rest} = data;
           this.contributorsStats = rest;
+          this.dateFrom = new Date(total.weeks[0].week)
+          this.dateUntil = new Date()
           this.sortContributors()
           this.totalStats = total;
-          this.dateFrom = new Date(total.weeks[0].week).toISOString();
-          this.dateUntil = new Date().toISOString();
           this.isLoading = false;
         });
     },
+
+    filterContributorWeeksByDateRange() {
+      const filteredData = {};
+
+      const data = this.contributorsStats
+      for (const userEmail in data) {
+        const user = data[userEmail];
+        const filteredWeeks = user.weeks.filter((week) => {
+          const weekDate = new Date(week.week);
+          return weekDate >= this.dateFrom && weekDate <= this.dateUntil;
+        });
+
+        filteredData[userEmail] = { ...user, weeks: filteredWeeks };
+        filteredData[userEmail]["total_commits"] = this.commits(filteredWeeks)
+      }
+
+      return filteredData;
+    },
     maxMainGraph() {
       const maxValue = Math.max(
         ...this.totalStats.weeks.map((o) => o[this.type])
@@ -180,6 +199,9 @@ export default {
       }
       return (1 - (cooefficient % 1)) * 10 ** exp + maxValue;
     },
+    commits(data){
+      return Object.values(data).reduce((acc, item) => acc + item.commits, 0);
+    },
     additions(data) {
       return Object.values(data).reduce((acc, item) => acc + item.additions, 0);
     },
@@ -212,16 +234,9 @@ export default {
       const minVal = event.chart.options.scales.x.min;
       const maxVal = event.chart.options.scales.x.max;
       if (minVal) {
-        this.dateFrom = new Date(minVal).toISOString();
-        this.dateUntil = new Date(maxVal).toISOString();
-      }
-
-      for (const instance of Object.values(Chart.instances)) {
-        if (instance !== event.chart) {
-          instance.options.scales.x.min = minVal;
-          instance.options.scales.x.max = maxVal;
-          instance.update();
-        }
+        this.dateFrom = new Date(minVal)
+        this.dateUntil = new Date(maxVal)
+        this.sortContributors()
       }
     },
 
@@ -245,7 +260,7 @@ export default {
               mode: 'x',
               threshold: 20,
 
-              onPan: this.updateOtherCharts,
+              onPanComplete: this.updateOtherCharts,
             },
             limits: {
               x: {

From 5d2b76426159211736492e0310ea44898474c85e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 30 Jun 2023 22:22:36 +0300
Subject: [PATCH 049/138] Calculate total stats while looping to avoid
 unnecessary computation later

---
 web_src/js/components/RepoContributors.vue | 24 ++++++++++------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 3c37adbb25630..7ffc49fcb50d1 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -75,10 +75,10 @@
             <p class="gt-font-12">
               <strong>{{ contributor.total_commits.toLocaleString() }} commits
               </strong>
-              <strong class="text green">{{ additions(contributor.weeks).toLocaleString() }}++
+              <strong class="text green">{{ contributor.total_additions.toLocaleString() }}++
               </strong>
               <strong class="text red">
-                {{ deletions(contributor.weeks).toLocaleString() }}--</strong>
+                {{ contributor.total_deletions.toLocaleString() }}--</strong>
             </p>
           </div>
         </div>
@@ -175,13 +175,20 @@ export default {
       const data = this.contributorsStats
       for (const userEmail in data) {
         const user = data[userEmail];
+        user["total_commits"] = 0
+        user["total_additions"] = 0
+        user["total_deletions"] = 0
         const filteredWeeks = user.weeks.filter((week) => {
           const weekDate = new Date(week.week);
-          return weekDate >= this.dateFrom && weekDate <= this.dateUntil;
+          if (weekDate >= this.dateFrom && weekDate <= this.dateUntil) {
+            user["total_commits"] += week.commits
+            user["total_additions"] += week.additions
+            user["total_deletions"] += week.deletions
+            return true
+          } else return false
         });
 
         filteredData[userEmail] = { ...user, weeks: filteredWeeks };
-        filteredData[userEmail]["total_commits"] = this.commits(filteredWeeks)
       }
 
       return filteredData;
@@ -199,15 +206,6 @@ export default {
       }
       return (1 - (cooefficient % 1)) * 10 ** exp + maxValue;
     },
-    commits(data){
-      return Object.values(data).reduce((acc, item) => acc + item.commits, 0);
-    },
-    additions(data) {
-      return Object.values(data).reduce((acc, item) => acc + item.additions, 0);
-    },
-    deletions(data) {
-      return Object.values(data).reduce((acc, item) => acc + item.deletions, 0);
-    },
 
     toGraphData(data) {
       const style = getComputedStyle(document.body);

From d0714e7d4bfc8d1c2be3232a64fdfc24e032ae61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 30 Jun 2023 22:34:41 +0300
Subject: [PATCH 050/138] Sort contributors based on selected contribution type

---
 web_src/js/components/RepoContributors.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 7ffc49fcb50d1..4882c542c2de5 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -150,8 +150,9 @@ export default {
   methods: {
     sortContributors() {
       const contributors = this.filterContributorWeeksByDateRange()
+      const sortingCriteria = "total_" + this.type
       this.sortedContributors =  Object.values(contributors).sort((a, b) =>
-        a.total_commits > b.total_commits ? -1 : a.total_commits === b.total_commits ? 0 : 1
+        a[sortingCriteria] > b[sortingCriteria] ? -1 : a[sortingCriteria] === b[sortingCriteria] ? 0 : 1
       ).slice(0, 100);
     },
     async fetchGraphData() {

From b273ba767a998fd6ea18884a224f9f1b51b5e68a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 30 Jun 2023 22:36:55 +0300
Subject: [PATCH 051/138] Do not show contributor graph if total contribution
 is 0 on selected date range

---
 web_src/js/components/RepoContributors.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 4882c542c2de5..4464d35ebae31 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -151,7 +151,7 @@ export default {
     sortContributors() {
       const contributors = this.filterContributorWeeksByDateRange()
       const sortingCriteria = "total_" + this.type
-      this.sortedContributors =  Object.values(contributors).sort((a, b) =>
+      this.sortedContributors =  Object.values(contributors).filter(contributor=>contributor[sortingCriteria]!==0).sort((a, b) =>
         a[sortingCriteria] > b[sortingCriteria] ? -1 : a[sortingCriteria] === b[sortingCriteria] ? 0 : 1
       ).slice(0, 100);
     },

From 1e163bb13fc8fb93584517a8dace6ba44f4fc168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 30 Jun 2023 22:55:12 +0300
Subject: [PATCH 052/138] Set highest value for contributor graphs dynamically

Use the same value for all graphs to make them easily comparable. The
highest value is max(max(contributors->weeks[contribution_type]))
---
 web_src/js/components/RepoContributors.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 4464d35ebae31..535d75f9455fa 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -179,12 +179,16 @@ export default {
         user["total_commits"] = 0
         user["total_additions"] = 0
         user["total_deletions"] = 0
+        user["max_contribution_type"] = 0
         const filteredWeeks = user.weeks.filter((week) => {
           const weekDate = new Date(week.week);
           if (weekDate >= this.dateFrom && weekDate <= this.dateUntil) {
             user["total_commits"] += week.commits
             user["total_additions"] += week.additions
             user["total_deletions"] += week.deletions
+            if (week[this.type] > user["max_contribution_type"]){
+              user["max_contribution_type"] = week[this.type]
+            }
             return true
           } else return false
         });
@@ -194,9 +198,9 @@ export default {
 
       return filteredData;
     },
-    maxMainGraph() {
+    maxContributorGraph() {
       const maxValue = Math.max(
-        ...this.totalStats.weeks.map((o) => o[this.type])
+        ...this.sortedContributors.map((c) => c["max_contribution_type"])
       );
       const [cooefficient, exp] = maxValue
         .toExponential()
@@ -292,6 +296,7 @@ export default {
           },
           y: {
             min: 0,
+            max: this.maxContributorGraph(),
           },
         },
       };

From e4ccffd264d91df19b6168604765e6559073fc8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sat, 1 Jul 2023 00:21:35 +0300
Subject: [PATCH 053/138] Fix a bug while parsing the commits

Sometimes, commit dates doesn't fall between start-date and end-date.
This was throwing index out of bounds error. Now we are checking if
commit date is actually within start-date and end-date and skip it if it
is not.
---
 models/contributors/contributors_graph.go | 24 ++++++++++++++---------
 modules/git/repo_commit.go                |  8 +++++++-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/models/contributors/contributors_graph.go b/models/contributors/contributors_graph.go
index 2bfaa2e27a43b..ec8448c225e0d 100644
--- a/models/contributors/contributors_graph.go
+++ b/models/contributors/contributors_graph.go
@@ -11,6 +11,7 @@ import (
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/log"
 	api "code.gitea.io/gitea/modules/structs"
 	util "code.gitea.io/gitea/modules/util"
 )
@@ -92,16 +93,21 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository, revis
 		val, _ := time.Parse(layout, startingOfWeek)
 		startingSundayParsed, _ := time.Parse(layout, startingSunday)
 		idx := int(val.Sub(startingSundayParsed).Hours()/24) / 7
-		user.Weeks[idx].Additions += v.Stats.Additions
-		user.Weeks[idx].Deletions += v.Stats.Deletions
-		user.Weeks[idx].Commits++
-		user.TotalCommits++
 
-		// Update overall statistics
-		total.Weeks[idx].Additions += v.Stats.Additions
-		total.Weeks[idx].Deletions += v.Stats.Deletions
-		total.Weeks[idx].Commits++
-		total.TotalCommits++
+		if idx >= 0 && idx < len(user.Weeks) {
+			user.Weeks[idx].Additions += v.Stats.Additions
+			user.Weeks[idx].Deletions += v.Stats.Deletions
+			user.Weeks[idx].Commits++
+			user.TotalCommits++
+
+			// Update overall statistics
+			total.Weeks[idx].Additions += v.Stats.Additions
+			total.Weeks[idx].Deletions += v.Stats.Deletions
+			total.Weeks[idx].Commits++
+			total.TotalCommits++
+		} else {
+			log.Warn("date range of the commit is not between starting date and ending date, skipping...")
+		}
 	}
 
 	return contributorsCommitStats, nil
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index 2280bbf5885f1..7212b44e7d6ad 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -237,7 +237,7 @@ func (repo *Repository) ExtendedCommitStats(revision string /*, limit int */) ([
 		_ = stdoutWriter.Close()
 	}()
 
-	gitCmd := NewCommand(repo.Ctx, "log", "--shortstat", "--no-merges", "--pretty=format:%aN%n%aE%n%as", "--reverse")
+	gitCmd := NewCommand(repo.Ctx, "log", "--shortstat", "--no-merges", "--pretty=format:---%n%cN%n%cE%n%cs", "--reverse")
 	// AddOptionFormat("--max-count=%d", limit)
 	gitCmd.AddDynamicArguments(baseCommit.ID.String())
 
@@ -253,6 +253,11 @@ func (repo *Repository) ExtendedCommitStats(revision string /*, limit int */) ([
 			scanner.Split(bufio.ScanLines)
 
 			for scanner.Scan() {
+				line := strings.TrimSpace(scanner.Text())
+				if line != "---" {
+					continue
+				}
+				scanner.Scan()
 				authorName := strings.TrimSpace(scanner.Text())
 				scanner.Scan()
 				authorEmail := strings.TrimSpace(scanner.Text())
@@ -263,6 +268,7 @@ func (repo *Repository) ExtendedCommitStats(revision string /*, limit int */) ([
 				if authorName == "" || authorEmail == "" || date == "" || stats == "" {
 					// FIXME: find a better way to parse the output so that we will handle this properly
 					log.Warn("Something is wrong with git log output, skipping...")
+					log.Warn("authorName: %s,  authorEmail: %s,  date: %s,  stats: %s", authorName, authorEmail, date, stats)
 					continue
 				}
 				//  1 file changed, 1 insertion(+), 1 deletion(-)

From 6ffe1f16ee772910b9482823eed2ffb0533df270 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sat, 1 Jul 2023 01:10:34 +0300
Subject: [PATCH 054/138] Fix linting errors

---
 web_src/js/components/RepoContributors.vue | 58 +++++++++++-----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 535d75f9455fa..4cc70ab3d065f 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -44,7 +44,7 @@
     </h2>
     <div class="ui divider"/>
     <div style="height: 380px">
-      <Line
+      <CLine
         v-memo="[totalStats.weeks]"
         v-if="Object.keys(totalStats).length !== 0"
         :data="toGraphData(totalStats.weeks)"
@@ -84,7 +84,7 @@
         </div>
         <div class="ui attached segment">
           <div>
-            <Line
+            <CLine
               :data="toGraphData(contributor.weeks)"
               :options="getOptions('contributor')"
             />
@@ -111,7 +111,7 @@ import {
   Filler,
 } from 'chart.js';
 import zoomPlugin from 'chartjs-plugin-zoom';
-import {Line} from 'vue-chartjs';
+import {Line as CLine} from 'vue-chartjs';
 import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm';
 
 const {pageData} = window.config;
@@ -131,7 +131,7 @@ Chart.register(
 );
 
 export default {
-  components: {Line, SvgIcon},
+  components: {CLine, SvgIcon},
   data: () => {
     return {
       isLoading: false,
@@ -149,9 +149,9 @@ export default {
   },
   methods: {
     sortContributors() {
-      const contributors = this.filterContributorWeeksByDateRange()
-      const sortingCriteria = "total_" + this.type
-      this.sortedContributors =  Object.values(contributors).filter(contributor=>contributor[sortingCriteria]!==0).sort((a, b) =>
+      const contributors = this.filterContributorWeeksByDateRange();
+      const sortingCriteria = `total_${this.type}`;
+      this.sortedContributors = Object.values(contributors).filter((contributor) => contributor[sortingCriteria] !== 0).sort((a, b) =>
         a[sortingCriteria] > b[sortingCriteria] ? -1 : a[sortingCriteria] === b[sortingCriteria] ? 0 : 1
       ).slice(0, 100);
     },
@@ -162,9 +162,9 @@ export default {
         .then((data) => {
           const {total, ...rest} = data;
           this.contributorsStats = rest;
-          this.dateFrom = new Date(total.weeks[0].week)
-          this.dateUntil = new Date()
-          this.sortContributors()
+          this.dateFrom = new Date(total.weeks[0].week);
+          this.dateUntil = new Date();
+          this.sortContributors();
           this.totalStats = total;
           this.isLoading = false;
         });
@@ -173,34 +173,34 @@ export default {
     filterContributorWeeksByDateRange() {
       const filteredData = {};
 
-      const data = this.contributorsStats
-      for (const userEmail in data) {
-        const user = data[userEmail];
-        user["total_commits"] = 0
-        user["total_additions"] = 0
-        user["total_deletions"] = 0
-        user["max_contribution_type"] = 0
+      const data = this.contributorsStats;
+      for (const key of Object.keys(data)) {
+        const user = data[key];
+        user['total_commits'] = 0;
+        user['total_additions'] = 0;
+        user['total_deletions'] = 0;
+        user['max_contribution_type'] = 0;
         const filteredWeeks = user.weeks.filter((week) => {
           const weekDate = new Date(week.week);
           if (weekDate >= this.dateFrom && weekDate <= this.dateUntil) {
-            user["total_commits"] += week.commits
-            user["total_additions"] += week.additions
-            user["total_deletions"] += week.deletions
-            if (week[this.type] > user["max_contribution_type"]){
-              user["max_contribution_type"] = week[this.type]
+            user['total_commits'] += week.commits;
+            user['total_additions'] += week.additions;
+            user['total_deletions'] += week.deletions;
+            if (week[this.type] > user['max_contribution_type']) {
+              user['max_contribution_type'] = week[this.type];
             }
-            return true
-          } else return false
+            return true;
+          } return false;
         });
 
-        filteredData[userEmail] = { ...user, weeks: filteredWeeks };
+        filteredData[key] = {...user, weeks: filteredWeeks};
       }
 
       return filteredData;
     },
     maxContributorGraph() {
       const maxValue = Math.max(
-        ...this.sortedContributors.map((c) => c["max_contribution_type"])
+        ...this.sortedContributors.map((c) => c['max_contribution_type'])
       );
       const [cooefficient, exp] = maxValue
         .toExponential()
@@ -237,9 +237,9 @@ export default {
       const minVal = event.chart.options.scales.x.min;
       const maxVal = event.chart.options.scales.x.max;
       if (minVal) {
-        this.dateFrom = new Date(minVal)
-        this.dateUntil = new Date(maxVal)
-        this.sortContributors()
+        this.dateFrom = new Date(minVal);
+        this.dateUntil = new Date(maxVal);
+        this.sortContributors();
       }
     },
 

From 497ce76e30da766fc858b4e9a67f0a187e8e5b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sat, 1 Jul 2023 16:07:33 +0300
Subject: [PATCH 055/138] Fix linting errors

---
 templates/package/view.tmpl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl
index 043e8ca0121c7..755c93fde3012 100644
--- a/templates/package/view.tmpl
+++ b/templates/package/view.tmpl
@@ -73,7 +73,7 @@
 					{{end}}
 				</div>
 				{{if not (eq .PackageDescriptor.Package.Type "container")}}
-					<div class="divider"></div>
+					<div class="ui divider"></div>
 					<strong>{{.locale.Tr "packages.assets"}} ({{len .PackageDescriptor.Files}})</strong>
 					<div class="ui relaxed list">
 					{{range .PackageDescriptor.Files}}
@@ -85,7 +85,7 @@
 					</div>
 				{{end}}
 				{{if .LatestVersions}}
-					<div class="divider"></div>
+					<div class="ui divider"></div>
 					<strong>{{.locale.Tr "packages.versions"}} ({{.TotalVersionCount}})</strong>
 					<a class="ui right" href="{{$.PackageDescriptor.PackageWebLink}}/versions">{{.locale.Tr "packages.versions.view_all"}}</a>
 					<div class="ui relaxed list">
@@ -97,9 +97,8 @@
 					{{end}}
 					</div>
 				{{end}}
-				</div>
 				{{if or .CanWritePackages .HasRepositoryAccess}}
-					<div class="divider"></div>
+					<div class="ui divider"></div>
 					<div class="ui relaxed list">
 						{{if .HasRepositoryAccess}}
 						<div class="item">{{svg "octicon-issue-opened" 16 "gt-mr-3"}} <a href="{{.PackageDescriptor.Repository.Link}}/issues">{{.locale.Tr "repo.issues"}}</a></div>

From 145d3ca84c88fa4d54788bf7d9fb56b049e792bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sat, 1 Jul 2023 16:45:49 +0300
Subject: [PATCH 056/138] Fix linting errors

---
 templates/package/view.tmpl | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl
index 755c93fde3012..6064db1b4c03e 100644
--- a/templates/package/view.tmpl
+++ b/templates/package/view.tmpl
@@ -73,7 +73,7 @@
 					{{end}}
 				</div>
 				{{if not (eq .PackageDescriptor.Package.Type "container")}}
-					<div class="ui divider"></div>
+					<div class="divider"></div>
 					<strong>{{.locale.Tr "packages.assets"}} ({{len .PackageDescriptor.Files}})</strong>
 					<div class="ui relaxed list">
 					{{range .PackageDescriptor.Files}}
@@ -84,21 +84,19 @@
 					{{end}}
 					</div>
 				{{end}}
-				{{if .LatestVersions}}
-					<div class="ui divider"></div>
-					<strong>{{.locale.Tr "packages.versions"}} ({{.TotalVersionCount}})</strong>
-					<a class="ui right" href="{{$.PackageDescriptor.PackageWebLink}}/versions">{{.locale.Tr "packages.versions.view_all"}}</a>
-					<div class="ui relaxed list">
-					{{range .LatestVersions}}
-						<div class="item gt-df">
-							<a class="gt-f1" href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .LowerVersion}}">{{.Version}}</a>
-							<span class="text small">{{DateTime "short" .CreatedUnix}}</span>
-						</div>
-					{{end}}
+				<div class="divider"></div>
+				<strong>{{.locale.Tr "packages.versions"}} ({{.TotalVersionCount}})</strong>
+				<a class="ui right" href="{{$.PackageDescriptor.PackageWebLink}}/versions">{{.locale.Tr "packages.versions.view_all"}}</a>
+				<div class="ui relaxed list">
+				{{range .LatestVersions}}
+					<div class="item gt-df">
+						<a class="gt-f1" href="{{$.PackageDescriptor.PackageWebLink}}/{{PathEscape .LowerVersion}}">{{.Version}}</a>
+						<span class="text small">{{DateTime "short" .CreatedUnix}}</span>
 					</div>
 				{{end}}
+				</div>
 				{{if or .CanWritePackages .HasRepositoryAccess}}
-					<div class="ui divider"></div>
+					<div class="divider"></div>
 					<div class="ui relaxed list">
 						{{if .HasRepositoryAccess}}
 						<div class="item">{{svg "octicon-issue-opened" 16 "gt-mr-3"}} <a href="{{.PackageDescriptor.Repository.Link}}/issues">{{.locale.Tr "repo.issues"}}</a></div>

From 991e3c01b2f73659a3fed7d4eb5046aa061f5a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 6 Jul 2023 11:06:34 +0300
Subject: [PATCH 057/138] Show loading animation while fetching data

---
 web_src/js/components/RepoContributors.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 4cc70ab3d065f..ee5f9580f0d8c 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -12,7 +12,7 @@
       >
         {{ dateFrom }}
       </relative-time>
-      -
+      {{ isLoading ? "Loading contributions..." : "-" }}
       <relative-time
         v-if="dateUntil !== null"
         format="datetime"
@@ -43,7 +43,11 @@
       </div>
     </h2>
     <div class="ui divider"/>
-    <div style="height: 380px">
+    <div style="height: 380px" class="gt-df">
+      <div v-if="isLoading" class="gt-tc gt-m-auto">
+        <p>This might take a few minutes...</p>
+        <SvgIcon v-if="isLoading" name="octicon-sync" class="gt-mr-3 job-status-rotate"/>
+      </div>
       <CLine
         v-memo="[totalStats.weeks]"
         v-if="Object.keys(totalStats).length !== 0"

From 8ba367458699b1c225d9700af7892a49485db483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 6 Jul 2023 13:33:27 +0300
Subject: [PATCH 058/138] Eliminate unnecessary fetch when contribution type
 changes

---
 web_src/js/components/RepoContributors.vue | 69 +++++++++++++++-------
 1 file changed, 47 insertions(+), 22 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index ee5f9580f0d8c..56f782b27215d 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -27,7 +27,7 @@
 
       <div class="ui right">
         <!-- Contribution type -->
-        <div class="ui dropdown simple">
+        <div class="ui dropdown jump" id="dropdown">
           <div class="ui basic compact button">
             <span class="text">
               Contribution type: <strong>{{ type }}</strong>
@@ -35,44 +35,41 @@
             </span>
           </div>
           <div class="menu">
-            <a :class="type === 'commits' ? 'active item' : 'item'" :href="`${repoLink}/activity/contributors/commits`">Commits</a>
-            <a :class="type === 'additions' ? 'active item' : 'item'" :href="`${repoLink}/activity/contributors/additions`">Additions</a>
-            <a :class="type === 'deletions' ? 'active item' : 'item'" :href="`${repoLink}/activity/contributors/deletions`">Deletions</a>
+            <div :class="type === 'commits' ? 'active item' : 'item'">
+              Commits
+            </div>
+            <div :class="type === 'additions' ? 'active item' : 'item'">
+              Additions
+            </div>
+            <div :class="type === 'deletions' ? 'active item' : 'item'">
+              Deletions
+            </div>
           </div>
         </div>
       </div>
     </h2>
-    <div class="ui divider"/>
+    <div class="divider"/>
     <div style="height: 380px" class="gt-df">
       <div v-if="isLoading" class="gt-tc gt-m-auto">
         <p>This might take a few minutes...</p>
         <SvgIcon v-if="isLoading" name="octicon-sync" class="gt-mr-3 job-status-rotate"/>
       </div>
       <CLine
-        v-memo="[totalStats.weeks]"
-        v-if="Object.keys(totalStats).length !== 0"
-        :data="toGraphData(totalStats.weeks)"
-        :options="getOptions('main')"
+        v-memo="[totalStats.weeks, type]" v-if="Object.keys(totalStats).length !== 0"
+        :data="toGraphData(totalStats.weeks)" :options="getOptions('main')"
       />
     </div>
-    <div class="ui divider"/>
+    <div class="divider"/>
 
     <div class="ui attached two column grid">
       <div
-        v-for="(contributor, index) in sortedContributors"
-        :key="index"
-        class="column stats-table"
-        v-memo="[sortedContributors]"
+        v-for="(contributor, index) in sortedContributors" :key="index" class="column stats-table"
+        v-memo="[sortedContributors, type]"
       >
         <div class="ui top attached header gt-df gt-f1">
           <b class="ui right">#{{ index + 1 }}</b>
           <a :href="contributor.home_link">
-            <img
-              height="40"
-              width="40"
-              :href="contributor.avatar_link"
-              :src="contributor.avatar_link"
-            >
+            <img height="40" width="40" :href="contributor.avatar_link" :src="contributor.avatar_link">
           </a>
           <div class="gt-ml-3">
             <a :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a>
@@ -117,6 +114,7 @@ import {
 import zoomPlugin from 'chartjs-plugin-zoom';
 import {Line as CLine} from 'vue-chartjs';
 import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm';
+import $ from 'jquery';
 
 const {pageData} = window.config;
 
@@ -146,10 +144,21 @@ export default {
       contributorsStats: [],
       dateFrom: null,
       dateUntil: null,
+      startDate: null,
+      endDate: null,
     };
   },
   mounted() {
     this.fetchGraphData();
+
+    $('.ui.dropdown').dropdown({
+      onChange: (val) => {
+        this.dateFrom = this.startDate;
+        this.dateUntil = this.endDate;
+        this.type = val;
+        this.sortContributors();
+      }
+    });
   },
   methods: {
     sortContributors() {
@@ -168,6 +177,8 @@ export default {
           this.contributorsStats = rest;
           this.dateFrom = new Date(total.weeks[0].week);
           this.dateUntil = new Date();
+          this.startDate = this.dateFrom;
+          this.endDate = this.dateUntil;
           this.sortContributors();
           this.totalStats = total;
           this.isLoading = false;
@@ -202,6 +213,20 @@ export default {
 
       return filteredData;
     },
+
+    maxMainGraph() {
+      const maxValue = Math.max(
+        ...this.totalStats.weeks.map((o) => o[this.type])
+      );
+      const [cooefficient, exp] = maxValue
+        .toExponential()
+        .split('e')
+        .map(Number);
+      if (cooefficient % 1 === 0) {
+        return maxValue;
+      }
+      return (1 - (cooefficient % 1)) * 10 ** exp + maxValue;
+    },
     maxContributorGraph() {
       const maxValue = Math.max(
         ...this.sortedContributors.map((c) => c['max_contribution_type'])
@@ -273,7 +298,7 @@ export default {
               x: {
                 min: 'original',
                 max: 'original',
-                minRange: 1000000000,
+                minRange: 1210000000,
               },
             },
             zoom: {
@@ -300,7 +325,7 @@ export default {
           },
           y: {
             min: 0,
-            max: this.maxContributorGraph(),
+            max: type === 'main' ? this.maxMainGraph() : this.maxContributorGraph(),
           },
         },
       };

From b148d1aa7cfbabb8e274fee86b07be5f080f4e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 6 Jul 2023 13:51:42 +0300
Subject: [PATCH 059/138] Reset all charts when main chart is clicked

---
 web_src/js/components/RepoContributors.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 56f782b27215d..9fc672d9fa66a 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -262,10 +262,15 @@ export default {
       };
     },
 
-    updateOtherCharts(event) {
+    updateOtherCharts(event, reset) {
       const minVal = event.chart.options.scales.x.min;
       const maxVal = event.chart.options.scales.x.max;
-      if (minVal) {
+      if (reset) {
+        this.dateFrom = this.startDate;
+        this.dateUntil = this.endDate;
+        this.sortContributors();
+      }
+      else if (minVal) {
         this.dateFrom = new Date(minVal);
         this.dateUntil = new Date(maxVal);
         this.sortContributors();
@@ -280,6 +285,7 @@ export default {
         onClick: (e) => {
           if (type === 'main') {
             e.chart.resetZoom();
+            this.updateOtherCharts(e, true)
           }
         },
         plugins: {

From 5de9fbf7610bd20f48482bda74f420fd83401feb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 6 Jul 2023 15:30:02 +0300
Subject: [PATCH 060/138] Handle errors which can occure while fetching data

---
 web_src/js/components/RepoContributors.vue | 26 ++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 9fc672d9fa66a..87f8de9629400 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -12,7 +12,7 @@
       >
         {{ dateFrom }}
       </relative-time>
-      {{ isLoading ? "Loading contributions..." : "-" }}
+      {{ isLoading ? "Loading contributions..." : errorText ? "Loading contributions failed :(": "-" }}
       <relative-time
         v-if="dateUntil !== null"
         format="datetime"
@@ -50,9 +50,15 @@
     </h2>
     <div class="divider"/>
     <div style="height: 380px" class="gt-df">
-      <div v-if="isLoading" class="gt-tc gt-m-auto">
-        <p>This might take a few minutes...</p>
-        <SvgIcon v-if="isLoading" name="octicon-sync" class="gt-mr-3 job-status-rotate"/>
+      <div v-if="isLoading || errorText !== ''" class="gt-tc gt-m-auto">
+        <div v-if="isLoading">
+          <SvgIcon name="octicon-sync" class="gt-mr-3 job-status-rotate"/>
+          This might take a few minutes...
+        </div>
+        <div v-else>
+          <SvgIcon name="octicon-x-circle-fill" class="text red"/>
+          {{ errorText }}
+        </div>
       </div>
       <CLine
         v-memo="[totalStats.weeks, type]" v-if="Object.keys(totalStats).length !== 0"
@@ -137,6 +143,7 @@ export default {
   data: () => {
     return {
       isLoading: false,
+      errorText: '',
       totalStats: {},
       sortedContributors: {},
       repoLink: pageData.repoLink || [],
@@ -181,6 +188,12 @@ export default {
           this.endDate = this.dateUntil;
           this.sortContributors();
           this.totalStats = total;
+          this.errorText = '';
+        })
+        .catch((e) => {
+          this.errorText = e.message;
+        })
+        .finally(() => {
           this.isLoading = false;
         });
     },
@@ -269,8 +282,7 @@ export default {
         this.dateFrom = this.startDate;
         this.dateUntil = this.endDate;
         this.sortContributors();
-      }
-      else if (minVal) {
+      } else if (minVal) {
         this.dateFrom = new Date(minVal);
         this.dateUntil = new Date(maxVal);
         this.sortContributors();
@@ -285,7 +297,7 @@ export default {
         onClick: (e) => {
           if (type === 'main') {
             e.chart.resetZoom();
-            this.updateOtherCharts(e, true)
+            this.updateOtherCharts(e, true);
           }
         },
         plugins: {

From 79dfb840efc2be843a4dea392d6d9a068d8d59b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 7 Jul 2023 22:15:24 +0300
Subject: [PATCH 061/138] Apply suggestions from code review

Co-authored-by: silverwind <me@silverwind.io>
---
 web_src/js/components/RepoContributors.vue | 3 +--
 web_src/js/features/contributors.js        | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 87f8de9629400..7caa795e458ca 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -257,7 +257,7 @@ export default {
     toGraphData(data) {
       const style = getComputedStyle(document.body);
       const colorName = this.type === 'commits' ? '--color-primary-alpha-60' : (this.type === 'additions' ? '--color-green-badge-hover-bg' : '--color-red-badge-hover-bg');
-      const color = style.getPropertyValue(colorName);
+      const color = style.getPropertyValue(colorName).trim();
       return {
         datasets: [
           {
@@ -309,7 +309,6 @@ export default {
               enabled: true,
               mode: 'x',
               threshold: 20,
-
               onPanComplete: this.updateOtherCharts,
             },
             limits: {
diff --git a/web_src/js/features/contributors.js b/web_src/js/features/contributors.js
index 5a2fa75e4ffae..5df71fdcf94bc 100644
--- a/web_src/js/features/contributors.js
+++ b/web_src/js/features/contributors.js
@@ -7,7 +7,6 @@ export function initRepoContributors() {
 
   try {
     const View = createApp(RepoContributors);
-
     View.mount(el);
   } catch (err) {
     console.error('RepoContributors failed to load', err);

From ec30e3bb6df529887a8ef1f871e832d4762b853d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 7 Jul 2023 22:27:25 +0300
Subject: [PATCH 062/138] Apply suggestions from code review

---
 web_src/js/components/RepoContributors.vue | 50 ++++++++++++----------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 7caa795e458ca..ac8ac0c9b0c4b 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -49,14 +49,14 @@
       </div>
     </h2>
     <div class="divider"/>
-    <div style="height: 380px" class="gt-df">
+    <div class="gt-df main-graph">
       <div v-if="isLoading || errorText !== ''" class="gt-tc gt-m-auto">
         <div v-if="isLoading">
           <SvgIcon name="octicon-sync" class="gt-mr-3 job-status-rotate"/>
           This might take a few minutes...
         </div>
-        <div v-else>
-          <SvgIcon name="octicon-x-circle-fill" class="text red"/>
+        <div v-else class="text red">
+          <SvgIcon name="octicon-x-circle-fill"/>
           {{ errorText }}
         </div>
       </div>
@@ -177,25 +177,23 @@ export default {
     },
     async fetchGraphData() {
       this.isLoading = true;
-      fetch(`${this.repoLink}/activity/contributors/data`)
-        .then((response) => response.json())
-        .then((data) => {
-          const {total, ...rest} = data;
-          this.contributorsStats = rest;
-          this.dateFrom = new Date(total.weeks[0].week);
-          this.dateUntil = new Date();
-          this.startDate = this.dateFrom;
-          this.endDate = this.dateUntil;
-          this.sortContributors();
-          this.totalStats = total;
-          this.errorText = '';
-        })
-        .catch((e) => {
-          this.errorText = e.message;
-        })
-        .finally(() => {
-          this.isLoading = false;
-        });
+      try {
+        const response = await fetch(`${this.repoLink}/activity/contributors/data`);
+        const data = await response.json();
+        const { total, ...rest } = data;
+        this.contributorsStats = rest;
+        this.dateFrom = new Date(total.weeks[0].week);
+        this.dateUntil = new Date();
+        this.startDate = this.dateFrom;
+        this.endDate = this.dateUntil;
+        this.sortContributors();
+        this.totalStats = total;
+        this.errorText = '';
+      } catch (e) {
+        this.errorText = e.message;
+      } finally {
+        this.isLoading = false;
+      }
     },
 
     filterContributorWeeksByDateRange() {
@@ -218,7 +216,8 @@ export default {
               user['max_contribution_type'] = week[this.type];
             }
             return true;
-          } return false;
+          }
+          return false;
         });
 
         filteredData[key] = {...user, weeks: filteredWeeks};
@@ -350,3 +349,8 @@ export default {
   },
 };
 </script>
+<style scoped>
+.main-graph {
+  height: 380px;
+}
+</style>

From 51f81180a6cb67bcdd87a89402a11d25af630c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sun, 9 Jul 2023 14:07:35 +0300
Subject: [PATCH 063/138] Use translated strings

---
 options/locale/locale_en-US.ini            |  4 ++++
 templates/repo/contributors.tmpl           | 12 +++++++++-
 web_src/js/components/RepoContributors.vue | 26 +++++++++++++---------
 web_src/js/features/contributors.js        | 17 ++++++++++++--
 4 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 13be6db546060..1e955289f9162 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1913,6 +1913,10 @@ contributors.contribution_type.filter_label = Contribution type:
 contributors.contribution_type.commits = Commits
 contributors.contribution_type.additions = Additions
 contributors.contribution_type.deletions = Deletions
+contributors.loading_title = Loading contributions...
+contributors.loading_title_failed = Loading contributions failed :(
+contributors.loading_info = This might take a few minutes...
+contributors.component_failed_to_load = An unexpected error happened.
 
 search = Search
 search.search_repo = Search repository
diff --git a/templates/repo/contributors.tmpl b/templates/repo/contributors.tmpl
index 387870dde7324..01862bce87397 100644
--- a/templates/repo/contributors.tmpl
+++ b/templates/repo/contributors.tmpl
@@ -1,3 +1,13 @@
 {{if .Permission.CanRead $.UnitTypeCode}}
-	<div id="repo-contributors-chart"></div>
+	<div id="repo-contributors-chart"
+		data-locale-filter-label="{{.locale.Tr "repo.contributors.contribution_type.filter_label" }}"
+		data-locale-contribution-type-commits="{{.locale.Tr "repo.contributors.contribution_type.commits" }}"
+		data-locale-contribution-type-additions="{{.locale.Tr "repo.contributors.contribution_type.additions" }}"
+		data-locale-contribution-type-deletions="{{.locale.Tr "repo.contributors.contribution_type.deletions" }}"
+		data-locale-loading-title="{{.locale.Tr "repo.contributors.loading_title" }}"
+		data-locale-loading-title-failed="{{.locale.Tr "repo.contributors.loading_title_failed" }}"
+		data-locale-loading-info="{{.locale.Tr "repo.contributors.loading_info" }}"
+		data-locale-component-failed-to-load="{{.locale.Tr "repo.contributors.component_failed_to_load" }}"
+	>
+	</div>
 {{end}}
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index ac8ac0c9b0c4b..889f5a73344b1 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -12,7 +12,7 @@
       >
         {{ dateFrom }}
       </relative-time>
-      {{ isLoading ? "Loading contributions..." : errorText ? "Loading contributions failed :(": "-" }}
+      {{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: "-" }}
       <relative-time
         v-if="dateUntil !== null"
         format="datetime"
@@ -30,19 +30,19 @@
         <div class="ui dropdown jump" id="dropdown">
           <div class="ui basic compact button">
             <span class="text">
-              Contribution type: <strong>{{ type }}</strong>
+              {{ locale.filterLabel }} <strong>{{ locale.contributionType[type] }}</strong>
               <svg-icon name="octicon-triangle-down" :size="14"/>
             </span>
           </div>
           <div class="menu">
             <div :class="type === 'commits' ? 'active item' : 'item'">
-              Commits
+              {{ locale.contributionType.commits }}
             </div>
             <div :class="type === 'additions' ? 'active item' : 'item'">
-              Additions
+              {{ locale.contributionType.additions }}
             </div>
             <div :class="type === 'deletions' ? 'active item' : 'item'">
-              Deletions
+              {{ locale.contributionType.deletions }}
             </div>
           </div>
         </div>
@@ -53,7 +53,7 @@
       <div v-if="isLoading || errorText !== ''" class="gt-tc gt-m-auto">
         <div v-if="isLoading">
           <SvgIcon name="octicon-sync" class="gt-mr-3 job-status-rotate"/>
-          This might take a few minutes...
+          {{ locale.loadingInfo }}
         </div>
         <div v-else class="text red">
           <SvgIcon name="octicon-x-circle-fill"/>
@@ -80,10 +80,8 @@
           <div class="gt-ml-3">
             <a :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a>
             <p class="gt-font-12">
-              <strong>{{ contributor.total_commits.toLocaleString() }} commits
-              </strong>
-              <strong class="text green">{{ contributor.total_additions.toLocaleString() }}++
-              </strong>
+              <strong>{{ contributor.total_commits.toLocaleString() }} {{ locale.contributionType.commits }}</strong>
+              <strong class="text green">{{ contributor.total_additions.toLocaleString() }}++ </strong>
               <strong class="text red">
                 {{ contributor.total_deletions.toLocaleString() }}--</strong>
             </p>
@@ -140,6 +138,12 @@ Chart.register(
 
 export default {
   components: {CLine, SvgIcon},
+  props: {
+    locale: {
+      type: Object,
+      required: true
+    },
+  },
   data: () => {
     return {
       isLoading: false,
@@ -180,7 +184,7 @@ export default {
       try {
         const response = await fetch(`${this.repoLink}/activity/contributors/data`);
         const data = await response.json();
-        const { total, ...rest } = data;
+        const {total, ...rest} = data;
         this.contributorsStats = rest;
         this.dateFrom = new Date(total.weeks[0].week);
         this.dateUntil = new Date();
diff --git a/web_src/js/features/contributors.js b/web_src/js/features/contributors.js
index 5df71fdcf94bc..961b48abadced 100644
--- a/web_src/js/features/contributors.js
+++ b/web_src/js/features/contributors.js
@@ -6,10 +6,23 @@ export function initRepoContributors() {
   if (!el) return;
 
   try {
-    const View = createApp(RepoContributors);
+    const View = createApp(RepoContributors, {
+      locale: {
+        filterLabel: el.getAttribute('data-locale-filter-label'),
+        contributionType: {
+          commits: el.getAttribute('data-locale-contribution-type-commits'),
+          additions: el.getAttribute('data-locale-contribution-type-additions'),
+          deletions: el.getAttribute('data-locale-contribution-type-deletions'),
+        },
+
+        loadingTitle: el.getAttribute('data-locale-loading-title'),
+        loadingTitleFailed: el.getAttribute('data-locale-loading-title-failed'),
+        loadingInfo: el.getAttribute('data-locale-loading-info'),
+      }
+    });
     View.mount(el);
   } catch (err) {
     console.error('RepoContributors failed to load', err);
-    el.textContent = 'RepoContributors failed to load';
+    el.textContent = el.getAttribute('data-locale-component-failed-to-load');
   }
 }

From 7e68c7cad63691f12f3cdc9a5940678513748265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sun, 9 Jul 2023 14:20:33 +0300
Subject: [PATCH 064/138] Do code splitting on contributors page

---
 web_src/js/features/contributors.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/features/contributors.js b/web_src/js/features/contributors.js
index 961b48abadced..328e4e07fdd74 100644
--- a/web_src/js/features/contributors.js
+++ b/web_src/js/features/contributors.js
@@ -1,10 +1,10 @@
 import {createApp} from 'vue';
-import RepoContributors from '../components/RepoContributors.vue';
 
-export function initRepoContributors() {
+export async function initRepoContributors() {
   const el = document.getElementById('repo-contributors-chart');
   if (!el) return;
 
+  const {default: RepoContributors} = await import('../components/RepoContributors.vue');
   try {
     const View = createApp(RepoContributors, {
       locale: {

From 056745b4341bb989ba08850c16a1a5c0b5b73700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sun, 9 Jul 2023 14:30:10 +0300
Subject: [PATCH 065/138] Use author information instead of committer

---
 modules/git/repo_commit.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index 7212b44e7d6ad..3640e2b541372 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -237,7 +237,7 @@ func (repo *Repository) ExtendedCommitStats(revision string /*, limit int */) ([
 		_ = stdoutWriter.Close()
 	}()
 
-	gitCmd := NewCommand(repo.Ctx, "log", "--shortstat", "--no-merges", "--pretty=format:---%n%cN%n%cE%n%cs", "--reverse")
+	gitCmd := NewCommand(repo.Ctx, "log", "--shortstat", "--no-merges", "--pretty=format:---%n%aN%n%aE%n%as", "--reverse")
 	// AddOptionFormat("--max-count=%d", limit)
 	gitCmd.AddDynamicArguments(baseCommit.ID.String())
 

From d6887e451dcd97f8353578475ceb4b04027b3c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sun, 9 Jul 2023 14:50:41 +0300
Subject: [PATCH 066/138] Move contributor related code under service

---
 routers/api/v1/repo/collaborators.go                          | 4 ++--
 routers/web/repo/contributors.go                              | 4 ++--
 .../repository}/contributors_graph.go                         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename {models/contributors => services/repository}/contributors_graph.go (99%)

diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index c02aae42fd9fd..0ab142a9a7937 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 
 	"code.gitea.io/gitea/models"
-	contributors_model "code.gitea.io/gitea/models/contributors"
+	contributors_service "code.gitea.io/gitea/services/repository"
 	"code.gitea.io/gitea/models/perm"
 	access_model "code.gitea.io/gitea/models/perm/access"
 	repo_model "code.gitea.io/gitea/models/repo"
@@ -396,7 +396,7 @@ func GetAllContributorsStats(ctx *context.APIContext) {
 		sha = ctx.Repo.Repository.DefaultBranch
 	}
 
-	if contributorStats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository, sha); err != nil {
+	if contributorStats, err := contributors_service.GetContributorStats(ctx, ctx.Repo.Repository, sha); err != nil {
 		ctx.Error(http.StatusInternalServerError, "GetContributorStats", err)
 	} else {
 		ctx.JSON(http.StatusOK, &contributorStats)
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index 18df7b82f56b3..e30a6aca5949c 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -6,7 +6,7 @@ package repo
 import (
 	"net/http"
 
-	contributors_model "code.gitea.io/gitea/models/contributors"
+	contributors_service "code.gitea.io/gitea/services/repository"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
 )
@@ -38,7 +38,7 @@ func Contributors(ctx *context.Context) {
 
 // ContributorsData renders JSON of contributors along with their weekly commit statistics
 func ContributorsData(ctx *context.Context) {
-	if contributorStats, err := contributors_model.GetContributorStats(ctx, ctx.Repo.Repository, ctx.Repo.CommitID); err != nil {
+	if contributorStats, err := contributors_service.GetContributorStats(ctx, ctx.Repo.Repository, ctx.Repo.CommitID); err != nil {
 		ctx.ServerError("GetContributorStats", err)
 	} else {
 		ctx.JSON(http.StatusOK, contributorStats)
diff --git a/models/contributors/contributors_graph.go b/services/repository/contributors_graph.go
similarity index 99%
rename from models/contributors/contributors_graph.go
rename to services/repository/contributors_graph.go
index ec8448c225e0d..ae0d99ceaf5df 100644
--- a/models/contributors/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -1,7 +1,7 @@
 // Copyright 2023 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-package contributors
+package repository
 
 import (
 	"context"

From 8ed40fe034214c93b52b843deb34522982c5378d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 14 Jul 2023 10:50:38 +0300
Subject: [PATCH 067/138] Apply suggestions from code review

Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: silverwind <me@silverwind.io>
---
 options/locale/locale_en-US.ini            | 4 ++--
 web_src/js/components/RepoContributors.vue | 8 ++++----
 web_src/js/features/contributors.js        | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 1e955289f9162..66b2b4bc1cc64 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1914,8 +1914,8 @@ contributors.contribution_type.commits = Commits
 contributors.contribution_type.additions = Additions
 contributors.contribution_type.deletions = Deletions
 contributors.loading_title = Loading contributions...
-contributors.loading_title_failed = Loading contributions failed :(
-contributors.loading_info = This might take a few minutes...
+contributors.loading_title_failed = Could not load contributions
+contributors.loading_info = This might take a bit…
 contributors.component_failed_to_load = An unexpected error happened.
 
 search = Search
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 889f5a73344b1..037c83539d72b 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -35,13 +35,13 @@
             </span>
           </div>
           <div class="menu">
-            <div :class="type === 'commits' ? 'active item' : 'item'">
+            <div :class="['item', {'active': type === 'commits'}]">
               {{ locale.contributionType.commits }}
             </div>
-            <div :class="type === 'additions' ? 'active item' : 'item'">
+            <div :class="['item', {'active': type === 'additions'}]">
               {{ locale.contributionType.additions }}
             </div>
-            <div :class="type === 'deletions' ? 'active item' : 'item'">
+            <div :class="['item', {'active': type === 'deletions'}]">
               {{ locale.contributionType.deletions }}
             </div>
           </div>
@@ -75,7 +75,7 @@
         <div class="ui top attached header gt-df gt-f1">
           <b class="ui right">#{{ index + 1 }}</b>
           <a :href="contributor.home_link">
-            <img height="40" width="40" :href="contributor.avatar_link" :src="contributor.avatar_link">
+            <img height="40" width="40" :src="contributor.avatar_link">
           </a>
           <div class="gt-ml-3">
             <a :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a>
diff --git a/web_src/js/features/contributors.js b/web_src/js/features/contributors.js
index 328e4e07fdd74..66185ac315a19 100644
--- a/web_src/js/features/contributors.js
+++ b/web_src/js/features/contributors.js
@@ -4,7 +4,7 @@ export async function initRepoContributors() {
   const el = document.getElementById('repo-contributors-chart');
   if (!el) return;
 
-  const {default: RepoContributors} = await import('../components/RepoContributors.vue');
+  const {default: RepoContributors} = await import(/* webpackChunkName: "contributors-graph" */'../components/RepoContributors.vue');
   try {
     const View = createApp(RepoContributors, {
       locale: {

From 3fc79af1b091c2230c7870999ea06c289a3374d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 14 Jul 2023 11:06:20 +0300
Subject: [PATCH 068/138] Apply suggestions from code review

---
 modules/structs/repo_collaborator.go       | 12 ++++++------
 routers/web/repo/contributors.go           |  8 +-------
 routers/web/web.go                         |  1 -
 web_src/js/components/RepoContributors.vue |  6 +++++-
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/modules/structs/repo_collaborator.go b/modules/structs/repo_collaborator.go
index 7c7134e370b7b..bdfb63df1d703 100644
--- a/modules/structs/repo_collaborator.go
+++ b/modules/structs/repo_collaborator.go
@@ -16,16 +16,16 @@ type RepoCollaboratorPermission struct {
 }
 
 type WeekData struct {
-	Week      int64 `json:"week"`
-	Additions int   `json:"additions"`
-	Deletions int   `json:"deletions"`
-	Commits   int   `json:"commits"`
+	Week      int64 `json:"week"` // Starting day of the week as Unix timestamp
+	Additions int   `json:"additions"` // Number of additions in that week
+	Deletions int   `json:"deletions"`// Number of deletions in that week
+	Commits   int   `json:"commits"`// Number of commits in that week
 }
 
 // ContributorData represents statistical git commit count data
 type ContributorData struct {
-	Name         string      `json:"name"`
-	Login        string      `json:"login"`
+	Name         string      `json:"name"`  // Display name of the contributor
+	Login        string      `json:"login"` // Login name of the contributor in case it exists
 	AvatarLink   string      `json:"avatar_link"`
 	HomeLink     string      `json:"home_link"`
 	TotalCommits int64       `json:"total_commits"`
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index e30a6aca5949c..afa233e905393 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -23,13 +23,7 @@ func Contributors(ctx *context.Context) {
 	ctx.Data["PageIsPulse"] = false
 	ctx.Data["PageIsContributors"] = true
 
-	ctx.Data["ContributionType"] = ctx.Params("contribution_type")
-	if ctx.Data["ContributionType"] == "" {
-		ctx.Data["ContributionType"] = "commits"
-	}
-	ctx.PageData["contributionType"] = ctx.Data["ContributionType"]
-
-	ctx.Data["ContributionTypeText"] = ctx.Tr("repo.contributors.contribution_type." + ctx.Data["ContributionType"].(string))
+	ctx.PageData["contributionType"] = "commits"
 
 	ctx.PageData["repoLink"] = ctx.Repo.RepoLink
 
diff --git a/routers/web/web.go b/routers/web/web.go
index 40073c041ee2d..d34b15005c972 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1240,7 +1240,6 @@ func registerRoutes(m *web.Route) {
 			m.Get("/{period}", repo.Activity)
 			m.Group("/contributors", func() {
 				m.Get("", repo.Contributors)
-				m.Get("/{contribution_type}", repo.Contributors)
 				m.Get("/data", repo.ContributorsData)
 			})
 		}, context.RepoRef(), repo.MustBeNotEmpty, context.RequireRepoReaderOr(unit.TypePullRequests, unit.TypeIssues, unit.TypeReleases))
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 037c83539d72b..4bc5d3e1fa09b 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -316,9 +316,13 @@ export default {
             },
             limits: {
               x: {
+                /* Check https://www.chartjs.org/chartjs-plugin-zoom/latest/guide/options.html#scale-limits
+                   to know what each option means */
                 min: 'original',
                 max: 'original',
-                minRange: 1210000000,
+
+                // number of milliseconds in 2 weeks. Minimum x range will be 2 weeks when you zoom on the graph
+                minRange: 2 * 7 * 24 * 60 * 60 * 1000,
               },
             },
             zoom: {

From 09d249d62b7fd5d85838299b0e1c4f6073aebdc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Tue, 17 Oct 2023 17:17:39 +0300
Subject: [PATCH 069/138] Apply suggestions from code review

---
 modules/util/dates.go                      |  7 ++----
 web_src/js/components/RepoContributors.vue | 26 ++++++++++++++++------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/modules/util/dates.go b/modules/util/dates.go
index aafa329048fb5..d5f0b034671be 100644
--- a/modules/util/dates.go
+++ b/modules/util/dates.go
@@ -7,8 +7,9 @@ import (
 	"time"
 )
 
+const layout = "2006-01-02"
+
 func ListSundaysBetween(startStr, endStr string) ([]int64, error) {
-	layout := "2006-01-02"
 	startDate, err := time.Parse(layout, startStr)
 	if err != nil {
 		return nil, err
@@ -35,8 +36,6 @@ func ListSundaysBetween(startStr, endStr string) ([]int64, error) {
 }
 
 func FindLastSundayBeforeDate(dateStr string) (string, error) {
-	layout := "2006-01-02"
-
 	date, err := time.Parse(layout, dateStr)
 	if err != nil {
 		return "", err
@@ -53,8 +52,6 @@ func FindLastSundayBeforeDate(dateStr string) (string, error) {
 }
 
 func FindFirstSundayAfterDate(dateStr string) (string, error) {
-	layout := "2006-01-02"
-
 	date, err := time.Parse(layout, dateStr)
 	if err != nil {
 		return "", err
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 4bc5d3e1fa09b..7877285106a78 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -60,7 +60,7 @@
           {{ errorText }}
         </div>
       </div>
-      <CLine
+      <ChartLine
         v-memo="[totalStats.weeks, type]" v-if="Object.keys(totalStats).length !== 0"
         :data="toGraphData(totalStats.weeks)" :options="getOptions('main')"
       />
@@ -80,16 +80,16 @@
           <div class="gt-ml-3">
             <a :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a>
             <p class="gt-font-12">
-              <strong>{{ contributor.total_commits.toLocaleString() }} {{ locale.contributionType.commits }}</strong>
-              <strong class="text green">{{ contributor.total_additions.toLocaleString() }}++ </strong>
-              <strong class="text red">
+              <strong v-if="contributor.total_commits">{{ contributor.total_commits.toLocaleString() }} {{ locale.contributionType.commits }}</strong>
+              <strong v-if="contributor.total_additions" class="text green">{{ contributor.total_additions.toLocaleString() }}++ </strong>
+              <strong v-if="contributor.total_deletions" class="text red">
                 {{ contributor.total_deletions.toLocaleString() }}--</strong>
             </p>
           </div>
         </div>
         <div class="ui attached segment">
           <div>
-            <CLine
+            <ChartLine
               :data="toGraphData(contributor.weeks)"
               :options="getOptions('contributor')"
             />
@@ -116,7 +116,7 @@ import {
   Filler,
 } from 'chart.js';
 import zoomPlugin from 'chartjs-plugin-zoom';
-import {Line as CLine} from 'vue-chartjs';
+import {Line as ChartLine} from 'vue-chartjs';
 import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm';
 import $ from 'jquery';
 
@@ -137,7 +137,7 @@ Chart.register(
 );
 
 export default {
-  components: {CLine, SvgIcon},
+  components: {ChartLine, SvgIcon},
   props: {
     locale: {
       type: Object,
@@ -231,6 +231,14 @@ export default {
     },
 
     maxMainGraph() {
+      // This method calculates maximum value for Y value of the main graph.
+      // If the number of maximum contributions for selected contribution type is
+      // 15.955 it is probably better to round it up to 20.000
+      // This method is responsible for doing that
+      // Normally, chartjs handles this automatically, but it will resize the
+      // graph when you zoom, pan etc. I think resizing the graph makes it harder
+      // to compare things visually.
+
       const maxValue = Math.max(
         ...this.totalStats.weeks.map((o) => o[this.type])
       );
@@ -244,6 +252,10 @@ export default {
       return (1 - (cooefficient % 1)) * 10 ** exp + maxValue;
     },
     maxContributorGraph() {
+      // Similar to maxMainGraph method this method calculates maximum value for Y value
+      // for contributors' graph. If I let chartjs do this for me, it will choose different
+      // maxY value for each contributors' graph which again makes it harder to compare.
+
       const maxValue = Math.max(
         ...this.sortedContributors.map((c) => c['max_contribution_type'])
       );

From 023bbbb9287df927d7060f5550871d02333b6ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Tue, 17 Oct 2023 19:57:42 +0300
Subject: [PATCH 070/138] Use GET instead of fetch

---
 web_src/js/components/RepoContributors.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 7877285106a78..f77ffcd1e4960 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -115,6 +115,7 @@ import {
   LineElement,
   Filler,
 } from 'chart.js';
+import {GET} from '../modules/fetch.js';
 import zoomPlugin from 'chartjs-plugin-zoom';
 import {Line as ChartLine} from 'vue-chartjs';
 import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm';
@@ -182,7 +183,7 @@ export default {
     async fetchGraphData() {
       this.isLoading = true;
       try {
-        const response = await fetch(`${this.repoLink}/activity/contributors/data`);
+        const response = await GET(`${this.repoLink}/activity/contributors/data`);
         const data = await response.json();
         const {total, ...rest} = data;
         this.contributorsStats = rest;

From e83b5625000149ae7ed3e2e4436b0f8b54bb2c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Tue, 17 Oct 2023 19:58:42 +0300
Subject: [PATCH 071/138] Re-order tags to script - template - style in vue
 file

---
 web_src/js/components/RepoContributors.vue | 205 +++++++++++----------
 1 file changed, 103 insertions(+), 102 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index f77ffcd1e4960..8061bc2b7b372 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -1,105 +1,3 @@
-<template>
-  <div>
-    <h2 class="ui header">
-      <relative-time
-        v-if="dateFrom !== null"
-        format="datetime"
-        year="numeric"
-        month="short"
-        day="numeric"
-        weekday=""
-        :datetime="dateFrom"
-      >
-        {{ dateFrom }}
-      </relative-time>
-      {{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: "-" }}
-      <relative-time
-        v-if="dateUntil !== null"
-        format="datetime"
-        year="numeric"
-        month="short"
-        day="numeric"
-        weekday=""
-        :datetime="dateUntil"
-      >
-        {{ dateUntil }}
-      </relative-time>
-
-      <div class="ui right">
-        <!-- Contribution type -->
-        <div class="ui dropdown jump" id="dropdown">
-          <div class="ui basic compact button">
-            <span class="text">
-              {{ locale.filterLabel }} <strong>{{ locale.contributionType[type] }}</strong>
-              <svg-icon name="octicon-triangle-down" :size="14"/>
-            </span>
-          </div>
-          <div class="menu">
-            <div :class="['item', {'active': type === 'commits'}]">
-              {{ locale.contributionType.commits }}
-            </div>
-            <div :class="['item', {'active': type === 'additions'}]">
-              {{ locale.contributionType.additions }}
-            </div>
-            <div :class="['item', {'active': type === 'deletions'}]">
-              {{ locale.contributionType.deletions }}
-            </div>
-          </div>
-        </div>
-      </div>
-    </h2>
-    <div class="divider"/>
-    <div class="gt-df main-graph">
-      <div v-if="isLoading || errorText !== ''" class="gt-tc gt-m-auto">
-        <div v-if="isLoading">
-          <SvgIcon name="octicon-sync" class="gt-mr-3 job-status-rotate"/>
-          {{ locale.loadingInfo }}
-        </div>
-        <div v-else class="text red">
-          <SvgIcon name="octicon-x-circle-fill"/>
-          {{ errorText }}
-        </div>
-      </div>
-      <ChartLine
-        v-memo="[totalStats.weeks, type]" v-if="Object.keys(totalStats).length !== 0"
-        :data="toGraphData(totalStats.weeks)" :options="getOptions('main')"
-      />
-    </div>
-    <div class="divider"/>
-
-    <div class="ui attached two column grid">
-      <div
-        v-for="(contributor, index) in sortedContributors" :key="index" class="column stats-table"
-        v-memo="[sortedContributors, type]"
-      >
-        <div class="ui top attached header gt-df gt-f1">
-          <b class="ui right">#{{ index + 1 }}</b>
-          <a :href="contributor.home_link">
-            <img height="40" width="40" :src="contributor.avatar_link">
-          </a>
-          <div class="gt-ml-3">
-            <a :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a>
-            <p class="gt-font-12">
-              <strong v-if="contributor.total_commits">{{ contributor.total_commits.toLocaleString() }} {{ locale.contributionType.commits }}</strong>
-              <strong v-if="contributor.total_additions" class="text green">{{ contributor.total_additions.toLocaleString() }}++ </strong>
-              <strong v-if="contributor.total_deletions" class="text red">
-                {{ contributor.total_deletions.toLocaleString() }}--</strong>
-            </p>
-          </div>
-        </div>
-        <div class="ui attached segment">
-          <div>
-            <ChartLine
-              :data="toGraphData(contributor.weeks)"
-              :options="getOptions('contributor')"
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
 <script>
 import {SvgIcon} from '../svg.js';
 import {
@@ -370,6 +268,109 @@ export default {
   },
 };
 </script>
+
+<template>
+  <div>
+    <h2 class="ui header">
+      <relative-time
+        v-if="dateFrom !== null"
+        format="datetime"
+        year="numeric"
+        month="short"
+        day="numeric"
+        weekday=""
+        :datetime="dateFrom"
+      >
+        {{ dateFrom }}
+      </relative-time>
+      {{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: "-" }}
+      <relative-time
+        v-if="dateUntil !== null"
+        format="datetime"
+        year="numeric"
+        month="short"
+        day="numeric"
+        weekday=""
+        :datetime="dateUntil"
+      >
+        {{ dateUntil }}
+      </relative-time>
+
+      <div class="ui right">
+        <!-- Contribution type -->
+        <div class="ui dropdown jump" id="dropdown">
+          <div class="ui basic compact button">
+            <span class="text">
+              {{ locale.filterLabel }} <strong>{{ locale.contributionType[type] }}</strong>
+              <svg-icon name="octicon-triangle-down" :size="14"/>
+            </span>
+          </div>
+          <div class="menu">
+            <div :class="['item', {'active': type === 'commits'}]">
+              {{ locale.contributionType.commits }}
+            </div>
+            <div :class="['item', {'active': type === 'additions'}]">
+              {{ locale.contributionType.additions }}
+            </div>
+            <div :class="['item', {'active': type === 'deletions'}]">
+              {{ locale.contributionType.deletions }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </h2>
+    <div class="divider"/>
+    <div class="gt-df main-graph">
+      <div v-if="isLoading || errorText !== ''" class="gt-tc gt-m-auto">
+        <div v-if="isLoading">
+          <SvgIcon name="octicon-sync" class="gt-mr-3 job-status-rotate"/>
+          {{ locale.loadingInfo }}
+        </div>
+        <div v-else class="text red">
+          <SvgIcon name="octicon-x-circle-fill"/>
+          {{ errorText }}
+        </div>
+      </div>
+      <ChartLine
+        v-memo="[totalStats.weeks, type]" v-if="Object.keys(totalStats).length !== 0"
+        :data="toGraphData(totalStats.weeks)" :options="getOptions('main')"
+      />
+    </div>
+    <div class="divider"/>
+
+    <div class="ui attached two column grid">
+      <div
+        v-for="(contributor, index) in sortedContributors" :key="index" class="column stats-table"
+        v-memo="[sortedContributors, type]"
+      >
+        <div class="ui top attached header gt-df gt-f1">
+          <b class="ui right">#{{ index + 1 }}</b>
+          <a :href="contributor.home_link">
+            <img height="40" width="40" :src="contributor.avatar_link">
+          </a>
+          <div class="gt-ml-3">
+            <a :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a>
+            <p class="gt-font-12">
+              <strong v-if="contributor.total_commits">{{ contributor.total_commits.toLocaleString() }} {{ locale.contributionType.commits }}</strong>
+              <strong v-if="contributor.total_additions" class="text green">{{ contributor.total_additions.toLocaleString() }}++ </strong>
+              <strong v-if="contributor.total_deletions" class="text red">
+                {{ contributor.total_deletions.toLocaleString() }}--</strong>
+            </p>
+          </div>
+        </div>
+        <div class="ui attached segment">
+          <div>
+            <ChartLine
+              :data="toGraphData(contributor.weeks)"
+              :options="getOptions('contributor')"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
 <style scoped>
 .main-graph {
   height: 380px;

From f2d33949c342ce7f2946d18a60b0964f56312119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 18 Oct 2023 13:33:39 +0300
Subject: [PATCH 072/138] Remove useless error checking

---
 services/repository/contributors_graph.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index ae0d99ceaf5df..3ee388114eb58 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -69,8 +69,8 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository, revis
 			continue
 		}
 		if _, ok := contributorsCommitStats[v.Author.Email]; !ok {
-			u, err := user_model.GetUserByEmail(ctx, v.Author.Email)
-			if u == nil || user_model.IsErrUserNotExist(err) {
+			u, _ := user_model.GetUserByEmail(ctx, v.Author.Email)
+			if u == nil {
 				contributorsCommitStats[v.Author.Email] = &api.ContributorData{
 					Name:       v.Author.Name,
 					AvatarLink: unknownUserAvatarLink,

From 88ffba5d1f732a31b18f4ccf39df2da7b54e8daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Tue, 31 Oct 2023 16:21:49 +0300
Subject: [PATCH 073/138] Apply suggestions from code review

---
 modules/git/repo_commit.go                 |  6 +++++-
 web_src/js/components/RepoContributors.vue | 24 +++++++++++++---------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index 0700e3b45e331..8f33a21df498e 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -219,7 +219,11 @@ type CommitsByFileAndRangeOptions struct {
 
 // ExtendedCommitStats return the list of *api.ExtendedCommitStats for the given revision
 func (repo *Repository) ExtendedCommitStats(revision string /*, limit int */) ([]*api.ExtendedCommitStats, error) {
-	baseCommit, _ := repo.GetCommit(revision)
+	baseCommit, err := repo.GetCommit(revision)
+
+	if err != nil {
+		return nil, err
+	}
 	stdoutReader, stdoutWriter, err := os.Pipe()
 	if err != nil {
 		return nil, err
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 8061bc2b7b372..203aa74b81df5 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -82,16 +82,20 @@ export default {
       this.isLoading = true;
       try {
         const response = await GET(`${this.repoLink}/activity/contributors/data`);
-        const data = await response.json();
-        const {total, ...rest} = data;
-        this.contributorsStats = rest;
-        this.dateFrom = new Date(total.weeks[0].week);
-        this.dateUntil = new Date();
-        this.startDate = this.dateFrom;
-        this.endDate = this.dateUntil;
-        this.sortContributors();
-        this.totalStats = total;
-        this.errorText = '';
+        if (response.ok) {
+          const data = await response.json();
+          const {total, ...rest} = data;
+          this.contributorsStats = rest;
+          this.dateFrom = new Date(total.weeks[0].week);
+          this.dateUntil = new Date();
+          this.startDate = this.dateFrom;
+          this.endDate = this.dateUntil;
+          this.sortContributors();
+          this.totalStats = total;
+          this.errorText = '';
+        } else {
+          this.errorText = response.statusText;
+        }
       } catch (e) {
         this.errorText = e.message;
       } finally {

From 80e6614ebda54c90bfde71160692cac57eb00803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 1 Nov 2023 13:30:11 +0300
Subject: [PATCH 074/138] Fix linting errors

---
 modules/git/repo_commit.go                 | 1 -
 modules/structs/repo_collaborator.go       | 6 +++---
 routers/api/v1/repo/collaborators.go       | 3 +--
 routers/web/repo/contributors.go           | 2 +-
 templates/swagger/v1_json.tmpl             | 2 +-
 web_src/js/components/RepoContributors.vue | 4 ++--
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index 8f33a21df498e..df08c50602a64 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -220,7 +220,6 @@ type CommitsByFileAndRangeOptions struct {
 // ExtendedCommitStats return the list of *api.ExtendedCommitStats for the given revision
 func (repo *Repository) ExtendedCommitStats(revision string /*, limit int */) ([]*api.ExtendedCommitStats, error) {
 	baseCommit, err := repo.GetCommit(revision)
-
 	if err != nil {
 		return nil, err
 	}
diff --git a/modules/structs/repo_collaborator.go b/modules/structs/repo_collaborator.go
index bdfb63df1d703..553546272beae 100644
--- a/modules/structs/repo_collaborator.go
+++ b/modules/structs/repo_collaborator.go
@@ -16,10 +16,10 @@ type RepoCollaboratorPermission struct {
 }
 
 type WeekData struct {
-	Week      int64 `json:"week"` // Starting day of the week as Unix timestamp
+	Week      int64 `json:"week"`      // Starting day of the week as Unix timestamp
 	Additions int   `json:"additions"` // Number of additions in that week
-	Deletions int   `json:"deletions"`// Number of deletions in that week
-	Commits   int   `json:"commits"`// Number of commits in that week
+	Deletions int   `json:"deletions"` // Number of deletions in that week
+	Commits   int   `json:"commits"`   // Number of commits in that week
 }
 
 // ContributorData represents statistical git commit count data
diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index 8dd4a9ec38d7d..529e164649f66 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -8,7 +8,6 @@ import (
 	"errors"
 	"net/http"
 
-	contributors_service "code.gitea.io/gitea/services/repository"
 	"code.gitea.io/gitea/models/perm"
 	access_model "code.gitea.io/gitea/models/perm/access"
 	repo_model "code.gitea.io/gitea/models/repo"
@@ -406,7 +405,7 @@ func GetAllContributorsStats(ctx *context.APIContext) {
 		sha = ctx.Repo.Repository.DefaultBranch
 	}
 
-	if contributorStats, err := contributors_service.GetContributorStats(ctx, ctx.Repo.Repository, sha); err != nil {
+	if contributorStats, err := repo_service.GetContributorStats(ctx, ctx.Repo.Repository, sha); err != nil {
 		ctx.Error(http.StatusInternalServerError, "GetContributorStats", err)
 	} else {
 		ctx.JSON(http.StatusOK, &contributorStats)
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index afa233e905393..b09ca599c780e 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -6,9 +6,9 @@ package repo
 import (
 	"net/http"
 
-	contributors_service "code.gitea.io/gitea/services/repository"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
+	contributors_service "code.gitea.io/gitea/services/repository"
 )
 
 const (
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 24c4964597026..11dcdc28d2d38 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -24227,4 +24227,4 @@
       "TOTPHeader": []
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 203aa74b81df5..ad54744c7e1d1 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -231,8 +231,8 @@ export default {
             },
             limits: {
               x: {
-                /* Check https://www.chartjs.org/chartjs-plugin-zoom/latest/guide/options.html#scale-limits
-                   to know what each option means */
+                // Check https://www.chartjs.org/chartjs-plugin-zoom/latest/guide/options.html#scale-limits
+                // to know what each option means
                 min: 'original',
                 max: 'original',
 

From 248065f976b9eb21f6ca2ec0cbc48e7c6e65352b Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 2 Nov 2023 00:36:47 +0100
Subject: [PATCH 075/138] dayjs

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bf46755474158..4836f359c5300 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,7 @@
         "chartjs-plugin-zoom": "2.0.1",
         "clippie": "4.0.6",
         "css-loader": "6.8.1",
-        "dayjs": "1.11.8",
+        "dayjs": "1.11.10",
         "dropzone": "6.0.0-beta.2",
         "easymde": "2.18.0",
         "esbuild-loader": "4.0.2",
diff --git a/package.json b/package.json
index e3c71adf88fec..199fda86e174c 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "chartjs-plugin-zoom": "2.0.1",
     "clippie": "4.0.6",
     "css-loader": "6.8.1",
-    "dayjs": "1.11.8",
+    "dayjs": "1.11.10",
     "dropzone": "6.0.0-beta.2",
     "easymde": "2.18.0",
     "esbuild-loader": "4.0.2",

From ba4e738e13fc89f31f58c47bc770416a8857b36d Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 2 Nov 2023 00:38:09 +0100
Subject: [PATCH 076/138] generate

---
 templates/swagger/v1_json.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 11dcdc28d2d38..24c4964597026 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -24227,4 +24227,4 @@
       "TOTPHeader": []
     }
   ]
-}
\ No newline at end of file
+}

From b6b4881585c43fad63042497abfd410bf67283a2 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 2 Nov 2023 01:48:27 +0100
Subject: [PATCH 077/138] fmt

---
 templates/repo/contributors.tmpl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/repo/contributors.tmpl b/templates/repo/contributors.tmpl
index 01862bce87397..787ca0535c7a5 100644
--- a/templates/repo/contributors.tmpl
+++ b/templates/repo/contributors.tmpl
@@ -1,13 +1,13 @@
 {{if .Permission.CanRead $.UnitTypeCode}}
 	<div id="repo-contributors-chart"
-		data-locale-filter-label="{{.locale.Tr "repo.contributors.contribution_type.filter_label" }}"
-		data-locale-contribution-type-commits="{{.locale.Tr "repo.contributors.contribution_type.commits" }}"
-		data-locale-contribution-type-additions="{{.locale.Tr "repo.contributors.contribution_type.additions" }}"
-		data-locale-contribution-type-deletions="{{.locale.Tr "repo.contributors.contribution_type.deletions" }}"
-		data-locale-loading-title="{{.locale.Tr "repo.contributors.loading_title" }}"
-		data-locale-loading-title-failed="{{.locale.Tr "repo.contributors.loading_title_failed" }}"
-		data-locale-loading-info="{{.locale.Tr "repo.contributors.loading_info" }}"
-		data-locale-component-failed-to-load="{{.locale.Tr "repo.contributors.component_failed_to_load" }}"
+		data-locale-filter-label="{{.locale.Tr "repo.contributors.contribution_type.filter_label"}}"
+		data-locale-contribution-type-commits="{{.locale.Tr "repo.contributors.contribution_type.commits"}}"
+		data-locale-contribution-type-additions="{{.locale.Tr "repo.contributors.contribution_type.additions"}}"
+		data-locale-contribution-type-deletions="{{.locale.Tr "repo.contributors.contribution_type.deletions"}}"
+		data-locale-loading-title="{{.locale.Tr "repo.contributors.loading_title"}}"
+		data-locale-loading-title-failed="{{.locale.Tr "repo.contributors.loading_title_failed"}}"
+		data-locale-loading-info="{{.locale.Tr "repo.contributors.loading_info"}}"
+		data-locale-component-failed-to-load="{{.locale.Tr "repo.contributors.component_failed_to_load"}}"
 	>
 	</div>
 {{end}}

From 2bf4ce02fe884f214c2ec34da21841fdd4fec06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 2 Nov 2023 11:44:49 +0300
Subject: [PATCH 078/138] Fix locale usage

---
 templates/repo/contributors.tmpl | 16 ++++++++--------
 templates/repo/navbar.tmpl       |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/templates/repo/contributors.tmpl b/templates/repo/contributors.tmpl
index 787ca0535c7a5..49a251c1f9692 100644
--- a/templates/repo/contributors.tmpl
+++ b/templates/repo/contributors.tmpl
@@ -1,13 +1,13 @@
 {{if .Permission.CanRead $.UnitTypeCode}}
 	<div id="repo-contributors-chart"
-		data-locale-filter-label="{{.locale.Tr "repo.contributors.contribution_type.filter_label"}}"
-		data-locale-contribution-type-commits="{{.locale.Tr "repo.contributors.contribution_type.commits"}}"
-		data-locale-contribution-type-additions="{{.locale.Tr "repo.contributors.contribution_type.additions"}}"
-		data-locale-contribution-type-deletions="{{.locale.Tr "repo.contributors.contribution_type.deletions"}}"
-		data-locale-loading-title="{{.locale.Tr "repo.contributors.loading_title"}}"
-		data-locale-loading-title-failed="{{.locale.Tr "repo.contributors.loading_title_failed"}}"
-		data-locale-loading-info="{{.locale.Tr "repo.contributors.loading_info"}}"
-		data-locale-component-failed-to-load="{{.locale.Tr "repo.contributors.component_failed_to_load"}}"
+		data-locale-filter-label="{{ctx.Locale.Tr "repo.contributors.contribution_type.filter_label"}}"
+		data-locale-contribution-type-commits="{{ctx.Locale.Tr "repo.contributors.contribution_type.commits"}}"
+		data-locale-contribution-type-additions="{{ctx.Locale.Tr "repo.contributors.contribution_type.additions"}}"
+		data-locale-contribution-type-deletions="{{ctx.Locale.Tr "repo.contributors.contribution_type.deletions"}}"
+		data-locale-loading-title="{{ctx.Locale.Tr "repo.contributors.loading_title"}}"
+		data-locale-loading-title-failed="{{ctx.Locale.Tr "repo.contributors.loading_title_failed"}}"
+		data-locale-loading-info="{{ctx.Locale.Tr "repo.contributors.loading_info"}}"
+		data-locale-component-failed-to-load="{{ctx.Locale.Tr "repo.contributors.component_failed_to_load"}}"
 	>
 	</div>
 {{end}}
diff --git a/templates/repo/navbar.tmpl b/templates/repo/navbar.tmpl
index 9dbf46daf6b16..d24372825631b 100644
--- a/templates/repo/navbar.tmpl
+++ b/templates/repo/navbar.tmpl
@@ -1,8 +1,8 @@
 <div class="ui fluid vertical menu">
 	<a class="{{if .PageIsPulse}}active{{end}} item" href="{{.RepoLink}}/activity">
-		{{.locale.Tr "repo.activity.navbar.pulse"}}
+		{{ctx.Locale.Tr "repo.activity.navbar.pulse"}}
 	</a>
 	<a class="{{if .PageIsContributors}}active{{end}} item" href="{{.RepoLink}}/activity/contributors">
-		{{.locale.Tr "repo.activity.navbar.contributors"}}
+		{{ctx.Locale.Tr "repo.activity.navbar.contributors"}}
 	</a>
 </div>

From 0d08f06c14bac53c3a542631003d0fbd63ca1d00 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 2 Nov 2023 20:25:28 +0100
Subject: [PATCH 079/138] layout fixes

---
 templates/repo/activity.tmpl               |  6 +-
 templates/repo/pulse.tmpl                  |  1 -
 web_src/js/components/RepoContributors.vue | 67 +++++++++++-----------
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl
index f99d14782c61b..960083d2fbd7f 100644
--- a/templates/repo/activity.tmpl
+++ b/templates/repo/activity.tmpl
@@ -1,11 +1,11 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository commits">
 	{{template "repo/header" .}}
-	<div class="ui container stackable grid">
-		<div class="four wide column">
+	<div class="ui container flex-container">
+		<div class="flex-container-nav">
 			{{template "repo/navbar" .}}
 		</div>
-		<div class="twelve wide column">
+		<div class="flex-container-main">
 			{{if .PageIsPulse}}{{template "repo/pulse" .}}{{end}}
 			{{if .PageIsContributors}}{{template "repo/contributors" .}}{{end}}
 		</div>
diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl
index 4b97931c27855..75f49c2a74526 100644
--- a/templates/repo/pulse.tmpl
+++ b/templates/repo/pulse.tmpl
@@ -17,7 +17,6 @@
 		</div>
 	</div>
 </h2>
-<div class="divider"></div>
 
 {{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}}
 <h4 class="ui top attached header">{{ctx.Locale.Tr "repo.activity.overview"}}</h4>
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index ad54744c7e1d1..27738a8715c2d 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -275,32 +275,33 @@ export default {
 
 <template>
   <div>
-    <h2 class="ui header">
-      <relative-time
-        v-if="dateFrom !== null"
-        format="datetime"
-        year="numeric"
-        month="short"
-        day="numeric"
-        weekday=""
-        :datetime="dateFrom"
-      >
-        {{ dateFrom }}
-      </relative-time>
-      {{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: "-" }}
-      <relative-time
-        v-if="dateUntil !== null"
-        format="datetime"
-        year="numeric"
-        month="short"
-        day="numeric"
-        weekday=""
-        :datetime="dateUntil"
-      >
-        {{ dateUntil }}
-      </relative-time>
-
-      <div class="ui right">
+    <h2 class="ui header gt-df gt-ac gt-sb">
+      <div>
+        <relative-time
+          v-if="dateFrom !== null"
+          format="datetime"
+          year="numeric"
+          month="short"
+          day="numeric"
+          weekday=""
+          :datetime="dateFrom"
+        >
+          {{ dateFrom }}
+        </relative-time>
+        {{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: "-" }}
+        <relative-time
+          v-if="dateUntil !== null"
+          format="datetime"
+          year="numeric"
+          month="short"
+          day="numeric"
+          weekday=""
+          :datetime="dateUntil"
+        >
+          {{ dateUntil }}
+        </relative-time>
+      </div>
+      <div>
         <!-- Contribution type -->
         <div class="ui dropdown jump" id="dropdown">
           <div class="ui basic compact button">
@@ -323,8 +324,7 @@ export default {
         </div>
       </div>
     </h2>
-    <div class="divider"/>
-    <div class="gt-df main-graph">
+    <div class="gt-df ui segment main-graph">
       <div v-if="isLoading || errorText !== ''" class="gt-tc gt-m-auto">
         <div v-if="isLoading">
           <SvgIcon name="octicon-sync" class="gt-mr-3 job-status-rotate"/>
@@ -340,11 +340,9 @@ export default {
         :data="toGraphData(totalStats.weeks)" :options="getOptions('main')"
       />
     </div>
-    <div class="divider"/>
-
-    <div class="ui attached two column grid">
+    <div class="contributor-grid">
       <div
-        v-for="(contributor, index) in sortedContributors" :key="index" class="column stats-table"
+        v-for="(contributor, index) in sortedContributors" :key="index" class="stats-table"
         v-memo="[sortedContributors, type]"
       >
         <div class="ui top attached header gt-df gt-f1">
@@ -379,4 +377,9 @@ export default {
 .main-graph {
   height: 380px;
 }
+.contributor-grid {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 1rem;
+}
 </style>

From 325fc9b307cffa3b16683621fff60f96a28271d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Mon, 6 Nov 2023 13:35:45 +0300
Subject: [PATCH 080/138] Combine email addresses linked to same gitea user
 together

---
 services/repository/contributors_graph.go | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index 3ee388114eb58..e9f62579d0f4d 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -65,29 +65,36 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository, revis
 	total := contributorsCommitStats["total"]
 
 	for _, v := range extendedCommitStats {
-		if len(v.Author.Email) == 0 {
+		userEmail := v.Author.Email
+		if len(userEmail) == 0 {
 			continue
 		}
-		if _, ok := contributorsCommitStats[v.Author.Email]; !ok {
-			u, _ := user_model.GetUserByEmail(ctx, v.Author.Email)
+		u, _ := user_model.GetUserByEmail(ctx, userEmail)
+		if u != nil {
+			// update userEmail with user's primary email address so
+			// that different mail addresses will linked to same account
+			userEmail = u.GetEmail()
+		}
+		if _, ok := contributorsCommitStats[userEmail]; !ok {
 			if u == nil {
-				contributorsCommitStats[v.Author.Email] = &api.ContributorData{
+				contributorsCommitStats[userEmail] = &api.ContributorData{
 					Name:       v.Author.Name,
 					AvatarLink: unknownUserAvatarLink,
 					Weeks:      CreateWeeks(sundays),
 				}
 			} else {
-				contributorsCommitStats[v.Author.Email] = &api.ContributorData{
+				contributorsCommitStats[userEmail] = &api.ContributorData{
 					Name:       u.DisplayName(),
 					Login:      u.LowerName,
 					AvatarLink: u.AvatarLink(ctx),
 					HomeLink:   u.HomeLink(),
 					Weeks:      CreateWeeks(sundays),
 				}
+
 			}
 		}
 		// Update user statistics
-		user := contributorsCommitStats[v.Author.Email]
+		user := contributorsCommitStats[userEmail]
 		startingOfWeek, _ := util.FindLastSundayBeforeDate(v.Author.Date)
 
 		val, _ := time.Parse(layout, startingOfWeek)

From 2b2d0ef9ad58f1ba4f55ad39e6bfcdc96220e290 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Tue, 7 Nov 2023 22:55:36 +0100
Subject: [PATCH 081/138] reduce main graph to 280px height

---
 web_src/js/components/RepoContributors.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 27738a8715c2d..20b5c2684a590 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -375,7 +375,7 @@ export default {
 
 <style scoped>
 .main-graph {
-  height: 380px;
+  height: 280px;
 }
 .contributor-grid {
   display: grid;

From 36d8e81fba1e8975d81378b011ab315fb0ac0920 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Tue, 7 Nov 2023 23:27:55 +0100
Subject: [PATCH 082/138] color and chart rendering enhancements

---
 web_src/js/components/RepoContributors.vue | 50 ++++++++++++++++------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 20b5c2684a590..cc0f19cf0cee0 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -21,6 +21,24 @@ import $ from 'jquery';
 
 const {pageData} = window.config;
 
+const colors = {
+  text: '--color-text',
+  border: '--color-secondary-alpha-60',
+  commits: '--color-primary-alpha-60',
+  additions: '--color-green',
+  deletions: '--color-red',
+};
+
+const styles = window.getComputedStyle(document.documentElement);
+const getColor = (name) => styles.getPropertyValue(name).trim();
+
+for (const [key, value] of Object.entries(colors)) {
+  colors[key] = getColor(value);
+}
+
+Chart.defaults.color = colors.text;
+Chart.defaults.borderColor = colors.border;
+
 Chart.register(
   TimeScale,
   CategoryScale,
@@ -78,6 +96,7 @@ export default {
         a[sortingCriteria] > b[sortingCriteria] ? -1 : a[sortingCriteria] === b[sortingCriteria] ? 0 : 1
       ).slice(0, 100);
     },
+
     async fetchGraphData() {
       this.isLoading = true;
       try {
@@ -145,15 +164,16 @@ export default {
       const maxValue = Math.max(
         ...this.totalStats.weeks.map((o) => o[this.type])
       );
-      const [cooefficient, exp] = maxValue
+      const [coefficient, exp] = maxValue
         .toExponential()
         .split('e')
         .map(Number);
-      if (cooefficient % 1 === 0) {
+      if (coefficient % 1 === 0) {
         return maxValue;
       }
-      return (1 - (cooefficient % 1)) * 10 ** exp + maxValue;
+      return (1 - (coefficient % 1)) * 10 ** exp + maxValue;
     },
+
     maxContributorGraph() {
       // Similar to maxMainGraph method this method calculates maximum value for Y value
       // for contributors' graph. If I let chartjs do this for me, it will choose different
@@ -162,20 +182,17 @@ export default {
       const maxValue = Math.max(
         ...this.sortedContributors.map((c) => c['max_contribution_type'])
       );
-      const [cooefficient, exp] = maxValue
+      const [coefficient, exp] = maxValue
         .toExponential()
         .split('e')
         .map(Number);
-      if (cooefficient % 1 === 0) {
+      if (coefficient % 1 === 0) {
         return maxValue;
       }
-      return (1 - (cooefficient % 1)) * 10 ** exp + maxValue;
+      return (1 - (coefficient % 1)) * 10 ** exp + maxValue;
     },
 
     toGraphData(data) {
-      const style = getComputedStyle(document.body);
-      const colorName = this.type === 'commits' ? '--color-primary-alpha-60' : (this.type === 'additions' ? '--color-green-badge-hover-bg' : '--color-red-badge-hover-bg');
-      const color = style.getPropertyValue(colorName).trim();
       return {
         datasets: [
           {
@@ -185,7 +202,7 @@ export default {
             pointRadius: 0,
             pointHitRadius: 0,
             fill: 'start',
-            backgroundColor: color,
+            backgroundColor: colors[this.type],
             borderWidth: 0,
             tension: 0.3,
           },
@@ -259,12 +276,19 @@ export default {
               display: false,
             },
             time: {
-              minUnit: 'day',
+              minUnit: 'month',
+            },
+            ticks: {
+              maxRotation: 0,
+              maxTicksLimit: type === 'main' ? 12 : 6,
             },
           },
           y: {
             min: 0,
             max: type === 'main' ? this.maxMainGraph() : this.maxContributorGraph(),
+            ticks: {
+              maxTicksLimit: type === 'main' ? 6 : 4,
+            },
           },
         },
       };
@@ -272,7 +296,6 @@ export default {
   },
 };
 </script>
-
 <template>
   <div>
     <h2 class="ui header gt-df gt-ac gt-sb">
@@ -372,10 +395,9 @@ export default {
     </div>
   </div>
 </template>
-
 <style scoped>
 .main-graph {
-  height: 280px;
+  height: 240px;
 }
 .contributor-grid {
   display: grid;

From 4d2905bbd1689205a0b93c2434a96f0307dc507e Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Tue, 7 Nov 2023 23:40:46 +0100
Subject: [PATCH 083/138] make fmt

---
 services/repository/contributors_graph.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index e9f62579d0f4d..a322b143c87ff 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -90,7 +90,6 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository, revis
 					HomeLink:   u.HomeLink(),
 					Weeks:      CreateWeeks(sundays),
 				}
-
 			}
 		}
 		// Update user statistics

From a151d51c675e2511000a2a3ca2b96c8134b837be Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Tue, 7 Nov 2023 23:49:21 +0100
Subject: [PATCH 084/138] js formatting

---
 web_src/js/components/RepoContributors.vue | 78 +++++++++-------------
 1 file changed, 30 insertions(+), 48 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index cc0f19cf0cee0..ca22a25e04105 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -61,21 +61,19 @@ export default {
       required: true
     },
   },
-  data: () => {
-    return {
-      isLoading: false,
-      errorText: '',
-      totalStats: {},
-      sortedContributors: {},
-      repoLink: pageData.repoLink || [],
-      type: pageData.contributionType,
-      contributorsStats: [],
-      dateFrom: null,
-      dateUntil: null,
-      startDate: null,
-      endDate: null,
-    };
-  },
+  data: () => ({
+    isLoading: false,
+    errorText: '',
+    totalStats: {},
+    sortedContributors: {},
+    repoLink: pageData.repoLink || [],
+    type: pageData.contributionType,
+    contributorsStats: [],
+    dateFrom: null,
+    dateUntil: null,
+    startDate: null,
+    endDate: null,
+  }),
   mounted() {
     this.fetchGraphData();
 
@@ -91,10 +89,11 @@ export default {
   methods: {
     sortContributors() {
       const contributors = this.filterContributorWeeksByDateRange();
-      const sortingCriteria = `total_${this.type}`;
-      this.sortedContributors = Object.values(contributors).filter((contributor) => contributor[sortingCriteria] !== 0).sort((a, b) =>
-        a[sortingCriteria] > b[sortingCriteria] ? -1 : a[sortingCriteria] === b[sortingCriteria] ? 0 : 1
-      ).slice(0, 100);
+      const criteria = `total_${this.type}`;
+      this.sortedContributors = Object.values(contributors)
+        .filter((contributor) => contributor[criteria] !== 0)
+        .sort((a, b) => a[criteria] > b[criteria] ? -1 : a[criteria] === b[criteria] ? 0 : 1)
+        .slice(0, 100);
     },
 
     async fetchGraphData() {
@@ -115,8 +114,8 @@ export default {
         } else {
           this.errorText = response.statusText;
         }
-      } catch (e) {
-        this.errorText = e.message;
+      } catch (err) {
+        this.errorText = err.message;
       } finally {
         this.isLoading = false;
       }
@@ -124,7 +123,6 @@ export default {
 
     filterContributorWeeksByDateRange() {
       const filteredData = {};
-
       const data = this.contributorsStats;
       for (const key of Object.keys(data)) {
         const user = data[key];
@@ -153,24 +151,16 @@ export default {
     },
 
     maxMainGraph() {
-      // This method calculates maximum value for Y value of the main graph.
-      // If the number of maximum contributions for selected contribution type is
-      // 15.955 it is probably better to round it up to 20.000
-      // This method is responsible for doing that
-      // Normally, chartjs handles this automatically, but it will resize the
-      // graph when you zoom, pan etc. I think resizing the graph makes it harder
-      // to compare things visually.
-
+      // This method calculates maximum value for Y value of the main graph. If the number
+      // of maximum contributions for selected contribution type is 15.955 it is probably
+      // better to round it up to 20.000.This method is responsible for doing that.
+      // Normally, chartjs handles this automatically, but it will resize the graph when you
+      // zoom, pan etc. I think resizing the graph makes it harder to compare things visually.
       const maxValue = Math.max(
         ...this.totalStats.weeks.map((o) => o[this.type])
       );
-      const [coefficient, exp] = maxValue
-        .toExponential()
-        .split('e')
-        .map(Number);
-      if (coefficient % 1 === 0) {
-        return maxValue;
-      }
+      const [coefficient, exp] = maxValue.toExponential().split('e').map(Number);
+      if (coefficient % 1 === 0) return maxValue;
       return (1 - (coefficient % 1)) * 10 ** exp + maxValue;
     },
 
@@ -178,17 +168,11 @@ export default {
       // Similar to maxMainGraph method this method calculates maximum value for Y value
       // for contributors' graph. If I let chartjs do this for me, it will choose different
       // maxY value for each contributors' graph which again makes it harder to compare.
-
       const maxValue = Math.max(
         ...this.sortedContributors.map((c) => c['max_contribution_type'])
       );
-      const [coefficient, exp] = maxValue
-        .toExponential()
-        .split('e')
-        .map(Number);
-      if (coefficient % 1 === 0) {
-        return maxValue;
-      }
+      const [coefficient, exp] = maxValue.toExponential().split('e').map(Number);
+      if (coefficient % 1 === 0) return maxValue;
       return (1 - (coefficient % 1)) * 10 ** exp + maxValue;
     },
 
@@ -196,9 +180,7 @@ export default {
       return {
         datasets: [
           {
-            data: data.map((i) => {
-              return {x: i.week, y: i[this.type]};
-            }),
+            data: data.map((i) => ({x: i.week, y: i[this.type]})),
             pointRadius: 0,
             pointHitRadius: 0,
             fill: 'start',

From 6ebc6ce27f3679991d11b4d2a6c606aca5ed7441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 8 Nov 2023 12:09:16 +0300
Subject: [PATCH 085/138] Use constant from time package instead of manually
 defining it

---
 modules/util/dates.go                     | 2 +-
 services/repository/contributors_graph.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/util/dates.go b/modules/util/dates.go
index d5f0b034671be..a61340bc49720 100644
--- a/modules/util/dates.go
+++ b/modules/util/dates.go
@@ -7,7 +7,7 @@ import (
 	"time"
 )
 
-const layout = "2006-01-02"
+const layout = time.DateOnly
 
 func ListSundaysBetween(startStr, endStr string) ([]int64, error) {
 	startDate, err := time.Parse(layout, startStr)
diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index a322b143c87ff..dc665bc647c49 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -47,7 +47,7 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository, revis
 		return nil, fmt.Errorf("ExtendedCommitStats: %w", err)
 	}
 
-	layout := "2006-01-02"
+	layout := time.DateOnly
 	initialCommitDate := extendedCommitStats[0].Author.Date
 
 	startingSunday, _ := util.FindLastSundayBeforeDate(initialCommitDate)

From b50929b5fdfb335d95761b1aa9c393a97c237dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 8 Nov 2023 12:34:01 +0300
Subject: [PATCH 086/138] Remove useless data from page context

---
 routers/web/repo/activity.go     | 1 -
 routers/web/repo/contributors.go | 1 -
 2 files changed, 2 deletions(-)

diff --git a/routers/web/repo/activity.go b/routers/web/repo/activity.go
index 53742e1a29265..af99c4ed98630 100644
--- a/routers/web/repo/activity.go
+++ b/routers/web/repo/activity.go
@@ -23,7 +23,6 @@ func Activity(ctx *context.Context) {
 	ctx.Data["PageIsActivity"] = true
 
 	ctx.Data["PageIsPulse"] = true
-	ctx.Data["PageIsContributors"] = false
 
 	ctx.Data["Period"] = ctx.Params("period")
 
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index b09ca599c780e..52b9276c75cbd 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -20,7 +20,6 @@ func Contributors(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("repo.contributors")
 
 	ctx.Data["PageIsActivity"] = true
-	ctx.Data["PageIsPulse"] = false
 	ctx.Data["PageIsContributors"] = true
 
 	ctx.PageData["contributionType"] = "commits"

From 043f2a2da35b98a750452311759f9c433d92e9b9 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 9 Nov 2023 10:04:05 +0100
Subject: [PATCH 087/138] Update templates/repo/navbar.tmpl

---
 templates/repo/navbar.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/navbar.tmpl b/templates/repo/navbar.tmpl
index d24372825631b..4464de2a48bc6 100644
--- a/templates/repo/navbar.tmpl
+++ b/templates/repo/navbar.tmpl
@@ -1,5 +1,5 @@
 <div class="ui fluid vertical menu">
-	<a class="{{if .PageIsPulse}}active{{end}} item" href="{{.RepoLink}}/activity">
+	<a class="{{if .PageIsPulse}}active {{end}}item" href="{{.RepoLink}}/activity">
 		{{ctx.Locale.Tr "repo.activity.navbar.pulse"}}
 	</a>
 	<a class="{{if .PageIsContributors}}active{{end}} item" href="{{.RepoLink}}/activity/contributors">

From dd2664d473509a34b358a51819215cf07a5a0dc1 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 9 Nov 2023 10:04:34 +0100
Subject: [PATCH 088/138] Update templates/repo/navbar.tmpl

---
 templates/repo/navbar.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/navbar.tmpl b/templates/repo/navbar.tmpl
index 4464de2a48bc6..a9042ee30d0b6 100644
--- a/templates/repo/navbar.tmpl
+++ b/templates/repo/navbar.tmpl
@@ -2,7 +2,7 @@
 	<a class="{{if .PageIsPulse}}active {{end}}item" href="{{.RepoLink}}/activity">
 		{{ctx.Locale.Tr "repo.activity.navbar.pulse"}}
 	</a>
-	<a class="{{if .PageIsContributors}}active{{end}} item" href="{{.RepoLink}}/activity/contributors">
+	<a class="{{if .PageIsContributors}}active {{end}}item" href="{{.RepoLink}}/activity/contributors">
 		{{ctx.Locale.Tr "repo.activity.navbar.contributors"}}
 	</a>
 </div>

From 1c9b0f51ad273f5e643dd26f91bac4061c885062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 9 Nov 2023 15:24:18 +0300
Subject: [PATCH 089/138] Apply suggestions from code review

---
 services/repository/contributors_graph.go  | 7 ++++++-
 web_src/js/components/RepoContributors.vue | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index dc665bc647c49..a3e0ab8207288 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"time"
 
+	"code.gitea.io/gitea/models/avatars"
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/git"
@@ -77,9 +78,13 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository, revis
 		}
 		if _, ok := contributorsCommitStats[userEmail]; !ok {
 			if u == nil {
+				avatarLink := avatars.GenerateEmailAvatarFastLink(ctx, userEmail, 0)
+				if avatarLink == "" {
+					avatarLink = unknownUserAvatarLink
+				}
 				contributorsCommitStats[userEmail] = &api.ContributorData{
 					Name:       v.Author.Name,
-					AvatarLink: unknownUserAvatarLink,
+					AvatarLink: avatarLink,
 					Weeks:      CreateWeeks(sundays),
 				}
 			} else {
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index ca22a25e04105..855bc296a0596 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -357,7 +357,7 @@ export default {
           </a>
           <div class="gt-ml-3">
             <a :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a>
-            <p class="gt-font-12">
+            <p class="gt-font-12 gt-df gt-gap-2">
               <strong v-if="contributor.total_commits">{{ contributor.total_commits.toLocaleString() }} {{ locale.contributionType.commits }}</strong>
               <strong v-if="contributor.total_additions" class="text green">{{ contributor.total_additions.toLocaleString() }}++ </strong>
               <strong v-if="contributor.total_deletions" class="text red">

From ebf5af296f94af5d32759d36fc31f9be659d9c6c Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Fri, 10 Nov 2023 05:15:44 +0100
Subject: [PATCH 090/138] Backend Asnyc

---
 routers/api/v1/repo/collaborators.go      |  9 +++-
 routers/web/repo/contributors.go          |  7 ++-
 services/repository/contributors_graph.go | 66 +++++++++++++++++++++--
 3 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index 529e164649f66..1efbe7d22de89 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -384,6 +384,9 @@ func GetAllContributorsStats(ctx *context.APIContext) {
 	//   description: SHA or branch to start listing commits from (usually 'master')
 	//   type: string
 	// responses:
+	//   "102":
+	//     description: request later as stats are still generated
+	//     "$ref": "#/responses/empty"
 	//   "200":
 	//     "$ref": "#/responses/ContributorDataMap"
 	//   "404":
@@ -405,7 +408,11 @@ func GetAllContributorsStats(ctx *context.APIContext) {
 		sha = ctx.Repo.Repository.DefaultBranch
 	}
 
-	if contributorStats, err := repo_service.GetContributorStats(ctx, ctx.Repo.Repository, sha); err != nil {
+	if contributorStats, err := repo_service.GetContributorStats(ctx, ctx.Cache, ctx.Repo.Repository, sha); err != nil {
+		if errors.Is(err, repo_service.ErrAwaitGeneration) {
+			ctx.Status(http.StatusProcessing)
+			return
+		}
 		ctx.Error(http.StatusInternalServerError, "GetContributorStats", err)
 	} else {
 		ctx.JSON(http.StatusOK, &contributorStats)
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index 52b9276c75cbd..86bfb720d7865 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -4,6 +4,7 @@
 package repo
 
 import (
+	"errors"
 	"net/http"
 
 	"code.gitea.io/gitea/modules/base"
@@ -31,7 +32,11 @@ func Contributors(ctx *context.Context) {
 
 // ContributorsData renders JSON of contributors along with their weekly commit statistics
 func ContributorsData(ctx *context.Context) {
-	if contributorStats, err := contributors_service.GetContributorStats(ctx, ctx.Repo.Repository, ctx.Repo.CommitID); err != nil {
+	if contributorStats, err := contributors_service.GetContributorStats(ctx, ctx.Cache, ctx.Repo.Repository, ctx.Repo.CommitID); err != nil {
+		if errors.Is(err, contributors_service.ErrAwaitGeneration) {
+			ctx.Status(http.StatusProcessing)
+			return
+		}
 		ctx.ServerError("GetContributorStats", err)
 	} else {
 		ctx.JSON(http.StatusOK, contributorStats)
diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index a3e0ab8207288..2f3a9782d7d60 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -5,16 +5,31 @@ package repository
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"sync"
 	"time"
 
 	"code.gitea.io/gitea/models/avatars"
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/graceful"
 	"code.gitea.io/gitea/modules/log"
 	api "code.gitea.io/gitea/modules/structs"
 	util "code.gitea.io/gitea/modules/util"
+	"gitea.com/go-chi/cache"
+)
+
+const (
+	contributorStatsCacheKey           = "GetContributorStats/%s/%s"
+	contributorStatsCacheTimeout int64 = 60 * 10
+)
+
+var (
+	ErrAwaitGeneration  = errors.New("generation took longer than ")
+	awaitGenerationTime = time.Second * 5
+	generateLock        = sync.Map{}
 )
 
 // CreateWeeks converts list of sundays to list of *api.WeekData
@@ -33,10 +48,50 @@ func CreateWeeks(sundays []int64) []*api.WeekData {
 }
 
 // GetContributorStats returns contributors stats for git commits for given revision or default branch
-func GetContributorStats(ctx context.Context, repo *repo_model.Repository, revision string) (map[string]*api.ContributorData, error) {
+func GetContributorStats(ctx context.Context, cache cache.Cache, repo *repo_model.Repository, revision string) (map[string]*api.ContributorData, error) {
+	// as GetContributorStats is resource intensive we cache the result
+	cacheKey := fmt.Sprintf(contributorStatsCacheKey, repo.FullName(), revision)
+	if !cache.IsExist(cacheKey) {
+		genReady := make(chan struct{})
+
+		// dont start multible async generations
+		_, run := generateLock.Load(cacheKey)
+		if run {
+			return nil, ErrAwaitGeneration
+		} else {
+			generateLock.Store(cacheKey, struct{}{})
+		}
+
+		// run generation async
+		go generateContributorStats(genReady, cache, cacheKey, repo, revision)
+
+		select {
+		case <-time.After(awaitGenerationTime):
+			return nil, ErrAwaitGeneration
+		case <-genReady:
+			// we got generation ready before timeout
+			break
+		}
+	}
+	// TODO: renew timeout of cache cache.UpdateTimeout(cacheKey, contributorStatsCacheTimeout)
+
+	switch v := cache.Get(cacheKey).(type) {
+	case error:
+		return nil, v
+	case map[string]*api.ContributorData:
+		return v, nil
+	default:
+		return nil, fmt.Errorf("unexpected type in cache detected")
+	}
+}
+
+func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey string, repo *repo_model.Repository, revision string) {
+	ctx := graceful.GetManager().HammerContext()
+
 	gitRepo, closer, err := git.RepositoryFromContextOrOpen(ctx, repo.RepoPath())
 	if err != nil {
-		return nil, fmt.Errorf("OpenRepository: %w", err)
+		err := fmt.Errorf("OpenRepository: %w", err)
+		cache.Put(cacheKey, err, contributorStatsCacheTimeout)
 	}
 	defer closer.Close()
 
@@ -45,7 +100,8 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository, revis
 	}
 	extendedCommitStats, err := gitRepo.ExtendedCommitStats(revision)
 	if err != nil {
-		return nil, fmt.Errorf("ExtendedCommitStats: %w", err)
+		err := fmt.Errorf("ExtendedCommitStats: %w", err)
+		cache.Put(cacheKey, err, contributorStatsCacheTimeout)
 	}
 
 	layout := time.DateOnly
@@ -121,5 +177,7 @@ func GetContributorStats(ctx context.Context, repo *repo_model.Repository, revis
 		}
 	}
 
-	return contributorsCommitStats, nil
+	cache.Put(cacheKey, contributorsCommitStats, contributorStatsCacheTimeout)
+	generateLock.Delete(cacheKey)
+	genDone <- struct{}{}
 }

From 8c35b11fdc8dc45ca2fff5a20a43ef281dad01be Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 11 Nov 2023 04:57:47 +0100
Subject: [PATCH 091/138] use status 216

---
 routers/api/v1/repo/collaborators.go | 4 ++--
 routers/web/repo/contributors.go     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index 1efbe7d22de89..161989fa2c0d1 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -384,7 +384,7 @@ func GetAllContributorsStats(ctx *context.APIContext) {
 	//   description: SHA or branch to start listing commits from (usually 'master')
 	//   type: string
 	// responses:
-	//   "102":
+	//   "216":
 	//     description: request later as stats are still generated
 	//     "$ref": "#/responses/empty"
 	//   "200":
@@ -410,7 +410,7 @@ func GetAllContributorsStats(ctx *context.APIContext) {
 
 	if contributorStats, err := repo_service.GetContributorStats(ctx, ctx.Cache, ctx.Repo.Repository, sha); err != nil {
 		if errors.Is(err, repo_service.ErrAwaitGeneration) {
-			ctx.Status(http.StatusProcessing)
+			ctx.Status(216)
 			return
 		}
 		ctx.Error(http.StatusInternalServerError, "GetContributorStats", err)
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index 86bfb720d7865..581d75e40bd40 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -34,7 +34,7 @@ func Contributors(ctx *context.Context) {
 func ContributorsData(ctx *context.Context) {
 	if contributorStats, err := contributors_service.GetContributorStats(ctx, ctx.Cache, ctx.Repo.Repository, ctx.Repo.CommitID); err != nil {
 		if errors.Is(err, contributors_service.ErrAwaitGeneration) {
-			ctx.Status(http.StatusProcessing)
+			ctx.Status(216)
 			return
 		}
 		ctx.ServerError("GetContributorStats", err)

From de1b537bbf3b09674df3c99be7de09f01cfd74b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sat, 11 Nov 2023 16:46:14 +0300
Subject: [PATCH 092/138] Handle http 216 on client side

---
 web_src/js/components/RepoContributors.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 855bc296a0596..003013dd6d56b 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -99,7 +99,13 @@ export default {
     async fetchGraphData() {
       this.isLoading = true;
       try {
-        const response = await GET(`${this.repoLink}/activity/contributors/data`);
+        let response;
+        do {
+          response = await GET(`${this.repoLink}/activity/contributors/data`);
+          if (response.status === 216) {
+            await new Promise(resolve => setTimeout(resolve, 1000)); // wait for 1 second before retrying
+          }
+        } while (response.status === 216);
         if (response.ok) {
           const data = await response.json();
           const {total, ...rest} = data;

From cc4f9961c257aa19b74f2d70e2766e0206e861b1 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 13 Nov 2023 04:28:42 +0100
Subject: [PATCH 093/138] body

---
 modules/structs/repo_collaborator.go       |  6 +++++
 routers/api/v1/repo/collaborators.go       |  9 +++----
 routers/api/v1/swagger/repo.go             |  8 +++---
 routers/web/repo/contributors.go           |  5 ++--
 services/repository/contributors_graph.go  |  9 +++----
 templates/swagger/v1_json.tmpl             | 29 ++++++++++++++++------
 web_src/js/components/RepoContributors.vue | 18 ++++++++------
 7 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/modules/structs/repo_collaborator.go b/modules/structs/repo_collaborator.go
index 553546272beae..9a28a5b47b43a 100644
--- a/modules/structs/repo_collaborator.go
+++ b/modules/structs/repo_collaborator.go
@@ -31,3 +31,9 @@ type ContributorData struct {
 	TotalCommits int64       `json:"total_commits"`
 	Weeks        []*WeekData `json:"weeks"`
 }
+
+// ContributorDataResponse returns ContributorData or indicates it is still generated in the backend
+type ContributorDataResponse struct {
+	Data    map[string]*ContributorData `json:"data"`
+	IsReady bool                        `json:"is_ready"`
+}
diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index 161989fa2c0d1..6ed68adb6fdbd 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -384,11 +384,8 @@ func GetAllContributorsStats(ctx *context.APIContext) {
 	//   description: SHA or branch to start listing commits from (usually 'master')
 	//   type: string
 	// responses:
-	//   "216":
-	//     description: request later as stats are still generated
-	//     "$ref": "#/responses/empty"
 	//   "200":
-	//     "$ref": "#/responses/ContributorDataMap"
+	//     "$ref": "#/responses/ContributorDataResponse"
 	//   "404":
 	//     "$ref": "#/responses/notFound"
 	//   "409":
@@ -410,11 +407,11 @@ func GetAllContributorsStats(ctx *context.APIContext) {
 
 	if contributorStats, err := repo_service.GetContributorStats(ctx, ctx.Cache, ctx.Repo.Repository, sha); err != nil {
 		if errors.Is(err, repo_service.ErrAwaitGeneration) {
-			ctx.Status(216)
+			ctx.JSON(http.StatusOK, &api.ContributorDataResponse{IsReady: false})
 			return
 		}
 		ctx.Error(http.StatusInternalServerError, "GetContributorStats", err)
 	} else {
-		ctx.JSON(http.StatusOK, &contributorStats)
+		ctx.JSON(http.StatusOK, &api.ContributorDataResponse{IsReady: false, Data: contributorStats})
 	}
 }
diff --git a/routers/api/v1/swagger/repo.go b/routers/api/v1/swagger/repo.go
index a4e35b260f033..ee56fb29870ef 100644
--- a/routers/api/v1/swagger/repo.go
+++ b/routers/api/v1/swagger/repo.go
@@ -253,11 +253,11 @@ type swaggerCommitList struct {
 	Body []api.Commit `json:"body"`
 }
 
-// ContributorDataMap
-// swagger:response ContributorDataMap
-type swaggerContributorDataMap struct {
+// ContributorDataResponse
+// swagger:response ContributorDataResponse
+type swaggerContributorDataResponse struct {
 	// in: body
-	Body map[string]*api.ContributorData `json:"body"`
+	Body api.ContributorDataResponse `json:"body"`
 }
 
 // ChangedFileList
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index 581d75e40bd40..f6753660182bc 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -9,6 +9,7 @@ import (
 
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/structs"
 	contributors_service "code.gitea.io/gitea/services/repository"
 )
 
@@ -34,11 +35,11 @@ func Contributors(ctx *context.Context) {
 func ContributorsData(ctx *context.Context) {
 	if contributorStats, err := contributors_service.GetContributorStats(ctx, ctx.Cache, ctx.Repo.Repository, ctx.Repo.CommitID); err != nil {
 		if errors.Is(err, contributors_service.ErrAwaitGeneration) {
-			ctx.Status(216)
+			ctx.JSON(http.StatusOK, &structs.ContributorDataResponse{IsReady: false})
 			return
 		}
 		ctx.ServerError("GetContributorStats", err)
 	} else {
-		ctx.JSON(http.StatusOK, contributorStats)
+		ctx.JSON(http.StatusOK, &structs.ContributorDataResponse{IsReady: true, Data: contributorStats})
 	}
 }
diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index 2f3a9782d7d60..b11409d97c3b5 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -58,9 +58,8 @@ func GetContributorStats(ctx context.Context, cache cache.Cache, repo *repo_mode
 		_, run := generateLock.Load(cacheKey)
 		if run {
 			return nil, ErrAwaitGeneration
-		} else {
-			generateLock.Store(cacheKey, struct{}{})
 		}
+		generateLock.Store(cacheKey, struct{}{})
 
 		// run generation async
 		go generateContributorStats(genReady, cache, cacheKey, repo, revision)
@@ -91,7 +90,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	gitRepo, closer, err := git.RepositoryFromContextOrOpen(ctx, repo.RepoPath())
 	if err != nil {
 		err := fmt.Errorf("OpenRepository: %w", err)
-		cache.Put(cacheKey, err, contributorStatsCacheTimeout)
+		_ = cache.Put(cacheKey, err, contributorStatsCacheTimeout)
 	}
 	defer closer.Close()
 
@@ -101,7 +100,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	extendedCommitStats, err := gitRepo.ExtendedCommitStats(revision)
 	if err != nil {
 		err := fmt.Errorf("ExtendedCommitStats: %w", err)
-		cache.Put(cacheKey, err, contributorStatsCacheTimeout)
+		_ = cache.Put(cacheKey, err, contributorStatsCacheTimeout)
 	}
 
 	layout := time.DateOnly
@@ -177,7 +176,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 		}
 	}
 
-	cache.Put(cacheKey, contributorsCommitStats, contributorStatsCacheTimeout)
+	_ = cache.Put(cacheKey, contributorsCommitStats, contributorStatsCacheTimeout)
 	generateLock.Delete(cacheKey)
 	genDone <- struct{}{}
 }
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 24c4964597026..1eaa44b92525a 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -4881,7 +4881,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/ContributorDataMap"
+            "$ref": "#/responses/ContributorDataResponse"
           },
           "404": {
             "$ref": "#/responses/notFound"
@@ -17571,6 +17571,24 @@
       },
       "x-go-package": "code.gitea.io/gitea/modules/structs"
     },
+    "ContributorDataResponse": {
+      "description": "ContributorDataResponse returns ContributorData or indicates it is still generated in the backend",
+      "type": "object",
+      "properties": {
+        "data": {
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/ContributorData"
+          },
+          "x-go-name": "Data"
+        },
+        "is_ready": {
+          "type": "boolean",
+          "x-go-name": "IsReady"
+        }
+      },
+      "x-go-package": "code.gitea.io/gitea/modules/structs"
+    },
     "CreateAccessTokenOption": {
       "description": "CreateAccessTokenOption options when create access token",
       "type": "object",
@@ -23373,13 +23391,10 @@
         "$ref": "#/definitions/ContentsResponse"
       }
     },
-    "ContributorDataMap": {
-      "description": "ContributorDataMap",
+    "ContributorDataResponse": {
+      "description": "ContributorDataResponse",
       "schema": {
-        "type": "object",
-        "additionalProperties": {
-          "$ref": "#/definitions/ContributorData"
-        }
+        "$ref": "#/definitions/ContributorDataResponse"
       }
     },
     "CronList": {
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 003013dd6d56b..59f187a527a78 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -99,15 +99,19 @@ export default {
     async fetchGraphData() {
       this.isLoading = true;
       try {
-        let response;
+        let data;
         do {
-          response = await GET(`${this.repoLink}/activity/contributors/data`);
-          if (response.status === 216) {
+          const response = await GET(`${this.repoLink}/activity/contributors/data`);
+          if (response.status !== 200) {
+            this.errorText = response.statusText;
+            break;
+          }
+          data = await response.json();
+          if (data.is_ready !== true) {
             await new Promise(resolve => setTimeout(resolve, 1000)); // wait for 1 second before retrying
           }
-        } while (response.status === 216);
-        if (response.ok) {
-          const data = await response.json();
+        } while (data.is_ready !== true);
+        if (data.is_ready) {
           const {total, ...rest} = data;
           this.contributorsStats = rest;
           this.dateFrom = new Date(total.weeks[0].week);
@@ -117,8 +121,6 @@ export default {
           this.sortContributors();
           this.totalStats = total;
           this.errorText = '';
-        } else {
-          this.errorText = response.statusText;
         }
       } catch (err) {
         this.errorText = err.message;

From 166080284f86c7ed9a2e26229d445a8bc566c1e1 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 13 Nov 2023 04:38:59 +0100
Subject: [PATCH 094/138] fix

---
 web_src/js/components/RepoContributors.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 59f187a527a78..170687118178e 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -112,7 +112,7 @@ export default {
           }
         } while (data.is_ready !== true);
         if (data.is_ready) {
-          const {total, ...rest} = data;
+          const {total, ...rest} = data.data;
           this.contributorsStats = rest;
           this.dateFrom = new Date(total.weeks[0].week);
           this.dateUntil = new Date();

From ed1506ef57f50f102bcd4bb6b58431d8f5bc1827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Mon, 13 Nov 2023 13:11:24 +0300
Subject: [PATCH 095/138] Fix frontend

---
 web_src/js/components/RepoContributors.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 170687118178e..81a854209b3e1 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -99,19 +99,19 @@ export default {
     async fetchGraphData() {
       this.isLoading = true;
       try {
-        let data;
+        let data, response;
         do {
-          const response = await GET(`${this.repoLink}/activity/contributors/data`);
+          response = await GET(`${this.repoLink}/activity/contributors/data`);
           if (response.status !== 200) {
             this.errorText = response.statusText;
             break;
           }
           data = await response.json();
-          if (data.is_ready !== true) {
+          if (!data.is_ready) {
             await new Promise(resolve => setTimeout(resolve, 1000)); // wait for 1 second before retrying
           }
-        } while (data.is_ready !== true);
-        if (data.is_ready) {
+        } while (!data.is_ready);
+        if (response.status === 200 && data.is_ready) {
           const {total, ...rest} = data.data;
           this.contributorsStats = rest;
           this.dateFrom = new Date(total.weeks[0].week);

From 6b1593f91c6ba246a62b8bfc0e94db2c1a5dcd5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Mon, 13 Nov 2023 13:16:22 +0300
Subject: [PATCH 096/138] Fix a small error

---
 routers/api/v1/repo/collaborators.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index 6ed68adb6fdbd..e3bb1a7630726 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -412,6 +412,6 @@ func GetAllContributorsStats(ctx *context.APIContext) {
 		}
 		ctx.Error(http.StatusInternalServerError, "GetContributorStats", err)
 	} else {
-		ctx.JSON(http.StatusOK, &api.ContributorDataResponse{IsReady: false, Data: contributorStats})
+		ctx.JSON(http.StatusOK, &api.ContributorDataResponse{IsReady: true, Data: contributorStats})
 	}
 }

From f31d0a3154072cfd26a89747d5ad8e04ecf9514a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Mon, 13 Nov 2023 13:41:02 +0300
Subject: [PATCH 097/138] Fix frontend

---
 web_src/js/components/RepoContributors.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 81a854209b3e1..647e789d823c9 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -102,16 +102,13 @@ export default {
         let data, response;
         do {
           response = await GET(`${this.repoLink}/activity/contributors/data`);
-          if (response.status !== 200) {
-            this.errorText = response.statusText;
-            break;
-          }
+          if (response.status !== 200) break;
           data = await response.json();
           if (!data.is_ready) {
             await new Promise(resolve => setTimeout(resolve, 1000)); // wait for 1 second before retrying
           }
         } while (!data.is_ready);
-        if (response.status === 200 && data.is_ready) {
+        if (response.status === 200) {
           const {total, ...rest} = data.data;
           this.contributorsStats = rest;
           this.dateFrom = new Date(total.weeks[0].week);
@@ -121,6 +118,8 @@ export default {
           this.sortContributors();
           this.totalStats = total;
           this.errorText = '';
+        } else {
+          this.errorText = response.statusText;
         }
       } catch (err) {
         this.errorText = err.message;

From 112897d5039bfb4c49dfd4bd81dec3e7ac1e9184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Mon, 13 Nov 2023 17:11:35 +0300
Subject: [PATCH 098/138] Use status 202

---
 modules/structs/repo_collaborator.go       |  6 -----
 routers/api/v1/repo/collaborators.go       |  9 ++++---
 routers/api/v1/swagger/repo.go             |  8 +++---
 routers/web/repo/contributors.go           |  5 ++--
 services/repository/contributors_graph.go  |  9 ++++---
 templates/swagger/v1_json.tmpl             | 29 ++++++----------------
 web_src/js/components/RepoContributors.vue | 13 +++++-----
 7 files changed, 30 insertions(+), 49 deletions(-)

diff --git a/modules/structs/repo_collaborator.go b/modules/structs/repo_collaborator.go
index 9a28a5b47b43a..553546272beae 100644
--- a/modules/structs/repo_collaborator.go
+++ b/modules/structs/repo_collaborator.go
@@ -31,9 +31,3 @@ type ContributorData struct {
 	TotalCommits int64       `json:"total_commits"`
 	Weeks        []*WeekData `json:"weeks"`
 }
-
-// ContributorDataResponse returns ContributorData or indicates it is still generated in the backend
-type ContributorDataResponse struct {
-	Data    map[string]*ContributorData `json:"data"`
-	IsReady bool                        `json:"is_ready"`
-}
diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index e3bb1a7630726..ec490d1f6a1e8 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -385,7 +385,10 @@ func GetAllContributorsStats(ctx *context.APIContext) {
 	//   type: string
 	// responses:
 	//   "200":
-	//     "$ref": "#/responses/ContributorDataResponse"
+	//     "$ref": "#/responses/ContributorDataMap"
+	//   "202":
+	//     description: request later as stats are still generated
+	//     "$ref": "#/responses/empty"
 	//   "404":
 	//     "$ref": "#/responses/notFound"
 	//   "409":
@@ -407,11 +410,11 @@ func GetAllContributorsStats(ctx *context.APIContext) {
 
 	if contributorStats, err := repo_service.GetContributorStats(ctx, ctx.Cache, ctx.Repo.Repository, sha); err != nil {
 		if errors.Is(err, repo_service.ErrAwaitGeneration) {
-			ctx.JSON(http.StatusOK, &api.ContributorDataResponse{IsReady: false})
+			ctx.Status(http.StatusAccepted)
 			return
 		}
 		ctx.Error(http.StatusInternalServerError, "GetContributorStats", err)
 	} else {
-		ctx.JSON(http.StatusOK, &api.ContributorDataResponse{IsReady: true, Data: contributorStats})
+		ctx.JSON(http.StatusOK, &contributorStats)
 	}
 }
diff --git a/routers/api/v1/swagger/repo.go b/routers/api/v1/swagger/repo.go
index ee56fb29870ef..a4e35b260f033 100644
--- a/routers/api/v1/swagger/repo.go
+++ b/routers/api/v1/swagger/repo.go
@@ -253,11 +253,11 @@ type swaggerCommitList struct {
 	Body []api.Commit `json:"body"`
 }
 
-// ContributorDataResponse
-// swagger:response ContributorDataResponse
-type swaggerContributorDataResponse struct {
+// ContributorDataMap
+// swagger:response ContributorDataMap
+type swaggerContributorDataMap struct {
 	// in: body
-	Body api.ContributorDataResponse `json:"body"`
+	Body map[string]*api.ContributorData `json:"body"`
 }
 
 // ChangedFileList
diff --git a/routers/web/repo/contributors.go b/routers/web/repo/contributors.go
index f6753660182bc..f7dedc0b34098 100644
--- a/routers/web/repo/contributors.go
+++ b/routers/web/repo/contributors.go
@@ -9,7 +9,6 @@ import (
 
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
-	"code.gitea.io/gitea/modules/structs"
 	contributors_service "code.gitea.io/gitea/services/repository"
 )
 
@@ -35,11 +34,11 @@ func Contributors(ctx *context.Context) {
 func ContributorsData(ctx *context.Context) {
 	if contributorStats, err := contributors_service.GetContributorStats(ctx, ctx.Cache, ctx.Repo.Repository, ctx.Repo.CommitID); err != nil {
 		if errors.Is(err, contributors_service.ErrAwaitGeneration) {
-			ctx.JSON(http.StatusOK, &structs.ContributorDataResponse{IsReady: false})
+			ctx.Status(http.StatusAccepted)
 			return
 		}
 		ctx.ServerError("GetContributorStats", err)
 	} else {
-		ctx.JSON(http.StatusOK, &structs.ContributorDataResponse{IsReady: true, Data: contributorStats})
+		ctx.JSON(http.StatusOK, contributorStats)
 	}
 }
diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index b11409d97c3b5..2f3a9782d7d60 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -58,8 +58,9 @@ func GetContributorStats(ctx context.Context, cache cache.Cache, repo *repo_mode
 		_, run := generateLock.Load(cacheKey)
 		if run {
 			return nil, ErrAwaitGeneration
+		} else {
+			generateLock.Store(cacheKey, struct{}{})
 		}
-		generateLock.Store(cacheKey, struct{}{})
 
 		// run generation async
 		go generateContributorStats(genReady, cache, cacheKey, repo, revision)
@@ -90,7 +91,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	gitRepo, closer, err := git.RepositoryFromContextOrOpen(ctx, repo.RepoPath())
 	if err != nil {
 		err := fmt.Errorf("OpenRepository: %w", err)
-		_ = cache.Put(cacheKey, err, contributorStatsCacheTimeout)
+		cache.Put(cacheKey, err, contributorStatsCacheTimeout)
 	}
 	defer closer.Close()
 
@@ -100,7 +101,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	extendedCommitStats, err := gitRepo.ExtendedCommitStats(revision)
 	if err != nil {
 		err := fmt.Errorf("ExtendedCommitStats: %w", err)
-		_ = cache.Put(cacheKey, err, contributorStatsCacheTimeout)
+		cache.Put(cacheKey, err, contributorStatsCacheTimeout)
 	}
 
 	layout := time.DateOnly
@@ -176,7 +177,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 		}
 	}
 
-	_ = cache.Put(cacheKey, contributorsCommitStats, contributorStatsCacheTimeout)
+	cache.Put(cacheKey, contributorsCommitStats, contributorStatsCacheTimeout)
 	generateLock.Delete(cacheKey)
 	genDone <- struct{}{}
 }
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 1eaa44b92525a..24c4964597026 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -4881,7 +4881,7 @@
         ],
         "responses": {
           "200": {
-            "$ref": "#/responses/ContributorDataResponse"
+            "$ref": "#/responses/ContributorDataMap"
           },
           "404": {
             "$ref": "#/responses/notFound"
@@ -17571,24 +17571,6 @@
       },
       "x-go-package": "code.gitea.io/gitea/modules/structs"
     },
-    "ContributorDataResponse": {
-      "description": "ContributorDataResponse returns ContributorData or indicates it is still generated in the backend",
-      "type": "object",
-      "properties": {
-        "data": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/ContributorData"
-          },
-          "x-go-name": "Data"
-        },
-        "is_ready": {
-          "type": "boolean",
-          "x-go-name": "IsReady"
-        }
-      },
-      "x-go-package": "code.gitea.io/gitea/modules/structs"
-    },
     "CreateAccessTokenOption": {
       "description": "CreateAccessTokenOption options when create access token",
       "type": "object",
@@ -23391,10 +23373,13 @@
         "$ref": "#/definitions/ContentsResponse"
       }
     },
-    "ContributorDataResponse": {
-      "description": "ContributorDataResponse",
+    "ContributorDataMap": {
+      "description": "ContributorDataMap",
       "schema": {
-        "$ref": "#/definitions/ContributorDataResponse"
+        "type": "object",
+        "additionalProperties": {
+          "$ref": "#/definitions/ContributorData"
+        }
       }
     },
     "CronList": {
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 647e789d823c9..b927a399bcd73 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -99,17 +99,16 @@ export default {
     async fetchGraphData() {
       this.isLoading = true;
       try {
-        let data, response;
+        let response;
         do {
           response = await GET(`${this.repoLink}/activity/contributors/data`);
-          if (response.status !== 200) break;
-          data = await response.json();
-          if (!data.is_ready) {
+          if (response.status === 202) {
             await new Promise(resolve => setTimeout(resolve, 1000)); // wait for 1 second before retrying
           }
-        } while (!data.is_ready);
-        if (response.status === 200) {
-          const {total, ...rest} = data.data;
+        } while (response.status === 202);
+        if (response.ok) {
+          const data = await response.json();
+          const {total, ...rest} = data;
           this.contributorsStats = rest;
           this.dateFrom = new Date(total.weeks[0].week);
           this.dateUntil = new Date();

From 130f3f4e7e9790631111f3884516344e3f86a4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Mon, 13 Nov 2023 19:12:02 +0300
Subject: [PATCH 099/138] Fix linting errors

---
 services/repository/contributors_graph.go | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index 2f3a9782d7d60..3350579396624 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -58,10 +58,9 @@ func GetContributorStats(ctx context.Context, cache cache.Cache, repo *repo_mode
 		_, run := generateLock.Load(cacheKey)
 		if run {
 			return nil, ErrAwaitGeneration
-		} else {
-			generateLock.Store(cacheKey, struct{}{})
 		}
 
+		generateLock.Store(cacheKey, struct{}{})
 		// run generation async
 		go generateContributorStats(genReady, cache, cacheKey, repo, revision)
 
@@ -91,7 +90,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	gitRepo, closer, err := git.RepositoryFromContextOrOpen(ctx, repo.RepoPath())
 	if err != nil {
 		err := fmt.Errorf("OpenRepository: %w", err)
-		cache.Put(cacheKey, err, contributorStatsCacheTimeout)
+		_ = cache.Put(cacheKey, err, contributorStatsCacheTimeout)
 	}
 	defer closer.Close()
 
@@ -101,7 +100,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	extendedCommitStats, err := gitRepo.ExtendedCommitStats(revision)
 	if err != nil {
 		err := fmt.Errorf("ExtendedCommitStats: %w", err)
-		cache.Put(cacheKey, err, contributorStatsCacheTimeout)
+		_ = cache.Put(cacheKey, err, contributorStatsCacheTimeout)
 	}
 
 	layout := time.DateOnly
@@ -177,7 +176,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 		}
 	}
 
-	cache.Put(cacheKey, contributorsCommitStats, contributorStatsCacheTimeout)
+	_ = cache.Put(cacheKey, contributorsCommitStats, contributorStatsCacheTimeout)
 	generateLock.Delete(cacheKey)
 	genDone <- struct{}{}
 }

From 2c2d376216deb019ccc5e347ce4ee8e0efd22646 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Thu, 16 Nov 2023 00:50:50 +0000
Subject: [PATCH 100/138] sync x axis in all graph

---
 web_src/js/components/RepoContributors.vue | 46 +++++++++++-----------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index b927a399bcd73..ebebe5acc1f48 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -69,18 +69,18 @@ export default {
     repoLink: pageData.repoLink || [],
     type: pageData.contributionType,
     contributorsStats: [],
-    dateFrom: null,
-    dateUntil: null,
-    startDate: null,
-    endDate: null,
+    xAxisStart: null,
+    xAxisEnd: null,
+    xAxisMin: null,
+    xAxisMax: null,
   }),
   mounted() {
     this.fetchGraphData();
 
     $('.ui.dropdown').dropdown({
       onChange: (val) => {
-        this.dateFrom = this.startDate;
-        this.dateUntil = this.endDate;
+        this.xAxisMin = this.xAxisStart;
+        this.xAxisMax = this.xAxisEnd;
         this.type = val;
         this.sortContributors();
       }
@@ -110,10 +110,10 @@ export default {
           const data = await response.json();
           const {total, ...rest} = data;
           this.contributorsStats = rest;
-          this.dateFrom = new Date(total.weeks[0].week);
-          this.dateUntil = new Date();
-          this.startDate = this.dateFrom;
-          this.endDate = this.dateUntil;
+          this.xAxisStart = total.weeks[0].week;
+          this.xAxisEnd = total.weeks[total.weeks.length - 1].week;
+          this.xAxisMin = this.xAxisStart;
+          this.xAxisMax = this.xAxisEnd;
           this.sortContributors();
           this.totalStats = total;
           this.errorText = '';
@@ -137,8 +137,8 @@ export default {
         user['total_deletions'] = 0;
         user['max_contribution_type'] = 0;
         const filteredWeeks = user.weeks.filter((week) => {
-          const weekDate = new Date(week.week);
-          if (weekDate >= this.dateFrom && weekDate <= this.dateUntil) {
+          const oneWeek = 7 * 24 * 60 * 60 * 1000;
+          if (week.week >= this.xAxisMin - oneWeek && week.week <= this.xAxisMax + oneWeek) {
             user['total_commits'] += week.commits;
             user['total_additions'] += week.additions;
             user['total_deletions'] += week.deletions;
@@ -202,12 +202,12 @@ export default {
       const minVal = event.chart.options.scales.x.min;
       const maxVal = event.chart.options.scales.x.max;
       if (reset) {
-        this.dateFrom = this.startDate;
-        this.dateUntil = this.endDate;
+        this.xAxisMin = this.xAxisStart;
+        this.xAxisMax = this.xAxisEnd;
         this.sortContributors();
       } else if (minVal) {
-        this.dateFrom = new Date(minVal);
-        this.dateUntil = new Date(maxVal);
+        this.xAxisMin = minVal;
+        this.xAxisMax = maxVal;
         this.sortContributors();
       }
     },
@@ -259,6 +259,8 @@ export default {
         },
         scales: {
           x: {
+            min: this.xAxisMin,
+            max: this.xAxisMax,
             type: 'time',
             grid: {
               display: false,
@@ -289,27 +291,27 @@ export default {
     <h2 class="ui header gt-df gt-ac gt-sb">
       <div>
         <relative-time
-          v-if="dateFrom !== null"
+          v-if="xAxisMin > 0"
           format="datetime"
           year="numeric"
           month="short"
           day="numeric"
           weekday=""
-          :datetime="dateFrom"
+          :datetime="new Date(xAxisMin)"
         >
-          {{ dateFrom }}
+          {{ new Date(xAxisMin) }}
         </relative-time>
         {{ isLoading ? locale.loadingTitle : errorText ? locale.loadingTitleFailed: "-" }}
         <relative-time
-          v-if="dateUntil !== null"
+          v-if="xAxisMax > 0"
           format="datetime"
           year="numeric"
           month="short"
           day="numeric"
           weekday=""
-          :datetime="dateUntil"
+          :datetime="new Date(xAxisMax)"
         >
-          {{ dateUntil }}
+          {{ new Date(xAxisMax) }}
         </relative-time>
       </div>
       <div>

From 3777a9e861d9caf8f6759449b5e88ca5fe792b9d Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Thu, 16 Nov 2023 05:48:15 +0000
Subject: [PATCH 101/138] fix lint

---
 web_src/js/components/RepoContributors.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index ebebe5acc1f48..857f9dbb24197 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -103,7 +103,7 @@ export default {
         do {
           response = await GET(`${this.repoLink}/activity/contributors/data`);
           if (response.status === 202) {
-            await new Promise(resolve => setTimeout(resolve, 1000)); // wait for 1 second before retrying
+            await new Promise((resolve) => setTimeout(resolve, 1000)); // wait for 1 second before retrying
           }
         } while (response.status === 202);
         if (response.ok) {

From f3bf5a43e654dd22a6bbdea6c56676fd51854534 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Thu, 16 Nov 2023 05:49:22 +0000
Subject: [PATCH 102/138] display the whole graph

---
 web_src/js/components/RepoContributors.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 857f9dbb24197..b4b60d3bbecca 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -150,6 +150,7 @@ export default {
           return false;
         });
 
+        user['max_contribution_type'] += 1;
         filteredData[key] = {...user, weeks: filteredWeeks};
       }
 

From f0ef0f302b8a3d4b038611530edd97bbe8078705 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Thu, 16 Nov 2023 05:50:14 +0000
Subject: [PATCH 103/138] improve avatar

---
 web_src/js/components/RepoContributors.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index b4b60d3bbecca..00bdcac764acb 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -362,7 +362,7 @@ export default {
         <div class="ui top attached header gt-df gt-f1">
           <b class="ui right">#{{ index + 1 }}</b>
           <a :href="contributor.home_link">
-            <img height="40" width="40" :src="contributor.avatar_link">
+            <img class="ui avatar gt-vm" height="40" width="40" :src="contributor.avatar_link">
           </a>
           <div class="gt-ml-3">
             <a :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a>

From 8552c9e5153cc6654c96da25f6a6f5ad49301a34 Mon Sep 17 00:00:00 2001
From: yp05327 <576951401@qq.com>
Date: Thu, 16 Nov 2023 06:33:34 +0000
Subject: [PATCH 104/138] convert click into double click

---
 web_src/js/components/RepoContributors.vue | 26 ++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 00bdcac764acb..893575865ac83 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -36,6 +36,18 @@ for (const [key, value] of Object.entries(colors)) {
   colors[key] = getColor(value);
 }
 
+const customEventListener = {
+  id: 'customEventListener',
+  afterEvent: (chart, args, opts) => {
+    // event will be replayed from chart.update when reset zoom,
+    // so we need to check whether args.replay is true to avoid call loops
+    if (args.event.type === 'dblclick' && opts.chartType === 'main' && args.replay !== true) {
+      chart.resetZoom();
+      opts.instance.updateOtherCharts(args.event, true);
+    }
+  }
+};
+
 Chart.defaults.color = colors.text;
 Chart.defaults.borderColor = colors.border;
 
@@ -50,7 +62,8 @@ Chart.register(
   PointElement,
   LineElement,
   Filler,
-  zoomPlugin
+  zoomPlugin,
+  customEventListener
 );
 
 export default {
@@ -218,13 +231,12 @@ export default {
         responsive: true,
         maintainAspectRatio: false,
         animation: false,
-        onClick: (e) => {
-          if (type === 'main') {
-            e.chart.resetZoom();
-            this.updateOtherCharts(e, true);
-          }
-        },
+        events: ['mousemove', 'mouseout', 'click', 'touchstart', 'touchmove', 'dblclick'],
         plugins: {
+          customEventListener: {
+            chartType: type,
+            instance: this,
+          },
           legend: {
             display: false,
           },

From 1f3b9f8b13dd457964fc10a12b60b32b9b661244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 17 Nov 2023 01:45:25 +0300
Subject: [PATCH 105/138] Apply suggestions from code review

---
 web_src/js/components/RepoContributors.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 893575865ac83..61d893b8e7049 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -41,7 +41,7 @@ const customEventListener = {
   afterEvent: (chart, args, opts) => {
     // event will be replayed from chart.update when reset zoom,
     // so we need to check whether args.replay is true to avoid call loops
-    if (args.event.type === 'dblclick' && opts.chartType === 'main' && args.replay !== true) {
+    if (args.event.type === 'dblclick' && opts.chartType === 'main' && !args.replay) {
       chart.resetZoom();
       opts.instance.updateOtherCharts(args.event, true);
     }
@@ -163,7 +163,6 @@ export default {
           return false;
         });
 
-        user['max_contribution_type'] += 1;
         filteredData[key] = {...user, weeks: filteredWeeks};
       }
 

From dec493bc67bad679fcb336db04a4284b25c019ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sun, 19 Nov 2023 13:43:57 +0300
Subject: [PATCH 106/138] Fix max chart value

---
 web_src/js/components/RepoContributors.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 61d893b8e7049..31ad9efa5ddcc 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -162,6 +162,9 @@ export default {
           }
           return false;
         });
+        // this line is required. See https://github.com/sahinakkaya/gitea/pull/3#discussion_r1396495722
+        // for details.
+        user['max_contribution_type'] += 1;
 
         filteredData[key] = {...user, weeks: filteredWeeks};
       }

From 2665147a321d3df81fda4e1529b3625052acae27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sun, 19 Nov 2023 16:30:56 +0300
Subject: [PATCH 107/138] Use drag to zoom

---
 web_src/js/components/RepoContributors.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 31ad9efa5ddcc..09bb42e8f5138 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -245,6 +245,7 @@ export default {
           zoom: {
             pan: {
               enabled: true,
+              modifierKey: 'shift',
               mode: 'x',
               threshold: 20,
               onPanComplete: this.updateOtherCharts,
@@ -261,7 +262,7 @@ export default {
               },
             },
             zoom: {
-              wheel: {
+              drag: {
                 enabled: type === 'main',
               },
               pinch: {

From bc04a82286b4ddb841310748e6b07b446401a805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sun, 19 Nov 2023 17:02:28 +0300
Subject: [PATCH 108/138] Add instructions on how to zoom pan etc.

---
 web_src/js/components/RepoContributors.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 09bb42e8f5138..35e14bee59fe0 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -27,6 +27,7 @@ const colors = {
   commits: '--color-primary-alpha-60',
   additions: '--color-green',
   deletions: '--color-red',
+  title: '--color-secondary-dark-4'
 };
 
 const styles = window.getComputedStyle(document.documentElement);
@@ -235,6 +236,13 @@ export default {
         animation: false,
         events: ['mousemove', 'mouseout', 'click', 'touchstart', 'touchmove', 'dblclick'],
         plugins: {
+          title: {
+            display: type === 'main',
+            text: ['drag: zoom', 'shift+drag: pan', 'double click: reset zoom'],
+            color: colors.title,
+            position: 'top',
+            align: 'end',
+          },
           customEventListener: {
             chartType: type,
             instance: this,

From 8de2f7d96a66fe59034ce03eaef28eee7dff3783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sun, 19 Nov 2023 18:41:38 +0300
Subject: [PATCH 109/138] Fix title

---
 web_src/js/components/RepoContributors.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 35e14bee59fe0..7d2af164d42e5 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -238,10 +238,10 @@ export default {
         plugins: {
           title: {
             display: type === 'main',
-            text: ['drag: zoom', 'shift+drag: pan', 'double click: reset zoom'],
+            text: 'drag: zoom, shift+drag: pan, double click: reset zoom',
             color: colors.title,
             position: 'top',
-            align: 'end',
+            align: 'center',
           },
           customEventListener: {
             chartType: type,
@@ -411,7 +411,7 @@ export default {
 </template>
 <style scoped>
 .main-graph {
-  height: 240px;
+  height: 260px;
 }
 .contributor-grid {
   display: grid;

From e43e6b9c2d81a1e2b58083238688cdc84750ec74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Tue, 21 Nov 2023 16:04:30 +0300
Subject: [PATCH 110/138] generate swagger

---
 templates/swagger/v1_json.tmpl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 24c4964597026..3cf34270b8a57 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -4883,6 +4883,10 @@
           "200": {
             "$ref": "#/responses/ContributorDataMap"
           },
+          "202": {
+            "description": "request later as stats are still generated",
+            "$ref": "#/responses/empty"
+          },
           "404": {
             "$ref": "#/responses/notFound"
           },

From 20b6bb746ca9e902312af334480b5f76a596d00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Tue, 21 Nov 2023 16:51:49 +0300
Subject: [PATCH 111/138] fmt

---
 services/repository/contributors_graph.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index 3350579396624..32719fca2a496 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -18,6 +18,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	api "code.gitea.io/gitea/modules/structs"
 	util "code.gitea.io/gitea/modules/util"
+
 	"gitea.com/go-chi/cache"
 )
 

From c860b02084b5387da2a57d08ae994f18e7d90530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Tue, 23 Jan 2024 10:48:11 +0300
Subject: [PATCH 112/138] Fix linting error in swagger file

---
 routers/api/v1/repo/collaborators.go | 1 -
 templates/swagger/v1_json.tmpl       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index f04be6d52d646..2ad74318d9027 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -390,7 +390,6 @@ func GetAllContributorsStats(ctx *context.APIContext) {
 	//   "200":
 	//     "$ref": "#/responses/ContributorDataMap"
 	//   "202":
-	//     description: request later as stats are still generated
 	//     "$ref": "#/responses/empty"
 	//   "404":
 	//     "$ref": "#/responses/notFound"
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 99457685793d8..7c97ce0a2f378 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -4930,7 +4930,6 @@
             "$ref": "#/responses/ContributorDataMap"
           },
           "202": {
-            "description": "request later as stats are still generated",
             "$ref": "#/responses/empty"
           },
           "404": {

From e8a5c577713f6dd2bc38b2208e2a2e20907331d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 24 Jan 2024 16:21:54 +0300
Subject: [PATCH 113/138] Target correct dropdown

---
 web_src/js/components/RepoContributors.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 7d2af164d42e5..fe01e45d30e52 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -91,7 +91,7 @@ export default {
   mounted() {
     this.fetchGraphData();
 
-    $('.ui.dropdown').dropdown({
+    $('#repo-contributors').dropdown({
       onChange: (val) => {
         this.xAxisMin = this.xAxisStart;
         this.xAxisMax = this.xAxisEnd;
@@ -340,7 +340,7 @@ export default {
       </div>
       <div>
         <!-- Contribution type -->
-        <div class="ui dropdown jump" id="dropdown">
+        <div class="ui dropdown jump" id="repo-contributors">
           <div class="ui basic compact button">
             <span class="text">
               {{ locale.filterLabel }} <strong>{{ locale.contributionType[type] }}</strong>

From 51a9e8d5ecb0c6c9e1455794b37a71dec6a3ef07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Wed, 24 Jan 2024 16:56:59 +0300
Subject: [PATCH 114/138] Move ExtendedCommitStats to service layer

---
 modules/git/repo_commit.go                | 98 -----------------------
 services/repository/contributors_graph.go | 98 ++++++++++++++++++++++-
 2 files changed, 97 insertions(+), 99 deletions(-)

diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
index 9205602795fa1..9c9ee7768febf 100644
--- a/modules/git/repo_commit.go
+++ b/modules/git/repo_commit.go
@@ -5,19 +5,13 @@
 package git
 
 import (
-	"bufio"
 	"bytes"
-	"context"
-	"fmt"
 	"io"
-	"os"
 	"strconv"
 	"strings"
 
 	"code.gitea.io/gitea/modules/cache"
-	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
-	api "code.gitea.io/gitea/modules/structs"
 )
 
 // GetBranchCommitID returns last commit ID string of given branch.
@@ -219,98 +213,6 @@ type CommitsByFileAndRangeOptions struct {
 	Page     int
 }
 
-// ExtendedCommitStats return the list of *api.ExtendedCommitStats for the given revision
-func (repo *Repository) ExtendedCommitStats(revision string /*, limit int */) ([]*api.ExtendedCommitStats, error) {
-	baseCommit, err := repo.GetCommit(revision)
-	if err != nil {
-		return nil, err
-	}
-	stdoutReader, stdoutWriter, err := os.Pipe()
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		_ = stdoutReader.Close()
-		_ = stdoutWriter.Close()
-	}()
-
-	gitCmd := NewCommand(repo.Ctx, "log", "--shortstat", "--no-merges", "--pretty=format:---%n%aN%n%aE%n%as", "--reverse")
-	// AddOptionFormat("--max-count=%d", limit)
-	gitCmd.AddDynamicArguments(baseCommit.ID.String())
-
-	var extendedCommitStats []*api.ExtendedCommitStats
-	stderr := new(strings.Builder)
-	err = gitCmd.Run(&RunOpts{
-		Dir:    repo.Path,
-		Stdout: stdoutWriter,
-		Stderr: stderr,
-		PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error {
-			_ = stdoutWriter.Close()
-			scanner := bufio.NewScanner(stdoutReader)
-			scanner.Split(bufio.ScanLines)
-
-			for scanner.Scan() {
-				line := strings.TrimSpace(scanner.Text())
-				if line != "---" {
-					continue
-				}
-				scanner.Scan()
-				authorName := strings.TrimSpace(scanner.Text())
-				scanner.Scan()
-				authorEmail := strings.TrimSpace(scanner.Text())
-				scanner.Scan()
-				date := strings.TrimSpace(scanner.Text())
-				scanner.Scan()
-				stats := strings.TrimSpace(scanner.Text())
-				if authorName == "" || authorEmail == "" || date == "" || stats == "" {
-					// FIXME: find a better way to parse the output so that we will handle this properly
-					log.Warn("Something is wrong with git log output, skipping...")
-					log.Warn("authorName: %s,  authorEmail: %s,  date: %s,  stats: %s", authorName, authorEmail, date, stats)
-					continue
-				}
-				//  1 file changed, 1 insertion(+), 1 deletion(-)
-				fields := strings.Split(stats, ",")
-
-				commitStats := api.CommitStats{}
-				for _, field := range fields[1:] {
-					parts := strings.Split(strings.TrimSpace(field), " ")
-					value, contributionType := parts[0], parts[1]
-					amount, _ := strconv.Atoi(value)
-
-					if strings.HasPrefix(contributionType, "insertion") {
-						commitStats.Additions = amount
-					} else {
-						commitStats.Deletions = amount
-					}
-				}
-				commitStats.Total = commitStats.Additions + commitStats.Deletions
-				scanner.Scan()
-				scanner.Text() // empty line at the end
-
-				res := &api.ExtendedCommitStats{
-					Author: &api.CommitUser{
-						Identity: api.Identity{
-							Name:  authorName,
-							Email: authorEmail,
-						},
-						Date: date,
-					},
-					Stats: &commitStats,
-				}
-				extendedCommitStats = append(extendedCommitStats, res)
-
-			}
-			_ = stdoutReader.Close()
-			return nil
-		},
-	})
-	if err != nil {
-		return nil, fmt.Errorf("Failed to get ContributorsCommitStats for repository.\nError: %w\nStderr: %s", err, stderr)
-	}
-
-	return extendedCommitStats, nil
-}
-
 // CommitsByFileAndRange return the commits according revision file and the page
 func (repo *Repository) CommitsByFileAndRange(opts CommitsByFileAndRangeOptions) ([]*Commit, error) {
 	skip := (opts.Page - 1) * setting.Git.CommitsRangeSize
diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index 32719fca2a496..09e2e4e33253e 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -4,9 +4,13 @@
 package repository
 
 import (
+	"bufio"
 	"context"
 	"errors"
 	"fmt"
+	"os"
+	"strconv"
+	"strings"
 	"sync"
 	"time"
 
@@ -85,6 +89,98 @@ func GetContributorStats(ctx context.Context, cache cache.Cache, repo *repo_mode
 	}
 }
 
+// ExtendedCommitStats return the list of *api.ExtendedCommitStats for the given revision
+func ExtendedCommitStats(repo *git.Repository, revision string /*, limit int */) ([]*api.ExtendedCommitStats, error) {
+	baseCommit, err := repo.GetCommit(revision)
+	if err != nil {
+		return nil, err
+	}
+	stdoutReader, stdoutWriter, err := os.Pipe()
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		_ = stdoutReader.Close()
+		_ = stdoutWriter.Close()
+	}()
+
+	gitCmd := git.NewCommand(repo.Ctx, "log", "--shortstat", "--no-merges", "--pretty=format:---%n%aN%n%aE%n%as", "--reverse")
+	// AddOptionFormat("--max-count=%d", limit)
+	gitCmd.AddDynamicArguments(baseCommit.ID.String())
+
+	var extendedCommitStats []*api.ExtendedCommitStats
+	stderr := new(strings.Builder)
+	err = gitCmd.Run(&git.RunOpts{
+		Dir:    repo.Path,
+		Stdout: stdoutWriter,
+		Stderr: stderr,
+		PipelineFunc: func(ctx context.Context, cancel context.CancelFunc) error {
+			_ = stdoutWriter.Close()
+			scanner := bufio.NewScanner(stdoutReader)
+			scanner.Split(bufio.ScanLines)
+
+			for scanner.Scan() {
+				line := strings.TrimSpace(scanner.Text())
+				if line != "---" {
+					continue
+				}
+				scanner.Scan()
+				authorName := strings.TrimSpace(scanner.Text())
+				scanner.Scan()
+				authorEmail := strings.TrimSpace(scanner.Text())
+				scanner.Scan()
+				date := strings.TrimSpace(scanner.Text())
+				scanner.Scan()
+				stats := strings.TrimSpace(scanner.Text())
+				if authorName == "" || authorEmail == "" || date == "" || stats == "" {
+					// FIXME: find a better way to parse the output so that we will handle this properly
+					log.Warn("Something is wrong with git log output, skipping...")
+					log.Warn("authorName: %s,  authorEmail: %s,  date: %s,  stats: %s", authorName, authorEmail, date, stats)
+					continue
+				}
+				//  1 file changed, 1 insertion(+), 1 deletion(-)
+				fields := strings.Split(stats, ",")
+
+				commitStats := api.CommitStats{}
+				for _, field := range fields[1:] {
+					parts := strings.Split(strings.TrimSpace(field), " ")
+					value, contributionType := parts[0], parts[1]
+					amount, _ := strconv.Atoi(value)
+
+					if strings.HasPrefix(contributionType, "insertion") {
+						commitStats.Additions = amount
+					} else {
+						commitStats.Deletions = amount
+					}
+				}
+				commitStats.Total = commitStats.Additions + commitStats.Deletions
+				scanner.Scan()
+				scanner.Text() // empty line at the end
+
+				res := &api.ExtendedCommitStats{
+					Author: &api.CommitUser{
+						Identity: api.Identity{
+							Name:  authorName,
+							Email: authorEmail,
+						},
+						Date: date,
+					},
+					Stats: &commitStats,
+				}
+				extendedCommitStats = append(extendedCommitStats, res)
+
+			}
+			_ = stdoutReader.Close()
+			return nil
+		},
+	})
+	if err != nil {
+		return nil, fmt.Errorf("Failed to get ContributorsCommitStats for repository.\nError: %w\nStderr: %s", err, stderr)
+	}
+
+	return extendedCommitStats, nil
+}
+
 func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey string, repo *repo_model.Repository, revision string) {
 	ctx := graceful.GetManager().HammerContext()
 
@@ -98,7 +194,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	if len(revision) == 0 {
 		revision = repo.DefaultBranch
 	}
-	extendedCommitStats, err := gitRepo.ExtendedCommitStats(revision)
+	extendedCommitStats, err := ExtendedCommitStats(gitRepo, revision)
 	if err != nil {
 		err := fmt.Errorf("ExtendedCommitStats: %w", err)
 		_ = cache.Put(cacheKey, err, contributorStatsCacheTimeout)

From 3740877851e9cddb185289af7498d748e9ec7d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 25 Jan 2024 17:11:29 +0300
Subject: [PATCH 115/138] Remove exposed endpoint as it is not needed by this
 PR

---
 routers/api/v1/api.go                |  1 -
 routers/api/v1/repo/collaborators.go | 58 ----------------------------
 templates/swagger/v1_json.tmpl       | 48 -----------------------
 3 files changed, 107 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index c9671e8fa227c..cb1803f7c652f 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -1237,7 +1237,6 @@ func Routes() *web.Route {
 						m.Get("/statuses", repo.GetCommitStatusesByRef)
 					}, context.ReferencesGitRepo())
 				}, reqRepoReader(unit.TypeCode))
-				m.Get("/contributors", context.ReferencesGitRepo(), reqRepoReader(unit.TypeCode), repo.GetAllContributorsStats)
 				m.Group("/git", func() {
 					m.Group("/commits", func() {
 						m.Get("/{sha}", repo.GetSingleCommit)
diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go
index 2ad74318d9027..a222e50a5e537 100644
--- a/routers/api/v1/repo/collaborators.go
+++ b/routers/api/v1/repo/collaborators.go
@@ -15,7 +15,6 @@ import (
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/context"
 	repo_module "code.gitea.io/gitea/modules/repository"
-	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/web"
 	"code.gitea.io/gitea/routers/api/v1/utils"
@@ -363,60 +362,3 @@ func GetAssignees(ctx *context.APIContext) {
 	}
 	ctx.JSON(http.StatusOK, convert.ToUsers(ctx, ctx.Doer, assignees))
 }
-
-// GetAllContributorsStats retrieves a map of contributors along with their weekly commit statistics
-func GetAllContributorsStats(ctx *context.APIContext) {
-	// swagger:operation GET /repos/{owner}/{repo}/contributors repository repoGetAllContributorsStats
-	// ---
-	// summary: Get a map of all contributors along with their weekly commit statistics from a repository
-	// produces:
-	// - application/json
-	// parameters:
-	// - name: owner
-	//   in: path
-	//   description: owner of the repo
-	//   type: string
-	//   required: true
-	// - name: repo
-	//   in: path
-	//   description: name of the repo
-	//   type: string
-	//   required: true
-	// - name: sha
-	//   in: query
-	//   description: SHA or branch to start listing commits from (usually 'master')
-	//   type: string
-	// responses:
-	//   "200":
-	//     "$ref": "#/responses/ContributorDataMap"
-	//   "202":
-	//     "$ref": "#/responses/empty"
-	//   "404":
-	//     "$ref": "#/responses/notFound"
-	//   "409":
-	//     "$ref": "#/responses/EmptyRepository"
-
-	if ctx.Repo.Repository.IsEmpty {
-		ctx.JSON(http.StatusConflict, api.APIError{
-			Message: "Git Repository is empty.",
-			URL:     setting.API.SwaggerURL,
-		})
-		return
-	}
-
-	sha := ctx.FormString("sha")
-
-	if len(sha) == 0 {
-		sha = ctx.Repo.Repository.DefaultBranch
-	}
-
-	if contributorStats, err := repo_service.GetContributorStats(ctx, ctx.Cache, ctx.Repo.Repository, sha); err != nil {
-		if errors.Is(err, repo_service.ErrAwaitGeneration) {
-			ctx.Status(http.StatusAccepted)
-			return
-		}
-		ctx.Error(http.StatusInternalServerError, "GetContributorStats", err)
-	} else {
-		ctx.JSON(http.StatusOK, &contributorStats)
-	}
-}
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 7c97ce0a2f378..49184faa80561 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -4893,54 +4893,6 @@
         }
       }
     },
-    "/repos/{owner}/{repo}/contributors": {
-      "get": {
-        "produces": [
-          "application/json"
-        ],
-        "tags": [
-          "repository"
-        ],
-        "summary": "Get a map of all contributors along with their weekly commit statistics from a repository",
-        "operationId": "repoGetAllContributorsStats",
-        "parameters": [
-          {
-            "type": "string",
-            "description": "owner of the repo",
-            "name": "owner",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "name of the repo",
-            "name": "repo",
-            "in": "path",
-            "required": true
-          },
-          {
-            "type": "string",
-            "description": "SHA or branch to start listing commits from (usually 'master')",
-            "name": "sha",
-            "in": "query"
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/responses/ContributorDataMap"
-          },
-          "202": {
-            "$ref": "#/responses/empty"
-          },
-          "404": {
-            "$ref": "#/responses/notFound"
-          },
-          "409": {
-            "$ref": "#/responses/EmptyRepository"
-          }
-        }
-      }
-    },
     "/repos/{owner}/{repo}/diffpatch": {
       "post": {
         "consumes": [

From 0f61e592e00ef57ae8c748fbec709d4edeeab637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 25 Jan 2024 18:24:01 +0300
Subject: [PATCH 116/138] Move types out from "modules/structs" to not pollute
 api

---
 modules/structs/repo_collaborator.go      | 17 ------
 modules/structs/repo_commit.go            |  6 --
 routers/api/v1/swagger/repo.go            |  7 ---
 services/repository/contributors_graph.go | 51 ++++++++++++-----
 templates/swagger/v1_json.tmpl            | 70 -----------------------
 5 files changed, 37 insertions(+), 114 deletions(-)

diff --git a/modules/structs/repo_collaborator.go b/modules/structs/repo_collaborator.go
index 553546272beae..946a6ec7e78e0 100644
--- a/modules/structs/repo_collaborator.go
+++ b/modules/structs/repo_collaborator.go
@@ -14,20 +14,3 @@ type RepoCollaboratorPermission struct {
 	RoleName   string `json:"role_name"`
 	User       *User  `json:"user"`
 }
-
-type WeekData struct {
-	Week      int64 `json:"week"`      // Starting day of the week as Unix timestamp
-	Additions int   `json:"additions"` // Number of additions in that week
-	Deletions int   `json:"deletions"` // Number of deletions in that week
-	Commits   int   `json:"commits"`   // Number of commits in that week
-}
-
-// ContributorData represents statistical git commit count data
-type ContributorData struct {
-	Name         string      `json:"name"`  // Display name of the contributor
-	Login        string      `json:"login"` // Login name of the contributor in case it exists
-	AvatarLink   string      `json:"avatar_link"`
-	HomeLink     string      `json:"home_link"`
-	TotalCommits int64       `json:"total_commits"`
-	Weeks        []*WeekData `json:"weeks"`
-}
diff --git a/modules/structs/repo_commit.go b/modules/structs/repo_commit.go
index 46ed99e197f88..fec7d97608d92 100644
--- a/modules/structs/repo_commit.go
+++ b/modules/structs/repo_commit.go
@@ -58,12 +58,6 @@ type Commit struct {
 	Stats      *CommitStats           `json:"stats"`
 }
 
-// ExtendedCommitStats contains information for commit stats with author data
-type ExtendedCommitStats struct {
-	Author *CommitUser  `json:"author"`
-	Stats  *CommitStats `json:"stats"`
-}
-
 // CommitDateOptions store dates for GIT_AUTHOR_DATE and GIT_COMMITTER_DATE
 type CommitDateOptions struct {
 	// swagger:strfmt date-time
diff --git a/routers/api/v1/swagger/repo.go b/routers/api/v1/swagger/repo.go
index a4e35b260f033..3e23aa4d5a5ac 100644
--- a/routers/api/v1/swagger/repo.go
+++ b/routers/api/v1/swagger/repo.go
@@ -253,13 +253,6 @@ type swaggerCommitList struct {
 	Body []api.Commit `json:"body"`
 }
 
-// ContributorDataMap
-// swagger:response ContributorDataMap
-type swaggerContributorDataMap struct {
-	// in: body
-	Body map[string]*api.ContributorData `json:"body"`
-}
-
 // ChangedFileList
 // swagger:response ChangedFileList
 type swaggerChangedFileList struct {
diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index 09e2e4e33253e..5adfed380799d 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -37,11 +37,34 @@ var (
 	generateLock        = sync.Map{}
 )
 
+type WeekData struct {
+	Week      int64 `json:"week"`      // Starting day of the week as Unix timestamp
+	Additions int   `json:"additions"` // Number of additions in that week
+	Deletions int   `json:"deletions"` // Number of deletions in that week
+	Commits   int   `json:"commits"`   // Number of commits in that week
+}
+
+// ContributorData represents statistical git commit count data
+type ContributorData struct {
+	Name         string      `json:"name"`  // Display name of the contributor
+	Login        string      `json:"login"` // Login name of the contributor in case it exists
+	AvatarLink   string      `json:"avatar_link"`
+	HomeLink     string      `json:"home_link"`
+	TotalCommits int64       `json:"total_commits"`
+	Weeks        []*WeekData `json:"weeks"`
+}
+
+// ExtendedCommitStats contains information for commit stats with author data
+type ExtendedCommitStats struct {
+	Author *api.CommitUser  `json:"author"`
+	Stats  *api.CommitStats `json:"stats"`
+}
+
 // CreateWeeks converts list of sundays to list of *api.WeekData
-func CreateWeeks(sundays []int64) []*api.WeekData {
-	var weeks []*api.WeekData
+func CreateWeeks(sundays []int64) []*WeekData {
+	var weeks []*WeekData
 	for _, week := range sundays {
-		weeks = append(weeks, &api.WeekData{
+		weeks = append(weeks, &WeekData{
 			Week:      week,
 			Additions: 0,
 			Deletions: 0,
@@ -53,7 +76,7 @@ func CreateWeeks(sundays []int64) []*api.WeekData {
 }
 
 // GetContributorStats returns contributors stats for git commits for given revision or default branch
-func GetContributorStats(ctx context.Context, cache cache.Cache, repo *repo_model.Repository, revision string) (map[string]*api.ContributorData, error) {
+func GetContributorStats(ctx context.Context, cache cache.Cache, repo *repo_model.Repository, revision string) (map[string]*ContributorData, error) {
 	// as GetContributorStats is resource intensive we cache the result
 	cacheKey := fmt.Sprintf(contributorStatsCacheKey, repo.FullName(), revision)
 	if !cache.IsExist(cacheKey) {
@@ -82,15 +105,15 @@ func GetContributorStats(ctx context.Context, cache cache.Cache, repo *repo_mode
 	switch v := cache.Get(cacheKey).(type) {
 	case error:
 		return nil, v
-	case map[string]*api.ContributorData:
+	case map[string]*ContributorData:
 		return v, nil
 	default:
 		return nil, fmt.Errorf("unexpected type in cache detected")
 	}
 }
 
-// ExtendedCommitStats return the list of *api.ExtendedCommitStats for the given revision
-func ExtendedCommitStats(repo *git.Repository, revision string /*, limit int */) ([]*api.ExtendedCommitStats, error) {
+// GetExtendedCommitStats return the list of *ExtendedCommitStats for the given revision
+func GetExtendedCommitStats(repo *git.Repository, revision string /*, limit int */) ([]*ExtendedCommitStats, error) {
 	baseCommit, err := repo.GetCommit(revision)
 	if err != nil {
 		return nil, err
@@ -108,7 +131,7 @@ func ExtendedCommitStats(repo *git.Repository, revision string /*, limit int */)
 	// AddOptionFormat("--max-count=%d", limit)
 	gitCmd.AddDynamicArguments(baseCommit.ID.String())
 
-	var extendedCommitStats []*api.ExtendedCommitStats
+	var extendedCommitStats []*ExtendedCommitStats
 	stderr := new(strings.Builder)
 	err = gitCmd.Run(&git.RunOpts{
 		Dir:    repo.Path,
@@ -157,7 +180,7 @@ func ExtendedCommitStats(repo *git.Repository, revision string /*, limit int */)
 				scanner.Scan()
 				scanner.Text() // empty line at the end
 
-				res := &api.ExtendedCommitStats{
+				res := &ExtendedCommitStats{
 					Author: &api.CommitUser{
 						Identity: api.Identity{
 							Name:  authorName,
@@ -194,7 +217,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	if len(revision) == 0 {
 		revision = repo.DefaultBranch
 	}
-	extendedCommitStats, err := ExtendedCommitStats(gitRepo, revision)
+	extendedCommitStats, err := GetExtendedCommitStats(gitRepo, revision)
 	if err != nil {
 		err := fmt.Errorf("ExtendedCommitStats: %w", err)
 		_ = cache.Put(cacheKey, err, contributorStatsCacheTimeout)
@@ -209,8 +232,8 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	sundays, _ := util.ListSundaysBetween(startingSunday, endingSunday)
 
 	unknownUserAvatarLink := user_model.NewGhostUser().AvatarLink(ctx)
-	contributorsCommitStats := make(map[string]*api.ContributorData)
-	contributorsCommitStats["total"] = &api.ContributorData{
+	contributorsCommitStats := make(map[string]*ContributorData)
+	contributorsCommitStats["total"] = &ContributorData{
 		Name:       "Total",
 		AvatarLink: unknownUserAvatarLink,
 		Weeks:      CreateWeeks(sundays),
@@ -234,13 +257,13 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 				if avatarLink == "" {
 					avatarLink = unknownUserAvatarLink
 				}
-				contributorsCommitStats[userEmail] = &api.ContributorData{
+				contributorsCommitStats[userEmail] = &ContributorData{
 					Name:       v.Author.Name,
 					AvatarLink: avatarLink,
 					Weeks:      CreateWeeks(sundays),
 				}
 			} else {
-				contributorsCommitStats[userEmail] = &api.ContributorData{
+				contributorsCommitStats[userEmail] = &ContributorData{
 					Name:       u.DisplayName(),
 					Login:      u.LowerName,
 					AvatarLink: u.AvatarLink(ctx),
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 49184faa80561..dc04a97b833c7 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -17585,41 +17585,6 @@
       },
       "x-go-package": "code.gitea.io/gitea/modules/structs"
     },
-    "ContributorData": {
-      "description": "ContributorData represents statistical git commit count data",
-      "type": "object",
-      "properties": {
-        "avatar_link": {
-          "type": "string",
-          "x-go-name": "AvatarLink"
-        },
-        "home_link": {
-          "type": "string",
-          "x-go-name": "HomeLink"
-        },
-        "login": {
-          "type": "string",
-          "x-go-name": "Login"
-        },
-        "name": {
-          "type": "string",
-          "x-go-name": "Name"
-        },
-        "total_commits": {
-          "type": "integer",
-          "format": "int64",
-          "x-go-name": "TotalCommits"
-        },
-        "weeks": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/WeekData"
-          },
-          "x-go-name": "Weeks"
-        }
-      },
-      "x-go-package": "code.gitea.io/gitea/modules/structs"
-    },
     "CreateAccessTokenOption": {
       "description": "CreateAccessTokenOption options when create access token",
       "type": "object",
@@ -23109,32 +23074,6 @@
       },
       "x-go-package": "code.gitea.io/gitea/modules/structs"
     },
-    "WeekData": {
-      "type": "object",
-      "properties": {
-        "additions": {
-          "type": "integer",
-          "format": "int64",
-          "x-go-name": "Additions"
-        },
-        "commits": {
-          "type": "integer",
-          "format": "int64",
-          "x-go-name": "Commits"
-        },
-        "deletions": {
-          "type": "integer",
-          "format": "int64",
-          "x-go-name": "Deletions"
-        },
-        "week": {
-          "type": "integer",
-          "format": "int64",
-          "x-go-name": "Week"
-        }
-      },
-      "x-go-package": "code.gitea.io/gitea/modules/structs"
-    },
     "WikiCommit": {
       "description": "WikiCommit page commit/revision",
       "type": "object",
@@ -23447,15 +23386,6 @@
         "$ref": "#/definitions/ContentsResponse"
       }
     },
-    "ContributorDataMap": {
-      "description": "ContributorDataMap",
-      "schema": {
-        "type": "object",
-        "additionalProperties": {
-          "$ref": "#/definitions/ContributorData"
-        }
-      }
-    },
     "CronList": {
       "description": "CronList",
       "schema": {

From 07eb1d1fc563d3840da90a7830d74aa80d23c9ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 26 Jan 2024 10:54:23 +0300
Subject: [PATCH 117/138] Apply suggestions from code review

Co-authored-by: yp05327 <576951401@qq.com>
---
 services/repository/contributors_graph.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index 5adfed380799d..99c7b055f7e39 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -231,7 +231,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 
 	sundays, _ := util.ListSundaysBetween(startingSunday, endingSunday)
 
-	unknownUserAvatarLink := user_model.NewGhostUser().AvatarLink(ctx)
+	unknownUserAvatarLink := user_model.NewGhostUser().AvatarLinkWithSize(ctx, 0)
 	contributorsCommitStats := make(map[string]*ContributorData)
 	contributorsCommitStats["total"] = &ContributorData{
 		Name:       "Total",
@@ -266,7 +266,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 				contributorsCommitStats[userEmail] = &ContributorData{
 					Name:       u.DisplayName(),
 					Login:      u.LowerName,
-					AvatarLink: u.AvatarLink(ctx),
+					AvatarLink: u.AvatarLinkWithSize(ctx, 0),
 					HomeLink:   u.HomeLink(),
 					Weeks:      CreateWeeks(sundays),
 				}

From e52db02f39bbc6f7e3953a8980d01c60c2c136fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 26 Jan 2024 14:20:28 +0300
Subject: [PATCH 118/138] Do not render 'a' tag if user is not present on the
 server

---
 web_src/js/components/RepoContributors.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index fe01e45d30e52..b640af9d4ebcb 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -388,7 +388,8 @@ export default {
             <img class="ui avatar gt-vm" height="40" width="40" :src="contributor.avatar_link">
           </a>
           <div class="gt-ml-3">
-            <a :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a>
+            <a v-if="contributor.home_link !== ''" :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a>
+            <p v-else class='contributor-name'><h4>{{ contributor.name }}</h4></p>
             <p class="gt-font-12 gt-df gt-gap-2">
               <strong v-if="contributor.total_commits">{{ contributor.total_commits.toLocaleString() }} {{ locale.contributionType.commits }}</strong>
               <strong v-if="contributor.total_additions" class="text green">{{ contributor.total_additions.toLocaleString() }}++ </strong>
@@ -418,4 +419,9 @@ export default {
   grid-template-columns: repeat(2, 1fr);
   gap: 1rem;
 }
+
+.contributor-name {
+  margin-bottom: 0;
+}
+
 </style>

From cd23a864e01c48ae40f3d91c234257afa6ac1f5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Fri, 26 Jan 2024 14:39:40 +0300
Subject: [PATCH 119/138] Fix linting error

---
 web_src/js/components/RepoContributors.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index b640af9d4ebcb..885774436300d 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -389,7 +389,9 @@ export default {
           </a>
           <div class="gt-ml-3">
             <a v-if="contributor.home_link !== ''" :href="contributor.home_link"><h4>{{ contributor.name }}</h4></a>
-            <p v-else class='contributor-name'><h4>{{ contributor.name }}</h4></p>
+            <h4 v-else class="contributor-name">
+              {{ contributor.name }}
+            </h4>
             <p class="gt-font-12 gt-df gt-gap-2">
               <strong v-if="contributor.total_commits">{{ contributor.total_commits.toLocaleString() }} {{ locale.contributionType.commits }}</strong>
               <strong v-if="contributor.total_additions" class="text green">{{ contributor.total_additions.toLocaleString() }}++ </strong>

From 9b337dcaed22d82389399d759e35550af63f0c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 1 Feb 2024 22:29:18 +0300
Subject: [PATCH 120/138] Adopt changes in upstream

---
 services/repository/contributors_graph.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index 99c7b055f7e39..354acf85c3a08 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -18,6 +18,7 @@ import (
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/git"
+	"code.gitea.io/gitea/modules/gitrepo"
 	"code.gitea.io/gitea/modules/graceful"
 	"code.gitea.io/gitea/modules/log"
 	api "code.gitea.io/gitea/modules/structs"
@@ -207,7 +208,7 @@ func GetExtendedCommitStats(repo *git.Repository, revision string /*, limit int
 func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey string, repo *repo_model.Repository, revision string) {
 	ctx := graceful.GetManager().HammerContext()
 
-	gitRepo, closer, err := git.RepositoryFromContextOrOpen(ctx, repo.RepoPath())
+	gitRepo, closer, err := gitrepo.RepositoryFromContextOrOpen(ctx, repo)
 	if err != nil {
 		err := fmt.Errorf("OpenRepository: %w", err)
 		_ = cache.Put(cacheKey, err, contributorStatsCacheTimeout)

From 6e87cd8b276300efec5bd2e2cc609eb38d58a8ad Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 10 Feb 2024 20:56:28 +0100
Subject: [PATCH 121/138] unexport internal used func

---
 services/repository/contributors_graph.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index 354acf85c3a08..ae903d688754b 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -113,8 +113,8 @@ func GetContributorStats(ctx context.Context, cache cache.Cache, repo *repo_mode
 	}
 }
 
-// GetExtendedCommitStats return the list of *ExtendedCommitStats for the given revision
-func GetExtendedCommitStats(repo *git.Repository, revision string /*, limit int */) ([]*ExtendedCommitStats, error) {
+// getExtendedCommitStats return the list of *ExtendedCommitStats for the given revision
+func getExtendedCommitStats(repo *git.Repository, revision string /*, limit int */) ([]*ExtendedCommitStats, error) {
 	baseCommit, err := repo.GetCommit(revision)
 	if err != nil {
 		return nil, err
@@ -218,7 +218,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	if len(revision) == 0 {
 		revision = repo.DefaultBranch
 	}
-	extendedCommitStats, err := GetExtendedCommitStats(gitRepo, revision)
+	extendedCommitStats, err := getExtendedCommitStats(gitRepo, revision)
 	if err != nil {
 		err := fmt.Errorf("ExtendedCommitStats: %w", err)
 		_ = cache.Put(cacheKey, err, contributorStatsCacheTimeout)

From 09a9c621ce18c678e8080e946e9f59e8ce61972d Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 10 Feb 2024 21:14:02 +0100
Subject: [PATCH 122/138] fix nil pointer issue found by test

---
 services/repository/contributors_graph.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index ae903d688754b..11942673e467b 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -212,6 +212,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	if err != nil {
 		err := fmt.Errorf("OpenRepository: %w", err)
 		_ = cache.Put(cacheKey, err, contributorStatsCacheTimeout)
+		return
 	}
 	defer closer.Close()
 
@@ -222,6 +223,12 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	if err != nil {
 		err := fmt.Errorf("ExtendedCommitStats: %w", err)
 		_ = cache.Put(cacheKey, err, contributorStatsCacheTimeout)
+		return
+	}
+	if len(extendedCommitStats) == 0 {
+		err := fmt.Errorf("no commits found for revision '%s'", revision)
+		_ = cache.Put(cacheKey, err, contributorStatsCacheTimeout)
+		return
 	}
 
 	layout := time.DateOnly

From e968a8f28139bf3faa78c449c53674e5c8bb4560 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 10 Feb 2024 22:46:13 +0100
Subject: [PATCH 123/138] unexport another internal used func

---
 services/repository/contributors_graph.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index 11942673e467b..56eac4414edaa 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -61,8 +61,8 @@ type ExtendedCommitStats struct {
 	Stats  *api.CommitStats `json:"stats"`
 }
 
-// CreateWeeks converts list of sundays to list of *api.WeekData
-func CreateWeeks(sundays []int64) []*WeekData {
+// createWeeks converts list of sundays to list of *api.WeekData
+func createWeeks(sundays []int64) []*WeekData {
 	var weeks []*WeekData
 	for _, week := range sundays {
 		weeks = append(weeks, &WeekData{
@@ -244,7 +244,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	contributorsCommitStats["total"] = &ContributorData{
 		Name:       "Total",
 		AvatarLink: unknownUserAvatarLink,
-		Weeks:      CreateWeeks(sundays),
+		Weeks:      createWeeks(sundays),
 	}
 	total := contributorsCommitStats["total"]
 
@@ -268,7 +268,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 				contributorsCommitStats[userEmail] = &ContributorData{
 					Name:       v.Author.Name,
 					AvatarLink: avatarLink,
-					Weeks:      CreateWeeks(sundays),
+					Weeks:      createWeeks(sundays),
 				}
 			} else {
 				contributorsCommitStats[userEmail] = &ContributorData{
@@ -276,7 +276,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 					Login:      u.LowerName,
 					AvatarLink: u.AvatarLinkWithSize(ctx, 0),
 					HomeLink:   u.HomeLink(),
-					Weeks:      CreateWeeks(sundays),
+					Weeks:      createWeeks(sundays),
 				}
 			}
 		}

From 93f9b2b2fef9f125b76949b03ceacb55fb61c757 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 10 Feb 2024 23:02:42 +0100
Subject: [PATCH 124/138] add test and expected outcome + add some codecoments
 to be solved

---
 services/repository/contributors_graph.go     |  9 ++-
 .../repository/contributors_graph_test.go     | 61 +++++++++++++++++++
 2 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 services/repository/contributors_graph_test.go

diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index 56eac4414edaa..2634cdce9af15 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -226,7 +226,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 		return
 	}
 	if len(extendedCommitStats) == 0 {
-		err := fmt.Errorf("no commits found for revision '%s'", revision)
+		err := fmt.Errorf("no commit stats returned for revision '%s'", revision)
 		_ = cache.Put(cacheKey, err, contributorStatsCacheTimeout)
 		return
 	}
@@ -259,6 +259,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 			// that different mail addresses will linked to same account
 			userEmail = u.GetEmail()
 		}
+		// duplicated logic
 		if _, ok := contributorsCommitStats[userEmail]; !ok {
 			if u == nil {
 				avatarLink := avatars.GenerateEmailAvatarFastLink(ctx, userEmail, 0)
@@ -288,6 +289,8 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 		startingSundayParsed, _ := time.Parse(layout, startingSunday)
 		idx := int(val.Sub(startingSundayParsed).Hours()/24) / 7
 
+		// we really should not itterate over each (even empty) stats of any user to generate the summary
+		// THIS IS really INEFFICIENT
 		if idx >= 0 && idx < len(user.Weeks) {
 			user.Weeks[idx].Additions += v.Stats.Additions
 			user.Weeks[idx].Deletions += v.Stats.Deletions
@@ -306,5 +309,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 
 	_ = cache.Put(cacheKey, contributorsCommitStats, contributorStatsCacheTimeout)
 	generateLock.Delete(cacheKey)
-	genDone <- struct{}{}
+	if genDone != nil {
+		genDone <- struct{}{}
+	}
 }
diff --git a/services/repository/contributors_graph_test.go b/services/repository/contributors_graph_test.go
new file mode 100644
index 0000000000000..de04913e2a78b
--- /dev/null
+++ b/services/repository/contributors_graph_test.go
@@ -0,0 +1,61 @@
+// Copyright 2024 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package repository
+
+import (
+	"slices"
+	"testing"
+
+	"code.gitea.io/gitea/modules/git"
+
+	"code.gitea.io/gitea/models/db"
+	repo_model "code.gitea.io/gitea/models/repo"
+	"code.gitea.io/gitea/models/unittest"
+	"gitea.com/go-chi/cache"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestRepository_ContributorsGraph(t *testing.T) {
+	assert.NoError(t, unittest.PrepareTestDatabase())
+	repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
+	assert.NoError(t, repo.LoadOwner(db.DefaultContext))
+	mockCache, err := cache.NewCacher(cache.Options{
+		Adapter:  "memory",
+		Interval: 24 * 60,
+	})
+	assert.NoError(t, err)
+
+	generateContributorStats(nil, mockCache, "key", repo, "404ref")
+	err, isErr := mockCache.Get("key").(error)
+	assert.True(t, isErr)
+	assert.ErrorAs(t, err, &git.ErrNotExist{})
+
+	generateContributorStats(nil, mockCache, "key2", repo, "master")
+	data, isData := mockCache.Get("key2").(map[string]*ContributorData)
+	assert.True(t, isData)
+	var keys []string
+	for k := range data {
+		keys = append(keys, k)
+	}
+	slices.Sort(keys)
+	assert.EqualValues(t, []string{
+		"ethantkoenig@gmail.com",
+		"jimmy.praet@telenet.be",
+		"jon@allspice.io",
+		"total", // generated summary
+	}, keys)
+
+	assert.EqualValues(t, &ContributorData{
+		Name:         "Ethan Koenig",
+		AvatarLink:   "https://secure.gravatar.com/avatar/b42fb195faa8c61b8d88abfefe30e9e3?d=identicon",
+		TotalCommits: 1,
+		Weeks: []*WeekData{{
+			Week:      1511654400, // sunday 2017-11-26
+			Additions: 3,
+			Deletions: 0,
+			Commits:   1,
+		}},
+	}, data["ethantkoenig@gmail.com"])
+}

From 2b06e09a7145b2930cb9f59f54551f62e8c8cd74 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 10 Feb 2024 23:24:50 +0100
Subject: [PATCH 125/138] expand test with total "summary user"

---
 .../repository/contributors_graph_test.go     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/services/repository/contributors_graph_test.go b/services/repository/contributors_graph_test.go
index de04913e2a78b..4bad625a30131 100644
--- a/services/repository/contributors_graph_test.go
+++ b/services/repository/contributors_graph_test.go
@@ -58,4 +58,28 @@ func TestRepository_ContributorsGraph(t *testing.T) {
 			Commits:   1,
 		}},
 	}, data["ethantkoenig@gmail.com"])
+	assert.EqualValues(t, &ContributorData{
+		Name:         "total",
+		TotalCommits: 3,
+		Weeks: []*WeekData{
+			{
+				Week:      1511654400, // sunday 2017-11-26 (2017-11-26 20:31:18 -0800)
+				Additions: 3,
+				Deletions: 0,
+				Commits:   1,
+			},
+			{
+				Week:      1607817600, // sunday 2020-12-13 (2020-12-15 15:23:11 -0500)
+				Additions: 10,
+				Deletions: 0,
+				Commits:   1,
+			},
+			{
+				Week:      1624752000, // sunday 2021-06-27 (2021-06-29 21:54:09 +0200)
+				Additions: 2,
+				Deletions: 0,
+				Commits:   1,
+			},
+		},
+	}, data["total"])
 }

From 3ba73e3fcbcc250d60ea2a4ee7d2027efc4fd856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Sun, 11 Feb 2024 16:27:47 +0300
Subject: [PATCH 126/138] Fix linting error

---
 services/repository/contributors_graph_test.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/services/repository/contributors_graph_test.go b/services/repository/contributors_graph_test.go
index 4bad625a30131..ccc28b16c1c86 100644
--- a/services/repository/contributors_graph_test.go
+++ b/services/repository/contributors_graph_test.go
@@ -7,13 +7,12 @@ import (
 	"slices"
 	"testing"
 
-	"code.gitea.io/gitea/modules/git"
-
 	"code.gitea.io/gitea/models/db"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unittest"
-	"gitea.com/go-chi/cache"
+	"code.gitea.io/gitea/modules/git"
 
+	"gitea.com/go-chi/cache"
 	"github.com/stretchr/testify/assert"
 )
 

From ecb412b9aa13b075eee6c5945fa61145dc85dd73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Tue, 13 Feb 2024 19:28:13 +0300
Subject: [PATCH 127/138] Fix implementation to satisfy unit test

---
 modules/util/dates.go                         |  68 ------------
 services/repository/contributors_graph.go     | 101 +++++++++---------
 .../repository/contributors_graph_test.go     |  31 +++---
 web_src/js/components/RepoContributors.vue    |  41 ++++++-
 4 files changed, 108 insertions(+), 133 deletions(-)
 delete mode 100644 modules/util/dates.go

diff --git a/modules/util/dates.go b/modules/util/dates.go
deleted file mode 100644
index a61340bc49720..0000000000000
--- a/modules/util/dates.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2023 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package util
-
-import (
-	"time"
-)
-
-const layout = time.DateOnly
-
-func ListSundaysBetween(startStr, endStr string) ([]int64, error) {
-	startDate, err := time.Parse(layout, startStr)
-	if err != nil {
-		return nil, err
-	}
-
-	endDate, err := time.Parse(layout, endStr)
-	if err != nil {
-		return nil, err
-	}
-
-	// Ensure the start date is a Sunday
-	for startDate.Weekday() != time.Sunday {
-		startDate = startDate.AddDate(0, 0, 1)
-	}
-
-	var sundays []int64
-
-	// Iterate from start date to end date and find all Sundays
-	for currentDate := startDate; currentDate.Before(endDate); currentDate = currentDate.AddDate(0, 0, 7) {
-		sundays = append(sundays, currentDate.UnixMilli())
-	}
-
-	return sundays, nil
-}
-
-func FindLastSundayBeforeDate(dateStr string) (string, error) {
-	date, err := time.Parse(layout, dateStr)
-	if err != nil {
-		return "", err
-	}
-
-	weekday := date.Weekday()
-	daysToSubtract := int(weekday) - int(time.Sunday)
-	if daysToSubtract < 0 {
-		daysToSubtract += 7
-	}
-
-	lastSunday := date.AddDate(0, 0, -daysToSubtract)
-	return lastSunday.Format(layout), nil
-}
-
-func FindFirstSundayAfterDate(dateStr string) (string, error) {
-	date, err := time.Parse(layout, dateStr)
-	if err != nil {
-		return "", err
-	}
-
-	weekday := date.Weekday()
-	daysToAdd := int(time.Sunday) - int(weekday)
-	if daysToAdd <= 0 {
-		daysToAdd += 7
-	}
-
-	firstSunday := date.AddDate(0, 0, daysToAdd)
-	return firstSunday.Format(layout), nil
-}
diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index 2634cdce9af15..560ee1ae661ad 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -22,7 +22,6 @@ import (
 	"code.gitea.io/gitea/modules/graceful"
 	"code.gitea.io/gitea/modules/log"
 	api "code.gitea.io/gitea/modules/structs"
-	util "code.gitea.io/gitea/modules/util"
 
 	"gitea.com/go-chi/cache"
 )
@@ -47,12 +46,12 @@ type WeekData struct {
 
 // ContributorData represents statistical git commit count data
 type ContributorData struct {
-	Name         string      `json:"name"`  // Display name of the contributor
-	Login        string      `json:"login"` // Login name of the contributor in case it exists
-	AvatarLink   string      `json:"avatar_link"`
-	HomeLink     string      `json:"home_link"`
-	TotalCommits int64       `json:"total_commits"`
-	Weeks        []*WeekData `json:"weeks"`
+	Name         string              `json:"name"`  // Display name of the contributor
+	Login        string              `json:"login"` // Login name of the contributor in case it exists
+	AvatarLink   string              `json:"avatar_link"`
+	HomeLink     string              `json:"home_link"`
+	TotalCommits int64               `json:"total_commits"`
+	Weeks        map[int64]*WeekData `json:"weeks"`
 }
 
 // ExtendedCommitStats contains information for commit stats with author data
@@ -61,19 +60,23 @@ type ExtendedCommitStats struct {
 	Stats  *api.CommitStats `json:"stats"`
 }
 
-// createWeeks converts list of sundays to list of *api.WeekData
-func createWeeks(sundays []int64) []*WeekData {
-	var weeks []*WeekData
-	for _, week := range sundays {
-		weeks = append(weeks, &WeekData{
-			Week:      week,
-			Additions: 0,
-			Deletions: 0,
-			Commits:   0,
-		},
-		)
+
+const layout = time.DateOnly
+
+func findLastSundayBeforeDate(dateStr string) (string, error) {
+	date, err := time.Parse(layout, dateStr)
+	if err != nil {
+		return "", err
+	}
+
+	weekday := date.Weekday()
+	daysToSubtract := int(weekday) - int(time.Sunday)
+	if daysToSubtract < 0 {
+		daysToSubtract += 7
 	}
-	return weeks
+
+	lastSunday := date.AddDate(0, 0, -daysToSubtract)
+	return lastSunday.Format(layout), nil
 }
 
 // GetContributorStats returns contributors stats for git commits for given revision or default branch
@@ -232,19 +235,12 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	}
 
 	layout := time.DateOnly
-	initialCommitDate := extendedCommitStats[0].Author.Date
-
-	startingSunday, _ := util.FindLastSundayBeforeDate(initialCommitDate)
-	endingSunday, _ := util.FindFirstSundayAfterDate(time.Now().Format(layout))
-
-	sundays, _ := util.ListSundaysBetween(startingSunday, endingSunday)
 
 	unknownUserAvatarLink := user_model.NewGhostUser().AvatarLinkWithSize(ctx, 0)
 	contributorsCommitStats := make(map[string]*ContributorData)
 	contributorsCommitStats["total"] = &ContributorData{
 		Name:       "Total",
-		AvatarLink: unknownUserAvatarLink,
-		Weeks:      createWeeks(sundays),
+		Weeks:      make(map[int64]*WeekData),
 	}
 	total := contributorsCommitStats["total"]
 
@@ -269,7 +265,7 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 				contributorsCommitStats[userEmail] = &ContributorData{
 					Name:       v.Author.Name,
 					AvatarLink: avatarLink,
-					Weeks:      createWeeks(sundays),
+					Weeks:      make(map[int64]*WeekData),
 				}
 			} else {
 				contributorsCommitStats[userEmail] = &ContributorData{
@@ -277,34 +273,43 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 					Login:      u.LowerName,
 					AvatarLink: u.AvatarLinkWithSize(ctx, 0),
 					HomeLink:   u.HomeLink(),
-					Weeks:      createWeeks(sundays),
+					Weeks:      make(map[int64]*WeekData),
 				}
 			}
 		}
 		// Update user statistics
 		user := contributorsCommitStats[userEmail]
-		startingOfWeek, _ := util.FindLastSundayBeforeDate(v.Author.Date)
+		startingOfWeek, _ := findLastSundayBeforeDate(v.Author.Date)
 
 		val, _ := time.Parse(layout, startingOfWeek)
-		startingSundayParsed, _ := time.Parse(layout, startingSunday)
-		idx := int(val.Sub(startingSundayParsed).Hours()/24) / 7
-
-		// we really should not itterate over each (even empty) stats of any user to generate the summary
-		// THIS IS really INEFFICIENT
-		if idx >= 0 && idx < len(user.Weeks) {
-			user.Weeks[idx].Additions += v.Stats.Additions
-			user.Weeks[idx].Deletions += v.Stats.Deletions
-			user.Weeks[idx].Commits++
-			user.TotalCommits++
-
-			// Update overall statistics
-			total.Weeks[idx].Additions += v.Stats.Additions
-			total.Weeks[idx].Deletions += v.Stats.Deletions
-			total.Weeks[idx].Commits++
-			total.TotalCommits++
-		} else {
-			log.Warn("date range of the commit is not between starting date and ending date, skipping...")
+		var week = val.UnixMilli()
+
+		if user.Weeks[week] == nil {
+			user.Weeks[week] = &WeekData{
+				Additions: 0,
+				Deletions: 0,
+				Commits: 0,
+				Week: week,
+			}
+		}
+		if total.Weeks[week] == nil {
+			total.Weeks[week] = &WeekData{
+				Additions: 0,
+				Deletions: 0,
+				Commits: 0,
+				Week: week,
+			}
 		}
+		user.Weeks[week].Additions += v.Stats.Additions
+		user.Weeks[week].Deletions += v.Stats.Deletions
+		user.Weeks[week].Commits++
+		user.TotalCommits++
+
+		// Update overall statistics
+		total.Weeks[week].Additions += v.Stats.Additions
+		total.Weeks[week].Deletions += v.Stats.Deletions
+		total.Weeks[week].Commits++
+		total.TotalCommits++
 	}
 
 	_ = cache.Put(cacheKey, contributorsCommitStats, contributorStatsCacheTimeout)
diff --git a/services/repository/contributors_graph_test.go b/services/repository/contributors_graph_test.go
index ccc28b16c1c86..3801a5eee4bfe 100644
--- a/services/repository/contributors_graph_test.go
+++ b/services/repository/contributors_graph_test.go
@@ -50,31 +50,34 @@ func TestRepository_ContributorsGraph(t *testing.T) {
 		Name:         "Ethan Koenig",
 		AvatarLink:   "https://secure.gravatar.com/avatar/b42fb195faa8c61b8d88abfefe30e9e3?d=identicon",
 		TotalCommits: 1,
-		Weeks: []*WeekData{{
-			Week:      1511654400, // sunday 2017-11-26
-			Additions: 3,
-			Deletions: 0,
-			Commits:   1,
-		}},
+		Weeks: map[int64]*WeekData{
+			1511654400000: {
+				Week:      1511654400000, // sunday 2017-11-26
+				Additions: 3,
+				Deletions: 0,
+				Commits:   1,
+			},
+		},
 	}, data["ethantkoenig@gmail.com"])
 	assert.EqualValues(t, &ContributorData{
-		Name:         "total",
+		Name:         "Total",
+		AvatarLink:   "",
 		TotalCommits: 3,
-		Weeks: []*WeekData{
-			{
-				Week:      1511654400, // sunday 2017-11-26 (2017-11-26 20:31:18 -0800)
+		Weeks: map[int64]*WeekData{
+			1511654400000: {
+				Week:      1511654400000, // sunday 2017-11-26 (2017-11-26 20:31:18 -0800)
 				Additions: 3,
 				Deletions: 0,
 				Commits:   1,
 			},
-			{
-				Week:      1607817600, // sunday 2020-12-13 (2020-12-15 15:23:11 -0500)
+			1607817600000: {
+				Week:      1607817600000, // sunday 2020-12-13 (2020-12-15 15:23:11 -0500)
 				Additions: 10,
 				Deletions: 0,
 				Commits:   1,
 			},
-			{
-				Week:      1624752000, // sunday 2021-06-27 (2021-06-29 21:54:09 +0200)
+			1624752000000: {
+				Week:      1624752000000, // sunday 2021-06-27 (2021-06-29 21:54:09 +0200)
 				Additions: 2,
 				Deletions: 0,
 				Commits:   1,
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 885774436300d..1ca08221e93f9 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -67,6 +67,31 @@ Chart.register(
   customEventListener
 );
 
+function listSundaysBetween(startDate, endDate) {
+
+  // Ensure the start date is a Sunday
+  while (startDate.getDay() !== 0) {
+    startDate.setDate(startDate.getDate() + 1);
+  }
+  const sundays = [];
+
+  for (let currentDate = new Date(startDate); currentDate < endDate; currentDate.setUTCMinutes(currentDate.getUTCMinutes() + 7 * 24 * 60)) {
+    sundays.push(Math.trunc(currentDate.getTime()));
+  }
+
+  return sundays;
+}
+
+function fillEmptySundaysWithZeroes(sundays, data) {
+  const result = {};
+
+  sundays.forEach((sunday) => {
+    result[sunday] = data[sunday] || {'week': sunday, 'additions': 0, 'deletions': 0, 'commits': 0 };
+  });
+
+  return Object.values(result)
+}
+
 export default {
   components: {ChartLine, SvgIcon},
   props: {
@@ -123,11 +148,21 @@ export default {
         if (response.ok) {
           const data = await response.json();
           const {total, ...rest} = data;
-          this.contributorsStats = rest;
-          this.xAxisStart = total.weeks[0].week;
-          this.xAxisEnd = total.weeks[total.weeks.length - 1].week;
+          // below line might be deleted if we are sure go produces map always sorted by keys
+          total.weeks = Object.fromEntries(Object.entries(total.weeks).sort())
+
+          const weekValues = Object.values(total.weeks);
+          this.xAxisStart = weekValues[0].week;
+          this.xAxisEnd = weekValues[weekValues.length - 1].week;
+          const sundays = listSundaysBetween(new Date(this.xAxisStart), new Date(this.xAxisEnd))
+          total.weeks = fillEmptySundaysWithZeroes(sundays, total.weeks)
           this.xAxisMin = this.xAxisStart;
           this.xAxisMax = this.xAxisEnd;
+          this.contributorsStats = {};
+          for (const [email, user] of Object.entries(rest)) {
+              user.weeks = fillEmptySundaysWithZeroes(sundays, user.weeks);
+              this.contributorsStats[email] = user;
+          }
           this.sortContributors();
           this.totalStats = total;
           this.errorText = '';

From 344ed41bef508096306a7114625b04aa488e8076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Tue, 13 Feb 2024 19:29:32 +0300
Subject: [PATCH 128/138] Fix linting error

---
 services/repository/contributors_graph.go  | 15 +++++++-------
 web_src/js/components/RepoContributors.vue | 24 ++++++++++++----------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/services/repository/contributors_graph.go b/services/repository/contributors_graph.go
index 560ee1ae661ad..8421df8e3ae7e 100644
--- a/services/repository/contributors_graph.go
+++ b/services/repository/contributors_graph.go
@@ -60,7 +60,6 @@ type ExtendedCommitStats struct {
 	Stats  *api.CommitStats `json:"stats"`
 }
 
-
 const layout = time.DateOnly
 
 func findLastSundayBeforeDate(dateStr string) (string, error) {
@@ -239,8 +238,8 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 	unknownUserAvatarLink := user_model.NewGhostUser().AvatarLinkWithSize(ctx, 0)
 	contributorsCommitStats := make(map[string]*ContributorData)
 	contributorsCommitStats["total"] = &ContributorData{
-		Name:       "Total",
-		Weeks:      make(map[int64]*WeekData),
+		Name:  "Total",
+		Weeks: make(map[int64]*WeekData),
 	}
 	total := contributorsCommitStats["total"]
 
@@ -282,22 +281,22 @@ func generateContributorStats(genDone chan struct{}, cache cache.Cache, cacheKey
 		startingOfWeek, _ := findLastSundayBeforeDate(v.Author.Date)
 
 		val, _ := time.Parse(layout, startingOfWeek)
-		var week = val.UnixMilli()
+		week := val.UnixMilli()
 
 		if user.Weeks[week] == nil {
 			user.Weeks[week] = &WeekData{
 				Additions: 0,
 				Deletions: 0,
-				Commits: 0,
-				Week: week,
+				Commits:   0,
+				Week:      week,
 			}
 		}
 		if total.Weeks[week] == nil {
 			total.Weeks[week] = &WeekData{
 				Additions: 0,
 				Deletions: 0,
-				Commits: 0,
-				Week: week,
+				Commits:   0,
+				Week:      week,
 			}
 		}
 		user.Weeks[week].Additions += v.Stats.Additions
diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 1ca08221e93f9..61aca2e6a934e 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -68,16 +68,18 @@ Chart.register(
 );
 
 function listSundaysBetween(startDate, endDate) {
-
   // Ensure the start date is a Sunday
   while (startDate.getDay() !== 0) {
     startDate.setDate(startDate.getDate() + 1);
   }
   const sundays = [];
 
-  for (let currentDate = new Date(startDate); currentDate < endDate; currentDate.setUTCMinutes(currentDate.getUTCMinutes() + 7 * 24 * 60)) {
+  /* eslint-disable no-unmodified-loop-condition */
+  // couldn't find a way to get rid of the error.
+  for (const currentDate = new Date(startDate); currentDate < endDate; currentDate.setUTCMinutes(currentDate.getUTCMinutes() + 7 * 24 * 60)) {
     sundays.push(Math.trunc(currentDate.getTime()));
   }
+  /* eslint-enable no-unmodified-loop-condition */
 
   return sundays;
 }
@@ -85,11 +87,11 @@ function listSundaysBetween(startDate, endDate) {
 function fillEmptySundaysWithZeroes(sundays, data) {
   const result = {};
 
-  sundays.forEach((sunday) => {
-    result[sunday] = data[sunday] || {'week': sunday, 'additions': 0, 'deletions': 0, 'commits': 0 };
-  });
+  for (const sunday of sundays) {
+    result[sunday] = data[sunday] || {'week': sunday, 'additions': 0, 'deletions': 0, 'commits': 0};
+  }
 
-  return Object.values(result)
+  return Object.values(result);
 }
 
 export default {
@@ -149,19 +151,19 @@ export default {
           const data = await response.json();
           const {total, ...rest} = data;
           // below line might be deleted if we are sure go produces map always sorted by keys
-          total.weeks = Object.fromEntries(Object.entries(total.weeks).sort())
+          total.weeks = Object.fromEntries(Object.entries(total.weeks).sort());
 
           const weekValues = Object.values(total.weeks);
           this.xAxisStart = weekValues[0].week;
           this.xAxisEnd = weekValues[weekValues.length - 1].week;
-          const sundays = listSundaysBetween(new Date(this.xAxisStart), new Date(this.xAxisEnd))
-          total.weeks = fillEmptySundaysWithZeroes(sundays, total.weeks)
+          const sundays = listSundaysBetween(new Date(this.xAxisStart), new Date(this.xAxisEnd));
+          total.weeks = fillEmptySundaysWithZeroes(sundays, total.weeks);
           this.xAxisMin = this.xAxisStart;
           this.xAxisMax = this.xAxisEnd;
           this.contributorsStats = {};
           for (const [email, user] of Object.entries(rest)) {
-              user.weeks = fillEmptySundaysWithZeroes(sundays, user.weeks);
-              this.contributorsStats[email] = user;
+            user.weeks = fillEmptySundaysWithZeroes(sundays, user.weeks);
+            this.contributorsStats[email] = user;
           }
           this.sortContributors();
           this.totalStats = total;

From 09d5d27a2293acdb309af30068c72c334995bcbc Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Wed, 14 Feb 2024 23:56:35 +0100
Subject: [PATCH 129/138] fix lint error and use dayjs to get sundays

---
 web_src/js/components/RepoContributors.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 61aca2e6a934e..bb71814502ae0 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -16,6 +16,7 @@ import {
 import {GET} from '../modules/fetch.js';
 import zoomPlugin from 'chartjs-plugin-zoom';
 import {Line as ChartLine} from 'vue-chartjs';
+import dayjs from 'dayjs';
 import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm';
 import $ from 'jquery';
 
@@ -72,14 +73,16 @@ function listSundaysBetween(startDate, endDate) {
   while (startDate.getDay() !== 0) {
     startDate.setDate(startDate.getDate() + 1);
   }
+
+  const start = dayjs(startDate);
+  const end = dayjs(endDate);
   const sundays = [];
 
-  /* eslint-disable no-unmodified-loop-condition */
-  // couldn't find a way to get rid of the error.
-  for (const currentDate = new Date(startDate); currentDate < endDate; currentDate.setUTCMinutes(currentDate.getUTCMinutes() + 7 * 24 * 60)) {
-    sundays.push(Math.trunc(currentDate.getTime()));
+  let current = start;
+  while (current.isBefore(end)) {
+    sundays.push(current.valueOf());
+    current = current.day(7);
   }
-  /* eslint-enable no-unmodified-loop-condition */
 
   return sundays;
 }

From c05d215895960cd3bdf60d37eeeffe9a7a659307 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 15 Feb 2024 00:01:02 +0100
Subject: [PATCH 130/138] refactor property access, remove empty line

---
 web_src/js/components/RepoContributors.vue | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index bb71814502ae0..a1c1deb85acb7 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -186,18 +186,18 @@ export default {
       const data = this.contributorsStats;
       for (const key of Object.keys(data)) {
         const user = data[key];
-        user['total_commits'] = 0;
-        user['total_additions'] = 0;
-        user['total_deletions'] = 0;
-        user['max_contribution_type'] = 0;
+        user.total_commits = 0;
+        user.total_additions = 0;
+        user.total_deletions = 0;
+        user.max_contribution_type = 0;
         const filteredWeeks = user.weeks.filter((week) => {
           const oneWeek = 7 * 24 * 60 * 60 * 1000;
           if (week.week >= this.xAxisMin - oneWeek && week.week <= this.xAxisMax + oneWeek) {
-            user['total_commits'] += week.commits;
-            user['total_additions'] += week.additions;
-            user['total_deletions'] += week.deletions;
-            if (week[this.type] > user['max_contribution_type']) {
-              user['max_contribution_type'] = week[this.type];
+            user.total_commits += week.commits;
+            user.total_additions += week.additions;
+            user.total_deletions += week.deletions;
+            if (week[this.type] > user.max_contribution_type) {
+              user.max_contribution_type = week[this.type];
             }
             return true;
           }
@@ -205,7 +205,7 @@ export default {
         });
         // this line is required. See https://github.com/sahinakkaya/gitea/pull/3#discussion_r1396495722
         // for details.
-        user['max_contribution_type'] += 1;
+        user.max_contribution_type += 1;
 
         filteredData[key] = {...user, weeks: filteredWeeks};
       }
@@ -232,7 +232,7 @@ export default {
       // for contributors' graph. If I let chartjs do this for me, it will choose different
       // maxY value for each contributors' graph which again makes it harder to compare.
       const maxValue = Math.max(
-        ...this.sortedContributors.map((c) => c['max_contribution_type'])
+        ...this.sortedContributors.map((c) => c.max_contribution_type)
       );
       const [coefficient, exp] = maxValue.toExponential().split('e').map(Number);
       if (coefficient % 1 === 0) return maxValue;
@@ -465,5 +465,4 @@ export default {
 .contributor-name {
   margin-bottom: 0;
 }
-
 </style>

From 1c203d1a1ddca5348feb0bf4fee206feaf306910 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 15 Feb 2024 00:07:02 +0100
Subject: [PATCH 131/138] fix eslint parser error

---
 web_src/js/components/.eslintrc.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web_src/js/components/.eslintrc.yaml b/web_src/js/components/.eslintrc.yaml
index 0cab470f6b6ce..0d233442bc436 100644
--- a/web_src/js/components/.eslintrc.yaml
+++ b/web_src/js/components/.eslintrc.yaml
@@ -7,6 +7,10 @@ extends:
   - plugin:vue/vue3-recommended
   - plugin:vue-scoped-css/vue3-recommended
 
+parserOptions:
+  sourceType: module
+  ecmaVersion: latest
+
 env:
   browser: true
 

From 9fb946bcbc4b0547b68929cb6acb00dec2e9b9bc Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 15 Feb 2024 00:24:49 +0100
Subject: [PATCH 132/138] rename 'sundays' to 'startDays' in js, add trailing
 commas

---
 web_src/js/components/RepoContributors.vue | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index a1c1deb85acb7..01af3cdac0cfe 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -28,7 +28,7 @@ const colors = {
   commits: '--color-primary-alpha-60',
   additions: '--color-green',
   deletions: '--color-red',
-  title: '--color-secondary-dark-4'
+  title: '--color-secondary-dark-4',
 };
 
 const styles = window.getComputedStyle(document.documentElement);
@@ -65,10 +65,11 @@ Chart.register(
   LineElement,
   Filler,
   zoomPlugin,
-  customEventListener
+  customEventListener,
 );
 
-function listSundaysBetween(startDate, endDate) {
+// Returns an array of millisecond-timestamps of start-of-week days (Sundays)
+function startDaysBetween(startDate, endDate) {
   // Ensure the start date is a Sunday
   while (startDate.getDay() !== 0) {
     startDate.setDate(startDate.getDate() + 1);
@@ -76,22 +77,22 @@ function listSundaysBetween(startDate, endDate) {
 
   const start = dayjs(startDate);
   const end = dayjs(endDate);
-  const sundays = [];
+  const startDays = [];
 
   let current = start;
   while (current.isBefore(end)) {
-    sundays.push(current.valueOf());
+    startDays.push(current.valueOf());
     current = current.day(7);
   }
 
-  return sundays;
+  return startDays;
 }
 
-function fillEmptySundaysWithZeroes(sundays, data) {
+function fillEmptyStartDaysWithZeroes(startDays, data) {
   const result = {};
 
-  for (const sunday of sundays) {
-    result[sunday] = data[sunday] || {'week': sunday, 'additions': 0, 'deletions': 0, 'commits': 0};
+  for (const startDay of startDays) {
+    result[startDay] = data[startDay] || {'week': startDay, 'additions': 0, 'deletions': 0, 'commits': 0};
   }
 
   return Object.values(result);
@@ -102,7 +103,7 @@ export default {
   props: {
     locale: {
       type: Object,
-      required: true
+      required: true,
     },
   },
   data: () => ({
@@ -159,13 +160,13 @@ export default {
           const weekValues = Object.values(total.weeks);
           this.xAxisStart = weekValues[0].week;
           this.xAxisEnd = weekValues[weekValues.length - 1].week;
-          const sundays = listSundaysBetween(new Date(this.xAxisStart), new Date(this.xAxisEnd));
-          total.weeks = fillEmptySundaysWithZeroes(sundays, total.weeks);
+          const startDays = startDaysBetween(new Date(this.xAxisStart), new Date(this.xAxisEnd));
+          total.weeks = fillEmptyStartDaysWithZeroes(startDays, total.weeks);
           this.xAxisMin = this.xAxisStart;
           this.xAxisMax = this.xAxisEnd;
           this.contributorsStats = {};
           for (const [email, user] of Object.entries(rest)) {
-            user.weeks = fillEmptySundaysWithZeroes(sundays, user.weeks);
+            user.weeks = fillEmptyStartDaysWithZeroes(startDays, user.weeks);
             this.contributorsStats[email] = user;
           }
           this.sortContributors();

From 5e510921446a89c1f432b2b41a0937a6a2755a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 15 Feb 2024 11:51:04 +0300
Subject: [PATCH 133/138] Add raw hours to generate timestamps correctly

---
 web_src/js/components/RepoContributors.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 01af3cdac0cfe..ce24fca360718 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -82,7 +82,10 @@ function startDaysBetween(startDate, endDate) {
   let current = start;
   while (current.isBefore(end)) {
     startDays.push(current.valueOf());
-    current = current.day(7);
+    // do not change the following line unless you are sure what you are doing
+    // see https://github.com/go-gitea/gitea/pull/27882#issuecomment-1945594269
+    // for details
+    current = current.add(7 * 24, 'hour')
   }
 
   return startDays;

From 0c53d38e0444001d65482d475537500d983f15a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 15 Feb 2024 11:59:45 +0300
Subject: [PATCH 134/138] Use current time as end date instead of last commit's
 time

---
 web_src/js/components/RepoContributors.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index ce24fca360718..03f8a95bbf5aa 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -91,6 +91,18 @@ function startDaysBetween(startDate, endDate) {
   return startDays;
 }
 
+
+function firstStartDateAfterDate(inputDate) {
+  if (!(inputDate instanceof Date) || isNaN(inputDate)) {
+    throw new Error('Invalid date');
+  }
+  let dayOfWeek = inputDate.getDay();
+  let daysUntilSunday = 7 - dayOfWeek;
+  let resultDate = new Date(inputDate.getTime()) ;
+  resultDate.setDate(resultDate.getDate() + daysUntilSunday);
+  return resultDate.valueOf();
+}
+
 function fillEmptyStartDaysWithZeroes(startDays, data) {
   const result = {};
 
@@ -162,7 +174,7 @@ export default {
 
           const weekValues = Object.values(total.weeks);
           this.xAxisStart = weekValues[0].week;
-          this.xAxisEnd = weekValues[weekValues.length - 1].week;
+          this.xAxisEnd = firstStartDateAfterDate(new Date())
           const startDays = startDaysBetween(new Date(this.xAxisStart), new Date(this.xAxisEnd));
           total.weeks = fillEmptyStartDaysWithZeroes(startDays, total.weeks);
           this.xAxisMin = this.xAxisStart;

From c3f8e9346ce60b7df99f35606c2b72ebc6906942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 15 Feb 2024 17:31:35 +0300
Subject: [PATCH 135/138] Fix linting error

---
 web_src/js/components/RepoContributors.vue | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 03f8a95bbf5aa..8cfa826468ba7 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -85,20 +85,19 @@ function startDaysBetween(startDate, endDate) {
     // do not change the following line unless you are sure what you are doing
     // see https://github.com/go-gitea/gitea/pull/27882#issuecomment-1945594269
     // for details
-    current = current.add(7 * 24, 'hour')
+    current = current.add(7 * 24, 'hour');
   }
 
   return startDays;
 }
 
-
 function firstStartDateAfterDate(inputDate) {
-  if (!(inputDate instanceof Date) || isNaN(inputDate)) {
+  if (!(inputDate instanceof Date)) {
     throw new Error('Invalid date');
   }
-  let dayOfWeek = inputDate.getDay();
-  let daysUntilSunday = 7 - dayOfWeek;
-  let resultDate = new Date(inputDate.getTime()) ;
+  const dayOfWeek = inputDate.getDay();
+  const daysUntilSunday = 7 - dayOfWeek;
+  const resultDate = new Date(inputDate.getTime());
   resultDate.setDate(resultDate.getDate() + daysUntilSunday);
   return resultDate.valueOf();
 }
@@ -174,7 +173,7 @@ export default {
 
           const weekValues = Object.values(total.weeks);
           this.xAxisStart = weekValues[0].week;
-          this.xAxisEnd = firstStartDateAfterDate(new Date())
+          this.xAxisEnd = firstStartDateAfterDate(new Date());
           const startDays = startDaysBetween(new Date(this.xAxisStart), new Date(this.xAxisEnd));
           total.weeks = fillEmptyStartDaysWithZeroes(startDays, total.weeks);
           this.xAxisMin = this.xAxisStart;

From ee1de5049ae22c4d6034f58b336d050e08307a93 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 15 Feb 2024 19:02:24 +0100
Subject: [PATCH 136/138] extract time-related functions to file and add test
 for startDaysBetween

---
 web_src/js/components/RepoContributors.vue | 50 +++-------------------
 web_src/js/utils/time.js                   | 45 +++++++++++++++++++
 web_src/js/utils/time.test.js              | 15 +++++++
 3 files changed, 65 insertions(+), 45 deletions(-)
 create mode 100644 web_src/js/utils/time.js
 create mode 100644 web_src/js/utils/time.test.js

diff --git a/web_src/js/components/RepoContributors.vue b/web_src/js/components/RepoContributors.vue
index 8cfa826468ba7..fa1545b3dfb25 100644
--- a/web_src/js/components/RepoContributors.vue
+++ b/web_src/js/components/RepoContributors.vue
@@ -16,7 +16,11 @@ import {
 import {GET} from '../modules/fetch.js';
 import zoomPlugin from 'chartjs-plugin-zoom';
 import {Line as ChartLine} from 'vue-chartjs';
-import dayjs from 'dayjs';
+import {
+  startDaysBetween,
+  firstStartDateAfterDate,
+  fillEmptyStartDaysWithZeroes,
+} from '../utils/time.js';
 import 'chartjs-adapter-dayjs-4/dist/chartjs-adapter-dayjs-4.esm';
 import $ from 'jquery';
 
@@ -68,50 +72,6 @@ Chart.register(
   customEventListener,
 );
 
-// Returns an array of millisecond-timestamps of start-of-week days (Sundays)
-function startDaysBetween(startDate, endDate) {
-  // Ensure the start date is a Sunday
-  while (startDate.getDay() !== 0) {
-    startDate.setDate(startDate.getDate() + 1);
-  }
-
-  const start = dayjs(startDate);
-  const end = dayjs(endDate);
-  const startDays = [];
-
-  let current = start;
-  while (current.isBefore(end)) {
-    startDays.push(current.valueOf());
-    // do not change the following line unless you are sure what you are doing
-    // see https://github.com/go-gitea/gitea/pull/27882#issuecomment-1945594269
-    // for details
-    current = current.add(7 * 24, 'hour');
-  }
-
-  return startDays;
-}
-
-function firstStartDateAfterDate(inputDate) {
-  if (!(inputDate instanceof Date)) {
-    throw new Error('Invalid date');
-  }
-  const dayOfWeek = inputDate.getDay();
-  const daysUntilSunday = 7 - dayOfWeek;
-  const resultDate = new Date(inputDate.getTime());
-  resultDate.setDate(resultDate.getDate() + daysUntilSunday);
-  return resultDate.valueOf();
-}
-
-function fillEmptyStartDaysWithZeroes(startDays, data) {
-  const result = {};
-
-  for (const startDay of startDays) {
-    result[startDay] = data[startDay] || {'week': startDay, 'additions': 0, 'deletions': 0, 'commits': 0};
-  }
-
-  return Object.values(result);
-}
-
 export default {
   components: {ChartLine, SvgIcon},
   props: {
diff --git a/web_src/js/utils/time.js b/web_src/js/utils/time.js
new file mode 100644
index 0000000000000..8a83ec4c5c460
--- /dev/null
+++ b/web_src/js/utils/time.js
@@ -0,0 +1,45 @@
+import dayjs from 'dayjs';
+
+// Returns an array of millisecond-timestamps of start-of-week days (Sundays)
+export function startDaysBetween(startDate, endDate) {
+  // Ensure the start date is a Sunday
+  while (startDate.getDay() !== 0) {
+    startDate.setDate(startDate.getDate() + 1);
+  }
+
+  const start = dayjs(startDate);
+  const end = dayjs(endDate);
+  const startDays = [];
+
+  let current = start;
+  while (current.isBefore(end)) {
+    startDays.push(current.valueOf());
+    // do not change the following line unless you are sure what you are doing
+    // see https://github.com/go-gitea/gitea/pull/27882#issuecomment-1945594269
+    // for details
+    current = current.add(7 * 24, 'hour');
+  }
+
+  return startDays;
+}
+
+export function firstStartDateAfterDate(inputDate) {
+  if (!(inputDate instanceof Date)) {
+    throw new Error('Invalid date');
+  }
+  const dayOfWeek = inputDate.getDay();
+  const daysUntilSunday = 7 - dayOfWeek;
+  const resultDate = new Date(inputDate.getTime());
+  resultDate.setDate(resultDate.getDate() + daysUntilSunday);
+  return resultDate.valueOf();
+}
+
+export function fillEmptyStartDaysWithZeroes(startDays, data) {
+  const result = {};
+
+  for (const startDay of startDays) {
+    result[startDay] = data[startDay] || {'week': startDay, 'additions': 0, 'deletions': 0, 'commits': 0};
+  }
+
+  return Object.values(result);
+}
diff --git a/web_src/js/utils/time.test.js b/web_src/js/utils/time.test.js
new file mode 100644
index 0000000000000..a3246cc3b4acf
--- /dev/null
+++ b/web_src/js/utils/time.test.js
@@ -0,0 +1,15 @@
+import {startDaysBetween} from './time.js';
+
+test('startDaysBetween', () => {
+  expect(startDaysBetween(new Date('2024-02-15'), new Date('2024-04-15'))).toEqual([
+    1708214400000,
+    1708819200000,
+    1709424000000,
+    1710028800000,
+    1710633600000,
+    1711238400000,
+    1711843200000,
+    1712448000000,
+    1713052800000,
+  ]);
+});

From 3b7b6361822784eda5fe411cf168f77329136459 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 15 Feb 2024 19:05:34 +0100
Subject: [PATCH 137/138] use better end date

---
 web_src/js/utils/time.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/utils/time.test.js b/web_src/js/utils/time.test.js
index a3246cc3b4acf..dd1114ce7fb97 100644
--- a/web_src/js/utils/time.test.js
+++ b/web_src/js/utils/time.test.js
@@ -1,7 +1,7 @@
 import {startDaysBetween} from './time.js';
 
 test('startDaysBetween', () => {
-  expect(startDaysBetween(new Date('2024-02-15'), new Date('2024-04-15'))).toEqual([
+  expect(startDaysBetween(new Date('2024-02-15'), new Date('2024-04-18'))).toEqual([
     1708214400000,
     1708819200000,
     1709424000000,

From eb3c79714cd3a9a774927cb4d7dd9129a0c872e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=9Eahin=20Akkaya?= <sahin@sahinakkaya.dev>
Date: Thu, 15 Feb 2024 22:20:04 +0300
Subject: [PATCH 138/138] Explain issue in comment instead of writing external
 link

---
 web_src/js/utils/time.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web_src/js/utils/time.js b/web_src/js/utils/time.js
index 8a83ec4c5c460..3284e893e1377 100644
--- a/web_src/js/utils/time.js
+++ b/web_src/js/utils/time.js
@@ -14,9 +14,10 @@ export function startDaysBetween(startDate, endDate) {
   let current = start;
   while (current.isBefore(end)) {
     startDays.push(current.valueOf());
-    // do not change the following line unless you are sure what you are doing
-    // see https://github.com/go-gitea/gitea/pull/27882#issuecomment-1945594269
-    // for details
+    // we are adding 7 * 24 hours instead of 1 week because we don't want
+    // date library to use local time zone to calculate 1 week from now.
+    // local time zone is problematic because of daylight saving time (dst)
+    // used on some countries
     current = current.add(7 * 24, 'hour');
   }