- {t("local_ipaddress")}:
+ {t("local_ip_address")}:
{asset?.meta?.local_ip_address}
diff --git a/src/Components/Common/Sidebar/Sidebar.tsx b/src/Components/Common/Sidebar/Sidebar.tsx
index 4e3929b187f..549cadabb09 100644
--- a/src/Components/Common/Sidebar/Sidebar.tsx
+++ b/src/Components/Common/Sidebar/Sidebar.tsx
@@ -8,6 +8,13 @@ import SlideOver from "../../../CAREUI/interactive/SlideOver";
import { classNames } from "../../../Utils/utils";
import { Link } from "raviger";
import careConfig from "@careConfig";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "@/Components/ui/tooltip";
+import { useTranslation } from "react-i18next";
import { useCareAppNavItems } from "@/Common/hooks/useCareApps";
export const SIDEBAR_SHRINK_PREFERENCE_KEY = "sidebarShrinkPreference";
@@ -39,15 +46,16 @@ const StatelessSidebar = ({
setShrinked,
onItemClick,
}: StatelessSidebarProps) => {
+ const { t } = useTranslation();
const BaseNavItems: INavItem[] = [
- { text: "Facilities", to: "/facility", icon: "l-hospital" },
- { text: "Patients", to: "/patients", icon: "l-user-injured" },
- { text: "Assets", to: "/assets", icon: "l-shopping-cart-alt" },
- { text: "Sample Test", to: "/sample", icon: "l-medkit" },
- { text: "Shifting", to: "/shifting", icon: "l-ambulance" },
- { text: "Resource", to: "/resource", icon: "l-heart-medical" },
- { text: "Users", to: "/users", icon: "l-users-alt" },
- { text: "Notice Board", to: "/notice_board", icon: "l-meeting-board" },
+ { text: t("facilities"), to: "/facility", icon: "l-hospital" },
+ { text: t("patients"), to: "/patients", icon: "l-user-injured" },
+ { text: t("assets"), to: "/assets", icon: "l-shopping-cart-alt" },
+ { text: t("sample_test"), to: "/sample", icon: "l-medkit" },
+ { text: t("shifting"), to: "/shifting", icon: "l-ambulance" },
+ { text: t("resource"), to: "/resource", icon: "l-heart-medical" },
+ { text: t("users"), to: "/users", icon: "l-users-alt" },
+ { text: t("notice_board"), to: "/notice_board", icon: "l-meeting-board" },
];
const PluginNavItems = useCareAppNavItems();
@@ -65,23 +73,21 @@ const StatelessSidebar = ({
const updateIndicator = () => {
if (!indicatorRef.current) return;
const index = NavItems.findIndex((item) => item.to === activeLink);
- const navItemCount = NavItems.length + (careConfig.urls.dashboard ? 2 : 1); // +2 for notification and dashboard
+ const navItemCount = NavItems.length + (careConfig.urls.dashboard ? 2 : 1);
if (index !== -1) {
- // Haha math go brrrrrrrrr
-
const e = indicatorRef.current;
const itemHeight = activeLinkRef.current?.clientHeight || 0;
- if (lastIndicatorPosition > index) {
- e.style.top = `${itemHeight * (index + 0.37)}px`;
- setTimeout(() => {
- e.style.bottom = `${itemHeight * (navItemCount - 0.63 - index)}px`;
- }, 50);
- } else {
- e.style.bottom = `${itemHeight * (navItemCount - 0.63 - index)}px`;
- setTimeout(() => {
- e.style.top = `${itemHeight * (index + 0.37)}px`;
- }, 50);
- }
+ const itemOffset = index * itemHeight;
+
+ const indicatorHeight = indicatorRef.current.clientHeight;
+ const indicatorOffset = (itemHeight - indicatorHeight) / 2;
+
+ const top = `${itemOffset + indicatorOffset}px`;
+ const bottom = `${navItemCount * itemHeight - itemOffset - indicatorOffset}px`;
+
+ e.style.top = top;
+ e.style.bottom = bottom;
+
setLastIndicatorPosition(index);
} else {
indicatorRef.current.style.display = "none";
@@ -103,7 +109,7 @@ const StatelessSidebar = ({
return (
)}
+ 