-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: feed footer 수정 UI 변경으로 likeCount와 commnetCount의 위치 및 font를 수정했습니다. * refactor: FollowButton 개선 * feat: profile-change icon sprite 추가 * feat: ProfileUser 구현 * feat: ProfileCount 구현 * feat: ProfileUser public Api 추가 * feat: Feed 컴포넌트 추출 * feat: ProfileFeedList 구현 * feat: ProfileFeedList Public Api 추가 * feat: ProfileHeader 구현 * feat: ProfileHeader Public Api 추가 * feat: ProfileMainPage 구현 * feat: ProfileMainPage Public Api 추가 * feat: routers index에 ProfileMainPage 추가 * feat: PageHeader 수정 * feat: ProfileFeedList.scss 수정 * feat: profile 임시 링크 추가 * feat: FollowButton 수정 * feat: PageHeader 수정 * feat: ProfileUser.scss 수정 * feat: router index.tsx 수정 * feat: ProfileHeader.scss 수정 * feat: Feed.scss 수정 * feat: ProfileFeedList.scss 수정 * feat: ProfileHeader widgets로 이동 * feat: router index.ts 수정 * feat: ProfileFeedList 컴포넌트 수정 section 태그를 div 태그로 변경 Closes #PW-344
- Loading branch information
1 parent
b28debd
commit f533a73
Showing
29 changed files
with
372 additions
and
56 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export { ProfileMainPage } from './ui/ProfileMainPage'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import { ProfileFeedList } from '@/widgets/profile-feed-list'; | ||
import { ProfileHeader } from '@/widgets/profile-header'; | ||
import { ProfileUser } from '@/widgets/profile-user'; | ||
|
||
export const ProfileMainPage = () => { | ||
return ( | ||
<main> | ||
<ProfileHeader name='2weeksone' /> | ||
<ProfileUser /> | ||
<ProfileFeedList /> | ||
</main> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
export interface ButtonProps { | ||
onClick: React.MouseEventHandler<HTMLButtonElement>; | ||
children: React.ReactNode; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
export { FeedMainList } from './ui'; | ||
export { FeedMainList, Feed } from './ui'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
export { FeedMainList } from './FeedMainList'; | ||
export { Feed } from './Feed'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export { ProfileFeedList } from './ui'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
.profile-feed-list-wrapper { | ||
display: flex; | ||
flex-direction: column; | ||
align-items: center; | ||
gap: 10px; | ||
margin-bottom: 20px; | ||
padding: 20px 20px 17px 20px; | ||
|
||
.feed-list-title { | ||
align-self: flex-start; | ||
margin-top: 20px; | ||
} | ||
|
||
.profile-feed { | ||
width: 100%; | ||
border: 1px solid $gray1; | ||
border-radius: 10px; | ||
padding: 20px 1px; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
import { Feed as FeedProps } from '@/shared/consts'; | ||
import { Feed } from '@/widgets/feed-main-list'; | ||
|
||
import './ProfileFeedList.scss'; | ||
|
||
const dummyFeeds: FeedProps[] = [ | ||
{ | ||
id: 1, | ||
user: { | ||
id: 1, | ||
name: '김붕어빵', | ||
profileImage: '', | ||
}, | ||
createdAt: '1분 전', | ||
updatedAt: '1분 전', | ||
content: 'ㅎㅇ', | ||
images: [], | ||
likeCount: 30, | ||
commentCount: 30, | ||
isLiked: true, | ||
isBookmarked: false, | ||
}, | ||
{ | ||
id: 2, | ||
user: { | ||
id: 1, | ||
name: '김붕어빵', | ||
profileImage: '', | ||
}, | ||
createdAt: '1분 전', | ||
updatedAt: '1분 전', | ||
content: 'ㅎㅇ', | ||
images: [], | ||
likeCount: 300, | ||
commentCount: 340, | ||
isLiked: true, | ||
isBookmarked: false, | ||
}, | ||
{ | ||
id: 3, | ||
user: { | ||
id: 1, | ||
name: '김붕어빵', | ||
profileImage: '', | ||
}, | ||
createdAt: '1분 전', | ||
updatedAt: '1분 전', | ||
content: 'ㅎㅇ', | ||
images: [], | ||
likeCount: 1, | ||
commentCount: 2, | ||
isLiked: false, | ||
isBookmarked: false, | ||
}, | ||
]; | ||
|
||
export const ProfileFeedList = () => { | ||
return ( | ||
<section className='profile-feed-list-wrapper'> | ||
<h3 className='feed-list-title b1md'>내 게시글</h3> | ||
{dummyFeeds.map((dummyFeed) => ( | ||
<div className='profile-feed' key={dummyFeed.id}> | ||
<Feed feed={dummyFeed} /> | ||
</div> | ||
))} | ||
</section> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export { ProfileFeedList } from './ProfileFeedList'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export { ProfileHeader } from './ui'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
.profile-header { | ||
width: 100%; | ||
height: 44px; | ||
display: flex; | ||
align-items: center; | ||
justify-content: center; | ||
border: none; | ||
background-color: white; | ||
margin-top: 3.45px; | ||
padding-left: 3px; | ||
|
||
.name { | ||
text-align: center; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
import './ProfileHeader.scss'; | ||
|
||
interface ProfileHeaderProps { | ||
name: string; | ||
} | ||
|
||
export const ProfileHeader = ({ name }: ProfileHeaderProps) => { | ||
return ( | ||
<header className='profile-header'> | ||
<p className='name h4md'>{name}</p> | ||
</header> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export { ProfileHeader } from './ProfileHeader'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export { ProfileUser } from './ui'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
.profile-count { | ||
display: flex; | ||
height: 100%; | ||
flex-direction: column; | ||
justify-content: space-between; | ||
|
||
gap: 5px; | ||
.count-number { | ||
color: $gray7; | ||
} | ||
.count-text { | ||
color: $gray4; | ||
} | ||
} |
Oops, something went wrong.