diff options
author | Stefan Malzner <stefan@adlk.io> | 2018-12-09 01:01:12 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2018-12-09 01:01:12 +0100 |
commit | f01957203f77fce8b65d5e034a8acd68f1e0ae2e (patch) | |
tree | 2f8d0d232266cdc7ed74e1913b270527f46bb33d | |
parent | Add dark mode styles to content tabs (diff) | |
download | ferdium-app-f01957203f77fce8b65d5e034a8acd68f1e0ae2e.tar.gz ferdium-app-f01957203f77fce8b65d5e034a8acd68f1e0ae2e.tar.zst ferdium-app-f01957203f77fce8b65d5e034a8acd68f1e0ae2e.zip |
Upgrade to react 16
TODO: add componentDidCatch
-rw-r--r-- | package-lock.json | 678 | ||||
-rw-r--r-- | package.json | 31 | ||||
-rw-r--r-- | src/components/auth/AuthLayout.js | 21 | ||||
-rw-r--r-- | src/components/auth/Invite.js | 6 | ||||
-rw-r--r-- | src/components/auth/Login.js | 3 | ||||
-rw-r--r-- | src/components/services/tabs/Tabbar.js | 2 | ||||
-rw-r--r-- | src/components/settings/account/AccountDashboard.js | 44 | ||||
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 14 | ||||
-rw-r--r-- | src/components/settings/services/ServicesDashboard.js | 20 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 6 | ||||
-rw-r--r-- | src/components/subscription/SubscriptionForm.js | 46 | ||||
-rw-r--r-- | src/components/ui/FullscreenLoader/index.js | 34 | ||||
-rw-r--r-- | src/components/ui/ImageUpload.js | 6 | ||||
-rw-r--r-- | src/components/ui/Tabs/TabItem.js | 4 | ||||
-rw-r--r-- | src/features/serviceProxy/index.js | 5 | ||||
-rw-r--r-- | src/stores/SettingsStore.js | 15 | ||||
-rw-r--r-- | src/styles/auth.scss | 14 | ||||
-rw-r--r-- | src/styles/welcome.scss | 5 |
18 files changed, 440 insertions, 514 deletions
diff --git a/package-lock.json b/package-lock.json index 4eb1c019c..16a91c031 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -1233,27 +1233,16 @@ | |||
1233 | } | 1233 | } |
1234 | }, | 1234 | }, |
1235 | "acorn": { | 1235 | "acorn": { |
1236 | "version": "5.7.3", | 1236 | "version": "6.0.4", |
1237 | "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", | 1237 | "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz", |
1238 | "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", | 1238 | "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==", |
1239 | "dev": true | 1239 | "dev": true |
1240 | }, | 1240 | }, |
1241 | "acorn-jsx": { | 1241 | "acorn-jsx": { |
1242 | "version": "3.0.1", | 1242 | "version": "5.0.1", |
1243 | "resolved": "http://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", | 1243 | "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz", |
1244 | "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", | 1244 | "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==", |
1245 | "dev": true, | 1245 | "dev": true |
1246 | "requires": { | ||
1247 | "acorn": "^3.0.4" | ||
1248 | }, | ||
1249 | "dependencies": { | ||
1250 | "acorn": { | ||
1251 | "version": "3.3.0", | ||
1252 | "resolved": "http://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", | ||
1253 | "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", | ||
1254 | "dev": true | ||
1255 | } | ||
1256 | } | ||
1257 | }, | 1246 | }, |
1258 | "address-rfc2822": { | 1247 | "address-rfc2822": { |
1259 | "version": "2.0.4", | 1248 | "version": "2.0.4", |
@@ -1281,12 +1270,6 @@ | |||
1281 | "json-schema-traverse": "^0.3.0" | 1270 | "json-schema-traverse": "^0.3.0" |
1282 | } | 1271 | } |
1283 | }, | 1272 | }, |
1284 | "ajv-keywords": { | ||
1285 | "version": "2.1.1", | ||
1286 | "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", | ||
1287 | "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=", | ||
1288 | "dev": true | ||
1289 | }, | ||
1290 | "amdefine": { | 1273 | "amdefine": { |
1291 | "version": "1.0.1", | 1274 | "version": "1.0.1", |
1292 | "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", | 1275 | "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", |
@@ -1481,6 +1464,16 @@ | |||
1481 | "sprintf-js": "~1.0.2" | 1464 | "sprintf-js": "~1.0.2" |
1482 | } | 1465 | } |
1483 | }, | 1466 | }, |
1467 | "aria-query": { | ||
1468 | "version": "3.0.0", | ||
1469 | "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", | ||
1470 | "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=", | ||
1471 | "dev": true, | ||
1472 | "requires": { | ||
1473 | "ast-types-flow": "0.0.7", | ||
1474 | "commander": "^2.11.0" | ||
1475 | } | ||
1476 | }, | ||
1484 | "arr-diff": { | 1477 | "arr-diff": { |
1485 | "version": "4.0.0", | 1478 | "version": "4.0.0", |
1486 | "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", | 1479 | "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", |
@@ -1531,6 +1524,16 @@ | |||
1531 | "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", | 1524 | "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", |
1532 | "dev": true | 1525 | "dev": true |
1533 | }, | 1526 | }, |
1527 | "array-includes": { | ||
1528 | "version": "3.0.3", | ||
1529 | "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", | ||
1530 | "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", | ||
1531 | "dev": true, | ||
1532 | "requires": { | ||
1533 | "define-properties": "^1.1.2", | ||
1534 | "es-abstract": "^1.7.0" | ||
1535 | } | ||
1536 | }, | ||
1534 | "array-initial": { | 1537 | "array-initial": { |
1535 | "version": "1.1.0", | 1538 | "version": "1.1.0", |
1536 | "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz", | 1539 | "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz", |
@@ -1590,15 +1593,6 @@ | |||
1590 | } | 1593 | } |
1591 | } | 1594 | } |
1592 | }, | 1595 | }, |
1593 | "array-union": { | ||
1594 | "version": "1.0.2", | ||
1595 | "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", | ||
1596 | "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", | ||
1597 | "dev": true, | ||
1598 | "requires": { | ||
1599 | "array-uniq": "^1.0.1" | ||
1600 | } | ||
1601 | }, | ||
1602 | "array-uniq": { | 1596 | "array-uniq": { |
1603 | "version": "1.0.3", | 1597 | "version": "1.0.3", |
1604 | "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", | 1598 | "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", |
@@ -1610,28 +1604,12 @@ | |||
1610 | "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", | 1604 | "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", |
1611 | "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" | 1605 | "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" |
1612 | }, | 1606 | }, |
1613 | "array.prototype.find": { | ||
1614 | "version": "2.0.4", | ||
1615 | "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.0.4.tgz", | ||
1616 | "integrity": "sha1-VWpcU2LAhkgyPdrrnenRS8GGTJA=", | ||
1617 | "dev": true, | ||
1618 | "requires": { | ||
1619 | "define-properties": "^1.1.2", | ||
1620 | "es-abstract": "^1.7.0" | ||
1621 | } | ||
1622 | }, | ||
1623 | "arraybuffer.slice": { | 1607 | "arraybuffer.slice": { |
1624 | "version": "0.0.6", | 1608 | "version": "0.0.6", |
1625 | "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz", | 1609 | "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz", |
1626 | "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=", | 1610 | "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=", |
1627 | "dev": true | 1611 | "dev": true |
1628 | }, | 1612 | }, |
1629 | "arrify": { | ||
1630 | "version": "1.0.1", | ||
1631 | "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", | ||
1632 | "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", | ||
1633 | "dev": true | ||
1634 | }, | ||
1635 | "asap": { | 1613 | "asap": { |
1636 | "version": "2.0.6", | 1614 | "version": "2.0.6", |
1637 | "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", | 1615 | "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", |
@@ -1657,6 +1635,18 @@ | |||
1657 | "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", | 1635 | "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", |
1658 | "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" | 1636 | "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" |
1659 | }, | 1637 | }, |
1638 | "ast-types-flow": { | ||
1639 | "version": "0.0.7", | ||
1640 | "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", | ||
1641 | "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=", | ||
1642 | "dev": true | ||
1643 | }, | ||
1644 | "astral-regex": { | ||
1645 | "version": "1.0.0", | ||
1646 | "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", | ||
1647 | "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", | ||
1648 | "dev": true | ||
1649 | }, | ||
1660 | "async": { | 1650 | "async": { |
1661 | "version": "0.1.22", | 1651 | "version": "0.1.22", |
1662 | "resolved": "http://registry.npmjs.org/async/-/async-0.1.22.tgz", | 1652 | "resolved": "http://registry.npmjs.org/async/-/async-0.1.22.tgz", |
@@ -1743,23 +1733,13 @@ | |||
1743 | "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", | 1733 | "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", |
1744 | "dev": true | 1734 | "dev": true |
1745 | }, | 1735 | }, |
1746 | "babel-code-frame": { | 1736 | "axobject-query": { |
1747 | "version": "6.26.0", | 1737 | "version": "2.0.2", |
1748 | "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", | 1738 | "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz", |
1749 | "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", | 1739 | "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", |
1750 | "dev": true, | 1740 | "dev": true, |
1751 | "requires": { | 1741 | "requires": { |
1752 | "chalk": "^1.1.3", | 1742 | "ast-types-flow": "0.0.7" |
1753 | "esutils": "^2.0.2", | ||
1754 | "js-tokens": "^3.0.2" | ||
1755 | }, | ||
1756 | "dependencies": { | ||
1757 | "js-tokens": { | ||
1758 | "version": "3.0.2", | ||
1759 | "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", | ||
1760 | "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", | ||
1761 | "dev": true | ||
1762 | } | ||
1763 | } | 1743 | } |
1764 | }, | 1744 | }, |
1765 | "babel-eslint": { | 1745 | "babel-eslint": { |
@@ -2373,9 +2353,9 @@ | |||
2373 | } | 2353 | } |
2374 | }, | 2354 | }, |
2375 | "chardet": { | 2355 | "chardet": { |
2376 | "version": "0.4.2", | 2356 | "version": "0.7.0", |
2377 | "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", | 2357 | "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", |
2378 | "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=", | 2358 | "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", |
2379 | "dev": true | 2359 | "dev": true |
2380 | }, | 2360 | }, |
2381 | "chokidar": { | 2361 | "chokidar": { |
@@ -3293,21 +3273,6 @@ | |||
3293 | } | 3273 | } |
3294 | } | 3274 | } |
3295 | }, | 3275 | }, |
3296 | "del": { | ||
3297 | "version": "2.2.2", | ||
3298 | "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", | ||
3299 | "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", | ||
3300 | "dev": true, | ||
3301 | "requires": { | ||
3302 | "globby": "^5.0.0", | ||
3303 | "is-path-cwd": "^1.0.0", | ||
3304 | "is-path-in-cwd": "^1.0.0", | ||
3305 | "object-assign": "^4.0.1", | ||
3306 | "pify": "^2.0.0", | ||
3307 | "pinkie-promise": "^2.0.0", | ||
3308 | "rimraf": "^2.2.8" | ||
3309 | } | ||
3310 | }, | ||
3311 | "delayed-stream": { | 3276 | "delayed-stream": { |
3312 | "version": "1.0.0", | 3277 | "version": "1.0.0", |
3313 | "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", | 3278 | "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", |
@@ -3439,9 +3404,9 @@ | |||
3439 | } | 3404 | } |
3440 | }, | 3405 | }, |
3441 | "domelementtype": { | 3406 | "domelementtype": { |
3442 | "version": "1.3.0", | 3407 | "version": "1.3.1", |
3443 | "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", | 3408 | "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", |
3444 | "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=" | 3409 | "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" |
3445 | }, | 3410 | }, |
3446 | "domhandler": { | 3411 | "domhandler": { |
3447 | "version": "2.4.2", | 3412 | "version": "2.4.2", |
@@ -4087,6 +4052,12 @@ | |||
4087 | "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.0.2.tgz", | 4052 | "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.0.2.tgz", |
4088 | "integrity": "sha512-IMn9dnwLMsgZjdUHswB/UZ0S8LQ/u+2/qjnHJ9tCtp3QHZsIYwJCiJOo2FT0i3CwwK/dtSODYtxuvzV4D9MY5g==" | 4053 | "integrity": "sha512-IMn9dnwLMsgZjdUHswB/UZ0S8LQ/u+2/qjnHJ9tCtp3QHZsIYwJCiJOo2FT0i3CwwK/dtSODYtxuvzV4D9MY5g==" |
4089 | }, | 4054 | }, |
4055 | "emoji-regex": { | ||
4056 | "version": "6.5.1", | ||
4057 | "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.5.1.tgz", | ||
4058 | "integrity": "sha512-PAHp6TxrCy7MGMFidro8uikr+zlJJKJ/Q6mm2ExZ7HwkyR9lSVFfE3kt36qcwa24BQL7y0G9axycGjK1A/0uNQ==", | ||
4059 | "dev": true | ||
4060 | }, | ||
4090 | "emojis-list": { | 4061 | "emojis-list": { |
4091 | "version": "2.1.0", | 4062 | "version": "2.1.0", |
4092 | "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", | 4063 | "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", |
@@ -4314,51 +4285,62 @@ | |||
4314 | "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" | 4285 | "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" |
4315 | }, | 4286 | }, |
4316 | "eslint": { | 4287 | "eslint": { |
4317 | "version": "4.19.1", | 4288 | "version": "5.10.0", |
4318 | "resolved": "http://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz", | 4289 | "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.10.0.tgz", |
4319 | "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==", | 4290 | "integrity": "sha512-HpqzC+BHULKlnPwWae9MaVZ5AXJKpkxCVXQHrFaRw3hbDj26V/9ArYM4Rr/SQ8pi6qUPLXSSXC4RBJlyq2Z2OQ==", |
4320 | "dev": true, | 4291 | "dev": true, |
4321 | "requires": { | 4292 | "requires": { |
4322 | "ajv": "^5.3.0", | 4293 | "@babel/code-frame": "^7.0.0", |
4323 | "babel-code-frame": "^6.22.0", | 4294 | "ajv": "^6.5.3", |
4324 | "chalk": "^2.1.0", | 4295 | "chalk": "^2.1.0", |
4325 | "concat-stream": "^1.6.0", | 4296 | "cross-spawn": "^6.0.5", |
4326 | "cross-spawn": "^5.1.0", | 4297 | "debug": "^4.0.1", |
4327 | "debug": "^3.1.0", | ||
4328 | "doctrine": "^2.1.0", | 4298 | "doctrine": "^2.1.0", |
4329 | "eslint-scope": "^3.7.1", | 4299 | "eslint-scope": "^4.0.0", |
4300 | "eslint-utils": "^1.3.1", | ||
4330 | "eslint-visitor-keys": "^1.0.0", | 4301 | "eslint-visitor-keys": "^1.0.0", |
4331 | "espree": "^3.5.4", | 4302 | "espree": "^5.0.0", |
4332 | "esquery": "^1.0.0", | 4303 | "esquery": "^1.0.1", |
4333 | "esutils": "^2.0.2", | 4304 | "esutils": "^2.0.2", |
4334 | "file-entry-cache": "^2.0.0", | 4305 | "file-entry-cache": "^2.0.0", |
4335 | "functional-red-black-tree": "^1.0.1", | 4306 | "functional-red-black-tree": "^1.0.1", |
4336 | "glob": "^7.1.2", | 4307 | "glob": "^7.1.2", |
4337 | "globals": "^11.0.1", | 4308 | "globals": "^11.7.0", |
4338 | "ignore": "^3.3.3", | 4309 | "ignore": "^4.0.6", |
4339 | "imurmurhash": "^0.1.4", | 4310 | "imurmurhash": "^0.1.4", |
4340 | "inquirer": "^3.0.6", | 4311 | "inquirer": "^6.1.0", |
4341 | "is-resolvable": "^1.0.0", | 4312 | "js-yaml": "^3.12.0", |
4342 | "js-yaml": "^3.9.1", | ||
4343 | "json-stable-stringify-without-jsonify": "^1.0.1", | 4313 | "json-stable-stringify-without-jsonify": "^1.0.1", |
4344 | "levn": "^0.3.0", | 4314 | "levn": "^0.3.0", |
4345 | "lodash": "^4.17.4", | 4315 | "lodash": "^4.17.5", |
4346 | "minimatch": "^3.0.2", | 4316 | "minimatch": "^3.0.4", |
4347 | "mkdirp": "^0.5.1", | 4317 | "mkdirp": "^0.5.1", |
4348 | "natural-compare": "^1.4.0", | 4318 | "natural-compare": "^1.4.0", |
4349 | "optionator": "^0.8.2", | 4319 | "optionator": "^0.8.2", |
4350 | "path-is-inside": "^1.0.2", | 4320 | "path-is-inside": "^1.0.2", |
4351 | "pluralize": "^7.0.0", | 4321 | "pluralize": "^7.0.0", |
4352 | "progress": "^2.0.0", | 4322 | "progress": "^2.0.0", |
4353 | "regexpp": "^1.0.1", | 4323 | "regexpp": "^2.0.1", |
4354 | "require-uncached": "^1.0.3", | 4324 | "require-uncached": "^1.0.3", |
4355 | "semver": "^5.3.0", | 4325 | "semver": "^5.5.1", |
4356 | "strip-ansi": "^4.0.0", | 4326 | "strip-ansi": "^4.0.0", |
4357 | "strip-json-comments": "~2.0.1", | 4327 | "strip-json-comments": "^2.0.1", |
4358 | "table": "4.0.2", | 4328 | "table": "^5.0.2", |
4359 | "text-table": "~0.2.0" | 4329 | "text-table": "^0.2.0" |
4360 | }, | 4330 | }, |
4361 | "dependencies": { | 4331 | "dependencies": { |
4332 | "ajv": { | ||
4333 | "version": "6.6.1", | ||
4334 | "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz", | ||
4335 | "integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==", | ||
4336 | "dev": true, | ||
4337 | "requires": { | ||
4338 | "fast-deep-equal": "^2.0.1", | ||
4339 | "fast-json-stable-stringify": "^2.0.0", | ||
4340 | "json-schema-traverse": "^0.4.1", | ||
4341 | "uri-js": "^4.2.2" | ||
4342 | } | ||
4343 | }, | ||
4362 | "ansi-regex": { | 4344 | "ansi-regex": { |
4363 | "version": "3.0.0", | 4345 | "version": "3.0.0", |
4364 | "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", | 4346 | "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", |
@@ -4385,30 +4367,25 @@ | |||
4385 | "supports-color": "^5.3.0" | 4367 | "supports-color": "^5.3.0" |
4386 | } | 4368 | } |
4387 | }, | 4369 | }, |
4388 | "cross-spawn": { | ||
4389 | "version": "5.1.0", | ||
4390 | "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", | ||
4391 | "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", | ||
4392 | "dev": true, | ||
4393 | "requires": { | ||
4394 | "lru-cache": "^4.0.1", | ||
4395 | "shebang-command": "^1.2.0", | ||
4396 | "which": "^1.2.9" | ||
4397 | } | ||
4398 | }, | ||
4399 | "debug": { | 4370 | "debug": { |
4400 | "version": "3.2.6", | 4371 | "version": "4.1.0", |
4401 | "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", | 4372 | "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz", |
4402 | "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", | 4373 | "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==", |
4403 | "dev": true, | 4374 | "dev": true, |
4404 | "requires": { | 4375 | "requires": { |
4405 | "ms": "^2.1.1" | 4376 | "ms": "^2.1.1" |
4406 | } | 4377 | } |
4407 | }, | 4378 | }, |
4408 | "globals": { | 4379 | "fast-deep-equal": { |
4409 | "version": "11.8.0", | 4380 | "version": "2.0.1", |
4410 | "resolved": "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz", | 4381 | "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", |
4411 | "integrity": "sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==", | 4382 | "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", |
4383 | "dev": true | ||
4384 | }, | ||
4385 | "json-schema-traverse": { | ||
4386 | "version": "0.4.1", | ||
4387 | "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", | ||
4388 | "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", | ||
4412 | "dev": true | 4389 | "dev": true |
4413 | }, | 4390 | }, |
4414 | "ms": { | 4391 | "ms": { |
@@ -4438,21 +4415,25 @@ | |||
4438 | } | 4415 | } |
4439 | }, | 4416 | }, |
4440 | "eslint-config-airbnb": { | 4417 | "eslint-config-airbnb": { |
4441 | "version": "14.1.0", | 4418 | "version": "17.1.0", |
4442 | "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-14.1.0.tgz", | 4419 | "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-17.1.0.tgz", |
4443 | "integrity": "sha1-NV0pAEC7+OAL+LSxn0twy+fCMX8=", | 4420 | "integrity": "sha512-R9jw28hFfEQnpPau01NO5K/JWMGLi6aymiF6RsnMURjTk+MqZKllCqGK/0tOvHkPi/NWSSOU2Ced/GX++YxLnw==", |
4444 | "dev": true, | 4421 | "dev": true, |
4445 | "requires": { | 4422 | "requires": { |
4446 | "eslint-config-airbnb-base": "^11.1.0" | 4423 | "eslint-config-airbnb-base": "^13.1.0", |
4424 | "object.assign": "^4.1.0", | ||
4425 | "object.entries": "^1.0.4" | ||
4447 | } | 4426 | } |
4448 | }, | 4427 | }, |
4449 | "eslint-config-airbnb-base": { | 4428 | "eslint-config-airbnb-base": { |
4450 | "version": "11.3.2", | 4429 | "version": "13.1.0", |
4451 | "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-11.3.2.tgz", | 4430 | "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz", |
4452 | "integrity": "sha512-/fhjt/VqzBA2SRsx7ErDtv6Ayf+XLw9LIOqmpBuHFCVwyJo2EtzGWMB9fYRFBoWWQLxmNmCpenNiH0RxyeS41w==", | 4431 | "integrity": "sha512-XWwQtf3U3zIoKO1BbHh6aUhJZQweOwSt4c2JrPDg9FP3Ltv3+YfEv7jIDB8275tVnO/qOHbfuYg3kzw6Je7uWw==", |
4453 | "dev": true, | 4432 | "dev": true, |
4454 | "requires": { | 4433 | "requires": { |
4455 | "eslint-restricted-globals": "^0.1.1" | 4434 | "eslint-restricted-globals": "^0.1.1", |
4435 | "object.assign": "^4.1.0", | ||
4436 | "object.entries": "^1.0.4" | ||
4456 | } | 4437 | } |
4457 | }, | 4438 | }, |
4458 | "eslint-import-resolver-node": { | 4439 | "eslint-import-resolver-node": { |
@@ -4576,39 +4557,32 @@ | |||
4576 | } | 4557 | } |
4577 | }, | 4558 | }, |
4578 | "eslint-plugin-jsx-a11y": { | 4559 | "eslint-plugin-jsx-a11y": { |
4579 | "version": "3.0.2", | 4560 | "version": "6.1.2", |
4580 | "resolved": "http://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-3.0.2.tgz", | 4561 | "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.1.2.tgz", |
4581 | "integrity": "sha1-nw6ryv3j0qJgDZamatuQ0JnoQf4=", | 4562 | "integrity": "sha512-7gSSmwb3A+fQwtw0arguwMdOdzmKUgnUcbSNlo+GjKLAQFuC2EZxWqG9XHRI8VscBJD5a8raz3RuxQNFW+XJbw==", |
4582 | "dev": true, | 4563 | "dev": true, |
4583 | "requires": { | 4564 | "requires": { |
4584 | "damerau-levenshtein": "^1.0.0", | 4565 | "aria-query": "^3.0.0", |
4585 | "jsx-ast-utils": "^1.0.0", | 4566 | "array-includes": "^3.0.3", |
4586 | "object-assign": "^4.0.1" | 4567 | "ast-types-flow": "^0.0.7", |
4568 | "axobject-query": "^2.0.1", | ||
4569 | "damerau-levenshtein": "^1.0.4", | ||
4570 | "emoji-regex": "^6.5.1", | ||
4571 | "has": "^1.0.3", | ||
4572 | "jsx-ast-utils": "^2.0.1" | ||
4587 | } | 4573 | } |
4588 | }, | 4574 | }, |
4589 | "eslint-plugin-react": { | 4575 | "eslint-plugin-react": { |
4590 | "version": "6.10.3", | 4576 | "version": "7.11.1", |
4591 | "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz", | 4577 | "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.11.1.tgz", |
4592 | "integrity": "sha1-xUNb6wZ3ThLH2y9qut3L+QDNP3g=", | 4578 | "integrity": "sha512-cVVyMadRyW7qsIUh3FHp3u6QHNhOgVrLQYdQEB1bPWBsgbNCHdFAeNMquBMCcZJu59eNthX053L70l7gRt4SCw==", |
4593 | "dev": true, | 4579 | "dev": true, |
4594 | "requires": { | 4580 | "requires": { |
4595 | "array.prototype.find": "^2.0.1", | 4581 | "array-includes": "^3.0.3", |
4596 | "doctrine": "^1.2.2", | 4582 | "doctrine": "^2.1.0", |
4597 | "has": "^1.0.1", | 4583 | "has": "^1.0.3", |
4598 | "jsx-ast-utils": "^1.3.4", | 4584 | "jsx-ast-utils": "^2.0.1", |
4599 | "object.assign": "^4.0.4" | 4585 | "prop-types": "^15.6.2" |
4600 | }, | ||
4601 | "dependencies": { | ||
4602 | "doctrine": { | ||
4603 | "version": "1.5.0", | ||
4604 | "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", | ||
4605 | "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", | ||
4606 | "dev": true, | ||
4607 | "requires": { | ||
4608 | "esutils": "^2.0.2", | ||
4609 | "isarray": "^1.0.0" | ||
4610 | } | ||
4611 | } | ||
4612 | } | 4586 | } |
4613 | }, | 4587 | }, |
4614 | "eslint-restricted-globals": { | 4588 | "eslint-restricted-globals": { |
@@ -4618,15 +4592,21 @@ | |||
4618 | "dev": true | 4592 | "dev": true |
4619 | }, | 4593 | }, |
4620 | "eslint-scope": { | 4594 | "eslint-scope": { |
4621 | "version": "3.7.3", | 4595 | "version": "4.0.0", |
4622 | "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz", | 4596 | "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz", |
4623 | "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==", | 4597 | "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", |
4624 | "dev": true, | 4598 | "dev": true, |
4625 | "requires": { | 4599 | "requires": { |
4626 | "esrecurse": "^4.1.0", | 4600 | "esrecurse": "^4.1.0", |
4627 | "estraverse": "^4.1.1" | 4601 | "estraverse": "^4.1.1" |
4628 | } | 4602 | } |
4629 | }, | 4603 | }, |
4604 | "eslint-utils": { | ||
4605 | "version": "1.3.1", | ||
4606 | "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz", | ||
4607 | "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==", | ||
4608 | "dev": true | ||
4609 | }, | ||
4630 | "eslint-visitor-keys": { | 4610 | "eslint-visitor-keys": { |
4631 | "version": "1.0.0", | 4611 | "version": "1.0.0", |
4632 | "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", | 4612 | "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", |
@@ -4634,13 +4614,14 @@ | |||
4634 | "dev": true | 4614 | "dev": true |
4635 | }, | 4615 | }, |
4636 | "espree": { | 4616 | "espree": { |
4637 | "version": "3.5.4", | 4617 | "version": "5.0.0", |
4638 | "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz", | 4618 | "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.0.tgz", |
4639 | "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==", | 4619 | "integrity": "sha512-1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA==", |
4640 | "dev": true, | 4620 | "dev": true, |
4641 | "requires": { | 4621 | "requires": { |
4642 | "acorn": "^5.5.0", | 4622 | "acorn": "^6.0.2", |
4643 | "acorn-jsx": "^3.0.0" | 4623 | "acorn-jsx": "^5.0.0", |
4624 | "eslint-visitor-keys": "^1.0.0" | ||
4644 | } | 4625 | } |
4645 | }, | 4626 | }, |
4646 | "esprima": { | 4627 | "esprima": { |
@@ -4834,25 +4815,14 @@ | |||
4834 | } | 4815 | } |
4835 | }, | 4816 | }, |
4836 | "external-editor": { | 4817 | "external-editor": { |
4837 | "version": "2.2.0", | 4818 | "version": "3.0.3", |
4838 | "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", | 4819 | "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz", |
4839 | "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", | 4820 | "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==", |
4840 | "dev": true, | 4821 | "dev": true, |
4841 | "requires": { | 4822 | "requires": { |
4842 | "chardet": "^0.4.0", | 4823 | "chardet": "^0.7.0", |
4843 | "iconv-lite": "^0.4.17", | 4824 | "iconv-lite": "^0.4.24", |
4844 | "tmp": "^0.0.33" | 4825 | "tmp": "^0.0.33" |
4845 | }, | ||
4846 | "dependencies": { | ||
4847 | "tmp": { | ||
4848 | "version": "0.0.33", | ||
4849 | "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", | ||
4850 | "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", | ||
4851 | "dev": true, | ||
4852 | "requires": { | ||
4853 | "os-tmpdir": "~1.0.2" | ||
4854 | } | ||
4855 | } | ||
4856 | } | 4826 | } |
4857 | }, | 4827 | }, |
4858 | "extglob": { | 4828 | "extglob": { |
@@ -5134,14 +5104,14 @@ | |||
5134 | "integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=" | 5104 | "integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=" |
5135 | }, | 5105 | }, |
5136 | "flat-cache": { | 5106 | "flat-cache": { |
5137 | "version": "1.3.0", | 5107 | "version": "1.3.4", |
5138 | "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", | 5108 | "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz", |
5139 | "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", | 5109 | "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==", |
5140 | "dev": true, | 5110 | "dev": true, |
5141 | "requires": { | 5111 | "requires": { |
5142 | "circular-json": "^0.3.1", | 5112 | "circular-json": "^0.3.1", |
5143 | "del": "^2.0.2", | ||
5144 | "graceful-fs": "^4.1.2", | 5113 | "graceful-fs": "^4.1.2", |
5114 | "rimraf": "~2.6.2", | ||
5145 | "write": "^0.2.1" | 5115 | "write": "^0.2.1" |
5146 | } | 5116 | } |
5147 | }, | 5117 | }, |
@@ -6078,19 +6048,11 @@ | |||
6078 | } | 6048 | } |
6079 | } | 6049 | } |
6080 | }, | 6050 | }, |
6081 | "globby": { | 6051 | "globals": { |
6082 | "version": "5.0.0", | 6052 | "version": "11.9.0", |
6083 | "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", | 6053 | "resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz", |
6084 | "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", | 6054 | "integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==", |
6085 | "dev": true, | 6055 | "dev": true |
6086 | "requires": { | ||
6087 | "array-union": "^1.0.1", | ||
6088 | "arrify": "^1.0.0", | ||
6089 | "glob": "^7.0.3", | ||
6090 | "object-assign": "^4.0.1", | ||
6091 | "pify": "^2.0.0", | ||
6092 | "pinkie-promise": "^2.0.0" | ||
6093 | } | ||
6094 | }, | 6056 | }, |
6095 | "globule": { | 6057 | "globule": { |
6096 | "version": "1.2.1", | 6058 | "version": "1.2.1", |
@@ -7160,9 +7122,9 @@ | |||
7160 | } | 7122 | } |
7161 | }, | 7123 | }, |
7162 | "ignore": { | 7124 | "ignore": { |
7163 | "version": "3.3.10", | 7125 | "version": "4.0.6", |
7164 | "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", | 7126 | "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", |
7165 | "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", | 7127 | "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", |
7166 | "dev": true | 7128 | "dev": true |
7167 | }, | 7129 | }, |
7168 | "import-fresh": { | 7130 | "import-fresh": { |
@@ -7245,24 +7207,23 @@ | |||
7245 | "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" | 7207 | "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" |
7246 | }, | 7208 | }, |
7247 | "inquirer": { | 7209 | "inquirer": { |
7248 | "version": "3.3.0", | 7210 | "version": "6.2.1", |
7249 | "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", | 7211 | "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz", |
7250 | "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", | 7212 | "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==", |
7251 | "dev": true, | 7213 | "dev": true, |
7252 | "requires": { | 7214 | "requires": { |
7253 | "ansi-escapes": "^3.0.0", | 7215 | "ansi-escapes": "^3.0.0", |
7254 | "chalk": "^2.0.0", | 7216 | "chalk": "^2.0.0", |
7255 | "cli-cursor": "^2.1.0", | 7217 | "cli-cursor": "^2.1.0", |
7256 | "cli-width": "^2.0.0", | 7218 | "cli-width": "^2.0.0", |
7257 | "external-editor": "^2.0.4", | 7219 | "external-editor": "^3.0.0", |
7258 | "figures": "^2.0.0", | 7220 | "figures": "^2.0.0", |
7259 | "lodash": "^4.3.0", | 7221 | "lodash": "^4.17.10", |
7260 | "mute-stream": "0.0.7", | 7222 | "mute-stream": "0.0.7", |
7261 | "run-async": "^2.2.0", | 7223 | "run-async": "^2.2.0", |
7262 | "rx-lite": "^4.0.8", | 7224 | "rxjs": "^6.1.0", |
7263 | "rx-lite-aggregates": "^4.0.8", | ||
7264 | "string-width": "^2.1.0", | 7225 | "string-width": "^2.1.0", |
7265 | "strip-ansi": "^4.0.0", | 7226 | "strip-ansi": "^5.0.0", |
7266 | "through": "^2.3.6" | 7227 | "through": "^2.3.6" |
7267 | }, | 7228 | }, |
7268 | "dependencies": { | 7229 | "dependencies": { |
@@ -7298,6 +7259,15 @@ | |||
7298 | "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", | 7259 | "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", |
7299 | "dev": true | 7260 | "dev": true |
7300 | }, | 7261 | }, |
7262 | "rxjs": { | ||
7263 | "version": "6.3.3", | ||
7264 | "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", | ||
7265 | "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", | ||
7266 | "dev": true, | ||
7267 | "requires": { | ||
7268 | "tslib": "^1.9.0" | ||
7269 | } | ||
7270 | }, | ||
7301 | "string-width": { | 7271 | "string-width": { |
7302 | "version": "2.1.1", | 7272 | "version": "2.1.1", |
7303 | "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", | 7273 | "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", |
@@ -7306,15 +7276,34 @@ | |||
7306 | "requires": { | 7276 | "requires": { |
7307 | "is-fullwidth-code-point": "^2.0.0", | 7277 | "is-fullwidth-code-point": "^2.0.0", |
7308 | "strip-ansi": "^4.0.0" | 7278 | "strip-ansi": "^4.0.0" |
7279 | }, | ||
7280 | "dependencies": { | ||
7281 | "strip-ansi": { | ||
7282 | "version": "4.0.0", | ||
7283 | "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", | ||
7284 | "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", | ||
7285 | "dev": true, | ||
7286 | "requires": { | ||
7287 | "ansi-regex": "^3.0.0" | ||
7288 | } | ||
7289 | } | ||
7309 | } | 7290 | } |
7310 | }, | 7291 | }, |
7311 | "strip-ansi": { | 7292 | "strip-ansi": { |
7312 | "version": "4.0.0", | 7293 | "version": "5.0.0", |
7313 | "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", | 7294 | "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz", |
7314 | "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", | 7295 | "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==", |
7315 | "dev": true, | 7296 | "dev": true, |
7316 | "requires": { | 7297 | "requires": { |
7317 | "ansi-regex": "^3.0.0" | 7298 | "ansi-regex": "^4.0.0" |
7299 | }, | ||
7300 | "dependencies": { | ||
7301 | "ansi-regex": { | ||
7302 | "version": "4.0.0", | ||
7303 | "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz", | ||
7304 | "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==", | ||
7305 | "dev": true | ||
7306 | } | ||
7318 | } | 7307 | } |
7319 | }, | 7308 | }, |
7320 | "supports-color": { | 7309 | "supports-color": { |
@@ -7601,21 +7590,6 @@ | |||
7601 | "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", | 7590 | "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", |
7602 | "dev": true | 7591 | "dev": true |
7603 | }, | 7592 | }, |
7604 | "is-path-cwd": { | ||
7605 | "version": "1.0.0", | ||
7606 | "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", | ||
7607 | "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", | ||
7608 | "dev": true | ||
7609 | }, | ||
7610 | "is-path-in-cwd": { | ||
7611 | "version": "1.0.1", | ||
7612 | "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", | ||
7613 | "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", | ||
7614 | "dev": true, | ||
7615 | "requires": { | ||
7616 | "is-path-inside": "^1.0.0" | ||
7617 | } | ||
7618 | }, | ||
7619 | "is-path-inside": { | 7593 | "is-path-inside": { |
7620 | "version": "1.0.1", | 7594 | "version": "1.0.1", |
7621 | "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", | 7595 | "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", |
@@ -7677,12 +7651,6 @@ | |||
7677 | "is-unc-path": "^1.0.0" | 7651 | "is-unc-path": "^1.0.0" |
7678 | } | 7652 | } |
7679 | }, | 7653 | }, |
7680 | "is-resolvable": { | ||
7681 | "version": "1.1.0", | ||
7682 | "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", | ||
7683 | "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", | ||
7684 | "dev": true | ||
7685 | }, | ||
7686 | "is-retry-allowed": { | 7654 | "is-retry-allowed": { |
7687 | "version": "1.1.0", | 7655 | "version": "1.1.0", |
7688 | "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", | 7656 | "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", |
@@ -8024,10 +7992,13 @@ | |||
8024 | } | 7992 | } |
8025 | }, | 7993 | }, |
8026 | "jsx-ast-utils": { | 7994 | "jsx-ast-utils": { |
8027 | "version": "1.4.1", | 7995 | "version": "2.0.1", |
8028 | "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz", | 7996 | "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz", |
8029 | "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=", | 7997 | "integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=", |
8030 | "dev": true | 7998 | "dev": true, |
7999 | "requires": { | ||
8000 | "array-includes": "^3.0.3" | ||
8001 | } | ||
8031 | }, | 8002 | }, |
8032 | "just-debounce": { | 8003 | "just-debounce": { |
8033 | "version": "1.0.0", | 8004 | "version": "1.0.0", |
@@ -9196,6 +9167,18 @@ | |||
9196 | "isobject": "^3.0.0" | 9167 | "isobject": "^3.0.0" |
9197 | } | 9168 | } |
9198 | }, | 9169 | }, |
9170 | "object.entries": { | ||
9171 | "version": "1.0.4", | ||
9172 | "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz", | ||
9173 | "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=", | ||
9174 | "dev": true, | ||
9175 | "requires": { | ||
9176 | "define-properties": "^1.1.2", | ||
9177 | "es-abstract": "^1.6.1", | ||
9178 | "function-bind": "^1.1.0", | ||
9179 | "has": "^1.0.1" | ||
9180 | } | ||
9181 | }, | ||
9199 | "object.map": { | 9182 | "object.map": { |
9200 | "version": "1.0.1", | 9183 | "version": "1.0.1", |
9201 | "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", | 9184 | "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", |
@@ -9606,11 +9589,6 @@ | |||
9606 | "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", | 9589 | "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", |
9607 | "dev": true | 9590 | "dev": true |
9608 | }, | 9591 | }, |
9609 | "performance-now": { | ||
9610 | "version": "0.2.0", | ||
9611 | "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", | ||
9612 | "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" | ||
9613 | }, | ||
9614 | "pify": { | 9592 | "pify": { |
9615 | "version": "2.3.0", | 9593 | "version": "2.3.0", |
9616 | "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", | 9594 | "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", |
@@ -9738,9 +9716,9 @@ | |||
9738 | "dev": true | 9716 | "dev": true |
9739 | }, | 9717 | }, |
9740 | "progress": { | 9718 | "progress": { |
9741 | "version": "2.0.1", | 9719 | "version": "2.0.3", |
9742 | "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz", | 9720 | "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", |
9743 | "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==", | 9721 | "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", |
9744 | "dev": true | 9722 | "dev": true |
9745 | }, | 9723 | }, |
9746 | "progress-stream": { | 9724 | "progress-stream": { |
@@ -9894,21 +9872,6 @@ | |||
9894 | "strict-uri-encode": "^1.0.0" | 9872 | "strict-uri-encode": "^1.0.0" |
9895 | } | 9873 | } |
9896 | }, | 9874 | }, |
9897 | "raf": { | ||
9898 | "version": "3.4.0", | ||
9899 | "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.0.tgz", | ||
9900 | "integrity": "sha512-pDP/NMRAXoTfrhCfyfSEwJAKLaxBU9eApMeBPB1TkDouZmvPerIClV8lTAd+uF8ZiTaVl69e1FCxQrAd/VTjGw==", | ||
9901 | "requires": { | ||
9902 | "performance-now": "^2.1.0" | ||
9903 | }, | ||
9904 | "dependencies": { | ||
9905 | "performance-now": { | ||
9906 | "version": "2.1.0", | ||
9907 | "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", | ||
9908 | "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" | ||
9909 | } | ||
9910 | } | ||
9911 | }, | ||
9912 | "randomatic": { | 9875 | "randomatic": { |
9913 | "version": "3.1.0", | 9876 | "version": "3.1.0", |
9914 | "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.0.tgz", | 9877 | "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.0.tgz", |
@@ -9945,15 +9908,14 @@ | |||
9945 | } | 9908 | } |
9946 | }, | 9909 | }, |
9947 | "react": { | 9910 | "react": { |
9948 | "version": "15.6.2", | 9911 | "version": "16.6.3", |
9949 | "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz", | 9912 | "resolved": "https://registry.npmjs.org/react/-/react-16.6.3.tgz", |
9950 | "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=", | 9913 | "integrity": "sha512-zCvmH2vbEolgKxtqXL2wmGCUxUyNheYn/C+PD1YAjfxHC54+MhdruyhO7QieQrYsYeTxrn93PM2y0jRH1zEExw==", |
9951 | "requires": { | 9914 | "requires": { |
9952 | "create-react-class": "^15.6.0", | ||
9953 | "fbjs": "^0.8.9", | ||
9954 | "loose-envify": "^1.1.0", | 9915 | "loose-envify": "^1.1.0", |
9955 | "object-assign": "^4.1.0", | 9916 | "object-assign": "^4.1.1", |
9956 | "prop-types": "^15.5.10" | 9917 | "prop-types": "^15.6.2", |
9918 | "scheduler": "^0.11.2" | ||
9957 | } | 9919 | } |
9958 | }, | 9920 | }, |
9959 | "react-addons-css-transition-group": { | 9921 | "react-addons-css-transition-group": { |
@@ -9965,23 +9927,23 @@ | |||
9965 | } | 9927 | } |
9966 | }, | 9928 | }, |
9967 | "react-dom": { | 9929 | "react-dom": { |
9968 | "version": "15.6.2", | 9930 | "version": "16.6.3", |
9969 | "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz", | 9931 | "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.3.tgz", |
9970 | "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=", | 9932 | "integrity": "sha512-8ugJWRCWLGXy+7PmNh8WJz3g1TaTUt1XyoIcFN+x0Zbkoz+KKdUyx1AQLYJdbFXjuF41Nmjn5+j//rxvhFjgSQ==", |
9971 | "requires": { | 9933 | "requires": { |
9972 | "fbjs": "^0.8.9", | ||
9973 | "loose-envify": "^1.1.0", | 9934 | "loose-envify": "^1.1.0", |
9974 | "object-assign": "^4.1.0", | 9935 | "object-assign": "^4.1.1", |
9975 | "prop-types": "^15.5.10" | 9936 | "prop-types": "^15.6.2", |
9937 | "scheduler": "^0.11.2" | ||
9976 | } | 9938 | } |
9977 | }, | 9939 | }, |
9978 | "react-dropzone": { | 9940 | "react-dropzone": { |
9979 | "version": "4.3.0", | 9941 | "version": "7.0.1", |
9980 | "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-4.3.0.tgz", | 9942 | "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-7.0.1.tgz", |
9981 | "integrity": "sha512-ULfrLaTSsd8BDa9KVAGCueuq1AN3L14dtMsGGqtP0UwYyjG4Vhf158f/ITSHuSPYkZXbvfcIiOlZsH+e3QWm+Q==", | 9943 | "integrity": "sha512-J4rbzhFZPVW7k7K9CVb0OcwSOJGLWa0y+0rvtB4rBLVkvq0agH/o3kPJ0DCkd6ZVzL2K1NFqIOvtQkwQKpmJBA==", |
9982 | "requires": { | 9944 | "requires": { |
9983 | "attr-accept": "^1.1.3", | 9945 | "attr-accept": "^1.1.3", |
9984 | "prop-types": "^15.5.7" | 9946 | "prop-types": "^15.6.2" |
9985 | } | 9947 | } |
9986 | }, | 9948 | }, |
9987 | "react-electron-web-view": { | 9949 | "react-electron-web-view": { |
@@ -9993,9 +9955,9 @@ | |||
9993 | } | 9955 | } |
9994 | }, | 9956 | }, |
9995 | "react-intl": { | 9957 | "react-intl": { |
9996 | "version": "2.7.1", | 9958 | "version": "2.7.2", |
9997 | "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.7.1.tgz", | 9959 | "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.7.2.tgz", |
9998 | "integrity": "sha512-Ndk0i04dSplBivA0/fELd8lMvIPuRizKC+F6s1EZ6jELvRKNcx9shWa8A1UIlTQfYSbys5huWCRgmylbW0e57A==", | 9960 | "integrity": "sha512-3dcNGLqEw2FKkX+1L2WYLgjP0MVJkvWuVd1uLcnwifIQe8JQvnd9Bss4hb4Gvg/YhBIRcs4LM6C2bAgyklucjw==", |
9999 | "requires": { | 9961 | "requires": { |
10000 | "hoist-non-react-statics": "^2.5.5", | 9962 | "hoist-non-react-statics": "^2.5.5", |
10001 | "intl-format-cache": "^2.0.5", | 9963 | "intl-format-cache": "^2.0.5", |
@@ -10031,17 +9993,6 @@ | |||
10031 | "spin.js": "2.x" | 9993 | "spin.js": "2.x" |
10032 | } | 9994 | } |
10033 | }, | 9995 | }, |
10034 | "react-motion": { | ||
10035 | "version": "0.4.8", | ||
10036 | "resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.4.8.tgz", | ||
10037 | "integrity": "sha1-I7st0nwtjgDSKeRVctEF789Ao14=", | ||
10038 | "requires": { | ||
10039 | "create-react-class": "^15.5.2", | ||
10040 | "performance-now": "^0.2.0", | ||
10041 | "prop-types": "^15.5.8", | ||
10042 | "raf": "^3.1.0" | ||
10043 | } | ||
10044 | }, | ||
10045 | "react-router": { | 9996 | "react-router": { |
10046 | "version": "3.2.1", | 9997 | "version": "3.2.1", |
10047 | "resolved": "http://registry.npmjs.org/react-router/-/react-router-3.2.1.tgz", | 9998 | "resolved": "http://registry.npmjs.org/react-router/-/react-router-3.2.1.tgz", |
@@ -10056,23 +10007,13 @@ | |||
10056 | "warning": "^3.0.0" | 10007 | "warning": "^3.0.0" |
10057 | } | 10008 | } |
10058 | }, | 10009 | }, |
10059 | "react-router-transition": { | ||
10060 | "version": "0.1.1", | ||
10061 | "resolved": "https://registry.npmjs.org/react-router-transition/-/react-router-transition-0.1.1.tgz", | ||
10062 | "integrity": "sha1-bMLLdHyyfk1WMsgsp1C0MSzNO9Y=", | ||
10063 | "requires": { | ||
10064 | "prop-types": "^15.5.8", | ||
10065 | "react-motion": "^0.4.8" | ||
10066 | } | ||
10067 | }, | ||
10068 | "react-sortable-hoc": { | 10010 | "react-sortable-hoc": { |
10069 | "version": "0.6.8", | 10011 | "version": "0.8.4", |
10070 | "resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-0.6.8.tgz", | 10012 | "resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-0.8.4.tgz", |
10071 | "integrity": "sha512-sUUAtNdV84AKZ2o+F5lVOOFWcyWG6aGDkNFgHoieB1zFLeWLWENkix06asPS4/GhigfuRh06aZix1j3Qx8+NSQ==", | 10013 | "integrity": "sha512-J9AFEQAJ7u2YWdVzkU5E3ewrG82xQ4xF1ZPrZYKliDwlVBDkmjri+iKFAEt6NCDIRiBZ4hiN5vzI8pwy/dGPHw==", |
10072 | "requires": { | 10014 | "requires": { |
10073 | "babel-runtime": "^6.11.6", | 10015 | "babel-runtime": "^6.11.6", |
10074 | "invariant": "^2.2.1", | 10016 | "invariant": "^2.2.1", |
10075 | "lodash": "^4.12.0", | ||
10076 | "prop-types": "^15.5.7" | 10017 | "prop-types": "^15.5.7" |
10077 | } | 10018 | } |
10078 | }, | 10019 | }, |
@@ -10300,9 +10241,9 @@ | |||
10300 | "integrity": "sha1-Hg9GUMhi3L/tVP1CsUjpuxch/PI=" | 10241 | "integrity": "sha1-Hg9GUMhi3L/tVP1CsUjpuxch/PI=" |
10301 | }, | 10242 | }, |
10302 | "regexpp": { | 10243 | "regexpp": { |
10303 | "version": "1.1.0", | 10244 | "version": "2.0.1", |
10304 | "resolved": "http://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz", | 10245 | "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", |
10305 | "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==", | 10246 | "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", |
10306 | "dev": true | 10247 | "dev": true |
10307 | }, | 10248 | }, |
10308 | "regexpu-core": { | 10249 | "regexpu-core": { |
@@ -10568,21 +10509,6 @@ | |||
10568 | "integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==", | 10509 | "integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==", |
10569 | "dev": true | 10510 | "dev": true |
10570 | }, | 10511 | }, |
10571 | "rx-lite": { | ||
10572 | "version": "4.0.8", | ||
10573 | "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", | ||
10574 | "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", | ||
10575 | "dev": true | ||
10576 | }, | ||
10577 | "rx-lite-aggregates": { | ||
10578 | "version": "4.0.8", | ||
10579 | "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz", | ||
10580 | "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", | ||
10581 | "dev": true, | ||
10582 | "requires": { | ||
10583 | "rx-lite": "*" | ||
10584 | } | ||
10585 | }, | ||
10586 | "rxjs": { | 10512 | "rxjs": { |
10587 | "version": "5.5.12", | 10513 | "version": "5.5.12", |
10588 | "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz", | 10514 | "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz", |
@@ -10646,6 +10572,15 @@ | |||
10646 | "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", | 10572 | "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", |
10647 | "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" | 10573 | "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" |
10648 | }, | 10574 | }, |
10575 | "scheduler": { | ||
10576 | "version": "0.11.3", | ||
10577 | "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.11.3.tgz", | ||
10578 | "integrity": "sha512-i9X9VRRVZDd3xZw10NY5Z2cVMbdYg6gqFecfj79USv1CFN+YrJ3gIPRKf1qlY+Sxly4djoKdfx1T+m9dnRB8kQ==", | ||
10579 | "requires": { | ||
10580 | "loose-envify": "^1.1.0", | ||
10581 | "object-assign": "^4.1.1" | ||
10582 | } | ||
10583 | }, | ||
10649 | "scss-tokenizer": { | 10584 | "scss-tokenizer": { |
10650 | "version": "0.2.3", | 10585 | "version": "0.2.3", |
10651 | "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", | 10586 | "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", |
@@ -10833,14 +10768,25 @@ | |||
10833 | "dev": true | 10768 | "dev": true |
10834 | }, | 10769 | }, |
10835 | "slice-ansi": { | 10770 | "slice-ansi": { |
10836 | "version": "1.0.0", | 10771 | "version": "2.0.0", |
10837 | "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", | 10772 | "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.0.0.tgz", |
10838 | "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", | 10773 | "integrity": "sha512-4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ==", |
10839 | "dev": true, | 10774 | "dev": true, |
10840 | "requires": { | 10775 | "requires": { |
10776 | "ansi-styles": "^3.2.0", | ||
10777 | "astral-regex": "^1.0.0", | ||
10841 | "is-fullwidth-code-point": "^2.0.0" | 10778 | "is-fullwidth-code-point": "^2.0.0" |
10842 | }, | 10779 | }, |
10843 | "dependencies": { | 10780 | "dependencies": { |
10781 | "ansi-styles": { | ||
10782 | "version": "3.2.1", | ||
10783 | "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", | ||
10784 | "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", | ||
10785 | "dev": true, | ||
10786 | "requires": { | ||
10787 | "color-convert": "^1.9.0" | ||
10788 | } | ||
10789 | }, | ||
10844 | "is-fullwidth-code-point": { | 10790 | "is-fullwidth-code-point": { |
10845 | "version": "2.0.0", | 10791 | "version": "2.0.0", |
10846 | "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", | 10792 | "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", |
@@ -11376,44 +11322,40 @@ | |||
11376 | "dev": true | 11322 | "dev": true |
11377 | }, | 11323 | }, |
11378 | "table": { | 11324 | "table": { |
11379 | "version": "4.0.2", | 11325 | "version": "5.1.1", |
11380 | "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", | 11326 | "resolved": "https://registry.npmjs.org/table/-/table-5.1.1.tgz", |
11381 | "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", | 11327 | "integrity": "sha512-NUjapYb/qd4PeFW03HnAuOJ7OMcBkJlqeClWxeNlQ0lXGSb52oZXGzkO0/I0ARegQ2eUT1g2VDJH0eUxDRcHmw==", |
11382 | "dev": true, | 11328 | "dev": true, |
11383 | "requires": { | 11329 | "requires": { |
11384 | "ajv": "^5.2.3", | 11330 | "ajv": "^6.6.1", |
11385 | "ajv-keywords": "^2.1.0", | 11331 | "lodash": "^4.17.11", |
11386 | "chalk": "^2.1.0", | 11332 | "slice-ansi": "2.0.0", |
11387 | "lodash": "^4.17.4", | ||
11388 | "slice-ansi": "1.0.0", | ||
11389 | "string-width": "^2.1.1" | 11333 | "string-width": "^2.1.1" |
11390 | }, | 11334 | }, |
11391 | "dependencies": { | 11335 | "dependencies": { |
11336 | "ajv": { | ||
11337 | "version": "6.6.1", | ||
11338 | "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz", | ||
11339 | "integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==", | ||
11340 | "dev": true, | ||
11341 | "requires": { | ||
11342 | "fast-deep-equal": "^2.0.1", | ||
11343 | "fast-json-stable-stringify": "^2.0.0", | ||
11344 | "json-schema-traverse": "^0.4.1", | ||
11345 | "uri-js": "^4.2.2" | ||
11346 | } | ||
11347 | }, | ||
11392 | "ansi-regex": { | 11348 | "ansi-regex": { |
11393 | "version": "3.0.0", | 11349 | "version": "3.0.0", |
11394 | "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", | 11350 | "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", |
11395 | "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", | 11351 | "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", |
11396 | "dev": true | 11352 | "dev": true |
11397 | }, | 11353 | }, |
11398 | "ansi-styles": { | 11354 | "fast-deep-equal": { |
11399 | "version": "3.2.1", | 11355 | "version": "2.0.1", |
11400 | "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", | 11356 | "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", |
11401 | "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", | 11357 | "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", |
11402 | "dev": true, | 11358 | "dev": true |
11403 | "requires": { | ||
11404 | "color-convert": "^1.9.0" | ||
11405 | } | ||
11406 | }, | ||
11407 | "chalk": { | ||
11408 | "version": "2.4.1", | ||
11409 | "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", | ||
11410 | "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", | ||
11411 | "dev": true, | ||
11412 | "requires": { | ||
11413 | "ansi-styles": "^3.2.1", | ||
11414 | "escape-string-regexp": "^1.0.5", | ||
11415 | "supports-color": "^5.3.0" | ||
11416 | } | ||
11417 | }, | 11359 | }, |
11418 | "is-fullwidth-code-point": { | 11360 | "is-fullwidth-code-point": { |
11419 | "version": "2.0.0", | 11361 | "version": "2.0.0", |
@@ -11421,6 +11363,12 @@ | |||
11421 | "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", | 11363 | "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", |
11422 | "dev": true | 11364 | "dev": true |
11423 | }, | 11365 | }, |
11366 | "json-schema-traverse": { | ||
11367 | "version": "0.4.1", | ||
11368 | "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", | ||
11369 | "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", | ||
11370 | "dev": true | ||
11371 | }, | ||
11424 | "string-width": { | 11372 | "string-width": { |
11425 | "version": "2.1.1", | 11373 | "version": "2.1.1", |
11426 | "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", | 11374 | "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", |
@@ -11439,15 +11387,6 @@ | |||
11439 | "requires": { | 11387 | "requires": { |
11440 | "ansi-regex": "^3.0.0" | 11388 | "ansi-regex": "^3.0.0" |
11441 | } | 11389 | } |
11442 | }, | ||
11443 | "supports-color": { | ||
11444 | "version": "5.5.0", | ||
11445 | "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", | ||
11446 | "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", | ||
11447 | "dev": true, | ||
11448 | "requires": { | ||
11449 | "has-flag": "^3.0.0" | ||
11450 | } | ||
11451 | } | 11390 | } |
11452 | } | 11391 | } |
11453 | }, | 11392 | }, |
@@ -11560,6 +11499,15 @@ | |||
11560 | "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", | 11499 | "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", |
11561 | "dev": true | 11500 | "dev": true |
11562 | }, | 11501 | }, |
11502 | "tmp": { | ||
11503 | "version": "0.0.33", | ||
11504 | "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", | ||
11505 | "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", | ||
11506 | "dev": true, | ||
11507 | "requires": { | ||
11508 | "os-tmpdir": "~1.0.2" | ||
11509 | } | ||
11510 | }, | ||
11563 | "to-absolute-glob": { | 11511 | "to-absolute-glob": { |
11564 | "version": "2.0.2", | 11512 | "version": "2.0.2", |
11565 | "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", | 11513 | "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz", |
diff --git a/package.json b/package.json index 155be5f1d..601ea3d4c 100644 --- a/package.json +++ b/package.json | |||
@@ -35,7 +35,7 @@ | |||
35 | "@meetfranz/electron-notification-state": "^1.0.0", | 35 | "@meetfranz/electron-notification-state": "^1.0.0", |
36 | "address-rfc2822": "^2.0.1", | 36 | "address-rfc2822": "^2.0.1", |
37 | "auto-launch": "https://github.com/meetfranz/node-auto-launch.git", | 37 | "auto-launch": "https://github.com/meetfranz/node-auto-launch.git", |
38 | "classnames": "^2.2.5", | 38 | "classnames": "2.2.6", |
39 | "debug-electron": "^0.0.4", | 39 | "debug-electron": "^0.0.4", |
40 | "du": "^0.1.0", | 40 | "du": "^0.1.0", |
41 | "electron-dl": "1.12.0", | 41 | "electron-dl": "1.12.0", |
@@ -65,18 +65,17 @@ | |||
65 | "pretty-bytes": "^4.0.2", | 65 | "pretty-bytes": "^4.0.2", |
66 | "prop-types": "^15.5.10", | 66 | "prop-types": "^15.5.10", |
67 | "prop-types-extended": "^0.2.1", | 67 | "prop-types-extended": "^0.2.1", |
68 | "react": "^15.4.1", | 68 | "react": "16.6.3", |
69 | "react-addons-css-transition-group": "^15.4.2", | 69 | "react-addons-css-transition-group": "15.6.2", |
70 | "react-dom": "^15.4.1", | 70 | "react-dom": "16.6.3", |
71 | "react-dropzone": "^4.2.1", | 71 | "react-dropzone": "7.0.1", |
72 | "react-electron-web-view": "^2.0.1", | 72 | "react-electron-web-view": "^2.0.1", |
73 | "react-intl": "^2.3.0", | 73 | "react-intl": "2.7.2", |
74 | "react-jss": "8.6.1", | 74 | "react-jss": "8.6.1", |
75 | "react-loader": "^2.4.0", | 75 | "react-loader": "2.4.5", |
76 | "react-router": "^3.0.2", | 76 | "react-router": "^3.0.2", |
77 | "react-router-transition": "^0.1.1", | 77 | "react-sortable-hoc": "0.8.4", |
78 | "react-sortable-hoc": "^0.6.7", | 78 | "react-tooltip": "3.9.0", |
79 | "react-tooltip": "^3.2.7", | ||
80 | "route-parser": "^0.0.5", | 79 | "route-parser": "^0.0.5", |
81 | "semver": "^5.4.1", | 80 | "semver": "^5.4.1", |
82 | "smoothscroll-polyfill": "^0.3.4", | 81 | "smoothscroll-polyfill": "^0.3.4", |
@@ -98,17 +97,17 @@ | |||
98 | "@babel/register": "7.0.0", | 97 | "@babel/register": "7.0.0", |
99 | "babel-eslint": "10.0.1", | 98 | "babel-eslint": "10.0.1", |
100 | "cross-env": "^5.0.5", | 99 | "cross-env": "^5.0.5", |
101 | "cz-conventional-changelog": "^2.0.0", | 100 | "cz-conventional-changelog": "2.1.0", |
102 | "dotenv": "^4.0.0", | 101 | "dotenv": "^4.0.0", |
103 | "electron": "^2.0.13", | 102 | "electron": "^2.0.13", |
104 | "electron-builder": "20.34.0", | 103 | "electron-builder": "20.34.0", |
105 | "electron-rebuild": "^1.6.0", | 104 | "electron-rebuild": "^1.6.0", |
106 | "eslint": "^4.7.1", | 105 | "eslint": "5.10.0", |
107 | "eslint-config-airbnb": "^14.1.0", | 106 | "eslint-config-airbnb": "17.1.0", |
108 | "eslint-loader": "^1.9.0", | 107 | "eslint-loader": "^1.9.0", |
109 | "eslint-plugin-import": "^2.2.0", | 108 | "eslint-plugin-import": "2.14.0", |
110 | "eslint-plugin-jsx-a11y": "^3.0.0", | 109 | "eslint-plugin-jsx-a11y": "6.1.2", |
111 | "eslint-plugin-react": "^6.10.0", | 110 | "eslint-plugin-react": "7.11.1", |
112 | "gulp": "^4.0.0", | 111 | "gulp": "^4.0.0", |
113 | "gulp-babel": "^8.0.0", | 112 | "gulp-babel": "^8.0.0", |
114 | "gulp-sass": "^4.0.2", | 113 | "gulp-sass": "^4.0.2", |
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 4fb0e6a59..4e1b0c52e 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js | |||
@@ -1,7 +1,6 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
4 | import { RouteTransition } from 'react-router-transition'; | ||
5 | import { intlShape } from 'react-intl'; | 4 | import { intlShape } from 'react-intl'; |
6 | import { TitleBar } from 'electron-react-titlebar'; | 5 | import { TitleBar } from 'electron-react-titlebar'; |
7 | 6 | ||
@@ -69,22 +68,10 @@ export default @observer class AuthLayout extends Component { | |||
69 | </InfoBar> | 68 | </InfoBar> |
70 | )} | 69 | )} |
71 | <div className="auth__layout"> | 70 | <div className="auth__layout"> |
72 | <RouteTransition | 71 | {/* Inject globalError into children */} |
73 | pathname={pathname} | 72 | {React.cloneElement(children, { |
74 | atEnter={{ opacity: 0 }} | 73 | error, |
75 | atLeave={{ opacity: 0 }} | 74 | })} |
76 | atActive={{ opacity: 1 }} | ||
77 | mapStyles={styles => ({ | ||
78 | transform: `translateX(${styles.translateX}%)`, | ||
79 | opacity: styles.opacity, | ||
80 | })} | ||
81 | component="span" | ||
82 | > | ||
83 | {/* Inject globalError into children */} | ||
84 | {React.cloneElement(children, { | ||
85 | error, | ||
86 | })} | ||
87 | </RouteTransition> | ||
88 | </div> | 75 | </div> |
89 | {/* </div> */} | 76 | {/* </div> */} |
90 | <Link to="https://adlk.io" className="auth__adlk" target="_blank"> | 77 | <Link to="https://adlk.io" className="auth__adlk" target="_blank"> |
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index 96821a61a..5da89f2ce 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component, Fragment } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
4 | import { defineMessages, intlShape } from 'react-intl'; | 4 | import { defineMessages, intlShape } from 'react-intl'; |
@@ -127,7 +127,7 @@ export default @observer class Invite extends Component { | |||
127 | }); | 127 | }); |
128 | 128 | ||
129 | const renderForm = ( | 129 | const renderForm = ( |
130 | <div> | 130 | <Fragment> |
131 | {this.state.showSuccessInfo && isInviteSuccessful && ( | 131 | {this.state.showSuccessInfo && isInviteSuccessful && ( |
132 | <Appear> | 132 | <Appear> |
133 | <Infobox | 133 | <Infobox |
@@ -171,7 +171,7 @@ export default @observer class Invite extends Component { | |||
171 | {intl.formatMessage(messages.skipButtonLabel)} | 171 | {intl.formatMessage(messages.skipButtonLabel)} |
172 | </Link>)} | 172 | </Link>)} |
173 | </form> | 173 | </form> |
174 | </div> | 174 | </Fragment> |
175 | ); | 175 | ); |
176 | 176 | ||
177 | return ( | 177 | return ( |
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index f465b35a5..2cf614041 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js | |||
@@ -11,11 +11,8 @@ import Button from '../ui/Button'; | |||
11 | import Link from '../ui/Link'; | 11 | import Link from '../ui/Link'; |
12 | import Infobox from '../ui/Infobox'; | 12 | import Infobox from '../ui/Infobox'; |
13 | 13 | ||
14 | |||
15 | import { globalError as globalErrorPropType } from '../../prop-types'; | 14 | import { globalError as globalErrorPropType } from '../../prop-types'; |
16 | 15 | ||
17 | // import Appear from '../ui/effects/Appear'; | ||
18 | |||
19 | const messages = defineMessages({ | 16 | const messages = defineMessages({ |
20 | headline: { | 17 | headline: { |
21 | id: 'login.headline', | 18 | id: 'login.headline', |
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js index dd5c2140f..27f555428 100644 --- a/src/components/services/tabs/Tabbar.js +++ b/src/components/services/tabs/Tabbar.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component, Fragment } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; | 3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; |
4 | 4 | ||
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 06c7074dd..43b8387c6 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component, Fragment } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; | 3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; |
4 | import { defineMessages, intlShape } from 'react-intl'; | 4 | import { defineMessages, intlShape } from 'react-intl'; |
@@ -132,21 +132,19 @@ export default @observer class AccountDashboard extends Component { | |||
132 | )} | 132 | )} |
133 | 133 | ||
134 | {!isLoading && userInfoRequestFailed && ( | 134 | {!isLoading && userInfoRequestFailed && ( |
135 | <div> | 135 | <Infobox |
136 | <Infobox | 136 | icon="alert" |
137 | icon="alert" | 137 | type="danger" |
138 | type="danger" | 138 | ctaLabel={intl.formatMessage(messages.tryReloadUserInfoRequest)} |
139 | ctaLabel={intl.formatMessage(messages.tryReloadUserInfoRequest)} | 139 | ctaLoading={isLoading} |
140 | ctaLoading={isLoading} | 140 | ctaOnClick={retryUserInfoRequest} |
141 | ctaOnClick={retryUserInfoRequest} | 141 | > |
142 | > | 142 | {intl.formatMessage(messages.userInfoRequestFailed)} |
143 | {intl.formatMessage(messages.userInfoRequestFailed)} | 143 | </Infobox> |
144 | </Infobox> | ||
145 | </div> | ||
146 | )} | 144 | )} |
147 | 145 | ||
148 | {!userInfoRequestFailed && ( | 146 | {!userInfoRequestFailed && ( |
149 | <div> | 147 | <Fragment> |
150 | {!isLoading && ( | 148 | {!isLoading && ( |
151 | <div className="account"> | 149 | <div className="account"> |
152 | <div className="account__box account__box--flex"> | 150 | <div className="account__box account__box--flex"> |
@@ -194,7 +192,7 @@ export default @observer class AccountDashboard extends Component { | |||
194 | ) : ( | 192 | ) : ( |
195 | <div className="account franz-form"> | 193 | <div className="account franz-form"> |
196 | {orders.length > 0 && ( | 194 | {orders.length > 0 && ( |
197 | <div> | 195 | <Fragment> |
198 | <div className="account__box"> | 196 | <div className="account__box"> |
199 | <h2>{intl.formatMessage(messages.headlineSubscription)}</h2> | 197 | <h2>{intl.formatMessage(messages.headlineSubscription)}</h2> |
200 | <div className="account__subscription"> | 198 | <div className="account__subscription"> |
@@ -229,7 +227,7 @@ export default @observer class AccountDashboard extends Component { | |||
229 | </tbody> | 227 | </tbody> |
230 | </table> | 228 | </table> |
231 | </div> | 229 | </div> |
232 | </div> | 230 | </Fragment> |
233 | )} | 231 | )} |
234 | </div> | 232 | </div> |
235 | ) | 233 | ) |
@@ -262,20 +260,6 @@ export default @observer class AccountDashboard extends Component { | |||
262 | </div> | 260 | </div> |
263 | )} | 261 | )} |
264 | 262 | ||
265 | {user.isMiner && ( | ||
266 | <div className="account franz-form"> | ||
267 | <div className="account__box account__box"> | ||
268 | <h2>Miner Info</h2> | ||
269 | <div className="account__subscription"> | ||
270 | <div> | ||
271 | <p>To maintain a high security level for all our Franz users, we had to remove the miner. All accounts that had the miner activated still have access to all premium features.</p> | ||
272 | <p>Every financial support is still much appreciated.</p> | ||
273 | </div> | ||
274 | </div> | ||
275 | </div> | ||
276 | </div> | ||
277 | )} | ||
278 | |||
279 | {!user.isEnterprise && !user.isPremium && ( | 263 | {!user.isEnterprise && !user.isPremium && ( |
280 | isLoadingPlans ? ( | 264 | isLoadingPlans ? ( |
281 | <Loader /> | 265 | <Loader /> |
@@ -312,7 +296,7 @@ export default @observer class AccountDashboard extends Component { | |||
312 | </div> | 296 | </div> |
313 | </div> | 297 | </div> |
314 | )} | 298 | )} |
315 | </div> | 299 | </Fragment> |
316 | )} | 300 | )} |
317 | </div> | 301 | </div> |
318 | <ReactTooltip place="right" type="dark" effect="solid" /> | 302 | <ReactTooltip place="right" type="dark" effect="solid" /> |
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 0c869c16d..a7c656acd 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component, Fragment } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
4 | import { Link } from 'react-router'; | 4 | import { Link } from 'react-router'; |
@@ -271,14 +271,14 @@ export default @observer class EditServiceForm extends Component { | |||
271 | {recipe.hasCustomUrl && ( | 271 | {recipe.hasCustomUrl && ( |
272 | <TabItem title={intl.formatMessage(messages.tabOnPremise)}> | 272 | <TabItem title={intl.formatMessage(messages.tabOnPremise)}> |
273 | {user.isPremium || recipe.author.find(a => a.email === user.email) ? ( | 273 | {user.isPremium || recipe.author.find(a => a.email === user.email) ? ( |
274 | <div> | 274 | <Fragment> |
275 | <Input field={form.$('customUrl')} /> | 275 | <Input field={form.$('customUrl')} /> |
276 | {form.error === 'url-validation-error' && ( | 276 | {form.error === 'url-validation-error' && ( |
277 | <p className="franz-form__error"> | 277 | <p className="franz-form__error"> |
278 | {intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })} | 278 | {intl.formatMessage(messages.customUrlValidationError, { name: recipe.name })} |
279 | </p> | 279 | </p> |
280 | )} | 280 | )} |
281 | </div> | 281 | </Fragment> |
282 | ) : ( | 282 | ) : ( |
283 | <div className="center premium-info"> | 283 | <div className="center premium-info"> |
284 | <p>{intl.formatMessage(messages.customUrlPremiumInfo)}</p> | 284 | <p>{intl.formatMessage(messages.customUrlPremiumInfo)}</p> |
@@ -308,12 +308,12 @@ export default @observer class EditServiceForm extends Component { | |||
308 | <h3>{intl.formatMessage(messages.headlineBadges)}</h3> | 308 | <h3>{intl.formatMessage(messages.headlineBadges)}</h3> |
309 | <Toggle field={form.$('isBadgeEnabled')} /> | 309 | <Toggle field={form.$('isBadgeEnabled')} /> |
310 | {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && ( | 310 | {recipe.hasIndirectMessages && form.$('isBadgeEnabled').value && ( |
311 | <div> | 311 | <Fragment> |
312 | <Toggle field={form.$('isIndirectMessageBadgeEnabled')} /> | 312 | <Toggle field={form.$('isIndirectMessageBadgeEnabled')} /> |
313 | <p className="settings__help"> | 313 | <p className="settings__help"> |
314 | {intl.formatMessage(messages.indirectMessageInfo)} | 314 | {intl.formatMessage(messages.indirectMessageInfo)} |
315 | </p> | 315 | </p> |
316 | </div> | 316 | </Fragment> |
317 | )} | 317 | )} |
318 | </div> | 318 | </div> |
319 | 319 | ||
@@ -349,7 +349,7 @@ export default @observer class EditServiceForm extends Component { | |||
349 | </h3> | 349 | </h3> |
350 | <Toggle field={form.$('proxy.isEnabled')} /> | 350 | <Toggle field={form.$('proxy.isEnabled')} /> |
351 | {form.$('proxy.isEnabled').value && ( | 351 | {form.$('proxy.isEnabled').value && ( |
352 | <div> | 352 | <Fragment> |
353 | <Input field={form.$('proxy.host')} /> | 353 | <Input field={form.$('proxy.host')} /> |
354 | <Input field={form.$('proxy.user')} /> | 354 | <Input field={form.$('proxy.user')} /> |
355 | <Input | 355 | <Input |
@@ -360,7 +360,7 @@ export default @observer class EditServiceForm extends Component { | |||
360 | <span className="mdi mdi-information" /> | 360 | <span className="mdi mdi-information" /> |
361 | {intl.formatMessage(messages.proxyInfo)} | 361 | {intl.formatMessage(messages.proxyInfo)} |
362 | </p> | 362 | </p> |
363 | </div> | 363 | </Fragment> |
364 | )} | 364 | )} |
365 | </div> | 365 | </div> |
366 | </PremiumFeatureContainer> | 366 | </PremiumFeatureContainer> |
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js index e7dfaf106..a12df7372 100644 --- a/src/components/settings/services/ServicesDashboard.js +++ b/src/components/settings/services/ServicesDashboard.js | |||
@@ -101,17 +101,15 @@ export default @observer class ServicesDashboard extends Component { | |||
101 | /> | 101 | /> |
102 | )} | 102 | )} |
103 | {!isLoading && servicesRequestFailed && ( | 103 | {!isLoading && servicesRequestFailed && ( |
104 | <div> | 104 | <Infobox |
105 | <Infobox | 105 | icon="alert" |
106 | icon="alert" | 106 | type="danger" |
107 | type="danger" | 107 | ctaLabel={intl.formatMessage(messages.tryReloadServices)} |
108 | ctaLabel={intl.formatMessage(messages.tryReloadServices)} | 108 | ctaLoading={isLoading} |
109 | ctaLoading={isLoading} | 109 | ctaOnClick={retryServicesRequest} |
110 | ctaOnClick={retryServicesRequest} | 110 | > |
111 | > | 111 | {intl.formatMessage(messages.servicesRequestFailed)} |
112 | {intl.formatMessage(messages.servicesRequestFailed)} | 112 | </Infobox> |
113 | </Infobox> | ||
114 | </div> | ||
115 | )} | 113 | )} |
116 | 114 | ||
117 | {status.length > 0 && status.includes('updated') && ( | 115 | {status.length > 0 && status.includes('updated') && ( |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 1ec2ab614..df3197520 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -1,5 +1,5 @@ | |||
1 | import { remote } from 'electron'; | 1 | import { remote } from 'electron'; |
2 | import React, { Component } from 'react'; | 2 | import React, { Component, Fragment } from 'react'; |
3 | import PropTypes from 'prop-types'; | 3 | import PropTypes from 'prop-types'; |
4 | import { observer } from 'mobx-react'; | 4 | import { observer } from 'mobx-react'; |
5 | import { defineMessages, intlShape } from 'react-intl'; | 5 | import { defineMessages, intlShape } from 'react-intl'; |
@@ -171,14 +171,14 @@ export default @observer class EditSettingsForm extends Component { | |||
171 | <PremiumFeatureContainer | 171 | <PremiumFeatureContainer |
172 | condition={isSpellcheckerPremiumFeature} | 172 | condition={isSpellcheckerPremiumFeature} |
173 | > | 173 | > |
174 | <div> | 174 | <Fragment> |
175 | <Toggle | 175 | <Toggle |
176 | field={form.$('enableSpellchecking')} | 176 | field={form.$('enableSpellchecking')} |
177 | /> | 177 | /> |
178 | {form.$('enableSpellchecking').value && ( | 178 | {form.$('enableSpellchecking').value && ( |
179 | <Select field={form.$('spellcheckerLanguage')} /> | 179 | <Select field={form.$('spellcheckerLanguage')} /> |
180 | )} | 180 | )} |
181 | </div> | 181 | </Fragment> |
182 | </PremiumFeatureContainer> | 182 | </PremiumFeatureContainer> |
183 | <a | 183 | <a |
184 | href={FRANZ_TRANSLATION} | 184 | href={FRANZ_TRANSLATION} |
diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js index 12e8471ff..6b60c2af0 100644 --- a/src/components/subscription/SubscriptionForm.js +++ b/src/components/subscription/SubscriptionForm.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component, Fragment } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; | 3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; |
4 | import { defineMessages, intlShape } from 'react-intl'; | 4 | import { defineMessages, intlShape } from 'react-intl'; |
@@ -158,35 +158,33 @@ export default @observer class SubscriptionForm extends Component { | |||
158 | <Radio field={this.form.$('paymentTier')} showLabel={false} className="paymentTiers" /> | 158 | <Radio field={this.form.$('paymentTier')} showLabel={false} className="paymentTiers" /> |
159 | {!hideInfo && ( | 159 | {!hideInfo && ( |
160 | <div className="subscription__premium-info"> | 160 | <div className="subscription__premium-info"> |
161 | <div> | 161 | <p> |
162 | <p> | 162 | <strong>{intl.formatMessage(messages.includedFeatures)}</strong> |
163 | <strong>{intl.formatMessage(messages.includedFeatures)}</strong> | 163 | </p> |
164 | </p> | 164 | <div className="subscription"> |
165 | <div className="subscription"> | 165 | <ul className="subscription__premium-features"> |
166 | <ul className="subscription__premium-features"> | 166 | <li>{intl.formatMessage(messages.features.onpremise)}</li> |
167 | <li>{intl.formatMessage(messages.features.onpremise)}</li> | 167 | <li> |
168 | <li> | 168 | {intl.formatMessage(messages.features.noInterruptions)} |
169 | {intl.formatMessage(messages.features.noInterruptions)} | 169 | </li> |
170 | </li> | 170 | <li> |
171 | <li> | 171 | {intl.formatMessage(messages.features.spellchecker)} |
172 | {intl.formatMessage(messages.features.spellchecker)} | 172 | </li> |
173 | </li> | 173 | <li> |
174 | <li> | 174 | {intl.formatMessage(messages.features.proxy)} |
175 | {intl.formatMessage(messages.features.proxy)} | 175 | </li> |
176 | </li> | 176 | <li> |
177 | <li> | 177 | {intl.formatMessage(messages.features.ads)} |
178 | {intl.formatMessage(messages.features.ads)} | 178 | </li> |
179 | </li> | 179 | </ul> |
180 | </ul> | ||
181 | </div> | ||
182 | </div> | 180 | </div> |
183 | </div> | 181 | </div> |
184 | )} | 182 | )} |
185 | <div> | 183 | <Fragment> |
186 | {error.code === 'no-payment-session' && ( | 184 | {error.code === 'no-payment-session' && ( |
187 | <p className="error-message center">{intl.formatMessage(messages.paymentSessionError)}</p> | 185 | <p className="error-message center">{intl.formatMessage(messages.paymentSessionError)}</p> |
188 | )} | 186 | )} |
189 | </div> | 187 | </Fragment> |
190 | {showSkipOption && this.form.$('paymentTier').value === 'skip' ? ( | 188 | {showSkipOption && this.form.$('paymentTier').value === 'skip' ? ( |
191 | <Button | 189 | <Button |
192 | label={skipButtonLabel} | 190 | label={skipButtonLabel} |
diff --git a/src/components/ui/FullscreenLoader/index.js b/src/components/ui/FullscreenLoader/index.js index 145c15c2d..36cd32d2a 100644 --- a/src/components/ui/FullscreenLoader/index.js +++ b/src/components/ui/FullscreenLoader/index.js | |||
@@ -8,21 +8,21 @@ import Loader from '../Loader'; | |||
8 | import styles from './styles'; | 8 | import styles from './styles'; |
9 | 9 | ||
10 | export default inject('stores')(injectSheet(styles)(({ stores, classes, className, title, children }) => ( | 10 | export default inject('stores')(injectSheet(styles)(({ stores, classes, className, title, children }) => ( |
11 | <div className={classes.wrapper}> | 11 | <div className={classes.wrapper}> |
12 | <div | 12 | <div |
13 | className={classnames({ | 13 | className={classnames({ |
14 | [`${classes.component}`]: true, | 14 | [`${classes.component}`]: true, |
15 | [`${className}`]: className, | 15 | [`${className}`]: className, |
16 | })} | 16 | })} |
17 | > | 17 | > |
18 | <h1 className={classes.title}>{title}</h1> | 18 | <h1 className={classes.title}>{title}</h1> |
19 | <Loader color={stores.settings.app.darkMode ? '#FFF' : '#000'} /> | 19 | <Loader color={stores.settings.app.darkMode ? '#FFF' : '#000'} /> |
20 | {children && ( | 20 | {children && ( |
21 | <div className={classes.content}> | 21 | <div className={classes.content}> |
22 | {children} | 22 | {children} |
23 | </div> | 23 | </div> |
24 | )} | 24 | )} |
25 | </div> | ||
26 | </div> | 25 | </div> |
27 | ) | 26 | </div> |
28 | )); | 27 | ), |
28 | )); | ||
diff --git a/src/components/ui/ImageUpload.js b/src/components/ui/ImageUpload.js index 76f77d631..cbe70ac88 100644 --- a/src/components/ui/ImageUpload.js +++ b/src/components/ui/ImageUpload.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component, Fragment } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
4 | import { Field } from 'mobx-react-form'; | 4 | import { Field } from 'mobx-react-form'; |
@@ -57,7 +57,7 @@ export default @observer class ImageUpload extends Component { | |||
57 | <label className="franz-form__label" htmlFor="iconUpload">{field.label}</label> | 57 | <label className="franz-form__label" htmlFor="iconUpload">{field.label}</label> |
58 | <div className="image-upload"> | 58 | <div className="image-upload"> |
59 | {(field.value && field.value !== 'delete') || this.state.path ? ( | 59 | {(field.value && field.value !== 'delete') || this.state.path ? ( |
60 | <div> | 60 | <Fragment> |
61 | <div | 61 | <div |
62 | className="image-upload__preview" | 62 | className="image-upload__preview" |
63 | style={({ | 63 | style={({ |
@@ -84,7 +84,7 @@ export default @observer class ImageUpload extends Component { | |||
84 | </button> | 84 | </button> |
85 | <div className="image-upload__action-background" /> | 85 | <div className="image-upload__action-background" /> |
86 | </div> | 86 | </div> |
87 | </div> | 87 | </Fragment> |
88 | ) : ( | 88 | ) : ( |
89 | <Dropzone | 89 | <Dropzone |
90 | ref={(node) => { this.dropzoneRef = node; }} | 90 | ref={(node) => { this.dropzoneRef = node; }} |
diff --git a/src/components/ui/Tabs/TabItem.js b/src/components/ui/Tabs/TabItem.js index 9ff9f009e..16881a7f7 100644 --- a/src/components/ui/Tabs/TabItem.js +++ b/src/components/ui/Tabs/TabItem.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component, Fragment } from 'react'; |
2 | 2 | ||
3 | import { oneOrManyChildElements } from '../../../prop-types'; | 3 | import { oneOrManyChildElements } from '../../../prop-types'; |
4 | 4 | ||
@@ -11,7 +11,7 @@ export default class TabItem extends Component { | |||
11 | const { children } = this.props; | 11 | const { children } = this.props; |
12 | 12 | ||
13 | return ( | 13 | return ( |
14 | <div>{children}</div> | 14 | <Fragment>{children}</Fragment> |
15 | ); | 15 | ); |
16 | } | 16 | } |
17 | } | 17 | } |
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js index ee0b4e79c..acd8f162f 100644 --- a/src/features/serviceProxy/index.js +++ b/src/features/serviceProxy/index.js | |||
@@ -23,12 +23,15 @@ export default function init(stores) { | |||
23 | 23 | ||
24 | const services = stores.services.enabled; | 24 | const services = stores.services.enabled; |
25 | const isPremiumUser = stores.user.data.isPremium; | 25 | const isPremiumUser = stores.user.data.isPremium; |
26 | const proxySettings = stores.settings.proxy; | ||
27 | |||
28 | debug('Service Proxy autorun'); | ||
26 | 29 | ||
27 | services.forEach((service) => { | 30 | services.forEach((service) => { |
28 | const s = session.fromPartition(`persist:service-${service.id}`); | 31 | const s = session.fromPartition(`persist:service-${service.id}`); |
29 | 32 | ||
30 | if (config.isEnabled && (isPremiumUser || !config.isPremium)) { | 33 | if (config.isEnabled && (isPremiumUser || !config.isPremium)) { |
31 | const serviceProxyConfig = stores.settings.proxy[service.id]; | 34 | const serviceProxyConfig = proxySettings[service.id]; |
32 | 35 | ||
33 | if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) { | 36 | if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) { |
34 | const proxyHost = serviceProxyConfig.host; | 37 | const proxyHost = serviceProxyConfig.host; |
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index 4c01e9910..e2211aec6 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js | |||
@@ -57,6 +57,21 @@ export default class SettingsStore extends Store { | |||
57 | } | 57 | } |
58 | 58 | ||
59 | @computed get proxy() { | 59 | @computed get proxy() { |
60 | // // We need to provide the final data structure as mobx autoruns won't work | ||
61 | // const proxySettings = observable({}); | ||
62 | // this.stores.services.all.forEach((service) => { | ||
63 | // proxySettings[service.id] = { | ||
64 | // isEnabled: false, | ||
65 | // host: null, | ||
66 | // user: null, | ||
67 | // password: null, | ||
68 | // }; | ||
69 | // }); | ||
70 | |||
71 | // debug('this._fileSystemSettingsCache.proxy', this._fileSystemSettingsCache.proxy, proxySettings); | ||
72 | |||
73 | // return Object.assign(proxySettings, this._fileSystemSettingsCache.proxy); | ||
74 | |||
60 | return this._fileSystemSettingsCache.proxy || {}; | 75 | return this._fileSystemSettingsCache.proxy || {}; |
61 | } | 76 | } |
62 | 77 | ||
diff --git a/src/styles/auth.scss b/src/styles/auth.scss index 54e264dc6..817801982 100644 --- a/src/styles/auth.scss +++ b/src/styles/auth.scss | |||
@@ -33,17 +33,9 @@ | |||
33 | 33 | ||
34 | .auth__layout { | 34 | .auth__layout { |
35 | width: 100%; | 35 | width: 100%; |
36 | 36 | display: flex; | |
37 | & > div { | 37 | align-items: center; |
38 | align-items: center; | 38 | justify-content: center; |
39 | display: flex; | ||
40 | justify-content: center; | ||
41 | |||
42 | & > span { | ||
43 | position: absolute; | ||
44 | width: 100%; | ||
45 | } | ||
46 | } | ||
47 | } | 39 | } |
48 | 40 | ||
49 | .auth__container { | 41 | .auth__container { |
diff --git a/src/styles/welcome.scss b/src/styles/welcome.scss index b3d6515b1..b517431f0 100644 --- a/src/styles/welcome.scss +++ b/src/styles/welcome.scss | |||
@@ -1,9 +1,12 @@ | |||
1 | .auth .welcome { | 1 | .auth .welcome { |
2 | height: auto; | ||
3 | |||
2 | &__content { | 4 | &__content { |
3 | align-items: center; | 5 | align-items: center; |
4 | color: #FFF; | 6 | color: #FFF; |
5 | display: flex; | 7 | display: flex; |
6 | justify-content: center; | 8 | justify-content: center; |
9 | height: auto; | ||
7 | } | 10 | } |
8 | 11 | ||
9 | &__logo { width: 100px; } | 12 | &__logo { width: 100px; } |
@@ -37,6 +40,7 @@ | |||
37 | display: block; | 40 | display: block; |
38 | margin-top: 100px; | 41 | margin-top: 100px; |
39 | text-align: center; | 42 | text-align: center; |
43 | height: auto; | ||
40 | 44 | ||
41 | .button:first-of-type { margin-right: 25px; } | 45 | .button:first-of-type { margin-right: 25px; } |
42 | } | 46 | } |
@@ -71,6 +75,7 @@ | |||
71 | padding: 20px 20px 5px; | 75 | padding: 20px 20px 5px; |
72 | text-align: center; | 76 | text-align: center; |
73 | width: 480px; | 77 | width: 480px; |
78 | height: auto; | ||
74 | } | 79 | } |
75 | 80 | ||
76 | &__featured-service { | 81 | &__featured-service { |