diff --git a/package.json b/package.json index 774e1314..792588b8 100644 --- a/package.json +++ b/package.json @@ -6,10 +6,11 @@ "@emotion/react": "^11.4.1", "@emotion/styled": "^11.3.0", "@fontsource/roboto": "^4.3.0", - "@mui/icons-material": "^5.0.0-rc.1", - "@mui/lab": "^5.0.0-alpha.46", - "@mui/material": "^5.0.0-rc.1", - "@mui/styles": "^5.0.0-rc.1", + "@mui/icons-material": "^5.0.5", + "@mui/lab": "^5.0.0-alpha.53", + "@mui/material": "^5.0.6", + "@mui/styles": "^5.0.2", + "@mui/system": "^5.0.6", "axios": "^0.21.1", "file-selector": "^0.2.4", "react": "^17.0.2", diff --git a/src/App.tsx b/src/App.tsx index 8aba732e..b6beb341 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -92,6 +92,7 @@ export default function App() { style={{ marginTop: theme.spacing(8), marginLeft: isMobileWidth ? '' : theme.spacing(8), + marginBottom: isMobileWidth ? theme.spacing(8) : '', width: 'auto', overflow: 'auto', }} diff --git a/src/components/navbar/BottomNavigationBar.tsx b/src/components/navbar/BottomNavigationBar.tsx new file mode 100644 index 00000000..0efe9a4c --- /dev/null +++ b/src/components/navbar/BottomNavigationBar.tsx @@ -0,0 +1,62 @@ +/* + * Copyright (C) Contributors to the Suwayomi project + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ + +import React from 'react'; +import { + Box, ListItem, +} from '@mui/material'; +import { styled } from '@mui/system'; +import { Link, useLocation } from 'react-router-dom'; + +const BottomNavContainer = styled('div')(({ theme }) => ({ + bottom: 0, + left: 0, + height: theme.spacing(7), + width: '100vw', + backgroundColor: theme.palette.mode === 'light' ? theme.palette.grey[100] : theme.palette.grey[900], + position: 'fixed', + display: 'flex', + flexDirection: 'row', + justifyContent: 'space-evenly', + alignItems: 'center', + // For Some reason the theme is throwing and error when accessing the Zindex object, + // This is the zIndex of the appBar in the default theme + zIndex: 1100, +})); + +interface IProps { + navBarItems: Array +} + +export default function BottomNavigationBar({ navBarItems }: IProps) { + const location = useLocation(); + return ( + + { + navBarItems.map(({ path, title, IconComponent }: NavbarItem) => ( + + + + +
{title}
+
+
+ + )) + } +
+ ); +} diff --git a/src/components/navbar/NavBar.tsx b/src/components/navbar/NavBar.tsx index 83d5d6e0..40f61308 100644 --- a/src/components/navbar/NavBar.tsx +++ b/src/components/navbar/NavBar.tsx @@ -5,13 +5,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -import React, { useContext, useState } from 'react'; +import React, { useContext } from 'react'; import makeStyles from '@mui/styles/makeStyles'; import AppBar from '@mui/material/AppBar'; import Toolbar from '@mui/material/Toolbar'; import Typography from '@mui/material/Typography'; import IconButton from '@mui/material/IconButton'; -import MenuIcon from '@mui/icons-material/Menu'; import { useMediaQuery } from '@mui/material'; import { useTheme } from '@mui/material/styles'; import CollectionsBookmarkIcon from '@mui/icons-material/CollectionsBookmark'; @@ -23,8 +22,8 @@ import ArrowBack from '@mui/icons-material/ArrowBack'; import { useHistory } from 'react-router-dom'; import NavBarContext from 'context/NavbarContext'; import DarkTheme from 'context/DarkTheme'; -import TemporaryDrawer from './TemporaryDrawer'; import PermanentSideBar from './PermanentSideBar'; +import BottomNavigationBar from './BottomNavigationBar'; const useStyles = makeStyles((theme) => ({ root: { @@ -54,7 +53,7 @@ const navbarItems: Array = [ IconComponent: ExploreIcon, }, { path: '/downloads', - title: 'Manga Download Queue', + title: 'Downloads', IconComponent: GetAppIcon, }, { path: '/settings', @@ -65,11 +64,11 @@ const navbarItems: Array = [ export default function NavBar() { const classes = useStyles(); - const [drawerOpen, setDrawerOpen] = useState(false); const { title, action, override } = useContext(NavBarContext); const theme = useTheme(); const isMobileWidth = useMediaQuery(theme.breakpoints.down('sm')); const history = useHistory(); + const isMainRoute = navbarItems.some(({ path }) => path === history.location.pathname); const { darkTheme } = useContext(DarkTheme); @@ -81,21 +80,8 @@ export default function NavBar() {
- {isMobileWidth ? ( - setDrawerOpen(true)} - size="large" - > - - - ) - : ( - !navbarItems.some(({ path }) => path === history.location.pathname) + { + !navbarItems.some(({ path }) => path === history.location.pathname) && ( ) - )} + } {title} {action} - {isMobileWidth ? ( - - ) - : } + { + isMainRoute + && ( + isMobileWidth + ? + : ) + }
)} diff --git a/src/components/navbar/PermanentSideBar.tsx b/src/components/navbar/PermanentSideBar.tsx index 2766a726..4b290ef7 100644 --- a/src/components/navbar/PermanentSideBar.tsx +++ b/src/components/navbar/PermanentSideBar.tsx @@ -6,28 +6,20 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import React from 'react'; -import makeStyles from '@mui/styles/makeStyles'; -import { - List, ListItem, ListItemIcon, Tooltip, -} from '@mui/material'; +import { ListItem, ListItemIcon, Tooltip } from '@mui/material'; import { Link, useLocation } from 'react-router-dom'; +import { styled } from '@mui/system'; -const useStyles = makeStyles((theme) => ({ - sideBar: { - height: '100vh', - width: theme.spacing(8), - backgroundColor: theme.palette.mode === 'light' ? theme.palette.grey[100] : theme.palette.grey[900], - position: 'fixed', - top: 0, - left: 0, - paddingTop: theme.spacing(8), - display: 'flex', - flexDirection: 'column', - boxShadow: theme.shadows[5], - }, - tooltip: { - fontSize: '1rem', - }, +const SideNavBarContainer = styled('div')(({ theme }) => ({ + height: '100vh', + width: theme.spacing(8), + backgroundColor: theme.palette.mode === 'light' ? theme.palette.grey[100] : theme.palette.grey[900], + position: 'fixed', + top: 0, + left: 0, + paddingTop: theme.spacing(8), + display: 'flex', + flexDirection: 'column', })); interface IProps { @@ -36,25 +28,24 @@ interface IProps { export default function PermanentSideBar({ navBarItems }: IProps) { const location = useLocation(); - const classes = useStyles(); return ( -
- - { - // eslint-disable-next-line react/destructuring-assignment - navBarItems.map(({ path, title, IconComponent }: NavbarItem) => ( - - - - - - - - - - )) - } - -
+ + { + // eslint-disable-next-line react/destructuring-assignment + navBarItems.map(({ path, title, IconComponent }: NavbarItem) => ( + + + + + + + + + + + + )) + } + ); } diff --git a/yarn.lock b/yarn.lock index a6db64e6..9dcd88ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1157,7 +1157,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.13.10", "@babel/runtime@^7.14.8", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.13.10", "@babel/runtime@^7.15.4", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": version "7.15.4" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a" integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw== @@ -1224,28 +1224,28 @@ resolved "https://registry.yarnpkg.com/@date-io/core/-/core-2.11.0.tgz#28580cda1c8228ab2c7ed6aee673ef0495f913e6" integrity sha512-DvPBnNoeuLaoSJZaxgpu54qzRhRKjSYVyQjhznTFrllKuDpm0sDFjHo6lvNLCM/cfMx2gb2PM2zY2kc9C8nmuw== -"@date-io/date-fns@^2.10.6": +"@date-io/date-fns@^2.11.0": version "2.11.0" resolved "https://registry.yarnpkg.com/@date-io/date-fns/-/date-fns-2.11.0.tgz#142fbf954eda7ad66514af7a2802d78c4ea40053" integrity sha512-mPQ71plBeFrArvBSHtjWMHXA89IUbZ6kuo2dsjlRC/1uNOybo91spIb+wTu03NxKTl8ut07s0jJ9svF71afpRg== dependencies: "@date-io/core" "^2.11.0" -"@date-io/dayjs@^2.10.6": +"@date-io/dayjs@^2.11.0": version "2.11.0" resolved "https://registry.yarnpkg.com/@date-io/dayjs/-/dayjs-2.11.0.tgz#41f4b4b9629612e6012accffd848875d1aeffb74" integrity sha512-w67vRK56NZJIKhJM/CrNbfnIcuMvR3ApfxzNZiCZ5w29sxgBDeKuX4M+P7A9r5HXOMGcsOcpgaoTDINNGkdpGQ== dependencies: "@date-io/core" "^2.11.0" -"@date-io/luxon@^2.10.6": +"@date-io/luxon@^2.11.1": version "2.11.1" resolved "https://registry.yarnpkg.com/@date-io/luxon/-/luxon-2.11.1.tgz#31a72f7b5e163c74e8a3b29d8f16c4c30de6ed43" integrity sha512-JUXo01kdPQxLORxqdENrgdUhooKgDUggsNRSdi2BcUhASIY2KGwwWXu8ikVHHGkw+DUF4FOEKGfkQd0RHSvX6g== dependencies: "@date-io/core" "^2.11.0" -"@date-io/moment@^2.10.6": +"@date-io/moment@^2.11.0": version "2.11.0" resolved "https://registry.yarnpkg.com/@date-io/moment/-/moment-2.11.0.tgz#850f8dd090d401845b39276d034dbabe20224ef5" integrity sha512-QSL+83qezQ9Ty0dtFgAkk6eC0GMl/lgYfDajeVUDB3zVA2A038hzczRLBg29ifnBGhQMPABxuOafgWwhDjlarg== @@ -1270,16 +1270,16 @@ source-map "^0.5.7" stylis "^4.0.3" -"@emotion/cache@^11.4.0": - version "11.4.0" - resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.4.0.tgz#293fc9d9a7a38b9aad8e9337e5014366c3b09ac0" - integrity sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g== +"@emotion/cache@^11.4.0", "@emotion/cache@^11.5.0": + version "11.5.0" + resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.5.0.tgz#a5eb78cbef8163939ee345e3ddf0af217b845e62" + integrity sha512-mAZ5QRpLriBtaj/k2qyrXwck6yeoz1V5lMt/jfj6igWU35yYlNKs2LziXVgvH81gnJZ+9QQNGelSsnuoAy6uIw== dependencies: "@emotion/memoize" "^0.7.4" - "@emotion/sheet" "^1.0.0" + "@emotion/sheet" "^1.0.3" "@emotion/utils" "^1.0.0" "@emotion/weak-memoize" "^0.2.5" - stylis "^4.0.3" + stylis "^4.0.10" "@emotion/hash@^0.8.0": version "0.8.0" @@ -1322,11 +1322,16 @@ "@emotion/utils" "^1.0.0" csstype "^3.0.2" -"@emotion/sheet@^1.0.0", "@emotion/sheet@^1.0.2": +"@emotion/sheet@^1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.2.tgz#1d9ffde531714ba28e62dac6a996a8b1089719d0" integrity sha512-QQPB1B70JEVUHuNtzjHftMGv6eC3Y9wqavyarj4x4lg47RACkeSfNo5pxIOKizwS9AEFLohsqoaxGQj4p0vSIw== +"@emotion/sheet@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.3.tgz#00c326cd7985c5ccb8fe2c1b592886579dcfab8f" + integrity sha512-YoX5GyQ4db7LpbmXHMuc8kebtBGP6nZfRC5Z13OKJMixBEwdZrJ914D6yJv/P+ZH/YY3F5s89NYX2hlZAf3SRQ== + "@emotion/styled@^11.3.0": version "11.3.0" resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.3.0.tgz#d63ee00537dfb6ff612e31b0e915c5cf9925a207" @@ -1611,129 +1616,129 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@mui/core@5.0.0-alpha.46": - version "5.0.0-alpha.46" - resolved "https://registry.yarnpkg.com/@mui/core/-/core-5.0.0-alpha.46.tgz#f4c0e5b2ad346e31e74bb96b684f6734b55cc9e6" - integrity sha512-LZa0s450YSHv58xlMRIWszE0zsqqTyxgP+l70gUyPvYwCfQErkxsvRjEInKI5GCrYDcr3N+jlKJ5MSRZDvtvig== +"@mui/core@5.0.0-alpha.53": + version "5.0.0-alpha.53" + resolved "https://registry.yarnpkg.com/@mui/core/-/core-5.0.0-alpha.53.tgz#ede1445be3bf5a93d25bdd8ead23afdfb1b68f8b" + integrity sha512-dTwuhzE0puewJ+/Cw35iAiaBGVcZqVyqspheQHVJuhysSd+o58SONRAiM6MQgI/iFKiJ57HKh+En1MwuC7DMLw== dependencies: - "@babel/runtime" "^7.14.8" + "@babel/runtime" "^7.15.4" "@emotion/is-prop-valid" "^1.1.0" - "@mui/utils" "5.0.0-rc.1" + "@mui/utils" "^5.0.1" + "@popperjs/core" "^2.4.4" clsx "^1.1.1" prop-types "^15.7.2" react-is "^17.0.2" -"@mui/icons-material@^5.0.0-rc.1": - version "5.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.0.0-rc.1.tgz#ffb5ec5195d2bf8105da6a78b7d6b9fc195c8511" - integrity sha512-w9tfGQaND221fkPaCp70gHg/8f4mk1RYx22YBLtV4wV0SLoI3d4+41DRrqTxeyKB1WIxETDVxaAqeBthrXM6hg== +"@mui/icons-material@^5.0.5": + version "5.0.5" + resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.0.5.tgz#7af61046da4e54de2da7fcf4bdeb3e439e7c10a7" + integrity sha512-beJo4kmgZwr+2x0ppgHcqqdNQYX4WKddJyMn4eHJAh9dNAGyeY1AJ/8Po+TJKyoSr3C2ZqnW7WrSonAJr2HrUw== dependencies: - "@babel/runtime" "^7.14.8" + "@babel/runtime" "^7.15.4" -"@mui/lab@^5.0.0-alpha.46": - version "5.0.0-alpha.46" - resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.46.tgz#456403bf1c8a810f052733119b9013778054bdf8" - integrity sha512-aGgX3GWOOPq7RuxDI4wQMrm+J7q7cvPDLxN1uS85oIZnMrFLTrFZaQlf4x6LQJtFpVTa7LKuhzNU6kLT37BWMg== +"@mui/lab@^5.0.0-alpha.53": + version "5.0.0-alpha.53" + resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.53.tgz#ee3bae46fc61e2274d3001583b7d0ca92abbe2c4" + integrity sha512-fUyGCuxj8Wdwvyc9v0X3YTNshItFWp6DtuCPjhPy6yhKjUAa0u0XKI4FcM5z/wPWUR56nJceNz9WwNZ72vkwWw== dependencies: - "@babel/runtime" "^7.14.8" - "@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" - "@mui/core" "5.0.0-alpha.46" - "@mui/system" "5.0.0-rc.1" - "@mui/utils" "5.0.0-rc.1" + "@babel/runtime" "^7.15.4" + "@date-io/date-fns" "^2.11.0" + "@date-io/dayjs" "^2.11.0" + "@date-io/luxon" "^2.11.1" + "@date-io/moment" "^2.11.0" + "@mui/core" "5.0.0-alpha.53" + "@mui/system" "^5.0.6" + "@mui/utils" "^5.0.1" clsx "^1.1.1" prop-types "^15.7.2" react-is "^17.0.2" - react-transition-group "^4.4.1" + react-transition-group "^4.4.2" rifm "^0.12.0" -"@mui/material@^5.0.0-rc.1": - version "5.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.0.0-rc.1.tgz#456218bfeb659dfb17c516ecc03f86013feaf253" - integrity sha512-23lEM2n0Y8VcFbk7mjNZzbAHDh7wu5P4foe1hDiSJaipBX4ESWnBAwo9exxQbFrDd+l2xtLzaoTmTOVOgkElrA== +"@mui/material@^5.0.6": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.0.6.tgz#0e688c918fd88a07f59385614c65fce937077a9f" + integrity sha512-1NmLel2Q+PnSfhFhdrhTbZFLfGpGKcPbu8onwGJu+vbD3YMTjr8gXvQ/sYZC0Motfu8jLnQdlq4FD4fRhqndnw== dependencies: - "@babel/runtime" "^7.14.8" - "@mui/core" "5.0.0-alpha.46" - "@mui/system" "5.0.0-rc.1" - "@mui/types" "7.0.0-rc.1" - "@mui/utils" "5.0.0-rc.1" - "@popperjs/core" "^2.4.4" - "@types/react-transition-group" "^4.2.0" + "@babel/runtime" "^7.15.4" + "@mui/core" "5.0.0-alpha.53" + "@mui/system" "^5.0.6" + "@mui/types" "^7.0.0" + "@mui/utils" "^5.0.1" + "@types/react-transition-group" "^4.4.4" clsx "^1.1.1" - csstype "^3.0.8" + csstype "^3.0.9" hoist-non-react-statics "^3.3.2" prop-types "^15.7.2" react-is "^17.0.2" - react-transition-group "^4.4.0" + react-transition-group "^4.4.2" -"@mui/private-theming@5.0.0-rc.1": - version "5.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.0.0-rc.1.tgz#eab6d20db119b6f2176d76ed725f53b9ebc12e97" - integrity sha512-dibj1bc+tX4+sKOhSAYoJVndk7MAVZkYLKRa3E3GDObDe5I/YOv0fS8cvfB3sTFiQWxbdKj//p2QJtos6o83NQ== +"@mui/private-theming@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.0.1.tgz#50a0ea6ad5a8d1d78072859c4bdaaa6b6584d986" + integrity sha512-R8Cf2+32cG1OXFAqTighA5Mx9R5BQ57cN1ZVaNgfgdbI87Yig2fVMdFSPrw3txcjKlnwsvFJF8AdwQMqq1tJ3Q== dependencies: - "@babel/runtime" "^7.14.8" - "@mui/utils" "5.0.0-rc.1" + "@babel/runtime" "^7.15.4" + "@mui/utils" "^5.0.1" prop-types "^15.7.2" -"@mui/styled-engine@5.0.0-rc.1": - version "5.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.0.0-rc.1.tgz#8a0c68e88868c42944042e01e28a0d11b6caf756" - integrity sha512-cYK3oGHzriPqULPSy5iitupk6JbvvwVqBC1n1gxISZzm7wEsBx0hDCDhh7tgCa1B7CXdl0Ntl27PXJjtukoo/A== +"@mui/styled-engine@^5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.0.2.tgz#a2d188e80d2c8c3501316649c1901a41ac07e376" + integrity sha512-vApnXLj/5V+SbBy+jGFtPgu3tgs0ybSdwWLwXcnUAdNdRyJBffi2KyOP8fhUONLOcZBMU2heNXWz/Zqn5kbDKQ== dependencies: - "@babel/runtime" "^7.14.8" - "@emotion/cache" "^11.4.0" + "@babel/runtime" "^7.15.4" + "@emotion/cache" "^11.5.0" prop-types "^15.7.2" -"@mui/styles@^5.0.0-rc.1": - version "5.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-5.0.0-rc.1.tgz#479c082afbdef116ad5323e15e3f1324efd29205" - integrity sha512-lOAEpHDTOv/mLGBXvu0zO+FJihezo3Z4PKggTEGIdEuZUvz2slyJOtlSGwvbURK7+dGT04jFBfMOHbPR1JODSw== +"@mui/styles@^5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@mui/styles/-/styles-5.0.2.tgz#236b834cd07a07de0c17b104eedb810453f3839c" + integrity sha512-ANYnMHpiWHcV0dMrzrdCzYm+kNU0f7Gc5nFLRDWF+8fWZ40K2Cg5eMRkOW/nmM5M0wtmDI+GFVsCXgZkNq89uw== dependencies: - "@babel/runtime" "^7.14.8" + "@babel/runtime" "^7.15.4" "@emotion/hash" "^0.8.0" - "@mui/private-theming" "5.0.0-rc.1" - "@mui/types" "7.0.0-rc.1" - "@mui/utils" "5.0.0-rc.1" + "@mui/private-theming" "^5.0.1" + "@mui/types" "^7.0.0" + "@mui/utils" "^5.0.1" clsx "^1.1.1" - csstype "^3.0.8" + csstype "^3.0.9" hoist-non-react-statics "^3.3.2" - jss "^10.7.1" - jss-plugin-camel-case "^10.7.1" - jss-plugin-default-unit "^10.7.1" - jss-plugin-global "^10.7.1" - jss-plugin-nested "^10.7.1" - jss-plugin-props-sort "^10.7.1" - jss-plugin-rule-value-function "^10.7.1" - jss-plugin-vendor-prefixer "^10.7.1" + jss "^10.8.1" + jss-plugin-camel-case "^10.8.1" + jss-plugin-default-unit "^10.8.1" + jss-plugin-global "^10.8.1" + jss-plugin-nested "^10.8.1" + jss-plugin-props-sort "^10.8.1" + jss-plugin-rule-value-function "^10.8.1" + jss-plugin-vendor-prefixer "^10.8.1" prop-types "^15.7.2" -"@mui/system@5.0.0-rc.1": - version "5.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.0.0-rc.1.tgz#24c99469b48c350802929f6097f671742be9a7f1" - integrity sha512-c+esT+9wZR5aNcssMHg5Wm19VdX+uyhNLLTzqAg8oW36LBeIMTfiN18GShcxnFV3faje78Nr3BhmMFn9yBunMA== +"@mui/system@^5.0.6": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.0.6.tgz#053ad18e3888f041137db9f0c0ac1486c86972a0" + integrity sha512-qZdgODiO82/r1bH9KV5bdqqx/q14i32OGUK/bO6phhXM/DX0TmWSUsnPqFX4F7/UKrvBHsGzIb8ohdRuihQD+Q== dependencies: - "@babel/runtime" "^7.14.8" - "@mui/private-theming" "5.0.0-rc.1" - "@mui/styled-engine" "5.0.0-rc.1" - "@mui/types" "7.0.0-rc.1" - "@mui/utils" "5.0.0-rc.1" + "@babel/runtime" "^7.15.4" + "@mui/private-theming" "^5.0.1" + "@mui/styled-engine" "^5.0.2" + "@mui/types" "^7.0.0" + "@mui/utils" "^5.0.1" clsx "^1.1.1" - csstype "^3.0.8" + csstype "^3.0.9" prop-types "^15.7.2" -"@mui/types@7.0.0-rc.1": - version "7.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.0.0-rc.1.tgz#276090e2cd062a5e9241cf8d4ad795a4ee10eb03" - integrity sha512-4vYFVi8ExcC7EEuk5melw/XPG2DVPeXI/HUYnQj+3t5NESpdvLJhbbvmHH366ZWAhXR2FechYWo/cQfGIsSG8Q== +"@mui/types@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.0.0.tgz#a7398502bc9c508875aafcbe28aea599b2c3d203" + integrity sha512-M/tkF2pZ4uoPhZ8pnNhlVnOFtz6F3dnYKIsnj8MuXKT6d26IE2u0UjA8B0275ggN74dR9rlHG5xJt5jgDx/Ung== -"@mui/utils@5.0.0-rc.1": - version "5.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.0.0-rc.1.tgz#8427d1117a380b8c861be9a6bbf51075e776cd63" - integrity sha512-FSh/zaZqfzz0Iz7/RHb2ajA/q6dfFKeNIXZCl7sZeYq9L1u8GR4IHi4n1MphLiJTco02XBw3KwME9Bqmk73LEQ== +"@mui/utils@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.0.1.tgz#d4f0f41b82db6ac273920a1b5b6a4de7879271f5" + integrity sha512-GWO104N+o9KG5fKiTEYnAg7kONKEg3vLN+VROAU0f3it6lFGLCVPcQYex/1gJ4QAy96u6Ez8/Hmmhi1+3cX0tQ== dependencies: - "@babel/runtime" "^7.14.8" + "@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" @@ -1789,9 +1794,9 @@ source-map "^0.7.3" "@popperjs/core@^2.4.4": - version "2.10.1" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.10.1.tgz#728ecd95ab207aab8a9a4e421f0422db329232be" - integrity sha512-HnUhk1Sy9IuKrxEMdIRCxpIqPw6BFsbYSEUO9p/hNw5sMld/+3OLMWQP80F8/db9qsv3qUjs7ZR5bS/R+iinXw== + version "2.10.2" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.10.2.tgz#0798c03351f0dea1a5a4cabddf26a55a7cbee590" + integrity sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ== "@rollup/plugin-node-resolve@^7.1.1": version "7.1.3" @@ -2114,9 +2119,9 @@ "@types/react" "*" "@types/react-is@^16.7.1 || ^17.0.0": - version "17.0.2" - resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.2.tgz#abc4d910bff5b0bc6b3e1bec57575f6b63fd4e05" - integrity sha512-2+L0ilcAEG8udkDnvx8B0upwXFBbNnVwOsSCTxW3SDOkmar9NyEeLG0ZLa3uOEw9zyYf/fQapcnfXAVmDKlyHw== + version "17.0.3" + resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz#2d855ba575f2fc8d17ef9861f084acc4b90a137a" + integrity sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw== dependencies: "@types/react" "*" @@ -2154,14 +2159,23 @@ "@types/history" "*" "@types/react" "*" -"@types/react-transition-group@^4.2.0": - version "4.4.2" - resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.2.tgz#38890fd9db68bf1f2252b99a942998dc7877c5b3" - integrity sha512-KibDWL6nshuOJ0fu8ll7QnV/LVTo3PzQ9aCPnRUYPfX7eZohHwLIdNHj7pftanREzHNP4/nJa8oeM73uSiavMQ== +"@types/react-transition-group@^4.4.4": + version "4.4.4" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e" + integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug== dependencies: "@types/react" "*" -"@types/react@*", "@types/react@^17.0.2": +"@types/react@*": + version "17.0.33" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.33.tgz#e01ae3de7613dac1094569880bb3792732203ad5" + integrity sha512-pLWntxXpDPaU+RTAuSGWGSEL2FRTNyRQOjSWDke/rxRg14ncsZvx8AKWMWZqvc1UOaJIAoObdZhAWvRaHFi5rw== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + +"@types/react@^17.0.2": version "17.0.20" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.20.tgz#a4284b184d47975c71658cd69e759b6bd37c3b8c" integrity sha512-wWZrPlihslrPpcKyCSlmIlruakxr57/buQN1RjlIeaaTWDLtJkTtRW429MoQJergvVKc4IWBpRhWw7YNh/7GVA== @@ -4302,10 +4316,10 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" -csstype@^3.0.2, csstype@^3.0.8: - version "3.0.8" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340" - integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw== +csstype@^3.0.2, csstype@^3.0.9: + version "3.0.9" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b" + integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw== cyclist@^1.0.1: version "1.0.1" @@ -7249,70 +7263,70 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jss-plugin-camel-case@^10.7.1: - version "10.7.1" - resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.7.1.tgz#e7f7097cf97e9deec599cef3275e213452318b93" - integrity sha512-+ioIyWvmAfgDCWXsQcW1NMnLBvRinOVFkSYJUgewQ6TynOcSj5F1bSU23B7z0p1iqK0PPHIU62xY1iNJD33WGA== +jss-plugin-camel-case@^10.8.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.8.2.tgz#8d7f915c8115afaff8cbde08faf610ec9892fba6" + integrity sha512-2INyxR+1UdNuKf4v9It3tNfPvf7IPrtkiwzofeKuMd5D58/dxDJVUQYRVg/n460rTlHUfsEQx43hDrcxi9dSPA== dependencies: "@babel/runtime" "^7.3.1" hyphenate-style-name "^1.0.3" - jss "10.7.1" + jss "10.8.2" -jss-plugin-default-unit@^10.7.1: - version "10.7.1" - resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.7.1.tgz#826270e2ee38d7024a281ac67c30d6944f124786" - integrity sha512-tW+dfYVNARBQb/ONzBwd8uyImigyzMiAEDai+AbH5rcHg5h3TtqhAkxx06iuZiT/dZUiFdSKlbe3q9jZGAPIwA== +jss-plugin-default-unit@^10.8.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.8.2.tgz#c66f12e02e0815d911b85c02c2a979ee7b4ce69a" + integrity sha512-UZ7cwT9NFYSG+SEy7noRU50s4zifulFdjkUNKE+u6mW7vFP960+RglWjTgMfh79G6OENZmaYnjHV/gcKV4nSxg== dependencies: "@babel/runtime" "^7.3.1" - jss "10.7.1" + jss "10.8.2" -jss-plugin-global@^10.7.1: - version "10.7.1" - resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.7.1.tgz#9725c46d662aac2e596a0a8741944c060e2b90a1" - integrity sha512-FbxCnu44IkK/bw8X3CwZKmcAnJqjAb9LujlAc/aP0bMSdVa3/MugKQRyeQSu00uGL44feJJDoeXXiHOakBr/Zw== +jss-plugin-global@^10.8.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.8.2.tgz#1a35632a693cf50113bcc5ffe6b51969df79c4ec" + integrity sha512-UaYMSPsYZ7s/ECGoj4KoHC2jwQd5iQ7K+FFGnCAILdQrv7hPmvM2Ydg45ThT/sH46DqktCRV2SqjRuxeBH8nRA== dependencies: "@babel/runtime" "^7.3.1" - jss "10.7.1" + jss "10.8.2" -jss-plugin-nested@^10.7.1: - version "10.7.1" - resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.7.1.tgz#35563a7a710a45307fd6b9742ffada1d72a62eb7" - integrity sha512-RNbICk7FlYKaJyv9tkMl7s6FFfeLA3ubNIFKvPqaWtADK0KUaPsPXVYBkAu4x1ItgsWx67xvReMrkcKA0jSXfA== +jss-plugin-nested@^10.8.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.8.2.tgz#79f3c7f75ea6a36ae72fe52e777035bb24d230c7" + integrity sha512-acRvuPJOb930fuYmhkJaa994EADpt8TxI63Iyg96C8FJ9T2xRyU5T6R1IYKRwUiqZo+2Sr7fdGzRTDD4uBZaMA== dependencies: "@babel/runtime" "^7.3.1" - jss "10.7.1" + jss "10.8.2" tiny-warning "^1.0.2" -jss-plugin-props-sort@^10.7.1: - version "10.7.1" - resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.7.1.tgz#1d12b26048541ed3a2ed1b69f7fc231605728362" - integrity sha512-eyd5FhA+J0QrpqXxO7YNF/HMSXXl4pB0EmUdY4vSJI4QG22F59vQ6AHtP6fSwhmBdQ98Qd9gjfO+RMxcE39P1A== +jss-plugin-props-sort@^10.8.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.8.2.tgz#e25a7471868652c394562b6dc5433dcaea7dff6f" + integrity sha512-wqdcjayKRWBZnNpLUrXvsWqh+5J5YToAQ+8HNBNw0kZxVvCDwzhK2Nx6AKs7p+5/MbAh2PLgNW5Ym/ysbVAuqQ== dependencies: "@babel/runtime" "^7.3.1" - jss "10.7.1" + jss "10.8.2" -jss-plugin-rule-value-function@^10.7.1: - version "10.7.1" - resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.7.1.tgz#123eb796eb9982f8efa7a7e362daddd90c0c69fe" - integrity sha512-fGAAImlbaHD3fXAHI3ooX6aRESOl5iBt3LjpVjxs9II5u9tzam7pqFUmgTcrip9VpRqYHn8J3gA7kCtm8xKwHg== +jss-plugin-rule-value-function@^10.8.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.8.2.tgz#55354b55f1b2968a15976729968f767f02d64049" + integrity sha512-bW0EKAs+0HXpb6BKJhrn94IDdiWb0CnSluTkh0rGEgyzY/nmD1uV/Wf6KGlesGOZ9gmJzQy+9FFdxIUID1c9Ug== dependencies: "@babel/runtime" "^7.3.1" - jss "10.7.1" + jss "10.8.2" tiny-warning "^1.0.2" -jss-plugin-vendor-prefixer@^10.7.1: - version "10.7.1" - resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.7.1.tgz#217821be2d6dacee31d2d464886760ba7742e19a" - integrity sha512-1UHFmBn7hZNsHXTkLLOL8abRl8vi+D1EVzWD4WmLFj55vawHZfnH1oEz6TUf5Y61XHv0smdHabdXds6BgOXe3A== +jss-plugin-vendor-prefixer@^10.8.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.8.2.tgz#ebb4a482642f34091e454901e21176441dd5f475" + integrity sha512-DeGv18QsSiYLSVIEB2+l0af6OToUe0JB+trpzUxyqD2QRC/5AzzDrCrYffO5AHZ81QbffYvSN/pkfZaTWpRXlg== dependencies: "@babel/runtime" "^7.3.1" css-vendor "^2.0.8" - jss "10.7.1" + jss "10.8.2" -jss@10.7.1, jss@^10.7.1: - version "10.7.1" - resolved "https://registry.yarnpkg.com/jss/-/jss-10.7.1.tgz#16d846e1a22fb42e857b99f9c6a0c5a27341c804" - integrity sha512-5QN8JSVZR6cxpZNeGfzIjqPEP+ZJwJJfZbXmeABNdxiExyO+eJJDy6WDtqTf8SDKnbL5kZllEpAP71E/Lt7PXg== +jss@10.8.2, jss@^10.8.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jss/-/jss-10.8.2.tgz#4b2a30b094b924629a64928236017a52c7c97505" + integrity sha512-FkoUNxI329CKQ9OQC8L72MBF9KPf5q8mIupAJ5twU7G7XREW7ahb+7jFfrjZ4iy1qvhx1HwIWUIvkZBDnKkEdQ== dependencies: "@babel/runtime" "^7.3.1" csstype "^3.0.2" @@ -9727,7 +9741,7 @@ react-scripts@4.0.3: optionalDependencies: fsevents "^2.1.3" -react-transition-group@^4.4.0, react-transition-group@^4.4.1: +react-transition-group@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== @@ -10891,7 +10905,7 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" -stylis@^4.0.3: +stylis@^4.0.10, stylis@^4.0.3: version "4.0.10" resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240" integrity sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg==