From dc0c10345b43160cc479d9f4f8652999ca14a1fb Mon Sep 17 00:00:00 2001 From: grapefruit Date: Mon, 28 Apr 2025 21:22:50 +0900 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80?= =?UTF-8?q?=20=EC=95=8A=EB=8A=94=20=EB=AA=A9=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constants/_category.ts | 13 ------------- 1 file changed, 13 deletions(-) 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' }, From 88eb59a50458681904b4808bc4d87ec4e00a0de2 Mon Sep 17 00:00:00 2001 From: grapefruit Date: Mon, 28 Apr 2025 21:23:36 +0900 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=EB=8C=80=EB=B6=84=EB=A5=98=20'?= =?UTF-8?q?=ED=95=99=EA=B5=90'=20=EC=84=A0=ED=83=9D=20=EC=8B=9C=20?= =?UTF-8?q?=EC=86=8C=EB=B6=84=EB=A5=98=EC=97=90=20'=EC=B4=88/=EC=A4=91/?= =?UTF-8?q?=EA=B3=A0'=EB=A7=8C=20=EB=B3=B4=EC=9D=B4=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=98=B5=EC=85=98=20=EC=88=98=EC=A0=95.=20Prefetch=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20=EB=B6=80=EB=B6=84=20=EC=A3=BC=EC=84=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/feature/AutoPlan/index.tsx | 13 +++++++------ src/components/feature/MealPlanEdit/index.tsx | 12 ++++++------ src/components/feature/MenualPlan/index.tsx | 12 ++++++------ src/components/feature/MenualPlanEdit/index.tsx | 12 ++++++------ 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/components/feature/AutoPlan/index.tsx b/src/components/feature/AutoPlan/index.tsx index a65ca78..0706381 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 } = @@ -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..fe76a05 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 { @@ -356,7 +356,7 @@ const MealPlanEdit = ({ id: monthMenuId }: MealPlanEditProps) => { selectedCategory.majorCategory !== MAJOR_CATEGORIES[1] && ( diff --git a/src/components/feature/MenualPlan/index.tsx b/src/components/feature/MenualPlan/index.tsx index 60d6374..1e7582e 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,7 +35,7 @@ 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'; @@ -64,9 +64,9 @@ const MenualPlan = () => { }), ); - const { minorCategories } = useFetchMinorCategories( - selectedCategory.majorCategory, - ); + // const { minorCategories } = useFetchMinorCategories( + // selectedCategory.majorCategory, + // ); const { prefetchMinorCategories, hasCategories } = usePrefetchMinorCategories(); @@ -276,7 +276,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..2ba9910 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,7 +38,7 @@ 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'; @@ -65,9 +65,9 @@ const MenualPlanEdit = () => { const isBothSelected = selectedCategory.majorCategory && selectedCategory.minorCategory; - const { minorCategories } = useFetchMinorCategories( - selectedCategory.majorCategory, - ); + // const { minorCategories } = useFetchMinorCategories( + // selectedCategory.majorCategory, + // ); const { mutate: postSaveMutate } = usePostMonthMenusSave(); const { @@ -286,7 +286,7 @@ const MenualPlanEdit = () => { selectedCategory.majorCategory !== MAJOR_CATEGORIES[1] && ( From e077eb7b42792313e390c7faf99ba4c6dfc72c31 Mon Sep 17 00:00:00 2001 From: grapefruit Date: Mon, 28 Apr 2025 21:42:32 +0900 Subject: [PATCH 3/7] =?UTF-8?q?feat:=20=EC=86=8C=EB=B6=84=EB=A5=98=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20api=20=ED=95=A8=EC=88=98=EC=97=90=20?= =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/menuCategory/index.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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, { From 7695a51d7d1715eedf0733f550e2a75b08acc422 Mon Sep 17 00:00:00 2001 From: grapefruit Date: Mon, 28 Apr 2025 21:56:44 +0900 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=EC=88=98=EB=8F=99=20=EC=8B=9D?= =?UTF-8?q?=EB=8B=A8=20=EC=9E=91=EC=84=B1=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?-=20=EC=A1=B0=EA=B1=B4=EB=B6=80=20=EB=A0=8C=EB=8D=94=EB=A7=81?= =?UTF-8?q?=20=EC=9C=84=EC=B9=98=20=20=EC=88=98=EC=A0=95=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EB=B2=84=EA=B7=B8=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/feature/MenualPlan/index.tsx | 25 ++++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/components/feature/MenualPlan/index.tsx b/src/components/feature/MenualPlan/index.tsx index 1e7582e..94e3ca6 100644 --- a/src/components/feature/MenualPlan/index.tsx +++ b/src/components/feature/MenualPlan/index.tsx @@ -42,6 +42,9 @@ 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(''); @@ -240,8 +243,8 @@ const MenualPlan = () => { isError={isCategoryError} /> -
- {selectedCategory.majorCategory === MAJOR_CATEGORIES[1] && ( + {selectedCategory.majorCategory === MAJOR_CATEGORIES[1] && ( +
{ 검색
- )} - - - -
+ + + +
+ )} {ORGANIZATION_LIST.map( (item) => From 77648e99f735b708afe83b32ed7601240f8854ac Mon Sep 17 00:00:00 2001 From: grapefruit Date: Mon, 28 Apr 2025 21:57:46 +0900 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=EC=9E=90=EB=8F=99=20=EC=8B=9D?= =?UTF-8?q?=EB=8B=A8=20=EC=9E=91=EC=84=B1=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?-=20=EC=A1=B0=EA=B1=B4=EB=B6=80=20=EB=A0=8C=EB=8D=94=EB=A7=81?= =?UTF-8?q?=20=EC=9C=84=EC=B9=98=20=20=EC=88=98=EC=A0=95=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EB=B2=84=EA=B7=B8=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/feature/AutoPlan/index.tsx | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/components/feature/AutoPlan/index.tsx b/src/components/feature/AutoPlan/index.tsx index 0706381..418d514 100644 --- a/src/components/feature/AutoPlan/index.tsx +++ b/src/components/feature/AutoPlan/index.tsx @@ -279,8 +279,8 @@ const AutoPlan = () => { selectedValue={selectedCategory.majorCategory} isError={isCategoryError} /> -
- {selectedCategory.majorCategory === MAJOR_CATEGORIES[1] && ( + {selectedCategory.majorCategory === MAJOR_CATEGORIES[1] && ( +
{ 검색
- )} - - - -
+ + + +
+ )} {ORGANIZATION_LIST.map( (organization) => From 89b00bafd68c87c9a9ab31d501dbf65fc6f3424b Mon Sep 17 00:00:00 2001 From: grapefruit Date: Mon, 28 Apr 2025 21:58:26 +0900 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=EC=8B=9D=EB=8B=A8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=ED=8E=98=EC=9D=B4=EC=A7=80=20-=20=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=EB=B6=80=20=EB=A0=8C=EB=8D=94=EB=A7=81=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=20=EC=88=98=EC=A0=95=20=EB=94=94=EC=9E=90=EC=9D=B8?= =?UTF-8?q?=20=EB=B2=84=EA=B7=B8=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/feature/MealPlanEdit/index.tsx | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/components/feature/MealPlanEdit/index.tsx b/src/components/feature/MealPlanEdit/index.tsx index fe76a05..122fd4b 100644 --- a/src/components/feature/MealPlanEdit/index.tsx +++ b/src/components/feature/MealPlanEdit/index.tsx @@ -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 && From 8688930ece6da74a0b0d7b913df8f6e0ce560066 Mon Sep 17 00:00:00 2001 From: grapefruit Date: Mon, 28 Apr 2025 21:59:19 +0900 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=EC=88=98=EB=8F=99=20=EC=8B=9D?= =?UTF-8?q?=EB=8B=A8=20=EC=88=98=EC=A0=95=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?= =?UTF-8?q?-=20=EC=A1=B0=EA=B1=B4=EB=B6=80=20=EB=A0=8C=EB=8D=94=EB=A7=81?= =?UTF-8?q?=20=EC=9C=84=EC=B9=98=20=20=EC=88=98=EC=A0=95=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EB=B2=84=EA=B7=B8=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/MenualPlanEdit/index.tsx | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/components/feature/MenualPlanEdit/index.tsx b/src/components/feature/MenualPlanEdit/index.tsx index 2ba9910..7034c03 100644 --- a/src/components/feature/MenualPlanEdit/index.tsx +++ b/src/components/feature/MenualPlanEdit/index.tsx @@ -44,6 +44,9 @@ 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, @@ -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) =>