first
This commit is contained in:
@@ -185,19 +185,18 @@ const Sidebar: React.FC<SidebarProps> = ({
|
||||
openMonitoring,
|
||||
openFloorNavigation,
|
||||
openNotifications,
|
||||
openListOfDetectors,
|
||||
openSensors,
|
||||
openListOfDetectors,
|
||||
closeSensors,
|
||||
closeListOfDetectors,
|
||||
closeMonitoring,
|
||||
closeFloorNavigation,
|
||||
closeNotifications,
|
||||
closeListOfDetectors,
|
||||
closeSensors,
|
||||
closeAllMenus,
|
||||
showMonitoring,
|
||||
showFloorNavigation,
|
||||
showNotifications,
|
||||
showListOfDetectors,
|
||||
showSensors
|
||||
showSensors,
|
||||
showListOfDetectors
|
||||
} = useNavigationStore()
|
||||
|
||||
useEffect(() => {
|
||||
@@ -229,14 +228,10 @@ const Sidebar: React.FC<SidebarProps> = ({
|
||||
case 3: // Monitoring
|
||||
if (pathname !== '/navigation') {
|
||||
router.push('/navigation')
|
||||
setTimeout(() => {
|
||||
closeAllMenus()
|
||||
openMonitoring()
|
||||
}, 100)
|
||||
setTimeout(() => openMonitoring(), 100)
|
||||
} else if (showMonitoring) {
|
||||
closeMonitoring()
|
||||
} else {
|
||||
closeAllMenus()
|
||||
openMonitoring()
|
||||
}
|
||||
handled = true
|
||||
@@ -244,14 +239,10 @@ const Sidebar: React.FC<SidebarProps> = ({
|
||||
case 4: // Floor Navigation
|
||||
if (pathname !== '/navigation') {
|
||||
router.push('/navigation')
|
||||
setTimeout(() => {
|
||||
closeAllMenus()
|
||||
openFloorNavigation()
|
||||
}, 100)
|
||||
setTimeout(() => openFloorNavigation(), 100)
|
||||
} else if (showFloorNavigation) {
|
||||
closeFloorNavigation()
|
||||
} else {
|
||||
closeAllMenus()
|
||||
openFloorNavigation()
|
||||
}
|
||||
handled = true
|
||||
@@ -259,14 +250,10 @@ const Sidebar: React.FC<SidebarProps> = ({
|
||||
case 5: // Notifications
|
||||
if (pathname !== '/navigation') {
|
||||
router.push('/navigation')
|
||||
setTimeout(() => {
|
||||
closeAllMenus()
|
||||
openNotifications()
|
||||
}, 100)
|
||||
setTimeout(() => openNotifications(), 100)
|
||||
} else if (showNotifications) {
|
||||
closeNotifications()
|
||||
} else {
|
||||
closeAllMenus()
|
||||
openNotifications()
|
||||
}
|
||||
handled = true
|
||||
@@ -274,29 +261,21 @@ const Sidebar: React.FC<SidebarProps> = ({
|
||||
case 6: // Sensors
|
||||
if (pathname !== '/navigation') {
|
||||
router.push('/navigation')
|
||||
setTimeout(() => {
|
||||
closeAllMenus()
|
||||
openSensors()
|
||||
}, 100)
|
||||
setTimeout(() => openSensors(), 100)
|
||||
} else if (showSensors) {
|
||||
closeSensors()
|
||||
} else {
|
||||
closeAllMenus()
|
||||
openSensors()
|
||||
}
|
||||
handled = true
|
||||
break
|
||||
case 7: // List of Detectors
|
||||
case 7: // Detector List
|
||||
if (pathname !== '/navigation') {
|
||||
router.push('/navigation')
|
||||
setTimeout(() => {
|
||||
closeAllMenus()
|
||||
openListOfDetectors()
|
||||
}, 100)
|
||||
setTimeout(() => openListOfDetectors(), 100)
|
||||
} else if (showListOfDetectors) {
|
||||
closeListOfDetectors()
|
||||
} else {
|
||||
closeAllMenus()
|
||||
openListOfDetectors()
|
||||
}
|
||||
handled = true
|
||||
@@ -352,8 +331,8 @@ const Sidebar: React.FC<SidebarProps> = ({
|
||||
return (
|
||||
<li key={item.id} className="flex-col flex items-center relative self-stretch w-full" role="listitem">
|
||||
<button
|
||||
className={`gap-2 pt-2 pr-2 pb-2 pl-2 rounded-md flex h-9 items-center relative self-stretch w-full transition-colors duration-200 hover:bg-gray-700 focus:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-inset ${
|
||||
isActive ? 'bg-gray-700' : ''
|
||||
className={`gap-2 pt-2 pr-2 pb-2 pl-2 rounded-md flex h-9 items-center relative self-stretch w-full transition-all duration-200 hover:bg-gray-700 focus:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-inset ${
|
||||
isActive ? 'bg-gradient-to-r from-blue-600 to-cyan-500 shadow-lg shadow-blue-500/30' : ''
|
||||
}`}
|
||||
onClick={() => handleItemClick(item.id)}
|
||||
aria-current={isActive ? 'page' : undefined}
|
||||
@@ -379,8 +358,6 @@ const Sidebar: React.FC<SidebarProps> = ({
|
||||
closeMonitoring()
|
||||
closeFloorNavigation()
|
||||
closeNotifications()
|
||||
closeListOfDetectors()
|
||||
closeSensors()
|
||||
}
|
||||
toggleNavigationSubMenu()
|
||||
}}
|
||||
@@ -395,8 +372,6 @@ const Sidebar: React.FC<SidebarProps> = ({
|
||||
closeMonitoring()
|
||||
closeFloorNavigation()
|
||||
closeNotifications()
|
||||
closeListOfDetectors()
|
||||
closeSensors()
|
||||
}
|
||||
toggleNavigationSubMenu()
|
||||
}
|
||||
@@ -426,8 +401,8 @@ const Sidebar: React.FC<SidebarProps> = ({
|
||||
return (
|
||||
<li key={subItem.id} className="flex-col flex h-8 items-center relative self-stretch w-full" role="listitem">
|
||||
<button
|
||||
className={`gap-2 pt-1.5 pr-2 pb-1.5 pl-2 rounded-md flex h-8 items-center relative self-stretch w-full transition-colors duration-200 hover:bg-gray-600 focus:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-inset ${
|
||||
isSubActive ? 'bg-gray-600' : ''
|
||||
className={`gap-2 pt-1.5 pr-2 pb-1.5 pl-2 rounded-md flex h-8 items-center relative self-stretch w-full transition-all duration-200 hover:bg-gray-600 focus:bg-gray-600 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-inset ${
|
||||
isSubActive ? 'bg-gradient-to-r from-blue-600 to-cyan-500 shadow-lg shadow-blue-500/30' : ''
|
||||
}`}
|
||||
onClick={() => handleItemClick(subItem.id)}
|
||||
aria-current={isSubActive ? 'page' : undefined}
|
||||
@@ -461,8 +436,6 @@ const Sidebar: React.FC<SidebarProps> = ({
|
||||
closeMonitoring()
|
||||
closeFloorNavigation()
|
||||
closeNotifications()
|
||||
closeListOfDetectors()
|
||||
closeSensors()
|
||||
}
|
||||
// Убираем сайд-бар
|
||||
toggleSidebar()
|
||||
@@ -511,7 +484,7 @@ const Sidebar: React.FC<SidebarProps> = ({
|
||||
</div>
|
||||
|
||||
<button
|
||||
className="!relative !w-8 !h-8 p-1.5 rounded-lg bg-gray-800/60 border border-gray-600/40 shadow-lg hover:shadow-xl hover:bg-gray-700 focus:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-blue-500 transition-all duration-200"
|
||||
className="relative w-4 h-4 aspect-[1] p-1 rounded hover:bg-gray-700 focus:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-blue-500 transition-colors duration-200"
|
||||
aria-label="Logout"
|
||||
title="Выйти"
|
||||
type="button"
|
||||
|
||||
Reference in New Issue
Block a user