-
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.
Browse files
Browse the repository at this point in the history
* UI: #72 유저 정보 설정 페이지 팀 설정 UI 구현 * Feat: #72 팀 초대 및 가입 상태를 처리하는 API Handler 추가 & 팀 설정 페이지 UI변경 * UI: #72 팀 head UI 추가 & style 변경 * Formatting: #72 TeamSettingPage 시맨틱 태그로 변경
- Loading branch information
1 parent
1f6c489
commit 68871f9
Showing
9 changed files
with
213 additions
and
29 deletions.
There are no files selected for viewing
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
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,3 +1,118 @@ | ||
| import { useEffect, useState } from 'react'; | ||
| import useAxios from '@/hooks/useAxios'; | ||
| import { findTeamList } from '@/services/userService'; | ||
|
|
||
| enum TeamStatus { | ||
| JOINED, | ||
| INVITED, | ||
| } | ||
|
|
||
| export default function TeamSettingPage() { | ||
| return <div>TeamSettingPage</div>; | ||
| const [view, setView] = useState<TeamStatus>(TeamStatus.JOINED); | ||
|
|
||
| // ToDo: useAxios 부분을 react query로 변경할 것 | ||
| const { data, loading, fetchData } = useAxios(findTeamList); | ||
| const joinedTeamList = data?.filter((data) => data.isPendingApproval === true); | ||
| const invitedTeamList = data?.filter((data) => data.isPendingApproval === false); | ||
| useEffect(() => { | ||
| fetchData(); | ||
| }, [fetchData]); | ||
|
|
||
| return ( | ||
| <main> | ||
| <section className="mt-10 space-x-4 border-b-2 px-10"> | ||
| <button | ||
| type="button" | ||
| onClick={() => setView(TeamStatus.JOINED)} | ||
| className={view === TeamStatus.JOINED ? 'text-main' : 'text-emphasis'} | ||
| > | ||
| 가입현황 | ||
| </button> | ||
| <button | ||
| type="button" | ||
| onClick={() => setView(TeamStatus.INVITED)} | ||
| className={view === TeamStatus.INVITED ? 'text-main' : 'text-emphasis'} | ||
| > | ||
| 대기현황 | ||
| </button> | ||
| </section> | ||
|
|
||
| <section className="mt-6 px-10"> | ||
| {/* 가입현황 레이아웃 */} | ||
| {view === TeamStatus.JOINED && ( | ||
| <article> | ||
| <ul className="min-w-300 space-y-2 text-sm"> | ||
| {joinedTeamList?.map((team) => ( | ||
| <li key={team.teamId} className="flex h-50 items-center gap-4 border p-8"> | ||
| <div className="flex max-h-full gap-4"> | ||
| <div className="max-h-full w-45 shrink-0"> | ||
| <small className="text-xs font-bold text-main">team</small> | ||
| <p className="break-all">{team.name}</p> | ||
| </div> | ||
|
|
||
| <div className="flex max-h-full w-45 shrink-0 flex-col"> | ||
| <small className="h-10 text-xs font-bold text-main">head</small> | ||
| <p className="grow overflow-y-auto break-all scrollbar-hide">{team.creator}</p> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="flex h-full flex-grow items-center overflow-y-auto break-all px-4 scrollbar-hide"> | ||
| <p className="max-h-full">{team.content}</p> | ||
| </div> | ||
| <div className="w-45 shrink-0"> | ||
| <button | ||
| type="button" | ||
| className="rounded-md bg-red-500 px-5 py-2 text-sm text-white hover:brightness-90" | ||
| > | ||
| 탈퇴하기 | ||
| </button> | ||
| </div> | ||
| </li> | ||
| ))} | ||
| </ul> | ||
| </article> | ||
| )} | ||
| {/* 대기현황 레이아웃 */} | ||
| {view === TeamStatus.INVITED && ( | ||
| <article> | ||
| <ul className="min-w-300 space-y-2 text-sm"> | ||
| {invitedTeamList?.map((invite) => ( | ||
| <li key={invite.teamId} className="flex h-50 items-center gap-4 border p-8"> | ||
| <div className="flex max-h-full gap-4"> | ||
| <div className="max-h-full w-45 shrink-0"> | ||
| <small className="text-xs font-bold text-main">team</small> | ||
| <p className="break-all">{invite.name}</p> | ||
| </div> | ||
|
|
||
| <div className="flex max-h-full w-45 shrink-0 flex-col"> | ||
| <small className="h-10 text-xs font-bold text-main">head</small> | ||
| <p className="grow overflow-y-auto break-all scrollbar-hide">{invite.creator}</p> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="flex h-full flex-grow items-center overflow-y-auto break-all px-4 scrollbar-hide"> | ||
| <p className="max-h-full">{invite.content}</p> | ||
| </div> | ||
| <div className="flex shrink-0 flex-col gap-4"> | ||
| <button | ||
| type="button" | ||
| className="rounded-md bg-main px-5 py-2 text-sm text-white hover:brightness-90" | ||
| > | ||
| 수락하기 | ||
| </button> | ||
| <button | ||
| type="button" | ||
| className="rounded-md bg-red-500 px-5 py-2 text-sm text-white hover:brightness-90" | ||
| > | ||
| 거부하기 | ||
| </button> | ||
| </div> | ||
| </li> | ||
| ))} | ||
| </ul> | ||
| </article> | ||
| )} | ||
| </section> | ||
| </main> | ||
| ); | ||
| } |
Oops, something went wrong.