diff --git a/apps/web/app/(main)/contacts/page.tsx b/apps/web/app/(main)/contacts/page.tsx index 6dfce36..669ff9c 100644 --- a/apps/web/app/(main)/contacts/page.tsx +++ b/apps/web/app/(main)/contacts/page.tsx @@ -5,11 +5,11 @@ import { ContactsFilterProvider } from '@/context/contacts-filter'; export default function ContactsPage() { return ( -
-

Контакты

+
+
-
+
diff --git a/apps/web/app/(main)/layout.tsx b/apps/web/app/(main)/layout.tsx index 69fff63..bb66468 100644 --- a/apps/web/app/(main)/layout.tsx +++ b/apps/web/app/(main)/layout.tsx @@ -1,11 +1,14 @@ -import { BottomNav } from '@/components/navigation'; +import { BottomNav, PageHeader } from '@/components/navigation'; import { type PropsWithChildren } from 'react'; export default async function Layout({ children }: Readonly) { return ( -
-
{children}
- -
+ <> + +
+
{children}
+ +
+ ); } diff --git a/apps/web/components/navigation/back-button.tsx b/apps/web/components/navigation/back-button.tsx new file mode 100644 index 0000000..6486c48 --- /dev/null +++ b/apps/web/components/navigation/back-button.tsx @@ -0,0 +1,14 @@ +'use client'; +import { ArrowLeft } from 'lucide-react'; +import { useRouter } from 'next/navigation'; + +export function BackButton() { + const router = useRouter(); + + return ( +
+ router.back()} /> + Назад +
+ ); +} diff --git a/apps/web/components/navigation/header.tsx b/apps/web/components/navigation/header.tsx new file mode 100644 index 0000000..19ab706 --- /dev/null +++ b/apps/web/components/navigation/header.tsx @@ -0,0 +1,14 @@ +import { BackButton } from './back-button'; + +type Props = { + title: string; +}; + +export function PageHeader(props: Readonly) { + return ( +
+ + {props.title || 'Page name'} +
+ ); +} diff --git a/apps/web/components/navigation/index.tsx b/apps/web/components/navigation/index.tsx index f5899d0..bb1137c 100644 --- a/apps/web/components/navigation/index.tsx +++ b/apps/web/components/navigation/index.tsx @@ -1 +1,2 @@ +export * from './header'; export * from './navbar'; diff --git a/apps/web/components/profile/profile-card.tsx b/apps/web/components/profile/profile-card.tsx index e2b8361..e6742f2 100644 --- a/apps/web/components/profile/profile-card.tsx +++ b/apps/web/components/profile/profile-card.tsx @@ -5,7 +5,6 @@ import { CheckboxWithText } from '@/components/profile/checkbox-with-text'; import { ProfileField } from '@/components/profile/profile-field'; import { Avatar, AvatarFallback, AvatarImage } from '@repo/ui/components/ui/avatar'; import { Button } from '@repo/ui/components/ui/button'; -import { Card, CardContent, CardHeader } from '@repo/ui/components/ui/card'; import { useQuery } from '@tanstack/react-query'; import Link from 'next/link'; @@ -22,15 +21,15 @@ export function ProfileCard({ telegramId }: ProfileCardProps) { if (!customer) return
Пользователь не найден
; return ( - - +
+
{customer?.name.charAt(0)}

{customer?.name}

- - +
+
{telegramId ? ( false ) : ( @@ -74,7 +73,7 @@ export function ProfileCard({ telegramId }: ProfileCardProps) { ) : ( false )} - - +
+
); }