From 4181674cf26bf623b1430ec906cba06121e7b902 Mon Sep 17 00:00:00 2001 From: Ari Crellin-Quick Date: Fri, 14 Sep 2018 14:29:51 -0700 Subject: [PATCH] De-lint JS sources --- baselayer | 2 +- static/js/components/FoldableRow.jsx | 3 ++- static/js/components/Plot.jsx | 5 +++-- static/js/components/Progress.jsx | 3 ++- static/js/components/Projects.jsx | 3 ++- static/js/components/UserProfile.jsx | 5 +++-- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/baselayer b/baselayer index 42f55cc..68cd649 160000 --- a/baselayer +++ b/baselayer @@ -1 +1 @@ -Subproject commit 42f55cc8ad182b59981958ce27c095f06deb6b28 +Subproject commit 68cd649a7a675ca2f671fc88f154932c7ba88c7f diff --git a/static/js/components/FoldableRow.jsx b/static/js/components/FoldableRow.jsx index f081d26..5c72f34 100644 --- a/static/js/components/FoldableRow.jsx +++ b/static/js/components/FoldableRow.jsx @@ -8,7 +8,8 @@ * The second element can be, e.g., another row in the table. * */ -import React, { Component, PropTypes } from 'react'; +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import colorScheme from './colorscheme'; const cs = colorScheme; diff --git a/static/js/components/Plot.jsx b/static/js/components/Plot.jsx index 3d2335e..2a7fe6f 100644 --- a/static/js/components/Plot.jsx +++ b/static/js/components/Plot.jsx @@ -1,4 +1,5 @@ import React, { Component } from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { showNotification } from 'baselayer/components/Notifications'; /* eslint-disable */ @@ -71,8 +72,8 @@ class Plot extends Component { } } Plot.propTypes = { - url: React.PropTypes.string.isRequired, - dispatch: React.PropTypes.func.isRequired + url: PropTypes.string.isRequired, + dispatch: PropTypes.func.isRequired }; Plot = connect()(Plot); diff --git a/static/js/components/Progress.jsx b/static/js/components/Progress.jsx index 241e227..3643caa 100644 --- a/static/js/components/Progress.jsx +++ b/static/js/components/Progress.jsx @@ -1,4 +1,5 @@ import React from 'react'; +import PropTypes from 'prop-types'; const Progress = (props) => { let response = ''; @@ -25,7 +26,7 @@ const Progress = (props) => { }; Progress.propTypes = { - type: React.PropTypes.string.isRequired + type: PropTypes.string.isRequired }; export default Progress; diff --git a/static/js/components/Projects.jsx b/static/js/components/Projects.jsx index 8398a0d..c8eb706 100644 --- a/static/js/components/Projects.jsx +++ b/static/js/components/Projects.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react'; +import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import { reduxForm } from 'redux-form'; diff --git a/static/js/components/UserProfile.jsx b/static/js/components/UserProfile.jsx index 36d67c6..71febf2 100644 --- a/static/js/components/UserProfile.jsx +++ b/static/js/components/UserProfile.jsx @@ -1,12 +1,13 @@ import React from 'react'; +import PropTypes from 'prop-types'; import { connect } from 'react-redux'; let UserProfile = props => (
{props.profile.username}
); UserProfile.propTypes = { - style: React.PropTypes.object.isRequired, - profile: React.PropTypes.object.isRequired + style: PropTypes.object.isRequired, + profile: PropTypes.object.isRequired }; const mapStateToProps = state => (