From 270cac5a44691fe20b54a15e37aee2038b98e2f4 Mon Sep 17 00:00:00 2001
From: Tristan Yang <yanggc888@163.com>
Date: Tue, 28 Feb 2023 20:04:53 +0800
Subject: [PATCH] fix: tweak UX

---
 src/common/component/InviteLink.tsx          |  2 +-
 src/common/component/ManageMembers/index.tsx | 77 ++++++++++----------
 src/common/component/Message/Reaction.tsx    |  2 +-
 src/common/component/Message/index.tsx       |  2 +-
 src/common/component/RequireAuth.tsx         |  7 +-
 src/routes/chat/index.tsx                    |  2 +-
 6 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/src/common/component/InviteLink.tsx b/src/common/component/InviteLink.tsx
index ca498b60..4c59b665 100644
--- a/src/common/component/InviteLink.tsx
+++ b/src/common/component/InviteLink.tsx
@@ -16,7 +16,7 @@ const InviteLink: FC<Props> = () => {
 
   return (
     <div className="flex flex-col items-start pb-8">
-      <p className="font-semibold text-sm mb-2 text-gray-500 dark:text-gray-50 flex gap-4">
+      <p className="font-semibold text-sm mb-2 text-gray-500 dark:text-gray-50 flex flex-col md:flex-row gap-4">
         {t("share_invite_link")}
         <a className="text-primary-500 flex gap-1 items-center" href="http://doc.voce.chat/faq#fe_url" target="_blank" rel="noopener noreferrer">
           <IconQuestion /> {t("invite_link_faq")}
diff --git a/src/common/component/ManageMembers/index.tsx b/src/common/component/ManageMembers/index.tsx
index e6e2f5d1..71ef5c68 100644
--- a/src/common/component/ManageMembers/index.tsx
+++ b/src/common/component/ManageMembers/index.tsx
@@ -84,44 +84,45 @@ const ManageMembers: FC<Props> = ({ cid }) => {
                 </div>
               </div>
               <div className="flex items-center gap-7">
-                <span className="text-xs text-right text-gray-500 dark:text-slate-100 flex items-center gap-1">
-                  {is_admin ? t("admin") : t("user")}
-                  {switchRoleVisible && (
-                    <Tippy
-                      interactive
-                      placement="bottom-end"
-                      trigger="click"
-                      content={
-                        <ul className="context-menu">
-                          <li
-                            className="item sb"
-                            onClick={handleToggleRole.bind(null, {
-                              ignore: is_admin,
-                              uid,
-                              isAdmin: true
-                            })}
-                          >
-                            {t("admin")}
-                            {is_admin && <IconCheck className="icon" />}
-                          </li>
-                          <li
-                            className="item sb"
-                            onClick={handleToggleRole.bind(null, {
-                              ignore: !is_admin,
-                              uid,
-                              isAdmin: false
-                            })}
-                          >
-                            {t("user")}
-                            {!is_admin && <IconCheck className="icon" />}
-                          </li>
-                        </ul>
-                      }
-                    >
-                      <IconArrowDown className="cursor-pointer dark:fill-slate-50" />
-                    </Tippy>
-                  )}
-                </span>
+                {switchRoleVisible ? <Tippy
+                  interactive
+                  placement="bottom-end"
+                  trigger="click"
+                  content={
+                    <ul className="context-menu">
+                      <li
+                        className="item sb"
+                        onClick={handleToggleRole.bind(null, {
+                          ignore: is_admin,
+                          uid,
+                          isAdmin: true
+                        })}
+                      >
+                        {t("admin")}
+                        {is_admin && <IconCheck className="icon" />}
+                      </li>
+                      <li
+                        className="item sb"
+                        onClick={handleToggleRole.bind(null, {
+                          ignore: !is_admin,
+                          uid,
+                          isAdmin: false
+                        })}
+                      >
+                        {t("user")}
+                        {!is_admin && <IconCheck className="icon" />}
+                      </li>
+                    </ul>
+                  }
+                >
+                  <span className="text-xs text-right text-gray-500 dark:text-slate-100 flex items-center gap-1 cursor-pointer">
+                    {is_admin ? t("admin") : t("user")}
+                    <IconArrowDown className="dark:fill-slate-50" />
+                  </span>
+                </Tippy> :
+                  <span className="text-xs text-right text-gray-500 dark:text-slate-100 flex items-center gap-1">
+                    {is_admin ? t("admin") : t("user")}</span>}
+
                 {dotsVisible && (
                   <Tippy
                     interactive
diff --git a/src/common/component/Message/Reaction.tsx b/src/common/component/Message/Reaction.tsx
index 7ba1f907..d1dedf1b 100644
--- a/src/common/component/Message/Reaction.tsx
+++ b/src/common/component/Message/Reaction.tsx
@@ -76,7 +76,7 @@ const Reaction: FC<Props> = ({ mid, reactions = null, readOnly = false }) => {
               placement="top"
               content={<ReactionDetails uids={uids} emoji={reaction as keyof Emojis} index={idx} />}
             >
-              <i className="emoji">
+              <i className="emoji w-4 h-4">
                 <ReactionItem native={reaction as keyof Emojis} />
               </i>
             </Tippy>
diff --git a/src/common/component/Message/index.tsx b/src/common/component/Message/index.tsx
index e8ca5ba1..a6599bd8 100644
--- a/src/common/component/Message/index.tsx
+++ b/src/common/component/Message/index.tsx
@@ -98,7 +98,7 @@ const Message: FC<IProps> = ({
       ref={inviewRef}
       className={clsx(`group w-full relative flex items-start gap-2 md:gap-4 px-1 md:px-2 py-1 my-2 rounded-lg md:dark:hover:bg-gray-800 md:hover:bg-gray-100`,
         readOnly && "hover:bg-transparent",
-        showExpire && "bg-red-200",
+        showExpire && "bg-red-200 dark:bg-red-200/40",
         pinInfo && "bg-cyan-50 dark:bg-cyan-800 pt-7"
       )}
     >
diff --git a/src/common/component/RequireAuth.tsx b/src/common/component/RequireAuth.tsx
index fb675c55..d35ffa6e 100644
--- a/src/common/component/RequireAuth.tsx
+++ b/src/common/component/RequireAuth.tsx
@@ -4,6 +4,7 @@ import { GuestRoutes } from "../../app/config";
 import { useGetInitializedQuery } from "../../app/services/auth";
 import { useGetLoginConfigQuery } from "../../app/services/server";
 import { useAppSelector } from "../../app/store";
+import Loading from "./Loading";
 
 interface Props {
   children: ReactElement;
@@ -14,15 +15,15 @@ const GuestAllows = GuestRoutes.map((path) => {
 });
 const RequireAuth: FC<Props> = ({ children, redirectTo = "/login" }) => {
   const location = useLocation();
-  const matchs = matchRoutes(GuestAllows, location);
-  const allowGuest = matchs ? !!matchs[0].pathname : false;
+  const matches = matchRoutes(GuestAllows, location);
+  const allowGuest = matches ? !!matches[0].pathname : false;
   const { data: loginConfig, isSuccess: loginConfigSuccess } = useGetLoginConfigQuery();
   const { isSuccess: checkInitialSuccess } = useGetInitializedQuery();
   const { token, guest, initialized } = useAppSelector((store) => store.authData);
   // console.log("auth route", { checkInitialSuccess, loginConfigSuccess, initialized, guest: loginConfig?.guest, token, allowGuest, guest });
 
   // 初始化和login配置检查
-  if (!checkInitialSuccess || !loginConfigSuccess) return null;
+  if (!checkInitialSuccess || !loginConfigSuccess) return <Loading fullscreen={true} />;
   //  未初始化 则先走setup 流程
   if (!initialized) return <Navigate to={`/onboarding`} replace />;
   // 开启guest 并且没token 而且是允许guest访问的路由  则先去过渡页登录
diff --git a/src/routes/chat/index.tsx b/src/routes/chat/index.tsx
index 3661b26d..48dffecc 100644
--- a/src/routes/chat/index.tsx
+++ b/src/routes/chat/index.tsx
@@ -56,7 +56,7 @@ function ChatPage() {
       {usersModalVisible && <UsersModal closeModal={toggleUsersModalVisible} />}
       <div className={clsx(`flex h-screen md:h-full md:pt-2 md:pb-2.5 md:pr-1`, isGuest ? "guest-container md:px-1" : "md:pr-12")}>
         {sessionListVisible && <div onClick={toggleSessionList} className="z-30 fixed top-0 left-4 w-screen h-screen bg-black/50 transition-all backdrop-blur-sm"></div>}
-        <div className={clsx("left-container pb-14 md:pb-0 flex-col md:rounded-l-2xl w-full md:max-w-[250px] md:min-w-[268px] h-full shadow-[rgb(0_0_0_/_10%)_-1px_0px_0px_inset] bg-white dark:!bg-gray-800",
+        <div className={clsx("left-container pb-14 md:pb-0 flex-col md:rounded-l-2xl w-full h-screen md:max-w-[250px] md:min-w-[268px] shadow-[rgb(0_0_0_/_10%)_-1px_0px_0px_inset] bg-white dark:!bg-gray-800",
           isMainPath ? "flex" : "hidden md:flex"
         )}>
           <Server readonly={isGuest} />