BREAKING CHANGE: Removed standalone user edit routes (/console/user/edit, /console/user/edit/:id) - Decompose 673-line monolithic UsersTable.js into 8 specialized components - Extract column definitions to UsersColumnDefs.js with render functions - Create dedicated UsersActions.jsx for action buttons - Create UsersFilters.jsx for search and filtering logic - Create UsersDescription.jsx for description area - Extract all data management logic to useUsersData.js hook - Move AddUser.js and EditUser.js to users/modals/ folder as modal components - Create 4 new confirmation modal components (Promote, Demote, EnableDisable, Delete) - Implement pure UsersTable.jsx component for table rendering only - Create main container component users/index.jsx to compose all subcomponents - Update import paths in pages/User/index.js to use new modular structure - Remove obsolete EditUser imports and routes from App.js - Delete original monolithic files: UsersTable.js, AddUser.js, EditUser.js The new architecture follows the same modular pattern as tokens and redemptions modules: - Consistent file organization across all table modules - Better separation of concerns and maintainability - Enhanced reusability and testability - Unified modal management approach All existing functionality preserved with improved code organization.
282 lines
7.8 KiB
JavaScript
282 lines
7.8 KiB
JavaScript
import React, { lazy, Suspense } from 'react';
|
|
import { Route, Routes, useLocation } from 'react-router-dom';
|
|
import Loading from './components/common/ui/Loading.js';
|
|
import User from './pages/User';
|
|
import { AuthRedirect, PrivateRoute } from './helpers';
|
|
import RegisterForm from './components/auth/RegisterForm.js';
|
|
import LoginForm from './components/auth/LoginForm.js';
|
|
import NotFound from './pages/NotFound';
|
|
import Setting from './pages/Setting';
|
|
|
|
import PasswordResetForm from './components/auth/PasswordResetForm.js';
|
|
import PasswordResetConfirm from './components/auth/PasswordResetConfirm.js';
|
|
import Channel from './pages/Channel';
|
|
import Token from './pages/Token';
|
|
import EditChannel from './pages/Channel/EditChannel';
|
|
import Redemption from './pages/Redemption';
|
|
import TopUp from './pages/TopUp';
|
|
import Log from './pages/Log';
|
|
import Chat from './pages/Chat';
|
|
import Chat2Link from './pages/Chat2Link';
|
|
import Midjourney from './pages/Midjourney';
|
|
import Pricing from './pages/Pricing/index.js';
|
|
import Task from './pages/Task/index.js';
|
|
import Playground from './pages/Playground/index.js';
|
|
import OAuth2Callback from './components/auth/OAuth2Callback.js';
|
|
import PersonalSetting from './components/settings/PersonalSetting.js';
|
|
import Setup from './pages/Setup/index.js';
|
|
import SetupCheck from './components/layout/SetupCheck.js';
|
|
|
|
const Home = lazy(() => import('./pages/Home'));
|
|
const Detail = lazy(() => import('./pages/Detail'));
|
|
const About = lazy(() => import('./pages/About'));
|
|
|
|
function App() {
|
|
const location = useLocation();
|
|
|
|
return (
|
|
<SetupCheck>
|
|
<Routes>
|
|
<Route
|
|
path='/'
|
|
element={
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<Home />
|
|
</Suspense>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/setup'
|
|
element={
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<Setup />
|
|
</Suspense>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console/channel'
|
|
element={
|
|
<PrivateRoute>
|
|
<Channel />
|
|
</PrivateRoute>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console/channel/edit/:id'
|
|
element={
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<EditChannel />
|
|
</Suspense>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console/channel/add'
|
|
element={
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<EditChannel />
|
|
</Suspense>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console/token'
|
|
element={
|
|
<PrivateRoute>
|
|
<Token />
|
|
</PrivateRoute>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console/playground'
|
|
element={
|
|
<PrivateRoute>
|
|
<Playground />
|
|
</PrivateRoute>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console/redemption'
|
|
element={
|
|
<PrivateRoute>
|
|
<Redemption />
|
|
</PrivateRoute>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console/user'
|
|
element={
|
|
<PrivateRoute>
|
|
<User />
|
|
</PrivateRoute>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/user/reset'
|
|
element={
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<PasswordResetConfirm />
|
|
</Suspense>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/login'
|
|
element={
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<AuthRedirect>
|
|
<LoginForm />
|
|
</AuthRedirect>
|
|
</Suspense>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/register'
|
|
element={
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<AuthRedirect>
|
|
<RegisterForm />
|
|
</AuthRedirect>
|
|
</Suspense>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/reset'
|
|
element={
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<PasswordResetForm />
|
|
</Suspense>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/oauth/github'
|
|
element={
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<OAuth2Callback type='github'></OAuth2Callback>
|
|
</Suspense>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/oauth/oidc'
|
|
element={
|
|
<Suspense fallback={<Loading></Loading>}>
|
|
<OAuth2Callback type='oidc'></OAuth2Callback>
|
|
</Suspense>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/oauth/linuxdo'
|
|
element={
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<OAuth2Callback type='linuxdo'></OAuth2Callback>
|
|
</Suspense>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console/setting'
|
|
element={
|
|
<PrivateRoute>
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<Setting />
|
|
</Suspense>
|
|
</PrivateRoute>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console/personal'
|
|
element={
|
|
<PrivateRoute>
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<PersonalSetting />
|
|
</Suspense>
|
|
</PrivateRoute>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console/topup'
|
|
element={
|
|
<PrivateRoute>
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<TopUp />
|
|
</Suspense>
|
|
</PrivateRoute>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console/log'
|
|
element={
|
|
<PrivateRoute>
|
|
<Log />
|
|
</PrivateRoute>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console'
|
|
element={
|
|
<PrivateRoute>
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<Detail />
|
|
</Suspense>
|
|
</PrivateRoute>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console/midjourney'
|
|
element={
|
|
<PrivateRoute>
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<Midjourney />
|
|
</Suspense>
|
|
</PrivateRoute>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console/task'
|
|
element={
|
|
<PrivateRoute>
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<Task />
|
|
</Suspense>
|
|
</PrivateRoute>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/pricing'
|
|
element={
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<Pricing />
|
|
</Suspense>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/about'
|
|
element={
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<About />
|
|
</Suspense>
|
|
}
|
|
/>
|
|
<Route
|
|
path='/console/chat/:id?'
|
|
element={
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<Chat />
|
|
</Suspense>
|
|
}
|
|
/>
|
|
{/* 方便使用chat2link直接跳转聊天... */}
|
|
<Route
|
|
path='/chat2link'
|
|
element={
|
|
<PrivateRoute>
|
|
<Suspense fallback={<Loading></Loading>} key={location.pathname}>
|
|
<Chat2Link />
|
|
</Suspense>
|
|
</PrivateRoute>
|
|
}
|
|
/>
|
|
<Route path='*' element={<NotFound />} />
|
|
</Routes>
|
|
</SetupCheck>
|
|
);
|
|
}
|
|
|
|
export default App;
|