diff --git a/.gitignore b/.gitignore index 889008f3..58a544ec 100644 --- a/.gitignore +++ b/.gitignore @@ -50,4 +50,7 @@ next-env.d.ts !.yarn/plugins !.yarn/releases !.yarn/sdks -!.yarn/versions \ No newline at end of file +!.yarn/versions + +# omc +.omc \ No newline at end of file diff --git a/src/components/bannerAdmin/BannerImageRegister.tsx b/src/components/bannerAdmin/BannerImageRegister.tsx index 65de3f6d..287af527 100644 --- a/src/components/bannerAdmin/BannerImageRegister.tsx +++ b/src/components/bannerAdmin/BannerImageRegister.tsx @@ -57,9 +57,7 @@ const BannerImageRegister = () => { - - {location === 'cr_feed' ? '[PC/MO]' : '[PC]'} - {' '} + [PC]{' '} {`이미지는 ${pcImageBaseWidth}*${pcImageBaseHeight} px`} 크기로 올려주세요. (형식: PNG, 용량: 1MB 이내) @@ -82,34 +80,30 @@ const BannerImageRegister = () => { required /> - {location !== 'cr_feed' && ( - <> - - - [MO]{' '} - {`이미지는 ${moImageBaseWidth}*${moImageBaseHeight} px`} - 크기로 올려주세요. - (형식: PNG, 용량: 1MB 이내) - - - - - - )} + + + [MO]{' '} + {`이미지는 ${moImageBaseWidth}*${moImageBaseHeight} px`} + 크기로 올려주세요. + (형식: PNG, 용량: 1MB 이내) + + + + {isModalOpen && ( diff --git a/src/components/bannerAdmin/CreateBannerModal.tsx b/src/components/bannerAdmin/CreateBannerModal.tsx index 85aebb94..34bf4a49 100644 --- a/src/components/bannerAdmin/CreateBannerModal.tsx +++ b/src/components/bannerAdmin/CreateBannerModal.tsx @@ -116,10 +116,7 @@ const CreateBannerModal = ({ end_date: data.dateRange[1].replaceAll('.', '-'), link: data?.link, image_pc: data.pcImageFileName.file, - image_mobile: - data.location === 'cr_feed' - ? data.pcImageFileName.file - : data.mobileImageFileName.file, + image_mobile: data.mobileImageFileName.file, }; if (modalState === CREATE_MODAL) { diff --git a/src/components/bannerAdmin/ImageDropZone.tsx b/src/components/bannerAdmin/ImageDropZone.tsx index dd0190a8..ad482607 100644 --- a/src/components/bannerAdmin/ImageDropZone.tsx +++ b/src/components/bannerAdmin/ImageDropZone.tsx @@ -53,17 +53,6 @@ const ImageDropZone = ({ }, { shouldValidate: true }, ); - if (getValues('location') === 'cr_feed') { - setValue( - 'mobileImageFileName', - { - file, - previewUrl: reader.result, - location: getValues('location'), - }, - { shouldValidate: true }, - ); - } }; reader.readAsDataURL(file); } diff --git a/src/components/bannerAdmin/types/form.ts b/src/components/bannerAdmin/types/form.ts index 6bf3976e..e495ea8d 100644 --- a/src/components/bannerAdmin/types/form.ts +++ b/src/components/bannerAdmin/types/form.ts @@ -10,12 +10,11 @@ export const contentList = { '생일 광고': 'birthday', } as const; -export const LOCATION_KEY = ['커뮤니티', '전체모임', '모임피드'] as const; -export const LOCATION_VALUE = ['pg_community', 'cr_main', 'cr_feed'] as const; +export const LOCATION_KEY = ['커뮤니티', '전체모임'] as const; +export const LOCATION_VALUE = ['pg_community', 'cr_main'] as const; export const locationList = { 커뮤니티: 'pg_community', 전체모임: 'cr_main', - 모임피드: 'cr_feed', } as const; const MAX_IMAGE_CAPACITY = 1; @@ -36,9 +35,7 @@ export const getPcImageBaseSize = ( case 'pg_community': return [1824, 328]; case 'cr_main': - return [760, 956]; - case 'cr_feed': - return [760, 760]; + return [760, 1012]; } }; @@ -50,8 +47,6 @@ export const getMoImageBaseSize = ( return [1340, 672]; case 'cr_main': return [760, 190]; - case 'cr_feed': - return [760, 760]; } }; diff --git a/src/services/api/client.ts b/src/services/api/client.ts index 02ad2e94..65ed390c 100644 --- a/src/services/api/client.ts +++ b/src/services/api/client.ts @@ -59,7 +59,8 @@ client.interceptors.response.use( destroyToken('ACCESS'); window.location.replace('/'); } - return { status: 400, error: '요청을 처리하는데 실패했어요' }; + error.message = '요청을 처리하는데 실패했어요'; + return Promise.reject(error); case 401: if (error?.config?.headers['Reissue-Request']) { destroyToken('ACCESS'); @@ -75,18 +76,20 @@ client.interceptors.response.use( if (error.config) { return client(error.config); } - return { status: 401, error: '만료된 토큰이에요' }; + error.message = '만료된 토큰이에요'; + return Promise.reject(error); case 403: - return { status: 403, error: '권한이 없어요' }; + error.message = '권한이 없어요'; + return Promise.reject(error); case 404: - return { status: 404, error: '잘못된 요청이에요' }; + error.message = '잘못된 요청이에요'; + return Promise.reject(error); case 500: - return { status: 500, error: '알 수 없는 에러예요' }; + error.message = '알 수 없는 에러예요'; + return Promise.reject(error); default: - return { - status: error.response.status, - error: '알 수 없는 에러예요', - }; + error.message = '알 수 없는 에러예요'; + return Promise.reject(error); } } else { throw error;