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.

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

Feature/#305 스터디페이지 권한 수정 #307

Merged
merged 7 commits into from
Sep 27, 2024
Merged

Feature/#305 스터디페이지 권한 수정 #307

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bd33742
feat: 스터디 수정/삭제/종료 버튼 권한 작업
llddang Sep 22, 2024
e49378f
feat: 커리큘럼 편집 버튼 스터디 장에게만 보이도록 권한 작업
llddang Sep 26, 2024
46a3eff
feat: 스터디원 관리 버튼 권한 작업
llddang Sep 26, 2024
7a47e56
feat: 스터디 관리 버튼 권한 작업 수정
llddang Sep 26, 2024
3bd8d21
design: 팀페이지 공통 여백 주도록 디자인 수정
llddang Sep 26, 2024
acf1ee4
refactor: 코드리뷰 반영
llddang Sep 27, 2024
a78b602
Merge branch 'develop' of https://github.com/BDD-CLUB/01-doo-re-front…
llddang Sep 27, 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
15 changes: 10 additions & 5 deletions src/app/team/[teamId]/study/[studyId]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import Participant from '@/containers/study/Participant';
import StudyControlPanel from '@/containers/study/StudyControlPanel';
import StudyInfoCard from '@/containers/study/StudyInfoCard';
import StudyParticipantMenu from '@/containers/study/StudyParticipantMenu';
import useGetUser from '@/hooks/useGetUser';
import participantData from '@/mocks/participant';
import { DocumentList, Study } from '@/types';

Expand All @@ -28,6 +29,8 @@ const Page = ({ params }: { params: { teamId: number; studyId: number } }) => {
const [isTerminateModalOpen, setIsTerminateModalOpen] = useState<boolean>(false);
const [documentArray, setDocumentArray] = useState<DocumentList[]>([]);

const user = useGetUser();

useEffect(() => {
getStudy(params.studyId).then((data) => {
setStudyData(data.body);
Expand All @@ -54,11 +57,13 @@ const Page = ({ params }: { params: { teamId: number; studyId: number } }) => {
</>
)}
</Flex>
<StudyControlPanel
editModalOpen={setIsEditModalOpen}
terminateModalOpen={setIsTerminateModalOpen}
deleteModalOpen={setIsDeleteModalOpen}
/>
{user?.memberId === studyData?.studyLeaderId && (
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 부분 user가 null 이고 studyData도 null 이라면 True로 판단될 수 있을 듯 합니다.
studyData && user?.memberId === studyData.studyLeaderId && 로 고치는 것도 좋아보입니다.

<StudyControlPanel
editModalOpen={setIsEditModalOpen}
terminateModalOpen={setIsTerminateModalOpen}
deleteModalOpen={setIsDeleteModalOpen}
/>
)}
<Grid gap="4" templateColumns={{ base: '', xl: '2fr 1fr' }} w="100%">
<Flex direction="column" rowGap={{ base: '6', '2xl': '12' }}>
{studyData && (
Expand Down