From b694ef7e4ee34a1d44c9762ffe0f9be6b319278d Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Sun, 14 Jan 2024 03:34:16 +0900 Subject: [PATCH 01/11] =?UTF-8?q?init:=20=EB=AA=A8=EB=8B=AC=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=B4=88=EA=B8=B0=EC=84=B8?= =?UTF-8?q?=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Modal/Modal.style.ts | 9 +++++++++ src/components/common/Modal/index.tsx | 11 +++++++++++ 2 files changed, 20 insertions(+) create mode 100644 src/components/common/Modal/Modal.style.ts create mode 100644 src/components/common/Modal/index.tsx diff --git a/src/components/common/Modal/Modal.style.ts b/src/components/common/Modal/Modal.style.ts new file mode 100644 index 00000000..14f1a341 --- /dev/null +++ b/src/components/common/Modal/Modal.style.ts @@ -0,0 +1,9 @@ +import styled from '@emotion/styled'; + +export const Wrapper = styled.div` + display: flex; +`; + +export const Contents = styled.div` + display: flex; +`; diff --git a/src/components/common/Modal/index.tsx b/src/components/common/Modal/index.tsx new file mode 100644 index 00000000..ddfffa6f --- /dev/null +++ b/src/components/common/Modal/index.tsx @@ -0,0 +1,11 @@ +import * as S from './Modal.style'; + +function Modal() { + return ( + + 모달 + + ); +} + +export default Modal; From 00f3628f7233290cefcf47beed70e7e7039bdc4d Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Sun, 14 Jan 2024 03:48:30 +0900 Subject: [PATCH 02/11] =?UTF-8?q?init:=20=EB=AA=A8=EB=8B=AC=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=EC=84=B8=ED=8C=85=20=EA=B5=AC=EC=B2=B4=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommonModal.style.ts} | 0 src/components/common/Modal/CommonModal/index.tsx | 11 +++++++++++ .../Modal/CommonModalForm/CommonModalForm.style.ts | 9 +++++++++ .../common/Modal/CommonModalForm/index.tsx | 11 +++++++++++ .../Modal/LoginCheckModal/LoginCheckModal.style.ts | 9 +++++++++ .../common/Modal/LoginCheckModal/index.tsx | 11 +++++++++++ .../LoginCheckModalForm/LoginCheckModalForm.style.ts | 9 +++++++++ .../common/Modal/LoginCheckModalForm/index.tsx | 11 +++++++++++ src/components/common/Modal/ModalPortal.tsx | 12 ++++++++++++ src/components/common/Modal/index.tsx | 11 ----------- 10 files changed, 83 insertions(+), 11 deletions(-) rename src/components/common/Modal/{Modal.style.ts => CommonModal/CommonModal.style.ts} (100%) create mode 100644 src/components/common/Modal/CommonModal/index.tsx create mode 100644 src/components/common/Modal/CommonModalForm/CommonModalForm.style.ts create mode 100644 src/components/common/Modal/CommonModalForm/index.tsx create mode 100644 src/components/common/Modal/LoginCheckModal/LoginCheckModal.style.ts create mode 100644 src/components/common/Modal/LoginCheckModal/index.tsx create mode 100644 src/components/common/Modal/LoginCheckModalForm/LoginCheckModalForm.style.ts create mode 100644 src/components/common/Modal/LoginCheckModalForm/index.tsx create mode 100644 src/components/common/Modal/ModalPortal.tsx delete mode 100644 src/components/common/Modal/index.tsx diff --git a/src/components/common/Modal/Modal.style.ts b/src/components/common/Modal/CommonModal/CommonModal.style.ts similarity index 100% rename from src/components/common/Modal/Modal.style.ts rename to src/components/common/Modal/CommonModal/CommonModal.style.ts diff --git a/src/components/common/Modal/CommonModal/index.tsx b/src/components/common/Modal/CommonModal/index.tsx new file mode 100644 index 00000000..9621c1ca --- /dev/null +++ b/src/components/common/Modal/CommonModal/index.tsx @@ -0,0 +1,11 @@ +import * as S from './CommonModal.style'; + +function CommonModal() { + return ( + + CommonModal + + ); +} + +export default CommonModal; diff --git a/src/components/common/Modal/CommonModalForm/CommonModalForm.style.ts b/src/components/common/Modal/CommonModalForm/CommonModalForm.style.ts new file mode 100644 index 00000000..05f161eb --- /dev/null +++ b/src/components/common/Modal/CommonModalForm/CommonModalForm.style.ts @@ -0,0 +1,9 @@ +import styled from '@emotion/styled' + +export const Wrapper = styled.div` + display: flex; +`; + +export const Contents = styled.div` + display: flex; +`; diff --git a/src/components/common/Modal/CommonModalForm/index.tsx b/src/components/common/Modal/CommonModalForm/index.tsx new file mode 100644 index 00000000..0337c9ea --- /dev/null +++ b/src/components/common/Modal/CommonModalForm/index.tsx @@ -0,0 +1,11 @@ +import * as S from './CommonModalForm.style'; + +function CommonModalForm() { + return ( + + CommonModalForm + + ); +} + +export default CommonModalForm; diff --git a/src/components/common/Modal/LoginCheckModal/LoginCheckModal.style.ts b/src/components/common/Modal/LoginCheckModal/LoginCheckModal.style.ts new file mode 100644 index 00000000..05f161eb --- /dev/null +++ b/src/components/common/Modal/LoginCheckModal/LoginCheckModal.style.ts @@ -0,0 +1,9 @@ +import styled from '@emotion/styled' + +export const Wrapper = styled.div` + display: flex; +`; + +export const Contents = styled.div` + display: flex; +`; diff --git a/src/components/common/Modal/LoginCheckModal/index.tsx b/src/components/common/Modal/LoginCheckModal/index.tsx new file mode 100644 index 00000000..73eea101 --- /dev/null +++ b/src/components/common/Modal/LoginCheckModal/index.tsx @@ -0,0 +1,11 @@ +import * as S from './LoginCheckModal.style'; + +function LoginCheckModal() { + return ( + + 모달 + + ); +} + +export default LoginCheckModal; diff --git a/src/components/common/Modal/LoginCheckModalForm/LoginCheckModalForm.style.ts b/src/components/common/Modal/LoginCheckModalForm/LoginCheckModalForm.style.ts new file mode 100644 index 00000000..14f1a341 --- /dev/null +++ b/src/components/common/Modal/LoginCheckModalForm/LoginCheckModalForm.style.ts @@ -0,0 +1,9 @@ +import styled from '@emotion/styled'; + +export const Wrapper = styled.div` + display: flex; +`; + +export const Contents = styled.div` + display: flex; +`; diff --git a/src/components/common/Modal/LoginCheckModalForm/index.tsx b/src/components/common/Modal/LoginCheckModalForm/index.tsx new file mode 100644 index 00000000..da40ecab --- /dev/null +++ b/src/components/common/Modal/LoginCheckModalForm/index.tsx @@ -0,0 +1,11 @@ +import * as S from './LoginCheckModalForm.style'; + +function LoginCheckModalForm() { + return ( + + LoginCheckModalForm + + ); +} + +export default LoginCheckModalForm; diff --git a/src/components/common/Modal/ModalPortal.tsx b/src/components/common/Modal/ModalPortal.tsx new file mode 100644 index 00000000..55dd8ba1 --- /dev/null +++ b/src/components/common/Modal/ModalPortal.tsx @@ -0,0 +1,12 @@ +import ReactDOM from 'react-dom'; + +interface ModalPortalProps { + children: React.ReactNode; +} + +const ModalPortal = ({ children }: ModalPortalProps) => { + const el: HTMLElement | null = document.getElementById('modal'); + return ReactDOM.createPortal(children, el as Element | DocumentFragment); +}; + +export default ModalPortal; diff --git a/src/components/common/Modal/index.tsx b/src/components/common/Modal/index.tsx deleted file mode 100644 index ddfffa6f..00000000 --- a/src/components/common/Modal/index.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import * as S from './Modal.style'; - -function Modal() { - return ( - - 모달 - - ); -} - -export default Modal; From 5c5929096942e7b90fe1d58ac91c050ca2d8e4cd Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Sun, 14 Jan 2024 05:01:43 +0900 Subject: [PATCH 03/11] =?UTF-8?q?style:=20asset=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/img_modal_ex.svg | 9 +++++++++ src/assets/index.ts | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 src/assets/img/img_modal_ex.svg diff --git a/src/assets/img/img_modal_ex.svg b/src/assets/img/img_modal_ex.svg new file mode 100644 index 00000000..35a1efca --- /dev/null +++ b/src/assets/img/img_modal_ex.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/index.ts b/src/assets/index.ts index f5968f3a..21e013ed 100644 --- a/src/assets/index.ts +++ b/src/assets/index.ts @@ -1,5 +1,4 @@ /// - import BtnFloatingList from './button/btn_floating_list.svg?react'; import BtnFloatingPostit from './button/btn_floating_postit.svg?react'; import BtnFloatingSticker from './button/btn_floating_sticker.svg?react'; @@ -27,6 +26,7 @@ import ImgKakaoStarOrange from './img/img_kakao_star_orange.svg?react'; import ImgKakaoStarWhite from './img/img_kakao_star_white.svg?react'; import ImgLe from './img/img_le.svg?react'; import ImgLogoLecue from './img/img_logo_lecue.svg?react'; +import ImgModalEx from './img/img_modal_ex.svg?react'; import ImgSplashLogo from './img/img_splash_logo.svg?react'; import ImgStarOrangeLine from './img/img_star_orangeline.svg?react'; import ImgStarPosit from './img/img_star_postit.svg?react'; @@ -60,8 +60,9 @@ export { ImgKakaoStarWhite, ImgLe, ImgLogoLecue, + ImgModalEx, + ImgSplashLogo, ImgStarOrangeLine, ImgStarPosit, ImgSticker, - ImgSplashLogo, }; From c0cf8de7ffede01e4a1dc35cf30834929fb76759 Mon Sep 17 00:00:00 2001 From: seoAreum <1971236@hansung.ac.kr> Date: Sun, 14 Jan 2024 05:03:07 +0900 Subject: [PATCH 04/11] =?UTF-8?q?chore:=20=ED=97=A4=EB=8D=94=20=ED=83=80?= =?UTF-8?q?=EC=9D=B4=ED=8B=80=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/LecueNote/page/LeceuNotePage/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LecueNote/page/LeceuNotePage/index.tsx b/src/LecueNote/page/LeceuNotePage/index.tsx index ed6e4301..603f71a6 100644 --- a/src/LecueNote/page/LeceuNotePage/index.tsx +++ b/src/LecueNote/page/LeceuNotePage/index.tsx @@ -6,7 +6,7 @@ import * as S from './LecueNotePage.style'; function LecueNotePage() { return ( -
+