From 6069abe5fdf49cbd9a80c9df0c136587fc8601b5 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Fri, 30 Dec 2016 16:49:54 -0200 Subject: [PATCH 1/5] Notifications - Step 2 --- cmd/web.go | 4 ++ options/locale/locale_en-US.ini | 8 +++ options/locale/locale_pt-BR.ini | 8 +++ public/css/index.css | 18 +++++ public/less/_user.less | 21 ++++++ routers/user/notification.go | 54 +++++++++++++++ routers/user/setting.go | 1 - templates/base/head.tmpl | 12 ++++ templates/user/notification/notification.tmpl | 68 +++++++++++++++++++ 9 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 routers/user/notification.go create mode 100644 templates/user/notification/notification.tmpl diff --git a/cmd/web.go b/cmd/web.go index 7dfd19d64..a513f589a 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -168,6 +168,8 @@ func runWeb(ctx *cli.Context) error { bindIgnErr := binding.BindIgnErr + m.Use(user.GetNotificationCount) + // FIXME: not all routes need go through same middlewares. // Especially some AJAX requests, we can reduce middleware number to improve performance. // Routers. @@ -578,6 +580,8 @@ func runWeb(ctx *cli.Context) error { }) // ***** END: Repository ***** + m.Get("/notifications", reqSignIn, user.Notifications) + m.Group("/api", func() { apiv1.RegisterRoutes(m) }, ignSignIn) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index da2db622c..8df3995e3 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -13,6 +13,7 @@ version = Version page = Page template = Template language = Language +notifications = Notifications create_new = Create... user_profile_and_more = User profile and more signed_in_as = Signed in as @@ -1230,3 +1231,10 @@ default_message = Drop files here or click to upload. invalid_input_type = You can't upload files of this type. file_too_big = File size ({{filesize}} MB) exceeds maximum size ({{maxFilesize}} MB). remove_file = Remove file + +[notification] +notifications = Notifications +unread = Unread +read = Read +no_unread = You have no unread notifications. +no_read = You have no read notifications. diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini index 5d9ae7a20..4893a7644 100644 --- a/options/locale/locale_pt-BR.ini +++ b/options/locale/locale_pt-BR.ini @@ -13,6 +13,7 @@ version=Versão page=Página template=Template language=Idioma +notifications = Notificações create_new=Criar... user_profile_and_more=Perfil do usuário e configurações signed_in_as=Logado como @@ -1197,3 +1198,10 @@ default_message=Arraste e solte arquivos aqui, ou clique para selecioná-los. invalid_input_type=Você não pode enviar arquivos deste tipo. file_too_big=O tamanho do arquivo ({{filesize}} MB) excede o limite máximo ({{maxFilesize}} MB). remove_file=Remover + +[notification] +notifications = Notificações +unread = Não lidas +read = Lidas +no_unread = Você não possui notificações não lidas. +no_read = Você não possui notificações lidas. diff --git a/public/css/index.css b/public/css/index.css index d64c71ca2..a8d616cc0 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -2694,6 +2694,24 @@ footer .ui.language .menu { .user.followers .follow .ui.button { padding: 8px 15px; } +.user.notification .octicon { + float: left; + font-size: 2em; +} +.user.notification .content { + float: left; + margin-left: 7px; +} +.user.notification .octicon-issue-opened, +.user.notification .octicon-git-pull-request { + color: green; +} +.user.notification .octicon-issue-closed { + color: red; +} +.user.notification .octicon-git-merge { + color: purple; +} .dashboard { padding-top: 15px; padding-bottom: 80px; diff --git a/public/less/_user.less b/public/less/_user.less index 3e37011cf..d7acc4639 100644 --- a/public/less/_user.less +++ b/public/less/_user.less @@ -74,4 +74,25 @@ } } } + + &.notification { + .octicon { + float: left; + font-size: 2em; + } + .content { + float: left; + margin-left: 7px; + } + + .octicon-issue-opened, .octicon-git-pull-request { + color: green; + } + .octicon-issue-closed { + color: red; + } + .octicon-git-merge { + color: purple; + } + } } diff --git a/routers/user/notification.go b/routers/user/notification.go new file mode 100644 index 000000000..13d2d70f8 --- /dev/null +++ b/routers/user/notification.go @@ -0,0 +1,54 @@ +package user + +import ( + "fmt" + + "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/context" +) + +const ( + tplNotification base.TplName = "user/notification/notification" +) + +// GetNotificationCount is the middleware that sets the notification count in the context +func GetNotificationCount(c *context.Context) { + if !c.IsSigned { + return + } + + count, err := models.GetNotificationUnreadCount(c.User) + if err != nil { + c.Handle(500, "GetNotificationCount", err) + return + } + + c.Data["NotificationUnreadCount"] = count +} + +// Notifications is the notifications page +func Notifications(c *context.Context) { + var status models.NotificationStatus + switch c.Query("status") { + case "read": + status = models.NotificationStatusRead + default: + status = models.NotificationStatusUnread + } + + notifications, err := models.NotificationsForUser(c.User, status) + if err != nil { + c.Handle(500, "ErrNotificationsForUser", err) + return + } + + title := "Notifications" + if count := len(notifications); count > 0 { + title = fmt.Sprintf("(%d) %s", count, title) + } + c.Data["Title"] = title + c.Data["Status"] = status + c.Data["Notifications"] = notifications + c.HTML(200, tplNotification) +} diff --git a/routers/user/setting.go b/routers/user/setting.go index e078f8c17..a465b0cd8 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -29,7 +29,6 @@ const ( tplSettingsSocial base.TplName = "user/settings/social" tplSettingsApplications base.TplName = "user/settings/applications" tplSettingsDelete base.TplName = "user/settings/delete" - tplNotification base.TplName = "user/notification" tplSecurity base.TplName = "user/security" ) diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index fe1474251..c1f386fe7 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -82,6 +82,18 @@ {{if .IsSigned}}
+ + + {{.i18n.Tr "notifications"}} + + {{if .NotificationUnreadCount}} + + {{.NotificationUnreadCount}} + + {{end}} + + +
{{.i18n.Tr "create_new"}} diff --git a/templates/user/notification/notification.tmpl b/templates/user/notification/notification.tmpl new file mode 100644 index 000000000..84e16eec9 --- /dev/null +++ b/templates/user/notification/notification.tmpl @@ -0,0 +1,68 @@ +{{template "base/head" .}} + +
+
+

{{.i18n.Tr "notification.notifications"}}

+ +
+ +
+ {{.i18n.Tr "notification.unread"}} + {{if eq .Status 1}} +
{{len .Notifications}}
+ {{end}} +
+ + +
+ {{.i18n.Tr "notification.read"}} + {{if eq .Status 2}} +
{{len .Notifications}}
+ {{end}} +
+ +
+
+ {{if eq (len .Notifications) 0}} + {{if eq .Status 1}} + {{.i18n.Tr "notification.no_unread"}} + {{else}} + {{.i18n.Tr "notification.no_read"}} + {{end}} + {{else}} +
+ {{range $notification := .Notifications}} + {{$issue := $notification.GetIssue}} + {{$repo := $notification.GetRepo}} + {{$repoOwner := $repo.MustOwner}} + +
+ + {{if and $issue.IsPull}} + {{if $issue.IsClosed}} + + {{else}} + + {{end}} + {{else}} + {{if $issue.IsClosed}} + + {{else}} + + {{end}} + {{end}} + +
+
{{$repoOwner.Name}}/{{$repo.Name}}
+
{{$issue.Title}}
+
+ +
+ {{end}} +
+ {{end}} +
+
+
+ +{{template "base/footer" .}} From 341a3b571bd262d7dc758825ca4dddca4e7f832b Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 2 Jan 2017 16:31:50 -0200 Subject: [PATCH 2/5] Do not get count on /api routers --- routers/user/notification.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/routers/user/notification.go b/routers/user/notification.go index 13d2d70f8..866cc6de0 100644 --- a/routers/user/notification.go +++ b/routers/user/notification.go @@ -2,6 +2,7 @@ package user import ( "fmt" + "strings" "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/base" @@ -14,6 +15,10 @@ const ( // GetNotificationCount is the middleware that sets the notification count in the context func GetNotificationCount(c *context.Context) { + if strings.HasPrefix(c.Req.URL.Path, "/api") { + return + } + if !c.IsSigned { return } From f59672a18db930477269f783746d8ce057827e65 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 2 Jan 2017 16:40:50 -0200 Subject: [PATCH 3/5] More fine graned colors --- public/css/index.css | 6 +++--- public/less/_user.less | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index a8d616cc0..54e732343 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -2704,13 +2704,13 @@ footer .ui.language .menu { } .user.notification .octicon-issue-opened, .user.notification .octicon-git-pull-request { - color: green; + color: #21ba45; } .user.notification .octicon-issue-closed { - color: red; + color: #d01919; } .user.notification .octicon-git-merge { - color: purple; + color: #a333c8; } .dashboard { padding-top: 15px; diff --git a/public/less/_user.less b/public/less/_user.less index d7acc4639..b446351bd 100644 --- a/public/less/_user.less +++ b/public/less/_user.less @@ -86,13 +86,13 @@ } .octicon-issue-opened, .octicon-git-pull-request { - color: green; + color: #21ba45; } .octicon-issue-closed { - color: red; + color: #d01919; } .octicon-git-merge { - color: purple; + color: #a333c8; } } } From 545ba2e2e62123fc4c9b7f780ccff3ee1b4888ff Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 2 Jan 2017 16:43:23 -0200 Subject: [PATCH 4/5] Showing index in front of issue title --- templates/user/notification/notification.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/notification/notification.tmpl b/templates/user/notification/notification.tmpl index 84e16eec9..154f8b179 100644 --- a/templates/user/notification/notification.tmpl +++ b/templates/user/notification/notification.tmpl @@ -54,7 +54,7 @@
{{$repoOwner.Name}}/{{$repo.Name}}
-
{{$issue.Title}}
+
#{{$issue.Index}} - {{$issue.Title}}
From b354cf362ec432533da4384d4ee0c32283b7089f Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Tue, 3 Jan 2017 17:09:36 -0200 Subject: [PATCH 5/5] Add pagination for notifications --- models/notification.go | 16 +++++++---- routers/user/notification.go | 28 +++++++++++++++++-- templates/user/notification/notification.tmpl | 6 ++-- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/models/notification.go b/models/notification.go index 46d63b482..188c98753 100644 --- a/models/notification.go +++ b/models/notification.go @@ -182,14 +182,20 @@ func getIssueNotification(e Engine, userID, issueID int64) (*Notification, error } // NotificationsForUser returns notifications for a given user and status -func NotificationsForUser(user *User, status NotificationStatus) ([]*Notification, error) { - return notificationsForUser(x, user, status) +func NotificationsForUser(user *User, status NotificationStatus, page, perPage int) ([]*Notification, error) { + return notificationsForUser(x, user, status, page, perPage) } -func notificationsForUser(e Engine, user *User, status NotificationStatus) (notifications []*Notification, err error) { - err = e. +func notificationsForUser(e Engine, user *User, status NotificationStatus, page, perPage int) (notifications []*Notification, err error) { + sess := e. Where("user_id = ?", user.ID). And("status = ?", status). - OrderBy("updated_unix DESC"). + OrderBy("updated_unix DESC") + + if page > 0 && perPage > 0 { + sess.Limit(perPage, (page-1)*perPage) + } + + err = sess. Find(¬ifications) return } diff --git a/routers/user/notification.go b/routers/user/notification.go index 866cc6de0..7e556ae2e 100644 --- a/routers/user/notification.go +++ b/routers/user/notification.go @@ -4,6 +4,8 @@ import ( "fmt" "strings" + "github.com/Unknwon/paginater" + "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" @@ -34,26 +36,46 @@ func GetNotificationCount(c *context.Context) { // Notifications is the notifications page func Notifications(c *context.Context) { - var status models.NotificationStatus - switch c.Query("status") { + var ( + keyword = c.Query("q") + status models.NotificationStatus + page = c.QueryInt("page") + perPage = c.QueryInt("perPage") + ) + if page < 1 { + page = 1 + } + if perPage < 1 { + perPage = 20 + } + + switch keyword { case "read": status = models.NotificationStatusRead default: status = models.NotificationStatusUnread } - notifications, err := models.NotificationsForUser(c.User, status) + notifications, err := models.NotificationsForUser(c.User, status, page, perPage) if err != nil { c.Handle(500, "ErrNotificationsForUser", err) return } + total, err := models.GetNotificationCount(c.User, status) + if err != nil { + c.Handle(500, "ErrGetNotificationCount", err) + return + } + title := "Notifications" if count := len(notifications); count > 0 { title = fmt.Sprintf("(%d) %s", count, title) } c.Data["Title"] = title + c.Data["Keyword"] = keyword c.Data["Status"] = status c.Data["Notifications"] = notifications + c.Data["Page"] = paginater.New(int(total), perPage, page, 5) c.HTML(200, tplNotification) } diff --git a/templates/user/notification/notification.tmpl b/templates/user/notification/notification.tmpl index 154f8b179..ddfcd4f71 100644 --- a/templates/user/notification/notification.tmpl +++ b/templates/user/notification/notification.tmpl @@ -5,7 +5,7 @@

{{.i18n.Tr "notification.notifications"}}

- +
{{.i18n.Tr "notification.unread"}} {{if eq .Status 1}} @@ -13,7 +13,7 @@ {{end}}
- +
{{.i18n.Tr "notification.read"}} {{if eq .Status 2}} @@ -62,6 +62,8 @@
{{end}}
+ + {{template "base/paginate" .}}