From 315adeb5e2012b7f7bcfcd1478f9d6dd2cc1092d Mon Sep 17 00:00:00 2001
From: Noah Loomans <noahloomans@gmail.com>
Date: Tue, 26 Jun 2018 21:46:41 +0200
Subject: Update code to comply with new styling

---
 .../components/presentational/IconFromUserType.js      |  7 ++++---
 src/client/react/components/presentational/Result.js   | 18 +++++++++---------
 src/client/react/components/presentational/Schedule.js |  5 +++--
 3 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'src/client/react/components/presentational')

diff --git a/src/client/react/components/presentational/IconFromUserType.js b/src/client/react/components/presentational/IconFromUserType.js
index 3a7350c..0cb5154 100644
--- a/src/client/react/components/presentational/IconFromUserType.js
+++ b/src/client/react/components/presentational/IconFromUserType.js
@@ -37,7 +37,8 @@ class IconFromUserType extends React.Component {
   };
 
   render() {
-    switch (this.props.userType) {
+    const { userType, defaultIcon } = this.props;
+    switch (userType) {
       case 'c':
         return <ClassIcon />;
       case 't':
@@ -47,8 +48,8 @@ class IconFromUserType extends React.Component {
       case 'r':
         return <RoomIcon />;
       default:
-        if (this.props.defaultIcon) {
-          return this.props.defaultIcon;
+        if (defaultIcon) {
+          return defaultIcon;
         }
 
         throw new Error('`userType` was invalid or not given, but `defaultIcon` is not defined.');
diff --git a/src/client/react/components/presentational/Result.js b/src/client/react/components/presentational/Result.js
index 900d3ac..d80554c 100644
--- a/src/client/react/components/presentational/Result.js
+++ b/src/client/react/components/presentational/Result.js
@@ -35,25 +35,25 @@ class Result extends React.Component {
   };
 
   render() {
+    const { onClick, isSelected, userId } = this.props;
+
     return (
       /* eslint-disable jsx-a11y/click-events-have-key-events */
       /* eslint-disable jsx-a11y/no-static-element-interactions */
       <div
-        className={classnames('Result', {
-          isSelected: this.props.isSelected,
-        })}
-        onClick={this.props.onClick}
+        className={classnames('Result', { isSelected })}
+        onClick={onClick}
       >
         <div className="iconWrapper">
-          <IconFromUserType userType={users.byId[this.props.userId].type} />
+          <IconFromUserType userType={users.byId[userId].type} />
         </div>
         <div className="text">
-          {users.byId[this.props.userId].value}
-          {users.byId[this.props.userId].alt &&
+          {users.byId[userId].value}
+          {users.byId[userId].alt && (
             <span className="alt">
-              {` ${users.byId[this.props.userId].alt}`}
+              {` ${users.byId[userId].alt}`}
             </span>
-          }
+          )}
         </div>
       </div>
     );
diff --git a/src/client/react/components/presentational/Schedule.js b/src/client/react/components/presentational/Schedule.js
index 7823238..727a1f4 100644
--- a/src/client/react/components/presentational/Schedule.js
+++ b/src/client/react/components/presentational/Schedule.js
@@ -66,9 +66,10 @@ class Schedule extends React.Component {
   }
 
   render() {
-    const DOMPurify = createDOMPurify(window);
+    const { htmlStr } = this.props;
 
-    const cleanHTML = DOMPurify.sanitize(this.props.htmlStr, {
+    const DOMPurify = createDOMPurify(window);
+    const cleanHTML = DOMPurify.sanitize(htmlStr, {
       ADD_ATTR: ['rules'],
     });
 
-- 
cgit v1.1