[frontend] replace userToolTip to Avatar

usatie · Jan 30, 2024 · 830281a · 830281a
1 parent 0dc9563
commit 830281a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/frontend/app/ui/room/message-item.tsx b/frontend/app/ui/room/message-item.tsx
@@ -2,7 +2,6 @@ import type { MessageEvent } from "@/app/lib/dtos";
 import { Avatar } from "@/app/ui/user/avatar";
 import { Stack } from "@/components/layout/stack";
 import { TooltipProvider } from "@radix-ui/react-tooltip";
-import UserTooltip from "../user/user-tool-tip";
 
 export function MessageItem({
   message,
@@ -18,7 +17,11 @@ export function MessageItem({
       {/* Left Side */}
       {withAvatar && (
         <TooltipProvider>
-          <UserTooltip user={message.user} avatarSize="medium"></UserTooltip>
+          <Avatar
+            avatarURL={message.user.avatarURL}
+            size="medium"
+            href={`/user/${message.user.id}`}
+          ></Avatar>
         </TooltipProvider>
       )}
       {!withAvatar && (

diff --git a/frontend/app/ui/user/match-history.tsx b/frontend/app/ui/user/match-history.tsx
@@ -38,6 +38,7 @@ export default async function MatchHistory({ userId }: { userId: number }) {
     <ProfileItem title="Match History">
       <div className="flex flex-col gap-2">
         {history.map((match) => {
+          // TODO: player2 が undefinedでerrorになる
           return (
             <div key={match.id} className="flex gap-8 items-center">
               <MatchDetailItem

diff --git a/frontend/app/ui/user/user-list.tsx b/frontend/app/ui/user/user-list.tsx
@@ -20,7 +20,8 @@ export default function UserList({
   const fetchOnlineStatus = async () => {
     try {
       users.forEach(async (u) => {
-        const online = await isOnline(u.id);
+        const body = await isOnline(u.id);
+        const online = body.isOnline;
         setOnlineStatus((prev) => ({ ...prev, [u.name]: online }));
       });
     } catch (error) {