diff --git a/apps/web/app/(main)/profile/schedule/page.tsx b/apps/web/app/(main)/profile/schedule/page.tsx index 25379a7..dc86121 100644 --- a/apps/web/app/(main)/profile/schedule/page.tsx +++ b/apps/web/app/(main)/profile/schedule/page.tsx @@ -1,7 +1,6 @@ -import { HorizontalDivider } from '@/components/common/divider'; import { Container } from '@/components/layout'; import { PageHeader } from '@/components/navigation'; -import { DaySlotAddForm, DaySlotsList, ScheduleCalendar } from '@/components/schedule'; +import { DaySlotsList, ScheduleCalendar } from '@/components/schedule'; export default function SchedulePage() { return ( @@ -10,8 +9,6 @@ export default function SchedulePage() { - - ); diff --git a/apps/web/app/(main)/profile/schedule/slots/[documentId]/page.tsx b/apps/web/app/(main)/profile/schedule/slots/[documentId]/page.tsx index 817a0f3..c7eaf20 100644 --- a/apps/web/app/(main)/profile/schedule/slots/[documentId]/page.tsx +++ b/apps/web/app/(main)/profile/schedule/slots/[documentId]/page.tsx @@ -16,8 +16,8 @@ export default async function ProfilePage(props: Readonly) { + - ); } diff --git a/apps/web/components/schedule/day-slot-add-form.tsx b/apps/web/components/schedule/day-slot-add-form.tsx index 8c5fbee..5fe9cdc 100644 --- a/apps/web/components/schedule/day-slot-add-form.tsx +++ b/apps/web/components/schedule/day-slot-add-form.tsx @@ -32,13 +32,11 @@ export const DaySlotAddForm = withContext(ScheduleTimeContextProvider)(function }; return ( -
- - - -
+ + + ); }); diff --git a/apps/web/components/schedule/day-slots-list.tsx b/apps/web/components/schedule/day-slots-list.tsx index c1ff49f..a8965db 100644 --- a/apps/web/components/schedule/day-slots-list.tsx +++ b/apps/web/components/schedule/day-slots-list.tsx @@ -1,5 +1,6 @@ 'use client'; import { SlotCard } from './components/slot-card'; +import { DaySlotAddForm } from './day-slot-add-form'; import { LoadingSpinner } from '@/components/common/spinner'; import { useSlots } from '@/hooks/slots'; @@ -10,12 +11,10 @@ export function DaySlotsList() { if (isLoading) return ; return ( -
- {slots?.map((slot) => { - if (!slot?.documentId) return null; - - return ; - })} +
+

Слоты

+ {slots?.map((slot) => slot && )} +
); } diff --git a/apps/web/components/schedule/slot-orders-list.tsx b/apps/web/components/schedule/slot-orders-list.tsx index 2079a6e..f84226d 100644 --- a/apps/web/components/schedule/slot-orders-list.tsx +++ b/apps/web/components/schedule/slot-orders-list.tsx @@ -2,23 +2,17 @@ import { OrderCard } from './components/order-card'; import { type SlotComponentProps } from './types'; import { useSlotQuery } from '@/hooks/slots'; -import { cn } from '@repo/ui/lib/utils'; -export function SlotOrdersList({ - className, - documentId, -}: Readonly & { readonly className?: string }) { +export function SlotOrdersList({ documentId }: Readonly) { const { data } = useSlotQuery({ documentId }); const slot = data?.data?.slot; if (!slot) return null; return ( -
-

Записи

- {slot?.orders.map((order) => { - return order && ; - })} +
+

Записи

+ {slot?.orders.map((order) => order && )}
); }