From 194987691253a19ec8be05619ac363ad5b922396 Mon Sep 17 00:00:00 2001 From: HyeJean <57613101+MEGUMMY1@users.noreply.github.com> Date: Mon, 8 Apr 2024 16:09:31 +0900 Subject: [PATCH 1/8] Update issue templates --- .github/ISSUE_TEMPLATE/feature_request.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..5a683a8 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,18 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: "[Feat] 제목" +labels: '' +assignees: '' + +--- + +## ⭐어떤 기능인가요? + +> 기능에 대해 간결하게 설명해주세요 + +## ⭐작업 상세 내용 + +- [ ] TODO +- [ ] TODO +- [ ] TODO From 50f37ad59c1e090d39ee9347c657c41492172e3a Mon Sep 17 00:00:00 2001 From: HyeJean <57613101+MEGUMMY1@users.noreply.github.com> Date: Mon, 8 Apr 2024 16:18:06 +0900 Subject: [PATCH 2/8] Update PR templates --- .github/PULL_REQUEST_TEMPLATE.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..989350f --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,17 @@ +## #️⃣연관된 이슈 + +> ex) #이슈번호1, #이슈번호2 + +## 📝작업 내용 + +- 이번 PR에서 작업한 내용을 간략히 설명해주세요 + + +### 📸스크린샷 + + +*** +### 💬리뷰 요구사항 + +> 리뷰어가 특별히 봐주었으면 하는 부분이 있다면 작성해주세요 +> From d1d00324bd59e70a54562f153c053eb713a02930 Mon Sep 17 00:00:00 2001 From: MEGUMMY1 Date: Tue, 9 Apr 2024 10:56:21 +0900 Subject: [PATCH 3/8] =?UTF-8?q?Fix:=20index.js=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/index.js b/src/index.js index b1ef1c0..8db5acb 100644 --- a/src/index.js +++ b/src/index.js @@ -1,10 +1,10 @@ import React from "react"; -import ReactDOM from "react-dom"; +import ReactDOM from "react-dom/client"; import App from "./App"; -ReactDOM.render( +const root = ReactDOM.createRoot(document.getElementById("root")); +root.render( - , - document.getElementById("root") + ); From e1ba3494a19a1042d8d0b8e099e5d1de6fa16e5d Mon Sep 17 00:00:00 2001 From: MEGUMMY1 Date: Tue, 9 Apr 2024 11:21:37 +0900 Subject: [PATCH 4/8] =?UTF-8?q?Style:=20global.scss=20=ED=98=95=EC=8B=9D?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/global.scss | 78 ++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/src/global.scss b/src/global.scss index 5b549b1..87890c1 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1,41 +1,39 @@ -:root { - --purple1: #f8f0ff; - --purple2: #ecd9ff; - --purple3: #dcb9ff; - --purple4: #c894fd; - --purple5: #ab57ff; - --purple6: #9935ff; - --purple7: #861dee; - --purple8: #6e0ad1; - --purple9: #5603a7; - --orange1: #fff0d6; - --orange2: #ffe2ad; - --orange3: #ffc583; - --orange4: #ffae65; - --orange5: #ff8832; - --blue1: #e2f5ff; - --blue2: #b1e4ff; - --blue3: #7cd2ff; - --blue4: #34b9ff; - --blue5: #00a2fe; - --green1: #e4fbdc; - --green2: #d0f5c3; - --green3: #9be282; - --green4: #60cf37; - --green5: #2ba600; - --gray1: #f6f6f6; - --gray2: #eeeeee; - --gray3: #cccccc; - --gray4: #999999; - --gray5: #555555; - --gray6: #4a4a4a; - --gray7: #3a3a3a; - --gray8: #2b2b2b; - --gray9: #181818; - --white: #ffffff; - --black: #000000; - --error: #dc3a3a; - --surface: #f6f8ff; +$purple1: #f8f0ff; +$purple2: #ecd9ff; +$purple3: #dcb9ff; +$purple4: #c894fd; +$purple5: #ab57ff; +$purple6: #9935ff; +$purple7: #861dee; +$purple8: #6e0ad1; +$purple9: #5603a7; +$orange1: #fff0d6; +$orange2: #ffe2ad; +$orange3: #ffc583; +$orange4: #ffae65; +$orange5: #ff8832; +$blue1: #e2f5ff; +$blue2: #b1e4ff; +$blue3: #7cd2ff; +$blue4: #34b9ff; +$blue5: #00a2fe; +$green1: #e4fbdc; +$green2: #d0f5c3; +$green3: #9be282; +$green4: #60cf37; +$green5: #2ba600; +$gray1: #f6f6f6; +$gray2: #eeeeee; +$gray3: #cccccc; +$gray4: #999999; +$gray5: #555555; +$gray6: #4a4a4a; +$gray7: #3a3a3a; +$gray8: #2b2b2b; +$gray9: #181818; +$white: #ffffff; +$black: #000000; +$error: #dc3a3a; +$surface: #f6f8ff; - --font-family: "Pretendard", sans-serif; -} +$font-family: "Pretendard", sans-serif; From ac58ea3afcf0e84fcb8f811399ea5b14a11b28cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=98=84=EC=8A=B9?= Date: Tue, 9 Apr 2024 11:36:57 +0900 Subject: [PATCH 5/8] =?UTF-8?q?feat:=20=ED=97=A4=EB=8D=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Header.jsx | 15 +++++++++++-- src/components/Header.module.scss | 36 +++++++++++++++++++++++++++++++ src/index.js | 12 +++++------ src/reset.scss | 3 ++- 4 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 src/components/Header.module.scss diff --git a/src/components/Header.jsx b/src/components/Header.jsx index 20cdde0..a1123eb 100644 --- a/src/components/Header.jsx +++ b/src/components/Header.jsx @@ -1,10 +1,21 @@ // Header.jsx +import styles from './Header.module.scss'; +import { Link } from 'react-router-dom'; + function Header() { return ( -
-

Header

+
+
+ +

Rolling

+ + + + +
); } +//위 버튼은 컴포넌트 스타일을 적용할 것임 export default Header; diff --git a/src/components/Header.module.scss b/src/components/Header.module.scss new file mode 100644 index 0000000..7ff88df --- /dev/null +++ b/src/components/Header.module.scss @@ -0,0 +1,36 @@ +$headerH: 64px; + +.header { + display: flex; + justify-content: center; + height: $headerH; +} + +.frame { + display: flex; + justify-content: space-between; + align-items: center; + max-width: 1248px; + width: 100%; + padding: 0 24px; +} + +.title { + display: flex; + align-items: center; + color: var(--gray-light-gray-90, #4a494f); + text-align: center; + font-family: Poppins; + font-size: 19.971px; + font-style: normal; + font-weight: 700; + line-height: 150%; + &::before { + content: ''; + background-image: url('../assets/Rolling_icon.png'); + display: inline-block; + width: 27.818px; + height: 27.658px; + margin-right: 8px; + } +} diff --git a/src/index.js b/src/index.js index b1ef1c0..593edf1 100644 --- a/src/index.js +++ b/src/index.js @@ -1,10 +1,10 @@ -import React from "react"; -import ReactDOM from "react-dom"; -import App from "./App"; +import React from 'react'; +import ReactDOM from 'react-dom/client'; +import App from './App'; -ReactDOM.render( +const root = ReactDOM.createRoot(document.getElementById('root')); +root.render( - , - document.getElementById("root") + ); diff --git a/src/reset.scss b/src/reset.scss index 3089150..257ed32 100644 --- a/src/reset.scss +++ b/src/reset.scss @@ -89,6 +89,7 @@ video { border: 0; font-size: 100%; vertical-align: baseline; + text-decoration: none; } /* HTML5 display-role reset for older browsers */ article, @@ -119,7 +120,7 @@ blockquote:before, blockquote:after, q:before, q:after { - content: ""; + content: ''; content: none; } table { From 3d0df273b329ecf8e9e5180297aa8ec41e00b04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=98=84=EC=8A=B9?= Date: Tue, 9 Apr 2024 11:52:56 +0900 Subject: [PATCH 6/8] =?UTF-8?q?Remove:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Header.jsx | 4 ++-- src/components/Header.module.scss | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/Header.jsx b/src/components/Header.jsx index a1123eb..67ef39c 100644 --- a/src/components/Header.jsx +++ b/src/components/Header.jsx @@ -5,14 +5,14 @@ import { Link } from 'react-router-dom'; function Header() { return (
-
+
+
); } diff --git a/src/components/Header.module.scss b/src/components/Header.module.scss index 7ff88df..8b3d88b 100644 --- a/src/components/Header.module.scss +++ b/src/components/Header.module.scss @@ -1,3 +1,5 @@ +@import url(../global.scss); + $headerH: 64px; .header { @@ -18,13 +20,10 @@ $headerH: 64px; .title { display: flex; align-items: center; - color: var(--gray-light-gray-90, #4a494f); - text-align: center; + color: #4a494f; font-family: Poppins; font-size: 19.971px; - font-style: normal; - font-weight: 700; - line-height: 150%; + line-height: normal; &::before { content: ''; background-image: url('../assets/Rolling_icon.png'); From 3be3e398655fc19cab2f808103c7720ad81d14bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=98=84=EC=8A=B9?= Date: Tue, 9 Apr 2024 12:29:34 +0900 Subject: [PATCH 7/8] =?UTF-8?q?Docs:=20=ED=97=A4=EB=8D=94=20fixed,=20?= =?UTF-8?q?=EC=95=84=EB=9E=AB=EC=A4=84=20=EC=B6=94=EA=B0=80/=EA=B8=80?= =?UTF-8?q?=EB=A1=9C=EB=B2=8C=20=EC=8A=A4=ED=83=80=EC=9D=BC=20*=EB=B3=B4?= =?UTF-8?q?=EB=8D=94=20=EC=82=AC=EC=9D=B4=EC=A6=88=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Header.module.scss | 9 +++++++-- src/reset.scss | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/Header.module.scss b/src/components/Header.module.scss index 8b3d88b..06474b1 100644 --- a/src/components/Header.module.scss +++ b/src/components/Header.module.scss @@ -1,9 +1,15 @@ @import url(../global.scss); -$headerH: 64px; +$headerH: 65px; .header { + position: fixed; + top: 0; + left: 0; + right: 0; display: flex; + padding: 12px 24px; + border-bottom: 1px solid #ededed; justify-content: center; height: $headerH; } @@ -14,7 +20,6 @@ $headerH: 64px; align-items: center; max-width: 1248px; width: 100%; - padding: 0 24px; } .title { diff --git a/src/reset.scss b/src/reset.scss index 257ed32..c9a5005 100644 --- a/src/reset.scss +++ b/src/reset.scss @@ -3,6 +3,9 @@ License: none (public domain) */ +* { + box-sizing: border-box; +} html, body, div, From d80775afa6b8021a51e04b80a9b4289419c63b53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=98=84=EC=8A=B9?= Date: Tue, 9 Apr 2024 12:35:41 +0900 Subject: [PATCH 8/8] =?UTF-8?q?Remove:=20=ED=97=A4=EB=8D=94=20fixed=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Header.module.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/components/Header.module.scss b/src/components/Header.module.scss index 06474b1..46ef19a 100644 --- a/src/components/Header.module.scss +++ b/src/components/Header.module.scss @@ -3,10 +3,6 @@ $headerH: 65px; .header { - position: fixed; - top: 0; - left: 0; - right: 0; display: flex; padding: 12px 24px; border-bottom: 1px solid #ededed;