From ec8c8fb4c3c3a0f68c7fc8366c80cdc984ce4a33 Mon Sep 17 00:00:00 2001 From: backward99 <86753969+backward99@users.noreply.github.com> Date: Mon, 15 Jan 2024 14:23:57 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=20=EC=95=84=ED=86=A0=EB=AF=B9=20=EA=B5=AC=EC=A1=B0?= =?UTF-8?q?=EB=A1=9C=20=EB=B6=84=EB=A6=AC=20(#272)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 아토믹 구조에 맞게 분리 * fix: 잘못 추가된 파일 제거 * fix: 폴더 분리 후 index 파일 수정 --- .../EventDetail => atoms/EventContent}/EventContent.tsx | 0 src/components/atoms/EventContent/index.ts | 3 +++ .../EventDetail => molecules/EventTime}/EventTime.tsx | 0 src/components/molecules/EventTime/index.ts | 3 +++ .../EventDetail => molecules/EventTitle}/EventTitle.tsx | 0 src/components/molecules/EventTitle/index.ts | 3 +++ .../Profile => molecules/ImageCard}/ImageCard.tsx | 0 src/components/molecules/ImageCard/index.ts | 3 +++ .../ResumeBasicInput => molecules/LinkItem}/LinkItem.tsx | 0 src/components/molecules/LinkItem/index.ts | 3 +++ .../MentorCareerContent}/MentorCareerContent.tsx | 0 src/components/molecules/MentorCareerContent/index.ts | 3 +++ .../MentorCareerTitle}/MentorCareerTitle.tsx | 0 src/components/molecules/MentorCareerTitle/index.ts | 3 +++ src/components/molecules/Modal/index.stories.tsx | 2 +- src/components/molecules/Modal/index.ts | 3 +-- src/components/molecules/OptionsButton/index.ts | 2 +- .../RadioCardGroup => molecules/RadioCard}/RadioCard.tsx | 0 src/components/molecules/RadioCard/index.ts | 3 +++ .../RejectionModalContent}/RejectionModalContent.tsx | 0 src/components/molecules/RejectionModalContent/index.ts | 3 +++ .../Profile => molecules/ResumeList}/ResumeList.tsx | 0 src/components/molecules/ResumeList/index.ts | 3 +++ .../TitleInputForm}/TitleInputForm.tsx | 0 src/components/molecules/TitleInputForm/index.ts | 3 +++ .../{ResumeBasicInput => BasicInfoForm}/BasicInfoForm.tsx | 0 src/components/organisms/BasicInfoForm/index.ts | 3 +++ .../BasicInfoView.stories.tsx | 0 .../{ResumeBasicInput => BasicInfoView}/BasicInfoView.tsx | 0 src/components/organisms/BasicInfoView/index.ts | 3 +++ .../CareerContentModal}/CareerContentModal.tsx | 2 +- src/components/organisms/CareerContentModal/index.ts | 3 +++ .../CommonInput}/CommonInput.tsx | 2 +- src/components/organisms/CommonInput/index.ts | 3 +++ .../EditDeleteOptionsButton}/EditDeleteOptionsButton.tsx | 6 +++--- src/components/organisms/EditDeleteOptionsButton/index.ts | 3 +++ src/components/organisms/EventDetail/EventDetail.tsx | 8 ++++---- .../organisms/{Profile => EventItem}/EventItem.tsx | 0 src/components/organisms/EventItem/index.ts | 3 +++ .../FeedbackBlock}/FeedbackBlock.tsx | 0 src/components/organisms/FeedbackBlock/index.ts | 3 +++ .../FeedbackCategoryDetails/FeedbackCategoryDetails.tsx | 2 +- .../ModalWithButton}/ModalWithButton.tsx | 2 +- src/components/organisms/ModalWithButton/index.ts | 3 +++ src/components/organisms/Profile/Profile.tsx | 4 ++-- .../organisms/RadioCardGroup/RadioCardGroup.tsx | 2 +- .../ReferenceLinkForm.stories.tsx | 0 .../ReferenceLinkForm.tsx | 2 +- src/components/organisms/ReferenceLinkForm/index.ts | 3 +++ .../organisms/RemoteControlPannel/RemoteControlPannel.tsx | 2 +- .../RemoteControlReject.tsx | 2 +- src/components/organisms/RemoteControlReject/index.ts | 3 +++ .../organisms/ResumeBasicInput/ResumeBasicInput.tsx | 8 ++++---- .../ResumeCategory.tsx | 0 src/components/organisms/ResumeCategory/index.ts | 3 +++ src/components/organisms/ResumeCategoryCareer/index.ts | 4 ++-- .../organisms/{Profile => UserDetail}/UserDetail.tsx | 0 src/components/organisms/UserDetail/index.ts | 3 +++ .../EditProfileTemplate/EditMenteeProfileTemplate.tsx | 2 +- .../EditProfileTemplate/EditMentorProfileTemplate.tsx | 4 ++-- .../templates/EditResumeTemplate/EditResumeTemplate.tsx | 2 +- .../EventProfileTemplate/EventProfileTemplate.tsx} | 6 +++--- src/components/templates/EventProfileTemplate/index.ts | 3 +++ .../FeedbackReflectTemplate/FeedbackReflectTemplate.tsx | 2 +- .../ResumeDetailTemplate/ResumeDetailTemplate.tsx | 2 +- .../SignUpMentorTemplate/SignUpMentorTemplate.tsx | 2 +- src/pages/EventPages/EventDetailPage/EventDetailPage.tsx | 2 +- src/pages/MyPage/MyPage.tsx | 2 +- 68 files changed, 110 insertions(+), 39 deletions(-) rename src/components/{organisms/EventDetail => atoms/EventContent}/EventContent.tsx (100%) create mode 100644 src/components/atoms/EventContent/index.ts rename src/components/{organisms/EventDetail => molecules/EventTime}/EventTime.tsx (100%) create mode 100644 src/components/molecules/EventTime/index.ts rename src/components/{organisms/EventDetail => molecules/EventTitle}/EventTitle.tsx (100%) create mode 100644 src/components/molecules/EventTitle/index.ts rename src/components/{organisms/Profile => molecules/ImageCard}/ImageCard.tsx (100%) create mode 100644 src/components/molecules/ImageCard/index.ts rename src/components/{organisms/ResumeBasicInput => molecules/LinkItem}/LinkItem.tsx (100%) create mode 100644 src/components/molecules/LinkItem/index.ts rename src/components/{organisms/EventDetail => molecules/MentorCareerContent}/MentorCareerContent.tsx (100%) create mode 100644 src/components/molecules/MentorCareerContent/index.ts rename src/components/{organisms/EventDetail => molecules/MentorCareerTitle}/MentorCareerTitle.tsx (100%) create mode 100644 src/components/molecules/MentorCareerTitle/index.ts rename src/components/{organisms/RadioCardGroup => molecules/RadioCard}/RadioCard.tsx (100%) create mode 100644 src/components/molecules/RadioCard/index.ts rename src/components/{organisms/RemoteControlPannel => molecules/RejectionModalContent}/RejectionModalContent.tsx (100%) create mode 100644 src/components/molecules/RejectionModalContent/index.ts rename src/components/{organisms/Profile => molecules/ResumeList}/ResumeList.tsx (100%) create mode 100644 src/components/molecules/ResumeList/index.ts rename src/components/{organisms/ResumeBasicInput => molecules/TitleInputForm}/TitleInputForm.tsx (100%) create mode 100644 src/components/molecules/TitleInputForm/index.ts rename src/components/organisms/{ResumeBasicInput => BasicInfoForm}/BasicInfoForm.tsx (100%) create mode 100644 src/components/organisms/BasicInfoForm/index.ts rename src/components/organisms/{ResumeBasicInput => BasicInfoView}/BasicInfoView.stories.tsx (100%) rename src/components/organisms/{ResumeBasicInput => BasicInfoView}/BasicInfoView.tsx (100%) create mode 100644 src/components/organisms/BasicInfoView/index.ts rename src/components/{molecules/Modal => organisms/CareerContentModal}/CareerContentModal.tsx (91%) create mode 100644 src/components/organisms/CareerContentModal/index.ts rename src/components/{templates/EditProfileTemplate => organisms/CommonInput}/CommonInput.tsx (95%) create mode 100644 src/components/organisms/CommonInput/index.ts rename src/components/{molecules/OptionsButton => organisms/EditDeleteOptionsButton}/EditDeleteOptionsButton.tsx (75%) create mode 100644 src/components/organisms/EditDeleteOptionsButton/index.ts rename src/components/organisms/{Profile => EventItem}/EventItem.tsx (100%) create mode 100644 src/components/organisms/EventItem/index.ts rename src/components/{templates/FeedbackResumeTemplate => organisms/FeedbackBlock}/FeedbackBlock.tsx (100%) create mode 100644 src/components/organisms/FeedbackBlock/index.ts rename src/components/{molecules/Modal => organisms/ModalWithButton}/ModalWithButton.tsx (89%) create mode 100644 src/components/organisms/ModalWithButton/index.ts rename src/components/organisms/{ResumeBasicInput => ReferenceLinkForm}/ReferenceLinkForm.stories.tsx (100%) rename src/components/organisms/{ResumeBasicInput => ReferenceLinkForm}/ReferenceLinkForm.tsx (98%) create mode 100644 src/components/organisms/ReferenceLinkForm/index.ts rename src/components/organisms/{RemoteControlPannel => RemoteControlReject}/RemoteControlReject.tsx (91%) create mode 100644 src/components/organisms/RemoteControlReject/index.ts rename src/components/organisms/{ResumeCategoryCareer => ResumeCategory}/ResumeCategory.tsx (100%) create mode 100644 src/components/organisms/ResumeCategory/index.ts rename src/components/organisms/{Profile => UserDetail}/UserDetail.tsx (100%) create mode 100644 src/components/organisms/UserDetail/index.ts rename src/components/{organisms/Profile/EventProfile.tsx => templates/EventProfileTemplate/EventProfileTemplate.tsx} (91%) create mode 100644 src/components/templates/EventProfileTemplate/index.ts diff --git a/src/components/organisms/EventDetail/EventContent.tsx b/src/components/atoms/EventContent/EventContent.tsx similarity index 100% rename from src/components/organisms/EventDetail/EventContent.tsx rename to src/components/atoms/EventContent/EventContent.tsx diff --git a/src/components/atoms/EventContent/index.ts b/src/components/atoms/EventContent/index.ts new file mode 100644 index 00000000..c36ea090 --- /dev/null +++ b/src/components/atoms/EventContent/index.ts @@ -0,0 +1,3 @@ +import EventContent from './EventContent'; + +export { EventContent }; diff --git a/src/components/organisms/EventDetail/EventTime.tsx b/src/components/molecules/EventTime/EventTime.tsx similarity index 100% rename from src/components/organisms/EventDetail/EventTime.tsx rename to src/components/molecules/EventTime/EventTime.tsx diff --git a/src/components/molecules/EventTime/index.ts b/src/components/molecules/EventTime/index.ts new file mode 100644 index 00000000..680f9ff0 --- /dev/null +++ b/src/components/molecules/EventTime/index.ts @@ -0,0 +1,3 @@ +import EventTime from './EventTime'; + +export { EventTime }; diff --git a/src/components/organisms/EventDetail/EventTitle.tsx b/src/components/molecules/EventTitle/EventTitle.tsx similarity index 100% rename from src/components/organisms/EventDetail/EventTitle.tsx rename to src/components/molecules/EventTitle/EventTitle.tsx diff --git a/src/components/molecules/EventTitle/index.ts b/src/components/molecules/EventTitle/index.ts new file mode 100644 index 00000000..2f3e4513 --- /dev/null +++ b/src/components/molecules/EventTitle/index.ts @@ -0,0 +1,3 @@ +import EventTitle from './EventTitle'; + +export { EventTitle }; diff --git a/src/components/organisms/Profile/ImageCard.tsx b/src/components/molecules/ImageCard/ImageCard.tsx similarity index 100% rename from src/components/organisms/Profile/ImageCard.tsx rename to src/components/molecules/ImageCard/ImageCard.tsx diff --git a/src/components/molecules/ImageCard/index.ts b/src/components/molecules/ImageCard/index.ts new file mode 100644 index 00000000..628b1f59 --- /dev/null +++ b/src/components/molecules/ImageCard/index.ts @@ -0,0 +1,3 @@ +import ImageCard from './ImageCard'; + +export { ImageCard }; diff --git a/src/components/organisms/ResumeBasicInput/LinkItem.tsx b/src/components/molecules/LinkItem/LinkItem.tsx similarity index 100% rename from src/components/organisms/ResumeBasicInput/LinkItem.tsx rename to src/components/molecules/LinkItem/LinkItem.tsx diff --git a/src/components/molecules/LinkItem/index.ts b/src/components/molecules/LinkItem/index.ts new file mode 100644 index 00000000..8599b24e --- /dev/null +++ b/src/components/molecules/LinkItem/index.ts @@ -0,0 +1,3 @@ +import LinkItem from './LinkItem'; + +export { LinkItem }; diff --git a/src/components/organisms/EventDetail/MentorCareerContent.tsx b/src/components/molecules/MentorCareerContent/MentorCareerContent.tsx similarity index 100% rename from src/components/organisms/EventDetail/MentorCareerContent.tsx rename to src/components/molecules/MentorCareerContent/MentorCareerContent.tsx diff --git a/src/components/molecules/MentorCareerContent/index.ts b/src/components/molecules/MentorCareerContent/index.ts new file mode 100644 index 00000000..408a3704 --- /dev/null +++ b/src/components/molecules/MentorCareerContent/index.ts @@ -0,0 +1,3 @@ +import MentorCareerContent from './MentorCareerContent'; + +export { MentorCareerContent }; diff --git a/src/components/organisms/EventDetail/MentorCareerTitle.tsx b/src/components/molecules/MentorCareerTitle/MentorCareerTitle.tsx similarity index 100% rename from src/components/organisms/EventDetail/MentorCareerTitle.tsx rename to src/components/molecules/MentorCareerTitle/MentorCareerTitle.tsx diff --git a/src/components/molecules/MentorCareerTitle/index.ts b/src/components/molecules/MentorCareerTitle/index.ts new file mode 100644 index 00000000..a428ec59 --- /dev/null +++ b/src/components/molecules/MentorCareerTitle/index.ts @@ -0,0 +1,3 @@ +import MentorCareerTitle from './MentorCareerTitle'; + +export { MentorCareerTitle }; diff --git a/src/components/molecules/Modal/index.stories.tsx b/src/components/molecules/Modal/index.stories.tsx index adfce443..50d51687 100644 --- a/src/components/molecules/Modal/index.stories.tsx +++ b/src/components/molecules/Modal/index.stories.tsx @@ -1,5 +1,5 @@ import type { Meta, StoryObj } from '@storybook/react'; -import ModalWithButton from './ModalWithButton'; +import ModalWithButton from '../../organisms/ModalWithButton/ModalWithButton'; const meta = { title: 'Resumeme/components/Molecules/Modal', diff --git a/src/components/molecules/Modal/index.ts b/src/components/molecules/Modal/index.ts index 68a2a7f6..e6dc10d9 100644 --- a/src/components/molecules/Modal/index.ts +++ b/src/components/molecules/Modal/index.ts @@ -1,4 +1,3 @@ -import CareerContentModal from './CareerContentModal'; import Modal from './Modal'; -export { Modal, CareerContentModal }; +export { Modal }; diff --git a/src/components/molecules/OptionsButton/index.ts b/src/components/molecules/OptionsButton/index.ts index 27641ad8..feb64e55 100644 --- a/src/components/molecules/OptionsButton/index.ts +++ b/src/components/molecules/OptionsButton/index.ts @@ -1,4 +1,4 @@ -import EditDeleteOptionsButton from './EditDeleteOptionsButton'; +import EditDeleteOptionsButton from '../../organisms/EditDeleteOptionsButton/EditDeleteOptionsButton'; import OptionsButton from './OptionsButton'; export { OptionsButton, EditDeleteOptionsButton }; diff --git a/src/components/organisms/RadioCardGroup/RadioCard.tsx b/src/components/molecules/RadioCard/RadioCard.tsx similarity index 100% rename from src/components/organisms/RadioCardGroup/RadioCard.tsx rename to src/components/molecules/RadioCard/RadioCard.tsx diff --git a/src/components/molecules/RadioCard/index.ts b/src/components/molecules/RadioCard/index.ts new file mode 100644 index 00000000..a93b6a41 --- /dev/null +++ b/src/components/molecules/RadioCard/index.ts @@ -0,0 +1,3 @@ +import RadioCard from './RadioCard'; + +export { RadioCard }; diff --git a/src/components/organisms/RemoteControlPannel/RejectionModalContent.tsx b/src/components/molecules/RejectionModalContent/RejectionModalContent.tsx similarity index 100% rename from src/components/organisms/RemoteControlPannel/RejectionModalContent.tsx rename to src/components/molecules/RejectionModalContent/RejectionModalContent.tsx diff --git a/src/components/molecules/RejectionModalContent/index.ts b/src/components/molecules/RejectionModalContent/index.ts new file mode 100644 index 00000000..914d30a3 --- /dev/null +++ b/src/components/molecules/RejectionModalContent/index.ts @@ -0,0 +1,3 @@ +import RejectionModalContent from './RejectionModalContent'; + +export { RejectionModalContent }; diff --git a/src/components/organisms/Profile/ResumeList.tsx b/src/components/molecules/ResumeList/ResumeList.tsx similarity index 100% rename from src/components/organisms/Profile/ResumeList.tsx rename to src/components/molecules/ResumeList/ResumeList.tsx diff --git a/src/components/molecules/ResumeList/index.ts b/src/components/molecules/ResumeList/index.ts new file mode 100644 index 00000000..4d352c69 --- /dev/null +++ b/src/components/molecules/ResumeList/index.ts @@ -0,0 +1,3 @@ +import ResumeList from './ResumeList'; + +export { ResumeList }; diff --git a/src/components/organisms/ResumeBasicInput/TitleInputForm.tsx b/src/components/molecules/TitleInputForm/TitleInputForm.tsx similarity index 100% rename from src/components/organisms/ResumeBasicInput/TitleInputForm.tsx rename to src/components/molecules/TitleInputForm/TitleInputForm.tsx diff --git a/src/components/molecules/TitleInputForm/index.ts b/src/components/molecules/TitleInputForm/index.ts new file mode 100644 index 00000000..d8e2c9ce --- /dev/null +++ b/src/components/molecules/TitleInputForm/index.ts @@ -0,0 +1,3 @@ +import TitleInputForm from './TitleInputForm'; + +export { TitleInputForm }; diff --git a/src/components/organisms/ResumeBasicInput/BasicInfoForm.tsx b/src/components/organisms/BasicInfoForm/BasicInfoForm.tsx similarity index 100% rename from src/components/organisms/ResumeBasicInput/BasicInfoForm.tsx rename to src/components/organisms/BasicInfoForm/BasicInfoForm.tsx diff --git a/src/components/organisms/BasicInfoForm/index.ts b/src/components/organisms/BasicInfoForm/index.ts new file mode 100644 index 00000000..e9bd3b7c --- /dev/null +++ b/src/components/organisms/BasicInfoForm/index.ts @@ -0,0 +1,3 @@ +import BasicInfoForm from './BasicInfoForm'; + +export { BasicInfoForm }; diff --git a/src/components/organisms/ResumeBasicInput/BasicInfoView.stories.tsx b/src/components/organisms/BasicInfoView/BasicInfoView.stories.tsx similarity index 100% rename from src/components/organisms/ResumeBasicInput/BasicInfoView.stories.tsx rename to src/components/organisms/BasicInfoView/BasicInfoView.stories.tsx diff --git a/src/components/organisms/ResumeBasicInput/BasicInfoView.tsx b/src/components/organisms/BasicInfoView/BasicInfoView.tsx similarity index 100% rename from src/components/organisms/ResumeBasicInput/BasicInfoView.tsx rename to src/components/organisms/BasicInfoView/BasicInfoView.tsx diff --git a/src/components/organisms/BasicInfoView/index.ts b/src/components/organisms/BasicInfoView/index.ts new file mode 100644 index 00000000..d4552812 --- /dev/null +++ b/src/components/organisms/BasicInfoView/index.ts @@ -0,0 +1,3 @@ +import BasicInfoView from './BasicInfoView'; + +export { BasicInfoView }; diff --git a/src/components/molecules/Modal/CareerContentModal.tsx b/src/components/organisms/CareerContentModal/CareerContentModal.tsx similarity index 91% rename from src/components/molecules/Modal/CareerContentModal.tsx rename to src/components/organisms/CareerContentModal/CareerContentModal.tsx index 1df2bfc3..f20af0a1 100644 --- a/src/components/molecules/Modal/CareerContentModal.tsx +++ b/src/components/organisms/CareerContentModal/CareerContentModal.tsx @@ -1,5 +1,5 @@ import { Text } from '@chakra-ui/react'; -import { Modal } from '.'; +import { Modal } from '../../molecules/Modal'; const CareerContentModal = ({ isOpen, onClose }: { isOpen: boolean; onClose: () => void }) => { return ( diff --git a/src/components/organisms/CareerContentModal/index.ts b/src/components/organisms/CareerContentModal/index.ts new file mode 100644 index 00000000..9020ab3c --- /dev/null +++ b/src/components/organisms/CareerContentModal/index.ts @@ -0,0 +1,3 @@ +import CareerContentModal from './CareerContentModal'; + +export { CareerContentModal }; diff --git a/src/components/templates/EditProfileTemplate/CommonInput.tsx b/src/components/organisms/CommonInput/CommonInput.tsx similarity index 95% rename from src/components/templates/EditProfileTemplate/CommonInput.tsx rename to src/components/organisms/CommonInput/CommonInput.tsx index 74626e4d..83daeeb3 100644 --- a/src/components/templates/EditProfileTemplate/CommonInput.tsx +++ b/src/components/organisms/CommonInput/CommonInput.tsx @@ -1,6 +1,6 @@ import { Flex } from '@chakra-ui/react'; import { FieldError, UseFormRegisterReturn } from 'react-hook-form'; -import { FORM_STYLE } from './EditMentorProfileTemplate'; +import { FORM_STYLE } from '../../templates/EditProfileTemplate/EditMentorProfileTemplate'; import { Avatar } from '~/components/atoms/Avatar'; import { BorderBox } from '~/components/atoms/BorderBox'; import { FormLabel } from '~/components/atoms/FormLabel'; diff --git a/src/components/organisms/CommonInput/index.ts b/src/components/organisms/CommonInput/index.ts new file mode 100644 index 00000000..115262c1 --- /dev/null +++ b/src/components/organisms/CommonInput/index.ts @@ -0,0 +1,3 @@ +import CommonInput from './CommonInput'; + +export { CommonInput }; diff --git a/src/components/molecules/OptionsButton/EditDeleteOptionsButton.tsx b/src/components/organisms/EditDeleteOptionsButton/EditDeleteOptionsButton.tsx similarity index 75% rename from src/components/molecules/OptionsButton/EditDeleteOptionsButton.tsx rename to src/components/organisms/EditDeleteOptionsButton/EditDeleteOptionsButton.tsx index 897311ae..b07cb650 100644 --- a/src/components/molecules/OptionsButton/EditDeleteOptionsButton.tsx +++ b/src/components/organisms/EditDeleteOptionsButton/EditDeleteOptionsButton.tsx @@ -1,7 +1,7 @@ import { useDisclosure } from '@chakra-ui/react'; -import OptionsButton from './OptionsButton'; -import { Option } from './OptionsButton'; -import { ConfirmModal } from '../ConfirmModal'; +import { ConfirmModal } from '../../molecules/ConfirmModal'; +import OptionsButton from '../../molecules/OptionsButton/OptionsButton'; +import { Option } from '../../molecules/OptionsButton/OptionsButton'; const EditDeleteOptionsButton = ({ onEdit, diff --git a/src/components/organisms/EditDeleteOptionsButton/index.ts b/src/components/organisms/EditDeleteOptionsButton/index.ts new file mode 100644 index 00000000..c0c1d41b --- /dev/null +++ b/src/components/organisms/EditDeleteOptionsButton/index.ts @@ -0,0 +1,3 @@ +import EditDeleteOptionsButton from './EditDeleteOptionsButton'; + +export { EditDeleteOptionsButton }; diff --git a/src/components/organisms/EventDetail/EventDetail.tsx b/src/components/organisms/EventDetail/EventDetail.tsx index ce453476..bc3d5d2d 100644 --- a/src/components/organisms/EventDetail/EventDetail.tsx +++ b/src/components/organisms/EventDetail/EventDetail.tsx @@ -1,8 +1,8 @@ import { Box, Divider, Flex } from '@chakra-ui/react'; -import EventContent from './EventContent'; -import EventTime from './EventTime'; -import MentorCareerContent from './MentorCareerContent'; -import MentorCareerTitle from './MentorCareerTitle'; +import EventContent from '../../atoms/EventContent/EventContent'; +import EventTime from '../../molecules/EventTime/EventTime'; +import MentorCareerContent from '../../molecules/MentorCareerContent/MentorCareerContent'; +import MentorCareerTitle from '../../molecules/MentorCareerTitle/MentorCareerTitle'; import { ReadEvent } from '~/types/event/event'; import { ReadMentor } from '~/types/mentor'; diff --git a/src/components/organisms/Profile/EventItem.tsx b/src/components/organisms/EventItem/EventItem.tsx similarity index 100% rename from src/components/organisms/Profile/EventItem.tsx rename to src/components/organisms/EventItem/EventItem.tsx diff --git a/src/components/organisms/EventItem/index.ts b/src/components/organisms/EventItem/index.ts new file mode 100644 index 00000000..228d26dc --- /dev/null +++ b/src/components/organisms/EventItem/index.ts @@ -0,0 +1,3 @@ +import EventItem from './EventItem'; + +export { EventItem }; diff --git a/src/components/templates/FeedbackResumeTemplate/FeedbackBlock.tsx b/src/components/organisms/FeedbackBlock/FeedbackBlock.tsx similarity index 100% rename from src/components/templates/FeedbackResumeTemplate/FeedbackBlock.tsx rename to src/components/organisms/FeedbackBlock/FeedbackBlock.tsx diff --git a/src/components/organisms/FeedbackBlock/index.ts b/src/components/organisms/FeedbackBlock/index.ts new file mode 100644 index 00000000..443bb76a --- /dev/null +++ b/src/components/organisms/FeedbackBlock/index.ts @@ -0,0 +1,3 @@ +import FeedbackBlock from './FeedbackBlock'; + +export { FeedbackBlock }; diff --git a/src/components/organisms/FeedbackCategoryDetails/FeedbackCategoryDetails.tsx b/src/components/organisms/FeedbackCategoryDetails/FeedbackCategoryDetails.tsx index 69df6cd8..be1149ba 100644 --- a/src/components/organisms/FeedbackCategoryDetails/FeedbackCategoryDetails.tsx +++ b/src/components/organisms/FeedbackCategoryDetails/FeedbackCategoryDetails.tsx @@ -2,7 +2,7 @@ import { Box, Divider } from '@chakra-ui/react'; import React from 'react'; import { BorderBox } from '~/components/atoms/BorderBox'; import { FeedbackView } from '~/components/molecules/FeedbackView'; -import FeedbackBlock from '~/components/templates/FeedbackResumeTemplate/FeedbackBlock'; +import FeedbackBlock from '~/components/organisms/FeedbackBlock/FeedbackBlock'; import { FeedbackComment } from '~/types/event/feedback'; import { ReadMentor } from '~/types/mentor'; import { DetailsComponentProps } from '~/types/props/detailsComponentProps'; diff --git a/src/components/molecules/Modal/ModalWithButton.tsx b/src/components/organisms/ModalWithButton/ModalWithButton.tsx similarity index 89% rename from src/components/molecules/Modal/ModalWithButton.tsx rename to src/components/organisms/ModalWithButton/ModalWithButton.tsx index d15441be..1df43d6a 100644 --- a/src/components/molecules/Modal/ModalWithButton.tsx +++ b/src/components/organisms/ModalWithButton/ModalWithButton.tsx @@ -1,5 +1,5 @@ import { Button, useDisclosure } from '@chakra-ui/react'; -import Modal, { ModalProps } from './Modal'; +import Modal, { ModalProps } from '../../molecules/Modal/Modal'; const ModalWithButton = ({ size, title, hasCloseButton, hasFooter, children }: ModalProps) => { const { isOpen, onOpen, onClose } = useDisclosure(); diff --git a/src/components/organisms/ModalWithButton/index.ts b/src/components/organisms/ModalWithButton/index.ts new file mode 100644 index 00000000..7038ef38 --- /dev/null +++ b/src/components/organisms/ModalWithButton/index.ts @@ -0,0 +1,3 @@ +import ModalWithButton from './ModalWithButton'; + +export { ModalWithButton }; diff --git a/src/components/organisms/Profile/Profile.tsx b/src/components/organisms/Profile/Profile.tsx index d0475fa4..14a29b2b 100644 --- a/src/components/organisms/Profile/Profile.tsx +++ b/src/components/organisms/Profile/Profile.tsx @@ -1,6 +1,6 @@ import { Flex, Heading } from '@chakra-ui/react'; -import ImageCard from './ImageCard'; -import UserDetail from './UserDetail'; +import ImageCard from '../../molecules/ImageCard/ImageCard'; +import UserDetail from '../UserDetail/UserDetail'; import { BorderBox } from '~/components/atoms/BorderBox'; import { User } from '~/types/user'; diff --git a/src/components/organisms/RadioCardGroup/RadioCardGroup.tsx b/src/components/organisms/RadioCardGroup/RadioCardGroup.tsx index 2878c6f3..208fe2d0 100644 --- a/src/components/organisms/RadioCardGroup/RadioCardGroup.tsx +++ b/src/components/organisms/RadioCardGroup/RadioCardGroup.tsx @@ -1,6 +1,6 @@ import { Box, BoxProps, Flex, FormErrorMessage, useRadioGroup } from '@chakra-ui/react'; import { FieldError, UseFormRegisterReturn } from 'react-hook-form'; -import RadioCard from './RadioCard'; +import RadioCard from '../../molecules/RadioCard/RadioCard'; export type RadioOption = { value: T; diff --git a/src/components/organisms/ResumeBasicInput/ReferenceLinkForm.stories.tsx b/src/components/organisms/ReferenceLinkForm/ReferenceLinkForm.stories.tsx similarity index 100% rename from src/components/organisms/ResumeBasicInput/ReferenceLinkForm.stories.tsx rename to src/components/organisms/ReferenceLinkForm/ReferenceLinkForm.stories.tsx diff --git a/src/components/organisms/ResumeBasicInput/ReferenceLinkForm.tsx b/src/components/organisms/ReferenceLinkForm/ReferenceLinkForm.tsx similarity index 98% rename from src/components/organisms/ResumeBasicInput/ReferenceLinkForm.tsx rename to src/components/organisms/ReferenceLinkForm/ReferenceLinkForm.tsx index 71561628..091066ea 100644 --- a/src/components/organisms/ResumeBasicInput/ReferenceLinkForm.tsx +++ b/src/components/organisms/ReferenceLinkForm/ReferenceLinkForm.tsx @@ -1,6 +1,6 @@ import { Box, Flex, FormControl, Radio, RadioGroup } from '@chakra-ui/react'; import { useForm } from 'react-hook-form'; -import LinkItem from './LinkItem'; +import LinkItem from '../../molecules/LinkItem/LinkItem'; import { BorderBox } from '~/components/atoms/BorderBox'; import { Button } from '~/components/atoms/Button'; import { FormTextInput } from '~/components/molecules/FormTextInput'; diff --git a/src/components/organisms/ReferenceLinkForm/index.ts b/src/components/organisms/ReferenceLinkForm/index.ts new file mode 100644 index 00000000..c6bc5b7e --- /dev/null +++ b/src/components/organisms/ReferenceLinkForm/index.ts @@ -0,0 +1,3 @@ +import ReferenceLinkForm from './ReferenceLinkForm'; + +export { ReferenceLinkForm }; diff --git a/src/components/organisms/RemoteControlPannel/RemoteControlPannel.tsx b/src/components/organisms/RemoteControlPannel/RemoteControlPannel.tsx index 8ee4b243..80e08eed 100644 --- a/src/components/organisms/RemoteControlPannel/RemoteControlPannel.tsx +++ b/src/components/organisms/RemoteControlPannel/RemoteControlPannel.tsx @@ -1,6 +1,6 @@ import { useForm } from 'react-hook-form'; import { useNavigate, useParams } from 'react-router-dom'; -import RemoteControlReject from './RemoteControlReject'; +import RemoteControlReject from '../RemoteControlReject/RemoteControlReject'; import { Button } from '~/components/atoms/Button'; import { FormLabel } from '~/components/atoms/FormLabel'; import { RemoteControl } from '~/components/atoms/RemoteControl'; diff --git a/src/components/organisms/RemoteControlPannel/RemoteControlReject.tsx b/src/components/organisms/RemoteControlReject/RemoteControlReject.tsx similarity index 91% rename from src/components/organisms/RemoteControlPannel/RemoteControlReject.tsx rename to src/components/organisms/RemoteControlReject/RemoteControlReject.tsx index f7eb780f..599af83d 100644 --- a/src/components/organisms/RemoteControlPannel/RemoteControlReject.tsx +++ b/src/components/organisms/RemoteControlReject/RemoteControlReject.tsx @@ -1,5 +1,5 @@ import { useDisclosure, Text, Box } from '@chakra-ui/react'; -import RejectionModalContent from './RejectionModalContent'; +import RejectionModalContent from '../../molecules/RejectionModalContent/RejectionModalContent'; import { Modal } from '~/components/molecules/Modal'; type RemoteControlRejectProps = { diff --git a/src/components/organisms/RemoteControlReject/index.ts b/src/components/organisms/RemoteControlReject/index.ts new file mode 100644 index 00000000..5f327733 --- /dev/null +++ b/src/components/organisms/RemoteControlReject/index.ts @@ -0,0 +1,3 @@ +import RemoteControlReject from './RemoteControlReject'; + +export { RemoteControlReject }; diff --git a/src/components/organisms/ResumeBasicInput/ResumeBasicInput.tsx b/src/components/organisms/ResumeBasicInput/ResumeBasicInput.tsx index 415dd81d..cf60b911 100644 --- a/src/components/organisms/ResumeBasicInput/ResumeBasicInput.tsx +++ b/src/components/organisms/ResumeBasicInput/ResumeBasicInput.tsx @@ -1,10 +1,10 @@ import { Box, Flex, Heading, Text } from '@chakra-ui/react'; import { useEffect, useState } from 'react'; import { useParams } from 'react-router-dom'; -import BasicInfoForm from './BasicInfoForm'; -import BasicInfoView from './BasicInfoView'; -import ReferenceLinkForm from './ReferenceLinkForm'; -import TitleInputForm from './TitleInputForm'; +import TitleInputForm from '../../molecules/TitleInputForm/TitleInputForm'; +import BasicInfoForm from '../BasicInfoForm/BasicInfoForm'; +import BasicInfoView from '../BasicInfoView/BasicInfoView'; +import ReferenceLinkForm from '../ReferenceLinkForm/ReferenceLinkForm'; import { BorderBox } from '~/components/atoms/BorderBox'; import useUser from '~/hooks/useUser'; import { useGetResumeReferenceLinks } from '~/queries/resume/details/useGetResumeReferenceLinks'; diff --git a/src/components/organisms/ResumeCategoryCareer/ResumeCategory.tsx b/src/components/organisms/ResumeCategory/ResumeCategory.tsx similarity index 100% rename from src/components/organisms/ResumeCategoryCareer/ResumeCategory.tsx rename to src/components/organisms/ResumeCategory/ResumeCategory.tsx diff --git a/src/components/organisms/ResumeCategory/index.ts b/src/components/organisms/ResumeCategory/index.ts new file mode 100644 index 00000000..7628526e --- /dev/null +++ b/src/components/organisms/ResumeCategory/index.ts @@ -0,0 +1,3 @@ +import ResumeCategory from './ResumeCategory'; + +export { ResumeCategory }; diff --git a/src/components/organisms/ResumeCategoryCareer/index.ts b/src/components/organisms/ResumeCategoryCareer/index.ts index 7628526e..c5a5c832 100644 --- a/src/components/organisms/ResumeCategoryCareer/index.ts +++ b/src/components/organisms/ResumeCategoryCareer/index.ts @@ -1,3 +1,3 @@ -import ResumeCategory from './ResumeCategory'; +import CareerForm from './CareerForm'; -export { ResumeCategory }; +export { CareerForm }; diff --git a/src/components/organisms/Profile/UserDetail.tsx b/src/components/organisms/UserDetail/UserDetail.tsx similarity index 100% rename from src/components/organisms/Profile/UserDetail.tsx rename to src/components/organisms/UserDetail/UserDetail.tsx diff --git a/src/components/organisms/UserDetail/index.ts b/src/components/organisms/UserDetail/index.ts new file mode 100644 index 00000000..7cef445c --- /dev/null +++ b/src/components/organisms/UserDetail/index.ts @@ -0,0 +1,3 @@ +import UserDetail from './UserDetail'; + +export { UserDetail }; diff --git a/src/components/templates/EditProfileTemplate/EditMenteeProfileTemplate.tsx b/src/components/templates/EditProfileTemplate/EditMenteeProfileTemplate.tsx index 0f2cb0dd..2abfbe51 100644 --- a/src/components/templates/EditProfileTemplate/EditMenteeProfileTemplate.tsx +++ b/src/components/templates/EditProfileTemplate/EditMenteeProfileTemplate.tsx @@ -2,7 +2,7 @@ import { Box, Flex, Heading } from '@chakra-ui/react'; import { useQueryClient } from '@tanstack/react-query'; import { SubmitHandler, useForm } from 'react-hook-form'; import { useNavigate } from 'react-router-dom'; -import CommonInput from './CommonInput'; +import CommonInput from '../../organisms/CommonInput/CommonInput'; import { FORM_STYLE } from './EditMentorProfileTemplate'; import { BorderBox } from '~/components/atoms/BorderBox'; import { FormLabel } from '~/components/atoms/FormLabel'; diff --git a/src/components/templates/EditProfileTemplate/EditMentorProfileTemplate.tsx b/src/components/templates/EditProfileTemplate/EditMentorProfileTemplate.tsx index e184deba..20a851a1 100644 --- a/src/components/templates/EditProfileTemplate/EditMentorProfileTemplate.tsx +++ b/src/components/templates/EditProfileTemplate/EditMentorProfileTemplate.tsx @@ -2,15 +2,15 @@ import { Box, ChakraProps, Flex, Heading, Text, useDisclosure } from '@chakra-ui import { useQueryClient } from '@tanstack/react-query'; import { SubmitHandler, useForm } from 'react-hook-form'; import { useNavigate } from 'react-router-dom'; -import CommonInput from './CommonInput'; +import CommonInput from '../../organisms/CommonInput/CommonInput'; import { BorderBox } from '~/components/atoms/BorderBox'; import { FormLabel } from '~/components/atoms/FormLabel'; import { FormControl } from '~/components/molecules/FormControl'; import { FormTextarea } from '~/components/molecules/FormTextarea'; import { FormTextInput } from '~/components/molecules/FormTextInput'; import { LabelCheckboxGroup } from '~/components/molecules/LabelCheckboxGroup'; -import { CareerContentModal } from '~/components/molecules/Modal'; import { SubmitButtonGroup } from '~/components/molecules/SubmitButtonGroup'; +import { CareerContentModal } from '~/components/organisms/CareerContentModal'; import { appPaths } from '~/config/paths'; import CONSTANTS from '~/constants'; import useUser from '~/hooks/useUser'; diff --git a/src/components/templates/EditResumeTemplate/EditResumeTemplate.tsx b/src/components/templates/EditResumeTemplate/EditResumeTemplate.tsx index 2e315321..878a8bfd 100644 --- a/src/components/templates/EditResumeTemplate/EditResumeTemplate.tsx +++ b/src/components/templates/EditResumeTemplate/EditResumeTemplate.tsx @@ -5,7 +5,7 @@ import { Button } from '~/components/atoms/Button'; import { ResumeBasicInput } from '~/components/organisms/ResumeBasicInput'; import { ActivityForm } from '~/components/organisms/ResumeCategoryActivity'; import { AwardForm } from '~/components/organisms/ResumeCategoryAwards'; -import CareerForm from '~/components/organisms/ResumeCategoryCareer/CareerForm'; +import { CareerForm } from '~/components/organisms/ResumeCategoryCareer'; import { ResumeCategoryDetails } from '~/components/organisms/ResumeCategoryDetails'; import { LanguageForm } from '~/components/organisms/ResumeCategoryLanguage'; import { ProjectForm } from '~/components/organisms/ResumeCategoryProject'; diff --git a/src/components/organisms/Profile/EventProfile.tsx b/src/components/templates/EventProfileTemplate/EventProfileTemplate.tsx similarity index 91% rename from src/components/organisms/Profile/EventProfile.tsx rename to src/components/templates/EventProfileTemplate/EventProfileTemplate.tsx index 36e9a069..08393aac 100644 --- a/src/components/organisms/Profile/EventProfile.tsx +++ b/src/components/templates/EventProfileTemplate/EventProfileTemplate.tsx @@ -1,6 +1,6 @@ import { Flex, Heading, Text } from '@chakra-ui/react'; import { v4 as uuidv4 } from 'uuid'; -import EventItem from './EventItem'; +import EventItem from '../../organisms/EventItem/EventItem'; import { BorderBox } from '~/components/atoms/BorderBox'; import { ReadManagementEvent } from '~/types/event/event'; @@ -8,7 +8,7 @@ type EventProfile = { events: ReadManagementEvent[]; }; -const EventProfile = ({ events }: EventProfile) => { +const EventProfileTemplate = ({ events }: EventProfile) => { return ( <> { ); }; -export default EventProfile; +export default EventProfileTemplate; diff --git a/src/components/templates/EventProfileTemplate/index.ts b/src/components/templates/EventProfileTemplate/index.ts new file mode 100644 index 00000000..c112d145 --- /dev/null +++ b/src/components/templates/EventProfileTemplate/index.ts @@ -0,0 +1,3 @@ +import EventProfileTemplate from './EventProfileTemplate'; + +export { EventProfileTemplate }; diff --git a/src/components/templates/FeedbackReflectTemplate/FeedbackReflectTemplate.tsx b/src/components/templates/FeedbackReflectTemplate/FeedbackReflectTemplate.tsx index 8c46f506..195773df 100644 --- a/src/components/templates/FeedbackReflectTemplate/FeedbackReflectTemplate.tsx +++ b/src/components/templates/FeedbackReflectTemplate/FeedbackReflectTemplate.tsx @@ -5,7 +5,7 @@ import { FeedbackCategoryReflectDetails } from '~/components/organisms/FeedbackC import { ResumeBasicInput } from '~/components/organisms/ResumeBasicInput'; import { ActivityForm } from '~/components/organisms/ResumeCategoryActivity'; import { AwardForm } from '~/components/organisms/ResumeCategoryAwards'; -import CareerForm from '~/components/organisms/ResumeCategoryCareer/CareerForm'; +import { CareerForm } from '~/components/organisms/ResumeCategoryCareer'; import { LanguageForm } from '~/components/organisms/ResumeCategoryLanguage'; import ProjectForm from '~/components/organisms/ResumeCategoryProject/ProjectForm'; import { TrainingForm } from '~/components/organisms/ResumeCategoryTraining'; diff --git a/src/components/templates/ResumeDetailTemplate/ResumeDetailTemplate.tsx b/src/components/templates/ResumeDetailTemplate/ResumeDetailTemplate.tsx index 6d19439e..619de083 100644 --- a/src/components/templates/ResumeDetailTemplate/ResumeDetailTemplate.tsx +++ b/src/components/templates/ResumeDetailTemplate/ResumeDetailTemplate.tsx @@ -3,7 +3,7 @@ import { Box, Flex, Text } from '@chakra-ui/react'; import { useNavigate, useParams } from 'react-router-dom'; import { BorderBox } from '../../atoms/BorderBox'; import { Label } from '~/components/atoms/Label'; -import EditDeleteOptionsButton from '~/components/molecules/OptionsButton/EditDeleteOptionsButton'; +import EditDeleteOptionsButton from '~/components/organisms/EditDeleteOptionsButton/EditDeleteOptionsButton'; import { ReferenceLinkBox } from '~/components/molecules/ReferenceLinkBox'; import { ResumeCategoryDetails } from '~/components/organisms/ResumeCategoryDetails'; import { diff --git a/src/components/templates/SignUpMentorTemplate/SignUpMentorTemplate.tsx b/src/components/templates/SignUpMentorTemplate/SignUpMentorTemplate.tsx index f6362bbd..e8d35ea8 100644 --- a/src/components/templates/SignUpMentorTemplate/SignUpMentorTemplate.tsx +++ b/src/components/templates/SignUpMentorTemplate/SignUpMentorTemplate.tsx @@ -7,7 +7,7 @@ import { FormControl } from '~/components/molecules/FormControl'; import { FormTextarea } from '~/components/molecules/FormTextarea'; import { FormTextInput } from '~/components/molecules/FormTextInput'; import { LabelCheckboxGroup } from '~/components/molecules/LabelCheckboxGroup'; -import { CareerContentModal } from '~/components/molecules/Modal'; +import { CareerContentModal } from '~/components/organisms/CareerContentModal'; import { SignUpHeader } from '~/components/organisms/SignUpHeader'; import CONSTANTS from '~/constants'; import { SignUpMentor } from '~/types/signUp'; diff --git a/src/pages/EventPages/EventDetailPage/EventDetailPage.tsx b/src/pages/EventPages/EventDetailPage/EventDetailPage.tsx index ed751f54..485f9aac 100644 --- a/src/pages/EventPages/EventDetailPage/EventDetailPage.tsx +++ b/src/pages/EventPages/EventDetailPage/EventDetailPage.tsx @@ -3,10 +3,10 @@ import { useQueryClient } from '@tanstack/react-query'; import { Suspense } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; import { Spinner } from '~/components/atoms/Spinner'; +import EventTitle from '~/components/molecules/EventTitle/EventTitle'; import { MentorProfile } from '~/components/molecules/MentorProfile'; import { Modal } from '~/components/molecules/Modal'; import { EventDetail } from '~/components/organisms/EventDetail'; -import EventTitle from '~/components/organisms/EventDetail/EventTitle'; import ResumeSelect from '~/components/organisms/ResumeSelect/ResumeSelect'; import { appPaths } from '~/config/paths'; import useUser from '~/hooks/useUser'; diff --git a/src/pages/MyPage/MyPage.tsx b/src/pages/MyPage/MyPage.tsx index 93fc254b..39ae05d2 100644 --- a/src/pages/MyPage/MyPage.tsx +++ b/src/pages/MyPage/MyPage.tsx @@ -2,7 +2,7 @@ import { Box } from '@chakra-ui/react'; import { Suspense } from 'react'; import { Spinner } from '~/components/atoms/Spinner'; import { Profile } from '~/components/organisms/Profile'; -import EventProfile from '~/components/organisms/Profile/EventProfile'; +import EventProfile from '~/components/templates/EventProfileTemplate/EventProfileTemplate'; import useUser from '~/hooks/useUser'; import { useGetManagementEvents } from '~/queries/event/details/useGetManagementEvents';