diff --git a/src/components/filtering/study-filter.tsx b/src/components/filtering/study-filter.tsx index 94b6522c..031dae3b 100644 --- a/src/components/filtering/study-filter.tsx +++ b/src/components/filtering/study-filter.tsx @@ -15,7 +15,7 @@ export interface StudyFilterValues { type: string[]; targetRoles: string[]; method: string[]; - inProgress: boolean; + recruiting: boolean; } interface StudyFilterProps { @@ -155,9 +155,9 @@ export default function StudyFilter({ values, onChange }: StudyFilterProps) { [values, onChange], ); - const handleInProgressChange = useCallback( + const handleRecruitingChange = useCallback( (pressed: boolean) => { - onChange({ ...values, inProgress: pressed }); + onChange({ ...values, recruiting: pressed }); }, [values, onChange], ); @@ -167,7 +167,7 @@ export default function StudyFilter({ values, onChange }: StudyFilterProps) { type: [], targetRoles: [], method: [], - inProgress: false, + recruiting: false, }); }, [onChange]); @@ -175,7 +175,7 @@ export default function StudyFilter({ values, onChange }: StudyFilterProps) { values.type.length > 0 || values.targetRoles.length > 0 || values.method.length > 0 || - values.inProgress; + values.recruiting; return (
@@ -203,11 +203,11 @@ export default function StudyFilter({ values, onChange }: StudyFilterProps) { - 진행 중만 보기 + 모집 중만 보기 {hasAnyFilter && ( diff --git a/src/components/pages/group-study-list-page.tsx b/src/components/pages/group-study-list-page.tsx index e2b69db2..29ac5cc9 100644 --- a/src/components/pages/group-study-list-page.tsx +++ b/src/components/pages/group-study-list-page.tsx @@ -37,9 +37,9 @@ export default function GroupStudyListPage() { const targetRoles = searchParams.get('targetRoles')?.split(',').filter(Boolean) ?? []; const method = searchParams.get('method')?.split(',').filter(Boolean) ?? []; - const inProgress = searchParams.get('inProgress') === 'true'; + const recruiting = searchParams.get('recruiting') === 'true'; - return { type, targetRoles, method, inProgress }; + return { type, targetRoles, method, recruiting }; }, [searchParams]); const currentPage = Number(searchParams.get('page')) || 1; @@ -61,7 +61,7 @@ export default function GroupStudyListPage() { filterValues.method.length > 0 ? (filterValues.method as GetGroupStudiesMethodEnum[]) : undefined, - inProgress: filterValues.inProgress || undefined, + recruiting: filterValues.recruiting || undefined, }); const allStudies = useMemo(() => data?.content ?? [], [data?.content]); @@ -100,7 +100,7 @@ export default function GroupStudyListPage() { ? values.targetRoles.join(',') : undefined, method: values.method.length > 0 ? values.method.join(',') : undefined, - inProgress: values.inProgress ? 'true' : undefined, + recruiting: values.recruiting ? 'true' : undefined, }); }, [updateSearchParams], diff --git a/src/components/pages/premium-study-list-page.tsx b/src/components/pages/premium-study-list-page.tsx index 0d88fb46..9471f58e 100644 --- a/src/components/pages/premium-study-list-page.tsx +++ b/src/components/pages/premium-study-list-page.tsx @@ -37,9 +37,9 @@ export default function PremiumStudyListPage() { const targetRoles = searchParams.get('targetRoles')?.split(',').filter(Boolean) ?? []; const method = searchParams.get('method')?.split(',').filter(Boolean) ?? []; - const inProgress = searchParams.get('inProgress') === 'true'; + const recruiting = searchParams.get('recruiting') === 'true'; - return { type, targetRoles, method, inProgress }; + return { type, targetRoles, method, recruiting }; }, [searchParams]); const currentPage = Number(searchParams.get('page')) || 1; @@ -61,7 +61,7 @@ export default function PremiumStudyListPage() { filterValues.method.length > 0 ? (filterValues.method as GetGroupStudiesMethodEnum[]) : undefined, - inProgress: filterValues.inProgress || undefined, + recruiting: filterValues.recruiting || undefined, }); const allStudies = useMemo(() => data?.content ?? [], [data?.content]); @@ -100,7 +100,7 @@ export default function PremiumStudyListPage() { ? values.targetRoles.join(',') : undefined, method: values.method.length > 0 ? values.method.join(',') : undefined, - inProgress: values.inProgress ? 'true' : undefined, + recruiting: values.recruiting ? 'true' : undefined, }); }, [updateSearchParams], diff --git a/src/components/ui/toggle/button.tsx b/src/components/ui/toggle/button.tsx index 88cfd8a3..e64016ac 100644 --- a/src/components/ui/toggle/button.tsx +++ b/src/components/ui/toggle/button.tsx @@ -13,8 +13,8 @@ export const toggleButtonVariants = cva( variants: { color: { primary: [ - 'data-[state=on]:bg-fill-brand-default-default', - 'data-[state=on]:text-text-inverse', + 'data-[state=on]:bg-fill-brand-subtle-default', + 'data-[state=on]:text-text-brand', 'data-[state=on]:border-border-brand', ], gray: [ diff --git a/src/hooks/queries/study-query.ts b/src/hooks/queries/study-query.ts index b6429d6e..97348178 100644 --- a/src/hooks/queries/study-query.ts +++ b/src/hooks/queries/study-query.ts @@ -17,7 +17,7 @@ interface GetStudiesParams { type?: GetGroupStudiesTypeEnum[]; targetRoles?: GetGroupStudiesTargetRolesEnum[]; method?: GetGroupStudiesMethodEnum[]; - inProgress?: boolean; + recruiting?: boolean; } export const useGetStudies = ({ @@ -27,7 +27,7 @@ export const useGetStudies = ({ type, targetRoles, method, - inProgress, + recruiting, }: GetStudiesParams) => { return useQuery({ queryKey: [ @@ -38,7 +38,7 @@ export const useGetStudies = ({ type, targetRoles, method, - inProgress, + recruiting, ], queryFn: async () => { const { data } = await groupStudyManagementApi.getGroupStudies( @@ -48,7 +48,7 @@ export const useGetStudies = ({ type, targetRoles, method, - inProgress, + recruiting, ); return data.content;