fix: 단어 수정, 연체/밴 탭 비활성화, auth 값 백엔드 응답 기준으로 수정 #99

innovationacademy-kr · Oct 26, 2022 · 33f0862 · 33f0862
1 parent c094e40
commit 33f0862
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 96 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -19,7 +19,7 @@ const App = () => {
         <Route path="saerom" element={<Layout />}>
           <Route path="" element={<Home />} />
           <Route path="task" element={<Task />} />
-          <Route path="status" element={<Status />} />
+          {/* <Route path="status" element={<Status />} /> */}
           <Route path="search" element={<Search />}>
             <Route path="searchDashboard" element={<SearchDashboard />} />
             <Route

diff --git a/frontend/src/Components/NavBar.tsx b/frontend/src/Components/NavBar.tsx
@@ -12,9 +12,9 @@ const NavBar = () => {
         <Link to="task" className="menu">
           TASK
         </Link>
-        <Link to="status" className="menu">
+        {/* <Link to="status" className="menu">
           연체/밴
-        </Link>
+        </Link> */}
         <Link to="search" className="menu">
           검색
         </Link>

diff --git a/frontend/src/Components/UserDetail.tsx b/frontend/src/Components/UserDetail.tsx
@@ -57,24 +57,19 @@ const UserDetail = () => {
         <NoneUser>목록에서 유저를 선택해주세요!</NoneUser>
       </DetailBox>
     );
-  } else if (data[0].auth === 1) {
-    return (
-      <DetailBox>
-        <BigFontSize>{UserInfo}</BigFontSize>
-        <BigRedMessage>영구 정지된 사용자입니다!</BigRedMessage>
-      </DetailBox>
-    );
-  } else {
-    return (
-      <DetailBox>
-        <LentDisabledInfo />
-        <BigFontSize>{UserInfo}</BigFontSize>
-        <p>현재 사물함 : {UserCabinetInfo}</p>
-        <p>대여기간 : {UserLentInfo}</p>
-        <ExpiredInfo />
-      </DetailBox>
-    );
   }
+  return (
+    <DetailBox>
+      <LentDisabledInfo />
+      <BigFontSize>{UserInfo}</BigFontSize>
+      {data[0].auth === 1 && (
+        <BigRedMessage>페널티가 남아있는 사용자입니다.</BigRedMessage>
+      )}
+      <p>현재 사물함 : {UserCabinetInfo}</p>
+      <p>대여기간 : {UserLentInfo}</p>
+      <ExpiredInfo />
+    </DetailBox>
+  );
 };
 
 const BigRedMessage = styled.div`

diff --git a/frontend/src/Tables/BanUserTable.tsx b/frontend/src/Tables/BanUserTable.tsx
@@ -61,7 +61,7 @@ export const BanUserTable = (props: any) => {
   if (TaskBanUserRedux.length !== 0) {
     return (
       <div>
-        <h2>영구 정지 사용자</h2>
+        <h2>페널티 적용 중인 사용자</h2>
         <TableSheet {...getTableProps()}>
           <TableHead>
             {headerGroups.map((headerGroup) => (

diff --git a/frontend/src/Tables/PrevCabinetTable.tsx b/frontend/src/Tables/PrevCabinetTable.tsx
@@ -50,7 +50,7 @@ export const PrevCabinetTable = () => {
   return (
     <div>
       <BigBlackText>이전 대여 사물함 기록</BigBlackText>
-      <SmallGrayText>최근 10건까지 표시됩니다.</SmallGrayText>
+      {/* <SmallGrayText>최근 10건까지 표시됩니다.</SmallGrayText> */}
       <TableSheet {...getTableProps()}>
         <TableHead>
           {headerGroups.map((headerGroup) => (

diff --git a/frontend/src/Tables/PrevUserTable.tsx b/frontend/src/Tables/PrevUserTable.tsx
@@ -52,7 +52,7 @@ export const PrevUserTable = () => {
   return (
     <div>
       <BigBlackText>이전 대여 사물함 기록</BigBlackText>
-      <SmallGrayText>최근 10건까지 표시됩니다.</SmallGrayText>
+      {/* <SmallGrayText>최근 10건까지 표시됩니다.</SmallGrayText> */}
       <TableSheet {...getTableProps()}>
         <TableHead>
           {headerGroups.map((headerGroup) => (

diff --git a/frontend/src/Tables/banUserTableStruct.ts b/frontend/src/Tables/banUserTableStruct.ts
@@ -6,7 +6,7 @@ export const banUserTableStruct = [
     accessor: "intra_id",
   },
   {
-    Header: "정지일",
+    Header: "부여일",
     accessor: "bannedDate",
     Cell: (props: any) => {
       const date = props;