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

[Feat] 팔로우 기능 및 페이지 추가 #436

Merged
merged 33 commits into from
Apr 7, 2024
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ed8c097
feat: 팔로우 버튼 추가 및 과제 관련 카드 과제 탭으로 이동
Dec 15, 2023
3006522
feat: 팔로워, 팔로잉 카드 추가
Dec 15, 2023
c58943e
feat: 팔로우 mutation 추가
Dec 15, 2023
14e2080
feat: 팔로우 훅, 페이지 셋업
Dec 30, 2023
e0c193e
feat: 팔로우 상태 추가
Dec 30, 2023
bb586cf
feat: 팔로우 카드 유저 추가
Dec 30, 2023
021a0cf
feat: 팔로우 페이지 카드 추가
Dec 31, 2023
c23a02d
feat: 팔로우 페이지네이션 추가
Dec 31, 2023
a268d70
refactor: 팔로우 preview 요청 카드에서 하도록 수정
Dec 31, 2023
c6c00e9
fix: router 오류
Jan 2, 2024
dec050e
feat: follow api 변경
42sungwook Feb 2, 2024
7f2045f
feat: follow searchparams 연결
42sungwook Feb 2, 2024
a24fe3f
feat: 본인 아이디 비교 추가
42sungwook Feb 2, 2024
f347018
feat: 팔로우 상태 중복 확인 제거
42sungwook Feb 4, 2024
c520992
feat: followButton 색상 구분
42sungwook Feb 4, 2024
ec96cb4
chore: merge develop
42sungwook Feb 4, 2024
1cec7ee
chore: 폴더 위치 변경, follow 페이지 refetch 삭제
42sungwook Feb 5, 2024
ddce6f1
refactor: follow 로직 수정
42sungwook Feb 7, 2024
858b706
feat: follow 에러 모달 추가
42sungwook Feb 7, 2024
9f371f4
fix: follow 렌더링 오류
42sungwook Feb 7, 2024
5cf7375
feat: follow 페이지 일반탭 추가 및 제목 추가
42sungwook Feb 7, 2024
2849eb9
feat: group 아이콘 색상 변경
42sungwook Feb 7, 2024
3bd2b9a
feat: schema type 변경
42sungwook Mar 19, 2024
4535d84
fix: follow 데이터 no-cache로 변경
42sungwook Apr 1, 2024
1dba9ab
refactor: isFollowing 변수명 수정
42sungwook Apr 4, 2024
3b7861a
refactor: FollowItemProps 타입 지정
42sungwook Apr 4, 2024
79bafea
refactor: Profile 탭 컴포넌트 분리
42sungwook Apr 4, 2024
c00ec99
refactor: follow 대쉬보드카드 관심사 분리
42sungwook Apr 4, 2024
a91dbb3
refactor: 팔로우 페이지 탭에 추가
42sungwook Apr 4, 2024
a633d96
refactor: 컴포넌트명 수정
42sungwook Apr 4, 2024
ee592b9
refactor: follow 페이지 리팩토링
42sungwook Apr 4, 2024
337c97b
feat: 팔로우 카드 링크 추가
42sungwook Apr 4, 2024
385bb5a
fix: followSkeleton title 수정
42sungwook Apr 4, 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
22 changes: 22 additions & 0 deletions app/src/@core/appRouter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ const ProfileLogtimeAndProjectPage = lazy(
);
const ProfileEvalPage = lazy(() => import('@/Profile/pages/Eval'));
const ProfileVersusPage = lazy(() => import('@/Profile/pages/Versus'));
const ProfileFollowersPage = lazy(
() => import('@/Profile/pages/Follow/Followers'),
);
const ProfileFollowingPage = lazy(
() => import('@/Profile/pages/Follow/Following'),
);
const LeaderboardLevelPage = lazy(() => import('@/Leaderboard/pages/Level'));
const LeaderboardExpIncrementPage = lazy(
() => import('@/Leaderboard/pages/ExpIncrement'),
Expand Down Expand Up @@ -161,6 +167,22 @@ export const appRouter = createBrowserRouter([
</Suspense>
),
},
{
path: ROUTES.PROFILE_FOLLOWERS,
element: (
<Suspense fallback={<ProfileVersusPageSkeleton />}>
<ProfileFollowersPage />
</Suspense>
),
},
{
path: ROUTES.PROFILE_FOLLOWING,
element: (
<Suspense fallback={<ProfileVersusPageSkeleton />}>
<ProfileFollowingPage />
</Suspense>
),
},
],
},
{
Expand Down
3 changes: 3 additions & 0 deletions app/src/@core/atoms/followErrorDialogAtom.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { atom } from 'jotai';

export const followErrorDialogAtom = atom(false);
26 changes: 26 additions & 0 deletions app/src/@core/components/Modal/FollowErrorDialog.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { useSetAtom } from 'jotai';

import { followErrorDialogAtom } from '@core/atoms/followErrorDialogAtom';

import { AlertDialog } from '@shared/ui-kit';

export const LogoutErrorDialog = () => {
const setIsModalOpen = useSetAtom(followErrorDialogAtom);

const handleConfirm = () => {
setIsModalOpen(false);
};

return (
<AlertDialog
isOpen
onClose={() => {
/* can't close */
}}
title="팔로우 오류"
description="다시 시도해주세요."
confirmText="확인"
onConfirm={handleConfirm}
/>
);
};
25 changes: 25 additions & 0 deletions app/src/@shared/__generated__/gql.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading