MERMS/MermsFirstOffice
1
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

fixed use context error

Browse Source
This commit was merged in pull request #4.
This commit is contained in:
victorAnumudu
2025-09-09 17:40:41 +01:00
parent 59184d38aa
commit f2671c44a2
11 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/layouts/aside/AsideLink.jsx
+2 -2
View File
@@ -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()
src/components/layouts/aside/AsideLinkWithSubLinks.jsx
+2 -2
View File
@@ -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()
src/components/layouts/aside/DashboardAside.jsx
+2 -2
View File
@@ -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
src/components/layouts/aside/_DashboardAside.jsx
+2 -2
View File
@@ -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
src/components/layouts/aside/__DashboardAside.jsx
+2 -2
View File
@@ -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