Merge pull request #1072 from lbryio/master

redirect fixes

client/src/pages/ContentPageWrapper/view.jsx

@@ -15,21 +15,23 @@ import {
 class ContentPageWrapper extends React.Component {
   componentDidMount () {
     const { onHandleShowPageUri, match, homeChannel } = this.props;
-    onHandleShowPageUri(homeChannel ? { claim: homeChannel } : match.params);
+    //onHandleShowPageUri(homeChannel ? { claim: homeChannel } : match.params);
   }
   componentWillReceiveProps (nextProps) {
     if (nextProps.match.params !== this.props.match.params) {
-      this.props.onHandleShowPageUri(nextProps.match.params);
+      //this.props.onHandleShowPageUri(nextProps.match.params);
     }
   }
   render () {
     const { error, requestType, match } = this.props;
     const { params } = match;
     const { claim, identifier } = params;
-    if (identifier) {
-      return <Redirect to={`https://lbry.tv/${identifier}/${claim}`} />
+    if (identifier && claim) {
+      return <Redirect to={`https://lbry.tv/${identifier}/${claim}`} />;
+    } else if (identifier) {
+      // return <Redirect to={`https://lbry.tv/${identifier}/`} />
     } else {
-      return <Redirect to={`https://lbry.tv/${claim}`} />
+      return <Redirect to={`https://lbry.tv/${claim}`} />;
     }
     if (error) {
       return (
@@ -38,13 +40,13 @@ class ContentPageWrapper extends React.Component {
     }
     switch (requestType) {
       case CHANNEL:
-        return <ShowChannel />;
+        // return <ShowChannel />;
       case ASSET_LITE:
-        return <ShowAssetLite />;
+        // return <ShowAssetLite />;
       case ASSET_DETAILS:
-        return <ShowAssetDetails />;
+        // return <ShowAssetDetails />;
       case SPECIAL_ASSET:
-        return <ShowChannel />;
+        // return <ShowChannel />;
       default:
         return <p>loading...</p>;
     }

server/routes/index.js

@@ -2,6 +2,6 @@ module.exports = {
   ...require('./pages').default,
   ...require('./api').default,
   ...require('./auth').default,
-  ...require('./assets').default,
+  // ...require('./assets').default,
   ...require('./fallback').default,
 };