From dedf8025a547d698d9f2e62f0897493d61ffadd5 Mon Sep 17 00:00:00 2001
From: Noah Loomans <noahloomans@gmail.com>
Date: Tue, 26 Jun 2018 22:25:55 +0200
Subject: Use mapStateToProps for router simplification

---
 src/client/react/components/page/User.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/client/react/components/page/User.js')

diff --git a/src/client/react/components/page/User.js b/src/client/react/components/page/User.js
index 4b9af64..af14188 100644
--- a/src/client/react/components/page/User.js
+++ b/src/client/react/components/page/User.js
@@ -20,6 +20,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
 import { Redirect } from 'react-router-dom';
 import { Elevation } from 'rmwc/Elevation';
 import Search from '../container/Search';
@@ -33,12 +34,15 @@ import './User.scss';
 class UserPage extends React.Component {
   static propTypes = {
     // react-router
-    match: PropTypes.object.isRequired,
+    user: PropTypes.string,
   };
 
+  static defaultProps = {
+    user: null,
+  }
+
   render() {
-    const { match } = this.props;
-    const user = userFromMatch(match);
+    const { user } = this.props;
 
     if (!user) {
       // Invalid user, redirect to index.
@@ -66,4 +70,8 @@ class UserPage extends React.Component {
   }
 }
 
-export default UserPage;
+const mapStateToProps = (state, { match }) => ({
+  user: userFromMatch(match),
+});
+
+export default connect(mapStateToProps)(UserPage);
-- 
cgit v1.1