From 515a6da7087345481b608a7c85324e0cf67280fe Mon Sep 17 00:00:00 2001 From: hazycora Date: Mon, 18 Sep 2023 21:12:26 -0500 Subject: [PATCH 1/9] Add .profile README to organization pages --- routers/web/org/home.go | 44 ++++++++++++++++++++++++++++++++++++-- routers/web/org/members.go | 2 ++ routers/web/org/teams.go | 5 +++++ templates/org/home.tmpl | 10 ++++++--- templates/org/menu.tmpl | 7 +++++- 5 files changed, 62 insertions(+), 6 deletions(-) diff --git a/routers/web/org/home.go b/routers/web/org/home.go index ec866eb6b3ba1..08a39ea1b2ea0 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -13,6 +13,8 @@ import ( user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "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" @@ -56,6 +58,45 @@ func Home(ctx *context.Context) { ctx.Data["RenderedDescription"] = desc } + profileGitRepo, profileReadmeBlob, profileClose := shared_user.FindUserProfileReadme(ctx) + defer profileClose() + ctx.Data["HasProfileReadme"] = profileReadmeBlob != nil + + PrepareOrgProfileTabData(ctx, profileGitRepo, profileReadmeBlob) + + ctx.HTML(http.StatusOK, tplOrgHome) +} + +func PrepareOrgProfileTabData(ctx *context.Context, profileGitRepo *git.Repository, profileReadme *git.Blob) { + org := ctx.Org.Organization + + tab := ctx.FormString("tab") + if tab == "" || tab == "overview" { + if profileReadme != nil { + tab = "overview" + } else { + tab = "repositories" + } + } + ctx.Data["TabName"] = tab + + switch tab { + case "overview": + if bytes, err := profileReadme.GetBlobContent(setting.UI.MaxDisplayFileSize); err != nil { + log.Error("failed to GetBlobContent: %v", err) + } else { + if profileContent, err := markdown.RenderString(&markup.RenderContext{ + Ctx: ctx, + GitRepo: profileGitRepo, + Metas: map[string]string{"mode": "document"}, + }, bytes); err != nil { + log.Error("failed to RenderString: %v", err) + } else { + ctx.Data["ProfileReadme"] = profileContent + } + } + } + var orderBy db.SearchOrderBy ctx.Data["SortType"] = ctx.FormString("sort") switch ctx.FormString("sort") { @@ -151,9 +192,8 @@ func Home(ctx *context.Context) { pager := context.NewPagination(int(count), setting.UI.User.RepoPagingNum, page, 5) pager.SetDefaultParams(ctx) pager.AddParam(ctx, "language", "Language") + pager.AddParam(ctx, "tab", "TabName") ctx.Data["Page"] = pager ctx.Data["ShowMemberAndTeamTab"] = ctx.Org.IsMember || len(members) > 0 - - ctx.HTML(http.StatusOK, tplOrgHome) } diff --git a/routers/web/org/members.go b/routers/web/org/members.go index 34cff05ea0b92..a973377541319 100644 --- a/routers/web/org/members.go +++ b/routers/web/org/members.go @@ -73,6 +73,8 @@ func Members(ctx *context.Context) { ctx.Data["MembersIsUserOrgOwner"] = organization.IsUserOrgOwner(members, org.ID) ctx.Data["MembersTwoFaStatus"] = members.GetTwoFaStatus(ctx) + shared_user.RenderUserHeader(ctx) + ctx.HTML(http.StatusOK, tplMembers) } diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index dfb87b28f8987..4393fcc51ffdc 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -65,6 +65,7 @@ func Teams(ctx *context.Context) { return } + shared_user.RenderUserHeader(ctx) ctx.HTML(http.StatusOK, tplTeams) } @@ -276,6 +277,7 @@ func NewTeam(ctx *context.Context) { ctx.Data["PageIsOrgTeamsNew"] = true ctx.Data["Team"] = &org_model.Team{} ctx.Data["Units"] = unit_model.Units + shared_user.RenderUserHeader(ctx) ctx.HTML(http.StatusOK, tplTeamNew) } @@ -341,6 +343,7 @@ func NewTeamPost(ctx *context.Context) { ctx.Data["PageIsOrgTeamsNew"] = true ctx.Data["Units"] = unit_model.Units ctx.Data["Team"] = t + shared_user.RenderUserHeader(ctx) if ctx.HasError() { ctx.HTML(http.StatusOK, tplTeamNew) @@ -391,6 +394,7 @@ func TeamMembers(ctx *context.Context) { ctx.Data["Invites"] = invites ctx.Data["IsEmailInviteEnabled"] = setting.MailService != nil + shared_user.RenderUserHeader(ctx) ctx.HTML(http.StatusOK, tplTeamMembers) } @@ -410,6 +414,7 @@ func TeamRepositories(ctx *context.Context) { return } ctx.Data["Units"] = unit_model.Units + shared_user.RenderUserHeader(ctx) ctx.HTML(http.StatusOK, tplTeamRepositories) } diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 18d5282a31315..5b2ee36e0789e 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -38,9 +38,13 @@
- {{template "explore/repo_search" .}} - {{template "explore/repo_list" .}} - {{template "base/paginate" .}} + {{if or (not .ProfileReadme) (eq .TabName "repositories")}} + {{template "explore/repo_search" .}} + {{template "explore/repo_list" .}} + {{template "base/paginate" .}} + {{else}} +
{{$.ProfileReadme|Str2html}}
+ {{end}}
{{if .ShowMemberAndTeamTab}} diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index 26c9f980a5a11..20e3644c8b57d 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -1,6 +1,11 @@
- + {{if .HasProfileReadme}} + + {{svg "octicon-info"}} {{.locale.Tr "user.overview"}} + + {{end}} + {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} {{if .RepoCount}}
{{.RepoCount}}
From 2272f9ac3a66ce90b2c8180c06ec0f931e7f25a5 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 19 Sep 2023 20:02:28 -0400 Subject: [PATCH 2/9] Update templates/org/menu.tmpl --- templates/org/menu.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index 20e3644c8b57d..e337529a6dbac 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -1,7 +1,7 @@
{{if .HasProfileReadme}} - + {{svg "octicon-info"}} {{.locale.Tr "user.overview"}} {{end}} From 920ae8495edd08a6d4b14bb0b1cf9cdb1a086b7f Mon Sep 17 00:00:00 2001 From: hazycora Date: Wed, 20 Sep 2023 18:50:21 -0500 Subject: [PATCH 3/9] overhaul overview pages --- routers/web/org/home.go | 30 +++++------ routers/web/user/profile.go | 71 ++++++++++++++++++++------ templates/explore/repo_grid.tmpl | 79 +++++++++++++++++++++++++++++ templates/org/home.tmpl | 8 ++- templates/org/menu.tmpl | 6 +-- templates/user/overview/header.tmpl | 2 - templates/user/profile.tmpl | 9 +++- web_src/css/index.css | 1 + web_src/css/shared/grid-list.css | 63 +++++++++++++++++++++++ 9 files changed, 228 insertions(+), 41 deletions(-) create mode 100644 templates/explore/repo_grid.tmpl create mode 100644 web_src/css/shared/grid-list.css diff --git a/routers/web/org/home.go b/routers/web/org/home.go index 08a39ea1b2ea0..68a28cdcd04c5 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -71,28 +71,26 @@ func PrepareOrgProfileTabData(ctx *context.Context, profileGitRepo *git.Reposito org := ctx.Org.Organization tab := ctx.FormString("tab") - if tab == "" || tab == "overview" { - if profileReadme != nil { - tab = "overview" - } else { - tab = "repositories" - } + if tab == "" { + tab = "overview" } ctx.Data["TabName"] = tab switch tab { case "overview": - if bytes, err := profileReadme.GetBlobContent(setting.UI.MaxDisplayFileSize); err != nil { - log.Error("failed to GetBlobContent: %v", err) - } else { - if profileContent, err := markdown.RenderString(&markup.RenderContext{ - Ctx: ctx, - GitRepo: profileGitRepo, - Metas: map[string]string{"mode": "document"}, - }, bytes); err != nil { - log.Error("failed to RenderString: %v", err) + if profileReadme != nil { + if bytes, err := profileReadme.GetBlobContent(setting.UI.MaxDisplayFileSize); err != nil { + log.Error("failed to GetBlobContent: %v", err) } else { - ctx.Data["ProfileReadme"] = profileContent + if profileContent, err := markdown.RenderString(&markup.RenderContext{ + Ctx: ctx, + GitRepo: profileGitRepo, + Metas: map[string]string{"mode": "document"}, + }, bytes); err != nil { + log.Error("failed to RenderString: %v", err) + } else { + ctx.Data["ProfileReadme"] = profileContent + } } } } diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index d9a0124020c12..4e77e9179b15a 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -79,12 +79,8 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGi // if there is a profile readme, default to "overview" page, otherwise, default to "repositories" page // if there is not a profile readme, the overview tab should be treated as the repositories tab tab := ctx.FormString("tab") - if tab == "" || tab == "overview" { - if profileReadme != nil { - tab = "overview" - } else { - tab = "repositories" - } + if tab == "" { + tab = "overview" } ctx.Data["TabName"] = tab ctx.Data["HasProfileReadme"] = profileReadme != nil @@ -231,18 +227,61 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGi total = int(count) case "overview": - if bytes, err := profileReadme.GetBlobContent(setting.UI.MaxDisplayFileSize); err != nil { - log.Error("failed to GetBlobContent: %v", err) - } else { - if profileContent, err := markdown.RenderString(&markup.RenderContext{ - Ctx: ctx, - GitRepo: profileGitRepo, - Metas: map[string]string{"mode": "document"}, - }, bytes); err != nil { - log.Error("failed to RenderString: %v", err) + date := "" + items, _, err := activities_model.GetFeeds(ctx, activities_model.GetFeedsOptions{ + ListOptions: db.ListOptions{ + PageSize: pagingNum, + Page: page, + }, + Actor: ctx.Doer, + RequestedUser: ctx.ContextUser, + IncludePrivate: showPrivate, + OnlyPerformedBy: true, + IncludeDeleted: false, + Date: date, + }) + if err != nil { + ctx.ServerError("GetFeeds", err) + return + } + ctx.Data["Feeds"] = items + ctx.Data["Date"] = date + repos, _, err = repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{ + ListOptions: db.ListOptions{ + PageSize: 8, + Page: 0, + }, + Actor: ctx.Doer, + Keyword: keyword, + OwnerID: ctx.ContextUser.ID, + OrderBy: db.SearchOrderByStars, + Private: ctx.IsSigned, + Collaborate: util.OptionalBoolFalse, + TopicOnly: topicOnly, + Language: language, + IncludeDescription: setting.UI.SearchRepoDescription, + }) + if err != nil { + ctx.ServerError("SearchRepository", err) + return + } + if profileReadme != nil { + ctx.Data["HasProfileReadme"] = true + if bytes, err := profileReadme.GetBlobContent(setting.UI.MaxDisplayFileSize); err != nil { + log.Error("failed to GetBlobContent: %v", err) } else { - ctx.Data["ProfileReadme"] = profileContent + if profileContent, err := markdown.RenderString(&markup.RenderContext{ + Ctx: ctx, + GitRepo: profileGitRepo, + Metas: map[string]string{"mode": "document"}, + }, bytes); err != nil { + log.Error("failed to RenderString: %v", err) + } else { + ctx.Data["ProfileReadme"] = profileContent + } } + } else { + ctx.Data["HasProfileReadme"] = false } default: // default to "repositories" repos, count, err = repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{ diff --git a/templates/explore/repo_grid.tmpl b/templates/explore/repo_grid.tmpl new file mode 100644 index 0000000000000..57a2d10801f28 --- /dev/null +++ b/templates/explore/repo_grid.tmpl @@ -0,0 +1,79 @@ +
+ {{range .Repos}} +
+
+
+
+ {{if $.IsPrivate}} + {{svg "octicon-lock" 16}} + {{else if $.IsMirror}} + {{svg "octicon-mirror" 16}} + {{else if $.IsFork}} + {{svg "octicon-repo-forked" 16}} + {{else}} + {{svg "octicon-repo" 16}} + {{end}} + + {{if or $.PageIsExplore $.PageIsProfileStarList}}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} + + + {{if .IsArchived}} + {{$.locale.Tr "repo.desc.archived"}} + {{end}} + {{if .IsTemplate}} + {{if .IsPrivate}} + {{$.locale.Tr "repo.desc.private_template"}} + {{else}} + {{if .Owner.Visibility.IsPrivate}} + {{$.locale.Tr "repo.desc.internal_template"}} + {{end}} + {{end}} + {{else}} + {{if .IsPrivate}} + {{$.locale.Tr "repo.desc.private"}} + {{else}} + {{if .Owner.Visibility.IsPrivate}} + {{$.locale.Tr "repo.desc.internal"}} + {{end}} + {{end}} + {{end}} + + {{if .IsFork}} + {{svg "octicon-repo-forked"}} + {{else if .IsMirror}} + {{svg "octicon-mirror"}} + {{end}} +
+
+ {{$description := .DescriptionHTML $.Context}} + {{if $description}} +
{{$description}}
+ {{end}} + {{if .Topics}} +
+ {{range .Topics}} + {{if ne . ""}}{{.}}{{end}} + {{end}} +
+ {{end}} +
+
+
+ {{if .PrimaryLanguage}} + + {{.PrimaryLanguage.Language}} + + {{end}} + {{if not $.DisableStars}} + {{svg "octicon-star" 16}}{{.NumStars}} + {{end}} + {{svg "octicon-git-branch" 16}}{{.NumForks}} +
+
+
+ {{else}} +
+ {{$.locale.Tr "explore.repo_no_results"}} +
+ {{end}} +
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 5b2ee36e0789e..24a3465567f67 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -38,12 +38,16 @@
- {{if or (not .ProfileReadme) (eq .TabName "repositories")}} + {{if eq .TabName "repositories"}} {{template "explore/repo_search" .}} {{template "explore/repo_list" .}} {{template "base/paginate" .}} {{else}} -
{{$.ProfileReadme|Str2html}}
+ {{if .ProfileReadme}} +
{{$.ProfileReadme|Str2html}}
+
+ {{end}} + {{template "explore/repo_grid" .}} {{end}}
diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index e337529a6dbac..4482be10fde06 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -1,10 +1,8 @@
- {{if .HasProfileReadme}} - {{svg "octicon-info"}} {{.locale.Tr "user.overview"}} - - {{end}} + {{svg "octicon-info"}} {{.locale.Tr "user.overview"}} + {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} {{if .RepoCount}} diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 895f1efb38ca3..d5025d4ff1961 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -1,9 +1,7 @@
- {{if .HasProfileReadme}} {{svg "octicon-info"}} {{.locale.Tr "user.overview"}} - {{end}} {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} {{if .RepoCount}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 2b81a23492876..80eda91222e2f 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -29,7 +29,14 @@ {{else if eq .TabName "followers"}} {{template "repo/user_cards" .}} {{else if eq .TabName "overview"}} -
{{.ProfileReadme | Str2html}}
+ {{if .HasProfileReadme}} +
{{.ProfileReadme | Str2html}}
+
+ {{end}} + {{template "explore/repo_grid" .}} +
+ {{template "user/heatmap" .}} + {{template "user/dashboard/feeds" .}} {{else}} {{template "explore/repo_search" .}} {{template "explore/repo_list" .}} diff --git a/web_src/css/index.css b/web_src/css/index.css index d399f073d557f..6dca751c9850b 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -14,6 +14,7 @@ @import "./modules/flexcontainer.css"; @import "./shared/flex-list.css"; +@import "./shared/grid-list.css"; @import "./shared/milestone.css"; @import "./shared/repoorg.css"; @import "./shared/settings.css"; diff --git a/web_src/css/shared/grid-list.css b/web_src/css/shared/grid-list.css new file mode 100644 index 0000000000000..779e866a9af29 --- /dev/null +++ b/web_src/css/shared/grid-list.css @@ -0,0 +1,63 @@ +.grid-list { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(18rem, 1fr)); + gap: 1rem; +} + +.grid-item { + border-radius: 0.5rem; + padding: 1em; + display: grid; + gap: 8px; + align-items: flex-start; + border: 1px solid var(--color-secondary); + grid-template-rows: 1fr min-content; +} + +.grid-item .grid-item-main { + display: grid; + gap: 4px; +} + +.grid-item .grid-item-header { + display: flex; + gap: 0.25rem; + justify-content: space-between; + flex-wrap: wrap; +} + +.grid-item .grid-item-title { + display: inline-flex; + flex-wrap: wrap; + align-items: center; + gap: .25rem; + max-width: 100%; + color: var(--color-text); + font-size: 16px; + font-weight: var(--font-weight-semibold); + word-break: break-word; + min-width: 0; +} + +.grid-item .grid-item-body { + font-size: 13px; + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 0.25rem; + color: var(--color-text-light-2); + word-break: break-word; +} + +.grid-item .grid-item-footer { + grid-column: 1 / -1; +} + +.grid-item .grid-item-trailing { + display: flex; + gap: 0.5rem; + align-items: center; + flex-grow: 0; + flex-wrap: wrap; + justify-content: end; +} \ No newline at end of file From 1ba8c192e298bbfc722e00f1302031e6710c0f82 Mon Sep 17 00:00:00 2001 From: hazycora Date: Wed, 20 Sep 2023 18:59:27 -0500 Subject: [PATCH 4/9] refactor organization home route --- routers/web/org/home.go | 146 +++++++++++++++++++++++----------------- 1 file changed, 83 insertions(+), 63 deletions(-) diff --git a/routers/web/org/home.go b/routers/web/org/home.go index 68a28cdcd04c5..e3d679154abda 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -76,6 +76,14 @@ func PrepareOrgProfileTabData(ctx *context.Context, profileGitRepo *git.Reposito } ctx.Data["TabName"] = tab + var ( + page int + count int64 + ) + + language := ctx.FormTrim("language") + ctx.Data["Language"] = language + switch tab { case "overview": if profileReadme != nil { @@ -93,68 +101,83 @@ func PrepareOrgProfileTabData(ctx *context.Context, profileGitRepo *git.Reposito } } } - } - - var orderBy db.SearchOrderBy - ctx.Data["SortType"] = ctx.FormString("sort") - switch ctx.FormString("sort") { - case "newest": - orderBy = db.SearchOrderByNewest - case "oldest": - orderBy = db.SearchOrderByOldest - case "recentupdate": - orderBy = db.SearchOrderByRecentUpdated - case "leastupdate": - orderBy = db.SearchOrderByLeastUpdated - case "reversealphabetically": - orderBy = db.SearchOrderByAlphabeticallyReverse - case "alphabetically": - orderBy = db.SearchOrderByAlphabetically - case "moststars": - orderBy = db.SearchOrderByStarsReverse - case "feweststars": - orderBy = db.SearchOrderByStars - case "mostforks": - orderBy = db.SearchOrderByForksReverse - case "fewestforks": - orderBy = db.SearchOrderByForks - default: - ctx.Data["SortType"] = "recentupdate" - orderBy = db.SearchOrderByRecentUpdated - } - - keyword := ctx.FormTrim("q") - ctx.Data["Keyword"] = keyword - - language := ctx.FormTrim("language") - ctx.Data["Language"] = language + repos, _, err := repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{ + ListOptions: db.ListOptions{ + PageSize: 6, + Page: 0, + }, + Keyword: "", + OwnerID: org.ID, + OrderBy: db.SearchOrderByStars, + Private: ctx.IsSigned, + Actor: ctx.Doer, + Language: language, + IncludeDescription: setting.UI.SearchRepoDescription, + }) + if err != nil { + ctx.ServerError("SearchRepository", err) + return + } + ctx.Data["Repos"] = repos + case "repositories": + var orderBy db.SearchOrderBy + ctx.Data["SortType"] = ctx.FormString("sort") + switch ctx.FormString("sort") { + case "newest": + orderBy = db.SearchOrderByNewest + case "oldest": + orderBy = db.SearchOrderByOldest + case "recentupdate": + orderBy = db.SearchOrderByRecentUpdated + case "leastupdate": + orderBy = db.SearchOrderByLeastUpdated + case "reversealphabetically": + orderBy = db.SearchOrderByAlphabeticallyReverse + case "alphabetically": + orderBy = db.SearchOrderByAlphabetically + case "moststars": + orderBy = db.SearchOrderByStarsReverse + case "feweststars": + orderBy = db.SearchOrderByStars + case "mostforks": + orderBy = db.SearchOrderByForksReverse + case "fewestforks": + orderBy = db.SearchOrderByForks + default: + ctx.Data["SortType"] = "recentupdate" + orderBy = db.SearchOrderByRecentUpdated + } - page := ctx.FormInt("page") - if page <= 0 { - page = 1 - } + keyword := ctx.FormTrim("q") + ctx.Data["Keyword"] = keyword - var ( - repos []*repo_model.Repository - count int64 - err error - ) - repos, count, err = repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{ - ListOptions: db.ListOptions{ - PageSize: setting.UI.User.RepoPagingNum, - Page: page, - }, - Keyword: keyword, - OwnerID: org.ID, - OrderBy: orderBy, - Private: ctx.IsSigned, - Actor: ctx.Doer, - Language: language, - IncludeDescription: setting.UI.SearchRepoDescription, - }) - if err != nil { - ctx.ServerError("SearchRepository", err) - return + page := ctx.FormInt("page") + if page <= 0 { + page = 1 + } + var ( + repos []*repo_model.Repository + err error + ) + repos, count, err = repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{ + ListOptions: db.ListOptions{ + PageSize: setting.UI.User.RepoPagingNum, + Page: page, + }, + Keyword: keyword, + OwnerID: org.ID, + OrderBy: orderBy, + Private: ctx.IsSigned, + Actor: ctx.Doer, + Language: language, + IncludeDescription: setting.UI.SearchRepoDescription, + }) + if err != nil { + ctx.ServerError("SearchRepository", err) + return + } + ctx.Data["Repos"] = repos + ctx.Data["Total"] = count } opts := &organization.FindOrgMembersOpts{ @@ -172,9 +195,6 @@ func PrepareOrgProfileTabData(ctx *context.Context, profileGitRepo *git.Reposito if ctx.Doer != nil { isFollowing = user_model.IsFollowing(ctx, ctx.Doer.ID, ctx.ContextUser.ID) } - - ctx.Data["Repos"] = repos - ctx.Data["Total"] = count ctx.Data["Members"] = members ctx.Data["Teams"] = ctx.Org.Teams ctx.Data["DisableNewPullMirrors"] = setting.Mirror.DisableNewPull From 9d0508257b18b6d19e55e808c5ebb0994ddfe98d Mon Sep 17 00:00:00 2001 From: hazycora Date: Wed, 20 Sep 2023 18:59:42 -0500 Subject: [PATCH 5/9] fix repository list on overview tab of users --- routers/web/user/profile.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index 4e77e9179b15a..f39eda22ac4b4 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -248,11 +248,11 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGi ctx.Data["Date"] = date repos, _, err = repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{ ListOptions: db.ListOptions{ - PageSize: 8, + PageSize: 6, Page: 0, }, Actor: ctx.Doer, - Keyword: keyword, + Keyword: "", OwnerID: ctx.ContextUser.ID, OrderBy: db.SearchOrderByStars, Private: ctx.IsSigned, From e1c2195460221913c0825dc4bfe02bf1dd718e1e Mon Sep 17 00:00:00 2001 From: hazycora Date: Wed, 20 Sep 2023 19:06:52 -0500 Subject: [PATCH 6/9] fix overview repo list sort order --- routers/web/org/home.go | 2 +- routers/web/user/profile.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/web/org/home.go b/routers/web/org/home.go index e3d679154abda..40ce78d66ac43 100644 --- a/routers/web/org/home.go +++ b/routers/web/org/home.go @@ -108,7 +108,7 @@ func PrepareOrgProfileTabData(ctx *context.Context, profileGitRepo *git.Reposito }, Keyword: "", OwnerID: org.ID, - OrderBy: db.SearchOrderByStars, + OrderBy: db.SearchOrderByStarsReverse, Private: ctx.IsSigned, Actor: ctx.Doer, Language: language, diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go index f39eda22ac4b4..642913e9e6822 100644 --- a/routers/web/user/profile.go +++ b/routers/web/user/profile.go @@ -254,7 +254,7 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGi Actor: ctx.Doer, Keyword: "", OwnerID: ctx.ContextUser.ID, - OrderBy: db.SearchOrderByStars, + OrderBy: db.SearchOrderByStarsReverse, Private: ctx.IsSigned, Collaborate: util.OptionalBoolFalse, TopicOnly: topicOnly, From eac07652e35a04b1442b104e262002276d399649 Mon Sep 17 00:00:00 2001 From: hazycora Date: Wed, 20 Sep 2023 19:44:17 -0500 Subject: [PATCH 7/9] only include first 5 topics of repositories in grids --- templates/explore/repo_grid.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/explore/repo_grid.tmpl b/templates/explore/repo_grid.tmpl index 57a2d10801f28..5663c8aa1a0a3 100644 --- a/templates/explore/repo_grid.tmpl +++ b/templates/explore/repo_grid.tmpl @@ -51,8 +51,8 @@ {{end}} {{if .Topics}}
- {{range .Topics}} - {{if ne . ""}}{{.}}{{end}} + {{range $i, $e := .Topics}} + {{if and (lt $i 5) (ne $e "")}}{{.}}{{end}} {{end}}
{{end}} From e97defeca5abb854d467dcd102716c4b1d1178eb Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 27 Jan 2024 21:31:19 +0100 Subject: [PATCH 8/9] Update web_src/css/shared/grid-list.css --- web_src/css/shared/grid-list.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/shared/grid-list.css b/web_src/css/shared/grid-list.css index 779e866a9af29..fdc848df8b64e 100644 --- a/web_src/css/shared/grid-list.css +++ b/web_src/css/shared/grid-list.css @@ -60,4 +60,4 @@ flex-grow: 0; flex-wrap: wrap; justify-content: end; -} \ No newline at end of file +} From c603f0279fa565e4154d6fec75c5a8ec17cdaf9a Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 27 Jan 2024 21:49:14 +0100 Subject: [PATCH 9/9] adopt refactor --- templates/explore/repo_grid.tmpl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/explore/repo_grid.tmpl b/templates/explore/repo_grid.tmpl index 5663c8aa1a0a3..5baa93531bca8 100644 --- a/templates/explore/repo_grid.tmpl +++ b/templates/explore/repo_grid.tmpl @@ -18,30 +18,30 @@ {{if .IsArchived}} - {{$.locale.Tr "repo.desc.archived"}} + {{ctx.Locale.Tr "repo.desc.archived"}} {{end}} {{if .IsTemplate}} {{if .IsPrivate}} - {{$.locale.Tr "repo.desc.private_template"}} + {{ctx.Locale.Tr "repo.desc.private_template"}} {{else}} {{if .Owner.Visibility.IsPrivate}} - {{$.locale.Tr "repo.desc.internal_template"}} + {{ctx.Locale.Tr "repo.desc.internal_template"}} {{end}} {{end}} {{else}} {{if .IsPrivate}} - {{$.locale.Tr "repo.desc.private"}} + {{ctx.Locale.Tr "repo.desc.private"}} {{else}} {{if .Owner.Visibility.IsPrivate}} - {{$.locale.Tr "repo.desc.internal"}} + {{ctx.Locale.Tr "repo.desc.internal"}} {{end}} {{end}} {{end}} {{if .IsFork}} - {{svg "octicon-repo-forked"}} + {{svg "octicon-repo-forked"}} {{else if .IsMirror}} - {{svg "octicon-mirror"}} + {{svg "octicon-mirror"}} {{end}}
@@ -73,7 +73,7 @@
{{else}}
- {{$.locale.Tr "explore.repo_no_results"}} + {{ctx.Locale.Tr "explore.repo_no_results"}}
{{end}}