diff --git a/README.md b/README.md index 0e354a9d47..dd95e90d6f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0b Gogs(Go Git Service) is a GitHub-like clone in the Go Programming Language, it currently supports Linux and Max OS X, but Windows has **NOT** supported yet due to installation problem with [libgit2](http://libgit2.github.com/) in Windows. -##### Current version: 0.0.7 Alpha +##### Current version: 0.0.8 Alpha ## Purpose diff --git a/models/action.go b/models/action.go index 8008d331cb..6a77d73003 100644 --- a/models/action.go +++ b/models/action.go @@ -56,6 +56,7 @@ func NewRepoAction(user *User, repo *Repository) error { return err } +// GetFeeds returns action list of given user in given context. func GetFeeds(userid, offset int64, isProfile bool) ([]Action, error) { actions := make([]Action, 0, 20) sess := orm.Limit(20, int(offset)).Desc("id").Where("user_id=?", userid) diff --git a/models/repo2.go b/models/repo2.go index ef0131d83e..6aa6eda60c 100644 --- a/models/repo2.go +++ b/models/repo2.go @@ -1,3 +1,7 @@ +// Copyright 2014 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + package models import ( diff --git a/modules/auth/user.go b/modules/auth/user.go index 9c9ce686df..21336cdd98 100644 --- a/modules/auth/user.go +++ b/modules/auth/user.go @@ -63,7 +63,7 @@ func IsSignedIn(session sessions.Session) bool { type FeedsForm struct { UserId int64 `form:"userid" binding:"Required"` - Offset int64 `form:"offset"` + Page int64 `form:"p"` } type UpdateProfileForm struct { diff --git a/routers/user/user.go b/routers/user/user.go index 450f09b6d3..c66904a24f 100644 --- a/routers/user/user.go +++ b/routers/user/user.go @@ -5,6 +5,7 @@ package user import ( + "fmt" "net/http" "github.com/codegangsta/martini" @@ -27,6 +28,13 @@ func Dashboard(r render.Render, data base.TmplData, session sessions.Session) { return } data["MyRepos"] = repos + + feeds, err := models.GetFeeds(auth.SignedInId(session), 0, false) + if err != nil { + log.Handle(200, "user.Dashboard", data, r, err) + return + } + data["Feeds"] = feeds r.HTML(200, "user/dashboard", data) } @@ -172,10 +180,21 @@ func Delete(data base.TmplData, req *http.Request, session sessions.Session, r r r.HTML(200, "user/delete", data) } +const ( + feedTpl = ` +
%s
%s
` +) + func Feeds(form auth.FeedsForm, r render.Render) { - actions, err := models.GetFeeds(form.UserId, form.Offset, false) + actions, err := models.GetFeeds(form.UserId, form.Page*20, false) if err != nil { r.JSON(500, err) } - r.JSON(200, actions) + + feeds := make([]string, len(actions)) + for i := range actions { + feeds[i] = fmt.Sprintf(feedTpl, base.ActionIcon(actions[i].OpType), + base.TimeSince(actions[i].Created), base.ActionDesc(actions[i])) + } + r.JSON(200, &feeds) } diff --git a/templates/repo/created.tmpl b/templates/repo/created.tmpl deleted file mode 100644 index 35803e3938..0000000000 --- a/templates/repo/created.tmpl +++ /dev/null @@ -1,8 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -
-
- Created successfully! -
-
-{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl index 7768a7ee6d..14b3451562 100644 --- a/templates/user/dashboard.tmpl +++ b/templates/user/dashboard.tmpl @@ -14,7 +14,17 @@
{{if .HasInfo}}
{{.InfoMsg}}
{{end}}
- Website is still in the progress of building...please come back later! {{.SignedUserName}} is logged! +
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index fd4313efdc..f2bb984b31 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -39,12 +39,12 @@ {{else}} -
  • Not found any activity
  • +
  • Not any public activity yet.
  • {{end}}
    {{else}} -
    repo
    +
    repo
    {{end}}
    diff --git a/web.go b/web.go index ad19a5da01..07f2aa251d 100644 --- a/web.go +++ b/web.go @@ -49,7 +49,7 @@ func runWeb(*cli.Context) { m.Use(middleware.InitContext()) // Routers. - m.Get("/", middleware.SignInRequire(false), routers.Home) + m.Get("/", middleware.SignInRequire(true), routers.Home) m.Any("/user/login", middleware.SignOutRequire(), binding.BindIgnErr(auth.LogInForm{}), user.SignIn) m.Any("/user/logout", middleware.SignInRequire(true), user.SignOut) m.Any("/user/sign_up", middleware.SignOutRequire(), binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)