Skip to content

Rework Fork Page #24130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Rework Fork Page #24130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fa4172
Rework Fork Page
JakobDev Apr 14, 2023
6a0d03d
Update Design
JakobDev Apr 21, 2023
18c6386
Litte style changes
JakobDev Apr 24, 2023
d902876
Merge branch 'main' into forkrework
silverwind May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 50 additions & 6 deletions models/repo/fork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package repo

import (
"context"
"time"

"code.gitea.io/gitea/models/db"
user_model "code.gitea.io/gitea/models/user"
Expand Down Expand Up @@ -54,15 +55,58 @@ func GetUserFork(ctx context.Context, repoID, userID int64) (*Repository, error)
return &forkedRepo, nil
}

// GetForksOptions represents options for GetForks
type GetForksOptions struct {
ListOptions db.ListOptions
Period string
SortType string
}

// GetForks returns all the forks of the repository
func GetForks(repo *Repository, listOptions db.ListOptions) ([]*Repository, error) {
if listOptions.Page == 0 {
forks := make([]*Repository, 0, repo.NumForks)
return forks, db.GetEngine(db.DefaultContext).Find(&forks, &Repository{ForkID: repo.ID})
func GetForks(repo *Repository, forkOptions GetForksOptions) ([]*Repository, error) {
var forks []*Repository
var sess db.Engine

if forkOptions.ListOptions.Page == 0 {
forks = make([]*Repository, 0, repo.NumForks)
sess = db.GetEngine(db.DefaultContext)
} else {
sess = db.GetPaginatedSession(&forkOptions.ListOptions)
forks = make([]*Repository, 0, forkOptions.ListOptions.PageSize)
}

switch forkOptions.Period {
case "1month":
sess.Where("repository.updated_unix >= ?", time.Now().AddDate(0, -1, 0).Unix())
case "6month":
sess.Where("repository.updated_unix >= ?", time.Now().AddDate(0, -6, 0).Unix())
case "1year":
sess.Where("repository.updated_unix >= ?", time.Now().AddDate(-1, 0, 0).Unix())
case "2year":
sess.Where("repository.updated_unix >= ?", time.Now().AddDate(-2, 0, 0).Unix())
case "5year":
sess.Where("repository.updated_unix >= ?", time.Now().AddDate(-5, 0, 0).Unix())
}

switch forkOptions.SortType {
case "moststars":
sess.Desc("repository.num_stars").Desc("repository.updated_unix")
case "recentupdated":
sess.Desc("repository.updated_unix")
case "leastrecentupdated":
sess.Asc("repository.updated_unix")
case "openissue":
sess.Desc("repository.num_issues").Desc("repository.updated_unix")
case "openpr":
sess.Desc("repository.num_pulls").Desc("repository.updated_unix")
case "newest":
sess.Desc("repository.created_unix")
case "oldest":
sess.Asc("repository.created_unix")
default:
sess.Desc("repository.num_stars").Desc("repository.updated_unix")
}

sess := db.GetPaginatedSession(&listOptions)
forks := make([]*Repository, 0, listOptions.PageSize)
return forks, sess.Find(&forks, &Repository{ForkID: repo.ID})
}

Expand Down
2 changes: 1 addition & 1 deletion routers/api/v1/repo/fork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func ListForks(ctx *context.APIContext) {
// "200":
// "$ref": "#/responses/RepositoryList"

forks, err := repo_model.GetForks(ctx.Repo.Repository, utils.GetListOptions(ctx))
forks, err := repo_model.GetForks(ctx.Repo.Repository, repo_model.GetForksOptions{ListOptions: utils.GetListOptions(ctx)})
if err != nil {
ctx.Error(http.StatusInternalServerError, "GetForks", err)
return
Expand Down
51 changes: 48 additions & 3 deletions routers/web/repo/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,10 +1032,45 @@ func Stars(ctx *context.Context) {
}, tplWatchers)
}

// ForksDropdownHelper is a little helper struct for creating dropdowns
type ForksDropdownHelper struct {
Parameter string // The URL parameter
Text string // The text that is displayed in the UI
}

// Forks render repository's forked users
func Forks(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("repo.forks")

aviablePeriods := []ForksDropdownHelper{
{Parameter: "all", Text: "All"},
{Parameter: "1month", Text: "1 month"},
{Parameter: "6month", Text: "6 months"},
{Parameter: "1year", Text: "1 year"},
{Parameter: "2year", Text: "2 years"},
{Parameter: "5year", Text: "5 years"},
}

period := ctx.FormString("period")
if period == "" {
period = "all"
}

aviableSortTypes := []ForksDropdownHelper{
{Parameter: "moststars", Text: "Stars"},
{Parameter: "recentupdated", Text: "Recently updated"},
{Parameter: "leastrecentupdated", Text: "Least recently updated"},
{Parameter: "openissue", Text: "Open Issues"},
{Parameter: "openpr", Text: "Open pull requests"},
{Parameter: "newest", Text: "Newest"},
{Parameter: "oldest", Text: "Oldest"},
}

sortType := ctx.FormString("sort")
if sortType == "" {
sortType = "moststars"
}

page := ctx.FormInt("page")
if page <= 0 {
page = 1
Expand All @@ -1044,9 +1079,13 @@ func Forks(ctx *context.Context) {
pager := context.NewPagination(ctx.Repo.Repository.NumForks, setting.ItemsPerPage, page, 5)
ctx.Data["Page"] = pager

forks, err := repo_model.GetForks(ctx.Repo.Repository, db.ListOptions{
Page: pager.Paginater.Current(),
PageSize: setting.ItemsPerPage,
forks, err := repo_model.GetForks(ctx.Repo.Repository, repo_model.GetForksOptions{
ListOptions: db.ListOptions{
Page: pager.Paginater.Current(),
PageSize: setting.ItemsPerPage,
},
SortType: sortType,
Period: period,
})
if err != nil {
ctx.ServerError("GetForks", err)
Expand All @@ -1062,5 +1101,11 @@ func Forks(ctx *context.Context) {

ctx.Data["Forks"] = forks

ctx.Data["Period"] = period
ctx.Data["AviablePeriods"] = aviablePeriods

ctx.Data["SortType"] = sortType
ctx.Data["AviableSortTypes"] = aviableSortTypes

ctx.HTML(http.StatusOK, tplForks)
}
64 changes: 59 additions & 5 deletions templates/repo/forks.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,66 @@
<h2 class="ui dividing header">
{{.locale.Tr "repo.forks"}}
</h2>
{{range .Forks}}
<div class="gt-df gt-ac gt-py-3">
<span class="gt-mr-2">{{avatar $.Context .Owner}}</span>
<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / <a href="{{.Link}}">{{.Name}}</a>

<div class="ui secondary filter stackable menu labels" style="display: flex; justify-content: end;">
{{$Period := .Period}}
{{$SortType := .SortType}}

<div class="ui dropdown downward type jump item">
<span class="text">
Period
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
</span>
<div class="menu">
{{range .AviablePeriods}}
<a class="{{if eq $Period .Parameter}} active {{end}}item" href="{{$.Link}}?period={{.Parameter}}&sort={{$SortType}}">{{.Text}}</a>
{{end}}
</div>
</div>
{{end}}

<div class="ui dropdown downward type jump item">
<span class="text">
Sort
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
</span>
<div class="menu">
{{range .AviableSortTypes}}
<a class="{{if eq $SortType .Parameter}} active {{end}}item" href="{{$.Link}}?period={{$Period}}&sort={{.Parameter}}">{{.Text}}</a>
{{end}}
</div>
</div>
</div>

<div class="ui divider"></div>

<div class="ui repository list">
{{range .Forks}}
<div class="item">
<div class="gt-df gt-ac gt-py-3">
<div class="repo-title" style="display: flex; flex: 1; flex-grow: 1;">
<span class="gt-mr-4">{{avatar $.Context .Owner}}</span>
<div style="display: flex; align-items: center;">
<a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a>&nbsp;/&nbsp;<a href="{{.Link}}">{{.Name}}</a>
</div>
</div>

<div class="metas gt-df gt-ac text grey">
{{if not $.DisableStars}}
<span class="text grey gt-df gt-ac gt-mr-3">{{svg "octicon-star" 16 "gt-mr-3"}}{{.NumStars}}</span>
{{end}}

<span class="text grey gt-df gt-ac gt-mr-3">{{svg "octicon-git-branch" 16 "gt-mr-3"}}{{.NumForks}}</span>
</div>
</div>

<div class="description">
<p class="time" style="display: inline-block;">Created {{TimeSinceUnix .CreatedUnix $.locale}}</p>
·
<p class="time" style="display: inline-block;">{{$.locale.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.locale}}</p>
</div>
</div>
{{end}}
</div>
</div>

{{template "base/paginate" .}}
Expand Down