aboutsummaryrefslogtreecommitdiff
path: root/src/client/react/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/react/components')
-rw-r--r--src/client/react/components/container/Search.js10
-rw-r--r--src/client/react/components/page/Index.js10
-rw-r--r--src/client/react/components/page/User.js31
3 files changed, 41 insertions, 10 deletions
diff --git a/src/client/react/components/container/Search.js b/src/client/react/components/container/Search.js
index 06523be..27b0563 100644
--- a/src/client/react/components/container/Search.js
+++ b/src/client/react/components/container/Search.js
@@ -6,7 +6,7 @@ import { withRouter } from 'react-router-dom';
import SearchIcon from 'react-icons/lib/md/search';
-import { inputChange, changeSelectedResult } from '../../actions/search';
+import { setUser, inputChange, changeSelectedResult } from '../../actions/search';
import users from '../../users';
import Results from './Results';
@@ -25,6 +25,10 @@ class Search extends React.Component {
this.onKeyDown = this.onKeyDown.bind(this);
}
+ componentDidMount() {
+ this.props.dispatch(setUser(this.props.urlUser));
+ }
+
onFocus() {
this.setState({
hasFocus: true,
@@ -97,6 +101,7 @@ class Search extends React.Component {
Search.propTypes = {
selectedResult: PropTypes.string,
+ urlUser: PropTypes.string,
isExactMatch: PropTypes.bool.isRequired,
searchText: PropTypes.string.isRequired,
dispatch: PropTypes.func.isRequired,
@@ -107,6 +112,7 @@ Search.propTypes = {
Search.defaultProps = {
selectedResult: null,
+ urlUser: null,
};
const mapStateToProps = state => ({
@@ -116,4 +122,4 @@ const mapStateToProps = state => ({
isExactMatch: state.search.isExactMatch,
});
-export default connect(mapStateToProps)(withRouter(Search));
+export default withRouter(connect(mapStateToProps)(Search));
diff --git a/src/client/react/components/page/Index.js b/src/client/react/components/page/Index.js
index dcc521d..a91d7a9 100644
--- a/src/client/react/components/page/Index.js
+++ b/src/client/react/components/page/Index.js
@@ -1,16 +1,10 @@
import React from 'react';
-import PropTypes from 'prop-types';
import Search from '../container/Search';
-const App = ({ location }) => (
+const App = () => (
<div>
- <Search location={location} />
+ <Search />
</div>
);
-App.propTypes = {
- // eslint-disable-next-line react/forbid-prop-types
- location: PropTypes.object.isRequired,
-};
-
export default App;
diff --git a/src/client/react/components/page/User.js b/src/client/react/components/page/User.js
new file mode 100644
index 0000000..2ad65a6
--- /dev/null
+++ b/src/client/react/components/page/User.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Redirect } from 'react-router-dom';
+import Search from '../container/Search';
+import users from '../../users';
+
+const App = ({ match }) => {
+ const user = `${match.params.type}/${match.params.value}`;
+
+ if (!users.allIds.includes(user)) {
+ // Invalid user, redirect to index.
+ return <Redirect to="/" />;
+ }
+
+ return (
+ <div>
+ <Search urlUser={user} />
+ </div>
+ );
+};
+
+App.propTypes = {
+ match: PropTypes.shape({
+ params: PropTypes.shape({
+ type: PropTypes.string.isRequired,
+ value: PropTypes.string.isRequired,
+ }).isRequired,
+ }).isRequired,
+};
+
+export default App;