From ab707c8d6a0ed16f1faa89c639400aae9d205359 Mon Sep 17 00:00:00 2001
From: saseungmin <dbd02169@naver.com>
Date: Sun, 13 Dec 2020 18:12:23 +0900
Subject: [PATCH] [Improve] settings title and study list change font

---
 README.md                                      |  4 ++--
 src/components/common/Header.jsx               | 10 +++++-----
 src/components/main/StudyGroup.jsx             |  7 +++----
 src/containers/common/HeaderContainer.test.jsx |  4 ++--
 src/index.css                                  |  3 +++
 src/pages/MainPage.jsx                         |  2 +-
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index c1140cb..a79fc41 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# 🌈 project-react-2-saseungmin (이름 미정)
-
+# 🌈 ConStu
+- Connect to Study (스터디를 잇다)
 ### 🚀 Hosting URL
 https://sweet-1cfff.web.app/
 
diff --git a/src/components/common/Header.jsx b/src/components/common/Header.jsx
index c041f49..430ff79 100644
--- a/src/components/common/Header.jsx
+++ b/src/components/common/Header.jsx
@@ -11,8 +11,8 @@ import Button from '../../styles/Button';
 const HeaderWrapper = styled.div`
   position: fixed;
   width: 100%;
-  background: white;
-  box-shadow: 0px 2px 4px ${palette.teal[2]};
+  background: ${palette.gray[1]};
+  box-shadow: 0px 2px 4px ${palette.gray[4]};
   z-index: 100;
 `;
 
@@ -30,8 +30,8 @@ const UserStatusWrapper = styled.div`
 `;
 
 const TitleWrapper = styled(Link)`
-  font-weight: bold;
-  font-size: 1.8rem;
+  font-family: 'Jua', sans-serif;
+  font-size: 2.3rem;
 `;
 
 const Spacer = styled.div`
@@ -42,7 +42,7 @@ const Header = ({ user, onLogout }) => (
   <>
     <HeaderWrapper>
       <Wrapper>
-        <TitleWrapper to="/">제목(미정)</TitleWrapper>
+        <TitleWrapper to="/">ConStu</TitleWrapper>
         {user ? (
           <UserStatusWrapper>
             <span>{user}</span>
diff --git a/src/components/main/StudyGroup.jsx b/src/components/main/StudyGroup.jsx
index e31b0f0..c12e664 100644
--- a/src/components/main/StudyGroup.jsx
+++ b/src/components/main/StudyGroup.jsx
@@ -26,7 +26,7 @@ const StudyGroupWrapper = styled.div`
 
 const HeaderLink = styled(Link)`
   display: block;
-  padding: 0.8rem 1rem 0.8rem 1rem;
+  padding: 1.5rem 1.2rem 0.8rem 1rem;
   h4 {
     text-align: center;
     margin: 0px 0px 0.25rem;
@@ -35,9 +35,8 @@ const HeaderLink = styled(Link)`
     white-space: nowrap;
     overflow: hidden;
     color: ${palette.gray[8]};
-    font-size: 2.3rem;
-    font-weight: 500;
-    font-family: 'Nanum Pen Script', cursive;
+    font-size: 1.7rem;
+    font-family: 'Sunflower', sans-serif;
     &:hover {
       color: ${palette.gray[6]};
     }
diff --git a/src/containers/common/HeaderContainer.test.jsx b/src/containers/common/HeaderContainer.test.jsx
index 613b84f..389fa36 100644
--- a/src/containers/common/HeaderContainer.test.jsx
+++ b/src/containers/common/HeaderContainer.test.jsx
@@ -34,7 +34,7 @@ describe('HeaderContainer', () => {
     it('renders Header text', () => {
       const { container } = renderHeaderContainer();
 
-      expect(container).toHaveTextContent('제목(미정)');
+      expect(container).toHaveTextContent('ConStu');
       expect(container).toHaveTextContent('로그아웃');
     });
 
@@ -57,7 +57,7 @@ describe('HeaderContainer', () => {
     it('renders Header text', () => {
       const { container } = renderHeaderContainer();
 
-      expect(container).toHaveTextContent('제목(미정)');
+      expect(container).toHaveTextContent('ConStu');
       expect(container).toHaveTextContent('로그인');
       expect(container).toHaveTextContent('회원가입');
     });
diff --git a/src/index.css b/src/index.css
index b4984a2..34b1b21 100644
--- a/src/index.css
+++ b/src/index.css
@@ -6,6 +6,9 @@ font-family: 'Nanum Pen Script', cursive;
 @import url('//cdn.jsdelivr.net/gh/wan2land/d2coding/d2coding-full.css');
 @import url('https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@300&display=swap');
 /* font-family: 'Noto Sans KR', sans-serif; */
+@import url('https://fonts.googleapis.com/css2?family=Jua&family=Sunflower:wght@500&display=swap');
+/* font-family: 'Jua', sans-serif; */
+/* font-family: 'Sunflower', sans-serif; */
 
 * {
   box-sizing: inherit;
diff --git a/src/pages/MainPage.jsx b/src/pages/MainPage.jsx
index da3c0f3..07e10f3 100644
--- a/src/pages/MainPage.jsx
+++ b/src/pages/MainPage.jsx
@@ -9,7 +9,7 @@ import StudyGroupsContainer from '../containers/groups/StudyGroupsContainer';
 const MainPage = () => (
   <>
     <Helmet>
-      <title>제목(미정)</title>
+      <title>ConStu</title>
     </Helmet>
     <Responsive>
       <StudyGroupsContainer />