fix: UI issues

NJUPT-SAST · Oct 11, 2024 · 07ecc7c · 07ecc7c
1 parent 9952310
commit 07ecc7c
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 32 deletions.
diff --git a/app/(tourist)/callback/feishu/page.module.scss b/app/(tourist)/callback/feishu/page.module.scss
@@ -2,7 +2,7 @@
   display: grid;
   align-items: center;
   justify-content: center;
-  width: 100%;
+  width: 100vw;
   height: 100vh;
   .wrap {
     display: flex;

diff --git a/app/(tourist)/callback/feishu/page.tsx b/app/(tourist)/callback/feishu/page.tsx
@@ -35,7 +35,7 @@ const FeishuCallback = ({
             const data = res.data.Data;
             dispatch(
               addAccount({
-                nickName: "ming",
+                nickName: "NJUPTer",
                 email: data.email,
                 Token: feishuRes.data.Data.loginToken,
                 userId: data.userId,

diff --git a/app/(tourist)/callback/github/page.module.scss b/app/(tourist)/callback/github/page.module.scss
@@ -2,7 +2,7 @@
   display: grid;
   align-items: center;
   justify-content: center;
-  width: 100%;
+  width: 100vw;
   height: 100vh;
   .wrap {
     display: flex;

diff --git a/app/(tourist)/callback/github/page.tsx b/app/(tourist)/callback/github/page.tsx
@@ -35,7 +35,7 @@ const GithubCallback = ({
             const data = res.data.Data;
             dispatch(
               addAccount({
-                nickName: "ming",
+                nickName: "NJUPTer",
                 email: data.email,
                 Token: githubRes.data.Data.loginToken,
                 userId: data.userId,

diff --git a/app/(tourist)/login/2/page.tsx b/app/(tourist)/login/2/page.tsx
@@ -72,13 +72,12 @@ const LoginStep2 = () => {
                         const data = res.data.Data;
                         dispatch(
                           addAccount({
-                            nickName: "ming",
+                            nickName: "NJUPTer",
                             email: data.email,
                             Token: tokenRef.current,
                             userId: data.userId,
                           }),
                         );
-                        //dispatch(login({ username: "ming", email: data.email }));
                         if (urlParams.get("redirect") !== null) {
                           router.push(redirect_uri);
                         } else {

diff --git a/components/accountPanel/accountItem/index.module.scss b/components/accountPanel/accountItem/index.module.scss
@@ -5,7 +5,7 @@
   flex-shrink: 0;
   align-items: center;
   justify-content: space-between;
-  width: 300px;
+  width: 100%;
   height: 78px;
   margin: 1px 0;
   padding: 0px 14px;

diff --git a/components/accountPanel/accountItem/index.tsx b/components/accountPanel/accountItem/index.tsx
@@ -36,7 +36,7 @@ const AccountItem = forwardRef<any, AccountItemProps>(
           />
         </div>
         <div className={`${styles.accountMsg}`}>
-          <div className={`${styles.accountName}`}>{nickName ?? "Ming"}</div>
+          <div className={`${styles.accountName}`}>{nickName ?? "NJUPTer"}</div>
           <div className={`${styles.accountMail}`}>
             {mail ?? "[email protected]"}
           </div>

diff --git a/components/accountPanel/accountList/index.tsx b/components/accountPanel/accountList/index.tsx
@@ -1,13 +1,14 @@
-"use client";
-import { useCallback, useEffect, useRef } from "react";
-import { MemorizedAccountItem } from "../accountItem";
-import styles from "./index.module.scss";
-import { useAppSelector } from "@/redux";
-import { useAppDispatch } from "@/redux";
-import { removeAccount } from "@/redux/features/userList";
-import { useRouter } from "next/navigation";
-import { useContext } from "react";
-import { SelectedAccountContext } from "@/lib/context";
+'use client'
+import { useCallback, useEffect, useRef } from 'react'
+import { MemorizedAccountItem } from '../accountItem'
+import styles from './index.module.scss'
+import { useAppSelector } from '@/redux'
+import { useAppDispatch } from '@/redux'
+import { removeAccount } from '@/redux/features/userList'
+import { useRouter } from 'next/navigation'
+import { useContext } from 'react'
+import { SelectedAccountContext } from '@/lib/context'
+import defaultAvatar from '@/public/defaultAvatar.png'
 
 /**
  *
@@ -16,14 +17,14 @@ import { SelectedAccountContext } from "@/lib/context";
  * @returns
  */
 const AccountList = () => {
-  const { selected, setSelected } = useContext(SelectedAccountContext);
-  const scrollRef = useRef<HTMLDivElement>(null);
-  const localUserList = useAppSelector((state) => state.localUserList);
-  const dispatch = useAppDispatch();
+  const { selected, setSelected } = useContext(SelectedAccountContext)
+  const scrollRef = useRef<HTMLDivElement>(null)
+  const localUserList = useAppSelector((state) => state.localUserList)
+  const dispatch = useAppDispatch()
 
   const scroll = useCallback((index: number) => {
-    scrollRef.current!.scroll({ top: index * 80, behavior: "smooth" });
-  }, []);
+    scrollRef.current!.scroll({ top: index * 80, behavior: 'smooth' })
+  }, [])
 
   return (
     <>
@@ -38,22 +39,22 @@ const AccountList = () => {
                 key={`${value.email}_${value.nickName}`}
                 nickName={`${value.nickName}`}
                 mail={`${value.email}`}
-                avator={`${value.avator}`}
+                avator={`${value.avator || defaultAvatar.src}`}
                 onFocus={() => {
-                  setSelected(index);
-                  scroll(index);
+                  setSelected(index)
+                  scroll(index)
                 }}
                 onClose={() => {
-                  dispatch(removeAccount(index));
+                  dispatch(removeAccount(index))
                 }}
               />
-            );
+            )
           })}
           <div className={styles.bottomWhite} />
         </div>
       </div>
     </>
-  );
-};
+  )
+}
 
-export { AccountList };
+export { AccountList }