fix: invalid react hook call

mogland · May 1, 2023 · 57ebe9e · 57ebe9e
1 parent 4ebc612
commit 57ebe9e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/pages/Home/index.tsx b/src/pages/Home/index.tsx
@@ -76,6 +76,7 @@ export const Home: BasicPage = () => {
     comments,
     pages,
   } = useHomeAggregateData();
+
   useEffect(() => {
     if (
       friendsPending &&

diff --git a/src/pages/Register/index.tsx b/src/pages/Register/index.tsx
@@ -20,19 +20,19 @@ export const RegisterPage: BasicPage = () => {
   const formRef = useRef<HTMLFormElement>(null);
   const appSnapshot = useSnapshot(app);
 
+  const { error } = useSWR("/user/master/info");
+  if (!error) {
+    toast.error("已注册，正在前往登录页面");
+    navigate(jump("/login"));
+    app.showSidebar = false;
+  }
+
   useEffect(() => {
     if (appSnapshot.authenticated) {
-      toast.success("已登录，正在前往仪表盘")
+      toast.success("已登录，正在前往仪表盘");
       navigate(jump("/dashboard"));
       return;
     }
-    const { error } = useSWR("/user/master/info");
-    if (!error) {
-      toast.error("已注册，正在前往登录页面")
-      navigate(jump("/login"));
-      return;
-    }
-    app.showSidebar = false;
   }, []);
 
   function handleSubmit(e: React.FormEvent<HTMLFormElement>) {

diff --git a/src/utils/request.ts b/src/utils/request.ts
@@ -15,7 +15,7 @@ export const apiClient = ofetch.create({
 });
 
 export const fetch = (url: RequestInfo) => {
-  const getToken = getCookie("token");
-  const headers = { Authorization: `Bearer ${getToken}`, token: getToken || "" };
+  const getToken = getCookie("token") || "";
+  const headers = { Authorization: `Bearer ${getToken}`, token: getToken };
   return apiClient(url, { headers });
 };