From 77dccd31b32ee0a9a53b2186bae231069c5ab152 Mon Sep 17 00:00:00 2001
From: Noah Loomans <noahloomans@gmail.com>
Date: Sat, 6 Jan 2018 12:11:19 +0100
Subject: Revert "Move to typescript"

This reverts commit f0c8cf0e79f003514fd65a70def5820205955a77.
---
 .../components/presentational/IconFromUserType.js  | 37 ++++++++++++++++++++++
 .../components/presentational/IconFromUserType.tsx | 31 ------------------
 .../react/components/presentational/Result.js      | 24 ++++++++++++++
 .../react/components/presentational/Result.tsx     | 18 -----------
 4 files changed, 61 insertions(+), 49 deletions(-)
 create mode 100644 src/client/react/components/presentational/IconFromUserType.js
 delete mode 100644 src/client/react/components/presentational/IconFromUserType.tsx
 create mode 100644 src/client/react/components/presentational/Result.js
 delete mode 100644 src/client/react/components/presentational/Result.tsx

(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
new file mode 100644
index 0000000..ee0e04b
--- /dev/null
+++ b/src/client/react/components/presentational/IconFromUserType.js
@@ -0,0 +1,37 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import StudentIcon from 'react-icons/lib/md/person';
+import RoomIcon from 'react-icons/lib/md/room';
+import ClassIcon from 'react-icons/lib/md/group';
+import TeacherIcon from 'react-icons/lib/md/account-circle';
+
+const IconFromUserType = ({ userType, defaultIcon }) => {
+  switch (userType) {
+    case 'c':
+      return <ClassIcon />;
+    case 't':
+      return <TeacherIcon />;
+    case 's':
+      return <StudentIcon />;
+    case 'r':
+      return <RoomIcon />;
+    default:
+      if (defaultIcon) {
+        return defaultIcon;
+      }
+
+      throw new Error('`userType` was invalid or not given, but `defaultIcon` is not defined.');
+  }
+};
+
+IconFromUserType.propTypes = {
+  userType: PropTypes.string,
+  defaultIcon: PropTypes.element,
+};
+
+IconFromUserType.defaultProps = {
+  userType: null,
+  defaultIcon: null,
+};
+
+export default IconFromUserType;
diff --git a/src/client/react/components/presentational/IconFromUserType.tsx b/src/client/react/components/presentational/IconFromUserType.tsx
deleted file mode 100644
index d77ea1b..0000000
--- a/src/client/react/components/presentational/IconFromUserType.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import * as React from 'react';
-import StudentIcon = require('react-icons/lib/md/person');
-import RoomIcon = require('react-icons/lib/md/room');
-import ClassIcon = require('react-icons/lib/md/group');
-import TeacherIcon = require('react-icons/lib/md/account-circle');
-
-// interface IconFromUserTypeProps {
-//   userType: string,
-//   defaultIcon?: JSX.Element,
-// }
-
-const IconFromUserType: React.StatelessComponent<{ userType: string, defaultIcon?: JSX.Element }> = (props) => {
-  switch (props.userType) {
-    case 'c':
-      return <ClassIcon />;
-    case 't':
-      return <TeacherIcon />;
-    case 's':
-      return <StudentIcon />;
-    case 'r':
-      return <RoomIcon />;
-    default:
-      if (props.defaultIcon) {
-        return props.defaultIcon;
-      }
-
-      throw new Error('`userType` was invalid or not given, but `defaultIcon` is not defined.');
-  }
-};
-
-export default IconFromUserType;
diff --git a/src/client/react/components/presentational/Result.js b/src/client/react/components/presentational/Result.js
new file mode 100644
index 0000000..0b9e024
--- /dev/null
+++ b/src/client/react/components/presentational/Result.js
@@ -0,0 +1,24 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import users from '../../users';
+
+import IconFromUserType from './IconFromUserType';
+
+const Result = ({ userId, isSelected }) => (
+  <div
+    className={classnames('search__result', {
+      'search__result--selected': isSelected,
+    })}
+  >
+    <div className="search__icon-wrapper"><IconFromUserType userType={users.byId[userId].type} /></div>
+    <div className="search__result__text">{users.byId[userId].value}</div>
+  </div>
+);
+
+Result.propTypes = {
+  userId: PropTypes.string.isRequired,
+  isSelected: PropTypes.bool.isRequired,
+};
+
+export default Result;
diff --git a/src/client/react/components/presentational/Result.tsx b/src/client/react/components/presentational/Result.tsx
deleted file mode 100644
index b33a365..0000000
--- a/src/client/react/components/presentational/Result.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import * as React from 'react';
-import * as classnames from 'classnames';
-import users from '../../users';
-
-import IconFromUserType from './IconFromUserType';
-
-const Result: React.StatelessComponent<{ userId: string, isSelected: boolean }> = ({ userId, isSelected }) => (
-  <div
-    className={classnames('search__result', {
-      'search__result--selected': isSelected,
-    })}
-  >
-    <div className="search__icon-wrapper"><IconFromUserType userType={users.byId[userId].type} /></div>
-    <div className="search__result__text">{users.byId[userId].value}</div>
-  </div>
-);
-
-export default Result;
-- 
cgit v1.1