Skip to content

develp branch 작업내용 머지 : develop -> main #182

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
heeeeyong merged 2 commits into from
Aug 20, 2025
Merged

develp branch 작업내용 머지 : develop -> main #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d8de24
fix: 띱하기가 내 프로필에서 보이는 에러 수정
heeeeyong Aug 20, 2025
0d2ebae
Merge pull request #181 from THIP-TextHip/chore/minor-updates
heeeeyong Aug 20, 2025
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: 5 additions & 1 deletion src/components/feed/OtherFeed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ interface OtherFeedProps {
profileData?: OtherProfileData | null;
userId?: number;
showFollowButton?: boolean; // showFollowButton prop 추가
isMyself?: boolean;
}

const OtherFeed = ({
Expand All @@ -21,6 +22,7 @@ const OtherFeed = ({
userId,
showFollowButton,
isMyFeed,
isMyself,
}: OtherFeedProps) => {
const hasPosts = posts.length > 0;

Expand All @@ -32,7 +34,9 @@ const OtherFeed = ({
<Container>
<Profile
userId={userId}
showFollowButton={showFollowButton !== undefined ? showFollowButton : !profileData.isWriter}
showFollowButton={
showFollowButton !== undefined ? showFollowButton : !profileData.isWriter && !isMyself
}
isFollowing={profileData.isFollowing}
profileImageUrl={profileData.profileImageUrl}
nickname={profileData.nickname}
Expand Down
2 changes: 1 addition & 1 deletion src/components/feed/UserProfileItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const UserProfileItem = ({
</div>
</div>
</div>
{type === 'followlist' && !isMyself && (
{type === 'followlist' && (
<div className="followbutton" onClick={toggleFollow}>
{followed ? '띱 취소' : '띱 하기'}
</div>
Expand Down
1 change: 1 addition & 0 deletions src/pages/feed/MyFeedPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ const MyFeedPage = () => {
isMyFeed={true}
profileData={profileData}
showFollowButton={false} // 띱하기 버튼 숨김
isMyself={true}
/>
<NavBar src={writefab} path="/post/create" />
</Container>
Expand Down