Skip to content

Commit 5074de0

Browse files
committed
feat: Add search bar on user profile page.
1 parent bf6f61c commit 5074de0

File tree

6 files changed

+69
-10
lines changed

6 files changed

+69
-10
lines changed

models/repo.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -1577,10 +1577,14 @@ func GetRepositoryByID(id int64) (*Repository, error) {
15771577
}
15781578

15791579
// GetUserRepositories returns a list of repositories of given user.
1580-
func GetUserRepositories(userID int64, private bool, page, pageSize int) ([]*Repository, error) {
1580+
func GetUserRepositories(userID int64, private bool, page, pageSize int, orderBy string) ([]*Repository, error) {
1581+
if len(orderBy) == 0 {
1582+
orderBy = "updated_unix DESC"
1583+
}
1584+
15811585
sess := x.
15821586
Where("owner_id = ?", userID).
1583-
Desc("updated_unix")
1587+
OrderBy(orderBy)
15841588
if !private {
15851589
sess.And("is_private=?", false)
15861590
}

models/user.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ func (u *User) GetOrganizationCount() (int64, error) {
491491

492492
// GetRepositories returns repositories that user owns, including private repositories.
493493
func (u *User) GetRepositories(page, pageSize int) (err error) {
494-
u.Repos, err = GetUserRepositories(u.ID, true, page, pageSize)
494+
u.Repos, err = GetUserRepositories(u.ID, true, page, pageSize, "")
495495
return err
496496
}
497497

routers/api/v1/repo/repo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func Search(ctx *context.APIContext) {
8080
// ListMyRepos list all my repositories
8181
// see https://github.com/gogits/go-gogs-client/wiki/Repositories#list-your-repositories
8282
func ListMyRepos(ctx *context.APIContext) {
83-
ownRepos, err := models.GetUserRepositories(ctx.User.ID, true, 1, ctx.User.NumRepos)
83+
ownRepos, err := models.GetUserRepositories(ctx.User.ID, true, 1, ctx.User.NumRepos, "")
8484
if err != nil {
8585
ctx.Error(500, "GetRepositories", err)
8686
return

routers/user/home.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ func showOrgProfile(ctx *context.Context) {
381381
ctx.Data["Repos"] = repos
382382
} else {
383383
showPrivate := ctx.IsSigned && ctx.User.IsAdmin
384-
repos, err = models.GetUserRepositories(org.ID, showPrivate, page, setting.UI.User.RepoPagingNum)
384+
repos, err = models.GetUserRepositories(org.ID, showPrivate, page, setting.UI.User.RepoPagingNum, "")
385385
if err != nil {
386386
ctx.Handle(500, "GetRepositories", err)
387387
return

routers/user/profile.go

+59-5
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,66 @@ func Profile(ctx *context.Context) {
109109
page = 1
110110
}
111111

112-
ctx.Data["Repos"], err = models.GetUserRepositories(ctxUser.ID, showPrivate, page, setting.UI.User.RepoPagingNum)
113-
if err != nil {
114-
ctx.Handle(500, "GetRepositories", err)
115-
return
112+
var (
113+
repos []*models.Repository
114+
count int64
115+
err error
116+
orderBy string
117+
)
118+
switch ctx.Query("sort") {
119+
case "newest":
120+
orderBy = "created_unix DESC"
121+
case "oldest":
122+
orderBy = "created_unix ASC"
123+
case "recentupdate":
124+
orderBy = "updated_unix DESC"
125+
case "leastupdate":
126+
orderBy = "updated_unix ASC"
127+
case "reversealphabetically":
128+
orderBy = "name DESC"
129+
case "alphabetically":
130+
orderBy = "name ASC"
131+
default:
132+
orderBy = "updated_unix DESC"
133+
}
134+
135+
keyword := ctx.Query("q")
136+
if len(keyword) == 0 {
137+
repos, err = models.GetUserRepositories(ctxUser.ID, showPrivate, page, setting.UI.User.RepoPagingNum, orderBy)
138+
if err != nil {
139+
ctx.Handle(500, "GetRepositories", err)
140+
return
141+
}
142+
ctx.Data["Repos"] = repos
143+
ctx.Data["Page"] = paginater.New(ctxUser.NumRepos, setting.UI.User.RepoPagingNum, page, 5)
144+
ctx.Data["Total"] = ctxUser.NumRepos
145+
} else {
146+
repos, count, err = models.SearchRepositoryByName(&models.SearchRepoOptions{
147+
Keyword: keyword,
148+
OwnerID: ctxUser.ID,
149+
OrderBy: orderBy,
150+
Private: ctx.IsSigned && ctx.User.ID == ctxUser.ID,
151+
Page: page,
152+
PageSize: setting.UI.User.RepoPagingNum,
153+
})
154+
if err != nil {
155+
ctx.Handle(500, "SearchRepositoryByName", err)
156+
return
157+
}
158+
159+
ctx.Data["Repos"] = repos
160+
ctx.Data["Page"] = paginater.New(int(count), setting.UI.User.RepoPagingNum, page, 5)
161+
ctx.Data["Total"] = count
116162
}
117-
ctx.Data["Page"] = paginater.New(ctxUser.NumRepos, setting.UI.User.RepoPagingNum, page, 5)
163+
164+
// set default sort value.
165+
if ctx.Query("sort") == "" {
166+
ctx.Data["SortType"] = "recentupdate"
167+
} else {
168+
ctx.Data["SortType"] = ctx.Query("sort")
169+
}
170+
171+
ctx.Data["Keyword"] = keyword
118172
}
119173

120174
ctx.HTML(200, tplProfile)

templates/user/profile.tmpl

+1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
{{template "explore/repo_list" .}}
9696
</div>
9797
{{else}}
98+
{{template "explore/search" .}}
9899
{{template "explore/repo_list" .}}
99100
{{template "base/paginate" .}}
100101
{{end}}

0 commit comments

Comments
 (0)