From d1fee01c6a9675ed24b5d37bd1738d5eb770d511 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 18 May 2019 16:41:22 -0700 Subject: [PATCH] Adding browser notifications. - Fixes #153 --- ui/src/components/navbar.tsx | 47 ++++++++++++++++++++++++++++++++++-- ui/src/components/post.tsx | 2 +- ui/src/css/main.css | 4 +++ 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx index 844711457..c19c20848 100644 --- a/ui/src/components/navbar.tsx +++ b/ui/src/components/navbar.tsx @@ -3,7 +3,7 @@ import { Link } from 'inferno-router'; import { Subscription } from "rxjs"; import { retryWhen, delay, take } from 'rxjs/operators'; import { WebSocketService, UserService } from '../services'; -import { UserOperation, GetRepliesForm, GetRepliesResponse, SortType, GetSiteResponse } from '../interfaces'; +import { UserOperation, GetRepliesForm, GetRepliesResponse, SortType, GetSiteResponse, Comment} from '../interfaces'; import { msgOp } from '../utils'; import { version } from '../version'; @@ -11,6 +11,7 @@ interface NavbarState { isLoggedIn: boolean; expanded: boolean; expandUserDropdown: boolean; + replies: Array, unreadCount: number; siteName: string; } @@ -21,6 +22,7 @@ export class Navbar extends Component { emptyState: NavbarState = { isLoggedIn: (UserService.Instance.user !== undefined), unreadCount: 0, + replies: [], expanded: false, expandUserDropdown: false, siteName: undefined @@ -37,6 +39,7 @@ export class Navbar extends Component { this.userSub = UserService.Instance.sub.subscribe(user => { this.state.isLoggedIn = user.user !== undefined; this.state.unreadCount = user.unreadCount; + this.requestNotificationPermission(); this.setState(this.state); }); @@ -48,6 +51,10 @@ export class Navbar extends Component { () => console.log('complete') ); + if (this.state.isLoggedIn) { + this.requestNotificationPermission(); + } + WebSocketService.Instance.getSite(); } @@ -151,6 +158,12 @@ export class Navbar extends Component { return; } else if (op == UserOperation.GetReplies) { let res: GetRepliesResponse = msg; + if (res.replies.length > 0 && this.state.replies.length > 0 && + (JSON.stringify(this.state.replies) !== JSON.stringify(res.replies))) { + this.notify(res.replies); + } + + this.state.replies = res.replies; this.sendRepliesCount(res); } else if (op == UserOperation.GetSite) { let res: GetSiteResponse = msg; @@ -187,5 +200,35 @@ export class Navbar extends Component { sendRepliesCount(res: GetRepliesResponse) { UserService.Instance.sub.next({user: UserService.Instance.user, unreadCount: res.replies.filter(r => !r.read).length}); } -} + requestNotificationPermission() { + if (UserService.Instance.user) { + document.addEventListener('DOMContentLoaded', function () { + if (!Notification) { + alert('Desktop notifications not available in your browser. Try Chromium.'); + return; + } + + if (Notification.permission !== 'granted') + Notification.requestPermission(); + }); + } + } + + notify(replies: Array) { + let recentReply = replies[0]; + if (Notification.permission !== 'granted') + Notification.requestPermission(); + else { + var notification = new Notification(`${replies.length} Unread Messages`, { + icon: `${window.location.protocol}//${window.location.host}/static/assets/apple-touch-icon.png`, + body: recentReply.content + }); + + notification.onclick = () => { + this.context.router.history.push(`/post/${recentReply.post_id}/comment/${recentReply.id}`); + }; + + } + } +} diff --git a/ui/src/components/post.tsx b/ui/src/components/post.tsx index 7b2f790eb..8fa18fbf8 100644 --- a/ui/src/components/post.tsx +++ b/ui/src/components/post.tsx @@ -69,7 +69,7 @@ export class Post extends Component { if (this.state.scrolled_comment_id && !this.state.scrolled && lastState.comments.length > 0) { var elmnt = document.getElementById(`comment-${this.state.scrolled_comment_id}`); elmnt.scrollIntoView(); - elmnt.classList.add("mark"); + elmnt.classList.add("mark-two"); this.state.scrolled = true; } } diff --git a/ui/src/css/main.css b/ui/src/css/main.css index c3ff3bdab..2a65ca19f 100644 --- a/ui/src/css/main.css +++ b/ui/src/css/main.css @@ -38,6 +38,10 @@ body, .text-white, .navbar-brand, .badge-light, .btn-secondary { background-color: #333; } +.mark-two { + background-color: #444 !important; +} + .md-div p { margin-bottom: 0px; }