Skip to content

Commit

Permalink
Merge pull request #210 from Team-Lecue/hotfix/jungwoo
Browse files Browse the repository at this point in the history
[Hotfix] 레큐북 제작 취소 모달 연결, navigate 경로 수정
  • Loading branch information
jungwoo3490 authored Jan 19, 2024
2 parents 14a5775 + 7327baf commit 5518903
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
7 changes: 2 additions & 5 deletions src/CreateBook/page/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,12 @@ function CreateBook() {
)}
{escapeModal && (
<CommonModal
handleFn={() => navigate(-1)}
handleFn={() => navigate('/', { state: { step: 1 } })}
category="book_escape"
setModalOn={setEscapeModal}
/>
)}
<Header
headerTitle="레큐북 만들기"
handleFn={() => setEscapeModal(true)}
/>
<Header headerTitle="레큐북 제작" handleFn={() => setEscapeModal(true)} />
<S.CreateBookBodyWrapper>
<S.InputWrapper>
<S.BookInputWrapper>
Expand Down
11 changes: 10 additions & 1 deletion src/Target/page/TargetPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useNavigate } from 'react-router-dom';

import Header from '../../../components/common/Header';
import LoadingPage from '../../../components/common/LoadingPage';
import CommonModal from '../../../components/common/Modal/CommonModal';
import CompleteButton from '../../components/CompleteButton';
import FavoriteImageInput from '../../components/FavoriteImageInput';
import NameInput from '../../components/NameInput';
Expand All @@ -14,6 +15,7 @@ function TargetPage() {
const [presignedFileName, setPresignedFileName] = useState('');
const [name, setName] = useState('');
const [fileData, setFileData] = useState<File | null>(null);
const [escapeModal, setEscapeModal] = useState(false);
const [presignedData, setPresignedData] = useState({
url: '',
fileName: '',
Expand Down Expand Up @@ -70,7 +72,14 @@ function TargetPage() {
<LoadingPage />
) : (
<S.TargetPageWrapper>
<Header headerTitle={'레큐북 제작'} />
{escapeModal && (
<CommonModal
handleFn={() => navigate('/', { state: { step: 1 } })}
category="book_escape"
setModalOn={setEscapeModal}
/>
)}
<Header headerTitle="레큐북 제작" handleFn={() => setEscapeModal(true)} />
<S.TargetPageBodyWrapper>
<S.InputSectionWrapper>
<S.NameInputWrapper>
Expand Down

0 comments on commit 5518903

Please sign in to comment.