mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-25 22:22:44 +01:00
2af30f715e
Fix ::User Profile Page Project Tab Have Inconsistent Layout and Style Added the big_avator for consistency in the all header_items tabs. Fixes: #24871 > ### Description > in the user profile page the `Packages` and `Projects` tab have small icons for user but other tabs have bigger profile picture with user info: > > ### Screenshots > ### **For Packages And Projects:** > ![image](https://user-images.githubusercontent.com/25511175/240148601-2420d77b-ba25-4718-9ccb-c5d0d95e3079.png) > > ### **For Other Tabs:** > ![image](https://user-images.githubusercontent.com/25511175/240148461-ce9636b3-fe11-4c46-a230-30d83eee5947.png) > ## Before ![image](https://github.com/go-gitea/gitea/assets/80308335/975ad038-07ca-4b10-b75d-ccf259be7b9d) ## After changes Project View <img width="1394" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/95d181d7-8e61-496d-9899-7b825c91ad56"> Packages View <img width="1378" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/7f5fd60f-6b18-4fa8-8c56-7b0d45d1a610"> ## Org view for projects page <img width="1385" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/6400dc89-a5ae-4f0a-831b-5b6efa020d89"> ## Org view for packages page <img width="1387" alt="image" src="https://github.com/go-gitea/gitea/assets/80308335/4e1e9ffe-1e4b-4334-8657-de11b5fd31d0"> --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: Giteabot <teabot@gitea.io> Co-authored-by: silverwind <me@silverwind.io>
116 lines
2.9 KiB
Go
116 lines
2.9 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package user
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
"code.gitea.io/gitea/modules/base"
|
|
"code.gitea.io/gitea/modules/context"
|
|
code_indexer "code.gitea.io/gitea/modules/indexer/code"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
shared_user "code.gitea.io/gitea/routers/web/shared/user"
|
|
)
|
|
|
|
const (
|
|
tplUserCode base.TplName = "user/code"
|
|
)
|
|
|
|
// CodeSearch render user/organization code search page
|
|
func CodeSearch(ctx *context.Context) {
|
|
if !setting.Indexer.RepoIndexerEnabled {
|
|
ctx.Redirect(ctx.ContextUser.HomeLink())
|
|
return
|
|
}
|
|
shared_user.PrepareContextForProfileBigAvatar(ctx)
|
|
shared_user.RenderUserHeader(ctx)
|
|
|
|
ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled
|
|
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
|
|
ctx.Data["Title"] = ctx.Tr("explore.code")
|
|
ctx.Data["ContextUser"] = ctx.ContextUser
|
|
|
|
language := ctx.FormTrim("l")
|
|
keyword := ctx.FormTrim("q")
|
|
|
|
queryType := ctx.FormTrim("t")
|
|
isMatch := queryType == "match"
|
|
|
|
ctx.Data["Keyword"] = keyword
|
|
ctx.Data["Language"] = language
|
|
ctx.Data["queryType"] = queryType
|
|
ctx.Data["IsCodePage"] = true
|
|
|
|
if keyword == "" {
|
|
ctx.HTML(http.StatusOK, tplUserCode)
|
|
return
|
|
}
|
|
|
|
var (
|
|
repoIDs []int64
|
|
err error
|
|
)
|
|
|
|
page := ctx.FormInt("page")
|
|
if page <= 0 {
|
|
page = 1
|
|
}
|
|
|
|
repoIDs, err = repo_model.FindUserCodeAccessibleOwnerRepoIDs(ctx, ctx.ContextUser.ID, ctx.Doer)
|
|
if err != nil {
|
|
ctx.ServerError("FindUserCodeAccessibleOwnerRepoIDs", err)
|
|
return
|
|
}
|
|
|
|
var (
|
|
total int
|
|
searchResults []*code_indexer.Result
|
|
searchResultLanguages []*code_indexer.SearchResultLanguages
|
|
)
|
|
|
|
if len(repoIDs) > 0 {
|
|
total, searchResults, searchResultLanguages, err = code_indexer.PerformSearch(ctx, repoIDs, language, keyword, page, setting.UI.RepoSearchPagingNum, isMatch)
|
|
if err != nil {
|
|
if code_indexer.IsAvailable(ctx) {
|
|
ctx.ServerError("SearchResults", err)
|
|
return
|
|
}
|
|
ctx.Data["CodeIndexerUnavailable"] = true
|
|
} else {
|
|
ctx.Data["CodeIndexerUnavailable"] = !code_indexer.IsAvailable(ctx)
|
|
}
|
|
|
|
loadRepoIDs := make([]int64, 0, len(searchResults))
|
|
for _, result := range searchResults {
|
|
var find bool
|
|
for _, id := range loadRepoIDs {
|
|
if id == result.RepoID {
|
|
find = true
|
|
break
|
|
}
|
|
}
|
|
if !find {
|
|
loadRepoIDs = append(loadRepoIDs, result.RepoID)
|
|
}
|
|
}
|
|
|
|
repoMaps, err := repo_model.GetRepositoriesMapByIDs(loadRepoIDs)
|
|
if err != nil {
|
|
ctx.ServerError("GetRepositoriesMapByIDs", err)
|
|
return
|
|
}
|
|
|
|
ctx.Data["RepoMaps"] = repoMaps
|
|
}
|
|
ctx.Data["SearchResults"] = searchResults
|
|
ctx.Data["SearchResultLanguages"] = searchResultLanguages
|
|
|
|
pager := context.NewPagination(total, setting.UI.RepoSearchPagingNum, page, 5)
|
|
pager.SetDefaultParams(ctx)
|
|
pager.AddParam(ctx, "l", "Language")
|
|
ctx.Data["Page"] = pager
|
|
|
|
ctx.HTML(http.StatusOK, tplUserCode)
|
|
}
|