LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Add identity verification to app #366

Merged
kauffj merged 15 commits from rewards3 into master 2017-07-25 01:02:40 +02:00
Conversation 1 Commits 15 Files changed 58 +119 -116
2 changed files with 119 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9bb618e3af - Show all commits

2
CHANGELOG.md
View file

@ -40,7 +40,7 @@ Web UI version numbers should always match the corresponding version of LBRY App
*
### Removed
*
* Removed bandwidth caps from settings, because the daemon was not respecting them anyway.
*
## [0.13.0] - 2017-06-30

91
ui/js/page/settings/view.jsx
View file

@ -13,8 +13,8 @@ class SettingsPage extends React.PureComponent {
const { daemonSettings } = this.props;
this.state = {
isMaxUpload: daemonSettings && daemonSettings.max_upload != 0,
isMaxDownload: daemonSettings && daemonSettings.max_download != 0,
// isMaxUpload: daemonSettings && daemonSettings.max_upload != 0,
// isMaxDownload: daemonSettings && daemonSettings.max_download != 0,
showUnavailable: lbry.getClientSetting("showUnavailable"),
language: lbry.getClientSetting("language"),
clearingCache: false,
@ -55,31 +55,31 @@ class SettingsPage extends React.PureComponent {
this.setDaemonSetting("download_directory", event.target.value);
}
onMaxUploadPrefChange(isLimited) {
if (!isLimited) {
this.setDaemonSetting("max_upload", 0.0);
}
this.setState({
isMaxUpload: isLimited,
});
}
onMaxUploadFieldChange(event) {
this.setDaemonSetting("max_upload", Number(event.target.value));
}
onMaxDownloadPrefChange(isLimited) {
if (!isLimited) {
this.setDaemonSetting("max_download", 0.0);
}
this.setState({
isMaxDownload: isLimited,
});
}
onMaxDownloadFieldChange(event) {
this.setDaemonSetting("max_download", Number(event.target.value));
}
// onMaxUploadPrefChange(isLimited) {
// if (!isLimited) {
// this.setDaemonSetting("max_upload", 0.0);
// }
// this.setState({
// isMaxUpload: isLimited,
// });
// }
//
// onMaxUploadFieldChange(event) {
// this.setDaemonSetting("max_upload", Number(event.target.value));
// }
//
// onMaxDownloadPrefChange(isLimited) {
// if (!isLimited) {
// this.setDaemonSetting("max_download", 0.0);
// }
// this.setState({
// isMaxDownload: isLimited,
// });
// }
//
// onMaxDownloadFieldChange(event) {
// this.setDaemonSetting("max_download", Number(event.target.value));
// }
onShowNsfwChange(event) {
this.props.setClientSetting("showNsfw", event.target.checked);
@ -148,23 +148,8 @@ class SettingsPage extends React.PureComponent {
</div>
</section>
*/
return (
<main className="main--single-column">
<SubHeader />
<section className="card">
<div className="card__content">
<h3>{__("Download Directory")}</h3>
</div>
<div className="card__content">
<FormRow
type="directory"
name="download_directory"
defaultValue={daemonSettings.download_directory}
helper={__("LBRY downloads will be saved here.")}
onChange={this.onDownloadDirChange.bind(this)}
/>
</div>
</section>
/*
<section className="card">
<div className="card__content">
<h3>{__("Bandwidth Limits")}</h3>
@ -252,6 +237,24 @@ class SettingsPage extends React.PureComponent {
</div>
</div>
</section>
*/
return (
<main className="main--single-column">
<SubHeader />
<section className="card">
<div className="card__content">
<h3>{__("Download Directory")}</h3>
</div>
<div className="card__content">
<FormRow
type="directory"
name="download_directory"
defaultValue={daemonSettings.download_directory}
helper={__("LBRY downloads will be saved here.")}
onChange={this.onDownloadDirChange.bind(this)}
/>
</div>
</section>
<section className="card">
<div className="card__content">
<h3>{__("Content")}</h3>