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

prettier #2383

Merged
neb-b merged 1 commit from prettier into master 2019-03-25 20:04:32 +01:00
Conversation 0 Commits 1 Files changed 19 +102 -102
19 changed files with 102 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/platforms/electron/devServer.js
View file

@ -67,7 +67,7 @@ mainInstance.waitUntilValid(() => {
const child = proc.spawn(electron, ['./dist/electron/webpack/main.js']); const child = proc.spawn(electron, ['./dist/electron/webpack/main.js']);
child.stdout.on('data', (data) => { child.stdout.on('data', data => {
console.log(data.toString()); console.log(data.toString());
}); });

4
src/platforms/electron/index.js
View file

@ -49,7 +49,7 @@ if (isDev) {
process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = true; process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = true;
} }
const startDaemon = async() => { const startDaemon = async () => {
let isDaemonRunning = false; let isDaemonRunning = false;
await Lbry.status() await Lbry.status()
@ -118,7 +118,7 @@ if (!gotSingleInstanceLock) {
} }
}); });
app.on('ready', async() => { app.on('ready', async () => {
startDaemon(); startDaemon();
startSandbox(); startSandbox();

2
src/platforms/electron/sandboxTest.js
View file

@ -1,4 +1,4 @@
require('@babel/register'); require('@babel/register');
require("@babel/polyfill"); require('@babel/polyfill');
require('./startSandbox.js')(); require('./startSandbox.js')();

2
src/platforms/electron/startSandbox.js
View file

@ -16,7 +16,7 @@ export default async function startSandbox() {
const port = 5278; const port = 5278;
const sandbox = express(); const sandbox = express();
sandbox.get('/set/:outpoint', async(req, res) => { sandbox.get('/set/:outpoint', async (req, res) => {
const { outpoint } = req.params; const { outpoint } = req.params;
const resolvedPath = await unpackByOutpoint(Lbry, outpoint); const resolvedPath = await unpackByOutpoint(Lbry, outpoint);

24
src/ui/component/categoryList/view.jsx
View file

@ -262,19 +262,19 @@ class CategoryList extends PureComponent<Props, State> {
const showScrollButtons = isCommunityTopBids ? !obscureNsfw : true; const showScrollButtons = isCommunityTopBids ? !obscureNsfw : true;
return ( return (
<section className='media-group--row'> <section className="media-group--row">
<header className='media-group__header'> <header className="media-group__header">
<div className='media-group__header-title'> <div className="media-group__header-title">
{categoryLink ? ( {categoryLink ? (
<div className='channel-info__actions'> <div className="channel-info__actions">
<div className='channel-info__actions__group'> <div className="channel-info__actions__group">
<Button <Button
label={category} label={category}
navigate='/show' navigate="/show"
navigateParams={{ uri: categoryLink, page: 1 }} navigateParams={{ uri: categoryLink, page: 1 }}
/> />
<SubscribeButton <SubscribeButton
button='alt' button="alt"
showSnackBarOnSubscribe showSnackBarOnSubscribe
uri={`lbry://${categoryLink}`} uri={`lbry://${categoryLink}`}
/> />
@ -285,7 +285,7 @@ class CategoryList extends PureComponent<Props, State> {
)} )}
{isCommunityTopBids && ( {isCommunityTopBids && (
<ToolTip <ToolTip
direction='top' direction="top"
label={__("What's this?")} label={__("What's this?")}
body={__( body={__(
'Community Content is a public space where anyone can share content with the rest of the LBRY community. Bid on the names from "one" to "ten" to put your content here!' 'Community Content is a public space where anyone can share content with the rest of the LBRY community. Bid on the names from "one" to "ten" to put your content here!'
@ -294,7 +294,7 @@ class CategoryList extends PureComponent<Props, State> {
)} )}
</div> </div>
{showScrollButtons && ( {showScrollButtons && (
<nav className='media-group__header-navigation'> <nav className="media-group__header-navigation">
<Button <Button
disabled={!canScrollPrevious} disabled={!canScrollPrevious}
onClick={this.handleScrollPrevious} onClick={this.handleScrollPrevious}
@ -309,14 +309,14 @@ class CategoryList extends PureComponent<Props, State> {
)} )}
</header> </header>
{obscureNsfw && isCommunityTopBids ? ( {obscureNsfw && isCommunityTopBids ? (
<p className='media__message help--warning'> <p className="media__message help--warning">
{__( {__(
'The community top bids section is only visible if you allow mature content in the app. You can change your content viewing preferences' 'The community top bids section is only visible if you allow mature content in the app. You can change your content viewing preferences'
)}{' '} )}{' '}
<Button button='link' navigate='/settings' label={__('here')} />. <Button button="link" navigate="/settings" label={__('here')} />.
</p> </p>
) : ( ) : (
<ul className='media-scrollhouse' ref={this.scrollWrapper}> <ul className="media-scrollhouse" ref={this.scrollWrapper}>
{urisInList && {urisInList &&
urisInList.map(uri => ( urisInList.map(uri => (
<FileCard <FileCard

26
src/ui/component/fileCard/view.jsx
View file

@ -80,12 +80,12 @@ class FileCard extends React.PureComponent<Props> {
if (!claim && (!pending || placeholder)) { if (!claim && (!pending || placeholder)) {
return ( return (
<li className='media-card media-placeholder'> <li className="media-card media-placeholder">
<div className='media__thumb placeholder' /> <div className="media__thumb placeholder" />
<div className='media__title placeholder' /> <div className="media__title placeholder" />
<div className='media__channel placeholder' /> <div className="media__channel placeholder" />
<div className='media__date placeholder' /> <div className="media__date placeholder" />
<div className='media__properties' /> <div className="media__properties" />
</li> </li>
); );
} }
@ -110,8 +110,8 @@ class FileCard extends React.PureComponent<Props> {
return ( return (
<li <li
tabIndex='0' tabIndex="0"
role='button' role="button"
onClick={!pending ? () => navigate('/show', { uri }) : () => {}} onClick={!pending ? () => navigate('/show', { uri }) : () => {}}
className={classnames('media-card', { className={classnames('media-card', {
'card--link': !pending, 'card--link': !pending,
@ -120,22 +120,22 @@ class FileCard extends React.PureComponent<Props> {
onContextMenu={handleContextMenu} onContextMenu={handleContextMenu}
> >
<CardMedia thumbnail={thumbnail} /> <CardMedia thumbnail={thumbnail} />
<div className='media__title'> <div className="media__title">
<TruncatedText text={title} lines={2} /> <TruncatedText text={title} lines={2} />
</div> </div>
<div className='media__subtitle'> <div className="media__subtitle">
{pending ? <div>Pending...</div> : <UriIndicator uri={uri} link />} {pending ? <div>Pending...</div> : <UriIndicator uri={uri} link />}
<div> <div>
<DateTime timeAgo block={height} /> <DateTime timeAgo block={height} />
</div> </div>
</div> </div>
<div className='media__properties'> <div className="media__properties">
<FilePrice hideFree uri={uri} /> <FilePrice hideFree uri={uri} />
{isRewardContent && <Icon iconColor='red' icon={icons.FEATURED} />} {isRewardContent && <Icon iconColor="red" icon={icons.FEATURED} />}
{isSubscribed && <Icon icon={icons.SUBSCRIPTION} />} {isSubscribed && <Icon icon={icons.SUBSCRIPTION} />}
{claimIsMine && <Icon icon={icons.PUBLISHED} />} {claimIsMine && <Icon icon={icons.PUBLISHED} />}
{!claimIsMine && fileInfo && <Icon icon={icons.LOCAL} />} {!claimIsMine && fileInfo && <Icon icon={icons.LOCAL} />}
{isNew && <span className='badge badge--alert'>{__('NEW')}</span>} {isNew && <span className="badge badge--alert">{__('NEW')}</span>}
</div> </div>
</li> </li>
); );

4
src/ui/component/fileViewer/view.jsx
View file

@ -254,7 +254,7 @@ class FileViewer extends React.PureComponent<Props> {
return ( return (
<div className={classnames('video', {}, className)}> <div className={classnames('video', {}, className)}>
{isPlaying && ( {isPlaying && (
<div className='content__view'> <div className="content__view">
{!isReadyToPlay ? ( {!isReadyToPlay ? (
<div className={layoverClass} style={layoverStyle}> <div className={layoverClass} style={layoverStyle}>
<LoadingScreen status={loadStatusMessage} /> <LoadingScreen status={loadStatusMessage} />
@ -284,7 +284,7 @@ class FileViewer extends React.PureComponent<Props> {
)} )}
{!isPlaying && ( {!isPlaying && (
<div <div
role='button' role="button"
onClick={this.playContent} onClick={this.playContent}
className={layoverClass} className={layoverClass}
style={layoverStyle} style={layoverStyle}

34
src/ui/component/firstRun/view.jsx
View file

@ -89,39 +89,39 @@ export default class FirstRun extends PureComponent<Props> {
const showHelp = !showWelcome && !showEmail; const showHelp = !showWelcome && !showEmail;
return ( return (
<div className='banner banner--first-run'> <div className="banner banner--first-run">
<Yrbl className='yrbl--first-run' /> <Yrbl className="yrbl--first-run" />
<div className='banner__item'> <div className="banner__item">
<div className='banner__item--static-for-animation'> <div className="banner__item--static-for-animation">
<Welcome className='banner__content' pose={showWelcome ? 'show' : 'hide'}> <Welcome className="banner__content" pose={showWelcome ? 'show' : 'hide'}>
<div> <div>
<header className='card__header'> <header className="card__header">
<h1 className='card__title'>{__('Hi There')}</h1> <h1 className="card__title">{__('Hi There')}</h1>
</header> </header>
<div className='card__content'> <div className="card__content">
{this.getWelcomeMessage()} {this.getWelcomeMessage()}
<div className='card__actions card__actions--top-space'> <div className="card__actions card__actions--top-space">
<Button button='primary' onClick={acknowledgeWelcome} label={__("I'm In")} /> <Button button="primary" onClick={acknowledgeWelcome} label={__("I'm In")} />
</div> </div>
</div> </div>
</div> </div>
</Welcome> </Welcome>
</div> </div>
<div className='banner__item--static-for-animation'> <div className="banner__item--static-for-animation">
<Email pose={showEmail ? 'show' : 'hide'}> <Email pose={showEmail ? 'show' : 'hide'}>
<EmailCollection /> <EmailCollection />
</Email> </Email>
</div> </div>
<div className='banner__item--static-for-animation'> <div className="banner__item--static-for-animation">
<Help pose={showHelp ? 'show' : 'hide'}> <Help pose={showHelp ? 'show' : 'hide'}>
<header className='card__header'> <header className="card__header">
<h1 className='card__title'>{__('You Are Awesome!')}</h1> <h1 className="card__title">{__('You Are Awesome!')}</h1>
</header> </header>
<div className='card__content'> <div className="card__content">
<p>{__("Check out some of the neat content below me. I'll see you around!")}</p> <p>{__("Check out some of the neat content below me. I'll see you around!")}</p>
<div className='card__actions'> <div className="card__actions">
<Button button='primary' onClick={completeFirstRun} label={__('See You Later')} /> <Button button="primary" onClick={completeFirstRun} label={__('See You Later')} />
</div> </div>
</div> </div>
</Help> </Help>

10
src/ui/component/spinner/view.jsx
View file

@ -70,11 +70,11 @@ class Spinner extends PureComponent<Props, State> {
'spinner--small': type === 'small', 'spinner--small': type === 'small',
})} })}
> >
<div className='rect rect1' /> <div className="rect rect1" />
<div className='rect rect2' /> <div className="rect rect2" />
<div className='rect rect3' /> <div className="rect rect3" />
<div className='rect rect4' /> <div className="rect rect4" />
<div className='rect rect5' /> <div className="rect rect5" />
</div> </div>
); );
} }

10
src/ui/component/uriIndicator/view.jsx
View file

@ -34,7 +34,7 @@ class UriIndicator extends React.PureComponent<Props> {
render() { render() {
const { claim, link, isResolvingUri } = this.props; const { claim, link, isResolvingUri } = this.props;
if (!claim) { if (!claim) {
return <span className='empty'>{isResolvingUri ? 'Validating...' : 'Unused'}</span>; return <span className="empty">{isResolvingUri ? 'Validating...' : 'Unused'}</span>;
} }
const { channel_name: channelName, signature_is_valid: signatureIsValid, value } = claim; const { channel_name: channelName, signature_is_valid: signatureIsValid, value } = claim;
@ -42,7 +42,7 @@ class UriIndicator extends React.PureComponent<Props> {
value && value.publisherSignature && value.publisherSignature.certificateId; value && value.publisherSignature && value.publisherSignature.certificateId;
if (!channelName) { if (!channelName) {
return <span className='channel-name'>Anonymous</span>; return <span className="channel-name">Anonymous</span>;
} }
let channelLink; let channelLink;
@ -50,7 +50,7 @@ class UriIndicator extends React.PureComponent<Props> {
channelLink = link ? buildURI({ channelName, claimId: channelClaimId }) : false; channelLink = link ? buildURI({ channelName, claimId: channelClaimId }) : false;
} }
const inner = <span className='channel-name'>{channelName}</span>; const inner = <span className="channel-name">{channelName}</span>;
if (!channelLink) { if (!channelLink) {
return inner; return inner;
@ -59,8 +59,8 @@ class UriIndicator extends React.PureComponent<Props> {
return ( return (
<Button <Button
noPadding noPadding
className='button--uri-indicator' className="button--uri-indicator"
navigate='/show' navigate="/show"
navigateParams={{ uri: channelLink, page: 1 }} navigateParams={{ uri: channelLink, page: 1 }}
> >
{inner} {inner}

20
src/ui/component/userPhoneNew/view.jsx
View file

@ -86,8 +86,8 @@ class UserPhoneNew extends React.PureComponent<Props, State> {
return ( return (
<React.Fragment> <React.Fragment>
<section className='card__content'> <section className="card__content">
<p className='card__subtitle'> <p className="card__subtitle">
{__( {__(
'Enter your phone number and we will send you a verification code. We will not share your phone number with third parties.' 'Enter your phone number and we will send you a verification code. We will not share your phone number with third parties.'
)} )}
@ -95,12 +95,12 @@ class UserPhoneNew extends React.PureComponent<Props, State> {
</section> </section>
<Form onSubmit={this.handleSubmit}> <Form onSubmit={this.handleSubmit}>
<div className='card__content'> <div className="card__content">
<fieldset-group class='fieldset-group--smushed'> <fieldset-group class="fieldset-group--smushed">
<FormField <FormField
label={__('Country')} label={__('Country')}
type='select' type="select"
name='country-codes' name="country-codes"
onChange={this.handleSelect} onChange={this.handleSelect}
> >
{countryCodes.map((country, index) => ( {countryCodes.map((country, index) => (
@ -111,10 +111,10 @@ class UserPhoneNew extends React.PureComponent<Props, State> {
))} ))}
</FormField> </FormField>
<FormField <FormField
type='text' type="text"
label={__('Number')} label={__('Number')}
placeholder={this.state.countryCode === '+1' ? '(555) 555-5555' : '5555555555'} placeholder={this.state.countryCode === '+1' ? '(555) 555-5555' : '5555555555'}
name='phone' name="phone"
value={this.state.phone} value={this.state.phone}
error={phoneErrorMessage} error={phoneErrorMessage}
onChange={event => { onChange={event => {
@ -123,8 +123,8 @@ class UserPhoneNew extends React.PureComponent<Props, State> {
/> />
</fieldset-group> </fieldset-group>
</div> </div>
<div className='card__actions'> <div className="card__actions">
<Submit label='Submit' disabled={isPending} /> <Submit label="Submit" disabled={isPending} />
{cancelButton} {cancelButton}
</div> </div>
</Form> </Form>

6
src/ui/component/wunderbar/internal/autocomplete.jsx
View file

@ -545,9 +545,9 @@ export default class Autocomplete extends React.Component {
composeEventHandlers(internal, external) { composeEventHandlers(internal, external) {
return external return external
? e => { ? e => {
internal(e); internal(e);
external(e); external(e);
} }
: internal; : internal;
} }

22
src/ui/modal/modal.jsx
View file

@ -58,25 +58,25 @@ export class Modal extends React.PureComponent<ModalProps> {
modal: !fullScreen, modal: !fullScreen,
'modal--fullscreen': fullScreen, 'modal--fullscreen': fullScreen,
})} })}
overlayClassName='modal-overlay' overlayClassName="modal-overlay"
> >
{title && ( {title && (
<header className='card__header'> <header className="card__header">
<h1 className='card__title'>{title}</h1> <h1 className="card__title">{title}</h1>
</header> </header>
)} )}
{children} {children}
{type === 'custom' ? null : ( // custom modals define their own buttons {type === 'custom' ? null : ( // custom modals define their own buttons
<div className='card__actions'> <div className="card__actions">
<Button <Button
button='primary' button="primary"
label={confirmButtonLabel} label={confirmButtonLabel}
disabled={confirmButtonDisabled} disabled={confirmButtonDisabled}
onClick={onConfirmed} onClick={onConfirmed}
/> />
{type === 'confirm' ? ( {type === 'confirm' ? (
<Button <Button
button='link' button="link"
label={abortButtonLabel} label={abortButtonLabel}
disabled={abortButtonDisabled} disabled={abortButtonDisabled}
onClick={onAborted} onClick={onAborted}
@ -116,19 +116,19 @@ export class ExpandableModal extends React.PureComponent<ModalProps, State> {
render() { render() {
return ( return (
<Modal type='custom' {...this.props}> <Modal type="custom" {...this.props}>
{this.props.children} {this.props.children}
{this.state.expanded ? ( {this.state.expanded ? (
<div className='card__content'>{this.props.extraContent}</div> <div className="card__content">{this.props.extraContent}</div>
) : null} ) : null}
<div className='card__actions'> <div className="card__actions">
<Button <Button
button='primary' button="primary"
label={this.props.confirmButtonLabel} label={this.props.confirmButtonLabel}
onClick={this.props.onConfirmed} onClick={this.props.onConfirmed}
/> />
<Button <Button
button='link' button="link"
label={!this.state.expanded ? this.props.expandButtonLabel : this.props.hideButtonLabel} label={!this.state.expanded ? this.props.expandButtonLabel : this.props.hideButtonLabel}
onClick={() => { onClick={() => {
this.toggleExpanded(); this.toggleExpanded();

6
src/ui/modal/modalError/view.jsx
View file

@ -42,17 +42,17 @@ class ModalError extends React.PureComponent<Props> {
isOpen isOpen
contentLabel={__('Error')} contentLabel={__('Error')}
title={__('Error')} title={__('Error')}
className='error-modal' className="error-modal"
onConfirmed={closeModal} onConfirmed={closeModal}
> >
<section className='card__content'> <section className="card__content">
<p> <p>
{__( {__(
"We're sorry that LBRY has encountered an error. This has been reported and we will investigate the problem." "We're sorry that LBRY has encountered an error. This has been reported and we will investigate the problem."
)} )}
</p> </p>
</section> </section>
<ul className='card__content error-modal__error-list'>{errorInfoList}</ul> <ul className="card__content error-modal__error-list">{errorInfoList}</ul>
</Modal> </Modal>
); );
} }

8
src/ui/page/auth/view.jsx
View file

@ -52,7 +52,7 @@ class AuthPage extends React.PureComponent<Props> {
} else if (user && !user.is_identity_verified) { } else if (user && !user.is_identity_verified) {
return [<UserVerify />, false]; return [<UserVerify />, false];
} }
return [<span className='empty'>{__('No further steps.')}</span>, true]; return [<span className="empty">{__('No further steps.')}</span>, true];
} }
render() { render() {
@ -62,15 +62,15 @@ class AuthPage extends React.PureComponent<Props> {
return ( return (
<Page> <Page>
{useTemplate ? ( {useTemplate ? (
<section className='card card--section'> <section className="card card--section">
{innerContent} {innerContent}
<p className='help'> <p className="help">
{`${__( {`${__(
'This information is disclosed only to LBRY, Inc. and not to the LBRY network. It is only required to earn LBRY rewards and may be used to sync usage data across devices.' 'This information is disclosed only to LBRY, Inc. and not to the LBRY network. It is only required to earn LBRY rewards and may be used to sync usage data across devices.'
)} `} )} `}
<Button <Button
button='link' button="link"
onClick={() => navigate('/discover')} onClick={() => navigate('/discover')}
label={__('Return home.')} label={__('Return home.')}
/> />

4
src/ui/page/rewards/view.jsx
View file

@ -132,8 +132,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>

2
src/ui/page/wallet/view.jsx
View file

@ -11,7 +11,7 @@ const WalletPage = () => (
<Page> <Page>
{IS_WEB && <UnsupportedOnWeb />} {IS_WEB && <UnsupportedOnWeb />}
<div className={classnames({ 'card--disabled': IS_WEB })}> <div className={classnames({ 'card--disabled': IS_WEB })}>
<div className='columns'> <div className="columns">
<WalletBalance /> <WalletBalance />
<RewardSummary /> <RewardSummary />
</div> </div>

12
src/ui/redux/actions/publish.js
View file

@ -127,12 +127,12 @@ export const doUploadThumbnail = (filePath: string, nsfw: boolean) => (dispatch:
.then(json => .then(json =>
json.success json.success
? dispatch({ ? dispatch({
type: ACTIONS.UPDATE_PUBLISH_FORM, type: ACTIONS.UPDATE_PUBLISH_FORM,
data: { data: {
uploadThumbnailStatus: THUMBNAIL_STATUSES.COMPLETE, uploadThumbnailStatus: THUMBNAIL_STATUSES.COMPLETE,
thumbnail: `${json.data.url}${fileExt}`, thumbnail: `${json.data.url}${fileExt}`,
}, },
}) })
: uploadError(json.message) : uploadError(json.message)
) )
.catch(err => uploadError(err.message)); .catch(err => uploadError(err.message));

6
src/ui/redux/reducers/content.js
View file

@ -46,9 +46,9 @@ reducers[ACTIONS.CLEAR_CONTENT_HISTORY_URI] = (state, action) => {
return index === -1 return index === -1
? state ? state
: { : {
...state, ...state,
history: history.slice(0, index).concat(history.slice(index + 1)), history: history.slice(0, index).concat(history.slice(index + 1)),
}; };
}; };
reducers[ACTIONS.CLEAR_CONTENT_HISTORY_ALL] = state => ({ ...state, history: [] }); reducers[ACTIONS.CLEAR_CONTENT_HISTORY_ALL] = state => ({ ...state, history: [] });