From dae603339b64a9ab8eec743fd097b0241908b329 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Mon, 17 Jun 2019 16:32:38 -0400 Subject: [PATCH] moar discovery --- package.json | 4 +- src/ui/component/button/view.jsx | 1 + src/ui/component/copyableText/view.jsx | 2 +- src/ui/component/fileList/view.jsx | 26 +- src/ui/component/fileListDiscover/index.js | 4 +- src/ui/component/fileListDiscover/view.jsx | 69 ++-- src/ui/component/fileListItem/view.jsx | 4 +- src/ui/component/fileProperties/view.jsx | 3 +- src/ui/component/fileTags/view.jsx | 20 +- src/ui/component/header/index.js | 16 +- src/ui/component/header/view.jsx | 104 +++--- src/ui/component/inviteNew/view.jsx | 4 +- src/ui/component/page/index.js | 16 +- src/ui/component/page/view.jsx | 95 ++---- src/ui/component/recommendedContent/view.jsx | 2 +- src/ui/component/rewardLink/view.jsx | 2 +- src/ui/component/rewardListClaimed/view.jsx | 4 +- src/ui/component/rewardSummary/index.js | 3 +- src/ui/component/rewardSummary/view.jsx | 48 +-- src/ui/component/rewardTile/view.jsx | 4 +- src/ui/component/rewardTotal/index.js | 25 ++ .../rewardTotal/total-background.png | Bin 0 -> 47186 bytes src/ui/component/rewardTotal/view.jsx | 25 ++ src/ui/component/router/view.jsx | 5 +- src/ui/component/sideBar/index.js | 3 +- src/ui/component/sideBar/view.jsx | 43 +-- src/ui/component/subscribeButton/view.jsx | 4 +- src/ui/component/tag/view.jsx | 17 +- src/ui/component/tagsSelect/view.jsx | 1 + src/ui/component/transactionList/index.js | 2 + .../internal/transaction-list-item.jsx | 4 +- src/ui/component/transactionList/view.jsx | 46 ++- .../component/transactionListRecent/index.js | 10 +- .../component/transactionListRecent/view.jsx | 49 +-- src/ui/component/userEmail/index.js | 18 ++ src/ui/component/userEmail/view.jsx | 60 ++++ src/ui/component/userEmailNew/view.jsx | 1 + src/ui/component/userEmailVerify/view.jsx | 2 +- src/ui/component/walletAddress/view.jsx | 6 +- src/ui/component/walletBalance/view.jsx | 8 +- src/ui/component/walletSend/view.jsx | 4 +- src/ui/constants/icons.js | 5 + src/ui/constants/pages.js | 1 + src/ui/constants/tags.js | 14 + src/ui/page/account/index.js | 10 +- src/ui/page/account/view.jsx | 18 +- src/ui/page/auth/index.js | 11 +- src/ui/page/auth/view.jsx | 49 +-- src/ui/page/discover/view.jsx | 2 +- src/ui/page/file/view.jsx | 61 ++-- src/ui/page/help/view.jsx | 14 +- src/ui/page/invite/view.jsx | 5 +- src/ui/page/rewards/view.jsx | 4 +- src/ui/page/sendCredits/index.js | 3 - src/ui/page/sendCredits/view.jsx | 18 -- src/ui/page/subscriptions/index.js | 5 +- src/ui/page/subscriptions/view.jsx | 53 ++- src/ui/page/tags/index.js | 8 +- src/ui/page/tags/view.jsx | 23 +- src/ui/page/transactionHistory/index.js | 8 +- src/ui/page/transactionHistory/view.jsx | 27 +- src/ui/page/userHistory/view.jsx | 2 - src/ui/page/wallet/index.js | 11 + src/ui/page/wallet/view.jsx | 17 + src/ui/reducers.js | 15 +- src/ui/redux/selectors/subscriptions.js | 2 +- src/ui/scss/all.scss | 2 +- src/ui/scss/component/_badge.scss | 3 + src/ui/scss/component/_button.scss | 38 ++- src/ui/scss/component/_card.scss | 55 ++-- src/ui/scss/component/_content.scss | 3 +- src/ui/scss/component/_file-list.scss | 27 +- src/ui/scss/component/_file-properties.scss | 14 +- src/ui/scss/component/_form-field.scss | 12 +- src/ui/scss/component/_header.scss | 42 +-- src/ui/scss/component/_icon.scss | 11 - src/ui/scss/component/_main.scss | 35 +- src/ui/scss/component/_markdown-preview.scss | 8 +- src/ui/scss/component/_media.scss | 31 +- src/ui/scss/component/_navigation.scss | 9 +- src/ui/scss/component/_spinner.scss | 1 + src/ui/scss/component/_table.scss | 29 +- src/ui/scss/component/_tags.scss | 33 +- src/ui/scss/component/_wunderbar.scss | 10 +- src/ui/scss/component/menu-button.scss | 96 ++++++ src/ui/scss/init/_gui.scss | 6 +- src/ui/scss/init/_vars.scss | 2 +- src/ui/util/format-credits.js | 5 +- src/ui/util/use-tween.js | 31 ++ static/locales/en.json | 302 ++++++------------ yarn.lock | 58 +++- 91 files changed, 1123 insertions(+), 890 deletions(-) create mode 100644 src/ui/component/rewardTotal/index.js create mode 100644 src/ui/component/rewardTotal/total-background.png create mode 100644 src/ui/component/rewardTotal/view.jsx create mode 100644 src/ui/component/userEmail/index.js create mode 100644 src/ui/component/userEmail/view.jsx create mode 100644 src/ui/constants/tags.js delete mode 100644 src/ui/page/sendCredits/index.js delete mode 100644 src/ui/page/sendCredits/view.jsx create mode 100644 src/ui/page/wallet/index.js create mode 100644 src/ui/page/wallet/view.jsx delete mode 100644 src/ui/scss/component/_icon.scss create mode 100644 src/ui/scss/component/menu-button.scss create mode 100644 src/ui/util/use-tween.js diff --git a/package.json b/package.json index 6fed1a788..ec02d7d8e 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,8 @@ "postinstall": "electron-builder install-app-deps && node ./build/downloadDaemon.js" }, "dependencies": { + "@reach/menu-button": "^0.1.18", + "@reach/tooltip": "^0.2.1", "electron-dl": "^1.11.0", "electron-log": "^2.2.12", "electron-updater": "^4.0.6", @@ -119,7 +121,7 @@ "jsmediatags": "^3.8.1", "json-loader": "^0.5.4", "lbry-format": "https://github.com/lbryio/lbry-format.git", - "lbry-redux": "lbryio/lbry-redux#291324d03f694c4fefa6967aa7be02d9245596a8", + "lbry-redux": "lbryio/lbry-redux#6a447d0542d23b9a37e266f5f85d3bde5297a451", "lbryinc": "lbryio/lbryinc#43d382d9b74d396a581a74d87e4c53105e04f845", "lint-staged": "^7.0.2", "localforage": "^1.7.1", diff --git a/src/ui/component/button/view.jsx b/src/ui/component/button/view.jsx index 4c62c3aab..0949ecdfb 100644 --- a/src/ui/component/button/view.jsx +++ b/src/ui/component/button/view.jsx @@ -105,6 +105,7 @@ class Button extends React.PureComponent { exact to={path} title={title} + disabled={disabled} onClick={e => { e.stopPropagation(); if (onClick) { diff --git a/src/ui/component/copyableText/view.jsx b/src/ui/component/copyableText/view.jsx index 1ac15adce..5a292719c 100644 --- a/src/ui/component/copyableText/view.jsx +++ b/src/ui/component/copyableText/view.jsx @@ -44,7 +44,7 @@ export default class CopyableText extends React.PureComponent { onFocus={this.onFocus} inputButton={ + +