diff --git a/src/AuthRoute.tsx b/src/AuthRoute.tsx index c3e3cda..c131a0b 100644 --- a/src/AuthRoute.tsx +++ b/src/AuthRoute.tsx @@ -1,5 +1,5 @@ -import { getLoginStatus } from '@/utils/auth' import { PRODUCTION_NAME } from '@/constants/common.constants' +import { getLoginStatus } from '@/utils/auth' import { getRedirectUrl } from '@/utils/common' const AuthRoute = () => { diff --git a/src/pages/HomeFramework.tsx b/src/pages/HomeFramework.tsx index c09e00d..b16e2ec 100644 --- a/src/pages/HomeFramework.tsx +++ b/src/pages/HomeFramework.tsx @@ -1,11 +1,10 @@ import React from 'react' -import '@/assets/css/pages/home-framework.scss' +import Icon from '@ant-design/icons' import router from '@/router' +import { COLOR_FONT_SECONDARY } from '@/constants/common.constants' +import '@/assets/css/pages/home-framework.scss' import LoadingMask from '@/components/common/LoadingMask' import HideScrollbar, { HideScrollbarElement } from '@/components/common/HideScrollbar' -import Icon from '@ant-design/icons' -import { COLOR_FONT_SECONDARY } from '@/constants/common.constants' -import { NavLink } from 'react-router-dom' export const HomeFrameworkContext = createContext<{ navbarHiddenState: { diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx index e4cb933..0efc6a7 100644 --- a/src/pages/Login.tsx +++ b/src/pages/Login.tsx @@ -1,13 +1,13 @@ import React from 'react' -import { login } from '@/utils/auth' import { SYSTEM_LOGIN_SUCCESS, SYSTEM_LOGIN_USERNAME_PASSWORD_ERROR, SYSTEM_USER_DISABLE, SYSTEM_USERNAME_NOT_FOUND } from '@/constants/common.constants' -import { setToken } from '@/utils/common' import '@/assets/css/pages/login.scss' +import { setToken } from '@/utils/common' +import { login } from '@/utils/auth' const Login: React.FC = () => { const [messageApi, contextHolder] = message.useMessage() diff --git a/src/services/index.tsx b/src/services/index.tsx index 8106e18..d509f81 100644 --- a/src/services/index.tsx +++ b/src/services/index.tsx @@ -1,5 +1,6 @@ import axios, { type AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios' import jwtDecode, { JwtPayload } from 'jwt-decode' +import { message } from 'antd' import { getToken, removeToken, setToken } from '@/utils/common' import { SYSTEM_ACCESS_DENIED, @@ -8,7 +9,6 @@ import { SYSTEM_TOKEN_RENEW_SUCCESS, SYSTEM_UNAUTHORIZED } from '@/constants/common.constants' -import { message } from 'antd' const service: AxiosInstance = axios.create({ baseURL: import.meta.env.VITE_API_URL,