diff --git a/ui/package-lock.json b/ui/package-lock.json index 01b77e5..aecde23 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -2303,141 +2303,332 @@ "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.1.tgz", "integrity": "sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw==" }, - "@material-ui/core": { - "version": "5.0.0-beta.3", - "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-5.0.0-beta.3.tgz", - "integrity": "sha512-yIa6aQcjO+R+iRbCveYhis4uEsl0YQqOxKcJDsb1q9NxdOPSrS26UvxSVfSxO6nYhs8HknL5rlplwSyyPZkwRw==", + "@mui/core": { + "version": "5.0.0-alpha.48", + "resolved": "https://registry.npmjs.org/@mui/core/-/core-5.0.0-alpha.48.tgz", + "integrity": "sha512-H/QQwKsr2EqPAnP35DGDpWihk5BOFYGhO52rIHb3XKOfoUjDCrCHBy2kvr3dLWJDmJXr/QzYj3AX10n5XzlaMg==", "requires": { - "@babel/runtime": "^7.4.4", - "@material-ui/system": "5.0.0-beta.3", - "@material-ui/types": "6.0.2", - "@material-ui/unstyled": "5.0.0-alpha.42", - "@material-ui/utils": "5.0.0-beta.1", - "@popperjs/core": "^2.4.4", - "@types/react-transition-group": "^4.2.0", - "clsx": "^1.0.4", - "csstype": "^3.0.2", - "hoist-non-react-statics": "^3.3.2", + "@babel/runtime": "^7.15.4", + "@emotion/is-prop-valid": "^1.1.0", + "@mui/utils": "^5.0.1", + "clsx": "^1.1.1", "prop-types": "^15.7.2", - "react-is": "^17.0.0", - "react-transition-group": "^4.4.0" + "react-is": "^17.0.2" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } } }, - "@material-ui/icons": { - "version": "5.0.0-beta.1", - "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-5.0.0-beta.1.tgz", - "integrity": "sha512-HMxEXok46a5xAr+26LpJUX+bX7WfaPi5Yi3Bbh1Agskw0nD5SHUbZizNxxuB8QbHhRNOZF9y9viEDNbSf+r+yg==", + "@mui/icons-material": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.0.1.tgz", + "integrity": "sha512-AZehR/Uvi9VodsNPk9ae1lENKrf1evqx9suiP6VIqu7NxjZOlw/m/yA2gRAMmLEmIGr7EChfi/wcXuq6BpM9vw==", "requires": { - "@babel/runtime": "^7.4.4" + "@babel/runtime": "^7.15.4" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } } }, - "@material-ui/lab": { - "version": "5.0.0-alpha.42", - "resolved": "https://registry.npmjs.org/@material-ui/lab/-/lab-5.0.0-alpha.42.tgz", - "integrity": "sha512-DzYUHmAus1RblQXdDcOxPpvFC20QCgBFtdGT9o+9CXxj8FA7/XiVMmkkvNDi8lfma1y4HPdUvmNSqEiVaZtBtw==", + "@mui/lab": { + "version": "5.0.0-alpha.48", + "resolved": "https://registry.npmjs.org/@mui/lab/-/lab-5.0.0-alpha.48.tgz", + "integrity": "sha512-ukYcx1ReSy4taQBMIPTkOaSz+CwgxYih3XwTCGTv84atRWMFhfqJO3Ofe8rQ5/innMDbBlSPkjaiMSag8d3QeQ==", "requires": { - "@babel/runtime": "^7.4.4", + "@babel/runtime": "^7.15.4", "@date-io/date-fns": "^2.10.6", "@date-io/dayjs": "^2.10.6", "@date-io/luxon": "^2.10.6", "@date-io/moment": "^2.10.6", - "@material-ui/system": "5.0.0-beta.3", - "@material-ui/unstyled": "5.0.0-alpha.42", - "@material-ui/utils": "5.0.0-beta.1", - "clsx": "^1.0.4", + "@mui/core": "5.0.0-alpha.48", + "@mui/system": "^5.0.1", + "@mui/utils": "^5.0.1", + "clsx": "^1.1.1", "prop-types": "^15.7.2", - "react-is": "^17.0.0", - "react-transition-group": "^4.4.1", + "react-is": "^17.0.2", + "react-transition-group": "^4.4.2", "rifm": "^0.12.0" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } } }, - "@material-ui/private-theming": { - "version": "5.0.0-beta.2", - "resolved": "https://registry.npmjs.org/@material-ui/private-theming/-/private-theming-5.0.0-beta.2.tgz", - "integrity": "sha512-qLlUeRdiLCT57sgVWprtPPENU4ZSVlUK6C/aERzlgu+oN7VdKzkz9r07K7bcUau/wHXusP+u1UKNp6TpPr2XVg==", + "@mui/material": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.0.1.tgz", + "integrity": "sha512-+/JJzRcORUf5MiZnzuqsPFRgxm3/0CUi1wE97ZQ2y7r+EnDVsjJLcjAH9Q9GY3k9zkPIpYb9Hig/+HT6AGZRnQ==", "requires": { - "@babel/runtime": "^7.4.4", - "@material-ui/utils": "5.0.0-beta.1", - "prop-types": "^15.7.2" - } - }, - "@material-ui/styled-engine": { - "version": "5.0.0-beta.1", - "resolved": "https://registry.npmjs.org/@material-ui/styled-engine/-/styled-engine-5.0.0-beta.1.tgz", - "integrity": "sha512-BSVsgVQ1cv+Eaf2FFhVahaEw7UeBaLBn0yAM8uWbLxi+LhuNN+HVv/Echv70MDMLW4fna3L2S6u1NXUoGd+7Hw==", - "requires": { - "@babel/runtime": "^7.4.4", - "@emotion/cache": "^11.0.0", - "prop-types": "^15.7.2" - } - }, - "@material-ui/styles": { - "version": "5.0.0-beta.3", - "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-5.0.0-beta.3.tgz", - "integrity": "sha512-m0SBTmZiDN9uNUthSMZCx6my2ejdOJNjPMvk27o7leiweubZgLVxLTgs/WaRsJJxmUEo6lnOZT0WzjAyp1ZESg==", - "requires": { - "@babel/runtime": "^7.4.4", - "@emotion/hash": "^0.8.0", - "@material-ui/private-theming": "5.0.0-beta.2", - "@material-ui/types": "6.0.2", - "@material-ui/utils": "5.0.0-beta.1", - "clsx": "^1.0.4", - "csstype": "^3.0.2", + "@babel/runtime": "^7.15.4", + "@mui/core": "5.0.0-alpha.48", + "@mui/system": "^5.0.1", + "@mui/types": "^7.0.0", + "@mui/utils": "^5.0.1", + "@popperjs/core": "^2.4.4", + "@types/react-transition-group": "^4.4.3", + "clsx": "^1.1.1", + "csstype": "^3.0.9", "hoist-non-react-statics": "^3.3.2", - "jss": "^10.0.3", - "jss-plugin-camel-case": "^10.0.3", - "jss-plugin-default-unit": "^10.0.3", - "jss-plugin-global": "^10.0.3", - "jss-plugin-nested": "^10.0.3", - "jss-plugin-props-sort": "^10.0.3", - "jss-plugin-rule-value-function": "^10.0.3", - "jss-plugin-vendor-prefixer": "^10.0.3", - "prop-types": "^15.7.2" - } - }, - "@material-ui/system": { - "version": "5.0.0-beta.3", - "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-5.0.0-beta.3.tgz", - "integrity": "sha512-gch4yt38XUe+WO2+4uomIMRTCK6bfmnTjCrGkYgkb4FuH0Ubk07ZHCSXdY+bmmCaHzwceCfEm9wa7BkM+tNbZQ==", - "requires": { - "@babel/runtime": "^7.4.4", - "@material-ui/private-theming": "5.0.0-beta.2", - "@material-ui/styled-engine": "5.0.0-beta.1", - "@material-ui/types": "6.0.2", - "@material-ui/utils": "5.0.0-beta.1", - "clsx": "^1.0.4", - "csstype": "^3.0.2", - "prop-types": "^15.7.2" - } - }, - "@material-ui/types": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-6.0.2.tgz", - "integrity": "sha512-/XUca4wUb9pWimLLdM1PE8KS8rTbDEGohSGkGtk3WST7lm23m+8RYv9uOmrvOg/VSsl4bMiOv4t2/LCb+RLbTg==" - }, - "@material-ui/unstyled": { - "version": "5.0.0-alpha.42", - "resolved": "https://registry.npmjs.org/@material-ui/unstyled/-/unstyled-5.0.0-alpha.42.tgz", - "integrity": "sha512-vwzb4kQbkpntBGE4EQcbnk6eitjPIDM3176WY/Ea7l4o/b95NTVsPlDvIntyRr+lcxkGtJCD7X5rUCZug6aoHw==", - "requires": { - "@babel/runtime": "^7.4.4", - "@emotion/is-prop-valid": "^1.1.0", - "@material-ui/utils": "5.0.0-beta.1", - "clsx": "^1.0.4", "prop-types": "^15.7.2", - "react-is": "^17.0.0" + "react-is": "^17.0.2", + "react-transition-group": "^4.4.2" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "@types/react-transition-group": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.3.tgz", + "integrity": "sha512-fUx5muOWSYP8Bw2BUQ9M9RK9+W1XBK/7FLJ8PTQpnpTEkn0ccyMffyEQvan4C3h53gHdx7KE5Qrxi/LnUGQtdg==", + "requires": { + "@types/react": "*" + } + }, + "csstype": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz", + "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==" + } } }, - "@material-ui/utils": { - "version": "5.0.0-beta.1", - "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-5.0.0-beta.1.tgz", - "integrity": "sha512-63E5b1iW79T6dga7Ao1turX4s5P8jipCMVw1tDjKHMiauILb8C6TmUPde+NoM+fQ6OTppC9JxdOXzuotxNRWNA==", + "@mui/private-theming": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.0.1.tgz", + "integrity": "sha512-R8Cf2+32cG1OXFAqTighA5Mx9R5BQ57cN1ZVaNgfgdbI87Yig2fVMdFSPrw3txcjKlnwsvFJF8AdwQMqq1tJ3Q==", "requires": { - "@babel/runtime": "^7.4.4", - "@types/prop-types": "^15.7.3", + "@babel/runtime": "^7.15.4", + "@mui/utils": "^5.0.1", + "prop-types": "^15.7.2" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + }, + "@mui/styled-engine": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.0.1.tgz", + "integrity": "sha512-j40nCbaKr1HAZYqpX61XvZYsadYskjo3u6+pRFFaewSViAkkD1rjjbubpnh15nqVfYmijtHMZJ9/l1x1hamvfQ==", + "requires": { + "@babel/runtime": "^7.15.4", + "@emotion/cache": "^11.4.0", + "prop-types": "^15.7.2" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } + } + }, + "@mui/styles": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@mui/styles/-/styles-5.0.1.tgz", + "integrity": "sha512-hCtR2ZVOkoIhpTan02I4UEShnZxe59WwhKRJqauMs/addXByhAHHCNheTdiV++Irl/fyyFObmzPM0CUD3q6FIA==", + "requires": { + "@babel/runtime": "^7.15.4", + "@emotion/hash": "^0.8.0", + "@mui/private-theming": "^5.0.1", + "@mui/types": "^7.0.0", + "@mui/utils": "^5.0.1", + "clsx": "^1.1.1", + "csstype": "^3.0.9", + "hoist-non-react-statics": "^3.3.2", + "jss": "^10.8.0", + "jss-plugin-camel-case": "^10.8.0", + "jss-plugin-default-unit": "^10.8.0", + "jss-plugin-global": "^10.8.0", + "jss-plugin-nested": "^10.8.0", + "jss-plugin-props-sort": "^10.8.0", + "jss-plugin-rule-value-function": "^10.8.0", + "jss-plugin-vendor-prefixer": "^10.8.0", + "prop-types": "^15.7.2" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "csstype": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz", + "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==" + }, + "jss": { + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/jss/-/jss-10.8.0.tgz", + "integrity": "sha512-6fAMLJrVQ8epM5ghghxWqCwRR0ZamP2cKbOAtzPudcCMSNdAqtvmzQvljUZYR8OXJIeb/IpZeOXA1sDXms4R1w==", + "requires": { + "@babel/runtime": "^7.3.1", + "csstype": "^3.0.2", + "is-in-browser": "^1.1.3", + "tiny-warning": "^1.0.2" + } + }, + "jss-plugin-camel-case": { + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.8.0.tgz", + "integrity": "sha512-yxlXrXwcCdGw+H4BC187dEu/RFyW8joMcWfj8Rk9UPgWTKu2Xh7Sib4iW3xXjHe/t5phOHF1rBsHleHykWix7g==", + "requires": { + "@babel/runtime": "^7.3.1", + "hyphenate-style-name": "^1.0.3", + "jss": "10.8.0" + } + }, + "jss-plugin-default-unit": { + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.8.0.tgz", + "integrity": "sha512-9XJV546cY9zV9OvIE/v/dOaxSi4062VfYQQfwbplRExcsU2a79Yn+qDz/4ciw6P4LV1Naq90U+OffAGRHfNq/Q==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.8.0" + } + }, + "jss-plugin-global": { + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.8.0.tgz", + "integrity": "sha512-H/8h/bHd4e7P0MpZ9zaUG8NQSB2ie9rWo/vcCP6bHVerbKLGzj+dsY22IY3+/FNRS8zDmUyqdZx3rD8k4nmH4w==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.8.0" + } + }, + "jss-plugin-nested": { + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.8.0.tgz", + "integrity": "sha512-MhmINZkSxyFILcFBuDoZmP1+wj9fik/b9SsjoaggkGjdvMQCES21mj4K5ZnRGVm448gIXyi9j/eZjtDzhaHUYQ==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.8.0", + "tiny-warning": "^1.0.2" + } + }, + "jss-plugin-props-sort": { + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.8.0.tgz", + "integrity": "sha512-VY+Wt5WX5GMsXDmd+Ts8+O16fpiCM81svbox++U3LDbJSM/g9FoMx3HPhwUiDfmgHL9jWdqEuvSl/JAk+mh6mQ==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.8.0" + } + }, + "jss-plugin-rule-value-function": { + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.8.0.tgz", + "integrity": "sha512-R8N8Ma6Oye1F9HroiUuHhVjpPsVq97uAh+rMI6XwKLqirIu2KFb5x33hPj+vNBMxSHc9jakhf5wG0BbQ7fSDOg==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.8.0", + "tiny-warning": "^1.0.2" + } + }, + "jss-plugin-vendor-prefixer": { + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.8.0.tgz", + "integrity": "sha512-G1zD0J8dFwKZQ+GaZaay7A/Tg7lhDw0iEkJ/iFFA5UPuvZFpMprCMQttXcTBhLlhhWnyZ8YPn4yqp+amrhQekw==", + "requires": { + "@babel/runtime": "^7.3.1", + "css-vendor": "^2.0.8", + "jss": "10.8.0" + } + } + } + }, + "@mui/system": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.0.1.tgz", + "integrity": "sha512-pGNKUpjK5hm4apZAUZu7LugemBPoZnNvNNCI2miI/BXxqyx41mL9+iT9p6Qe9uDOh8Z6GUbLIzvOjSTP+ECRZw==", + "requires": { + "@babel/runtime": "^7.15.4", + "@mui/private-theming": "^5.0.1", + "@mui/styled-engine": "^5.0.1", + "@mui/types": "^7.0.0", + "@mui/utils": "^5.0.1", + "clsx": "^1.1.1", + "csstype": "^3.0.9", + "prop-types": "^15.7.2" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "csstype": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz", + "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==" + } + } + }, + "@mui/types": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.0.0.tgz", + "integrity": "sha512-M/tkF2pZ4uoPhZ8pnNhlVnOFtz6F3dnYKIsnj8MuXKT6d26IE2u0UjA8B0275ggN74dR9rlHG5xJt5jgDx/Ung==" + }, + "@mui/utils": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.0.1.tgz", + "integrity": "sha512-GWO104N+o9KG5fKiTEYnAg7kONKEg3vLN+VROAU0f3it6lFGLCVPcQYex/1gJ4QAy96u6Ez8/Hmmhi1+3cX0tQ==", + "requires": { + "@babel/runtime": "^7.15.4", + "@types/prop-types": "^15.7.4", "@types/react-is": "^16.7.1 || ^17.0.0", "prop-types": "^15.7.2", - "react-is": "^17.0.0" + "react-is": "^17.0.2" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } } }, "@nodelib/fs.scandir": { @@ -3249,14 +3440,6 @@ "@types/react": "*" } }, - "@types/react-transition-group": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.2.tgz", - "integrity": "sha512-KibDWL6nshuOJ0fu8ll7QnV/LVTo3PzQ9aCPnRUYPfX7eZohHwLIdNHj7pftanREzHNP4/nJa8oeM73uSiavMQ==", - "requires": { - "@types/react": "*" - } - }, "@types/resolve": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz", @@ -11661,84 +11844,6 @@ "universalify": "^2.0.0" } }, - "jss": { - "version": "10.7.1", - "resolved": "https://registry.npmjs.org/jss/-/jss-10.7.1.tgz", - "integrity": "sha512-5QN8JSVZR6cxpZNeGfzIjqPEP+ZJwJJfZbXmeABNdxiExyO+eJJDy6WDtqTf8SDKnbL5kZllEpAP71E/Lt7PXg==", - "requires": { - "@babel/runtime": "^7.3.1", - "csstype": "^3.0.2", - "is-in-browser": "^1.1.3", - "tiny-warning": "^1.0.2" - } - }, - "jss-plugin-camel-case": { - "version": "10.7.1", - "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.7.1.tgz", - "integrity": "sha512-+ioIyWvmAfgDCWXsQcW1NMnLBvRinOVFkSYJUgewQ6TynOcSj5F1bSU23B7z0p1iqK0PPHIU62xY1iNJD33WGA==", - "requires": { - "@babel/runtime": "^7.3.1", - "hyphenate-style-name": "^1.0.3", - "jss": "10.7.1" - } - }, - "jss-plugin-default-unit": { - "version": "10.7.1", - "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.7.1.tgz", - "integrity": "sha512-tW+dfYVNARBQb/ONzBwd8uyImigyzMiAEDai+AbH5rcHg5h3TtqhAkxx06iuZiT/dZUiFdSKlbe3q9jZGAPIwA==", - "requires": { - "@babel/runtime": "^7.3.1", - "jss": "10.7.1" - } - }, - "jss-plugin-global": { - "version": "10.7.1", - "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.7.1.tgz", - "integrity": "sha512-FbxCnu44IkK/bw8X3CwZKmcAnJqjAb9LujlAc/aP0bMSdVa3/MugKQRyeQSu00uGL44feJJDoeXXiHOakBr/Zw==", - "requires": { - "@babel/runtime": "^7.3.1", - "jss": "10.7.1" - } - }, - "jss-plugin-nested": { - "version": "10.7.1", - "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.7.1.tgz", - "integrity": "sha512-RNbICk7FlYKaJyv9tkMl7s6FFfeLA3ubNIFKvPqaWtADK0KUaPsPXVYBkAu4x1ItgsWx67xvReMrkcKA0jSXfA==", - "requires": { - "@babel/runtime": "^7.3.1", - "jss": "10.7.1", - "tiny-warning": "^1.0.2" - } - }, - "jss-plugin-props-sort": { - "version": "10.7.1", - "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.7.1.tgz", - "integrity": "sha512-eyd5FhA+J0QrpqXxO7YNF/HMSXXl4pB0EmUdY4vSJI4QG22F59vQ6AHtP6fSwhmBdQ98Qd9gjfO+RMxcE39P1A==", - "requires": { - "@babel/runtime": "^7.3.1", - "jss": "10.7.1" - } - }, - "jss-plugin-rule-value-function": { - "version": "10.7.1", - "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.7.1.tgz", - "integrity": "sha512-fGAAImlbaHD3fXAHI3ooX6aRESOl5iBt3LjpVjxs9II5u9tzam7pqFUmgTcrip9VpRqYHn8J3gA7kCtm8xKwHg==", - "requires": { - "@babel/runtime": "^7.3.1", - "jss": "10.7.1", - "tiny-warning": "^1.0.2" - } - }, - "jss-plugin-vendor-prefixer": { - "version": "10.7.1", - "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.7.1.tgz", - "integrity": "sha512-1UHFmBn7hZNsHXTkLLOL8abRl8vi+D1EVzWD4WmLFj55vawHZfnH1oEz6TUf5Y61XHv0smdHabdXds6BgOXe3A==", - "requires": { - "@babel/runtime": "^7.3.1", - "css-vendor": "^2.0.8", - "jss": "10.7.1" - } - }, "jsx-ast-utils": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz", diff --git a/ui/package.json b/ui/package.json index f9ce87f..e38f97b 100644 --- a/ui/package.json +++ b/ui/package.json @@ -6,10 +6,10 @@ "@emotion/react": "^11.1.5", "@emotion/styled": "^11.1.5", "@fontsource/roboto": "^4.2.1", - "@material-ui/core": "^5.0.0-beta.3", - "@material-ui/icons": "^5.0.0-beta.1", - "@material-ui/lab": "^5.0.0-alpha.42", - "@material-ui/styles": "^5.0.0-beta.3", + "@mui/material": "^5.0.1", + "@mui/icons-material": "^5.0.1", + "@mui/lab": "^5.0.0-alpha.48", + "@mui/styles": "^5.0.1", "@react-hook/resize-observer": "^1.2.0", "@types/jest": "^26.0.20", "@types/node": "^16.3.1", @@ -41,11 +41,11 @@ "no-restricted-imports": [ "error", { - "name": "@material-ui/core", + "name": "@mui/material", "message": "Please use the 'import Button from \"material-ui/core/Button\";' style instead; see https://material-ui.com/guides/minimizing-bundle-size/#option-1" }, { - "name": "@material-ui/icons", + "name": "@mui/icons-material", "message": "Please use the 'import MenuIcon from \"material-ui/icons/Menu\";' style instead; see https://material-ui.com/guides/minimizing-bundle-size/#option-1" } ] diff --git a/ui/src/App.tsx b/ui/src/App.tsx index 49daaf7..1650e76 100644 --- a/ui/src/App.tsx +++ b/ui/src/App.tsx @@ -2,7 +2,7 @@ // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt. // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception -import Container from "@material-ui/core/Container"; +import Container from "@mui/material/Container"; import React, { useEffect, useReducer, useState } from "react"; import * as api from "./api"; import MoonfireMenu from "./AppMenu"; @@ -10,17 +10,17 @@ import Login from "./Login"; import { useSnackbars } from "./snackbars"; import { Camera, Session } from "./types"; import ListActivity from "./List"; -import AppBar from "@material-ui/core/AppBar"; +import AppBar from "@mui/material/AppBar"; import LiveActivity, { MultiviewChooser } from "./Live"; -import Drawer from "@material-ui/core/Drawer"; -import List from "@material-ui/core/List"; -import ListItem from "@material-ui/core/ListItem"; -import ListItemText from "@material-ui/core/ListItemText"; -import ListIcon from "@material-ui/icons/List"; -import Videocam from "@material-ui/icons/Videocam"; -import ListItemIcon from "@material-ui/core/ListItemIcon"; -import FilterList from "@material-ui/icons/FilterList"; -import IconButton from "@material-ui/core/IconButton"; +import Drawer from "@mui/material/Drawer"; +import List from "@mui/material/List"; +import ListItem from "@mui/material/ListItem"; +import ListItemText from "@mui/material/ListItemText"; +import ListIcon from "@mui/icons-material/List"; +import Videocam from "@mui/icons-material/Videocam"; +import ListItemIcon from "@mui/material/ListItemIcon"; +import FilterList from "@mui/icons-material/FilterList"; +import IconButton from "@mui/material/IconButton"; export type LoginState = | "unknown" diff --git a/ui/src/AppMenu.tsx b/ui/src/AppMenu.tsx index b8c6500..4a82e46 100644 --- a/ui/src/AppMenu.tsx +++ b/ui/src/AppMenu.tsx @@ -2,16 +2,16 @@ // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt. // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception -import Button from "@material-ui/core/Button"; -import IconButton from "@material-ui/core/IconButton"; -import Menu from "@material-ui/core/Menu"; -import MenuItem from "@material-ui/core/MenuItem"; -import { Theme } from "@material-ui/core/styles"; -import { createStyles, makeStyles } from "@material-ui/styles"; -import Toolbar from "@material-ui/core/Toolbar"; -import Typography from "@material-ui/core/Typography"; -import AccountCircle from "@material-ui/icons/AccountCircle"; -import MenuIcon from "@material-ui/icons/Menu"; +import Button from "@mui/material/Button"; +import IconButton from "@mui/material/IconButton"; +import Menu from "@mui/material/Menu"; +import MenuItem from "@mui/material/MenuItem"; +import { Theme } from "@mui/material/styles"; +import { createStyles, makeStyles } from "@mui/styles"; +import Toolbar from "@mui/material/Toolbar"; +import Typography from "@mui/material/Typography"; +import AccountCircle from "@mui/icons-material/AccountCircle"; +import MenuIcon from "@mui/icons-material/Menu"; import React from "react"; import { LoginState } from "./App"; import { Session } from "./types"; diff --git a/ui/src/ErrorBoundary.tsx b/ui/src/ErrorBoundary.tsx index 904461a..314ee5f 100644 --- a/ui/src/ErrorBoundary.tsx +++ b/ui/src/ErrorBoundary.tsx @@ -2,9 +2,9 @@ // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt. // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception -import Avatar from "@material-ui/core/Avatar"; -import Container from "@material-ui/core/Container"; -import BugReportIcon from "@material-ui/icons/BugReport"; +import Avatar from "@mui/material/Avatar"; +import Container from "@mui/material/Container"; +import BugReportIcon from "@mui/icons-material/BugReport"; import React from "react"; interface State { diff --git a/ui/src/List/DisplaySelector.tsx b/ui/src/List/DisplaySelector.tsx index 0f2680b..3393f5d 100644 --- a/ui/src/List/DisplaySelector.tsx +++ b/ui/src/List/DisplaySelector.tsx @@ -2,15 +2,15 @@ // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt. // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception -import Card from "@material-ui/core/Card"; -import Checkbox from "@material-ui/core/Checkbox"; -import InputLabel from "@material-ui/core/InputLabel"; -import FormControl from "@material-ui/core/FormControl"; -import MenuItem from "@material-ui/core/MenuItem"; -import Select from "@material-ui/core/Select"; +import Card from "@mui/material/Card"; +import Checkbox from "@mui/material/Checkbox"; +import InputLabel from "@mui/material/InputLabel"; +import FormControl from "@mui/material/FormControl"; +import MenuItem from "@mui/material/MenuItem"; +import Select from "@mui/material/Select"; import React from "react"; -import { useTheme } from "@material-ui/core/styles"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; +import { useTheme } from "@mui/material/styles"; +import FormControlLabel from "@mui/material/FormControlLabel"; interface Props { split90k?: number; diff --git a/ui/src/List/StreamMultiSelector.tsx b/ui/src/List/StreamMultiSelector.tsx index 6d091a0..9da2427 100644 --- a/ui/src/List/StreamMultiSelector.tsx +++ b/ui/src/List/StreamMultiSelector.tsx @@ -2,11 +2,11 @@ // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt. // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception -import Card from "@material-ui/core/Card"; +import Card from "@mui/material/Card"; import { Camera, Stream, StreamType } from "../types"; -import Checkbox from "@material-ui/core/Checkbox"; -import { useTheme } from "@material-ui/core/styles"; -import { makeStyles } from "@material-ui/styles"; +import Checkbox from "@mui/material/Checkbox"; +import { useTheme } from "@mui/material/styles"; +import { makeStyles } from "@mui/styles"; interface Props { cameras: Camera[]; diff --git a/ui/src/List/TimerangeSelector.tsx b/ui/src/List/TimerangeSelector.tsx index cda8a5e..b0d96f2 100644 --- a/ui/src/List/TimerangeSelector.tsx +++ b/ui/src/List/TimerangeSelector.tsx @@ -5,21 +5,21 @@ import { Stream } from "../types"; import StaticDatePicker, { StaticDatePickerProps, -} from "@material-ui/lab/StaticDatePicker"; +} from "@mui/lab/StaticDatePicker"; import React, { useEffect } from "react"; import { zonedTimeToUtc } from "date-fns-tz"; import { addDays, addMilliseconds, differenceInMilliseconds } from "date-fns"; import startOfDay from "date-fns/startOfDay"; -import Card from "@material-ui/core/Card"; -import { useTheme } from "@material-ui/core/styles"; -import TextField from "@material-ui/core/TextField"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import FormLabel from "@material-ui/core/FormLabel"; -import Radio from "@material-ui/core/Radio"; -import RadioGroup from "@material-ui/core/RadioGroup"; -import TimePicker, { TimePickerProps } from "@material-ui/lab/TimePicker"; -import Collapse from "@material-ui/core/Collapse"; -import Box from "@material-ui/core/Box"; +import Card from "@mui/material/Card"; +import { useTheme } from "@mui/material/styles"; +import TextField from "@mui/material/TextField"; +import FormControlLabel from "@mui/material/FormControlLabel"; +import FormLabel from "@mui/material/FormLabel"; +import Radio from "@mui/material/Radio"; +import RadioGroup from "@mui/material/RadioGroup"; +import TimePicker, { TimePickerProps } from "@mui/lab/TimePicker"; +import Collapse from "@mui/material/Collapse"; +import Box from "@mui/material/Box"; interface Props { selectedStreams: Set; diff --git a/ui/src/List/VideoList.tsx b/ui/src/List/VideoList.tsx index 25bcf68..19f2332 100644 --- a/ui/src/List/VideoList.tsx +++ b/ui/src/List/VideoList.tsx @@ -6,11 +6,11 @@ import React from "react"; import * as api from "../api"; import { useSnackbars } from "../snackbars"; import { Stream } from "../types"; -import TableBody from "@material-ui/core/TableBody"; -import TableCell from "@material-ui/core/TableCell"; -import TableRow, { TableRowProps } from "@material-ui/core/TableRow"; -import Skeleton from "@material-ui/core/Skeleton"; -import Alert from "@material-ui/core/Alert"; +import TableBody from "@mui/material/TableBody"; +import TableCell from "@mui/material/TableCell"; +import TableRow, { TableRowProps } from "@mui/material/TableRow"; +import Skeleton from "@mui/material/Skeleton"; +import Alert from "@mui/material/Alert"; interface Props { stream: Stream; diff --git a/ui/src/List/index.tsx b/ui/src/List/index.tsx index 75e7198..fedc4a9 100644 --- a/ui/src/List/index.tsx +++ b/ui/src/List/index.tsx @@ -2,13 +2,13 @@ // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt. // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception -import Box from "@material-ui/core/Box"; -import Modal from "@material-ui/core/Modal"; -import Paper from "@material-ui/core/Paper"; -import { Theme } from "@material-ui/core/styles"; -import { makeStyles } from "@material-ui/styles"; -import Table from "@material-ui/core/Table"; -import TableContainer from "@material-ui/core/TableContainer"; +import Box from "@mui/material/Box"; +import Modal from "@mui/material/Modal"; +import Paper from "@mui/material/Paper"; +import { Theme } from "@mui/material/styles"; +import { makeStyles } from "@mui/styles"; +import Table from "@mui/material/Table"; +import TableContainer from "@mui/material/TableContainer"; import utcToZonedTime from "date-fns-tz/utcToZonedTime"; import format from "date-fns/format"; import React, { useMemo, useState } from "react"; diff --git a/ui/src/Live/LiveCamera.tsx b/ui/src/Live/LiveCamera.tsx index 1dd4d0c..24db691 100644 --- a/ui/src/Live/LiveCamera.tsx +++ b/ui/src/Live/LiveCamera.tsx @@ -6,9 +6,9 @@ import React, { SyntheticEvent } from "react"; import { Camera } from "../types"; import { Part, parsePart } from "./parser"; import * as api from "../api"; -import Box from "@material-ui/core/Box"; -import CircularProgress from "@material-ui/core/CircularProgress"; -import Alert from "@material-ui/core/Alert"; +import Box from "@mui/material/Box"; +import CircularProgress from "@mui/material/CircularProgress"; +import Alert from "@mui/material/Alert"; import useResizeObserver from "@react-hook/resize-observer"; import { fillAspect } from "../aspect"; diff --git a/ui/src/Live/Multiview.tsx b/ui/src/Live/Multiview.tsx index 5e0885c..ca59797 100644 --- a/ui/src/Live/Multiview.tsx +++ b/ui/src/Live/Multiview.tsx @@ -2,12 +2,12 @@ // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt. // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception -import Select, { SelectChangeEvent } from "@material-ui/core/Select"; -import MenuItem from "@material-ui/core/MenuItem"; +import Select, { SelectChangeEvent } from "@mui/material/Select"; +import MenuItem from "@mui/material/MenuItem"; import React, { useReducer } from "react"; import { Camera } from "../types"; -import { makeStyles } from "@material-ui/styles"; -import { Theme } from "@material-ui/core/styles"; +import { makeStyles } from "@mui/styles"; +import { Theme } from "@mui/material/styles"; export interface Layout { className: string; diff --git a/ui/src/Live/index.tsx b/ui/src/Live/index.tsx index c35a691..c97e7d4 100644 --- a/ui/src/Live/index.tsx +++ b/ui/src/Live/index.tsx @@ -2,8 +2,8 @@ // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt. // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception -import Container from "@material-ui/core/Container"; -import ErrorIcon from "@material-ui/icons/Error"; +import Container from "@mui/material/Container"; +import ErrorIcon from "@mui/icons-material/Error"; import { Camera } from "../types"; import LiveCamera from "./LiveCamera"; import Multiview from "./Multiview"; diff --git a/ui/src/Login.tsx b/ui/src/Login.tsx index 3e7f89f..dcf2424 100644 --- a/ui/src/Login.tsx +++ b/ui/src/Login.tsx @@ -2,17 +2,17 @@ // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt. // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception -import Avatar from "@material-ui/core/Avatar"; -import Dialog from "@material-ui/core/Dialog"; -import DialogActions from "@material-ui/core/DialogActions"; -import DialogTitle from "@material-ui/core/DialogTitle"; -import FormControl from "@material-ui/core/FormControl"; -import FormHelperText from "@material-ui/core/FormHelperText"; -import { Theme } from "@material-ui/core/styles"; -import { makeStyles } from "@material-ui/styles"; -import TextField from "@material-ui/core/TextField"; -import LockOutlinedIcon from "@material-ui/icons/LockOutlined"; -import LoadingButton from "@material-ui/lab/LoadingButton"; +import Avatar from "@mui/material/Avatar"; +import Dialog from "@mui/material/Dialog"; +import DialogActions from "@mui/material/DialogActions"; +import DialogTitle from "@mui/material/DialogTitle"; +import FormControl from "@mui/material/FormControl"; +import FormHelperText from "@mui/material/FormHelperText"; +import { Theme } from "@mui/material/styles"; +import { makeStyles } from "@mui/styles"; +import TextField from "@mui/material/TextField"; +import LockOutlinedIcon from "@mui/icons-material/LockOutlined"; +import LoadingButton from "@mui/lab/LoadingButton"; import React, { useEffect } from "react"; import * as api from "./api"; import { useSnackbars } from "./snackbars"; diff --git a/ui/src/index.tsx b/ui/src/index.tsx index 2885029..f9f4ad8 100644 --- a/ui/src/index.tsx +++ b/ui/src/index.tsx @@ -2,17 +2,17 @@ // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt. // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception -import CssBaseline from "@material-ui/core/CssBaseline"; -import { ThemeProvider, createTheme } from "@material-ui/core/styles"; -import StyledEngineProvider from "@material-ui/core/StyledEngineProvider"; -import LocalizationProvider from "@material-ui/lab/LocalizationProvider"; +import CssBaseline from "@mui/material/CssBaseline"; +import { ThemeProvider, createTheme } from "@mui/material/styles"; +import StyledEngineProvider from "@mui/material/StyledEngineProvider"; +import LocalizationProvider from "@mui/lab/LocalizationProvider"; import "@fontsource/roboto"; import React from "react"; import ReactDOM from "react-dom"; import App from "./App"; import ErrorBoundary from "./ErrorBoundary"; import { SnackbarProvider } from "./snackbars"; -import AdapterDateFns from "@material-ui/lab/AdapterDateFns"; +import AdapterDateFns from "@mui/lab/AdapterDateFns"; import "./index.css"; const theme = createTheme({ diff --git a/ui/src/snackbars.tsx b/ui/src/snackbars.tsx index 25d709b..8aba222 100644 --- a/ui/src/snackbars.tsx +++ b/ui/src/snackbars.tsx @@ -16,12 +16,12 @@ * flexibility (yet). */ -import IconButton from "@material-ui/core/IconButton"; +import IconButton from "@mui/material/IconButton"; import Snackbar, { SnackbarCloseReason, SnackbarProps, -} from "@material-ui/core/Snackbar"; -import CloseIcon from "@material-ui/icons/Close"; +} from "@mui/material/Snackbar"; +import CloseIcon from "@mui/icons-material/Close"; import React, { useContext } from "react"; interface SnackbarProviderProps { diff --git a/ui/src/testutil.tsx b/ui/src/testutil.tsx index 8883889..9539f9b 100644 --- a/ui/src/testutil.tsx +++ b/ui/src/testutil.tsx @@ -2,7 +2,7 @@ // Copyright (C) 2021 The Moonfire NVR Authors; see AUTHORS and LICENSE.txt. // SPDX-License-Identifier: GPL-v3.0-or-later WITH GPL-3.0-linking-exception -import { createTheme, ThemeProvider } from "@material-ui/core/styles"; +import { createTheme, ThemeProvider } from "@mui/material/styles"; import { render } from "@testing-library/react"; import { SnackbarProvider } from "./snackbars";