diff --git a/package.json b/package.json
index b5a3c3678..b1fed994b 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,5 @@
"electron": "^1.4.15",
"electron-builder": "^11.7.0",
"electron-debug": "^1.1.0"
- },
- "dependencies": {}
+ }
}
diff --git a/ui/js/app.js b/ui/js/app.js
index 834af6521..a7c7dd188 100644
--- a/ui/js/app.js
+++ b/ui/js/app.js
@@ -15,6 +15,7 @@ const app = {
}
global.app = app;
module.exports = app;
+
//
// import React from 'react';
// import {Line} from 'rc-progress';
diff --git a/ui/js/component/file-actions.js b/ui/js/component/file-actions.js
index aef2f5380..2829615cc 100644
--- a/ui/js/component/file-actions.js
+++ b/ui/js/component/file-actions.js
@@ -1,10 +1,10 @@
import React from 'react';
import lbry from '../lbry.js';
import lbryuri from '../lbryuri.js';
-import {Icon, FilePrice} from '../component/common.js';
-import {Modal} from './modal.js';
-import {FormField} from './form.js';
import Link from 'component/link';
+import {Icon, FilePrice} from '../component/common.js';
+import Modal from './modal.js';
+import FormField from './form.js';
import {ToolTip} from '../component/tooltip.js';
import {DropDownMenu, DropDownMenuItem} from './menu.js';
diff --git a/ui/js/component/header.js b/ui/js/component/header.js
index 4ab99c061..f0d66caee 100644
--- a/ui/js/component/header.js
+++ b/ui/js/component/header.js
@@ -1,7 +1,7 @@
import React from 'react';
import lbryuri from '../lbryuri.js';
-import Link from 'component/link';
import {Icon, CreditAmount} from './common.js';
+import Link from 'component/link';
var Header = React.createClass({
_balanceSubscribeId: null,
diff --git a/ui/js/component/link.js b/ui/js/component/link.js
deleted file mode 100644
index d46fcda25..000000000
--- a/ui/js/component/link.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import React from 'react';
-import {Icon} from './common.js';
-import Modal from '../component/modal.js';
-import rewards from '../rewards.js';
-
-export let Link = React.createClass({
- propTypes: {
- label: React.PropTypes.string,
- icon: React.PropTypes.string,
- button: React.PropTypes.string,
- badge: React.PropTypes.string,
- hidden: React.PropTypes.bool,
- },
- getDefaultProps: function() {
- return {
- hidden: false,
- disabled: false,
- };
- },
- handleClick: function(e) {
- if (this.props.onClick) {
- this.props.onClick(e);
- }
- },
- render: function() {
- if (this.props.hidden) {
- return null;
- }
-
- /* The way the class name is generated here is a mess -- refactor */
-
- const className = (this.props.className || '') +
- (!this.props.className && !this.props.button ? 'button-text' : '') + // Non-button links get the same look as text buttons
- (this.props.button ? ' button-block button-' + this.props.button + ' button-set-item' : '') +
- (this.props.disabled ? ' disabled' : '');
-
- let content;
- if (this.props.children) { // Custom content
- content = this.props.children;
- } else {
- content = (
-
- {'icon' in this.props ? : null}
- {this.props.label ? {this.props.label} : null}
- {'badge' in this.props ? {this.props.badge} : null}
-
- );
- }
-
- return (
-
- {content}
-
- );
- }
-});
-
-export let RewardLink = React.createClass({
- propTypes: {
- type: React.PropTypes.string.isRequired,
- claimed: React.PropTypes.bool,
- onRewardClaim: React.PropTypes.func,
- onRewardFailure: React.PropTypes.func
- },
- refreshClaimable: function() {
- switch(this.props.type) {
- case 'new_user':
- this.setState({ claimable: true });
- return;
-
- case 'first_publish':
- lbry.claim_list_mine().then((list) => {
- this.setState({
- claimable: list.length > 0
- })
- });
- return;
- }
- },
- componentWillMount: function() {
- this.refreshClaimable();
- },
- getInitialState: function() {
- return {
- claimable: true,
- pending: false,
- errorMessage: null
- }
- },
- claimReward: function() {
- this.setState({
- pending: true
- })
- rewards.claimReward(this.props.type).then((reward) => {
- this.setState({
- pending: false,
- errorMessage: null
- })
- if (this.props.onRewardClaim) {
- this.props.onRewardClaim(reward);
- }
- }).catch((error) => {
- this.setState({
- errorMessage: error.message,
- pending: false
- })
- })
- },
- clearError: function() {
- if (this.props.onRewardFailure) {
- this.props.onRewardFailure()
- }
- this.setState({
- errorMessage: null
- })
- },
- render: function() {
- return (
-
- {this.props.claimed
- ? Reward claimed.
- : }
- {this.state.errorMessage ?
-
- {this.state.errorMessage}
-
- : ''}
-
- );
- }
-});
\ No newline at end of file
diff --git a/ui/js/component/splash.js b/ui/js/component/splash.js
index a156718b4..b0831b6a2 100644
--- a/ui/js/component/splash.js
+++ b/ui/js/component/splash.js
@@ -29,7 +29,6 @@ var SplashScreen = React.createClass({
});
lbry.resolve({uri: 'lbry://one'}).then(() => {
- window.sessionStorage.setItem('loaded', 'y')
this.props.onLoadDone();
});
return;
diff --git a/ui/js/page/help/view.jsx b/ui/js/page/help/view.jsx
index 5db7f6472..eba7a6273 100644
--- a/ui/js/page/help/view.jsx
+++ b/ui/js/page/help/view.jsx
@@ -2,7 +2,6 @@
import React from 'react';
import lbry from 'lbry.js';
import Link from 'component/link';
-import {SettingsNav} from './settings.js';
import {version as uiVersion} from 'json!../../../package.json';
var HelpPage = React.createClass({
@@ -24,6 +23,9 @@ var HelpPage = React.createClass({
});
});
},
+ componentDidMount: function() {
+ document.title = "Help";
+ },
render: function() {
let ver, osName, platform, newVerLink;
if (this.state.versionInfo) {
@@ -46,71 +48,58 @@ var HelpPage = React.createClass({
}
return (
-
-
+
-
-
Read the FAQ
-
-
-
Our FAQ answers many common questions.
-
-
+ Read the FAQ
+ Our FAQ answers many common questions.
+
-
-
Get Live Help
-
-
-
- Live help is available most hours in the #help channel of our Slack chat room.
-
-
-
-
-
+ Get Live Help
+
+ Live help is available most hours in the #help channel of our Slack chat room.
+
+
+
+
-
Report a Bug
-
-
Did you find something wrong?
-
-
Thanks! LBRY is made by its users.
-
+ Report a Bug
+ Did you find something wrong?
+
+ Thanks! LBRY is made by its users.
{!ver ? null :
-
About
-
- {ver.lbrynet_update_available || ver.lbryum_update_available ?
-
A newer version of LBRY is available.
- :
Your copy of LBRY is up to date.
- }
-
-
-
- daemon (lbrynet)
- {ver.lbrynet_version}
-
-
- wallet (lbryum)
- {ver.lbryum_version}
-
-
- interface
- {uiVersion}
-
-
- Platform
- {platform}
-
-
- Installation ID
- {this.state.lbryId}
-
-
-
-
+ About
+ {ver.lbrynet_update_available || ver.lbryum_update_available ?
+ A newer version of LBRY is available.
+ : Your copy of LBRY is up to date.
+ }
+
+
+
+ daemon (lbrynet)
+ {ver.lbrynet_version}
+
+
+ wallet (lbryum)
+ {ver.lbryum_version}
+
+
+ interface
+ {uiVersion}
+
+
+ Platform
+ {platform}
+
+
+ Installation ID
+ {this.state.lbryId}
+
+
+
}
diff --git a/ui/js/page/show.js b/ui/js/page/show.js
index e9013716b..f37994b7a 100644
--- a/ui/js/page/show.js
+++ b/ui/js/page/show.js
@@ -5,8 +5,8 @@ import lbryuri from '../lbryuri.js';
import {Video} from '../page/watch.js'
import {TruncatedText, Thumbnail, FilePrice, BusyMessage} from '../component/common.js';
import {FileActions} from '../component/file-actions.js';
-import Link from '../component/link';
import UriIndicator from '../component/channel-indicator.js';
+import Link from 'component/link';
var FormatItem = React.createClass({
propTypes: {