format code

.pre-commit-config.yaml

@@ -20,4 +20,12 @@ repos:
     hooks:
       - id: prettier
         types_or: [markdown, ts, tsx]
+
+  - repo: local
+    hooks:
+      - id: admin-eslint
+        name: eslint
+        entry: bash -c 'yarn --cwd admin-frontend lint || exit 0'
+        language: system
+        pass_filenames: false
 exclude: 'CHANGELOG.md'

admin-frontend/package.json

@@ -26,7 +26,8 @@
     "start": "react-scripts start",
     "build": "react-scripts build && cp -r -f build/* ../src/plugins/nonebot_bison/admin_page/dist",
     "test": "react-scripts test",
-    "eject": "react-scripts eject"
+    "eject": "react-scripts eject",
+    "lint": "eslint --fix src/**/*.ts src/**/*.tsx"
   },
   "eslintConfig": {
     "extends": [

admin-frontend/src/App.tsx

@@ -18,16 +18,14 @@ function App() {
   }, [globalConfLoaded]);
 
   return (
-    <>
+    globalConfLoaded
-      { globalConfLoaded
       && (
       <Routes>
         <Route path="/auth/:code" element={<Auth />} />
         <Route path="/unauthed" element={<Unauthed />} />
         <Route path="/home" element={<Home />} />
       </Routes>
-      )}
+      )
-    </>
   );
 }
 

admin-frontend/src/features/auth/Auth.tsx

@@ -14,11 +14,12 @@ export default function Auth() {
       dispatch(login(code));
     }
   }, [isLogin, code]);
-  return (
+
-      { isLogin
+  if (isLogin) {
-        ? <Navigate to="/home" />
+    return <Navigate to="/home" />;
-        : isFailed
+  }
-          ? <Navigate to="/unauthed" />
+  if (isFailed) {
-          : <div> login </div>}
+    return <Navigate to="/unauthed" />;
-  );
+  }
+  return <div> login </div>;
 }

admin-frontend/src/features/subsribeConfigManager/SubscribeManager.tsx

@@ -1,14 +1,6 @@
 import React from 'react';
-import { SubscribeResp } from '../../utils/type';
-import { useGetSubsQuery } from './subscribeConfigSlice';
 
-export function SubscribeManager() {
+export default function SubscribeManager() {
-  const {
-    data: subs,
-    isLoading,
-    isFetching,
-    isSuccess,
-  } = useGetSubsQuery();
   return (
     <>
     </>

admin-frontend/src/features/subsribeConfigManager/subscribeConfigSlice.ts

@@ -1,7 +1,5 @@
-import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
+import { createApi } from '@reduxjs/toolkit/query/react';
-import { RootState } from '../../app/store';
+import { StatusResp, SubscribeConfig, SubscribeResp } from '../../utils/type';
-import { StatusResp, SubscribeResp, SubscribeConfig } from '../../utils/type';
-import { subsribeUrl } from '../../utils/urls';
 import { baseQueryWithAuth } from '../auth/authQuery';
 
 export const subscribeApi = createApi({

admin-frontend/src/pages/Home.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { SubscribeManager } from '../features/subsribeConfigManager/SubscribeManager';
+import SubscribeManager from '../features/subsribeConfigManager/SubscribeManager';
 
 export default function Home() {
   return (