From 7e9bd4b7c90eeffc1c30ce757626100aa585de79 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Wed, 15 Mar 2017 21:57:58 +0900 Subject: [PATCH] Remove unnecessary codes --- src/browser/components/ErrorView.jsx | 104 +++++++-------- src/browser/components/HoveringURL.jsx | 14 +- src/browser/components/TeamListItemNew.jsx | 148 --------------------- 3 files changed, 57 insertions(+), 209 deletions(-) delete mode 100644 src/browser/components/TeamListItemNew.jsx diff --git a/src/browser/components/ErrorView.jsx b/src/browser/components/ErrorView.jsx index b1061e3a..f36a0ef4 100644 --- a/src/browser/components/ErrorView.jsx +++ b/src/browser/components/ErrorView.jsx @@ -30,60 +30,58 @@ const errorPage = { } }; -class ErrorView extends React.Component { - render() { - return ( - -
-
- - - -

{'Cannot connect to Mattermost'}

-
-

{'We\'re having trouble connecting to Mattermost. If refreshing this page (Ctrl+R or Command+R) does not work please verify that:'}

-
- -
-
- {this.props.errorInfo.errorDescription}{' ('} - {this.props.errorInfo.errorCode }{')'}
- - -
-
+function ErrorView(props) { + return ( + +
+
+ + + +

{'Cannot connect to Mattermost'}

+
+

{'We\'re having trouble connecting to Mattermost. If refreshing this page (Ctrl+R or Command+R) does not work please verify that:'}

+
+ +
+
+ {props.errorInfo.errorDescription}{' ('} + {props.errorInfo.errorCode }{')'}
+ + +
- - ); - } +
+
+ ); } ErrorView.propTypes = { diff --git a/src/browser/components/HoveringURL.jsx b/src/browser/components/HoveringURL.jsx index 65bb3d67..ba96211b 100644 --- a/src/browser/components/HoveringURL.jsx +++ b/src/browser/components/HoveringURL.jsx @@ -1,13 +1,11 @@ const React = require('react'); -class HoveringURL extends React.Component { - render() { - return ( -
- {this.props.targetURL} -
- ); - } +function HoveringURL(props) { + return ( +
+ {props.targetURL} +
+ ); } HoveringURL.propTypes = { diff --git a/src/browser/components/TeamListItemNew.jsx b/src/browser/components/TeamListItemNew.jsx deleted file mode 100644 index 07ed8b23..00000000 --- a/src/browser/components/TeamListItemNew.jsx +++ /dev/null @@ -1,148 +0,0 @@ -const React = require('react'); -const {findDOMNode} = require('react-dom'); -const {Button, HelpBlock, ListGroupItem} = require('react-bootstrap'); - -const TeamListItemNew = React.createClass({ - propTypes: { - onTeamAdd: React.PropTypes.func, - teamIndex: React.PropTypes.number, - teamName: React.PropTypes.string, - teamUrl: React.PropTypes.string - }, - - getInitialState() { - return { - name: this.props.teamName, - url: this.props.teamUrl, - index: this.props.teamIndex, - errorMessage: null - }; - }, - handleSubmit(e) { - console.log('submit'); - e.preventDefault(); - const errorMessage = this.getValidationErrorMessage(); - if (errorMessage) { - this.setState({ - errorMessage - }); - return; - } - - this.props.onTeamAdd({ - name: this.state.name.trim(), - url: this.state.url.trim(), - index: this.state.index - }); - - this.setState({ - name: '', - url: '', - index: '', - errorMessage: null - }); - }, - handleNameChange(e) { - console.log('name'); - this.setState({ - name: e.target.value - }); - }, - handleURLChange(e) { - console.log('url'); - this.setState({ - url: e.target.value - }); - }, - - getValidationErrorMessage() { - if (this.state.name.trim() === '') { - return 'Name is required.'; - } else if (this.state.url.trim() === '') { - return 'URL is required.'; - } else if (!(/^https?:\/\/.*/).test(this.state.url.trim())) { - return 'URL should start with http:// or https://.'; - } - return null; - }, - - componentDidMount() { - const inputTeamName = findDOMNode(this.refs.inputTeamName); - const setErrorMessage = () => { - this.setState({ - errorMessage: this.getValidationErrorMessage() - }); - }; - inputTeamName.addEventListener('invalid', setErrorMessage); - const inputTeamURL = findDOMNode(this.refs.inputTeamURL); - inputTeamURL.addEventListener('invalid', setErrorMessage); - }, - - render() { - var existingTeam = false; - if (this.state.name !== '' && this.state.url !== '') { - existingTeam = true; - } - - var btnAddText; - if (existingTeam) { - btnAddText = 'Save'; - } else { - btnAddText = 'Add'; - } - - return ( - -
-
- - { ' ' } - -
- { ' ' } -
- - { ' ' } - -
- { ' ' } - -
- { (() => { - if (this.state.errorMessage !== null) { - return ( - - { this.state.errorMessage } - ); - } - return null; - })() } -
- ); - } -}); - -module.exports = TeamListItemNew;