From 9fe0943df5bbb82f16e17b047ab588d6d74292ed Mon Sep 17 00:00:00 2001
From: Hessel van Bakel <Hesselvanbakel@gmail.com>
Date: Sun, 14 Apr 2024 23:05:34 +0200
Subject: [PATCH 1/2] team translations

added translations to the team page
---
 .../team/[team]/(container)/members/page.tsx  |  2 +-
 .../team/[team]/(container)/overview/page.tsx | 19 +++++----
 .../team/[team]/(container)/settings/page.tsx | 28 +++++++------
 .../[locale]/(console)/team/[team]/layout.tsx | 14 ++++---
 src/locales/en/pages.json                     | 41 +++++++++++++++++++
 src/locales/nl/pages.json                     | 41 +++++++++++++++++++
 6 files changed, 118 insertions(+), 27 deletions(-)

diff --git a/src/app/[locale]/(console)/team/[team]/(container)/members/page.tsx b/src/app/[locale]/(console)/team/[team]/(container)/members/page.tsx
index d5584ba..8cb1b7f 100644
--- a/src/app/[locale]/(console)/team/[team]/(container)/members/page.tsx
+++ b/src/app/[locale]/(console)/team/[team]/(container)/members/page.tsx
@@ -38,7 +38,7 @@ export default function Account() {
     const params = useParams();
     const slug = Array.isArray(params.team) ? params.team[0] : params.team;
     const { isPending, data, refetch } = useData(slug);
-    const t = useTranslations('pages.console.organisation.members');
+    const t = useTranslations('pages.console.team.members');
 
     if (!data?.team) return <NotFoundScreen text={t('not_found')} />;
     const team = data.team;
diff --git a/src/app/[locale]/(console)/team/[team]/(container)/overview/page.tsx b/src/app/[locale]/(console)/team/[team]/(container)/overview/page.tsx
index c937728..5b810c5 100644
--- a/src/app/[locale]/(console)/team/[team]/(container)/overview/page.tsx
+++ b/src/app/[locale]/(console)/team/[team]/(container)/overview/page.tsx
@@ -16,8 +16,13 @@ import { useParams } from 'next/navigation';
 import React from 'react';
 import { z } from 'zod';
 import { PageTitle } from '../../components/PageTitle';
+import { useTranslations } from 'next-intl';
+import { title } from 'process';
 
 export default function Account() {
+    const t = useTranslations(
+        'pages.console.team.overview'
+    );
     const params = useParams();
     const slug = Array.isArray(params.team) ? params.team[0] : params.team;
 
@@ -33,13 +38,13 @@ export default function Account() {
 
     return (
         <div className="flex flex-grow flex-col gap-6 pt-6">
-            <PageTitle team={team} title="Overview" />
+            <PageTitle team={team} title={t('title')} />
             <div className="grid grid-cols-1 gap-16 xl:grid-cols-3">
                 <div className="space-y-12 xl:col-span-2">
                     <div className="space-y-6">
                         <div className="flex justify-between gap-8">
                             <h2 className="text-xl font-semibold">
-                                Registrations
+                                {t('registrations')}
                             </h2>
                             <Link
                                 href={`/team/${slug}/registrations`}
@@ -48,8 +53,8 @@ export default function Account() {
                                 })}
                             >
                                 {registration_count >= 6
-                                    ? `View all ${registration_count} registrations`
-                                    : 'View all registrations'}
+                                    ? t("registration-count.multiple", {registration_count})
+                                    : t("registration-count.single")}
                                 <ArrowRight className="ml-2 h-4 w-4" />
                             </Link>
                         </div>
@@ -66,7 +71,7 @@ export default function Account() {
                 <div className="space-y-12">
                     <div className="space-y-6">
                         <div className="flex items-center justify-between gap-8">
-                            <h2 className="text-xl font-semibold">Members</h2>
+                            <h2 className="text-xl font-semibold">{t('members')}</h2>
                             <Link
                                 href={`/team/${slug}/members`}
                                 className={buttonVariants({
@@ -74,8 +79,8 @@ export default function Account() {
                                 })}
                             >
                                 {player_count >= 6
-                                    ? `View all ${player_count} members`
-                                    : 'View all members'}
+                                    ? t("member-count.multiple")
+                                    : t("member-count.single")}
                                 <ArrowRight className="ml-2 h-4 w-4" />
                             </Link>
                         </div>
diff --git a/src/app/[locale]/(console)/team/[team]/(container)/settings/page.tsx b/src/app/[locale]/(console)/team/[team]/(container)/settings/page.tsx
index fb4e2d9..a8b2b53 100644
--- a/src/app/[locale]/(console)/team/[team]/(container)/settings/page.tsx
+++ b/src/app/[locale]/(console)/team/[team]/(container)/settings/page.tsx
@@ -24,6 +24,9 @@ import { z } from 'zod';
 import { PageTitle } from '../../components/PageTitle';
 
 export default function Account() {
+    const t = useTranslations(
+        'pages.console.team.settings'
+    );
     const params = useParams();
     const slug = Array.isArray(params.team) ? params.team[0] : params.team;
     const { isPending, data: team, refetch } = useTeam<Team>({ slug });
@@ -34,39 +37,38 @@ export default function Account() {
         <LoaderOverlay />
     ) : team ? (
         <div className="flex max-w-2xl flex-grow flex-col gap-6 pt-6">
-            <PageTitle team={team} title="Settings" />
+            <PageTitle team={team} title= {t("title")} />
             <div className="flex w-full items-center justify-between gap-16 rounded-lg border p-6">
                 <div className="flex flex-col gap-6">
                     <div className="space-y-2">
-                        <h2 className="text-xl font-bold">Team Logo</h2>
+                        <h2 className="text-xl font-bold">{t("logo.title")}</h2>
                         <p>
-                            This is the public logo of your team, shown all
-                            throughout {brand_name}.
+                            {t("logo.description")}
                         </p>
                     </div>
                     <UploadImage
                         intent="logo"
                         actor={team}
                         triggerRefresh={refetch}
-                        title={'change logo'}
-                        description={'cjamge'}
+                        title={t("logo.change")}
+                        description={t("logo.description")}
                     />
                 </div>
                 <Avatar profile={team} renderBadge={false} size="huge" />
             </div>
             <EditorBox
-                title="Team name"
-                description={`This is the public name of your team, shown all throughout ${brand_name}.`}
-                submit="Save name"
+                title={t("name.title")}
+                description={t("name.description")}
+                submit={t("name.submit")}
                 defaultValue={team.name}
                 mutate={mutate}
                 Schema={Team.pick({ name: true })}
                 field="name"
             />
             <EditorBox
-                title="Team description"
-                description={`This is the public description of your team, shown all throughout ${brand_name}.`}
-                submit="Save description"
+                title={t("description.title")}
+                description={t("description.description")}
+                submit={t("description.submit")}
                 defaultValue={team.description}
                 mutate={mutate}
                 Schema={Team.pick({ description: true })}
@@ -76,7 +78,7 @@ export default function Account() {
             <DangerZone team={team} />
         </div>
     ) : (
-        <NotFoundScreen text="Team not found" />
+        <NotFoundScreen text={t("not_found")} />
     );
 }
 
diff --git a/src/app/[locale]/(console)/team/[team]/layout.tsx b/src/app/[locale]/(console)/team/[team]/layout.tsx
index 26b440d..62b3116 100644
--- a/src/app/[locale]/(console)/team/[team]/layout.tsx
+++ b/src/app/[locale]/(console)/team/[team]/layout.tsx
@@ -11,10 +11,14 @@ import { useAuth } from '@/lib/auth';
 import { useRouter } from '@/locales/navigation';
 import { User } from '@/schema/resources/user';
 import { ArrowLeft } from 'lucide-react';
+import { useTranslations } from 'next-intl';
 import { useParams } from 'next/navigation';
 import React, { ReactNode, useEffect } from 'react';
 
 export default function TeamLayout({ children }: { children: ReactNode }) {
+    const t = useTranslations(
+        'pages.console.team'
+    );
     const router = useRouter();
     const params = useParams();
     const slug = Array.isArray(params.team) ? params.team[0] : params.team;
@@ -41,12 +45,10 @@ export default function TeamLayout({ children }: { children: ReactNode }) {
                     <NavbarSubLink>
                         <ArrowLeft />
                     </NavbarSubLink>
-                    <NavbarSubLink link="overview">Overview</NavbarSubLink>
-                    <NavbarSubLink link="registrations">
-                        Registrations
-                    </NavbarSubLink>
-                    <NavbarSubLink link="members">Members</NavbarSubLink>
-                    <NavbarSubLink link="settings">Settings</NavbarSubLink>
+                    <NavbarSubLink link="overview">{t("overview.title")}</NavbarSubLink>
+                    <NavbarSubLink link="registrations">{t("registration.title")}</NavbarSubLink>
+                    <NavbarSubLink link="members">{t("members.title")}</NavbarSubLink>
+                    <NavbarSubLink link="settings">{t("settings.title")}</NavbarSubLink>
                 </NavbarSubLinks>
             </Navbar>
             <div className="flex flex-grow flex-col pb-24 pt-8">
diff --git a/src/locales/en/pages.json b/src/locales/en/pages.json
index 2e2b456..99d6269 100644
--- a/src/locales/en/pages.json
+++ b/src/locales/en/pages.json
@@ -559,6 +559,47 @@
           "confirmed": "Registration confirmed!"
         }
       }
+    },
+    "team": {
+      "overview": {
+        "title": "Overview",
+        "registrations": "Registrations",
+        "members": "Members",
+        "registration-count": {
+          "single": "View registrations",
+          "multiple": "View all {registration_count} registrations"
+        },
+        "member-count": {
+          "single": "View members",
+          "multiple": "View all {player_count} members"
+        }
+      },
+      "registration": {
+        "title": "Registrations"
+      },
+      "members": {
+        "title": "Members",
+        "not_found": "Team not found"
+      },
+      "settings": {
+        "title": "Settings",
+        "not_found": "Team not found",
+        "logo": {
+          "title": "Team Logo",
+          "description": "This is the public logo of your team, shown all throughout {brand_name}.",
+          "change": "change logo"
+        },
+        "name": {
+          "title": "Team name",
+          "description": "This is the public name of your team, shown all throughout {brand_name}.",
+          "submit": "Save name"
+        },
+        "description": {
+          "title": "Team description",
+          "description": "This is the public description of your team, shown all throughout {brand_name}.",
+          "submit": "Save description"
+        }
+      }
     }
   },
   "account": {
diff --git a/src/locales/nl/pages.json b/src/locales/nl/pages.json
index 08a6ad8..5d92be3 100644
--- a/src/locales/nl/pages.json
+++ b/src/locales/nl/pages.json
@@ -559,6 +559,47 @@
         },
         "user-not-found": "Gebruiker niet gevonden"
       }
+    },
+    "team": {
+      "overview": {
+        "member-count": {
+          "multiple": "Bekijk alle {player_count} leden",
+          "single": "Bekijk leden"
+        },
+        "members": "Leden",
+        "registration-count": {
+          "multiple": "Bekijk alle {registration_count} registraties",
+          "single": "Bekijk registraties"
+        },
+        "registrations": "Registraties",
+        "title": "Overzicht"
+      },
+      "members": {
+        "not_found": "Team niet gevonden",
+        "title": "Leden"
+      },
+      "registration": {
+        "title": "Registraties"
+      },
+      "settings": {
+        "description": {
+          "description": "Dit is de openbare beschrijving van je team, die overal in {brand_name} wordt weergegeven.",
+          "submit": "Beschrijving opslaan",
+          "title": "Teambeschrijving"
+        },
+        "logo": {
+          "change": "logo wijzigen",
+          "description": "Dit is het openbare logo van je team, dat overal in {brand_name} wordt weergegeven.",
+          "title": "Teamlogo"
+        },
+        "name": {
+          "description": "Dit is de openbare naam van je team, die overal in {brand_name} wordt weergegeven.",
+          "submit": "Naam opslaan",
+          "title": "Teamnaam"
+        },
+        "not_found": "Team niet gevonden",
+        "title": "Instellingen"
+      }
     }
   },
   "account": {

From 4c5fcedb5b625df49bfb18163c2d1174cfc49196 Mon Sep 17 00:00:00 2001
From: Micha de Vries <micha@devrie.sh>
Date: Sun, 14 Apr 2024 23:15:21 +0200
Subject: [PATCH 2/2] linting

---
 .../team/[team]/(container)/overview/page.tsx | 21 +++++++------
 .../team/[team]/(container)/settings/page.tsx | 31 ++++++++-----------
 .../[locale]/(console)/team/[team]/layout.tsx | 20 +++++++-----
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/src/app/[locale]/(console)/team/[team]/(container)/overview/page.tsx b/src/app/[locale]/(console)/team/[team]/(container)/overview/page.tsx
index 5b810c5..25ea9b2 100644
--- a/src/app/[locale]/(console)/team/[team]/(container)/overview/page.tsx
+++ b/src/app/[locale]/(console)/team/[team]/(container)/overview/page.tsx
@@ -12,17 +12,14 @@ import { Team } from '@/schema/resources/team';
 import { User } from '@/schema/resources/user';
 import { useQuery } from '@tanstack/react-query';
 import { ArrowRight } from 'lucide-react';
+import { useTranslations } from 'next-intl';
 import { useParams } from 'next/navigation';
 import React from 'react';
 import { z } from 'zod';
 import { PageTitle } from '../../components/PageTitle';
-import { useTranslations } from 'next-intl';
-import { title } from 'process';
 
 export default function Account() {
-    const t = useTranslations(
-        'pages.console.team.overview'
-    );
+    const t = useTranslations('pages.console.team.overview');
     const params = useParams();
     const slug = Array.isArray(params.team) ? params.team[0] : params.team;
 
@@ -53,8 +50,10 @@ export default function Account() {
                                 })}
                             >
                                 {registration_count >= 6
-                                    ? t("registration-count.multiple", {registration_count})
-                                    : t("registration-count.single")}
+                                    ? t('registration-count.multiple', {
+                                          registration_count,
+                                      })
+                                    : t('registration-count.single')}
                                 <ArrowRight className="ml-2 h-4 w-4" />
                             </Link>
                         </div>
@@ -71,7 +70,9 @@ export default function Account() {
                 <div className="space-y-12">
                     <div className="space-y-6">
                         <div className="flex items-center justify-between gap-8">
-                            <h2 className="text-xl font-semibold">{t('members')}</h2>
+                            <h2 className="text-xl font-semibold">
+                                {t('members')}
+                            </h2>
                             <Link
                                 href={`/team/${slug}/members`}
                                 className={buttonVariants({
@@ -79,8 +80,8 @@ export default function Account() {
                                 })}
                             >
                                 {player_count >= 6
-                                    ? t("member-count.multiple")
-                                    : t("member-count.single")}
+                                    ? t('member-count.multiple')
+                                    : t('member-count.single')}
                                 <ArrowRight className="ml-2 h-4 w-4" />
                             </Link>
                         </div>
diff --git a/src/app/[locale]/(console)/team/[team]/(container)/settings/page.tsx b/src/app/[locale]/(console)/team/[team]/(container)/settings/page.tsx
index a8b2b53..59d13c1 100644
--- a/src/app/[locale]/(console)/team/[team]/(container)/settings/page.tsx
+++ b/src/app/[locale]/(console)/team/[team]/(container)/settings/page.tsx
@@ -11,7 +11,6 @@ import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { useTeam, useUpdateTeam } from '@/lib/Queries/Team';
 import { useSurreal } from '@/lib/Surreal';
-import { brand_name } from '@/lib/branding';
 import { useRouter } from '@/locales/navigation';
 import { Team } from '@/schema/resources/team';
 import { zodResolver } from '@hookform/resolvers/zod';
@@ -24,9 +23,7 @@ import { z } from 'zod';
 import { PageTitle } from '../../components/PageTitle';
 
 export default function Account() {
-    const t = useTranslations(
-        'pages.console.team.settings'
-    );
+    const t = useTranslations('pages.console.team.settings');
     const params = useParams();
     const slug = Array.isArray(params.team) ? params.team[0] : params.team;
     const { isPending, data: team, refetch } = useTeam<Team>({ slug });
@@ -37,38 +34,36 @@ export default function Account() {
         <LoaderOverlay />
     ) : team ? (
         <div className="flex max-w-2xl flex-grow flex-col gap-6 pt-6">
-            <PageTitle team={team} title= {t("title")} />
+            <PageTitle team={team} title={t('title')} />
             <div className="flex w-full items-center justify-between gap-16 rounded-lg border p-6">
                 <div className="flex flex-col gap-6">
                     <div className="space-y-2">
-                        <h2 className="text-xl font-bold">{t("logo.title")}</h2>
-                        <p>
-                            {t("logo.description")}
-                        </p>
+                        <h2 className="text-xl font-bold">{t('logo.title')}</h2>
+                        <p>{t('logo.description')}</p>
                     </div>
                     <UploadImage
                         intent="logo"
                         actor={team}
                         triggerRefresh={refetch}
-                        title={t("logo.change")}
-                        description={t("logo.description")}
+                        title={t('logo.change')}
+                        description={t('logo.description')}
                     />
                 </div>
                 <Avatar profile={team} renderBadge={false} size="huge" />
             </div>
             <EditorBox
-                title={t("name.title")}
-                description={t("name.description")}
-                submit={t("name.submit")}
+                title={t('name.title')}
+                description={t('name.description')}
+                submit={t('name.submit')}
                 defaultValue={team.name}
                 mutate={mutate}
                 Schema={Team.pick({ name: true })}
                 field="name"
             />
             <EditorBox
-                title={t("description.title")}
-                description={t("description.description")}
-                submit={t("description.submit")}
+                title={t('description.title')}
+                description={t('description.description')}
+                submit={t('description.submit')}
                 defaultValue={team.description}
                 mutate={mutate}
                 Schema={Team.pick({ description: true })}
@@ -78,7 +73,7 @@ export default function Account() {
             <DangerZone team={team} />
         </div>
     ) : (
-        <NotFoundScreen text={t("not_found")} />
+        <NotFoundScreen text={t('not_found')} />
     );
 }
 
diff --git a/src/app/[locale]/(console)/team/[team]/layout.tsx b/src/app/[locale]/(console)/team/[team]/layout.tsx
index 62b3116..c8bc888 100644
--- a/src/app/[locale]/(console)/team/[team]/layout.tsx
+++ b/src/app/[locale]/(console)/team/[team]/layout.tsx
@@ -16,9 +16,7 @@ import { useParams } from 'next/navigation';
 import React, { ReactNode, useEffect } from 'react';
 
 export default function TeamLayout({ children }: { children: ReactNode }) {
-    const t = useTranslations(
-        'pages.console.team'
-    );
+    const t = useTranslations('pages.console.team');
     const router = useRouter();
     const params = useParams();
     const slug = Array.isArray(params.team) ? params.team[0] : params.team;
@@ -45,10 +43,18 @@ export default function TeamLayout({ children }: { children: ReactNode }) {
                     <NavbarSubLink>
                         <ArrowLeft />
                     </NavbarSubLink>
-                    <NavbarSubLink link="overview">{t("overview.title")}</NavbarSubLink>
-                    <NavbarSubLink link="registrations">{t("registration.title")}</NavbarSubLink>
-                    <NavbarSubLink link="members">{t("members.title")}</NavbarSubLink>
-                    <NavbarSubLink link="settings">{t("settings.title")}</NavbarSubLink>
+                    <NavbarSubLink link="overview">
+                        {t('overview.title')}
+                    </NavbarSubLink>
+                    <NavbarSubLink link="registrations">
+                        {t('registration.title')}
+                    </NavbarSubLink>
+                    <NavbarSubLink link="members">
+                        {t('members.title')}
+                    </NavbarSubLink>
+                    <NavbarSubLink link="settings">
+                        {t('settings.title')}
+                    </NavbarSubLink>
                 </NavbarSubLinks>
             </Navbar>
             <div className="flex flex-grow flex-col pb-24 pt-8">