Skip to content

Commit 7e2b24c

Browse files
authored
Merge pull request #66 from LIKELION-SOGANG/feature/people-improve-generation#65
PEOPLE 페이지 기수 컴포넌트 개선
2 parents 54c9fb9 + 25aadeb commit 7e2b24c

File tree

9 files changed

+33
-102
lines changed

9 files changed

+33
-102
lines changed

public/images/people/MockImages/김유이.svg

Lines changed: 0 additions & 9 deletions
This file was deleted.

public/images/people/MockImages/오은택.svg

Lines changed: 0 additions & 9 deletions
This file was deleted.

public/images/people/MockImages/이선명.svg

Lines changed: 0 additions & 9 deletions
This file was deleted.

public/images/people/MockImages/임정연.svg

Lines changed: 0 additions & 9 deletions
This file was deleted.

public/images/people/MockImages/장세환.svg

Lines changed: 0 additions & 9 deletions
This file was deleted.

public/images/people/MockImages/정고은.svg

Lines changed: 0 additions & 9 deletions
This file was deleted.

public/images/people/MockImages/정인영.svg

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/app/(main)/people/components/TabItem.tsx

Lines changed: 32 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React from 'react'
2-
import Image from 'next/image'
32
interface Member {
43
_id: string
54
name: string
@@ -16,48 +15,43 @@ export default function TabItem({ data }: TabItemProps) {
1615

1716
return (
1817
<div>
19-
<div className="flex items-center text-center text-black mx-8 my-0 mt-16">
20-
<div className="flex-grow h-[0.1rem] tablet:h-[0.2rem] bg-black"></div>
21-
<div className="font-pretendard px-6 py-0 font-semibold text-[1.6rem] tablet:text-[2.4rem]">
22-
운영진
23-
</div>
24-
<div className="flex-grow h-[0.1rem] tablet:h-[0.2rem] bg-black"></div>
25-
</div>
26-
<div className="overflow-x-auto w-full mt-[3rem] tablet:mt-[9.5rem] tablet:mb-[16rem] scrollbar-hide">
27-
<div className="flex justify-start items-center text-black whitespace-nowrap mx-[4rem]">
28-
{adult_lion?.map(member => (
29-
<div
30-
key={member._id}
31-
className="flex flex-col justify-center items-center w-[16vw] min-w-[12rem] tablet:min-w-[18rem] h-auto mx-4">
32-
<Image
33-
// src={member.emoji}
34-
src={''}
35-
width={160}
36-
height={160}
37-
className="block object-contain w-[10rem] h-[10rem] tablet:w-[16rem] tablet:h-[16rem] mb-8"
38-
alt={member.name}
39-
/>
40-
<div className="font-pretendard text-[1.6rem] tablet:text-[2rem] font-bold mb-0">
41-
{member.name}
42-
</div>
43-
<div className="font-pretendard text-[1.2rem] tablet:text-[1.4rem] font-medium">
44-
{/* {member.generation} / {member.part} */}
45-
</div>
46-
{member.type === 'president' ? (
47-
<div className="mt-[0.4rem] font-semibold">대표</div>
48-
) : member.type === 'vice_president' ? (
49-
<div className="mt-[0.4rem] font-semibold">부대표</div>
50-
) : (
51-
<div className="mt-[2.0rem] font-semibold"></div>
52-
)}
18+
{adult_lion?.length > 0 ? (
19+
<div>
20+
<div className="flex items-center text-center text-black mx-8 my-0 mt-16">
21+
<div className="flex-grow h-[0.1rem] tablet:h-[0.2rem] bg-black"></div>
22+
<div className="font-pretendard px-6 py-0 font-semibold text-[1.6rem] tablet:text-[2.4rem]">
23+
운영진
5324
</div>
54-
))}
25+
<div className="flex-grow h-[0.1rem] tablet:h-[0.2rem] bg-black"></div>
26+
</div>
27+
28+
<div className="flex flex-wrap justify-center items-start gap-12 px-8 py-16 pb-[18rem] mx-auto my-0 text-black pb-[6rem]">
29+
{adult_lion?.map(member => (
30+
<div
31+
key={member._id}
32+
className="flex flex-col justify-center items-center min-w-[3rem] tablet:min-w-[5rem] h-auto mx-4">
33+
<div className="font-pretendard text-[1.6rem] tablet:text-[2rem] font-bold mb-0">
34+
{member.name}
35+
</div>
36+
<div className="font-pretendard text-[1.2rem] tablet:text-[1.4rem] font-medium"></div>
37+
{member.type === 'president' ? (
38+
<div className="mt-[0.4rem] font-semibold">대표</div>
39+
) : member.type === 'vice_president' ? (
40+
<div className="mt-[0.4rem] font-semibold">부대표</div>
41+
) : (
42+
<div className="mt-[2.0rem] font-semibold"></div>
43+
)}
44+
</div>
45+
))}
46+
</div>
5547
</div>
56-
</div>
48+
) : (
49+
<div></div>
50+
)}
5751

5852
<div className="flex items-center text-center text-black mx-8 my-0 mt-16">
5953
<div className="flex-grow h-[0.1rem] tablet:h-[0.2rem] bg-black"></div>
60-
<div className="font-pretendard px-6 py-0 text-[1.6rem] tablet:text-[2.4rem] font-semibold">
54+
<div className="font-pretendard px-6 py-0 font-semibold text-[1.6rem] tablet:text-[2.4rem]">
6155
아기사자
6256
</div>
6357
<div className="flex-grow h-[0.1rem] tablet:h-[0.2rem] bg-black"></div>

src/app/(main)/people/container/People2.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default function SecondSection({ Members }: SecondSectionProps) {
2424
useEffect(() => {
2525
const generations = Array.from(
2626
new Set(Members.map((member: Member) => parseInt(member.generation, 10)))
27-
) as number[]
27+
).sort((a, b) => a - b)
2828
setTabList(generations)
2929
setSelectedTab(parseInt(Members[Members.length - 1].generation))
3030
}, [Members])

0 commit comments

Comments
 (0)