Merge pull request #2418 from lbryio/lbry-tv-cta

lbry.tv minor edits
This commit is contained in:
Sean Yesmunt 2019-04-11 14:20:32 -04:00 committed by GitHub
commit bd5d044ed1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 57 additions and 40 deletions

View file

@ -62,7 +62,7 @@ export default class FirstRun extends PureComponent<Props> {
<p>{__('Thanks for trying out lbry.tv')}</p> <p>{__('Thanks for trying out lbry.tv')}</p>
<p> <p>
{__( {__(
"Some things still don't work they way they are supposed to, but we are working hard to make that better." 'Some features are only available on our desktop app. We are working hard to add them here. Check back later or download the app.'
)} )}
</p> </p>
</React.Fragment> </React.Fragment>

View file

@ -2,6 +2,7 @@
// @flow // @flow
import * as icons from 'constants/icons'; import * as icons from 'constants/icons';
import * as React from 'react'; import * as React from 'react';
import classnames from 'classnames';
// @if TARGET='app' // @if TARGET='app'
import { shell } from 'electron'; import { shell } from 'electron';
// @endif // @endif
@ -160,7 +161,31 @@ class HelpPage extends React.PureComponent<Props, State> {
</div> </div>
</div> </div>
</section> </section>
<section className="card card--section">
<header className="card__header">
<h2 className="card__title">{__('Report a Bug or Suggest a New Feature')}</h2>
<p className="card__subtitle">
{__('Did you find something wrong? Think LBRY could add something useful and cool?')}{' '}
<Button button="link" label={__('Learn more')} href="https://lbry.com/faq/support" />.
</p>
</header>
<div className="card__content">
<div className="card__actions">
<Button
navigate="/$/report"
label={__('Submit a Bug Report/Feature Request')}
icon={icons.REPORT}
button="primary"
/>
</div>
<div className="card__meta">{__('Thanks! LBRY is made by its users.')}</div>
</div>
</section>
{/* @if TARGET='app' */}
<section className="card card--section"> <section className="card card--section">
<header className="card__header"> <header className="card__header">
<h2 className="card__title">{__('View your Log')}</h2> <h2 className="card__title">{__('View your Log')}</h2>
@ -187,30 +212,6 @@ class HelpPage extends React.PureComponent<Props, State> {
</div> </div>
</section> </section>
<section className="card card--section">
<header className="card__header">
<h2 className="card__title">{__('Report a Bug or Suggest a New Feature')}</h2>
<p className="card__subtitle">
{__('Did you find something wrong? Think LBRY could add something useful and cool?')}{' '}
<Button button="link" label={__('Learn more')} href="https://lbry.com/faq/support" />.
</p>
</header>
<div className="card__content">
<div className="card__actions">
<Button
navigate="/$/report"
label={__('Submit a Bug Report/Feature Request')}
icon={icons.REPORT}
button="primary"
/>
</div>
<div className="card__meta">{__('Thanks! LBRY is made by its users.')}</div>
</div>
</section>
<section className="card card--section"> <section className="card card--section">
<header className="card__header"> <header className="card__header">
<h2 className="card__title">{__('About')}</h2> <h2 className="card__title">{__('About')}</h2>
@ -288,6 +289,7 @@ class HelpPage extends React.PureComponent<Props, State> {
</table> </table>
</div> </div>
</section> </section>
{/* @endif */}
</Page> </Page>
); );
} }

View file

@ -8,6 +8,7 @@ import Page from 'component/page';
import classnames from 'classnames'; import classnames from 'classnames';
import type { Reward } from 'types/reward'; import type { Reward } from 'types/reward';
import { rewards as REWARD_TYPES } from 'lbryinc'; import { rewards as REWARD_TYPES } from 'lbryinc';
import UnsupportedOnWeb from 'component/common/unsupported-on-web';
type Props = { type Props = {
doAuth: () => void, doAuth: () => void,
@ -32,19 +33,25 @@ class RewardsPage extends PureComponent<Props> {
if (user && !user.is_reward_approved && daemonSettings && daemonSettings.share_usage_data) { if (user && !user.is_reward_approved && daemonSettings && daemonSettings.share_usage_data) {
if (!user.primary_email || !user.has_verified_email || !user.is_identity_verified) { if (!user.primary_email || !user.has_verified_email || !user.is_identity_verified) {
return ( return (
<section className="card card--section"> !IS_WEB && (
<header className="card__header"> <section className="card card--section">
<h2 className="card__title">{__('Humans Only')}</h2> <header className="card__header">
<p className="card__subtitle"> <h2 className="card__title">{__('Humans Only')}</h2>
{__('Rewards are for human beings only.')}{' '} <p className="card__subtitle">
{__("You'll have to prove you're one of us before you can claim any rewards.")} {__('Rewards are for human beings only.')}{' '}
</p> {__("You'll have to prove you're one of us before you can claim any rewards.")}
</header> </p>
</header>
<div className="card__content"> <div className="card__content">
<Button navigate="/$/auth?redirect=rewards" button="primary" label="Prove Humanity" /> <Button
</div> navigate="/$/auth?redirect=rewards"
</section> button="primary"
label="Prove Humanity"
/>
</div>
</section>
)
); );
} }
return ( return (
@ -131,8 +138,8 @@ class RewardsPage extends PureComponent<Props> {
<p className="card__content"> <p className="card__content">
{claimed && claimed.length {claimed && claimed.length
? __( ? __(
"You have claimed all available rewards! We're regularly adding more so be sure to check back later." "You have claimed all available rewards! We're regularly adding more so be sure to check back later."
) )
: __('There are no rewards available at this time, please check back later.')} : __('There are no rewards available at this time, please check back later.')}
</p> </p>
</section> </section>
@ -162,6 +169,7 @@ class RewardsPage extends PureComponent<Props> {
render() { render() {
return ( return (
<Page> <Page>
{IS_WEB && <UnsupportedOnWeb />}
{this.renderPageHeader()} {this.renderPageHeader()}
{this.renderUnclaimedRewards()} {this.renderUnclaimedRewards()}
{<RewardListClaimed />} {<RewardListClaimed />}

View file

@ -1,9 +1,11 @@
// @flow // @flow
import React from 'react'; import React from 'react';
import classnames from 'classnames';
import BusyIndicator from 'component/common/busy-indicator'; import BusyIndicator from 'component/common/busy-indicator';
import TransactionList from 'component/transactionList'; import TransactionList from 'component/transactionList';
import Page from 'component/page'; import Page from 'component/page';
import RefreshTransactionButton from 'component/transactionRefreshButton'; import RefreshTransactionButton from 'component/transactionRefreshButton';
import UnsupportedOnWeb from 'component/common/unsupported-on-web';
type Props = { type Props = {
fetchMyClaims: () => void, fetchMyClaims: () => void,
@ -25,7 +27,12 @@ class TransactionHistoryPage extends React.PureComponent<Props> {
return ( return (
<Page> <Page>
<section className="card card--section"> {IS_WEB && <UnsupportedOnWeb />}
<section
className={classnames('card card--section', {
'card--disabled': IS_WEB,
})}
>
<header className="card__header card__header--flat"> <header className="card__header card__header--flat">
<h2 className="card__title card__title--flex-between "> <h2 className="card__title card__title--flex-between ">
{__('Transaction History')} {__('Transaction History')}