remove lbryinc web, update sitename, etc

.env.defaults

@@ -35,11 +35,11 @@ SITE_CANONICAL_URL=https://lbry.tv
 ## Custom Site info
 DOMAIN=lbry.tv
 URL=https://lbry.tv
-SITE_TITLE=lbry.tv
+SITE_TITLE=LBRY
-SITE_NAME=lbry.tv
+SITE_NAME=LBRY
 SITE_DESCRIPTION=Meet LBRY, an open, free, and community-controlled content wonderland.
 SITE_HELP_EMAIL=help@lbry.com
-LOGO_TITLE=lbry.tv
+LOGO_TITLE=LBRY
 ## Social media
 TWITTER_ACCOUNT=LBRYcom
 BRANDED_SITE=odysee

extras/lbryinc/index.js

@@ -5,10 +5,6 @@ import Lbryio from './lbryio';
 
 export { Lbryio };
 
-export function testTheThing() {
-  console.log('tested');
-}
-
 // constants
 export { LBRYINC_ACTIONS, YOUTUBE_STATUSES, ERRORS };
 
@@ -20,7 +16,6 @@ export { doGenerateAuthToken } from './redux/actions/auth';
 export { doFetchCostInfoForUri } from './redux/actions/cost_info';
 export { doBlackListedOutpointsSubscribe } from './redux/actions/blacklist';
 export { doFilteredOutpointsSubscribe } from './redux/actions/filtered';
-// export { doFetchFeaturedUris, doFetchTrendingUris } from './redux/actions/homepage';
 export { doFetchViewCount, doFetchSubCount } from './redux/actions/stats';
 export {
   doCheckSync,
@@ -31,17 +26,14 @@ export {
   doResetSync,
   doSyncEncryptAndDecrypt,
 } from 'redux/actions/sync';
-export { doUpdateUploadProgress } from './redux/actions/web';
 
 // reducers
 export { authReducer } from './redux/reducers/auth';
 export { costInfoReducer } from './redux/reducers/cost_info';
 export { blacklistReducer } from './redux/reducers/blacklist';
 export { filteredReducer } from './redux/reducers/filtered';
-// export { homepageReducer } from './redux/reducers/homepage';
 export { statsReducer } from './redux/reducers/stats';
 export { syncReducer } from './redux/reducers/sync';
-export { webReducer } from './redux/reducers/web';
 
 // selectors
 export { selectAuthToken, selectIsAuthenticating } from './redux/selectors/auth';
@@ -56,12 +48,6 @@ export {
   selectBlacklistedOutpointMap,
 } from './redux/selectors/blacklist';
 export { selectFilteredOutpoints, selectFilteredOutpointMap } from './redux/selectors/filtered';
-// export {
-//   selectFeaturedUris,
-//   selectFetchingFeaturedUris,
-//   selectTrendingUris,
-//   selectFetchingTrendingUris,
-// } from './redux/selectors/homepage';
 export {
   selectViewCount,
   makeSelectViewCountForUri,
@@ -80,4 +66,3 @@ export {
   selectSyncApplyErrorMessage,
   selectSyncApplyPasswordError,
 } from './redux/selectors/sync';
-export { selectCurrentUploads, selectUploadCount } from './redux/selectors/web';

extras/lbryinc/redux/actions/homepage.js

@@ -1,79 +0,0 @@
-import { Lbryio } from 'lbryinc';
-import { batchActions } from 'util/batch-actions';
-import { doResolveUris } from 'util/lbryURI';
-import * as ACTIONS from 'constants/action_types';
-
-export function doFetchFeaturedUris(offloadResolve = false) {
-  return dispatch => {
-    dispatch({
-      type: ACTIONS.FETCH_FEATURED_CONTENT_STARTED,
-    });
-
-    const success = ({ Uris }) => {
-      let urisToResolve = [];
-      Object.keys(Uris).forEach(category => {
-        urisToResolve = [...urisToResolve, ...Uris[category]];
-      });
-
-      const actions = [
-        {
-          type: ACTIONS.FETCH_FEATURED_CONTENT_COMPLETED,
-          data: {
-            uris: Uris,
-            success: true,
-          },
-        },
-      ];
-      if (urisToResolve.length && !offloadResolve) {
-        actions.push(doResolveUris(urisToResolve));
-      }
-
-      dispatch(batchActions(...actions));
-    };
-
-    const failure = () => {
-      dispatch({
-        type: ACTIONS.FETCH_FEATURED_CONTENT_COMPLETED,
-        data: {
-          uris: {},
-        },
-      });
-    };
-
-    Lbryio.call('file', 'list_homepage').then(success, failure);
-  };
-}
-
-export function doFetchTrendingUris() {
-  return dispatch => {
-    dispatch({
-      type: ACTIONS.FETCH_TRENDING_CONTENT_STARTED,
-    });
-
-    const success = data => {
-      const urisToResolve = data.map(uri => uri.url);
-      const actions = [
-        doResolveUris(urisToResolve),
-        {
-          type: ACTIONS.FETCH_TRENDING_CONTENT_COMPLETED,
-          data: {
-            uris: data,
-            success: true,
-          },
-        },
-      ];
-      dispatch(batchActions(...actions));
-    };
-
-    const failure = () => {
-      dispatch({
-        type: ACTIONS.FETCH_TRENDING_CONTENT_COMPLETED,
-        data: {
-          uris: [],
-        },
-      });
-    };
-
-    Lbryio.call('file', 'list_trending').then(success, failure);
-  };
-}

extras/lbryinc/redux/actions/web.js

@@ -1,12 +0,0 @@
-// @flow
-import * as ACTIONS from 'constants/action_types';
-
-export const doUpdateUploadProgress = (
-  progress: string,
-  params: { [key: string]: any },
-  xhr: any
-) => (dispatch: Dispatch) =>
-  dispatch({
-    type: ACTIONS.UPDATE_UPLOAD_PROGRESS,
-    data: { progress, params, xhr },
-  });

extras/lbryinc/redux/reducers/homepage.js

@@ -1,48 +0,0 @@
-import { handleActions } from 'util/redux-utils';
-import * as ACTIONS from 'constants/action_types';
-
-const defaultState = {
-  fetchingFeaturedContent: false,
-  fetchingFeaturedContentFailed: false,
-  featuredUris: undefined,
-  fetchingTrendingContent: false,
-  fetchingTrendingContentFailed: false,
-  trendingUris: undefined,
-};
-
-export const homepageReducer = handleActions(
-  {
-    [ACTIONS.FETCH_FEATURED_CONTENT_STARTED]: state => ({
-      ...state,
-      fetchingFeaturedContent: true,
-    }),
-
-    [ACTIONS.FETCH_FEATURED_CONTENT_COMPLETED]: (state, action) => {
-      const { uris, success } = action.data;
-
-      return {
-        ...state,
-        fetchingFeaturedContent: false,
-        fetchingFeaturedContentFailed: !success,
-        featuredUris: uris,
-      };
-    },
-
-    [ACTIONS.FETCH_TRENDING_CONTENT_STARTED]: state => ({
-      ...state,
-      fetchingTrendingContent: true,
-    }),
-
-    [ACTIONS.FETCH_TRENDING_CONTENT_COMPLETED]: (state, action) => {
-      const { uris, success } = action.data;
-
-      return {
-        ...state,
-        fetchingTrendingContent: false,
-        fetchingTrendingContentFailed: !success,
-        trendingUris: uris,
-      };
-    },
-  },
-  defaultState
-);

extras/lbryinc/redux/reducers/web.js

@@ -1,62 +0,0 @@
-// @flow
-import * as ACTIONS from 'constants/action_types';
-
-/*
-test mock:
-  currentUploads: {
-    'test#upload': {
-      progress: 50,
-      params: {
-        name: 'steve',
-        thumbnail_url: 'https://dev2.spee.ch/4/KMNtoSZ009fawGz59VG8PrID.jpeg',
-      },
-    },
-  },
- */
-
-export type Params = {
-  channel?: string,
-  name: string,
-  thumbnail_url: ?string,
-  title: ?string,
-};
-
-export type UploadItem = {
-  progess: string,
-  params: Params,
-  xhr?: any,
-};
-
-export type TvState = {
-  currentUploads: { [key: string]: UploadItem },
-};
-
-const reducers = {};
-
-const defaultState: TvState = {
-  currentUploads: {},
-};
-
-reducers[ACTIONS.UPDATE_UPLOAD_PROGRESS] = (state: TvState, action) => {
-  const { progress, params, xhr } = action.data;
-  const key = params.channel ? `${params.name}#${params.channel}` : `${params.name}#anonymous`;
-  let currentUploads;
-  if (!progress) {
-    currentUploads = Object.assign({}, state.currentUploads);
-    Object.keys(currentUploads).forEach(k => {
-      if (k === key) {
-        delete currentUploads[key];
-      }
-    });
-  } else {
-    currentUploads = Object.assign({}, state.currentUploads);
-    currentUploads[key] = { progress, params, xhr };
-  }
-  return { ...state, currentUploads };
-};
-
-export function webReducer(state: TvState = defaultState, action: any) {
-  const handler = reducers[action.type];
-  if (handler) return handler(state, action);
-  return state;
-}

extras/lbryinc/redux/selectors/homepage.js

@@ -1,17 +0,0 @@
-import { createSelector } from 'reselect';
-
-const selectState = state => state.homepage || {};
-
-export const selectFeaturedUris = createSelector(selectState, state => state.featuredUris);
-
-export const selectFetchingFeaturedUris = createSelector(
-  selectState,
-  state => state.fetchingFeaturedContent
-);
-
-export const selectTrendingUris = createSelector(selectState, state => state.trendingUris);
-
-export const selectFetchingTrendingUris = createSelector(
-  selectState,
-  state => state.fetchingTrendingContent
-);

extras/lbryinc/redux/selectors/web.js

@@ -1,10 +0,0 @@
-import { createSelector } from 'reselect';
-
-const selectState = state => state.web || {};
-
-export const selectCurrentUploads = createSelector(selectState, state => state.currentUploads);
-
-export const selectUploadCount = createSelector(
-  selectCurrentUploads,
-  currentUploads => currentUploads && Object.keys(currentUploads).length
-);

static/app-strings.json

@@ -2194,5 +2194,6 @@
   "Trending for #Btc": "Trending for #Btc",
   "Trending for #Music": "Trending for #Music",
   "You sent %lbc% as a tip, Mahalo!": "You sent %lbc% as a tip, Mahalo!",
+  "Export All": "Export All",
   "--end--": "--end--"
 }

ui/component/app/index.js

@@ -1,6 +1,5 @@
 import { hot } from 'react-hot-loader/root';
 import { connect } from 'react-redux';
-import { selectUploadCount } from 'lbryinc';
 import { selectGetSyncErrorMessage, selectSyncFatalError } from 'redux/selectors/sync';
 import { doFetchAccessToken, doUserSetReferrer } from 'redux/actions/user';
 import { selectUser, selectAccessToken, selectUserVerifiedEmail } from 'redux/selectors/user';
@@ -43,7 +42,6 @@ const select = (state) => ({
   autoUpdateDownloaded: selectAutoUpdateDownloaded(state),
   isUpgradeAvailable: selectIsUpgradeAvailable(state),
   syncError: selectGetSyncErrorMessage(state),
-  uploadCount: selectUploadCount(state),
   rewards: selectUnclaimedRewards(state),
   isAuthenticated: selectUserVerifiedEmail(state),
   currentModal: selectModal(state),

ui/component/sideNavigation/view.jsx

@@ -272,7 +272,7 @@ function SideNavigation(props: Props) {
         <Button label={__('About --[link title in Sidebar or Footer]--')} href="https://lbry.com/about" />
       </li>
       <li className="navigation-link">
-        <Button label={__('FAQ')} href="https://odysee.com/@OdyseeHelp:b" />
+        <Button label={__('FAQ')} href="https://lbry.com/faq" />
       </li>
       <li className="navigation-link">
         <Button label={__('Support --[used in footer; general help/support]--')} href="https://lbry.com/support" />

ui/component/webUploadList/index.js

@@ -1,13 +0,0 @@
-import { connect } from 'react-redux';
-import { selectCurrentUploads, selectUploadCount } from 'lbryinc';
-import WebUploadList from './view';
-
-const select = state => ({
-  currentUploads: selectCurrentUploads(state),
-  uploadCount: selectUploadCount(state),
-});
-
-export default connect(
-  select,
-  null
-)(WebUploadList);

ui/component/webUploadList/internal/web-upload-item.jsx

@@ -1,41 +0,0 @@
-// @flow
-import React from 'react';
-import Button from 'component/button';
-import FileThumbnail from 'component/fileThumbnail';
-type Props = {
-  params: UpdatePublishFormData,
-  progress: string,
-  xhr?: () => void,
-};
-
-export default function WebUploadItem(props: Props) {
-  const { params, progress, xhr } = props;
-
-  return (
-    <li className={'claim-preview claim-preview--padded claim-preview--inactive card--inline'}>
-      <FileThumbnail thumbnail={params.thumbnail_url} />
-      <div className={'claim-preview-metadata'}>
-        <div className="claim-preview-info">
-          <div className="claim-preview__title">{params.title}</div>
-          {xhr && (
-            <div className="card__actions--inline">
-              <Button
-                button="link"
-                onClick={() => {
-                  xhr.abort();
-                }}
-                label={__('Cancel')}
-              />
-            </div>
-          )}
-        </div>
-        <h2>lbry://{params.name}</h2>
-        <div className={'claim-upload__progress--outer card--inline'}>
-          <div className={'claim-upload__progress--inner'} style={{ width: `${progress}%` }}>
-            Uploading...
-          </div>
-        </div>
-      </div>
-    </li>
-  );
-}

ui/component/webUploadList/view.jsx

@@ -1,36 +0,0 @@
-// @flow
-import * as React from 'react';
-import Card from 'component/common/card';
-import WebUploadItem from './internal/web-upload-item';
-
-export type UploadItem = {
-  progess: string,
-  params: UpdatePublishFormData,
-  xhr?: { abort: () => void },
-};
-
-type Props = {
-  currentUploads: { [key: string]: UploadItem },
-  uploadCount: number,
-};
-
-export default function WebUploadList(props: Props) {
-  const { currentUploads, uploadCount } = props;
-
-  return (
-    !!uploadCount && (
-      <Card
-        title={__('Currently Uploading')}
-        subtitle={__('Leave the app running until upload is complete')}
-        body={
-          <section>
-            {/* $FlowFixMe */}
-            {Object.values(currentUploads).map(({ progress, params, xhr }) => (
-              <WebUploadItem key={`upload${params.name}`} progress={progress} params={params} xhr={xhr} />
-            ))}
-          </section>
-        }
-      />
-    )
-  );
-}

ui/page/fileListPublished/index.js

@@ -7,7 +7,6 @@ import {
 } from 'redux/selectors/claims';
 import { doFetchClaimListMine, doCheckPendingClaims } from 'redux/actions/claims';
 import { doClearPublish } from 'redux/actions/publish';
-import { selectUploadCount } from 'lbryinc';
 import FileListPublished from './view';
 import { withRouter } from 'react-router';
 import { MY_CLAIMS_PAGE_SIZE, PAGE_PARAM, PAGE_SIZE_PARAM } from 'constants/claim';
@@ -25,7 +24,6 @@ const select = (state, props) => {
     urls: selectMyClaimsPage(state),
     urlTotal: selectMyClaimsPageItemCount(state),
     error: selectFetchingMyClaimsPageError(state),
-    uploadCount: selectUploadCount(state),
   };
 };
 

ui/page/fileListPublished/view.jsx

@@ -7,7 +7,6 @@ import ClaimList from 'component/claimList';
 import Page from 'component/page';
 import Paginate from 'component/common/paginate';
 import { PAGE_PARAM, PAGE_SIZE_PARAM } from 'constants/claim';
-import WebUploadList from 'component/webUploadList';
 import Spinner from 'component/spinner';
 import Yrbl from 'component/yrbl';
 import classnames from 'classnames';
@@ -17,7 +16,6 @@ const FILTER_UPLOADS = 'stream';
 const FILTER_REPOSTS = 'repost';
 
 type Props = {
-  uploadCount: number,
   checkPendingPublishes: () => void,
   clearPublish: () => void,
   fetchClaimListMine: (number, number, boolean, Array<string>) => void,
@@ -30,17 +28,7 @@ type Props = {
 };
 
 function FileListPublished(props: Props) {
-  const {
+  const { checkPendingPublishes, clearPublish, fetchClaimListMine, fetching, urls, urlTotal, page, pageSize } = props;
-    uploadCount,
-    checkPendingPublishes,
-    clearPublish,
-    fetchClaimListMine,
-    fetching,
-    urls,
-    urlTotal,
-    page,
-    pageSize,
-  } = props;
 
   const [filterBy, setFilterBy] = React.useState(FILTER_ALL);
   const params = {};
@@ -59,12 +47,11 @@ function FileListPublished(props: Props) {
       const params = JSON.parse(paramsString);
       fetchClaimListMine(params.page, params.page_size, true, filterBy.split(','));
     }
-  }, [uploadCount, paramsString, filterBy, fetchClaimListMine]);
+  }, [paramsString, filterBy, fetchClaimListMine]);
 
   return (
     <Page>
       <div className="card-stack">
-        <WebUploadList />
         {!!urls && (
           <>
             <ClaimList

ui/reducers.js

@@ -1,6 +1,6 @@
 import { combineReducers } from 'redux';
 import { connectRouter } from 'connected-react-router';
-import { costInfoReducer, blacklistReducer, filteredReducer, statsReducer, webReducer } from 'lbryinc';
+import { costInfoReducer, blacklistReducer, filteredReducer, statsReducer } from 'lbryinc';
 import { claimsReducer } from 'redux/reducers/claims';
 import { fileInfoReducer } from 'redux/reducers/file_info';
 import { walletReducer } from 'redux/reducers/wallet';
@@ -48,6 +48,5 @@ export default (history) =>
     user: userReducer,
     wallet: walletReducer,
     sync: syncReducer,
-    web: webReducer,
     collections: collectionsReducer,
   });