-
- {/* if the transactions are loading */}
- {loading && (
-
-
-
- )}
- {/* when the transactions are finished loading */}
- {!loading && (
- <>
- {showIntro ? (
-
- ) : (
-
-
-
-
- )}
-
- )}
+ {stripeEnvironment && (
+
+
+
+ {__('LBRY Credits')}
+ {__('Account History')}
+ {__('Payment History')}
+
+
+
+
+
+ {/* if the transactions are loading */}
+ {loading && (
+
+
+
+ )}
+ {/* when the transactions are finished loading */}
+ {!loading && (
+ <>
+ {showIntro ? (
+
+ ) : (
+
+
+
+
+ )}
+
+ )}
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {/* @endif */}
- {/* @if TARGET='app' */}
-
- {loading && (
-
-
-
- )}
- {!loading && (
- <>
- {showIntro ? (
-
- ) : (
-
-
-
-
- )}
-
- )}
-
- {/* @endif */}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )}
+ {!stripeEnvironment && (
+
+ {loading && (
+
+
+
+ )}
+ {!loading && (
+ <>
+ {showIntro ? (
+
+ ) : (
+
+
+
+
+ )}
+
+ )}
+
+ )}
);
};
diff --git a/ui/util/stripe.js b/ui/util/stripe.js
new file mode 100644
index 000000000..09a72308b
--- /dev/null
+++ b/ui/util/stripe.js
@@ -0,0 +1,13 @@
+// @flow
+import { STRIPE_PUBLIC_KEY } from 'config';
+import * as STRIPE_CONSTS from 'constants/stripe';
+export function getStripeEnvironment() {
+ if (STRIPE_PUBLIC_KEY) {
+ if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
+ return STRIPE_CONSTS.LIVE;
+ } else {
+ return STRIPE_CONSTS.TEST;
+ }
+ }
+ return null;
+}
--
2.45.2
From 503e5e9b76513ad0f3c7afa0aa219d1de6107dfc Mon Sep 17 00:00:00 2001
From: zeppi
Date: Tue, 17 Aug 2021 18:34:58 -0400
Subject: [PATCH 2/4] v0.51.2-rc.3
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index fcde26e5b..b4b78d99e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "lbry",
- "version": "0.51.2-rc.2",
+ "version": "0.51.2-rc.3",
"description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
"keywords": [
"lbry"
--
2.45.2
From afe4fee3f32db78926f7bc4447b0e79ee6e6a272 Mon Sep 17 00:00:00 2001
From: infinite-persistence
Date: Mon, 2 Aug 2021 20:33:31 +0800
Subject: [PATCH 3/4] Fallback image for
## Ticket
5457 Create file thumbnail fallback image for odysee
## Approach
Since `background-image` does not invoke an `onerror` event, create a test Image instance to have the `onerror` capability. This technique is used by majority of plugins. No additional fetch is seen with this technique.
---
.env.defaults | 1 +
config.js | 1 +
ui/component/fileThumbnail/thumb.jsx | 6 ++++--
ui/component/fileThumbnail/view.jsx | 5 ++++-
ui/effects/use-lazy-loading.js | 10 ++++++++++
5 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/.env.defaults b/.env.defaults
index 5274f8c68..48c0ebb66 100644
--- a/.env.defaults
+++ b/.env.defaults
@@ -52,6 +52,7 @@ YRBL_SAD_IMG_URL=https://cdn.lbryplayer.xyz/api/v3/streams/free/yrbl-sad/c2d9649
#LOGO_TEXT_LIGHT=https://cdn.lbryplayer.xyz/api/v3/streams/free/yrbl-sad/c2d9649633d974e5ffb503925e1f17d951f1bd0f/f262dd
#LOGO_TEXT_DARK=https://cdn.lbryplayer.xyz/api/v3/streams/free/yrbl-sad/c2d9649633d974e5ffb503925e1f17d951f1bd0f/f262dd
#AVATAR_DEFAULT=
+#MISSING_THUMB_DEFAULT=
#FAVICON=
# LOCALE
diff --git a/config.js b/config.js
index 89c916654..49e215c5b 100644
--- a/config.js
+++ b/config.js
@@ -35,6 +35,7 @@ const config = {
LOGO_TEXT_LIGHT: process.env.LOGO_TEXT_LIGHT,
LOGO_TEXT_DARK: process.env.LOGO_TEXT_DARK,
AVATAR_DEFAULT: process.env.AVATAR_DEFAULT,
+ MISSING_THUMB_DEFAULT: process.env.MISSING_THUMB_DEFAULT,
// OG
OG_TITLE_SUFFIX: process.env.OG_TITLE_SUFFIX,
OG_HOMEPAGE_TITLE: process.env.OG_HOMEPAGE_TITLE,
diff --git a/ui/component/fileThumbnail/thumb.jsx b/ui/component/fileThumbnail/thumb.jsx
index 64f11c138..9f2fb993e 100644
--- a/ui/component/fileThumbnail/thumb.jsx
+++ b/ui/component/fileThumbnail/thumb.jsx
@@ -6,14 +6,16 @@ import useLazyLoading from 'effects/use-lazy-loading';
type Props = {
thumb: string,
+ fallback: ?string,
children?: Node,
className?: string,
};
const Thumb = (props: Props) => {
- const { thumb, children, className } = props;
+ const { thumb, fallback, children, className } = props;
const thumbnailRef = React.useRef(null);
- useLazyLoading(thumbnailRef);
+
+ useLazyLoading(thumbnailRef, fallback || '');
return (
diff --git a/ui/component/fileThumbnail/view.jsx b/ui/component/fileThumbnail/view.jsx
index 6da4e513c..a5ef83ab6 100644
--- a/ui/component/fileThumbnail/view.jsx
+++ b/ui/component/fileThumbnail/view.jsx
@@ -4,6 +4,7 @@ import { getThumbnailCdnUrl } from 'util/thumbnail';
import React from 'react';
import FreezeframeWrapper from './FreezeframeWrapper';
import Placeholder from './placeholder.png';
+import { MISSING_THUMB_DEFAULT } from 'config';
import classnames from 'classnames';
import Thumb from './thumb';
@@ -42,6 +43,8 @@ function FileThumbnail(props: Props) {
);
}
+ const fallback = MISSING_THUMB_DEFAULT ? getThumbnailCdnUrl({ thumbnail: MISSING_THUMB_DEFAULT }) : undefined;
+
let url = thumbnail || (hasResolvedClaim ? Placeholder : '');
// @if TARGET='web'
// Pass image urls through a compression proxy
@@ -54,7 +57,7 @@ function FileThumbnail(props: Props) {
if (hasResolvedClaim || thumbnailUrl) {
return (
-
+
{children}
);
diff --git a/ui/effects/use-lazy-loading.js b/ui/effects/use-lazy-loading.js
index 8e9ed8555..18ac92be5 100644
--- a/ui/effects/use-lazy-loading.js
+++ b/ui/effects/use-lazy-loading.js
@@ -5,11 +5,13 @@ import React, { useEffect } from 'react';
/**
* Helper React hook for lazy loading images
* @param elementRef - A React useRef instance to the element to lazy load.
+ * @param backgroundFallback
* @param yOffsetPx - Number of pixels from the viewport to start loading.
* @param {Array<>} [deps=[]] - The dependencies this lazy-load is reliant on.
*/
export default function useLazyLoading(
elementRef: { current: ?ElementRef },
+ backgroundFallback: string = '',
yOffsetPx: number = 500,
deps: Array = []
) {
@@ -42,11 +44,19 @@ export default function useLazyLoading(
// $FlowFixMe
target.src = target.dataset.src;
setSrcLoaded(true);
+ // No fallback handling here (clients have access to 'onerror' on the image ref).
return;
}
// useful for lazy loading background images on divs
if (target.dataset.backgroundImage) {
+ if (backgroundFallback) {
+ const tmpImage = new Image();
+ tmpImage.onerror = () => {
+ target.style.backgroundImage = `url(${backgroundFallback})`;
+ };
+ tmpImage.src = target.dataset.backgroundImage;
+ }
target.style.backgroundImage = `url(${target.dataset.backgroundImage})`;
}
}
--
2.45.2
From 24ee71a00b953be9de7128be17ffbaced949231d Mon Sep 17 00:00:00 2001
From: zeppi
Date: Wed, 18 Aug 2021 10:45:37 -0400
Subject: [PATCH 4/4] aniview only web - v0.1
---
.../videoViewer/internal/plugins/videojs-aniview/plugin.js | 2 +-
ui/component/viewers/videoViewer/internal/videojs.jsx | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ui/component/viewers/videoViewer/internal/plugins/videojs-aniview/plugin.js b/ui/component/viewers/videoViewer/internal/plugins/videojs-aniview/plugin.js
index f51502be8..0dcdc20be 100644
--- a/ui/component/viewers/videoViewer/internal/plugins/videojs-aniview/plugin.js
+++ b/ui/component/viewers/videoViewer/internal/plugins/videojs-aniview/plugin.js
@@ -97,7 +97,7 @@ class AniviewPlugin extends Component {
}
}
-videojs.registerComponent('recsys', AniviewPlugin);
+videojs.registerComponent('aniview', AniviewPlugin);
const onPlayerReady = (player, options) => {
player.aniview = new AniviewPlugin(player, options);
diff --git a/ui/component/viewers/videoViewer/internal/videojs.jsx b/ui/component/viewers/videoViewer/internal/videojs.jsx
index 29366c338..d27bf7f1d 100644
--- a/ui/component/viewers/videoViewer/internal/videojs.jsx
+++ b/ui/component/viewers/videoViewer/internal/videojs.jsx
@@ -13,8 +13,9 @@ import hlsQualitySelector from './plugins/videojs-hls-quality-selector/plugin';
import recsys from './plugins/videojs-recsys/plugin';
import qualityLevels from 'videojs-contrib-quality-levels';
import isUserTyping from 'util/detect-typing';
+// @if TARGET='web'
import './plugins/videojs-aniview/plugin';
-
+// @endif
const isDev = process.env.NODE_ENV !== 'production';
export type Player = {
@@ -585,9 +586,11 @@ export default React.memo(function VideoJs(props: Props) {
// This must be initialized earlier than everything else
// otherwise a race condition occurs if we place this in the onReady call back
// allow if isDev because otherwise you'll never see ads when basing to master
+ // @if TARGET='web'
if ((allowPreRoll && SIMPLE_SITE) || isDev) {
vjs.aniview();
}
+ // @endif
// fixes #3498 (https://github.com/lbryio/lbry-desktop/issues/3498)
// summary: on firefox the focus would stick to the fullscreen button which caused buggy behavior with spacebar
@@ -662,6 +665,7 @@ export default React.memo(function VideoJs(props: Props) {
}, [source, reload]);
// Load IMA3 SDK for aniview
+ // @if TARGET='web'
useEffect(() => {
const script = document.createElement('script');
script.src = `https://imasdk.googleapis.com/js/sdkloader/ima3.js`;
@@ -674,6 +678,7 @@ export default React.memo(function VideoJs(props: Props) {
document.body.removeChild(script);
};
});
+ // @endif
return (
// $FlowFixMe
--
2.45.2