diff --git a/src/App.js b/src/App.js index ef7d8a1..361c8fd 100644 --- a/src/App.js +++ b/src/App.js @@ -4,7 +4,7 @@ import { QueryClientProvider, QueryClient } from '@tanstack/react-query' import SiteRoutes from './SiteRoutes'; import LogoutModal from './components/layouts/LogoutModal'; -import { generalLayoutContext } from './context/GeneralLayoutContext'; +import { GeneralLayoutContext } from './context/GeneralLayoutContext'; import './App.css'; @@ -24,7 +24,7 @@ function App() { const {pathname} = useLocation() - const {logoutModal, setLogoutModal} = generalLayoutContext() + const {logoutModal, setLogoutModal} = GeneralLayoutContext() useEffect(()=>{ window.scrollTo(0,0) diff --git a/src/components/layouts/DashboardHeader.jsx b/src/components/layouts/DashboardHeader.jsx index 67c0190..49a3a69 100644 --- a/src/components/layouts/DashboardHeader.jsx +++ b/src/components/layouts/DashboardHeader.jsx @@ -1,7 +1,7 @@ import { LuSunDim } from "react-icons/lu"; import { IoMdSunny } from "react-icons/io"; -import { generalLayoutContext } from "../../context/GeneralLayoutContext" +import { GeneralLayoutContext } from "../../context/GeneralLayoutContext" import UserAvatar from '../../assets/user_avatar.jpg' import HandBurger from "./HandBurger" @@ -15,7 +15,7 @@ export default function DashboardHeader() { // let {pathname} = useLocation() - const {theme, handleTheme, setLogoutModal, activeMenu, handleActiveMenu, showAsideDrawer, setShowAsideDrawer} = generalLayoutContext() + const {theme, handleTheme, setLogoutModal, activeMenu, handleActiveMenu, showAsideDrawer, setShowAsideDrawer} = GeneralLayoutContext() return ( <> diff --git a/src/components/layouts/DashboardLayout.jsx b/src/components/layouts/DashboardLayout.jsx index 3eccf23..4efdffb 100644 --- a/src/components/layouts/DashboardLayout.jsx +++ b/src/components/layouts/DashboardLayout.jsx @@ -1,7 +1,7 @@ import { Outlet } from 'react-router-dom' import DashboardHeader from './DashboardHeader' -import { generalLayoutContext } from '../../context/GeneralLayoutContext' +import { GeneralLayoutContext } from '../../context/GeneralLayoutContext' import DashboardAside from './aside/DashboardAside' import RightAsideBar from './rightaside/RightAsideBar' @@ -9,7 +9,7 @@ export default function DashboardLayout() { // let {pathname} = useLocation() - const {showAsideDrawer, setShowAsideDrawer} = generalLayoutContext() + const {showAsideDrawer, setShowAsideDrawer} = GeneralLayoutContext() return (
diff --git a/src/components/layouts/_DashboardLayout.jsx b/src/components/layouts/_DashboardLayout.jsx index 6133830..0516412 100644 --- a/src/components/layouts/_DashboardLayout.jsx +++ b/src/components/layouts/_DashboardLayout.jsx @@ -4,7 +4,6 @@ import { FaArrowRight, FaArrowLeft } from "react-icons/fa6"; import DashboardAside from './aside/DashboardAside' import DashboardHeader from './DashboardHeader' -import { generalLayoutContext } from '../../context/GeneralLayoutContext' export default function DashboardLayout() { const [shrinkAside, setShrinkAside] = useState(false) diff --git a/src/components/layouts/aside/AsideLink.jsx b/src/components/layouts/aside/AsideLink.jsx index a5edfb6..6f7ba00 100644 --- a/src/components/layouts/aside/AsideLink.jsx +++ b/src/components/layouts/aside/AsideLink.jsx @@ -1,10 +1,10 @@ import { Link, useLocation } from "react-router-dom" import Icons from "../../Icons" -import { generalLayoutContext } from "../../../context/GeneralLayoutContext" +import { GeneralLayoutContext } from "../../../context/GeneralLayoutContext" export default function AsideLink({name, to, icon}) { - const {shrinkAside, setShowAsideDrawer} = generalLayoutContext() + const {shrinkAside, setShowAsideDrawer} = GeneralLayoutContext() const {pathname} = useLocation() diff --git a/src/components/layouts/aside/AsideLinkWithSubLinks.jsx b/src/components/layouts/aside/AsideLinkWithSubLinks.jsx index 2675dc1..32f7aac 100644 --- a/src/components/layouts/aside/AsideLinkWithSubLinks.jsx +++ b/src/components/layouts/aside/AsideLinkWithSubLinks.jsx @@ -2,12 +2,12 @@ import { useState } from "react"; import { useLocation } from "react-router-dom" import { FaCaretDown } from "react-icons/fa"; import Icons from "../../Icons"; -import { generalLayoutContext } from "../../../context/GeneralLayoutContext"; +import { GeneralLayoutContext } from "../../../context/GeneralLayoutContext"; export default function AsideLinkWithSubLinks({name, icon, to, children, isOpen}) { - const {shrinkAside} = generalLayoutContext() + const {shrinkAside} = GeneralLayoutContext() const {pathname} = useLocation() diff --git a/src/components/layouts/aside/DashboardAside.jsx b/src/components/layouts/aside/DashboardAside.jsx index 0fe90a0..61bfe0c 100644 --- a/src/components/layouts/aside/DashboardAside.jsx +++ b/src/components/layouts/aside/DashboardAside.jsx @@ -5,7 +5,7 @@ import MainBtn from "../../MainBtn"; import AsideLink from "./AsideLink"; import AsideLinkWithSubLinks from "./AsideLinkWithSubLinks"; import { useSelector } from "react-redux"; -import { generalLayoutContext } from "../../../context/GeneralLayoutContext"; +import { GeneralLayoutContext } from "../../../context/GeneralLayoutContext"; import { TbLogout2 } from "react-icons/tb"; import UserAvatar from '../../../assets/user_avatar.jpg' import Icons from "../../Icons"; @@ -14,7 +14,7 @@ export default function DashboardAside() { const {pathname} = useLocation() - const {setLogoutModal, activeMenu, handleActiveMenu} = generalLayoutContext() + const {setLogoutModal, activeMenu, handleActiveMenu} = GeneralLayoutContext() const {userDetails} = useSelector((state) => state.userDetails) // GETS LOGGED IN USER ROLE DETAILS const {role}= userDetails diff --git a/src/components/layouts/aside/_DashboardAside.jsx b/src/components/layouts/aside/_DashboardAside.jsx index cc7f593..a1bd05e 100644 --- a/src/components/layouts/aside/_DashboardAside.jsx +++ b/src/components/layouts/aside/_DashboardAside.jsx @@ -6,7 +6,7 @@ import MainBtn from "../../MainBtn"; import AsideLink from "./AsideLink"; import AsideLinkWithSubLinks from "./AsideLinkWithSubLinks"; import { useSelector } from "react-redux"; -import { generalLayoutContext } from "../../../context/GeneralLayoutContext"; +import { GeneralLayoutContext } from "../../../context/GeneralLayoutContext"; import { TbLogout2 } from "react-icons/tb"; @@ -14,7 +14,7 @@ export default function DashboardAside({shrinkAside=false}) { const {pathname} = useLocation() - const {setLogoutModal} = generalLayoutContext() + const {setLogoutModal} = GeneralLayoutContext() const {userDetails} = useSelector((state) => state.userDetails) // GETS LOGGED IN USER ROLE DETAILS const {role}= userDetails diff --git a/src/components/layouts/aside/__DashboardAside.jsx b/src/components/layouts/aside/__DashboardAside.jsx index 6b953f1..59a9ea6 100644 --- a/src/components/layouts/aside/__DashboardAside.jsx +++ b/src/components/layouts/aside/__DashboardAside.jsx @@ -6,7 +6,7 @@ import MainBtn from "../../MainBtn"; import AsideLink from "./AsideLink"; import AsideLinkWithSubLinks from "./AsideLinkWithSubLinks"; import { useSelector } from "react-redux"; -import { generalLayoutContext } from "../../../context/GeneralLayoutContext"; +import { GeneralLayoutContext } from "../../../context/GeneralLayoutContext"; import { TbLogout2 } from "react-icons/tb"; @@ -14,7 +14,7 @@ export default function DashboardAside({shrinkAside=false}) { const {pathname} = useLocation() - const {setLogoutModal} = generalLayoutContext() + const {setLogoutModal} = GeneralLayoutContext() const {userDetails} = useSelector((state) => state.userDetails) // GETS LOGGED IN USER ROLE DETAILS const {role}= userDetails diff --git a/src/context/GeneralLayoutContext.jsx b/src/context/GeneralLayoutContext.jsx index 813104b..0be00e3 100644 --- a/src/context/GeneralLayoutContext.jsx +++ b/src/context/GeneralLayoutContext.jsx @@ -108,6 +108,6 @@ export default function GeneralLayoutContextInt({children}) { } -export const generalLayoutContext = () => { +export const GeneralLayoutContext = () => { return useContext(GeneralContextProviderInt) } diff --git a/src/index.js b/src/index.js index df3ff95..942211e 100644 --- a/src/index.js +++ b/src/index.js @@ -6,7 +6,7 @@ import { Provider } from "react-redux"; import './index.css'; import App from './App'; import store from './store/store.js' -import GeneralLayoutContext from './context/GeneralLayoutContext.jsx'; +import GeneralLayoutContextInt from './context/GeneralLayoutContext.jsx'; const root = ReactDOM.createRoot(document.getElementById('root')); @@ -14,9 +14,9 @@ root.render( - + - +