diff --git a/appview/pages/pages.go b/appview/pages/pages.go index 25d9f225..d1e72e5d 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -296,6 +296,35 @@ func (p *Pages) UserProfileSettings(w io.Writer, params UserProfileSettingsParam return p.execute("user/settings/profile", w, params) } +type NotificationsParams struct { + LoggedInUser *oauth.User + Notifications []*models.NotificationWithEntity + UnreadCount int + HasMore bool + NextOffset int + Limit int +} + +func (p *Pages) Notifications(w io.Writer, params NotificationsParams) error { + return p.execute("notifications/list", w, params) +} + +type NotificationItemParams struct { + Notification *models.Notification +} + +func (p *Pages) NotificationItem(w io.Writer, params NotificationItemParams) error { + return p.executePlain("notifications/fragments/item", w, params) +} + +type NotificationCountParams struct { + Count int +} + +func (p *Pages) NotificationCount(w io.Writer, params NotificationCountParams) error { + return p.executePlain("notifications/fragments/count", w, params) +} + type UserKeysSettingsParams struct { LoggedInUser *oauth.User PubKeys []models.PublicKey @@ -318,6 +347,17 @@ func (p *Pages) UserEmailsSettings(w io.Writer, params UserEmailsSettingsParams) return p.execute("user/settings/emails", w, params) } +type UserNotificationSettingsParams struct { + LoggedInUser *oauth.User + Preferences *models.NotificationPreferences + Tabs []map[string]any + Tab string +} + +func (p *Pages) UserNotificationSettings(w io.Writer, params UserNotificationSettingsParams) error { + return p.execute("user/settings/notifications", w, params) +} + type UpgradeBannerParams struct { Registrations []models.Registration Spindles []models.Spindle diff --git a/appview/pages/templates/errors/500.html b/appview/pages/templates/errors/500.html index 34b52da0..529e2d59 100644 --- a/appview/pages/templates/errors/500.html +++ b/appview/pages/templates/errors/500.html @@ -5,7 +5,7 @@
- {{ i "alert-triangle" "w-8 h-8 text-red-500 dark:text-red-400" }} + {{ i "triangle-alert" "w-8 h-8 text-red-500 dark:text-red-400" }}
@@ -14,22 +14,15 @@ 500 — internal server error

- Something went wrong on our end. We've been notified and are working to fix the issue. -

-
-
- {{ i "info" "w-4 h-4" }} - we're on it! -
-

Our team has been automatically notified about this error.

-
+ We encountered an error while processing your request. Please try again later. +

- {{ i "home" "w-4 h-4" }} + {{ i "arrow-left" "w-4 h-4" }} back to home
diff --git a/appview/pages/templates/layouts/fragments/topbar.html b/appview/pages/templates/layouts/fragments/topbar.html index b98458d1..a997000d 100644 --- a/appview/pages/templates/layouts/fragments/topbar.html +++ b/appview/pages/templates/layouts/fragments/topbar.html @@ -10,6 +10,7 @@
{{ with .LoggedInUser }} {{ block "newButton" . }} {{ end }} + {{ template "notifications/fragments/bell" }} {{ block "dropDown" . }} {{ end }} {{ else }} login @@ -44,7 +45,7 @@ {{ define "dropDown" }}
{{ $user := didOrHandle .Did .Handle }} {{ template "user/fragments/picHandle" $user }} diff --git a/appview/pages/templates/notifications/fragments/bell.html b/appview/pages/templates/notifications/fragments/bell.html new file mode 100644 index 00000000..5e8894d5 --- /dev/null +++ b/appview/pages/templates/notifications/fragments/bell.html @@ -0,0 +1,11 @@ +{{define "notifications/fragments/bell"}} +
+ + {{ i "bell" "w-5 h-5" }} + + +
+{{end}} diff --git a/appview/pages/templates/notifications/fragments/count.html b/appview/pages/templates/notifications/fragments/count.html new file mode 100644 index 00000000..87c7ce7c --- /dev/null +++ b/appview/pages/templates/notifications/fragments/count.html @@ -0,0 +1,7 @@ +{{define "notifications/fragments/count"}} +{{if and .Count (gt .Count 0)}} + + {{if gt .Count 99}}99+{{else}}{{.Count}}{{end}} + +{{end}} +{{end}} diff --git a/appview/pages/templates/notifications/fragments/item.html b/appview/pages/templates/notifications/fragments/item.html new file mode 100644 index 00000000..7d663703 --- /dev/null +++ b/appview/pages/templates/notifications/fragments/item.html @@ -0,0 +1,212 @@ +{{define "notifications/fragments/item"}} +
+ {{if .Issue}} + {{template "issueNotification" .}} + {{else if .Pull}} + {{template "pullNotification" .}} + {{else if .Repo}} + {{template "repoNotification" .}} + {{else if eq .Type "followed"}} + {{template "followNotification" .}} + {{else}} + {{template "genericNotification" .}} + {{end}} +
+{{end}} + +{{define "issueNotification"}} +{{$url := printf "/%s/%s/issues/%d" (resolve .Repo.Did) .Repo.Name .Issue.IssueId}} + +
+
+ +
+ {{if eq .Type "issue_created"}} + + {{ i "circle-dot" "w-4 h-4" }} + + {{else if eq .Type "issue_commented"}} + + {{ i "message-circle" "w-4 h-4" }} + + {{else if eq .Type "issue_closed"}} + + {{ i "ban" "w-4 h-4" }} + + {{end}} + {{template "user/fragments/picHandle" (resolve .ActorDid)}} + {{if eq .Type "issue_created"}} + opened issue + {{else if eq .Type "issue_commented"}} + commented on issue + {{else if eq .Type "issue_closed"}} + closed issue + {{end}} + {{if not .Read}} +
+ {{end}} +
+ +
+ #{{.Issue.IssueId}} + {{.Issue.Title}} + on + {{resolve .Repo.Did}}/{{.Repo.Name}} +
+
+ +
+ {{ template "repo/fragments/time" .Created }} +
+
+ +{{end}} + +{{define "pullNotification"}} +{{$url := printf "/%s/%s/pulls/%d" (resolve .Repo.Did) .Repo.Name .Pull.PullId}} + +
+
+
+ {{if eq .Type "pull_created"}} + + {{ i "git-pull-request-create" "w-4 h-4" }} + + {{else if eq .Type "pull_commented"}} + + {{ i "message-circle" "w-4 h-4" }} + + {{else if eq .Type "pull_merged"}} + + {{ i "git-merge" "w-4 h-4" }} + + {{else if eq .Type "pull_closed"}} + + {{ i "git-pull-request-closed" "w-4 h-4" }} + + {{end}} + {{template "user/fragments/picHandle" (resolve .ActorDid)}} + {{if eq .Type "pull_created"}} + opened pull request + {{else if eq .Type "pull_commented"}} + commented on pull request + {{else if eq .Type "pull_merged"}} + merged pull request + {{else if eq .Type "pull_closed"}} + closed pull request + {{end}} + {{if not .Read}} +
+ {{end}} +
+ +
+ #{{.Pull.PullId}} + {{.Pull.Title}} + on + {{resolve .Repo.Did}}/{{.Repo.Name}} +
+
+ +
+ {{ template "repo/fragments/time" .Created }} +
+
+ +{{end}} + +{{define "repoNotification"}} +{{$url := printf "/%s/%s" (resolve .Repo.Did) .Repo.Name}} + +
+
+ + {{ i "star" "w-4 h-4" }} + + +
+ +
+ {{template "user/fragments/picHandle" (resolve .ActorDid)}} + starred + {{resolve .Repo.Did}}/{{.Repo.Name}} + {{if not .Read}} +
+ {{end}} +
+
+
+ +
+ {{ template "repo/fragments/time" .Created }} +
+
+ +{{end}} + +{{define "followNotification"}} +{{$url := printf "/%s" (resolve .ActorDid)}} + +
+
+ + {{ i "user-plus" "w-4 h-4" }} + + +
+
+ {{template "user/fragments/picHandle" (resolve .ActorDid)}} + followed you + {{if not .Read}} +
+ {{end}} +
+
+
+ +
+ {{ template "repo/fragments/time" .Created }} +
+
+ +{{end}} + +{{define "genericNotification"}} + +
+
+ + {{ i "bell" "w-4 h-4" }} + + +
+
+ New notification + {{if not .Read}} +
+ {{end}} +
+
+
+ +
+ {{ template "repo/fragments/time" .Created }} +
+
+ +{{end}} diff --git a/appview/pages/templates/notifications/list.html b/appview/pages/templates/notifications/list.html new file mode 100644 index 00000000..7362e6db --- /dev/null +++ b/appview/pages/templates/notifications/list.html @@ -0,0 +1,46 @@ +{{ define "title" }}notifications{{ end }} + +{{ define "content" }} +
+
+

Notifications

+ + {{ i "settings" "w-4 h-4" }} + preferences + +
+
+ +
+ {{if .Notifications}} +
+ {{range .Notifications}} + {{template "notifications/fragments/item" .}} + {{end}} +
+ + {{if .HasMore}} +
+ +
+ {{end}} + {{else}} +
+
+ {{ i "bell-off" "w-16 h-16" }} +
+

No notifications

+

When you receive notifications, they'll appear here.

+
+ {{end}} +
+{{ end }} diff --git a/appview/pages/templates/strings/timeline.html b/appview/pages/templates/strings/timeline.html index dde7e929..fb6b675c 100644 --- a/appview/pages/templates/strings/timeline.html +++ b/appview/pages/templates/strings/timeline.html @@ -44,7 +44,7 @@ {{ $stat := .Stats }} {{ $resolved := resolve .Did.String }}
- + {{ template "user/fragments/picHandle" $resolved }} diff --git a/appview/pages/templates/user/fragments/picHandle.html b/appview/pages/templates/user/fragments/picHandle.html index a78a5532..dc7a2e3f 100644 --- a/appview/pages/templates/user/fragments/picHandle.html +++ b/appview/pages/templates/user/fragments/picHandle.html @@ -2,7 +2,7 @@ {{ . | truncateAt30 }} {{ end }} diff --git a/appview/pages/templates/user/fragments/picHandleLink.html b/appview/pages/templates/user/fragments/picHandleLink.html index e718cb43..686873f9 100644 --- a/appview/pages/templates/user/fragments/picHandleLink.html +++ b/appview/pages/templates/user/fragments/picHandleLink.html @@ -1,6 +1,6 @@ {{ define "user/fragments/picHandleLink" }} {{ $resolved := resolve . }} - + {{ template "user/fragments/picHandle" $resolved }} {{ end }} diff --git a/appview/pages/templates/user/settings/notifications.html b/appview/pages/templates/user/settings/notifications.html new file mode 100644 index 00000000..656ec642 --- /dev/null +++ b/appview/pages/templates/user/settings/notifications.html @@ -0,0 +1,173 @@ +{{ define "title" }}{{ .Tab }} settings{{ end }} + +{{ define "content" }} +
+

Settings

+
+
+
+
+ {{ template "user/settings/fragments/sidebar" . }} +
+
+ {{ template "notificationSettings" . }} +
+
+
+{{ end }} + +{{ define "notificationSettings" }} +
+
+

Notification Preferences

+

+ Choose which notifications you want to receive when activity happens on your repositories and profile. +

+
+
+ +
+ +
+
+
+
+ Repository starred +
+ When someone stars your repository. +
+
+
+ +
+ +
+
+
+ New issues +
+ When someone creates an issue on your repository. +
+
+
+ +
+ +
+
+
+ Issue comments +
+ When someone comments on an issue you're involved with. +
+
+
+ +
+ +
+
+
+ Issue closed +
+ When an issue on your repository is closed. +
+
+
+ +
+ +
+
+
+ New pull requests +
+ When someone creates a pull request on your repository. +
+
+
+ +
+ +
+
+
+ Pull request comments +
+ When someone comments on a pull request you're involved with. +
+
+
+ +
+ +
+
+
+ Pull request merged +
+ When your pull request is merged. +
+
+
+ +
+ +
+
+
+ New followers +
+ When someone follows you. +
+
+
+ +
+ +
+
+
+ Email notifications +
+ Receive notifications via email in addition to in-app notifications. +
+
+
+ +
+
+ +
+ +
+
+ +
+
+{{ end }}