From be7765b584c1485df41ad89522eeda4e1963d66e Mon Sep 17 00:00:00 2001 From: "rjwats@gmail.com" Date: Fri, 18 May 2018 23:29:14 +0100 Subject: [PATCH] use latest material ui --- interface/package-lock.json | 411 ++++++++++-------- interface/package.json | 20 +- interface/src/App.js | 20 +- interface/src/components/MenuAppBar.js | 36 +- interface/src/components/SectionContent.js | 6 +- .../src/components/SnackbarNotification.js | 8 +- interface/src/containers/APConfiguration.js | 3 +- interface/src/containers/APStatus.js | 22 +- interface/src/containers/NTPConfiguration.js | 3 +- interface/src/containers/NTPStatus.js | 29 +- interface/src/containers/WiFiConfiguration.js | 3 +- interface/src/containers/WiFiStatus.js | 29 +- interface/src/forms/APSettingsForm.js | 10 +- interface/src/forms/NTPSettingsForm.js | 8 +- interface/src/forms/OTASettingsForm.js | 13 +- interface/src/forms/WiFiNetworkSelector.js | 29 +- interface/src/forms/WiFiSettingsForm.js | 32 +- 17 files changed, 381 insertions(+), 301 deletions(-) diff --git a/interface/package-lock.json b/interface/package-lock.json index 593b337..4c9e9a0 100644 --- a/interface/package-lock.json +++ b/interface/package-lock.json @@ -1,25 +1,90 @@ { - "name": "fresh", + "name": "esp8266-react", "version": "0.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { + "@babel/runtime": { + "version": "7.0.0-beta.47", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.47.tgz", + "integrity": "sha512-3IaakAC5B4bHJ0aCUKVw0pt+GruavdgWDFbf7TfKh7ZJ8yQuUp7af7MNwf3e+jH8776cjqYmMO1JNDDAE9WfrA==", + "requires": { + "core-js": "2.5.6", + "regenerator-runtime": "0.11.1" + } + }, + "@material-ui/core": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-1.0.0.tgz", + "integrity": "sha512-BTLp4goHFKGqCVSjSWNSUZp3/fvN36L0B73Z68i4Hs6TRZaApW5M2JyKmWTsCf/hk4PNKTnZMh141qNQFhxzAw==", + "requires": { + "@babel/runtime": "7.0.0-beta.47", + "@types/jss": "9.5.3", + "@types/react-transition-group": "2.0.9", + "brcast": "3.0.1", + "classnames": "2.2.5", + "deepmerge": "2.1.0", + "dom-helpers": "3.3.1", + "hoist-non-react-statics": "2.5.0", + "jss": "9.8.1", + "jss-camel-case": "6.1.0", + "jss-default-unit": "8.0.2", + "jss-global": "3.0.0", + "jss-nested": "6.0.1", + "jss-props-sort": "6.0.0", + "jss-vendor-prefixer": "7.0.0", + "keycode": "2.2.0", + "lodash": "4.17.4", + "normalize-scroll-left": "0.1.2", + "prop-types": "15.6.1", + "react-event-listener": "0.5.3", + "react-jss": "8.4.0", + "react-popper": "0.10.4", + "react-scrollbar-size": "2.1.0", + "react-transition-group": "2.3.1", + "recompose": "0.27.0", + "scroll": "2.0.3", + "warning": "3.0.0" + }, + "dependencies": { + "hoist-non-react-statics": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz", + "integrity": "sha512-6Bl6XsDT1ntE0lHbIhr4Kp2PGcleGZ66qu5Jqk8lc0Xc/IeG6gVLmwUGs/K0Us+L8VWoKgj0uWdPMataOsm31w==" + } + } + }, + "@material-ui/icons": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-1.0.0.tgz", + "integrity": "sha512-z/YCTc8W0+7wrtOhiMKVuQKD/au6hw6u7O183RiMLxhOVj7o0dmC2DdP+ImhclRPIjnPdc3CwctH3kOSilmaVQ==", + "requires": { + "recompose": "0.27.0" + } + }, "@types/jss": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/@types/jss/-/jss-9.3.0.tgz", - "integrity": "sha512-n7MUYCO/Wt4d6Yj0ZewXSSkqBcrdLFgpQ4mUBRXBWDmLfXtgT3tJ26GVPr8HiyRLLze6iQfaBJTlvjRTjgZpRg==" + "version": "9.5.3", + "resolved": "https://registry.npmjs.org/@types/jss/-/jss-9.5.3.tgz", + "integrity": "sha512-RQWhcpOVyIhGryKpnUyZARwsgmp+tB82O7c75lC4Tjbmr3hPiCnM1wc+pJipVEOsikYXW0IHgeiQzmxQXbnAIA==", + "requires": { + "csstype": "2.5.2", + "indefinite-observable": "1.0.1" + } }, "@types/react": { - "version": "16.0.36", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.0.36.tgz", - "integrity": "sha512-q33EVfy4i+fwhM31PL6/c6Job/DyjOiExHuR163bJK3rEMRf2ENkBrN4thQH5cwA+TiiN1vWDZU6D5H1AvQTlA==" + "version": "16.3.14", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.3.14.tgz", + "integrity": "sha512-wNUGm49fPl7eE2fnYdF0v5vSOrUMdKMQD/4NwtQRnb6mnPwtkhabmuFz37eq90+hhyfz0pWd38jkZHOcaZ6LGw==", + "requires": { + "csstype": "2.5.2" + } }, "@types/react-transition-group": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.0.6.tgz", - "integrity": "sha512-mVhRv+d0MIoLWl6hEFA7Nnd/obW2RQpZViTAKhM37mltuTDWCdoj8xAZv94ntB8wgAc6DDiDCXxFXPgClGnsfQ==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.0.9.tgz", + "integrity": "sha512-Id2MtQcmOgLymqqLqg1VjzNpN7O5vGoF47h3s7jxhzqWdMCtk2GwxFUqcKbGrRmHzzQGyRatfG8yahonIys74Q==", "requires": { - "@types/react": "16.0.36" + "@types/react": "16.3.14" } }, "abab": { @@ -1489,7 +1554,7 @@ "move-concurrently": "1.0.1", "promise-inflight": "1.0.1", "rimraf": "2.6.2", - "ssri": "5.2.4", + "ssri": "5.3.0", "unique-filename": "1.1.0", "y18n": "4.0.0" }, @@ -1600,11 +1665,6 @@ "lazy-cache": "1.0.4" } }, - "chain-function": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/chain-function/-/chain-function-1.0.0.tgz", - "integrity": "sha1-DUqzfn4Y6tC9xHuSB2QRjOWHM9w=" - }, "chalk": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", @@ -1852,14 +1912,14 @@ } }, "compression-webpack-plugin": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-1.1.8.tgz", - "integrity": "sha512-AzOQLq2fkVw/ra6MJgk+y/gvkMPjnhRyhnTdd2EoM9vyKx81JiESe2jVJISVHae1o8+fN/5Xl8kAFRhUmwoYtg==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-1.1.11.tgz", + "integrity": "sha512-ZVWKrTQhtOP7rDx3M/koXTnRm/iwcYbuCdV+i4lZfAIe32Mov7vUVM0+8Vpz4q0xH+TBUZxq+rM8nhtkDH50YQ==", "requires": { - "async": "2.6.0", "cacache": "10.0.4", "find-cache-dir": "1.0.0", - "serialize-javascript": "1.4.0", + "neo-async": "2.5.1", + "serialize-javascript": "1.5.0", "webpack-sources": "1.1.0" } }, @@ -1968,9 +2028,9 @@ } }, "core-js": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", - "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" + "version": "2.5.6", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz", + "integrity": "sha512-lQUVfQi0aLix2xpyjrrJEvfuYCqPc/HwmTKsC/VNf8q0zsjX7SQZtp4+oRONN5Tsur9GDETPjj+Ub2iDiGZfSQ==" }, "core-util-is": { "version": "1.0.2", @@ -2314,6 +2374,11 @@ "cssom": "0.3.2" } }, + "csstype": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.5.2.tgz", + "integrity": "sha512-epoHrKPywwUhFTXadQNA5PPx4GChtkM03SkBeFZTaFtJcn6QfXpBkX2IAc4J9Oe18nha5NrTOo2OMOge+qH1mw==" + }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -2382,9 +2447,9 @@ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" }, "deepmerge": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.0.1.tgz", - "integrity": "sha512-VIPwiMJqJ13ZQfaCsIFnp5Me9tnjURiaIFxfz7EH0Ci0dTSQpZtSLrqOicXqEd/z2r+z+Klk9GzmnRsgpgbOsQ==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.0.tgz", + "integrity": "sha512-Q89Z26KAfA3lpPGhbF6XMfYAm3jIV3avViy6KOJ2JLzFbeWHOvPQUu5aSJIWXap3gDZC2y1eF5HXEPI2wGqgvw==" }, "default-require-extensions": { "version": "1.0.0", @@ -2616,9 +2681,9 @@ } }, "duplexify": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz", - "integrity": "sha512-g8ID9OroF9hKt2POf8YLayy+9594PzmM3scI00/uBXocX3TWNgoB67hjzkFe9ITAbQOne/lLdBxHXvYUM4ZgGA==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz", + "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", "requires": { "end-of-stream": "1.4.1", "inherits": "2.0.3", @@ -3129,7 +3194,7 @@ "doctrine": "2.1.0", "has": "1.0.1", "jsx-ast-utils": "2.0.1", - "prop-types": "15.6.0" + "prop-types": "15.6.1" }, "dependencies": { "jsx-ast-utils": { @@ -3414,7 +3479,14 @@ "object-assign": "4.1.1", "promise": "7.3.1", "setimmediate": "1.0.5", - "ua-parser-js": "0.7.17" + "ua-parser-js": "0.7.18" + }, + "dependencies": { + "core-js": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" + } } }, "figures": { @@ -3528,9 +3600,9 @@ "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=" }, "flush-write-stream": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.2.tgz", - "integrity": "sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz", + "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==", "requires": { "inherits": "2.0.3", "readable-stream": "2.3.3" @@ -4989,6 +5061,14 @@ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, + "indefinite-observable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/indefinite-observable/-/indefinite-observable-1.0.1.tgz", + "integrity": "sha1-CZFUI8yNb36xy3iCrRNGM8mm7cM=", + "requires": { + "symbol-observable": "1.0.4" + } + }, "indent-string": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", @@ -5896,13 +5976,20 @@ } }, "jss": { - "version": "9.8.0", - "resolved": "https://registry.npmjs.org/jss/-/jss-9.8.0.tgz", - "integrity": "sha512-1E9pn6k1Qd1BxKz845supoedukHuwMeBiqybCQV9l60v8JE7owkZSvVJfjw3wm50SjG1C/ABPtQ8PrGfhfrzLw==", + "version": "9.8.1", + "resolved": "https://registry.npmjs.org/jss/-/jss-9.8.1.tgz", + "integrity": "sha512-a9dXInEPTRmdSmzw3LNhbAwdQVZgCRmFU7dFzrpLTMAcdolHXNamhxQ6J+PNIqUtWa9yRbZIzWX6aUlI55LZ/A==", "requires": { "is-in-browser": "1.1.3", - "symbol-observable": "1.1.0", + "symbol-observable": "1.2.0", "warning": "3.0.0" + }, + "dependencies": { + "symbol-observable": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" + } } }, "jss-camel-case": { @@ -5927,9 +6014,9 @@ "integrity": "sha512-WxNHrF/18CdoAGw2H0FqOEvJdREXVXLazn7PQYU7V6/BWkCV0GkmWsppNiExdw8dP4TU1ma1dT9zBNJ95feLmg==" }, "jss-expand": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/jss-expand/-/jss-expand-5.1.0.tgz", - "integrity": "sha512-WTxmNipgj0V8kr8gc8Gc6Et7uQZH60H7FFNG9zZHjR6TPJoj7TDK+/EBxwRHtCRQD4B8RTwoa7MyEKD4ReKfXw==" + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/jss-expand/-/jss-expand-5.3.0.tgz", + "integrity": "sha512-NiM4TbDVE0ykXSAw6dfFmB1LIqXP/jdd0ZMnlvlGgEMkMt+weJIl8Ynq1DsuBY9WwkNyzWktdqcEW2VN0RAtQg==" }, "jss-extend": { "version": "6.2.0", @@ -5953,14 +6040,14 @@ } }, "jss-preset-default": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/jss-preset-default/-/jss-preset-default-4.3.0.tgz", - "integrity": "sha512-3VqMmR07OkiGyVPHfke/sjR33kSyRVjIE/3+bGgJ9Pp1jMIAPIDDY3h3wfEwa97DFV25SncTrNjjIgBFVCb4BA==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/jss-preset-default/-/jss-preset-default-4.5.0.tgz", + "integrity": "sha512-qZbpRVtHT7hBPpZEBPFfafZKWmq3tA/An5RNqywDsZQGrlinIF/mGD9lmj6jGqu8GrED2SMHZ3pPKLmjCZoiaQ==", "requires": { "jss-camel-case": "6.1.0", "jss-compose": "5.0.0", "jss-default-unit": "8.0.2", - "jss-expand": "5.1.0", + "jss-expand": "5.3.0", "jss-extend": "6.2.0", "jss-global": "3.0.0", "jss-nested": "6.0.1", @@ -5996,9 +6083,9 @@ "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=" }, "keycode": { - "version": "2.1.9", - "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.1.9.tgz", - "integrity": "sha1-lkojxU5IiUBbSGGlyfBIDUUUHfo=" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz", + "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=" }, "killable": { "version": "1.0.0", @@ -6274,48 +6361,6 @@ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=" }, - "material-ui": { - "version": "1.0.0-beta.32", - "resolved": "https://registry.npmjs.org/material-ui/-/material-ui-1.0.0-beta.32.tgz", - "integrity": "sha512-f8srx1qmAmD5lAuKPxVg5lWUkyIJAwsK31yU3jk2v5gMFVIruwf3qYIuZMb5tklVu1qt7qoR7SrH1Zo7oiFxjA==", - "requires": { - "@types/jss": "9.3.0", - "@types/react-transition-group": "2.0.6", - "babel-runtime": "6.26.0", - "brcast": "3.0.1", - "classnames": "2.2.5", - "deepmerge": "2.0.1", - "dom-helpers": "3.3.1", - "hoist-non-react-statics": "2.3.1", - "jss": "9.8.0", - "jss-camel-case": "6.1.0", - "jss-default-unit": "8.0.2", - "jss-global": "3.0.0", - "jss-nested": "6.0.1", - "jss-props-sort": "6.0.0", - "jss-vendor-prefixer": "7.0.0", - "keycode": "2.1.9", - "lodash": "4.17.4", - "normalize-scroll-left": "0.1.2", - "prop-types": "15.6.0", - "react-event-listener": "0.5.3", - "react-jss": "8.3.0", - "react-popper": "0.7.5", - "react-scrollbar-size": "2.1.0", - "react-transition-group": "2.2.1", - "recompose": "0.26.0", - "scroll": "2.0.1", - "warning": "3.0.0" - } - }, - "material-ui-icons": { - "version": "1.0.0-beta.17", - "resolved": "https://registry.npmjs.org/material-ui-icons/-/material-ui-icons-1.0.0-beta.17.tgz", - "integrity": "sha1-XxmvVKLZnu7zR6VUFKaFPhyFDcM=", - "requires": { - "recompose": "0.26.0" - } - }, "math-expression-evaluator": { "version": "1.2.17", "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", @@ -6491,13 +6536,13 @@ "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", "requires": { "concat-stream": "1.6.0", - "duplexify": "3.5.3", + "duplexify": "3.6.0", "end-of-stream": "1.4.1", - "flush-write-stream": "1.0.2", + "flush-write-stream": "1.0.3", "from2": "2.3.0", "parallel-transform": "1.1.0", "pump": "2.0.1", - "pumpify": "1.4.0", + "pumpify": "1.5.1", "stream-each": "1.2.2", "through2": "2.0.3" } @@ -6511,9 +6556,9 @@ } }, "moment": { - "version": "2.20.1", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz", - "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==" + "version": "2.22.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz", + "integrity": "sha512-shJkRTSebXvsVqk56I+lkb2latjBs8I+pc2TzWc545y2iFnSjm7Wg0QMh+ZWcdSLQyGEau5jI8ocnmkyTgr9YQ==" }, "move-concurrently": { "version": "1.0.1", @@ -6576,6 +6621,11 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=" }, + "neo-async": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz", + "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==" + }, "no-case": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", @@ -7086,9 +7136,9 @@ "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==" }, "popper.js": { - "version": "1.12.9", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.12.9.tgz", - "integrity": "sha1-DfvC3/lsRRuzMu3Pz6r1ZtMx1bM=" + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.3.tgz", + "integrity": "sha1-FDj5jQRqz3tNeM1QK/QYrGTU8JU=" }, "portfinder": { "version": "1.0.13", @@ -8334,9 +8384,9 @@ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=" }, "prop-types": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", - "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz", + "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==", "requires": { "fbjs": "0.8.16", "loose-envify": "1.3.1", @@ -8384,11 +8434,11 @@ } }, "pumpify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz", - "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", + "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "requires": { - "duplexify": "3.5.3", + "duplexify": "3.6.0", "inherits": "2.0.3", "pump": "2.0.1" } @@ -8537,20 +8587,20 @@ } }, "react": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-16.2.0.tgz", - "integrity": "sha512-ZmIomM7EE1DvPEnSFAHZn9Vs9zJl5A9H7el0EGTE6ZbW9FKe/14IYAlPbC8iH25YarEQxZL+E8VW7Mi7kfQrDQ==", + "version": "16.3.2", + "resolved": "https://registry.npmjs.org/react/-/react-16.3.2.tgz", + "integrity": "sha512-o5GPdkhciQ3cEph6qgvYB7LTOHw/GB0qRI6ZFNugj49qJCFfgHwVNjZ5u+b7nif4vOeMIOuYj3CeYe2IBD74lg==", "requires": { "fbjs": "0.8.16", "loose-envify": "1.3.1", "object-assign": "4.1.1", - "prop-types": "15.6.0" + "prop-types": "15.6.1" } }, "react-app-rewired": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/react-app-rewired/-/react-app-rewired-1.4.1.tgz", - "integrity": "sha512-XuZNpsmGSNQq59YWwRM07HXDu91M5G3zVhrn0f9qKqicZPUbbU1qF5h/g5ALZk7H4c9SIJOMYQVhnZA/zrBXtw==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/react-app-rewired/-/react-app-rewired-1.5.2.tgz", + "integrity": "sha512-/cbaFBaSYvCcj2BnolCh2Cx0J8QwFECg5RssXFPckhdzC9iEb5BKJGqt71ZTOF35gv6ebo4CPKJR4nZajzW4Sw==", "dev": true, "requires": { "cross-spawn": "5.1.0", @@ -8558,21 +8608,21 @@ } }, "react-autosuggest": { - "version": "9.3.3", - "resolved": "https://registry.npmjs.org/react-autosuggest/-/react-autosuggest-9.3.3.tgz", - "integrity": "sha512-g0W1x2+PfWWcEsz2r7sCPv1Dpwq6eH0uysFLwI4iVKfPxZkHvRL2tjRvnoFVfrP6/61lfqII4pOKh1V1S4VPrQ==", + "version": "9.3.4", + "resolved": "https://registry.npmjs.org/react-autosuggest/-/react-autosuggest-9.3.4.tgz", + "integrity": "sha512-vcAsZw+6zkjimni4aun1tvuzVCGilmFihAgF8yCeVm/p82ssGgtQb0pnNCcEBcPzPTLJjQc2O8dLJidoOyjlcA==", "requires": { - "prop-types": "15.6.0", - "react-autowhatever": "10.1.0", + "prop-types": "15.6.1", + "react-autowhatever": "10.1.1", "shallow-equal": "1.0.0" } }, "react-autowhatever": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/react-autowhatever/-/react-autowhatever-10.1.0.tgz", - "integrity": "sha512-LMZggoRgcmldAMyABY3Dz/DRiTQViMsQllXtOsDrZeBRwPIfn0RAOySaQMUNyECrHaCB5pm66jgQvkyNSh/BjA==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/react-autowhatever/-/react-autowhatever-10.1.1.tgz", + "integrity": "sha512-fcwjDnk1zKMYoJyKmEukw8eWJlwT6UVKZagY+Lfhj79Nx0D8Brj38ZLNtQOFrRLAZrIA+QX4UUjW0MUISqT9OA==", "requires": { - "prop-types": "15.6.0", + "prop-types": "15.6.1", "react-themeable": "1.1.0", "section-iterator": "2.0.0" } @@ -8603,14 +8653,14 @@ } }, "react-dom": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.2.0.tgz", - "integrity": "sha512-zpGAdwHVn9K0091d+hr+R0qrjoJ84cIBFL2uU60KvWBPfZ7LPSrfqviTxGHWN0sjPZb2hxWzMexwrvJdKePvjg==", + "version": "16.3.2", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.3.2.tgz", + "integrity": "sha512-MMPko3zYncNrz/7gG17wJWUREZDvskZHXOwbttzl0F0L3wDmToyuETuo/r8Y5yvDejwYcRyWI1lvVBjLJWFwKA==", "requires": { "fbjs": "0.8.16", "loose-envify": "1.3.1", "object-assign": "4.1.1", - "prop-types": "15.6.0" + "prop-types": "15.6.1" } }, "react-error-overlay": { @@ -8625,7 +8675,7 @@ "requires": { "babel-runtime": "6.26.0", "fbjs": "0.8.16", - "prop-types": "15.6.0", + "prop-types": "15.6.1", "warning": "3.0.0" } }, @@ -8635,39 +8685,47 @@ "integrity": "sha512-0alrJV+A4YIjk2+PcBtdKUjVKgrEKZ+igO104XbGqFEaLPo6wf4wwo4OnK5IfDBWEu7EJirQg+gwGhITgKzN7w==" }, "react-jss": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/react-jss/-/react-jss-8.3.0.tgz", - "integrity": "sha512-oNPk5wnQ2z2v+4syriGlsjy/X1/qS5UwFm0XxaPSsOEXc3JJHcjdQ3LmAXOgVBg2qD1v26FIs/g/pHQW3KCfaA==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/react-jss/-/react-jss-8.4.0.tgz", + "integrity": "sha512-yIi4udcTIIh5u4KJ47wsL3UZYMuSrp5xR1YBvPeRNshpCdRoJxt5BWmCu1RA3LIa+//dnRsAtAQmMAYeg1W9oQ==", "requires": { "hoist-non-react-statics": "2.3.1", - "jss": "9.8.0", - "jss-preset-default": "4.3.0", - "prop-types": "15.6.0", + "jss": "9.8.1", + "jss-preset-default": "4.5.0", + "prop-types": "15.6.1", "theming": "1.3.0" } }, + "react-lifecycles-compat": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", + "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" + }, "react-material-ui-form-validator": { - "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/react-material-ui-form-validator/-/react-material-ui-form-validator-2.0.0-beta.4.tgz", - "integrity": "sha512-OK7WUEqtyBxALZZEjFGS/AaIUHZ6sFyoqZc4kPUC4254WputxDsH/05hw2Ph3rjBBnbfYjVuP0famSO5M0zyeQ==", + "version": "2.0.0-beta.10", + "resolved": "https://registry.npmjs.org/react-material-ui-form-validator/-/react-material-ui-form-validator-2.0.0-beta.10.tgz", + "integrity": "sha512-heK9NPpoRqyX5XiOHx3z0ZFQlj8xgbLM6F9H6i/6RmWrNlcJQ5YjqMeP9i+diA5EtEnSv9h1TIp6tE8WR9TS4A==", "requires": { - "react-form-validator-core": "0.4.1" + "react-form-validator-core": "0.4.4" }, "dependencies": { "react-form-validator-core": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/react-form-validator-core/-/react-form-validator-core-0.4.1.tgz", - "integrity": "sha512-tc0hFFroMfUFh8+c9/Y6PKRLA+TyIJIqRK6USgjH26yojgeUDBf82Izo/YqFl8199UXr4SjMCcNBJVcKabdtNw==" + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/react-form-validator-core/-/react-form-validator-core-0.4.4.tgz", + "integrity": "sha512-Oy7pLJMMVWSKp4PNH06iGfEEpGHHGUn57/gA/b5hbMnKhR7B3ZycZuZ/i9GJxLatvePMReyoxcZZP8TqeGcbPg==", + "requires": { + "react-lifecycles-compat": "3.0.4" + } } } }, "react-popper": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-0.7.5.tgz", - "integrity": "sha512-ya9dhhGCf74JTOB2uyksEHhIGw7w9tNZRUJF73lEq2h4H5JT6MBa4PdT4G+sx6fZwq+xKZAL/sVNAIuojPn7Dg==", + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-0.10.4.tgz", + "integrity": "sha1-rypBXqIike3VBGeNev2opu4ylao=", "requires": { - "popper.js": "1.12.9", - "prop-types": "15.6.0" + "popper.js": "1.14.3", + "prop-types": "15.6.1" } }, "react-router": { @@ -8680,7 +8738,7 @@ "invariant": "2.2.2", "loose-envify": "1.3.1", "path-to-regexp": "1.7.0", - "prop-types": "15.6.0", + "prop-types": "15.6.1", "warning": "3.0.0" } }, @@ -8692,7 +8750,7 @@ "history": "4.7.2", "invariant": "2.2.2", "loose-envify": "1.3.1", - "prop-types": "15.6.0", + "prop-types": "15.6.1", "react-router": "4.2.0", "warning": "3.0.0" } @@ -8757,7 +8815,7 @@ "integrity": "sha512-9dDUJvk7S48r0TRKjlKJ9e/LkLLYgc9LdQR6W21I8ZqtSrEsedPOoMji4nU3DHy7fx2l8YMScJS/N7qiloYzXQ==", "requires": { "babel-runtime": "6.26.0", - "prop-types": "15.6.0", + "prop-types": "15.6.1", "react-event-listener": "0.5.3", "stifle": "1.0.4" } @@ -8778,16 +8836,13 @@ } }, "react-transition-group": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.2.1.tgz", - "integrity": "sha512-q54UBM22bs/CekG8r3+vi9TugSqh0t7qcEVycaRc9M0p0aCEu+h6rp/RFiW7fHfgd1IKpd9oILFTl5QK+FpiPA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.3.1.tgz", + "integrity": "sha512-hu4/LAOFSKjWt1+1hgnOv3ldxmt6lvZGTWz4KUkFrqzXrNDIVSu6txIcPszw7PNduR8en9YTN55JLRyd/L1ZiQ==", "requires": { - "chain-function": "1.0.0", - "classnames": "2.2.5", "dom-helpers": "3.3.1", "loose-envify": "1.3.1", - "prop-types": "15.6.0", - "warning": "3.0.0" + "prop-types": "15.6.1" } }, "read-all-stream": { @@ -8863,14 +8918,16 @@ } }, "recompose": { - "version": "0.26.0", - "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.26.0.tgz", - "integrity": "sha512-KwOu6ztO0mN5vy3+zDcc45lgnaUoaQse/a5yLVqtzTK13czSWnFGmXbQVmnoMgDkI5POd1EwIKSbjU1V7xdZog==", + "version": "0.27.0", + "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.27.0.tgz", + "integrity": "sha512-hivr1EopLhzjchhv2Y7VcLA2H5NGztwV/qfYqmIAhTkNowNQ9PyXdfq9Q8QCa0TMrPM1NtStlUyi5I/p8XfUNQ==", "requires": { + "babel-runtime": "6.26.0", "change-emitter": "0.1.6", "fbjs": "0.8.16", "hoist-non-react-statics": "2.3.1", - "symbol-observable": "1.1.0" + "react-lifecycles-compat": "3.0.4", + "symbol-observable": "1.0.4" } }, "recursive-readdir": { @@ -9273,9 +9330,9 @@ } }, "scroll": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/scroll/-/scroll-2.0.1.tgz", - "integrity": "sha1-tMfSfovPOuiligQvJyaK4/VfnM0=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/scroll/-/scroll-2.0.3.tgz", + "integrity": "sha512-3ncZzf8gUW739h3LeS68nSssO60O+GGjT3SxzgofQmT8PIoyHzebql9HHPJopZX8iT6TKOdwaWFMqL6LzUN3DQ==", "requires": { "rafl": "1.2.2" } @@ -9339,9 +9396,9 @@ } }, "serialize-javascript": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz", - "integrity": "sha1-fJWFFNtqwkQ6irwGLcn3iGp/YAU=" + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz", + "integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==" }, "serve-index": { "version": "1.9.1", @@ -9603,9 +9660,9 @@ } }, "ssri": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.2.4.tgz", - "integrity": "sha512-UnEAgMZa15973iH7cUi0AHjJn1ACDIkaMyZILoqwN6yzt+4P81I8tBc5Hl+qwi5auMplZtPQsHrPBR5vJLcQtQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", + "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", "requires": { "safe-buffer": "5.1.1" } @@ -9807,9 +9864,9 @@ } }, "symbol-observable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz", - "integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw==" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz", + "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0=" }, "symbol-tree": { "version": "3.2.2", @@ -9879,7 +9936,7 @@ "brcast": "3.0.1", "is-function": "1.0.1", "is-plain-object": "2.0.4", - "prop-types": "15.6.0" + "prop-types": "15.6.1" } }, "throat": { @@ -10017,9 +10074,9 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, "ua-parser-js": { - "version": "0.7.17", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz", - "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g==" + "version": "0.7.18", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.18.tgz", + "integrity": "sha512-LtzwHlVHwFGTptfNSgezHp7WUlwiqb0gA9AALRbKaERfxwJoiX0A73QbTToxteIAuIaFshhgIZfqK8s7clqgnA==" }, "uglify-js": { "version": "3.3.6", diff --git a/interface/package.json b/interface/package.json index fb209bf..c6424f1 100644 --- a/interface/package.json +++ b/interface/package.json @@ -3,16 +3,16 @@ "version": "0.1.0", "private": true, "dependencies": { - "compression-webpack-plugin": "^1.1.8", - "material-ui": "^1.0.0-beta.32", - "material-ui-icons": "^1.0.0-beta.17", - "moment": "^2.20.1", - "prop-types": "^15.6.0", - "react": "^16.2.0", - "react-autosuggest": "^9.3.3", - "react-dom": "^16.2.0", + "@material-ui/core": "^1.0.0", + "@material-ui/icons": "^1.0.0", + "compression-webpack-plugin": "^1.1.11", + "moment": "^2.22.1", + "prop-types": "^15.6.1", + "react": "^16.3.2", + "react-autosuggest": "^9.3.4", + "react-dom": "^16.3.2", "react-form-validator-core": "^0.3.0", - "react-material-ui-form-validator": "^2.0.0-beta.4", + "react-material-ui-form-validator": "^2.0.0-beta.10", "react-router": "^4.2.0", "react-router-dom": "^4.2.2", "react-scripts": "1.0.17" @@ -24,6 +24,6 @@ "eject": "react-scripts eject" }, "devDependencies": { - "react-app-rewired": "^1.4.1" + "react-app-rewired": "^1.5.2" } } diff --git a/interface/src/App.js b/interface/src/App.js index e1b5c8c..9747eab 100644 --- a/interface/src/App.js +++ b/interface/src/App.js @@ -1,25 +1,25 @@ import React, { Component } from 'react'; import AppRouting from './AppRouting'; - import SnackbarNotification from './components/SnackbarNotification'; +import CssBaseline from '@material-ui/core/CssBaseline'; +import blueGrey from '@material-ui/core/colors/blueGrey'; +import indigo from '@material-ui/core/colors/indigo'; +import orange from '@material-ui/core/colors/orange'; +import red from '@material-ui/core/colors/red'; +import green from '@material-ui/core/colors/green'; +import blue from '@material-ui/core/colors/blue'; + import JssProvider from 'react-jss/lib/JssProvider'; import { create } from 'jss'; -import Reboot from 'material-ui/Reboot'; -import blueGrey from 'material-ui/colors/blueGrey'; -import indigo from 'material-ui/colors/indigo'; -import orange from 'material-ui/colors/orange'; -import red from 'material-ui/colors/red'; -import green from 'material-ui/colors/green'; - import { MuiThemeProvider, createMuiTheme, createGenerateClassName, jssPreset, -} from 'material-ui/styles'; +} from '@material-ui/core/styles'; // Our theme const theme = createMuiTheme({ @@ -45,7 +45,7 @@ class App extends Component { - + diff --git a/interface/src/components/MenuAppBar.js b/interface/src/components/MenuAppBar.js index a1b7a0f..82ad102 100644 --- a/interface/src/components/MenuAppBar.js +++ b/interface/src/components/MenuAppBar.js @@ -1,23 +1,29 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { withStyles } from 'material-ui/styles'; -import Drawer from 'material-ui/Drawer'; -import AppBar from 'material-ui/AppBar'; -import Toolbar from 'material-ui/Toolbar'; -import Typography from 'material-ui/Typography'; -import IconButton from 'material-ui/IconButton'; -import Hidden from 'material-ui/Hidden'; -import Divider from 'material-ui/Divider'; import { Link } from 'react-router-dom'; -import List, { ListItem, ListItemIcon, ListItemText } from 'material-ui/List'; -import MenuIcon from 'material-ui-icons/Menu'; -import WifiIcon from 'material-ui-icons/Wifi'; -import SystemUpdateIcon from 'material-ui-icons/SystemUpdate'; -import AccessTimeIcon from 'material-ui-icons/AccessTime'; -import SettingsInputAntennaIcon from 'material-ui-icons/SettingsInputAntenna'; +import { withStyles } from '@material-ui/core/styles'; +import Drawer from '@material-ui/core/Drawer'; +import AppBar from '@material-ui/core/AppBar'; +import Toolbar from '@material-ui/core/Toolbar'; +import Typography from '@material-ui/core/Typography'; +import IconButton from '@material-ui/core/IconButton'; +import Hidden from '@material-ui/core/Hidden'; +import Divider from '@material-ui/core/Divider'; -const drawerWidth = 250; +import List from '@material-ui/core/List'; +import ListItem from '@material-ui/core/ListItem'; +import ListItemIcon from '@material-ui/core/ListItemIcon'; +import ListItemText from '@material-ui/core/ListItemText'; + +import MenuIcon from '@material-ui/icons/Menu'; +import WifiIcon from '@material-ui/icons/Wifi'; +import SystemUpdateIcon from '@material-ui/icons/SystemUpdate'; +import ShowChartIcon from '@material-ui/icons/ShowChart'; +import AccessTimeIcon from '@material-ui/icons/AccessTime'; +import SettingsInputAntennaIcon from '@material-ui/icons/SettingsInputAntenna'; + +const drawerWidth = 290; const styles = theme => ({ root: { diff --git a/interface/src/components/SectionContent.js b/interface/src/components/SectionContent.js index 845eed3..2bce92a 100644 --- a/interface/src/components/SectionContent.js +++ b/interface/src/components/SectionContent.js @@ -1,9 +1,9 @@ import React from 'react'; import PropTypes from 'prop-types'; -import Paper from 'material-ui/Paper'; -import { withStyles } from 'material-ui/styles'; -import Typography from 'material-ui/Typography'; +import Paper from '@material-ui/core/Paper'; +import { withStyles } from '@material-ui/core/styles'; +import Typography from '@material-ui/core/Typography'; const styles = theme => ({ content: { diff --git a/interface/src/components/SnackbarNotification.js b/interface/src/components/SnackbarNotification.js index 044e0a1..562b1c9 100644 --- a/interface/src/components/SnackbarNotification.js +++ b/interface/src/components/SnackbarNotification.js @@ -1,9 +1,9 @@ import React, {Fragment} from 'react'; import PropTypes from 'prop-types'; -import { withStyles } from 'material-ui/styles'; -import Snackbar from 'material-ui/Snackbar'; -import IconButton from 'material-ui/IconButton'; -import CloseIcon from 'material-ui-icons/Close'; +import { withStyles } from '@material-ui/core/styles'; +import Snackbar from '@material-ui/core/Snackbar'; +import IconButton from '@material-ui/core/IconButton'; +import CloseIcon from '@material-ui/icons/Close'; const styles = theme => ({ close: { diff --git a/interface/src/containers/APConfiguration.js b/interface/src/containers/APConfiguration.js index 051d64e..19044db 100644 --- a/interface/src/containers/APConfiguration.js +++ b/interface/src/containers/APConfiguration.js @@ -1,6 +1,7 @@ import React, { Component } from 'react'; -import Tabs, { Tab } from 'material-ui/Tabs'; +import Tabs from '@material-ui/core/Tabs'; +import Tab from '@material-ui/core/Tab'; import MenuAppBar from '../components/MenuAppBar'; import APSettings from './APSettings'; diff --git a/interface/src/containers/APStatus.js b/interface/src/containers/APStatus.js index 7bd9c80..712abc6 100644 --- a/interface/src/containers/APStatus.js +++ b/interface/src/containers/APStatus.js @@ -1,15 +1,17 @@ import React, { Component, Fragment } from 'react'; -import { withStyles } from 'material-ui/styles'; -import Button from 'material-ui/Button'; -import { LinearProgress } from 'material-ui/Progress'; -import Typography from 'material-ui/Typography'; -import List, { ListItem, ListItemText } from 'material-ui/List'; -import Avatar from 'material-ui/Avatar'; -import Divider from 'material-ui/Divider'; -import SettingsInputAntennaIcon from 'material-ui-icons/SettingsInputAntenna'; -import DeviceHubIcon from 'material-ui-icons/DeviceHub'; -import ComputerIcon from 'material-ui-icons/Computer'; +import { withStyles } from '@material-ui/core/styles'; +import Button from '@material-ui/core/Button'; +import LinearProgress from '@material-ui/core/LinearProgress'; +import Typography from '@material-ui/core/Typography'; +import List from '@material-ui/core/List'; +import ListItem from '@material-ui/core/ListItem'; +import ListItemText from '@material-ui/core/ListItemText'; +import Avatar from '@material-ui/core/Avatar'; +import Divider from '@material-ui/core/Divider'; +import SettingsInputAntennaIcon from '@material-ui/icons/SettingsInputAntenna'; +import DeviceHubIcon from '@material-ui/icons/DeviceHub'; +import ComputerIcon from '@material-ui/icons/Computer'; import {restComponent} from '../components/RestComponent'; import SectionContent from '../components/SectionContent' diff --git a/interface/src/containers/NTPConfiguration.js b/interface/src/containers/NTPConfiguration.js index c75dc70..04393bf 100644 --- a/interface/src/containers/NTPConfiguration.js +++ b/interface/src/containers/NTPConfiguration.js @@ -3,7 +3,8 @@ import MenuAppBar from '../components/MenuAppBar'; import NTPSettings from './NTPSettings'; import NTPStatus from './NTPStatus'; -import Tabs, { Tab } from 'material-ui/Tabs'; +import Tabs from '@material-ui/core/Tabs'; +import Tab from '@material-ui/core/Tab'; class NTPConfiguration extends Component { diff --git a/interface/src/containers/NTPStatus.js b/interface/src/containers/NTPStatus.js index 1c3023d..5b166af 100644 --- a/interface/src/containers/NTPStatus.js +++ b/interface/src/containers/NTPStatus.js @@ -1,24 +1,25 @@ import React, { Component, Fragment } from 'react'; -import { withStyles } from 'material-ui/styles'; -import Button from 'material-ui/Button'; -import { LinearProgress } from 'material-ui/Progress'; -import Typography from 'material-ui/Typography'; -import List, { ListItem, ListItemText } from 'material-ui/List'; -import Avatar from 'material-ui/Avatar'; -import Divider from 'material-ui/Divider'; -import SwapVerticalCircleIcon from 'material-ui-icons/SwapVerticalCircle'; -import AccessTimeIcon from 'material-ui-icons/AccessTime'; -import DNSIcon from 'material-ui-icons/Dns'; -import TimerIcon from 'material-ui-icons/Timer'; -import UpdateIcon from 'material-ui-icons/Update'; -import AvTimerIcon from 'material-ui-icons/AvTimer'; +import { withStyles } from '@material-ui/core/styles'; +import Button from '@material-ui/core/Button'; +import LinearProgress from '@material-ui/core/LinearProgress'; +import Typography from '@material-ui/core/Typography'; +import List from '@material-ui/core/List'; +import ListItem from '@material-ui/core/ListItem'; +import ListItemText from '@material-ui/core/ListItemText'; +import Avatar from '@material-ui/core/Avatar'; +import Divider from '@material-ui/core/Divider'; +import SwapVerticalCircleIcon from '@material-ui/icons/SwapVerticalCircle'; +import AccessTimeIcon from '@material-ui/icons/AccessTime'; +import DNSIcon from '@material-ui/icons/Dns'; +import TimerIcon from '@material-ui/icons/Timer'; +import UpdateIcon from '@material-ui/icons/Update'; +import AvTimerIcon from '@material-ui/icons/AvTimer'; import { isSynchronized, ntpStatusHighlight, ntpStatus } from '../constants/NTPStatus'; import * as Highlight from '../constants/Highlight'; import { unixTimeToTimeAndDate } from '../constants/TimeFormat'; import { NTP_STATUS_ENDPOINT } from '../constants/Endpoints'; - import { restComponent } from '../components/RestComponent'; import SectionContent from '../components/SectionContent'; diff --git a/interface/src/containers/WiFiConfiguration.js b/interface/src/containers/WiFiConfiguration.js index 14494e6..ab20bed 100644 --- a/interface/src/containers/WiFiConfiguration.js +++ b/interface/src/containers/WiFiConfiguration.js @@ -1,6 +1,7 @@ import React, { Component } from 'react'; -import Tabs, { Tab } from 'material-ui/Tabs'; +import Tabs from '@material-ui/core/Tabs'; +import Tab from '@material-ui/core/Tab'; import MenuAppBar from '../components/MenuAppBar'; import WiFiNetworkScanner from './WiFiNetworkScanner'; diff --git a/interface/src/containers/WiFiStatus.js b/interface/src/containers/WiFiStatus.js index 268b2f5..79f4f3e 100644 --- a/interface/src/containers/WiFiStatus.js +++ b/interface/src/containers/WiFiStatus.js @@ -1,26 +1,27 @@ import React, { Component, Fragment } from 'react'; -import { withStyles } from 'material-ui/styles'; -import Button from 'material-ui/Button'; -import { LinearProgress } from 'material-ui/Progress'; -import Typography from 'material-ui/Typography'; +import { withStyles } from '@material-ui/core/styles'; +import Button from '@material-ui/core/Button'; +import LinearProgress from '@material-ui/core/LinearProgress'; +import Typography from '@material-ui/core/Typography'; + +import List from '@material-ui/core/List'; +import ListItem from '@material-ui/core/ListItem'; +import ListItemText from '@material-ui/core/ListItemText'; + +import Avatar from '@material-ui/core/Avatar'; +import Divider from '@material-ui/core/Divider'; +import WifiIcon from '@material-ui/icons/Wifi'; +import DNSIcon from '@material-ui/icons/Dns'; +import SettingsInputComponentIcon from '@material-ui/icons/SettingsInputComponent'; +import SettingsInputAntennaIcon from '@material-ui/icons/SettingsInputAntenna'; import SectionContent from '../components/SectionContent'; - import { WIFI_STATUS_ENDPOINT } from '../constants/Endpoints'; import { isConnected, connectionStatus, connectionStatusHighlight } from '../constants/WiFiConnectionStatus'; import * as Highlight from '../constants/Highlight'; - import { restComponent } from '../components/RestComponent'; -import List, { ListItem, ListItemText } from 'material-ui/List'; -import Avatar from 'material-ui/Avatar'; -import Divider from 'material-ui/Divider'; -import WifiIcon from 'material-ui-icons/Wifi'; -import DNSIcon from 'material-ui-icons/Dns'; -import SettingsInputComponentIcon from 'material-ui-icons/SettingsInputComponent'; -import SettingsInputAntennaIcon from 'material-ui-icons/SettingsInputAntenna'; - const styles = theme => ({ ["wifiStatus_" + Highlight.IDLE]: { backgroundColor: theme.palette.highlight_idle diff --git a/interface/src/forms/APSettingsForm.js b/interface/src/forms/APSettingsForm.js index 122508c..1004a03 100644 --- a/interface/src/forms/APSettingsForm.js +++ b/interface/src/forms/APSettingsForm.js @@ -1,11 +1,11 @@ import React, { Fragment } from 'react'; import PropTypes from 'prop-types'; -import { withStyles } from 'material-ui/styles'; -import Button from 'material-ui/Button'; -import { LinearProgress } from 'material-ui/Progress'; -import Typography from 'material-ui/Typography'; -import { MenuItem } from 'material-ui/Menu'; +import { withStyles } from '@material-ui/core/styles'; +import Button from '@material-ui/core/Button'; +import LinearProgress from '@material-ui/core/LinearProgress'; +import Typography from '@material-ui/core/Typography'; +import MenuItem from '@material-ui/core/MenuItem'; import { TextValidator, ValidatorForm, SelectValidator } from 'react-material-ui-form-validator'; diff --git a/interface/src/forms/NTPSettingsForm.js b/interface/src/forms/NTPSettingsForm.js index d543403..f5c4d51 100644 --- a/interface/src/forms/NTPSettingsForm.js +++ b/interface/src/forms/NTPSettingsForm.js @@ -1,11 +1,11 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { withStyles } from 'material-ui/styles'; -import Button from 'material-ui/Button'; -import { LinearProgress } from 'material-ui/Progress'; +import { withStyles } from '@material-ui/core/styles'; +import Button from '@material-ui/core/Button'; +import LinearProgress from '@material-ui/core/LinearProgress'; import { TextValidator, ValidatorForm } from 'react-material-ui-form-validator'; -import Typography from 'material-ui/Typography'; +import Typography from '@material-ui/core/Typography'; import isIP from '../validators/isIP'; import isHostname from '../validators/isHostname'; diff --git a/interface/src/forms/OTASettingsForm.js b/interface/src/forms/OTASettingsForm.js index 750e10d..8d80385 100644 --- a/interface/src/forms/OTASettingsForm.js +++ b/interface/src/forms/OTASettingsForm.js @@ -1,13 +1,13 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { withStyles } from 'material-ui/styles'; -import Button from 'material-ui/Button'; -import Switch from 'material-ui/Switch'; -import { LinearProgress } from 'material-ui/Progress'; +import { withStyles } from '@material-ui/core/styles'; +import Button from '@material-ui/core/Button'; +import Switch from '@material-ui/core/Switch'; +import LinearProgress from '@material-ui/core/LinearProgress'; import { TextValidator, ValidatorForm } from 'react-material-ui-form-validator'; -import Typography from 'material-ui/Typography'; -import { FormControlLabel } from 'material-ui/Form'; +import Typography from '@material-ui/core/Typography'; +import FormControlLabel from '@material-ui/core/FormControlLabel'; import isIP from '../validators/isIP'; import isHostname from '../validators/isHostname'; @@ -65,6 +65,7 @@ class OTASettingsForm extends React.Component { checked={otaSettings.enabled} onChange={handleCheckboxChange('enabled')} value="enabled" + color="primary" /> } label="Enable OTA Updates?" diff --git a/interface/src/forms/WiFiNetworkSelector.js b/interface/src/forms/WiFiNetworkSelector.js index ce838b3..c592e18 100644 --- a/interface/src/forms/WiFiNetworkSelector.js +++ b/interface/src/forms/WiFiNetworkSelector.js @@ -1,21 +1,26 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import { withStyles } from 'material-ui/styles'; -import Button from 'material-ui/Button'; -import { LinearProgress } from 'material-ui/Progress'; -import Typography from 'material-ui/Typography'; +import { withStyles } from '@material-ui/core/styles'; +import Button from '@material-ui/core/Button'; +import LinearProgress from '@material-ui/core/LinearProgress'; +import Typography from '@material-ui/core/Typography'; + +import List from '@material-ui/core/List'; +import ListItem from '@material-ui/core/ListItem'; +import ListItemIcon from '@material-ui/core/ListItemIcon'; +import ListItemText from '@material-ui/core/ListItemText'; +import ListItemAvatar from '@material-ui/core/ListItemAvatar'; + +import Avatar from '@material-ui/core/Avatar'; +import Badge from '@material-ui/core/Badge'; + +import WifiIcon from '@material-ui/icons/Wifi'; +import LockIcon from '@material-ui/icons/Lock'; +import LockOpenIcon from '@material-ui/icons/LockOpen'; import { isNetworkOpen, networkSecurityMode } from '../constants/WiFiSecurityModes'; -import List, { ListItem, ListItemText, ListItemIcon, ListItemAvatar } from 'material-ui/List'; -import Avatar from 'material-ui/Avatar'; -import Badge from 'material-ui/Badge'; - -import WifiIcon from 'material-ui-icons/Wifi'; -import LockIcon from 'material-ui-icons/Lock'; -import LockOpenIcon from 'material-ui-icons/LockOpen'; - const styles = theme => ({ scanningProgress: { margin: theme.spacing.unit * 4, diff --git a/interface/src/forms/WiFiSettingsForm.js b/interface/src/forms/WiFiSettingsForm.js index c09357a..663911a 100644 --- a/interface/src/forms/WiFiSettingsForm.js +++ b/interface/src/forms/WiFiSettingsForm.js @@ -1,23 +1,27 @@ import React, {Fragment} from 'react'; import PropTypes from 'prop-types'; -import { withStyles } from 'material-ui/styles'; -import Button from 'material-ui/Button'; -import { LinearProgress } from 'material-ui/Progress'; -import Checkbox from 'material-ui/Checkbox'; -import { FormControlLabel } from 'material-ui/Form'; +import { withStyles } from '@material-ui/core/styles'; +import Button from '@material-ui/core/Button'; +import LinearProgress from '@material-ui/core/LinearProgress'; +import Checkbox from '@material-ui/core/Checkbox'; +import FormControlLabel from '@material-ui/core/FormControlLabel'; +import Typography from '@material-ui/core/Typography'; +import List from '@material-ui/core/List'; +import ListItem from '@material-ui/core/ListItem'; +import ListItemText from '@material-ui/core/ListItemText'; +import ListItemAvatar from '@material-ui/core/ListItemAvatar'; +import ListItemSecondaryAction from '@material-ui/core/ListItemSecondaryAction'; + +import Avatar from '@material-ui/core/Avatar'; +import IconButton from '@material-ui/core/IconButton'; +import LockIcon from '@material-ui/icons/Lock'; +import LockOpenIcon from '@material-ui/icons/LockOpen'; +import DeleteIcon from '@material-ui/icons/Delete'; + import { TextValidator, ValidatorForm } from 'react-material-ui-form-validator'; -import Typography from 'material-ui/Typography'; -import List, { ListItem, ListItemText, ListItemSecondaryAction, ListItemAvatar } from 'material-ui/List'; - import { isNetworkOpen, networkSecurityMode } from '../constants/WiFiSecurityModes'; -import Avatar from 'material-ui/Avatar'; -import IconButton from 'material-ui/IconButton'; -import LockIcon from 'material-ui-icons/Lock'; -import LockOpenIcon from 'material-ui-icons/LockOpen'; -import DeleteIcon from 'material-ui-icons/Delete'; - import isIP from '../validators/isIP'; import isHostname from '../validators/isHostname'; import optional from '../validators/optional';