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

channel and file selector fixes

Browse source
This commit is contained in:
Jeremy Kauffman 2017-05-21 10:42:34 -04:00
parent bb16156034
commit 951190bf96
15 changed files with 127 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ui/js/actions/content.js
View file

@ -26,6 +26,8 @@ import {
export function doResolveUri(uri) {
return function(dispatch, getState) {
uri = lbryuri.normalize(uri)
const state = getState()
const alreadyResolving = selectResolvingUris(state).indexOf(uri) !== -1
@ -81,14 +83,6 @@ export function doFetchFeaturedUris() {
featuredUris[category] = Uris[category]
}
})
//
// dispatch({
// type: types.FETCH_FEATURED_CONTENT_COMPLETED,
// data: {
// categories: ["FOO"],
// uris: { FOO: ["lbry://gtasoc"]},
// }
// })
dispatch({
type: types.FETCH_FEATURED_CONTENT_COMPLETED,

2
ui/js/actions/cost_info.js
View file

@ -1,4 +1,4 @@
import * as types from 'constants/action_types'
import * as types from 'constants/action_types'
import lbry from 'lbry'
import lbryio from 'lbryio'
import {

2
ui/js/component/fileActions/view.jsx
View file

@ -118,7 +118,7 @@ class FileActions extends React.Component {
<DropDownMenuItem key={1} onClick={() => openModal('confirmRemove')} label="Remove..." />
</DropDownMenu> : '' }
<Modal type="confirm" isOpen={modal == 'affirmPurchase'}
contentLabel="Confirm Purchase" onConfirmed={this.onAffirmPurchase.bind(this)} onAborted={this.closeModal.bind(this)}>
contentLabel="Confirm Purchase" onConfirmed={this.onAffirmPurchase.bind(this)} onAborted={this.props.closeModal}>
This will purchase <strong>{title}</strong> for <strong><FilePrice uri={uri} look="plain" /></strong> credits.
</Modal>
<Modal isOpen={modal == 'notEnoughCredits'} contentLabel="Not enough credits"

4
ui/js/component/form.js
View file

@ -32,7 +32,7 @@ export class FormField extends React.Component {
}
componentWillMount() {
if (['text', 'number', 'radio', 'checkbox', 'file'].includes(this.props.type)) {
if (['text', 'number', 'radio', 'checkbox'].includes(this.props.type)) {
this._element = 'input';
this._type = this.props.type;
} else if (this.props.type == 'text-number') {
@ -118,7 +118,7 @@ export class FormField extends React.Component {
</label> :
element }
{ formFieldFileSelectorTypes.includes(this.props.type) ?
<FileSelector type={this.props.type} onFileChosen={this.handleFileChosen}
<FileSelector type={this.props.type} onFileChosen={this.handleFileChosen.bind(this)}
{... this.props.defaultValue ? {initPath: this.props.defaultValue} : {}} /> :
null }
{ this.props.postfix ? <span className="form-field__postfix">{this.props.postfix}</span> : '' }

4
ui/js/component/reward-link.js
View file

@ -30,11 +30,11 @@ export class RewardLink extends React.Component {
return;
case 'first_publish':
lbry.claim_list_mine().then(function(list) {
lbry.claim_list_mine().then((list) => {
this.setState({
claimable: list.length > 0
})
}.bind(this));
});
return;
}
}

17
ui/js/component/uriIndicator/index.js
View file

@ -1,20 +1,31 @@
import React from 'react'
import lbryuri from 'lbryuri';
import {
connect,
} from 'react-redux'
import {
makeSelectIsResolvingForUri
} from 'selectors/content'
import {
makeSelectClaimForUri,
} from 'selectors/claims'
import UriIndicator from './view'
const makeSelect = () => {
const selectClaimForUri = makeSelectClaimForUri()
const selectClaim = makeSelectClaimForUri(),
selectIsResolving = makeSelectIsResolvingForUri();
const select = (state, props) => ({
claim: selectClaimForUri(state, props),
claim: selectClaim(state, props),
isResolvingUri: selectIsResolving(state, props),
uri: lbryuri.normalize(props.uri),
})
return select
}
export default connect(makeSelect, null)(UriIndicator)
const perform = (dispatch) => ({
resolveUri: (uri) => dispatch(doResolveUri(uri))
})
export default connect(makeSelect, perform)(UriIndicator)

98
ui/js/component/uriIndicator/view.jsx
View file

@ -1,50 +1,74 @@
import React from 'react';
import lbry from 'lbry';
import lbryuri from 'lbryuri';
import {Icon} from 'component/common';
const UriIndicator = (props) => {
const {
uri,
claim
} = props
const uriObj = lbryuri.parse(uri);
if (!claim) {
return <span className="empty">Unused</span>
class UriIndicator extends React.Component{
componentWillMount() {
this.resolve(this.props)
}
const {
has_signature: hasSignature,
signature_is_valid: signatureIsValid
} = claim
if (!hasSignature || !uriObj.isChannel) {
return <span className="empty">Anonymous</span>;
componentWillReceiveProps(nextProps) {
this.resolve(nextProps)
}
const channelUriObj = Object.assign({}, uriObj);
delete channelUriObj.path;
delete channelUriObj.contentName;
const channelUri = lbryuri.build(channelUriObj, false);
resolve(props) {
const {
isResolvingUri,
resolveUri,
claim,
uri,
} = props
let icon, modifier;
if (signatureIsValid) {
modifier = 'valid';
} else {
icon = 'icon-times-circle';
modifier = 'invalid';
if(!isResolvingUri && claim === undefined && uri) {
resolveUri(uri)
}
}
return (
<span>
{channelUri} {' '}
{ !signatureIsValid ?
<Icon icon={icon} className={`channel-indicator__icon channel-indicator__icon--${modifier}`} /> :
'' }
</span>
)
render() {
const {
claim,
uri,
isResolvingUri
} = this.props
if (isResolvingUri) {
return <span className="empty">Validating...</span>
}
if (!claim) {
return <span className="empty">Unused</span>
}
const {
channel_name: channelName,
has_signature: hasSignature,
signature_is_valid: signatureIsValid,
} = claim
console.log('uri indicator render')
console.log(uri)
console.log(claim)
if (!hasSignature || !channelName) {
return <span className="empty">Anonymous</span>;
}
let icon, modifier;
if (signatureIsValid) {
modifier = 'valid';
} else {
icon = 'icon-times-circle';
modifier = 'invalid';
}
return (
<span>
{channelName} {' '}
{ !signatureIsValid ?
<Icon icon={icon} className={`channel-indicator__icon channel-indicator__icon--${modifier}`} /> :
'' }
</span>
)
}
}
export default UriIndicator;

3
ui/js/page/channel/index.js
View file

@ -11,8 +11,6 @@ import {
} from 'selectors/claims'
import ChannelPage from './view'
import FilePage from './view'
const makeSelect = () => {
const selectClaim = makeSelectClaimForUri(),
selectClaimsInChannel = makeSelectClaimsInChannelForUri()
@ -26,7 +24,6 @@ const makeSelect = () => {
}
const perform = (dispatch) => ({
// fetchClaims: () => { console.log('fetch claims') }
fetchClaims: (uri) => dispatch(doFetchClaimsByChannel(uri))
})

21
ui/js/page/channel/view.jsx
View file

@ -1,5 +1,7 @@
import React from 'react';
import lbryuri from 'lbryuri'
import {BusyMessage} from 'component/common'
import FileTile from 'component/fileTile'
class ChannelPage extends React.Component{
componentDidMount() {
@ -23,7 +25,15 @@ class ChannelPage extends React.Component{
uri
} = this.props
console.log(claimsInChannel);
let contentList
if (claimsInChannel === undefined) {
contentList = <BusyMessage message="Fetching content" />
} else if (claimsInChannel) {
contentList = claimsInChannel.length ?
claimsInChannel.map((claim) => <FileTile key={claim.claim_id} uri={lbryuri.build({name: claim.name, claimId: claim.claim_id})} />) :
<span className="empty">No content found.</span>
}
return <main className="main--single-column">
<section className="card">
<div className="card__inner">
@ -35,13 +45,8 @@ class ChannelPage extends React.Component{
</p>
</div>
</section>
<section className="card">
<div className="card__content">
{claimsInChannel ?
claimsInChannel.map((claim) => <FileTile uri={lbryuri.build({name: claim.name, claimId: claim.claim_id})} /> )
: ''}
</div>
</section>
<h3 className="card-row__header">Published Content</h3>
{contentList}
</main>
}
}

4
ui/js/page/filePage/index.js
View file

@ -2,6 +2,9 @@ import React from 'react'
import {
connect
} from 'react-redux'
import {
doNavigate,
} from 'actions/app'
import {
doFetchFileInfo,
} from 'actions/file_info'
@ -37,6 +40,7 @@ const makeSelect = () => {
}
const perform = (dispatch) => ({
navigate: (path, params) => dispatch(doNavigate(path, params)),
fetchFileInfo: (uri) => dispatch(doFetchFileInfo(uri))
})

9
ui/js/page/filePage/view.jsx
View file

@ -74,6 +74,7 @@ class FilePage extends React.Component{
const {
txid,
nout,
channel_name: channelName,
has_signature: hasSignature,
signature_is_valid: signatureIsValid,
value
@ -81,10 +82,8 @@ class FilePage extends React.Component{
const outpoint = txid + ':' + nout
const title = metadata.title
const channelUriObj = lbryuri.parse(uri)
delete channelUriObj.path;
delete channelUriObj.contentName;
const channelUri = signatureIsValid && hasSignature && channelUriObj.isChannel ? lbryuri.build(channelUriObj, false) : null
const channelClaimId = claim.value && claim.value.publisherSignature ? claim.value.publisherSignature.certificateId : null;
const channelUri = signatureIsValid && hasSignature && channelName ? lbryuri.build({channelName, claimId: channelClaimId}, false) : null
const uriIndicator = <UriIndicator uri={uri} />
return (
@ -102,7 +101,7 @@ class FilePage extends React.Component{
: null}<h1>{title}</h1>
<div className="card__subtitle">
{ channelUri ?
<Link href={"?show=" + channelUri }>{uriIndicator}</Link> :
<Link onClick={() => this.props.navigate('/show', { uri: channelUri })}>{uriIndicator}</Link> :
uriIndicator}
</div>
<div className="card__actions">

2
ui/js/page/search/view.jsx
View file

@ -8,8 +8,6 @@ import {BusyMessage} from 'component/common.js';
class SearchPage extends React.Component{
render() {
console.log('render search page')
const {
query,
} = this.props

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

@ -105,7 +105,7 @@ class SettingsPage extends React.Component {
name="download_directory"
defaultValue={daemonSettings.download_directory}
helper="LBRY downloads will be saved here."
onChange={this.onDownloadDirChange} />
onChange={this.onDownloadDirChange.bind(this)} />
</div>
</section>
<section className="card">
@ -132,7 +132,7 @@ class SettingsPage extends React.Component {
defaultValue={daemonSettings.max_upload}
placeholder="10"
className="form-field__input--inline"
onChange={this.onMaxUploadFieldChange}
onChange={this.onMaxUploadFieldChange.bind(this)}
/>
: ''
@ -160,7 +160,7 @@ class SettingsPage extends React.Component {
defaultValue={daemonSettings.max_download}
placeholder="10"
className="form-field__input--inline"
onChange={this.onMaxDownloadFieldChange}
onChange={this.onMaxDownloadFieldChange.bind(this)}
/>
: ''
@ -175,13 +175,13 @@ class SettingsPage extends React.Component {
</div>
<div className="card__content">
<FormRow type="checkbox"
onChange={this.onShowUnavailableChange}
onChange={this.onShowUnavailableChange.bind(this)}
defaultChecked={this.state.showUnavailable}
label="Show unavailable content in search results" />
</div>
<div className="card__content">
<FormRow label="Show NSFW content" type="checkbox"
onChange={this.onShowNsfwChange} defaultChecked={this.state.showNsfw}
onChange={this.onShowNsfwChange.bind(this)} defaultChecked={this.state.showNsfw}
helper="NSFW content may include nudity, intense sexuality, profanity, or other adult content. By displaying NSFW content, you are affirming you are of legal age to view mature content in your country or jurisdiction. " />
</div>
</section>
@ -191,7 +191,7 @@ class SettingsPage extends React.Component {
</div>
<div className="card__content">
<FormRow type="checkbox"
onChange={this.onShareDataChange}
onChange={this.onShareDataChange.bind(this)}
defaultChecked={daemonSettings.share_usage_data}
label="Help make LBRY better by contributing diagnostic data about my usage" />
</div>

2
ui/js/page/showPage/view.jsx
View file

@ -49,7 +49,7 @@ class ShowPage extends React.Component{
</section>
}
else if (claim.name.length && claim.name[0] === '@') {
innerContent = <ChannelPage uri={lbryuri.build({ name: claim.name, claimId: claim.claim_id })} />
innerContent = <ChannelPage uri={uri} />
}
else if (claim) {
innerContent = <FilePage uri={uri} />

16
ui/js/reducers/claims.js
View file

@ -57,6 +57,22 @@ reducers[types.CLAIM_LIST_MINE_COMPLETED] = function(state, action) {
})
}
// reducers[types.FETCH_CHANNEL_CLAIMS_STARTED] = function(state, action) {
// const {
// uri,
// } = action.data
//
// const newClaims = Object.assign({}, state.claimsByChannel)
//
// if (claims !== undefined) {
// newClaims[uri] = claims
// }
//
// return Object.assign({}, state, {
// claimsByChannel: newClaims
// })
// }
reducers[types.FETCH_CHANNEL_CLAIMS_COMPLETED] = function(state, action) {
const {
uri,