diff --git a/src/commons/modals/CategoryModal.tsx b/src/commons/modals/CategoryModal.tsx index 1e53b71a..797fb39c 100644 --- a/src/commons/modals/CategoryModal.tsx +++ b/src/commons/modals/CategoryModal.tsx @@ -5,7 +5,7 @@ import CategoryModalList, { CategoryModalType, VCategoryModalListProps, } from 'commons/modals/VCategoryModalList'; -import { redirect, useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router-dom'; export interface CategoryModalProps { handleModalCloseClick: () => void; @@ -30,7 +30,7 @@ const CategoryModal = ({ '서울', '경기', '인천', - '제주특별자치도', + '제주', '충북', '충남', '대전', @@ -42,8 +42,8 @@ const CategoryModal = ({ '전북', '전남', '광주', - '강원특별자치도', - '세종특별자치시', + '강원', + '세종', ]; const handleSpeciesClick = (speciess: SpeciesType) => { diff --git a/src/pages/detailPet/components/VDetailPetData.tsx b/src/pages/detailPet/components/VDetailPetData.tsx index a3b581cc..c35793fe 100644 --- a/src/pages/detailPet/components/VDetailPetData.tsx +++ b/src/pages/detailPet/components/VDetailPetData.tsx @@ -14,11 +14,11 @@ const VDetailPetData = ({ imageUrl, }: VDetailPetDataProps) => { return ( -
+
z diff --git a/src/pages/detailPet/components/VDetailPetInfo.tsx b/src/pages/detailPet/components/VDetailPetInfo.tsx index 66740350..18c3fc7d 100644 --- a/src/pages/detailPet/components/VDetailPetInfo.tsx +++ b/src/pages/detailPet/components/VDetailPetInfo.tsx @@ -3,11 +3,11 @@ import { DetailPetInfoProps } from '../detailPetType'; const VDetailPetInfo = (data: DetailPetInfoProps) => { return ( -
-
+
+
-

{data.name}

+

{data.name}

@@ -21,7 +21,7 @@ const VDetailPetInfo = (data: DetailPetInfoProps) => {
성별 - + {data.sex === 'MALE' ? '수컷' : '암컷'}
@@ -35,7 +35,7 @@ const VDetailPetInfo = (data: DetailPetInfoProps) => {
분양지역 - {data.shelterInfo.name} + {data.shelterInfo.name}
{'애니모리에 등록된 보호소입니다. '} @@ -56,7 +56,7 @@ const VDetailPetInfo = (data: DetailPetInfoProps) => {
중성화 - {data.neutralizationStatus} + {data.neutralizationStatus}
@@ -66,15 +66,15 @@ const VDetailPetInfo = (data: DetailPetInfoProps) => { {data.adoptionStatus}
- 보호종료일 - {data.protectionExpirationDate} + 보호종료일 + {data.protectionExpirationDate}
연락처 - {data.shelterInfo.contact} + {data.shelterInfo.contact}
@@ -83,12 +83,15 @@ const VDetailPetInfo = (data: DetailPetInfoProps) => {
- + 문의하기 -
{data.description}
+
+ 상세정보 + {data.description} +
); diff --git a/src/pages/home/components/Home.tsx b/src/pages/home/components/Home.tsx index e7e08efa..2f59504d 100644 --- a/src/pages/home/components/Home.tsx +++ b/src/pages/home/components/Home.tsx @@ -73,11 +73,13 @@ const Home = () => { const categoryAvailable = region !== '전국' || species !== '전체'; return ( -
+
{categoryAvailable && } {noData && } - +
+ +
); }; diff --git a/src/pages/home/components/HomeVideoSlider.tsx b/src/pages/home/components/HomeVideoSlider.tsx index 895e054a..f1802ab6 100644 --- a/src/pages/home/components/HomeVideoSlider.tsx +++ b/src/pages/home/components/HomeVideoSlider.tsx @@ -49,6 +49,7 @@ const HomeVideoSlider = (props: HomeVideoSliderProps) => { return ( { sensitivity: 100, thresholdDelta: 30, }} - autoHeight={true} direction={'vertical'} keyboard={{ enabled: true, pageUpDown: true, onlyInViewport: true }} > @@ -69,6 +69,7 @@ const HomeVideoSlider = (props: HomeVideoSliderProps) => {
{ + const textColor = + props.adoptionStatus === '미입양' ? 'text-brand-color' : 'text-blue-700'; + return (
{props.name}
-
+
{props.adoptionStatus}
diff --git a/src/pages/profileList/components/ProfileCard.tsx b/src/pages/profileList/components/ProfileCard.tsx index c877e6a9..a8dfa4e3 100644 --- a/src/pages/profileList/components/ProfileCard.tsx +++ b/src/pages/profileList/components/ProfileCard.tsx @@ -1,33 +1,43 @@ import { ListProps } from '../profileListType'; -const ProfileCard = (vProfileInfoProps: ListProps) => ( -
- -
- -
-
- + ); +}; export default ProfileCard; diff --git a/src/pages/register/components/FileInput.tsx b/src/pages/register/components/FileInput.tsx index 5b89d697..48cf12ad 100644 --- a/src/pages/register/components/FileInput.tsx +++ b/src/pages/register/components/FileInput.tsx @@ -26,7 +26,7 @@ const FileInput = (props: FileInputProps) => { <> @@ -43,7 +43,7 @@ const FileInput = (props: FileInputProps) => { <>