Compare commits

...
31 Commits
Author SHA1 Message Date
Sean Yesmunt 80b837679b v0.26.0 2018-12-11 14:08:39 -05:00
Sean Yesmunt 2389abad4d re-add build:dir script 2018-12-11 14:08:25 -05:00
Sean Yesmunt b191785b5e v0.26.0-rc.16 2018-12-10 12:05:02 -05:00
Sean Yesmunt d2f5a0f9d4 fix: CategoryList style 2018-12-10 12:02:56 -05:00
Thomas Zarebczan a06e79e575 chore: bump proper daemon
0.30.1!!
2018-12-10 10:35:43 -05:00
Thomas Zarebczan 6d765ae388 chore: bump rc 2018-12-07 20:14:51 -05:00
Thomas Zarebczan 98df27c3db chore: bump daemon rc 2018-12-07 20:08:48 -05:00
Sean Yesmunt 73f49ec787 update lbry-redux 2018-12-07 16:12:49 -05:00
Sean Yesmunt 195c4c0838 fix: can't preview alignment 2018-12-07 16:12:49 -05:00
Sean Yesmunt 4df7c36e8b hide abandonded claims 2018-12-07 16:12:49 -05:00
Sean Yesmunt 9614f3cfb1 fix: md button color in dark mode 2018-12-07 16:12:48 -05:00
Sean Yesmunt cc044b7de3 fix title wrapping 2018-12-07 16:12:48 -05:00
Sean Yesmunt 003b7fbdc4 update lbry-redux 2018-12-07 16:12:48 -05:00
Thomas Zarebczan af6e64b341 chore: bump rc and daemon rc 2018-12-06 10:23:08 -05:00
Sean Yesmunt 3ffd7ceb30 v0.26.0-rc.13 2018-12-05 16:20:26 -05:00
Sean Yesmunt c382fd1ca4 Merge branch 'rc-fixes' into release-0.26.0 2018-12-05 16:20:11 -05:00
Sean Yesmunt 724c1be3df v0.26.0-rc.12 2018-12-05 15:34:20 -05:00
Sean Yesmunt 88fb2c8420 Merge branch 'master' into release-0.26.0 2018-12-05 15:33:31 -05:00
Sean Yesmunt b6e316b301 v0.26.0-rc.11 2018-12-05 14:50:03 -05:00
Sean Yesmunt b7ff3f8d9d daemon v0.30.1rc8 2018-12-05 14:49:52 -05:00
Sean Yesmunt 770e2d27e7 v0.26.0-rc.10 2018-12-03 19:00:09 -05:00
Sean Yesmunt b380e5eff5 Merge branch 'master' into release-0.26.0 2018-12-03 18:59:52 -05:00
Sean Yesmunt b26abfd80e v0.26.0-rc.9 2018-11-29 01:20:05 -05:00
Sean Yesmunt 3b75c5f2d2 Merge branch 'master' into release-0.26.0 2018-11-29 01:19:51 -05:00
Sean Yesmunt 43670705f6 v0.26.0-rc.8 2018-11-28 18:52:28 -05:00
Sean Yesmunt bb1de34060 Merge pull request #2126 from lbryio/master
Merge master into release
2018-11-28 18:51:46 -05:00
Sean Yesmunt 240ca203f3 v0.26.0-rc.7 2018-11-20 00:57:04 -05:00
Sean Yesmunt 70fa4ad2fe Merge branch 'master' into release-0.26.0 2018-11-20 00:56:45 -05:00
Sean Yesmunt fe0fb60d96 v0.26.0-rc.6 2018-11-13 20:15:54 -05:00
Sean Yesmunt f7485e56a7 Merge branch 'master' into release-0.26.0 2018-11-13 20:15:39 -05:00
Sean Yesmunt 363f919f72 v0.26.0-rc.5 2018-11-08 16:01:40 -05:00
10 changed files with 82 additions and 10 deletions

No files matched your search

+4 -3
View File
@@ -1,6 +1,6 @@
{
"name": "LBRY",
"version": "0.26.0-rc.4",
"version": "0.26.0",
"description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
"keywords": [
"lbry"
@@ -23,6 +23,7 @@
"extract-langs": "node build/extractLocals.js",
"compile": "electron-webpack && yarn extract-langs",
"build": "yarn compile && electron-builder build",
"build:dir": "yarn build -- --dir -c.compression=store -c.mac.identity=null",
"dev": "electron-webpack dev",
"lint": "eslint 'src/**/*.{js,jsx}' --fix && flow",
"format": "prettier 'src/**/*.{js,jsx,scss,json}' --write",
@@ -49,7 +50,7 @@
"formik": "^0.10.4",
"hast-util-sanitize": "^1.1.2",
"keytar": "^4.2.1",
"lbry-redux": "lbryio/lbry-redux#84b7d396934d57a37802aadbef71db91230a9404",
"lbry-redux": "lbryio/lbry-redux#820b6eeadf9e58c1e5027fd4d92808ba817b410e",
"lbryinc": "lbryio/lbryinc#68c8ce6b7608dabc9180fff9b4841d10e1c62284",
"localforage": "^1.7.1",
"mammoth": "^1.4.6",
@@ -133,7 +134,7 @@
"yarn": "^1.3"
},
"lbrySettings": {
"lbrynetDaemonVersion": "0.30.1rc7",
"lbrynetDaemonVersion": "0.30.1",
"lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip",
"lbrynetDaemonDir": "static/daemon",
"lbrynetDaemonFileName": "lbrynet"
+27 -5
View File
@@ -7,6 +7,7 @@ import ToolTip from 'component/common/tooltip';
import FileCard from 'component/fileCard';
import Button from 'component/button';
import SubscribeButton from 'component/subscribeButton';
import classnames from 'classnames';
type Props = {
category: string,
@@ -16,6 +17,7 @@ type Props = {
channelClaims: ?Array<Claim>,
fetchChannel: string => void,
obscureNsfw: boolean,
isSubComponent: boolean,
};
type State = {
@@ -26,6 +28,7 @@ type State = {
class CategoryList extends PureComponent<Props, State> {
static defaultProps = {
categoryLink: '',
isSubComponent: false,
};
constructor() {
@@ -207,14 +210,27 @@ class CategoryList extends PureComponent<Props, State> {
}
render() {
const { category, categoryLink, names, channelClaims, obscureNsfw } = this.props;
const {
category,
categoryLink,
names,
channelClaims,
obscureNsfw,
isSubComponent,
} = this.props;
const { canScrollNext, canScrollPrevious } = this.state;
const isCommunityTopBids = category.match(/^community/i);
const showScrollButtons = isCommunityTopBids ? !obscureNsfw : true;
// isSubComponent is a hack, this component should be able to handle this with proper overflow styling
return (
<div className="card-row">
<div className="card-row__header">
<div
className={classnames('card-row__header', {
'card-row__header--sub-component': isSubComponent,
})}
>
<div className="card-row__title">
{categoryLink ? (
<div className="card__actions card__actions--no-margin">
@@ -234,7 +250,11 @@ class CategoryList extends PureComponent<Props, State> {
)}
</div>
{showScrollButtons && (
<div className="card-row__scroll-btns">
<div
className={classnames('card-row__scroll-btns', {
'card-row__scroll-btns--sub-component': isSubComponent,
})}
>
<Button
className="btn--arrow"
disabled={!canScrollPrevious}
@@ -259,7 +279,9 @@ class CategoryList extends PureComponent<Props, State> {
</div>
) : (
<div
className="card-row__scrollhouse"
className={classnames('card-row__scrollhouse', {
'card-row__scrollhouse--sub-component': isSubComponent,
})}
ref={ref => {
this.rowItems = ref;
}}
@@ -289,7 +311,7 @@ class CategoryList extends PureComponent<Props, State> {
{!channelClaims &&
!names &&
/* eslint-disable react/no-array-index-key */
new Array(10).fill(1).map((x, i) => <FileCard key={i} />)
new Array(10).fill(1).map((x, i) => <FileCard placeholder key={i} />)
/* eslint-enable react/no-array-index-key */
}
</div>
+11 -1
View File
@@ -29,11 +29,13 @@ type Props = {
isSubscribed: boolean,
showSubscribedLogo: boolean,
isNew: boolean,
placeholder: boolean,
};
class FileCard extends React.PureComponent<Props> {
static defaultProps = {
showSubscribedLogo: false,
placeholder: false,
};
componentWillMount() {
@@ -65,9 +67,17 @@ class FileCard extends React.PureComponent<Props> {
isSubscribed,
isNew,
showSubscribedLogo,
isResolvingUri,
placeholder,
} = this.props;
if (!claim && !pending) {
const abandoned = !isResolvingUri && !claim && !pending && !placeholder;
if (abandoned) {
return null;
}
if ((!claim && !pending) || placeholder) {
return (
<div className="card card--small">
<div className="card--placeholder card__media" />
@@ -23,7 +23,7 @@ class SuggestedSubscriptions extends PureComponent<Props> {
return suggested ? (
<div className="card__content subscriptions__suggested">
{suggested.map(({ uri, label }) => (
<CategoryList key={uri} category={label} categoryLink={uri} />
<CategoryList isSubComponent key={uri} category={label} categoryLink={uri} />
))}
</div>
) : null;
+6
View File
@@ -28,6 +28,12 @@ button {
font-weight: inherit;
}
h1 {
// Paul - Remove this in your changes
// This should be added to the media-title (or whatever that is called)
word-break: break-word;
}
ul {
list-style-type: none;
padding: 0;
+16
View File
@@ -306,6 +306,10 @@
// this needs to be used on a page with noPadding
// doing so allows the content to scroll to the edge of the screen
padding-left: $spacing-width;
&.card-row__header--sub-component {
padding-left: 0;
}
}
.card-row__message {
@@ -320,6 +324,12 @@
@media (min-width: $medium-breakpoint) {
padding-right: $spacing-width;
}
&.card-row__scroll-btns--sub-component {
@media (min-width: $medium-breakpoint) {
padding-right: 0;
}
}
}
.card-row__scrollhouse {
@@ -353,6 +363,12 @@
width: calc((100% / 8) - 27px);
}
}
&.card-row__scrollhouse--sub-component {
.card:first-of-type {
margin-left: 0;
}
}
}
.card-row__title {
@@ -54,6 +54,10 @@
padding-top: var(--video-aspect-ratio);
width: 100%;
.card__media-text {
margin-top: calc(-1 * var(--video-aspect-ratio));
}
&.content__empty--nsfw {
background-color: $lbry-grape-3;
}
@@ -59,6 +59,7 @@
.file-tile__title {
font-size: 1.1em;
word-break: break-word;
}
.file-tile__uri {
+4
View File
@@ -165,6 +165,10 @@ html[data-theme='dark'] {
a {
color: $lbry-white !important; // We need to use !important to override the CodeMirror styles
&.active {
background-color: rgba($lbry-black, 0.4);
}
&:hover {
color: $lbry-black !important;
}
+8
View File
@@ -5663,6 +5663,14 @@ lazy-val@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.3.tgz#bb97b200ef00801d94c317e29dc6ed39e31c5edc"
lbry-redux@lbryio/lbry-redux#820b6eeadf9e58c1e5027fd4d92808ba817b410e:
version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/820b6eeadf9e58c1e5027fd4d92808ba817b410e"
dependencies:
proxy-polyfill "0.1.6"
reselect "^3.0.0"
uuid "^3.3.2"
lbry-redux@lbryio/lbry-redux#84b7d396934d57a37802aadbef71db91230a9404:
version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/84b7d396934d57a37802aadbef71db91230a9404"