minor changes

This commit is contained in:
Jeremy Kauffman 2017-04-17 16:45:51 -04:00
parent 0b17ca6043
commit c252c757b0
8 changed files with 22 additions and 18 deletions

2
lbry

@ -1 +1 @@
Subproject commit af455ff52ecc81be2229f1061318d607c4cc047d Subproject commit 043e2d0ab96030468d53d02e311fd848f35c2dc1

2
lbryum

@ -1 +1 @@
Subproject commit 39ace3737509ff2b09fabaaa64d1525843de1325 Subproject commit 121bda3963ee94f0c9c027813c55b71b38219739

View file

@ -41,7 +41,7 @@ const SubmitEmailStage = React.createClass({
return ( return (
<section> <section>
<form onSubmit={this.handleSubmit}> <form onSubmit={this.handleSubmit}>
<FormRow ref={(ref) => { this._emailRow = ref }} type="text" label="Email" placeholder="admin@toplbryfan.com" <FormRow ref={(ref) => { this._emailRow = ref }} type="text" label="Email" placeholder="scrwvwls@lbry.io"
name="email" value={this.state.email} name="email" value={this.state.email}
onChange={this.handleEmailChanged} /> onChange={this.handleEmailChanged} />
<div className="form-row-submit"> <div className="form-row-submit">
@ -128,9 +128,9 @@ const WelcomeStage = React.createClass({
<section> <section>
<h3 className="modal__header">Welcome to LBRY.</h3> <h3 className="modal__header">Welcome to LBRY.</h3>
<p>Using LBRY is like dating a centaur. Totally normal up top, and <em>way different</em> underneath.</p> <p>Using LBRY is like dating a centaur. Totally normal up top, and <em>way different</em> underneath.</p>
<p>On the upper level, LBRY is like other popular video and media sites.</p> <p>Up top, LBRY is similar to popular media sites.</p>
<p>Below, LBRY is controlled by its users -- you -- through the power of blockchain and decentralization.</p> <p>Below, LBRY is controlled by users -- you -- via blockchain and decentralization.</p>
<p>Thanks for making it possible! Here's a nickel, kid.</p> <p>Thank you for making content freedom possible! Here's a nickel, kid.</p>
<div style={{textAlign: "center", marginBottom: "12px"}}> <div style={{textAlign: "center", marginBottom: "12px"}}>
<RewardLink type="new_user" button="primary" onRewardClaim={this.onRewardClaim} onRewardFailure={this.props.endAuth} /> <RewardLink type="new_user" button="primary" onRewardClaim={this.onRewardClaim} onRewardFailure={this.props.endAuth} />
</div> </div>
@ -143,6 +143,7 @@ const WelcomeStage = React.createClass({
<p>This reward will show in your Wallet momentarily, probably while you are reading this message.</p> <p>This reward will show in your Wallet momentarily, probably while you are reading this message.</p>
<p>LBC is used to compensate creators, to publish, and to have say in how the network works.</p> <p>LBC is used to compensate creators, to publish, and to have say in how the network works.</p>
<p>No need to understand it all just yet! Try watching or downloading something next.</p> <p>No need to understand it all just yet! Try watching or downloading something next.</p>
<p>Finally, know that LBRY is a beta and that it earns the name.</p>
</section> </section>
</Modal> </Modal>
); );
@ -156,6 +157,7 @@ const ErrorStage = React.createClass({
<section> <section>
<p>An error was encountered that we cannot continue from.</p> <p>An error was encountered that we cannot continue from.</p>
<p>At least we're earning the name beta.</p> <p>At least we're earning the name beta.</p>
{ this.props.errorText ? <p>Message: {this.props.errorText}</p> : '' }
<Link button="alt" label="Try Reload" onClick={() => { window.location.reload() } } /> <Link button="alt" label="Try Reload" onClick={() => { window.location.reload() } } />
</section> </section>
); );

View file

@ -167,7 +167,7 @@ let FileActionsRow = React.createClass({
</DropDownMenu> : '' } </DropDownMenu> : '' }
<Modal type="confirm" isOpen={this.state.modal == 'affirmPurchase'} <Modal type="confirm" isOpen={this.state.modal == 'affirmPurchase'}
contentLabel="Confirm Purchase" onConfirmed={this.onAffirmPurchase} onAborted={this.closeModal}> contentLabel="Confirm Purchase" onConfirmed={this.onAffirmPurchase} onAborted={this.closeModal}>
Confirm you want to purchase this bro. Do you want to purchase this?
</Modal> </Modal>
<Modal isOpen={this.state.modal == 'notEnoughCredits'} contentLabel="Not enough credits" <Modal isOpen={this.state.modal == 'notEnoughCredits'} contentLabel="Not enough credits"
onConfirmed={this.closeModal}> onConfirmed={this.closeModal}>

View file

@ -10,7 +10,7 @@ const lbryio = {
enabled: false enabled: false
}; };
const CONNECTION_STRING = 'https://api.lbry.io/'; const CONNECTION_STRING = 'http://localhost:8080/';
const mocks = { const mocks = {
'reward_type.get': ({name}) => { 'reward_type.get': ({name}) => {
@ -27,7 +27,7 @@ const mocks = {
lbryio.call = function(resource, action, params={}, method='get') { lbryio.call = function(resource, action, params={}, method='get') {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!lbryio.enabled && (resource != 'discover' || action != 'list')) { if (!lbryio.enabled && (resource != 'discover' || action != 'list')) {
reject(new Error("LBRY interal API is disabled")) reject(new Error("LBRY internal API is disabled"))
return return
} }
/* temp code for mocks */ /* temp code for mocks */
@ -105,10 +105,9 @@ lbryio.authenticate = function() {
} }
if (lbryio._authenticationPromise === null) { if (lbryio._authenticationPromise === null) {
lbryio._authenticationPromise = new Promise((resolve, reject) => { lbryio._authenticationPromise = new Promise((resolve, reject) => {
lbry.status().then(({installation_id}) => { lbry.status().then((response) => {
//temp hack for installation_ids being wrong let installation_id = response.installation_id;
installation_id += "Y".repeat(96 - installation_id.length)
function setCurrentUser() { function setCurrentUser() {
lbryio.call('user', 'me').then((data) => { lbryio.call('user', 'me').then((data) => {

View file

@ -32,7 +32,7 @@ export let WatchLink = React.createClass({
uri: this.props.uri, uri: this.props.uri,
outpoint: streamInfo.outpoint, outpoint: streamInfo.outpoint,
claimId: streamInfo.claim_id claimId: streamInfo.claim_id
}) }).catch(() => {})
}); });
if (this.props.onGet) { if (this.props.onGet) {
this.props.onGet() this.props.onGet()
@ -84,7 +84,7 @@ export let WatchLink = React.createClass({
</Modal> </Modal>
<Modal type="confirm" isOpen={this.state.modal == 'affirmPurchase'} <Modal type="confirm" isOpen={this.state.modal == 'affirmPurchase'}
contentLabel="Confirm Purchase" onConfirmed={this.onAffirmPurchase} onAborted={this.closeModal}> contentLabel="Confirm Purchase" onConfirmed={this.onAffirmPurchase} onAborted={this.closeModal}>
Confirm you want to purchase this bro. Do you want to purchase this?
</Modal> </Modal>
</div>); </div>);
} }

View file

@ -34,9 +34,7 @@ video {
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
position: relative; position: relative;
&:hover { .video__play-button { @include absolute-center(); }
.video__play-button { @include absolute-center(); }
}
} }
.video__play-button { .video__play-button {
position: absolute; position: absolute;
@ -48,6 +46,11 @@ video {
color: white; color: white;
z-index: 1; z-index: 1;
background: $color-black-transparent; background: $color-black-transparent;
opacity: 0.6;
left: 0; left: 0;
top: 0; top: 0;
&:hover {
opacity: 1;
transition: opacity $transition-standard;
}
} }

View file

@ -20,7 +20,7 @@
} }
.video__back-label { .video__back-label {
opacity: 0; opacity: 0.5;
transition: opacity 100ms ease-in; transition: opacity 100ms ease-in;
} }