diff --git a/web/src/App.js b/web/src/App.js
index 571d0745..e71b27cf 100644
--- a/web/src/App.js
+++ b/web/src/App.js
@@ -1,8 +1,8 @@
-import React, { lazy, Suspense, useContext, useEffect } from 'react';
+import React, { lazy, Suspense } from 'react';
import { Route, Routes, useLocation } from 'react-router-dom';
import Loading from './components/Loading';
import User from './pages/User';
-import { PrivateRoute } from './components/PrivateRoute';
+import { AuthRedirect, PrivateRoute } from './helpers';
import RegisterForm from './components/RegisterForm';
import LoginForm from './components/LoginForm';
import NotFound from './pages/NotFound';
@@ -18,7 +18,6 @@ import TopUp from './pages/TopUp';
import Log from './pages/Log';
import Chat from './pages/Chat';
import Chat2Link from './pages/Chat2Link';
-import { Layout } from '@douyinfe/semi-ui';
import Midjourney from './pages/Midjourney';
import Pricing from './pages/Pricing/index.js';
import Task from './pages/Task/index.js';
@@ -27,7 +26,6 @@ import OAuth2Callback from './components/OAuth2Callback.js';
import PersonalSetting from './components/PersonalSetting.js';
import Setup from './pages/Setup/index.js';
import SetupCheck from './components/SetupCheck';
-import AuthRedirect from './components/AuthRedirect';
const Home = lazy(() => import('./pages/Home'));
const Detail = lazy(() => import('./pages/Detail'));
diff --git a/web/src/components/AuthRedirect.js b/web/src/components/AuthRedirect.js
deleted file mode 100644
index d22c675d..00000000
--- a/web/src/components/AuthRedirect.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-import { Navigate } from 'react-router-dom';
-
-const AuthRedirect = ({ children }) => {
- const user = localStorage.getItem('user');
-
- if (user) {
- return ;
- }
-
- return children;
-};
-
-export default AuthRedirect;
\ No newline at end of file
diff --git a/web/src/components/PrivateRoute.js b/web/src/components/PrivateRoute.js
deleted file mode 100644
index ca938c41..00000000
--- a/web/src/components/PrivateRoute.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Navigate } from 'react-router-dom';
-
-import { history } from '../helpers';
-
-function PrivateRoute({ children }) {
- if (!localStorage.getItem('user')) {
- return ;
- }
- return children;
-}
-
-export { PrivateRoute };
diff --git a/web/src/helpers/auth.js b/web/src/helpers/auth.js
index 75b4b0df..cb694ccf 100644
--- a/web/src/helpers/auth.js
+++ b/web/src/helpers/auth.js
@@ -1,3 +1,7 @@
+import React from 'react';
+import { Navigate } from 'react-router-dom';
+import { history } from './history';
+
export function authHeader() {
// return authorization header with jwt token
let user = JSON.parse(localStorage.getItem('user'));
@@ -7,4 +11,23 @@ export function authHeader() {
} else {
return {};
}
-}
\ No newline at end of file
+}
+
+export const AuthRedirect = ({ children }) => {
+ const user = localStorage.getItem('user');
+
+ if (user) {
+ return ;
+ }
+
+ return children;
+};
+
+function PrivateRoute({ children }) {
+ if (!localStorage.getItem('user')) {
+ return ;
+ }
+ return children;
+}
+
+export { PrivateRoute };