diff --git a/src/main/scala/gitbucket/core/controller/DashboardController.scala b/src/main/scala/gitbucket/core/controller/DashboardController.scala
index 2c8a982..ce0de3a 100644
--- a/src/main/scala/gitbucket/core/controller/DashboardController.scala
+++ b/src/main/scala/gitbucket/core/controller/DashboardController.scala
@@ -21,6 +21,16 @@
trait DashboardControllerBase extends ControllerBase {
self: IssuesService with PullRequestService with RepositoryService with AccountService with UsersAuthenticator =>
+ get("/dashboard/repos")(usersOnly {
+ val userName = context.loginAccount.get.userName
+
+ html.repos(
+ getGroupNames(userName),
+ getVisibleRepositories(None, withoutPhysicalInfo = true),
+ getUserRepositories(userName, withoutPhysicalInfo = true)
+ )
+ })
+
get("/dashboard/issues")(usersOnly {
searchIssues("created_by")
})
@@ -83,8 +93,7 @@
},
filter,
getGroupNames(userName),
- Nil,
- getUserRepositories(userName, withoutPhysicalInfo = true)
+ getVisibleRepositories(None, withoutPhysicalInfo = true)
)
}
@@ -109,8 +118,7 @@
},
filter,
getGroupNames(userName),
- Nil,
- getUserRepositories(userName, withoutPhysicalInfo = true)
+ getVisibleRepositories(None, withoutPhysicalInfo = true)
)
}
diff --git a/src/main/scala/gitbucket/core/controller/IndexController.scala b/src/main/scala/gitbucket/core/controller/IndexController.scala
index ed9042d..d7b3f5a 100644
--- a/src/main/scala/gitbucket/core/controller/IndexController.scala
+++ b/src/main/scala/gitbucket/core/controller/IndexController.scala
@@ -64,8 +64,7 @@
val visibleOwnerSet: Set[String] = Set(account.userName) ++ getGroupsByUserName(account.userName)
gitbucket.core.html.index(
getRecentActivitiesByOwners(visibleOwnerSet),
- Nil,
- getUserRepositories(account.userName, withoutPhysicalInfo = true),
+ getVisibleRepositories(None, withoutPhysicalInfo = true),
showBannerToCreatePersonalAccessToken = hasAccountFederation(account.userName) && !hasAccessToken(
account.userName
)
@@ -75,7 +74,6 @@
gitbucket.core.html.index(
getRecentActivities(),
getVisibleRepositories(None, withoutPhysicalInfo = true),
- Nil,
showBannerToCreatePersonalAccessToken = false
)
}
@@ -273,18 +271,7 @@
val repositories = visibleRepositories.filter { repository =>
repository.name.toLowerCase.indexOf(query) >= 0 || repository.owner.toLowerCase.indexOf(query) >= 0
}
- context.loginAccount
- .map { account =>
- gitbucket.core.search.html.repositories(
- query,
- repositories,
- Nil,
- getUserRepositories(account.userName, withoutPhysicalInfo = true)
- )
- }
- .getOrElse {
- gitbucket.core.search.html.repositories(query, repositories, visibleRepositories, Nil)
- }
+ gitbucket.core.search.html.repositories(query, repositories, visibleRepositories)
}
}
diff --git a/src/main/twirl/gitbucket/core/dashboard/issues.scala.html b/src/main/twirl/gitbucket/core/dashboard/issues.scala.html
index f23e576..c2e92ed 100644
--- a/src/main/twirl/gitbucket/core/dashboard/issues.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/issues.scala.html
@@ -5,10 +5,9 @@
condition: gitbucket.core.service.IssuesService.IssueSearchCondition,
filter: String,
groups: List[String],
- recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
- userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
+ recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
@gitbucket.core.html.main("Issues"){
- @gitbucket.core.dashboard.html.sidebar(recentRepositories, userRepositories){
+ @gitbucket.core.dashboard.html.sidebar(recentRepositories){
@gitbucket.core.dashboard.html.tab("issues")
@gitbucket.core.dashboard.html.issuesnavi("issues", filter, openCount, closedCount, condition)
diff --git a/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html b/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html
index 3d05a84..b3cf909 100644
--- a/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/pulls.scala.html
@@ -5,10 +5,9 @@
condition: gitbucket.core.service.IssuesService.IssueSearchCondition,
filter: String,
groups: List[String],
- recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
- userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
+ recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
@gitbucket.core.html.main("Pull requests"){
- @gitbucket.core.dashboard.html.sidebar(recentRepositories, userRepositories){
+ @gitbucket.core.dashboard.html.sidebar(recentRepositories){
@gitbucket.core.dashboard.html.tab("pulls")
@gitbucket.core.dashboard.html.issuesnavi("pulls", filter, openCount, closedCount, condition)
diff --git a/src/main/twirl/gitbucket/core/dashboard/repos.scala.html b/src/main/twirl/gitbucket/core/dashboard/repos.scala.html
new file mode 100644
index 0000000..a3ac8c6
--- /dev/null
+++ b/src/main/twirl/gitbucket/core/dashboard/repos.scala.html
@@ -0,0 +1,71 @@
+@(groups: List[String],
+ recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
+ userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.view.helpers
+@gitbucket.core.html.main("Repositories"){
+ @gitbucket.core.dashboard.html.sidebar(recentRepositories){
+ @gitbucket.core.dashboard.html.tab("repos")
+
+
+
+
+
+ @if(userRepositories.isEmpty){
+ No repositories
+ } else {
+ @userRepositories.map { repository =>
+
+
+ @gitbucket.core.helper.html.repositoryicon(repository, true)
+
+
+
+ @if(repository.repository.originUserName.isDefined){
+
+ }
+ @if(repository.repository.description.isDefined){
+
@repository.repository.description
+ }
+
Updated @gitbucket.core.helper.html.datetimeago(repository.repository.lastActivityDate)
+
+
+ }
+ }
+
+ }
+}
+
diff --git a/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html b/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
index 9f59a2f..ee7feb0 100644
--- a/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html
@@ -1,29 +1,8 @@
-@(recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
- userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(body: Html)(implicit context: gitbucket.core.controller.Context)
+@(recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(body: Html)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
diff --git a/src/main/twirl/gitbucket/core/dashboard/tab.scala.html b/src/main/twirl/gitbucket/core/dashboard/tab.scala.html
index 597509f..ee2c17d 100644
--- a/src/main/twirl/gitbucket/core/dashboard/tab.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/tab.scala.html
@@ -2,6 +2,7 @@
- News feed
@if(context.loginAccount.isDefined){
+ - Repositories
- Pull requests
- Issues
@gitbucket.core.plugin.PluginRegistry().getDashboardTabs.map { tab =>
diff --git a/src/main/twirl/gitbucket/core/index.scala.html b/src/main/twirl/gitbucket/core/index.scala.html
index 83ca41c..2552a01 100644
--- a/src/main/twirl/gitbucket/core/index.scala.html
+++ b/src/main/twirl/gitbucket/core/index.scala.html
@@ -1,10 +1,9 @@
@(activities: List[gitbucket.core.model.Activity],
recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
- userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
showBannerToCreatePersonalAccessToken: Boolean)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
@gitbucket.core.html.main("GitBucket"){
- @gitbucket.core.dashboard.html.sidebar(recentRepositories, userRepositories){
+ @gitbucket.core.dashboard.html.sidebar(recentRepositories){
@context.settings.information.map { information =>
diff --git a/src/main/twirl/gitbucket/core/search/repositories.scala.html b/src/main/twirl/gitbucket/core/search/repositories.scala.html
index eb450ce..04ed4df 100644
--- a/src/main/twirl/gitbucket/core/search/repositories.scala.html
+++ b/src/main/twirl/gitbucket/core/search/repositories.scala.html
@@ -1,10 +1,9 @@
@(query: String,
repositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
- recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo],
- userRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
+ recentRepositories: List[gitbucket.core.service.RepositoryService.RepositoryInfo])(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
@gitbucket.core.html.main("GitBucket"){
- @gitbucket.core.dashboard.html.sidebar(recentRepositories, userRepositories){
+ @gitbucket.core.dashboard.html.sidebar(recentRepositories){