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

moar cleanup

Browse source
This commit is contained in:
Sean Yesmunt 2020-01-02 17:30:58 -05:00
parent 7990a379fc
commit 0b38bb1f1a
10 changed files with 50 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ui/analytics.js
View file

@ -43,7 +43,8 @@ type LogPublishParams = {
channel_claim_id?: string,
};
let analyticsEnabled: boolean = true;
let analyticsEnabled: boolean = isProduction;
const analytics: Analytics = {
error: message => {
if (analyticsEnabled && isProduction) {

8
ui/component/header/view.jsx
View file

@ -147,13 +147,17 @@ const Header = (props: Props) => {
</MenuItem>
<MenuItem className="menu__link" onSelect={() => history.push(`/$/${PAGES.PUBLISHED}`)}>
<Icon aria-hidden icon={ICONS.PUBLISH} />
{__('Your Publishes')}
{__('Publishes')}
</MenuItem>
<MenuItem className="menu__link" onSelect={() => history.push(`/$/${PAGES.PUBLISHED}`)}>
<Icon aria-hidden icon={ICONS.CHANNEL} />
{__('Channels')}
</MenuItem>
{/* @if TARGET='app' */}
<MenuItem className="menu__link" onSelect={() => history.push(`/$/${PAGES.PUBLISH}`)}>
<Icon aria-hidden icon={ICONS.LIBRARY} />
{__('Your Library')}
{__('Library')}
</MenuItem>
{/* @endif */}

2
ui/component/router/view.jsx
View file

@ -98,7 +98,7 @@ function AppRouter(props: Props) {
<PrivateRoute {...props} path={`/$/${PAGES.REWARDS}`} component={RewardsPage} />
<PrivateRoute {...props} path={`/$/${PAGES.TRANSACTIONS}`} component={TransactionHistoryPage} />
<PrivateRoute {...props} path={`/$/${PAGES.LIBRARY}`} component={LibraryPage} />
<PrivateRoute {...props} path={`/$/${PAGES.FOLLOWING}`} component={FollowingPage} />
<PrivateRoute {...props} path={`/$/${PAGES.TAGS_FOLLOWING_MANAGE}`} component={FollowingPage} />
<PrivateRoute {...props} path={`/$/${PAGES.BLOCKED}`} component={ListBlockedPage} />
<PrivateRoute {...props} path={`/$/${PAGES.WALLET}`} exact component={WalletPage} />
<PrivateRoute {...props} path={`/$/${PAGES.CHANNELS}`} component={ChannelsPage} />

2
ui/constants/pages.js
View file

@ -21,9 +21,9 @@ exports.SEARCH = 'search';
exports.TRANSACTIONS = 'transactions';
exports.TAGS = 'tags';
exports.TAGS_FOLLOWING = 'following/tags';
exports.TAGS_FOLLOWING_MANAGE = 'following/tags/manage';
exports.CHANNELS_FOLLOWING = 'following/channels';
exports.CHANNELS_FOLLOWING_MANAGE = 'following/channels/manage';
exports.FOLLOWING = 'following';
exports.WALLET = 'wallet';
exports.BLOCKED = 'blocked';
exports.CHANNELS = 'channels';

3
ui/page/channel/view.jsx
View file

@ -163,6 +163,8 @@ function ChannelPage(props: Props) {
return (
<Page>
<ClaimUri uri={uri} />
<div className="card">
<header className="channel-cover">
<div className="channel__quick-actions">
@ -212,7 +214,6 @@ function ChannelPage(props: Props) {
<Button button="alt" title={__('Edit')} onClick={() => setEditing(!editing)} icon={ICONS.EDIT} />
)}
<div className="channel__meta">
<ClaimUri uri={uri} inline />
<span>
{subCount} {subCount !== 1 ? __('Followers') : __('Follower')}
<HelpLink href="https://lbry.com/faq/views" />

2
ui/page/following/view.jsx
View file

@ -24,7 +24,7 @@ function FollowingPage(props: Props) {
const viewingSuggestedSubs = urlParams.get('view') || !hasSubscriptions;
function onClick() {
let url = `/$/${PAGES.FOLLOWING}`;
let url = `/$/${PAGES.TAGS_FOLLOWING_MANAGE}`;
if (!viewingSuggestedSubs) {
url += '?view=discover';
}

47
ui/page/search/view.jsx
View file

@ -60,30 +60,29 @@ export default function SearchPage(props: Props) {
</header>
)}
<div className="card">
<ClaimList
uris={uris}
loading={isSearching}
header={<SearchOptions />}
headerAltControls={
<Fragment>
<span>{__('Find what you were looking for?')}</span>
<Button
button="alt"
description={__('Yes')}
onClick={() => onFeedbackPositive(urlQuery)}
icon={ICONS.YES}
/>
<Button
button="alt"
description={__('No')}
onClick={() => onFeedbackNegative(urlQuery)}
icon={ICONS.NO}
/>
</Fragment>
}
/>
</div>
<ClaimList
uris={uris}
loading={isSearching}
header={<SearchOptions />}
headerAltControls={
<Fragment>
<span>{__('Find what you were looking for?')}</span>
<Button
button="alt"
description={__('Yes')}
onClick={() => onFeedbackPositive(urlQuery)}
icon={ICONS.YES}
/>
<Button
button="alt"
description={__('No')}
onClick={() => onFeedbackNegative(urlQuery)}
icon={ICONS.NO}
/>
</Fragment>
}
/>
<div className="help">{__('These search results are provided by LBRY, Inc.')}</div>
</Fragment>
)}

7
ui/page/tags/view.jsx
View file

@ -7,6 +7,7 @@ import Button from 'component/button';
import useHover from 'effects/use-hover';
import analytics from 'analytics';
import HiddenNsfw from 'component/common/hidden-nsfw';
import Icon from 'component/common/icon';
type Props = {
location: { search: string },
@ -46,6 +47,12 @@ function TagsPage(props: Props) {
return (
<Page>
<ClaimListDiscover
headerLabel={
<span>
<Icon icon={ICONS.TAG} size={10} />
{tag}
</span>
}
tags={tags}
hiddenNsfwMessage={<HiddenNsfw type="page" />}
meta={

2
ui/page/tagsFollowing/view.jsx
View file

@ -35,7 +35,7 @@ function DiscoverPage(props: Props) {
icon={ICONS.EDIT}
label={__('Manage')}
requiresAuth={IS_WEB}
navigate={`/$/${PAGES.FOLLOWING}`}
navigate={`/$/${PAGES.TAGS_FOLLOWING_MANAGE}`}
/>
}
/>

16
ui/scss/component/_claim-list.scss
View file

@ -6,33 +6,29 @@
.claim-list__header {
display: flex;
flex-wrap: wrap;
align-items: center;
min-height: 3rem;
margin: var(--spacing-medium) 0;
margin-top: 0;
font-size: var(--font-body);
fieldset-section {
margin-top: 0;
margin-bottom: 0;
.spinner {
margin-left: var(--spacing-medium);
}
}
.claim-list__header--small {
min-height: 0;
color: var(--color-text-subtitle);
}
.claim-list__dropdown {
padding: 0 var(--spacing-medium);
padding-right: var(--spacing-large);
margin-bottom: 0;
margin-left: var(--spacing-medium);
margin-right: var(--spacing-medium);
@media (max-width: $breakpoint-small) {
font-size: var(--font-small);
padding: 0 var(--spacing-small);
padding-right: var(--spacing-large);
margin-top: var(--spacing-small);
margin-left: 0;
}
}