refactor(core): remove route group from account pages

core/app/[locale]/(default)/(auth)/change-password/_components/change-password-form.tsx

@@ -17,8 +17,8 @@ import {
 import { Message } from '~/components/ui/message';
 import { useRouter } from '~/i18n/routing';
 
-import { useAccountStatusContext } from '../../../account/(tabs)/_components/account-status-provider';
-import { SubmitMessagesList } from '../../../account/(tabs)/_components/submit-messages-list';
+import { useAccountStatusContext } from '../../../account/_components/account-status-provider';
+import { SubmitMessagesList } from '../../../account/_components/submit-messages-list';
 import { changePassword } from '../_actions/change-password';
 
 interface Props {

core/app/[locale]/(default)/(auth)/login/_components/login-form.tsx

@@ -17,8 +17,8 @@ import {
 } from '~/components/ui/form';
 import { Message } from '~/components/ui/message';
 
-import { useAccountStatusContext } from '../../../account/(tabs)/_components/account-status-provider';
-import { SubmitMessagesList } from '../../../account/(tabs)/_components/submit-messages-list';
+import { useAccountStatusContext } from '../../../account/_components/account-status-provider';
+import { SubmitMessagesList } from '../../../account/_components/submit-messages-list';
 import { login } from '../_actions/login';
 
 const SubmitButton = () => {

core/app/[locale]/(default)/(auth)/login/forgot-password/_components/reset-password-form/index.tsx

@@ -8,8 +8,8 @@ import ReCaptcha from 'react-google-recaptcha';
 import {
   AccountState as FormStatus,
   useAccountStatusContext,
-} from '~/app/[locale]/(default)/account/(tabs)/_components/account-status-provider';
-import { SubmitMessagesList } from '~/app/[locale]/(default)/account/(tabs)/_components/submit-messages-list';
+} from '~/app/[locale]/(default)/account/_components/account-status-provider';
+import { SubmitMessagesList } from '~/app/[locale]/(default)/account/_components/submit-messages-list';
 import { type FragmentOf } from '~/client/graphql';
 import { Button } from '~/components/ui/button';
 import {

core/app/[locale]/(default)/(auth)/register/_components/register-customer-form.tsx

@@ -8,7 +8,7 @@ import ReCaptcha from 'react-google-recaptcha';
 import {
   AccountState as FormStatus,
   useAccountStatusContext,
-} from '~/app/[locale]/(default)/account/(tabs)/_components/account-status-provider';
+} from '~/app/[locale]/(default)/account/_components/account-status-provider';
 import { ExistingResultType } from '~/client/util';
 import {
   Checkboxes,
@@ -38,7 +38,7 @@ import { Button } from '~/components/ui/button';
 import { Field, Form, FormSubmit } from '~/components/ui/form';
 import { Message } from '~/components/ui/message';
 
-import { SubmitMessagesList } from '../../../account/(tabs)/_components/submit-messages-list';
+import { SubmitMessagesList } from '../../../account/_components/submit-messages-list';
 import { login } from '../_actions/login';
 import { registerCustomer } from '../_actions/register-customer';
 import { getRegisterCustomerQuery } from '../page-data';

core/app/[locale]/(default)/account/(tabs)/_components/account-status-provider.tsx → core/app/[locale]/(default)/account/_components/account-status-provider.tsx

@@ -4,8 +4,6 @@ import { createContext, ReactNode, useContext, useEffect, useState } from 'react
 
 import { usePathname } from '~/i18n/routing';
 
-// import { State as AccountState } from '../settings/change-password/_actions/change-password';
-
 export interface AccountState {
   status: 'idle' | 'error' | 'success';
   messages: string[];

core/app/[locale]/(default)/account/layout.tsx

@@ -1,16 +1,29 @@
-import { getLocale } from 'next-intl/server';
+import { setRequestLocale } from 'next-intl/server';
 import { PropsWithChildren } from 'react';
 
 import { auth } from '~/auth';
 import { redirect } from '~/i18n/routing';
 
-export default async function AccountLayout({ children }: PropsWithChildren) {
-  const locale = await getLocale();
+import { TabNavigation } from './_components/tab-navigation';
+
+interface Props extends PropsWithChildren {
+  params: Promise<{ locale: string }>;
+}
+
+export default async function AccountLayout({ children, params }: Props) {
+  const { locale } = await params;
   const session = await auth();
 
+  setRequestLocale(locale);
+
   if (!session) {
     redirect({ href: '/login', locale });
   }
 
-  return children;
+  return (
+    <>
+      <TabNavigation />
+      {children}
+    </>
+  );
 }

core/app/[locale]/(default)/account/page.tsx

@@ -5,7 +5,7 @@ import { ReactNode } from 'react';
 
 import { Link } from '~/components/link';
 
-import { AccountNotification } from './(tabs)/_components/account-notification';
+import { AccountNotification } from './_components/account-notification';
 
 interface AccountItem {
   children: ReactNode;

core/app/providers.tsx

@@ -5,7 +5,7 @@ import { PropsWithChildren } from 'react';
 import { CartProvider } from '~/components/header/cart-provider';
 import { CompareDrawerProvider } from '~/components/ui/compare-drawer';
 
-import { AccountStatusProvider } from './[locale]/(default)/account/(tabs)/_components/account-status-provider';
+import { AccountStatusProvider } from './[locale]/(default)/account/_components/account-status-provider';
 
 export function Providers({ children }: PropsWithChildren) {
   return (