diff --git a/.env.defaults b/.env.defaults index d6e8d77b1..0275b72af 100644 --- a/.env.defaults +++ b/.env.defaults @@ -22,12 +22,16 @@ SITE_DESCRIPTION=Meet LBRY, an open, free, and community-controlled content wond LOGO_TITLE=lbry.tv SIMPLE_SITE=false SHOW_ADS=true -# OG +YRBL_HAPPY_IMG_URL=https://cdn.lbryplayer.xyz/api/v3/streams/free/yrbl-happy/7aa50a7e5adaf48691935d55e45d697547392929/839d9a +YRBL_SAD_IMG_URL=https://cdn.lbryplayer.xyz/api/v3/streams/free/yrbl-sad/c2d9649633d974e5ffb503925e1f17d951f1bd0f/f262dd + +# OG OG_TITLE_SUFFIX=| lbry.tv OG_HOMEPAGE_TITLE=lbry.tv OG_IMAGE_URL= SITE_CANONICAL_URL=https://lbry.tv + # LOCALE DEFAULT_LANGUAGE=en diff --git a/config.js b/config.js index 44049558b..edc0a4eec 100644 --- a/config.js +++ b/config.js @@ -22,6 +22,8 @@ const config = { OG_TITLE_SUFFIX: process.env.OG_TITLE_SUFFIX, OG_HOMEPAGE_TITLE: process.env.OG_HOMEPAGE_TITLE, OG_IMAGE_URL: process.env.OG_IMAGE_URL, + YRBL_HAPPY_IMG_URL: process.env.YRBL_HAPPY_IMG_URL, + YRBL_SAD_IMG_URL: process.env.YRBL_SAD_IMG_URL, SITE_CANONICAL_URL: process.env.SITE_CANONICAL_URL, DEFAULT_LANGUAGE: process.env.DEFAULT_LANGUAGE, AUTO_FOLLOW_CHANNELS: process.env.AUTO_FOLLOW_CHANNELS, diff --git a/static/app-strings.json b/static/app-strings.json index 7a43f6c9d..feef7fd9d 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -1119,7 +1119,7 @@ "Once the transaction is sent, it cannot be reversed.": "Once the transaction is sent, it cannot be reversed.", "Update Your Password": "Update Your Password", "Your Wallet is Empty": "Your Wallet is Empty", - "There are a lot of ways to get LBC! You can purchase your own, earn rewards, or have your friend send you a few.": "There are a lot of ways to get LBC! You can purchase your own, earn rewards, or have your friend send you a few.", + "Never fear though, there are tons of ways to earn LBC! You can earn or purchase LBC, or you can have your friends send you some.": "Never fear though, there are tons of ways to earn LBC! You can earn or purchase LBC, or you can have your friends send you some.", "Buy Credits": "Buy Credits", "Earn Rewards": "Earn Rewards", "Rewards are currently disabled for your account. Turn on diagnostic data sharing, in %settings%, to re-enable them.": "Rewards are currently disabled for your account. Turn on diagnostic data sharing, in %settings%, to re-enable them.", diff --git a/ui/component/publishFile/view.jsx b/ui/component/publishFile/view.jsx index 5a4b0a67d..79d515b33 100644 --- a/ui/component/publishFile/view.jsx +++ b/ui/component/publishFile/view.jsx @@ -337,7 +337,7 @@ function PublishFile(props: Props) { return ( {header} diff --git a/ui/component/userEmailVerify/view.jsx b/ui/component/userEmailVerify/view.jsx index 3de909ddb..e00653636 100644 --- a/ui/component/userEmailVerify/view.jsx +++ b/ui/component/userEmailVerify/view.jsx @@ -77,11 +77,11 @@ class UserEmailVerify extends React.PureComponent {

{ @@ -31,8 +30,8 @@ export default class extends React.PureComponent { Friendly gerbil {title && subtitle && (

-

{title}

-

{subtitle}

+

{title}

+

{subtitle}

)} diff --git a/ui/page/buy/view.jsx b/ui/page/buy/view.jsx index 9e5facf56..65bb9573c 100644 --- a/ui/page/buy/view.jsx +++ b/ui/page/buy/view.jsx @@ -88,7 +88,7 @@ export default function BuyPage(props: Props) { ); return ( - + {!user && (
diff --git a/ui/page/channelNew/view.jsx b/ui/page/channelNew/view.jsx index d40d02c13..2dd7588f3 100644 --- a/ui/page/channelNew/view.jsx +++ b/ui/page/channelNew/view.jsx @@ -1,10 +1,12 @@ // @flow +import * as PAGES from 'constants/pages'; +import * as ICONS from 'constants/icons'; import React from 'react'; import ChannelEdit from 'component/channelEdit'; import Page from 'component/page'; import Button from 'component/button'; import { useHistory } from 'react-router'; -import * as PAGES from 'constants/pages'; +import Yrbl from 'component/yrbl'; type Props = { balance: number, @@ -18,17 +20,32 @@ function ChannelNew(props: Props) { const emptyBalance = balance === 0; return ( - + {emptyBalance && ( -
-
-

You need LBC for this

-

Get sum coinz

-
-
-
+
+ +

{__('You need LBC to create a channel and upload content.')}

+

+ {__( + 'Never fear though, there are tons of ways to earn LBC! You can earn or purchase LBC, or you can have your friends send you some.' + )} +

+
+
+
+ } + />
)} diff --git a/ui/page/publish/view.jsx b/ui/page/publish/view.jsx index dd2a0dda4..2324fd1bc 100644 --- a/ui/page/publish/view.jsx +++ b/ui/page/publish/view.jsx @@ -1,10 +1,11 @@ // @flow -import React, { Fragment } from 'react'; +import * as ICONS from 'constants/icons'; +import * as PAGES from 'constants/pages'; +import React from 'react'; import PublishForm from 'component/publishForm'; import Page from 'component/page'; import Yrbl from 'component/yrbl'; -import LbcSymbol from 'component/common/lbc-symbol'; -import RewardAuthIntro from 'component/rewardAuthIntro'; +import Button from 'component/button'; type Props = { balance: number, @@ -23,40 +24,34 @@ function PublishPage(props: Props) { return ( - {balance === 0 ? ( - -
- -

- {__( - 'LBRY uses a blockchain, which is a fancy way of saying that users (you) are in control of your data.' - )} -

-

- {__('Because of the blockchain, some actions require LBRY credits')} ( - - ). -

-

- {' '} - {__( - 'allows you to do some neat things, like paying your favorite creators for their content. And no company can stop you.' - )} -

- - } - /> -
-
- -
-
- ) : ( - + {balance === 0 && ( +
+ +

{__('You need LBC to create a channel and upload content.')}

+

+ {__( + 'Never fear though, there are tons of ways to earn LBC! You can earn or purchase LBC, or you can have your friends send you some.' + )} +

+
+
+
+ } + /> +
)} +
); } diff --git a/ui/page/wallet/view.jsx b/ui/page/wallet/view.jsx index fe88062b2..1d1e1dd03 100644 --- a/ui/page/wallet/view.jsx +++ b/ui/page/wallet/view.jsx @@ -36,27 +36,29 @@ const WalletPage = (props: Props) => { {showIntro ? (
+

{__('You need LBC to create a channel and upload content.')}

{__( - 'There are a lot of ways to get LBC! You can purchase your own, earn rewards, or have your friend send you a few.' + 'Never fear though, there are tons of ways to earn LBC! You can earn or purchase LBC, or you can have your friends send you some.' )}