From 4f26857ed5dc93b531a27dd766bc40dabf566b10 Mon Sep 17 00:00:00 2001 From: bill bittner Date: Wed, 7 Mar 2018 20:31:10 -0800 Subject: [PATCH] moved connected components to containers folder --- .../AboutPage/{index.js => index.jsx} | 0 .../AssetPreview/{index.js => index.jsx} | 0 .../ErrorPage/{index.js => index.jsx} | 0 .../FourOhFourPage/{index.js => index.jsx} | 0 .../GAListener/{index.js => index.jsx} | 0 .../HomePage/{index.js => index.jsx} | 0 .../AssetDisplay/index.js | 0 .../AssetDisplay/view.jsx | 2 +- .../AssetInfo/index.js | 0 .../AssetInfo/view.jsx | 0 .../AssetTitle/index.js | 2 - .../AssetTitle/view.jsx | 0 .../containers/ChannelClaimsDisplay/view.jsx | 2 +- react/containers/NavBar/view.jsx | 16 ++--- .../containers/PublishMetadataInputs/view.jsx | 72 +++++++++---------- react/containers/PublishTitleInput/view.jsx | 2 +- .../ShowAssetDetails/index.js | 0 .../ShowAssetDetails/view.jsx | 12 ++-- .../ShowAssetLite/index.js | 0 .../ShowAssetLite/view.jsx | 4 +- .../ShowChannel/index.js | 0 .../ShowChannel/view.jsx | 8 +-- react/containers/ShowPage/view.jsx | 6 +- 23 files changed, 62 insertions(+), 64 deletions(-) rename react/components/AboutPage/{index.js => index.jsx} (100%) rename react/components/AssetPreview/{index.js => index.jsx} (100%) rename react/components/ErrorPage/{index.js => index.jsx} (100%) rename react/components/FourOhFourPage/{index.js => index.jsx} (100%) rename react/components/GAListener/{index.js => index.jsx} (100%) rename react/components/HomePage/{index.js => index.jsx} (100%) rename react/{components => containers}/AssetDisplay/index.js (100%) rename react/{components => containers}/AssetDisplay/view.jsx (97%) rename react/{components => containers}/AssetInfo/index.js (100%) rename react/{components => containers}/AssetInfo/view.jsx (100%) rename react/{components => containers}/AssetTitle/index.js (88%) rename react/{components => containers}/AssetTitle/view.jsx (100%) rename react/{components => containers}/ShowAssetDetails/index.js (100%) rename react/{components => containers}/ShowAssetDetails/view.jsx (77%) rename react/{components => containers}/ShowAssetLite/index.js (100%) rename react/{components => containers}/ShowAssetLite/view.jsx (89%) rename react/{components => containers}/ShowChannel/index.js (100%) rename react/{components => containers}/ShowChannel/view.jsx (86%) diff --git a/react/components/AboutPage/index.js b/react/components/AboutPage/index.jsx similarity index 100% rename from react/components/AboutPage/index.js rename to react/components/AboutPage/index.jsx diff --git a/react/components/AssetPreview/index.js b/react/components/AssetPreview/index.jsx similarity index 100% rename from react/components/AssetPreview/index.js rename to react/components/AssetPreview/index.jsx diff --git a/react/components/ErrorPage/index.js b/react/components/ErrorPage/index.jsx similarity index 100% rename from react/components/ErrorPage/index.js rename to react/components/ErrorPage/index.jsx diff --git a/react/components/FourOhFourPage/index.js b/react/components/FourOhFourPage/index.jsx similarity index 100% rename from react/components/FourOhFourPage/index.js rename to react/components/FourOhFourPage/index.jsx diff --git a/react/components/GAListener/index.js b/react/components/GAListener/index.jsx similarity index 100% rename from react/components/GAListener/index.js rename to react/components/GAListener/index.jsx diff --git a/react/components/HomePage/index.js b/react/components/HomePage/index.jsx similarity index 100% rename from react/components/HomePage/index.js rename to react/components/HomePage/index.jsx diff --git a/react/components/AssetDisplay/index.js b/react/containers/AssetDisplay/index.js similarity index 100% rename from react/components/AssetDisplay/index.js rename to react/containers/AssetDisplay/index.js diff --git a/react/components/AssetDisplay/view.jsx b/react/containers/AssetDisplay/view.jsx similarity index 97% rename from react/components/AssetDisplay/view.jsx rename to react/containers/AssetDisplay/view.jsx index 6a8b96e8..0bf77c6d 100644 --- a/react/components/AssetDisplay/view.jsx +++ b/react/containers/AssetDisplay/view.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import ProgressBar from 'components/ProgressBar'; +import ProgressBar from 'components/ProgressBar/index'; import { LOCAL_CHECK, UNAVAILABLE, ERROR, AVAILABLE } from 'constants/asset_display_states'; class AssetDisplay extends React.Component { diff --git a/react/components/AssetInfo/index.js b/react/containers/AssetInfo/index.js similarity index 100% rename from react/components/AssetInfo/index.js rename to react/containers/AssetInfo/index.js diff --git a/react/components/AssetInfo/view.jsx b/react/containers/AssetInfo/view.jsx similarity index 100% rename from react/components/AssetInfo/view.jsx rename to react/containers/AssetInfo/view.jsx diff --git a/react/components/AssetTitle/index.js b/react/containers/AssetTitle/index.js similarity index 88% rename from react/components/AssetTitle/index.js rename to react/containers/AssetTitle/index.js index 537d6948..0797513b 100644 --- a/react/components/AssetTitle/index.js +++ b/react/containers/AssetTitle/index.js @@ -3,9 +3,7 @@ import View from './view'; import { selectAsset } from 'selectors/show'; const mapStateToProps = ({ show }) => { - // select title const { claimData: { title } } = selectAsset(show); - // return props return { title, }; diff --git a/react/components/AssetTitle/view.jsx b/react/containers/AssetTitle/view.jsx similarity index 100% rename from react/components/AssetTitle/view.jsx rename to react/containers/AssetTitle/view.jsx diff --git a/react/containers/ChannelClaimsDisplay/view.jsx b/react/containers/ChannelClaimsDisplay/view.jsx index c714a178..742df849 100644 --- a/react/containers/ChannelClaimsDisplay/view.jsx +++ b/react/containers/ChannelClaimsDisplay/view.jsx @@ -24,7 +24,7 @@ class ChannelClaimsDisplay extends React.Component { render () { const { channel: { claimsData: { claims, currentPage, totalPages } } } = this.props; return ( -
+
{(claims.length > 0) ? (
{claims.map((claim, index) => -
+
+
-
- Open-source, decentralized image and video sharing. +
+ Open-source, decentralized image and video sharing.
-
- Publish - About +
+ Publish + About { this.props.channelName ? ( ) : ( - Channel + Channel )}
diff --git a/react/containers/PublishMetadataInputs/view.jsx b/react/containers/PublishMetadataInputs/view.jsx index 85bcb29e..f5d89dfe 100644 --- a/react/containers/PublishMetadataInputs/view.jsx +++ b/react/containers/PublishMetadataInputs/view.jsx @@ -24,48 +24,48 @@ class PublishMetadataInputs extends React.Component { } render () { return ( -
- {this.props.showMetadataInputs && ( -
-
-
- -
- +
+ {this.props.showMetadataInputs && ( +
+
+
+ +
+ +
-
-
-
- -
- +
+
+ +
+ +
-
-
-
- -
- +
+
+ +
+ +
-
- )} - + )} +
); } diff --git a/react/containers/PublishTitleInput/view.jsx b/react/containers/PublishTitleInput/view.jsx index b01bc7f2..511fef07 100644 --- a/react/containers/PublishTitleInput/view.jsx +++ b/react/containers/PublishTitleInput/view.jsx @@ -12,7 +12,7 @@ class PublishTitleInput extends React.Component { } render () { return ( - + ); } } diff --git a/react/components/ShowAssetDetails/index.js b/react/containers/ShowAssetDetails/index.js similarity index 100% rename from react/components/ShowAssetDetails/index.js rename to react/containers/ShowAssetDetails/index.js diff --git a/react/components/ShowAssetDetails/view.jsx b/react/containers/ShowAssetDetails/view.jsx similarity index 77% rename from react/components/ShowAssetDetails/view.jsx rename to react/containers/ShowAssetDetails/view.jsx index d6cdb2e6..47eafb83 100644 --- a/react/components/ShowAssetDetails/view.jsx +++ b/react/containers/ShowAssetDetails/view.jsx @@ -1,10 +1,10 @@ import React from 'react'; -import SEO from 'components/SEO'; -import NavBar from 'containers/NavBar'; -import ErrorPage from 'components/ErrorPage'; -import AssetTitle from 'components/AssetTitle'; -import AssetDisplay from 'components/AssetDisplay'; -import AssetInfo from 'components/AssetInfo'; +import SEO from 'components/SEO/index'; +import NavBar from 'containers/NavBar/index'; +import ErrorPage from 'components/ErrorPage/index'; +import AssetTitle from 'containers/AssetTitle/index'; +import AssetDisplay from 'containers/AssetDisplay/index'; +import AssetInfo from 'containers/AssetInfo/index'; class ShowAssetDetails extends React.Component { render () { diff --git a/react/components/ShowAssetLite/index.js b/react/containers/ShowAssetLite/index.js similarity index 100% rename from react/components/ShowAssetLite/index.js rename to react/containers/ShowAssetLite/index.js diff --git a/react/components/ShowAssetLite/view.jsx b/react/containers/ShowAssetLite/view.jsx similarity index 89% rename from react/components/ShowAssetLite/view.jsx rename to react/containers/ShowAssetLite/view.jsx index 8241a31b..dbf45feb 100644 --- a/react/components/ShowAssetLite/view.jsx +++ b/react/containers/ShowAssetLite/view.jsx @@ -1,7 +1,7 @@ import React from 'react'; -import SEO from 'components/SEO'; +import SEO from 'components/SEO/index'; import { Link } from 'react-router-dom'; -import AssetDisplay from 'components/AssetDisplay'; +import AssetDisplay from 'containers/AssetDisplay/index'; class ShowLite extends React.Component { render () { diff --git a/react/components/ShowChannel/index.js b/react/containers/ShowChannel/index.js similarity index 100% rename from react/components/ShowChannel/index.js rename to react/containers/ShowChannel/index.js diff --git a/react/components/ShowChannel/view.jsx b/react/containers/ShowChannel/view.jsx similarity index 86% rename from react/components/ShowChannel/view.jsx rename to react/containers/ShowChannel/view.jsx index 842a6953..64c15062 100644 --- a/react/components/ShowChannel/view.jsx +++ b/react/containers/ShowChannel/view.jsx @@ -1,8 +1,8 @@ import React from 'react'; -import SEO from 'components/SEO'; -import ErrorPage from 'components/ErrorPage'; -import NavBar from 'containers/NavBar'; -import ChannelClaimsDisplay from 'containers/ChannelClaimsDisplay'; +import SEO from 'components/SEO/index'; +import ErrorPage from 'components/ErrorPage/index'; +import NavBar from 'containers/NavBar/index'; +import ChannelClaimsDisplay from 'containers/ChannelClaimsDisplay/index'; class ShowChannel extends React.Component { render () { diff --git a/react/containers/ShowPage/view.jsx b/react/containers/ShowPage/view.jsx index 7f275dd9..8e579c02 100644 --- a/react/containers/ShowPage/view.jsx +++ b/react/containers/ShowPage/view.jsx @@ -1,8 +1,8 @@ import React from 'react'; import ErrorPage from 'components/ErrorPage'; -import ShowAssetLite from 'components/ShowAssetLite'; -import ShowAssetDetails from 'components/ShowAssetDetails'; -import ShowChannel from 'components/ShowChannel'; +import ShowAssetLite from 'containers/ShowAssetLite'; +import ShowAssetDetails from 'containers/ShowAssetDetails'; +import ShowChannel from 'containers/ShowChannel'; import { CHANNEL, ASSET_LITE, ASSET_DETAILS } from 'constants/show_request_types';