fix changes suggested

bryanlundberg · Oct 3, 2024 · 6d37e0d · 6d37e0d
1 parent 47b11dc
commit 6d37e0d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 27 deletions.
diff --git a/src/components/navbar/NavItem.tsx b/src/components/navbar/NavItem.tsx
@@ -1,17 +1,15 @@
 import { Link, usePathname } from "@/i18n/routing";
 import { twMerge } from "tailwind-merge";
 import { InteractiveIcon } from "../timer/InteractiveIcon";
-import { useTranslations } from "next-intl";
 
 interface NavItem {
   path: string;
   icon: React.ReactNode;
-  toolTipMessage:any;
+  toolTipMessage:string;
 }
 
 export function NavItem({ path, icon , toolTipMessage}: NavItem) {
   const pathname = usePathname();
-  const t = useTranslations();
   return (
     <>
       <li className="grow first:rounded-s-md last:rounded-e-md overflow-hidden">
@@ -27,7 +25,7 @@ export function NavItem({ path, icon , toolTipMessage}: NavItem) {
           <InteractiveIcon
               icon={icon}
               animation={false}
-              message={t(toolTipMessage)}
+              message={toolTipMessage}
             />
         </Link>
       </li>

diff --git a/src/components/navbar/Navbar.tsx b/src/components/navbar/Navbar.tsx
@@ -6,29 +6,7 @@ import {
   CubeIcon,
   StackIcon,
 } from "@radix-ui/react-icons";
-
-const navigation: Navigation = [
-  {
-    path: "/",
-    icon: <ClockIcon />,
-    toolTipMessage: "Index.HomePage.title",
-  },
-  {
-    path: "/solves",
-    icon: <StackIcon />,
-    toolTipMessage: "Index.SolvesPage.title",
-  },
-  {
-    path: "/stats",
-    icon: <BarChartIcon />,
-    toolTipMessage: "Index.StatsPage.title",
-  },
-  {
-    path: "/cubes",
-    icon: <CubeIcon />,
-    toolTipMessage: "Index.CubesPage.title",
-  },
-];
+import { useTranslations } from "next-intl";
 
 type Navigation = NavItem[];
 
@@ -39,6 +17,31 @@ interface NavItem {
 }
 
 export default function Navbar() {
+
+  const t = useTranslations("Index");
+
+  const navigation: Navigation = [
+    {
+      path: "/",
+      icon: <ClockIcon />,
+      toolTipMessage: t("HomePage.title"),
+    },
+    {
+      path: "/solves",
+      icon: <StackIcon />,
+      toolTipMessage: t("SolvesPage.title"),
+    },
+    {
+      path: "/stats",
+      icon: <BarChartIcon />,
+      toolTipMessage: t("StatsPage.title"),
+    },
+    {
+      path: "/cubes",
+      icon: <CubeIcon />,
+      toolTipMessage: t("CubesPage.title"),
+    },
+  ];
   return (
     <NavContainer>
       {navigation.map((item: NavItem) => {