diff --git a/src/components/account/login/AccountLogin.js b/src/components/account/login/AccountLogin.js index 5e48ebaa..396f05f7 100644 --- a/src/components/account/login/AccountLogin.js +++ b/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 ( diff --git a/src/router/hoc/ResolveRoutes.tsx b/src/router/hoc/ResolveRoutes.tsx index 6bd65f22..56d2b577 100644 --- a/src/router/hoc/ResolveRoutes.tsx +++ b/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(); diff --git a/src/router/hoc/authenticationCheck.tsx b/src/router/hoc/authenticationCheck.tsx index 18d68874..3f147ea2 100644 --- a/src/router/hoc/authenticationCheck.tsx +++ b/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'); } };