Compare commits

...

3 commits

Author SHA1 Message Date
saltrafael
c97b9c23e9 Fix icon color 2021-08-03 12:19:54 -04:00
saltrafael
8b70aa65c4 Bump redux 2021-08-03 12:19:52 -04:00
saltrafael
e76eddbf56 Show on content page if a file is part of a playlist already 2021-08-03 12:19:42 -04:00
7 changed files with 31 additions and 11 deletions

View file

@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Add watch later to hover action for last used playlist on popup _community pr!_ ([#6274](https://github.com/lbryio/lbry-desktop/pull/6274)) - Add watch later to hover action for last used playlist on popup _community pr!_ ([#6274](https://github.com/lbryio/lbry-desktop/pull/6274))
- Open in desktop (web feature) _community pr!_ ([#6667](https://github.com/lbryio/lbry-desktop/pull/6667)) - Open in desktop (web feature) _community pr!_ ([#6667](https://github.com/lbryio/lbry-desktop/pull/6667))
- Add confirmation on comment removal _community pr!_ ([#6563](https://github.com/lbryio/lbry-desktop/pull/6563)) - Add confirmation on comment removal _community pr!_ ([#6563](https://github.com/lbryio/lbry-desktop/pull/6563))
- Show on content page if a file is part of a playlist already _community pr!_([#6393](https://github.com/lbryio/lbry-desktop/pull/6393))
### Changed ### Changed
- Use Canonical Url for copy link ([#6500](https://github.com/lbryio/lbry-desktop/pull/6500)) - Use Canonical Url for copy link ([#6500](https://github.com/lbryio/lbry-desktop/pull/6500))

View file

@ -1,11 +1,17 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { doOpenModal } from 'redux/actions/app'; import { doOpenModal } from 'redux/actions/app';
import CollectionAddButton from './view'; import CollectionAddButton from './view';
import { makeSelectClaimForUri } from 'lbry-redux'; import { makeSelectClaimForUri, makeSelectClaimUrlInCollection } from 'lbry-redux';
const select = (state, props) => ({ const select = (state, props) => {
claim: makeSelectClaimForUri(props.uri)(state), const claim = makeSelectClaimForUri(props.uri)(state);
}); const permanentUrl = claim && claim.permanent_url;
return {
claim,
isSaved: makeSelectClaimUrlInCollection(permanentUrl)(state),
};
};
export default connect(select, { export default connect(select, {
doOpenModal, doOpenModal,

View file

@ -11,10 +11,11 @@ type Props = {
fileAction?: boolean, fileAction?: boolean,
type?: boolean, type?: boolean,
claim: Claim, claim: Claim,
isSaved: boolean,
}; };
export default function CollectionAddButton(props: Props) { export default function CollectionAddButton(props: Props) {
const { doOpenModal, uri, fileAction, type = 'playlist', claim } = props; const { doOpenModal, uri, fileAction, type = 'playlist', claim, isSaved } = props;
// $FlowFixMe // $FlowFixMe
const streamType = (claim && claim.value && claim.value.stream_type) || ''; const streamType = (claim && claim.value && claim.value.stream_type) || '';
@ -24,10 +25,14 @@ export default function CollectionAddButton(props: Props) {
return ( return (
<Button <Button
button={fileAction ? undefined : 'alt'} button={fileAction ? undefined : 'alt'}
className={classnames({ 'button--file-action': fileAction })} className={classnames({
icon={fileAction ? ICONS.ADD : ICONS.LIBRARY} 'button--file-action': fileAction,
'button--file-action-active': fileAction && isSaved,
})}
icon={fileAction ? (!isSaved ? ICONS.ADD : ICONS.STACK) : ICONS.LIBRARY}
iconSize={fileAction ? 22 : undefined} iconSize={fileAction ? 22 : undefined}
label={uri ? __('Save') : __('New List')} iconColor={isSaved && 'primary'}
label={uri ? (!isSaved ? __('Save') : __('Saved')) : __('New List')}
requiresAuth={IS_WEB} requiresAuth={IS_WEB}
title={__('Add this claim to a list')} title={__('Add this claim to a list')}
onClick={(e) => { onClick={(e) => {

View file

@ -3,6 +3,7 @@ import * as ICONS from 'constants/icons';
import React from 'react'; import React from 'react';
import classnames from 'classnames'; import classnames from 'classnames';
import { icons } from './icon-custom'; import { icons } from './icon-custom';
import { DOMAIN } from 'config';
// It would be nice to standardize this somehow // It would be nice to standardize this somehow
// These are copied from `scss/vars`, can they both come from the same source? // These are copied from `scss/vars`, can they both come from the same source?
@ -38,6 +39,8 @@ class IconComponent extends React.PureComponent<Props> {
getIconColor = (color: string) => { getIconColor = (color: string) => {
switch (color) { switch (color) {
case 'primary':
return DOMAIN === 'odysee.com' ? RED_COLOR : GREEN_COLOR;
case 'red': case 'red':
return RED_COLOR; return RED_COLOR;
case 'green': case 'green':

View file

@ -240,6 +240,11 @@
} }
} }
.button--file-action-active {
@extend .button--file-action;
color: var(--color-link);
}
.button--fire { .button--fire {
color: var(--color-fire); color: var(--color-fire);
position: relative; position: relative;

View file

@ -31,7 +31,7 @@
"koa-logger": "^3.2.1", "koa-logger": "^3.2.1",
"koa-send": "^5.0.0", "koa-send": "^5.0.0",
"koa-static": "^5.0.0", "koa-static": "^5.0.0",
"lbry-redux": "lbryio/lbry-redux#508e8d36fd91106beb7d6b4edb9f726dae0e6264", "lbry-redux": "lbryio/lbry-redux#9ebfc927d087193a29c0650993f0aa8be492a8c4",
"lbryinc": "lbryio/lbryinc#8f9a58bfc8312a65614fd7327661cdcc502c4e59", "lbryinc": "lbryio/lbryinc#8f9a58bfc8312a65614fd7327661cdcc502c4e59",
"mysql": "^2.17.1", "mysql": "^2.17.1",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",

View file

@ -3331,9 +3331,9 @@ latest-version@^3.0.0:
dependencies: dependencies:
package-json "^4.0.0" package-json "^4.0.0"
lbry-redux@lbryio/lbry-redux#508e8d36fd91106beb7d6b4edb9f726dae0e6264: lbry-redux@lbryio/lbry-redux#9ebfc927d087193a29c0650993f0aa8be492a8c4:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/508e8d36fd91106beb7d6b4edb9f726dae0e6264" resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/9ebfc927d087193a29c0650993f0aa8be492a8c4"
dependencies: dependencies:
proxy-polyfill "0.1.6" proxy-polyfill "0.1.6"
reselect "^3.0.0" reselect "^3.0.0"