format with prettier

This commit is contained in:
Sean Yesmunt 2017-06-05 21:21:55 -07:00
parent 6f93834990
commit c8b949f020
124 changed files with 8463 additions and 7383 deletions

View file

@ -1,5 +1,5 @@
import * as types from 'constants/action_types' import * as types from 'constants/action_types';
import lbry from 'lbry' import lbry from 'lbry';
import { import {
selectUpdateUrl, selectUpdateUrl,
selectUpgradeDownloadPath, selectUpgradeDownloadPath,
@ -7,11 +7,9 @@ import {
selectUpgradeFilename, selectUpgradeFilename,
selectPageTitle, selectPageTitle,
selectCurrentPage, selectCurrentPage,
selectCurrentParams, selectCurrentParams
} from 'selectors/app' } from 'selectors/app';
import { import { doSearch } from 'actions/search';
doSearch,
} from 'actions/search'
const { remote, ipcRenderer, shell } = require('electron'); const { remote, ipcRenderer, shell } = require('electron');
const path = require('path'); const path = require('path');
@ -19,25 +17,21 @@ const app = require('electron').remote.app;
const { download } = remote.require('electron-dl'); const { download } = remote.require('electron-dl');
const fs = remote.require('fs'); const fs = remote.require('fs');
const queryStringFromParams = (params) => { const queryStringFromParams = params => {
return Object return Object.keys(params).map(key => `${key}=${params[key]}`).join('&');
.keys(params) };
.map(key => `${key}=${params[key]}`)
.join('&')
}
export function doNavigate(path, params = {}) { export function doNavigate(path, params = {}) {
return function(dispatch, getState) { return function(dispatch, getState) {
let url = path let url = path;
if (params) if (params) url = `${url}?${queryStringFromParams(params)}`;
url = `${url}?${queryStringFromParams(params)}`
dispatch(doChangePath(url)) dispatch(doChangePath(url));
const state = getState() const state = getState();
const pageTitle = selectPageTitle(state) const pageTitle = selectPageTitle(state);
dispatch(doHistoryPush(params, pageTitle, url)) dispatch(doHistoryPush(params, pageTitle, url));
} };
} }
export function doChangePath(path) { export function doChangePath(path) {
@ -45,37 +39,37 @@ export function doChangePath(path) {
dispatch({ dispatch({
type: types.CHANGE_PATH, type: types.CHANGE_PATH,
data: { data: {
path, path
} }
}) });
const state = getState() const state = getState();
const pageTitle = selectPageTitle(state) const pageTitle = selectPageTitle(state);
window.document.title = pageTitle window.document.title = pageTitle;
window.scrollTo(0, 0) window.scrollTo(0, 0);
const currentPage = selectCurrentPage(state) const currentPage = selectCurrentPage(state);
if (currentPage === 'search') { if (currentPage === 'search') {
const params = selectCurrentParams(state) const params = selectCurrentParams(state);
dispatch(doSearch(params.query)) dispatch(doSearch(params.query));
}
} }
};
} }
export function doHistoryBack() { export function doHistoryBack() {
return function(dispatch, getState) { return function(dispatch, getState) {
history.back() history.back();
} };
} }
export function doHistoryPush(params, title, relativeUrl) { export function doHistoryPush(params, title, relativeUrl) {
return function(dispatch, getState) { return function(dispatch, getState) {
let pathParts = window.location.pathname.split('/') let pathParts = window.location.pathname.split('/');
pathParts[pathParts.length - 1] = relativeUrl.replace(/^\//, '') pathParts[pathParts.length - 1] = relativeUrl.replace(/^\//, '');
const url = pathParts.join('/') const url = pathParts.join('/');
title += " - LBRY" title += ' - LBRY';
history.pushState(params, title, url) history.pushState(params, title, url);
} };
} }
export function doOpenModal(modal) { export function doOpenModal(modal) {
@ -84,13 +78,13 @@ export function doOpenModal(modal) {
data: { data: {
modal modal
} }
} };
} }
export function doCloseModal() { export function doCloseModal() {
return { return {
type: types.CLOSE_MODAL, type: types.CLOSE_MODAL
} };
} }
export function doUpdateDownloadProgress(percent) { export function doUpdateDownloadProgress(percent) {
@ -99,37 +93,40 @@ export function doUpdateDownloadProgress(percent) {
data: { data: {
percent: percent percent: percent
} }
} };
} }
export function doSkipUpgrade() { export function doSkipUpgrade() {
return { return {
type: types.SKIP_UPGRADE type: types.SKIP_UPGRADE
} };
} }
export function doStartUpgrade() { export function doStartUpgrade() {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
const upgradeDownloadPath = selectUpgradeDownloadPath(state) const upgradeDownloadPath = selectUpgradeDownloadPath(state);
ipcRenderer.send('upgrade', upgradeDownloadPath) ipcRenderer.send('upgrade', upgradeDownloadPath);
} };
} }
export function doDownloadUpgrade() { export function doDownloadUpgrade() {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
// Make a new directory within temp directory so the filename is guaranteed to be available // Make a new directory within temp directory so the filename is guaranteed to be available
const dir = fs.mkdtempSync(app.getPath('temp') + require('path').sep); const dir = fs.mkdtempSync(app.getPath('temp') + require('path').sep);
const upgradeFilename = selectUpgradeFilename(state) const upgradeFilename = selectUpgradeFilename(state);
let options = { let options = {
onProgress: (p) => dispatch(doUpdateDownloadProgress(Math.round(p * 100))), onProgress: p => dispatch(doUpdateDownloadProgress(Math.round(p * 100))),
directory: dir, directory: dir
}; };
download(remote.getCurrentWindow(), selectUpdateUrl(state), options) download(
.then(downloadItem => { remote.getCurrentWindow(),
selectUpdateUrl(state),
options
).then(downloadItem => {
/** /**
* TODO: get the download path directly from the download object. It should just be * TODO: get the download path directly from the download object. It should just be
* downloadItem.getSavePath(), but the copy on the main process is being garbage collected * downloadItem.getSavePath(), but the copy on the main process is being garbage collected
@ -142,25 +139,25 @@ export function doDownloadUpgrade() {
downloadItem, downloadItem,
path: path.join(dir, upgradeFilename) path: path.join(dir, upgradeFilename)
} }
}) });
}); });
dispatch({ dispatch({
type: types.UPGRADE_DOWNLOAD_STARTED type: types.UPGRADE_DOWNLOAD_STARTED
}) });
dispatch({ dispatch({
type: types.OPEN_MODAL, type: types.OPEN_MODAL,
data: { data: {
modal: 'downloading' modal: 'downloading'
} }
}) });
} };
} }
export function doCancelUpgrade() { export function doCancelUpgrade() {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
const upgradeDownloadItem = selectUpgradeDownloadItem(state) const upgradeDownloadItem = selectUpgradeDownloadItem(state);
if (upgradeDownloadItem) { if (upgradeDownloadItem) {
/* /*
@ -171,68 +168,68 @@ export function doCancelUpgrade() {
try { try {
upgradeDownloadItem.cancel(); upgradeDownloadItem.cancel();
} catch (err) { } catch (err) {
console.error(err) console.error(err);
// Do nothing // Do nothing
} }
} }
dispatch({ type: types.UPGRADE_CANCELLED }) dispatch({ type: types.UPGRADE_CANCELLED });
} };
} }
export function doCheckUpgradeAvailable() { export function doCheckUpgradeAvailable() {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
lbry.getAppVersionInfo().then(({ remoteVersion, upgradeAvailable }) => { lbry.getAppVersionInfo().then(({ remoteVersion, upgradeAvailable }) => {
if (upgradeAvailable) { if (upgradeAvailable) {
dispatch({ dispatch({
type: types.UPDATE_VERSION, type: types.UPDATE_VERSION,
data: { data: {
version: remoteVersion, version: remoteVersion
} }
}) });
dispatch({ dispatch({
type: types.OPEN_MODAL, type: types.OPEN_MODAL,
data: { data: {
modal: 'upgrade' modal: 'upgrade'
} }
})
}
}); });
} }
});
};
} }
export function doAlertError(errorList) { export function doAlertError(errorList) {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
console.log('do alert error') console.log('do alert error');
console.log(errorList) console.log(errorList);
dispatch({ dispatch({
type: types.OPEN_MODAL, type: types.OPEN_MODAL,
data: { data: {
modal: 'error', modal: 'error',
extraContent: errorList extraContent: errorList
} }
}) });
} };
} }
export function doDaemonReady() { export function doDaemonReady() {
return { return {
type: types.DAEMON_READY type: types.DAEMON_READY
} };
} }
export function doShowSnackBar(data) { export function doShowSnackBar(data) {
return { return {
type: types.SHOW_SNACKBAR, type: types.SHOW_SNACKBAR,
data, data
} };
} }
export function doRemoveSnackBarSnack() { export function doRemoveSnackBarSnack() {
return { return {
type: types.REMOVE_SNACKBAR_SNACK, type: types.REMOVE_SNACKBAR_SNACK
} };
} }

View file

@ -1,29 +1,27 @@
import * as types from 'constants/action_types' import * as types from 'constants/action_types';
import lbry from 'lbry' import lbry from 'lbry';
import { import { selectFetchingAvailability } from 'selectors/availability';
selectFetchingAvailability
} from 'selectors/availability'
export function doFetchAvailability(uri) { export function doFetchAvailability(uri) {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
const alreadyFetching = !!selectFetchingAvailability(state)[uri] const alreadyFetching = !!selectFetchingAvailability(state)[uri];
if (!alreadyFetching) { if (!alreadyFetching) {
dispatch({ dispatch({
type: types.FETCH_AVAILABILITY_STARTED, type: types.FETCH_AVAILABILITY_STARTED,
data: { uri } data: { uri }
}) });
lbry.get_availability({uri}).then((availability) => { lbry.get_availability({ uri }).then(availability => {
dispatch({ dispatch({
type: types.FETCH_AVAILABILITY_COMPLETED, type: types.FETCH_AVAILABILITY_COMPLETED,
data: { data: {
availability, availability,
uri, uri
}
})
})
} }
});
});
} }
};
} }

View file

@ -1,97 +1,84 @@
import * as types from 'constants/action_types' import * as types from 'constants/action_types';
import lbry from 'lbry' import lbry from 'lbry';
import lbryio from 'lbryio' import lbryio from 'lbryio';
import lbryuri from 'lbryuri' import lbryuri from 'lbryuri';
import rewards from 'rewards' import rewards from 'rewards';
import { import { selectBalance } from 'selectors/wallet';
selectBalance,
} from 'selectors/wallet'
import { import {
selectFileInfoForUri, selectFileInfoForUri,
selectUrisDownloading, selectUrisDownloading
} from 'selectors/file_info' } from 'selectors/file_info';
import { import { selectResolvingUris } from 'selectors/content';
selectResolvingUris import { selectCostInfoForUri } from 'selectors/cost_info';
} from 'selectors/content' import { selectClaimsByUri } from 'selectors/claims';
import { import { doOpenModal } from 'actions/app';
selectCostInfoForUri,
} from 'selectors/cost_info'
import {
selectClaimsByUri,
} from 'selectors/claims'
import {
doOpenModal,
} from 'actions/app'
export function doResolveUri(uri) { export function doResolveUri(uri) {
return function(dispatch, getState) { return function(dispatch, getState) {
uri = lbryuri.normalize(uri);
uri = lbryuri.normalize(uri) const state = getState();
const alreadyResolving = selectResolvingUris(state).indexOf(uri) !== -1;
const state = getState()
const alreadyResolving = selectResolvingUris(state).indexOf(uri) !== -1
if (!alreadyResolving) { if (!alreadyResolving) {
dispatch({ dispatch({
type: types.RESOLVE_URI_STARTED, type: types.RESOLVE_URI_STARTED,
data: { uri } data: { uri }
}) });
lbry.resolve({ uri }).then((resolutionInfo) => { lbry.resolve({ uri }).then(resolutionInfo => {
const { const { claim, certificate } = resolutionInfo
claim, ? resolutionInfo
certificate, : { claim: null, certificate: null };
} = resolutionInfo ? resolutionInfo : { claim : null, certificate: null }
dispatch({ dispatch({
type: types.RESOLVE_URI_COMPLETED, type: types.RESOLVE_URI_COMPLETED,
data: { data: {
uri, uri,
claim, claim,
certificate, certificate
}
})
})
} }
});
});
} }
};
} }
export function doCancelResolveUri(uri) { export function doCancelResolveUri(uri) {
return function(dispatch, getState) { return function(dispatch, getState) {
lbry.cancelResolve({ uri }) lbry.cancelResolve({ uri });
dispatch({ dispatch({
type: types.RESOLVE_URI_CANCELED, type: types.RESOLVE_URI_CANCELED,
data: { uri } data: { uri }
}) });
} };
} }
export function doFetchFeaturedUris() { export function doFetchFeaturedUris() {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
dispatch({ dispatch({
type: types.FETCH_FEATURED_CONTENT_STARTED, type: types.FETCH_FEATURED_CONTENT_STARTED
}) });
const success = ({ Categories, Uris }) => { const success = ({ Categories, Uris }) => {
let featuredUris = {};
let featuredUris = {} Categories.forEach(category => {
Categories.forEach((category) => {
if (Uris[category] && Uris[category].length) { if (Uris[category] && Uris[category].length) {
featuredUris[category] = Uris[category] featuredUris[category] = Uris[category];
} }
}) });
dispatch({ dispatch({
type: types.FETCH_FEATURED_CONTENT_COMPLETED, type: types.FETCH_FEATURED_CONTENT_COMPLETED,
data: { data: {
categories: Categories, categories: Categories,
uris: featuredUris, uris: featuredUris
}
})
} }
});
};
const failure = () => { const failure = () => {
dispatch({ dispatch({
@ -100,25 +87,30 @@ export function doFetchFeaturedUris() {
categories: [], categories: [],
uris: {} uris: {}
} }
}) });
} };
lbryio.call('discover', 'list', { version: "early-access" } ) lbryio
.then(success, failure) .call('discover', 'list', { version: 'early-access' })
} .then(success, failure);
};
} }
export function doUpdateLoadStatus(uri, outpoint) { export function doUpdateLoadStatus(uri, outpoint) {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
lbry.file_list({ lbry
.file_list({
outpoint: outpoint, outpoint: outpoint,
full_status: true, full_status: true
}).then(([fileInfo]) => { })
.then(([fileInfo]) => {
if (!fileInfo || fileInfo.written_bytes == 0) { if (!fileInfo || fileInfo.written_bytes == 0) {
// download hasn't started yet // download hasn't started yet
setTimeout(() => { dispatch(doUpdateLoadStatus(uri, outpoint)) }, 250) setTimeout(() => {
dispatch(doUpdateLoadStatus(uri, outpoint));
}, 250);
} else if (fileInfo.completed) { } else if (fileInfo.completed) {
// TODO this isn't going to get called if they reload the client before // TODO this isn't going to get called if they reload the client before
// the download finished // the download finished
@ -127,16 +119,13 @@ export function doUpdateLoadStatus(uri, outpoint) {
data: { data: {
uri, uri,
outpoint, outpoint,
fileInfo, fileInfo
} }
}) });
} else { } else {
// ready to play // ready to play
const { const { total_bytes, written_bytes } = fileInfo;
total_bytes, const progress = written_bytes / total_bytes * 100;
written_bytes,
} = fileInfo
const progress = (written_bytes / total_bytes) * 100
dispatch({ dispatch({
type: types.DOWNLOADING_PROGRESSED, type: types.DOWNLOADING_PROGRESSED,
@ -144,112 +133,118 @@ export function doUpdateLoadStatus(uri, outpoint) {
uri, uri,
outpoint, outpoint,
fileInfo, fileInfo,
progress, progress
} }
}) });
setTimeout(() => { dispatch(doUpdateLoadStatus(uri, outpoint)) }, 250) setTimeout(() => {
} dispatch(doUpdateLoadStatus(uri, outpoint));
}) }, 250);
} }
});
};
} }
export function doDownloadFile(uri, streamInfo) { export function doDownloadFile(uri, streamInfo) {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
lbry.file_list({ outpoint: streamInfo.outpoint, full_status: true }).then(([fileInfo]) => { lbry
.file_list({ outpoint: streamInfo.outpoint, full_status: true })
.then(([fileInfo]) => {
dispatch({ dispatch({
type: types.DOWNLOADING_STARTED, type: types.DOWNLOADING_STARTED,
data: { data: {
uri, uri,
outpoint: streamInfo.outpoint, outpoint: streamInfo.outpoint,
fileInfo, fileInfo
} }
}) });
dispatch(doUpdateLoadStatus(uri, streamInfo.outpoint)) dispatch(doUpdateLoadStatus(uri, streamInfo.outpoint));
}) });
lbryio.call('file', 'view', { lbryio
.call('file', 'view', {
uri: uri, uri: uri,
outpoint: streamInfo.outpoint, outpoint: streamInfo.outpoint,
claim_id: streamInfo.claim_id, claim_id: streamInfo.claim_id
}).catch(() => {}) })
.catch(() => {});
rewards.claimEligiblePurchaseRewards() rewards.claimEligiblePurchaseRewards();
};
}
} }
export function doLoadVideo(uri) { export function doLoadVideo(uri) {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
dispatch({ dispatch({
type: types.LOADING_VIDEO_STARTED, type: types.LOADING_VIDEO_STARTED,
data: { data: {
uri uri
} }
}) });
lbry.get({ uri }).then(streamInfo => { lbry.get({ uri }).then(streamInfo => {
const timeout = streamInfo === null || const timeout =
streamInfo === null ||
typeof streamInfo !== 'object' || typeof streamInfo !== 'object' ||
streamInfo.error == 'Timeout' streamInfo.error == 'Timeout';
if (timeout) { if (timeout) {
dispatch({ dispatch({
type: types.LOADING_VIDEO_FAILED, type: types.LOADING_VIDEO_FAILED,
data: { uri } data: { uri }
}) });
dispatch(doOpenModal('timedOut')) dispatch(doOpenModal('timedOut'));
} else { } else {
dispatch(doDownloadFile(uri, streamInfo)) dispatch(doDownloadFile(uri, streamInfo));
}
})
} }
});
};
} }
export function doPurchaseUri(uri, purchaseModalName) { export function doPurchaseUri(uri, purchaseModalName) {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
const balance = selectBalance(state) const balance = selectBalance(state);
const fileInfo = selectFileInfoForUri(state, { uri }) const fileInfo = selectFileInfoForUri(state, { uri });
const downloadingByUri = selectUrisDownloading(state) const downloadingByUri = selectUrisDownloading(state);
const alreadyDownloading = !!downloadingByUri[uri] const alreadyDownloading = !!downloadingByUri[uri];
// we already fully downloaded the file. // we already fully downloaded the file.
if (fileInfo && fileInfo.completed) { if (fileInfo && fileInfo.completed) {
// If written_bytes is false that means the user has deleted/moved the // If written_bytes is false that means the user has deleted/moved the
// file manually on their file system, so we need to dispatch a // file manually on their file system, so we need to dispatch a
// doLoadVideo action to reconstruct the file from the blobs // doLoadVideo action to reconstruct the file from the blobs
if (!fileInfo.written_bytes) dispatch(doLoadVideo(uri)) if (!fileInfo.written_bytes) dispatch(doLoadVideo(uri));
return Promise.resolve() return Promise.resolve();
} }
// we are already downloading the file // we are already downloading the file
if (alreadyDownloading) { if (alreadyDownloading) {
return Promise.resolve() return Promise.resolve();
} }
const costInfo = selectCostInfoForUri(state, { uri }) const costInfo = selectCostInfoForUri(state, { uri });
const { cost } = costInfo const { cost } = costInfo;
// the file is free or we have partially downloaded it // the file is free or we have partially downloaded it
if (cost <= 0.01 || (fileInfo && fileInfo.download_directory)) { if (cost <= 0.01 || (fileInfo && fileInfo.download_directory)) {
dispatch(doLoadVideo(uri)) dispatch(doLoadVideo(uri));
return Promise.resolve() return Promise.resolve();
} }
if (cost > balance) { if (cost > balance) {
dispatch(doOpenModal('notEnoughCredits')) dispatch(doOpenModal('notEnoughCredits'));
} else { } else {
dispatch(doOpenModal(purchaseModalName)) dispatch(doOpenModal(purchaseModalName));
} }
return Promise.resolve() return Promise.resolve();
} };
} }
export function doFetchClaimsByChannel(uri) { export function doFetchClaimsByChannel(uri) {
@ -257,12 +252,12 @@ export function doFetchClaimsByChannel(uri) {
dispatch({ dispatch({
type: types.FETCH_CHANNEL_CLAIMS_STARTED, type: types.FETCH_CHANNEL_CLAIMS_STARTED,
data: { uri } data: { uri }
}) });
lbry.resolve({ uri }).then((resolutionInfo) => { lbry.resolve({ uri }).then(resolutionInfo => {
const { const { claims_in_channel } = resolutionInfo
claims_in_channel, ? resolutionInfo
} = resolutionInfo ? resolutionInfo : { claims_in_channel: [] } : { claims_in_channel: [] };
dispatch({ dispatch({
type: types.FETCH_CHANNEL_CLAIMS_COMPLETED, type: types.FETCH_CHANNEL_CLAIMS_COMPLETED,
@ -270,25 +265,24 @@ export function doFetchClaimsByChannel(uri) {
uri, uri,
claims: claims_in_channel claims: claims_in_channel
} }
}) });
}) });
} };
} }
export function doFetchClaimListMine() { export function doFetchClaimListMine() {
return function(dispatch, getState) { return function(dispatch, getState) {
dispatch({ dispatch({
type: types.FETCH_CLAIM_LIST_MINE_STARTED type: types.FETCH_CLAIM_LIST_MINE_STARTED
}) });
lbry.claim_list_mine().then(claims => {
lbry.claim_list_mine().then((claims) => {
dispatch({ dispatch({
type: types.FETCH_CLAIM_LIST_MINE_COMPLETED, type: types.FETCH_CLAIM_LIST_MINE_COMPLETED,
data: { data: {
claims claims
} }
}) });
}) });
} };
} }

View file

@ -1,48 +1,40 @@
import * as types from 'constants/action_types' import * as types from 'constants/action_types';
import lbry from 'lbry' import lbry from 'lbry';
import lbryio from 'lbryio' import lbryio from 'lbryio';
import { import { doResolveUri } from 'actions/content';
doResolveUri import { selectResolvingUris } from 'selectors/content';
} from 'actions/content' import { selectClaimsByUri } from 'selectors/claims';
import { import { selectSettingsIsGenerous } from 'selectors/settings';
selectResolvingUris,
} from 'selectors/content'
import {
selectClaimsByUri
} from 'selectors/claims'
import {
selectSettingsIsGenerous
} from 'selectors/settings'
export function doFetchCostInfoForUri(uri) { export function doFetchCostInfoForUri(uri) {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState(), const state = getState(),
claim = selectClaimsByUri(state)[uri], claim = selectClaimsByUri(state)[uri],
isResolving = selectResolvingUris(state).indexOf(uri) !== -1, isResolving = selectResolvingUris(state).indexOf(uri) !== -1,
isGenerous = selectSettingsIsGenerous(state) isGenerous = selectSettingsIsGenerous(state);
if (claim === null) { //claim doesn't exist, nothing to fetch a cost for if (claim === null) {
return //claim doesn't exist, nothing to fetch a cost for
return;
} }
if (!claim) { if (!claim) {
setTimeout(() => { setTimeout(() => {
dispatch(doFetchCostInfoForUri(uri)) dispatch(doFetchCostInfoForUri(uri));
}, 1000) }, 1000);
if (!isResolving) { if (!isResolving) {
dispatch(doResolveUri(uri)) dispatch(doResolveUri(uri));
} }
return return;
} }
function begin() { function begin() {
dispatch({ dispatch({
type: types.FETCH_COST_INFO_STARTED, type: types.FETCH_COST_INFO_STARTED,
data: { data: {
uri, uri
} }
}) });
} }
function resolve(costInfo) { function resolve(costInfo) {
@ -50,28 +42,27 @@ export function doFetchCostInfoForUri(uri) {
type: types.FETCH_COST_INFO_COMPLETED, type: types.FETCH_COST_INFO_COMPLETED,
data: { data: {
uri, uri,
costInfo, costInfo
} }
}) });
} }
if (isGenerous && claim) { if (isGenerous && claim) {
let cost let cost;
const fee = claim.value.stream.metadata.fee; const fee = claim.value.stream.metadata.fee;
if (fee === undefined) { if (fee === undefined) {
resolve({ cost: 0, includesData: true }) resolve({ cost: 0, includesData: true });
} else if (fee.currency == 'LBC') { } else if (fee.currency == 'LBC') {
resolve({ cost: fee.amount, includesData: true }) resolve({ cost: fee.amount, includesData: true });
} else { } else {
begin() begin();
lbryio.getExchangeRates().then(({ lbc_usd }) => { lbryio.getExchangeRates().then(({ lbc_usd }) => {
resolve({ cost: fee.amount / lbc_usd, includesData: true }) resolve({ cost: fee.amount / lbc_usd, includesData: true });
}); });
} }
} else { } else {
begin() begin();
lbry.getCostInfo(uri).then(resolve) lbry.getCostInfo(uri).then(resolve);
} }
};
} }
}

View file

@ -1,121 +1,113 @@
import * as types from 'constants/action_types' import * as types from 'constants/action_types';
import lbry from 'lbry' import lbry from 'lbry';
import { import { doFetchClaimListMine } from 'actions/content';
doFetchClaimListMine
} from 'actions/content'
import { import {
selectClaimsByUri, selectClaimsByUri,
selectClaimListMineIsPending, selectClaimListMineIsPending
} from 'selectors/claims' } from 'selectors/claims';
import { import {
selectFileListIsPending, selectFileListIsPending,
selectAllFileInfos, selectAllFileInfos,
selectUrisLoading, selectUrisLoading
} from 'selectors/file_info' } from 'selectors/file_info';
import { import { doCloseModal } from 'actions/app';
doCloseModal,
} from 'actions/app'
const { const { shell } = require('electron');
shell,
} = require('electron')
export function doFetchFileInfo(uri) { export function doFetchFileInfo(uri) {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
const claim = selectClaimsByUri(state)[uri] const claim = selectClaimsByUri(state)[uri];
const outpoint = claim ? `${claim.txid}:${claim.nout}` : null const outpoint = claim ? `${claim.txid}:${claim.nout}` : null;
const alreadyFetching = !!selectUrisLoading(state)[uri] const alreadyFetching = !!selectUrisLoading(state)[uri];
if (!alreadyFetching) { if (!alreadyFetching) {
dispatch({ dispatch({
type: types.FETCH_FILE_INFO_STARTED, type: types.FETCH_FILE_INFO_STARTED,
data: { data: {
outpoint, outpoint
} }
}) });
lbry.file_list({outpoint: outpoint, full_status: true}).then(fileInfos => {
lbry
.file_list({ outpoint: outpoint, full_status: true })
.then(fileInfos => {
dispatch({ dispatch({
type: types.FETCH_FILE_INFO_COMPLETED, type: types.FETCH_FILE_INFO_COMPLETED,
data: { data: {
outpoint, outpoint,
fileInfo: fileInfos && fileInfos.length ? fileInfos[0] : null, fileInfo: fileInfos && fileInfos.length ? fileInfos[0] : null
}
})
})
} }
});
});
} }
};
} }
export function doFileList() { export function doFileList() {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
const isPending = selectFileListIsPending(state) const isPending = selectFileListIsPending(state);
if (!isPending) { if (!isPending) {
dispatch({ dispatch({
type: types.FILE_LIST_STARTED, type: types.FILE_LIST_STARTED
}) });
lbry.file_list().then((fileInfos) => { lbry.file_list().then(fileInfos => {
dispatch({ dispatch({
type: types.FILE_LIST_COMPLETED, type: types.FILE_LIST_COMPLETED,
data: { data: {
fileInfos, fileInfos
}
})
})
} }
});
});
} }
};
} }
export function doOpenFileInShell(fileInfo) { export function doOpenFileInShell(fileInfo) {
return function(dispatch, getState) { return function(dispatch, getState) {
shell.openItem(fileInfo.download_path) shell.openItem(fileInfo.download_path);
} };
} }
export function doOpenFileInFolder(fileInfo) { export function doOpenFileInFolder(fileInfo) {
return function(dispatch, getState) { return function(dispatch, getState) {
shell.showItemInFolder(fileInfo.download_path) shell.showItemInFolder(fileInfo.download_path);
} };
} }
export function doDeleteFile(outpoint, deleteFromComputer) { export function doDeleteFile(outpoint, deleteFromComputer) {
return function(dispatch, getState) { return function(dispatch, getState) {
dispatch({ dispatch({
type: types.FILE_DELETE, type: types.FILE_DELETE,
data: { data: {
outpoint outpoint
} }
}) });
lbry.file_delete({ lbry.file_delete({
outpoint: outpoint, outpoint: outpoint,
delete_target_file: deleteFromComputer, delete_target_file: deleteFromComputer
}) });
dispatch(doCloseModal()) dispatch(doCloseModal());
};
} }
}
export function doFetchFileInfosAndPublishedClaims() { export function doFetchFileInfosAndPublishedClaims() {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState(), const state = getState(),
isClaimListMinePending = selectClaimListMineIsPending(state), isClaimListMinePending = selectClaimListMineIsPending(state),
isFileInfoListPending = selectFileListIsPending(state) isFileInfoListPending = selectFileListIsPending(state);
if (isClaimListMinePending === undefined) { if (isClaimListMinePending === undefined) {
dispatch(doFetchClaimListMine()) dispatch(doFetchClaimListMine());
} }
if (isFileInfoListPending === undefined) { if (isFileInfoListPending === undefined) {
dispatch(doFileList()) dispatch(doFileList());
} }
};
} }
}

View file

@ -1,36 +1,35 @@
import * as types from 'constants/action_types' import * as types from 'constants/action_types';
import lbry from 'lbry' import lbry from 'lbry';
import lbryio from 'lbryio'; import lbryio from 'lbryio';
import rewards from 'rewards' import rewards from 'rewards';
export function doFetchRewards() { export function doFetchRewards() {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
dispatch({ dispatch({
type: types.FETCH_REWARDS_STARTED, type: types.FETCH_REWARDS_STARTED
}) });
lbryio.call('reward', 'list', {}).then(function(userRewards) { lbryio.call('reward', 'list', {}).then(function(userRewards) {
dispatch({ dispatch({
type: types.FETCH_REWARDS_COMPLETED, type: types.FETCH_REWARDS_COMPLETED,
data: { userRewards } data: { userRewards }
})
}); });
} });
};
} }
export function doClaimReward(rewardType) { export function doClaimReward(rewardType) {
return function(dispatch, getState) { return function(dispatch, getState) {
try { try {
rewards.claimReward(rewards[rewardType]) rewards.claimReward(rewards[rewardType]);
dispatch({ dispatch({
type: types.REWARD_CLAIMED, type: types.REWARD_CLAIMED,
data: { data: {
reward: rewards[rewardType] reward: rewards[rewardType]
} }
}) });
} catch(err) { } catch (err) {}
} };
}
} }

View file

@ -1,54 +1,47 @@
import * as types from 'constants/action_types' import * as types from 'constants/action_types';
import lbryuri from 'lbryuri' import lbryuri from 'lbryuri';
import lighthouse from 'lighthouse' import lighthouse from 'lighthouse';
import { import { doResolveUri } from 'actions/content';
doResolveUri, import { doNavigate, doHistoryPush } from 'actions/app';
} from 'actions/content' import { selectCurrentPage } from 'selectors/app';
import {
doNavigate,
doHistoryPush
} from 'actions/app'
import {
selectCurrentPage,
} from 'selectors/app'
export function doSearch(query) { export function doSearch(query) {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
const page = selectCurrentPage(state) const page = selectCurrentPage(state);
if (!query) { if (!query) {
return dispatch({ return dispatch({
type: types.SEARCH_CANCELLED, type: types.SEARCH_CANCELLED
}) });
} }
dispatch({ dispatch({
type: types.SEARCH_STARTED, type: types.SEARCH_STARTED,
data: { query } data: { query }
}) });
if (page != 'search') { if (page != 'search') {
dispatch(doNavigate('search', { query: query })) dispatch(doNavigate('search', { query: query }));
} else { } else {
lighthouse.search(query).then(results => { lighthouse.search(query).then(results => {
results.forEach(result => { results.forEach(result => {
const uri = lbryuri.build({ const uri = lbryuri.build({
channelName: result.channel_name, channelName: result.channel_name,
contentName: result.name, contentName: result.name,
claimId: result.channel_id || result.claim_id, claimId: result.channel_id || result.claim_id
}) });
dispatch(doResolveUri(uri)) dispatch(doResolveUri(uri));
}) });
dispatch({ dispatch({
type: types.SEARCH_COMPLETED, type: types.SEARCH_COMPLETED,
data: { data: {
query, query,
results, results
}
})
})
} }
});
});
} }
};
} }

View file

@ -1,31 +1,31 @@
import * as types from 'constants/action_types' import * as types from 'constants/action_types';
import lbry from 'lbry' import lbry from 'lbry';
export function doFetchDaemonSettings() { export function doFetchDaemonSettings() {
return function(dispatch, getState) { return function(dispatch, getState) {
lbry.settings_get().then((settings) => { lbry.settings_get().then(settings => {
dispatch({ dispatch({
type: types.DAEMON_SETTINGS_RECEIVED, type: types.DAEMON_SETTINGS_RECEIVED,
data: { data: {
settings settings
} }
}) });
}) });
} };
} }
export function doSetDaemonSetting(key, value) { export function doSetDaemonSetting(key, value) {
return function(dispatch, getState) { return function(dispatch, getState) {
let settings = {}; let settings = {};
settings[key] = value; settings[key] = value;
lbry.settings_set(settings).then(settings) lbry.settings_set(settings).then(settings);
lbry.settings_get().then((settings) => { lbry.settings_get().then(settings => {
dispatch({ dispatch({
type: types.DAEMON_SETTINGS_RECEIVED, type: types.DAEMON_SETTINGS_RECEIVED,
data: { data: {
settings settings
} }
}) });
}) });
} };
} }

View file

@ -1,13 +1,11 @@
import * as types from 'constants/action_types' import * as types from 'constants/action_types';
import lbry from 'lbry' import lbry from 'lbry';
import { import {
selectDraftTransaction, selectDraftTransaction,
selectDraftTransactionAmount, selectDraftTransactionAmount,
selectBalance, selectBalance
} from 'selectors/wallet' } from 'selectors/wallet';
import { import { doOpenModal } from 'actions/app';
doOpenModal,
} from 'actions/app'
export function doUpdateBalance(balance) { export function doUpdateBalance(balance) {
return { return {
@ -15,111 +13,115 @@ export function doUpdateBalance(balance) {
data: { data: {
balance: balance balance: balance
} }
} };
} }
export function doFetchTransactions() { export function doFetchTransactions() {
return function(dispatch, getState) { return function(dispatch, getState) {
dispatch({ dispatch({
type: types.FETCH_TRANSACTIONS_STARTED type: types.FETCH_TRANSACTIONS_STARTED
}) });
lbry.call('transaction_list', {}, (results) => { lbry.call('transaction_list', {}, results => {
dispatch({ dispatch({
type: types.FETCH_TRANSACTIONS_COMPLETED, type: types.FETCH_TRANSACTIONS_COMPLETED,
data: { data: {
transactions: results transactions: results
} }
}) });
}) });
} };
} }
export function doGetNewAddress() { export function doGetNewAddress() {
return function(dispatch, getState) { return function(dispatch, getState) {
dispatch({ dispatch({
type: types.GET_NEW_ADDRESS_STARTED type: types.GET_NEW_ADDRESS_STARTED
}) });
lbry.wallet_new_address().then(function(address) { lbry.wallet_new_address().then(function(address) {
localStorage.setItem('wallet_address', address); localStorage.setItem('wallet_address', address);
dispatch({ dispatch({
type: types.GET_NEW_ADDRESS_COMPLETED, type: types.GET_NEW_ADDRESS_COMPLETED,
data: { address } data: { address }
}) });
}) });
} };
} }
export function doCheckAddressIsMine(address) { export function doCheckAddressIsMine(address) {
return function(dispatch, getState) { return function(dispatch, getState) {
dispatch({ dispatch({
type: types.CHECK_ADDRESS_IS_MINE_STARTED type: types.CHECK_ADDRESS_IS_MINE_STARTED
}) });
lbry.checkAddressIsMine(address, (isMine) => { lbry.checkAddressIsMine(address, isMine => {
if (!isMine) dispatch(doGetNewAddress()) if (!isMine) dispatch(doGetNewAddress());
dispatch({ dispatch({
type: types.CHECK_ADDRESS_IS_MINE_COMPLETED type: types.CHECK_ADDRESS_IS_MINE_COMPLETED
}) });
}) });
} };
} }
export function doSendDraftTransaction() { export function doSendDraftTransaction() {
return function(dispatch, getState) { return function(dispatch, getState) {
const state = getState() const state = getState();
const draftTx = selectDraftTransaction(state) const draftTx = selectDraftTransaction(state);
const balance = selectBalance(state) const balance = selectBalance(state);
const amount = selectDraftTransactionAmount(state) const amount = selectDraftTransactionAmount(state);
if (balance - amount < 1) { if (balance - amount < 1) {
return dispatch(doOpenModal('insufficientBalance')) return dispatch(doOpenModal('insufficientBalance'));
} }
dispatch({ dispatch({
type: types.SEND_TRANSACTION_STARTED, type: types.SEND_TRANSACTION_STARTED
}) });
const successCallback = (results) => { const successCallback = results => {
if (results === true) { if (results === true) {
dispatch({ dispatch({
type: types.SEND_TRANSACTION_COMPLETED, type: types.SEND_TRANSACTION_COMPLETED
}) });
dispatch(doOpenModal('transactionSuccessful')) dispatch(doOpenModal('transactionSuccessful'));
} } else {
else {
dispatch({ dispatch({
type: types.SEND_TRANSACTION_FAILED, type: types.SEND_TRANSACTION_FAILED,
data: { error: results } data: { error: results }
}) });
dispatch(doOpenModal('transactionFailed')) dispatch(doOpenModal('transactionFailed'));
}
} }
};
const errorCallback = (error) => { const errorCallback = error => {
dispatch({ dispatch({
type: types.SEND_TRANSACTION_FAILED, type: types.SEND_TRANSACTION_FAILED,
data: { error: error.message } data: { error: error.message }
}) });
dispatch(doOpenModal('transactionFailed')) dispatch(doOpenModal('transactionFailed'));
} };
lbry.sendToAddress(draftTx.amount, draftTx.address, successCallback, errorCallback); lbry.sendToAddress(
} draftTx.amount,
draftTx.address,
successCallback,
errorCallback
);
};
} }
export function doSetDraftTransactionAmount(amount) { export function doSetDraftTransactionAmount(amount) {
return { return {
type: types.SET_DRAFT_TRANSACTION_AMOUNT, type: types.SET_DRAFT_TRANSACTION_AMOUNT,
data: { amount } data: { amount }
} };
} }
export function doSetDraftTransactionAddress(address) { export function doSetDraftTransactionAddress(address) {
return { return {
type: types.SET_DRAFT_TRANSACTION_ADDRESS, type: types.SET_DRAFT_TRANSACTION_ADDRESS,
data: { address } data: { address }
} };
} }

View file

@ -3,8 +3,14 @@ import lbry from './lbry.js';
const env = ENV; const env = ENV;
const config = require(`./config/${env}`); const config = require(`./config/${env}`);
const language = lbry.getClientSetting('language') ? lbry.getClientSetting('language') : 'en'; const language = lbry.getClientSetting('language')
const i18n = require('y18n')({directory: 'app/locales', updateFiles: false, locale: language}); ? lbry.getClientSetting('language')
: 'en';
const i18n = require('y18n')({
directory: 'app/locales',
updateFiles: false,
locale: language
});
const logs = []; const logs = [];
const app = { const app = {
env: env, env: env,
@ -16,7 +22,7 @@ const app = {
console.log(message); console.log(message);
logs.push(message); logs.push(message);
} }
} };
window.__ = i18n.__; window.__ = i18n.__;
window.__n = i18n.__n; window.__n = i18n.__n;

View file

@ -1,26 +1,19 @@
import React from 'react'; import React from 'react';
import { connect } from 'react-redux' import { connect } from 'react-redux';
import { import { selectCurrentModal } from 'selectors/app';
selectCurrentModal, import { doCheckUpgradeAvailable, doAlertError } from 'actions/app';
} from 'selectors/app' import { doUpdateBalance } from 'actions/wallet';
import { import App from './view';
doCheckUpgradeAvailable,
doAlertError,
} from 'actions/app'
import {
doUpdateBalance,
} from 'actions/wallet'
import App from './view'
const select = (state) => ({ const select = state => ({
modal: selectCurrentModal(state), modal: selectCurrentModal(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
alertError: (errorList) => dispatch(doAlertError(errorList)), alertError: errorList => dispatch(doAlertError(errorList)),
checkUpgradeAvailable: () => dispatch(doCheckUpgradeAvailable()), checkUpgradeAvailable: () => dispatch(doCheckUpgradeAvailable()),
updateBalance: (balance) => dispatch(doUpdateBalance(balance)) updateBalance: balance => dispatch(doUpdateBalance(balance))
}) });
export default connect(select, perform)(App) export default connect(select, perform)(App);

View file

@ -1,33 +1,32 @@
import React from 'react' import React from 'react';
import Router from 'component/router' import Router from 'component/router';
import Header from 'component/header'; import Header from 'component/header';
import ErrorModal from 'component/errorModal' import ErrorModal from 'component/errorModal';
import DownloadingModal from 'component/downloadingModal' import DownloadingModal from 'component/downloadingModal';
import UpgradeModal from 'component/upgradeModal' import UpgradeModal from 'component/upgradeModal';
import lbry from 'lbry' import lbry from 'lbry';
import {Line} from 'rc-progress' import { Line } from 'rc-progress';
class App extends React.Component { class App extends React.Component {
componentWillMount() { componentWillMount() {
document.addEventListener('unhandledError', (event) => { document.addEventListener('unhandledError', event => {
this.props.alertError(event.detail); this.props.alertError(event.detail);
}); });
if (!this.props.upgradeSkipped) { if (!this.props.upgradeSkipped) {
this.props.checkUpgradeAvailable() this.props.checkUpgradeAvailable();
} }
lbry.balanceSubscribe((balance) => { lbry.balanceSubscribe(balance => {
this.props.updateBalance(balance) this.props.updateBalance(balance);
}) });
} }
render() { render() {
const { const { modal } = this.props;
modal,
} = this.props
return <div id="window"> return (
<div id="window">
<Header /> <Header />
<div id="main-content"> <div id="main-content">
<Router /> <Router />
@ -36,7 +35,8 @@ class App extends React.Component {
{modal == 'downloading' && <DownloadingModal />} {modal == 'downloading' && <DownloadingModal />}
{modal == 'error' && <ErrorModal />} {modal == 'error' && <ErrorModal />}
</div> </div>
);
} }
} }
export default App export default App;

View file

@ -1,15 +1,14 @@
import React from "react"; import React from 'react';
import lbry from "../lbry.js"; import lbry from '../lbry.js';
import lbryio from "../lbryio.js"; import lbryio from '../lbryio.js';
import Modal from "./modal.js"; import Modal from './modal.js';
import ModalPage from "./modal-page.js"; import ModalPage from './modal-page.js';
import Link from "component/link" import Link from 'component/link';
import { RewardLink } from 'component/reward-link'; import { RewardLink } from 'component/reward-link';
import {FormRow} from "../component/form.js"; import { FormRow } from '../component/form.js';
import {CreditAmount, Address} from "../component/common.js"; import { CreditAmount, Address } from '../component/common.js';
import { getLocal, setLocal } from '../utils.js'; import { getLocal, setLocal } from '../utils.js';
import rewards from '../rewards' import rewards from '../rewards';
class SubmitEmailStage extends React.Component { class SubmitEmailStage extends React.Component {
constructor(props) { constructor(props) {
@ -24,42 +23,70 @@ class SubmitEmailStage extends React.Component {
handleEmailChanged(event) { handleEmailChanged(event) {
this.setState({ this.setState({
email: event.target.value, email: event.target.value
}); });
} }
onEmailSaved(email) { onEmailSaved(email) {
this.props.setStage("confirm", { email: email }) this.props.setStage('confirm', { email: email });
} }
handleSubmit(event) { handleSubmit(event) {
event.preventDefault(); event.preventDefault();
this.setState({ this.setState({
submitting: true, submitting: true
}); });
lbryio.call('user_email', 'new', {email: this.state.email}, 'post').then(() => { lbryio.call('user_email', 'new', { email: this.state.email }, 'post').then(
() => {
this.onEmailSaved(this.state.email); this.onEmailSaved(this.state.email);
}, (error) => { },
if (error.xhr && (error.xhr.status == 409 || error.message == __("This email is already in use"))) { error => {
if (
error.xhr &&
(error.xhr.status == 409 ||
error.message == __('This email is already in use'))
) {
this.onEmailSaved(this.state.email); this.onEmailSaved(this.state.email);
return; return;
} else if (this._emailRow) { } else if (this._emailRow) {
this._emailRow.showError(error.message) this._emailRow.showError(error.message);
} }
this.setState({ submitting: false }); this.setState({ submitting: false });
}); }
);
} }
render() { render() {
return ( return (
<section> <section>
<form onSubmit={(event) => { this.handleSubmit(event) }}> <form
<FormRow ref={(ref) => { this._emailRow = ref }} type="text" label={__("Email")} placeholder="scrwvwls@lbry.io" onSubmit={event => {
name="email" value={this.state.email} this.handleSubmit(event);
onChange={(event) => { this.handleEmailChanged(event) }} /> }}
>
<FormRow
ref={ref => {
this._emailRow = ref;
}}
type="text"
label={__('Email')}
placeholder="scrwvwls@lbry.io"
name="email"
value={this.state.email}
onChange={event => {
this.handleEmailChanged(event);
}}
/>
<div className="form-row-submit"> <div className="form-row-submit">
<Link button="primary" label={__("Next")} disabled={this.state.submitting} onClick={(event) => { this.handleSubmit(event) }} /> <Link
button="primary"
label={__('Next')}
disabled={this.state.submitting}
onClick={event => {
this.handleSubmit(event);
}}
/>
</div> </div>
</form> </form>
</section> </section>
@ -75,34 +102,41 @@ class ConfirmEmailStage extends React.Component {
rewardType: null, rewardType: null,
code: '', code: '',
submitting: false, submitting: false,
errorMessage: null, errorMessage: null
}; };
} }
handleCodeChanged(event) { handleCodeChanged(event) {
this.setState({ this.setState({
code: event.target.value, code: event.target.value
}); });
} }
handleSubmit(event) { handleSubmit(event) {
event.preventDefault(); event.preventDefault();
this.setState({ this.setState({
submitting: true, submitting: true
}); });
const onSubmitError = (error) => { const onSubmitError = error => {
if (this._codeRow) { if (this._codeRow) {
this._codeRow.showError(error.message) this._codeRow.showError(error.message);
} }
this.setState({ submitting: false }); this.setState({ submitting: false });
}; };
lbryio.call('user_email', 'confirm', {verification_token: this.state.code, email: this.props.email}, 'post').then((userEmail) => { lbryio
.call(
'user_email',
'confirm',
{ verification_token: this.state.code, email: this.props.email },
'post'
)
.then(userEmail => {
if (userEmail.is_verified) { if (userEmail.is_verified) {
this.props.setStage("welcome") this.props.setStage('welcome');
} else { } else {
onSubmitError(new Error(__("Your email is still not verified."))) //shouldn't happen? onSubmitError(new Error(__('Your email is still not verified.'))); //shouldn't happen?
} }
}, onSubmitError); }, onSubmitError);
} }
@ -110,15 +144,46 @@ class ConfirmEmailStage extends React.Component {
render() { render() {
return ( return (
<section> <section>
<form onSubmit={(event) => { this.handleSubmit(event) }}> <form
<FormRow label={__("Verification Code")} ref={(ref) => { this._codeRow = ref }} type="text" onSubmit={event => {
name="code" placeholder="a94bXXXXXXXXXXXXXX" value={this.state.code} onChange={(event) => { this.handleCodeChanged(event) }} this.handleSubmit(event);
helper={__("A verification code is required to access this version.")}/> }}
>
<FormRow
label={__('Verification Code')}
ref={ref => {
this._codeRow = ref;
}}
type="text"
name="code"
placeholder="a94bXXXXXXXXXXXXXX"
value={this.state.code}
onChange={event => {
this.handleCodeChanged(event);
}}
helper={__(
'A verification code is required to access this version.'
)}
/>
<div className="form-row-submit form-row-submit--with-footer"> <div className="form-row-submit form-row-submit--with-footer">
<Link button="primary" label={__("Verify")} disabled={this.state.submitting} onClick={(event) => { this.handleSubmit(event)}} /> <Link
button="primary"
label={__('Verify')}
disabled={this.state.submitting}
onClick={event => {
this.handleSubmit(event);
}}
/>
</div> </div>
<div className="form-field__helper"> <div className="form-field__helper">
{__("No code?")} <Link onClick={() => { this.props.setStage("nocode")}} label={__("Click here")} />. {__('No code?')}
{' '}
<Link
onClick={() => {
this.props.setStage('nocode');
}}
label={__('Click here')}
/>.
</div> </div>
</form> </form>
</section> </section>
@ -128,15 +193,15 @@ class ConfirmEmailStage extends React.Component {
class WelcomeStage extends React.Component { class WelcomeStage extends React.Component {
static propTypes = { static propTypes = {
endAuth: React.PropTypes.func, endAuth: React.PropTypes.func
} };
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
hasReward: false, hasReward: false,
rewardAmount: null, rewardAmount: null
}; };
} }
@ -144,59 +209,127 @@ class WelcomeStage extends React.Component {
this.setState({ this.setState({
hasReward: true, hasReward: true,
rewardAmount: reward.amount rewardAmount: reward.amount
}) });
} }
render() { render() {
return ( return !this.state.hasReward
!this.state.hasReward ? ? <Modal
<Modal type="custom" isOpen={true} contentLabel={__("Welcome to LBRY")} {...this.props}> type="custom"
isOpen={true}
contentLabel={__('Welcome to LBRY')}
{...this.props}
>
<section> <section>
<h3 className="modal__header">{__("Welcome to LBRY.")}</h3> <h3 className="modal__header">{__('Welcome to LBRY.')}</h3>
<p>{__("Using LBRY is like dating a centaur. Totally normal up top, and way different underneath.")}</p> <p>
<p>{__("Up top, LBRY is similar to popular media sites.")}</p> {__(
<p>{__("Below, LBRY is controlled by users -- you -- via blockchain and decentralization.")}</p> 'Using LBRY is like dating a centaur. Totally normal up top, and way different underneath.'
<p>{__("Thank you for making content freedom possible! Here's a nickel, kid.")}</p> )}
<div style={{textAlign: "center", marginBottom: "12px"}}> </p>
<RewardLink type="new_user" button="primary" onRewardClaim={(event) => { this.onRewardClaim(event) }} onRewardFailure={() => this.props.setStage(null)} onConfirmed={() => { this.props.setStage(null) }} /> <p>{__('Up top, LBRY is similar to popular media sites.')}</p>
<p>
{__(
'Below, LBRY is controlled by users -- you -- via blockchain and decentralization.'
)}
</p>
<p>
{__(
"Thank you for making content freedom possible! Here's a nickel, kid."
)}
</p>
<div style={{ textAlign: 'center', marginBottom: '12px' }}>
<RewardLink
type="new_user"
button="primary"
onRewardClaim={event => {
this.onRewardClaim(event);
}}
onRewardFailure={() => this.props.setStage(null)}
onConfirmed={() => {
this.props.setStage(null);
}}
/>
</div> </div>
</section> </section>
</Modal> :
<Modal type="alert" overlayClassName="modal-overlay modal-overlay--clear" isOpen={true} contentLabel={__("Welcome to LBRY")} {...this.props} onConfirmed={() => { this.props.setStage(null) }}>
<section>
<h3 className="modal__header">{__("About Your Reward")}</h3>
<p>{__("You earned a reward of ")} <CreditAmount amount={this.state.rewardAmount} label={false} /> {__("LBRY credits, or \"LBC\".")}</p>
<p>{__("This reward will show in your Wallet momentarily, probably while you are reading this message.")}</p>
<p>{__("LBC is used to compensate creators, to publish, and to have say in how the network works.")}</p>
<p>{__("No need to understand it all just yet! Try watching or downloading something next.")}</p>
<p>{__("Finally, know that LBRY is an early beta and that it earns the name.")}</p>
</section>
</Modal> </Modal>
); : <Modal
type="alert"
overlayClassName="modal-overlay modal-overlay--clear"
isOpen={true}
contentLabel={__('Welcome to LBRY')}
{...this.props}
onConfirmed={() => {
this.props.setStage(null);
}}
>
<section>
<h3 className="modal__header">{__('About Your Reward')}</h3>
<p>
{__('You earned a reward of ')}
{' '}<CreditAmount
amount={this.state.rewardAmount}
label={false}
/>
{' '}{__('LBRY credits, or "LBC".')}
</p>
<p>
{__(
'This reward will show in your Wallet momentarily, probably while you are reading this message.'
)}
</p>
<p>
{__(
'LBC is used to compensate creators, to publish, and to have say in how the network works.'
)}
</p>
<p>
{__(
'No need to understand it all just yet! Try watching or downloading something next.'
)}
</p>
<p>
{__(
'Finally, know that LBRY is an early beta and that it earns the name.'
)}
</p>
</section>
</Modal>;
} }
} }
const ErrorStage = (props) => { const ErrorStage = props => {
return <section> return (
<p>{__("An error was encountered that we cannot continue from.")}</p> <section>
<p>{__('An error was encountered that we cannot continue from.')}</p>
<p>{__("At least we're earning the name beta.")}</p> <p>{__("At least we're earning the name beta.")}</p>
{ props.errorText ? <p>{__("Message:")} {props.errorText}</p> : '' } {props.errorText ? <p>{__('Message:')} {props.errorText}</p> : ''}
<Link button="alt" label={__("Try Reload")} onClick={() => { window.location.reload() } } /> <Link
button="alt"
label={__('Try Reload')}
onClick={() => {
window.location.reload();
}}
/>
</section> </section>
} );
};
const PendingStage = (props) => { const PendingStage = props => {
return <section> return (
<p>{__("Preparing for first access")} <span className="busy-indicator"></span></p> <section>
<p>
{__('Preparing for first access')} <span className="busy-indicator" />
</p>
</section> </section>
} );
};
class CodeRequiredStage extends React.Component { class CodeRequiredStage extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this._balanceSubscribeId = null this._balanceSubscribeId = null;
this.state = { this.state = {
balance: 0, balance: 0,
@ -205,14 +338,14 @@ class CodeRequiredStage extends React.Component {
} }
componentWillMount() { componentWillMount() {
this._balanceSubscribeId = lbry.balanceSubscribe((balance) => { this._balanceSubscribeId = lbry.balanceSubscribe(balance => {
this.setState({ this.setState({
balance: balance balance: balance
}); });
}) });
if (!this.state.address) { if (!this.state.address) {
lbry.wallet_unused_address().then((address) => { lbry.wallet_unused_address().then(address => {
setLocal('wallet_address', address); setLocal('wallet_address', address);
this.setState({ address: address }); this.setState({ address: address });
}); });
@ -221,7 +354,7 @@ class CodeRequiredStage extends React.Component {
componentWillUnmount() { componentWillUnmount() {
if (this._balanceSubscribeId) { if (this._balanceSubscribeId) {
lbry.balanceUnsubscribe(this._balanceSubscribeId) lbry.balanceUnsubscribe(this._balanceSubscribeId);
} }
} }
@ -230,27 +363,62 @@ class CodeRequiredStage extends React.Component {
return ( return (
<div> <div>
<section className="section-spaced"> <section className="section-spaced">
<p>{__("Access to LBRY is restricted as we build and scale the network.")}</p> <p>
<p>{__("There are two ways in:")}</p> {__(
<h3>{__("Own LBRY Credits")}</h3> 'Access to LBRY is restricted as we build and scale the network.'
<p>{__("If you own at least 1 LBC, you can get in right now.")}</p> )}
<p style={{ textAlign: "center"}}><Link onClick={() => { setLocal('auth_bypassed', true); this.props.setStage(null); }} </p>
disabled={disabled} label={__("Let Me In")} button={ disabled ? "alt" : "primary" } /></p> <p>{__('There are two ways in:')}</p>
<p>{__("Your balance is ")}<CreditAmount amount={this.state.balance} />. {__("To increase your balance, send credits to this address:")}</p> <h3>{__('Own LBRY Credits')}</h3>
<p><Address address={ this.state.address ? this.state.address : __("Generating Address...") } /></p> <p>{__('If you own at least 1 LBC, you can get in right now.')}</p>
<p style={{ textAlign: 'center' }}>
<Link
onClick={() => {
setLocal('auth_bypassed', true);
this.props.setStage(null);
}}
disabled={disabled}
label={__('Let Me In')}
button={disabled ? 'alt' : 'primary'}
/>
</p>
<p>
{__('Your balance is ')}<CreditAmount
amount={this.state.balance}
/>. {__('To increase your balance, send credits to this address:')}
</p>
<p>
<Address
address={
this.state.address
? this.state.address
: __('Generating Address...')
}
/>
</p>
<p>{__("If you don't understand how to send credits, then...")}</p> <p>{__("If you don't understand how to send credits, then...")}</p>
</section> </section>
<section> <section>
<h3>{__("Wait For A Code")}</h3> <h3>{__('Wait For A Code')}</h3>
<p>{__("If you provide your email, you'll automatically receive a notification when the system is open.")}</p> <p>
<p><Link onClick={() => { this.props.setStage("email"); }} label={__("Return")} /></p> {__(
"If you provide your email, you'll automatically receive a notification when the system is open."
)}
</p>
<p>
<Link
onClick={() => {
this.props.setStage('email');
}}
label={__('Return')}
/>
</p>
</section> </section>
</div> </div>
); );
} }
} }
export class AuthOverlay extends React.Component { export class AuthOverlay extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
@ -262,10 +430,10 @@ export class AuthOverlay extends React.Component {
email: SubmitEmailStage, email: SubmitEmailStage,
confirm: ConfirmEmailStage, confirm: ConfirmEmailStage,
welcome: WelcomeStage welcome: WelcomeStage
} };
this.state = { this.state = {
stage: "pending", stage: 'pending',
stageProps: {} stageProps: {}
}; };
} }
@ -274,35 +442,43 @@ export class AuthOverlay extends React.Component {
this.setState({ this.setState({
stage: stage, stage: stage,
stageProps: stageProps stageProps: stageProps
}) });
} }
componentWillMount() { componentWillMount() {
lbryio.authenticate().then((user) => { lbryio
.authenticate()
.then(user => {
if (!user.has_verified_email) { if (!user.has_verified_email) {
if (getLocal('auth_bypassed')) { if (getLocal('auth_bypassed')) {
this.setStage(null) this.setStage(null);
} else { } else {
this.setStage("email", {}) this.setStage('email', {});
} }
} else { } else {
lbryio.call('reward', 'list', {}).then((userRewards) => { lbryio.call('reward', 'list', {}).then(userRewards => {
userRewards.filter(function(reward) { userRewards.filter(function(reward) {
return reward.reward_type == rewards.TYPE_NEW_USER && reward.transaction_id; return (
}).length ? reward.reward_type == rewards.TYPE_NEW_USER &&
this.setStage(null) : reward.transaction_id
this.setStage("welcome") );
}).length
? this.setStage(null)
: this.setStage('welcome');
}); });
} }
}).catch((err) => { })
this.setStage("error", { errorText: err.message }) .catch(err => {
document.dispatchEvent(new CustomEvent('unhandledError', { this.setStage('error', { errorText: err.message });
document.dispatchEvent(
new CustomEvent('unhandledError', {
detail: { detail: {
message: err.message, message: err.message,
data: err.stack data: err.stack
} }
}));
}) })
);
});
} }
render() { render() {
@ -312,16 +488,30 @@ export class AuthOverlay extends React.Component {
const StageContent = this._stages[this.state.stage]; const StageContent = this._stages[this.state.stage];
if (!StageContent) { if (!StageContent) {
return <span className="empty">{__("Unknown authentication step.")}</span>
}
return ( return (
this.state.stage != "welcome" ? <span className="empty">{__('Unknown authentication step.')}</span>
<ModalPage className="modal-page--full" isOpen={true} contentLabel={__("Authentication")}>
<h1>{__("LBRY Early Access")}</h1>
<StageContent {...this.state.stageProps} setStage={(stage, stageProps) => { this.setStage(stage, stageProps) }} />
</ModalPage> :
<StageContent setStage={(stage, stageProps) => { this.setStage(stage, stageProps) }} {...this.state.stageProps} />
); );
} }
return this.state.stage != 'welcome'
? <ModalPage
className="modal-page--full"
isOpen={true}
contentLabel={__('Authentication')}
>
<h1>{__('LBRY Early Access')}</h1>
<StageContent
{...this.state.stageProps}
setStage={(stage, stageProps) => {
this.setStage(stage, stageProps);
}}
/>
</ModalPage>
: <StageContent
setStage={(stage, stageProps) => {
this.setStage(stage, stageProps);
}}
{...this.state.stageProps}
/>;
}
} }

View file

@ -6,38 +6,51 @@ export class Icon extends React.Component {
static propTypes = { static propTypes = {
icon: React.PropTypes.string.isRequired, icon: React.PropTypes.string.isRequired,
className: React.PropTypes.string, className: React.PropTypes.string,
fixed: React.PropTypes.bool, fixed: React.PropTypes.bool
} };
render() { render() {
const { fixed, className } = this.props; const { fixed, className } = this.props;
const spanClassName = ('icon ' + ('fixed' in this.props ? 'icon-fixed-width ' : '') + const spanClassName =
this.props.icon + ' ' + (this.props.className || '')); 'icon ' +
return <span className={spanClassName}></span> ('fixed' in this.props ? 'icon-fixed-width ' : '') +
this.props.icon +
' ' +
(this.props.className || '');
return <span className={spanClassName} />;
} }
} }
export class TruncatedText extends React.Component { export class TruncatedText extends React.Component {
static propTypes = { static propTypes = {
lines: React.PropTypes.number, lines: React.PropTypes.number
} };
static defaultProps = { static defaultProps = {
lines: null lines: null
} };
render() { render() {
return <span className="truncated-text" style={{ WebkitLineClamp: this.props.lines }}>{this.props.children}</span>; return (
<span
className="truncated-text"
style={{ WebkitLineClamp: this.props.lines }}
>
{this.props.children}
</span>
);
} }
} }
export class BusyMessage extends React.Component { export class BusyMessage extends React.Component {
static propTypes = { static propTypes = {
message: React.PropTypes.string, message: React.PropTypes.string
} };
render() { render() {
return <span>{this.props.message} <span className="busy-indicator"></span></span> return (
<span>{this.props.message} <span className="busy-indicator" /></span>
);
} }
} }
@ -54,23 +67,29 @@ export class CreditAmount extends React.Component {
isEstimate: React.PropTypes.bool, isEstimate: React.PropTypes.bool,
label: React.PropTypes.bool, label: React.PropTypes.bool,
showFree: React.PropTypes.bool, showFree: React.PropTypes.bool,
look: React.PropTypes.oneOf(['indicator', 'plain']), look: React.PropTypes.oneOf(['indicator', 'plain'])
} };
static defaultProps = { static defaultProps = {
precision: 1, precision: 1,
label: true, label: true,
showFree: false, showFree: false,
look: 'indicator', look: 'indicator'
} };
render() { render() {
const formattedAmount = lbry.formatCredits(this.props.amount, this.props.precision); const formattedAmount = lbry.formatCredits(
this.props.amount,
this.props.precision
);
let amountText; let amountText;
if (this.props.showFree && parseFloat(formattedAmount) == 0) { if (this.props.showFree && parseFloat(formattedAmount) == 0) {
amountText = __('free'); amountText = __('free');
} else if (this.props.label) { } else if (this.props.label) {
amountText = formattedAmount + ' ' + (parseFloat(formattedAmount) == 1 ? __('credit') : __('credits')); amountText =
formattedAmount +
' ' +
(parseFloat(formattedAmount) == 1 ? __('credit') : __('credits'));
} else { } else {
amountText = formattedAmount; amountText = formattedAmount;
} }
@ -80,19 +99,26 @@ export class CreditAmount extends React.Component {
<span> <span>
{amountText} {amountText}
</span> </span>
{ this.props.isEstimate ? <span className="credit-amount__estimate" title={__("This is an estimate and does not include data fees")}>*</span> : null } {this.props.isEstimate
? <span
className="credit-amount__estimate"
title={__('This is an estimate and does not include data fees')}
>
*
</span>
: null}
</span> </span>
); );
} }
} }
let addressStyle = { let addressStyle = {
fontFamily: '"Consolas", "Lucida Console", "Adobe Source Code Pro", monospace', fontFamily: '"Consolas", "Lucida Console", "Adobe Source Code Pro", monospace'
}; };
export class Address extends React.Component { export class Address extends React.Component {
static propTypes = { static propTypes = {
address: React.PropTypes.string, address: React.PropTypes.string
} };
constructor(props) { constructor(props) {
super(props); super(props);
@ -102,21 +128,32 @@ export class Address extends React.Component {
render() { render() {
return ( return (
<input className="input-copyable" type="text" ref={(input) => { this._inputElem = input; }} <input
onFocus={() => { this._inputElem.select(); }} style={addressStyle} readOnly="readonly" value={this.props.address}></input> className="input-copyable"
type="text"
ref={input => {
this._inputElem = input;
}}
onFocus={() => {
this._inputElem.select();
}}
style={addressStyle}
readOnly="readonly"
value={this.props.address}
/>
); );
} }
} }
export class Thumbnail extends React.Component { export class Thumbnail extends React.Component {
static propTypes = { static propTypes = {
src: React.PropTypes.string, src: React.PropTypes.string
} };
handleError() { handleError() {
if (this.state.imageUrl != this._defaultImageUri) { if (this.state.imageUrl != this._defaultImageUri) {
this.setState({ this.setState({
imageUri: this._defaultImageUri, imageUri: this._defaultImageUri
}); });
} }
} }
@ -124,12 +161,12 @@ export class Thumbnail extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
this._defaultImageUri = lbry.imagePath('default-thumb.svg') this._defaultImageUri = lbry.imagePath('default-thumb.svg');
this._maxLoadTime = 10000 this._maxLoadTime = 10000;
this._isMounted = false this._isMounted = false;
this.state = { this.state = {
imageUri: this.props.src || this._defaultImageUri, imageUri: this.props.src || this._defaultImageUri
}; };
} }
@ -138,7 +175,7 @@ export class Thumbnail extends React.Component {
setTimeout(() => { setTimeout(() => {
if (this._isMounted && !this.refs.img.complete) { if (this._isMounted && !this.refs.img.complete) {
this.setState({ this.setState({
imageUri: this._defaultImageUri, imageUri: this._defaultImageUri
}); });
} }
}, this._maxLoadTime); }, this._maxLoadTime);
@ -150,8 +187,18 @@ export class Thumbnail extends React.Component {
render() { render() {
const className = this.props.className ? this.props.className : '', const className = this.props.className ? this.props.className : '',
otherProps = Object.assign({}, this.props) otherProps = Object.assign({}, this.props);
delete otherProps.className; delete otherProps.className;
return <img ref="img" onError={() => { this.handleError() }} {...otherProps} className={className} src={this.state.imageUri} /> return (
<img
ref="img"
onError={() => {
this.handleError();
}}
{...otherProps}
className={className}
src={this.state.imageUri}
/>
);
} }
} }

View file

@ -1,25 +1,17 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { doStartUpgrade, doCancelUpgrade } from 'actions/app';
} from 'react-redux' import { selectDownloadProgress, selectDownloadComplete } from 'selectors/app';
import { import DownloadingModal from './view';
doStartUpgrade,
doCancelUpgrade,
} from 'actions/app'
import {
selectDownloadProgress,
selectDownloadComplete,
} from 'selectors/app'
import DownloadingModal from './view'
const select = (state) => ({ const select = state => ({
downloadProgress: selectDownloadProgress(state), downloadProgress: selectDownloadProgress(state),
downloadComplete: selectDownloadComplete(state), downloadComplete: selectDownloadComplete(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
startUpgrade: () => dispatch(doStartUpgrade()), startUpgrade: () => dispatch(doStartUpgrade()),
cancelUpgrade: () => dispatch(doCancelUpgrade()) cancelUpgrade: () => dispatch(doCancelUpgrade())
}) });
export default connect(select, perform)(DownloadingModal) export default connect(select, perform)(DownloadingModal);

View file

@ -1,9 +1,7 @@
import React from 'react' import React from 'react';
import { import { Modal } from 'component/modal';
Modal
} from 'component/modal'
import { Line } from 'rc-progress'; import { Line } from 'rc-progress';
import Link from 'component/link' import Link from 'component/link';
class DownloadingModal extends React.Component { class DownloadingModal extends React.Component {
render() { render() {
@ -11,30 +9,54 @@ class DownloadingModal extends React.Component {
downloadProgress, downloadProgress,
downloadComplete, downloadComplete,
startUpgrade, startUpgrade,
cancelUpgrade, cancelUpgrade
} = this.props } = this.props;
return ( return (
<Modal isOpen={true} contentLabel={__("Downloading Update")} type="custom"> <Modal
{__("Downloading Update")}{downloadProgress ? `: ${downloadProgress}%` : null} isOpen={true}
<Line percent={downloadProgress ? downloadProgress : 0} strokeWidth="4"/> contentLabel={__('Downloading Update')}
{downloadComplete ? ( type="custom"
<div> >
{__('Downloading Update')}
{downloadProgress ? `: ${downloadProgress}%` : null}
<Line
percent={downloadProgress ? downloadProgress : 0}
strokeWidth="4"
/>
{downloadComplete
? <div>
<br /> <br />
<p>{__("Click \"Begin Upgrade\" to start the upgrade process.")}</p> <p>{__('Click "Begin Upgrade" to start the upgrade process.')}</p>
<p>{__("The app will close, and you will be prompted to install the latest version of LBRY.")}</p> <p>
<p>{__("After the install is complete, please reopen the app.")}</p> {__(
'The app will close, and you will be prompted to install the latest version of LBRY.'
)}
</p>
<p>
{__('After the install is complete, please reopen the app.')}
</p>
</div> </div>
) : null } : null}
<div className="modal__buttons"> <div className="modal__buttons">
{downloadComplete {downloadComplete
? <Link button="primary" label={__("Begin Upgrade")} className="modal__button" onClick={startUpgrade} /> ? <Link
button="primary"
label={__('Begin Upgrade')}
className="modal__button"
onClick={startUpgrade}
/>
: null} : null}
<Link button="alt" label={__("Cancel")} className="modal__button" onClick={cancelUpgrade} /> <Link
button="alt"
label={__('Cancel')}
className="modal__button"
onClick={cancelUpgrade}
/>
</div> </div>
</Modal> </Modal>
) );
} }
} }
export default DownloadingModal export default DownloadingModal;

View file

@ -1,23 +1,16 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { selectCurrentModal, selectModalExtraContent } from 'selectors/app';
} from 'react-redux' import { doCloseModal } from 'actions/app';
import { import ErrorModal from './view';
selectCurrentModal,
selectModalExtraContent,
} from 'selectors/app'
import {
doCloseModal,
} from 'actions/app'
import ErrorModal from './view'
const select = (state) => ({ const select = state => ({
modal: selectCurrentModal(state), modal: selectCurrentModal(state),
error: selectModalExtraContent(state), error: selectModalExtraContent(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
closeModal: () => dispatch(doCloseModal()) closeModal: () => dispatch(doCloseModal())
}) });
export default connect(select, perform)(ErrorModal) export default connect(select, perform)(ErrorModal);

View file

@ -1,18 +1,12 @@
import React from 'react' import React from 'react';
import lbry from 'lbry' import lbry from 'lbry';
import { import { ExpandableModal } from 'component/modal';
ExpandableModal
} from 'component/modal'
class ErrorModal extends React.Component { class ErrorModal extends React.Component {
render() { render() {
const { const { modal, closeModal, error } = this.props;
modal,
closeModal,
error
} = this.props
const errorObj = typeof error === "string" ? { error: error } : error const errorObj = typeof error === 'string' ? { error: error } : error;
const error_key_labels = { const error_key_labels = {
connectionString: __('API connection string'), connectionString: __('API connection string'),
@ -20,35 +14,50 @@ class ErrorModal extends React.Component {
params: __('Parameters'), params: __('Parameters'),
code: __('Error code'), code: __('Error code'),
message: __('Error message'), message: __('Error message'),
data: __('Error data'), data: __('Error data')
} };
const errorInfoList = [];
const errorInfoList = []
for (let key of Object.keys(error)) { for (let key of Object.keys(error)) {
let val = typeof error[key] == 'string' ? error[key] : JSON.stringify(error[key]); let val = typeof error[key] == 'string'
? error[key]
: JSON.stringify(error[key]);
let label = error_key_labels[key]; let label = error_key_labels[key];
errorInfoList.push(<li key={key}><strong>{label}</strong>: <code>{val}</code></li>); errorInfoList.push(
<li key={key}><strong>{label}</strong>: <code>{val}</code></li>
);
} }
const errorInfo = <ul className="error-modal__error-list">{errorInfoList}</ul> const errorInfo = (
<ul className="error-modal__error-list">{errorInfoList}</ul>
);
return ( return (
<ExpandableModal <ExpandableModal
isOpen={modal == 'error'} isOpen={modal == 'error'}
contentLabel={__("Error")} className="error-modal" contentLabel={__('Error')}
className="error-modal"
overlayClassName="error-modal-overlay" overlayClassName="error-modal-overlay"
onConfirmed={closeModal} onConfirmed={closeModal}
extraContent={errorInfo} extraContent={errorInfo}
> >
<h3 className="modal__header">{__("Error")}</h3> <h3 className="modal__header">{__('Error')}</h3>
<div className="error-modal__content"> <div className="error-modal__content">
<div><img className="error-modal__warning-symbol" src={lbry.imagePath('warning.png')} /></div> <div>
<p>{__("We're sorry that LBRY has encountered an error. This has been reported and we will investigate the problem.")}</p> <img
className="error-modal__warning-symbol"
src={lbry.imagePath('warning.png')}
/>
</div>
<p>
{__(
"We're sorry that LBRY has encountered an error. This has been reported and we will investigate the problem."
)}
</p>
</div> </div>
</ExpandableModal> </ExpandableModal>
) );
} }
} }
export default ErrorModal export default ErrorModal;

View file

@ -5,54 +5,60 @@ class FileSelector extends React.Component {
static propTypes = { static propTypes = {
type: React.PropTypes.oneOf(['file', 'directory']), type: React.PropTypes.oneOf(['file', 'directory']),
initPath: React.PropTypes.string, initPath: React.PropTypes.string,
onFileChosen: React.PropTypes.func, onFileChosen: React.PropTypes.func
} };
static defaultProps = { static defaultProps = {
type: 'file', type: 'file'
} };
componentWillMount() { componentWillMount() {
this.setState({ this.setState({
path: this.props.initPath || null, path: this.props.initPath || null
}); });
} }
handleButtonClick() { handleButtonClick() {
remote.dialog.showOpenDialog({ remote.dialog.showOpenDialog(
properties: [this.props.type == 'file' ? 'openFile' : 'openDirectory'], {
}, (paths) => { properties: [this.props.type == 'file' ? 'openFile' : 'openDirectory']
if (!paths) { // User hit cancel, so do nothing },
paths => {
if (!paths) {
// User hit cancel, so do nothing
return; return;
} }
const path = paths[0]; const path = paths[0];
this.setState({ this.setState({
path: path, path: path
}); });
if (this.props.onFileChosen) { if (this.props.onFileChosen) {
this.props.onFileChosen(path); this.props.onFileChosen(path);
} }
}); }
);
} }
render() { render() {
return ( return (
<div className="file-selector"> <div className="file-selector">
<button type="button" className="file-selector__choose-button" onClick={() => this.handleButtonClick()}> <button
{this.props.type == 'file' ? type="button"
__('Choose File') : className="file-selector__choose-button"
__('Choose Directory')} onClick={() => this.handleButtonClick()}
>
{this.props.type == 'file'
? __('Choose File')
: __('Choose Directory')}
</button> </button>
{' '} {' '}
<span className="file-selector__path"> <span className="file-selector__path">
{this.state.path ? {this.state.path ? this.state.path : __('No File Chosen')}
this.state.path :
__('No File Chosen')}
</span> </span>
</div> </div>
); );
} }
}; }
export default FileSelector; export default FileSelector;

View file

@ -1,49 +1,30 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect, import { selectPlatform } from 'selectors/app';
} from 'react-redux'
import {
selectPlatform,
} from 'selectors/app'
import { import {
makeSelectFileInfoForUri, makeSelectFileInfoForUri,
makeSelectDownloadingForUri, makeSelectDownloadingForUri,
makeSelectLoadingForUri, makeSelectLoadingForUri
} from 'selectors/file_info' } from 'selectors/file_info';
import { import { makeSelectIsAvailableForUri } from 'selectors/availability';
makeSelectIsAvailableForUri, import { selectCurrentModal } from 'selectors/app';
} from 'selectors/availability' import { makeSelectCostInfoForUri } from 'selectors/cost_info';
import { import { doCloseModal, doOpenModal, doHistoryBack } from 'actions/app';
selectCurrentModal, import { doFetchAvailability } from 'actions/availability';
} from 'selectors/app'
import {
makeSelectCostInfoForUri,
} from 'selectors/cost_info'
import {
doCloseModal,
doOpenModal,
doHistoryBack,
} from 'actions/app'
import {
doFetchAvailability
} from 'actions/availability'
import { import {
doOpenFileInShell, doOpenFileInShell,
doOpenFileInFolder, doOpenFileInFolder,
doDeleteFile, doDeleteFile
} from 'actions/file_info' } from 'actions/file_info';
import { import { doPurchaseUri, doLoadVideo } from 'actions/content';
doPurchaseUri, import FileActions from './view';
doLoadVideo,
} from 'actions/content'
import FileActions from './view'
const makeSelect = () => { const makeSelect = () => {
const selectFileInfoForUri = makeSelectFileInfoForUri() const selectFileInfoForUri = makeSelectFileInfoForUri();
const selectIsAvailableForUri = makeSelectIsAvailableForUri() const selectIsAvailableForUri = makeSelectIsAvailableForUri();
const selectDownloadingForUri = makeSelectDownloadingForUri() const selectDownloadingForUri = makeSelectDownloadingForUri();
const selectCostInfoForUri = makeSelectCostInfoForUri() const selectCostInfoForUri = makeSelectCostInfoForUri();
const selectLoadingForUri = makeSelectLoadingForUri() const selectLoadingForUri = makeSelectLoadingForUri();
const select = (state, props) => ({ const select = (state, props) => ({
fileInfo: selectFileInfoForUri(state, props), fileInfo: selectFileInfoForUri(state, props),
@ -52,24 +33,24 @@ const makeSelect = () => {
modal: selectCurrentModal(state), modal: selectCurrentModal(state),
downloading: selectDownloadingForUri(state, props), downloading: selectDownloadingForUri(state, props),
costInfo: selectCostInfoForUri(state, props), costInfo: selectCostInfoForUri(state, props),
loading: selectLoadingForUri(state, props), loading: selectLoadingForUri(state, props)
}) });
return select return select;
} };
const perform = (dispatch) => ({ const perform = dispatch => ({
checkAvailability: (uri) => dispatch(doFetchAvailability(uri)), checkAvailability: uri => dispatch(doFetchAvailability(uri)),
closeModal: () => dispatch(doCloseModal()), closeModal: () => dispatch(doCloseModal()),
openInFolder: (fileInfo) => dispatch(doOpenFileInFolder(fileInfo)), openInFolder: fileInfo => dispatch(doOpenFileInFolder(fileInfo)),
openInShell: (fileInfo) => dispatch(doOpenFileInShell(fileInfo)), openInShell: fileInfo => dispatch(doOpenFileInShell(fileInfo)),
deleteFile: (fileInfo, deleteFromComputer) => { deleteFile: (fileInfo, deleteFromComputer) => {
dispatch(doHistoryBack()) dispatch(doHistoryBack());
dispatch(doDeleteFile(fileInfo, deleteFromComputer)) dispatch(doDeleteFile(fileInfo, deleteFromComputer));
}, },
openModal: (modal) => dispatch(doOpenModal(modal)), openModal: modal => dispatch(doOpenModal(modal)),
startDownload: (uri) => dispatch(doPurchaseUri(uri, 'affirmPurchase')), startDownload: uri => dispatch(doPurchaseUri(uri, 'affirmPurchase')),
loadVideo: (uri) => dispatch(doLoadVideo(uri)), loadVideo: uri => dispatch(doLoadVideo(uri))
}) });
export default connect(makeSelect, perform)(FileActions) export default connect(makeSelect, perform)(FileActions);

View file

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import { Icon, BusyMessage } from 'component/common'; import { Icon, BusyMessage } from 'component/common';
import FilePrice from 'component/filePrice' import FilePrice from 'component/filePrice';
import { Modal } from 'component/modal'; import { Modal } from 'component/modal';
import { FormField } from 'component/form'; import { FormField } from 'component/form';
import Link from 'component/link'; import Link from 'component/link';
@ -9,43 +9,43 @@ import {DropDownMenu, DropDownMenuItem} from 'component/menu';
class FileActions extends React.Component { class FileActions extends React.Component {
constructor(props) { constructor(props) {
super(props) super(props);
this.state = { this.state = {
forceShowActions: false, forceShowActions: false,
deleteChecked: false, deleteChecked: false
} };
} }
componentWillMount() { componentWillMount() {
this.checkAvailability(this.props.uri) this.checkAvailability(this.props.uri);
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
this.checkAvailability(nextProps.uri) this.checkAvailability(nextProps.uri);
} }
checkAvailability(uri) { checkAvailability(uri) {
if (!this._uri || uri !== this._uri) { if (!this._uri || uri !== this._uri) {
this._uri = uri; this._uri = uri;
this.props.checkAvailability(uri) this.props.checkAvailability(uri);
} }
} }
onShowFileActionsRowClicked() { onShowFileActionsRowClicked() {
this.setState({ this.setState({
forceShowActions: true, forceShowActions: true
}); });
} }
handleDeleteCheckboxClicked(event) { handleDeleteCheckboxClicked(event) {
this.setState({ this.setState({
deleteChecked: event.target.checked, deleteChecked: event.target.checked
}) });
} }
onAffirmPurchase() { onAffirmPurchase() {
this.props.closeModal() this.props.closeModal();
this.props.loadVideo(this.props.uri) this.props.loadVideo(this.props.uri);
} }
render() { render() {
@ -63,52 +63,89 @@ class FileActions extends React.Component {
closeModal, closeModal,
startDownload, startDownload,
costInfo, costInfo,
loading, loading
} = this.props } = this.props;
const deleteChecked = this.state.deleteChecked, const deleteChecked = this.state.deleteChecked,
metadata = fileInfo ? fileInfo.metadata : null, metadata = fileInfo ? fileInfo.metadata : null,
openInFolderMessage = platform.startsWith('Mac') ? __('Open in Finder') : __('Open in Folder'), openInFolderMessage = platform.startsWith('Mac')
? __('Open in Finder')
: __('Open in Folder'),
showMenu = fileInfo && Object.keys(fileInfo).length > 0, showMenu = fileInfo && Object.keys(fileInfo).length > 0,
title = metadata ? metadata.title : uri; title = metadata ? metadata.title : uri;
let content let content;
if (loading || downloading) { if (loading || downloading) {
const progress = fileInfo && fileInfo.written_bytes
? fileInfo.written_bytes / fileInfo.total_bytes * 100
: 0,
label = fileInfo
? progress.toFixed(0) + __('% complete')
: __('Connecting...'),
labelWithIcon = (
<span className="button__content">
<Icon icon="icon-download" /><span>{label}</span>
</span>
);
const content = (
progress = (fileInfo && fileInfo.written_bytes) ? fileInfo.written_bytes / fileInfo.total_bytes * 100 : 0, <div className="faux-button-block file-actions__download-status-bar button-set-item">
label = fileInfo ? progress.toFixed(0) + __('% complete') : __('Connecting...'), <div
labelWithIcon = <span className="button__content"><Icon icon="icon-download" /><span>{label}</span></span>; className="faux-button-block file-actions__download-status-bar-overlay"
style={{ width: progress + '%' }}
content = <div className="faux-button-block file-actions__download-status-bar button-set-item"> >
<div className="faux-button-block file-actions__download-status-bar-overlay" style={{ width: progress + '%' }}>{labelWithIcon}</div>
{labelWithIcon} {labelWithIcon}
</div> </div>
{labelWithIcon}
} else if (!fileInfo && isAvailable === undefined) {
content = <BusyMessage message={__("Checking availability")} />
} else if (!fileInfo && !isAvailable && !this.state.forceShowActions) {
content = <div>
<div className="button-set-item empty">{__("Content unavailable.")}</div>
<ToolTip label={__("Why?")}
body={__("The content on LBRY is hosted by its users. It appears there are no users connected that have this file at the moment.")}
className="button-set-item" />
<Link label={__("Try Anyway")} onClick={this.onShowFileActionsRowClicked.bind(this)} className="button-text button-set-item" />
</div> </div>
);
} else if (!fileInfo && isAvailable === undefined) {
content = <BusyMessage message={__('Checking availability')} />;
} else if (!fileInfo && !isAvailable && !this.state.forceShowActions) {
content = (
<div>
<div className="button-set-item empty">
{__('Content unavailable.')}
</div>
<ToolTip
label={__('Why?')}
body={__(
'The content on LBRY is hosted by its users. It appears there are no users connected that have this file at the moment.'
)}
className="button-set-item"
/>
<Link
label={__('Try Anyway')}
onClick={this.onShowFileActionsRowClicked.bind(this)}
className="button-text button-set-item"
/>
</div>
);
} else if (fileInfo === null && !downloading) { } else if (fileInfo === null && !downloading) {
if (!costInfo) { if (!costInfo) {
content = <BusyMessage message={__("Fetching cost info")} /> content = <BusyMessage message={__('Fetching cost info')} />;
} else { } else {
content = <Link button="text" label={__("Download")} icon="icon-download" onClick={() => { startDownload(uri) } } />; content = (
<Link
button="text"
label={__('Download')}
icon="icon-download"
onClick={() => {
startDownload(uri);
}}
/>
);
} }
} else if (fileInfo && fileInfo.download_path) { } else if (fileInfo && fileInfo.download_path) {
content = <Link label={__("Open")} button="text" icon="icon-folder-open" onClick={() => openInShell(fileInfo)} />; content = (
<Link
label={__('Open')}
button="text"
icon="icon-folder-open"
onClick={() => openInShell(fileInfo)}
/>
);
} else { } else {
console.log('handle this case of file action props?'); console.log('handle this case of file action props?');
} }
@ -116,36 +153,70 @@ class FileActions extends React.Component {
return ( return (
<section className="file-actions"> <section className="file-actions">
{content} {content}
{ showMenu ? {showMenu
<DropDownMenu> ? <DropDownMenu>
<DropDownMenuItem key={0} onClick={() => openInFolder(fileInfo)} label={openInFolderMessage} /> <DropDownMenuItem
<DropDownMenuItem key={1} onClick={() => openModal('confirmRemove')} label={__("Remove...")} /> key={0}
</DropDownMenu> : '' } onClick={() => openInFolder(fileInfo)}
<Modal type="confirm" isOpen={modal == 'affirmPurchase'} label={openInFolderMessage}
contentLabel={__("Confirm Purchase")} onConfirmed={this.onAffirmPurchase.bind(this)} onAborted={closeModal}> />
{__("This will purchase")} <strong>{title}</strong> {__("for")} <strong><FilePrice uri={uri} look="plain" /></strong> {__("credits")}. <DropDownMenuItem
key={1}
onClick={() => openModal('confirmRemove')}
label={__('Remove...')}
/>
</DropDownMenu>
: ''}
<Modal
type="confirm"
isOpen={modal == 'affirmPurchase'}
contentLabel={__('Confirm Purchase')}
onConfirmed={this.onAffirmPurchase.bind(this)}
onAborted={closeModal}
>
{__('This will purchase')} <strong>{title}</strong> {__('for')}
{' '}<strong><FilePrice uri={uri} look="plain" /></strong>
{' '}{__('credits')}.
</Modal> </Modal>
<Modal isOpen={modal == 'notEnoughCredits'} contentLabel={__("Not enough credits")} <Modal
onConfirmed={closeModal}> isOpen={modal == 'notEnoughCredits'}
contentLabel={__('Not enough credits')}
onConfirmed={closeModal}
>
{__("You don't have enough LBRY credits to pay for this stream.")} {__("You don't have enough LBRY credits to pay for this stream.")}
</Modal> </Modal>
<Modal isOpen={modal == 'timedOut'} contentLabel={__("Download failed")} <Modal
onConfirmed={closeModal}> isOpen={modal == 'timedOut'}
{__("LBRY was unable to download the stream")} <strong>{uri}</strong>. contentLabel={__('Download failed')}
onConfirmed={closeModal}
>
{__('LBRY was unable to download the stream')} <strong>{uri}</strong>.
</Modal> </Modal>
<Modal isOpen={modal == 'confirmRemove'} <Modal
contentLabel={__("Not enough credits")} isOpen={modal == 'confirmRemove'}
contentLabel={__('Not enough credits')}
type="confirm" type="confirm"
confirmButtonLabel={__("Remove")} confirmButtonLabel={__('Remove')}
onConfirmed={() => deleteFile(fileInfo.outpoint, deleteChecked)} onConfirmed={() => deleteFile(fileInfo.outpoint, deleteChecked)}
onAborted={closeModal}> onAborted={closeModal}
<p>{__("Are you sure you'd like to remove")} <cite>{title}</cite> {__("from LBRY?")}</p> >
<p>
{__("Are you sure you'd like to remove")} <cite>{title}</cite>
{' '}{__('from LBRY?')}
</p>
<label><FormField type="checkbox" checked={deleteChecked} onClick={this.handleDeleteCheckboxClicked.bind(this)} /> {__("Delete this file from my computer")}</label> <label>
<FormField
type="checkbox"
checked={deleteChecked}
onClick={this.handleDeleteCheckboxClicked.bind(this)}
/>
{' '}{__('Delete this file from my computer')}
</label>
</Modal> </Modal>
</section> </section>
); );
} }
} }
export default FileActions export default FileActions;

View file

@ -1,50 +1,37 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { doNavigate } from 'actions/app';
} from 'react-redux' import { doResolveUri, doCancelResolveUri } from 'actions/content';
import { import { selectObscureNsfw } from 'selectors/app';
doNavigate,
} from 'actions/app'
import {
doResolveUri,
doCancelResolveUri,
} from 'actions/content'
import {
selectObscureNsfw,
} from 'selectors/app'
import { import {
makeSelectClaimForUri, makeSelectClaimForUri,
makeSelectMetadataForUri, makeSelectMetadataForUri
} from 'selectors/claims' } from 'selectors/claims';
import { import { makeSelectFileInfoForUri } from 'selectors/file_info';
makeSelectFileInfoForUri, import { makeSelectIsResolvingForUri } from 'selectors/content';
} from 'selectors/file_info' import FileCard from './view';
import {
makeSelectIsResolvingForUri,
} from 'selectors/content'
import FileCard from './view'
const makeSelect = () => { const makeSelect = () => {
const selectClaimForUri = makeSelectClaimForUri() const selectClaimForUri = makeSelectClaimForUri();
const selectFileInfoForUri = makeSelectFileInfoForUri() const selectFileInfoForUri = makeSelectFileInfoForUri();
const selectMetadataForUri = makeSelectMetadataForUri() const selectMetadataForUri = makeSelectMetadataForUri();
const selectResolvingUri = makeSelectIsResolvingForUri() const selectResolvingUri = makeSelectIsResolvingForUri();
const select = (state, props) => ({ const select = (state, props) => ({
claim: selectClaimForUri(state, props), claim: selectClaimForUri(state, props),
fileInfo: selectFileInfoForUri(state, props), fileInfo: selectFileInfoForUri(state, props),
obscureNsfw: selectObscureNsfw(state), obscureNsfw: selectObscureNsfw(state),
metadata: selectMetadataForUri(state, props), metadata: selectMetadataForUri(state, props),
isResolvingUri: selectResolvingUri(state, props), isResolvingUri: selectResolvingUri(state, props)
}) });
return select return select;
} };
const perform = (dispatch) => ({ const perform = dispatch => ({
navigate: (path, params) => dispatch(doNavigate(path, params)), navigate: (path, params) => dispatch(doNavigate(path, params)),
resolveUri: (uri) => dispatch(doResolveUri(uri)), resolveUri: uri => dispatch(doResolveUri(uri)),
cancelResolveUri: (uri) => dispatch(doCancelResolveUri(uri)) cancelResolveUri: uri => dispatch(doCancelResolveUri(uri))
}) });
export default connect(makeSelect, perform)(FileCard) export default connect(makeSelect, perform)(FileCard);

View file

@ -3,103 +3,113 @@ import lbry from 'lbry.js';
import lbryuri from 'lbryuri.js'; import lbryuri from 'lbryuri.js';
import Link from 'component/link'; import Link from 'component/link';
import { Thumbnail, TruncatedText, Icon } from 'component/common'; import { Thumbnail, TruncatedText, Icon } from 'component/common';
import FilePrice from 'component/filePrice' import FilePrice from 'component/filePrice';
import UriIndicator from 'component/uriIndicator'; import UriIndicator from 'component/uriIndicator';
class FileCard extends React.Component { class FileCard extends React.Component {
componentWillMount() { componentWillMount() {
this.resolve(this.props) this.resolve(this.props);
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
this.resolve(nextProps) this.resolve(nextProps);
} }
resolve(props) { resolve(props) {
const { const { isResolvingUri, resolveUri, claim, uri } = props;
isResolvingUri,
resolveUri,
claim,
uri,
} = props
if (!isResolvingUri && claim === undefined && uri) { if (!isResolvingUri && claim === undefined && uri) {
resolveUri(uri) resolveUri(uri);
} }
} }
componentWillUnmount() { componentWillUnmount() {
const { const { isResolvingUri, cancelResolveUri, uri } = this.props;
isResolvingUri,
cancelResolveUri,
uri
} = this.props
if (isResolvingUri) { if (isResolvingUri) {
cancelResolveUri(uri) cancelResolveUri(uri);
} }
} }
handleMouseOver() { handleMouseOver() {
this.setState({ this.setState({
hovered: true, hovered: true
}); });
} }
handleMouseOut() { handleMouseOut() {
this.setState({ this.setState({
hovered: false, hovered: false
}); });
} }
render() { render() {
const { claim, fileInfo, metadata, isResolvingUri, navigate } = this.props;
const {
claim,
fileInfo,
metadata,
isResolvingUri,
navigate,
} = this.props
const uri = lbryuri.normalize(this.props.uri); const uri = lbryuri.normalize(this.props.uri);
const title = !isResolvingUri && metadata && metadata.title ? metadata.title : uri; const title = !isResolvingUri && metadata && metadata.title
? metadata.title
: uri;
const obscureNsfw = this.props.obscureNsfw && metadata && metadata.nsfw; const obscureNsfw = this.props.obscureNsfw && metadata && metadata.nsfw;
let description = "" let description = '';
if (isResolvingUri) { if (isResolvingUri) {
description = __("Loading...") description = __('Loading...');
} else if (metadata && metadata.description) { } else if (metadata && metadata.description) {
description = metadata.description description = metadata.description;
} else if (claim === null) { } else if (claim === null) {
description = __("This address contains no content.") description = __('This address contains no content.');
} }
return ( return (
<section className={ 'card card--small card--link ' + (obscureNsfw ? 'card--obscured ' : '') } onMouseEnter={this.handleMouseOver.bind(this)} onMouseLeave={this.handleMouseOut.bind(this)}> <section
className={
'card card--small card--link ' +
(obscureNsfw ? 'card--obscured ' : '')
}
onMouseEnter={this.handleMouseOver.bind(this)}
onMouseLeave={this.handleMouseOut.bind(this)}
>
<div className="card__inner"> <div className="card__inner">
<Link onClick={() => navigate('/show', { uri })} className="card__link"> <Link
onClick={() => navigate('/show', { uri })}
className="card__link"
>
<div className="card__title-identity"> <div className="card__title-identity">
<h5 title={title}><TruncatedText lines={1}>{title}</TruncatedText></h5> <h5 title={title}>
<TruncatedText lines={1}>{title}</TruncatedText>
</h5>
<div className="card__subtitle"> <div className="card__subtitle">
<span style={{float: "right"}}> <span style={{ float: 'right' }}>
<FilePrice uri={uri} /> <FilePrice uri={uri} />
{ fileInfo ? <span>{' '}<Icon fixed icon="icon-folder" /></span> : '' } {fileInfo
? <span>{' '}<Icon fixed icon="icon-folder" /></span>
: ''}
</span> </span>
<UriIndicator uri={uri} /> <UriIndicator uri={uri} />
</div> </div>
</div> </div>
{metadata && metadata.thumbnail && {metadata &&
<div className="card__media" style={{ backgroundImage: "url('" + metadata.thumbnail + "')" }}></div> metadata.thumbnail &&
} <div
className="card__media"
style={{ backgroundImage: "url('" + metadata.thumbnail + "')" }}
/>}
<div className="card__content card__subtext card__subtext--two-lines"> <div className="card__content card__subtext card__subtext--two-lines">
<TruncatedText lines={2}>{description}</TruncatedText> <TruncatedText lines={2}>{description}</TruncatedText>
</div> </div>
</Link> </Link>
{obscureNsfw && this.state.hovered {obscureNsfw && this.state.hovered
? <div className='card-overlay'> ? <div className="card-overlay">
<p> <p>
{__("This content is Not Safe For Work. To view adult content, please change your")} <Link className="button-text" onClick={() => navigate('settings')} label={__("Settings")} />. {__(
'This content is Not Safe For Work. To view adult content, please change your'
)}
{' '}<Link
className="button-text"
onClick={() => navigate('settings')}
label={__('Settings')}
/>.
</p> </p>
</div> </div>
: null} : null}
@ -109,4 +119,4 @@ class FileCard extends React.Component {
} }
} }
export default FileCard export default FileCard;

View file

@ -1,13 +1,9 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import FileList from './view';
} from 'react-redux'
import FileList from './view'
const select = (state) => ({ const select = state => ({});
})
const perform = (dispatch) => ({ const perform = dispatch => ({});
})
export default connect(select, perform)(FileList) export default connect(select, perform)(FileList);

View file

@ -10,11 +10,11 @@ import {BusyMessage, Thumbnail} from 'component/common.js';
class FileList extends React.Component { class FileList extends React.Component {
constructor(props) { constructor(props) {
super(props) super(props);
this.state = { this.state = {
sortBy: 'date', sortBy: 'date'
} };
this._sortFunctions = { this._sortFunctions = {
date: function(fileInfos) { date: function(fileInfos) {
@ -22,8 +22,12 @@ class FileList extends React.Component {
}, },
title: function(fileInfos) { title: function(fileInfos) {
return fileInfos.slice().sort(function(fileInfo1, fileInfo2) { return fileInfos.slice().sort(function(fileInfo1, fileInfo2) {
const title1 = fileInfo1.metadata ? fileInfo1.metadata.stream.metadata.title.toLowerCase() : fileInfo1.name; const title1 = fileInfo1.metadata
const title2 = fileInfo2.metadata ? fileInfo2.metadata.stream.metadata.title.toLowerCase() : fileInfo2.name; ? fileInfo1.metadata.stream.metadata.title.toLowerCase()
: fileInfo1.name;
const title2 = fileInfo2.metadata
? fileInfo2.metadata.stream.metadata.title.toLowerCase()
: fileInfo2.name;
if (title1 < title2) { if (title1 < title2) {
return -1; return -1;
} else if (title1 > title2) { } else if (title1 > title2) {
@ -31,10 +35,12 @@ class FileList extends React.Component {
} else { } else {
return 0; return 0;
} }
}) });
}, },
filename: function(fileInfos) { filename: function(fileInfos) {
return fileInfos.slice().sort(function({file_name: fileName1}, {file_name: fileName2}) { return fileInfos
.slice()
.sort(function({ file_name: fileName1 }, { file_name: fileName2 }) {
const fileName1Lower = fileName1.toLowerCase(); const fileName1Lower = fileName1.toLowerCase();
const fileName2Lower = fileName2.toLowerCase(); const fileName2Lower = fileName2.toLowerCase();
if (fileName1Lower < fileName2Lower) { if (fileName1Lower < fileName2Lower) {
@ -44,50 +50,51 @@ class FileList extends React.Component {
} else { } else {
return 0; return 0;
} }
}) });
},
} }
};
} }
handleSortChanged(event) { handleSortChanged(event) {
this.setState({ this.setState({
sortBy: event.target.value, sortBy: event.target.value
}) });
} }
render() { render() {
const { const { handleSortChanged, fetching, fileInfos } = this.props;
handleSortChanged, const { sortBy } = this.state;
fetching, const content = [];
fileInfos,
} = this.props
const {
sortBy,
} = this.state
const content = []
this._sortFunctions[sortBy](fileInfos).forEach(fileInfo => { this._sortFunctions[sortBy](fileInfos).forEach(fileInfo => {
const uri = lbryuri.build({ const uri = lbryuri.build({
contentName: fileInfo.name, contentName: fileInfo.name,
channelName: fileInfo.channel_name, channelName: fileInfo.channel_name
}) });
content.push(<FileTile key={uri} uri={uri} hidePrice={true} showEmpty={this.props.fileTileShowEmpty} />) content.push(
}) <FileTile
key={uri}
uri={uri}
hidePrice={true}
showEmpty={this.props.fileTileShowEmpty}
/>
);
});
return ( return (
<section className="file-list__header"> <section className="file-list__header">
{fetching && <span className="busy-indicator" />} {fetching && <span className="busy-indicator" />}
<span className='sort-section'> <span className="sort-section">
{__("Sort by")} { ' ' } {__('Sort by')} {' '}
<FormField type="select" onChange={this.handleSortChanged.bind(this)}> <FormField type="select" onChange={this.handleSortChanged.bind(this)}>
<option value="date">{__("Date")}</option> <option value="date">{__('Date')}</option>
<option value="title">{__("Title")}</option> <option value="title">{__('Title')}</option>
<option value="filename">{__("File name")}</option> <option value="filename">{__('File name')}</option>
</FormField> </FormField>
</span> </span>
{content} {content}
</section> </section>
) );
} }
} }
export default FileList export default FileList;

View file

@ -1,29 +1,23 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect, import { doSearch } from 'actions/search';
} from 'react-redux'
import {
doSearch,
} from 'actions/search'
import { import {
selectIsSearching, selectIsSearching,
selectCurrentSearchResults, selectCurrentSearchResults,
selectSearchQuery, selectSearchQuery
} from 'selectors/search' } from 'selectors/search';
import { import { doNavigate } from 'actions/app';
doNavigate, import FileListSearch from './view';
} from 'actions/app'
import FileListSearch from './view'
const select = (state) => ({ const select = state => ({
isSearching: selectIsSearching(state), isSearching: selectIsSearching(state),
query: selectSearchQuery(state), query: selectSearchQuery(state),
results: selectCurrentSearchResults(state) results: selectCurrentSearchResults(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
navigate: (path) => dispatch(doNavigate(path)), navigate: path => dispatch(doNavigate(path)),
search: (search) => dispatch(doSearch(search)) search: search => dispatch(doSearch(search))
}) });
export default connect(select, perform)(FileListSearch) export default connect(select, perform)(FileListSearch);

View file

@ -3,74 +3,74 @@ import lbry from 'lbry';
import lbryio from 'lbryio'; import lbryio from 'lbryio';
import lbryuri from 'lbryuri'; import lbryuri from 'lbryuri';
import lighthouse from 'lighthouse'; import lighthouse from 'lighthouse';
import FileTile from 'component/fileTile' import FileTile from 'component/fileTile';
import Link from 'component/link' import Link from 'component/link';
import { ToolTip } from 'component/tooltip.js'; import { ToolTip } from 'component/tooltip.js';
import { BusyMessage } from 'component/common.js'; import { BusyMessage } from 'component/common.js';
const SearchNoResults = (props) => { const SearchNoResults = props => {
const { const { navigate, query } = props;
navigate,
query,
} = props
return <section> return (
<section>
<span className="empty"> <span className="empty">
{__("No one has checked anything in for %s yet."), query} { ' ' } {(__('No one has checked anything in for %s yet.'), query)} {' '}
<Link label={__("Be the first")} onClick={() => navigate('/publish')} /> <Link label={__('Be the first')} onClick={() => navigate('/publish')} />
</span> </span>
</section>; </section>
} );
};
const FileListSearchResults = (props) => { const FileListSearchResults = props => {
const { const { results } = props;
results,
} = props
const rows = [], const rows = [],
seenNames = {}; //fix this when the search API returns claim IDs seenNames = {}; //fix this when the search API returns claim IDs
for (let {name, claim, claim_id, channel_name, channel_id, txid, nout} of results) { for (let {
name,
claim,
claim_id,
channel_name,
channel_id,
txid,
nout
} of results) {
const uri = lbryuri.build({ const uri = lbryuri.build({
channelName: channel_name, channelName: channel_name,
contentName: name, contentName: name,
claimId: channel_id || claim_id, claimId: channel_id || claim_id
}); });
rows.push( rows.push(<FileTile key={uri} uri={uri} />);
<FileTile key={uri} uri={uri} />
);
}
return (
<div>{rows}</div>
);
} }
return <div>{rows}</div>;
};
class FileListSearch extends React.Component { class FileListSearch extends React.Component {
componentWillMount() { componentWillMount() {
this.props.search(this.props.query) this.props.search(this.props.query);
} }
render() { render() {
const { const { isSearching, results } = this.props;
isSearching,
results
} = this.props
return ( return (
<div> <div>
{isSearching && !results && {isSearching &&
<BusyMessage message={__("Looking up the Dewey Decimals")} />} !results &&
<BusyMessage message={__('Looking up the Dewey Decimals')} />}
{isSearching && results && {isSearching &&
<BusyMessage message={__("Refreshing the Dewey Decimals")} />} results &&
<BusyMessage message={__('Refreshing the Dewey Decimals')} />}
{(results && !!results.length) ? {results && !!results.length
<FileListSearchResults {...this.props} /> : ? <FileListSearchResults {...this.props} />
<SearchNoResults {...this.props} />} : <SearchNoResults {...this.props} />}
</div> </div>
) );
} }
} }
export default FileListSearch export default FileListSearch;

View file

@ -1,31 +1,27 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect, import { doFetchCostInfoForUri } from 'actions/cost_info';
} from 'react-redux'
import {
doFetchCostInfoForUri,
} from 'actions/cost_info'
import { import {
makeSelectCostInfoForUri, makeSelectCostInfoForUri,
makeSelectFetchingCostInfoForUri, makeSelectFetchingCostInfoForUri
} from 'selectors/cost_info' } from 'selectors/cost_info';
import FilePrice from './view' import FilePrice from './view';
const makeSelect = () => { const makeSelect = () => {
const selectCostInfoForUri = makeSelectCostInfoForUri() const selectCostInfoForUri = makeSelectCostInfoForUri();
const selectFetchingCostInfoForUri = makeSelectFetchingCostInfoForUri() const selectFetchingCostInfoForUri = makeSelectFetchingCostInfoForUri();
const select = (state, props) => ({ const select = (state, props) => ({
costInfo: selectCostInfoForUri(state, props), costInfo: selectCostInfoForUri(state, props),
fetching: selectFetchingCostInfoForUri(state, props), fetching: selectFetchingCostInfoForUri(state, props)
}) });
return select return select;
} };
const perform = (dispatch) => ({ const perform = dispatch => ({
fetchCostInfo: (uri) => dispatch(doFetchCostInfoForUri(uri)), fetchCostInfo: uri => dispatch(doFetchCostInfoForUri(uri))
// cancelFetchCostInfo: (uri) => dispatch(doCancelFetchCostInfoForUri(uri)) // cancelFetchCostInfo: (uri) => dispatch(doCancelFetchCostInfoForUri(uri))
}) });
export default connect(makeSelect, perform)(FilePrice) export default connect(makeSelect, perform)(FilePrice);

View file

@ -1,44 +1,43 @@
import React from 'react' import React from 'react';
import { import { CreditAmount } from 'component/common';
CreditAmount,
} from 'component/common'
class FilePrice extends React.Component { class FilePrice extends React.Component {
componentWillMount() { componentWillMount() {
this.fetchCost(this.props) this.fetchCost(this.props);
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
this.fetchCost(nextProps) this.fetchCost(nextProps);
} }
fetchCost(props) { fetchCost(props) {
const { const { costInfo, fetchCostInfo, uri, fetching } = props;
costInfo,
fetchCostInfo,
uri,
fetching,
} = props
if (costInfo === undefined && !fetching) { if (costInfo === undefined && !fetching) {
fetchCostInfo(uri) fetchCostInfo(uri);
} }
} }
render() { render() {
const { const { costInfo, look = 'indicator' } = this.props;
costInfo,
look = 'indicator',
} = this.props
const isEstimate = costInfo ? !costInfo.includesData : null const isEstimate = costInfo ? !costInfo.includesData : null;
if (!costInfo) { if (!costInfo) {
return <span className={`credit-amount credit-amount--${look}`}>???</span>; return (
<span className={`credit-amount credit-amount--${look}`}>???</span>
);
} }
return <CreditAmount label={false} amount={costInfo.cost} isEstimate={isEstimate} showFree={true} /> return (
<CreditAmount
label={false}
amount={costInfo.cost}
isEstimate={isEstimate}
showFree={true}
/>
);
} }
} }
export default FilePrice export default FilePrice;

View file

@ -1,48 +1,36 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { doNavigate } from 'actions/app';
} from 'react-redux' import { doResolveUri } from 'actions/content';
import {
doNavigate,
} from 'actions/app'
import {
doResolveUri,
} from 'actions/content'
import { import {
makeSelectClaimForUri, makeSelectClaimForUri,
makeSelectMetadataForUri, makeSelectMetadataForUri
} from 'selectors/claims' } from 'selectors/claims';
import { import { makeSelectFileInfoForUri } from 'selectors/file_info';
makeSelectFileInfoForUri, import { selectObscureNsfw } from 'selectors/app';
} from 'selectors/file_info' import { makeSelectIsResolvingForUri } from 'selectors/content';
import { import FileTile from './view';
selectObscureNsfw,
} from 'selectors/app'
import {
makeSelectIsResolvingForUri,
} from 'selectors/content'
import FileTile from './view'
const makeSelect = () => { const makeSelect = () => {
const selectClaimForUri = makeSelectClaimForUri() const selectClaimForUri = makeSelectClaimForUri();
const selectFileInfoForUri = makeSelectFileInfoForUri() const selectFileInfoForUri = makeSelectFileInfoForUri();
const selectMetadataForUri = makeSelectMetadataForUri() const selectMetadataForUri = makeSelectMetadataForUri();
const selectResolvingUri = makeSelectIsResolvingForUri() const selectResolvingUri = makeSelectIsResolvingForUri();
const select = (state, props) => ({ const select = (state, props) => ({
claim: selectClaimForUri(state, props), claim: selectClaimForUri(state, props),
fileInfo: selectFileInfoForUri(state, props), fileInfo: selectFileInfoForUri(state, props),
obscureNsfw: selectObscureNsfw(state), obscureNsfw: selectObscureNsfw(state),
metadata: selectMetadataForUri(state, props), metadata: selectMetadataForUri(state, props),
isResolvingUri: selectResolvingUri(state, props), isResolvingUri: selectResolvingUri(state, props)
}) });
return select return select;
} };
const perform = (dispatch) => ({ const perform = dispatch => ({
navigate: (path, params) => dispatch(doNavigate(path, params)), navigate: (path, params) => dispatch(doNavigate(path, params)),
resolveUri: (uri) => dispatch(doResolveUri(uri)), resolveUri: uri => dispatch(doResolveUri(uri))
}) });
export default connect(makeSelect, perform)(FileTile) export default connect(makeSelect, perform)(FileTile);

View file

@ -3,38 +3,37 @@ import lbry from 'lbry.js';
import lbryuri from 'lbryuri.js'; import lbryuri from 'lbryuri.js';
import Link from 'component/link'; import Link from 'component/link';
import FileActions from 'component/fileActions'; import FileActions from 'component/fileActions';
import {Thumbnail, TruncatedText,} from 'component/common.js'; import { Thumbnail, TruncatedText } from 'component/common.js';
import FilePrice from 'component/filePrice' import FilePrice from 'component/filePrice';
import UriIndicator from 'component/uriIndicator'; import UriIndicator from 'component/uriIndicator';
class FileTile extends React.Component { class FileTile extends React.Component {
static SHOW_EMPTY_PUBLISH = "publish" static SHOW_EMPTY_PUBLISH = 'publish';
static SHOW_EMPTY_PENDING = "pending" static SHOW_EMPTY_PENDING = 'pending';
constructor(props) { constructor(props) {
super(props) super(props);
this.state = { this.state = {
showNsfwHelp: false, showNsfwHelp: false
} };
} }
componentDidMount() { componentDidMount() {
const { const { isResolvingUri, resolveUri, claim, uri } = this.props;
isResolvingUri,
resolveUri,
claim,
uri,
} = this.props
if (!isResolvingUri && !claim && uri) { if (!isResolvingUri && !claim && uri) {
resolveUri(uri) resolveUri(uri);
} }
} }
handleMouseOver() { handleMouseOver() {
if (this.props.obscureNsfw && this.props.metadata && this.props.metadata.nsfw) { if (
this.props.obscureNsfw &&
this.props.metadata &&
this.props.metadata.nsfw
) {
this.setState({ this.setState({
showNsfwHelp: true, showNsfwHelp: true
}); });
} }
} }
@ -42,7 +41,7 @@ class FileTile extends React.Component {
handleMouseOut() { handleMouseOut() {
if (this.state.showNsfwHelp) { if (this.state.showNsfwHelp) {
this.setState({ this.setState({
showNsfwHelp: false, showNsfwHelp: false
}); });
} }
} }
@ -54,38 +53,59 @@ class FileTile extends React.Component {
isResolvingUri, isResolvingUri,
showEmpty, showEmpty,
navigate, navigate,
hidePrice, hidePrice
} = this.props } = this.props;
const uri = lbryuri.normalize(this.props.uri); const uri = lbryuri.normalize(this.props.uri);
const isClaimed = !!claim; const isClaimed = !!claim;
const isClaimable = lbryuri.isClaimable(uri) const isClaimable = lbryuri.isClaimable(uri);
const title = isClaimed && metadata && metadata.title ? metadata.title : uri; const title = isClaimed && metadata && metadata.title
? metadata.title
: uri;
const obscureNsfw = this.props.obscureNsfw && metadata && metadata.nsfw; const obscureNsfw = this.props.obscureNsfw && metadata && metadata.nsfw;
let onClick = () => navigate('/show', { uri }) let onClick = () => navigate('/show', { uri });
let description = "" let description = '';
if (isClaimed) { if (isClaimed) {
description = metadata && metadata.description description = metadata && metadata.description;
} else if (isResolvingUri) { } else if (isResolvingUri) {
description = __("Loading...") description = __('Loading...');
} else if (showEmpty === FileTile.SHOW_EMPTY_PUBLISH) { } else if (showEmpty === FileTile.SHOW_EMPTY_PUBLISH) {
onClick = () => navigate('/publish', { }) onClick = () => navigate('/publish', {});
description = <span className="empty"> description = (
{__("This location is unused.")} { ' ' } <span className="empty">
{ isClaimable && <span className="button-text">{__("Put something here!")}</span> } {__('This location is unused.')} {' '}
{isClaimable &&
<span className="button-text">{__('Put something here!')}</span>}
</span> </span>
);
} else if (showEmpty === FileTile.SHOW_EMPTY_PENDING) { } else if (showEmpty === FileTile.SHOW_EMPTY_PENDING) {
description = <span className="empty">{__("This file is pending confirmation.")}</span> description = (
<span className="empty">
{__('This file is pending confirmation.')}
</span>
);
} }
return ( return (
<section className={ 'file-tile card ' + (obscureNsfw ? 'card--obscured ' : '') } onMouseEnter={this.handleMouseOver.bind(this)} onMouseLeave={this.handleMouseOut.bind(this)}> <section
className={'file-tile card ' + (obscureNsfw ? 'card--obscured ' : '')}
onMouseEnter={this.handleMouseOver.bind(this)}
onMouseLeave={this.handleMouseOut.bind(this)}
>
<Link onClick={onClick} className="card__link"> <Link onClick={onClick} className="card__link">
<div className={"card__inner file-tile__row"}> <div className={'card__inner file-tile__row'}>
<div className="card__media" <div
style={{ backgroundImage: "url('" + (metadata && metadata.thumbnail ? metadata.thumbnail : lbry.imagePath('default-thumb.svg')) + "')" }}> className="card__media"
</div> style={{
backgroundImage:
"url('" +
(metadata && metadata.thumbnail
? metadata.thumbnail
: lbry.imagePath('default-thumb.svg')) +
"')"
}}
/>
<div className="file-tile__content"> <div className="file-tile__content">
<div className="card__title-primary"> <div className="card__title-primary">
{!hidePrice ? <FilePrice uri={this.props.uri} /> : null} {!hidePrice ? <FilePrice uri={this.props.uri} /> : null}
@ -101,9 +121,16 @@ class FileTile extends React.Component {
</div> </div>
</Link> </Link>
{this.state.showNsfwHelp {this.state.showNsfwHelp
? <div className='card-overlay'> ? <div className="card-overlay">
<p> <p>
{__("This content is Not Safe For Work. To view adult content, please change your")} <Link className="button-text" onClick={() => navigate('/settings')} label={__("Settings")} />. {__(
'This content is Not Safe For Work. To view adult content, please change your'
)}
{' '}<Link
className="button-text"
onClick={() => navigate('/settings')}
label={__('Settings')}
/>.
</p> </p>
</div> </div>
: null} : null}
@ -112,4 +139,4 @@ class FileTile extends React.Component {
} }
} }
export default FileTile export default FileTile;

View file

@ -7,7 +7,7 @@ var formFieldCounter = 0,
formFieldNestedLabelTypes = ['radio', 'checkbox']; formFieldNestedLabelTypes = ['radio', 'checkbox'];
function formFieldId() { function formFieldId() {
return "form-field-" + (++formFieldCounter); return 'form-field-' + ++formFieldCounter;
} }
export class FormField extends React.Component { export class FormField extends React.Component {
@ -16,7 +16,7 @@ export class FormField extends React.Component {
prefix: React.PropTypes.string, prefix: React.PropTypes.string,
postfix: React.PropTypes.string, postfix: React.PropTypes.string,
hasError: React.PropTypes.bool hasError: React.PropTypes.bool
} };
constructor(props) { constructor(props) {
super(props); super(props);
@ -27,7 +27,7 @@ export class FormField extends React.Component {
this.state = { this.state = {
isError: null, isError: null,
errorMessage: null, errorMessage: null
}; };
} }
@ -59,8 +59,9 @@ export class FormField extends React.Component {
handleFileChosen(path) { handleFileChosen(path) {
this.refs.field.value = path; this.refs.field.value = path;
if (this.props.onChange) { // Updating inputs programmatically doesn't generate an event, so we have to make our own if (this.props.onChange) {
const event = new Event('change', {bubbles: true}) // Updating inputs programmatically doesn't generate an event, so we have to make our own
const event = new Event('change', { bubbles: true });
this.refs.field.dispatchEvent(event); // This alone won't generate a React event, but we use it to attach the field as a target this.refs.field.dispatchEvent(event); // This alone won't generate a React event, but we use it to attach the field as a target
this.props.onChange(event); this.props.onChange(event);
} }
@ -69,7 +70,7 @@ export class FormField extends React.Component {
showError(text) { showError(text) {
this.setState({ this.setState({
isError: true, isError: true,
errorMessage: text, errorMessage: text
}); });
} }
@ -92,9 +93,12 @@ export class FormField extends React.Component {
render() { render() {
// Pass all unhandled props to the field element // Pass all unhandled props to the field element
const otherProps = Object.assign({}, this.props), const otherProps = Object.assign({}, this.props),
isError = this.state.isError !== null ? this.state.isError : this.props.hasError, isError = this.state.isError !== null
? this.state.isError
: this.props.hasError,
elementId = this.props.id ? this.props.id : formFieldId(), elementId = this.props.id ? this.props.id : formFieldId(),
renderElementInsideLabel = this.props.label && formFieldNestedLabelTypes.includes(this.props.type); renderElementInsideLabel =
this.props.label && formFieldNestedLabelTypes.includes(this.props.type);
delete otherProps.type; delete otherProps.type;
delete otherProps.label; delete otherProps.label;
@ -103,35 +107,71 @@ export class FormField extends React.Component {
delete otherProps.postfix; delete otherProps.postfix;
delete otherProps.prefix; delete otherProps.prefix;
const element = <this._element id={elementId} type={this._type} name={this.props.name} ref="field" placeholder={this.props.placeholder} const element = (
className={'form-field__input form-field__input-' + this.props.type + ' ' + (this.props.className || '') + (isError ? 'form-field__input--error' : '')} <this._element
{...otherProps}> id={elementId}
type={this._type}
name={this.props.name}
ref="field"
placeholder={this.props.placeholder}
className={
'form-field__input form-field__input-' +
this.props.type +
' ' +
(this.props.className || '') +
(isError ? 'form-field__input--error' : '')
}
{...otherProps}
>
{this.props.children} {this.props.children}
</this._element>; </this._element>
);
return <div className={"form-field form-field--" + this.props.type}> return (
{ this.props.prefix ? <span className="form-field__prefix">{this.props.prefix}</span> : '' } <div className={'form-field form-field--' + this.props.type}>
{ renderElementInsideLabel ? {this.props.prefix
<label htmlFor={elementId} className={"form-field__label " + (isError ? 'form-field__label--error' : '')}> ? <span className="form-field__prefix">{this.props.prefix}</span>
: ''}
{renderElementInsideLabel
? <label
htmlFor={elementId}
className={
'form-field__label ' +
(isError ? 'form-field__label--error' : '')
}
>
{element} {element}
{this.props.label} {this.props.label}
</label> : </label>
element } : element}
{ formFieldFileSelectorTypes.includes(this.props.type) ? {formFieldFileSelectorTypes.includes(this.props.type)
<FileSelector type={this.props.type} onFileChosen={this.handleFileChosen.bind(this)} ? <FileSelector
{... this.props.defaultValue ? {initPath: this.props.defaultValue} : {}} /> : type={this.props.type}
null } onFileChosen={this.handleFileChosen.bind(this)}
{ this.props.postfix ? <span className="form-field__postfix">{this.props.postfix}</span> : '' } {...(this.props.defaultValue
{ isError && this.state.errorMessage ? <div className="form-field__error">{this.state.errorMessage}</div> : '' } ? { initPath: this.props.defaultValue }
: {})}
/>
: null}
{this.props.postfix
? <span className="form-field__postfix">{this.props.postfix}</span>
: ''}
{isError && this.state.errorMessage
? <div className="form-field__error">{this.state.errorMessage}</div>
: ''}
</div> </div>
);
} }
} }
export class FormRow extends React.Component { export class FormRow extends React.Component {
static propTypes = { static propTypes = {
label: React.PropTypes.oneOfType([React.PropTypes.string, React.PropTypes.element]), label: React.PropTypes.oneOfType([
React.PropTypes.string,
React.PropTypes.element
])
// helper: React.PropTypes.html, // helper: React.PropTypes.html,
} };
constructor(props) { constructor(props) {
super(props); super(props);
@ -140,14 +180,14 @@ export class FormRow extends React.Component {
this.state = { this.state = {
isError: false, isError: false,
errorMessage: null, errorMessage: null
}; };
} }
showError(text) { showError(text) {
this.setState({ this.setState({
isError: true, isError: true,
errorMessage: text, errorMessage: text
}); });
} }
@ -177,23 +217,43 @@ export class FormRow extends React.Component {
render() { render() {
const fieldProps = Object.assign({}, this.props), const fieldProps = Object.assign({}, this.props),
elementId = formFieldId(), elementId = formFieldId(),
renderLabelInFormField = formFieldNestedLabelTypes.includes(this.props.type); renderLabelInFormField = formFieldNestedLabelTypes.includes(
this.props.type
);
if (!renderLabelInFormField) { if (!renderLabelInFormField) {
delete fieldProps.label; delete fieldProps.label;
} }
delete fieldProps.helper; delete fieldProps.helper;
return <div className="form-row"> return (
{ this.props.label && !renderLabelInFormField ? <div className="form-row">
<div className={"form-row__label-row " + (this.props.labelPrefix ? "form-row__label-row--prefix" : "") }> {this.props.label && !renderLabelInFormField
<label htmlFor={elementId} className={"form-field__label " + (this.state.isError ? 'form-field__label--error' : '')}> ? <div
className={
'form-row__label-row ' +
(this.props.labelPrefix ? 'form-row__label-row--prefix' : '')
}
>
<label
htmlFor={elementId}
className={
'form-field__label ' +
(this.state.isError ? 'form-field__label--error' : '')
}
>
{this.props.label} {this.props.label}
</label> </label>
</div> : '' }
<FormField ref="field" hasError={this.state.isError} {...fieldProps} />
{ !this.state.isError && this.props.helper ? <div className="form-field__helper">{this.props.helper}</div> : '' }
{ this.state.isError ? <div className="form-field__error">{this.state.errorMessage}</div> : '' }
</div> </div>
: ''}
<FormField ref="field" hasError={this.state.isError} {...fieldProps} />
{!this.state.isError && this.props.helper
? <div className="form-field__helper">{this.props.helper}</div>
: ''}
{this.state.isError
? <div className="form-field__error">{this.state.errorMessage}</div>
: ''}
</div>
);
} }
} }

View file

@ -1,25 +1,18 @@
import React from 'react' import React from 'react';
import lbry from 'lbry' import lbry from 'lbry';
import { import { connect } from 'react-redux';
connect import { selectBalance } from 'selectors/wallet';
} from 'react-redux' import { doNavigate, doHistoryBack } from 'actions/app';
import { import Header from './view';
selectBalance
} from 'selectors/wallet'
import {
doNavigate,
doHistoryBack,
} from 'actions/app'
import Header from './view'
const select = (state) => ({ const select = state => ({
balance: lbry.formatCredits(selectBalance(state), 1), balance: lbry.formatCredits(selectBalance(state), 1),
publish: __("Publish"), publish: __('Publish')
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
navigate: (path) => dispatch(doNavigate(path)), navigate: path => dispatch(doNavigate(path)),
back: () => dispatch(doHistoryBack()), back: () => dispatch(doHistoryBack())
}) });
export default connect(select, perform)(Header) export default connect(select, perform)(Header);

View file

@ -2,37 +2,56 @@ import React from 'react';
import Link from 'component/link'; import Link from 'component/link';
import WunderBar from 'component/wunderbar'; import WunderBar from 'component/wunderbar';
export const Header = (props) => { export const Header = props => {
const { const { balance, back, navigate, publish } = props;
balance,
back,
navigate,
publish,
} = props
return <header id="header"> return (
<header id="header">
<div className="header__item"> <div className="header__item">
<Link onClick={back} button="alt button--flat" icon="icon-arrow-left" /> <Link onClick={back} button="alt button--flat" icon="icon-arrow-left" />
</div> </div>
<div className="header__item"> <div className="header__item">
<Link onClick={() => navigate('/discover')} button="alt button--flat" icon="icon-home" /> <Link
onClick={() => navigate('/discover')}
button="alt button--flat"
icon="icon-home"
/>
</div> </div>
<div className="header__item header__item--wunderbar"> <div className="header__item header__item--wunderbar">
<WunderBar /> <WunderBar />
</div> </div>
<div className="header__item"> <div className="header__item">
<Link onClick={() => navigate('/wallet')} button="text" icon="icon-bank" label={balance} ></Link> <Link
onClick={() => navigate('/wallet')}
button="text"
icon="icon-bank"
label={balance}
/>
</div> </div>
<div className="header__item"> <div className="header__item">
<Link onClick={() => navigate('/publish')} button="primary button--flat" icon="icon-upload" label={publish} /> <Link
onClick={() => navigate('/publish')}
button="primary button--flat"
icon="icon-upload"
label={publish}
/>
</div> </div>
<div className="header__item"> <div className="header__item">
<Link onClick={() => navigate('/downloaded')} button="alt button--flat" icon="icon-folder" /> <Link
onClick={() => navigate('/downloaded')}
button="alt button--flat"
icon="icon-folder"
/>
</div> </div>
<div className="header__item"> <div className="header__item">
<Link onClick={() => navigate('/settings')} button="alt button--flat" icon="icon-gear" /> <Link
onClick={() => navigate('/settings')}
button="alt button--flat"
icon="icon-gear"
/>
</div> </div>
</header> </header>
} );
};
export default Header; export default Header;

View file

@ -1,7 +1,5 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect, import Link from './view';
} from 'react-redux'
import Link from './view'
export default connect(null, null)(Link) export default connect(null, null)(Link);

View file

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import { Icon } from 'component/common.js'; import { Icon } from 'component/common.js';
const Link = (props) => { const Link = props => {
const { const {
href, href,
title, title,
@ -13,35 +13,41 @@ const Link = (props) => {
button, button,
hidden, hidden,
disabled, disabled,
children, children
} = props } = props;
const className = (props.className || '') + const className =
(props.className || '') +
(!props.className && !props.button ? 'button-text' : '') + // Non-button links get the same look as text buttons (!props.className && !props.button ? 'button-text' : '') + // Non-button links get the same look as text buttons
(props.button ? ' button-block button-' + props.button + ' button-set-item' : '') + (props.button
? ' button-block button-' + props.button + ' button-set-item'
: '') +
(props.disabled ? ' disabled' : ''); (props.disabled ? ' disabled' : '');
let content; let content;
if (children) { if (children) {
content = children content = children;
} else { } else {
content = ( content = (
<span {... 'button' in props ? {className: 'button__content'} : {}}> <span {...('button' in props ? { className: 'button__content' } : {})}>
{'icon' in props ? <Icon icon={icon} fixed={true} /> : null} {'icon' in props ? <Icon icon={icon} fixed={true} /> : null}
{label ? <span className="link-label">{label}</span> : null} {label ? <span className="link-label">{label}</span> : null}
{'badge' in props ? <span className="badge">{badge}</span> : null} {'badge' in props ? <span className="badge">{badge}</span> : null}
</span> </span>
)
}
return (
<a className={className} href={href || 'javascript:;'} title={title}
onClick={onClick}
{... 'style' in props ? {style: style} : {}}>
{content}
</a>
); );
} }
export default Link return (
<a
className={className}
href={href || 'javascript:;'}
title={title}
onClick={onClick}
{...('style' in props ? { style: style } : {})}
>
{content}
</a>
);
};
export default Link;

View file

@ -1,14 +1,14 @@
import React from 'react'; import React from 'react';
import lbry from '../lbry.js'; import lbry from '../lbry.js';
import { BusyMessage, Icon } from './common.js'; import { BusyMessage, Icon } from './common.js';
import Link from 'component/link' import Link from 'component/link';
class LoadScreen extends React.Component { class LoadScreen extends React.Component {
static propTypes = { static propTypes = {
message: React.PropTypes.string.isRequired, message: React.PropTypes.string.isRequired,
details: React.PropTypes.string, details: React.PropTypes.string,
isWarning: React.PropTypes.bool, isWarning: React.PropTypes.bool
} };
constructor(props) { constructor(props) {
super(props); super(props);
@ -16,13 +16,13 @@ class LoadScreen extends React.Component {
this.state = { this.state = {
message: null, message: null,
details: null, details: null,
isLagging: false, isLagging: false
}; };
} }
static defaultProps = { static defaultProps = {
isWarning: false, isWarning: false
} };
render() { render() {
const imgSrc = lbry.imagePath('lbry-white-485x160.png'); const imgSrc = lbry.imagePath('lbry-white-485x160.png');
@ -31,16 +31,24 @@ class LoadScreen extends React.Component {
<img src={imgSrc} alt="LBRY" /> <img src={imgSrc} alt="LBRY" />
<div className="load-screen__message"> <div className="load-screen__message">
<h3> <h3>
{!this.props.isWarning ? {!this.props.isWarning
<BusyMessage message={this.props.message} /> : ? <BusyMessage message={this.props.message} />
<span><Icon icon="icon-warning" />{' ' + this.props.message}</span> } : <span>
<Icon icon="icon-warning" />{' ' + this.props.message}
</span>}
</h3> </h3>
<span className={'load-screen__details ' + (this.props.isWarning ? 'load-screen__details--warning' : '')}>{this.props.details}</span> <span
className={
'load-screen__details ' +
(this.props.isWarning ? 'load-screen__details--warning' : '')
}
>
{this.props.details}
</span>
</div> </div>
</div> </div>
); );
} }
} }
export default LoadScreen; export default LoadScreen;

View file

@ -7,19 +7,23 @@ export class DropDownMenuItem extends React.Component {
href: React.PropTypes.string, href: React.PropTypes.string,
label: React.PropTypes.string, label: React.PropTypes.string,
icon: React.PropTypes.string, icon: React.PropTypes.string,
onClick: React.PropTypes.func, onClick: React.PropTypes.func
} };
static defaultProps = { static defaultProps = {
iconPosition: 'left', iconPosition: 'left'
} };
render() { render() {
var icon = (this.props.icon ? <Icon icon={this.props.icon} fixed /> : null); var icon = this.props.icon ? <Icon icon={this.props.icon} fixed /> : null;
return ( return (
<a className="menu__menu-item" onClick={this.props.onClick} <a
href={this.props.href || 'javascript:'} label={this.props.label}> className="menu__menu-item"
onClick={this.props.onClick}
href={this.props.href || 'javascript:'}
label={this.props.label}
>
{this.props.iconPosition == 'left' ? icon : null} {this.props.iconPosition == 'left' ? icon : null}
{this.props.label} {this.props.label}
{this.props.iconPosition == 'left' ? null : icon} {this.props.iconPosition == 'left' ? null : icon}
@ -36,7 +40,7 @@ export class DropDownMenu extends React.Component {
this._menuDiv = null; this._menuDiv = null;
this.state = { this.state = {
menuOpen: false, menuOpen: false
}; };
} }
@ -48,7 +52,7 @@ export class DropDownMenu extends React.Component {
handleMenuIconClick(e) { handleMenuIconClick(e) {
this.setState({ this.setState({
menuOpen: !this.state.menuOpen, menuOpen: !this.state.menuOpen
}); });
if (!this.state.menuOpen && !this._isWindowClickBound) { if (!this.state.menuOpen && !this._isWindowClickBound) {
this._isWindowClickBound = true; this._isWindowClickBound = true;
@ -61,13 +65,15 @@ export class DropDownMenu extends React.Component {
handleMenuClick(e) { handleMenuClick(e) {
// Event bubbles up to the menu after a link is clicked // Event bubbles up to the menu after a link is clicked
this.setState({ this.setState({
menuOpen: false, menuOpen: false
}); });
} }
handleWindowClick(e) { handleWindowClick(e) {
if (this.state.menuOpen && if (
(!this._menuDiv || !this._menuDiv.contains(e.target))) { this.state.menuOpen &&
(!this._menuDiv || !this._menuDiv.contains(e.target))
) {
this.setState({ this.setState({
menuOpen: false menuOpen: false
}); });
@ -81,9 +87,22 @@ export class DropDownMenu extends React.Component {
} }
return ( return (
<div className="menu-container"> <div className="menu-container">
<Link ref={(span) => this._menuButton = span} button="text" icon="icon-ellipsis-v" onClick={(event) => { this.handleMenuIconClick(event) }} /> <Link
ref={span => (this._menuButton = span)}
button="text"
icon="icon-ellipsis-v"
onClick={event => {
this.handleMenuIconClick(event);
}}
/>
{this.state.menuOpen {this.state.menuOpen
? <div ref={(div) => this._menuDiv = div} className="menu" onClick={(event) => { this.handleMenuClick(event) }}> ? <div
ref={div => (this._menuDiv = div)}
className="menu"
onClick={event => {
this.handleMenuClick(event);
}}
>
{this.props.children} {this.props.children}
</div> </div>
: null} : null}

View file

@ -4,9 +4,12 @@ import ReactModal from 'react-modal';
export class ModalPage extends React.Component { export class ModalPage extends React.Component {
render() { render() {
return ( return (
<ReactModal onCloseRequested={this.props.onAborted || this.props.onConfirmed} {...this.props} <ReactModal
onCloseRequested={this.props.onAborted || this.props.onConfirmed}
{...this.props}
className={(this.props.className || '') + ' modal-page'} className={(this.props.className || '') + ' modal-page'}
overlayClassName="modal-overlay"> overlayClassName="modal-overlay"
>
<div className="modal-page__content"> <div className="modal-page__content">
{this.props.children} {this.props.children}
</div> </div>
@ -15,4 +18,4 @@ export class ModalPage extends React.Component {
} }
} }
export default ModalPage export default ModalPage;

View file

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import ReactModal from 'react-modal'; import ReactModal from 'react-modal';
import Link from 'component/link'; import Link from 'component/link';
import app from '../app.js' import app from '../app.js';
export class Modal extends React.Component { export class Modal extends React.Component {
static propTypes = { static propTypes = {
@ -12,8 +12,8 @@ export class Modal extends React.Component {
confirmButtonLabel: React.PropTypes.string, confirmButtonLabel: React.PropTypes.string,
abortButtonLabel: React.PropTypes.string, abortButtonLabel: React.PropTypes.string,
confirmButtonDisabled: React.PropTypes.bool, confirmButtonDisabled: React.PropTypes.bool,
abortButtonDisabled: React.PropTypes.bool, abortButtonDisabled: React.PropTypes.bool
} };
static defaultProps = { static defaultProps = {
type: 'alert', type: 'alert',
@ -21,23 +21,42 @@ export class Modal extends React.Component {
confirmButtonLabel: app.i18n.__('OK'), confirmButtonLabel: app.i18n.__('OK'),
abortButtonLabel: app.i18n.__('Cancel'), abortButtonLabel: app.i18n.__('Cancel'),
confirmButtonDisabled: false, confirmButtonDisabled: false,
abortButtonDisabled: false, abortButtonDisabled: false
} };
render() { render() {
return ( return (
<ReactModal onCloseRequested={this.props.onAborted || this.props.onConfirmed} {...this.props} <ReactModal
onCloseRequested={this.props.onAborted || this.props.onConfirmed}
{...this.props}
className={(this.props.className || '') + ' modal'} className={(this.props.className || '') + ' modal'}
overlayClassName={![null, undefined, ""].includes(this.props.overlayClassName) ? this.props.overlayClassName : 'modal-overlay'}> overlayClassName={
![null, undefined, ''].includes(this.props.overlayClassName)
? this.props.overlayClassName
: 'modal-overlay'
}
>
<div> <div>
{this.props.children} {this.props.children}
</div> </div>
{this.props.type == 'custom' // custom modals define their own buttons {this.props.type == 'custom' // custom modals define their own buttons
? null ? null
: <div className="modal__buttons"> : <div className="modal__buttons">
<Link button="primary" label={this.props.confirmButtonLabel} className="modal__button" disabled={this.props.confirmButtonDisabled} onClick={this.props.onConfirmed} /> <Link
button="primary"
label={this.props.confirmButtonLabel}
className="modal__button"
disabled={this.props.confirmButtonDisabled}
onClick={this.props.onConfirmed}
/>
{this.props.type == 'confirm' {this.props.type == 'confirm'
? <Link button="alt" label={this.props.abortButtonLabel} className="modal__button" disabled={this.props.abortButtonDisabled} onClick={this.props.onAborted} /> ? <Link
button="alt"
label={this.props.abortButtonLabel}
className="modal__button"
disabled={this.props.abortButtonDisabled}
onClick={this.props.onAborted}
/>
: null} : null}
</div>} </div>}
</ReactModal> </ReactModal>
@ -48,26 +67,26 @@ export class Modal extends React.Component {
export class ExpandableModal extends React.Component { export class ExpandableModal extends React.Component {
static propTypes = { static propTypes = {
expandButtonLabel: React.PropTypes.string, expandButtonLabel: React.PropTypes.string,
extraContent: React.PropTypes.element, extraContent: React.PropTypes.element
} };
static defaultProps = { static defaultProps = {
confirmButtonLabel: app.i18n.__('OK'), confirmButtonLabel: app.i18n.__('OK'),
expandButtonLabel: app.i18n.__('Show More...'), expandButtonLabel: app.i18n.__('Show More...'),
hideButtonLabel: app.i18n.__('Show Less'), hideButtonLabel: app.i18n.__('Show Less')
} };
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
expanded: false, expanded: false
} };
} }
toggleExpanded() { toggleExpanded() {
this.setState({ this.setState({
expanded: !this.state.expanded, expanded: !this.state.expanded
}); });
} }
@ -75,13 +94,26 @@ export class ExpandableModal extends React.Component {
return ( return (
<Modal type="custom" {...this.props}> <Modal type="custom" {...this.props}>
{this.props.children} {this.props.children}
{this.state.expanded {this.state.expanded ? this.props.extraContent : null}
? this.props.extraContent
: null}
<div className="modal__buttons"> <div className="modal__buttons">
<Link button="primary" label={this.props.confirmButtonLabel} className="modal__button" onClick={this.props.onConfirmed} /> <Link
<Link button="alt" label={!this.state.expanded ? this.props.expandButtonLabel : this.props.hideButtonLabel} button="primary"
className="modal__button" onClick={() => { this.toggleExpanded() }} /> label={this.props.confirmButtonLabel}
className="modal__button"
onClick={this.props.onConfirmed}
/>
<Link
button="alt"
label={
!this.state.expanded
? this.props.expandButtonLabel
: this.props.hideButtonLabel
}
className="modal__button"
onClick={() => {
this.toggleExpanded();
}}
/>
</div> </div>
</Modal> </Modal>
); );

View file

@ -2,16 +2,22 @@ import React from 'react';
export class Notice extends React.Component { export class Notice extends React.Component {
static propTypes = { static propTypes = {
isError: React.PropTypes.bool, isError: React.PropTypes.bool
} };
static defaultProps = { static defaultProps = {
isError: false, isError: false
} };
render() { render() {
return ( return (
<section className={'notice ' + (this.props.isError ? 'notice--error ' : '') + (this.props.className || '')}> <section
className={
'notice ' +
(this.props.isError ? 'notice--error ' : '') +
(this.props.className || '')
}
>
{this.props.children} {this.props.children}
</section> </section>
); );

View file

@ -1,9 +1,9 @@
import React from 'react'; import React from 'react';
import lbry from 'lbry' import lbry from 'lbry';
import { Icon } from 'component/common'; import { Icon } from 'component/common';
import Modal from 'component/modal'; import Modal from 'component/modal';
import rewards from 'rewards'; import rewards from 'rewards';
import Link from 'component/link' import Link from 'component/link';
export class RewardLink extends React.Component { export class RewardLink extends React.Component {
static propTypes = { static propTypes = {
@ -11,7 +11,7 @@ export class RewardLink extends React.Component {
claimed: React.PropTypes.bool, claimed: React.PropTypes.bool,
onRewardClaim: React.PropTypes.func, onRewardClaim: React.PropTypes.func,
onRewardFailure: React.PropTypes.func onRewardFailure: React.PropTypes.func
} };
constructor(props) { constructor(props) {
super(props); super(props);
@ -30,10 +30,10 @@ export class RewardLink extends React.Component {
return; return;
case 'first_publish': case 'first_publish':
lbry.claim_list_mine().then((list) => { lbry.claim_list_mine().then(list => {
this.setState({ this.setState({
claimable: list.length > 0 claimable: list.length > 0
}) });
}); });
return; return;
} }
@ -46,42 +46,60 @@ export class RewardLink extends React.Component {
claimReward() { claimReward() {
this.setState({ this.setState({
pending: true pending: true
}) });
rewards.claimReward(this.props.type).then((reward) => { rewards
.claimReward(this.props.type)
.then(reward => {
this.setState({ this.setState({
pending: false, pending: false,
errorMessage: null errorMessage: null
}) });
if (this.props.onRewardClaim) { if (this.props.onRewardClaim) {
this.props.onRewardClaim(reward); this.props.onRewardClaim(reward);
} }
}).catch((error) => { })
.catch(error => {
this.setState({ this.setState({
errorMessage: error.message, errorMessage: error.message,
pending: false pending: false
}) });
}) });
} }
clearError() { clearError() {
if (this.props.onRewardFailure) { if (this.props.onRewardFailure) {
this.props.onRewardFailure() this.props.onRewardFailure();
} }
this.setState({ this.setState({
errorMessage: null errorMessage: null
}) });
} }
render() { render() {
return ( return (
<div className="reward-link"> <div className="reward-link">
{this.props.claimed {this.props.claimed
? <span><Icon icon="icon-check" /> {__("Reward claimed.")}</span> ? <span><Icon icon="icon-check" /> {__('Reward claimed.')}</span>
: <Link button={this.props.button ? this.props.button : 'alt'} disabled={this.state.pending || !this.state.claimable } : <Link
label={ this.state.pending ? __("Claiming...") : __("Claim Reward")} onClick={() => { this.claimReward() }} />} button={this.props.button ? this.props.button : 'alt'}
{this.state.errorMessage ? disabled={this.state.pending || !this.state.claimable}
<Modal isOpen={true} contentLabel={__("Reward Claim Error")} className="error-modal" onConfirmed={() => { this.clearError() }}> label={
this.state.pending ? __('Claiming...') : __('Claim Reward')
}
onClick={() => {
this.claimReward();
}}
/>}
{this.state.errorMessage
? <Modal
isOpen={true}
contentLabel={__('Reward Claim Error')}
className="error-modal"
onConfirmed={() => {
this.clearError();
}}
>
{this.state.errorMessage} {this.state.errorMessage}
</Modal> </Modal>
: ''} : ''}

View file

@ -1,14 +1,11 @@
import React from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import Router from './view.jsx'; import Router from './view.jsx';
import { import { selectCurrentPage, selectCurrentParams } from 'selectors/app.js';
selectCurrentPage,
selectCurrentParams,
} from 'selectors/app.js';
const select = (state) => ({ const select = state => ({
params: selectCurrentParams(state), params: selectCurrentParams(state),
currentPage: selectCurrentPage(state) currentPage: selectCurrentPage(state)
}) });
export default connect(select, null)(Router); export default connect(select, null)(Router);

View file

@ -4,48 +4,44 @@ import HelpPage from 'page/help';
import ReportPage from 'page/report.js'; import ReportPage from 'page/report.js';
import StartPage from 'page/start.js'; import StartPage from 'page/start.js';
import WalletPage from 'page/wallet'; import WalletPage from 'page/wallet';
import ShowPage from 'page/showPage' import ShowPage from 'page/showPage';
import PublishPage from 'page/publish'; import PublishPage from 'page/publish';
import DiscoverPage from 'page/discover'; import DiscoverPage from 'page/discover';
import SplashScreen from 'component/splash.js'; import SplashScreen from 'component/splash.js';
import DeveloperPage from 'page/developer.js'; import DeveloperPage from 'page/developer.js';
import RewardsPage from 'page/rewards.js'; import RewardsPage from 'page/rewards.js';
import FileListDownloaded from 'page/fileListDownloaded' import FileListDownloaded from 'page/fileListDownloaded';
import FileListPublished from 'page/fileListPublished' import FileListPublished from 'page/fileListPublished';
import ChannelPage from 'page/channel' import ChannelPage from 'page/channel';
import SearchPage from 'page/search' import SearchPage from 'page/search';
const route = (page, routesMap) => { const route = (page, routesMap) => {
const component = routesMap[page] const component = routesMap[page];
return component return component;
}; };
const Router = props => {
const Router = (props) => { const { currentPage, params } = props;
const {
currentPage,
params,
} = props;
return route(currentPage, { return route(currentPage, {
'settings': <SettingsPage {...params} />, settings: <SettingsPage {...params} />,
'help': <HelpPage {...params} />, help: <HelpPage {...params} />,
'report': <ReportPage {...params} />, report: <ReportPage {...params} />,
'downloaded': <FileListDownloaded {...params} />, downloaded: <FileListDownloaded {...params} />,
'published': <FileListPublished {...params} />, published: <FileListPublished {...params} />,
'start': <StartPage {...params} />, start: <StartPage {...params} />,
'wallet': <WalletPage {...params} />, wallet: <WalletPage {...params} />,
'send': <WalletPage {...params} />, send: <WalletPage {...params} />,
'receive': <WalletPage {...params} />, receive: <WalletPage {...params} />,
'show': <ShowPage {...params} />, show: <ShowPage {...params} />,
'channel': <ChannelPage {...params} />, channel: <ChannelPage {...params} />,
'publish': <PublishPage {...params} />, publish: <PublishPage {...params} />,
'developer': <DeveloperPage {...params} />, developer: <DeveloperPage {...params} />,
'discover': <DiscoverPage {...params} />, discover: <DiscoverPage {...params} />,
'rewards': <RewardsPage {...params} />, rewards: <RewardsPage {...params} />,
'search': <SearchPage {...params} />, search: <SearchPage {...params} />
}) });
} };
export default Router export default Router;

View file

@ -1,23 +1,16 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect, import { doNavigate, doRemoveSnackBarSnack } from 'actions/app';
} from 'react-redux' import { selectSnackBarSnacks } from 'selectors/app';
import { import SnackBar from './view';
doNavigate,
doRemoveSnackBarSnack,
} from 'actions/app'
import {
selectSnackBarSnacks,
} from 'selectors/app'
import SnackBar from './view'
const perform = (dispatch) => ({ const perform = dispatch => ({
navigate: (path) => dispatch(doNavigate(path)), navigate: path => dispatch(doNavigate(path)),
removeSnack: () => dispatch(doRemoveSnackBarSnack()), removeSnack: () => dispatch(doRemoveSnackBarSnack())
}) });
const select = (state) => ({ const select = state => ({
snacks: selectSnackBarSnacks(state), snacks: selectSnackBarSnacks(state)
}) });
export default connect(select, perform)(SnackBar) export default connect(select, perform)(SnackBar);

View file

@ -1,5 +1,5 @@
import React from 'react'; import React from 'react';
import Link from 'component/link' import Link from 'component/link';
class SnackBar extends React.Component { class SnackBar extends React.Component {
constructor(props) { constructor(props) {
@ -10,11 +10,7 @@ class SnackBar extends React.Component {
} }
render() { render() {
const { const { navigate, snacks, removeSnack } = this.props;
navigate,
snacks,
removeSnack,
} = this.props
if (!snacks.length) { if (!snacks.length) {
this._hideTimeout = null; //should be unmounting anyway, but be safe? this._hideTimeout = null; //should be unmounting anyway, but be safe?
@ -22,25 +18,25 @@ class SnackBar extends React.Component {
} }
const snack = snacks[0]; const snack = snacks[0];
const { const { message, linkText, linkTarget } = snack;
message,
linkText,
linkTarget,
} = snack
if (this._hideTimeout === null) { if (this._hideTimeout === null) {
this._hideTimeout = setTimeout(() => { this._hideTimeout = setTimeout(() => {
this._hideTimeout = null; this._hideTimeout = null;
removeSnack() removeSnack();
}, this._displayTime * 1000); }, this._displayTime * 1000);
} }
return ( return (
<div className="snack-bar"> <div className="snack-bar">
{message} {message}
{linkText && linkTarget && {linkText &&
<Link onClick={() => navigate(linkTarget)} className="snack-bar__action" label={linkText} /> linkTarget &&
} <Link
onClick={() => navigate(linkTarget)}
className="snack-bar__action"
label={linkText}
/>}
</div> </div>
); );
} }

View file

@ -5,44 +5,46 @@ import LoadScreen from './load_screen.js';
export class SplashScreen extends React.Component { export class SplashScreen extends React.Component {
static propTypes = { static propTypes = {
message: React.PropTypes.string, message: React.PropTypes.string,
onLoadDone: React.PropTypes.func, onLoadDone: React.PropTypes.func
} };
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
details: __('Starting daemon'), details: __('Starting daemon'),
message: __("Connecting"), message: __('Connecting'),
isLagging: false, isLagging: false
}; };
} }
updateStatus() { updateStatus() {
lbry.status().then((status) => { this._updateStatusCallback(status) }); lbry.status().then(status => {
this._updateStatusCallback(status);
});
} }
_updateStatusCallback(status) { _updateStatusCallback(status) {
const startupStatus = status.startup_status const startupStatus = status.startup_status;
if (startupStatus.code == 'started') { if (startupStatus.code == 'started') {
// Wait until we are able to resolve a name before declaring // Wait until we are able to resolve a name before declaring
// that we are done. // that we are done.
// TODO: This is a hack, and the logic should live in the daemon // TODO: This is a hack, and the logic should live in the daemon
// to give us a better sense of when we are actually started // to give us a better sense of when we are actually started
this.setState({ this.setState({
message: __("Testing Network"), message: __('Testing Network'),
details: __("Waiting for name resolution"), details: __('Waiting for name resolution'),
isLagging: false isLagging: false
}); });
lbry.resolve({uri: "lbry://one"}).then(() => { lbry.resolve({ uri: 'lbry://one' }).then(() => {
this.props.onLoadDone(); this.props.onLoadDone();
}); });
return; return;
} }
this.setState({ this.setState({
details: startupStatus.message + (startupStatus.is_lagging ? '' : '...'), details: startupStatus.message + (startupStatus.is_lagging ? '' : '...'),
isLagging: startupStatus.is_lagging, isLagging: startupStatus.is_lagging
}); });
setTimeout(() => { setTimeout(() => {
this.updateStatus(); this.updateStatus();
@ -50,19 +52,30 @@ export class SplashScreen extends React.Component {
} }
componentDidMount() { componentDidMount() {
lbry.connect() lbry
.then(() => { this.updateStatus() }) .connect()
.then(() => {
this.updateStatus();
})
.catch(() => { .catch(() => {
this.setState({ this.setState({
isLagging: true, isLagging: true,
message: __("Connection Failure"), message: __('Connection Failure'),
details: __("Try closing all LBRY processes and starting again. If this still happpens, your anti-virus software or firewall may be preventing LBRY from connecting. Contact hello@lbry.io if you think this is a software bug.") details: __(
}) 'Try closing all LBRY processes and starting again. If this still happpens, your anti-virus software or firewall may be preventing LBRY from connecting. Contact hello@lbry.io if you think this is a software bug.'
}) )
});
});
} }
render() { render() {
return <LoadScreen message={this.state.message} details={this.state.details} isWarning={this.state.isLagging} /> return (
<LoadScreen
message={this.state.message}
details={this.state.details}
isWarning={this.state.isLagging}
/>
);
} }
} }

View file

@ -1,23 +1,16 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect, import { selectCurrentPage, selectHeaderLinks } from 'selectors/app';
} from 'react-redux' import { doNavigate } from 'actions/app';
import { import SubHeader from './view';
selectCurrentPage,
selectHeaderLinks,
} from 'selectors/app'
import {
doNavigate,
} from 'actions/app'
import SubHeader from './view'
const select = (state, props) => ({ const select = (state, props) => ({
currentPage: selectCurrentPage(state), currentPage: selectCurrentPage(state),
subLinks: selectHeaderLinks(state), subLinks: selectHeaderLinks(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
navigate: (path) => dispatch(doNavigate(path)), navigate: path => dispatch(doNavigate(path))
}) });
export default connect(select, perform)(SubHeader) export default connect(select, perform)(SubHeader);

View file

@ -1,29 +1,32 @@
import React from 'react' import React from 'react';
import Link from 'component/link' import Link from 'component/link';
const SubHeader = (props) => { const SubHeader = props => {
const { const { subLinks, currentPage, navigate, modifier } = props;
subLinks,
currentPage,
navigate,
modifier,
} = props
const links = [] const links = [];
for (let link of Object.keys(subLinks)) { for (let link of Object.keys(subLinks)) {
links.push( links.push(
<Link onClick={(event) => navigate(`/${link}`, event)} key={link} className={link == currentPage ? 'sub-header-selected' : 'sub-header-unselected' }> <Link
onClick={event => navigate(`/${link}`, event)}
key={link}
className={
link == currentPage ? 'sub-header-selected' : 'sub-header-unselected'
}
>
{subLinks[link]} {subLinks[link]}
</Link> </Link>
) );
} }
return ( return (
<nav className={'sub-header' + (modifier ? ' sub-header--' + modifier : '')}> <nav
className={'sub-header' + (modifier ? ' sub-header--' + modifier : '')}
>
{links} {links}
</nav> </nav>
) );
} };
export default SubHeader export default SubHeader;

View file

@ -4,36 +4,47 @@ export class ToolTip extends React.Component {
static propTypes = { static propTypes = {
body: React.PropTypes.string.isRequired, body: React.PropTypes.string.isRequired,
label: React.PropTypes.string.isRequired label: React.PropTypes.string.isRequired
} };
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
showTooltip: false, showTooltip: false
}; };
} }
handleClick() { handleClick() {
this.setState({ this.setState({
showTooltip: !this.state.showTooltip, showTooltip: !this.state.showTooltip
}); });
} }
handleTooltipMouseOut() { handleTooltipMouseOut() {
this.setState({ this.setState({
showTooltip: false, showTooltip: false
}); });
} }
render() { render() {
return ( return (
<span className={'tooltip ' + (this.props.className || '')}> <span className={'tooltip ' + (this.props.className || '')}>
<a className="tooltip__link" onClick={() => { this.handleClick() }}> <a
className="tooltip__link"
onClick={() => {
this.handleClick();
}}
>
{this.props.label} {this.props.label}
</a> </a>
<div className={'tooltip__body ' + (this.state.showTooltip ? '' : ' hidden')} <div
onMouseOut={() => { this.handleTooltipMouseOut() }}> className={
'tooltip__body ' + (this.state.showTooltip ? '' : ' hidden')
}
onMouseOut={() => {
this.handleTooltipMouseOut();
}}
>
{this.props.body} {this.props.body}
</div> </div>
</span> </span>
@ -41,4 +52,4 @@ export class ToolTip extends React.Component {
} }
} }
export default ToolTip export default ToolTip;

View file

@ -1,25 +1,21 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { doFetchTransactions } from 'actions/wallet';
} from 'react-redux'
import {
doFetchTransactions,
} from 'actions/wallet'
import { import {
selectBalance, selectBalance,
selectTransactionItems, selectTransactionItems,
selectIsFetchingTransactions, selectIsFetchingTransactions
} from 'selectors/wallet' } from 'selectors/wallet';
import TransactionList from './view' import TransactionList from './view';
const select = (state) => ({ const select = state => ({
fetchingTransactions: selectIsFetchingTransactions(state), fetchingTransactions: selectIsFetchingTransactions(state),
transactionItems: selectTransactionItems(state), transactionItems: selectTransactionItems(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
fetchTransactions: () => dispatch(doFetchTransactions()) fetchTransactions: () => dispatch(doFetchTransactions())
}) });
export default connect(select, perform)(TransactionList) export default connect(select, perform)(TransactionList);

View file

@ -1,31 +1,37 @@
import React from 'react'; import React from 'react';
import { import { Address, BusyMessage, CreditAmount } from 'component/common';
Address,
BusyMessage,
CreditAmount
} from 'component/common';
class TransactionList extends React.Component { class TransactionList extends React.Component {
componentWillMount() { componentWillMount() {
this.props.fetchTransactions() this.props.fetchTransactions();
} }
render() { render() {
const { const { fetchingTransactions, transactionItems } = this.props;
fetchingTransactions,
transactionItems,
} = this.props
const rows = [] const rows = [];
if (transactionItems.length > 0) { if (transactionItems.length > 0) {
transactionItems.forEach(function(item) { transactionItems.forEach(function(item) {
rows.push( rows.push(
<tr key={item.id}> <tr key={item.id}>
<td>{(item.amount > 0 ? '+' : '') + item.amount}</td> <td>{(item.amount > 0 ? '+' : '') + item.amount}</td>
<td>{ item.date ? item.date.toLocaleDateString() : <span className="empty">{__("(Transaction pending)")}</span> }</td>
<td>{ item.date ? item.date.toLocaleTimeString() : <span className="empty">{__("(Transaction pending)")}</span> }</td>
<td> <td>
<a className="button-text" href={"https://explorer.lbry.io/#!/transaction?id="+item.id}>{item.id.substr(0, 7)}</a> {item.date
? item.date.toLocaleDateString()
: <span className="empty">{__('(Transaction pending)')}</span>}
</td>
<td>
{item.date
? item.date.toLocaleTimeString()
: <span className="empty">{__('(Transaction pending)')}</span>}
</td>
<td>
<a
className="button-text"
href={'https://explorer.lbry.io/#!/transaction?id=' + item.id}
>
{item.id.substr(0, 7)}
</a>
</td> </td>
</tr> </tr>
); );
@ -35,31 +41,33 @@ class TransactionList extends React.Component{
return ( return (
<section className="card"> <section className="card">
<div className="card__title-primary"> <div className="card__title-primary">
<h3>{__("Transaction History")}</h3> <h3>{__('Transaction History')}</h3>
</div> </div>
<div className="card__content"> <div className="card__content">
{ fetchingTransactions && <BusyMessage message={__("Loading transactions")} /> } {fetchingTransactions &&
{ !fetchingTransactions && rows.length === 0 ? <div className="empty">{__("You have no transactions.")}</div> : '' } <BusyMessage message={__('Loading transactions')} />}
{ rows.length > 0 ? {!fetchingTransactions && rows.length === 0
<table className="table-standard table-stretch"> ? <div className="empty">{__('You have no transactions.')}</div>
: ''}
{rows.length > 0
? <table className="table-standard table-stretch">
<thead> <thead>
<tr> <tr>
<th>{__("Amount")}</th> <th>{__('Amount')}</th>
<th>{__("Date")}</th> <th>{__('Date')}</th>
<th>{__("Time")}</th> <th>{__('Time')}</th>
<th>{__("Transaction")}</th> <th>{__('Transaction')}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{rows} {rows}
</tbody> </tbody>
</table> </table>
: '' : ''}
}
</div> </div>
</section> </section>
) );
} }
} }
export default TransactionList export default TransactionList;

View file

@ -1,19 +1,13 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { doDownloadUpgrade, doSkipUpgrade } from 'actions/app';
} from 'react-redux' import UpgradeModal from './view';
import {
doDownloadUpgrade,
doSkipUpgrade,
} from 'actions/app'
import UpgradeModal from './view'
const select = (state) => ({ const select = state => ({});
})
const perform = (dispatch) => ({ const perform = dispatch => ({
downloadUpgrade: () => dispatch(doDownloadUpgrade()), downloadUpgrade: () => dispatch(doDownloadUpgrade()),
skipUpgrade: () => dispatch(doSkipUpgrade()), skipUpgrade: () => dispatch(doSkipUpgrade())
}) });
export default connect(select, perform)(UpgradeModal) export default connect(select, perform)(UpgradeModal);

View file

@ -1,32 +1,27 @@
import React from 'react' import React from 'react';
import { import { Modal } from 'component/modal';
Modal import { downloadUpgrade, skipUpgrade } from 'actions/app';
} from 'component/modal'
import {
downloadUpgrade,
skipUpgrade
} from 'actions/app'
class UpgradeModal extends React.Component { class UpgradeModal extends React.Component {
render() { render() {
const { const { downloadUpgrade, skipUpgrade } = this.props;
downloadUpgrade,
skipUpgrade
} = this.props
return ( return (
<Modal <Modal
isOpen={true} isOpen={true}
contentLabel={__("Update available")} contentLabel={__('Update available')}
type="confirm" type="confirm"
confirmButtonLabel={__("Upgrade")} confirmButtonLabel={__('Upgrade')}
abortButtonLabel={__("Skip")} abortButtonLabel={__('Skip')}
onConfirmed={downloadUpgrade} onConfirmed={downloadUpgrade}
onAborted={skipUpgrade}> onAborted={skipUpgrade}
{__("Your version of LBRY is out of date and may be unreliable or insecure.")} >
{__(
'Your version of LBRY is out of date and may be unreliable or insecure.'
)}
</Modal> </Modal>
) );
} }
} }
export default UpgradeModal export default UpgradeModal;

View file

@ -1,15 +1,9 @@
import React from 'react' import React from 'react';
import lbryuri from 'lbryuri'; import lbryuri from 'lbryuri';
import { import { connect } from 'react-redux';
connect, import { makeSelectIsResolvingForUri } from 'selectors/content';
} from 'react-redux' import { makeSelectClaimForUri } from 'selectors/claims';
import { import UriIndicator from './view';
makeSelectIsResolvingForUri
} from 'selectors/content'
import {
makeSelectClaimForUri,
} from 'selectors/claims'
import UriIndicator from './view'
const makeSelect = () => { const makeSelect = () => {
const selectClaim = makeSelectClaimForUri(), const selectClaim = makeSelectClaimForUri(),
@ -18,14 +12,14 @@ const makeSelect = () => {
const select = (state, props) => ({ const select = (state, props) => ({
claim: selectClaim(state, props), claim: selectClaim(state, props),
isResolvingUri: selectIsResolving(state, props), isResolvingUri: selectIsResolving(state, props),
uri: lbryuri.normalize(props.uri), uri: lbryuri.normalize(props.uri)
}) });
return select return select;
} };
const perform = (dispatch) => ({ const perform = dispatch => ({
resolveUri: (uri) => dispatch(doResolveUri(uri)) resolveUri: uri => dispatch(doResolveUri(uri))
}) });
export default connect(makeSelect, perform)(UriIndicator) export default connect(makeSelect, perform)(UriIndicator);

View file

@ -3,46 +3,37 @@ import {Icon} from 'component/common';
class UriIndicator extends React.Component { class UriIndicator extends React.Component {
componentWillMount() { componentWillMount() {
this.resolve(this.props) this.resolve(this.props);
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
this.resolve(nextProps) this.resolve(nextProps);
} }
resolve(props) { resolve(props) {
const { const { isResolvingUri, resolveUri, claim, uri } = props;
isResolvingUri,
resolveUri,
claim,
uri,
} = props
if (!isResolvingUri && claim === undefined && uri) { if (!isResolvingUri && claim === undefined && uri) {
resolveUri(uri) resolveUri(uri);
} }
} }
render() { render() {
const { const { claim, uri, isResolvingUri } = this.props;
claim,
uri,
isResolvingUri
} = this.props
if (isResolvingUri) { if (isResolvingUri) {
return <span className="empty">Validating...</span> return <span className="empty">Validating...</span>;
} }
if (!claim) { if (!claim) {
return <span className="empty">Unused</span> return <span className="empty">Unused</span>;
} }
const { const {
channel_name: channelName, channel_name: channelName,
has_signature: hasSignature, has_signature: hasSignature,
signature_is_valid: signatureIsValid, signature_is_valid: signatureIsValid
} = claim } = claim;
if (!hasSignature || !channelName) { if (!hasSignature || !channelName) {
return <span className="empty">Anonymous</span>; return <span className="empty">Anonymous</span>;
@ -59,11 +50,14 @@ class UriIndicator extends React.Component{
return ( return (
<span> <span>
{channelName} {' '} {channelName} {' '}
{ !signatureIsValid ? {!signatureIsValid
<Icon icon={icon} className={`channel-indicator__icon channel-indicator__icon--${modifier}`} /> : ? <Icon
'' } icon={icon}
className={`channel-indicator__icon channel-indicator__icon--${modifier}`}
/>
: ''}
</span> </span>
) );
} }
} }

View file

@ -1,39 +1,27 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect, import { doCloseModal } from 'actions/app';
} from 'react-redux' import { selectCurrentModal } from 'selectors/app';
import { import { doPurchaseUri, doLoadVideo } from 'actions/content';
doCloseModal,
} from 'actions/app'
import {
selectCurrentModal,
} from 'selectors/app'
import {
doPurchaseUri,
doLoadVideo,
} from 'actions/content'
import { import {
makeSelectMetadataForUri, makeSelectMetadataForUri,
makeSelectContentTypeForUri, makeSelectContentTypeForUri
} from 'selectors/claims' } from 'selectors/claims';
import { import {
makeSelectFileInfoForUri, makeSelectFileInfoForUri,
makeSelectLoadingForUri, makeSelectLoadingForUri,
makeSelectDownloadingForUri, makeSelectDownloadingForUri
} from 'selectors/file_info' } from 'selectors/file_info';
import { import { makeSelectCostInfoForUri } from 'selectors/cost_info';
makeSelectCostInfoForUri, import Video from './view';
} from 'selectors/cost_info'
import Video from './view'
const makeSelect = () => { const makeSelect = () => {
const selectCostInfo = makeSelectCostInfoForUri() const selectCostInfo = makeSelectCostInfoForUri();
const selectFileInfo = makeSelectFileInfoForUri() const selectFileInfo = makeSelectFileInfoForUri();
const selectIsLoading = makeSelectLoadingForUri() const selectIsLoading = makeSelectLoadingForUri();
const selectIsDownloading = makeSelectDownloadingForUri() const selectIsDownloading = makeSelectDownloadingForUri();
const selectMetadata = makeSelectMetadataForUri() const selectMetadata = makeSelectMetadataForUri();
const selectContentType = makeSelectContentTypeForUri() const selectContentType = makeSelectContentTypeForUri();
const select = (state, props) => ({ const select = (state, props) => ({
costInfo: selectCostInfo(state, props), costInfo: selectCostInfo(state, props),
@ -42,16 +30,16 @@ const makeSelect = () => {
modal: selectCurrentModal(state), modal: selectCurrentModal(state),
isLoading: selectIsLoading(state, props), isLoading: selectIsLoading(state, props),
isDownloading: selectIsDownloading(state, props), isDownloading: selectIsDownloading(state, props),
contentType: selectContentType(state, props), contentType: selectContentType(state, props)
}) });
return select return select;
} };
const perform = (dispatch) => ({ const perform = dispatch => ({
loadVideo: (uri) => dispatch(doLoadVideo(uri)), loadVideo: uri => dispatch(doLoadVideo(uri)),
purchaseUri: (uri) => dispatch(doPurchaseUri(uri, 'affirmPurchaseAndPlay')), purchaseUri: uri => dispatch(doPurchaseUri(uri, 'affirmPurchaseAndPlay')),
closeModal: () => dispatch(doCloseModal()), closeModal: () => dispatch(doCloseModal())
}) });
export default connect(makeSelect, perform)(Video) export default connect(makeSelect, perform)(Video);

View file

@ -1,25 +1,23 @@
import React from 'react'; import React from 'react';
import FilePrice from 'component/filePrice' import FilePrice from 'component/filePrice';
import Link from 'component/link'; import Link from 'component/link';
import Modal from 'component/modal'; import Modal from 'component/modal';
import lbry from 'lbry' import lbry from 'lbry';
import { import { Thumbnail } from 'component/common';
Thumbnail,
} from 'component/common'
class VideoPlayButton extends React.Component { class VideoPlayButton extends React.Component {
onPurchaseConfirmed() { onPurchaseConfirmed() {
this.props.closeModal() this.props.closeModal();
this.props.startPlaying() this.props.startPlaying();
this.props.loadVideo(this.props.uri) this.props.loadVideo(this.props.uri);
} }
onWatchClick() { onWatchClick() {
this.props.purchaseUri(this.props.uri).then(() => { this.props.purchaseUri(this.props.uri).then(() => {
if (!this.props.modal) { if (!this.props.modal) {
this.props.startPlaying() this.props.startPlaying();
} }
}) });
} }
render() { render() {
@ -28,17 +26,15 @@ class VideoPlayButton extends React.Component {
label, label,
className, className,
metadata, metadata,
metadata: { metadata: { title },
title,
},
uri, uri,
modal, modal,
closeModal, closeModal,
isLoading, isLoading,
costInfo, costInfo,
fileInfo, fileInfo,
mediaType, mediaType
} = this.props } = this.props;
/* /*
title={ title={
@ -48,45 +44,64 @@ class VideoPlayButton extends React.Component {
} }
*/ */
const disabled = isLoading || fileInfo === undefined || (fileInfo === null && (!costInfo || costInfo.cost === undefined)) const disabled =
const icon = ["audio", "video"].indexOf(mediaType) !== -1 ? "icon-play" : "icon-folder-o" isLoading ||
fileInfo === undefined ||
(fileInfo === null && (!costInfo || costInfo.cost === undefined));
const icon = ['audio', 'video'].indexOf(mediaType) !== -1
? 'icon-play'
: 'icon-folder-o';
return (<div> return (
<Link button={ button ? button : null } <div>
<Link
button={button ? button : null}
disabled={disabled} disabled={disabled}
label={label ? label : ""} label={label ? label : ''}
className="video__play-button" className="video__play-button"
icon={icon} icon={icon}
onClick={this.onWatchClick.bind(this)} /> onClick={this.onWatchClick.bind(this)}
<Modal contentLabel={__("Not enough credits")} isOpen={modal == 'notEnoughCredits'} onConfirmed={closeModal}> />
<Modal
contentLabel={__('Not enough credits')}
isOpen={modal == 'notEnoughCredits'}
onConfirmed={closeModal}
>
{__("You don't have enough LBRY credits to pay for this stream.")} {__("You don't have enough LBRY credits to pay for this stream.")}
</Modal> </Modal>
<Modal <Modal
type="confirm" type="confirm"
isOpen={modal == 'affirmPurchaseAndPlay'} isOpen={modal == 'affirmPurchaseAndPlay'}
contentLabel={__("Confirm Purchase")} contentLabel={__('Confirm Purchase')}
onConfirmed={this.onPurchaseConfirmed.bind(this)} onConfirmed={this.onPurchaseConfirmed.bind(this)}
onAborted={closeModal}> onAborted={closeModal}
{__("This will purchase")} <strong>{title}</strong> {__("for")} <strong><FilePrice uri={uri} look="plain" /></strong> {__("credits")}. >
{__('This will purchase')} <strong>{title}</strong> {__('for')}
{' '}<strong><FilePrice uri={uri} look="plain" /></strong>
{' '}{__('credits')}.
</Modal> </Modal>
<Modal <Modal
isOpen={modal == 'timedOut'} onConfirmed={closeModal} contentLabel={__("Timed Out")}> isOpen={modal == 'timedOut'}
{__("Sorry, your download timed out :(")} onConfirmed={closeModal}
contentLabel={__('Timed Out')}
>
{__('Sorry, your download timed out :(')}
</Modal> </Modal>
</div>); </div>
);
} }
} }
class Video extends React.Component { class Video extends React.Component {
constructor(props) { constructor(props) {
super(props) super(props);
this.state = { isPlaying: false } this.state = { isPlaying: false };
} }
startPlaying() { startPlaying() {
this.setState({ this.setState({
isPlaying: true isPlaying: true
}) });
} }
render() { render() {
@ -95,88 +110,105 @@ class Video extends React.Component {
isLoading, isLoading,
isDownloading, isDownloading,
fileInfo, fileInfo,
contentType
} = this.props;
const { isPlaying = false } = this.state;
const isReadyToPlay = fileInfo && fileInfo.written_bytes > 0;
const mediaType = lbry.getMediaType(
contentType, contentType,
} = this.props fileInfo && fileInfo.file_name
const { );
isPlaying = false,
} = this.state
const isReadyToPlay = fileInfo && fileInfo.written_bytes > 0 let loadStatusMessage = '';
const mediaType = lbry.getMediaType(contentType, fileInfo && fileInfo.file_name)
let loadStatusMessage = ''
if (fileInfo && fileInfo.completed && !fileInfo.written_bytes) { if (fileInfo && fileInfo.completed && !fileInfo.written_bytes) {
loadStatusMessage = __("It looks like you deleted or moved this file. We're rebuilding it now. It will only take a few seconds.") loadStatusMessage = __(
"It looks like you deleted or moved this file. We're rebuilding it now. It will only take a few seconds."
);
} else if (isLoading) { } else if (isLoading) {
loadStatusMessage = __("Requesting stream... it may sit here for like 15-20 seconds in a really awkward way... we're working on it") loadStatusMessage = __(
"Requesting stream... it may sit here for like 15-20 seconds in a really awkward way... we're working on it"
);
} else if (isDownloading) { } else if (isDownloading) {
loadStatusMessage = __("Downloading stream... not long left now!") loadStatusMessage = __('Downloading stream... not long left now!');
} }
let klassName = "" let klassName = '';
if (isLoading || isDownloading) klassName += "video-embedded video" if (isLoading || isDownloading) klassName += 'video-embedded video';
if (mediaType === "video") { if (mediaType === 'video') {
klassName += "video-embedded video" klassName += 'video-embedded video';
klassName += isPlaying ? " video--active" : " video--hidden" klassName += isPlaying ? ' video--active' : ' video--hidden';
} else if (mediaType === "application") { } else if (mediaType === 'application') {
klassName += "video-embedded" klassName += 'video-embedded';
} else { } else {
if (!isPlaying) klassName += "video-embedded" if (!isPlaying) klassName += 'video-embedded';
} }
const poster = metadata.thumbnail const poster = metadata.thumbnail;
return ( return (
<div className={klassName}>{ <div className={klassName}>
isPlaying ? {isPlaying
(!isReadyToPlay ? ? !isReadyToPlay
<span>{__("this is the world's worst loading screen and we shipped our software with it anyway...")} <br /><br />{loadStatusMessage}</span> : ? <span>
<VideoPlayer filename={fileInfo.file_name} poster={poster} downloadPath={fileInfo.download_path} mediaType={mediaType} poster={poster} />) : {__(
<div className="video__cover" style={{backgroundImage: 'url("' + metadata.thumbnail + '")'}}> "this is the world's worst loading screen and we shipped our software with it anyway..."
<VideoPlayButton startPlaying={this.startPlaying.bind(this)} {...this.props} mediaType={mediaType} /> )}
{' '}<br /><br />{loadStatusMessage}
</span>
: <VideoPlayer
filename={fileInfo.file_name}
poster={poster}
downloadPath={fileInfo.download_path}
mediaType={mediaType}
poster={poster}
/>
: <div
className="video__cover"
style={{ backgroundImage: 'url("' + metadata.thumbnail + '")' }}
>
<VideoPlayButton
startPlaying={this.startPlaying.bind(this)}
{...this.props}
mediaType={mediaType}
/>
</div>}
</div> </div>
}</div>
); );
} }
} }
const from = require('from2') const from = require('from2');
const player = require('render-media') const player = require('render-media');
const fs = require('fs') const fs = require('fs');
class VideoPlayer extends React.Component { class VideoPlayer extends React.Component {
componentDidMount() { componentDidMount() {
const elem = this.refs.media const elem = this.refs.media;
const { const { downloadPath, filename } = this.props;
downloadPath,
filename,
} = this.props
const file = { const file = {
name: filename, name: filename,
createReadStream: (opts) => { createReadStream: opts => {
return fs.createReadStream(downloadPath, opts) return fs.createReadStream(downloadPath, opts);
}
} }
};
player.append(file, elem, { player.append(file, elem, {
autoplay: true, autoplay: true,
controls: true, controls: true
}) });
} }
render() { render() {
const { const { downloadPath, mediaType, poster } = this.props;
downloadPath,
mediaType,
poster,
} = this.props
return ( return (
<div> <div>
{["audio", "application"].indexOf(mediaType) !== -1 && <Thumbnail src={poster} className="video-embedded" />} {['audio', 'application'].indexOf(mediaType) !== -1 &&
<Thumbnail src={poster} className="video-embedded" />}
<div ref="media" /> <div ref="media" />
</div> </div>
) );
} }
} }
export default Video export default Video;

View file

@ -1,25 +1,20 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { doCheckAddressIsMine, doGetNewAddress } from 'actions/wallet';
} from 'react-redux'
import {
doCheckAddressIsMine,
doGetNewAddress,
} from 'actions/wallet'
import { import {
selectReceiveAddress, selectReceiveAddress,
selectGettingNewAddress selectGettingNewAddress
} from 'selectors/wallet' } from 'selectors/wallet';
import WalletPage from './view' import WalletPage from './view';
const select = (state) => ({ const select = state => ({
receiveAddress: selectReceiveAddress(state), receiveAddress: selectReceiveAddress(state),
gettingNewAddress: selectGettingNewAddress(state), gettingNewAddress: selectGettingNewAddress(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
checkAddressIsMine: (address) => dispatch(doCheckAddressIsMine(address)), checkAddressIsMine: address => dispatch(doCheckAddressIsMine(address)),
getNewAddress: () => dispatch(doGetNewAddress()), getNewAddress: () => dispatch(doGetNewAddress())
}) });
export default connect(select, perform)(WalletPage) export default connect(select, perform)(WalletPage);

View file

@ -1,36 +1,44 @@
import React from 'react'; import React from 'react';
import Link from 'component/link'; import Link from 'component/link';
import { import { Address } from 'component/common';
Address
} from 'component/common';
class WalletAddress extends React.Component { class WalletAddress extends React.Component {
componentWillMount() { componentWillMount() {
this.props.checkAddressIsMine(this.props.receiveAddress) this.props.checkAddressIsMine(this.props.receiveAddress);
} }
render() { render() {
const { const { receiveAddress, getNewAddress, gettingNewAddress } = this.props;
receiveAddress,
getNewAddress,
gettingNewAddress,
} = this.props
return ( return (
<section className="card"> <section className="card">
<div className="card__title-primary"> <div className="card__title-primary">
<h3>{__("Wallet Address")}</h3> <h3>{__('Wallet Address')}</h3>
</div> </div>
<div className="card__content"> <div className="card__content">
<Address address={receiveAddress} /> <Address address={receiveAddress} />
</div> </div>
<div className="card__actions"> <div className="card__actions">
<Link label={__("Get New Address")} button="primary" icon='icon-refresh' onClick={getNewAddress} disabled={gettingNewAddress} /> <Link
label={__('Get New Address')}
button="primary"
icon="icon-refresh"
onClick={getNewAddress}
disabled={gettingNewAddress}
/>
</div> </div>
<div className="card__content"> <div className="card__content">
<div className="help"> <div className="help">
<p>{__("Other LBRY users may send credits to you by entering this address on the \"Send\" page.")}</p> <p>
<p>{__("You can generate a new address at any time, and any previous addresses will continue to work. Using multiple addresses can be helpful for keeping track of incoming payments from multiple sources.")}</p> {__(
'Other LBRY users may send credits to you by entering this address on the "Send" page.'
)}
</p>
<p>
{__(
'You can generate a new address at any time, and any previous addresses will continue to work. Using multiple addresses can be helpful for keeping track of incoming payments from multiple sources.'
)}
</p>
</div> </div>
</div> </div>
</section> </section>
@ -38,4 +46,4 @@ class WalletAddress extends React.Component {
} }
} }
export default WalletAddress export default WalletAddress;

View file

@ -1,36 +1,31 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { doCloseModal } from 'actions/app';
} from 'react-redux'
import {
doCloseModal,
} from 'actions/app'
import { import {
doSendDraftTransaction, doSendDraftTransaction,
doSetDraftTransactionAmount, doSetDraftTransactionAmount,
doSetDraftTransactionAddress, doSetDraftTransactionAddress
} from 'actions/wallet' } from 'actions/wallet';
import { import { selectCurrentModal } from 'selectors/app';
selectCurrentModal,
} from 'selectors/app'
import { import {
selectDraftTransactionAmount, selectDraftTransactionAmount,
selectDraftTransactionAddress, selectDraftTransactionAddress
} from 'selectors/wallet' } from 'selectors/wallet';
import WalletSend from './view' import WalletSend from './view';
const select = (state) => ({ const select = state => ({
modal: selectCurrentModal(state), modal: selectCurrentModal(state),
address: selectDraftTransactionAddress(state), address: selectDraftTransactionAddress(state),
amount: selectDraftTransactionAmount(state), amount: selectDraftTransactionAmount(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
closeModal: () => dispatch(doCloseModal()), closeModal: () => dispatch(doCloseModal()),
sendToAddress: () => dispatch(doSendDraftTransaction()), sendToAddress: () => dispatch(doSendDraftTransaction()),
setAmount: (event) => dispatch(doSetDraftTransactionAmount(event.target.value)), setAmount: event => dispatch(doSetDraftTransactionAmount(event.target.value)),
setAddress: (event) => dispatch(doSetDraftTransactionAddress(event.target.value)), setAddress: event =>
}) dispatch(doSetDraftTransactionAddress(event.target.value))
});
export default connect(select, perform)(WalletSend) export default connect(select, perform)(WalletSend);

View file

@ -1,11 +1,9 @@
import React from 'react'; import React from 'react';
import Link from 'component/link'; import Link from 'component/link';
import Modal from 'component/modal'; import Modal from 'component/modal';
import { import { FormRow } from 'component/form';
FormRow
} from 'component/form';
const WalletSend = (props) => { const WalletSend = props => {
const { const {
sendToAddress, sendToAddress,
closeModal, closeModal,
@ -13,37 +11,75 @@ const WalletSend = (props) => {
setAmount, setAmount,
setAddress, setAddress,
amount, amount,
address, address
} = props } = props;
return ( return (
<section className="card"> <section className="card">
<form onSubmit={sendToAddress}> <form onSubmit={sendToAddress}>
<div className="card__title-primary"> <div className="card__title-primary">
<h3>{__("Send Credits")}</h3> <h3>{__('Send Credits')}</h3>
</div> </div>
<div className="card__content"> <div className="card__content">
<FormRow label={__("Amount")} postfix="LBC" step="0.01" type="number" placeholder="1.23" size="10" onChange={setAmount} value={amount} /> <FormRow
label={__('Amount')}
postfix="LBC"
step="0.01"
type="number"
placeholder="1.23"
size="10"
onChange={setAmount}
value={amount}
/>
</div> </div>
<div className="card__content"> <div className="card__content">
<FormRow label={__("Recipient Address")} placeholder="bbFxRyXXXXXXXXXXXZD8nE7XTLUxYnddTs" type="text" size="60" onChange={setAddress} value={address} /> <FormRow
label={__('Recipient Address')}
placeholder="bbFxRyXXXXXXXXXXXZD8nE7XTLUxYnddTs"
type="text"
size="60"
onChange={setAddress}
value={address}
/>
</div> </div>
<div className="card__actions card__actions--form-submit"> <div className="card__actions card__actions--form-submit">
<Link button="primary" label={__("Send")} onClick={sendToAddress} disabled={!(parseFloat(amount) > 0.0) || !address} /> <Link
<input type='submit' className='hidden' /> button="primary"
label={__('Send')}
onClick={sendToAddress}
disabled={!(parseFloat(amount) > 0.0) || !address}
/>
<input type="submit" className="hidden" />
</div> </div>
</form> </form>
{modal == 'insufficientBalance' && <Modal isOpen={true} contentLabel={__("Insufficient balance")} onConfirmed={closeModal}> {modal == 'insufficientBalance' &&
{__("Insufficient balance: after this transaction you would have less than 1 LBC in your wallet.")} <Modal
isOpen={true}
contentLabel={__('Insufficient balance')}
onConfirmed={closeModal}
>
{__(
'Insufficient balance: after this transaction you would have less than 1 LBC in your wallet.'
)}
</Modal>} </Modal>}
{modal == 'transactionSuccessful' && <Modal isOpen={true} contentLabel={__("Transaction successful")} onConfirmed={closeModal}> {modal == 'transactionSuccessful' &&
{__("Your transaction was successfully placed in the queue.")} <Modal
isOpen={true}
contentLabel={__('Transaction successful')}
onConfirmed={closeModal}
>
{__('Your transaction was successfully placed in the queue.')}
</Modal>} </Modal>}
{modal == 'transactionFailed' && <Modal isOpen={true} contentLabel={__("Transaction failed")} onConfirmed={closeModal}> {modal == 'transactionFailed' &&
{__("Something went wrong")}: <Modal
isOpen={true}
contentLabel={__('Transaction failed')}
onConfirmed={closeModal}
>
{__('Something went wrong')}:
</Modal>} </Modal>}
</section> </section>
) );
} };
export default WalletSend export default WalletSend;

View file

@ -1,25 +1,19 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import lbryuri from 'lbryuri.js';
} from 'react-redux' import { selectWunderBarAddress, selectWunderBarIcon } from 'selectors/search';
import lbryuri from 'lbryuri.js' import { doNavigate } from 'actions/app';
import { import Wunderbar from './view';
selectWunderBarAddress,
selectWunderBarIcon
} from 'selectors/search'
import {
doNavigate,
} from 'actions/app'
import Wunderbar from './view'
const select = (state) => ({ const select = state => ({
address: selectWunderBarAddress(state), address: selectWunderBarAddress(state),
icon: selectWunderBarIcon(state) icon: selectWunderBarIcon(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
onSearch: (query) => dispatch(doNavigate('/search', { query, })), onSearch: query => dispatch(doNavigate('/search', { query })),
onSubmit: (query) => dispatch(doNavigate('/show', { uri: lbryuri.normalize(query) } )) onSubmit: query =>
}) dispatch(doNavigate('/show', { uri: lbryuri.normalize(query) }))
});
export default connect(select, perform)(Wunderbar) export default connect(select, perform)(Wunderbar);

View file

@ -3,12 +3,12 @@ import lbryuri from 'lbryuri.js';
import { Icon } from 'component/common.js'; import { Icon } from 'component/common.js';
class WunderBar extends React.PureComponent { class WunderBar extends React.PureComponent {
static TYPING_TIMEOUT = 800 static TYPING_TIMEOUT = 800;
static propTypes = { static propTypes = {
onSearch: React.PropTypes.func.isRequired, onSearch: React.PropTypes.func.isRequired,
onSubmit: React.PropTypes.func.isRequired onSubmit: React.PropTypes.func.isRequired
} };
constructor(props) { constructor(props) {
super(props); super(props);
@ -35,13 +35,11 @@ class WunderBar extends React.PureComponent {
} }
onChange(event) { onChange(event) {
if (this._userTypingTimer) {
if (this._userTypingTimer)
{
clearTimeout(this._userTypingTimer); clearTimeout(this._userTypingTimer);
} }
this.setState({ address: event.target.value }) this.setState({ address: event.target.value });
this._isSearchDispatchPending = true; this._isSearchDispatchPending = true;
@ -58,7 +56,10 @@ class WunderBar extends React.PureComponent {
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
if (nextProps.viewingPage !== this.props.viewingPage || nextProps.address != this.props.address) { if (
nextProps.viewingPage !== this.props.viewingPage ||
nextProps.address != this.props.address
) {
this.setState({ address: nextProps.address, icon: nextProps.icon }); this.setState({ address: nextProps.address, icon: nextProps.icon });
} }
} }
@ -66,14 +67,17 @@ class WunderBar extends React.PureComponent {
onFocus() { onFocus() {
this._stateBeforeSearch = this.state; this._stateBeforeSearch = this.state;
let newState = { let newState = {
icon: "icon-search", icon: 'icon-search',
isActive: true isActive: true
} };
this._focusPending = true; this._focusPending = true;
//below is hacking, improved when we have proper routing //below is hacking, improved when we have proper routing
if (!this.state.address.startsWith('lbry://') && this.state.icon !== "icon-search") //onFocus, if they are not on an exact URL or a search page, clear the bar if (
{ !this.state.address.startsWith('lbry://') &&
this.state.icon !== 'icon-search'
) {
//onFocus, if they are not on an exact URL or a search page, clear the bar
newState.address = ''; newState.address = '';
} }
this.setState(newState); this.setState(newState);
@ -83,14 +87,13 @@ class WunderBar extends React.PureComponent {
if (this._isSearchDispatchPending) { if (this._isSearchDispatchPending) {
setTimeout(() => { setTimeout(() => {
this.onBlur(); this.onBlur();
}, WunderBar.TYPING_TIMEOUT + 1) }, WunderBar.TYPING_TIMEOUT + 1);
} else { } else {
let commonState = { isActive: false }; let commonState = { isActive: false };
if (this._resetOnNextBlur) { if (this._resetOnNextBlur) {
this.setState(Object.assign({}, this._stateBeforeSearch, commonState)); this.setState(Object.assign({}, this._stateBeforeSearch, commonState));
this._input.value = this.state.address; this._input.value = this.state.address;
} } else {
else {
this._resetOnNextBlur = true; this._resetOnNextBlur = true;
this._stateBeforeSearch = this.state; this._stateBeforeSearch = this.state;
this.setState(commonState); this.setState(commonState);
@ -116,9 +119,8 @@ class WunderBar extends React.PureComponent {
onKeyPress(event) { onKeyPress(event) {
if (event.charCode == 13 && this._input.value) { if (event.charCode == 13 && this._input.value) {
let uri = null, let uri = null,
method = "onSubmit"; method = 'onSubmit';
this._resetOnNextBlur = false; this._resetOnNextBlur = false;
clearTimeout(this._userTypingTimer); clearTimeout(this._userTypingTimer);
@ -126,9 +128,10 @@ class WunderBar extends React.PureComponent {
try { try {
uri = lbryuri.normalize(this._input.value); uri = lbryuri.normalize(this._input.value);
this.setState({ value: uri }); this.setState({ value: uri });
} catch (error) { //then it's not a valid URL, so let's search } catch (error) {
//then it's not a valid URL, so let's search
uri = this._input.value; uri = this._input.value;
method = "onSearch"; method = 'onSearch';
} }
this.props[method](uri); this.props[method](uri);
@ -142,16 +145,23 @@ class WunderBar extends React.PureComponent {
render() { render() {
return ( return (
<div className={'wunderbar' + (this.state.isActive ? ' wunderbar--active' : '')}> <div
className={
'wunderbar' + (this.state.isActive ? ' wunderbar--active' : '')
}
>
{this.state.icon ? <Icon fixed icon={this.state.icon} /> : ''} {this.state.icon ? <Icon fixed icon={this.state.icon} /> : ''}
<input className="wunderbar__input" type="search" <input
className="wunderbar__input"
type="search"
ref={this.onReceiveRef} ref={this.onReceiveRef}
onFocus={this.onFocus} onFocus={this.onFocus}
onBlur={this.onBlur} onBlur={this.onBlur}
onChange={this.onChange} onChange={this.onChange}
onKeyPress={this.onKeyPress} onKeyPress={this.onKeyPress}
value={this.state.address} value={this.state.address}
placeholder={__("Find movies, music, games, and more")} /> placeholder={__('Find movies, music, games, and more')}
/>
</div> </div>
); );
} }

View file

@ -1,2 +1 @@
module.exports = { module.exports = {};
}

View file

@ -1,2 +1 @@
module.exports = { module.exports = {};
}

View file

@ -1,68 +1,71 @@
export const CHANGE_PATH = 'CHANGE_PATH' export const CHANGE_PATH = 'CHANGE_PATH';
export const OPEN_MODAL = 'OPEN_MODAL' export const OPEN_MODAL = 'OPEN_MODAL';
export const CLOSE_MODAL = 'CLOSE_MODAL' export const CLOSE_MODAL = 'CLOSE_MODAL';
export const HISTORY_BACK = 'HISTORY_BACK' export const HISTORY_BACK = 'HISTORY_BACK';
export const SHOW_SNACKBAR = 'SHOW_SNACKBAR' export const SHOW_SNACKBAR = 'SHOW_SNACKBAR';
export const REMOVE_SNACKBAR_SNACK = 'REMOVE_SNACKBAR_SNACK' export const REMOVE_SNACKBAR_SNACK = 'REMOVE_SNACKBAR_SNACK';
export const DAEMON_READY = 'DAEMON_READY' export const DAEMON_READY = 'DAEMON_READY';
// Upgrades // Upgrades
export const UPGRADE_CANCELLED = 'UPGRADE_CANCELLED' export const UPGRADE_CANCELLED = 'UPGRADE_CANCELLED';
export const DOWNLOAD_UPGRADE = 'DOWNLOAD_UPGRADE' export const DOWNLOAD_UPGRADE = 'DOWNLOAD_UPGRADE';
export const UPGRADE_DOWNLOAD_STARTED = 'UPGRADE_DOWNLOAD_STARTED' export const UPGRADE_DOWNLOAD_STARTED = 'UPGRADE_DOWNLOAD_STARTED';
export const UPGRADE_DOWNLOAD_COMPLETED = 'UPGRADE_DOWNLOAD_COMPLETED' export const UPGRADE_DOWNLOAD_COMPLETED = 'UPGRADE_DOWNLOAD_COMPLETED';
export const UPGRADE_DOWNLOAD_PROGRESSED = 'UPGRADE_DOWNLOAD_PROGRESSED' export const UPGRADE_DOWNLOAD_PROGRESSED = 'UPGRADE_DOWNLOAD_PROGRESSED';
export const CHECK_UPGRADE_AVAILABLE = 'CHECK_UPGRADE_AVAILABLE' export const CHECK_UPGRADE_AVAILABLE = 'CHECK_UPGRADE_AVAILABLE';
export const UPDATE_VERSION = 'UPDATE_VERSION' export const UPDATE_VERSION = 'UPDATE_VERSION';
export const SKIP_UPGRADE = 'SKIP_UPGRADE' export const SKIP_UPGRADE = 'SKIP_UPGRADE';
export const START_UPGRADE = 'START_UPGRADE' export const START_UPGRADE = 'START_UPGRADE';
// Wallet // Wallet
export const GET_NEW_ADDRESS_STARTED = 'GET_NEW_ADDRESS_STARTED' export const GET_NEW_ADDRESS_STARTED = 'GET_NEW_ADDRESS_STARTED';
export const GET_NEW_ADDRESS_COMPLETED = 'GET_NEW_ADDRESS_COMPLETED' export const GET_NEW_ADDRESS_COMPLETED = 'GET_NEW_ADDRESS_COMPLETED';
export const FETCH_TRANSACTIONS_STARTED = 'FETCH_TRANSACTIONS_STARTED' export const FETCH_TRANSACTIONS_STARTED = 'FETCH_TRANSACTIONS_STARTED';
export const FETCH_TRANSACTIONS_COMPLETED = 'FETCH_TRANSACTIONS_COMPLETED' export const FETCH_TRANSACTIONS_COMPLETED = 'FETCH_TRANSACTIONS_COMPLETED';
export const UPDATE_BALANCE = 'UPDATE_BALANCE' export const UPDATE_BALANCE = 'UPDATE_BALANCE';
export const CHECK_ADDRESS_IS_MINE_STARTED = 'CHECK_ADDRESS_IS_MINE_STARTED' export const CHECK_ADDRESS_IS_MINE_STARTED = 'CHECK_ADDRESS_IS_MINE_STARTED';
export const CHECK_ADDRESS_IS_MINE_COMPLETED = 'CHECK_ADDRESS_IS_MINE_COMPLETED' export const CHECK_ADDRESS_IS_MINE_COMPLETED =
export const SET_DRAFT_TRANSACTION_AMOUNT = 'SET_DRAFT_TRANSACTION_AMOUNT' 'CHECK_ADDRESS_IS_MINE_COMPLETED';
export const SET_DRAFT_TRANSACTION_ADDRESS = 'SET_DRAFT_TRANSACTION_ADDRESS' export const SET_DRAFT_TRANSACTION_AMOUNT = 'SET_DRAFT_TRANSACTION_AMOUNT';
export const SEND_TRANSACTION_STARTED = 'SEND_TRANSACTION_STARTED' export const SET_DRAFT_TRANSACTION_ADDRESS = 'SET_DRAFT_TRANSACTION_ADDRESS';
export const SEND_TRANSACTION_COMPLETED = 'SEND_TRANSACTION_COMPLETED' export const SEND_TRANSACTION_STARTED = 'SEND_TRANSACTION_STARTED';
export const SEND_TRANSACTION_FAILED = 'SEND_TRANSACTION_FAILED' export const SEND_TRANSACTION_COMPLETED = 'SEND_TRANSACTION_COMPLETED';
export const SEND_TRANSACTION_FAILED = 'SEND_TRANSACTION_FAILED';
// Content // Content
export const FETCH_FEATURED_CONTENT_STARTED = 'FETCH_FEATURED_CONTENT_STARTED' export const FETCH_FEATURED_CONTENT_STARTED = 'FETCH_FEATURED_CONTENT_STARTED';
export const FETCH_FEATURED_CONTENT_COMPLETED = 'FETCH_FEATURED_CONTENT_COMPLETED' export const FETCH_FEATURED_CONTENT_COMPLETED =
export const RESOLVE_URI_STARTED = 'RESOLVE_URI_STARTED' 'FETCH_FEATURED_CONTENT_COMPLETED';
export const RESOLVE_URI_COMPLETED = 'RESOLVE_URI_COMPLETED' export const RESOLVE_URI_STARTED = 'RESOLVE_URI_STARTED';
export const RESOLVE_URI_CANCELED = 'RESOLVE_URI_CANCELED' export const RESOLVE_URI_COMPLETED = 'RESOLVE_URI_COMPLETED';
export const FETCH_CHANNEL_CLAIMS_STARTED = 'FETCH_CHANNEL_CLAIMS_STARTED' export const RESOLVE_URI_CANCELED = 'RESOLVE_URI_CANCELED';
export const FETCH_CHANNEL_CLAIMS_COMPLETED = 'FETCH_CHANNEL_CLAIMS_COMPLETED' export const FETCH_CHANNEL_CLAIMS_STARTED = 'FETCH_CHANNEL_CLAIMS_STARTED';
export const FETCH_CLAIM_LIST_MINE_STARTED = 'FETCH_CLAIM_LIST_MINE_STARTED' export const FETCH_CHANNEL_CLAIMS_COMPLETED = 'FETCH_CHANNEL_CLAIMS_COMPLETED';
export const FETCH_CLAIM_LIST_MINE_COMPLETED = 'FETCH_CLAIM_LIST_MINE_COMPLETED' export const FETCH_CLAIM_LIST_MINE_STARTED = 'FETCH_CLAIM_LIST_MINE_STARTED';
export const FILE_LIST_STARTED = 'FILE_LIST_STARTED' export const FETCH_CLAIM_LIST_MINE_COMPLETED =
export const FILE_LIST_COMPLETED = 'FILE_LIST_COMPLETED' 'FETCH_CLAIM_LIST_MINE_COMPLETED';
export const FETCH_FILE_INFO_STARTED = 'FETCH_FILE_INFO_STARTED' export const FILE_LIST_STARTED = 'FILE_LIST_STARTED';
export const FETCH_FILE_INFO_COMPLETED = 'FETCH_FILE_INFO_COMPLETED' export const FILE_LIST_COMPLETED = 'FILE_LIST_COMPLETED';
export const FETCH_COST_INFO_STARTED = 'FETCH_COST_INFO_STARTED' export const FETCH_FILE_INFO_STARTED = 'FETCH_FILE_INFO_STARTED';
export const FETCH_COST_INFO_COMPLETED = 'FETCH_COST_INFO_COMPLETED' export const FETCH_FILE_INFO_COMPLETED = 'FETCH_FILE_INFO_COMPLETED';
export const LOADING_VIDEO_STARTED = 'LOADING_VIDEO_STARTED' export const FETCH_COST_INFO_STARTED = 'FETCH_COST_INFO_STARTED';
export const LOADING_VIDEO_COMPLETED = 'LOADING_VIDEO_COMPLETED' export const FETCH_COST_INFO_COMPLETED = 'FETCH_COST_INFO_COMPLETED';
export const LOADING_VIDEO_FAILED = 'LOADING_VIDEO_FAILED' export const LOADING_VIDEO_STARTED = 'LOADING_VIDEO_STARTED';
export const DOWNLOADING_STARTED = 'DOWNLOADING_STARTED' export const LOADING_VIDEO_COMPLETED = 'LOADING_VIDEO_COMPLETED';
export const DOWNLOADING_PROGRESSED = 'DOWNLOADING_PROGRESSED' export const LOADING_VIDEO_FAILED = 'LOADING_VIDEO_FAILED';
export const DOWNLOADING_COMPLETED = 'DOWNLOADING_COMPLETED' export const DOWNLOADING_STARTED = 'DOWNLOADING_STARTED';
export const PLAY_VIDEO_STARTED = 'PLAY_VIDEO_STARTED' export const DOWNLOADING_PROGRESSED = 'DOWNLOADING_PROGRESSED';
export const FETCH_AVAILABILITY_STARTED = 'FETCH_AVAILABILITY_STARTED' export const DOWNLOADING_COMPLETED = 'DOWNLOADING_COMPLETED';
export const FETCH_AVAILABILITY_COMPLETED = 'FETCH_AVAILABILITY_COMPLETED' export const PLAY_VIDEO_STARTED = 'PLAY_VIDEO_STARTED';
export const FILE_DELETE = 'FILE_DELETE' export const FETCH_AVAILABILITY_STARTED = 'FETCH_AVAILABILITY_STARTED';
export const FETCH_AVAILABILITY_COMPLETED = 'FETCH_AVAILABILITY_COMPLETED';
export const FILE_DELETE = 'FILE_DELETE';
// Search // Search
export const SEARCH_STARTED = 'SEARCH_STARTED' export const SEARCH_STARTED = 'SEARCH_STARTED';
export const SEARCH_COMPLETED = 'SEARCH_COMPLETED' export const SEARCH_COMPLETED = 'SEARCH_COMPLETED';
export const SEARCH_CANCELLED = 'SEARCH_CANCELLED' export const SEARCH_CANCELLED = 'SEARCH_CANCELLED';
// Settings // Settings
export const DAEMON_SETTINGS_RECEIVED = 'DAEMON_SETTINGS_RECEIVED' export const DAEMON_SETTINGS_RECEIVED = 'DAEMON_SETTINGS_RECEIVED';

View file

@ -1,7 +1,15 @@
const jsonrpc = {}; const jsonrpc = {};
jsonrpc.call = function (connectionString, method, params, callback, errorCallback, connectFailedCallback, timeout) { jsonrpc.call = function(
var xhr = new XMLHttpRequest; connectionString,
method,
params,
callback,
errorCallback,
connectFailedCallback,
timeout
) {
var xhr = new XMLHttpRequest();
if (typeof connectFailedCallback !== 'undefined') { if (typeof connectFailedCallback !== 'undefined') {
if (timeout) { if (timeout) {
xhr.timeout = timeout; xhr.timeout = timeout;
@ -11,8 +19,10 @@ jsonrpc.call = function (connectionString, method, params, callback, errorCallba
connectFailedCallback(e); connectFailedCallback(e);
}); });
xhr.addEventListener('timeout', function() { xhr.addEventListener('timeout', function() {
connectFailedCallback(new Error(__('XMLHttpRequest connection timed out'))); connectFailedCallback(
}) new Error(__('XMLHttpRequest connection timed out'))
);
});
} }
xhr.addEventListener('load', function() { xhr.addEventListener('load', function() {
var response = JSON.parse(xhr.responseText); var response = JSON.parse(xhr.responseText);
@ -31,7 +41,7 @@ jsonrpc.call = function (connectionString, method, params, callback, errorCallba
data: response.error.data data: response.error.data
} }
}); });
document.dispatchEvent(errorEvent) document.dispatchEvent(errorEvent);
} }
} else if (callback) { } else if (callback) {
callback(response.result); callback(response.result);
@ -60,16 +70,18 @@ jsonrpc.call = function (connectionString, method, params, callback, errorCallba
const counter = parseInt(sessionStorage.getItem('JSONRPCCounter') || 0); const counter = parseInt(sessionStorage.getItem('JSONRPCCounter') || 0);
xhr.open('POST', connectionString, true); xhr.open('POST', connectionString, true);
xhr.send(JSON.stringify({ xhr.send(
'jsonrpc': '2.0', JSON.stringify({
'method': method, jsonrpc: '2.0',
'params': params, method: method,
'id': counter, params: params,
})); id: counter
})
);
sessionStorage.setItem('JSONRPCCounter', counter + 1); sessionStorage.setItem('JSONRPCCounter', counter + 1);
return xhr return xhr;
}; };
export default jsonrpc; export default jsonrpc;

View file

@ -18,7 +18,7 @@ let lbry = {
useCustomLighthouseServers: false, useCustomLighthouseServers: false,
customLighthouseServers: [], customLighthouseServers: [],
showDeveloperMenu: false, showDeveloperMenu: false,
language: 'en', language: 'en'
} }
}; };
@ -35,12 +35,13 @@ function savePendingPublish({name, channel_name}) {
} }
const pendingPublishes = getLocal('pendingPublishes') || []; const pendingPublishes = getLocal('pendingPublishes') || [];
const newPendingPublish = { const newPendingPublish = {
name, channel_name, name,
channel_name,
claim_id: 'pending_claim_' + uri, claim_id: 'pending_claim_' + uri,
txid: 'pending_' + uri, txid: 'pending_' + uri,
nout: 0, nout: 0,
outpoint: 'pending_' + uri + ':0', outpoint: 'pending_' + uri + ':0',
time: Date.now(), time: Date.now()
}; };
setLocal('pendingPublishes', [...pendingPublishes, newPendingPublish]); setLocal('pendingPublishes', [...pendingPublishes, newPendingPublish]);
return newPendingPublish; return newPendingPublish;
@ -52,10 +53,17 @@ function savePendingPublish({name, channel_name}) {
*/ */
function removePendingPublishIfNeeded({ name, channel_name, outpoint }) { function removePendingPublishIfNeeded({ name, channel_name, outpoint }) {
function pubMatches(pub) { function pubMatches(pub) {
return pub.outpoint === outpoint || (pub.name === name && (!channel_name || pub.channel_name === channel_name)); return (
pub.outpoint === outpoint ||
(pub.name === name &&
(!channel_name || pub.channel_name === channel_name))
);
} }
setLocal('pendingPublishes', lbry.getPendingPublishes().filter(pub => !pubMatches(pub))); setLocal(
'pendingPublishes',
lbry.getPendingPublishes().filter(pub => !pubMatches(pub))
);
} }
/** /**
@ -64,10 +72,12 @@ function removePendingPublishIfNeeded({name, channel_name, outpoint}) {
*/ */
lbry.getPendingPublishes = function() { lbry.getPendingPublishes = function() {
const pendingPublishes = getLocal('pendingPublishes') || []; const pendingPublishes = getLocal('pendingPublishes') || [];
const newPendingPublishes = pendingPublishes.filter(pub => Date.now() - pub.time <= lbry.pendingPublishTimeout); const newPendingPublishes = pendingPublishes.filter(
pub => Date.now() - pub.time <= lbry.pendingPublishTimeout
);
setLocal('pendingPublishes', newPendingPublishes); setLocal('pendingPublishes', newPendingPublishes);
return newPendingPublishes; return newPendingPublishes;
} };
/** /**
* Gets a pending publish attempt by its name or (fake) outpoint. A channel name can also be * Gets a pending publish attempt by its name or (fake) outpoint. A channel name can also be
@ -75,12 +85,24 @@ lbry.getPendingPublishes = function() {
*/ */
function getPendingPublish({ name, channel_name, outpoint }) { function getPendingPublish({ name, channel_name, outpoint }) {
const pendingPublishes = lbry.getPendingPublishes(); const pendingPublishes = lbry.getPendingPublishes();
return pendingPublishes.find( return (
pub => pub.outpoint === outpoint || (pub.name === name && (!channel_name || pub.channel_name === channel_name)) pendingPublishes.find(
) || null; pub =>
pub.outpoint === outpoint ||
(pub.name === name &&
(!channel_name || pub.channel_name === channel_name))
) || null
);
} }
function pendingPublishToDummyClaim({channel_name, name, outpoint, claim_id, txid, nout}) { function pendingPublishToDummyClaim({
channel_name,
name,
outpoint,
claim_id,
txid,
nout
}) {
return { name, outpoint, claim_id, txid, nout, channel_name }; return { name, outpoint, claim_id, txid, nout, channel_name };
} }
@ -88,33 +110,51 @@ function pendingPublishToDummyFileInfo({name, outpoint, claim_id}) {
return { name, outpoint, claim_id, metadata: null }; return { name, outpoint, claim_id, metadata: null };
} }
lbry.call = function (method, params, callback, errorCallback, connectFailedCallback) { lbry.call = function(
return jsonrpc.call(lbry.daemonConnectionString, method, params, callback, errorCallback, connectFailedCallback); method,
} params,
callback,
errorCallback,
connectFailedCallback
) {
return jsonrpc.call(
lbry.daemonConnectionString,
method,
params,
callback,
errorCallback,
connectFailedCallback
);
};
//core //core
lbry._connectPromise = null; lbry._connectPromise = null;
lbry.connect = function() { lbry.connect = function() {
if (lbry._connectPromise === null) { if (lbry._connectPromise === null) {
lbry._connectPromise = new Promise((resolve, reject) => { lbry._connectPromise = new Promise((resolve, reject) => {
let tryNum = 0;
let tryNum = 0
function checkDaemonStartedFailed() { function checkDaemonStartedFailed() {
if (tryNum <= 100) { // Move # of tries into constant or config option if (tryNum <= 100) {
// Move # of tries into constant or config option
setTimeout(() => { setTimeout(() => {
tryNum++ tryNum++;
checkDaemonStarted(); checkDaemonStarted();
}, tryNum < 50 ? 400 : 1000); }, tryNum < 50 ? 400 : 1000);
} } else {
else { reject(new Error('Unable to connect to LBRY'));
reject(new Error("Unable to connect to LBRY"));
} }
} }
// Check every half second to see if the daemon is accepting connections // Check every half second to see if the daemon is accepting connections
function checkDaemonStarted() { function checkDaemonStarted() {
lbry.call('status', {}, resolve, checkDaemonStartedFailed, checkDaemonStartedFailed) lbry.call(
'status',
{},
resolve,
checkDaemonStartedFailed,
checkDaemonStartedFailed
);
} }
checkDaemonStarted(); checkDaemonStarted();
@ -122,15 +162,20 @@ lbry.connect = function() {
} }
return lbry._connectPromise; return lbry._connectPromise;
} };
lbry.checkAddressIsMine = function(address, callback) { lbry.checkAddressIsMine = function(address, callback) {
lbry.call('wallet_is_address_mine', { address: address }, callback); lbry.call('wallet_is_address_mine', { address: address }, callback);
} };
lbry.sendToAddress = function(amount, address, callback, errorCallback) { lbry.sendToAddress = function(amount, address, callback, errorCallback) {
lbry.call("send_amount_to_address", { "amount" : amount, "address": address }, callback, errorCallback); lbry.call(
} 'send_amount_to_address',
{ amount: amount, address: address },
callback,
errorCallback
);
};
/** /**
* Takes a LBRY URI; will first try and calculate a total cost using * Takes a LBRY URI; will first try and calculate a total cost using
@ -142,12 +187,12 @@ lbry.sendToAddress = function(amount, address, callback, errorCallback) {
* - includes_data: Boolean; indicates whether or not the data fee info * - includes_data: Boolean; indicates whether or not the data fee info
* from Lighthouse is included. * from Lighthouse is included.
*/ */
lbry.costPromiseCache = {} lbry.costPromiseCache = {};
lbry.getCostInfo = function(uri) { lbry.getCostInfo = function(uri) {
if (lbry.costPromiseCache[uri] === undefined) { if (lbry.costPromiseCache[uri] === undefined) {
lbry.costPromiseCache[uri] = new Promise((resolve, reject) => { lbry.costPromiseCache[uri] = new Promise((resolve, reject) => {
const COST_INFO_CACHE_KEY = 'cost_info_cache'; const COST_INFO_CACHE_KEY = 'cost_info_cache';
let costInfoCache = getSession(COST_INFO_CACHE_KEY, {}) let costInfoCache = getSession(COST_INFO_CACHE_KEY, {});
function cacheAndResolve(cost, includesData) { function cacheAndResolve(cost, includesData) {
costInfoCache[uri] = { cost, includesData }; costInfoCache[uri] = { cost, includesData };
@ -160,11 +205,13 @@ lbry.getCostInfo = function(uri) {
} }
if (costInfoCache[uri] && costInfoCache[uri].cost) { if (costInfoCache[uri] && costInfoCache[uri].cost) {
return resolve(costInfoCache[uri]) return resolve(costInfoCache[uri]);
} }
function getCost(uri, size) { function getCost(uri, size) {
lbry.stream_cost_estimate({uri, ... size !== null ? {size} : {}}).then((cost) => { lbry
.stream_cost_estimate({ uri, ...(size !== null ? { size } : {}) })
.then(cost => {
cacheAndResolve(cost, size !== null); cacheAndResolve(cost, size !== null);
}, reject); }, reject);
} }
@ -172,18 +219,17 @@ lbry.getCostInfo = function(uri) {
const uriObj = lbryuri.parse(uri); const uriObj = lbryuri.parse(uri);
const name = uriObj.path || uriObj.name; const name = uriObj.path || uriObj.name;
lighthouse.get_size_for_name(name).then((size) => { lighthouse.get_size_for_name(name).then(size => {
if (size) { if (size) {
getCost(name, size); getCost(name, size);
} } else {
else {
getCost(name, null); getCost(name, null);
} }
}) });
}); });
} }
return lbry.costPromiseCache[uri]; return lbry.costPromiseCache[uri];
} };
/** /**
* Publishes a file. The optional fileListedCallback is called when the file becomes available in * Publishes a file. The optional fileListedCallback is called when the file becomes available in
@ -192,22 +238,32 @@ lbry.getCostInfo = function(uri) {
* This currently includes a work-around to cache the file in local storage so that the pending * This currently includes a work-around to cache the file in local storage so that the pending
* publish can appear in the UI immediately. * publish can appear in the UI immediately.
*/ */
lbry.publish = function(params, fileListedCallback, publishedCallback, errorCallback) { lbry.publish = function(
lbry.call('publish', params, (result) => { params,
fileListedCallback,
publishedCallback,
errorCallback
) {
lbry.call(
'publish',
params,
result => {
if (returnedPending) { if (returnedPending) {
return; return;
} }
clearTimeout(returnPendingTimeout); clearTimeout(returnPendingTimeout);
publishedCallback(result); publishedCallback(result);
}, (err) => { },
err => {
if (returnedPending) { if (returnedPending) {
return; return;
} }
clearTimeout(returnPendingTimeout); clearTimeout(returnPendingTimeout);
errorCallback(err); errorCallback(err);
}); }
);
let returnedPending = false; let returnedPending = false;
// Give a short grace period in case publish() returns right away or (more likely) gives an error // Give a short grace period in case publish() returns right away or (more likely) gives an error
@ -215,75 +271,84 @@ lbry.publish = function(params, fileListedCallback, publishedCallback, errorCall
returnedPending = true; returnedPending = true;
if (publishedCallback) { if (publishedCallback) {
savePendingPublish({name: params.name, channel_name: params.channel_name}); savePendingPublish({
name: params.name,
channel_name: params.channel_name
});
publishedCallback(true); publishedCallback(true);
} }
if (fileListedCallback) { if (fileListedCallback) {
const { name, channel_name } = params; const { name, channel_name } = params;
savePendingPublish({name: params.name, channel_name: params.channel_name}); savePendingPublish({
name: params.name,
channel_name: params.channel_name
});
fileListedCallback(true); fileListedCallback(true);
} }
}, 2000); }, 2000);
} };
lbry.getClientSettings = function() { lbry.getClientSettings = function() {
var outSettings = {}; var outSettings = {};
for (let setting of Object.keys(lbry.defaultClientSettings)) { for (let setting of Object.keys(lbry.defaultClientSettings)) {
var localStorageVal = localStorage.getItem('setting_' + setting); var localStorageVal = localStorage.getItem('setting_' + setting);
outSettings[setting] = (localStorageVal === null ? lbry.defaultClientSettings[setting] : JSON.parse(localStorageVal)); outSettings[setting] = localStorageVal === null
? lbry.defaultClientSettings[setting]
: JSON.parse(localStorageVal);
} }
return outSettings; return outSettings;
} };
lbry.getClientSetting = function(setting) { lbry.getClientSetting = function(setting) {
var localStorageVal = localStorage.getItem('setting_' + setting); var localStorageVal = localStorage.getItem('setting_' + setting);
if (setting == 'showDeveloperMenu') if (setting == 'showDeveloperMenu') {
{
return true; return true;
} }
return (localStorageVal === null ? lbry.defaultClientSettings[setting] : JSON.parse(localStorageVal)); return localStorageVal === null
} ? lbry.defaultClientSettings[setting]
: JSON.parse(localStorageVal);
};
lbry.setClientSettings = function(settings) { lbry.setClientSettings = function(settings) {
for (let setting of Object.keys(settings)) { for (let setting of Object.keys(settings)) {
lbry.setClientSetting(setting, settings[setting]); lbry.setClientSetting(setting, settings[setting]);
} }
} };
lbry.setClientSetting = function(setting, value) { lbry.setClientSetting = function(setting, value) {
return localStorage.setItem('setting_' + setting, JSON.stringify(value)); return localStorage.setItem('setting_' + setting, JSON.stringify(value));
} };
lbry.getSessionInfo = function(callback) { lbry.getSessionInfo = function(callback) {
lbry.call('status', { session_status: true }, callback); lbry.call('status', { session_status: true }, callback);
} };
lbry.reportBug = function(message, callback) { lbry.reportBug = function(message, callback) {
lbry.call('report_bug', { lbry.call(
'report_bug',
{
message: message message: message
}, callback); },
} callback
);
};
//utilities //utilities
lbry.formatCredits = function(amount, precision) lbry.formatCredits = function(amount, precision) {
{
return amount.toFixed(precision || 1).replace(/\.?0+$/, ''); return amount.toFixed(precision || 1).replace(/\.?0+$/, '');
} };
lbry.formatName = function(name) { lbry.formatName = function(name) {
// Converts LBRY name to standard format (all lower case, no special characters, spaces replaced by dashes) // Converts LBRY name to standard format (all lower case, no special characters, spaces replaced by dashes)
name = name.replace('/\s+/g', '-'); name = name.replace('/s+/g', '-');
name = name.toLowerCase().replace(/[^a-z0-9\-]/g, ''); name = name.toLowerCase().replace(/[^a-z0-9\-]/g, '');
return name; return name;
} };
lbry.imagePath = function(file) {
lbry.imagePath = function(file)
{
return 'img/' + file; return 'img/' + file;
} };
lbry.getMediaType = function(contentType, fileName) { lbry.getMediaType = function(contentType, fileName) {
if (contentType) { if (contentType) {
@ -307,7 +372,7 @@ lbry.getMediaType = function(contentType, fileName) {
} else { } else {
return 'unknown'; return 'unknown';
} }
} };
lbry.stop = function(callback) { lbry.stop = function(callback) {
lbry.call('stop', {}, callback); lbry.call('stop', {}, callback);
@ -325,30 +390,38 @@ lbry._updateBalanceSubscribers = function() {
} }
}); });
if (!lbry._balanceUpdateInterval && Object.keys(lbry._balanceSubscribeCallbacks).length) { if (
!lbry._balanceUpdateInterval &&
Object.keys(lbry._balanceSubscribeCallbacks).length
) {
lbry._balanceUpdateInterval = setInterval(() => { lbry._balanceUpdateInterval = setInterval(() => {
lbry._updateBalanceSubscribers(); lbry._updateBalanceSubscribers();
}, lbry._balanceSubscribeInterval); }, lbry._balanceSubscribeInterval);
} }
} };
lbry.balanceSubscribe = function(callback) { lbry.balanceSubscribe = function(callback) {
const subscribeId = ++lbry._subscribeIdCount; const subscribeId = ++lbry._subscribeIdCount;
lbry._balanceSubscribeCallbacks[subscribeId] = callback; lbry._balanceSubscribeCallbacks[subscribeId] = callback;
lbry._updateBalanceSubscribers(); lbry._updateBalanceSubscribers();
return subscribeId; return subscribeId;
} };
lbry.balanceUnsubscribe = function(subscribeId) { lbry.balanceUnsubscribe = function(subscribeId) {
delete lbry._balanceSubscribeCallbacks[subscribeId]; delete lbry._balanceSubscribeCallbacks[subscribeId];
if (lbry._balanceUpdateInterval && !Object.keys(lbry._balanceSubscribeCallbacks).length) { if (
clearInterval(lbry._balanceUpdateInterval) lbry._balanceUpdateInterval &&
} !Object.keys(lbry._balanceSubscribeCallbacks).length
) {
clearInterval(lbry._balanceUpdateInterval);
} }
};
lbry.showMenuIfNeeded = function() { lbry.showMenuIfNeeded = function() {
const showingMenu = sessionStorage.getItem('menuShown') || null; const showingMenu = sessionStorage.getItem('menuShown') || null;
const chosenMenu = lbry.getClientSetting('showDeveloperMenu') ? 'developer' : 'normal'; const chosenMenu = lbry.getClientSetting('showDeveloperMenu')
? 'developer'
: 'normal';
if (chosenMenu != showingMenu) { if (chosenMenu != showingMenu) {
menu.showMenubar(chosenMenu == 'developer'); menu.showMenubar(chosenMenu == 'developer');
} }
@ -357,11 +430,12 @@ lbry.showMenuIfNeeded = function() {
lbry.getAppVersionInfo = function() { lbry.getAppVersionInfo = function() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
ipcRenderer.once('version-info-received', (event, versionInfo) => { resolve(versionInfo) }); ipcRenderer.once('version-info-received', (event, versionInfo) => {
resolve(versionInfo);
});
ipcRenderer.send('version-info-requested'); ipcRenderer.send('version-info-requested');
}); });
} };
/** /**
* Wrappers for API methods to simulate missing or future behavior. Unlike the old-style stubs, * Wrappers for API methods to simulate missing or future behavior. Unlike the old-style stubs,
@ -389,56 +463,81 @@ lbry.file_list = function(params={}) {
} }
} }
lbry.call('file_list', params, (fileInfos) => { lbry.call(
'file_list',
params,
fileInfos => {
removePendingPublishIfNeeded({ name, channel_name, outpoint }); removePendingPublishIfNeeded({ name, channel_name, outpoint });
const dummyFileInfos = lbry.getPendingPublishes().map(pendingPublishToDummyFileInfo); const dummyFileInfos = lbry
.getPendingPublishes()
.map(pendingPublishToDummyFileInfo);
resolve([...fileInfos, ...dummyFileInfos]); resolve([...fileInfos, ...dummyFileInfos]);
}, reject, reject); },
reject,
reject
);
}); });
} };
lbry.claim_list_mine = function(params = {}) { lbry.claim_list_mine = function(params = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
lbry.call('claim_list_mine', params, (claims) => { lbry.call(
'claim_list_mine',
params,
claims => {
for (let { name, channel_name, txid, nout } of claims) { for (let { name, channel_name, txid, nout } of claims) {
removePendingPublishIfNeeded({name, channel_name, outpoint: txid + ':' + nout}); removePendingPublishIfNeeded({
} name,
channel_name,
const dummyClaims = lbry.getPendingPublishes().map(pendingPublishToDummyClaim); outpoint: txid + ':' + nout
resolve([...claims, ...dummyClaims]);
}, reject, reject)
}); });
} }
const dummyClaims = lbry
.getPendingPublishes()
.map(pendingPublishToDummyClaim);
resolve([...claims, ...dummyClaims]);
},
reject,
reject
);
});
};
const claimCacheKey = 'resolve_claim_cache'; const claimCacheKey = 'resolve_claim_cache';
lbry._claimCache = getSession(claimCacheKey, {}); lbry._claimCache = getSession(claimCacheKey, {});
lbry._resolveXhrs = {} lbry._resolveXhrs = {};
lbry.resolve = function(params = {}) { lbry.resolve = function(params = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!params.uri) { if (!params.uri) {
throw __("Resolve has hacked cache on top of it that requires a URI") throw __('Resolve has hacked cache on top of it that requires a URI');
} }
if (params.uri && lbry._claimCache[params.uri] !== undefined) { if (params.uri && lbry._claimCache[params.uri] !== undefined) {
resolve(lbry._claimCache[params.uri]); resolve(lbry._claimCache[params.uri]);
} else { } else {
lbry._resolveXhrs[params.uri] = lbry.call('resolve', params, function(data) { lbry._resolveXhrs[params.uri] = lbry.call(
'resolve',
params,
function(data) {
if (data !== undefined) { if (data !== undefined) {
lbry._claimCache[params.uri] = data; lbry._claimCache[params.uri] = data;
} }
setSession(claimCacheKey, lbry._claimCache) setSession(claimCacheKey, lbry._claimCache);
resolve(data) resolve(data);
}, reject) },
reject
);
} }
}); });
} };
lbry.cancelResolve = function(params = {}) { lbry.cancelResolve = function(params = {}) {
const xhr = lbry._resolveXhrs[params.uri] const xhr = lbry._resolveXhrs[params.uri];
if (xhr && xhr.readyState > 0 && xhr.readyState < 4) { if (xhr && xhr.readyState > 0 && xhr.readyState < 4) {
xhr.abort() xhr.abort();
}
} }
};
lbry = new Proxy(lbry, { lbry = new Proxy(lbry, {
get: function(target, name) { get: function(target, name) {
@ -448,7 +547,14 @@ lbry = new Proxy(lbry, {
return function(params = {}) { return function(params = {}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
jsonrpc.call(lbry.daemonConnectionString, name, params, resolve, reject, reject); jsonrpc.call(
lbry.daemonConnectionString,
name,
params,
resolve,
reject,
reject
);
}); });
}; };
} }

View file

@ -10,42 +10,59 @@ const lbryio = {
enabled: true enabled: true
}; };
const CONNECTION_STRING = process.env.LBRY_APP_API_URL
const CONNECTION_STRING = process.env.LBRY_APP_API_URL ? ? process.env.LBRY_APP_API_URL.replace(/\/*$/, '/') // exactly one slash at the end
process.env.LBRY_APP_API_URL.replace(/\/*$/,'/') : // exactly one slash at the end : 'https://api.lbry.io/';
'https://api.lbry.io/'
const EXCHANGE_RATE_TIMEOUT = 20 * 60 * 1000; const EXCHANGE_RATE_TIMEOUT = 20 * 60 * 1000;
lbryio._exchangePromise = null; lbryio._exchangePromise = null;
lbryio._exchangeLastFetched = null; lbryio._exchangeLastFetched = null;
lbryio.getExchangeRates = function() { lbryio.getExchangeRates = function() {
if (!lbryio._exchangeLastFetched || Date.now() - lbryio._exchangeLastFetched > EXCHANGE_RATE_TIMEOUT) { if (
!lbryio._exchangeLastFetched ||
Date.now() - lbryio._exchangeLastFetched > EXCHANGE_RATE_TIMEOUT
) {
lbryio._exchangePromise = new Promise((resolve, reject) => { lbryio._exchangePromise = new Promise((resolve, reject) => {
lbryio.call('lbc', 'exchange_rate', {}, 'get', true).then(({lbc_usd, lbc_btc, btc_usd}) => { lbryio
.call('lbc', 'exchange_rate', {}, 'get', true)
.then(({ lbc_usd, lbc_btc, btc_usd }) => {
const rates = { lbc_usd, lbc_btc, btc_usd }; const rates = { lbc_usd, lbc_btc, btc_usd };
resolve(rates); resolve(rates);
}).catch(reject); })
.catch(reject);
}); });
lbryio._exchangeLastFetched = Date.now(); lbryio._exchangeLastFetched = Date.now();
} }
return lbryio._exchangePromise; return lbryio._exchangePromise;
} };
lbryio.call = function(resource, action, params={}, method='get', evenIfDisabled=false) { // evenIfDisabled is just for development, when we may have some calls working and some not lbryio.call = function(
resource,
action,
params = {},
method = 'get',
evenIfDisabled = false
) {
// evenIfDisabled is just for development, when we may have some calls working and some not
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!lbryio.enabled && !evenIfDisabled && (resource != 'discover' || action != 'list')) { if (
console.log(__("Internal API disabled")); !lbryio.enabled &&
reject(new Error(__("LBRY internal API is disabled"))) !evenIfDisabled &&
return (resource != 'discover' || action != 'list')
) {
console.log(__('Internal API disabled'));
reject(new Error(__('LBRY internal API is disabled')));
return;
} }
const xhr = new XMLHttpRequest; const xhr = new XMLHttpRequest();
xhr.addEventListener('error', function(event) { xhr.addEventListener('error', function(event) {
reject(new Error(__("Something went wrong making an internal API call."))); reject(
new Error(__('Something went wrong making an internal API call.'))
);
}); });
xhr.addEventListener('timeout', function() { xhr.addEventListener('timeout', function() {
reject(new Error(__('XMLHttpRequest connection timed out'))); reject(new Error(__('XMLHttpRequest connection timed out')));
}); });
@ -59,15 +76,17 @@ lbryio.call = function(resource, action, params={}, method='get', evenIfDisabled
error.xhr = xhr; error.xhr = xhr;
reject(error); reject(error);
} else { } else {
document.dispatchEvent(new CustomEvent('unhandledError', { document.dispatchEvent(
new CustomEvent('unhandledError', {
detail: { detail: {
connectionString: connectionString, connectionString: connectionString,
method: action, method: action,
params: params, params: params,
message: response.error.message, message: response.error.message,
... response.error.data ? {data: response.error.data} : {}, ...(response.error.data ? { data: response.error.data } : {})
} }
})); })
);
} }
} else { } else {
resolve(response.data); resolve(response.data);
@ -82,14 +101,23 @@ lbryio.call = function(resource, action, params={}, method='get', evenIfDisabled
const fullParams = { app_id: lbryio.getAccessToken(), ...params }; const fullParams = { app_id: lbryio.getAccessToken(), ...params };
if (method == 'get') { if (method == 'get') {
xhr.open('get', CONNECTION_STRING + resource + '/' + action + '?' + querystring.stringify(fullParams), true); xhr.open(
'get',
CONNECTION_STRING +
resource +
'/' +
action +
'?' +
querystring.stringify(fullParams),
true
);
xhr.send(); xhr.send();
} else if (method == 'post') { } else if (method == 'post') {
xhr.open('post', CONNECTION_STRING + resource + '/' + action, true); xhr.open('post', CONNECTION_STRING + resource + '/' + action, true);
xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
xhr.send(querystring.stringify(fullParams)); xhr.send(querystring.stringify(fullParams));
} else { } else {
reject(new Error(__("Invalid method"))); reject(new Error(__('Invalid method')));
} }
}); });
}; };
@ -97,11 +125,11 @@ lbryio.call = function(resource, action, params={}, method='get', evenIfDisabled
lbryio.getAccessToken = () => { lbryio.getAccessToken = () => {
const token = getSession('accessToken'); const token = getSession('accessToken');
return token ? token.toString().trim() : token; return token ? token.toString().trim() : token;
} };
lbryio.setAccessToken = (token) => { lbryio.setAccessToken = token => {
setSession('accessToken', token ? token.toString().trim() : token) setSession('accessToken', token ? token.toString().trim() : token);
} };
lbryio.authenticate = function() { lbryio.authenticate = function() {
if (!lbryio.enabled) { if (!lbryio.enabled) {
@ -109,55 +137,70 @@ lbryio.authenticate = function() {
resolve({ resolve({
id: 1, id: 1,
has_verified_email: true has_verified_email: true
}) });
}) });
} }
if (lbryio._authenticationPromise === null) { if (lbryio._authenticationPromise === null) {
lbryio._authenticationPromise = new Promise((resolve, reject) => { lbryio._authenticationPromise = new Promise((resolve, reject) => {
lbry.status().then((response) => { lbry
.status()
.then(response => {
let installation_id = response.installation_id; let installation_id = response.installation_id;
function setCurrentUser() { function setCurrentUser() {
lbryio.call('user', 'me').then((data) => { lbryio
lbryio.user = data .call('user', 'me')
resolve(data) .then(data => {
}).catch(function(err) { lbryio.user = data;
resolve(data);
})
.catch(function(err) {
lbryio.setAccessToken(null); lbryio.setAccessToken(null);
if (!getSession('reloadedOnFailedAuth')) { if (!getSession('reloadedOnFailedAuth')) {
setSession('reloadedOnFailedAuth', true) setSession('reloadedOnFailedAuth', true);
window.location.reload(); window.location.reload();
} else { } else {
reject(err); reject(err);
} }
}) });
} }
if (!lbryio.getAccessToken()) { if (!lbryio.getAccessToken()) {
lbryio.call('user', 'new', { lbryio
.call(
'user',
'new',
{
language: 'en', language: 'en',
app_id: installation_id, app_id: installation_id
}, 'post').then(function(responseData) { },
'post'
)
.then(function(responseData) {
if (!responseData.id) { if (!responseData.id) {
reject(new Error(__("Received invalid authentication response."))); reject(
new Error(__('Received invalid authentication response.'))
);
} }
lbryio.setAccessToken(installation_id) lbryio.setAccessToken(installation_id);
setCurrentUser() setCurrentUser();
}).catch(function(error) { })
.catch(function(error) {
/* /*
until we have better error code format, assume all errors are duplicate application id until we have better error code format, assume all errors are duplicate application id
if we're wrong, this will be caught by later attempts to make a valid call if we're wrong, this will be caught by later attempts to make a valid call
*/ */
lbryio.setAccessToken(installation_id) lbryio.setAccessToken(installation_id);
setCurrentUser() setCurrentUser();
}) });
} else { } else {
setCurrentUser() setCurrentUser();
} }
}).catch(reject); })
.catch(reject);
}); });
} }
return lbryio._authenticationPromise; return lbryio._authenticationPromise;
} };
export default lbryio; export default lbryio;

View file

@ -28,12 +28,15 @@ const lbryuri = {};
lbryuri.parse = function(uri, requireProto = false) { lbryuri.parse = function(uri, requireProto = false) {
// Break into components. Empty sub-matches are converted to null // Break into components. Empty sub-matches are converted to null
const componentsRegex = new RegExp( const componentsRegex = new RegExp(
'^((?:lbry:\/\/)?)' + // protocol '^((?:lbry://)?)' + // protocol
'([^:$#/]*)' + // name (stops at the first separator or end) '([^:$#/]*)' + // name (stops at the first separator or end)
'([:$#]?)([^/]*)' + // modifier separator, modifier (stops at the first path separator or end) '([:$#]?)([^/]*)' + // modifier separator, modifier (stops at the first path separator or end)
'(/?)(.*)' // path separator, path '(/?)(.*)' // path separator, path
); );
const [proto, name, modSep, modVal, pathSep, path] = componentsRegex.exec(uri).slice(1).map(match => match || null); const [proto, name, modSep, modVal, pathSep, path] = componentsRegex
.exec(uri)
.slice(1)
.map(match => match || null);
let contentName; let contentName;
@ -56,7 +59,12 @@ lbryuri.parse = function(uri, requireProto=false) {
} }
if (channelName.length < CHANNEL_NAME_MIN_LEN) { if (channelName.length < CHANNEL_NAME_MIN_LEN) {
throw new Error(__(`Channel names must be at least %s characters.`, CHANNEL_NAME_MIN_LEN)); throw new Error(
__(
`Channel names must be at least %s characters.`,
CHANNEL_NAME_MIN_LEN
)
);
} }
contentName = path; contentName = path;
@ -64,7 +72,13 @@ lbryuri.parse = function(uri, requireProto=false) {
const nameBadChars = (channelName || name).match(/[^A-Za-z0-9-]/g); const nameBadChars = (channelName || name).match(/[^A-Za-z0-9-]/g);
if (nameBadChars) { if (nameBadChars) {
throw new Error(__(`Invalid character %s in name: %s.`, nameBadChars.length == 1 ? '' : 's', nameBadChars.join(', ') )); throw new Error(
__(
`Invalid character %s in name: %s.`,
nameBadChars.length == 1 ? '' : 's',
nameBadChars.join(', ')
)
);
} }
// Validate and process modifier (claim ID, bid position or claim sequence) // Validate and process modifier (claim ID, bid position or claim sequence)
@ -83,7 +97,10 @@ lbryuri.parse = function(uri, requireProto=false) {
} }
} }
if (claimId && (claimId.length > CLAIM_ID_MAX_LEN || !claimId.match(/^[0-9a-f]+$/))) { if (
claimId &&
(claimId.length > CLAIM_ID_MAX_LEN || !claimId.match(/^[0-9a-f]+$/))
) {
throw new Error(__(`Invalid claim ID %s.`, claimId)); throw new Error(__(`Invalid claim ID %s.`, claimId));
} }
@ -103,7 +120,13 @@ lbryuri.parse = function(uri, requireProto=false) {
const pathBadChars = path.match(/[^A-Za-z0-9-]/g); const pathBadChars = path.match(/[^A-Za-z0-9-]/g);
if (pathBadChars) { if (pathBadChars) {
throw new Error(__(`Invalid character %s in path: %s`,count == 1 ? '' : 's',nameBadChars.join(', '))); throw new Error(
__(
`Invalid character %s in path: %s`,
count == 1 ? '' : 's',
nameBadChars.join(', ')
)
);
} }
contentName = path; contentName = path;
@ -112,15 +135,17 @@ lbryuri.parse = function(uri, requireProto=false) {
} }
return { return {
name, path, isChannel, name,
... contentName ? {contentName} : {}, path,
... channelName ? {channelName} : {}, isChannel,
... claimSequence ? {claimSequence: parseInt(claimSequence)} : {}, ...(contentName ? { contentName } : {}),
... bidPosition ? {bidPosition: parseInt(bidPosition)} : {}, ...(channelName ? { channelName } : {}),
... claimId ? {claimId} : {}, ...(claimSequence ? { claimSequence: parseInt(claimSequence) } : {}),
... path ? {path} : {}, ...(bidPosition ? { bidPosition: parseInt(bidPosition) } : {}),
...(claimId ? { claimId } : {}),
...(path ? { path } : {})
};
}; };
}
/** /**
* Takes an object in the same format returned by lbryuri.parse() and builds a URI. * Takes an object in the same format returned by lbryuri.parse() and builds a URI.
@ -128,14 +153,28 @@ lbryuri.parse = function(uri, requireProto=false) {
* The channelName key will accept names with or without the @ prefix. * The channelName key will accept names with or without the @ prefix.
*/ */
lbryuri.build = function(uriObj, includeProto = true, allowExtraProps = false) { lbryuri.build = function(uriObj, includeProto = true, allowExtraProps = false) {
let {name, claimId, claimSequence, bidPosition, path, contentName, channelName} = uriObj; let {
name,
claimId,
claimSequence,
bidPosition,
path,
contentName,
channelName
} = uriObj;
if (channelName) { if (channelName) {
const channelNameFormatted = channelName.startsWith('@') ? channelName : '@' + channelName; const channelNameFormatted = channelName.startsWith('@')
? channelName
: '@' + channelName;
if (!name) { if (!name) {
name = channelNameFormatted; name = channelNameFormatted;
} else if (name !== channelNameFormatted) { } else if (name !== channelNameFormatted) {
throw new Error(__('Received a channel content URI, but name and channelName do not match. \"name\" represents the value in the name position of the URI (lbry://name...), which for channel content will be the channel name. In most cases, to construct a channel URI you should just pass channelName and contentName.')); throw new Error(
__(
'Received a channel content URI, but name and channelName do not match. "name" represents the value in the name position of the URI (lbry://name...), which for channel content will be the channel name. In most cases, to construct a channel URI you should just pass channelName and contentName.'
)
);
} }
} }
@ -146,49 +185,65 @@ lbryuri.build = function(uriObj, includeProto=true, allowExtraProps=false) {
path = contentName; path = contentName;
} }
if (path && path !== contentName) { if (path && path !== contentName) {
throw new Error(__('Path and contentName do not match. Only one is required; most likely you wanted contentName.')); throw new Error(
__(
'Path and contentName do not match. Only one is required; most likely you wanted contentName.'
)
);
} }
} }
return (includeProto ? 'lbry://' : '') + name + return (
(includeProto ? 'lbry://' : '') +
name +
(claimId ? `#${claimId}` : '') + (claimId ? `#${claimId}` : '') +
(claimSequence ? `:${claimSequence}` : '') + (claimSequence ? `:${claimSequence}` : '') +
(bidPosition ? `\$${bidPosition}` : '') + (bidPosition ? `\$${bidPosition}` : '') +
(path ? `/${path}` : ''); (path ? `/${path}` : '')
);
} };
/* Takes a parseable LBRY URI and converts it to standard, canonical format (currently this just /* Takes a parseable LBRY URI and converts it to standard, canonical format (currently this just
* consists of adding the lbry:// prefix if needed) */ * consists of adding the lbry:// prefix if needed) */
lbryuri.normalize = function(uri) { lbryuri.normalize = function(uri) {
const {name, path, bidPosition, claimSequence, claimId} = lbryuri.parse(uri); const { name, path, bidPosition, claimSequence, claimId } = lbryuri.parse(
uri
);
return lbryuri.build({ name, path, claimSequence, bidPosition, claimId }); return lbryuri.build({ name, path, claimSequence, bidPosition, claimId });
} };
lbryuri.isValid = function(uri) { lbryuri.isValid = function(uri) {
let parts let parts;
try { try {
parts = lbryuri.parse(lbryuri.normalize(uri)) parts = lbryuri.parse(lbryuri.normalize(uri));
} catch (error) { } catch (error) {
return false; return false;
} }
return parts && parts.name; return parts && parts.name;
} };
lbryuri.isValidName = function(name, checkCase = true) { lbryuri.isValidName = function(name, checkCase = true) {
const regexp = new RegExp('^[a-z0-9-]+$', checkCase ? '' : 'i'); const regexp = new RegExp('^[a-z0-9-]+$', checkCase ? '' : 'i');
return regexp.test(name); return regexp.test(name);
} };
lbryuri.isClaimable = function(uri) { lbryuri.isClaimable = function(uri) {
let parts let parts;
try { try {
parts = lbryuri.parse(lbryuri.normalize(uri)) parts = lbryuri.parse(lbryuri.normalize(uri));
} catch (error) { } catch (error) {
return false; return false;
} }
return parts && parts.name && !parts.claimId && !parts.bidPosition && !parts.claimSequence && !parts.isChannel && !parts.path; return (
} parts &&
parts.name &&
!parts.claimId &&
!parts.bidPosition &&
!parts.claimSequence &&
!parts.isChannel &&
!parts.path
);
};
window.lbryuri = lbryuri; window.lbryuri = lbryuri;
export default lbryuri; export default lbryuri;

View file

@ -6,7 +6,7 @@ const maxQueryTries = 2;
const defaultServers = [ const defaultServers = [
'http://lighthouse7.lbry.io:50005', 'http://lighthouse7.lbry.io:50005',
'http://lighthouse8.lbry.io:50005', 'http://lighthouse8.lbry.io:50005',
'http://lighthouse9.lbry.io:50005', 'http://lighthouse9.lbry.io:50005'
]; ];
const path = '/'; const path = '/';
@ -21,7 +21,14 @@ function getServers() {
function call(method, params, callback, errorCallback) { function call(method, params, callback, errorCallback) {
if (connectTryNum >= maxQueryTries) { if (connectTryNum >= maxQueryTries) {
errorCallback(new Error(__(`Could not connect to Lighthouse server. Last server attempted: %s`, server))); errorCallback(
new Error(
__(
`Could not connect to Lighthouse server. Last server attempted: %s`,
server
)
)
);
return; return;
} }
@ -32,30 +39,46 @@ function call(method, params, callback, errorCallback) {
*/ */
if (!server || !getServers().includes(server) || connectTryNum > 0) { if (!server || !getServers().includes(server) || connectTryNum > 0) {
// If there's a current server, filter it out so we get a new one // If there's a current server, filter it out so we get a new one
const newServerChoices = server ? getServers().filter((s) => s != server) : getServers(); const newServerChoices = server
server = newServerChoices[Math.round(Math.random() * (newServerChoices.length - 1))]; ? getServers().filter(s => s != server)
: getServers();
server =
newServerChoices[
Math.round(Math.random() * (newServerChoices.length - 1))
];
} }
jsonrpc.call(server + path, method, params, (response) => { jsonrpc.call(
server + path,
method,
params,
response => {
connectTryNum = 0; connectTryNum = 0;
callback(response); callback(response);
}, (error) => { },
error => {
connectTryNum = 0; connectTryNum = 0;
errorCallback(error); errorCallback(error);
}, () => { },
() => {
connectTryNum++; connectTryNum++;
call(method, params, callback, errorCallback); call(method, params, callback, errorCallback);
}, queryTimeout); },
queryTimeout
);
} }
const lighthouse = new Proxy({}, { const lighthouse = new Proxy(
{},
{
get: function(target, name) { get: function(target, name) {
return function(...params) { return function(...params) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
call(name, params, resolve, reject); call(name, params, resolve, reject);
}); });
}; };
}, }
}); }
);
export default lighthouse; export default lighthouse;

View file

@ -9,57 +9,50 @@ import { Provider } from 'react-redux';
import store from 'store.js'; import store from 'store.js';
import SplashScreen from 'component/splash.js'; import SplashScreen from 'component/splash.js';
import { AuthOverlay } from 'component/auth.js'; import { AuthOverlay } from 'component/auth.js';
import { import { doChangePath, doNavigate, doDaemonReady } from 'actions/app';
doChangePath, import { doFetchDaemonSettings } from 'actions/settings';
doNavigate, import { doFileList } from 'actions/file_info';
doDaemonReady import { toQueryString } from 'util/query_params';
} from 'actions/app'
import {
doFetchDaemonSettings
} from 'actions/settings'
import {
doFileList
} from 'actions/file_info'
import {
toQueryString,
} from 'util/query_params'
const { remote, ipcRenderer, shell } = require('electron'); const { remote, ipcRenderer, shell } = require('electron');
const contextMenu = remote.require('./menu/context-menu'); const contextMenu = remote.require('./menu/context-menu');
const app = require('./app') const app = require('./app');
lbry.showMenuIfNeeded(); lbry.showMenuIfNeeded();
window.addEventListener('contextmenu', (event) => { window.addEventListener('contextmenu', event => {
contextMenu.showContextMenu(remote.getCurrentWindow(), event.x, event.y, contextMenu.showContextMenu(
lbry.getClientSetting('showDeveloperMenu')); remote.getCurrentWindow(),
event.x,
event.y,
lbry.getClientSetting('showDeveloperMenu')
);
event.preventDefault(); event.preventDefault();
}); });
window.addEventListener('popstate', (event, param) => { window.addEventListener('popstate', (event, param) => {
const params = event.state const params = event.state;
const pathParts = document.location.pathname.split('/') const pathParts = document.location.pathname.split('/');
const route = '/' + pathParts[pathParts.length - 1] const route = '/' + pathParts[pathParts.length - 1];
const queryString = toQueryString(params) const queryString = toQueryString(params);
let action let action;
if (route.match(/html$/)) { if (route.match(/html$/)) {
action = doChangePath('/discover') action = doChangePath('/discover');
} else { } else {
action = doChangePath(`${route}?${queryString}`) action = doChangePath(`${route}?${queryString}`);
} }
app.store.dispatch(action) app.store.dispatch(action);
}) });
ipcRenderer.on('open-uri-requested', (event, uri) => { ipcRenderer.on('open-uri-requested', (event, uri) => {
if (uri && uri.startsWith('lbry://')) { if (uri && uri.startsWith('lbry://')) {
app.store.dispatch(doNavigate('/show', { uri })) app.store.dispatch(doNavigate('/show', { uri }));
} }
}); });
document.addEventListener('click', (event) => { document.addEventListener('click', event => {
var target = event.target; var target = event.target;
while (target && target !== document) { while (target && target !== document) {
if (target.matches('a[href^="http"]')) { if (target.matches('a[href^="http"]')) {
@ -74,17 +67,21 @@ document.addEventListener('click', (event) => {
const initialState = app.store.getState(); const initialState = app.store.getState();
var init = function() { var init = function() {
function onDaemonReady() { function onDaemonReady() {
window.sessionStorage.setItem('loaded', 'y'); //once we've made it here once per session, we don't need to show splash again window.sessionStorage.setItem('loaded', 'y'); //once we've made it here once per session, we don't need to show splash again
const actions = [] const actions = [];
app.store.dispatch(doDaemonReady()) app.store.dispatch(doDaemonReady());
app.store.dispatch(doChangePath('/discover')) app.store.dispatch(doChangePath('/discover'));
app.store.dispatch(doFetchDaemonSettings()) app.store.dispatch(doFetchDaemonSettings());
app.store.dispatch(doFileList()) app.store.dispatch(doFileList());
ReactDOM.render(<Provider store={store}><div>{ lbryio.enabled ? <AuthOverlay/> : '' }<App /><SnackBar /></div></Provider>, canvas) ReactDOM.render(
<Provider store={store}>
<div>{lbryio.enabled ? <AuthOverlay /> : ''}<App /><SnackBar /></div>
</Provider>,
canvas
);
} }
if (window.sessionStorage.getItem('loaded') == 'y') { if (window.sessionStorage.getItem('loaded') == 'y') {

View file

@ -1,30 +1,26 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { doFetchClaimsByChannel } from 'actions/content';
} from 'react-redux'
import {
doFetchClaimsByChannel
} from 'actions/content'
import { import {
makeSelectClaimForUri, makeSelectClaimForUri,
makeSelectClaimsInChannelForUri makeSelectClaimsInChannelForUri
} from 'selectors/claims' } from 'selectors/claims';
import ChannelPage from './view' import ChannelPage from './view';
const makeSelect = () => { const makeSelect = () => {
const selectClaim = makeSelectClaimForUri(), const selectClaim = makeSelectClaimForUri(),
selectClaimsInChannel = makeSelectClaimsInChannelForUri() selectClaimsInChannel = makeSelectClaimsInChannelForUri();
const select = (state, props) => ({ const select = (state, props) => ({
claim: selectClaim(state, props), claim: selectClaim(state, props),
claimsInChannel: selectClaimsInChannel(state, props) claimsInChannel: selectClaimsInChannel(state, props)
}) });
return select return select;
} };
const perform = (dispatch) => ({ const perform = dispatch => ({
fetchClaims: (uri) => dispatch(doFetchClaimsByChannel(uri)) fetchClaims: uri => dispatch(doFetchClaimsByChannel(uri))
}) });
export default connect(makeSelect, perform)(ChannelPage) export default connect(makeSelect, perform)(ChannelPage);

View file

@ -1,53 +1,56 @@
import React from 'react'; import React from 'react';
import lbryuri from 'lbryuri' import lbryuri from 'lbryuri';
import {BusyMessage} from 'component/common' import { BusyMessage } from 'component/common';
import FileTile from 'component/fileTile' import FileTile from 'component/fileTile';
class ChannelPage extends React.Component { class ChannelPage extends React.Component {
componentDidMount() { componentDidMount() {
this.fetchClaims(this.props) this.fetchClaims(this.props);
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
this.fetchClaims(nextProps) this.fetchClaims(nextProps);
} }
fetchClaims(props) { fetchClaims(props) {
if (props.claimsInChannel === undefined) { if (props.claimsInChannel === undefined) {
props.fetchClaims(props.uri) props.fetchClaims(props.uri);
} }
} }
render() { render() {
const { const { claimsInChannel, claim, uri } = this.props;
claimsInChannel,
claim,
uri
} = this.props
let contentList let contentList;
if (claimsInChannel === undefined) { if (claimsInChannel === undefined) {
contentList = <BusyMessage message={__("Fetching content")} /> contentList = <BusyMessage message={__('Fetching content')} />;
} else if (claimsInChannel) { } else if (claimsInChannel) {
contentList = claimsInChannel.length ? contentList = claimsInChannel.length
claimsInChannel.map((claim) => <FileTile key={claim.claim_id} uri={lbryuri.build({name: claim.name, claimId: claim.claim_id})} />) : ? claimsInChannel.map(claim =>
<span className="empty">{__("No content found.")}</span> <FileTile
key={claim.claim_id}
uri={lbryuri.build({ name: claim.name, claimId: claim.claim_id })}
/>
)
: <span className="empty">{__('No content found.')}</span>;
} }
return <main className="main--single-column"> return (
<main className="main--single-column">
<section className="card"> <section className="card">
<div className="card__inner"> <div className="card__inner">
<div className="card__title-identity"><h1>{uri}</h1></div> <div className="card__title-identity"><h1>{uri}</h1></div>
</div> </div>
<div className="card__content"> <div className="card__content">
<p> <p>
{__("This channel page is a stub.")} {__('This channel page is a stub.')}
</p> </p>
</div> </div>
</section> </section>
<h3 className="card-row__header">{__("Published Content")}</h3> <h3 className="card-row__header">{__('Published Content')}</h3>
{contentList} {contentList}
</main> </main>
);
} }
} }

View file

@ -12,9 +12,13 @@ class DeveloperPage extends React.Component {
this.state = { this.state = {
showDeveloperMenu: lbry.getClientSetting('showDeveloperMenu'), showDeveloperMenu: lbry.getClientSetting('showDeveloperMenu'),
useCustomLighthouseServers: lbry.getClientSetting('useCustomLighthouseServers'), useCustomLighthouseServers: lbry.getClientSetting(
customLighthouseServers: lbry.getClientSetting('customLighthouseServers').join('\n'), 'useCustomLighthouseServers'
upgradePath: '', ),
customLighthouseServers: lbry
.getClientSetting('customLighthouseServers')
.join('\n'),
upgradePath: ''
}; };
} }
@ -22,20 +26,20 @@ class DeveloperPage extends React.Component {
lbry.setClientSetting('showDeveloperMenu', event.target.checked); lbry.setClientSetting('showDeveloperMenu', event.target.checked);
lbry.showMenuIfNeeded(); lbry.showMenuIfNeeded();
this.setState({ this.setState({
showDeveloperMenu: event.target.checked, showDeveloperMenu: event.target.checked
}); });
} }
handleUseCustomLighthouseServersChange(event) { handleUseCustomLighthouseServersChange(event) {
lbry.setClientSetting('useCustomLighthouseServers', event.target.checked); lbry.setClientSetting('useCustomLighthouseServers', event.target.checked);
this.setState({ this.setState({
useCustomLighthouseServers: event.target.checked, useCustomLighthouseServers: event.target.checked
}); });
} }
handleUpgradeFileChange(event) { handleUpgradeFileChange(event) {
this.setState({ this.setState({
upgradePath: event.target.value, upgradePath: event.target.value
}); });
} }
@ -51,10 +55,13 @@ class DeveloperPage extends React.Component {
ipcRenderer.send('upgrade', this.state.upgradePath); ipcRenderer.send('upgrade', this.state.upgradePath);
upgradeSent = true; upgradeSent = true;
} }
} } catch (e) {}
catch (e) {}
if (!upgradeSent) { if (!upgradeSent) {
alert('Failed to start upgrade. Is "' + this.state.upgradePath + '" a valid path to the upgrade?'); alert(
'Failed to start upgrade. Is "' +
this.state.upgradePath +
'" a valid path to the upgrade?'
);
} }
} }
} }
@ -63,27 +70,70 @@ class DeveloperPage extends React.Component {
return ( return (
<main> <main>
<section className="card"> <section className="card">
<h3>{__("Developer Settings")}</h3> <h3>{__('Developer Settings')}</h3>
<div className="form-row"> <div className="form-row">
<label><FormField type="checkbox" onChange={(event) => { this.handleShowDeveloperMenuChange() }} checked={this.state.showDeveloperMenu} /> {__("Show developer menu")}</label> <label>
<FormField
type="checkbox"
onChange={event => {
this.handleShowDeveloperMenuChange();
}}
checked={this.state.showDeveloperMenu}
/>
{' '}
{__('Show developer menu')}
</label>
</div> </div>
<div className="form-row"> <div className="form-row">
<label><FormField type="checkbox" onChange={(event) => { this.handleUseCustomLighthouseServersChange() }} checked={this.state.useCustomLighthouseServers} /> {__("Use custom search servers")}</label> <label>
<FormField
type="checkbox"
onChange={event => {
this.handleUseCustomLighthouseServersChange();
}}
checked={this.state.useCustomLighthouseServers}
/>
{' '}
{__('Use custom search servers')}
</label>
</div> </div>
{this.state.useCustomLighthouseServers {this.state.useCustomLighthouseServers
? <div className="form-row"> ? <div className="form-row">
<label> <label>
{__("Custom search servers (one per line)")} {__('Custom search servers (one per line)')}
<div><FormField type="textarea" className="developer-page__custom-lighthouse-servers" value={this.state.customLighthouseServers} onChange={(event) => { this.handleCustomLighthouseServersChange() }} checked={this.state.debugMode} /></div> <div>
<FormField
type="textarea"
className="developer-page__custom-lighthouse-servers"
value={this.state.customLighthouseServers}
onChange={event => {
this.handleCustomLighthouseServersChange();
}}
checked={this.state.debugMode}
/>
</div>
</label> </label>
</div> </div>
: null} : null}
</section> </section>
<section className="card"> <section className="card">
<div className="form-row"> <div className="form-row">
<FormField name="file" ref="file" type="file" onChange={(event) => { this.handleUpgradeFileChange() }}/> <FormField
name="file"
ref="file"
type="file"
onChange={event => {
this.handleUpgradeFileChange();
}}
/>
&nbsp; &nbsp;
<Link label={__("Force Upgrade")} button="alt" onClick={(event) => { this.handleForceUpgradeClick() }} /> <Link
label={__('Force Upgrade')}
button="alt"
onClick={event => {
this.handleForceUpgradeClick();
}}
/>
</div> </div>
</section> </section>
</main> </main>

View file

@ -1,23 +1,19 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { doFetchFeaturedUris } from 'actions/content';
} from 'react-redux'
import {
doFetchFeaturedUris,
} from 'actions/content'
import { import {
selectFeaturedUris, selectFeaturedUris,
selectFetchingFeaturedUris, selectFetchingFeaturedUris
} from 'selectors/content' } from 'selectors/content';
import DiscoverPage from './view' import DiscoverPage from './view';
const select = (state) => ({ const select = state => ({
featuredUris: selectFeaturedUris(state), featuredUris: selectFeaturedUris(state),
fetchingFeaturedUris: selectFetchingFeaturedUris(state), fetchingFeaturedUris: selectFetchingFeaturedUris(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
fetchFeaturedUris: () => dispatch(doFetchFeaturedUris()) fetchFeaturedUris: () => dispatch(doFetchFeaturedUris())
}) });
export default connect(select, perform)(DiscoverPage) export default connect(select, perform)(DiscoverPage);

View file

@ -1,61 +1,73 @@
import React from 'react'; import React from 'react';
import lbryio from 'lbryio.js'; import lbryio from 'lbryio.js';
import lbryuri from 'lbryuri' import lbryuri from 'lbryuri';
import FileCard from 'component/fileCard'; import FileCard from 'component/fileCard';
import { BusyMessage } from 'component/common.js'; import { BusyMessage } from 'component/common.js';
import ToolTip from 'component/tooltip.js'; import ToolTip from 'component/tooltip.js';
const communityCategoryToolTipText = ('Community Content is a public space where anyone can share content with the ' + const communityCategoryToolTipText =
'Community Content is a public space where anyone can share content with the ' +
'rest of the LBRY community. Bid on the names "one," "two," "three," "four" and ' + 'rest of the LBRY community. Bid on the names "one," "two," "three," "four" and ' +
'"five" to put your content here!'); '"five" to put your content here!';
const FeaturedCategory = (props) => { const FeaturedCategory = props => {
const { const { category, names } = props;
category,
names,
} = props
return <div className="card-row card-row--small"> return (
<h3 className="card-row__header">{category} <div className="card-row card-row--small">
{category && category.match(/^community/i) && <ToolTip label={__("What's this?")} body={__(communityCategoryToolTipText)} className="tooltip--header" />} <h3 className="card-row__header">
{category}
{category &&
category.match(/^community/i) &&
<ToolTip
label={__("What's this?")}
body={__(communityCategoryToolTipText)}
className="tooltip--header"
/>}
</h3> </h3>
{names && names.map(name => <FileCard key={name} displayStyle="card" uri={lbryuri.normalize(name)} />)} {names &&
names.map(name =>
<FileCard
key={name}
displayStyle="card"
uri={lbryuri.normalize(name)}
/>
)}
</div> </div>
} );
};
class DiscoverPage extends React.Component { class DiscoverPage extends React.Component {
componentWillMount() { componentWillMount() {
this.props.fetchFeaturedUris() this.props.fetchFeaturedUris();
} }
render() { render() {
const { const { featuredUris, fetchingFeaturedUris } = this.props;
featuredUris, const failedToLoad =
fetchingFeaturedUris, !fetchingFeaturedUris &&
} = this.props (featuredUris === undefined ||
const failedToLoad = !fetchingFeaturedUris && ( (featuredUris !== undefined && Object.keys(featuredUris).length === 0));
featuredUris === undefined ||
(featuredUris !== undefined && Object.keys(featuredUris).length === 0)
)
return ( return (
<main> <main>
{ {fetchingFeaturedUris &&
fetchingFeaturedUris && <BusyMessage message={__('Fetching content')} />}
<BusyMessage message={__("Fetching content")} /> {typeof featuredUris === 'object' &&
} Object.keys(featuredUris).map(
{ category =>
typeof featuredUris === "object" && featuredUris[category].length
Object.keys(featuredUris).map(category => ( ? <FeaturedCategory
featuredUris[category].length ? <FeaturedCategory key={category} category={category} names={featuredUris[category]} /> : '' key={category}
)) category={category}
} names={featuredUris[category]}
{ />
failedToLoad && : ''
<div className="empty">{__("Failed to load landing content.")}</div> )}
} {failedToLoad &&
<div className="empty">{__('Failed to load landing content.')}</div>}
</main> </main>
) );
} }
} }

View file

@ -1,27 +1,21 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { doFetchFileInfosAndPublishedClaims } from 'actions/file_info';
} from 'react-redux'
import {
doFetchFileInfosAndPublishedClaims,
} from 'actions/file_info'
import { import {
selectFileInfosDownloaded, selectFileInfosDownloaded,
selectFileListDownloadedOrPublishedIsPending, selectFileListDownloadedOrPublishedIsPending
} from 'selectors/file_info' } from 'selectors/file_info';
import { import { doNavigate } from 'actions/app';
doNavigate, import FileListDownloaded from './view';
} from 'actions/app'
import FileListDownloaded from './view'
const select = (state) => ({ const select = state => ({
fileInfos: selectFileInfosDownloaded(state), fileInfos: selectFileInfosDownloaded(state),
isPending: selectFileListDownloadedOrPublishedIsPending(state), isPending: selectFileListDownloadedOrPublishedIsPending(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
navigate: (path) => dispatch(doNavigate(path)), navigate: path => dispatch(doNavigate(path)),
fetchFileInfosDownloaded: () => dispatch(doFetchFileInfosAndPublishedClaims()), fetchFileInfosDownloaded: () => dispatch(doFetchFileInfosAndPublishedClaims())
}) });
export default connect(select, perform)(FileListDownloaded) export default connect(select, perform)(FileListDownloaded);

View file

@ -7,29 +7,33 @@ import {FileTile} from 'component/fileTile';
import rewards from 'rewards.js'; import rewards from 'rewards.js';
import lbryio from 'lbryio.js'; import lbryio from 'lbryio.js';
import { BusyMessage, Thumbnail } from 'component/common.js'; import { BusyMessage, Thumbnail } from 'component/common.js';
import FileList from 'component/fileList' import FileList from 'component/fileList';
import SubHeader from 'component/subHeader' import SubHeader from 'component/subHeader';
class FileListDownloaded extends React.Component { class FileListDownloaded extends React.Component {
componentWillMount() { componentWillMount() {
this.props.fetchFileInfosDownloaded() this.props.fetchFileInfosDownloaded();
} }
render() { render() {
const { const { fileInfos, isPending, navigate } = this.props;
fileInfos,
isPending,
navigate,
} = this.props
let content let content;
if (fileInfos && fileInfos.length > 0) { if (fileInfos && fileInfos.length > 0) {
content = <FileList fileInfos={fileInfos} fetching={isPending} /> content = <FileList fileInfos={fileInfos} fetching={isPending} />;
} else { } else {
if (isPending) { if (isPending) {
content = <BusyMessage message={__("Loading")} /> content = <BusyMessage message={__('Loading')} />;
} else { } else {
content = <span>{__("You haven't downloaded anything from LBRY yet. Go")} <Link onClick={() => navigate('/discover')} label={__("search for your first download")} />!</span> content = (
<span>
{__("You haven't downloaded anything from LBRY yet. Go")}
{' '}<Link
onClick={() => navigate('/discover')}
label={__('search for your first download')}
/>!
</span>
);
} }
} }
@ -38,8 +42,8 @@ class FileListDownloaded extends React.Component {
<SubHeader /> <SubHeader />
{content} {content}
</main> </main>
) );
} }
} }
export default FileListDownloaded export default FileListDownloaded;

View file

@ -1,27 +1,21 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { doFetchFileInfosAndPublishedClaims } from 'actions/file_info';
} from 'react-redux'
import {
doFetchFileInfosAndPublishedClaims,
} from 'actions/file_info'
import { import {
selectFileInfosPublished, selectFileInfosPublished,
selectFileListDownloadedOrPublishedIsPending selectFileListDownloadedOrPublishedIsPending
} from 'selectors/file_info' } from 'selectors/file_info';
import { import { doNavigate } from 'actions/app';
doNavigate, import FileListPublished from './view';
} from 'actions/app'
import FileListPublished from './view'
const select = (state) => ({ const select = state => ({
fileInfos: selectFileInfosPublished(state), fileInfos: selectFileInfosPublished(state),
isPending: selectFileListDownloadedOrPublishedIsPending(state), isPending: selectFileListDownloadedOrPublishedIsPending(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
navigate: (path) => dispatch(doNavigate(path)), navigate: path => dispatch(doNavigate(path)),
fetchFileListPublished: () => dispatch(doFetchFileInfosAndPublishedClaims()), fetchFileListPublished: () => dispatch(doFetchFileInfosAndPublishedClaims())
}) });
export default connect(select, perform)(FileListPublished) export default connect(select, perform)(FileListPublished);

View file

@ -7,16 +7,16 @@ import FileTile from 'component/fileTile';
import rewards from 'rewards.js'; import rewards from 'rewards.js';
import lbryio from 'lbryio.js'; import lbryio from 'lbryio.js';
import { BusyMessage, Thumbnail } from 'component/common.js'; import { BusyMessage, Thumbnail } from 'component/common.js';
import FileList from 'component/fileList' import FileList from 'component/fileList';
import SubHeader from 'component/subHeader' import SubHeader from 'component/subHeader';
class FileListPublished extends React.Component { class FileListPublished extends React.Component {
componentWillMount() { componentWillMount() {
this.props.fetchFileListPublished() this.props.fetchFileListPublished();
} }
componentDidUpdate() { componentDidUpdate() {
if(this.props.fileInfos.length > 0) this._requestPublishReward() if (this.props.fileInfos.length > 0) this._requestPublishReward();
} }
_requestPublishReward() { _requestPublishReward() {
@ -37,21 +37,31 @@ class FileListPublished extends React.Component {
} }
render() { render() {
const { const { fileInfos, isPending, navigate } = this.props;
fileInfos,
isPending,
navigate,
} = this.props
let content let content;
if (fileInfos && fileInfos.length > 0) { if (fileInfos && fileInfos.length > 0) {
content = <FileList fileInfos={fileInfos} fetching={isPending} fileTileShowEmpty={FileTile.SHOW_EMPTY_PENDING} /> content = (
<FileList
fileInfos={fileInfos}
fetching={isPending}
fileTileShowEmpty={FileTile.SHOW_EMPTY_PENDING}
/>
);
} else { } else {
if (isPending) { if (isPending) {
content = <BusyMessage message={__("Loading")} /> content = <BusyMessage message={__('Loading')} />;
} else { } else {
content = <span>{__("It looks like you haven't published anything to LBRY yet. Go")} <Link onClick={() => navigate('/publish')} label={__("share your beautiful cats with the world")} />!</span> content = (
<span>
{__("It looks like you haven't published anything to LBRY yet. Go")}
{' '}<Link
onClick={() => navigate('/publish')}
label={__('share your beautiful cats with the world')}
/>!
</span>
);
} }
} }
@ -60,8 +70,8 @@ class FileListPublished extends React.Component {
<SubHeader /> <SubHeader />
{content} {content}
</main> </main>
) );
} }
} }
export default FileListPublished export default FileListPublished;

View file

@ -1,35 +1,23 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { doNavigate } from 'actions/app';
} from 'react-redux' import { doFetchFileInfo } from 'actions/file_info';
import { import { makeSelectFileInfoForUri } from 'selectors/file_info';
doNavigate, import { doFetchCostInfoForUri } from 'actions/cost_info';
} from 'actions/app'
import {
doFetchFileInfo,
} from 'actions/file_info'
import {
makeSelectFileInfoForUri,
} from 'selectors/file_info'
import {
doFetchCostInfoForUri,
} from 'actions/cost_info'
import { import {
makeSelectClaimForUri, makeSelectClaimForUri,
makeSelectContentTypeForUri, makeSelectContentTypeForUri,
makeSelectMetadataForUri, makeSelectMetadataForUri
} from 'selectors/claims' } from 'selectors/claims';
import { import { makeSelectCostInfoForUri } from 'selectors/cost_info';
makeSelectCostInfoForUri, import FilePage from './view';
} from 'selectors/cost_info'
import FilePage from './view'
const makeSelect = () => { const makeSelect = () => {
const selectClaim = makeSelectClaimForUri(), const selectClaim = makeSelectClaimForUri(),
selectContentType = makeSelectContentTypeForUri(), selectContentType = makeSelectContentTypeForUri(),
selectFileInfo = makeSelectFileInfoForUri(), selectFileInfo = makeSelectFileInfoForUri(),
selectCostInfo = makeSelectCostInfoForUri(), selectCostInfo = makeSelectCostInfoForUri(),
selectMetadata = makeSelectMetadataForUri() selectMetadata = makeSelectMetadataForUri();
const select = (state, props) => ({ const select = (state, props) => ({
claim: selectClaim(state, props), claim: selectClaim(state, props),
@ -37,15 +25,15 @@ const makeSelect = () => {
costInfo: selectCostInfo(state, props), costInfo: selectCostInfo(state, props),
metadata: selectMetadata(state, props), metadata: selectMetadata(state, props),
fileInfo: selectFileInfo(state, props) fileInfo: selectFileInfo(state, props)
}) });
return select return select;
} };
const perform = (dispatch) => ({ const perform = dispatch => ({
navigate: (path, params) => dispatch(doNavigate(path, params)), navigate: (path, params) => dispatch(doNavigate(path, params)),
fetchFileInfo: (uri) => dispatch(doFetchFileInfo(uri)), fetchFileInfo: uri => dispatch(doFetchFileInfo(uri)),
fetchCostInfo: (uri) => dispatch(doFetchCostInfoForUri(uri)), fetchCostInfo: uri => dispatch(doFetchCostInfoForUri(uri))
}) });
export default connect(makeSelect, perform)(FilePage) export default connect(makeSelect, perform)(FilePage);

View file

@ -1,24 +1,15 @@
import React from 'react'; import React from 'react';
import lbry from 'lbry.js'; import lbry from 'lbry.js';
import lbryuri from 'lbryuri.js'; import lbryuri from 'lbryuri.js';
import Video from 'component/video' import Video from 'component/video';
import { import { Thumbnail } from 'component/common';
Thumbnail, import FilePrice from 'component/filePrice';
} from 'component/common';
import FilePrice from 'component/filePrice'
import FileActions from 'component/fileActions'; import FileActions from 'component/fileActions';
import Link from 'component/link'; import Link from 'component/link';
import UriIndicator from 'component/uriIndicator'; import UriIndicator from 'component/uriIndicator';
const FormatItem = (props) => { const FormatItem = props => {
const { const { contentType, metadata: { author, language, license } } = props;
contentType,
metadata: {
author,
language,
license,
}
} = props
const mediaType = lbry.getMediaType(contentType); const mediaType = lbry.getMediaType(contentType);
@ -26,56 +17,51 @@ const FormatItem = (props) => {
<table className="table-standard"> <table className="table-standard">
<tbody> <tbody>
<tr> <tr>
<td>{__("Content-Type")}</td><td>{mediaType}</td> <td>{__('Content-Type')}</td><td>{mediaType}</td>
</tr> </tr>
<tr> <tr>
<td>{__("Author")}</td><td>{author}</td> <td>{__('Author')}</td><td>{author}</td>
</tr> </tr>
<tr> <tr>
<td>{__("Language")}</td><td>{language}</td> <td>{__('Language')}</td><td>{language}</td>
</tr> </tr>
<tr> <tr>
<td>{__("License")}</td><td>{license}</td> <td>{__('License')}</td><td>{license}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
) );
} };
class FilePage extends React.Component { class FilePage extends React.Component {
componentDidMount() { componentDidMount() {
this.fetchFileInfo(this.props) this.fetchFileInfo(this.props);
this.fetchCostInfo(this.props) this.fetchCostInfo(this.props);
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
this.fetchFileInfo(nextProps) this.fetchFileInfo(nextProps);
} }
fetchFileInfo(props) { fetchFileInfo(props) {
if (props.fileInfo === undefined) { if (props.fileInfo === undefined) {
props.fetchFileInfo(props.uri) props.fetchFileInfo(props.uri);
} }
} }
fetchCostInfo(props) { fetchCostInfo(props) {
if (props.costInfo === undefined) { if (props.costInfo === undefined) {
props.fetchCostInfo(props.uri) props.fetchCostInfo(props.uri);
} }
} }
render() { render() {
const { const { claim, fileInfo, metadata, contentType, uri } = this.props;
claim,
fileInfo,
metadata,
contentType,
uri,
} = this.props
if (!claim || !metadata) { if (!claim || !metadata) {
return <span className="empty">{__("Empty claim or metadata info.")}</span> return (
<span className="empty">{__('Empty claim or metadata info.')}</span>
);
} }
const { const {
@ -85,35 +71,50 @@ class FilePage extends React.Component{
has_signature: hasSignature, has_signature: hasSignature,
signature_is_valid: signatureIsValid, signature_is_valid: signatureIsValid,
value value
} = claim } = claim;
const outpoint = txid + ':' + nout const outpoint = txid + ':' + nout;
const title = metadata.title const title = metadata.title;
const channelClaimId = claim.value && claim.value.publisherSignature ? claim.value.publisherSignature.certificateId : null; const channelClaimId = claim.value && claim.value.publisherSignature
const channelUri = signatureIsValid && hasSignature && channelName ? lbryuri.build({channelName, claimId: channelClaimId}, false) : null ? claim.value.publisherSignature.certificateId
const uriIndicator = <UriIndicator uri={uri} /> : null;
const mediaType = lbry.getMediaType(contentType) const channelUri = signatureIsValid && hasSignature && channelName
const player = require('render-media') ? lbryuri.build({ channelName, claimId: channelClaimId }, false)
const isPlayable = Object.values(player.mime).indexOf(contentType) !== -1 || : null;
mediaType === "audio" const uriIndicator = <UriIndicator uri={uri} />;
const mediaType = lbry.getMediaType(contentType);
const player = require('render-media');
const isPlayable =
Object.values(player.mime).indexOf(contentType) !== -1 ||
mediaType === 'audio';
return ( return (
<main className="main--single-column"> <main className="main--single-column">
<section className="show-page-media"> <section className="show-page-media">
{ isPlayable ? {isPlayable
<Video className="video-embedded" uri={uri} /> : ? <Video className="video-embedded" uri={uri} />
(metadata && metadata.thumbnail ? <Thumbnail src={metadata.thumbnail} /> : <Thumbnail />) } : metadata && metadata.thumbnail
? <Thumbnail src={metadata.thumbnail} />
: <Thumbnail />}
</section> </section>
<section className="card"> <section className="card">
<div className="card__inner"> <div className="card__inner">
<div className="card__title-identity"> <div className="card__title-identity">
{!fileInfo || fileInfo.written_bytes <= 0 {!fileInfo || fileInfo.written_bytes <= 0
? <span style={{float: "right"}}><FilePrice uri={lbryuri.normalize(uri)} /></span> ? <span style={{ float: 'right' }}>
: null}<h1>{title}</h1> <FilePrice uri={lbryuri.normalize(uri)} />
</span>
: null}
<h1>{title}</h1>
<div className="card__subtitle"> <div className="card__subtitle">
{ channelUri ? {channelUri
<Link onClick={() => this.props.navigate('/show', { uri: channelUri })}>{uriIndicator}</Link> : ? <Link
uriIndicator} onClick={() =>
this.props.navigate('/show', { uri: channelUri })}
>
{uriIndicator}
</Link>
: uriIndicator}
</div> </div>
<div className="card__actions"> <div className="card__actions">
<FileActions uri={uri} /> <FileActions uri={uri} />
@ -123,16 +124,21 @@ class FilePage extends React.Component{
{metadata && metadata.description} {metadata && metadata.description}
</div> </div>
</div> </div>
{ metadata ? {metadata
<div className="card__content"> ? <div className="card__content">
<FormatItem metadata={metadata} contentType={contentType} /> <FormatItem metadata={metadata} contentType={contentType} />
</div> : '' } </div>
: ''}
<div className="card__content"> <div className="card__content">
<Link href="https://lbry.io/dmca" label={__("report")} className="button-text-help" /> <Link
href="https://lbry.io/dmca"
label={__('report')}
className="button-text-help"
/>
</div> </div>
</section> </section>
</main> </main>
) );
} }
} }

View file

@ -1,14 +1,10 @@
import React from 'react' import React from 'react';
import { import { doNavigate } from 'actions/app';
doNavigate import { connect } from 'react-redux';
} from 'actions/app' import HelpPage from './view';
import {
connect
} from 'react-redux'
import HelpPage from './view'
const perform = (dispatch) => ({ const perform = dispatch => ({
navigate: (path, params) => dispatch(doNavigate(path, params)), navigate: (path, params) => dispatch(doNavigate(path, params))
}) });
export default connect(null, perform)(HelpPage) export default connect(null, perform)(HelpPage);

View file

@ -2,8 +2,8 @@
import React from 'react'; import React from 'react';
import lbry from 'lbry.js'; import lbry from 'lbry.js';
import Link from 'component/link'; import Link from 'component/link';
import SubHeader from 'component/subHeader' import SubHeader from 'component/subHeader';
import {BusyMessage} from 'component/common' import { BusyMessage } from 'component/common';
class HelpPage extends React.Component { class HelpPage extends React.Component {
constructor(props) { constructor(props) {
@ -24,14 +24,14 @@ class HelpPage extends React.Component {
upgradeAvailable: upgradeAvailable upgradeAvailable: upgradeAvailable
}); });
}); });
lbry.call('version', {}, (info) => { lbry.call('version', {}, info => {
this.setState({ this.setState({
versionInfo: info versionInfo: info
}) });
}) });
lbry.getSessionInfo((info) => { lbry.getSessionInfo(info => {
this.setState({ this.setState({
lbryId: info.lbry_id, lbryId: info.lbry_id
}); });
}); });
} }
@ -39,16 +39,16 @@ class HelpPage extends React.Component {
render() { render() {
let ver, osName, platform, newVerLink; let ver, osName, platform, newVerLink;
const { const { navigate } = this.props;
navigate
} = this.props
if (this.state.versionInfo) { if (this.state.versionInfo) {
ver = this.state.versionInfo; ver = this.state.versionInfo;
if (ver.os_system == 'Darwin') { if (ver.os_system == 'Darwin') {
osName = (parseInt(ver.os_release.match(/^\d+/)) < 16 ? 'Mac OS X' : 'Mac OS'); osName = parseInt(ver.os_release.match(/^\d+/)) < 16
? 'Mac OS X'
: 'Mac OS';
platform = `${osName} ${ver.os_release}` platform = `${osName} ${ver.os_release}`;
newVerLink = 'https://lbry.io/get/lbry.dmg'; newVerLink = 'https://lbry.io/get/lbry.dmg';
} else if (ver.os_system == 'Linux') { } else if (ver.os_system == 'Linux') {
platform = `Linux (${ver.platform})`; platform = `Linux (${ver.platform})`;
@ -66,68 +66,96 @@ class HelpPage extends React.Component {
<SubHeader /> <SubHeader />
<section className="card"> <section className="card">
<div className="card__title-primary"> <div className="card__title-primary">
<h3>{__("Read the FAQ")}</h3> <h3>{__('Read the FAQ')}</h3>
</div> </div>
<div className="card__content"> <div className="card__content">
<p>{__("Our FAQ answers many common questions.")}</p> <p>{__('Our FAQ answers many common questions.')}</p>
<p><Link href="https://lbry.io/faq" label={__("Read the FAQ")} icon="icon-question" button="alt"/></p> <p>
<Link
href="https://lbry.io/faq"
label={__('Read the FAQ')}
icon="icon-question"
button="alt"
/>
</p>
</div> </div>
</section> </section>
<section className="card"> <section className="card">
<div className="card__title-primary"> <div className="card__title-primary">
<h3>{__("Get Live Help")}</h3> <h3>{__('Get Live Help')}</h3>
</div> </div>
<div className="card__content"> <div className="card__content">
<p> <p>
{__("Live help is available most hours in the")} <strong>#help</strong> {__("channel of our Slack chat room.")} {__('Live help is available most hours in the')}
{' '}<strong>#help</strong>
{' '}{__('channel of our Slack chat room.')}
</p> </p>
<p> <p>
<Link button="alt" label={__("Join Our Slack")} icon="icon-slack" href="https://slack.lbry.io" /> <Link
button="alt"
label={__('Join Our Slack')}
icon="icon-slack"
href="https://slack.lbry.io"
/>
</p> </p>
</div> </div>
</section> </section>
<section className="card"> <section className="card">
<div className="card__title-primary"><h3>{__("Report a Bug")}</h3></div> <div className="card__title-primary">
<h3>{__('Report a Bug')}</h3>
</div>
<div className="card__content"> <div className="card__content">
<p>{__("Did you find something wrong?")}</p> <p>{__('Did you find something wrong?')}</p>
<p><Link onClick={() => navigate('report')} label={__("Submit a Bug Report")} icon="icon-bug" button="alt" /></p> <p>
<div className="meta">{__("Thanks! LBRY is made by its users.")}</div> <Link
onClick={() => navigate('report')}
label={__('Submit a Bug Report')}
icon="icon-bug"
button="alt"
/>
</p>
<div className="meta">
{__('Thanks! LBRY is made by its users.')}
</div>
</div> </div>
</section> </section>
<section className="card"> <section className="card">
<div className="card__title-primary"><h3>{__("About")}</h3></div> <div className="card__title-primary"><h3>{__('About')}</h3></div>
<div className="card__content"> <div className="card__content">
{ this.state.upgradeAvailable === null ? '' : {this.state.upgradeAvailable === null
( this.state.upgradeAvailable ? ? ''
<p>{__("A newer version of LBRY is available.")} <Link href={newVerLink} label={__("Download now!")} /></p> : this.state.upgradeAvailable
: <p>{__("Your copy of LBRY is up to date.")}</p>)} ? <p>
{ this.state.uiVersion && ver ? {__('A newer version of LBRY is available.')}
<table className="table-standard"> {' '}<Link href={newVerLink} label={__('Download now!')} />
</p>
: <p>{__('Your copy of LBRY is up to date.')}</p>}
{this.state.uiVersion && ver
? <table className="table-standard">
<tbody> <tbody>
<tr> <tr>
<th>{__("daemon (lbrynet)")}</th> <th>{__('daemon (lbrynet)')}</th>
<td>{ver.lbrynet_version}</td> <td>{ver.lbrynet_version}</td>
</tr> </tr>
<tr> <tr>
<th>{__("wallet (lbryum)")}</th> <th>{__('wallet (lbryum)')}</th>
<td>{ver.lbryum_version}</td> <td>{ver.lbryum_version}</td>
</tr> </tr>
<tr> <tr>
<th>{__("interface")}</th> <th>{__('interface')}</th>
<td>{this.state.uiVersion}</td> <td>{this.state.uiVersion}</td>
</tr> </tr>
<tr> <tr>
<th>{__("Platform")}</th> <th>{__('Platform')}</th>
<td>{platform}</td> <td>{platform}</td>
</tr> </tr>
<tr> <tr>
<th>{__("Installation ID")}</th> <th>{__('Installation ID')}</th>
<td>{this.state.lbryId}</td> <td>{this.state.lbryId}</td>
</tr> </tr>
</tbody> </tbody>
</table> : </table>
<BusyMessage message={__("Looking up version info")} /> : <BusyMessage message={__('Looking up version info')} />}
}
</div> </div>
</section> </section>
</main> </main>

View file

@ -1,23 +1,16 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect, import { doNavigate, doHistoryBack } from 'actions/app';
} from 'react-redux' import { selectMyClaims } from 'selectors/claims';
import { import PublishPage from './view';
doNavigate,
doHistoryBack,
} from 'actions/app'
import {
selectMyClaims
} from 'selectors/claims'
import PublishPage from './view'
const select = (state) => ({ const select = state => ({
myClaims: selectMyClaims(state) myClaims: selectMyClaims(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
back: () => dispatch(doHistoryBack()), back: () => dispatch(doHistoryBack()),
navigate: (path) => dispatch(doNavigate(path)), navigate: path => dispatch(doNavigate(path))
}) });
export default connect(select, perform)(PublishPage) export default connect(select, perform)(PublishPage);

View file

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import lbry from 'lbry'; import lbry from 'lbry';
import lbryuri from 'lbryuri' import lbryuri from 'lbryuri';
import { FormField, FormRow } from 'component/form.js'; import { FormField, FormRow } from 'component/form.js';
import Link from 'component/link'; import Link from 'component/link';
import rewards from 'rewards'; import rewards from 'rewards';
@ -36,18 +36,18 @@ class PublishPage extends React.Component {
errorMessage: null, errorMessage: null,
submitting: false, submitting: false,
creatingChannel: false, creatingChannel: false,
modal: null, modal: null
}; };
} }
_updateChannelList(channel) { _updateChannelList(channel) {
// Calls API to update displayed list of channels. If a channel name is provided, will select // Calls API to update displayed list of channels. If a channel name is provided, will select
// that channel at the same time (used immediately after creating a channel) // that channel at the same time (used immediately after creating a channel)
lbry.channel_list_mine().then((channels) => { lbry.channel_list_mine().then(channels => {
rewards.claimReward(rewards.TYPE_FIRST_CHANNEL).then(() => {}, () => {}) rewards.claimReward(rewards.TYPE_FIRST_CHANNEL).then(() => {}, () => {});
this.setState({ this.setState({
channels: channels, channels: channels,
... channel ? {channel} : {} ...(channel ? { channel } : {})
}); });
}); });
} }
@ -58,7 +58,7 @@ class PublishPage extends React.Component {
} }
this.setState({ this.setState({
submitting: true, submitting: true
}); });
let checkFields = this._requiredFields; let checkFields = this._requiredFields;
@ -84,7 +84,7 @@ class PublishPage extends React.Component {
if (missingFieldFound) { if (missingFieldFound) {
this.setState({ this.setState({
submitting: false, submitting: false
}); });
return; return;
} }
@ -99,7 +99,14 @@ class PublishPage extends React.Component {
var metadata = {}; var metadata = {};
} }
for (let metaField of ['title', 'description', 'thumbnail', 'license', 'license_url', 'language']) { for (let metaField of [
'title',
'description',
'thumbnail',
'license',
'license_url',
'language'
]) {
var value = this.refs['meta_' + metaField].getValue(); var value = this.refs['meta_' + metaField].getValue();
if (value !== '') { if (value !== '') {
metadata[metaField] = value; metadata[metaField] = value;
@ -118,26 +125,33 @@ class PublishPage extends React.Component {
name: this.state.name, name: this.state.name,
bid: parseFloat(this.state.bid), bid: parseFloat(this.state.bid),
metadata: metadata, metadata: metadata,
... this.state.channel != 'new' && this.state.channel != 'anonymous' ? {channel_name: this.state.channel} : {}, ...(this.state.channel != 'new' && this.state.channel != 'anonymous'
? { channel_name: this.state.channel }
: {})
}; };
if (this.refs.file.getValue() !== '') { if (this.refs.file.getValue() !== '') {
publishArgs.file_path = this.refs.file.getValue(); publishArgs.file_path = this.refs.file.getValue();
} }
lbry.publish(publishArgs, (message) => { lbry.publish(
publishArgs,
message => {
this.handlePublishStarted(); this.handlePublishStarted();
}, null, (error) => { },
null,
error => {
this.handlePublishError(error); this.handlePublishError(error);
}); }
);
}; };
if (this.state.isFee) { if (this.state.isFee) {
lbry.wallet_unused_address().then((address) => { lbry.wallet_unused_address().then(address => {
metadata.fee = {}; metadata.fee = {};
metadata.fee[this.state.feeCurrency] = { metadata.fee[this.state.feeCurrency] = {
amount: parseFloat(this.state.feeAmount), amount: parseFloat(this.state.feeAmount),
address: address, address: address
}; };
doPublish(); doPublish();
@ -149,19 +163,19 @@ class PublishPage extends React.Component {
handlePublishStarted() { handlePublishStarted() {
this.setState({ this.setState({
modal: 'publishStarted', modal: 'publishStarted'
}); });
} }
handlePublishStartedConfirmed() { handlePublishStartedConfirmed() {
this.props.navigate('/published') this.props.navigate('/published');
} }
handlePublishError(error) { handlePublishError(error) {
this.setState({ this.setState({
submitting: false, submitting: false,
modal: 'error', modal: 'error',
errorMessage: error.message, errorMessage: error.message
}); });
} }
@ -172,14 +186,16 @@ class PublishPage extends React.Component {
this.setState({ this.setState({
rawName: '', rawName: '',
name: '', name: '',
nameResolved: false, nameResolved: false
}); });
return; return;
} }
if (!lbryuri.isValidName(rawName, false)) { if (!lbryuri.isValidName(rawName, false)) {
this.refs.name.showError(__("LBRY names must contain only letters, numbers and dashes.")); this.refs.name.showError(
__('LBRY names must contain only letters, numbers and dashes.')
);
return; return;
} }
@ -188,32 +204,36 @@ class PublishPage extends React.Component {
rawName: rawName, rawName: rawName,
name: name, name: name,
nameResolved: null, nameResolved: null,
myClaimExists: null, myClaimExists: null
}); });
const myClaimInfo = Object.values(this.props.myClaims).find(claim => claim.name === name) const myClaimInfo = Object.values(this.props.myClaims).find(
claim => claim.name === name
);
this.setState({ this.setState({
myClaimExists: !!myClaimInfo, myClaimExists: !!myClaimInfo
}); });
lbry.resolve({uri: name}).then((claimInfo) => { lbry.resolve({ uri: name }).then(
claimInfo => {
if (name != this.state.name) { if (name != this.state.name) {
return; return;
} }
if (!claimInfo) { if (!claimInfo) {
this.setState({ this.setState({
nameResolved: false, nameResolved: false
}); });
} else { } else {
const topClaimIsMine = myClaimInfo && myClaimInfo.amount >= claimInfo.amount; const topClaimIsMine =
myClaimInfo && myClaimInfo.amount >= claimInfo.amount;
const newState = { const newState = {
nameResolved: true, nameResolved: true,
topClaimValue: parseFloat(claimInfo.amount), topClaimValue: parseFloat(claimInfo.amount),
myClaimExists: !!myClaimInfo, myClaimExists: !!myClaimInfo,
myClaimValue: myClaimInfo ? parseFloat(myClaimInfo.amount) : null, myClaimValue: myClaimInfo ? parseFloat(myClaimInfo.amount) : null,
myClaimMetadata: myClaimInfo ? myClaimInfo.value : null, myClaimMetadata: myClaimInfo ? myClaimInfo.value : null,
topClaimIsMine: topClaimIsMine, topClaimIsMine: topClaimIsMine
}; };
if (topClaimIsMine) { if (topClaimIsMine) {
@ -225,30 +245,33 @@ class PublishPage extends React.Component {
this.setState(newState); this.setState(newState);
} }
}, () => { // Assume an error means the name is available },
() => {
// Assume an error means the name is available
this.setState({ this.setState({
name: name, name: name,
nameResolved: false, nameResolved: false,
myClaimExists: false, myClaimExists: false
});
}); });
} }
);
}
handleBidChange(event) { handleBidChange(event) {
this.setState({ this.setState({
bid: event.target.value, bid: event.target.value
}); });
} }
handleFeeAmountChange(event) { handleFeeAmountChange(event) {
this.setState({ this.setState({
feeAmount: event.target.value, feeAmount: event.target.value
}); });
} }
handleFeeCurrencyChange(event) { handleFeeCurrencyChange(event) {
this.setState({ this.setState({
feeCurrency: event.target.value, feeCurrency: event.target.value
}); });
} }
@ -259,14 +282,16 @@ class PublishPage extends React.Component {
} }
handleLicenseChange(event) { handleLicenseChange(event) {
var licenseType = event.target.options[event.target.selectedIndex].getAttribute('data-license-type'); var licenseType = event.target.options[
event.target.selectedIndex
].getAttribute('data-license-type');
var newState = { var newState = {
copyrightChosen: licenseType == 'copyright', copyrightChosen: licenseType == 'copyright',
otherLicenseChosen: licenseType == 'other', otherLicenseChosen: licenseType == 'other'
}; };
if (licenseType == 'copyright') { if (licenseType == 'copyright') {
newState.copyrightNotice = __("All rights reserved.") newState.copyrightNotice = __('All rights reserved.');
} }
this.setState(newState); this.setState(newState);
@ -274,19 +299,19 @@ class PublishPage extends React.Component {
handleCopyrightNoticeChange(event) { handleCopyrightNoticeChange(event) {
this.setState({ this.setState({
copyrightNotice: event.target.value, copyrightNotice: event.target.value
}); });
} }
handleOtherLicenseDescriptionChange(event) { handleOtherLicenseDescriptionChange(event) {
this.setState({ this.setState({
otherLicenseDescription: event.target.value, otherLicenseDescription: event.target.value
}); });
} }
handleOtherLicenseUrlChange(event) { handleOtherLicenseUrlChange(event) {
this.setState({ this.setState({
otherLicenseUrl: event.target.value, otherLicenseUrl: event.target.value
}); });
} }
@ -294,64 +319,83 @@ class PublishPage extends React.Component {
const channel = event.target.value; const channel = event.target.value;
this.setState({ this.setState({
channel: channel, channel: channel
}); });
} }
handleNewChannelNameChange(event) { handleNewChannelNameChange(event) {
const newChannelName = (event.target.value.startsWith('@') ? event.target.value : '@' + event.target.value); const newChannelName = event.target.value.startsWith('@')
? event.target.value
: '@' + event.target.value;
if (newChannelName.length > 1 && !lbryuri.isValidName(newChannelName.substr(1), false)) { if (
this.refs.newChannelName.showError(__("LBRY channel names must contain only letters, numbers and dashes.")); newChannelName.length > 1 &&
!lbryuri.isValidName(newChannelName.substr(1), false)
) {
this.refs.newChannelName.showError(
__('LBRY channel names must contain only letters, numbers and dashes.')
);
return; return;
} else { } else {
this.refs.newChannelName.clearError() this.refs.newChannelName.clearError();
} }
this.setState({ this.setState({
newChannelName: newChannelName, newChannelName: newChannelName
}); });
} }
handleNewChannelBidChange(event) { handleNewChannelBidChange(event) {
this.setState({ this.setState({
newChannelBid: event.target.value, newChannelBid: event.target.value
}); });
} }
handleTOSChange(event) { handleTOSChange(event) {
this.setState({ this.setState({
TOSAgreed: event.target.checked, TOSAgreed: event.target.checked
}); });
} }
handleCreateChannelClick(event) { handleCreateChannelClick(event) {
if (this.state.newChannelName.length < 5) { if (this.state.newChannelName.length < 5) {
this.refs.newChannelName.showError(__("LBRY channel names must be at least 4 characters in length.")); this.refs.newChannelName.showError(
__('LBRY channel names must be at least 4 characters in length.')
);
return; return;
} }
this.setState({ this.setState({
creatingChannel: true, creatingChannel: true
}); });
const newChannelName = this.state.newChannelName; const newChannelName = this.state.newChannelName;
lbry.channel_new({channel_name: newChannelName, amount: parseInt(this.state.newChannelBid)}).then(() => { lbry
.channel_new({
channel_name: newChannelName,
amount: parseInt(this.state.newChannelBid)
})
.then(
() => {
setTimeout(() => { setTimeout(() => {
this.setState({ this.setState({
creatingChannel: false, creatingChannel: false
}); });
this._updateChannelList(newChannelName); this._updateChannelList(newChannelName);
}, 5000); }, 5000);
}, (error) => { },
error => {
// TODO: better error handling // TODO: better error handling
this.refs.newChannelName.showError(__("Unable to create channel due to an internal error.")); this.refs.newChannelName.showError(
__('Unable to create channel due to an internal error.')
);
this.setState({ this.setState({
creatingChannel: false, creatingChannel: false
});
}); });
} }
);
}
getLicenseUrl() { getLicenseUrl() {
if (!this.refs.meta_license) { if (!this.refs.meta_license) {
@ -359,7 +403,10 @@ class PublishPage extends React.Component {
} else if (this.state.otherLicenseChosen) { } else if (this.state.otherLicenseChosen) {
return this.state.otherLicenseUrl; return this.state.otherLicenseUrl;
} else { } else {
return this.refs.meta_license.getSelectedElement().getAttribute('data-url') || '' ; return (
this.refs.meta_license.getSelectedElement().getAttribute('data-url') ||
''
);
} }
} }
@ -369,25 +416,33 @@ class PublishPage extends React.Component {
onFileChange() { onFileChange() {
if (this.refs.file.getValue()) { if (this.refs.file.getValue()) {
this.setState({ hasFile: true }) this.setState({ hasFile: true });
} else { } else {
this.setState({ hasFile: false }) this.setState({ hasFile: false });
} }
} }
getNameBidHelpText() { getNameBidHelpText() {
if (!this.state.name) { if (!this.state.name) {
return __("Select a URL for this publish."); return __('Select a URL for this publish.');
} else if (this.state.nameResolved === false) { } else if (this.state.nameResolved === false) {
return __("This URL is unused."); return __('This URL is unused.');
} else if (this.state.myClaimExists) { } else if (this.state.myClaimExists) {
return __("You have already used this URL. Publishing to it again will update your previous publish.") return __(
'You have already used this URL. Publishing to it again will update your previous publish.'
);
} else if (this.state.topClaimValue) { } else if (this.state.topClaimValue) {
return <span>{__n("A deposit of at least \"%s\" credit is required to win \"%s\". However, you can still get a permanent URL for any amount." return (
, "A deposit of at least \"%s\" credits is required to win \"%s\". However, you can still get a permanent URL for any amount." <span>
, this.state.topClaimValue /*pluralization param*/ {__n(
, this.state.topClaimValue, this.state.name /*regular params*/ 'A deposit of at least "%s" credit is required to win "%s". However, you can still get a permanent URL for any amount.',
)}</span> 'A deposit of at least "%s" credits is required to win "%s". However, you can still get a permanent URL for any amount.',
this.state.topClaimValue /*pluralization param*/,
this.state.topClaimValue,
this.state.name /*regular params*/
)}
</span>
);
} else { } else {
return ''; return '';
} }
@ -395,7 +450,7 @@ class PublishPage extends React.Component {
closeModal() { closeModal() {
this.setState({ this.setState({
modal: null, modal: null
}); });
} }
@ -404,49 +459,100 @@ class PublishPage extends React.Component {
return null; return null;
} }
const lbcInputHelp = __("This LBC remains yours and the deposit can be undone at any time."); const lbcInputHelp = __(
'This LBC remains yours and the deposit can be undone at any time.'
);
return ( return (
<main className="main--single-column"> <main className="main--single-column">
<form onSubmit={(event) => { this.handleSubmit(event) }}> <form
onSubmit={event => {
this.handleSubmit(event);
}}
>
<section className="card"> <section className="card">
<div className="card__title-primary"> <div className="card__title-primary">
<h4>{__("Content")}</h4> <h4>{__('Content')}</h4>
<div className="card__subtitle"> <div className="card__subtitle">
{__("What are you publishing?")} {__('What are you publishing?')}
</div> </div>
</div> </div>
<div className="card__content"> <div className="card__content">
<FormRow name="file" label="File" ref="file" type="file" onChange={(event) => { this.onFileChange(event) }} <FormRow
helper={this.state.myClaimExists ? __("If you don't choose a file, the file from your existing claim will be used.") : null}/> name="file"
label="File"
ref="file"
type="file"
onChange={event => {
this.onFileChange(event);
}}
helper={
this.state.myClaimExists
? __(
"If you don't choose a file, the file from your existing claim will be used."
)
: null
}
/>
</div> </div>
{ !this.state.hasFile ? '' : {!this.state.hasFile
<div> ? ''
: <div>
<div className="card__content"> <div className="card__content">
<FormRow label={__("Title")} type="text" ref="meta_title" name="title" placeholder={__("Title")} /> <FormRow
label={__('Title')}
type="text"
ref="meta_title"
name="title"
placeholder={__('Title')}
/>
</div> </div>
<div className="card__content"> <div className="card__content">
<FormRow type="text" label={__("Thumbnail URL")} ref="meta_thumbnail" name="thumbnail" placeholder="http://spee.ch/mylogo" /> <FormRow
type="text"
label={__('Thumbnail URL')}
ref="meta_thumbnail"
name="thumbnail"
placeholder="http://spee.ch/mylogo"
/>
</div> </div>
<div className="card__content"> <div className="card__content">
<FormRow label={__("Description")} type="textarea" ref="meta_description" name="description" placeholder={__("Description of your content")} /> <FormRow
label={__('Description')}
type="textarea"
ref="meta_description"
name="description"
placeholder={__('Description of your content')}
/>
</div> </div>
<div className="card__content"> <div className="card__content">
<FormRow label={__("Language")} type="select" defaultValue="en" ref="meta_language" name="language"> <FormRow
<option value="en">{__("English")}</option> label={__('Language')}
<option value="zh">{__("Chinese")}</option> type="select"
<option value="fr">{__("French")}</option> defaultValue="en"
<option value="de">{__("German")}</option> ref="meta_language"
<option value="jp">{__("Japanese")}</option> name="language"
<option value="ru">{__("Russian")}</option> >
<option value="es">{__("Spanish")}</option> <option value="en">{__('English')}</option>
<option value="zh">{__('Chinese')}</option>
<option value="fr">{__('French')}</option>
<option value="de">{__('German')}</option>
<option value="jp">{__('Japanese')}</option>
<option value="ru">{__('Russian')}</option>
<option value="es">{__('Spanish')}</option>
</FormRow> </FormRow>
</div> </div>
<div className="card__content"> <div className="card__content">
<FormRow type="select" label={__("Maturity")} defaultValue="en" ref="meta_nsfw" name="nsfw"> <FormRow
type="select"
label={__('Maturity')}
defaultValue="en"
ref="meta_nsfw"
name="nsfw"
>
{/* <option value=""></option> */} {/* <option value=""></option> */}
<option value="0">{__("All Ages")}</option> <option value="0">{__('All Ages')}</option>
<option value="1">{__("Adults Only")}</option> <option value="1">{__('Adults Only')}</option>
</FormRow> </FormRow>
</div> </div>
</div>} </div>}
@ -454,136 +560,345 @@ class PublishPage extends React.Component {
<section className="card"> <section className="card">
<div className="card__title-primary"> <div className="card__title-primary">
<h4>{__("Access")}</h4> <h4>{__('Access')}</h4>
<div className="card__subtitle"> <div className="card__subtitle">
{__("How much does this content cost?")} {__('How much does this content cost?')}
</div> </div>
</div> </div>
<div className="card__content"> <div className="card__content">
<div className="form-row__label-row"> <div className="form-row__label-row">
<label className="form-row__label">{__("Price")}</label> <label className="form-row__label">{__('Price')}</label>
</div> </div>
<FormRow label={__("Free")} type="radio" name="isFree" value="1" onChange={ () => { this.handleFeePrefChange(false) } } defaultChecked={!this.state.isFee} /> <FormRow
<FormField type="radio" name="isFree" label={!this.state.isFee ? __('Choose price...') : __('Price ') } label={__('Free')}
onChange={ () => { this.handleFeePrefChange(true) } } defaultChecked={this.state.isFee} /> type="radio"
name="isFree"
value="1"
onChange={() => {
this.handleFeePrefChange(false);
}}
defaultChecked={!this.state.isFee}
/>
<FormField
type="radio"
name="isFree"
label={!this.state.isFee ? __('Choose price...') : __('Price ')}
onChange={() => {
this.handleFeePrefChange(true);
}}
defaultChecked={this.state.isFee}
/>
<span className={!this.state.isFee ? 'hidden' : ''}> <span className={!this.state.isFee ? 'hidden' : ''}>
<FormField type="number" className="form-field__input--inline" step="0.01" placeholder="1.00" onChange={(event) => this.handleFeeAmountChange(event)} /> <FormField type="select" onChange={(event) => { this.handleFeeCurrencyChange(event) }}> <FormField
<option value="USD">{__("US Dollars")}</option> type="number"
<option value="LBC">{__("LBRY credits")}</option> className="form-field__input--inline"
step="0.01"
placeholder="1.00"
onChange={event => this.handleFeeAmountChange(event)}
/>
{' '}
<FormField
type="select"
onChange={event => {
this.handleFeeCurrencyChange(event);
}}
>
<option value="USD">{__('US Dollars')}</option>
<option value="LBC">{__('LBRY credits')}</option>
</FormField> </FormField>
</span> </span>
{ this.state.isFee ? {this.state.isFee
<div className="form-field__helper"> ? <div className="form-field__helper">
{__("If you choose to price this content in dollars, the number of credits charged will be adjusted based on the value of LBRY credits at the time of purchase.")} {__(
</div> : '' } 'If you choose to price this content in dollars, the number of credits charged will be adjusted based on the value of LBRY credits at the time of purchase.'
<FormRow label="License" type="select" ref="meta_license" name="license" onChange={(event) => { this.handleLicenseChange(event) }}> )}
<option></option> </div>
<option>{__("Public Domain")}</option> : ''}
<option data-url="https://creativecommons.org/licenses/by/4.0/legalcode">{__("Creative Commons Attribution 4.0 International")}</option> <FormRow
<option data-url="https://creativecommons.org/licenses/by-sa/4.0/legalcode">{__("Creative Commons Attribution-ShareAlike 4.0 International")}</option> label="License"
<option data-url="https://creativecommons.org/licenses/by-nd/4.0/legalcode">{__("Creative Commons Attribution-NoDerivatives 4.0 International")}</option> type="select"
<option data-url="https://creativecommons.org/licenses/by-nc/4.0/legalcode">{__("Creative Commons Attribution-NonCommercial 4.0 International")}</option> ref="meta_license"
<option data-url="https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode">{__("Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International")}</option> name="license"
<option data-url="https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode">{__("Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International")}</option> onChange={event => {
<option data-license-type="copyright" {... this.state.copyrightChosen ? {value: this.state.copyrightNotice} : {}}>{__("Copyrighted...")}</option> this.handleLicenseChange(event);
<option data-license-type="other" {... this.state.otherLicenseChosen ? {value: this.state.otherLicenseDescription} : {}}>{__("Other...")}</option> }}
>
<option />
<option>{__('Public Domain')}</option>
<option data-url="https://creativecommons.org/licenses/by/4.0/legalcode">
{__('Creative Commons Attribution 4.0 International')}
</option>
<option data-url="https://creativecommons.org/licenses/by-sa/4.0/legalcode">
{__(
'Creative Commons Attribution-ShareAlike 4.0 International'
)}
</option>
<option data-url="https://creativecommons.org/licenses/by-nd/4.0/legalcode">
{__(
'Creative Commons Attribution-NoDerivatives 4.0 International'
)}
</option>
<option data-url="https://creativecommons.org/licenses/by-nc/4.0/legalcode">
{__(
'Creative Commons Attribution-NonCommercial 4.0 International'
)}
</option>
<option data-url="https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode">
{__(
'Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International'
)}
</option>
<option data-url="https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode">
{__(
'Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International'
)}
</option>
<option
data-license-type="copyright"
{...(this.state.copyrightChosen
? { value: this.state.copyrightNotice }
: {})}
>
{__('Copyrighted...')}
</option>
<option
data-license-type="other"
{...(this.state.otherLicenseChosen
? { value: this.state.otherLicenseDescription }
: {})}
>
{__('Other...')}
</option>
</FormRow> </FormRow>
<FormField type="hidden" ref="meta_license_url" name="license_url" value={this.getLicenseUrl()} /> <FormField
type="hidden"
ref="meta_license_url"
name="license_url"
value={this.getLicenseUrl()}
/>
{this.state.copyrightChosen {this.state.copyrightChosen
? <FormRow label={__("Copyright notice")} type="text" name="copyright-notice" ? <FormRow
value={this.state.copyrightNotice} onChange={(event) => { this.handleCopyrightNoticeChange(event) }} /> label={__('Copyright notice')}
type="text"
name="copyright-notice"
value={this.state.copyrightNotice}
onChange={event => {
this.handleCopyrightNoticeChange(event);
}}
/>
: null} : null}
{this.state.otherLicenseChosen ? {this.state.otherLicenseChosen
<FormRow label={__("License description")} type="text" name="other-license-description" onChange={(event) => { this.handleOtherLicenseDescriptionChange() }} /> ? <FormRow
label={__('License description')}
type="text"
name="other-license-description"
onChange={event => {
this.handleOtherLicenseDescriptionChange();
}}
/>
: null} : null}
{this.state.otherLicenseChosen ? {this.state.otherLicenseChosen
<FormRow label={__("License URL")} type="text" name="other-license-url" onChange={(event) => { this.handleOtherLicenseUrlChange(event) }} /> ? <FormRow
label={__('License URL')}
type="text"
name="other-license-url"
onChange={event => {
this.handleOtherLicenseUrlChange(event);
}}
/>
: null} : null}
</div> </div>
</section> </section>
<section className="card"> <section className="card">
<div className="card__title-primary"> <div className="card__title-primary">
<h4>{__("Identity")}</h4> <h4>{__('Identity')}</h4>
<div className="card__subtitle"> <div className="card__subtitle">
{__("Who created this content?")} {__('Who created this content?')}
</div> </div>
</div> </div>
<div className="card__content"> <div className="card__content">
<FormRow type="select" tabIndex="1" onChange={(event) => { this.handleChannelChange(event) }} value={this.state.channel}> <FormRow
<option key="anonymous" value="anonymous">{__("Anonymous")}</option> type="select"
{this.state.channels.map(({name}) => <option key={name} value={name}>{name}</option>)} tabIndex="1"
<option key="new" value="new">{__("New identity...")}</option> onChange={event => {
this.handleChannelChange(event);
}}
value={this.state.channel}
>
<option key="anonymous" value="anonymous">
{__('Anonymous')}
</option>
{this.state.channels.map(({ name }) =>
<option key={name} value={name}>{name}</option>
)}
<option key="new" value="new">{__('New identity...')}</option>
</FormRow> </FormRow>
</div> </div>
{this.state.channel == 'new' ? {this.state.channel == 'new'
<div className="card__content"> ? <div className="card__content">
<FormRow label={__("Name")} type="text" onChange={(event) => { this.handleNewChannelNameChange(event) }} ref={newChannelName => { this.refs.newChannelName = newChannelName }} <FormRow
value={this.state.newChannelName} /> label={__('Name')}
<FormRow label={__("Deposit")} type="text"
onChange={event => {
this.handleNewChannelNameChange(event);
}}
ref={newChannelName => {
this.refs.newChannelName = newChannelName;
}}
value={this.state.newChannelName}
/>
<FormRow
label={__('Deposit')}
postfix="LBC" postfix="LBC"
step="0.01" step="0.01"
type="number" type="number"
helper={lbcInputHelp} helper={lbcInputHelp}
onChange={(event) => { this.handleNewChannelBidChange(event) }} onChange={event => {
value={this.state.newChannelBid} /> this.handleNewChannelBidChange(event);
}}
value={this.state.newChannelBid}
/>
<div className="form-row-submit"> <div className="form-row-submit">
<Link button="primary" label={!this.state.creatingChannel ? __("Create identity") : __("Creating identity...")} onClick={(event) => { this.handleCreateChannelClick(event) }} disabled={this.state.creatingChannel} /> <Link
button="primary"
label={
!this.state.creatingChannel
? __('Create identity')
: __('Creating identity...')
}
onClick={event => {
this.handleCreateChannelClick(event);
}}
disabled={this.state.creatingChannel}
/>
</div> </div>
</div> </div>
: null} : null}
</section> </section>
<section className="card"> <section className="card">
<div className="card__title-primary"> <div className="card__title-primary">
<h4>{__("Address")}</h4> <h4>{__('Address')}</h4>
<div className="card__subtitle">{__("Where should this content permanently reside?")} <Link label={__("Read more")} href="https://lbry.io/faq/naming" />.</div> <div className="card__subtitle">
{__('Where should this content permanently reside?')}
{' '}<Link
label={__('Read more')}
href="https://lbry.io/faq/naming"
/>.
</div>
</div> </div>
<div className="card__content"> <div className="card__content">
<FormRow prefix="lbry://" type="text" ref="name" placeholder="myname" value={this.state.rawName} onChange={(event) => { this.handleNameChange(event) }} <FormRow
helper={this.getNameBidHelpText()} /> prefix="lbry://"
type="text"
ref="name"
placeholder="myname"
value={this.state.rawName}
onChange={event => {
this.handleNameChange(event);
}}
helper={this.getNameBidHelpText()}
/>
</div> </div>
{ this.state.rawName ? {this.state.rawName
<div className="card__content"> ? <div className="card__content">
<FormRow ref="bid" <FormRow
ref="bid"
type="number" type="number"
step="0.01" step="0.01"
label={__("Deposit")} label={__('Deposit')}
postfix="LBC" postfix="LBC"
onChange={(event) => { this.handleBidChange(event) }} onChange={event => {
this.handleBidChange(event);
}}
value={this.state.bid} value={this.state.bid}
placeholder={this.state.nameResolved ? this.state.topClaimValue + 10 : 100} placeholder={
helper={lbcInputHelp} /> this.state.nameResolved
</div> : '' } ? this.state.topClaimValue + 10
: 100
}
helper={lbcInputHelp}
/>
</div>
: ''}
</section> </section>
<section className="card"> <section className="card">
<div className="card__title-primary"> <div className="card__title-primary">
<h4>{__("Terms of Service")}</h4> <h4>{__('Terms of Service')}</h4>
</div> </div>
<div className="card__content"> <div className="card__content">
<FormRow label={ <FormRow
<span>{__("I agree to the")} <Link href="https://www.lbry.io/termsofservice" label={__("LBRY terms of service")} checked={this.state.TOSAgreed} /></span> label={
} type="checkbox" name="tos_agree" ref={(field) => { this.refs.tos_agree = field }} onChange={(event) => { this.handleTOSChange(event)}} /> <span>
{__('I agree to the')}
{' '}<Link
href="https://www.lbry.io/termsofservice"
label={__('LBRY terms of service')}
checked={this.state.TOSAgreed}
/>
</span>
}
type="checkbox"
name="tos_agree"
ref={field => {
this.refs.tos_agree = field;
}}
onChange={event => {
this.handleTOSChange(event);
}}
/>
</div> </div>
</section> </section>
<div className="card-series-submit"> <div className="card-series-submit">
<Link button="primary" label={!this.state.submitting ? __("Publish") : __("Publishing...")} onClick={(event) => { this.handleSubmit(event) }} disabled={this.state.submitting} /> <Link
<Link button="cancel" onClick={this.props.back} label={__("Cancel")} /> button="primary"
label={
!this.state.submitting ? __('Publish') : __('Publishing...')
}
onClick={event => {
this.handleSubmit(event);
}}
disabled={this.state.submitting}
/>
<Link
button="cancel"
onClick={this.props.back}
label={__('Cancel')}
/>
<input type="submit" className="hidden" /> <input type="submit" className="hidden" />
</div> </div>
</form> </form>
<Modal isOpen={this.state.modal == 'publishStarted'} contentLabel={__("File published")} <Modal
onConfirmed={(event) => { this.handlePublishStartedConfirmed(event) }}> isOpen={this.state.modal == 'publishStarted'}
<p>{__("Your file has been published to LBRY at the address")} <code>lbry://{this.state.name}</code>!</p> contentLabel={__('File published')}
<p>{__('The file will take a few minutes to appear for other LBRY users. Until then it will be listed as "pending" under your published files.')}</p> onConfirmed={event => {
this.handlePublishStartedConfirmed(event);
}}
>
<p>
{__('Your file has been published to LBRY at the address')}
{' '}<code>lbry://{this.state.name}</code>!
</p>
<p>
{__(
'The file will take a few minutes to appear for other LBRY users. Until then it will be listed as "pending" under your published files.'
)}
</p>
</Modal> </Modal>
<Modal isOpen={this.state.modal == 'error'} contentLabel={__("Error publishing file")} <Modal
onConfirmed={(event) => { this.closeModal(event) }}> isOpen={this.state.modal == 'error'}
{__("The following error occurred when attempting to publish your file")}: {this.state.errorMessage} contentLabel={__('Error publishing file')}
onConfirmed={event => {
this.closeModal(event);
}}
>
{__(
'The following error occurred when attempting to publish your file'
)}: {this.state.errorMessage}
</Modal> </Modal>
</main> </main>
); );

View file

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import Link from 'component/link'; import Link from 'component/link';
import {FormRow} from 'component/form' import { FormRow } from 'component/form';
import Modal from '../component/modal.js'; import Modal from '../component/modal.js';
import lbry from '../lbry.js'; import lbry from '../lbry.js';
@ -10,7 +10,7 @@ class ReportPage extends React.Component {
this.state = { this.state = {
submitting: false, submitting: false,
modal: null, modal: null
}; };
} }
@ -22,7 +22,7 @@ class ReportPage extends React.Component {
lbry.reportBug(this._messageArea.value, () => { lbry.reportBug(this._messageArea.value, () => {
this.setState({ this.setState({
submitting: false, submitting: false,
modal: 'submitted', modal: 'submitted'
}); });
}); });
this._messageArea.value = ''; this._messageArea.value = '';
@ -31,8 +31,8 @@ class ReportPage extends React.Component {
closeModal() { closeModal() {
this.setState({ this.setState({
modal: null, modal: null
}) });
} }
render() { render() {
@ -40,25 +40,58 @@ class ReportPage extends React.Component {
<main className="main--single-column"> <main className="main--single-column">
<section className="card"> <section className="card">
<div className="card__content"> <div className="card__content">
<h3>{__("Report an Issue")}</h3> <h3>{__('Report an Issue')}</h3>
<p>{__("Please describe the problem you experienced and any information you think might be useful to us. Links to screenshots are great!")}</p> <p>
{__(
'Please describe the problem you experienced and any information you think might be useful to us. Links to screenshots are great!'
)}
</p>
<div className="form-row"> <div className="form-row">
<FormRow type="textarea" ref={(t) => this._messageArea = t} rows="10" name="message" placeholder={__("Description of your issue")} /> <FormRow
type="textarea"
ref={t => (this._messageArea = t)}
rows="10"
name="message"
placeholder={__('Description of your issue')}
/>
</div> </div>
<div className="form-row form-row-submit"> <div className="form-row form-row-submit">
<button onClick={(event) => { this.submitMessage(event) }} className={'button-block button-primary ' + (this.state.submitting ? 'disabled' : '')}>{this.state.submitting ? __('Submitting...') : __('Submit Report')}</button> <button
onClick={event => {
this.submitMessage(event);
}}
className={
'button-block button-primary ' +
(this.state.submitting ? 'disabled' : '')
}
>
{this.state.submitting
? __('Submitting...')
: __('Submit Report')}
</button>
</div> </div>
</div> </div>
</section> </section>
<section className="card"> <section className="card">
<div className="card__content"> <div className="card__content">
<h3>{__("Developer?")}</h3> <h3>{__('Developer?')}</h3>
{__("You can also")} <Link href="https://github.com/lbryio/lbry/issues" label={__("submit an issue on GitHub")}/>. {__('You can also')}
{' '}<Link
href="https://github.com/lbryio/lbry/issues"
label={__('submit an issue on GitHub')}
/>.
</div> </div>
</section> </section>
<Modal isOpen={this.state.modal == 'submitted'} contentLabel={__("Bug report submitted")} <Modal
onConfirmed={(event) => { this.closeModal(event) }}> isOpen={this.state.modal == 'submitted'}
{__("Your bug report has been submitted! Thank you for your feedback.")} contentLabel={__('Bug report submitted')}
onConfirmed={event => {
this.closeModal(event);
}}
>
{__(
'Your bug report has been submitted! Thank you for your feedback.'
)}
</Modal> </Modal>
</main> </main>
); );

View file

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import lbryio from 'lbryio'; import lbryio from 'lbryio';
import { CreditAmount, Icon } from 'component/common.js'; import { CreditAmount, Icon } from 'component/common.js';
import SubHeader from 'component/subHeader' import SubHeader from 'component/subHeader';
import { RewardLink } from 'component/reward-link'; import { RewardLink } from 'component/reward-link';
export class RewardTile extends React.Component { export class RewardTile extends React.Component {
@ -12,7 +12,7 @@ export class RewardTile extends React.Component {
claimed: React.PropTypes.bool.isRequired, claimed: React.PropTypes.bool.isRequired,
value: React.PropTypes.number.isRequired, value: React.PropTypes.number.isRequired,
onRewardClaim: React.PropTypes.func onRewardClaim: React.PropTypes.func
} };
render() { render() {
return ( return (
@ -24,7 +24,7 @@ export class RewardTile extends React.Component {
</div> </div>
<div className="card__actions"> <div className="card__actions">
{this.props.claimed {this.props.claimed
? <span><Icon icon="icon-check" /> {__("Reward claimed.")}</span> ? <span><Icon icon="icon-check" /> {__('Reward claimed.')}</span>
: <RewardLink {...this.props} />} : <RewardLink {...this.props} />}
</div> </div>
<div className="card__content">{this.props.description}</div> <div className="card__content">{this.props.description}</div>
@ -40,22 +40,25 @@ export class RewardsPage extends React.Component {
this.state = { this.state = {
userRewards: null, userRewards: null,
failed: null, failed: null
}; };
} }
componentWillMount() { componentWillMount() {
this.loadRewards() this.loadRewards();
} }
loadRewards() { loadRewards() {
lbryio.call('reward', 'list', {}).then((userRewards) => { lbryio.call('reward', 'list', {}).then(
userRewards => {
this.setState({ this.setState({
userRewards: userRewards, userRewards: userRewards
});
}, () => {
this.setState({failed: true })
}); });
},
() => {
this.setState({ failed: true });
}
);
} }
render() { render() {
@ -64,10 +67,30 @@ export class RewardsPage extends React.Component {
<SubHeader /> <SubHeader />
<div> <div>
{!this.state.userRewards {!this.state.userRewards
? (this.state.failed ? <div className="empty">{__("Failed to load rewards.")}</div> : '') ? this.state.failed
: this.state.userRewards.map(({reward_type, reward_title, reward_description, transaction_id, reward_amount}) => { ? <div className="empty">{__('Failed to load rewards.')}</div>
return <RewardTile key={reward_type} onRewardClaim={this.loadRewards} type={reward_type} title={__(reward_title)} description={__(reward_description)} claimed={!!transaction_id} value={reward_amount} />; : ''
})} : this.state.userRewards.map(
({
reward_type,
reward_title,
reward_description,
transaction_id,
reward_amount
}) => {
return (
<RewardTile
key={reward_type}
onRewardClaim={this.loadRewards}
type={reward_type}
title={__(reward_title)}
description={__(reward_description)}
claimed={!!transaction_id}
value={reward_amount}
/>
);
}
)}
</div> </div>
</main> </main>
); );

View file

@ -1,24 +1,20 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect,
} from 'react-redux'
import { import {
selectIsSearching, selectIsSearching,
selectSearchQuery, selectSearchQuery,
selectCurrentSearchResults, selectCurrentSearchResults
} from 'selectors/search' } from 'selectors/search';
import { import { doNavigate } from 'actions/app';
doNavigate, import SearchPage from './view';
} from 'actions/app'
import SearchPage from './view'
const select = (state) => ({ const select = state => ({
isSearching: selectIsSearching(state), isSearching: selectIsSearching(state),
query: selectSearchQuery(state) query: selectSearchQuery(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
navigate: (path) => dispatch(doNavigate(path)), navigate: path => dispatch(doNavigate(path))
}) });
export default connect(select, perform)(SearchPage) export default connect(select, perform)(SearchPage);

View file

@ -1,36 +1,47 @@
import React from 'react'; import React from 'react';
import lbryuri from 'lbryuri'; import lbryuri from 'lbryuri';
import FileTile from 'component/fileTile' import FileTile from 'component/fileTile';
import FileListSearch from 'component/fileListSearch' import FileListSearch from 'component/fileListSearch';
import { ToolTip } from 'component/tooltip.js'; import { ToolTip } from 'component/tooltip.js';
import { BusyMessage } from 'component/common.js'; import { BusyMessage } from 'component/common.js';
class SearchPage extends React.Component { class SearchPage extends React.Component {
render() { render() {
const { const { query } = this.props;
query,
} = this.props
return ( return (
<main className="main--single-column"> <main className="main--single-column">
{ lbryuri.isValid(query) ? {lbryuri.isValid(query)
<section className="section-spaced"> ? <section className="section-spaced">
<h3 className="card-row__header"> <h3 className="card-row__header">
{__("Exact URL")} <ToolTip label="?" body={__("This is the resolution of a LBRY URL and not controlled by LBRY Inc.")} {__('Exact URL')}
className="tooltip--header" /> {' '}<ToolTip
label="?"
body={__(
'This is the resolution of a LBRY URL and not controlled by LBRY Inc.'
)}
className="tooltip--header"
/>
</h3> </h3>
<FileTile uri={lbryuri.normalize(query)} showEmpty={FileTile.SHOW_EMPTY_PUBLISH} /> <FileTile
</section> : '' } uri={lbryuri.normalize(query)}
showEmpty={FileTile.SHOW_EMPTY_PUBLISH}
/>
</section>
: ''}
<section className="section-spaced"> <section className="section-spaced">
<h3 className="card-row__header"> <h3 className="card-row__header">
{__("Search Results for")} {query} <ToolTip label="?" body={__("These search results are provided by LBRY, Inc.")} {__('Search Results for')} {query}
className="tooltip--header" /> {' '}<ToolTip
label="?"
body={__('These search results are provided by LBRY, Inc.')}
className="tooltip--header"
/>
</h3> </h3>
<FileListSearch query={query} /> <FileListSearch query={query} />
</section> </section>
</main> </main>
) );
} }
} }
export default SearchPage; export default SearchPage;

View file

@ -1,21 +1,15 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { doSetDaemonSetting } from 'actions/settings';
} from 'react-redux' import { selectDaemonSettings } from 'selectors/settings';
import { import SettingsPage from './view';
doSetDaemonSetting
} from 'actions/settings'
import {
selectDaemonSettings
} from 'selectors/settings'
import SettingsPage from './view'
const select = (state) => ({ const select = state => ({
daemonSettings: selectDaemonSettings(state) daemonSettings: selectDaemonSettings(state)
}) });
const perform = (dispatch) => ({ const perform = dispatch => ({
setDaemonSetting: (key, value) => dispatch(doSetDaemonSetting(key, value)), setDaemonSetting: (key, value) => dispatch(doSetDaemonSetting(key, value))
}) });
export default connect(select, perform)(SettingsPage) export default connect(select, perform)(SettingsPage);

View file

@ -1,31 +1,30 @@
import React from 'react'; import React from 'react';
import { FormField, FormRow } from 'component/form.js'; import { FormField, FormRow } from 'component/form.js';
import SubHeader from 'component/subHeader' import SubHeader from 'component/subHeader';
import lbry from 'lbry.js'; import lbry from 'lbry.js';
class SettingsPage extends React.Component { class SettingsPage extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
const daemonSettings = this.props.daemonSettings const daemonSettings = this.props.daemonSettings;
this.state = { this.state = {
isMaxUpload: daemonSettings && daemonSettings.max_upload != 0, isMaxUpload: daemonSettings && daemonSettings.max_upload != 0,
isMaxDownload: daemonSettings && daemonSettings.max_download != 0, isMaxDownload: daemonSettings && daemonSettings.max_download != 0,
showNsfw: lbry.getClientSetting('showNsfw'), showNsfw: lbry.getClientSetting('showNsfw'),
showUnavailable: lbry.getClientSetting('showUnavailable'), showUnavailable: lbry.getClientSetting('showUnavailable'),
language: lbry.getClientSetting('language'), language: lbry.getClientSetting('language')
} };
} }
setDaemonSetting(name, value) { setDaemonSetting(name, value) {
this.props.setDaemonSetting(name, value) this.props.setDaemonSetting(name, value);
} }
setClientSetting(name, value) { setClientSetting(name, value) {
lbry.setClientSetting(name, value) lbry.setClientSetting(name, value);
this._onSettingSaveSuccess() this._onSettingSaveSuccess();
} }
onRunOnStartChange(event) { onRunOnStartChange(event) {
@ -76,17 +75,17 @@ class SettingsPage extends React.Component {
// this.setState({language: language}) // this.setState({language: language})
// } // }
onShowUnavailableChange(event) { onShowUnavailableChange(event) {}
}
render() { render() {
const { const { daemonSettings } = this.props;
daemonSettings
} = this.props
if (!daemonSettings) { if (!daemonSettings) {
return <main className="main--single-column"><span className="empty">{__("Failed to load settings.")}</span></main>; return (
<main className="main--single-column">
<span className="empty">{__('Failed to load settings.')}</span>
</main>
);
} }
/* /*
<section className="card"> <section className="card">
@ -106,35 +105,50 @@ class SettingsPage extends React.Component {
<SubHeader /> <SubHeader />
<section className="card"> <section className="card">
<div className="card__content"> <div className="card__content">
<h3>{__("Download Directory")}</h3> <h3>{__('Download Directory')}</h3>
</div> </div>
<div className="card__content"> <div className="card__content">
<FormRow type="directory" <FormRow
type="directory"
name="download_directory" name="download_directory"
defaultValue={daemonSettings.download_directory} defaultValue={daemonSettings.download_directory}
helper={__("LBRY downloads will be saved here.")} helper={__('LBRY downloads will be saved here.')}
onChange={this.onDownloadDirChange.bind(this)} /> onChange={this.onDownloadDirChange.bind(this)}
/>
</div> </div>
</section> </section>
<section className="card"> <section className="card">
<div className="card__content"> <div className="card__content">
<h3>{__("Bandwidth Limits")}</h3> <h3>{__('Bandwidth Limits')}</h3>
</div> </div>
<div className="card__content"> <div className="card__content">
<div className="form-row__label-row"><div className="form-field__label">{__("Max Upload")}</div></div> <div className="form-row__label-row">
<FormRow type="radio" <div className="form-field__label">{__('Max Upload')}</div>
</div>
<FormRow
type="radio"
name="max_upload_pref" name="max_upload_pref"
onChange={() => { this.onMaxUploadPrefChange(false) }} onChange={() => {
this.onMaxUploadPrefChange(false);
}}
defaultChecked={!this.state.isMaxUpload} defaultChecked={!this.state.isMaxUpload}
label={__("Unlimited")} /> label={__('Unlimited')}
/>
<div className="form-row"> <div className="form-row">
<FormField type="radio" <FormField
type="radio"
name="max_upload_pref" name="max_upload_pref"
onChange={() => { this.onMaxUploadPrefChange(true) }} onChange={() => {
this.onMaxUploadPrefChange(true);
}}
defaultChecked={this.state.isMaxUpload} defaultChecked={this.state.isMaxUpload}
label={ this.state.isMaxUpload ? __("Up to") : __("Choose limit...") } /> label={
{ this.state.isMaxUpload ? this.state.isMaxUpload ? __('Up to') : __('Choose limit...')
<FormField type="number" }
/>
{this.state.isMaxUpload
? <FormField
type="number"
min="0" min="0"
step=".5" step=".5"
defaultValue={daemonSettings.max_upload} defaultValue={daemonSettings.max_upload}
@ -142,27 +156,40 @@ class SettingsPage extends React.Component {
className="form-field__input--inline" className="form-field__input--inline"
onChange={this.onMaxUploadFieldChange.bind(this)} onChange={this.onMaxUploadFieldChange.bind(this)}
/> />
: '' : ''}
{this.state.isMaxUpload
} ? <span className="form-field__label">MB/s</span>
{ this.state.isMaxUpload ? <span className="form-field__label">MB/s</span> : '' } : ''}
</div> </div>
</div> </div>
<div className="card__content"> <div className="card__content">
<div className="form-row__label-row"><div className="form-field__label">{__("Max Download")}</div></div> <div className="form-row__label-row">
<FormRow label={__("Unlimited")} <div className="form-field__label">{__('Max Download')}</div>
</div>
<FormRow
label={__('Unlimited')}
type="radio" type="radio"
name="max_download_pref" name="max_download_pref"
onChange={() => { this.onMaxDownloadPrefChange(false) }} onChange={() => {
defaultChecked={!this.state.isMaxDownload} /> this.onMaxDownloadPrefChange(false);
}}
defaultChecked={!this.state.isMaxDownload}
/>
<div className="form-row"> <div className="form-row">
<FormField type="radio" <FormField
type="radio"
name="max_download_pref" name="max_download_pref"
onChange={() => { this.onMaxDownloadPrefChange(true) }} onChange={() => {
this.onMaxDownloadPrefChange(true);
}}
defaultChecked={this.state.isMaxDownload} defaultChecked={this.state.isMaxDownload}
label={ this.state.isMaxDownload ? __("Up to") : __("Choose limit...") } /> label={
{ this.state.isMaxDownload ? this.state.isMaxDownload ? __('Up to') : __('Choose limit...')
<FormField type="number" }
/>
{this.state.isMaxDownload
? <FormField
type="number"
min="0" min="0"
step=".5" step=".5"
defaultValue={daemonSettings.max_download} defaultValue={daemonSettings.max_download}
@ -170,27 +197,35 @@ class SettingsPage extends React.Component {
className="form-field__input--inline" className="form-field__input--inline"
onChange={this.onMaxDownloadFieldChange.bind(this)} onChange={this.onMaxDownloadFieldChange.bind(this)}
/> />
: '' : ''}
{this.state.isMaxDownload
} ? <span className="form-field__label">MB/s</span>
{ this.state.isMaxDownload ? <span className="form-field__label">MB/s</span> : '' } : ''}
</div> </div>
</div> </div>
</section> </section>
<section className="card"> <section className="card">
<div className="card__content"> <div className="card__content">
<h3>{__("Content")}</h3> <h3>{__('Content')}</h3>
</div> </div>
<div className="card__content"> <div className="card__content">
<FormRow type="checkbox" <FormRow
type="checkbox"
onChange={this.onShowUnavailableChange.bind(this)} onChange={this.onShowUnavailableChange.bind(this)}
defaultChecked={this.state.showUnavailable} defaultChecked={this.state.showUnavailable}
label={__("Show unavailable content in search results")} /> label={__('Show unavailable content in search results')}
/>
</div> </div>
<div className="card__content"> <div className="card__content">
<FormRow label={__("Show NSFW content")} type="checkbox" <FormRow
onChange={this.onShowNsfwChange.bind(this)} defaultChecked={this.state.showNsfw} label={__('Show NSFW content')}
helper={__("NSFW content may include nudity, intense sexuality, profanity, or other adult content. By displaying NSFW content, you are affirming you are of legal age to view mature content in your country or jurisdiction. ")} /> type="checkbox"
onChange={this.onShowNsfwChange.bind(this)}
defaultChecked={this.state.showNsfw}
helper={__(
'NSFW content may include nudity, intense sexuality, profanity, or other adult content. By displaying NSFW content, you are affirming you are of legal age to view mature content in your country or jurisdiction. '
)}
/>
</div> </div>
</section> </section>
@ -219,13 +254,17 @@ class SettingsPage extends React.Component {
<section className="card"> <section className="card">
<div className="card__content"> <div className="card__content">
<h3>{__("Share Diagnostic Data")}</h3> <h3>{__('Share Diagnostic Data')}</h3>
</div> </div>
<div className="card__content"> <div className="card__content">
<FormRow type="checkbox" <FormRow
type="checkbox"
onChange={this.onShareDataChange.bind(this)} onChange={this.onShareDataChange.bind(this)}
defaultChecked={daemonSettings.share_usage_data} defaultChecked={daemonSettings.share_usage_data}
label={__("Help make LBRY better by contributing diagnostic data about my usage")} /> label={__(
'Help make LBRY better by contributing diagnostic data about my usage'
)}
/>
</div> </div>
</section> </section>
</main> </main>

View file

@ -1,17 +1,9 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { doResolveUri } from 'actions/content';
} from 'react-redux' import { makeSelectClaimForUri } from 'selectors/claims';
import { import { makeSelectIsResolvingForUri } from 'selectors/content';
doResolveUri, import ShowPage from './view';
} from 'actions/content'
import {
makeSelectClaimForUri,
} from 'selectors/claims'
import {
makeSelectIsResolvingForUri,
} from 'selectors/content'
import ShowPage from './view'
const makeSelect = () => { const makeSelect = () => {
const selectClaim = makeSelectClaimForUri(), const selectClaim = makeSelectClaimForUri(),
@ -20,13 +12,13 @@ const makeSelect = () => {
const select = (state, props) => ({ const select = (state, props) => ({
claim: selectClaim(state, props), claim: selectClaim(state, props),
isResolvingUri: selectIsResolving(state, props) isResolvingUri: selectIsResolving(state, props)
}) });
return select return select;
} };
const perform = (dispatch) => ({ const perform = dispatch => ({
resolveUri: (uri) => dispatch(doResolveUri(uri)) resolveUri: uri => dispatch(doResolveUri(uri))
}) });
export default connect(makeSelect, perform)(ShowPage) export default connect(makeSelect, perform)(ShowPage);

View file

@ -1,64 +1,57 @@
import React from 'react'; import React from 'react';
import lbryuri from 'lbryuri' import lbryuri from 'lbryuri';
import { import { BusyMessage } from 'component/common';
BusyMessage, import ChannelPage from 'page/channel';
} from 'component/common'; import FilePage from 'page/filePage';
import ChannelPage from 'page/channel'
import FilePage from 'page/filePage'
class ShowPage extends React.Component { class ShowPage extends React.Component {
componentWillMount() { componentWillMount() {
this.resolve(this.props) this.resolve(this.props);
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
this.resolve(nextProps) this.resolve(nextProps);
} }
resolve(props) { resolve(props) {
const { const { isResolvingUri, resolveUri, claim, uri } = props;
isResolvingUri,
resolveUri,
claim,
uri,
} = props
if (!isResolvingUri && claim === undefined && uri) { if (!isResolvingUri && claim === undefined && uri) {
resolveUri(uri) resolveUri(uri);
} }
} }
render() { render() {
const { const { claim, uri, isResolvingUri } = this.props;
claim,
uri,
isResolvingUri,
} = this.props
let innerContent = ""; let innerContent = '';
if (isResolvingUri || !claim) { if (isResolvingUri || !claim) {
innerContent = <section className="card"> innerContent = (
<section className="card">
<div className="card__inner"> <div className="card__inner">
<div className="card__title-identity"><h1>{uri}</h1></div> <div className="card__title-identity"><h1>{uri}</h1></div>
</div> </div>
<div className="card__content"> <div className="card__content">
{ isResolvingUri && <BusyMessage message={__("Loading magic decentralized data...")} /> } {isResolvingUri &&
{ claim === null && <span className="empty">{__("There's nothing at this location.")}</span> } <BusyMessage
message={__('Loading magic decentralized data...')}
/>}
{claim === null &&
<span className="empty">
{__("There's nothing at this location.")}
</span>}
</div> </div>
</section> </section>
} );
else if (claim.name.length && claim.name[0] === '@') { } else if (claim.name.length && claim.name[0] === '@') {
innerContent = <ChannelPage uri={uri} /> innerContent = <ChannelPage uri={uri} />;
} } else if (claim) {
else if (claim) { innerContent = <FilePage uri={uri} />;
innerContent = <FilePage uri={uri} />
} }
return ( return <main className="main--single-column">{innerContent}</main>;
<main className="main--single-column">{innerContent}</main>
)
} }
} }
export default ShowPage export default ShowPage;

View file

@ -9,8 +9,8 @@ class StartPage extends React.Component {
render() { render() {
return ( return (
<main className="main--single-column"> <main className="main--single-column">
<h3>{__("LBRY is Closed")}</h3> <h3>{__('LBRY is Closed')}</h3>
<Link href="lbry://lbry" label={__("Click here to start LBRY")} /> <Link href="lbry://lbry" label={__('Click here to start LBRY')} />
</main> </main>
); );
} }

View file

@ -1,18 +1,12 @@
import React from 'react' import React from 'react';
import { import { connect } from 'react-redux';
connect import { selectCurrentPage } from 'selectors/app';
} from 'react-redux' import { selectBalance } from 'selectors/wallet';
import { import WalletPage from './view';
selectCurrentPage
} from 'selectors/app'
import {
selectBalance
} from 'selectors/wallet'
import WalletPage from './view'
const select = (state) => ({ const select = state => ({
currentPage: selectCurrentPage(state), currentPage: selectCurrentPage(state),
balance: selectBalance(state) balance: selectBalance(state)
}) });
export default connect(select, null)(WalletPage) export default connect(select, null)(WalletPage);

View file

@ -1,25 +1,20 @@
import React from 'react'; import React from 'react';
import SubHeader from 'component/subHeader' import SubHeader from 'component/subHeader';
import TransactionList from 'component/transactionList' import TransactionList from 'component/transactionList';
import WalletAddress from 'component/walletAddress' import WalletAddress from 'component/walletAddress';
import WalletSend from 'component/walletSend' import WalletSend from 'component/walletSend';
import { import { CreditAmount } from 'component/common';
CreditAmount
} from 'component/common';
const WalletPage = (props) => { const WalletPage = props => {
const { const { balance, currentPage } = props;
balance,
currentPage
} = props
return ( return (
<main className="main--single-column"> <main className="main--single-column">
<SubHeader /> <SubHeader />
<section className="card"> <section className="card">
<div className="card__title-primary"> <div className="card__title-primary">
<h3>{__("Balance")}</h3> <h3>{__('Balance')}</h3>
</div> </div>
<div className="card__content"> <div className="card__content">
<CreditAmount amount={balance} precision={8} /> <CreditAmount amount={balance} precision={8} />
@ -29,7 +24,7 @@ const WalletPage = (props) => {
{currentPage === 'send' ? <WalletSend {...props} /> : ''} {currentPage === 'send' ? <WalletSend {...props} /> : ''}
{currentPage === 'receive' ? <WalletAddress /> : ''} {currentPage === 'receive' ? <WalletAddress /> : ''}
</main> </main>
) );
} };
export default WalletPage; export default WalletPage;

View file

@ -1,7 +1,7 @@
import * as types from 'constants/action_types' import * as types from 'constants/action_types';
import lbry from 'lbry' import lbry from 'lbry';
const reducers = {} const reducers = {};
const defaultState = { const defaultState = {
isLoaded: false, isLoaded: false,
currentPath: 'discover', currentPath: 'discover',
@ -9,42 +9,42 @@ const defaultState = {
upgradeSkipped: sessionStorage.getItem('upgradeSkipped'), upgradeSkipped: sessionStorage.getItem('upgradeSkipped'),
daemonReady: false, daemonReady: false,
obscureNsfw: !lbry.getClientSetting('showNsfw'), obscureNsfw: !lbry.getClientSetting('showNsfw'),
hasSignature: false, hasSignature: false
} };
reducers[types.DAEMON_READY] = function(state, action) { reducers[types.DAEMON_READY] = function(state, action) {
return Object.assign({}, state, { return Object.assign({}, state, {
daemonReady: true, daemonReady: true
}) });
} };
reducers[types.CHANGE_PATH] = function(state, action) { reducers[types.CHANGE_PATH] = function(state, action) {
return Object.assign({}, state, { return Object.assign({}, state, {
currentPath: action.data.path, currentPath: action.data.path
}) });
} };
reducers[types.UPGRADE_CANCELLED] = function(state, action) { reducers[types.UPGRADE_CANCELLED] = function(state, action) {
return Object.assign({}, state, { return Object.assign({}, state, {
downloadProgress: null, downloadProgress: null,
upgradeDownloadComplete: false, upgradeDownloadComplete: false,
modal: null, modal: null
}) });
} };
reducers[types.UPGRADE_DOWNLOAD_COMPLETED] = function(state, action) { reducers[types.UPGRADE_DOWNLOAD_COMPLETED] = function(state, action) {
return Object.assign({}, state, { return Object.assign({}, state, {
downloadPath: action.data.path, downloadPath: action.data.path,
upgradeDownloading: false, upgradeDownloading: false,
upgradeDownloadCompleted: true upgradeDownloadCompleted: true
}) });
} };
reducers[types.UPGRADE_DOWNLOAD_STARTED] = function(state, action) { reducers[types.UPGRADE_DOWNLOAD_STARTED] = function(state, action) {
return Object.assign({}, state, { return Object.assign({}, state, {
upgradeDownloading: true upgradeDownloading: true
}) });
} };
reducers[types.SKIP_UPGRADE] = function(state, action) { reducers[types.SKIP_UPGRADE] = function(state, action) {
sessionStorage.setItem('upgradeSkipped', true); sessionStorage.setItem('upgradeSkipped', true);
@ -52,78 +52,73 @@ reducers[types.SKIP_UPGRADE] = function(state, action) {
return Object.assign({}, state, { return Object.assign({}, state, {
upgradeSkipped: true, upgradeSkipped: true,
modal: null modal: null
}) });
} };
reducers[types.UPDATE_VERSION] = function(state, action) { reducers[types.UPDATE_VERSION] = function(state, action) {
return Object.assign({}, state, { return Object.assign({}, state, {
version: action.data.version version: action.data.version
}) });
} };
reducers[types.OPEN_MODAL] = function(state, action) { reducers[types.OPEN_MODAL] = function(state, action) {
return Object.assign({}, state, { return Object.assign({}, state, {
modal: action.data.modal, modal: action.data.modal,
modalExtraContent: action.data.extraContent modalExtraContent: action.data.extraContent
}) });
} };
reducers[types.CLOSE_MODAL] = function(state, action) { reducers[types.CLOSE_MODAL] = function(state, action) {
return Object.assign({}, state, { return Object.assign({}, state, {
modal: undefined, modal: undefined,
modalExtraContent: undefined modalExtraContent: undefined
}) });
} };
reducers[types.UPGRADE_DOWNLOAD_PROGRESSED] = function(state, action) { reducers[types.UPGRADE_DOWNLOAD_PROGRESSED] = function(state, action) {
return Object.assign({}, state, { return Object.assign({}, state, {
downloadProgress: action.data.percent downloadProgress: action.data.percent
}) });
} };
reducers[types.DAEMON_READY] = function(state, action) { reducers[types.DAEMON_READY] = function(state, action) {
return Object.assign({}, state, { return Object.assign({}, state, {
daemonReady: true daemonReady: true
}) });
} };
reducers[types.SHOW_SNACKBAR] = function(state, action) { reducers[types.SHOW_SNACKBAR] = function(state, action) {
const { const { message, linkText, linkTarget, isError } = action.data;
message, const snackBar = Object.assign({}, state.snackBar);
linkText, const snacks = Object.assign([], snackBar.snacks);
linkTarget,
isError,
} = action.data
const snackBar = Object.assign({}, state.snackBar)
const snacks = Object.assign([], snackBar.snacks)
snacks.push({ snacks.push({
message, message,
linkText, linkText,
linkTarget, linkTarget,
isError, isError
}) });
const newSnackBar = Object.assign({}, snackBar, { const newSnackBar = Object.assign({}, snackBar, {
snacks, snacks
}) });
return Object.assign({}, state, { return Object.assign({}, state, {
snackBar: newSnackBar, snackBar: newSnackBar
}) });
} };
reducers[types.REMOVE_SNACKBAR_SNACK] = function(state, action) { reducers[types.REMOVE_SNACKBAR_SNACK] = function(state, action) {
const snackBar = Object.assign({}, state.snackBar) const snackBar = Object.assign({}, state.snackBar);
const snacks = Object.assign([], snackBar.snacks) const snacks = Object.assign([], snackBar.snacks);
snacks.shift() snacks.shift();
const newSnackBar = Object.assign({}, snackBar, { const newSnackBar = Object.assign({}, snackBar, {
snacks, snacks
}) });
return Object.assign({}, state, { return Object.assign({}, state, {
snackBar: newSnackBar, snackBar: newSnackBar
}) });
} };
export default function reducer(state = defaultState, action) { export default function reducer(state = defaultState, action) {
const handler = reducers[action.type]; const handler = reducers[action.type];

Some files were not shown because too many files have changed in this diff Show more