mirror of
https://github.com/go-gitea/gitea
synced 2024-09-10 16:37:55 +02:00
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>
113 lines
4.1 KiB
Go
113 lines
4.1 KiB
Go
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package user
|
|
|
|
import (
|
|
"code.gitea.io/gitea/models/db"
|
|
"code.gitea.io/gitea/models/organization"
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/context"
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/log"
|
|
"code.gitea.io/gitea/modules/markup"
|
|
"code.gitea.io/gitea/modules/markup/markdown"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
)
|
|
|
|
// prepareContextForCommonProfile store some common data into context data for user's profile related pages (including the nav menu)
|
|
// It is designed to be fast and safe to be called multiple times in one request
|
|
func prepareContextForCommonProfile(ctx *context.Context) {
|
|
ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled
|
|
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
|
|
ctx.Data["ContextUser"] = ctx.ContextUser
|
|
ctx.Data["EnableFeed"] = setting.Other.EnableFeed
|
|
ctx.Data["FeedURL"] = ctx.ContextUser.HomeLink()
|
|
}
|
|
|
|
// PrepareContextForProfileBigAvatar set the context for big avatar view on the profile page
|
|
func PrepareContextForProfileBigAvatar(ctx *context.Context) {
|
|
prepareContextForCommonProfile(ctx)
|
|
|
|
ctx.Data["IsFollowing"] = ctx.Doer != nil && user_model.IsFollowing(ctx.Doer.ID, ctx.ContextUser.ID)
|
|
ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail && ctx.ContextUser.Email != "" && ctx.IsSigned && !ctx.ContextUser.KeepEmailPrivate
|
|
|
|
// Show OpenID URIs
|
|
openIDs, err := user_model.GetUserOpenIDs(ctx.ContextUser.ID)
|
|
if err != nil {
|
|
ctx.ServerError("GetUserOpenIDs", err)
|
|
return
|
|
}
|
|
ctx.Data["OpenIDs"] = openIDs
|
|
|
|
if len(ctx.ContextUser.Description) != 0 {
|
|
content, err := markdown.RenderString(&markup.RenderContext{
|
|
URLPrefix: ctx.Repo.RepoLink,
|
|
Metas: map[string]string{"mode": "document"},
|
|
GitRepo: ctx.Repo.GitRepo,
|
|
Ctx: ctx,
|
|
}, ctx.ContextUser.Description)
|
|
if err != nil {
|
|
ctx.ServerError("RenderString", err)
|
|
return
|
|
}
|
|
ctx.Data["RenderedDescription"] = content
|
|
}
|
|
|
|
showPrivate := ctx.IsSigned && (ctx.Doer.IsAdmin || ctx.Doer.ID == ctx.ContextUser.ID)
|
|
orgs, err := organization.FindOrgs(organization.FindOrgOptions{
|
|
UserID: ctx.ContextUser.ID,
|
|
IncludePrivate: showPrivate,
|
|
})
|
|
if err != nil {
|
|
ctx.ServerError("FindOrgs", err)
|
|
return
|
|
}
|
|
ctx.Data["Orgs"] = orgs
|
|
ctx.Data["HasOrgsVisible"] = organization.HasOrgsVisible(orgs, ctx.Doer)
|
|
|
|
badges, _, err := user_model.GetUserBadges(ctx, ctx.ContextUser)
|
|
if err != nil {
|
|
ctx.ServerError("GetUserBadges", err)
|
|
return
|
|
}
|
|
ctx.Data["Badges"] = badges
|
|
|
|
// in case the numbers are already provided by other functions, no need to query again (which is slow)
|
|
if _, ok := ctx.Data["NumFollowers"]; !ok {
|
|
_, ctx.Data["NumFollowers"], _ = user_model.GetUserFollowers(ctx, ctx.ContextUser, ctx.Doer, db.ListOptions{PageSize: 1, Page: 1})
|
|
}
|
|
if _, ok := ctx.Data["NumFollowing"]; !ok {
|
|
_, ctx.Data["NumFollowing"], _ = user_model.GetUserFollowing(ctx, ctx.ContextUser, ctx.Doer, db.ListOptions{PageSize: 1, Page: 1})
|
|
}
|
|
}
|
|
|
|
func FindUserProfileReadme(ctx *context.Context) (profileGitRepo *git.Repository, profileReadmeBlob *git.Blob, profileClose func()) {
|
|
profileDbRepo, err := repo_model.GetRepositoryByName(ctx.ContextUser.ID, ".profile")
|
|
if err == nil && !profileDbRepo.IsEmpty {
|
|
if profileGitRepo, err = git.OpenRepository(ctx, profileDbRepo.RepoPath()); err != nil {
|
|
log.Error("FindUserProfileReadme failed to OpenRepository: %v", err)
|
|
} else {
|
|
if commit, err := profileGitRepo.GetBranchCommit(profileDbRepo.DefaultBranch); err != nil {
|
|
log.Error("FindUserProfileReadme failed to GetBranchCommit: %v", err)
|
|
} else {
|
|
profileReadmeBlob, _ = commit.GetBlobByPath("README.md")
|
|
}
|
|
}
|
|
}
|
|
return profileGitRepo, profileReadmeBlob, func() {
|
|
if profileGitRepo != nil {
|
|
_ = profileGitRepo.Close()
|
|
}
|
|
}
|
|
}
|
|
|
|
func RenderUserHeader(ctx *context.Context) {
|
|
prepareContextForCommonProfile(ctx)
|
|
|
|
_, profileReadmeBlob, profileClose := FindUserProfileReadme(ctx)
|
|
defer profileClose()
|
|
ctx.Data["HasProfileReadme"] = profileReadmeBlob != nil
|
|
}
|