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.

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

✨ Profile User Api #79

Merged
merged 26 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
76f9206
feat: PageHeader.scss 수정
Legitgoons May 24, 2024
3efc682
feat: useGetUser hook 구현
Legitgoons May 24, 2024
6d20865
feat: ProfileUser useGetUser 사용
Legitgoons May 24, 2024
d4621ef
feat: user.ts Fetch interface 구현
Legitgoons May 24, 2024
eac07d4
feat: profileImage Link 경로 수정
Legitgoons May 24, 2024
fa5756c
feat: Feed 내 Profile 경로 props 추가
Legitgoons May 24, 2024
0e4beb4
feat: types/index.ts 수정
Legitgoons May 24, 2024
36ce49d
feat: ProfileMainPage 수정
Legitgoons May 24, 2024
3cb4e26
feat: Router index 수정
Legitgoons May 24, 2024
5019432
fix: ProfileUser 컴포넌트 수정
Legitgoons May 24, 2024
6289ee5
fix: shared/consts/types/index.ts 수정
Legitgoons May 26, 2024
7e847ae
Merge branch 'feature/PW-346-profile-api' of https://github.com/Colla…
Legitgoons May 26, 2024
19cbeec
feat: ProfileMainPage useEffect 삭제
Legitgoons May 26, 2024
3a9cef7
feat: ProfileUser 수정
Legitgoons May 26, 2024
9ffbabf
feat: ProfileUser 컴포넌트 icon 추가
Legitgoons May 26, 2024
21d195f
feat: ProfileUserImage 컴포넌트 구현
Legitgoons May 29, 2024
4594567
feat: ProfileUser에서 ProfileUserImage 컴포넌트 분리 적용
Legitgoons May 29, 2024
4efb10c
refactor: ProfileMainPage 분기처리 리팩토링
Legitgoons May 29, 2024
8512416
feat: shared/ProfileImage 컴포넌트 구현
Legitgoons May 29, 2024
b70eef2
feat: shared/Profile ProfileImage컴포넌트 적용 및 isLink prop 추가
Legitgoons May 29, 2024
eb8b944
feat: Feed 컴포넌트 isLink prop 추가
Legitgoons May 29, 2024
4531af2
feat: FeedMainList 내부 Feed 컴포넌트에 isLink prop 설정
Legitgoons May 29, 2024
f5cbb5d
feat: ProfileFeedList 내부 Feed 컴포넌트에 isLink prop 설정
Legitgoons May 29, 2024
f98f6bf
feat: ProfileUserImage 내 NoProfileIcon SVG 추가
Legitgoons May 29, 2024
6a734f9
feat: useGetUser enalbed 삭제
Legitgoons May 29, 2024
fe4a12c
feat: ProfileMainPage 내 ProfileFeedList 제거
Legitgoons May 29, 2024
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
Prev Previous commit
Next Next commit
feat: ProfileUser 컴포넌트 icon 추가
  • Loading branch information
Legitgoons committed May 26, 2024
commit 9ffbabf5d7c4679623c739560f2fe89fd60aa98f
12 changes: 12 additions & 0 deletions src/widgets/profile-user/assets/profile-change-icon.svg
Legitgoons marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/widgets/profile-user/ui/ProfileUser.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Icon, NetworkError, PageHeader } from '@/shared/ui';

import { useGetUser } from '../api';
import ProfileChangeIcon from '../assets/profile-change-icon.svg?react';

import { ProfileCount } from './ProfileCount';
import './ProfileUser.scss';
Expand Down Expand Up @@ -43,7 +44,7 @@ export const ProfileUser = ({ userId, isOwner }: ProfileUserProps) => {
)}
{isOwner && (
<button className='profile-change-btn'>
<Icon name='profile-change' height='24' width='24' />
<ProfileChangeIcon />
</button>
)}
</div>
Expand Down
Loading