From d0e67a0f8aa479bfba5739452965a8983b4622a5 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Fri, 23 May 2025 16:22:25 +0300 Subject: [PATCH] context: rename contexts properly --- apps/web/app/(main)/contacts/page.tsx | 6 +++--- apps/web/app/(main)/profile/schedule/layout.tsx | 4 ++-- apps/web/components/contacts/dropdown-filter.tsx | 4 ++-- apps/web/components/orders/components/contacts-grid.tsx | 6 +++--- apps/web/components/schedule/calendar.tsx | 4 ++-- apps/web/components/schedule/day-slots-list.tsx | 4 ++-- .../context/{contacts-filter.tsx => contacts-context.tsx} | 7 ++++--- apps/web/context/{schedule.tsx => date-context.tsx} | 6 +++--- apps/web/hooks/api/contacts/use-customer-contacts.ts | 4 ++-- 9 files changed, 23 insertions(+), 22 deletions(-) rename apps/web/context/{contacts-filter.tsx => contacts-context.tsx} (60%) rename apps/web/context/{schedule.tsx => date-context.tsx} (56%) diff --git a/apps/web/app/(main)/contacts/page.tsx b/apps/web/app/(main)/contacts/page.tsx index 8dd9928..514d9ec 100644 --- a/apps/web/app/(main)/contacts/page.tsx +++ b/apps/web/app/(main)/contacts/page.tsx @@ -1,10 +1,10 @@ import { ContactsFilter, ContactsList } from '@/components/contacts'; -import { ContactsFilterProvider } from '@/context/contacts-filter'; +import { ContactsContextProvider } from '@/context/contacts-context'; import { Card } from '@repo/ui/components/ui/card'; export default function ContactsPage() { return ( - +

Контакты

@@ -14,6 +14,6 @@ export default function ContactsPage() {
-
+ ); } diff --git a/apps/web/app/(main)/profile/schedule/layout.tsx b/apps/web/app/(main)/profile/schedule/layout.tsx index 4e7490d..79708aa 100644 --- a/apps/web/app/(main)/profile/schedule/layout.tsx +++ b/apps/web/app/(main)/profile/schedule/layout.tsx @@ -1,6 +1,6 @@ -import { ScheduleContextProvider } from '@/context/schedule'; +import { DateContextProvider } from '@/context/date-context'; import { type PropsWithChildren } from 'react'; export default async function Layout({ children }: Readonly) { - return {children}; + return {children}; } diff --git a/apps/web/components/contacts/dropdown-filter.tsx b/apps/web/components/contacts/dropdown-filter.tsx index 698d99a..2d3a18a 100644 --- a/apps/web/components/contacts/dropdown-filter.tsx +++ b/apps/web/components/contacts/dropdown-filter.tsx @@ -1,6 +1,6 @@ 'use client'; -import { ContactsFilterContext, type FilterType } from '@/context/contacts-filter'; +import { ContactsContext, type FilterType } from '@/context/contacts-context'; import { Button } from '@repo/ui/components/ui/button'; import { DropdownMenu, @@ -18,7 +18,7 @@ const filterLabels: Record = { }; export function ContactsFilter() { - const { filter, setFilter } = use(ContactsFilterContext); + const { filter, setFilter } = use(ContactsContext); return ( diff --git a/apps/web/components/orders/components/contacts-grid.tsx b/apps/web/components/orders/components/contacts-grid.tsx index bf36da5..c524dfa 100644 --- a/apps/web/components/orders/components/contacts-grid.tsx +++ b/apps/web/components/orders/components/contacts-grid.tsx @@ -2,7 +2,7 @@ import { LoadingSpinner } from '@/components/common/spinner'; import { CardSectionHeader } from '@/components/ui'; -import { ContactsFilterProvider } from '@/context/contacts-filter'; +import { ContactsContextProvider } from '@/context/contacts-context'; import { useCustomerContacts } from '@/hooks/api/contacts'; // eslint-disable-next-line import/extensions import AvatarPlaceholder from '@/public/avatar/avatar_placeholder.png'; @@ -86,7 +86,7 @@ export function ContactsGridBase({ contacts, onSelect, selected, title }: Contac ); } -export const MastersGrid = withContext(ContactsFilterProvider)(function () { +export const MastersGrid = withContext(ContactsContextProvider)(function () { const { contacts, isLoading, setFilter } = useCustomerContacts(); const masterId = useOrderStore((store) => store.masterId); const setMasterId = useOrderStore((store) => store.setMasterId); @@ -107,7 +107,7 @@ export const MastersGrid = withContext(ContactsFilterProvider)(function () { ); }); -export const ClientsGrid = withContext(ContactsFilterProvider)(function () { +export const ClientsGrid = withContext(ContactsContextProvider)(function () { const { contacts, isLoading, setFilter } = useCustomerContacts(); const clientId = useOrderStore((store) => store.clientId); const setClientId = useOrderStore((store) => store.setClientId); diff --git a/apps/web/components/schedule/calendar.tsx b/apps/web/components/schedule/calendar.tsx index be9fa86..915cc0b 100644 --- a/apps/web/components/schedule/calendar.tsx +++ b/apps/web/components/schedule/calendar.tsx @@ -1,12 +1,12 @@ 'use client'; -import { ScheduleContext } from '@/context/schedule'; +import { DateContext } from '@/context/date-context'; import { Calendar } from '@repo/ui/components/ui/calendar'; import dayjs from 'dayjs'; import { use } from 'react'; export function ScheduleCalendar() { - const { selectedDate, setSelectedDate } = use(ScheduleContext); + const { selectedDate, setSelectedDate } = use(DateContext); return ( void }; -export const ContactsFilterContext = createContext({} as ContextType); +export const ContactsContext = createContext({} as ContextType); -export function ContactsFilterProvider({ children }: Readonly) { +export function ContactsContextProvider({ children }: Readonly) { const [filter, setFilter] = useState('all'); const value = useMemo(() => ({ filter, setFilter }), [filter, setFilter]); - return {children}; + return {children}; } diff --git a/apps/web/context/schedule.tsx b/apps/web/context/date-context.tsx similarity index 56% rename from apps/web/context/schedule.tsx rename to apps/web/context/date-context.tsx index a8d9bd1..8baceff 100644 --- a/apps/web/context/schedule.tsx +++ b/apps/web/context/date-context.tsx @@ -7,12 +7,12 @@ type ContextType = { setSelectedDate: (date: Date) => void; }; -export const ScheduleContext = createContext({} as ContextType); +export const DateContext = createContext({} as ContextType); -export function ScheduleContextProvider({ children }: { readonly children: React.ReactNode }) { +export function DateContextProvider({ children }: { readonly children: React.ReactNode }) { const [selectedDate, setSelectedDate] = useState(new Date()); const value = useMemo(() => ({ selectedDate, setSelectedDate }), [selectedDate]); - return {children}; + return {children}; } diff --git a/apps/web/hooks/api/contacts/use-customer-contacts.ts b/apps/web/hooks/api/contacts/use-customer-contacts.ts index 43dd5d7..dfd7040 100644 --- a/apps/web/hooks/api/contacts/use-customer-contacts.ts +++ b/apps/web/hooks/api/contacts/use-customer-contacts.ts @@ -1,12 +1,12 @@ 'use client'; import { useClientsQuery, useMastersQuery } from './query'; -import { ContactsFilterContext } from '@/context/contacts-filter'; +import { ContactsContext } from '@/context/contacts-context'; import { sift } from 'radash'; import { use, useEffect, useMemo } from 'react'; export function useCustomerContacts() { - const { filter, setFilter } = use(ContactsFilterContext); + const { filter, setFilter } = use(ContactsContext); const { data: clientsData,