From f7422e1c62fb263d563cef8011917a509771b0bb Mon Sep 17 00:00:00 2001 From: Hannah Park Date: Fri, 28 May 2021 17:48:30 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20loading=20gif=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/pages/LoadingPage.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/pages/LoadingPage.tsx b/frontend/src/components/pages/LoadingPage.tsx index 9b7da9bf5..979f018fe 100644 --- a/frontend/src/components/pages/LoadingPage.tsx +++ b/frontend/src/components/pages/LoadingPage.tsx @@ -28,14 +28,20 @@ const LoadingPage = () => { return ( -
로딩중~~~
+
); }; const Test = styled.div` - background-color: red; + display: flex; + justify-content: center; width: 100%; height: 100%; + padding-top: 30rem; + + & > img { + } `; + export default LoadingPage; From 948ed9456ad7a0a344b24381e9d3e9c6d48e44bb Mon Sep 17 00:00:00 2001 From: Hannah Park Date: Fri, 28 May 2021 17:54:37 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EC=BA=98=EB=A6=B0=EB=8D=94=20UI=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#25)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/SearchBar/Calendar/CalendarStyles.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/SearchBar/Calendar/CalendarStyles.tsx b/frontend/src/components/SearchBar/Calendar/CalendarStyles.tsx index 92753f101..4b8706d3a 100644 --- 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; } From b59d07b3915036c774d606e330dad4230d69da56 Mon Sep 17 00:00:00 2001 From: Hannah Park Date: Fri, 28 May 2021 17:58:38 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=EB=A9=94=EC=9D=B8=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=9D=BC=EC=9A=B0=ED=8C=85=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/pages/LoadingPage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/components/pages/LoadingPage.tsx b/frontend/src/components/pages/LoadingPage.tsx index 979f018fe..41d76df2c 100644 --- 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로 돌아가는 로직 필요 }); }