From 50e7010a5b2b27bd9076f2230495dcf067cc24c4 Mon Sep 17 00:00:00 2001 From: Travis Eden Date: Thu, 24 May 2018 12:51:40 -0400 Subject: [PATCH 1/4] add search page to router --- src/renderer/component/router/view.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/renderer/component/router/view.jsx b/src/renderer/component/router/view.jsx index 34728ace5..fa1a0fea3 100644 --- a/src/renderer/component/router/view.jsx +++ b/src/renderer/component/router/view.jsx @@ -17,6 +17,7 @@ import AuthPage from 'page/auth'; import InvitePage from 'page/invite'; import BackupPage from 'page/backup'; import SubscriptionsPage from 'page/subscriptions'; +import SearchPage from 'page/search'; const route = (props, page, routesMap) => { const component = routesMap[page]; @@ -51,6 +52,7 @@ const Router = props => { show: , wallet: , subscriptions: , + search: , }); }; From 0ca5941deedf7127b0d677b776def8f2bafbd9fc Mon Sep 17 00:00:00 2001 From: Travis Eden Date: Thu, 24 May 2018 13:48:51 -0400 Subject: [PATCH 2/4] remove search bar and padding from search page --- src/renderer/page/search/view.jsx | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/renderer/page/search/view.jsx b/src/renderer/page/search/view.jsx index 763848def..f4e75b9e1 100644 --- a/src/renderer/page/search/view.jsx +++ b/src/renderer/page/search/view.jsx @@ -37,16 +37,8 @@ class SearchPage extends React.PureComponent { render() { const { query, updateSearchQuery } = this.props; return ( - +
- (this.input = input)} - className="search__input" - value={query} - placeholder={__('Search for anything...')} - onChange={event => updateSearchQuery(event.target.value)} - /> - {isURIValid(query) && (
From 731e3a15465d2d8524bd1ffb3aece835c397febd Mon Sep 17 00:00:00 2001 From: Travis Eden Date: Thu, 24 May 2018 13:54:52 -0400 Subject: [PATCH 3/4] alter onSearch mechanics --- src/renderer/component/wunderbar/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/renderer/component/wunderbar/index.js b/src/renderer/component/wunderbar/index.js index 7cdd0ca80..6b22c7876 100644 --- a/src/renderer/component/wunderbar/index.js +++ b/src/renderer/component/wunderbar/index.js @@ -7,6 +7,7 @@ import { MODALS, doFocusSearchInput, doBlurSearchInput, + doSearch, } from 'lbry-redux'; import { doNavigate } from 'redux/actions/navigation'; import Wunderbar from './view'; @@ -27,8 +28,8 @@ const select = state => { const perform = dispatch => ({ onSearch: query => { - dispatch(doUpdateSearchQuery(query)); - dispatch(doNotify({ id: MODALS.SEARCH })); + dispatch(doSearch(query)); + dispatch(doNavigate(`/search`, { query })); }, onSubmit: (uri, extraParams) => dispatch(doNavigate('/show', { uri, ...extraParams })), updateSearchQuery: query => dispatch(doUpdateSearchQuery(query)), From b79ec0daa778924ba19bd9c49f37074747968ecb Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Mon, 4 Jun 2018 22:40:46 -0400 Subject: [PATCH 4/4] update lbry-redux --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index f7007f5b7..c44816496 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "formik": "^0.10.4", "hast-util-sanitize": "^1.1.2", "keytar": "^4.2.1", - "lbry-redux": "lbryio/lbry-redux#a32e8835c238c0ba1081fe6979763c5b0fade76c", + "lbry-redux": "lbryio/lbry-redux#02e47f922e5ba8908b5848c15b84196c87b9804d", "localforage": "^1.7.1", "mixpanel-browser": "^2.17.1", "moment": "^2.22.0", diff --git a/yarn.lock b/yarn.lock index 8dbc8d895..9cb6db041 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5647,9 +5647,9 @@ lazy-val@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.3.tgz#bb97b200ef00801d94c317e29dc6ed39e31c5edc" -lbry-redux@lbryio/lbry-redux#a32e8835c238c0ba1081fe6979763c5b0fade76c: +lbry-redux@lbryio/lbry-redux#02e47f922e5ba8908b5848c15b84196c87b9804d: version "0.0.1" - resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/a32e8835c238c0ba1081fe6979763c5b0fade76c" + resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/02e47f922e5ba8908b5848c15b84196c87b9804d" dependencies: proxy-polyfill "0.1.6" reselect "^3.0.0"