Skip to content

Commit

Permalink
Merge d70001b into 6d7d61b
Browse files Browse the repository at this point in the history
  • Loading branch information
JackNeto committed Nov 17, 2019
2 parents 6d7d61b + d70001b commit b40259c
Show file tree
Hide file tree
Showing 39 changed files with 1,789 additions and 1,989 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,6 +1,6 @@
language: node_js
node_js:
- 8
- 11
cache:
directories:
- node_modules
Expand Down
544 changes: 337 additions & 207 deletions package-lock.json

Large diffs are not rendered by default.

276 changes: 139 additions & 137 deletions package.json
@@ -1,141 +1,143 @@
{
"name": "entaxy",
"description": "Your Personal Finance App",
"version": "0.1.0",
"private": true,
"homepage": "https://entaxy.io",
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --coverage",
"coverage": "react-scripts test --coverage --watchAll=false",
"test:ci": "react-scripts test --coverage --watchAll=false",
"eject": "react-scripts eject",
"lint": "eslint src --ext '.js,.jsx' --config .eslintrc",
"lint:fix": "npm run lint --fix",
"deploy:test": "npm run build && aws s3 sync build/ s3://entaxy-test --delete",
"deploy:staging": "npm run build && aws s3 sync build/ s3://staging.entaxy.io --delete",
"postdeploy:staging": "aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_ID --paths '/*'",
"deploy:production": "npm run build && aws s3 sync build/ s3://entaxy-production --delete",
"postdeploy:production": "aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_ID --paths '/*'",
"debug": "echo 'chrome://inspect' && npx react-scripts --inspect-brk test --env=jsdom --runInBand --watch"
},
"dependencies": {
"@material-ui/core": "^4.5.1",
"@material-ui/icons": "^4.5.1",
"@mdi/js": "^4.5.95",
"@mdi/react": "^1.2.1",
"@vx/axis": "0.0.192",
"@vx/curve": "0.0.192",
"@vx/glyph": "0.0.192",
"@vx/gradient": "0.0.192",
"@vx/grid": "0.0.192",
"@vx/group": "0.0.192",
"@vx/legend": "0.0.192",
"@vx/pattern": "0.0.192",
"@vx/point": "0.0.192",
"@vx/responsive": "0.0.192",
"@vx/scale": "0.0.192",
"@vx/shape": "0.0.192",
"@vx/tooltip": "0.0.192",
"big.js": "^5.2.2",
"blockstack": "^19.2.5",
"chroma-js": "^2.0.4",
"classnames": "^2.2.6",
"d3": "^5.12.0",
"d3-array": "^2.3.3",
"d3-sankey": "^0.12.3",
"date-fns": "^2.5.1",
"formik": "^1.5.8",
"jsdom": "^15.2.0",
"localforage": "^1.7.3",
"lodash": "^4.17.15",
"papaparse": "^5.1.0",
"pluralize": "^8.0.0",
"prop-types": "^15.7.2",
"query-string": "^6.8.3",
"react": "^16.10.2",
"react-confirm": "^0.1.18",
"react-dom": "^16.10.2",
"react-dropzone": "^10.1.10",
"react-motion": "^0.5.2",
"react-number-format": "^4.3.0",
"react-redux": "^7.1.1",
"react-router-dom": "^5.1.2",
"react-scripts": "^3.2.0",
"react-select": "^3.0.8",
"react-virtualized": "^9.21.1",
"react-window": "^1.8.5",
"recharts": "^1.8.3",
"recompose": "^0.30.0",
"redux": "^4.0.4",
"redux-devtools-extension": "^2.13.8",
"redux-logger": "^3.0.6",
"redux-persist": "^6.0.0",
"redux-thunk": "^2.3.0",
"reselect": "^4.0.0",
"uuid": "^3.3.3",
"yup": "^0.27.0"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
"name": "entaxy",
"description": "Your Personal Finance App",
"version": "0.1.3",
"private": true,
"homepage": "https://entaxy.io",
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --coverage",
"coverage": "react-scripts test --coverage --watchAll=false",
"test:ci": "react-scripts test --coverage --watchAll=false",
"eject": "react-scripts eject",
"lint": "eslint src --ext '.js,.jsx' --config .eslintrc",
"lint:fix": "npm run lint --fix",
"deploy:test": "npm run build && aws s3 sync build/ s3://entaxy-test --delete",
"deploy:staging": "npm run build && aws s3 sync build/ s3://staging.entaxy.io --delete",
"postdeploy:staging": "aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_ID --paths '/*'",
"deploy:production": "npm run build && aws s3 sync build/ s3://entaxy-production --delete",
"postdeploy:production": "aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_ID --paths '/*'",
"debug": "echo 'chrome://inspect' && npx react-scripts --inspect-brk test --env=jsdom --runInBand --watch"
},
"dependencies": {
"@material-ui/core": "^4.6.1",
"@material-ui/icons": "^4.5.1",
"@mdi/js": "^4.5.95",
"@mdi/react": "^1.2.1",
"@vx/axis": "0.0.192",
"@vx/curve": "0.0.192",
"@vx/glyph": "0.0.192",
"@vx/gradient": "0.0.192",
"@vx/grid": "0.0.192",
"@vx/group": "0.0.192",
"@vx/legend": "0.0.192",
"@vx/pattern": "0.0.192",
"@vx/point": "0.0.192",
"@vx/responsive": "0.0.192",
"@vx/scale": "0.0.192",
"@vx/shape": "0.0.192",
"@vx/tooltip": "0.0.192",
"big.js": "^5.2.2",
"blockstack": "^19.2.5",
"chroma-js": "^2.1.0",
"classnames": "^2.2.6",
"d3": "^5.12.0",
"d3-array": "^2.4.0",
"d3-sankey": "^0.12.3",
"date-fns": "^2.7.0",
"formik": "^1.5.8",
"jsdom": "^15.2.1",
"localforage": "^1.7.3",
"lodash": "^4.17.15",
"papaparse": "^5.1.0",
"pluralize": "^8.0.0",
"prop-types": "^15.7.2",
"query-string": "^6.9.0",
"react": "^16.12.0",
"react-confirm": "^0.1.18",
"react-date-range": "^1.0.0-beta",
"react-dom": "^16.12.0",
"react-dropzone": "^10.1.10",
"react-motion": "^0.5.2",
"react-number-format": "^4.3.1",
"react-redux": "^7.1.3",
"react-router-dom": "^5.1.2",
"react-scripts": "^3.2.0",
"react-select": "^3.0.8",
"react-virtualized": "^9.21.2",
"react-window": "^1.8.5",
"recharts": "^1.8.5",
"recompose": "^0.30.0",
"redux": "^4.0.4",
"redux-devtools-extension": "^2.13.8",
"redux-logger": "^3.0.6",
"redux-persist": "^6.0.0",
"redux-thunk": "^2.3.0",
"reselect": "^4.0.0",
"uuid": "^3.3.3",
"yup": "^0.27.0"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
],
"devDependencies": {
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"coveralls": "^3.0.7",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.15.1",
"eslint": "^6.6.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jest": "^23.0.4",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.16.0",
"eslint-plugin-react-hooks": "^2.3.0",
"history": "^4.10.1",
"http-proxy-middleware": "^0.20.0",
"husky": "^3.0.9",
"jest-enzyme": "^7.1.2",
"lint-staged": "^9.4.3",
"mq-polyfill": "^1.1.8",
"react-test-renderer": "^16.12.0",
"redux-mock-store": "^1.5.3"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.{js,jsx}": [
"npm run lint --fix",
"react-scripts test --env=jsdom --bail --coverage --findRelatedTests --watchAll=false",
"git add"
]
},
"jest": {
"collectCoverageFrom": [
"src/**/*.{js,jsx,mjs}",
"!src/registerServiceWorker.js",
"!src/setupProxy.js",
"!src/store/**/types.js",
"!src/store/transactions/selectors.js",
"!src/core/Taxes/*",
"!src/core/Portfolios/*"
],
"devDependencies": {
"@testing-library/jest-dom": "^4.1.2",
"@testing-library/react": "^9.3.0",
"coveralls": "^3.0.7",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.15.1",
"eslint": "^6.5.1",
"eslint-config-airbnb": "^18.0.1",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jest": "^22.19.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.16.0",
"eslint-plugin-react-hooks": "^2.1.2",
"history": "^4.10.1",
"http-proxy-middleware": "^0.20.0",
"husky": "^3.0.9",
"jest-enzyme": "^7.1.1",
"lint-staged": "^9.4.2",
"react-test-renderer": "^16.10.2",
"redux-mock-store": "^1.5.3"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.{js,jsx}": [
"npm run lint --fix",
"react-scripts test --env=jsdom --bail --coverage --findRelatedTests --watchAll=false",
"git add"
]
},
"jest": {
"collectCoverageFrom": [
"src/**/*.{js,jsx,mjs}",
"!src/registerServiceWorker.js",
"!src/setupProxy.js",
"!src/store/**/types.js",
"!src/store/transactions/selectors.js",
"!src/core/Taxes/*",
"!src/core/Portfolios/*"
],
"coverageThreshold": {
"global": {
"branches": 50,
"functions": 50,
"lines": 50,
"statements": 50
}
}
"coverageThreshold": {
"global": {
"branches": 50,
"functions": 50,
"lines": 50,
"statements": 50
}
}
}
}
Expand Up @@ -5,10 +5,10 @@ exports[`ConfirmDialog matches snapshot 1`] = `
<ConfirmDialog proceed={[Function: mockConstructor]} cancel={[Function: bound cancel]} dismiss={[Function: mockConstructor]} show={true} title=\\"Title\\" description=\\"Description\\">
<WithStyles(ForwardRef(Dialog)) disableBackdropClick={true} disableEscapeKeyDown={true} maxWidth=\\"xs\\" aria-labelledby=\\"confirmation-dialog-title\\" open={true}>
<ForwardRef(Dialog) classes={{...}} disableBackdropClick={true} disableEscapeKeyDown={true} maxWidth=\\"xs\\" aria-labelledby=\\"confirmation-dialog-title\\" open={true}>
<ForwardRef(Modal) className=\\"MuiDialog-root\\" BackdropComponent={{...}} BackdropProps={{...}} closeAfterTransition={true} disableBackdropClick={true} disableEscapeKeyDown={true} onEscapeKeyDown={[undefined]} onClose={[undefined]} open={true} aria-labelledby=\\"confirmation-dialog-title\\">
<ForwardRef(Modal) className=\\"MuiDialog-root\\" BackdropComponent={{...}} BackdropProps={{...}} closeAfterTransition={true} disableBackdropClick={true} disableEscapeKeyDown={true} onEscapeKeyDown={[undefined]} onClose={[undefined]} open={true}>
<ForwardRef(Portal) container={[undefined]} disablePortal={false}>
<Portal containerInfo={{...}}>
<div onKeyDown={[Function: handleKeyDown]} role=\\"presentation\\" className=\\"MuiDialog-root\\" aria-labelledby=\\"confirmation-dialog-title\\" style={{...}}>
<div onKeyDown={[Function: handleKeyDown]} role=\\"presentation\\" className=\\"MuiDialog-root\\" style={{...}}>
<WithStyles(ForwardRef(Backdrop)) open={true} onClick={[Function: handleBackdropClick]} transitionDuration={{...}}>
<ForwardRef(Backdrop) classes={{...}} open={true} onClick={[Function: handleBackdropClick]} transitionDuration={{...}}>
<ForwardRef(Fade) in={true} timeout={{...}} onClick={[Function: handleBackdropClick]}>
Expand All @@ -23,9 +23,9 @@ exports[`ConfirmDialog matches snapshot 1`] = `
<ForwardRef(Fade) appear={true} in={true} timeout={{...}} onEnter={[Function: chainedFunction]} onEntering={[undefined]} onEntered={[undefined]} onExit={[undefined]} onExiting={[undefined]} onExited={[Function: chainedFunction]} role=\\"none presentation\\" tabIndex=\\"-1\\">
<Transition appear={true} in={true} onEnter={[Function: handleEnter]} onExit={[Function: handleExit]} timeout={{...}} onEntering={[Function: noop]} onEntered={[Function: noop]} onExiting={[Function: noop]} onExited={[Function: chainedFunction]} role=\\"none presentation\\" tabIndex=\\"-1\\" mountOnEnter={false} unmountOnExit={false} enter={true} exit={true}>
<div className=\\"MuiDialog-container MuiDialog-scrollPaper\\" onClick={[Function: handleBackdropClick]} onMouseDown={[Function: handleMouseDown]} style={{...}} role=\\"none presentation\\" tabIndex=\\"-1\\">
<WithStyles(ForwardRef(Paper)) elevation={24} role=\\"dialog\\" className=\\"MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthXs\\">
<ForwardRef(Paper) classes={{...}} elevation={24} role=\\"dialog\\" className=\\"MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthXs\\">
<div className=\\"MuiPaper-root MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthXs MuiPaper-rounded\\" role=\\"dialog\\">
<WithStyles(ForwardRef(Paper)) elevation={24} role=\\"dialog\\" aria-describedby={[undefined]} aria-labelledby=\\"confirmation-dialog-title\\" className=\\"MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthXs\\">
<ForwardRef(Paper) classes={{...}} elevation={24} role=\\"dialog\\" aria-describedby={[undefined]} aria-labelledby=\\"confirmation-dialog-title\\" className=\\"MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthXs\\">
<div className=\\"MuiPaper-root MuiPaper-elevation24 MuiDialog-paper MuiDialog-paperScrollPaper MuiDialog-paperWidthXs MuiPaper-rounded\\" role=\\"dialog\\" aria-describedby={[undefined]} aria-labelledby=\\"confirmation-dialog-title\\">
<WithStyles(ForwardRef(DialogTitle)) id=\\"confirmation-dialog-title\\">
<ForwardRef(DialogTitle) classes={{...}} id=\\"confirmation-dialog-title\\">
<div className=\\"MuiDialogTitle-root\\" id=\\"confirmation-dialog-title\\">
Expand Down
2 changes: 1 addition & 1 deletion src/common/ConfirmDialog/index.jsx
Expand Up @@ -38,7 +38,7 @@ ConfirmDialog.propTypes = {
show: PropTypes.bool.isRequired, // from confirmable. indicates if the dialog is shown or not.
proceed: PropTypes.func.isRequired, // from confirmable. call to close the dialog with promise resolved.
dismiss: PropTypes.func.isRequired, // from confirmable. call to only close the dialog.
title: PropTypes.string.isRequired, // the title of the dialog
title: PropTypes.node.isRequired, // the title of the dialog
description: PropTypes.string.isRequired // the description of the dialog
}

Expand Down

0 comments on commit b40259c

Please sign in to comment.