diff --git a/Employee_Managment_App/src/App.tsx b/Employee_Managment_App/src/App.tsx index 87dfc8d..a7a39b6 100644 --- a/Employee_Managment_App/src/App.tsx +++ b/Employee_Managment_App/src/App.tsx @@ -93,6 +93,7 @@ function App() { isOpen={sbIsOpen} type={sbType as any} position="Left" + className='app-nav-sidebar' showBackdrop={!isDesktop} closeOnDocumentClick={!isDesktop} open={() => { diff --git a/Employee_Managment_App/src/components/EmployeeInfo.tsx b/Employee_Managment_App/src/components/EmployeeInfo.tsx index acce3d5..3ad2292 100644 --- a/Employee_Managment_App/src/components/EmployeeInfo.tsx +++ b/Employee_Managment_App/src/components/EmployeeInfo.tsx @@ -235,14 +235,12 @@ const EmployeeInfo = (props: { employeeData?: EmployeeDetails; userInfo?: Employ {employeeData && userInfo && - (userInfo.Name === employeeData.Name || - userInfo.Name === employeeData.TeamLead) && ( + (userInfo.Name === employeeData.Name) && ( )} {employeeData && userInfo && - (userInfo.Name === employeeData.Name || - userInfo.Name === employeeData.TeamLead) && ( + (userInfo.Name === employeeData.Name) && ( )} {employeeData && diff --git a/Employee_Managment_App/src/components/TopNav.tsx b/Employee_Managment_App/src/components/TopNav.tsx index 10752af..1e667d2 100644 --- a/Employee_Managment_App/src/components/TopNav.tsx +++ b/Employee_Managment_App/src/components/TopNav.tsx @@ -58,7 +58,6 @@ const TopNav: React.FC = ({ const [query, setQuery] = useState(''); const [avatarMenuOpen, setAvatarMenuOpen] = useState(false); const [mobileSearchOpen, setMobileSearchOpen] = useState(false); - const [createMenuOpen, setCreateMenuOpen] = useState(false); const [panelOpen, setPanelOpen] = useState(false); const [panelTab, setPanelTab] = useState<'notifications' | 'announcements'>('announcements'); @@ -84,13 +83,11 @@ const TopNav: React.FC = ({ setAvatarMenuOpen(false); } if (createRef.current && !createRef.current.contains(ev.target as Node)) { - setCreateMenuOpen(false); } }; const handleEsc = (e: KeyboardEvent) => { if (e.key === 'Escape') { setAvatarMenuOpen(false); - setCreateMenuOpen(false); setMobileSearchOpen(false); setPanelOpen(false); } @@ -187,31 +184,6 @@ const TopNav: React.FC = ({ - - setCreateMenuOpen((o) => !o)} - aria-haspopup="menu" - aria-expanded={createMenuOpen} - title="Create" - > - Create - - - - {createMenuOpen && ( - - - Create Leave - - - Create Permission - - - )} - - diff --git a/Employee_Managment_App/src/index.css b/Employee_Managment_App/src/index.css index 06b93dd..d9d43b4 100644 --- a/Employee_Managment_App/src/index.css +++ b/Employee_Managment_App/src/index.css @@ -54143,7 +54143,9 @@ ejs-sidebar { visibility: hidden; will-change: transform; } - +.e-sidebar.app-nav-sidebar { + overflow: hidden; +} .e-sidebar.e-right.e-open, .e-sidebar.e-left.e-open { -webkit-transform: translateX(0%);