diff --git a/src/api/menuCategory/index.ts b/src/api/menuCategory/index.ts index 81fd64c..cf3d8a0 100644 --- a/src/api/menuCategory/index.ts +++ b/src/api/menuCategory/index.ts @@ -6,6 +6,9 @@ import { MENU_CAGEGORY_API } from '@/constants/_apiPath'; const { MENU_CATEGORIES, SEARCH_SCHOOL } = MENU_CAGEGORY_API; +/** + * @description 소분류 조회 + */ const getMinorCategories = async (param: MajorCategory) => { const response = await get>(MENU_CATEGORIES, { params: { @@ -16,7 +19,7 @@ const getMinorCategories = async (param: MajorCategory) => { }; /** - * @description 학교명 검색 api + * @description 학교명 검색 */ const getSearchSchool = async ({ keyword }: GetSearchSchoolRequest) => { const response = await get>(SEARCH_SCHOOL, { diff --git a/src/components/feature/AutoPlan/index.tsx b/src/components/feature/AutoPlan/index.tsx index a65ca78..418d514 100644 --- a/src/components/feature/AutoPlan/index.tsx +++ b/src/components/feature/AutoPlan/index.tsx @@ -35,7 +35,7 @@ import { } from '@/components/common/Typography'; import MealCalendar from '@/components/shared/Meal/MealCalender'; import { MealHeaderFormData } from '@/components/shared/Meal/MealHeader'; -import { ORGANIZATION_LIST } from '@/constants/_category'; +import { ORGANIZATION_LIST, SCHOOL_LEVEL_LIST } from '@/constants/_category'; import { AUTO_PLAN_BETA_MESSAGE, MAJOR_CATEGORIES } from '@/constants/_meal'; import { MEAL_FORM_LEGEND, @@ -46,7 +46,7 @@ import { PAGE_TITLE } from '@/constants/_pageTitle'; import { MEAL_HEADER_ERROR } from '@/constants/_schema'; import { usePostMonthMenusAuto } from '@/hooks/menu/usePostMonthMenusAuto'; import { usePostMonthMenusSave } from '@/hooks/menu/usePostMonthMenusSave'; -import { useFetchMinorCategories } from '@/hooks/menuCategory/useFetchMinorCategories'; +// import { useFetchMinorCategories } from '@/hooks/menuCategory/useFetchMinorCategories'; import { useGetSearchSchool } from '@/hooks/menuCategory/useGetSearchSchool'; import { usePrefetchMinorCategories } from '@/hooks/menuCategory/usePrefetchMinorCategories'; import useNavigate from '@/hooks/useNavigate'; @@ -71,9 +71,10 @@ const AutoPlan = () => { const { navigate } = useNavigate(); const queryClient = useQueryClient(); - const { minorCategories } = useFetchMinorCategories( - selectedCategory.majorCategory, - ); + // 현재는 대분류 '학교' 선택 시 소분류 옵션에 '초/중/고'만 보여주므로 주석처리 + // const { minorCategories } = useFetchMinorCategories( + // selectedCategory.majorCategory, + // ); const { mutate: postAutoMutate } = usePostMonthMenusAuto(); const { mutate: postSaveMutate } = usePostMonthMenusSave(); const { prefetchMinorCategories, hasCategories } = @@ -278,8 +279,8 @@ const AutoPlan = () => { selectedValue={selectedCategory.majorCategory} isError={isCategoryError} /> -
- {selectedCategory.majorCategory === MAJOR_CATEGORIES[1] && ( + {selectedCategory.majorCategory === MAJOR_CATEGORIES[1] && ( +
{ 검색
- )} - - - -
+ + + +
+ )} {ORGANIZATION_LIST.map( (organization) => @@ -314,7 +315,7 @@ const AutoPlan = () => { selectedCategory.majorCategory !== MAJOR_CATEGORIES[1] && ( diff --git a/src/components/feature/MealPlanEdit/index.tsx b/src/components/feature/MealPlanEdit/index.tsx index 9d3aeac..122fd4b 100644 --- a/src/components/feature/MealPlanEdit/index.tsx +++ b/src/components/feature/MealPlanEdit/index.tsx @@ -35,7 +35,7 @@ import { } from '@/components/common/Typography'; import MealCalendar from '@/components/shared/Meal/MealCalender'; import { MealHeaderFormData } from '@/components/shared/Meal/MealHeader'; -import { ORGANIZATION_LIST } from '@/constants/_category'; +import { ORGANIZATION_LIST, SCHOOL_LEVEL_LIST } from '@/constants/_category'; import { MAJOR_CATEGORIES } from '@/constants/_meal'; import { MEAL_FORM_LEGEND, @@ -45,7 +45,7 @@ import { ROUTES } from '@/constants/_navbar'; import { PAGE_TITLE } from '@/constants/_pageTitle'; import { MEAL_HEADER_ERROR } from '@/constants/_schema'; import { usePutMonthMenus } from '@/hooks/menu/usePutMonthMenus'; -import { useFetchMinorCategories } from '@/hooks/menuCategory/useFetchMinorCategories'; +// import { useFetchMinorCategories } from '@/hooks/menuCategory/useFetchMinorCategories'; import { useGetSearchSchool } from '@/hooks/menuCategory/useGetSearchSchool'; import useNavigate from '@/hooks/useNavigate'; import { useToastStore } from '@/stores/useToastStore'; @@ -77,9 +77,9 @@ const MealPlanEdit = ({ id: monthMenuId }: MealPlanEditProps) => { const { navigate, handleBack } = useNavigate(); const queryClient = useQueryClient(); - const { minorCategories } = useFetchMinorCategories( - selectedCategory.majorCategory, - ); + // const { minorCategories } = useFetchMinorCategories( + // selectedCategory.majorCategory, + // ); const { mutate: putMutate } = usePutMonthMenus(); const { @@ -321,8 +321,8 @@ const MealPlanEdit = ({ id: monthMenuId }: MealPlanEditProps) => { selectedValue={selectedCategory.majorCategory} isError={isCategoryError} /> -
- {selectedCategory.majorCategory === MAJOR_CATEGORIES[1] && ( + {selectedCategory.majorCategory === MAJOR_CATEGORIES[1] && ( +
{ 검색
- )} - - - -
+ + + +
+ )} {ORGANIZATION_LIST.map( (organization) => selectedCategory.majorCategory === organization.value && selectedCategory.majorCategory !== MAJOR_CATEGORIES[1] && ( diff --git a/src/components/feature/MenualPlan/index.tsx b/src/components/feature/MenualPlan/index.tsx index 60d6374..94e3ca6 100644 --- a/src/components/feature/MenualPlan/index.tsx +++ b/src/components/feature/MenualPlan/index.tsx @@ -25,7 +25,7 @@ import { Option, Selectbox } from '@/components/common/Selectbox'; import { H2BlackH2, Subtitle2White } from '@/components/common/Typography'; import MealCalendar from '@/components/shared/Meal/MealCalender'; import { MealHeaderFormData } from '@/components/shared/Meal/MealHeader'; -import { ORGANIZATION_LIST } from '@/constants/_category'; +import { ORGANIZATION_LIST, SCHOOL_LEVEL_LIST } from '@/constants/_category'; import { MAJOR_CATEGORIES } from '@/constants/_meal'; import { MEAL_FORM_LEGEND, @@ -35,13 +35,16 @@ import { ROUTES } from '@/constants/_navbar'; import { PAGE_TITLE } from '@/constants/_pageTitle'; import { MEAL_HEADER_ERROR } from '@/constants/_schema'; import { MEAL_CREATE_MESSAGE } from '@/constants/_toastMessage'; -import { useFetchMinorCategories } from '@/hooks/menuCategory/useFetchMinorCategories'; +// import { useFetchMinorCategories } from '@/hooks/menuCategory/useFetchMinorCategories'; import { useGetSearchSchool } from '@/hooks/menuCategory/useGetSearchSchool'; import { usePrefetchMinorCategories } from '@/hooks/menuCategory/usePrefetchMinorCategories'; import useNavigate from '@/hooks/useNavigate'; import { useMenualPlanStore } from '@/stores/useMenualPlanStore'; import { useToastStore } from '@/stores/useToastStore'; +/** + * @description 수동 식단 작성 페이지 + */ const MenualPlan = () => { const [calendarData, setCalendarData] = useState({}); const [selectedDate, setSelectedDate] = useState(''); @@ -64,9 +67,9 @@ const MenualPlan = () => { }), ); - const { minorCategories } = useFetchMinorCategories( - selectedCategory.majorCategory, - ); + // const { minorCategories } = useFetchMinorCategories( + // selectedCategory.majorCategory, + // ); const { prefetchMinorCategories, hasCategories } = usePrefetchMinorCategories(); @@ -240,8 +243,8 @@ const MenualPlan = () => { isError={isCategoryError} /> -
- {selectedCategory.majorCategory === MAJOR_CATEGORIES[1] && ( + {selectedCategory.majorCategory === MAJOR_CATEGORIES[1] && ( +
{ 검색
- )} - - - -
+ + + +
+ )} {ORGANIZATION_LIST.map( (item) => @@ -276,7 +279,7 @@ const MenualPlan = () => { selectedCategory.majorCategory !== MAJOR_CATEGORIES[1] && ( diff --git a/src/components/feature/MenualPlanEdit/index.tsx b/src/components/feature/MenualPlanEdit/index.tsx index be7d421..7034c03 100644 --- a/src/components/feature/MenualPlanEdit/index.tsx +++ b/src/components/feature/MenualPlanEdit/index.tsx @@ -28,7 +28,7 @@ import { Option, Selectbox } from '@/components/common/Selectbox'; import { H2BlackH2, Subtitle2White } from '@/components/common/Typography'; import MealCalendar from '@/components/shared/Meal/MealCalender'; import { MealHeaderFormData } from '@/components/shared/Meal/MealHeader'; -import { ORGANIZATION_LIST } from '@/constants/_category'; +import { ORGANIZATION_LIST, SCHOOL_LEVEL_LIST } from '@/constants/_category'; import { MAJOR_CATEGORIES } from '@/constants/_meal'; import { MEAL_FORM_LEGEND, @@ -38,12 +38,15 @@ import { ROUTES } from '@/constants/_navbar'; import { PAGE_TITLE } from '@/constants/_pageTitle'; import { MEAL_HEADER_ERROR } from '@/constants/_schema'; import { usePostMonthMenusSave } from '@/hooks/menu/usePostMonthMenusSave'; -import { useFetchMinorCategories } from '@/hooks/menuCategory/useFetchMinorCategories'; +// import { useFetchMinorCategories } from '@/hooks/menuCategory/useFetchMinorCategories'; import { useGetSearchSchool } from '@/hooks/menuCategory/useGetSearchSchool'; import useNavigate from '@/hooks/useNavigate'; import { useMenualPlanStore } from '@/stores/useMenualPlanStore'; import { useToastStore } from '@/stores/useToastStore'; +/** + * @description 수동 식단 수정 페이지 + */ const MenualPlanEdit = () => { const { monthMenuName, category, calendar } = useMenualPlanStore((state) => ({ monthMenuName: state.monthMenuName, @@ -65,9 +68,9 @@ const MenualPlanEdit = () => { const isBothSelected = selectedCategory.majorCategory && selectedCategory.minorCategory; - const { minorCategories } = useFetchMinorCategories( - selectedCategory.majorCategory, - ); + // const { minorCategories } = useFetchMinorCategories( + // selectedCategory.majorCategory, + // ); const { mutate: postSaveMutate } = usePostMonthMenusSave(); const { @@ -250,8 +253,8 @@ const MenualPlanEdit = () => { selectedValue={selectedCategory.majorCategory} isError={isCategoryError} /> -
- {selectedCategory.majorCategory === MAJOR_CATEGORIES[1] && ( + {selectedCategory.majorCategory === MAJOR_CATEGORIES[1] && ( +
{ 검색
- )} - - - -
+ + + +
+ )} {ORGANIZATION_LIST.map( (organization) => @@ -286,7 +289,7 @@ const MenualPlanEdit = () => { selectedCategory.majorCategory !== MAJOR_CATEGORIES[1] && ( diff --git a/src/constants/_category.ts b/src/constants/_category.ts index 3092b8c..7dd0431 100644 --- a/src/constants/_category.ts +++ b/src/constants/_category.ts @@ -12,19 +12,6 @@ export const ORGANIZATION_LIST = [ { value: MAJOR_CATEGORIES[2], label: MAJOR_CATEGORIES[2] }, ]; -export const MOCK_CATEGORY_LIST = [ - SCHOOL_LEVEL_LIST, - ORGANIZATION_LIST, - [ - { value: '1', label: '세번쨰' }, - { value: '2', label: MAJOR_CATEGORIES[1] }, - { value: '3', label: MAJOR_CATEGORIES[2] }, - { value: '4', label: '세번쨰' }, - { value: '5', label: MAJOR_CATEGORIES[1] }, - { value: '6', label: MAJOR_CATEGORIES[2] }, - ], -]; - export const CATEGORY_MAPPINGS = [ { category: MAJOR_CATEGORIES[0], queryKey: 'getSchoolMinorCategories' }, // { category: MAJOR_CATEGORIES[1], queryKey: 'getSchoolNameMinorCategories' },