Skip to content

Commit 416ea84

Browse files
MacKentochMacKentoch
committed
upgrade dependencies
1 parent d5bf835 commit 416ea84

File tree

15 files changed

+236
-234
lines changed

15 files changed

+236
-234
lines changed

‎.babelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"env": {
1414
"production": {
1515
"presets": [
16-
// "react-optimize"
16+
"react-optimize"
1717
],
1818
"comments": false
1919
},

‎docs/assets/app.bundle.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/assets/app.vendor.bundle.js

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"test": "cross-env NODE_ENV=test nyc mocha test/.setup.js test/**/*.spec.js --recursive",
1010
"coverage": "nyc report --reporter=text-lcov | coveralls",
1111
"dev": "rimraf docs/assets && cross-env NODE_ENV=dev webpack --display-entrypoints --config webpack.dev.config.js",
12-
"prod": "rimraf docs/assets && cross-env NODE_ENV=production webpack -p --config webpack.production.config.js ",
12+
"prod": "rimraf docs/assets && cross-env NODE_ENV=production webpack -p --config webpack.production.config.js",
1313
"start": "cross-env NODE_ENV=dev node server.hot.reload",
1414
"serve-spa-dev": "npm run dev && cross-env NODE_ENV=dev nodemon ./src/server/SPA/index.js",
1515
"serve-spa-prod": "npm run prod && cross-env NODE_ENV=production node ./src/server/SPA/index.js"

‎src/app/components/alert/Alert.js

+67-60
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// @flow weak
22

3-
import React from 'react';
3+
import React, {
4+
PureComponent
5+
} from 'react';
46
import PropTypes from 'prop-types';
57
import {
68
Motion,
@@ -9,67 +11,72 @@ import {
911
} from 'react-motion';
1012
import cx from 'classnames';
1113

12-
const Alert = ({
13-
type,
14-
showAlert,
15-
errorTitle,
16-
errorMessage,
17-
onClose
18-
}) => (
19-
<Motion
20-
style={{
21-
interpolatedScale: spring(showAlert ? 1 : 0, presets.stiff)
22-
}}>
23-
{
24-
({ interpolatedScale }) => (
25-
<div
26-
className={
27-
cx({
28-
'alert': true,
29-
'alert-dismissible': true,
30-
'alert-danger': type === 'error',
31-
'alert-warning': type === 'warning'
32-
})
33-
}
34-
style={{
35-
WebkitTransform: `scale(${interpolatedScale})`,
36-
transform: `scale(${interpolatedScale})`
37-
}}>
38-
<button
39-
type="button"
40-
className="close"
41-
onClick={onClose}>
42-
&times;
43-
</button>
44-
{
45-
errorTitle && errorTitle.length > 0 &&
46-
<strong>
47-
{errorTitle}
48-
</strong>
49-
}
50-
{
51-
<p>
52-
{errorMessage}
53-
</p>
54-
}
55-
</div>
56-
)
57-
}
58-
</Motion>
59-
);
14+
class Alert extends PureComponent {
15+
static propTypes = {
16+
showAlert: PropTypes.bool,
17+
errorTitle: PropTypes.string,
18+
errorMessage: PropTypes.string,
19+
onClose: PropTypes.func.isRequired,
20+
type: PropTypes.oneOf(['warning', 'error'])
21+
};
6022

23+
static defaultProps = {
24+
showAlert: false,
25+
type: 'warning'
26+
};
6127

62-
Alert.propTypes = {
63-
showAlert: PropTypes.bool,
64-
errorTitle: PropTypes.string,
65-
errorMessage: PropTypes.string,
66-
onClose: PropTypes.func.isRequired,
67-
type: PropTypes.oneOf(['warning', 'error'])
68-
};
28+
render() {
29+
const {
30+
type,
31+
showAlert,
32+
errorTitle,
33+
errorMessage,
34+
onClose
35+
} = this.props;
6936

70-
Alert.defaultProps = {
71-
showAlert: false,
72-
type: 'warning'
73-
};
37+
return (
38+
<Motion
39+
style={{
40+
interpolatedScale: spring(showAlert ? 1 : 0, presets.stiff)
41+
}}>
42+
{
43+
({ interpolatedScale }) => (
44+
<div
45+
className={
46+
cx({
47+
'alert': true,
48+
'alert-dismissible': true,
49+
'alert-danger': type === 'error',
50+
'alert-warning': type === 'warning'
51+
})
52+
}
53+
style={{
54+
WebkitTransform: `scale(${interpolatedScale})`,
55+
transform: `scale(${interpolatedScale})`
56+
}}>
57+
<button
58+
type="button"
59+
className="close"
60+
onClick={onClose}>
61+
&times;
62+
</button>
63+
{
64+
errorTitle && errorTitle.length > 0 &&
65+
<strong>
66+
{errorTitle}
67+
</strong>
68+
}
69+
{
70+
<p>
71+
{errorMessage}
72+
</p>
73+
}
74+
</div>
75+
)
76+
}
77+
</Motion>
78+
);
79+
}
80+
}
7481

7582
export default Alert;

‎src/app/components/alert/ErrorAlert.js

+57-54
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// @flow weak
22

3-
import React from 'react';
3+
import React, {
4+
PureComponent
5+
} from 'react';
46
import PropTypes from 'prop-types';
57

68
import {
@@ -10,61 +12,62 @@ import {
1012
} from 'react-motion';
1113

1214

13-
const ErrorAlert = ({
14-
showAlert,
15-
errorTitle,
16-
errorMessage,
17-
onClose
18-
}) => (
19-
<div>
20-
<Motion
21-
style={{
22-
interpolatedScale: spring(showAlert ? 1 : 0, presets.stiff)
23-
}}>
24-
{
25-
({ interpolatedScale }) => (
26-
<div
27-
className="alert alert-dismissible alert-danger"
28-
style={{
29-
WebkitTransform: `scale(${interpolatedScale})`,
30-
transform: `scale(${interpolatedScale})`
31-
}}>
32-
<button
33-
type="button"
34-
className="close"
35-
onClick={onClose}>
36-
&times;
37-
</button>
38-
{
39-
errorTitle && errorTitle.length > 0 &&
40-
<strong>
41-
{errorTitle}
42-
</strong>
43-
}
44-
{
45-
<p>
46-
{errorMessage}
47-
</p>
48-
}
49-
</div>
50-
)
51-
}
52-
</Motion>
53-
</div>
54-
);
15+
class ErrorAlert extends PureComponent {
16+
static propTypes = {
17+
showAlert: PropTypes.bool,
18+
errorTitle: PropTypes.string,
19+
errorMessage: PropTypes.string,
20+
onClose: PropTypes.func.isRequired
21+
};
5522

23+
static defaultProps = {
24+
showAlert: false
25+
};
5626

57-
ErrorAlert.propTypes = {
58-
showAlert: PropTypes.bool,
59-
errorTitle: PropTypes.string,
60-
errorMessage: PropTypes.string,
61-
onClose: PropTypes.func.isRequired
62-
};
27+
render() {
28+
const {
29+
showAlert,
30+
errorTitle,
31+
errorMessage,
32+
onClose
33+
} = this.props;
6334

64-
ErrorAlert.defaultProps = {
65-
showAlert: false
66-
};
67-
68-
ErrorAlert.displayName = 'ErrorAlert';
35+
return (
36+
<Motion
37+
style={{
38+
interpolatedScale: spring(showAlert ? 1 : 0, presets.stiff)
39+
}}>
40+
{
41+
({ interpolatedScale }) => (
42+
<div
43+
className="alert alert-dismissible alert-danger"
44+
style={{
45+
WebkitTransform: `scale(${interpolatedScale})`,
46+
transform: `scale(${interpolatedScale})`
47+
}}>
48+
<button
49+
type="button"
50+
className="close"
51+
onClick={onClose}>
52+
&times;
53+
</button>
54+
{
55+
errorTitle && errorTitle.length > 0 &&
56+
<strong>
57+
{errorTitle}
58+
</strong>
59+
}
60+
{
61+
<p>
62+
{errorMessage}
63+
</p>
64+
}
65+
</div>
66+
)
67+
}
68+
</Motion>
69+
);
70+
}
71+
}
6972

7073
export default ErrorAlert;

0 commit comments

Comments
 (0)