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

fix: channel navigation from search page

Browse source
This commit is contained in:
Sean Yesmunt 2019-03-19 00:15:42 -04:00
parent 78b7ae58bd
commit c74440692d
2 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/ui/component/channelTile/view.jsx
View file

@ -45,26 +45,26 @@ class ChannelTile extends React.PureComponent<Props> {
subscriptionUri = `lbry://${claim.permanent_url}`;
}
const onClick = () => navigate('/show', { uri });
const onClick = () => navigate('/show', { uri, page: 1 });
return (
<section
onClick={onClick}
role="button"
role='button'
className={classnames('media-tile card--link', {
'media-tile--small': size === 'small',
'media-tile--large': size === 'large',
})}
>
<CardMedia title={channelName} thumbnail={null} />
<div className="media__info">
{isResolvingUri && <div className="media__title">{__('Loading...')}</div>}
<div className='media__info'>
{isResolvingUri && <div className='media__title'>{__('Loading...')}</div>}
{!isResolvingUri && (
<React.Fragment>
<div className="media__title">
<div className='media__title'>
<TruncatedText text={channelName || uri} lines={1} />
</div>
<div className="media__subtitle">
<div className='media__subtitle'>
{totalItems > 0 && (
<span>
{totalItems} {totalItems === 1 ? 'publish' : 'publishes'}
@ -75,8 +75,8 @@ class ChannelTile extends React.PureComponent<Props> {
</React.Fragment>
)}
{subscriptionUri && (
<div className="media__actions">
<SubscribeButton buttonStyle="inverse" uri={subscriptionUri} />
<div className='media__actions'>
<SubscribeButton buttonStyle='inverse' uri={subscriptionUri} />
</div>
)}
</div>

46
src/ui/page/channel/view.jsx
View file

@ -32,11 +32,11 @@ class ChannelPage extends React.PureComponent<Props> {
fetchClaims(uri, page || 1);
}
componentWillReceiveProps(nextProps: Props) {
const { page, fetchClaims } = this.props;
componentDidUpdate(prevProps: Props) {
const { page, fetchClaims, uri } = this.props;
if (nextProps.page && page !== nextProps.page) {
fetchClaims(nextProps.uri, nextProps.page);
if (prevProps.page && prevProps.page && page !== prevProps.page) {
fetchClaims(uri, page);
}
}
@ -80,21 +80,21 @@ class ChannelPage extends React.PureComponent<Props> {
claimsInChannel && claimsInChannel.length ? (
<FileList sortByHeight hideFilter fileInfos={claimsInChannel} />
) : (
!fetching && <span className="empty">{__('No content found.')}</span>
!fetching && <span className='empty'>{__('No content found.')}</span>
);
return (
<Page notContained>
<header className="channel-info">
<h1 className="media__title media__title--large">
<header className='channel-info'>
<h1 className='media__title media__title--large'>
{name}
{fetching && <BusyIndicator />}
</h1>
<div className="channel-info__actions__group">
<div className='channel-info__actions__group'>
<SubscribeButton uri={`lbry://${permanentUrl}`} channelName={name} />
<Button
button="alt"
button='alt'
icon={icons.SHARE}
label={__('Share Channel')}
onClick={() =>
@ -104,42 +104,42 @@ class ChannelPage extends React.PureComponent<Props> {
</div>
</header>
<section className="media-group--list">{contentList}</section>
<section className='media-group--list'>{contentList}</section>
{(!fetching || (claimsInChannel && claimsInChannel.length)) && totalPages > 1 && (
<Form>
<fieldset-group class="fieldset-group--smushed fieldgroup--paginate">
<fieldset-group class='fieldset-group--smushed fieldgroup--paginate'>
<fieldset-section>
<ReactPaginate
pageCount={totalPages}
pageRangeDisplayed={2}
previousLabel="‹"
nextLabel="›"
activeClassName="pagination__item--selected"
pageClassName="pagination__item"
previousClassName="pagination__item pagination__item--previous"
nextClassName="pagination__item pagination__item--next"
breakClassName="pagination__item pagination__item--break"
previousLabel='‹'
nextLabel='›'
activeClassName='pagination__item--selected'
pageClassName='pagination__item'
previousClassName='pagination__item pagination__item--previous'
nextClassName='pagination__item pagination__item--next'
breakClassName='pagination__item pagination__item--break'
marginPagesDisplayed={2}
onPageChange={e => this.changePage(e.selected + 1)}
forcePage={currentPage}
initialPage={currentPage}
containerClassName="pagination"
containerClassName='pagination'
/>
</fieldset-section>
<FormField
className="paginate-channel"
className='paginate-channel'
onKeyUp={e => this.paginate(e, totalPages)}
label={__('Go to page:')}
type="text"
name="paginate-file"
type='text'
name='paginate-file'
/>
</fieldset-group>
</Form>
)}
{!channelIsMine && <HiddenNsfwClaims className="card__content help" uri={uri} />}
{!channelIsMine && <HiddenNsfwClaims className='card__content help' uri={uri} />}
</Page>
);
}