merge

src/Components/Chat/ChatHeader.js

@@ -23,7 +23,6 @@ function ChatHeader({ roomId }) {
           ""
         )}
       </div>
-      <h1> </h1>
     </header>
   );
 }

src/Components/User/UserList.js

@@ -102,7 +102,6 @@ function UserList() {
     <>
       <div className="friends-list-container" style={{ maxHeight }}>
         <div className="search-box">
-          <div className="search-icon"></div>
           
           <input
             type="text"
@@ -116,11 +115,9 @@ function UserList() {
       <div className="friends-header">
         <h2 className="friends-list-title">
           전체 유저{" "}
-          {Array.isArray(userList)
-            ? me
+          {showAddedFriends
           ? userList.length
-              : userList.length
-            : 0}
+          : userList.filter((user) => !user.isFriend).length}
           <button
             className="toggle-friends-button"
             onClick={toggleAddedFriends}

src/css/components/chatScreen.css

@@ -8,7 +8,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 10px;
+  padding: 4px;
   background-color: #f0f0f0;
 }
 

src/css/components/friendList.css

@@ -66,6 +66,8 @@
 }
 
 .search-input {
+  display: flex;
+  align-items: center; 
   width: 100%;
   height: 48px;
   border: none;
@@ -75,6 +77,11 @@
   line-height: 48px;
   color: #8c8c8c;
   background-color: transparent;
-  margin-left: 10px;
   padding: 0;
+  margin-left: -26px;
+}
+
+.search-input input[type="text"] {
+  flex: 1; 
+  padding-left: 10px; 
 }
\ No newline at end of file

src/css/components/userProfile.css

@@ -157,7 +157,7 @@
   padding-right: 40px;
   z-index: 10;
 }
-comment .profile-component {
+.profile-component {
   padding-top: 2vh;
   padding-bottom: 1.5vh;
   position: relative;