-
Notifications
You must be signed in to change notification settings - Fork 124
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: added notification preference ui
- Loading branch information
adeel.tajamul
committed
May 9, 2023
1 parent
7cf9294
commit 6eb8974
Showing
16 changed files
with
667 additions
and
1 deletion.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,16 @@ | ||
| /* eslint-disable import/no-named-default */ | ||
| import { combineReducers } from 'redux'; | ||
|
|
||
| import { | ||
| reducer as accountSettingsReducer, | ||
| storeName as accountSettingsStoreName, | ||
| } from '../account-settings'; | ||
| import { | ||
| default as notificationPreferencesReducer, | ||
| } from '../notification-preferences/data/reducers'; | ||
|
|
||
| const createRootReducer = () => combineReducers({ | ||
| [accountSettingsStoreName]: accountSettingsReducer, | ||
| notificationPreferences: notificationPreferencesReducer, | ||
| }); | ||
| export default createRootReducer; |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| import React, { useEffect } from 'react'; | ||
| import { useDispatch, useSelector } from 'react-redux'; | ||
| import { Link } from 'react-router-dom'; | ||
| import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; | ||
| import { Icon } from '@edx/paragon'; | ||
| import { ArrowForwardIos } from '@edx/paragon/icons'; | ||
| import { fetchCourseList } from './data/thunks'; | ||
| import { courseListStatus, getCourseList } from './data/selectors'; | ||
| import { IDLE_STATUS } from '../constants'; | ||
| import { messages } from './messages'; | ||
|
|
||
| const NotificationCourses = ({ intl }) => { | ||
| const dispatch = useDispatch(); | ||
| const courseStatus = useSelector(courseListStatus()); | ||
| const coursesList = useSelector(getCourseList()); | ||
| useEffect(() => { | ||
| if (courseStatus === IDLE_STATUS) { | ||
| dispatch(fetchCourseList()); | ||
| } | ||
| }, [courseStatus, dispatch]); | ||
| return ( | ||
| <div className="ml-auto mr-auto w-828px"> | ||
| <h2 className="notification-heading mt-6 mb-5.5"> | ||
| {intl.formatMessage(messages.notificationHeading)} | ||
| </h2> | ||
| <div> | ||
| { | ||
| coursesList.map(course => ( | ||
| <Link | ||
| to={`/notifications/${course.id}`} | ||
| > | ||
| <div className="mb-4 d-flex text-gray-700"> | ||
| <span className="ml-0 mr-auto"> | ||
| {course.name} | ||
| </span> | ||
| <span className="ml-auto mr-0"> | ||
| <Icon src={ArrowForwardIos} /> | ||
| </span> | ||
| </div> | ||
| </Link> | ||
| )) | ||
| } | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| NotificationCourses.propTypes = { | ||
| intl: intlShape.isRequired, | ||
| }; | ||
|
|
||
| export default injectIntl(NotificationCourses); |
70 changes: 70 additions & 0 deletions
70
src/notification-preferences/NotificationPreferenceGroup.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,70 @@ | ||
| import React, { useEffect, useState } from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { useDispatch, useSelector } from 'react-redux'; | ||
| import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; | ||
| import { Collapsible } from '@edx/paragon'; | ||
| import { messages } from './messages'; | ||
| import ToggleSwitch from './ToggleSwitch'; | ||
| import { | ||
| getCoursePreferenceGroup, | ||
| getSelectedCourse, | ||
| } from './data/selectors'; | ||
| import NotificationPreferenceRow from './NotificationPreferenceRow'; | ||
| import { updateGroupValue } from './data/actions'; | ||
|
|
||
| const NotificationPreferenceGroup = ({ intl, groupKey }) => { | ||
| const dispatch = useDispatch(); | ||
| const courseId = useSelector(getSelectedCourse()); | ||
| const preferenceGroup = useSelector(getCoursePreferenceGroup(groupKey)); | ||
| const [groupToggle, setGroupToggle] = useState(true); | ||
| useEffect(() => {}, [courseId]); | ||
| const onChangeGroupSettings = (checked) => { | ||
| setGroupToggle(checked); | ||
| dispatch(updateGroupValue(courseId, groupKey, checked)); | ||
| }; | ||
| if (!courseId) { | ||
| return null; | ||
| } | ||
| return ( | ||
| <Collapsible.Advanced open={groupToggle}> | ||
| <Collapsible.Trigger> | ||
| <div className="d-flex"> | ||
| <span className="ml-0 mr-auto"> | ||
| {intl.formatMessage(messages.notificationGroupTitle, { key: groupKey })} | ||
| </span> | ||
| <span className="ml-auto mr-0"> | ||
| <ToggleSwitch value={groupToggle} onChange={onChangeGroupSettings} /> | ||
| </span> | ||
| </div> | ||
| <hr /> | ||
| </Collapsible.Trigger> | ||
| <Collapsible.Body> | ||
| <div className="d-flex flex-row notification-help-text"> | ||
| <span className="w-66 ">{intl.formatMessage(messages.notificationHelpType)}</span> | ||
| <span className="d-flex w-34"> | ||
| <span className="ml-0 mr-auto">{intl.formatMessage(messages.notificationHelpWeb)}</span> | ||
| <span className="mx-auto">{intl.formatMessage(messages.notificationHelpEmail)}</span> | ||
| <span className="ml-auto mr-0 pr-2.5">{intl.formatMessage(messages.notificationHelpPush)}</span> | ||
| </span> | ||
| </div> | ||
| <div className="mt-3 pb-5"> | ||
| { | ||
| Object.keys(preferenceGroup).map(preferenceName => ( | ||
| <NotificationPreferenceRow | ||
| groupKey={groupKey} | ||
| preferenceName={preferenceName} | ||
| /> | ||
| )) | ||
| } | ||
| </div> | ||
| </Collapsible.Body> | ||
| </Collapsible.Advanced> | ||
| ); | ||
| }; | ||
|
|
||
| NotificationPreferenceGroup.propTypes = { | ||
| intl: intlShape.isRequired, | ||
| groupKey: PropTypes.string.isRequired, | ||
| }; | ||
|
|
||
| export default injectIntl(NotificationPreferenceGroup); |
51 changes: 51 additions & 0 deletions
51
src/notification-preferences/NotificationPreferenceRow.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,51 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { useDispatch, useSelector } from 'react-redux'; | ||
| import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; | ||
| import { messages } from './messages'; | ||
| import ToggleSwitch from './ToggleSwitch'; | ||
| import { getPreferenceAttribute } from './data/selectors'; | ||
| import { updatePreferenceValue } from './data/actions'; | ||
|
|
||
| const NotificationPreferenceRow = ({ intl, groupKey, preferenceName }) => { | ||
| const dispatch = useDispatch(); | ||
| const preference = useSelector(getPreferenceAttribute(groupKey, preferenceName)); | ||
| const onToggle = (checked, notificationFor) => { | ||
| dispatch(updatePreferenceValue(groupKey, preferenceName, notificationFor, checked)); | ||
| }; | ||
| return ( | ||
| <div className="d-flex flex-row mb-3"> | ||
| <span className="w-66"> | ||
| {intl.formatMessage(messages.notificationTitle, { text: preferenceName })} | ||
| </span> | ||
| <span className="d-flex w-34"> | ||
| <span className="ml-0 mr-auto"> | ||
| <ToggleSwitch | ||
| value={preference.web} | ||
| onChange={(checked) => onToggle(checked, 'web')} | ||
| /> | ||
| </span> | ||
| <span className="mx-auto"> | ||
| <ToggleSwitch | ||
| value={preference.email} | ||
| onChange={(checked) => onToggle(checked, 'email')} | ||
| /> | ||
| </span> | ||
| <span className="ml-auto mr-0"> | ||
| <ToggleSwitch | ||
| value={preference.push} | ||
| onChange={(checked) => onToggle(checked, 'push')} | ||
| /> | ||
| </span> | ||
| </span> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| NotificationPreferenceRow.propTypes = { | ||
| intl: intlShape.isRequired, | ||
| groupKey: PropTypes.string.isRequired, | ||
| preferenceName: PropTypes.string.isRequired, | ||
| }; | ||
|
|
||
| export default injectIntl(NotificationPreferenceRow); |
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,68 @@ | ||
| import React, { useEffect } from 'react'; | ||
| import { useDispatch, useSelector } from 'react-redux'; | ||
| import { useParams } from 'react-router'; | ||
| import { Link } from 'react-router-dom'; | ||
| import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; | ||
| import { Icon } from '@edx/paragon'; | ||
| import { ArrowBack } from '@edx/paragon/icons'; | ||
| import { | ||
| courseListStatus, | ||
| getCourse, | ||
| getCoursePreferences, | ||
| notificationPreferencesStatus, | ||
| } from './data/selectors'; | ||
| import { fetchCourseList, fetchCourseNotificationPreferences } from './data/thunks'; | ||
| import { messages } from './messages'; | ||
| import NotificationPreferenceGroup from './NotificationPreferenceGroup'; | ||
| import { updateSelectedCourse } from './data/actions'; | ||
| import { IDLE_STATUS, SUCCESS_STATUS } from '../constants'; | ||
|
|
||
| const NotificationPreferences = ({ intl }) => { | ||
| const { courseId } = useParams(); | ||
| const dispatch = useDispatch(); | ||
| const courseStatus = useSelector(courseListStatus()); | ||
| const notificationStatus = useSelector(notificationPreferencesStatus()); | ||
| const course = useSelector(getCourse(courseId)); | ||
| const preferences = useSelector(getCoursePreferences()); | ||
| useEffect(() => { | ||
| dispatch(updateSelectedCourse(courseId)); | ||
| if (courseStatus !== SUCCESS_STATUS) { | ||
| dispatch(fetchCourseList()); | ||
| } | ||
| if (notificationStatus === IDLE_STATUS) { | ||
| dispatch(fetchCourseNotificationPreferences(courseId)); | ||
| } | ||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| }, [courseId, course, preferences]); | ||
| if (notificationStatus === IDLE_STATUS) { | ||
| return null; | ||
| } | ||
| return ( | ||
| <div className="ml-auto mr-auto w-828px"> | ||
| <h2 className="notification-heading mt-6 mb-5.5"> | ||
| {intl.formatMessage(messages.notificationHeading)} | ||
| </h2> | ||
| <div> | ||
| <div className="d-flex mb-4"> | ||
| <Link to="/notifications"> | ||
| <Icon className="d-inline-block align-bottom ml-1" src={ArrowBack} /> | ||
| </Link> | ||
| <span className="notification-course-title ml-auto mr-auto"> | ||
| {course?.name} | ||
| </span> | ||
| </div> | ||
| { | ||
| Object.keys(preferences).map(key => ( | ||
| <NotificationPreferenceGroup groupKey={key} /> | ||
| )) | ||
| } | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| NotificationPreferences.propTypes = { | ||
| intl: intlShape.isRequired, | ||
| }; | ||
|
|
||
| export default injectIntl(NotificationPreferences); |
Oops, something went wrong.