From 095c30ce15797f79839f65997e65c3d0265fd6a6 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Tue, 6 Jun 2023 23:34:52 +0530 Subject: [PATCH 1/7] Fix ::User Profile Page - Project/Packages Tabs Have Inconsistent Layout and Style --- routers/web/org/projects.go | 1 + routers/web/shared/user/header.go | 90 ++++++++++++ routers/web/user/package.go | 1 + templates/org/projects/list.tmpl | 25 +++- templates/package/shared/list.tmpl | 6 +- templates/package/shared/versionlist.tmpl | 4 +- templates/projects/list.tmpl | 2 +- templates/shared/user/profile_big_avatar.tmpl | 135 ++++++++++++++++++ templates/user/overview/header.tmpl | 22 +-- templates/user/overview/package_versions.tmpl | 25 +++- templates/user/overview/packages.tmpl | 26 +++- templates/user/profile.tmpl | 117 +-------------- web_src/css/user.css | 9 ++ 13 files changed, 308 insertions(+), 155 deletions(-) create mode 100644 templates/shared/user/profile_big_avatar.tmpl diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go index b3f6024b60606..9cb3f93db152c 100644 --- a/routers/web/org/projects.go +++ b/routers/web/org/projects.go @@ -41,6 +41,7 @@ func MustEnableProjects(ctx *context.Context) { // Projects renders the home page of projects func Projects(ctx *context.Context) { + shared_user.RenderProfileBigAvatar(ctx) ctx.Data["Title"] = ctx.Tr("repo.project_board") sortType := ctx.FormTrim("sort") diff --git a/routers/web/shared/user/header.go b/routers/web/shared/user/header.go index 9594e6975a8ef..d76a24120259c 100644 --- a/routers/web/shared/user/header.go +++ b/routers/web/shared/user/header.go @@ -4,12 +4,102 @@ package user import ( + "fmt" + + "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/markup" + "code.gitea.io/gitea/modules/markup/markdown" "code.gitea.io/gitea/modules/setting" ) +// RenderProfileBigAvatar set the context for big avatar view on repo +func RenderProfileBigAvatar(ctx *context.Context) { + // check view permissions + if !user_model.IsUserVisibleToViewer(ctx, ctx.ContextUser, ctx.Doer) { + ctx.NotFound("user", fmt.Errorf(ctx.ContextUser.Name)) + return + } + + // advertise feed via meta tag + ctx.Data["FeedURL"] = ctx.ContextUser.HomeLink() + + // Show OpenID URIs + openIDs, err := user_model.GetUserOpenIDs(ctx.ContextUser.ID) + if err != nil { + ctx.ServerError("GetUserOpenIDs", err) + return + } + + var isFollowing bool + if ctx.Doer != nil { + isFollowing = user_model.IsFollowing(ctx.Doer.ID, ctx.ContextUser.ID) + } + + ctx.Data["ContextUser"] = ctx.ContextUser + ctx.Data["OpenIDs"] = openIDs + ctx.Data["IsFollowing"] = isFollowing + + 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 + + pagingNum := setting.UI.User.RepoPagingNum + page := ctx.FormInt("page") + _, numFollowers, err := user_model.GetUserFollowers(ctx, ctx.ContextUser, ctx.Doer, db.ListOptions{ + PageSize: pagingNum, + Page: page, + }) + if err != nil { + ctx.ServerError("GetUserFollowers", err) + return + } + ctx.Data["NumFollowers"] = numFollowers + _, numFollowing, err := user_model.GetUserFollowing(ctx, ctx.ContextUser, ctx.Doer, db.ListOptions{ + PageSize: pagingNum, + Page: page, + }) + if err != nil { + ctx.ServerError("GetUserFollowing", err) + return + } + ctx.Data["NumFollowing"] = numFollowing + ctx.Data["ShowUserEmail"] = setting.UI.ShowUserEmail && ctx.ContextUser.Email != "" && ctx.IsSigned && !ctx.ContextUser.KeepEmailPrivate + ctx.Data["EnableFeed"] = setting.Other.EnableFeed +} + func RenderUserHeader(ctx *context.Context) { ctx.Data["IsProjectEnabled"] = true ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled diff --git a/routers/web/user/package.go b/routers/web/user/package.go index 81a26da827283..2ef12c6f56cb7 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -36,6 +36,7 @@ const ( // ListPackages displays a list of all packages of the context user func ListPackages(ctx *context.Context) { + shared_user.RenderProfileBigAvatar(ctx) page := ctx.FormInt("page") if page <= 1 { page = 1 diff --git a/templates/org/projects/list.tmpl b/templates/org/projects/list.tmpl index 1f113b28c84c9..dcf11f345d88f 100644 --- a/templates/org/projects/list.tmpl +++ b/templates/org/projects/list.tmpl @@ -1,6 +1,23 @@ {{template "base/head" .}} -
- {{template "user/overview/header" .}} - {{template "projects/list" .}} -
+{{if .ContextUser.IsOrganization}} +
+ {{template "shared/user/profile_big_avatar" .}} + {{template "user/overview/header" .}} + {{template "projects/list" .}} +
+{{else}} +
+
+
+
+ {{template "shared/user/profile_big_avatar" .}} +
+
+ {{template "user/overview/header" .}} + {{template "projects/list" .}} +
+
+
+
+{{end}} {{template "base/footer" .}} diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 707fbe357fbb8..907c582dc5f22 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -1,6 +1,6 @@ -
+
{{template "base/alert" .}} -
+
- +
+ + {{svg "octicon-x" 14 "remove icon"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
{{.locale.Tr "packages.filter.type"}}
+
+ {{range $type := .AvailableTypes}} +
+ {{$type.Name}} +
+ {{end}} +
+
From 91906db03d0fb86f24d6e0929f18de0c1aac0858 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Wed, 7 Jun 2023 12:29:34 +0530 Subject: [PATCH 3/7] Code tab fix for profile avatar --- routers/web/user/code.go | 5 +- templates/shared/user/profile_big_avatar.tmpl | 2 +- templates/user/code.tmpl | 74 ++++++++++++++----- templates/user/overview/header.tmpl | 2 +- web_src/css/user.css | 3 +- 5 files changed, 60 insertions(+), 26 deletions(-) diff --git a/routers/web/user/code.go b/routers/web/user/code.go index b3adbcb8d3a8f..11ce6f4cd1cd7 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -11,6 +11,7 @@ import ( "code.gitea.io/gitea/modules/context" code_indexer "code.gitea.io/gitea/modules/indexer/code" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/routers/web/shared/user" ) const ( @@ -19,17 +20,15 @@ const ( // CodeSearch render user/organization code search page func CodeSearch(ctx *context.Context) { + user.RenderProfileBigAvatar(ctx) if !setting.Indexer.RepoIndexerEnabled { ctx.Redirect(ctx.ContextUser.HomeLink()) return } - - ctx.Data["IsProjectEnabled"] = true 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") diff --git a/templates/shared/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl index e2ac20f2bb98a..2950f63daabe3 100644 --- a/templates/shared/user/profile_big_avatar.tmpl +++ b/templates/shared/user/profile_big_avatar.tmpl @@ -1,4 +1,4 @@ -{{if .ContextUser.IsOrganization}} +{{if .ContextUser.IsOrganization }} {{with .ContextUser}}
diff --git a/templates/user/code.tmpl b/templates/user/code.tmpl index 338aae2be169f..9a4dc2112b277 100644 --- a/templates/user/code.tmpl +++ b/templates/user/code.tmpl @@ -1,25 +1,59 @@ {{template "base/head" .}} -
- {{template "user/overview/header" .}} -
- {{template "code/searchform" .}} -
-
- {{if .CodeIndexerUnavailable}} -
-

{{$.locale.Tr "explore.code_search_unavailable"}}

+{{if .ContextUser.IsOrganization}} +
+ {{template "shared/user/profile_big_avatar" .}} + {{template "user/overview/header" .}} +
+ {{template "code/searchform" .}} +
+
+ {{if .CodeIndexerUnavailable}} +
+

{{$.locale.Tr "explore.code_search_unavailable"}}

+
+ {{else if .SearchResults}} +

+ {{.locale.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html}} +

+ {{template "code/searchresults" .}} + {{else if .Keyword}} +
{{$.locale.Tr "explore.code_no_results"}}
+ {{end}} +
+ {{template "base/paginate" .}} +
+
+{{else}} +
+
+
+
+ {{template "shared/user/profile_big_avatar" .}} +
+
+ {{template "user/overview/header" .}} +
+ {{template "code/searchform" .}} +
+
+ {{if .CodeIndexerUnavailable}} +
+

{{$.locale.Tr "explore.code_search_unavailable"}}

+
+ {{else if .SearchResults}} +

+ {{.locale.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html}} +

+ {{template "code/searchresults" .}} + {{else if .Keyword}} +
{{$.locale.Tr "explore.code_no_results"}}
+ {{end}} +
+ {{template "base/paginate" .}} +
- {{else if .SearchResults}} -

- {{.locale.Tr "explore.code_search_results" (.Keyword|Escape) | Str2html}} -

- {{template "code/searchresults" .}} - {{else if .Keyword}} -
{{$.locale.Tr "explore.code_no_results"}}
- {{end}} +
- - {{template "base/paginate" .}}
-
+{{end}} {{template "base/footer" .}} diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index f1c167172b778..4f2fc24417667 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -1,4 +1,4 @@ -
+
{{if .ProfileReadme}} diff --git a/web_src/css/user.css b/web_src/css/user.css index ae4d9945ebbc4..46e38bba0de00 100644 --- a/web_src/css/user.css +++ b/web_src/css/user.css @@ -69,7 +69,8 @@ padding-bottom: 100px; } -.user.profile.packages .search-input { +.user.profile.packages .search-input, +.user.profile .code-search { margin-top: 15px; } From ee7b36d0fbdcccc8bc89b77ac51f6b6959c05db7 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Wed, 7 Jun 2023 12:31:59 +0530 Subject: [PATCH 4/7] Fixing linting issues in template --- templates/shared/user/profile_big_avatar.tmpl | 2 +- templates/user/overview/header.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/shared/user/profile_big_avatar.tmpl b/templates/shared/user/profile_big_avatar.tmpl index 2950f63daabe3..e2ac20f2bb98a 100644 --- a/templates/shared/user/profile_big_avatar.tmpl +++ b/templates/shared/user/profile_big_avatar.tmpl @@ -1,4 +1,4 @@ -{{if .ContextUser.IsOrganization }} +{{if .ContextUser.IsOrganization}} {{with .ContextUser}}
diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 4f2fc24417667..881932f53c31f 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -1,4 +1,4 @@ -
+
{{if .ProfileReadme}} From 75f9726d09061f78895ccaecaa1506f32a0ff0c8 Mon Sep 17 00:00:00 2001 From: puni9869 Date: Wed, 7 Jun 2023 19:54:06 +0530 Subject: [PATCH 5/7] Fixing header ctx key --- templates/user/overview/header.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 881932f53c31f..46831d15a71d8 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -1,4 +1,4 @@ -
+
{{if .ProfileReadme}} From cc79ebaec5a054a3c58fdf21b52c79c641833ce7 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 8 Jun 2023 12:01:17 +0200 Subject: [PATCH 6/7] fix all value in package search dropdown --- templates/package/shared/list.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 123f7b0fd3a8e..f1e001552f56c 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -3,12 +3,12 @@
-
- - {{svg "octicon-x" 14 "remove icon"}} +
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{.locale.Tr "packages.filter.type"}}
+
{{.locale.Tr "packages.filter.type.all"}}
{{range $type := .AvailableTypes}}
{{$type.Name}} From b887c71dba26374f6c0bdb45942ee4064f3170db Mon Sep 17 00:00:00 2001 From: puni9869 Date: Thu, 8 Jun 2023 22:58:58 +0530 Subject: [PATCH 7/7] Making visible project tab when we are on code tab --- routers/web/user/code.go | 2 +- templates/user/overview/header.tmpl | 2 +- templates/user/profile.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/routers/web/user/code.go b/routers/web/user/code.go index 11ce6f4cd1cd7..5a97d6c79a573 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -25,6 +25,7 @@ func CodeSearch(ctx *context.Context) { ctx.Redirect(ctx.ContextUser.HomeLink()) return } + ctx.Data["IsProjectEnabled"] = true ctx.Data["IsPackageEnabled"] = setting.Packages.Enabled ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled ctx.Data["Title"] = ctx.Tr("explore.code") @@ -108,6 +109,5 @@ func CodeSearch(ctx *context.Context) { pager.SetDefaultParams(ctx) pager.AddParam(ctx, "l", "Language") ctx.Data["Page"] = pager - ctx.HTML(http.StatusOK, tplUserCode) } diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 46831d15a71d8..fe1dfb506751e 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -1,4 +1,4 @@ -
+
{{if .ProfileReadme}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 3b5fa6375b635..30bd23dd883e9 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -6,7 +6,7 @@ {{template "shared/user/profile_big_avatar" .}}
-
+
{{template "user/overview/header" .}}