From 7c77f166cd6b0c283090b550f048997af2e83552 Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Sat, 30 Jul 2016 03:47:31 -0400 Subject: [PATCH] Make Show page use lbry.getClaimInfo() and lbry.getCostEstimate() --- js/page/show.js | 56 ++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/js/page/show.js b/js/page/show.js index 9c4b95f48..0acaedcad 100644 --- a/js/page/show.js +++ b/js/page/show.js @@ -29,19 +29,23 @@ var formatItemStyle = { var FormatItem = React.createClass({ propTypes: { - results: React.PropTypes.object, + claimInfo: React.PropTypes.object, + amount: React.PropTypes.number, + name: React.PropTypes.string, }, render: function() { - var results = this.props.results; - var name = results.name; - var thumbnail = results.thumbnail; - var title = results.title; - var amount = results.cost_est ? results.cost_est : 0.0; - var description = results.description; - var author = results.author; - var language = results.language; - var license = results.license; - var fileContentType = results['content-type']; + var name = this.props.name; + + var claimInfo = this.props.claimInfo; + var thumbnail = claimInfo.thumbnail; + var title = claimInfo.title; + var description = claimInfo.description; + var author = claimInfo.author; + var language = claimInfo.language; + var license = claimInfo.license; + var fileContentType = claimInfo['content-type']; + + var amount = this.props.amount || 0.0; return (
@@ -71,12 +75,13 @@ var FormatItem = React.createClass({ var FormatsSection = React.createClass({ propTypes: { - results: React.PropTypes.object, + claimInfo: React.PropTypes.object, + amount: React.PropTypes.number, name: React.PropTypes.string, }, render: function() { var name = this.props.name; - var format = this.props.results; + var format = this.props.claimInfo; var title = format.title; if(format == null) @@ -91,9 +96,9 @@ var FormatsSection = React.createClass({

{title}

{/* In future, anticipate multiple formats, just a guess at what it could look like - // var formats = this.props.results.formats + // var formats = this.props.claimInfo.formats // return ({formats.map(function(format,i){ */} - + {/* })}); */}
); } @@ -105,32 +110,39 @@ var DetailPage = React.createClass({ }, getInitialState: function() { return { - results: null, + claimInfo: null, + amount: null, searching: true, }; }, componentWillMount: function() { - lbry.search(this.props.name, (results) => { + lbry.getClaimInfo(this.props.name, (claimInfo) => { this.setState({ - results: results[0], + claimInfo: claimInfo.value, searching: false, }); }); + + lbry.getCostEstimate(this.props.name, (amount) => { + this.setState({ + amount: amount, + }); + }); }, render: function() { - if (this.state.results == null && this.state.searching) { + if (this.state.claimInfo == null && this.state.searching) { // Still waiting for metadata return null; } var name = this.props.name; - var metadata = this.state.metadata; - var results = this.state.results; + var claimInfo = this.state.claimInfo; + var amount = this.state.amount; return (
- +