Skip to content
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-027: 에러 모달 구현 #119

Merged
merged 2 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/components/Home/SearchYoutube.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import {
SearchContainer,
} from '@/styles/HomepageStyle';

import { recommendationModalState } from '@/stores/modal';
import { recommendationModalState, errorModalState } from '@/stores/modal';

import {
modelingDataState,
modelingProgressState,
Expand All @@ -37,6 +38,7 @@ const SearchYoutube = ({ searchRef }: Props) => {

const userToken = useRecoilValue(userTokenState);
const setIsOpenModal = useSetRecoilState(recommendationModalState);
const setIsOpenErrorModal = useSetRecoilState(errorModalState);
const setVideoLink = useSetRecoilState(videoLinkState);
const setProgress = useSetRecoilState(modelingProgressState);
const [status, setStatus] = useRecoilState(modelingStatusState);
Expand Down Expand Up @@ -109,6 +111,7 @@ const SearchYoutube = ({ searchRef }: Props) => {
setModelingData(null);
} catch (e) {
console.error(e);
setIsOpenErrorModal(true);
}
} else {
navigate('/summary/guest');
Expand Down
7 changes: 6 additions & 1 deletion src/components/layout/Layout.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
import { Outlet, useLocation } from 'react-router-dom';
import { useRecoilValue } from 'recoil';
import { useRecoilValue } from 'recoil';

import { isSideBarOpenState } from '@/stores/ui';

import Footer from './footer/Footer';
import Header from './header';
import SideBar from './sideBar';
import NicknameModal from '@/components/NicknameModal';
import ErrorModal from '../modals/ErrorModal';

import { useMemo, useEffect } from 'react';
import { userInfoState } from '@/stores/user';
import { errorModalState } from '@/stores/modal';

const Layout = () => {
const { pathname } = useLocation();
const isSideBarOpen = useRecoilValue(isSideBarOpenState);
const userInfo = useRecoilValue(userInfoState);
const isErrorModalOpen = useRecoilValue(errorModalState)

const isShowFooter = useMemo(
() => pathname === '/' || /^(\/category)/g.test(pathname),
Expand All @@ -38,6 +42,7 @@ const Layout = () => {

{isShowFooter && <Footer />}
{userInfo && userInfo.nick_name === '' && <NicknameModal />}
{isErrorModalOpen && <ErrorModal/>}
</>
);
};
Expand Down
4 changes: 3 additions & 1 deletion src/components/layout/sideBar/ConvertVideo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import UpSvg from '@/assets/icons/up.svg?react';
import * as ConvertVideoStyle from '@/styles/layout/sideBar/ConvertVideo.style';
import { CommonTitle } from '@/styles/layout/sideBar/UserMode.style';

import { recommendationModalState } from '@/stores/modal';
import { errorModalState, recommendationModalState } from '@/stores/modal';
import {
modelingDataState,
modelingProgressState,
Expand All @@ -31,6 +31,7 @@ const ConvertVideo = () => {
const userToken = useRecoilValue(userTokenState);
const setIsOpenModal = useSetRecoilState(recommendationModalState);
const setVideoLink = useSetRecoilState(videoLinkState);
const setIsOpenErrorModal = useSetRecoilState(errorModalState);
const [status, setStatus] = useRecoilState(modelingStatusState);
const [progress, setProgress] = useRecoilState(modelingProgressState);
const [modelingData, setModelingData] = useRecoilState(modelingDataState);
Expand All @@ -51,6 +52,7 @@ const ConvertVideo = () => {
navigate(`/summary/${video_id}`);
setModelingData(null);
} catch (e) {
setIsOpenErrorModal(true)
console.error(e);
}
} else {
Expand Down
39 changes: 39 additions & 0 deletions src/components/modals/ErrorModal.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { useSetRecoilState } from 'recoil';
import { errorModalState } from '@/stores/modal';
import useOutsideClick from '@/hooks/useOutsideClick';

import CloseIcon from '@/assets/icons/close.svg?react';
import errorImg from '@/assets/Error.png';
import { ErrorModalContainer } from '@/styles/modals/ErrorModal.style';

const ErrorModal = () => {
const setIsOpenModal = useSetRecoilState(errorModalState);
const [modalRef] = useOutsideClick<HTMLDivElement>(() =>
setIsOpenModal(false),
);

return (
<ErrorModalContainer>
<div className="container" ref={modalRef}>
<div className='wrapper'>
<div className="close-btn" onClick={() => setIsOpenModal(false)}>
<CloseIcon width={28} height={28} />
</div>

<div className='main'>
<div className='modal-main'>
<img src={errorImg} alt='errorImg' width={56} height={56}></img>
<h2>영상 업로드 중 오류</h2>
</div>
<h4>업로드 중 알 수 없는 오류가 발생했어요<br />다시 시도해주세요</h4>
</div>
</div>
<button className='restart-btn' onClick={() => setIsOpenModal(false)}>
다시 입력하기
</button>
</div>
</ErrorModalContainer>
);
};

export default ErrorModal;
5 changes: 5 additions & 0 deletions src/stores/modal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,8 @@ export const recommendationModalState = atom({
key: 'recommendation-modal',
default: false,
});

export const errorModalState = atom({
key: 'error-modal',
default: false,
});
85 changes: 85 additions & 0 deletions src/styles/modals/ErrorModal.style.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import styled from 'styled-components';
import theme from '../theme';

export const ErrorModalContainer = styled.div`
position: fixed;
z-index: 100;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.5);
display: flex;
justify-content: center;
align-items: center;

.container {
width: 700px;
height: 384px;
background-color: ${theme.color.white};
padding: 40px 50px;
display: flex;
flex-direction: column;
justify-content: space-between;
}

.wrapper {
width: 600px;
height: 198px;
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
}

.close-btn {
align-self: flex-end;
cursor: pointer;
}

.main {
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
}

.modal-main {
width: 245px;
height: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
text-align: center;
}

.modal-main h2 {
color: ${theme.color.gray500};
font-style: ${theme.typography.Header6};
font-size: 24px;
line-height: 1.6em;
margin-top: 12px;
margin-bottom: 12px;
}

.main h4 {
color: ${theme.color.gray300};
font-style: ${theme.typography.Body1};
font-size: 16px;
line-height: 1.6em;
}

.restart-btn {
width: 600px;
height: 58px;
font-style: ${theme.typography.Body1};
font-size: 16px;
padding: 16px 24px;
color: ${theme.color.white};
background-color: ${theme.color.gray500};
border: none;
border-radius: 12px;
cursor: pointer;
}
`;
Loading