fixes, channel page stubs

ui/js/app.js

@@ -72,8 +72,6 @@ var App = React.createClass({
   getViewingPageAndArgs: function(address) {
     // For now, routes are in format ?page or ?page=args
     let [isMatch, viewingPage, pageArgs] = address.match(/\??([^=]*)(?:=(.*))?/);
-    console.log(pageArgs);
-    console.log(decodeURIComponent(pageArgs));
     return {
       viewingPage: viewingPage,
       pageArgs: pageArgs === undefined ? null : decodeURIComponent(pageArgs)

ui/js/component/header.js

@@ -137,8 +137,12 @@ let WunderBar = React.createClass({
   },
   onKeyPress: function(event) {
     if (event.charCode == 13 && this._input.value) {
+      let uri = lbryuri.normalize(this._input.value);
       clearTimeout(this._userTypingTimer);
-      this.props.onSubmit(lbryuri.normalize(this._input.value));
+      this.props.onSubmit(uri);
+      this.setState({ value: uri })
+      this._resetOnNextBlur = false;
+      this._input.blur();
     }
   },
   onReceiveRef: function(ref) {

ui/js/page/show.js

@@ -44,6 +44,23 @@ var FormatItem = React.createClass({
   }
 });
 
+let ChannelPage = React.createClass({
+  render: function() {
+    return <main className="main--single-column">
+      <section className="card">
+        <div className="card__inner">
+          <div className="card__title-identity"><h1>{this.props.title}</h1></div>
+        </div>
+        <div className="card__content">
+          <p>
+            This channel page is a stub.
+          </p>
+        </div>
+      </section>
+    </main>
+  }
+})
+
 let ShowPage = React.createClass({
   _uri: null,
   _isMounted: false,
@@ -58,6 +75,7 @@ let ShowPage = React.createClass({
       metadata: null,
       contentType: null,
       hasSignature: false,
+      claimType: null,
       signatureIsValid: false,
       cost: null,
       costIncludesData: null,
@@ -78,6 +96,7 @@ let ShowPage = React.createClass({
   },
 
   componentWillMount: function() {
+    this._isMounted = true;
     this.loadUri(this.props.uri);
   },
 
@@ -85,11 +104,25 @@ let ShowPage = React.createClass({
     this._uri = lbryuri.normalize(uri);
 
     lbry.resolve({uri: this._uri}).then((resolveData) => {
+      const isChannel = resolveData && resolveData.claims_in_channel;
+      if (!this._isMounted) {
+        return;
+      }
       if (resolveData) {
-        let {claim: {txid, nout, has_signature, signature_is_valid, value: {stream: {metadata, source: {contentType}}}}} = resolveData;
-        const outpoint = txid + ':' + nout;
+        let newState = { uriLookupComplete: true }
+        if (!isChannel) {
+          let {claim: {txid: txid, nout: nout, has_signature: has_signature, signature_is_valid: signature_is_valid, value: {stream: {metadata: metadata, source: {contentType: contentType}}}}} = resolveData;
 
-        lbry.file_list({outpoint}).then((fileInfo) => {
+          Object.assign(newState, {
+            claimType: "file",
+            metadata: metadata,
+            outpoint: txid + ':' + nout,
+            hasSignature: has_signature,
+            signatureIsValid: signature_is_valid,
+            contentType: contentType
+          });
+
+          lbry.file_list({outpoint: newState.outpoint}).then((fileInfo) => {
             this.setState({
               isDownloaded: fileInfo.length > 0,
             });
@@ -97,17 +130,6 @@ let ShowPage = React.createClass({
 
           lbry.setTitle(metadata.title ? metadata.title : this._uri)
 
-        if (this._isMounted) {
-          this.setState({
-            outpoint: outpoint,
-            metadata: metadata,
-            hasSignature: has_signature,
-            signatureIsValid: signature_is_valid,
-            contentType: contentType,
-            uriLookupComplete: true,
-          });
-        }
-
           lbry.getCostInfo(this._uri).then(({cost, includesData}) => {
             if (this._isMounted) {
               this.setState({
@@ -117,19 +139,38 @@ let ShowPage = React.createClass({
             }
           });
         } else {
-        if (this._isMounted) {
+          console.log('channel');
+          let {certificate: {txid: txid, nout: nout, has_signature: has_signature}} = resolveData;
+          console.log(txid);
+          Object.assign(newState, {
+            claimType: "channel",
+            outpoint: txid + ':' + nout,
+            txid: txid,
+            metadata: {
+              title:resolveData.certificate.name
+            }
+          });
+        }
+
+        this.setState(newState);
+
+      } else {
         this.setState(Object.assign({}, this.getInitialState(), {
           uriLookupComplete: true,
           isFailed: true
         }));
       }
-      }
     });
   },
 
   render: function() {
-    const metadata = this.state.metadata;
-    const title = metadata ? this.state.metadata.title : this._uri;
+    const metadata = this.state.metadata,
+          title = metadata ? this.state.metadata.title : this._uri,
+          channelUriObj = lbryuri.parse(this._uri);
+
+    delete channelUriObj.path;
+    delete channelUriObj.contentName;
+    const channelUri = this.props.hasSignature && channelUriObj.isChannel ? lbryuri.build(channelUriObj, false) : null;
 
     if (this.state.isFailed) {
       return <main className="main--single-column">
@@ -148,6 +189,11 @@ let ShowPage = React.createClass({
       </main>
     }
 
+    if (this.state.claimType == "channel") {
+      return <ChannelPage title={this._uri} />
+    }
+
+    const uriIndicator = <UriIndicator uri={this._uri} hasSignature={this.state.hasSignature} signatureIsValid={this.state.signatureIsValid} />;
     return (
       <main className="main--single-column">
         <section className="show-page-media">
@@ -165,7 +211,9 @@ let ShowPage = React.createClass({
               { this.state.uriLookupComplete && this.state.outpoint ?
                 <div>
                   <div className="card__subtitle">
-                    <UriIndicator uri={this._uri} hasSignature={this.state.hasSignature} signatureIsValid={this.state.signatureIsValid} />
+                    { this.state.signatureIsValid ?
+                        <Link href={"?show=" + channelUri }>{uriIndicator}</Link> :
+                        uriIndicator}
                   </div>
                   <div className="card__actions">
                     <FileActions uri={this._uri} outpoint={this.state.outpoint} metadata={metadata} contentType={this.state.contentType} />