Merge pull request #62 from ghojeong/fe/47/new-calendar

[FE] PR 전 merge
codesquad-members-2021 · May 28, 2021 · 0731e28 · 0731e28
2 parents 9595433 + b59d07b
commit 0731e28
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/frontend/src/components/SearchBar/Calendar/CalendarStyles.tsx b/frontend/src/components/SearchBar/Calendar/CalendarStyles.tsx
@@ -57,7 +57,7 @@ const CalendarSelector = styled.div`
 const CalendarLayout = styled.div`
   /* outline: red solid 1px; */
   /*margin: 1.6rem;*/
-  padding: 1.5rem;
+  padding: 2.5rem;
   font-size: 1.6rem;
   font-weight: 600;
 
@@ -134,8 +134,9 @@ const CurrentMonth = styled.div`
     grid-template-columns: repeat(7, 1fr);
 
     & > span {
+      justify-content: center;
       display: flex;
-      align-items: center; 
+      align-items: center;
       height: 2em;
       padding: 0.5rem 1rem;
     }

diff --git a/frontend/src/components/pages/LoadingPage.tsx b/frontend/src/components/pages/LoadingPage.tsx
@@ -17,6 +17,7 @@ const LoadingPage = () => {
     .then(({ token }) => {
         console.log("token입니다: ", token);
         localStorage.setItem('token', token);
+        window.location.href="http://localhost:3000";
         //mainpage로 돌아가는 로직 필요
     });
   }
@@ -28,14 +29,20 @@ const LoadingPage = () => {
 
   return (
     <Test>
-      <div>로딩중~~~</div>
+      <img src="https://thumbs.gfycat.com/GeneralUnpleasantApisdorsatalaboriosa-max-1mb.gif"/>
     </Test>
   );
 };
 
 const Test = styled.div`
-  background-color: red;
+  display: flex;
+  justify-content: center;
   width: 100%;
   height: 100%;
+  padding-top: 30rem;
+
+  & > img {
+  }
 `;
+
 export default LoadingPage;