Merge pull request #113 from GPGT-Algorithm-Study/dev

[Feat] 관리자 계정 표시 변경
GPGT-Algorithm-Study · Jun 4, 2024 · b66441e · b66441e
2 parents fc64c7a + a22b7b9
commit b66441e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/src/pages/MyPage/MyInfoCard/index.jsx b/src/pages/MyPage/MyInfoCard/index.jsx
@@ -127,14 +127,20 @@ function MyInfoCard({ userInfo, isUser, loadData }) {
                 ? userInfo.profileImg
                 : 'https://static.solved.ac/misc/360x360/default_profile.png'
             }
-            isWarning={userInfo.warning == 4}
+            isWarning={userInfo.warning == 4 && !userInfo.manager}
           />
           <UserId>
             <div className="user-id">
               {userInfo.notionId} {userInfo.emoji}
             </div>
             <div className="boj-handle">{userInfo.bojHandle}</div>
-            {userInfo.warning == 4 && <WarningMsg>BLOCKED</WarningMsg>}
+            {userInfo.warning == 4 && !userInfo.manager ? (
+              <WarningMsg>BLOCKED</WarningMsg>
+            ) : (
+              <div>
+                🛠️<b>관리자</b>🛠️
+              </div>
+            )}
             {userInfo.warning < 4 && (
               <WarningWrapper>
                 {[...Array(3)].map((_, i) => (

diff --git a/src/pages/Users/UserCard/index.jsx b/src/pages/Users/UserCard/index.jsx
@@ -46,6 +46,8 @@ function UserCard({ user, toggleShowProblemsId, showProblemsId }) {
     window.open(url, '_blank');
   }, []);
 
+  console.log(user);
+
   return (
     <Card>
       <Link to={`/my-page/${user.bojHandle}`}>
@@ -61,7 +63,7 @@ function UserCard({ user, toggleShowProblemsId, showProblemsId }) {
                     ? user.profileImg
                     : 'https://static.solved.ac/misc/360x360/default_profile.png'
                 }
-                isWarning={user.warning == 4}
+                isWarning={user.warning == 4 && !user.manager}
               />
             </div>
             <div className="id-wrapper">
@@ -89,12 +91,22 @@ function UserCard({ user, toggleShowProblemsId, showProblemsId }) {
         <SolvedInfo>
           <FlexWrapper>
             <CenterConatiner>
-              <WarningWrapper>
-                {[...Array(3)].map((_, i) => (
-                  <Warning key={i} warning={i + 1 <= user.warning} />
-                ))}
-              </WarningWrapper>
-              {user.warning == 4 && <WarningMsg>BLOCKED</WarningMsg>}
+              {user.manager && user.warning == 4 ? null : (
+                <WarningWrapper>
+                  {[...Array(3)].map((_, i) => (
+                    <Warning key={i} warning={i + 1 <= user.warning} />
+                  ))}
+                </WarningWrapper>
+              )}
+              {user.warning == 4 ? (
+                !user.manager ? (
+                  <WarningMsg>BLOCKED</WarningMsg>
+                ) : (
+                  <p>
+                    🛠️<b>관리자</b>🛠️
+                  </p>
+                )
+              ) : null}
             </CenterConatiner>
             <TierWrapper>
               <CommonTierImg