From 295ab9c1b42d176251b6eb28218ad1d69630ebd1 Mon Sep 17 00:00:00 2001
From: naka-12 <104970808+naka-12@users.noreply.github.com>
Date: Wed, 16 Apr 2025 00:27:47 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E6=A4=9C?=
 =?UTF-8?q?=E7=B4=A2=E3=81=A7=201=20=E6=96=87=E5=AD=97=E4=BB=A5=E4=B8=8A?=
 =?UTF-8?q?=E5=85=A5=E5=8A=9B=E3=81=97=E3=81=9F=E3=82=89=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/app/home/components/NoMoreUser.tsx   |  9 ---------
 web/app/home/page.tsx                    |  4 ++--
 web/app/search/page.tsx                  | 11 ++++++++---
 web/components/common/BackgroundText.tsx |  7 +++++++
 4 files changed, 17 insertions(+), 14 deletions(-)
 delete mode 100644 web/app/home/components/NoMoreUser.tsx
 create mode 100644 web/components/common/BackgroundText.tsx

diff --git a/web/app/home/components/NoMoreUser.tsx b/web/app/home/components/NoMoreUser.tsx
deleted file mode 100644
index 91b7aa02..00000000
--- a/web/app/home/components/NoMoreUser.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-export default function NoMoreUser() {
-  return (
-    <div className="flex h-full items-center justify-center px-4 text-center">
-      <p className="text-2xl text-gray-500">
-        「いいね！」を送るユーザーがいません。
-      </p>
-    </div>
-  );
-}
diff --git a/web/app/home/page.tsx b/web/app/home/page.tsx
index da45ff4b..1e747856 100644
--- a/web/app/home/page.tsx
+++ b/web/app/home/page.tsx
@@ -15,7 +15,7 @@ import { useAboutMe, useRecommended } from "~/api/user";
 import { Card } from "~/components/Card";
 import { DraggableCard } from "~/components/DraggableCard";
 import FullScreenCircularProgress from "~/components/common/FullScreenCircularProgress";
-import NoMoreUser from "./components/NoMoreUser";
+import BackgroundText from "../../components/common/BackgroundText";
 import PersonDetailedMenu from "./components/PersonDetailedMenu";
 import RoundButton from "./components/RoundButton";
 
@@ -121,7 +121,7 @@ export default function Home() {
     return <FullScreenCircularProgress />;
   }
   if (recommended.size() === 0 && loading === false) {
-    return <NoMoreUser />;
+    return <BackgroundText text="「いいね！」を送るユーザーがいません。" />;
   }
   if (error) throw error;
 
diff --git a/web/app/search/page.tsx b/web/app/search/page.tsx
index f1114915..ab7cfe47 100644
--- a/web/app/search/page.tsx
+++ b/web/app/search/page.tsx
@@ -6,6 +6,7 @@ import { useAll, useMatched, useMyID, usePendingFromMe } from "~/api/user";
 import FullScreenCircularProgress from "~/components/common/FullScreenCircularProgress";
 import Search from "~/components/search/search";
 import Table from "~/components/search/table";
+import BackgroundText from "../../components/common/BackgroundText";
 
 export default function SearchPage({
   searchParams,
@@ -58,10 +59,14 @@ export default function SearchPage({
       <div className="w-full">
         <h2 className="m-5 mb-4 font-bold text-2xl">ユーザー検索</h2>
         <Search placeholder="検索" setSearchString={setQuery} />
-        {users ? (
-          <Table users={users} canRequest={canRequest} />
+        {query !== "" ? (
+          users.length > 0 ? (
+            <Table users={users} canRequest={canRequest} />
+          ) : (
+            <BackgroundText text="ユーザが見つかりません" />
+          )
         ) : (
-          <span>ユーザーが見つかりません</span>
+          <BackgroundText text="ユーザ名・授業名・タグ名で検索してみましょう" />
         )}
       </div>
     </div>
diff --git a/web/components/common/BackgroundText.tsx b/web/components/common/BackgroundText.tsx
new file mode 100644
index 00000000..069e09aa
--- /dev/null
+++ b/web/components/common/BackgroundText.tsx
@@ -0,0 +1,7 @@
+export default function BackgroundText({ text }: { text: string }) {
+  return (
+    <div className="flex h-full items-center justify-center px-4 text-center">
+      <p className="text-2xl text-gray-500">{text}</p>
+    </div>
+  );
+}

From a1418aa0206dfece6c16e540d8a12858d0e8622f Mon Sep 17 00:00:00 2001
From: naka-12 <104970808+naka-12@users.noreply.github.com>
Date: Wed, 16 Apr 2025 00:38:34 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E6=A4=9C?=
 =?UTF-8?q?=E7=B4=A2=E3=81=AE=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/app/search/page.tsx          |  7 +++----
 web/components/search/search.tsx | 12 +++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/web/app/search/page.tsx b/web/app/search/page.tsx
index ab7cfe47..27c7a368 100644
--- a/web/app/search/page.tsx
+++ b/web/app/search/page.tsx
@@ -55,10 +55,9 @@ export default function SearchPage({
   );
 
   return (
-    <div className="flex justify-center">
-      <div className="w-full">
-        <h2 className="m-5 mb-4 font-bold text-2xl">ユーザー検索</h2>
-        <Search placeholder="検索" setSearchString={setQuery} />
+    <div className="flex h-full flex-col justify-center gap-2 p-4">
+      <Search placeholder="検索" setSearchString={setQuery} />
+      <div className="flex-1">
         {query !== "" ? (
           users.length > 0 ? (
             <Table users={users} canRequest={canRequest} />
diff --git a/web/components/search/search.tsx b/web/components/search/search.tsx
index e826aa5c..740ad6d5 100644
--- a/web/components/search/search.tsx
+++ b/web/components/search/search.tsx
@@ -21,19 +21,17 @@ export default function Search({ placeholder, setSearchString }: Props) {
   }
 
   return (
-    <div className="relative mr-5 ml-5 flex flex-1 flex-shrink-0">
-      <label htmlFor="search" className="sr-only">
-        Search
-      </label>
+    <label className="input input-bordered flex items-center gap-2">
+      <MdOutlineSearch className="text-gray-500" />
       <input
-        className=" block w-full rounded-md border border-gray-200 py-[9px] pl-10 text-sm outline-none placeholder:text-gray-500 focus:border-primary focus:ring-1 focus:ring-primary"
+        type="text"
+        className="grow"
         placeholder={placeholder}
         onChange={(e) => {
           handleSearch(e.target.value);
         }}
         defaultValue={searchParams.get("query")?.toString()}
       />
-      <MdOutlineSearch className="-translate-y-1/2 absolute top-1/2 left-3 h-[18px] w-[18px] text-gray-500 peer-focus:text-gray-900" />
-    </div>
+    </label>
   );
 }

From f03947c2e391ed865410077431b737d45737938f Mon Sep 17 00:00:00 2001
From: naka-12 <104970808+naka-12@users.noreply.github.com>
Date: Wed, 16 Apr 2025 00:47:04 +0900
Subject: [PATCH 3/4] =?UTF-8?q?=E3=83=9E=E3=83=83=E3=83=81=E7=94=BB?=
 =?UTF-8?q?=E9=9D=A2=E3=81=AE=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=82=82=E7=B5=B1=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/app/friends/page.tsx          | 4 ++--
 web/components/match/matching.tsx | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/web/app/friends/page.tsx b/web/app/friends/page.tsx
index ce2a859e..219d8f60 100644
--- a/web/app/friends/page.tsx
+++ b/web/app/friends/page.tsx
@@ -15,7 +15,7 @@ export default function Friends() {
   const [activeTab, setActiveTab] = useState("matching");
 
   return (
-    <div className="relative w-full">
+    <div className="relative h-full w-full">
       <div className="fixed top-12 flex h-10 w-full border-gray-200 border-b bg-white">
         <button
           type="button"
@@ -43,7 +43,7 @@ export default function Friends() {
         </button>
       </div>
 
-      <div className="pt-10 text-center text-gray-700 text-lg">
+      <div className="h-full pt-10 text-center text-gray-700 text-lg">
         {activeTab === "matching" ? <NoSSRMatchings /> : <NoSSRRequests />}
       </div>
     </div>
diff --git a/web/components/match/matching.tsx b/web/components/match/matching.tsx
index f1348150..01a8a647 100644
--- a/web/components/match/matching.tsx
+++ b/web/components/match/matching.tsx
@@ -1,6 +1,7 @@
 "use client";
 import { deleteMatch } from "~/api/match";
 import { useMatched } from "~/api/user";
+import BackgroundText from "../common/BackgroundText";
 import FullScreenCircularProgress from "../common/FullScreenCircularProgress";
 import { useModal } from "../common/modal/ModalProvider";
 import { HumanListItem } from "../human/humanListItem";
@@ -15,16 +16,14 @@ export default function Matchings() {
   if (error) throw error;
 
   return (
-    <div>
+    <div className="h-full">
       {data && data.length === 0 && (
-        <p className="p-4 text-lg">
-          誰ともマッチングしていません。 リクエストを送りましょう！
-        </p>
+        <BackgroundText text="まだ誰ともマッチングしていません。リクエストを送りましょう！" />
       )}
       {current === "loading" ? (
         <FullScreenCircularProgress />
       ) : (
-        <ul className="mt-4 space-y-4">
+        <ul className="space-y-4">
           {data?.map((matchedUser) =>
             matchedUser.id === 0 ? (
               //メモ帳

From 6cd9401b9b6c05a64611597e14be9f468d6d8518 Mon Sep 17 00:00:00 2001
From: naka-12 <104970808+naka-12@users.noreply.github.com>
Date: Wed, 16 Apr 2025 00:57:32 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=82=82=E7=B5=B1=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/app/chat/components/RoomList.tsx | 161 +++++++++++++--------------
 1 file changed, 77 insertions(+), 84 deletions(-)

diff --git a/web/app/chat/components/RoomList.tsx b/web/app/chat/components/RoomList.tsx
index 03635e5f..a43ac412 100644
--- a/web/app/chat/components/RoomList.tsx
+++ b/web/app/chat/components/RoomList.tsx
@@ -3,6 +3,7 @@
 import { Box, List, Typography } from "@mui/material";
 import type { RoomOverview } from "common/types";
 import { useRouter, useSearchParams } from "next/navigation";
+import BackgroundText from "~/components/common/BackgroundText";
 import { HumanListItem } from "~/components/human/humanListItem";
 import RoomPage from "./RoomPage";
 
@@ -23,93 +24,85 @@ export function RoomList(props: RoomListProps) {
   return (
     <>
       {!friendId ? (
-        <List disablePadding>
-          <p
-            style={{
-              marginLeft: "40px",
-              marginRight: "40px",
-            }}
-          >
-            {roomsData && roomsData.length === 0 && (
-              <>
-                誰ともマッチングしていません。
-                <br />
-                リクエストを送りましょう！
-              </>
-            )}
-          </p>
-          {roomsData?.map((room) => {
-            if (room.isDM) {
-              if (room.matchingStatus === "otherRequest") {
-                return (
-                  <Box
-                    key={room.friendId}
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      openRoom(room);
-                    }}
-                  >
-                    <HumanListItem
+        <>
+          {roomsData && roomsData.length === 0 ? (
+            <BackgroundText text="まだ誰ともマッチングしていません。リクエストを送りましょう！" />
+          ) : (
+            <List>
+              {roomsData?.map((room) => {
+                if (room.isDM) {
+                  if (room.matchingStatus === "otherRequest") {
+                    return (
+                      <Box
+                        key={room.friendId}
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          openRoom(room);
+                        }}
+                      >
+                        <HumanListItem
+                          key={room.friendId}
+                          id={room.friendId}
+                          name={room.name}
+                          pictureUrl={room.thumbnail}
+                          rollUpName={true}
+                          lastMessage={room.lastMsg?.content}
+                          statusMessage="リクエストを受けました"
+                          unreadCount={room.unreadMessages}
+                        />
+                      </Box>
+                    );
+                  }
+                  if (room.matchingStatus === "myRequest") {
+                    return (
+                      <Box
+                        key={room.friendId}
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          openRoom(room);
+                        }}
+                      >
+                        <HumanListItem
+                          key={room.friendId}
+                          id={room.friendId}
+                          name={room.name}
+                          pictureUrl={room.thumbnail}
+                          rollUpName={true}
+                          lastMessage={room.lastMsg?.content}
+                          statusMessage="リクエスト中 メッセージを送りましょう！"
+                          unreadCount={room.unreadMessages}
+                        />
+                      </Box>
+                    );
+                  }
+                  return (
+                    <Box
                       key={room.friendId}
-                      id={room.friendId}
-                      name={room.name}
-                      pictureUrl={room.thumbnail}
-                      rollUpName={true}
-                      lastMessage={room.lastMsg?.content}
-                      statusMessage="リクエストを受けました"
-                      unreadCount={room.unreadMessages}
-                    />
-                  </Box>
-                );
-              }
-              if (room.matchingStatus === "myRequest") {
+                      onClick={() => {
+                        openRoom(room);
+                      }}
+                    >
+                      <HumanListItem
+                        key={room.friendId}
+                        id={room.friendId}
+                        name={room.name}
+                        pictureUrl={room.thumbnail}
+                        rollUpName={true}
+                        lastMessage={room.lastMsg?.content}
+                        unreadCount={room.unreadMessages}
+                      />
+                    </Box>
+                  );
+                }
                 return (
-                  <Box
-                    key={room.friendId}
-                    onClick={(e) => {
-                      e.stopPropagation();
-                      openRoom(room);
-                    }}
-                  >
-                    <HumanListItem
-                      key={room.friendId}
-                      id={room.friendId}
-                      name={room.name}
-                      pictureUrl={room.thumbnail}
-                      rollUpName={true}
-                      lastMessage={room.lastMsg?.content}
-                      statusMessage="リクエスト中 メッセージを送りましょう！"
-                      unreadCount={room.unreadMessages}
-                    />
-                  </Box>
+                  <Typography key={room.roomId} variant="body2" sx={{ mb: 1 }}>
+                    グループチャット: {room.name}
+                  </Typography>
                 );
-              }
-              return (
-                <Box
-                  key={room.friendId}
-                  onClick={() => {
-                    openRoom(room);
-                  }}
-                >
-                  <HumanListItem
-                    key={room.friendId}
-                    id={room.friendId}
-                    name={room.name}
-                    pictureUrl={room.thumbnail}
-                    rollUpName={true}
-                    lastMessage={room.lastMsg?.content}
-                    unreadCount={room.unreadMessages}
-                  />
-                </Box>
-              );
-            }
-            return (
-              <Typography key={room.roomId} variant="body2" sx={{ mb: 1 }}>
-                グループチャット: {room.name}
-              </Typography>
-            );
-          })}
-        </List>
+              })}
+            </List>
+          )}
+        </>
       ) : (
         <RoomPage id={Number.parseInt(friendId)} />
       )}