Merge pull request #128 from iziz9/develop

Refactor: 이전 모달 컴포넌트 삭제 및 현재 모달 폴더 이동
Field-Passer · Oct 22, 2023 · 4efda7c · 4efda7c
2 parents 5db7adc + da74af6
commit 4efda7c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 189 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -7,7 +7,7 @@ import Sidebar from './components/Main/Sidebar'
 import { useEffect } from 'react'
 import { cheakOpenBox } from './store/slices/searchChkSlice'
 import { useDispatch } from 'react-redux'
-import ModalWithHook from './components/ModalWithHook'
+import Modal from './components/common/Modal'
 import Overlay from './components/Style/Overlay'
 import Interceptor from './hooks/useAxiosInterceptor'
 
@@ -25,7 +25,7 @@ const App = () => {
     <ThemeProvider theme={theme}>
       <Interceptor>
         <Sidebar />
-        <ModalWithHook />
+        <Modal />
         <Overlay />
         <Header />
         <Outlet />

diff --git a/src/components/Main/Footer.tsx b/src/components/Main/Footer.tsx
@@ -48,7 +48,6 @@ const FooterContainer = styled.footer`
   background-color: ${COLORS.gray10};
   color: ${COLORS.font};
   margin-top: 50px;
-  /* bottom: 0; */
   width: 100%;
   position: relative;
   padding: 30px 0;

diff --git a/src/components/Style/Modal.tsx b/src/components/Style/Modal.tsx
diff --git a/src/components/ModalWithHook.tsx → src/components/common/Modal.tsx b/src/components/ModalWithHook.tsx → src/components/common/Modal.tsx
@@ -7,7 +7,7 @@ import { useSelector } from 'react-redux'
 import { RootState } from '@src/store/config'
 import { Mobile, PC } from '@src/hooks/useScreenHook'
 
-const ModalWithHook = () => {
+const Modal = () => {
   const { isModalOpen, isConfirm, content, navigateOption, confirmAction } = useSelector(
     (state: RootState) => state.modal
   )
@@ -186,4 +186,4 @@ const ConfirmButton = styled.button`
   height: 40px;
 `
 
-export default ModalWithHook
+export default Modal