-
Notifications
You must be signed in to change notification settings - Fork 0
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
Feature/#82 커리큘럼 편집 모달창 구현 #208
Merged
The head ref may contain hidden characters: "feature/#82-\uCEE4\uB9AC\uD058\uB7FC_\uD3B8\uC9D1_\uBAA8\uB2EC\uCC3D_\uAD6C\uD604"
Merged
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
83b0a02
feat: react beautiful dnd 라이브러리 설치
pipisebastian 29cdc07
feat: 커리큘럼 편집 모달창 구현
pipisebastian ca0364c
Merge branch 'develop' of https://github.com/BDD-CLUB/01-doo-re-front…
pipisebastian 4e15547
refactor: components 필요없는 파일 제거
pipisebastian 2059276
refactor: 주석 제거
pipisebastian 8229f79
Merge branch 'develop' of https://github.com/BDD-CLUB/01-doo-re-front…
pipisebastian 1084916
Merge branch 'develop' of https://github.com/BDD-CLUB/01-doo-re-front…
pipisebastian 6ecd0aa
feat: 전체보기 버튼 추가
pipisebastian e3a0f3a
Merge branch 'develop' of https://github.com/BDD-CLUB/01-doo-re-front…
pipisebastian File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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 was deleted.
Oops, something went wrong.
File renamed without changes.
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,81 @@ | ||
'use client'; | ||
|
||
import { Flex, Image, Card, IconButton, useDisclosure } from '@chakra-ui/react'; | ||
import { BiArrowBack } from 'react-icons/bi'; | ||
|
||
import CurriculumCardData from '@/mocks/curriculum'; | ||
|
||
import CurriculumItem from './CurriculumItem'; | ||
import ActionModal from '../../../components/Modal/ActionModal'; | ||
import CurriculumModal from '../CurriculumModal'; | ||
|
||
const CurriculumCard = () => { | ||
const { isOpen: isActionModalOpen, onOpen: onActionModalOpen, onClose: onActionModalClose } = useDisclosure(); | ||
|
||
return ( | ||
<Flex direction="column" w="100%"> | ||
<IconButton | ||
color="white" | ||
bg="green_dark" | ||
_hover={{ bg: 'green_dark' }} | ||
aria-label="" | ||
icon={<BiArrowBack />} | ||
onClick={onActionModalOpen} | ||
size="icon_sm" | ||
/> | ||
<Flex h={{ base: '30vh', lg: '35vh', '2xl': '40vh' }}> | ||
<Image | ||
display={{ base: 'none', md: 'block' }} | ||
w={{ base: '30vh', lg: '35vh', '2xl': '40vh' }} | ||
borderTopRightRadius="0" | ||
borderTopLeftRadius="2xl" | ||
borderBottomLeftRadius="2xl" | ||
borderBottomRightRadius="0" | ||
alt="curriculum card" | ||
src="/images/curriculumCrops/carrot_5.png" | ||
/> | ||
<Card | ||
direction="row" | ||
w="100%" | ||
py="4" | ||
pr="1" | ||
borderTopRightRadius="2xl" | ||
borderTopLeftRadius={{ base: '2xl', md: '0' }} | ||
borderBottomLeftRadius={{ base: '2xl', md: '0' }} | ||
borderBottomRightRadius="2xl" | ||
> | ||
<Flex className="scroll" direction="column" gap="3" overflowY="auto" w="100%"> | ||
{CurriculumCardData.map((data) => { | ||
return ( | ||
<CurriculumItem | ||
key={data.id} | ||
id={data.id} | ||
name={data.name} | ||
itemOrder={data.itemOrder} | ||
isCompleted={data.isCompleted} | ||
/> | ||
); | ||
})} | ||
</Flex> | ||
</Card> | ||
</Flex> | ||
<ActionModal | ||
isOpen={isActionModalOpen} | ||
onClose={onActionModalClose} | ||
title="커리큘럼" | ||
subButtonText="이전" | ||
onSubButtonClick={() => { | ||
onActionModalClose(); | ||
}} | ||
mainButtonText="다음" | ||
onMainButtonClick={() => { | ||
onActionModalClose(); | ||
}} | ||
> | ||
<CurriculumModal /> | ||
</ActionModal> | ||
</Flex> | ||
); | ||
}; | ||
|
||
export default CurriculumCard; |
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이 부분 바꾸려고 해놓으신 거겠죠..?
갑자기 초록 동그라미밖에 안보여서 당황했습니다😯
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
바꿨습니닷..!