From 1c31b13438cd795a1759a2ee066d9c7372b902ba Mon Sep 17 00:00:00 2001 From: Daniel Cojocea Date: Mon, 19 Aug 2024 15:00:11 -0400 Subject: [PATCH] Added tooltips to buttons in collapsed view --- Client/src/Components/Sidebar/index.jsx | 133 ++++++++++++++++-------- 1 file changed, 92 insertions(+), 41 deletions(-) diff --git a/Client/src/Components/Sidebar/index.jsx b/Client/src/Components/Sidebar/index.jsx index cb1232b9c..e197f2dbf 100644 --- a/Client/src/Components/Sidebar/index.jsx +++ b/Client/src/Components/Sidebar/index.jsx @@ -184,32 +184,29 @@ function Sidebar() { > {menu.map((item) => item.path ? ( - navigate(`/${item.path}`)} - sx={{ - gap: theme.gap.medium, - borderRadius: `${theme.shape.borderRadius}px`, - justifyContent: collapsed ? "center" : "flex-start", + - {item.icon} - {!collapsed && {item.name}} - - ) : collapsed ? ( - openPopup(event, item.name)} + key={item.path} + onClick={() => navigate(`/${item.path}`)} sx={{ - position: "relative", gap: theme.gap.medium, borderRadius: `${theme.shape.borderRadius}px`, justifyContent: collapsed ? "center" : "flex-start", @@ -218,6 +215,43 @@ function Sidebar() { {item.icon} {!collapsed && {item.name}} + + ) : collapsed ? ( + + + openPopup(event, item.name)} + sx={{ + position: "relative", + gap: theme.gap.medium, + borderRadius: `${theme.shape.borderRadius}px`, + justifyContent: collapsed ? "center" : "flex-start", + }} + > + {item.icon} + {!collapsed && {item.name}} + + {other.map((item) => ( - - item.path === "support" - ? window.open( - "https://github.com/bluewave-labs/bluewave-uptime", - "_blank", - "noreferrer" - ) - : navigate(`/${item.path}`) - } - sx={{ - gap: theme.gap.medium, - borderRadius: `${theme.shape.borderRadius}px`, - justifyContent: collapsed ? "center" : "flex-start", + - {item.icon} - {!collapsed && {item.name}} - + + item.path === "support" + ? window.open( + "https://github.com/bluewave-labs/bluewave-uptime", + "_blank", + "noreferrer" + ) + : navigate(`/${item.path}`) + } + sx={{ + gap: theme.gap.medium, + borderRadius: `${theme.shape.borderRadius}px`, + justifyContent: collapsed ? "center" : "flex-start", + }} + > + {item.icon} + {!collapsed && {item.name}} + + ))}