Merge pull request #187 from YAPP-Github/dev

Release 0.1.8

src/components/base/LoginCheck.tsx

@@ -0,0 +1,35 @@
+import React, { useEffect } from 'react';
+import Cookies from 'js-cookie';
+import { Modal } from '@/components/base/index';
+import { useToggle } from '@/hooks/common';
+import { useLocation, useNavigate } from 'react-router-dom';
+
+const LoginCheck = () => {
+  const navigate = useNavigate();
+  const location = useLocation();
+  const [isErrorModal, onToggleErrorModal] = useToggle();
+
+  useEffect(() => {
+    const token = Cookies.get('AccessToken');
+    const invalidToken = !token || token === 'undefined';
+    invalidToken && onToggleErrorModal();
+  }, [location]);
+
+  return (
+    <>
+      {isErrorModal && (
+        <Modal
+          width={200}
+          height={140}
+          bottonName="확인"
+          title="알림"
+          text="로그인 후에 설문 진행 가능합니다."
+          onToggleModal={onToggleErrorModal}
+          onClick={() => navigate('/')}
+        />
+      )}
+    </>
+  );
+};
+
+export default LoginCheck;

src/components/domain/matching/MatchingTemplete.tsx

@@ -33,6 +33,7 @@ const initMeetingSurvey: MeetingPartnerSurvey = {
   mindset: '',
   play: '',
   universities: '',
+  payDeadline: '',
 };
 
 const initDatingSurvey: DatingPartnerSurvey = {
@@ -46,6 +47,7 @@ const initDatingSurvey: DatingPartnerSurvey = {
   isSmoke: false,
   kakaoId: '',
   university: '',
+  payDeadline: '',
 };
 
 const MatchingTemplete = ({ meeting, dating, btnName, title, handleStatus }: MatchingTemplateProps) => {

src/components/domain/matching/MeetingEndBox.tsx

@@ -1,13 +1,10 @@
 import { palette } from '@/lib/styles/palette';
-import { schools } from '@/mock/schools';
 import styled from 'styled-components';
 import KakaoCopyBox from './KakaoCopyBox';
-import { conversionDepartment, conversionDomesticArea, conversionMindset, conversionPlay } from '@/utils/converson';
+import { conversionDepartment, conversionMindset, conversionPlay } from '@/utils/converson';
 import { addComma } from '@/utils/addComma';
-import { addCommaTail } from '@/utils/addCommaTail';
-import { DatingPartnerSurvey } from '@/types/dating';
 import { memo } from 'react';
-import { Departments, MeetingPartnerSurvey, MindSet, Play } from '@/types/meeting';
+import { MeetingPartnerSurvey } from '@/types/meeting';
 
 function MeetingEndBox({ areas, averageAge, averageHeight, departments, kakaoId, mindset, play, universities }: MeetingPartnerSurvey) {
   return (

src/components/domain/survey/Template.tsx

@@ -0,0 +1,14 @@
+import React from 'react';
+import { Outlet } from 'react-router-dom';
+import LoginCheck from '@/components/base/LoginCheck';
+
+const Template = () => {
+  return (
+    <>
+      <Outlet />
+      <LoginCheck />
+    </>
+  );
+};
+
+export default Template;

src/components/header/UserHeader.tsx

@@ -5,6 +5,7 @@ import { Outlet } from 'react-router-dom';
 import styled from 'styled-components';
 import { HeaderWrapper, Logo } from '../domain/survey/SurveyTemplate';
 import MenuBlock from './MenuBlock';
+import LoginCheck from '@/components/base/LoginCheck';
 
 const UserHeader = () => {
   const [isMenu, onToggleMenu] = useToggle();
@@ -18,6 +19,7 @@ const UserHeader = () => {
       </HeaderLayout>
       <MenuBlock isMenu={isMenu} onToggleMenu={onToggleMenu} />
       <Outlet />
+      <LoginCheck />
     </>
   );
 };

src/hooks/common/useDateLabel.ts

@@ -1,4 +1,4 @@
-function useDateLabel(date: string) {
+function useDateLabel(date: string): string {
   const parseDate = new Date(date);
 
   const month = parseDate.getMonth() + 1;

src/router/Routing.tsx

@@ -38,6 +38,8 @@ import {
 import Test from '@/components/base/Test';
 import UserHeader from '@/components/header/UserHeader';
 import { palette } from '@/lib/styles/palette';
+import LoginCheck from '@/components/base/LoginCheck';
+import Template from '@/components/domain/survey/Template';
 
 function Routing() {
   return (
@@ -53,7 +55,7 @@ function Routing() {
             <Route path={Path.TypeOfMeetingSurvey} element={<TypeOfMeetingSurvey />} />
             <Route path={Path.OauthKakao} element={<OauthKakao />} />
             <Route path={Path.EndSurvey} element={<EndSurvey />} />
-            <Route path={'/meeting'} element={<Outlet />}>
+            <Route path={'/meeting'} element={<Template />}>
               <Route path={Path.GenderAverageAgeSurvey} element={<GenderAverageAgeSurvey />} />
               <Route path={Path.OurUniversitiesSurvey} element={<OurUniversitiesSurvey />} />
               <Route path={Path.OurDepartmentsAverageHeightSurvey} element={<OurDepartmentsAverageHeightSurvey />} />
@@ -70,7 +72,7 @@ function Routing() {
               <Route path={Path.AgreementSurvey} element={<AgreementSurvey />} />
               <Route path={Path.KakaoIdSurvey} element={<KakaoIdSurvey />} />
             </Route>
-            <Route path={'/dating'} element={<Outlet />}>
+            <Route path={'/dating'} element={<Template />}>
               <Route path={Path.MyGenderAge} element={<MyGenderAge />} />
               <Route path={Path.MyDepartmentCharacter} element={<MyDepartmentCharacter />} />
               <Route path={Path.MyMbtiHeight} element={<MyMbtiHeight />} />