From 88e75511d77d7ee9439ad03d2ce8049199716d78 Mon Sep 17 00:00:00 2001
From: Timothy Armes <tim@timothyarmes.com>
Date: Fri, 7 Jul 2023 09:34:05 +0200
Subject: [PATCH] Code tidy

---
 app/[lang]/components/Navbar.tsx         | 40 ++++++++++--------------
 app/[lang]/components/TestableLayout.tsx |  3 +-
 app/[lang]/layout.tsx                    |  3 +-
 {app => css}/globals.css                 |  0
 4 files changed, 20 insertions(+), 26 deletions(-)
 rename {app => css}/globals.css (100%)

diff --git a/app/[lang]/components/Navbar.tsx b/app/[lang]/components/Navbar.tsx
index 810e10f..fb28091 100644
--- a/app/[lang]/components/Navbar.tsx
+++ b/app/[lang]/components/Navbar.tsx
@@ -6,6 +6,12 @@ import Hamburger from "./Hamburger";
 export default function Navbar() {
   const t = useTranslations("Nav");
 
+  const links = [
+    { title: t("tournaments"), route: "/tournois" },
+    { title: t("about"), route: "/qui-sommes-nous" },
+    { title: t("contact"), route: "/contactez-nous" },
+  ];
+
   return (
     <nav
       className="relative mt-0 h-16 w-full overflow-x-clip border-b-[1px] bg-white px-5 dark:border-gray-700 dark:bg-gray-800"
@@ -29,30 +35,16 @@ export default function Navbar() {
           data-test="desktop-menu"
         >
           <ul className="list-reset flex h-full flex-1 items-center justify-around text-gray-900 no-underline dark:text-white md:flex-none">
-            <li className="mr-10 h-full">
-              <Link
-                className="inline-flex h-full items-center border-b-4 border-t-4 border-transparent transition-all duration-300 ease-in-out hover:border-b-teal-600"
-                href="/tournois"
-              >
-                {t("tournaments")}
-              </Link>
-            </li>
-            <li className="mr-10 h-full">
-              <Link
-                className="inline-flex h-full items-center border-b-4 border-t-4 border-transparent transition-all duration-300 ease-in-out hover:border-b-teal-600"
-                href="/qui-sommes-nous"
-              >
-                {t("about")}
-              </Link>
-            </li>
-            <li className="mr-10 h-full">
-              <Link
-                className="inline-flex h-full items-center border-b-4 border-t-4 border-transparent transition-all duration-300 ease-in-out hover:border-b-teal-600"
-                href="/contactez-nous"
-              >
-                {t("contact")}
-              </Link>
-            </li>
+            {links.map(({ title, route }) => (
+              <li key={route} className="mr-10 h-full">
+                <Link
+                  className="inline-flex h-full items-center border-b-4 border-t-4 border-transparent transition-all duration-300 ease-in-out hover:border-b-teal-600"
+                  href={route}
+                >
+                  {title}
+                </Link>
+              </li>
+            ))}
           </ul>
         </div>
       </div>
diff --git a/app/[lang]/components/TestableLayout.tsx b/app/[lang]/components/TestableLayout.tsx
index dcc8188..6b2c4d9 100644
--- a/app/[lang]/components/TestableLayout.tsx
+++ b/app/[lang]/components/TestableLayout.tsx
@@ -1,7 +1,8 @@
 import { NextIntlClientProvider, AbstractIntlMessages } from "next-intl";
 import { ReactNode } from "react";
 
-import "@/app/globals.css";
+import "@/css/globals.css";
+
 import Navbar from "./Navbar";
 import Footer from "./Footer";
 
diff --git a/app/[lang]/layout.tsx b/app/[lang]/layout.tsx
index a4e8e6b..36a9192 100644
--- a/app/[lang]/layout.tsx
+++ b/app/[lang]/layout.tsx
@@ -5,7 +5,8 @@ import { getTranslator } from "next-intl/server";
 import { notFound } from "next/navigation";
 import { ReactNode } from "react";
 
-import "@/app/globals.css";
+import "@/css/globals.css";
+
 import Providers from "./providers";
 import TestableLayout from "./components/TestableLayout";
 
diff --git a/app/globals.css b/css/globals.css
similarity index 100%
rename from app/globals.css
rename to css/globals.css