Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

동물 상세보기 페이지 이름, 연락처 정렬 #199

Merged
merged 3 commits into from
Nov 11, 2023
Merged

동물 상세보기 페이지 이름, 연락처 정렬 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7d7382
feat: 상세보기 페이지 연락처 요소 정렬
hjiwon Nov 11, 2023
58438c0
feat: 동물 상세보기 페이지 이름 정렬
hjiwon Nov 11, 2023
e0999d2
feat: 첫 번째 비디오에서도 동영상 로딩 상태 보여줌
hjiwon Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions src/pages/detailPet/components/VDetailPetInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,17 @@ import { DetailPetInfoProps } from '../detailPetType';
const VDetailPetInfo = (data: DetailPetInfoProps) => {
return (
<div className="flex flex-col items-center">
<h2 className="text-3xl w-full mb-10">{data.name}</h2>
<div className="flex flex-col items-center text-sm md:text-base">
<div className="flex h-14 justify-around">
<div className="flex py-7 justify-around">
<div className="flex">
<h2 className="text-3xl w-36 mb-10">{data.name}</h2>
</div>
<div className="flex">
<span className="w-20 block font-bold"></span>
<span className="w-36 block"></span>
</div>
</div>
<div className="flex py-7 justify-around">
<div className="flex">
<span className="w-16 block font-bold">나이</span>
<span className="w-20 block">{data.age}</span>
Expand Down Expand Up @@ -41,7 +49,7 @@ const VDetailPetInfo = (data: DetailPetInfoProps) => {
</div>
</div>

<div className="flex h-14 justify-around">
<div className="flex py-7 justify-around">
<div className="flex">
<span className="w-16 block font-bold">백신접종</span>
<span className="w-20 block">{data.vaccinationStatus}</span>
Expand All @@ -52,7 +60,7 @@ const VDetailPetInfo = (data: DetailPetInfoProps) => {
</div>
</div>

<div className="flex h-14 justify-around">
<div className="flex py-7 justify-around">
<div className="flex">
<span className="w-16 block font-bold">입양 여부</span>
<span className="w-20 block">{data.adoptionStatus}</span>
Expand All @@ -63,11 +71,15 @@ const VDetailPetInfo = (data: DetailPetInfoProps) => {
</div>
</div>

<div className="hidden md:flex w-full h-10 mb-10">
<div className="hidden py-7 md:flex justify-around">
<div className="flex">
<span className="w-16 block font-bold">연락처</span>
<span className="w-36 block">{data.shelterInfo.contact}</span>
</div>
<div className="flex">
<span className="w-20 block font-bold"></span>
<span className="w-20 block"></span>
</div>
</div>

<a href={`tel:${data.shelterInfo.contact}`}>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/home/components/HomeVideo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const HomeVideo = (props: HomeVideoProps) => {
onMouseEnter={handleMouseEnter}
>
<VideoOverlay {...videoOverlayProps} />
{loading && index !== 0 && playing && (
{loading && playing && (
<div className="w-10 h-10 loader top-1/2 absolute" />
)}
<video
Expand Down