From 212b8260c71d06be7a0784269d72b0d46db1dc0b Mon Sep 17 00:00:00 2001 From: Shaun Ford Date: Thu, 11 May 2017 13:43:53 -0700 Subject: [PATCH] Fix error where PropTypes could not be found (#16) --- app/components/AddButton/AddButton.js | 3 ++- app/components/ApiError/ApiError.js | 3 ++- app/components/Buttons/Buttons.js | 3 ++- app/components/ConfirmationBox/ConfirmationBox.js | 3 ++- .../IamPrincipalPermissionsFieldSet.js | 3 ++- app/components/Login/Login.js | 3 ++- app/components/LoginMfaForm/LoginMfaForm.js | 3 ++- app/components/LoginUserForm/LoginUserForm.js | 3 ++- app/components/Modal/Modal.js | 3 ++- app/components/SDBDescriptionField/SDBDescriptionField.js | 3 ++- app/components/SideBar/views/Category.js | 3 ++- .../UserGroupPermissionsFieldSet.js | 3 ++- app/components/VaultBrowser/VaultBrowser.js | 3 ++- app/components/VaultSecret/VaultSecret.js | 3 ++- package.json | 8 +++++--- 15 files changed, 33 insertions(+), 17 deletions(-) diff --git a/app/components/AddButton/AddButton.js b/app/components/AddButton/AddButton.js index 7aa9c75..2fe3b01 100644 --- a/app/components/AddButton/AddButton.js +++ b/app/components/AddButton/AddButton.js @@ -1,5 +1,6 @@ import React from 'react' -import { Component, PropTypes } from 'react' +import { Component } from 'react' +import PropTypes from 'prop-types' import './AddButton.scss' import '../../assets/images/add-green.svg' diff --git a/app/components/ApiError/ApiError.js b/app/components/ApiError/ApiError.js index 7ff9076..fcfebba 100644 --- a/app/components/ApiError/ApiError.js +++ b/app/components/ApiError/ApiError.js @@ -1,5 +1,6 @@ import React from 'react' -import { Component, PropTypes } from 'react' +import { Component } from 'react' +import PropTypes from 'prop-types' import * as cmsUtils from '../../utils/cmsUtils' import './ApiError.scss' diff --git a/app/components/Buttons/Buttons.js b/app/components/Buttons/Buttons.js index d9f0fba..70b8950 100644 --- a/app/components/Buttons/Buttons.js +++ b/app/components/Buttons/Buttons.js @@ -1,5 +1,6 @@ import React from 'react' -import { Component, PropTypes } from 'react' +import { Component } from 'react' +import PropTypes from 'prop-types' import './Buttons.scss' import '../../assets/images/remove-red.svg' diff --git a/app/components/ConfirmationBox/ConfirmationBox.js b/app/components/ConfirmationBox/ConfirmationBox.js index b44bc8f..9d47115 100644 --- a/app/components/ConfirmationBox/ConfirmationBox.js +++ b/app/components/ConfirmationBox/ConfirmationBox.js @@ -1,5 +1,6 @@ import React from 'react' -import { Component, PropTypes } from 'react' +import { Component } from 'react' +import PropTypes from 'prop-types' import './ConfirmationBox.scss' diff --git a/app/components/IamPrincipalPermissionsFieldSet/IamPrincipalPermissionsFieldSet.js b/app/components/IamPrincipalPermissionsFieldSet/IamPrincipalPermissionsFieldSet.js index b2b1edb..ae49ad3 100644 --- a/app/components/IamPrincipalPermissionsFieldSet/IamPrincipalPermissionsFieldSet.js +++ b/app/components/IamPrincipalPermissionsFieldSet/IamPrincipalPermissionsFieldSet.js @@ -1,5 +1,6 @@ import React from 'react' -import { Component, PropTypes } from 'react' +import { Component } from 'react' +import PropTypes from 'prop-types' import RoleSelect from '../RoleSelect/RoleSelect' import Buttons from '../Buttons/Buttons' import AddButton from '../AddButton/AddButton' diff --git a/app/components/Login/Login.js b/app/components/Login/Login.js index 08db0b7..3116f75 100644 --- a/app/components/Login/Login.js +++ b/app/components/Login/Login.js @@ -1,5 +1,6 @@ import React from 'react' -import { Component, PropTypes } from 'react' +import { Component } from 'react' +import PropTypes from 'prop-types' import { connect } from 'react-redux' import * as messengerActions from '../../actions/messengerActions' import Messenger from '../Messenger/Messenger' diff --git a/app/components/LoginMfaForm/LoginMfaForm.js b/app/components/LoginMfaForm/LoginMfaForm.js index 9f4099c..ffe2f05 100644 --- a/app/components/LoginMfaForm/LoginMfaForm.js +++ b/app/components/LoginMfaForm/LoginMfaForm.js @@ -1,5 +1,6 @@ import React from 'react' -import { Component, PropTypes } from 'react' +import { Component } from 'react' +import PropTypes from 'prop-types' import { connect } from 'react-redux' import { reduxForm, touch } from 'redux-form' import { finalizeMfaLogin } from '../../actions/authenticationActions' diff --git a/app/components/LoginUserForm/LoginUserForm.js b/app/components/LoginUserForm/LoginUserForm.js index 46b0b1a..d18b0db 100644 --- a/app/components/LoginUserForm/LoginUserForm.js +++ b/app/components/LoginUserForm/LoginUserForm.js @@ -1,5 +1,6 @@ import React from 'react' -import { Component, PropTypes } from 'react' +import { Component } from 'react' +import PropTypes from 'prop-types' import { connect } from 'react-redux' import { reduxForm } from 'redux-form' import { loginUser } from '../../actions/authenticationActions' diff --git a/app/components/Modal/Modal.js b/app/components/Modal/Modal.js index ea7674e..19a3fde 100644 --- a/app/components/Modal/Modal.js +++ b/app/components/Modal/Modal.js @@ -1,5 +1,6 @@ import React from 'react' -import { Component, PropTypes } from 'react' +import { Component } from 'react' +import PropTypes from 'prop-types' import './Modal.scss' diff --git a/app/components/SDBDescriptionField/SDBDescriptionField.js b/app/components/SDBDescriptionField/SDBDescriptionField.js index a3a8d53..f7e8322 100644 --- a/app/components/SDBDescriptionField/SDBDescriptionField.js +++ b/app/components/SDBDescriptionField/SDBDescriptionField.js @@ -1,5 +1,6 @@ import React from 'react' -import { Component, PropTypes } from 'react' +import { Component } from 'react' +import PropTypes from 'prop-types' import * as cms from '../../constants/cms' /** diff --git a/app/components/SideBar/views/Category.js b/app/components/SideBar/views/Category.js index e147f40..fa3690c 100644 --- a/app/components/SideBar/views/Category.js +++ b/app/components/SideBar/views/Category.js @@ -1,5 +1,6 @@ import React from 'react' -import { Component, PropTypes } from 'react' +import { Component } from 'react' +import PropTypes from 'prop-types' import log from 'logger' /** diff --git a/app/components/UserGroupPermissionsFieldSet/UserGroupPermissionsFieldSet.js b/app/components/UserGroupPermissionsFieldSet/UserGroupPermissionsFieldSet.js index 6ac6606..ae8a9ae 100644 --- a/app/components/UserGroupPermissionsFieldSet/UserGroupPermissionsFieldSet.js +++ b/app/components/UserGroupPermissionsFieldSet/UserGroupPermissionsFieldSet.js @@ -1,5 +1,6 @@ import React from 'react' -import { Component, PropTypes } from 'react' +import { Component } from 'react' +import PropTypes from 'prop-types' import GroupsSelect from '../GroupSelect/GroupsSelect' import RoleSelect from '../RoleSelect/RoleSelect' import Buttons from '../Buttons/Buttons' diff --git a/app/components/VaultBrowser/VaultBrowser.js b/app/components/VaultBrowser/VaultBrowser.js index 63c62f5..c2407c4 100644 --- a/app/components/VaultBrowser/VaultBrowser.js +++ b/app/components/VaultBrowser/VaultBrowser.js @@ -1,5 +1,6 @@ import React from 'react' -import { Component, PropTypes } from 'react' +import { Component } from 'react' +import PropTypes from 'prop-types' import './VaultBrowser.scss' import AddButton from '../AddButton/AddButton' import VaultSecretForm from '../VaultSecretForm/VaultSecretForm' diff --git a/app/components/VaultSecret/VaultSecret.js b/app/components/VaultSecret/VaultSecret.js index b72e671..86781cd 100644 --- a/app/components/VaultSecret/VaultSecret.js +++ b/app/components/VaultSecret/VaultSecret.js @@ -1,5 +1,6 @@ import React from 'react' -import { Component, PropTypes } from 'react' +import { Component } from 'react' +import PropTypes from 'prop-types' import VaultSecretForm from '../VaultSecretForm/VaultSecretForm' import * as mSDBActions from '../../actions/manageSafetyDepositBoxActions' import './VaultSecret.scss' diff --git a/package.json b/package.json index 9da6cc1..a63d82d 100644 --- a/package.json +++ b/package.json @@ -22,13 +22,17 @@ "dependencies": { "axios": "0.12.0", "cookie": "0.3.1", + "create-react-class": "^15.5.3", "humps": "1.1.0", "loglevel": "1.4.1", + "prop-types": "15.5.9", "react": "15.1.0", + "react-addons-create-fragment": "15.1.0", "react-addons-css-transition-group": "15.1.0", "react-addons-shallow-compare": "15.1.0", "react-copy-to-clipboard": "4.1.0", "react-dom": "15.1.0", + "react-paginate": "4.1.1", "react-redux": "4.4.5", "react-router": "2.5.1", "react-router-redux": "4.0.5", @@ -36,9 +40,7 @@ "redux": "3.5.2", "redux-form": "5.3.0", "redux-logger": "2.6.1", - "redux-thunk": "2.1.0", - "react-paginate": "4.1.1", - "react-addons-create-fragment": "15.1.0" + "redux-thunk": "2.1.0" }, "devDependencies": { "api-mock": "^0.3.2",