From c183ebc8381cfa690ba49b2cc3a437bc2544553a Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Wed, 21 Jun 2017 14:33:32 -0400 Subject: [PATCH 01/11] travis work --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3308117f3..3e7c16c62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,13 @@ os: linux dist: xenial +#language: python +#python: 2.7 -install: +#before_install: +# - virtualenv venv +# - source venv/bin/activate + +script: - rvm install 2.3.1 - rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger # - FULL_BUILD=true ./build.sh From da1314fb2c0c448167afc5e5e96beef449e6df18 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Wed, 21 Jun 2017 15:22:17 -0400 Subject: [PATCH 02/11] transifex travis integration --- .travis.yml | 31 +++++++++++++++++++++++-------- .tx/config | 9 +++++++++ 2 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 .tx/config diff --git a/.travis.yml b/.travis.yml index 3e7c16c62..9e6873e39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,28 @@ +env: + global: + - TRANSIFEX_USER: api + - secure: u6gwnZlPGJLnvpoPPCpUZ+jBPajQuIW1+aq6UGW57z54AUjTAECxaYpqcGTGtDBjYark/yeiso887wP/EmJva7hMHeNMf6uLqwzP3YFsIv/Iv+9c1f4MXbJNgOrEKN834o/BdkD4ifi9CCiH9uPPVYGPx1bvfaxGpcHmQXdW4F4S0uj+jePB257mt+afGiNlz9wET6kWJKNNZf/4BNmefldVNq7h6oTSLsyO1TBhDcvSjatpKIwmXUNQfSUTFWvrtpWUB/m/IzitGuUtrt82vU2fPl7tuH6BHNrNp58MINjFzXXJLC+mMybb2UBDIAuc3+k7vj4J0U2rkcTloxDNCKNmYa1jBogOKBRgGp98Ct7E0V2vuLGAPniUbvBcCGK1wwed7uwDjsz3YNCGxUEcyyWc3OVDgN/up4+gXHxkh9FTpZy8Q3rSZx4Lwj700impBUQIVh/5p7Vgv+bSUdOeVRAMlcP9yT83jX50w9LkJMfICFPNv1tOZ3/SOnnB+JdW/ahpplFI4Z68/fBLttZTeaNcU4f28oJvPer8Wll+Elx5kxwLqLbwVUFNlxTxY1LYnPB7SPjGxrFNy3mVTRq5Pxp1hMiTZF4TlapkfHgR+gEzk2wpcJGmub70tW2baZaJF0jDBWIh7GXV+EGve53BKDhpX2Z6jTK0gkhrSUW1MT8= + - secure: h1r9Qzv2xHRQl7nDHcscB4qDv7KlF/ncgHko1YuoY4oLZipBV8mzQXDmn3nlMKwaKOe1/Tty/bjoZexkWict4cwKBzU7/1HtJeMa6nxRICuS6DiVhLUNGZEddK6jQLxeEZFxkFPSCZyjybPWtasF8f8jd0lqqLIL4/FcIVV56aRCKAsUwCbedxi8Vnc19l74xjaQIK82xBFYOQPK078OBovk9DDOnicTjMulUo3/pKEZD1njSdcEhfSRv+MFE+31B/a6lpoLo7twPlyzLMfpo30NlEzIN0TeMAk44e4PV6DYg0wntC2GJ21p4BqMnDGocwnZwm7gpjflzUZdW6hF0esGLcqOdbyJLUb3rNX9AzQmn0p9KwDC3S80peZFxSiuLJGL8eivceVDUK/jwWinu3OHDJ/eO5iMDm9odm2ALemPtrDTSlRNT8HzNCY9PQTU9Dhdm4Q/dGDsRPWibFJSJ/qGKhVgadk2CUEAPua0hB1zZ556PkTGx4R1JDscgFDAkgemzgKl4Z/4qK3xGDoEtz1HmBlvQtn+B/PuhA2essADj0iTDiItxb7AYTA7EzsHEcRMmrbYarZ3Eh2onWy2GOpAGRN5Xl9cBIDbibcSC6BLI1m2PcLABpP7DhUX4bJbsVNSiGesHEU7o9Dgn8Ig09eHW/8F9i0VVoGUZXxKMJ8= + os: linux dist: xenial -#language: python -#python: 2.7 -#before_install: -# - virtualenv venv -# - source venv/bin/activate +branches: + only: + - "/^v\\d+\\.\\d+\\.\\d+$/" + +install: +- rvm install 2.3.1 script: - - rvm install 2.3.1 - - rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger -# - FULL_BUILD=true ./build.sh +- rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger +- FULL_BUILD=true ./build.sh + +sudo: required +after_success: +- pip install virtualenv +- virtualenv ~/env +- source ~/env/bin/activate +- pip install transifex-client +- sudo echo $'[https://www.transifex.com]\nhostname = https://www.transifex.com\nusername= '"$TRANSIFEX_USER"$'\npassword = '"$TRANSIFEX_PASSWORD"$'\ntoken = '"$TRANSIFEX_API_TOKEN"$'\n' > ~/.transifexrc +- tx push -s diff --git a/.tx/config b/.tx/config new file mode 100644 index 000000000..9946300b6 --- /dev/null +++ b/.tx/config @@ -0,0 +1,9 @@ +[main] +host = https://www.transifex.com + +[lbry-app.app-strings] +file_filter = app/dist/locales/.json +source_file = app/dist/locales/en.json +source_lang = en +type = KEYVALUEJSON + From b95f818604b365cf92259267e6d620d78c5e1079 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Wed, 21 Jun 2017 15:27:40 -0400 Subject: [PATCH 03/11] ping travis --- .tx/config | 1 - 1 file changed, 1 deletion(-) diff --git a/.tx/config b/.tx/config index 9946300b6..8979a5b32 100644 --- a/.tx/config +++ b/.tx/config @@ -6,4 +6,3 @@ file_filter = app/dist/locales/.json source_file = app/dist/locales/en.json source_lang = en type = KEYVALUEJSON - From 31565c3d5af3bceaf3bfba2ac819d55ed8027422 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Wed, 21 Jun 2017 15:34:55 -0400 Subject: [PATCH 04/11] ping travis From 613c15280cc7f5e5410fb106f3e7d2bee3e8cf8f Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Wed, 21 Jun 2017 15:42:50 -0400 Subject: [PATCH 05/11] ping travis From 9da8a4b8dc40e215b5f3eb89af8af0a28ff560a2 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Wed, 21 Jun 2017 15:43:21 -0400 Subject: [PATCH 06/11] build on master too --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e6873e39..9676d6e89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,9 @@ env: os: linux dist: xenial -branches: - only: - - "/^v\\d+\\.\\d+\\.\\d+$/" +#branches: +# only: +# - "/^v\\d+\\.\\d+\\.\\d+$/" install: - rvm install 2.3.1 From a9fe3a0ed209449f8b332a01ff1d48f50c2af97a Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Wed, 21 Jun 2017 18:27:07 -0400 Subject: [PATCH 07/11] those arent real functions anymore --- ui/js/actions/rewards.js | 2 +- ui/js/rewards.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/js/actions/rewards.js b/ui/js/actions/rewards.js index 14a2a8253..34254ab3f 100644 --- a/ui/js/actions/rewards.js +++ b/ui/js/actions/rewards.js @@ -77,7 +77,7 @@ export function doClaimReward(reward, saveError = false) { export function doClaimEligiblePurchaseRewards() { return function(dispatch, getState) { - if (!lbryio.enabled || !lbryio.getAccessToken()) { + if (!lbryio.enabled) { return; } diff --git a/ui/js/rewards.js b/ui/js/rewards.js index 08d82fd9b..d69e48f7e 100644 --- a/ui/js/rewards.js +++ b/ui/js/rewards.js @@ -93,7 +93,7 @@ rewards.TYPE_FEATURED_DOWNLOAD = "featured_download"; rewards.claimReward = function(type) { function requestReward(resolve, reject, params) { - if (!lbryio.enabled || !lbryio.getAccessToken()) { + if (!lbryio.enabled) { reject(new Error(__("Rewards are not enabled."))); return; } From 0d5a04b4512e3f346132b5552868e0a780aef172 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Wed, 21 Jun 2017 18:49:23 -0400 Subject: [PATCH 08/11] pass the function, dont call it --- ui/js/lbryio.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/lbryio.js b/ui/js/lbryio.js index a371d4db7..9e3a7cc43 100644 --- a/ui/js/lbryio.js +++ b/ui/js/lbryio.js @@ -202,7 +202,7 @@ lbryio.authenticate = function() { return lbryio.setAuthToken(response.auth_token); }); }) - .then(lbryio.getCurrentUser()) + .then(lbryio.getCurrentUser) .then(resolve, reject); }); } From b14293cd14624cbffcc36882bc40dd920e0f9a9f Mon Sep 17 00:00:00 2001 From: Intnick Date: Thu, 22 Jun 2017 01:15:24 +0200 Subject: [PATCH 09/11] separated page name translations --- ui/js/selectors/app.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ui/js/selectors/app.js b/ui/js/selectors/app.js index c03bb28d3..0945833c1 100644 --- a/ui/js/selectors/app.js +++ b/ui/js/selectors/app.js @@ -31,17 +31,25 @@ export const selectPageTitle = createSelector( (page, params) => { switch (page) { case "settings": - case "help": + return __("Settings"); case "report": + return __("Report"); case "wallet": + return __("Wallet"); case "send": + return __("Send"); case "receive": + return __("Receive"); case "rewards": + return __("Rewards"); case "start": + return __("Start"); case "publish": + return __("Publish"); case "help": + return __("Help"); case "developer": - return __(page.charAt(0).toUpperCase() + page.slice(1)); + return __("Developer"); case "search": return params.query ? __("Search results for %s", params.query) From 89b5e20b157b1a7187a4c8bdece16b4a5ff27a12 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Wed, 21 Jun 2017 20:09:30 -0400 Subject: [PATCH 10/11] iron out auth issues --- ui/js/actions/app.js | 1 - ui/js/actions/rewards.js | 3 +-- ui/js/actions/user.js | 4 ++-- ui/js/component/authOverlay/view.jsx | 8 +++++++- ui/js/selectors/user.js | 7 ++----- ui/js/store.js | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ui/js/actions/app.js b/ui/js/actions/app.js index 9657b8756..9f6214d39 100644 --- a/ui/js/actions/app.js +++ b/ui/js/actions/app.js @@ -12,7 +12,6 @@ import { import { doSearch } from "actions/search"; import { doFetchDaemonSettings } from "actions/settings"; import { doAuthenticate } from "actions/user"; -import { doRewardList } from "actions/rewards"; import { doFileList } from "actions/file_info"; const { remote, ipcRenderer, shell } = require("electron"); diff --git a/ui/js/actions/rewards.js b/ui/js/actions/rewards.js index 34254ab3f..9c5d5143a 100644 --- a/ui/js/actions/rewards.js +++ b/ui/js/actions/rewards.js @@ -1,8 +1,7 @@ import * as types from "constants/action_types"; -import lbry from "lbry"; import lbryio from "lbryio"; import rewards from "rewards"; -import { selectRewards, selectRewardsByType } from "selectors/rewards"; +import { selectRewardsByType } from "selectors/rewards"; export function doRewardList() { return function(dispatch, getState) { diff --git a/ui/js/actions/user.js b/ui/js/actions/user.js index 662521617..b9c5f8590 100644 --- a/ui/js/actions/user.js +++ b/ui/js/actions/user.js @@ -16,8 +16,6 @@ export function doAuthenticate() { type: types.AUTHENTICATION_SUCCESS, data: { user }, }); - - dispatch(doRewardList()); //FIXME - where should this happen? }) .catch(error => { dispatch({ @@ -36,6 +34,8 @@ export function doUserFetch() { lbryio .getCurrentUser() .then(user => { + dispatch(doRewardList()); + dispatch({ type: types.USER_FETCH_SUCCESS, data: { user }, diff --git a/ui/js/component/authOverlay/view.jsx b/ui/js/component/authOverlay/view.jsx index 0cce29f9b..206e45f55 100644 --- a/ui/js/component/authOverlay/view.jsx +++ b/ui/js/component/authOverlay/view.jsx @@ -3,6 +3,7 @@ import lbryio from "lbryio.js"; import ModalPage from "component/modal-page.js"; import Auth from "component/auth"; import Link from "component/link"; +import { getLocal, setLocal } from "utils"; export class AuthOverlay extends React.PureComponent { constructor(props) { @@ -14,7 +15,12 @@ export class AuthOverlay extends React.PureComponent { } componentWillReceiveProps(nextProps) { - if (this.props.isShowing && !this.props.isPending && !nextProps.isShowing) { + if ( + this.props.isShowing && + !this.props.isPending && + !nextProps.isShowing /* && !getLocal("welcome_screen_shown")*/ + ) { + setLocal("welcome_screen_shown", true); setTimeout(() => this.props.openWelcomeModal(), 1); } } diff --git a/ui/js/selectors/user.js b/ui/js/selectors/user.js index bd981273e..d17485aa6 100644 --- a/ui/js/selectors/user.js +++ b/ui/js/selectors/user.js @@ -25,7 +25,7 @@ export const selectEmailToVerify = createSelector( export const selectUserHasEmail = createSelector( selectUser, selectEmailToVerify, - (user, email) => (user && user.has_email) || email + (user, email) => (user && user.has_email) || !!email ); export const selectUserIsRewardEligible = createSelector( @@ -64,11 +64,8 @@ export const selectEmailVerifyErrorMessage = createSelector( ); export const selectUserIsVerificationCandidate = createSelector( - selectUserIsRewardEligible, - selectUserIsRewardApproved, - selectEmailToVerify, selectUser, - (isEligible, isApproved, emailToVerify, user) => emailToVerify && user + user => user && !user.has_verified_email ); export const selectUserIsAuthRequested = createSelector( diff --git a/ui/js/store.js b/ui/js/store.js index 5f75449de..0ec06c017 100644 --- a/ui/js/store.js +++ b/ui/js/store.js @@ -77,7 +77,7 @@ if (env === "development") { middleware.push(logger); } -middleware.push(createActionBuffer(REHYDRATE)); +// middleware.push(createActionBuffer(REHYDRATE)); // was causing issues with authentication reducers not firing const createStoreWithMiddleware = redux.compose( autoRehydrate(), From d9bc7f9777fd21b877c4c780d0b92ddcfdf1c958 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Wed, 21 Jun 2017 20:12:35 -0400 Subject: [PATCH 11/11] =?UTF-8?q?Bump=20version:=200.12.2rc5=20=E2=86=92?= =?UTF-8?q?=200.12.2rc6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- app/package-lock.json | 2 +- app/package.json | 2 +- ui/package-lock.json | 2 +- ui/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index c8cf85307..d2d1d26b2 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.12.2rc5 +current_version = 0.12.2rc6 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))? diff --git a/app/package-lock.json b/app/package-lock.json index ece7eeafe..5c472c583 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.12.2rc5", + "version": "0.12.2rc6", "lockfileVersion": 1, "dependencies": { "commander": { diff --git a/app/package.json b/app/package.json index 2a01c01c7..6adae36ef 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.12.2rc5", + "version": "0.12.2rc6", "main": "main.js", "description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.", "author": { diff --git a/ui/package-lock.json b/ui/package-lock.json index 890228ef8..1690e0544 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "lbry-web-ui", - "version": "0.12.2rc5", + "version": "0.12.2rc6", "lockfileVersion": 1, "dependencies": { "abbrev": { diff --git a/ui/package.json b/ui/package.json index 0face051b..4227e7837 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "lbry-web-ui", - "version": "0.12.2rc5", + "version": "0.12.2rc6", "description": "LBRY UI", "scripts": { "test": "echo \"Error: no test specified\" && exit 1",