diff --git a/lbry b/lbry index af455ff52..043e2d0ab 160000 --- a/lbry +++ b/lbry @@ -1 +1 @@ -Subproject commit af455ff52ecc81be2229f1061318d607c4cc047d +Subproject commit 043e2d0ab96030468d53d02e311fd848f35c2dc1 diff --git a/lbryum b/lbryum index 39ace3737..121bda396 160000 --- a/lbryum +++ b/lbryum @@ -1 +1 @@ -Subproject commit 39ace3737509ff2b09fabaaa64d1525843de1325 +Subproject commit 121bda3963ee94f0c9c027813c55b71b38219739 diff --git a/ui/js/component/auth.js b/ui/js/component/auth.js index 197fc0b38..6cd547633 100644 --- a/ui/js/component/auth.js +++ b/ui/js/component/auth.js @@ -41,7 +41,7 @@ const SubmitEmailStage = React.createClass({ return (
- { this._emailRow = ref }} type="text" label="Email" placeholder="admin@toplbryfan.com" + { this._emailRow = ref }} type="text" label="Email" placeholder="scrwvwls@lbry.io" name="email" value={this.state.email} onChange={this.handleEmailChanged} />
@@ -128,9 +128,9 @@ const WelcomeStage = React.createClass({

Welcome to LBRY.

Using LBRY is like dating a centaur. Totally normal up top, and way different underneath.

-

On the upper level, LBRY is like other popular video and media sites.

-

Below, LBRY is controlled by its users -- you -- through the power of blockchain and decentralization.

-

Thanks for making it possible! Here's a nickel, kid.

+

Up top, LBRY is similar to popular media sites.

+

Below, LBRY is controlled by users -- you -- via blockchain and decentralization.

+

Thank you for making content freedom possible! Here's a nickel, kid.

@@ -143,6 +143,7 @@ const WelcomeStage = React.createClass({

This reward will show in your Wallet momentarily, probably while you are reading this message.

LBC is used to compensate creators, to publish, and to have say in how the network works.

No need to understand it all just yet! Try watching or downloading something next.

+

Finally, know that LBRY is a beta and that it earns the name.

); @@ -156,6 +157,7 @@ const ErrorStage = React.createClass({

An error was encountered that we cannot continue from.

At least we're earning the name beta.

+ { this.props.errorText ?

Message: {this.props.errorText}

: '' } { window.location.reload() } } />
); diff --git a/ui/js/component/file-actions.js b/ui/js/component/file-actions.js index fff8191e2..2f2a4074d 100644 --- a/ui/js/component/file-actions.js +++ b/ui/js/component/file-actions.js @@ -167,7 +167,7 @@ let FileActionsRow = React.createClass({ : '' } - Confirm you want to purchase this bro. + Do you want to purchase this? diff --git a/ui/js/lbryio.js b/ui/js/lbryio.js index d662354e6..99fcd0e0d 100644 --- a/ui/js/lbryio.js +++ b/ui/js/lbryio.js @@ -10,7 +10,7 @@ const lbryio = { enabled: false }; -const CONNECTION_STRING = 'https://api.lbry.io/'; +const CONNECTION_STRING = 'http://localhost:8080/'; const mocks = { 'reward_type.get': ({name}) => { @@ -27,7 +27,7 @@ const mocks = { lbryio.call = function(resource, action, params={}, method='get') { return new Promise((resolve, reject) => { if (!lbryio.enabled && (resource != 'discover' || action != 'list')) { - reject(new Error("LBRY interal API is disabled")) + reject(new Error("LBRY internal API is disabled")) return } /* temp code for mocks */ @@ -105,10 +105,9 @@ lbryio.authenticate = function() { } if (lbryio._authenticationPromise === null) { lbryio._authenticationPromise = new Promise((resolve, reject) => { - lbry.status().then(({installation_id}) => { + lbry.status().then((response) => { - //temp hack for installation_ids being wrong - installation_id += "Y".repeat(96 - installation_id.length) + let installation_id = response.installation_id; function setCurrentUser() { lbryio.call('user', 'me').then((data) => { diff --git a/ui/js/page/watch.js b/ui/js/page/watch.js index 76e96cada..315e19a9c 100644 --- a/ui/js/page/watch.js +++ b/ui/js/page/watch.js @@ -32,7 +32,7 @@ export let WatchLink = React.createClass({ uri: this.props.uri, outpoint: streamInfo.outpoint, claimId: streamInfo.claim_id - }) + }).catch(() => {}) }); if (this.props.onGet) { this.props.onGet() @@ -84,7 +84,7 @@ export let WatchLink = React.createClass({ - Confirm you want to purchase this bro. + Do you want to purchase this?
); } diff --git a/ui/scss/component/_video.scss b/ui/scss/component/_video.scss index c41815dca..9dd95ebe9 100644 --- a/ui/scss/component/_video.scss +++ b/ui/scss/component/_video.scss @@ -34,9 +34,7 @@ video { background-position: center center; background-repeat: no-repeat; position: relative; - &:hover { - .video__play-button { @include absolute-center(); } - } + .video__play-button { @include absolute-center(); } } .video__play-button { position: absolute; @@ -48,6 +46,11 @@ video { color: white; z-index: 1; background: $color-black-transparent; + opacity: 0.6; left: 0; top: 0; + &:hover { + opacity: 1; + transition: opacity $transition-standard; + } } \ No newline at end of file diff --git a/ui/scss/page/_watch.scss b/ui/scss/page/_watch.scss index 59a614d31..6ed5459ae 100644 --- a/ui/scss/page/_watch.scss +++ b/ui/scss/page/_watch.scss @@ -20,7 +20,7 @@ } .video__back-label { - opacity: 0; + opacity: 0.5; transition: opacity 100ms ease-in; }