diff --git a/src/components/layout/Layout.js b/src/components/layout/Layout.js index 3c1bafd..1fd0d57 100644 --- a/src/components/layout/Layout.js +++ b/src/components/layout/Layout.js @@ -4,10 +4,14 @@ import { useEffect, useState } from "react"; import { useLocation } from "react-router-dom"; import { StyledContent } from "./LayoutStyled"; import Menu from "./Menu/Menu"; +import { useTrustRelationshipsContext } from "../../store/TrustRelationshipsContext"; + const Layout = ({ children }) => { const [open, setOpen] = useState(false); + const { count } = useTrustRelationshipsContext(); + const handleDrawerOpen = () => { setOpen(true); }; @@ -40,6 +44,7 @@ const Layout = ({ children }) => { diff --git a/src/components/layout/Menu/Menu.js b/src/components/layout/Menu/Menu.js index 2f9af7c..29ba576 100644 --- a/src/components/layout/Menu/Menu.js +++ b/src/components/layout/Menu/Menu.js @@ -6,9 +6,8 @@ import * as React from 'react'; import MenuItem from './MenuItem/MenuItem'; import { DrawerHeaderStyled, DrawerStyled } from './MenuStyled'; import TopMenu from './TopMenu/TopMenu'; -import { TrustRelationshipsProvider } from '../../../store/TrustRelationshipsContext'; -const Menu = ({ open, handleDrawerClose, handleDrawerOpen }) => { +const Menu = ({ open, handleDrawerClose, handleDrawerOpen, count }) => { const theme = useTheme(); return ( @@ -24,9 +23,7 @@ const Menu = ({ open, handleDrawerClose, handleDrawerOpen }) => { )} - - - + ); diff --git a/src/components/layout/Menu/MenuItem/MenuItem.js b/src/components/layout/Menu/MenuItem/MenuItem.js index 5d2bd0d..469c28a 100644 --- a/src/components/layout/Menu/MenuItem/MenuItem.js +++ b/src/components/layout/Menu/MenuItem/MenuItem.js @@ -6,12 +6,10 @@ import HandshakeIcon from '@mui/icons-material/Handshake'; import DriveFileMoveIcon from '@mui/icons-material/DriveFileMove'; import * as React from 'react'; import LinkItem from './LinkItem'; -import { useTrustRelationshipsContext } from '../../../../store/TrustRelationshipsContext'; import { useState } from 'react'; -const MenuItem = ({ open }) => { +const MenuItem = ({ open, count }) => { const [isHovered, setIsHovered] = useState(false); - const { count } = useTrustRelationshipsContext(); return ( <>