-
Notifications
You must be signed in to change notification settings - Fork 413
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
bring in email preferences page from lbry.com #4409
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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
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,16 @@ | ||
import { connect } from 'react-redux'; | ||
import { doSetClientSetting } from 'redux/actions/settings'; | ||
import { selectosNotificationsEnabled } from 'redux/selectors/settings'; | ||
import { selectUserVerifiedEmail } from 'redux/selectors/user'; | ||
import SettingsPage from './view'; | ||
|
||
const select = state => ({ | ||
osNotificationsEnabled: selectosNotificationsEnabled(state), | ||
isAuthenticated: selectUserVerifiedEmail(state), | ||
}); | ||
|
||
const perform = dispatch => ({ | ||
setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)), | ||
}); | ||
|
||
export default connect(select, perform)(SettingsPage); |
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,185 @@ | ||
// @flow | ||
import * as ICONS from 'constants/icons'; | ||
import * as PAGES from 'constants/pages'; | ||
import * as SETTINGS from 'constants/settings'; | ||
import * as React from 'react'; | ||
|
||
import Page from 'component/page'; | ||
import { FormField } from 'component/common/form'; | ||
import Card from 'component/common/card'; | ||
import { Lbryio } from 'lbryinc'; | ||
import { useHistory } from 'react-router'; | ||
import { Redirect } from 'react-router-dom'; | ||
import Yrbl from 'component/yrbl'; | ||
import Button from 'component/button'; | ||
|
||
type Props = { | ||
osNotificationsEnabled: boolean, | ||
isAuthenticated: boolean, | ||
setClientSetting: (string, boolean) => void, | ||
}; | ||
|
||
export default function NotificationSettingsPage(props: Props) { | ||
const { osNotificationsEnabled, setClientSetting, isAuthenticated } = props; | ||
const [error, setError] = React.useState(); | ||
const [tagMap, setTagMap] = React.useState({}); | ||
const [tags, setTags] = React.useState(); | ||
const [enabledEmails, setEnabledEmails] = React.useState(); | ||
const { location } = useHistory(); | ||
const urlParams = new URLSearchParams(location.search); | ||
const verificationToken = urlParams.get('verification_token'); | ||
const lbryIoParams = verificationToken ? { auth_token: verificationToken } : undefined; | ||
|
||
React.useEffect(() => { | ||
Lbryio.call('tag', 'list', lbryIoParams) | ||
.then(setTags) | ||
.catch(e => { | ||
setError(true); | ||
}); | ||
|
||
Lbryio.call('user_email', 'status', lbryIoParams) | ||
.then(res => { | ||
const enabledEmails = | ||
res.emails && | ||
Object.keys(res.emails).reduce((acc, email) => { | ||
const isEnabled = res.emails[email]; | ||
return [...acc, { email, isEnabled }]; | ||
}, []); | ||
|
||
setTagMap(res.tags); | ||
setEnabledEmails(enabledEmails); | ||
}) | ||
.catch(e => { | ||
setError(true); | ||
}); | ||
}, []); | ||
|
||
function handleChangeTag(name, newIsEnabled) { | ||
const tagParams = newIsEnabled ? { add: name } : { remove: name }; | ||
|
||
Lbryio.call('user_tag', 'edit', { ...lbryIoParams, ...tagParams }).then(() => { | ||
const newTagMap = { ...tagMap }; | ||
newTagMap[name] = newIsEnabled; | ||
|
||
setTagMap(newTagMap); | ||
}); | ||
} | ||
|
||
function handleChangeEmail(email, newIsEnabled) { | ||
Lbryio.call('user_email', 'edit', { | ||
email: email, | ||
enabled: newIsEnabled, | ||
...lbryIoParams, | ||
}) | ||
.then(() => { | ||
const newEnabledEmails = enabledEmails | ||
? enabledEmails.map(userEmail => { | ||
if (email === userEmail.email) { | ||
return { email, isEnabled: newIsEnabled }; | ||
} | ||
|
||
return userEmail; | ||
}) | ||
: []; | ||
|
||
setEnabledEmails(newEnabledEmails); | ||
}) | ||
.catch(e => { | ||
setError(true); | ||
}); | ||
} | ||
|
||
if (!isAuthenticated && !verificationToken) { | ||
return <Redirect to={`/$/${PAGES.AUTH_SIGNIN}?redirect=${location.pathname}`} />; | ||
} | ||
|
||
return ( | ||
<Page> | ||
{error ? ( | ||
<Yrbl | ||
type="sad" | ||
title={__('Uh Oh')} | ||
subtitle={ | ||
<> | ||
<div>{__('There was an error displaying this page.')}</div> | ||
<div className="section__actions"> | ||
<Button | ||
button="secondary" | ||
label={__('Refresh')} | ||
icon={ICONS.REFRESH} | ||
onClick={() => window.location.reload()} | ||
/> | ||
<Button button="secondary" label={__('Go Home')} icon={ICONS.HOME} navigate={'/'} /> | ||
</div> | ||
</> | ||
} | ||
/> | ||
) : ( | ||
<div className="card-stack"> | ||
{/* @if TARGET='app' */} | ||
<Card | ||
title={__('App Notifications')} | ||
subtitle={__('Notification settings for the desktop app.')} | ||
actions={ | ||
<FormField | ||
type="checkbox" | ||
name="desktopNotification" | ||
onChange={() => setClientSetting(SETTINGS.OS_NOTIFICATIONS_ENABLED, !osNotificationsEnabled)} | ||
checked={osNotificationsEnabled} | ||
label={__('Show Desktop Notifications')} | ||
helper={__('Get notified when a publish or channel is confirmed.')} | ||
/> | ||
} | ||
/> | ||
|
||
{/* @endif */} | ||
|
||
{enabledEmails && enabledEmails.length > 0 && ( | ||
<Card | ||
title={enabledEmails.length === 1 ? __('Your Email') : __('Receiving Addresses')} | ||
subtitle={__('Uncheck your email below if you want to stop receiving messages.')} | ||
actions={ | ||
<> | ||
{enabledEmails.map(({ email, isEnabled }) => ( | ||
<FormField | ||
type="checkbox" | ||
name={`active-email:${email}`} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is this safe for all potential emails? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah. It's just used for the input label for screen readers |
||
key={email} | ||
onChange={() => handleChangeEmail(email, !isEnabled)} | ||
checked={isEnabled} | ||
label={email} | ||
/> | ||
))} | ||
</> | ||
} | ||
/> | ||
)} | ||
|
||
{tags && tags.length > 0 && ( | ||
<Card | ||
title={__('Email Preferences')} | ||
subtitle={__("Opt out of any topics you don't want to receive email about.")} | ||
actions={ | ||
<> | ||
{tags.map(tag => { | ||
const isEnabled = tagMap[tag.name]; | ||
return ( | ||
<FormField | ||
type="checkbox" | ||
key={tag.name} | ||
name={tag.name} | ||
onChange={() => handleChangeTag(tag.name, !isEnabled)} | ||
checked={isEnabled} | ||
label={tag.description} | ||
/> | ||
); | ||
})} | ||
</> | ||
} | ||
/> | ||
)} | ||
</div> | ||
)} | ||
</Page> | ||
); | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe we could introduce tabs to settings instead of this? (not blocking feedback, can evolve)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah. This definitely a step towards some tabbed/nested setting page.