add toms changes lost in rebase

This commit is contained in:
Sean Yesmunt 2019-07-29 12:54:46 -04:00
parent 1c2f380d2b
commit 6eafb3a561
5 changed files with 22 additions and 6 deletions

View file

@ -4,6 +4,7 @@ import React from 'react';
import { FormField, Form } from 'component/common/form'; import { FormField, Form } from 'component/common/form';
import Button from 'component/button'; import Button from 'component/button';
import ChannelSection from 'component/selectChannel'; import ChannelSection from 'component/selectChannel';
import UnsupportedOnWeb from 'component/common/unsupported-on-web';
import usePersistedState from 'util/use-persisted-state'; import usePersistedState from 'util/use-persisted-state';
type Props = { type Props = {
@ -38,6 +39,8 @@ export function CommentCreate(props: Props) {
return ( return (
<section> <section>
<UnsupportedOnWeb type="feature" />
{/* @if TARGET='app' */}
{commentAck !== true && ( {commentAck !== true && (
<div> <div>
<p>{__('A few things to know before participating in the comment alpha:')}</p> <p>{__('A few things to know before participating in the comment alpha:')}</p>
@ -86,6 +89,7 @@ export function CommentCreate(props: Props) {
</div> </div>
</Form> </Form>
)} )}
{/* @endif */}
</section> </section>
); );
} }

View file

@ -1,11 +1,19 @@
// @flow
import React from 'react'; import React from 'react';
import Button from 'component/button'; import Button from 'component/button';
export default function UnsupportedOnWeb() { type Props = {
type?: string,
};
export default function UnsupportedOnWeb(props: Props) {
const { type = 'page' } = props;
return ( return (
IS_WEB && ( IS_WEB && (
<div className="help help--warning"> <div className="card__subtitle--status">
This page is not currently supported on the web.{' '} {type === 'page' && __('This page is not currently supported on the web')}
{type === 'feature' && __('This feature is not currently supported on the web')}.{' '}
<Button button="link" label={__('Download the desktop app')} href="https://lbry.com/get" /> for full feature <Button button="link" label={__('Download the desktop app')} href="https://lbry.com/get" /> for full feature
support. support.
</div> </div>

View file

@ -172,7 +172,7 @@ class FileRender extends React.PureComponent<Props> {
video: ( video: (
<VideoViewer claim={claim} source={{ downloadPath, fileName }} contentType={contentType} poster={poster} /> <VideoViewer claim={claim} source={{ downloadPath, fileName }} contentType={contentType} poster={poster} />
), ),
// audio: <AudioViewer claim={claim} source={{ downloadPath, fileName }} contentType={contentType} />, audio: <VideoViewer claim={claim} source={{ downloadPath, fileName }} contentType={contentType} />,
// Add routes to viewer... // Add routes to viewer...
}; };

View file

@ -44,6 +44,7 @@ class AudioVideoViewer extends React.PureComponent<Props> {
preload: 'auto', preload: 'auto',
poster, poster,
sources, sources,
playbackRates: [0.5, 1, 1.25, 1.5, 2],
}; };
import( import(

View file

@ -7,8 +7,11 @@ import UnsupportedOnWeb from 'component/common/unsupported-on-web';
import UserEmail from 'component/userEmail'; import UserEmail from 'component/userEmail';
import InvitePage from 'page/invite'; import InvitePage from 'page/invite';
const WalletPage = () => ( const AccountPage = () => (
<Page> <Page>
{/* @if TARGET='web' */}
<UserEmail />
{/* @endif */}
<UnsupportedOnWeb /> <UnsupportedOnWeb />
<div className={classnames({ 'card--disabled': IS_WEB })}> <div className={classnames({ 'card--disabled': IS_WEB })}>
<div className="columns"> <div className="columns">
@ -23,4 +26,4 @@ const WalletPage = () => (
</Page> </Page>
); );
export default WalletPage; export default AccountPage;