From 90d617dbc92940d556c247ef3f7ce17473257437 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Thu, 12 Jul 2018 19:05:04 -0400
Subject: [PATCH 1/2] hide community row if nsfw content is hidden

---
 src/renderer/component/categoryList/index.js |  7 +-
 src/renderer/component/categoryList/view.jsx | 92 +++++++++++---------
 src/renderer/scss/component/_card.scss       | 10 ++-
 3 files changed, 66 insertions(+), 43 deletions(-)

diff --git a/src/renderer/component/categoryList/index.js b/src/renderer/component/categoryList/index.js
index 7e728b9f4..66bb15b83 100644
--- a/src/renderer/component/categoryList/index.js
+++ b/src/renderer/component/categoryList/index.js
@@ -4,15 +4,20 @@ import {
   makeSelectClaimsInChannelForCurrentPage,
   makeSelectFetchingChannelClaims,
 } from 'lbry-redux';
+import { selectShowNsfw } from 'redux/selectors/settings';
 import CategoryList from './view';
 
 const select = (state, props) => ({
   channelClaims: makeSelectClaimsInChannelForCurrentPage(props.categoryLink)(state),
   fetching: makeSelectFetchingChannelClaims(props.categoryLink)(state),
+  obscureNsfw: !selectShowNsfw(state),
 });
 
 const perform = dispatch => ({
   fetchChannel: channel => dispatch(doFetchClaimsByChannel(channel)),
 });
 
-export default connect(select, perform)(CategoryList);
+export default connect(
+  select,
+  perform
+)(CategoryList);
diff --git a/src/renderer/component/categoryList/view.jsx b/src/renderer/component/categoryList/view.jsx
index 8dca1b4f6..9f1ae72d4 100644
--- a/src/renderer/component/categoryList/view.jsx
+++ b/src/renderer/component/categoryList/view.jsx
@@ -1,11 +1,11 @@
 // @flow
-import React from 'react';
+import * as React from 'react';
 import { normalizeURI } from 'lbry-redux';
 import ToolTip from 'component/common/tooltip';
 import FileCard from 'component/fileCard';
 import Button from 'component/button';
 import * as icons from 'constants/icons';
-import Claim from 'types/claim';
+import type { Claim } from 'types/claim';
 
 type Props = {
   category: string,
@@ -14,6 +14,7 @@ type Props = {
   fetching: boolean,
   channelClaims: Array<Claim>,
   fetchChannel: string => void,
+  obscureNsfw: boolean,
 };
 
 type State = {
@@ -206,11 +207,12 @@ class CategoryList extends React.PureComponent<Props, State> {
   }
 
   render() {
-    const { category, categoryLink, names, channelClaims } = this.props;
+    const { category, categoryLink, names, channelClaims, obscureNsfw } = this.props;
     const { canScrollNext, canScrollPrevious } = this.state;
 
-    // The lint was throwing an error saying we should use <button> instead of <a>
-    // We are using buttons, needs more exploration
+    const isCommunityTopBids = category.match(/^community/i);
+    const showScrollButtons = isCommunityTopBids ? !obscureNsfw : true;
+
     return (
       <div className="card-row">
         <div className="card-row__header">
@@ -220,45 +222,55 @@ class CategoryList extends React.PureComponent<Props, State> {
             ) : (
               category
             )}
-            {category &&
-              category.match(/^community/i) && (
-                <ToolTip
-                  label={__("What's this?")}
-                  body={__(
-                    'Community Content is a public space where anyone can share content with the rest of the LBRY community. Bid on the names from "one" to "ten" to put your content here!'
-                  )}
-                />
-              )}
-          </div>
-          <div className="card-row__scroll-btns">
-            <Button
-              className="btn--arrow"
-              disabled={!canScrollPrevious}
-              onClick={this.handleScrollPrevious}
-              icon={icons.ARROW_LEFT}
-            />
-            <Button
-              className="btn--arrow"
-              disabled={!canScrollNext}
-              onClick={this.handleScrollNext}
-              icon={icons.ARROW_RIGHT}
-            />
+            {isCommunityTopBids && (
+              <ToolTip
+                label={__("What's this?")}
+                body={__(
+                  'Community Content is a public space where anyone can share content with the rest of the LBRY community. Bid on the names from "one" to "ten" to put your content here!'
+                )}
+              />
+            )}
           </div>
+          {showScrollButtons && (
+            <div className="card-row__scroll-btns">
+              <Button
+                className="btn--arrow"
+                disabled={!canScrollPrevious}
+                onClick={this.handleScrollPrevious}
+                icon={icons.ARROW_LEFT}
+              />
+              <Button
+                className="btn--arrow"
+                disabled={!canScrollNext}
+                onClick={this.handleScrollNext}
+                icon={icons.ARROW_RIGHT}
+              />
+            </div>
+          )}
         </div>
-        <div
-          ref={ref => {
-            this.rowItems = ref;
-          }}
-          className="card-row__scrollhouse"
-        >
-          {names && names.map(name => <FileCard key={name} uri={normalizeURI(name)} />)}
+        {obscureNsfw && isCommunityTopBids ? (
+          <div className="card__content help">
+            {__(
+              'The community top bids section is only visible if you allow NSFW content in the app. You can change your content viewing preferences'
+            )}{' '}
+            <Button button="link" navigate="/settings" label={__('here')} />.
+          </div>
+        ) : (
+          <div
+            className="card-row__scrollhouse"
+            ref={ref => {
+              this.rowItems = ref;
+            }}
+          >
+            {names && names.map(name => <FileCard key={name} uri={normalizeURI(name)} />)}
 
-          {channelClaims && channelClaims.length
-            ? channelClaims.map(claim => (
+            {channelClaims &&
+              channelClaims.length &&
+              channelClaims.map(claim => (
                 <FileCard key={claim.claim_id} uri={`lbry://${claim.name}#${claim.claim_id}`} />
-              ))
-            : null}
-        </div>
+              ))}
+          </div>
+        )}
       </div>
     );
   }
diff --git a/src/renderer/scss/component/_card.scss b/src/renderer/scss/component/_card.scss
index 8468ac8d9..037a0edb4 100644
--- a/src/renderer/scss/component/_card.scss
+++ b/src/renderer/scss/component/_card.scss
@@ -21,7 +21,6 @@
 }
 
 .card--small {
-  width: var(--card-small-width);
   white-space: normal;
 
   .card__media {
@@ -273,7 +272,6 @@
 .card-row {
   white-space: nowrap;
   width: 100%;
-  min-width: var(--card-small-width);
   padding-top: $spacing-vertical;
 
   &:first-of-type {
@@ -283,6 +281,14 @@
   &:last-of-type {
     padding-bottom: $spacing-vertical * 2/3;
   }
+
+  // This is only for the text that is displayed when a user has nsfw hidden
+  // It is not used anywhere else in the app and is needed due to the css related to
+  // the content that scrolls off the edge of the screen
+  .card__content.help {
+    padding: 0 $spacing-width;
+    white-space: normal;
+  }
 }
 
 .card-row__header {

From 7e0c01141a74346d915ac0f8aa486eca5a9a243c Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Thu, 12 Jul 2018 19:21:44 -0400
Subject: [PATCH 2/2] rename 'NSFW' to 'mature'

---
 src/renderer/component/categoryList/view.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/component/categoryList/view.jsx b/src/renderer/component/categoryList/view.jsx
index 9f1ae72d4..25d780b95 100644
--- a/src/renderer/component/categoryList/view.jsx
+++ b/src/renderer/component/categoryList/view.jsx
@@ -251,7 +251,7 @@ class CategoryList extends React.PureComponent<Props, State> {
         {obscureNsfw && isCommunityTopBids ? (
           <div className="card__content help">
             {__(
-              'The community top bids section is only visible if you allow NSFW content in the app. You can change your content viewing preferences'
+              'The community top bids section is only visible if you allow mature content in the app. You can change your content viewing preferences'
             )}{' '}
             <Button button="link" navigate="/settings" label={__('here')} />.
           </div>