From 7ca830677525e6fc9127660fde32c46bcf00ab59 Mon Sep 17 00:00:00 2001
From: slene <vslene@gmail.com>
Date: Sun, 16 Mar 2014 00:03:23 +0800
Subject: modify RepoAssignment

---
 web.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'web.go')

diff --git a/web.go b/web.go
index ad19a5da..af430917 100644
--- a/web.go
+++ b/web.go
@@ -68,12 +68,12 @@ func runWeb(*cli.Context) {
 	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/settings", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Setting)
 	m.Get("/:username/:reponame/tree/:branchname/**",
-		middleware.SignInRequire(false), auth.RepoAssignment(true), repo.Single)
+		middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Single)
 	m.Get("/:username/:reponame/tree/:branchname",
-		middleware.SignInRequire(false), auth.RepoAssignment(true), repo.Single)
-	m.Get("/:username/:reponame", middleware.SignInRequire(false), auth.RepoAssignment(true), repo.Single)
+		middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Single)
+	m.Get("/:username/:reponame", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Single)
 
 	//m.Get("/:username/:reponame", repo.Repo)
 
-- 
cgit v1.2.3


From dfcae2a97ae57cf8cb9e954b9d69151f5e340745 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sat, 15 Mar 2014 12:13:45 -0400
Subject: Add repo list data, need front-end fix

---
 routers/repo/repo.go          | 17 -----------------
 routers/repo/single.go        |  1 -
 routers/user/user.go          |  7 ++++++-
 templates/user/dashboard.tmpl |  8 ++++----
 templates/user/profile.tmpl   |  8 +++++++-
 web.go                        |  1 -
 6 files changed, 17 insertions(+), 25 deletions(-)

(limited to 'web.go')

diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 23f8ea10..116c199b 100644
--- 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 e9339510..d796d963 100644
--- 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 4ba7da16..8d8691a3 100644
--- 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 306c3bc1..547e8ab5 100644
--- 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 94444520..aa15cb88 100644
--- 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 ad19a5da..8d4fd5b5 100644
--- 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/**",
-- 
cgit v1.2.3