Merge branch 'master' of http://gitea.palntour.com/pav/pav-fe-kac

src/components/account/login/AccountLogin.js

@@ -88,7 +88,7 @@ export const AccountLogin = ({ props }) => {
       // props.history.push('/');
 
       // LANCC 화면으로 이동
-      props.history.push('/control');
+      props.history.replace('/control');
     }
   }, [isLogin]);
   return (

src/router/hoc/ResolveRoutes.tsx

@@ -1,5 +1,5 @@
-import { Suspense, useEffect } from 'react';
-import { Route, RouteComponentProps, Switch } from 'react-router-dom';
+import { Suspense } from 'react';
+import { Route, Switch } from 'react-router-dom';
 import BlankLayout from '@layouts/BlankLayout';
 import HeaderLayout from '@layouts/HeaderLayout';
 import HorizontalLayout from '@src/layouts/HorizontalLayout';
@@ -10,10 +10,7 @@ import LayoutWrapper from '@layouts/components/layout-wrapper';
 import { IRoute } from '../routes/type';
 import { Routes } from '../routes';
 import authenticationCheck from './authenticationCheck';
-
-interface IFinalRoute extends RouteComponentProps {
-  route: IRoute;
-}
+import { useSelector } from '@store/storeConfig/store';
 
 export default function ResolveRoutes() {
   const [layout, setLayout] = useLayout();

src/router/hoc/authenticationCheck.tsx

@@ -23,12 +23,12 @@ export default function (SpecificComponent: ReactNode, option: IOption) {
               data: { result }
             } = await clientInstance.get('/api/acnt/jwt/valid/token');
             if (!result) {
-              props.history.push('/account/login');
+              props.history.replace('/account/login');
             }
             dispatch(Actions.checkAuthencation.request());
           }
         } catch (error) {
-          props.history.push('/account/login');
+          props.history.replace('/account/login');
         }
       };