From cd1ce38687248aaf8bebb65c3816f17040ff6c56 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Sun, 21 Jul 2019 17:31:22 -0400 Subject: [PATCH] better consistency --- package.json | 1 - src/ui/component/channelContent/view.jsx | 4 +- src/ui/component/channelEdit/view.jsx | 199 ++++++++--------- src/ui/component/claimList/view.jsx | 4 +- src/ui/component/claimListDiscover/view.jsx | 8 +- src/ui/component/claimPreview/view.jsx | 48 ++-- src/ui/component/commentCreate/view.jsx | 26 +-- .../common/form-components/form-field.jsx | 11 - src/ui/component/common/icon-custom.jsx | 2 +- .../component/common/unsupported-on-web.jsx | 2 +- src/ui/component/fileDetails/view.jsx | 6 +- src/ui/component/fileDownloadLink/view.jsx | 2 +- src/ui/component/inviteList/view.jsx | 73 +++--- src/ui/component/inviteNew/view.jsx | 41 ++-- src/ui/component/navigationHistory/view.jsx | 14 +- .../navigationHistoryRecent/view.jsx | 8 +- src/ui/component/previewLink/view.jsx | 4 +- .../publishAdditionalOptions/view.jsx | 2 +- src/ui/component/publishFile/view.jsx | 6 +- src/ui/component/publishForm/view.jsx | 16 +- src/ui/component/publishFormErrors/view.jsx | 2 +- src/ui/component/publishName/view.jsx | 46 ++-- src/ui/component/publishPrice/view.jsx | 62 +++-- src/ui/component/publishText/view.jsx | 42 ++-- src/ui/component/recommendedContent/view.jsx | 2 +- src/ui/component/rewardListClaimed/view.jsx | 2 +- src/ui/component/rewardSummary/view.jsx | 20 +- src/ui/component/rewardTile/view.jsx | 38 ++-- src/ui/component/rewardTotal/view.jsx | 4 +- src/ui/component/searchOptions/view.jsx | 4 +- src/ui/component/selectChannel/view.jsx | 8 +- src/ui/component/selectThumbnail/view.jsx | 2 +- src/ui/component/sideBar/view.jsx | 18 +- src/ui/component/socialShare/view.jsx | 37 ++- src/ui/component/tagsSearch/view.jsx | 2 +- src/ui/component/tagsSelect/view.jsx | 50 ++--- .../internal/transaction-list-item.jsx | 3 +- src/ui/component/transactionList/view.jsx | 8 +- .../component/transactionListRecent/view.jsx | 2 +- src/ui/component/userEmail/view.jsx | 12 +- src/ui/component/userEmailNew/view.jsx | 22 +- src/ui/component/userEmailVerify/view.jsx | 41 ++-- src/ui/component/userPhoneNew/view.jsx | 54 +++-- src/ui/component/userPhoneVerify/view.jsx | 14 +- src/ui/component/userVerify/view.jsx | 136 +++++------ src/ui/component/walletAddress/view.jsx | 41 +--- src/ui/component/walletBackup/view.jsx | 99 ++++---- .../walletBalance/balance-background.png | Bin 23205 -> 33298 bytes src/ui/component/walletBalance/view.jsx | 13 +- src/ui/component/walletSend/view.jsx | 60 +++-- src/ui/component/walletSendTip/view.jsx | 10 +- src/ui/component/yrbl/index.jsx | 2 +- src/ui/modal/modal.jsx | 8 +- src/ui/modal/modalAffirmPurchase/view.jsx | 16 +- src/ui/modal/modalAuthFailure/view.jsx | 4 +- .../modal/modalAutoGenerateThumbnail/view.jsx | 6 +- src/ui/modal/modalAutoUpdateConfirm/view.jsx | 12 +- .../modal/modalAutoUpdateDownloaded/view.jsx | 12 +- .../modalConfirmThumbnailUpload/view.jsx | 9 +- src/ui/modal/modalConfirmTransaction/view.jsx | 2 +- src/ui/modal/modalDownloading/view.jsx | 24 +- src/ui/modal/modalError/view.jsx | 14 +- src/ui/modal/modalFileTimeout/view.jsx | 14 +- src/ui/modal/modalFirstReward/view.jsx | 18 +- src/ui/modal/modalFirstSubscription/view.jsx | 32 ++- src/ui/modal/modalIncompatibleDaemon/view.jsx | 14 +- .../modal/modalOpenExternalResource/view.jsx | 14 +- src/ui/modal/modalPublish/view.jsx | 16 +- src/ui/modal/modalRemoveFile/view.jsx | 12 +- src/ui/modal/modalRevokeClaim/view.jsx | 2 +- .../modalRewardApprovalRequired/view.jsx | 12 +- src/ui/modal/modalRewardCode/view.jsx | 7 +- src/ui/modal/modalTransactionFailed/view.jsx | 4 +- src/ui/modal/modalUpgrade/view.jsx | 18 +- src/ui/modal/modalWalletDecrypt/view.jsx | 14 +- src/ui/modal/modalWalletEncrypt/view.jsx | 2 +- src/ui/modal/modalWalletUnlock/view.jsx | 32 ++- src/ui/modal/modalWelcome/view.jsx | 14 +- src/ui/page/channel/view.jsx | 2 +- src/ui/page/file/view.jsx | 113 +++++----- src/ui/page/fileListDownloaded/view.jsx | 13 +- src/ui/page/fileListPublished/view.jsx | 12 +- src/ui/page/following/view.jsx | 4 +- src/ui/page/getCredits/index.js | 3 - src/ui/page/getCredits/view.jsx | 33 --- src/ui/page/help/view.jsx | 211 ++++++++---------- src/ui/page/publish/view.jsx | 4 +- src/ui/page/report/view.jsx | 94 ++++---- src/ui/page/rewards/view.jsx | 68 +++--- src/ui/page/search/view.jsx | 8 +- src/ui/page/settings/view.jsx | 87 +++----- src/ui/page/show/view.jsx | 14 +- src/ui/scss/all.scss | 3 - src/ui/scss/component/_badge.scss | 1 + src/ui/scss/component/_button.scss | 27 ++- src/ui/scss/component/_card.scss | 92 +++----- src/ui/scss/component/_channel.scss | 7 +- src/ui/scss/component/_claim-list.scss | 95 +++++--- src/ui/scss/component/_comments.scss | 1 + src/ui/scss/component/_credit.scss | 17 -- src/ui/scss/component/_expandable.scss | 4 - src/ui/scss/component/_file-download.scss | 4 - src/ui/scss/component/_file-properties.scss | 4 +- src/ui/scss/component/_form-field.scss | 68 +++--- src/ui/scss/component/_header.scss | 8 +- src/ui/scss/component/_main.scss | 8 +- src/ui/scss/component/_markdown-editor.scss | 4 +- src/ui/scss/component/_markdown-preview.scss | 22 -- src/ui/scss/component/_media.scss | 98 ++------ src/ui/scss/component/_modal.scss | 31 --- src/ui/scss/component/_navigation.scss | 87 ++------ src/ui/scss/component/_pagination.scss | 5 +- src/ui/scss/component/_search.scss | 12 +- src/ui/scss/component/_snack-bar.scss | 7 +- src/ui/scss/component/_table.scss | 9 +- src/ui/scss/component/_tags.scss | 9 +- src/ui/scss/component/_toggle.scss | 143 ------------ src/ui/scss/component/_wunderbar.scss | 29 ++- src/ui/scss/component/menu-button.scss | 7 +- src/ui/scss/component/tabs.scss | 8 +- src/ui/scss/init/_gui.scss | 87 ++++---- src/ui/scss/init/_mixins.scss | 6 +- src/ui/scss/init/_vars.scss | 26 ++- static/locales/id.json | 10 +- yarn.lock | 7 - 125 files changed, 1330 insertions(+), 1947 deletions(-) delete mode 100644 src/ui/page/getCredits/index.js delete mode 100644 src/ui/page/getCredits/view.jsx delete mode 100644 src/ui/scss/component/_credit.scss delete mode 100644 src/ui/scss/component/_file-download.scss delete mode 100644 src/ui/scss/component/_toggle.scss diff --git a/package.json b/package.json index 9dec23212..d645bd263 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,6 @@ "react-simplemde-editor": "^4.0.0", "react-spring": "^8.0.20", "react-sticky-box": "^0.8.0", - "react-toggle": "^4.0.2", "redux": "^3.6.0", "redux-persist": "^4.8.0", "redux-persist-transform-compress": "^4.2.0", diff --git a/src/ui/component/channelContent/view.jsx b/src/ui/component/channelContent/view.jsx index 309664b70..fb72728fd 100644 --- a/src/ui/component/channelContent/view.jsx +++ b/src/ui/component/channelContent/view.jsx @@ -29,11 +29,11 @@ function ChannelContent(props: Props) { {!fetching && !hasContent && (
-

{__("This channel hasn't uploaded anything.")}

+

{__("This channel hasn't uploaded anything.")}

)} - {!channelIsMine && } + {!channelIsMine && } {hasContent && claim.permanent_url)} />} diff --git a/src/ui/component/channelEdit/view.jsx b/src/ui/component/channelEdit/view.jsx index 77c963402..f4e528fdd 100644 --- a/src/ui/component/channelEdit/view.jsx +++ b/src/ui/component/channelEdit/view.jsx @@ -2,7 +2,6 @@ import React, { useState } from 'react'; import { parseURI } from 'lbry-redux'; import { Form, FormField } from 'component/common/form'; -import Button from 'component/button'; import SelectAsset from 'component/selectAsset'; import TagSelect from 'component/tagsSelect'; @@ -21,12 +20,9 @@ type Props = { tags: Array, locations: Array, languages: Array, - updateChannel: any => void, - updateThumb: string => void, updateCover: string => void, - setEditing: boolean => void, }; function ChannelForm(props: Props) { @@ -43,7 +39,6 @@ function ChannelForm(props: Props) { languages, amount, updateChannel, - setEditing, updateThumb, updateCover, } = props; @@ -113,111 +108,109 @@ function ChannelForm(props: Props) {

updateChannel(channelParams)}> -
- handleThumbnailChange(v)} - currentValue={params.thumbnail} - assetName={'Thumbnail'} - recommended={'(300 x 300)'} - /> + handleThumbnailChange(v)} + currentValue={params.thumbnail} + assetName={'Thumbnail'} + recommended={'(300 x 300)'} + /> - handleCoverChange(v)} - currentValue={params.cover} - assetName={'Cover'} - recommended={'(1000 x 160)'} - /> + handleCoverChange(v)} + currentValue={params.cover} + assetName={'Cover'} + recommended={'(1000 x 160)'} + /> - setParams({ ...params, title: e.target.value })} - /> - handleBidChange(parseFloat(event.target.value))} - placeholder={0.1} - /> + setParams({ ...params, title: e.target.value })} + /> + handleBidChange(parseFloat(event.target.value))} + placeholder={0.1} + /> - setParams({ ...params, website: e.target.value })} - /> + setParams({ ...params, website: e.target.value })} + /> - setParams({ ...params, email: e.target.value })} - /> + setParams({ ...params, email: e.target.value })} + /> - setParams({ ...params, description: text })} - /> - { - if (!params.tags.map(savedTag => savedTag.name).includes(newTag.name)) { - setParams({ ...params, tags: [...params.tags, newTag] }); - } else { - // If it already exists and the user types it in, remove it - setParams({ ...params, tags: params.tags.filter(tag => tag.name !== newTag.name) }); - } + setParams({ ...params, description: text })} + /> + { + if (!params.tags.map(savedTag => savedTag.name).includes(newTag.name)) { + setParams({ ...params, tags: [...params.tags, newTag] }); + } else { + // If it already exists and the user types it in, remove it + setParams({ ...params, tags: params.tags.filter(tag => tag.name !== newTag.name) }); + } + }} + onRemove={clickedTag => { + const newTags = params.tags.slice().filter(tag => tag.name !== clickedTag.name); + setParams({ ...params, tags: newTags }); + }} + tagsChosen={params.tags || []} + /> +
+
diff --git a/src/ui/component/claimList/view.jsx b/src/ui/component/claimList/view.jsx index 7a29d01a1..77a54f635 100644 --- a/src/ui/component/claimList/view.jsx +++ b/src/ui/component/claimList/view.jsx @@ -99,7 +99,7 @@ export default function ClaimList(props: Props) { )} {urisLength > 0 && ( -