Open platform to collect and prioritize feedback
Notifications dropdown
Matt Roberts761cb11eee55
diff --git a/app/services/sqlstore/postgres/notification.go b/app/services/sqlstore/postgres/notification.goindex 5832e9edc..473a9fce2 100644--- a/app/services/sqlstore/postgres/notification.go+++ b/app/services/sqlstore/postgres/notification.go@@ -115,7 +115,7 @@ func getActiveNotifications(ctx context.Context, q *query.GetActiveNotifications// Iterate over notifications and build avatar URLfor i := range q.Result {- q.Result[i].AvatarURL = buildAvatarURL(ctx, q.Result[i].AvatarType, int(q.Result[i].ID), q.Result[i].AuthorName, q.Result[i].AvatarBlobKey)+ q.Result[i].AvatarURL = buildAvatarURL(ctx, q.Result[i].AvatarType, int(q.Result[i].AuthorID), q.Result[i].AuthorName, q.Result[i].AvatarBlobKey)}return nildiff --git a/public/assets/styles/utility/display.scss b/public/assets/styles/utility/display.scssindex 23f3cd134..38ea83e9e 100644--- a/public/assets/styles/utility/display.scss+++ b/public/assets/styles/utility/display.scss@@ -149,7 +149,7 @@border: 0 solid get("colors.gray.100");border-top-width: 1px;}- .flex-y.flex--divide-#{$i} > *:last-child {+ .flex-y.flex--divide-#{$i}:not(.no-lastchild-paddingzero) > *:last-child {padding-bottom: 0;}}@@ -203,3 +203,11 @@cursor: pointer;pointer-events: inherit;}+++.hover {+ &:hover {+ background-color: get("colors.gray.100")+ }+}+diff --git a/public/components/NotificationIndicator.scss b/public/components/NotificationIndicator.scssindex d36e2da63..12eecac8e 100644--- a/public/components/NotificationIndicator.scss+++ b/public/components/NotificationIndicator.scss@@ -13,3 +13,8 @@border-radius: 100%;}}++.c-notifications-container {+ max-height: 80vh;+ overflow-y: auto;+}diff --git a/public/components/NotificationIndicator.tsx b/public/components/NotificationIndicator.tsxindex 63d1d0a88..f971d88b6 100644--- a/public/components/NotificationIndicator.tsx+++ b/public/components/NotificationIndicator.tsx@@ -10,8 +10,13 @@ import { Notification } from "@fider/models"import { HStack, VStack } from "./layout"export const NotificationItem = ({ notification }: { notification: Notification }) => {+ const openNotification = () => {+ console.log(notification.link)+ window.location.href = `/notifications/${notification.id}`+ }+return (- <HStack spacing={4} className="px-3">+ <HStack spacing={4} className="px-3 clickable hover py-2" onClick={openNotification}><Avatar user={{ name: notification.authorName, avatarURL: notification.avatarURL }} /><div><Markdown className="c-notification-indicator-text" text={notification.title} style="full" />@@ -38,7 +43,8 @@ export const NotificationIndicator = () => {const fider = useFider()const [unreadNotifications, setUnreadNotifications] = useState(0)const [showingNotifications, setShowingNotifications] = useState(false)- const [notifications, setNotifications] = useState<Notification[] | undefined>()+ const [recent, setRecent] = useState<Notification[] | undefined>()+ const [unread, setUnread] = useState<Notification[] | undefined>()useEffect(() => {if (fider.session.isAuthenticated) {@@ -54,7 +60,16 @@ export const NotificationIndicator = () => {if (showingNotifications) {actions.getAllNotifications().then((result) => {if (result) {- setNotifications(result.data)+ const [unread, recent] = (result.data || []).reduce(+ (result, item) => {+ result[item.read ? 1 : 0].push(item)+ return result+ },+ [[] as Notification[], [] as Notification[]]+ )+ setRecent(recent)+ setUnread(unread)+ setUnreadNotifications(unread.length)}})}@@ -64,19 +79,35 @@ export const NotificationIndicator = () => {<Dropdownwide={true}position="left"- onToggled={() => setShowingNotifications(!showingNotifications)}+ fullsceenSm={true}+ onToggled={(isOpen: boolean) => setShowingNotifications(isOpen)}renderHandle={<NotificationIcon unreadNotifications={unreadNotifications} />}>- <div>- {showingNotifications && notifications !== undefined && notifications?.length > 0 && (+ <div className="c-notifications-container">+ {showingNotifications && (unread !== undefined || recent !== undefined) && (<>- <p className="text-display text-center my-6 bg-gray-50">No new notifications</p>- <p className="text-title px-4 bg-gray-50">Previous notifications</p>- <VStack spacing={2} className="c-notifications-container py-2" divide={true}>- {notifications.map((n) => (- <NotificationItem key={n.id} notification={n} />- ))}- </VStack>+ {unread !== undefined && unread?.length > 0 ? (+ <>+ <p className="text-title px-4 mt-2">Unread notifications</p>+ <VStack spacing={2} className="py-3 mb-2 no-lastchild-paddingzero" divide={true}>+ {unread.map((n) => (+ <NotificationItem key={n.id} notification={n} />+ ))}+ </VStack>+ </>+ ) : (+ <p className="text-display text-center my-6">No new notifications</p>+ )}+ {recent !== undefined && recent?.length > 0 && (+ <>+ <p className="text-title px-4">Previous notifications</p>+ <VStack spacing={2} className="py-2 no-lastchild-paddingzero" divide={true}>+ {recent.map((n) => (+ <NotificationItem key={n.id} notification={n} />+ ))}+ </VStack>+ </>+ )}</>)}</div>diff --git a/public/components/common/Dropdown.scss b/public/components/common/Dropdown.scssindex 005b84568..38d94f00e 100644--- a/public/components/common/Dropdown.scss+++ b/public/components/common/Dropdown.scss@@ -31,7 +31,15 @@}&--wide {- max-width: sizing(120);+ max-width: sizing(180);+ }++ &--fullscreen-small {+ @include media("sm") {+ position: fixed;+ left: 0;+ width: 100vw;+ }}}diff --git a/public/components/common/Dropdown.tsx b/public/components/common/Dropdown.tsxindex 61e36c197..3493307b9 100644--- a/public/components/common/Dropdown.tsx+++ b/public/components/common/Dropdown.tsx@@ -45,6 +45,7 @@ interface DropdownProps {onToggled?: (isOpen: boolean) => voidchildren: React.ReactNodewide?: boolean+ fullsceenSm?: boolean}interface DropdownContextFuncs {@@ -62,6 +63,7 @@ export const Dropdown = (props: DropdownProps) => {const changeToggleState = (newState: boolean) => {setIsOpen(newState)if (props.onToggled) {+ console.log("onToggled", newState)props.onToggled(newState)}}@@ -93,6 +95,7 @@ export const Dropdown = (props: DropdownProps) => {const listClassName = classSet({"c-dropdown__list--wide": props.wide,"c-dropdown__list shadow-lg": true,+ "c-dropdown__list--fullscreen-small": props.fullsceenSm,[`c-dropdown__list--${position}`]: position === "left",})