From 35afc862d6b167d0f214671bbba6a802cbd3c3e1 Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Tue, 18 Feb 2025 17:17:40 +0300
Subject: [PATCH] fix: selected day reset after go back to /schedule

---
 apps/web/app/(main)/profile/schedule/layout.tsx             | 6 ++++++
 apps/web/app/(main)/profile/schedule/page.tsx               | 5 ++---
 .../{ => profile/schedule}/slots/[documentId]/page.tsx      | 0
 apps/web/components/schedule/components/slot-card.tsx       | 4 +++-
 4 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 apps/web/app/(main)/profile/schedule/layout.tsx
 rename apps/web/app/(main)/{ => profile/schedule}/slots/[documentId]/page.tsx (100%)

diff --git a/apps/web/app/(main)/profile/schedule/layout.tsx b/apps/web/app/(main)/profile/schedule/layout.tsx
new file mode 100644
index 0000000..4e7490d
--- /dev/null
+++ b/apps/web/app/(main)/profile/schedule/layout.tsx
@@ -0,0 +1,6 @@
+import { ScheduleContextProvider } from '@/context/schedule';
+import { type PropsWithChildren } from 'react';
+
+export default async function Layout({ children }: Readonly<PropsWithChildren>) {
+  return <ScheduleContextProvider>{children}</ScheduleContextProvider>;
+}
diff --git a/apps/web/app/(main)/profile/schedule/page.tsx b/apps/web/app/(main)/profile/schedule/page.tsx
index c909810..25379a7 100644
--- a/apps/web/app/(main)/profile/schedule/page.tsx
+++ b/apps/web/app/(main)/profile/schedule/page.tsx
@@ -2,11 +2,10 @@ import { HorizontalDivider } from '@/components/common/divider';
 import { Container } from '@/components/layout';
 import { PageHeader } from '@/components/navigation';
 import { DaySlotAddForm, DaySlotsList, ScheduleCalendar } from '@/components/schedule';
-import { ScheduleContextProvider } from '@/context/schedule';
 
 export default function SchedulePage() {
   return (
-    <ScheduleContextProvider>
+    <>
       <PageHeader title="График работы" />
       <Container className="px-0">
         <ScheduleCalendar />
@@ -14,6 +13,6 @@ export default function SchedulePage() {
         <HorizontalDivider className="px-4" />
         <DaySlotAddForm />
       </Container>
-    </ScheduleContextProvider>
+    </>
   );
 }
diff --git a/apps/web/app/(main)/slots/[documentId]/page.tsx b/apps/web/app/(main)/profile/schedule/slots/[documentId]/page.tsx
similarity index 100%
rename from apps/web/app/(main)/slots/[documentId]/page.tsx
rename to apps/web/app/(main)/profile/schedule/slots/[documentId]/page.tsx
diff --git a/apps/web/components/schedule/components/slot-card.tsx b/apps/web/components/schedule/components/slot-card.tsx
index 24b00dc..55206d7 100644
--- a/apps/web/components/schedule/components/slot-card.tsx
+++ b/apps/web/components/schedule/components/slot-card.tsx
@@ -7,6 +7,7 @@ import { Enum_Slot_State } from '@repo/graphql/types';
 import { Badge } from '@repo/ui/components/ui/badge';
 import { cn } from '@repo/ui/lib/utils';
 import Link from 'next/link';
+import { usePathname } from 'next/navigation';
 
 const MAP_BADGE_TEXT: Record<Enum_Slot_State, string> = {
   closed: 'Закрыто',
@@ -15,6 +16,7 @@ const MAP_BADGE_TEXT: Record<Enum_Slot_State, string> = {
 };
 
 export function SlotCard(props: Readonly<SlotComponentProps>) {
+  const pathname = usePathname();
   const { documentId } = props;
 
   const { data } = useSlotQuery({ documentId });
@@ -29,7 +31,7 @@ export function SlotCard(props: Readonly<SlotComponentProps>) {
   const isClosed = slot?.state === Enum_Slot_State.Closed;
 
   return (
-    <Link href={`/slots/${documentId}`} rel="noopener noreferrer">
+    <Link href={`${pathname}/slots/${documentId}`} rel="noopener noreferrer">
       <div className="flex items-center justify-between rounded-2xl bg-background p-4 px-6 dark:bg-primary/5">
         <div className="flex flex-col gap-2">
           <ReadonlyTimeRange {...slot} />