-
-
Notifications
You must be signed in to change notification settings - Fork 527
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
24 changed files
with
461 additions
and
130 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
frontend/src/components/NotificationsList/NotificationsListError.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
frontend/src/components/NotificationsList/NotificationsListLoading.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
frontend/src/components/NotificationsOverlay/NotificationsOverlay.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| import React from "react" | ||
| import { connect } from "react-redux" | ||
| import { close } from "../../reducers/notifications" | ||
| import NotificationsFetch from "../NotificationsFetch" | ||
| import { | ||
| NotificationsList, | ||
| NotificationsListError, | ||
| NotificationsListLoading, | ||
| } from "../NotificationsList" | ||
| import NotificationsOverlayLayout from "./NotificationsOverlayLayout" | ||
|
|
||
| class NotificationsOverlay extends React.Component { | ||
| constructor(props) { | ||
| super(props) | ||
|
|
||
| this.body = document.body | ||
|
|
||
| this.state = { | ||
| unread: false, | ||
| url: "", | ||
| } | ||
| } | ||
|
|
||
| getApiUrl() { | ||
| let url = misago.get("NOTIFICATIONS_API") + "?limit=20" | ||
| url += this.state.unread ? "&filter=unread" : "" | ||
| return url | ||
| } | ||
|
|
||
| componentDidUpdate(prevProps, prevState) { | ||
| if (prevProps.open !== this.props.open) { | ||
| if (this.props.open) { | ||
| this.body.classList.add("notifications-fullscreen") | ||
| } else { | ||
| this.body.classList.remove("notifications-fullscreen") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| close = () => { | ||
| this.props.dispatch(close()) | ||
| } | ||
|
|
||
| render = () => ( | ||
| <NotificationsOverlayLayout | ||
| close={this.close} | ||
| unread={this.state.unread} | ||
| showAll={() => this.setState({ unread: false })} | ||
| showUnread={() => this.setState({ unread: true })} | ||
| > | ||
| <NotificationsFetch | ||
| filter={this.state.unread ? "unread" : "all"} | ||
| disabled={!this.props.open} | ||
| > | ||
| {({ data, loading, error }) => { | ||
| if (loading) { | ||
| return <NotificationsListLoading /> | ||
| } | ||
|
|
||
| if (error) { | ||
| return <NotificationsListError error={error} /> | ||
| } | ||
|
|
||
| return ( | ||
| <NotificationsList | ||
| filter={this.state.unread ? "unread" : "all"} | ||
| items={data ? data.results : []} | ||
| /> | ||
| ) | ||
| }} | ||
| </NotificationsFetch> | ||
| </NotificationsOverlayLayout> | ||
| ) | ||
| } | ||
|
|
||
| function select(state) { | ||
| return { open: state.notifications.open } | ||
| } | ||
|
|
||
| const NotificationsOverlayConnected = connect(select)(NotificationsOverlay) | ||
|
|
||
| export default NotificationsOverlayConnected |
61 changes: 61 additions & 0 deletions
61
frontend/src/components/NotificationsOverlay/NotificationsOverlayLayout.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| import classnames from "classnames" | ||
| import React from "react" | ||
| import { DropdownFooter, DropdownHeader, DropdownPills } from "../Dropdown" | ||
|
|
||
| export default function NotificationsOverlayLayout({ | ||
| children, | ||
| close, | ||
| showAll, | ||
| showUnread, | ||
| unread, | ||
| }) { | ||
| return ( | ||
| <div className="notifications-overlay-layout"> | ||
| <div className="notifications-overlay-header"> | ||
| <div className="notifications-overlay-caption"> | ||
| {pgettext("notifications title", "Notifications")} | ||
| </div> | ||
| <button | ||
| className="btn btn-notifications-overlay" | ||
| title={pgettext("dialog", "Cancel")} | ||
| type="button" | ||
| onClick={close} | ||
| > | ||
| <span className="material-icon">close</span> | ||
| </button> | ||
| </div> | ||
| <DropdownPills> | ||
| <NotificationsOverlayLayoutPill active={!unread} onClick={showAll}> | ||
| {pgettext("notifications dropdown", "All")} | ||
| </NotificationsOverlayLayoutPill> | ||
| <NotificationsOverlayLayoutPill active={unread} onClick={showUnread}> | ||
| {pgettext("notifications dropdown", "Unread")} | ||
| </NotificationsOverlayLayoutPill> | ||
| </DropdownPills> | ||
| {children} | ||
| <DropdownFooter> | ||
| <a | ||
| className="btn btn-default btn-block" | ||
| href={misago.get("NOTIFICATIONS_URL")} | ||
| > | ||
| {pgettext("notifications", "See all notifications")} | ||
| </a> | ||
| </DropdownFooter> | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| function NotificationsOverlayLayoutPill({ active, children, onClick }) { | ||
| return ( | ||
| <button | ||
| className={classnames("btn", { | ||
| "btn-primary": active, | ||
| "btn-default": !active, | ||
| })} | ||
| type="button" | ||
| onClick={onClick} | ||
| > | ||
| {children} | ||
| </button> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| import NotificationsOverlay from "./NotificationsOverlay" | ||
|
|
||
| export default NotificationsOverlay |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 39 additions & 0 deletions
39
frontend/src/components/user-menu/UserNotificationsOverlay.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| import React from "react" | ||
| import { connect } from "react-redux" | ||
| import { open } from "../../reducers/notifications" | ||
|
|
||
| function UserNotificationsOverlay({ dispatch, user }) { | ||
| let title = null | ||
| if (user.unreadNotifications) { | ||
| title = gettext("You have unread notifications!") | ||
| } else { | ||
| title = pgettext("navbar link", "Notifications") | ||
| } | ||
|
|
||
| return ( | ||
| <li> | ||
| <a | ||
| className="navbar-icon" | ||
| href={misago.get("NOTIFICATIONS_URL")} | ||
| onClick={(event) => { | ||
| event.preventDefault() | ||
| dispatch(open()) | ||
| }} | ||
| title={title} | ||
| > | ||
| <span className="material-icon"> | ||
| {!!user.unreadNotifications | ||
| ? "notifications_active" | ||
| : "notifications_none"} | ||
| </span> | ||
| {!!user.unreadNotifications && ( | ||
| <span className="badge">{user.unreadNotifications}</span> | ||
| )} | ||
| </a> | ||
| </li> | ||
| ) | ||
| } | ||
|
|
||
| const UserNotificationsOverlayConnected = connect()(UserNotificationsOverlay) | ||
|
|
||
| export default UserNotificationsOverlayConnected |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
frontend/src/initializers/components/notifications-overlay.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import React from "react" | ||
| import ReactDOM from "react-dom" | ||
| import { Provider } from "react-redux" | ||
| import NotificationsOverlay from "../../components/NotificationsOverlay" | ||
| import store from "../../services/store" | ||
|
|
||
| export default function initializer(context) { | ||
| if (context.get("isAuthenticated")) { | ||
| const root = document.getElementById("notifications-mount") | ||
| ReactDOM.render( | ||
| <Provider store={store.getStore()}> | ||
| <NotificationsOverlay /> | ||
| </Provider>, | ||
| root | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| misago.addInitializer({ | ||
| name: "component:notifications-overlay", | ||
| initializer: initializer, | ||
| after: "store", | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import misago from "misago/index" | ||
| import reducer, { initialState } from "../../reducers/notifications" | ||
| import store from "../../services/store" | ||
|
|
||
| export default function initializer(context) { | ||
| store.addReducer("notifications", reducer, initialState) | ||
| } | ||
|
|
||
| misago.addInitializer({ | ||
| name: "reducer:notifications", | ||
| initializer: initializer, | ||
| before: "store", | ||
| }) |
Oops, something went wrong.