Compare commits

..
Author SHA1 Message Date
zeppi 6a51d252a8 fix rebase more 2021-11-13 16:23:56 -05:00
28 changed files with 981 additions and 84 deletions

No files matched your search

+3 -1
View File
@@ -2216,6 +2216,8 @@
"Enable Data Hosting": "Enable Data Hosting",
"Data over the limit will be deleted within 30 minutes. This will make the Yrbl cry a little bit.": "Data over the limit will be deleted within 30 minutes. This will make the Yrbl cry a little bit.",
"Choose %asset%": "Choose %asset%",
"Uploaded image will be visible in a few minutes.": "Uploaded image will be visible in a few minutes.",
"Showing %filtered% results of %total%": "Showing %filtered% results of %total%",
"filtered": "filtered",
"View All Playlists": "View All Playlists",
"--end--": "--end--"
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 KiB

+2 -2
View File
@@ -187,7 +187,7 @@ function ClaimPreviewTile(props: Props) {
<div className="placeholder claim-tile__title" />
<div
className={classnames('claim-tile__info placeholder', {
contains_view_count: shouldShowViewCount,
'contains_view_count': shouldShowViewCount,
})}
/>
</div>
@@ -247,7 +247,7 @@ function ClaimPreviewTile(props: Props) {
<div>
<div
className={classnames('claim-tile__info', {
contains_view_count: shouldShowViewCount,
'contains_view_count': shouldShowViewCount,
})}
>
{isChannel ? (
+73 -36
View File
@@ -25,6 +25,7 @@ const ALL = 'All';
const PRIVATE = 'Private';
const PUBLIC = 'Public';
const COLLECTION_FILTERS = [ALL, PRIVATE, PUBLIC];
const COLLECTION_SHOW_COUNT = 12;
export default function CollectionsListMine(props: Props) {
const {
@@ -42,6 +43,7 @@ export default function CollectionsListMine(props: Props) {
const [filterType, setFilterType] = React.useState(ALL);
const [searchText, setSearchText] = React.useState('');
const playlistPageUrl = `/$/${PAGES.PLAYLISTS}?type=${filterType}`;
let collectionsToShow = [];
if (filterType === ALL) {
collectionsToShow = unpublishedCollectionsList.concat(publishedList);
@@ -53,18 +55,24 @@ export default function CollectionsListMine(props: Props) {
let filteredCollections;
if (searchText && collectionsToShow) {
filteredCollections = collectionsToShow.filter((id) => {
return (
(unpublishedCollections[id] &&
unpublishedCollections[id].name.toLocaleLowerCase().includes(searchText.toLocaleLowerCase())) ||
(publishedCollections[id] &&
publishedCollections[id].name.toLocaleLowerCase().includes(searchText.toLocaleLowerCase()))
);
});
filteredCollections = collectionsToShow
.filter((id) => {
return (
(unpublishedCollections[id] &&
unpublishedCollections[id].name.toLocaleLowerCase().includes(searchText.toLocaleLowerCase())) ||
(publishedCollections[id] &&
publishedCollections[id].name.toLocaleLowerCase().includes(searchText.toLocaleLowerCase()))
);
})
.slice(0, COLLECTION_SHOW_COUNT);
} else {
filteredCollections = collectionsToShow || [];
filteredCollections = collectionsToShow.slice(0, COLLECTION_SHOW_COUNT) || [];
}
const totalLength = collectionsToShow ? collectionsToShow.length : 0;
const filteredLength = filteredCollections.length;
const isTruncated = totalLength > filteredLength;
const watchLater = builtinCollectionsList.find((list) => list.id === COLLECTIONS_CONSTS.WATCH_LATER_ID);
const favorites = builtinCollectionsList.find((list) => list.id === COLLECTIONS_CONSTS.FAVORITES_ID);
const builtin = [watchLater, favorites];
@@ -130,7 +138,19 @@ export default function CollectionsListMine(props: Props) {
<div className="claim-grid__wrapper">
<div className="claim-grid__header section">
<h1 className="claim-grid__title">
{__('Playlists')}
<Button
className="claim-grid__title"
button="link"
navigate={playlistPageUrl}
label={
<span className="claim-grid__title-span">
{__('Playlists')}
<div className="claim-grid__title--empty">
<Icon className="icon--margin-right" icon={ICONS.STACK} />
</div>
</span>
}
/>
{!hasCollections && !fetchingCollections && (
<div className="claim-grid__title--empty">{__('(Empty) --[indicates empty playlist]--')}</div>
)}
@@ -139,38 +159,55 @@ export default function CollectionsListMine(props: Props) {
)}
</h1>
</div>
<div className="section__header--actions">
<div className="claim-search__wrapper">
<div className="claim-search__menu-group">
{COLLECTION_FILTERS.map((value) => (
<Button
label={__(value)}
key={value}
button="alt"
onClick={() => setFilterType(value)}
className={classnames('button-toggle', {
'button-toggle--active': filterType === value,
})}
/>
))}
<div className="section__header-action-stack">
<div className="section__header--actions">
<div className="claim-search__wrapper">
<div className="claim-search__menu-group">
{COLLECTION_FILTERS.map((value) => (
<Button
label={__(value)}
key={value}
button="alt"
onClick={() => setFilterType(value)}
className={classnames('button-toggle', {
'button-toggle--active': filterType === value,
})}
/>
))}
</div>
</div>
<Form onSubmit={() => {}} className="wunderbar--inline">
<Icon icon={ICONS.SEARCH} />
<FormField
onFocus={onTextareaFocus}
onBlur={onTextareaBlur}
className="wunderbar__input--inline"
value={searchText}
onChange={(e) => setSearchText(e.target.value)}
type="text"
placeholder={__('Search')}
/>
</Form>
</div>
<Form onSubmit={() => {}} className="wunderbar--inline">
<Icon icon={ICONS.SEARCH} />
<FormField
onFocus={onTextareaFocus}
onBlur={onTextareaBlur}
className="wunderbar__input--inline"
value={searchText}
onChange={(e) => setSearchText(e.target.value)}
type="text"
placeholder={__('Search')}
<p className="collection-grid__results-summary">
{isTruncated && (
<>
{__(`Showing %filtered% results of %total%`, {
filtered: filteredLength,
total: totalLength,
})}
{`${searchText ? ' (' + __('filtered') + ') ' : ' '}`}
</>
)}
<Button
button="link"
navigate={playlistPageUrl}
label={<span className="claim-grid__title-span">{__('View All Playlists')}</span>}
/>
</Form>
</p>
</div>
{Boolean(hasCollections) && (
<div>
{/* TODO: fix above spacing hack */}
<div className="claim-grid">
{filteredCollections &&
filteredCollections.length > 0 &&
+8 -1
View File
@@ -20,7 +20,8 @@ function Paginate(props: Props) {
const { search } = location;
const [textValue, setTextValue] = React.useState('');
const urlParams = new URLSearchParams(search);
const initialPage = disableHistory ? 1 : Number(urlParams.get(PAGINATE_PARAM)) || 1;
const urlParamPage = Number(urlParams.get(PAGINATE_PARAM));
const initialPage = disableHistory ? 1 : urlParamPage || 1;
const [currentPage, setCurrentPage] = React.useState(initialPage);
const isMobile = useIsMobile();
@@ -47,6 +48,12 @@ function Paginate(props: Props) {
}
}
React.useEffect(() => {
if (urlParamPage) {
setCurrentPage(urlParamPage);
}
}, [urlParamPage, setCurrentPage]);
return (
// Hide the paginate controls if we are loading or there is only one page
// It should still be rendered to trigger the onPageChange callback
+49
View File
@@ -0,0 +1,49 @@
import { connect } from 'react-redux';
import DownloadProgress from './view';
import { doSetPlayingUri, doStopDownload, doContinueDownloading, doPurchaseUriWrapper } from 'redux/actions/content';
import * as SETTINGS from 'constants/settings';
import { selectFileInfosByOutpoint } from 'redux/selectors/file_info';
import { selectPrimaryUri, selectPlayingUri } from 'redux/selectors/content';
import { makeSelectClientSetting } from 'redux/selectors/settings';
const select = (state) => {
const byOutpoint = selectFileInfosByOutpoint(state);
const runningByOutpoint = [];
const primaryUri = selectPrimaryUri(state);
const playingUri = selectPlayingUri(state);
const uri = playingUri ? playingUri.uri : null;
let primaryOutpoint = null;
let playingOutpoint = null;
for (const key in byOutpoint) {
const item = byOutpoint[key];
if (item && primaryUri && primaryUri.includes(`/${item.claim_name}`)) primaryOutpoint = item.outpoint;
if (item && uri && uri.includes(`/${item.claim_name}`)) playingOutpoint = item.outpoint;
if (item && item.status === 'running') {
runningByOutpoint.push(item);
}
}
return {
byOutpoint: selectFileInfosByOutpoint(state),
primary: {
uri: primaryUri,
outpoint: primaryOutpoint,
},
playing: {
uri,
outpoint: playingOutpoint,
},
currentTheme: makeSelectClientSetting(SETTINGS.THEME)(state),
};
};
const perform = (dispatch) => ({
pause: () => dispatch(doSetPlayingUri({ uri: null })),
doContinueDownloading: (outpoint, force) => dispatch(doContinueDownloading(outpoint, force)),
stopDownload: (outpoint) => dispatch(doStopDownload(outpoint)),
download: (uri) => dispatch(doPurchaseUriWrapper(uri, false, true)),
});
export default connect(select, perform)(DownloadProgress);
+286
View File
@@ -0,0 +1,286 @@
// @flow
import React, { useState, useEffect } from 'react';
import { shell } from 'electron';
import Button from 'component/button';
import * as ICONS from 'constants/icons';
import { buildURI } from 'util/lbryURI';
import { formatBytes } from 'util/format-bytes';
import { areEqual, removeItem } from 'util/array';
import loadingIcon from '../../../static/img/white_loading.gif';
import darkLoadingIcon from '../../../static/img/dark_loading.gif';
import usePersistedState from 'effects/use-persisted-state';
type Props = {
byOutpoint: any,
primary: any,
playing: any,
currentTheme: string,
stopDownload: (outpoint: string) => void,
doContinueDownloading: (outpoint: string, force: boolean) => void,
download: (uri: string) => void,
};
function DownloadProgress({ byOutpoint, primary, playing, currentTheme, stopDownload, doContinueDownloading }: Props) {
const [isShow, setIsShow] = usePersistedState('download-progress', true);
const [downloading, setDownloading] = usePersistedState('download-progress-downloading', []);
const [cancelHash] = useState({});
const [initDownloadingHash] = useState({});
const [prevPlaying, setPrevPlaying] = useState({});
const [prevPrimary, setPrevPrimary] = useState({});
const handleCancel = (hash, value) => {
cancelHash[hash] = value;
};
const handleStopDownload = (outpoint) => {
const updated = [...downloading];
removeItem(updated, outpoint);
setDownloading(updated);
stopDownload(outpoint);
};
const runningByOutpoint = {};
const currentDownloading = [...downloading];
for (const key in byOutpoint) {
const item = byOutpoint[key];
if (item && item.status === 'running') runningByOutpoint[item.outpoint] = item;
}
Object.keys(runningByOutpoint)
.filter((outpoint) => downloading.indexOf(outpoint) === -1)
.map((outpoint) => {
if (primary.outpoint !== outpoint && playing.outpoint !== outpoint) {
currentDownloading.push(outpoint);
}
});
downloading
.filter((outpoint) => (byOutpoint[outpoint] && byOutpoint[outpoint].status !== 'running') || !byOutpoint[outpoint])
.map((outpoint) => {
removeItem(currentDownloading, outpoint);
});
if (!areEqual(downloading, currentDownloading)) setDownloading(currentDownloading);
if (currentDownloading.length === 0) return null;
if (playing.outpoint !== prevPlaying.outpoint) {
if (downloading.includes(prevPlaying.outpoint)) {
setTimeout(() => {
doContinueDownloading(prevPlaying.outpoint, true);
}, 1000);
}
setPrevPlaying(playing);
}
if (primary.outpoint !== prevPrimary.outpoint) {
if (downloading.includes(prevPrimary.outpoint)) {
setTimeout(() => {
doContinueDownloading(prevPrimary.outpoint, true);
}, 1000);
}
setPrevPrimary(primary);
}
currentDownloading.map((outpoint) => {
if (!initDownloadingHash[outpoint]) {
initDownloadingHash[outpoint] = true;
doContinueDownloading(outpoint, false);
}
});
if (!isShow) {
return (
<>
<Button
iconSize={40}
icon={ICONS.DOWNLOAD}
className="download-progress__toggle-button"
onClick={() => setIsShow(true)}
>
<div className="download-progress__current-downloading">
<span className="notification__bubble">
<span className="notification__count">{currentDownloading.length}</span>
</span>
</div>
</Button>
</>
);
}
return (
<div className="download-progress__header">
<Button className="download-progress__top-close-button" onClick={() => setIsShow(false)}>
<div />
</Button>
{currentDownloading.map((outpoint, index) => {
const item = runningByOutpoint[outpoint];
let releaseTime = '';
let isPlaying = false;
if (item.metadata && item.metadata.release_time) {
releaseTime = new Date(parseInt(item.metadata.release_time) * 1000).toISOString().split('T')[0];
}
if (outpoint === primary.outpoint || outpoint === playing.outpoint) {
isPlaying = true;
}
return (
<div key={item.outpoint}>
{index !== 0 && <hr className="download-progress__divider" />}
<DownloadProgressItem
fileName={item.suggested_file_name}
title={item.metadata.title}
releaseTime={releaseTime}
writtenBytes={item.written_bytes}
totalBytes={item.total_bytes}
addedOn={item.added_on}
directory={item.download_directory}
stopDownload={handleStopDownload}
outpoint={item.outpoint}
isCancel={cancelHash[item.outpoint]}
claimID={item.claim_id}
playing={isPlaying}
claimName={item.claim_name}
handleCancel={handleCancel}
currentTheme={currentTheme}
/>
</div>
);
})}
</div>
);
}
type DownloadProgressItemProps = {
fileName: string,
writtenBytes: number,
totalBytes: number,
addedOn: number,
title: string,
releaseTime: string,
directory: string,
outpoint: string,
isCancel: boolean,
claimID: string,
claimName: string,
playing: boolean,
currentTheme: string,
stopDownload: (outpoint: string) => void,
handleCancel: (hash: string, value: boolean) => void,
};
function DownloadProgressItem({
fileName,
writtenBytes,
totalBytes,
addedOn,
title,
releaseTime,
directory,
outpoint,
isCancel,
claimID,
claimName,
playing,
currentTheme,
stopDownload,
handleCancel,
}: DownloadProgressItemProps) {
const processStopDownload = () => {
handleCancel(outpoint, false);
stopDownload(outpoint);
};
const [percent, setPercent] = useState(0);
const [progressText, setProgressText] = useState('');
useEffect(() => {
const updatePercent = ((writtenBytes / totalBytes) * 100).toFixed(0);
setPercent(updatePercent);
let updateText = '';
const downloadSpeed = Math.ceil(writtenBytes / (Date.now() / 1000 - addedOn));
const remainingSecond = Math.ceil((totalBytes - writtenBytes) / downloadSpeed);
const remainingMinutes = Math.floor(remainingSecond / 60);
if (remainingMinutes > 0) {
updateText += __('%remainingMinutes% minutes %remainSecond% seconds remaining', {
remainingMinutes: remainingMinutes,
remainSecond: remainingSecond - 60 * remainingMinutes,
});
} else {
updateText += __('%remainSecond% seconds remaining', { remainSecond: remainingSecond - 60 * remainingMinutes });
}
updateText += ' -- ';
updateText += __('%written% of %total%', {
written: formatBytes(writtenBytes),
total: formatBytes(totalBytes),
});
updateText += ' ';
updateText += __('(%speed%/sec)', {
speed: formatBytes(downloadSpeed),
});
setProgressText(updateText);
}, [writtenBytes, totalBytes, addedOn]);
const openDownloadFolder = () => {
shell.openPath(directory);
};
return (
<div className="download-progress__state-container">
<div className="download-progress__state-bar">
<Button
label={title}
className="download-progress__state-filename"
navigate={buildURI({ claimName, claimID })}
/>
{playing ? (
currentTheme === 'light' ? (
<img src={loadingIcon} className="download-progress__playing-button" />
) : (
<img src={darkLoadingIcon} className="download-progress__playing-button" />
)
) : (
<div
className="download-progress__close-button"
onClick={() => {
handleCancel(outpoint, true);
}}
>
&times;
</div>
)}
</div>
<div className="download-progress__state-bar">
<a className="download-progress__state-filename-link" onClick={openDownloadFolder}>
{fileName}
</a>
<p className="download-progress__release-time">{releaseTime}</p>
</div>
<div className="download-progress__state-bar">
<div className="download-progress__bar-container">
<div className="download-progress__bar-content" style={{ width: `${percent}%` }} />
</div>
</div>
<p className="download-progress__count-time">{progressText}</p>
{isCancel && (
<div className="download-progress__cancel">
<p>{__('Do you cancel download this file?')}</p>
<div className="download-progress__cancel-confirm">
<Button label={__('Yes')} className="download-progress__cancel-ok" onClick={processStopDownload} />
<Button
label={__('No')}
className="download-progress__cancel-ok"
onClick={() => handleCancel(outpoint, false)}
/>
</div>
</div>
)}
</div>
);
}
export default DownloadProgress;
+2
View File
@@ -1,5 +1,6 @@
// @flow
import React from 'react';
import DateTime from 'component/dateTime';
import FileViewCount from 'component/fileViewCount';
import FileActions from 'component/fileActions';
@@ -13,6 +14,7 @@ function FileSubtitle(props: Props) {
return (
<div className="media__subtitle--between">
<div className="file__viewdate">
<DateTime uri={uri} show={DateTime.SHOW_DATE} />
<FileViewCount uri={uri} />
</div>
+2
View File
@@ -5,6 +5,7 @@ import classnames from 'classnames';
import SideNavigation from 'component/sideNavigation';
import SettingsSideNavigation from 'component/settingsSideNavigation';
import Header from 'component/header';
import DownloadProgress from 'component/downloadProgress';
/* @if TARGET='app' */
import StatusBar from 'component/common/status-bar';
/* @endif */
@@ -135,6 +136,7 @@ function Page(props: Props) {
<StatusBar />
{/* @endif */}
</div>
<DownloadProgress />
</Fragment>
);
}
+20
View File
@@ -0,0 +1,20 @@
import { connect } from 'react-redux';
import { withRouter } from 'react-router';
import {
selectMyPublishedPlaylistCollections,
selectMyUnpublishedCollections, // should probably distinguish types
// selectSavedCollections,
} from 'redux/selectors/collections';
import { selectFetchingMyCollections } from 'redux/selectors/claims';
import PlaylistsMine from './view';
const select = (state) => {
return {
publishedCollections: selectMyPublishedPlaylistCollections(state),
unpublishedCollections: selectMyUnpublishedCollections(state),
// savedCollections: selectSavedCollections(state),
fetchingCollections: selectFetchingMyCollections(state),
};
};
export default withRouter(connect(select)(PlaylistsMine));
+182
View File
@@ -0,0 +1,182 @@
// @flow
import React from 'react';
import CollectionPreviewTile from 'component/collectionPreviewTile';
import Button from 'component/button';
import Icon from 'component/common/icon';
import * as ICONS from 'constants/icons';
import * as KEYCODES from 'constants/keycodes';
import Paginate from 'component/common/paginate';
import Yrbl from 'component/yrbl';
import classnames from 'classnames';
import { FormField, Form } from 'component/common/form';
type Props = {
publishedCollections: CollectionGroup,
unpublishedCollections: CollectionGroup,
// savedCollections: CollectionGroup,
fetchingCollections: boolean,
page: number,
pageSize: number,
history: { replace: (string) => void },
location: { search: string },
};
const ALL = 'All';
const PRIVATE = 'Private';
const PUBLIC = 'Public';
const COLLECTION_FILTERS = [ALL, PRIVATE, PUBLIC];
const FILTER_TYPE_PARAM = 'type';
const PAGE_PARAM = 'page';
export default function PlaylistsMine(props: Props) {
const {
publishedCollections,
unpublishedCollections,
// savedCollections, these are resolved on startup from sync'd claimIds or urls
fetchingCollections,
history,
location,
} = props;
const { search } = location;
const urlParams = new URLSearchParams(search);
const page = Number(urlParams.get(PAGE_PARAM)) || 1;
const type = urlParams.get(FILTER_TYPE_PARAM) || ALL;
const pageSize = 12;
const unpublishedCollectionsList = (Object.keys(unpublishedCollections || {}): any);
const publishedList = (Object.keys(publishedCollections || {}): any);
const hasCollections = unpublishedCollectionsList.length || publishedList.length;
const [filterType, setFilterType] = React.useState(type);
const [searchText, setSearchText] = React.useState('');
let collectionsToShow = [];
if (filterType === ALL) {
collectionsToShow = unpublishedCollectionsList.concat(publishedList);
} else if (filterType === PRIVATE) {
collectionsToShow = unpublishedCollectionsList;
} else if (filterType === PUBLIC) {
collectionsToShow = publishedList;
}
let filteredCollections;
if (searchText && collectionsToShow) {
filteredCollections = collectionsToShow.filter((id) => {
return (
(unpublishedCollections[id] &&
unpublishedCollections[id].name.toLocaleLowerCase().includes(searchText.toLocaleLowerCase())) ||
(publishedCollections[id] &&
publishedCollections[id].name.toLocaleLowerCase().includes(searchText.toLocaleLowerCase()))
);
});
} else {
filteredCollections = collectionsToShow || [];
}
const shouldPaginate = filteredCollections.length > pageSize;
const paginateStartIndex = shouldPaginate ? (page - 1) * pageSize : 0;
const paginateEndIndex = paginateStartIndex + pageSize;
const paginatedCollections = filteredCollections.slice(paginateStartIndex, paginateEndIndex);
function escapeListener(e: SyntheticKeyboardEvent<*>) {
if (e.keyCode === KEYCODES.ESCAPE) {
e.preventDefault();
setSearchText('');
}
}
function onTextareaFocus() {
window.addEventListener('keydown', escapeListener);
}
function onTextareaBlur() {
window.removeEventListener('keydown', escapeListener);
}
function handleFilterType(val) {
const newParams = new URLSearchParams();
if (val) {
newParams.set(FILTER_TYPE_PARAM, val);
}
newParams.set(PAGE_PARAM, '1');
history.replace(`?${newParams.toString()}`);
setFilterType(val);
}
return (
<>
<div className="claim-grid__wrapper">
<div className="claim-grid__header section">
<h1 className="claim-grid__title">
{__('Playlists')}
{!hasCollections && !fetchingCollections && (
<div className="claim-grid__title--empty">{__('(Empty) --[indicates empty playlist]--')}</div>
)}
{!hasCollections && fetchingCollections && (
<div className="claim-grid__title--empty">{__('(Empty) --[indicates empty playlist]--')}</div>
)}
</h1>
</div>
<div className="section__header--actions">
<div className="claim-search__wrapper">
<div className="claim-search__menu-group">
{COLLECTION_FILTERS.map((value) => (
<Button
label={__(value)}
key={value}
button="alt"
onClick={() => handleFilterType(value)}
className={classnames('button-toggle', {
'button-toggle--active': filterType === value,
})}
/>
))}
</div>
</div>
<Form onSubmit={() => {}} className="wunderbar--inline">
<Icon icon={ICONS.SEARCH} />
<FormField
onFocus={onTextareaFocus}
onBlur={onTextareaBlur}
className="wunderbar__input--inline"
value={searchText}
onChange={(e) => setSearchText(e.target.value)}
type="text"
placeholder={__('Search')}
/>
</Form>
</div>
{Boolean(hasCollections) && (
<div>
{/* TODO: fix above spacing hack */}
<div className="claim-grid">
{paginatedCollections &&
paginatedCollections.length > 0 &&
paginatedCollections.map((key) => <CollectionPreviewTile tileLayout collectionId={key} key={key} />)}
{!paginatedCollections.length && <div className="empty main--empty">{__('No matching playlists')}</div>}
</div>
{shouldPaginate && (
<Paginate
totalPages={
filteredCollections.length > 0 ? Math.ceil(filteredCollections.length / Number(pageSize)) : 1
}
/>
)}
</div>
)}
{!hasCollections && !fetchingCollections && (
<div className="main--empty">
<Yrbl type={'sad'} title={__('You have no lists yet. Better start hoarding!')} />
</div>
)}
{!hasCollections && fetchingCollections && (
<div className="main--empty">
<h2 className="main--empty empty">{__('Loading...')}</h2>
</div>
)}
</div>
</>
);
}
+2
View File
@@ -45,6 +45,7 @@ import InvitedPage from 'page/invited';
import LibraryPage from 'page/library';
import ListBlockedPage from 'page/listBlocked';
import ListsPage from 'page/lists';
import PlaylistsPage from 'page/playlists';
import OwnComments from 'page/ownComments';
import PasswordResetPage from 'page/passwordReset';
import PasswordSetPage from 'page/passwordSet';
@@ -294,6 +295,7 @@ function AppRouter(props: Props) {
<PrivateRoute {...props} path={`/$/${PAGES.REWARDS_VERIFY}`} component={RewardsVerifyPage} />
<PrivateRoute {...props} path={`/$/${PAGES.LIBRARY}`} component={LibraryPage} />
<PrivateRoute {...props} path={`/$/${PAGES.LISTS}`} component={ListsPage} />
<PrivateRoute {...props} path={`/$/${PAGES.PLAYLISTS}`} component={PlaylistsPage} />
<PrivateRoute {...props} path={`/$/${PAGES.TAGS_FOLLOWING_MANAGE}`} component={TagsFollowingManagePage} />
<PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_BLOCKED_MUTED}`} component={ListBlockedPage} />
<PrivateRoute {...props} path={`/$/${PAGES.SETTINGS_CREATOR}`} component={SettingsCreatorPage} />
+1
View File
@@ -27,6 +27,7 @@ exports.HOME = 'home';
exports.HELP = 'help';
exports.LIBRARY = 'library';
exports.LISTS = 'lists';
exports.PLAYLISTS = 'playlists';
exports.INVITE = 'invite';
exports.DEPRECATED__PUBLISH = 'publish';
exports.DEPRECATED__PUBLISHED = 'published';
+1 -29
View File
@@ -1,31 +1,3 @@
import { connect } from 'react-redux';
import { doPurchaseList } from 'redux/actions/claims';
import { selectMyPurchases, selectIsFetchingMyPurchases } from 'redux/selectors/claims';
import { selectDownloadUrlsCount, selectIsFetchingFileList } from 'redux/selectors/file_info';
import {
selectBuiltinCollections,
selectMyPublishedMixedCollections,
selectMyPublishedPlaylistCollections,
selectMyUnpublishedCollections, // should probably distinguish types
// selectSavedCollections, // TODO: implement saving and copying collections
} from 'redux/selectors/collections';
import ListsPage from './view';
const select = (state) => ({
allDownloadedUrlsCount: selectDownloadUrlsCount(state),
fetchingFileList: selectIsFetchingFileList(state),
myPurchases: selectMyPurchases(state),
fetchingMyPurchases: selectIsFetchingMyPurchases(state),
builtinCollections: selectBuiltinCollections(state),
publishedCollections: selectMyPublishedMixedCollections(state),
publishedPlaylists: selectMyPublishedPlaylistCollections(state),
unpublishedCollections: selectMyUnpublishedCollections(state),
// savedCollections: selectSavedCollections(state),
});
export default connect(select, {
doPurchaseList,
})(ListsPage);
export default ListsPage;
+3
View File
@@ -0,0 +1,3 @@
import PlaylistsPage from './view';
export default PlaylistsPage;
+22
View File
@@ -0,0 +1,22 @@
// @flow
import * as ICONS from 'constants/icons';
import React from 'react';
import Page from 'component/page';
import PlaylistsMine from 'component/playlistsMine';
import Icon from 'component/common/icon';
function PlaylistsPage() {
return (
<Page>
<label className="claim-list__header-label">
<span>
<Icon icon={ICONS.STACK} size={10} />
{__('Playlists')}
</span>
</label>
<PlaylistsMine />
</Page>
);
}
export default PlaylistsPage;
+24 -4
View File
@@ -14,29 +14,30 @@ import {
} from 'redux/selectors/file_info';
import { makeSelectUrlsForCollectionId } from 'redux/selectors/collections';
import { doToast } from 'redux/actions/notifications';
import { doPurchaseUri } from 'redux/actions/file';
import { doPurchaseUri, doDeleteFile } from 'redux/actions/file';
import Lbry from 'lbry';
import * as SETTINGS from 'constants/settings';
import { makeSelectCostInfoForUri, Lbryio } from 'lbryinc';
import { makeSelectClientSetting, selectosNotificationsEnabled, selectDaemonSettings } from 'redux/selectors/settings';
const DOWNLOAD_POLL_INTERVAL = 1000;
var timeOutHash = {};
export function doUpdateLoadStatus(uri: string, outpoint: string) {
export function doUpdateLoadStatus(uri: any, outpoint: string) {
// Updates the loading status for a uri as it's downloading
// Calls file_list and checks the written_bytes value to see if the number has increased
// Not needed on web as users aren't actually downloading the file
// @if TARGET='app'
return (dispatch: Dispatch, getState: GetState) => {
const setNextStatusUpdate = () =>
setTimeout(() => {
(timeOutHash[outpoint] = setTimeout(() => {
// We need to check if outpoint still exists first because user are able to delete file (outpoint) while downloading.
// If a file is already deleted, no point to still try update load status
const byOutpoint = selectFileInfosByOutpoint(getState());
if (byOutpoint[outpoint]) {
dispatch(doUpdateLoadStatus(uri, outpoint));
}
}, DOWNLOAD_POLL_INTERVAL);
}, DOWNLOAD_POLL_INTERVAL));
Lbry.file_list({
outpoint,
@@ -96,6 +97,25 @@ export function doUpdateLoadStatus(uri: string, outpoint: string) {
// @endif
}
export function doContinueDownloading(outpoint: string, force: boolean) {
return (dispatch: Dispatch) => {
if (!timeOutHash[outpoint] || force) {
dispatch(doUpdateLoadStatus(null, outpoint));
}
};
}
export function doStopDownload(outpoint: string) {
return (dispatch: Dispatch) => {
if (timeOutHash[outpoint]) {
clearInterval(timeOutHash[outpoint]);
timeOutHash[outpoint] = undefined;
}
dispatch(doDeleteFile(outpoint, false, false, null));
};
}
export function doSetPrimaryUri(uri: ?string) {
return (dispatch: Dispatch) => {
dispatch({
+1
View File
@@ -66,3 +66,4 @@
@import 'component/empty';
@import 'component/stripe-card';
@import 'component/wallet-tip-send';
@import 'component/download-progress';
-3
View File
@@ -40,9 +40,6 @@ $actions-z-index: 2;
width: 100%;
height: 100%;
position: absolute;
p {
padding: var(--spacing-m);
}
}
.channel-cover__gradient {
+1
View File
@@ -720,6 +720,7 @@
margin: 0 0;
padding: var(--spacing-xxs) var(--spacing-xxs);
height: unset;
background-color: var(--color-header-background);
// label (with 'Add' text) hidden by default
.button__label {
+6
View File
@@ -136,3 +136,9 @@
}
}
}
.collection-grid__results-summary {
padding: 0;
padding-bottom: var(--spacing-m);
color: var(--color-text-help);
}
+224
View File
@@ -0,0 +1,224 @@
.download-progress__header {
padding: 15px;
position: fixed;
bottom: 0;
right: 0;
width: 400px;
display: flex;
flex-direction: column;
background-color: var(--color-header-background); //var(--color-gray-9):dark-mode
border-radius: var(--border-radius);
// border: 1px solid var(--color-gray-3);
z-index: 9999;
}
.download-progress__top-close-button {
position: absolute;
top: 7px;
right: 15px;
font-size: 35px;
background-color: transparent;
width: 15px;
height: 15px;
div {
height: 2px;
width: 13px;
background-color: var(--color-gray-4);
border-radius: var(--border-radius);
}
}
.download-progress__state-container {
margin-top: 10px;
padding-bottom: 10px;
display: flex;
flex-direction: column;
width: 100%;
}
.download-progress__state-filename {
margin: 0;
font-weight: 800;
font-size: 13px;
flex: 1;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-right: 10px;
span.button__label {
color: var(--color-text);
}
}
.download-progress__state-filename-link {
margin: 0;
font-weight: 800;
font-size: 13px;
flex: 1;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-right: 10px;
text-decoration: underline;
cursor: pointer;
}
.download-progress__release-time {
margin: 0;
font-weight: 800;
font-size: 12px;
margin-left: auto;
font-style: italic;
}
.download-progress__state-bar {
display: flex;
flex-direction: row;
width: 100%;
align-items: center;
margin-bottom: 2px;
}
.download-progress__bar-container {
width: 100%;
background-color: var(--color-gray-5);
height: 6px;
border-radius: var(--border-radius);
}
.download-progress__bar-content {
border-radius: var(--border-radius);
height: 100%;
background-color: var(--color-primary);
}
.download-progress__close-button {
flex-shrink: 0;
margin-left: auto;
font-size: 20px;
cursor: pointer;
}
.download-progress__playing-button {
flex-shrink: 0;
margin-left: auto;
width: 29.6px;
height: 29.6px;
}
.download-progress__count-time {
font-size: 11px;
letter-spacing: -0.6px;
}
.download-progress__divider {
border-top: 1px solid var(--color-gray-6);
margin-left: -15px;
width: 110%;
}
.download-progress__cancel {
margin-top: 7px;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.download-progress__cancel p {
margin: 0;
font-size: 12px;
margin: 0;
white-space: nowrap;
width: 285px;
overflow: hidden;
text-overflow: ellipsis;
}
.download-progress__cancel b {
font-size: 13px;
}
.download-progress__cancel-confirm {
width: 90px;
display: flex;
justify-content: space-around;
align-items: center;
}
.download-progress__cancel-ok {
border: none;
background-color: transparent;
font-size: 13px;
color: var(--color-text);
}
.download-progress__cancel-ok:hover {
color: var(--color-primary);
}
.download__container {
position: fixed;
bottom: 10px;
right: 10px;
width: 400px;
height: 300px;
border-radius: var(--border-radius);
box-shadow: 2px 2px 5px var(--color-gray-4);
background-color: var(--color-white);
transition: width 2s;
}
.download-progress__toggle-button {
position: fixed;
bottom: 10px;
right: 10px;
border: none;
background: var(--color-header-background);
color: var(--color-gray-6);
width: 50px;
height: 50px;
border-radius: var(--border-radius);
box-shadow: 0px 5px 4px var(--color-gray-4);
display: flex;
justify-content: center;
align-items: center;
}
.download_close_modal {
float: right;
margin-right: 10px;
font-size: 25px;
}
.download-progress__current-downloading {
position: fixed;
bottom: 25px;
right: 15px;
border: none;
width: 30px;
height: 30px;
display: flex;
justify-content: center;
align-items: center;
margin: 0;
animation-name: downloadcount;
animation-duration: 1.3s;
animation-iteration-count: infinite;
.notification__bubble {
height: 1.5rem;
width: 1.5rem;
border-radius: 50%;
background-color: var(--color-editor-tag);
position: absolute;
top: -0.5rem;
right: -0.5rem;
color: white;
font-size: var(--font-small);
font-weight: bold;
line-height: 1;
display: flex;
align-items: center;
justify-content: center;
}
.notification__bubble--small {
font-size: var(--font-xsmall);
}
.notification__bubble--inline {
@extend .notification__bubble;
top: 0.75rem;
right: 1rem;
}
}
@keyframes downloadcount {
0% {
transform: translateY(-10px);
}
50% {
transform: translateY(-3px);
}
100% {
transform: translateY(-10px);
}
}
+16 -8
View File
@@ -313,14 +313,16 @@ fieldset-group {
}
&:nth-of-type(2) {
input,
select {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
label {
margin-left: var(--spacing-s);
&:not(input.paginate-channel) {
// yuck
input,
select {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
label {
margin-left: var(--spacing-s);
}
}
}
}
@@ -331,6 +333,12 @@ fieldset-group {
align-items: flex-end;
justify-content: center;
}
&.fieldgroup--paginate-top {
padding-bottom: var(--spacing-m);
align-items: flex-end;
justify-content: center;
}
}
// This is a special case where the prefix appears "inside" the input
+6
View File
@@ -121,6 +121,12 @@
overflow-x: hidden;
}
.menu__link-disable {
@extend .menu__link;
color: var(--color-text-subtitle)!important;
}
.menu__link--notification {
width: 100%;
display: flex;
+5
View File
@@ -48,6 +48,11 @@
flex-wrap: wrap;
}
.section__header-action-stack {
display: flex;
flex-direction: column;
}
.section__flex {
display: flex;
align-items: flex-start;
+18
View File
@@ -0,0 +1,18 @@
export function areEqual(first, second) {
if (first.length !== second.length) {
return false;
}
for (let i = 0; i < first.length; i++) {
if (!second.includes(first[i])) {
return false;
}
}
return true;
}
export function removeItem(array, item) {
const index = array.indexOf(item);
if (index > -1) {
array.splice(index, 1);
}
}
+24
View File
@@ -0,0 +1,24 @@
// @flow
/**
* Helper to extract livestream claim uris from the output of
* `selectActiveLivestreams`.
*
* @param activeLivestreams Object obtained from `selectActiveLivestreams`.
* @param channelIds List of channel IDs to filter the results with.
* @returns {[]|Array<*>}
*/
export function getLivestreamUris(activeLivestreams: ?LivestreamInfo, channelIds: ?Array<string>) {
let values = (activeLivestreams && Object.values(activeLivestreams)) || [];
if (channelIds && channelIds.length > 0) {
// $FlowFixMe
values = values.filter((v) => channelIds.includes(v.creatorId) && Boolean(v.latestClaimUri));
} else {
// $FlowFixMe
values = values.filter((v) => Boolean(v.latestClaimUri));
}
// $FlowFixMe
return values.map((v) => v.latestClaimUri);
}