diff --git a/dummy/src/views/partials/CodeSnippet.js b/dummy/src/views/partials/CodeSnippet.js index a8982319..e6ed054c 100644 --- a/dummy/src/views/partials/CodeSnippet.js +++ b/dummy/src/views/partials/CodeSnippet.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import hljs from "highlight.js"; import $ from "jquery"; diff --git a/dummy/src/views/partials/Container.js b/dummy/src/views/partials/Container.js index 4174bbcb..629e8850 100644 --- a/dummy/src/views/partials/Container.js +++ b/dummy/src/views/partials/Container.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import { Grid, Navbar, NavItem, Nav, Brand } from "react-bootstrap"; import { LinkContainer } from "react-router-bootstrap"; diff --git a/dummy/src/views/partials/ExampleWell.js b/dummy/src/views/partials/ExampleWell.js index 59f09246..8603ecd5 100644 --- a/dummy/src/views/partials/ExampleWell.js +++ b/dummy/src/views/partials/ExampleWell.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import { Panel } from "react-bootstrap"; class ExampleWell extends React.Component { diff --git a/dummy/src/views/partials/IndexPanel.js b/dummy/src/views/partials/IndexPanel.js index acedf5aa..bd85b93e 100644 --- a/dummy/src/views/partials/IndexPanel.js +++ b/dummy/src/views/partials/IndexPanel.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import { Panel, Col } from "react-bootstrap"; class IndexPanel extends React.Component { diff --git a/dummy/src/views/partials/RequestTestButton.js b/dummy/src/views/partials/RequestTestButton.js index 6c39b97c..a6576a68 100644 --- a/dummy/src/views/partials/RequestTestButton.js +++ b/dummy/src/views/partials/RequestTestButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import {Glyphicon} from "react-bootstrap"; import {ButtonLoader} from "../../../../src/views/bootstrap"; import {connect} from "react-redux"; diff --git a/dummy/src/views/partials/RequestTestErrorModal.js b/dummy/src/views/partials/RequestTestErrorModal.js index d7fde0cd..38ae0881 100644 --- a/dummy/src/views/partials/RequestTestErrorModal.js +++ b/dummy/src/views/partials/RequestTestErrorModal.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import { Modal, Button } from "react-bootstrap"; import { connect } from "react-redux"; import { dismissRequestTestErrorModal } from "../../actions/request-test-buttons"; diff --git a/dummy/src/views/partials/RequestTestSuccessModal.js b/dummy/src/views/partials/RequestTestSuccessModal.js index a3b6f0dc..2375e137 100644 --- a/dummy/src/views/partials/RequestTestSuccessModal.js +++ b/dummy/src/views/partials/RequestTestSuccessModal.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import { Modal, Button } from "react-bootstrap"; import { connect } from "react-redux"; import { dismissRequestTestSuccessModal } from "../../actions/request-test-buttons"; diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..6813d140 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,120 @@ +{ + "name": "redux-auth", + "version": "0.0.5-beta5", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + }, + "core-js": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" + }, + "encoding": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", + "requires": { + "iconv-lite": "0.4.18" + } + }, + "fbjs": { + "version": "0.8.14", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.14.tgz", + "integrity": "sha1-0dviviVMNakeCfMfnNUKQLKg7Rw=", + "requires": { + "core-js": "1.2.7", + "isomorphic-fetch": "2.2.1", + "loose-envify": "1.3.1", + "object-assign": "4.1.1", + "promise": "7.3.1", + "setimmediate": "1.0.5", + "ua-parser-js": "0.7.14" + }, + "dependencies": { + "isomorphic-fetch": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", + "requires": { + "node-fetch": "1.7.2", + "whatwg-fetch": "2.0.3" + } + } + } + }, + "iconv-lite": { + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz", + "integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA==" + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" + }, + "loose-envify": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "requires": { + "js-tokens": "3.0.2" + } + }, + "node-fetch": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.2.tgz", + "integrity": "sha512-xZZUq2yDhKMIn/UgG5q//IZSNLJIwW2QxS14CNH5spuiXkITM2pUitjdq58yLSaU7m4M0wBNaM2Gh/ggY4YJig==", + "requires": { + "encoding": "0.1.12", + "is-stream": "1.1.0" + } + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "requires": { + "asap": "2.0.6" + } + }, + "prop-types": { + "version": "15.5.10", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.5.10.tgz", + "integrity": "sha1-J5ffwxJhguOpXj37suiT3ddFYVQ=", + "requires": { + "fbjs": "0.8.14", + "loose-envify": "1.3.1" + } + }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + }, + "ua-parser-js": { + "version": "0.7.14", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.14.tgz", + "integrity": "sha1-EQ1T+kw/MmwSEpK76skE0uAzh8o=" + }, + "whatwg-fetch": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz", + "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ=" + } + } +} diff --git a/package.json b/package.json index c2f8df57..0a8fb1db 100644 --- a/package.json +++ b/package.json @@ -1,124 +1,125 @@ -{ - "name": "redux-auth", - "description": "Complete token authentication system for react + redux.", - "version": "0.0.5-beta5", - "license": "WTFPL", - "repository": { - "type": "git", - "url": "https://github.com/lynndylanhurley/redux-auth.git" - }, - "homepage": "https://github.com/lynndylanhurley/redux-auth", - "keywords": [ - "react", - "isomorphic", - "universal", - "starter", - "boilerplate", - "template", - "webpack", - "koa", - "transmit" - ], - "main": "index.js", - "scripts": { - "release": "node ./node_modules/webpack/bin/webpack.js --verbose --colors --display-error-details --config webpack.release.js", - "test": "node_modules/.bin/_mocha --timeout 5000 --compilers .:test/compiler.js test/runner.js", - "test-coverage": "node_modules/.bin/babel-node node_modules/.bin/isparta cover --root ./src node_modules/.bin/_mocha -- --timeout 5000 test/runner.js && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js" - }, - "files": [ - "src", - "default-theme.js", - "bootstrap-theme.js", - "material-ui-theme.js", - "index.js", - "LICENSE.md", - "README.md" - ], - "dependencies": { - "browser-cookies": "^1.0.8", - "classnames": "^2.1.5", - "cookie": "^0.2.3", - "extend": "^3.0.0", - "immutable": "^3.7.5", - "isomorphic-fetch": "^2.1.1", - "query-string": "^2.4.2", - "rc-dialog": "^6.1.1", - "react-bootstrap": "^0.29.5", - "react-loader": "^2.4.0", - "redux-immutablejs": "0.0.8" - }, - "devDependencies": { - "babel-cli": "6.3.13", - "babel-core": "6.3.13", - "babel-loader": "6.1.0", - "babel-polyfill": "6.3.13", - "babel-preset-es2015": "6.3.13", - "babel-preset-react": "6.3.13", - "babel-preset-stage-0": "6.3.13", - "babel-register": "6.3.13", - "bootstrap": "^3.3.5", - "bootstrap-sass": "^3.3.5", - "bootstrap-webpack": "0.0.5", - "chai": "^3.3.0", - "chai-as-promised": "^5.1.0", - "concurrently": "0.1.1", - "coveralls": "^2.11.4", - "css-loader": "^0.19.0", - "exports-loader": "^0.6.2", - "extract-text-webpack-plugin": "0.9.1", - "fetch-mock": "^2.1.0", - "file-loader": "0.8.5", - "h2o2": "4.0.1", - "hapi": "9.3.1", - "highlight.js": "^8.8.0", - "imports-loader": "^0.6.4", - "inert": "3.0.1", - "install": "^0.3.0", - "invariant": "^2.2.0", - "isparta": "^4.0.0", - "istanbul": "^0.3.22", - "istanbul-instrumenter-loader": "^0.1.3", - "jquery": "^2.1.4", - "jquery-deparam": "^0.4.2", - "jsdom": "^9.4.1", - "jsdomify": "^2.1.0", - "json-loader": "0.5.4", - "material-ui": "0.15.2", - "mocha": "^2.3.4", - "mockery": "^1.4.0", - "nock": "^3.3.2", - "node-sass": "^3.3.3", - "nodemon": "^1.7.2", - "piping": "0.2.0", - "react": "^15.2.1", - "react-addons-test-utils": "^0.14.3", - "react-dom": "^15.2.1", - "react-hot-loader": "1.3.0", - "react-redux": "^3.1.2", - "react-router": "^2.5.2", - "react-router-bootstrap": "^0.19.0", - "react-router-redux": "^4.0.5", - "react-select": "^1.0.0-beta13", - "react-tap-event-plugin": "^0.2.1", - "react-transmit": "3.0.6", - "redux": "^3.3.1", - "redux-thunk": "^1.0.0", - "require-subvert": "^0.1.0", - "rewire": "^2.5.1", - "sass-loader": "^3.0.0", - "serialize-javascript": "^1.1.2", - "sinon": "1.17.0", - "style-loader": "^0.12.4", - "thunk": "^0.0.1", - "url-loader": "^0.5.6", - "warning": "^2.1.0", - "webpack": "1.12.9", - "webpack-dev-server": "1.14.0" - }, - "peerDependencies": { - "react-router-bootstrap": "*" - }, - "engines": { - "node": ">=0.10.32" - } -} +{ + "name": "redux-auth", + "description": "Complete token authentication system for react + redux.", + "version": "0.0.5-beta5", + "license": "WTFPL", + "repository": { + "type": "git", + "url": "https://github.com/lynndylanhurley/redux-auth.git" + }, + "homepage": "https://github.com/lynndylanhurley/redux-auth", + "keywords": [ + "react", + "isomorphic", + "universal", + "starter", + "boilerplate", + "template", + "webpack", + "koa", + "transmit" + ], + "main": "index.js", + "scripts": { + "release": "node ./node_modules/webpack/bin/webpack.js --verbose --colors --display-error-details --config webpack.release.js", + "test": "node_modules/.bin/_mocha --timeout 5000 --compilers .:test/compiler.js test/runner.js", + "test-coverage": "node_modules/.bin/babel-node node_modules/.bin/isparta cover --root ./src node_modules/.bin/_mocha -- --timeout 5000 test/runner.js && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js" + }, + "files": [ + "src", + "default-theme.js", + "bootstrap-theme.js", + "material-ui-theme.js", + "index.js", + "LICENSE.md", + "README.md" + ], + "dependencies": { + "browser-cookies": "^1.0.8", + "classnames": "^2.1.5", + "cookie": "^0.2.3", + "extend": "^3.0.0", + "immutable": "^3.7.5", + "isomorphic-fetch": "^2.1.1", + "prop-types": "^15.5.10", + "query-string": "^2.4.2", + "rc-dialog": "^6.1.1", + "react-bootstrap": "^0.29.5", + "react-loader": "^2.4.0", + "redux-immutablejs": "0.0.8" + }, + "devDependencies": { + "babel-cli": "6.3.13", + "babel-core": "6.3.13", + "babel-loader": "6.1.0", + "babel-polyfill": "6.3.13", + "babel-preset-es2015": "6.3.13", + "babel-preset-react": "6.3.13", + "babel-preset-stage-0": "6.3.13", + "babel-register": "6.3.13", + "bootstrap": "^3.3.5", + "bootstrap-sass": "^3.3.5", + "bootstrap-webpack": "0.0.5", + "chai": "^3.3.0", + "chai-as-promised": "^5.1.0", + "concurrently": "0.1.1", + "coveralls": "^2.11.4", + "css-loader": "^0.19.0", + "exports-loader": "^0.6.2", + "extract-text-webpack-plugin": "0.9.1", + "fetch-mock": "^2.1.0", + "file-loader": "0.8.5", + "h2o2": "4.0.1", + "hapi": "9.3.1", + "highlight.js": "^8.8.0", + "imports-loader": "^0.6.4", + "inert": "3.0.1", + "install": "^0.3.0", + "invariant": "^2.2.0", + "isparta": "^4.0.0", + "istanbul": "^0.3.22", + "istanbul-instrumenter-loader": "^0.1.3", + "jquery": "^2.1.4", + "jquery-deparam": "^0.4.2", + "jsdom": "^9.4.1", + "jsdomify": "^2.1.0", + "json-loader": "0.5.4", + "material-ui": "0.15.2", + "mocha": "^2.3.4", + "mockery": "^1.4.0", + "nock": "^3.3.2", + "node-sass": "^3.3.3", + "nodemon": "^1.7.2", + "piping": "0.2.0", + "react": "^15.2.1", + "react-addons-test-utils": "^0.14.3", + "react-dom": "^15.2.1", + "react-hot-loader": "1.3.0", + "react-redux": "^3.1.2", + "react-router": "^2.5.2", + "react-router-bootstrap": "^0.19.0", + "react-router-redux": "^4.0.5", + "react-select": "^1.0.0-beta13", + "react-tap-event-plugin": "^0.2.1", + "react-transmit": "3.0.6", + "redux": "^3.3.1", + "redux-thunk": "^1.0.0", + "require-subvert": "^0.1.0", + "rewire": "^2.5.1", + "sass-loader": "^3.0.0", + "serialize-javascript": "^1.1.2", + "sinon": "1.17.0", + "style-loader": "^0.12.4", + "thunk": "^0.0.1", + "url-loader": "^0.5.6", + "warning": "^2.1.0", + "webpack": "1.12.9", + "webpack-dev-server": "1.14.0" + }, + "peerDependencies": { + "react-router-bootstrap": "*" + }, + "engines": { + "node": ">=0.10.32" + } +} diff --git a/src/views/bootstrap/AuthGlobals.js b/src/views/bootstrap/AuthGlobals.js index 4f1a7cc4..dbaea603 100644 --- a/src/views/bootstrap/AuthGlobals.js +++ b/src/views/bootstrap/AuthGlobals.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import EmailSignInSuccessModal from "./modals/EmailSignInSuccessModal"; import EmailSignInErrorModal from "./modals/EmailSignInErrorModal"; import OAuthSignInSuccessModal from "./modals/OAuthSignInSuccessModal"; diff --git a/src/views/bootstrap/ButtonLoader.js b/src/views/bootstrap/ButtonLoader.js index 0fc4ebdb..08eb30f5 100644 --- a/src/views/bootstrap/ButtonLoader.js +++ b/src/views/bootstrap/ButtonLoader.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import { Button, Glyphicon } from "react-bootstrap"; import Spinner from "react-loader"; diff --git a/src/views/bootstrap/DestroyAccountButton.js b/src/views/bootstrap/DestroyAccountButton.js index a4bc3389..3c28b1d1 100644 --- a/src/views/bootstrap/DestroyAccountButton.js +++ b/src/views/bootstrap/DestroyAccountButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import ButtonLoader from "./ButtonLoader"; import { destroyAccount } from "../../actions/destroy-account"; import { connect } from "react-redux"; diff --git a/src/views/bootstrap/EmailSignInForm.js b/src/views/bootstrap/EmailSignInForm.js index 7a707ead..8e15fd80 100644 --- a/src/views/bootstrap/EmailSignInForm.js +++ b/src/views/bootstrap/EmailSignInForm.js @@ -1,4 +1,5 @@ -import React, {PropTypes} from "react"; +import React from "react"; +import PropTypes from "prop-types"; import ButtonLoader from "./ButtonLoader"; import Input from "./Input"; import { emailSignInFormUpdate, emailSignIn } from "../../actions/email-sign-in"; diff --git a/src/views/bootstrap/EmailSignUpForm.js b/src/views/bootstrap/EmailSignUpForm.js index 4ed65180..2202ff67 100644 --- a/src/views/bootstrap/EmailSignUpForm.js +++ b/src/views/bootstrap/EmailSignUpForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import Input from "./Input"; import ButtonLoader from "./ButtonLoader"; import { emailSignUpFormUpdate, emailSignUp } from "../../actions/email-sign-up"; diff --git a/src/views/bootstrap/ErrorList.js b/src/views/bootstrap/ErrorList.js index de7cf08f..ed2901f8 100644 --- a/src/views/bootstrap/ErrorList.js +++ b/src/views/bootstrap/ErrorList.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import { Glyphicon } from "react-bootstrap"; import Immutable from "immutable"; diff --git a/src/views/bootstrap/Input.js b/src/views/bootstrap/Input.js index ebd5c102..adbc533a 100644 --- a/src/views/bootstrap/Input.js +++ b/src/views/bootstrap/Input.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import { Input, Glyphicon } from "react-bootstrap"; import Immutable from "immutable"; diff --git a/src/views/bootstrap/OAuthSignInButton.js b/src/views/bootstrap/OAuthSignInButton.js index a404d1f4..3580cad3 100644 --- a/src/views/bootstrap/OAuthSignInButton.js +++ b/src/views/bootstrap/OAuthSignInButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import { connect } from "react-redux"; import ButtonLoader from "./ButtonLoader"; import { Glyphicon } from "react-bootstrap"; diff --git a/src/views/bootstrap/RequestPasswordResetForm.js b/src/views/bootstrap/RequestPasswordResetForm.js index ae3546a7..75ca62d3 100644 --- a/src/views/bootstrap/RequestPasswordResetForm.js +++ b/src/views/bootstrap/RequestPasswordResetForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import Input from "./Input"; import ButtonLoader from "./ButtonLoader"; import { Glyphicon } from "react-bootstrap"; diff --git a/src/views/bootstrap/SignOutButton.js b/src/views/bootstrap/SignOutButton.js index a0909b31..11cb024c 100644 --- a/src/views/bootstrap/SignOutButton.js +++ b/src/views/bootstrap/SignOutButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import ButtonLoader from "./ButtonLoader"; import { Glyphicon } from "react-bootstrap"; import { connect } from "react-redux"; diff --git a/src/views/bootstrap/UpdatePasswordForm.js b/src/views/bootstrap/UpdatePasswordForm.js index 3e0f8886..355e9d41 100644 --- a/src/views/bootstrap/UpdatePasswordForm.js +++ b/src/views/bootstrap/UpdatePasswordForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import Input from "./Input"; import ButtonLoader from "./ButtonLoader"; import { Glyphicon } from "react-bootstrap"; diff --git a/src/views/bootstrap/modals/Modal.js b/src/views/bootstrap/modals/Modal.js index a176e058..a7fbbc75 100644 --- a/src/views/bootstrap/modals/Modal.js +++ b/src/views/bootstrap/modals/Modal.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import { Modal, Button } from "react-bootstrap"; import ErrorList from "../ErrorList"; import { connect } from "react-redux"; diff --git a/src/views/bootstrap/modals/PasswordResetSuccessModal.js b/src/views/bootstrap/modals/PasswordResetSuccessModal.js index e59b58d3..18d9df14 100644 --- a/src/views/bootstrap/modals/PasswordResetSuccessModal.js +++ b/src/views/bootstrap/modals/PasswordResetSuccessModal.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import { Modal, Button, Glyphicon } from "react-bootstrap"; import ButtonLoader from "../ButtonLoader"; import Input from "../Input"; diff --git a/src/views/default/AuthGlobals.js b/src/views/default/AuthGlobals.js index 0f090543..b4077bb6 100644 --- a/src/views/default/AuthGlobals.js +++ b/src/views/default/AuthGlobals.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import EmailSignInSuccessModal from "./modals/EmailSignInSuccessModal"; import EmailSignInErrorModal from "./modals/EmailSignInErrorModal"; import OAuthSignInSuccessModal from "./modals/OAuthSignInSuccessModal"; diff --git a/src/views/default/ButtonLoader.js b/src/views/default/ButtonLoader.js index 3687b543..e44e7b15 100644 --- a/src/views/default/ButtonLoader.js +++ b/src/views/default/ButtonLoader.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import Spinner from "react-loader"; import extend from "extend"; diff --git a/src/views/default/DestroyAccountButton.js b/src/views/default/DestroyAccountButton.js index 37ce4892..97232d3e 100644 --- a/src/views/default/DestroyAccountButton.js +++ b/src/views/default/DestroyAccountButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import ButtonLoader from "./ButtonLoader"; import { destroyAccount } from "../../actions/destroy-account"; import { connect } from "react-redux"; diff --git a/src/views/default/EmailSignInForm.js b/src/views/default/EmailSignInForm.js index af4b45ca..dc73a2df 100644 --- a/src/views/default/EmailSignInForm.js +++ b/src/views/default/EmailSignInForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import ButtonLoader from "./ButtonLoader"; import Input from "./Input"; import { emailSignInFormUpdate, emailSignIn } from "../../actions/email-sign-in"; diff --git a/src/views/default/EmailSignUpForm.js b/src/views/default/EmailSignUpForm.js index b85cb157..f285d217 100644 --- a/src/views/default/EmailSignUpForm.js +++ b/src/views/default/EmailSignUpForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import Input from "./Input"; import ButtonLoader from "./ButtonLoader"; import { emailSignUpFormUpdate, emailSignUp } from "../../actions/email-sign-up"; diff --git a/src/views/default/ErrorList.js b/src/views/default/ErrorList.js index 4de74f75..56c5b11a 100644 --- a/src/views/default/ErrorList.js +++ b/src/views/default/ErrorList.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import Immutable from "immutable"; class ErrorList extends React.Component { diff --git a/src/views/default/Input.js b/src/views/default/Input.js index 78350bf6..cf4e2aa9 100644 --- a/src/views/default/Input.js +++ b/src/views/default/Input.js @@ -1,4 +1,5 @@ -import React, {PropTypes} from "react"; +import React from "react"; +import PropTypes from "prop-types"; import Immutable from "immutable"; class AuthInput extends React.Component { diff --git a/src/views/default/OAuthSignInButton.js b/src/views/default/OAuthSignInButton.js index e5240fbf..8d7108c6 100644 --- a/src/views/default/OAuthSignInButton.js +++ b/src/views/default/OAuthSignInButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import { connect } from "react-redux"; import ButtonLoader from "./ButtonLoader"; import { oAuthSignIn as _oAuthSignIn } from "../../actions/oauth-sign-in"; diff --git a/src/views/default/RequestPasswordResetForm.js b/src/views/default/RequestPasswordResetForm.js index d19f6819..7ad628e1 100644 --- a/src/views/default/RequestPasswordResetForm.js +++ b/src/views/default/RequestPasswordResetForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import Input from "./Input"; import ButtonLoader from "./ButtonLoader"; import { connect } from "react-redux"; diff --git a/src/views/default/SignOutButton.js b/src/views/default/SignOutButton.js index c192316c..ca1e4f98 100644 --- a/src/views/default/SignOutButton.js +++ b/src/views/default/SignOutButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import ButtonLoader from "./ButtonLoader"; import { connect } from "react-redux"; import { signOut } from "../../actions/sign-out"; diff --git a/src/views/default/UpdatePasswordForm.js b/src/views/default/UpdatePasswordForm.js index 1c40258f..e6dfef16 100644 --- a/src/views/default/UpdatePasswordForm.js +++ b/src/views/default/UpdatePasswordForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import Input from "./Input"; import ButtonLoader from "./ButtonLoader"; import { updatePassword, updatePasswordFormUpdate } from "../../actions/update-password"; diff --git a/src/views/default/modals/Modal.js b/src/views/default/modals/Modal.js index 9496a110..238f0904 100644 --- a/src/views/default/modals/Modal.js +++ b/src/views/default/modals/Modal.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import Dialog from "rc-dialog"; import ErrorList from "../ErrorList"; import { connect } from "react-redux"; diff --git a/src/views/default/modals/PasswordResetSuccessModal.js b/src/views/default/modals/PasswordResetSuccessModal.js index bf8b165b..8557e479 100644 --- a/src/views/default/modals/PasswordResetSuccessModal.js +++ b/src/views/default/modals/PasswordResetSuccessModal.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import { Modal, Button, Glyphicon } from "react-bootstrap"; import ButtonLoader from "../ButtonLoader"; import Input from "../Input"; diff --git a/src/views/material-ui/AuthGlobals.js b/src/views/material-ui/AuthGlobals.js index 0f090543..b4077bb6 100644 --- a/src/views/material-ui/AuthGlobals.js +++ b/src/views/material-ui/AuthGlobals.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import EmailSignInSuccessModal from "./modals/EmailSignInSuccessModal"; import EmailSignInErrorModal from "./modals/EmailSignInErrorModal"; import OAuthSignInSuccessModal from "./modals/OAuthSignInSuccessModal"; diff --git a/src/views/material-ui/ButtonLoader.js b/src/views/material-ui/ButtonLoader.js index b1ee2814..f9aae75f 100644 --- a/src/views/material-ui/ButtonLoader.js +++ b/src/views/material-ui/ButtonLoader.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import RaisedButton from "material-ui/RaisedButton"; import ActionFavorite from "material-ui/svg-icons/action/favorite"; import * as Colors from "material-ui/styles/colors"; diff --git a/src/views/material-ui/DestroyAccountButton.js b/src/views/material-ui/DestroyAccountButton.js index e3ec3d19..546df47d 100644 --- a/src/views/material-ui/DestroyAccountButton.js +++ b/src/views/material-ui/DestroyAccountButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import ButtonLoader from "./ButtonLoader"; import { destroyAccount } from "../../actions/destroy-account"; import ActionDelete from "material-ui/svg-icons/action/delete"; diff --git a/src/views/material-ui/EmailSignInForm.js b/src/views/material-ui/EmailSignInForm.js index 5781b968..430d84ca 100644 --- a/src/views/material-ui/EmailSignInForm.js +++ b/src/views/material-ui/EmailSignInForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import ButtonLoader from "./ButtonLoader"; import Input from "./Input"; import { emailSignInFormUpdate, emailSignIn } from "../../actions/email-sign-in"; diff --git a/src/views/material-ui/EmailSignUpForm.js b/src/views/material-ui/EmailSignUpForm.js index 95ecc5c3..827f6d20 100644 --- a/src/views/material-ui/EmailSignUpForm.js +++ b/src/views/material-ui/EmailSignUpForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import Input from "./Input"; import ButtonLoader from "./ButtonLoader"; import { emailSignUpFormUpdate, emailSignUp } from "../../actions/email-sign-up"; diff --git a/src/views/material-ui/ErrorList.js b/src/views/material-ui/ErrorList.js index b613d69e..7ad55e55 100644 --- a/src/views/material-ui/ErrorList.js +++ b/src/views/material-ui/ErrorList.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import * as Colors from "material-ui/styles/colors"; import AlertError from "material-ui/svg-icons/alert/error"; import Immutable from "immutable"; diff --git a/src/views/material-ui/Input.js b/src/views/material-ui/Input.js index 082f4fe5..a1b11760 100644 --- a/src/views/material-ui/Input.js +++ b/src/views/material-ui/Input.js @@ -1,4 +1,5 @@ -import React, {PropTypes} from "react"; +import React from "react"; +import PropTypes from "prop-types"; import * as Colors from "material-ui/styles/colors"; import TextField from "material-ui/TextField"; import AlertError from "material-ui/svg-icons/alert/error"; diff --git a/src/views/material-ui/OAuthSignInButton.js b/src/views/material-ui/OAuthSignInButton.js index cdaada39..d9f8caa9 100644 --- a/src/views/material-ui/OAuthSignInButton.js +++ b/src/views/material-ui/OAuthSignInButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import { connect } from "react-redux"; import ButtonLoader from "./ButtonLoader"; import ActionExitToApp from "material-ui/svg-icons/action/exit-to-app"; diff --git a/src/views/material-ui/RequestPasswordResetForm.js b/src/views/material-ui/RequestPasswordResetForm.js index 8b669d4e..8d59faf4 100644 --- a/src/views/material-ui/RequestPasswordResetForm.js +++ b/src/views/material-ui/RequestPasswordResetForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import Input from "./Input"; import ButtonLoader from "./ButtonLoader"; import { connect } from "react-redux"; diff --git a/src/views/material-ui/SignOutButton.js b/src/views/material-ui/SignOutButton.js index bbba3585..2406fe80 100644 --- a/src/views/material-ui/SignOutButton.js +++ b/src/views/material-ui/SignOutButton.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import ButtonLoader from "./ButtonLoader"; import ActionLock from "material-ui/svg-icons/action/lock"; import { connect } from "react-redux"; diff --git a/src/views/material-ui/UpdatePasswordForm.js b/src/views/material-ui/UpdatePasswordForm.js index ac10fac2..e7358ef8 100644 --- a/src/views/material-ui/UpdatePasswordForm.js +++ b/src/views/material-ui/UpdatePasswordForm.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import Input from "./Input"; import ButtonLoader from "./ButtonLoader"; import ActionLock from "material-ui/svg-icons/action/lock"; diff --git a/src/views/material-ui/modals/Modal.js b/src/views/material-ui/modals/Modal.js index 57e80c7e..11ea8ec0 100644 --- a/src/views/material-ui/modals/Modal.js +++ b/src/views/material-ui/modals/Modal.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import Dialog from "material-ui/Dialog"; import FlatButton from "material-ui/FlatButton"; import ErrorList from "../ErrorList"; diff --git a/src/views/material-ui/modals/PasswordResetSuccessModal.js b/src/views/material-ui/modals/PasswordResetSuccessModal.js index 9e312d5a..aaacdb07 100644 --- a/src/views/material-ui/modals/PasswordResetSuccessModal.js +++ b/src/views/material-ui/modals/PasswordResetSuccessModal.js @@ -1,4 +1,5 @@ -import React, { PropTypes } from "react"; +import React from "react"; +import PropTypes from "prop-types"; import ActionLock from "material-ui/svg-icons/action/lock"; import Dialog from "material-ui/Dialog"; import FlatButton from "material-ui/FlatButton";