Merge pull request #210 from YAPP-Github/dev

Release 0.1.16

src/components/base/Modal.tsx

@@ -93,6 +93,7 @@ const ModalInner = styled.div<IModalInnerProps>`
   height: ${({ height }) => height}px;
   border-radius: 4px;
   animation: ${({ isClose }) => (isClose ? transitions.popOut : transitions.popIn)} 0.2s ease-in-out;
+  word-break: keep-all;
 `;
 
 const ModalTitle = styled.h2`

src/components/domain/matching/WaitingBox.tsx

@@ -9,7 +9,7 @@ function WaitingBox() {
       <StringEle>
         매칭은 <strong>매일밤 10시</strong>에 이루어집니다.
         <br />
-        매칭이 되면 카톡과 이메일로 링크를 보내드릴게요.
+        매칭이 되면 이메일로 링크를 보내드릴게요.
       </StringEle>
     </>
   );

src/components/domain/matching/buttons/EndButton.tsx

@@ -3,7 +3,7 @@ import { useToggle } from '@/hooks/common';
 import { postReMatchMeetingSurvey } from '@/lib/api/meeting';
 import { postReMatchDatingSurvey } from '@/lib/api/dating';
 import { useLocation } from 'react-router-dom';
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Status } from '@/pages/MatchingPage';
 
 interface EndButtonProps {
@@ -12,12 +12,18 @@ interface EndButtonProps {
 
 function EndButton({ handleStatus }: EndButtonProps) {
   const location = useLocation();
+  const [isModal, onToggleModal] = useToggle();
   const [isErrorModal, onToggleErrorModal] = useToggle();
   const [errorMessage, setErrorMessage] = useState('에러가 발생했습니다😭 다시한번 시도해 주세요!');
+  const [isConfirm, setConfirm] = useState(false);
 
   const handleClick = async () => {
-    const matchMeeting = location.pathname.includes('meeting');
+    onToggleModal();
+  };
+
+  const handleRematch = async () => {
     try {
+      const matchMeeting = location.pathname.includes('meeting');
       matchMeeting ? await postReMatchMeetingSurvey() : await postReMatchDatingSurvey();
       handleStatus('waiting');
     } catch (e) {
@@ -26,11 +32,29 @@ function EndButton({ handleStatus }: EndButtonProps) {
       onToggleErrorModal();
     }
   };
+
+  useEffect(() => {
+    if (isConfirm) {
+      handleRematch();
+    }
+  }, [isConfirm]);
+
   return (
     <>
       <Button onClick={handleClick} size="medium">
         다시 매칭하기
       </Button>
+      {isModal && (
+        <Modal
+          width={200}
+          height={140}
+          bottonName="확인"
+          title="다시 매칭하시겠습니까?"
+          text="　이전 설문 내용을 토대로　　다시 매칭해드립니다"
+          onToggleModal={onToggleModal}
+          onClick={() => setConfirm(true)}
+        />
+      )}
       {isErrorModal && (
         <Modal
           width={200}

src/components/domain/matching/buttons/NoneButton.tsx

@@ -1,9 +1,12 @@
 import { Button } from '@/components/base';
 import React from 'react';
+import Path from '@/router/Path';
+import { useNavigate } from 'react-router-dom';
 
 function NoneButton() {
+  const navigate = useNavigate();
   const handleClick = () => {
-    console.log('asd');
+    navigate(Path.TypeOfMeetingSurvey);
   };
   return (
     <Button onClick={handleClick} size="medium" variant={'default'}>

src/components/domain/survey/SurveyTemplate.tsx

@@ -78,7 +78,7 @@ export const Logo = styled(Link)`
 `;
 
 const ContentsWrapper = styled.div`
-  overflow: scroll;
+  overflow: auto;
   height: calc(100% - 56px - 117px - 38px - 20px);
 `;