Skip to content

dev >> main 메이커스 활동 정렬 로직 제거 및 아이콘 크기 변경 #2209

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

Merged
ljh0608 merged 4 commits into from
Feb 22, 2026
Merged

dev >> main 메이커스 활동 정렬 로직 제거 및 아이콘 크기 변경 #2209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96c8846
fix: 메이커스 우선 정렬 로직 제거
ljh0608 Feb 22, 2026
42dce3a
Merge pull request #2207 from sopt-makers/fix/#2206
ljh0608 Feb 22, 2026
b0bfafb
fix: 멤버 프로필 드롭다운 아이콘 크기 변경
ljh0608 Feb 22, 2026
6794a7e
Merge pull request #2208 from sopt-makers/fix/#2206
ljh0608 Feb 22, 2026
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
6 changes: 3 additions & 3 deletions src/components/members/detail/ProfileSection/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const ProfileSection = ({ profile, memberId }: ProfileSectionProps) => {
logClickEvent('editProfile');
}}
>
<EditIcon />
<EditIcon style={{ width: '20px', height: '20px' }} />
</EditButton>
) : (
<MoreIconContainer>
Expand All @@ -132,7 +132,7 @@ const ProfileSection = ({ profile, memberId }: ProfileSectionProps) => {
}}
>
<Flex align='center' css={{ gap: '10px', color: `${colors.gray10}` }}>
<IconAlertTriangle css={{ width: '16px', height: '16px' }} />
<IconAlertTriangle css={{ width: '20px', height: '20px' }} />
신고
</Flex>
</FeedDropdown.Item>
Expand All @@ -143,7 +143,7 @@ const ProfileSection = ({ profile, memberId }: ProfileSectionProps) => {
}}
>
<Flex align='center' css={{ gap: '10px' }}>
<IconUserX css={{ width: '16px', height: '16px' }} /> 차단
<IconUserX css={{ width: '20px', height: '20px' }} /> 차단
</Flex>
</FeedDropdown.Item>
</FeedDropdown>
Expand Down
9 changes: 1 addition & 8 deletions src/components/members/detail/SoptActivitySection/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,9 @@ interface SoptActivitySectionProps {
}

export default function SoptActivitySection({ soptActivities, isMine }: SoptActivitySectionProps) {
// 메이커스 정보가 프로필에서 먼저 오도록 정렬
const sortedActivities = [...soptActivities].sort((a, b) => {
const aIsMakers = a.team === '메이커스' ? 1 : 0;
const bIsMakers = b.team === '메이커스' ? 1 : 0;
return bIsMakers - aIsMakers;
});

return (
<MemberDetailSection>
{sortedActivities.map(({ generation, part, projects, team }, idx) => (
{soptActivities.map(({ generation, part, projects, team }, idx) => (
<PartItem
key={`${generation}-${part}-${team ?? ''}-${idx}`}
generation={`${generation}`}
Expand Down
Loading