Merge branch 'dev' of github.com:innovationacademy-kr/42cabi into dev

innovationacademy-kr · Nov 27, 2023 · 1593649 · 1593649
2 parents 9cb91ee + bcd8d6c
commit 1593649
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/frontend/src/components/LeftNav/LeftMainNav/LeftMainNav.tsx b/frontend/src/components/LeftNav/LeftMainNav/LeftMainNav.tsx
@@ -70,7 +70,7 @@ const LeftMainNav = ({
             }
             onClick={onClickPendingButton}
           >
-            오픈예정
+            사용가능
           </TopBtnStyled>
         </TopBtnsStyled>
       </TopSectionStyled>

diff --git a/frontend/src/pages/PendingPage/PendingPage.tsx b/frontend/src/pages/PendingPage/PendingPage.tsx
@@ -50,10 +50,10 @@ const PendingPage = () => {
 
   return (
     <WrapperStyled>
-      <HeaderStyled>오픈 예정 사물함</HeaderStyled>
-      <SubHeaderStyled>
+      <HeaderStyled>사용 가능 사물함</HeaderStyled>
+      {/* <SubHeaderStyled>
         <span>매일 오후 1시</span> 일괄적으로 오픈됩니다.{" "}
-      </SubHeaderStyled>
+      </SubHeaderStyled> */}
       <Timer observeOpenTime={() => setIsOpenTime(true)} />
       {isLoaded && pendingCabinets ? (
         Object.entries(pendingCabinets).map(([key, value]) => (