Add repo list data, need front-end fix

diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 23f8ea107c49b901f073db91510173e090642ae5..116c199b7d19c01d4b6423c07602fef1f47f1f55 100644 (file)
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -67,20 +67,3 @@ func Delete(ctx *middleware.Context, form auth.DeleteRepoForm) {
 
        ctx.Render.Redirect("/", 302)
 }
-
-func List(ctx *middleware.Context) {
-       if ctx.User != nil {
-               ctx.Render.Redirect("/")
-               return
-       }
-
-       ctx.Data["Title"] = "Repositories"
-       repos, err := models.GetRepositories(ctx.User)
-       if err != nil {
-               ctx.Handle(200, "repo.List", err)
-               return
-       }
-
-       ctx.Data["Repos"] = repos
-       ctx.Render.HTML(200, "repo/list", ctx.Data)
-}

diff --git a/routers/repo/single.go b/routers/repo/single.go
index e933951050a77d0377cd2a7f81927a729d21e5ea..d796d9639d1e076b689b4f7b3db13d45410abfee 100644 (file)
--- a/routers/repo/single.go
+++ b/routers/repo/single.go
@@ -41,7 +41,6 @@ func Single(ctx *middleware.Context, params martini.Params) {
        ctx.Data["Treenames"] = treenames
        ctx.Data["IsRepoToolbarSource"] = true
        ctx.Data["Files"] = files
-
        ctx.Render.HTML(200, "repo/single", ctx.Data)
 }
 

diff --git a/routers/user/user.go b/routers/user/user.go
index 4ba7da161584083e584e207e8d9c4f7ef6f70aa0..8d8691a39fbbc2fe8f5bbfba47b535da012668b1 100644 (file)
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -60,7 +60,12 @@ func Profile(ctx *middleware.Context, params martini.Params) {
                }
                ctx.Data["Feeds"] = feeds
        default:
-
+               repos, err := models.GetRepositories(user)
+               if err != nil {
+                       ctx.Handle(200, "user.Profile", err)
+                       return
+               }
+               ctx.Data["Repos"] = repos
        }
 
        ctx.Render.HTML(200, "user/profile", ctx.Data)

diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl
index 306c3bc15d065a56ae85b16c26da9fc37ca89bf2..547e8ab5562f8ec8ef8b57f676b2c261fb7fa00a 100644 (file)
--- a/templates/user/dashboard.tmpl
+++ b/templates/user/dashboard.tmpl
@@ -4,9 +4,9 @@
     <div class="container">
         <ul class="nav nav-pills pull-right">
             <li class="active"><a href="/">Feed</a></li>
-            <li><a href="/issues/">Issues</a></li>
-            <li><a href="/pulls/">Pull Requests</a></li>
-            <li><a href="/stars/">Stars</a></li>
+            <li><a href="/issues">Issues</a></li>
+            <li><a href="/pulls">Pull Requests</a></li>
+            <li><a href="/stars">Stars</a></li>
         </ul>
         <h3>News Feed</h3>
     </div>
@@ -29,7 +29,7 @@
     <div id="gogs-feed-right" class="col-md-4">
         <div class="panel panel-default repo-panel">
             <div class="panel-heading">Your Repositories
-                <a class="btn btn-success pull-right btn-sm" href="/repo/create/"><i class="fa fa-plus-square"></i>New Repo</a>
+                <a class="btn btn-success pull-right btn-sm" href="/repo/create"><i class="fa fa-plus-square"></i>New Repo</a>
             </div>
             <div class="panel-body">
                 <ul class="list-group">{{range .MyRepos}}

diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 944445201282b7df839c10e9e0278445709884cc..aa15cb88bb6407a807dfb069a47824f68056b97d 100644 (file)
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -44,7 +44,13 @@
                 </ul>
             </div>
             {{else}}
-            <div class="tab-pane active">repo</div>
+            {{$owner := .Owner}}
+            <div class="tab-pane active">
+                {{range .Repos}}
+                    <h4><a href="/{{$owner.Name}}/{{.LowerName}}">{{.LowerName}}</a> <small>Star:{{.NumStars}} Fork:{{.NumForks}}</small></h4>
+                    <p>{{.Description}}</p>
+                {{end}}
+            </div>
             {{end}}
         </div>
     </div>

diff --git a/web.go b/web.go
index ad19a5da01529872c593025c7f357585369fbea6..8d4fd5b5c93c9d00241956ddbc288c627a56d7f6 100644 (file)
--- a/web.go
+++ b/web.go
@@ -66,7 +66,6 @@ func runWeb(*cli.Context) {
 
        m.Any("/repo/create", middleware.SignInRequire(true), binding.BindIgnErr(auth.CreateRepoForm{}), repo.Create)
        m.Any("/repo/delete", middleware.SignInRequire(true), binding.Bind(auth.DeleteRepoForm{}), repo.Delete)
-       m.Any("/repo/list", middleware.SignInRequire(false), repo.List)
 
        m.Get("/:username/:reponame/settings", middleware.SignInRequire(false), auth.RepoAssignment(true), repo.Setting)
        m.Get("/:username/:reponame/tree/:branchname/**",