From d19f65846b77cabebb4057848cc809dd73364132 Mon Sep 17 00:00:00 2001 From: yueunfive <122276414+yueunfive@users.noreply.github.com> Date: Sat, 16 Dec 2023 18:38:45 +0900 Subject: [PATCH] =?UTF-8?q?design/#57/=ED=99=94=EB=A9=B4=20=EC=9E=98?= =?UTF-8?q?=EB=A6=BC=20=ED=98=84=EC=83=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/WritingPageBtn.tsx | 1 - src/components/WritingPageWrap.tsx | 57 +- src/pages/AttachPicture.tsx | 206 +++---- src/pages/RecommendResult.tsx | 2 +- src/pages/SelectRetro.tsx | 192 +++---- src/pages/Subscribe.tsx | 3 +- src/pages/WritingPage/GuideLine/AAR.tsx | 277 ++++----- src/pages/WritingPage/GuideLine/Continue.tsx | 196 +++---- src/pages/WritingPage/GuideLine/FiveF.tsx | 311 +++++----- src/pages/WritingPage/GuideLine/FourL.tsx | 263 ++++----- src/pages/WritingPage/GuideLine/KPT.tsx | 214 +++---- src/pages/WritingPage/GuideLine/ORID.tsx | 284 +++++----- .../WritingPage/GuideLine/Performance.tsx | 384 ++++++------- src/pages/WritingPage/GuideLine/Personal.tsx | 530 +++++++++--------- src/pages/WritingPage/GuideLine/TIL.tsx | 225 ++++---- src/pages/WritingPage/GuideLine/YWT.tsx | 246 ++++---- src/pages/WritingPage/StepByStep/AAR.tsx | 94 ++-- src/pages/WritingPage/StepByStep/Continue.tsx | 74 +-- src/pages/WritingPage/StepByStep/FiveF.tsx | 114 ++-- src/pages/WritingPage/StepByStep/FourL.tsx | 94 ++-- src/pages/WritingPage/StepByStep/KPT.tsx | 74 +-- src/pages/WritingPage/StepByStep/ORID.tsx | 100 ++-- .../WritingPage/StepByStep/Performance.tsx | 34 +- src/pages/WritingPage/StepByStep/Personal.tsx | 34 +- src/pages/WritingPage/StepByStep/TIL.tsx | 74 +-- src/pages/WritingPage/StepByStep/YWT.tsx | 72 +-- src/pages/login/Login.tsx | 72 +-- 27 files changed, 2150 insertions(+), 2077 deletions(-) diff --git a/src/components/WritingPageBtn.tsx b/src/components/WritingPageBtn.tsx index 7609e11..7a817ce 100644 --- a/src/components/WritingPageBtn.tsx +++ b/src/components/WritingPageBtn.tsx @@ -3,7 +3,6 @@ import styled from "styled-components"; const WritingPageBtnWrap = styled.div` margin-top: 50px; margin-bottom: 90px; - height: 100dp; .temporary_btn { width: 190px; diff --git a/src/components/WritingPageWrap.tsx b/src/components/WritingPageWrap.tsx index 8992cbe..8b16eb0 100644 --- a/src/components/WritingPageWrap.tsx +++ b/src/components/WritingPageWrap.tsx @@ -2,38 +2,47 @@ import styled from "styled-components"; const WritingPageWrap = styled.div` background-color: #121212; + min-height: calc(100vh - 90px); + display: flex; flex-direction: column; + justify-content: center; align-items: center; - .container { - margin-top: 80px; + .all-container { display: flex; flex-direction: column; + align-items: center; - .title_container { + .container { + margin-top: 80px; display: flex; - align-items: center; - gap: 30px; - margin-bottom: 50px; - } - .title_main { - color: var(--text-high-emphasis, rgba(255, 255, 255, 0.87)); - font-size: 32px; - font-style: normal; - font-weight: 700; - line-height: normal; - } - .title_content { - color: var(--text-medium-emphasis, rgba(255, 255, 255, 0.6)); - font-size: 18px; - font-style: normal; - font-weight: 600; - line-height: normal; - } - .temporary_btn:disabled { - /* isContentFilled가 false일 때 버튼 스타일 */ - opacity: 0.6; + flex-direction: column; + + .title_container { + display: flex; + align-items: center; + gap: 30px; + margin-bottom: 50px; + } + .title_main { + color: var(--text-high-emphasis, rgba(255, 255, 255, 0.87)); + font-size: 32px; + font-style: normal; + font-weight: 700; + line-height: normal; + } + .title_content { + color: var(--text-medium-emphasis, rgba(255, 255, 255, 0.6)); + font-size: 18px; + font-style: normal; + font-weight: 600; + line-height: normal; + } + .temporary_btn:disabled { + /* isContentFilled가 false일 때 버튼 스타일 */ + opacity: 0.6; + } } } `; diff --git a/src/pages/AttachPicture.tsx b/src/pages/AttachPicture.tsx index eac3b10..be9d801 100644 --- a/src/pages/AttachPicture.tsx +++ b/src/pages/AttachPicture.tsx @@ -117,50 +117,52 @@ export default function AttachPicture() { <>
-
-

첨부하고 싶은 사진이 있다면 넣어주세요

-
-
- {previewUrl && ( - Preview - )} -
-
- - {pictureFile ? ( -

{pictureFile.name}

- ) : ( -

- 또는 파일을 여기로 드래그 해주세요 -

- )} -
- - - - + + {pictureFile ? ( +

{pictureFile.name}

+ ) : ( +

+ 또는 파일을 여기로 드래그 해주세요 +

+ )} + + + + + +
); @@ -168,71 +170,75 @@ export default function AttachPicture() { const AttachPictureWrap = styled.div` background-color: #121212; - height: 100%; - width: 100%; - //padding: 0px 100px; - box-sizing: border-box; + min-height: calc(100vh - 90px); + display: flex; - flex-direction: column; + justify-content: center; align-items: center; - .titleText { - margin-top: 90px; - margin-block: 30px; - display: inline-flex; - justify-content: center; + .container { + display: flex; + flex-direction: column; align-items: center; - gap: 30px; - color: var(--text-high-emphasis, rgba(255, 255, 255, 0.87)); - font-size: 32px; - font-style: normal; - font-weight: 700; - line-height: normal; - } - .picture_container { - width: 437px; - height: 280px; - flex-shrink: 0; - border-radius: 16px; - border: 2px dashed var(--text-medium-emphasis, rgba(255, 255, 255, 0.6)); - } + .titleText { + margin-top: 90px; + margin-block: 30px; + display: inline-flex; + justify-content: center; + align-items: center; + gap: 30px; + color: var(--text-high-emphasis, rgba(255, 255, 255, 0.87)); + font-size: 32px; + font-style: normal; + font-weight: 700; + line-height: normal; + } - .picture-select { - display: inline-flex; - padding: 7px 16px; - justify-content: center; - align-items: center; - text-align: center; - gap: 10px; - border-radius: 8px; - background: rgba(255, 255, 255, 0.1); - border: none; - margin-top: 107px; - margin-left: 176px; - } + .picture_container { + width: 437px; + height: 280px; + flex-shrink: 0; + border-radius: 16px; + border: 2px dashed var(--text-medium-emphasis, rgba(255, 255, 255, 0.6)); + } - .select-text { - color: var(--text-high-emphasis, rgba(255, 255, 255, 0.87)); - font-size: 14px; - font-style: normal; - font-weight: 600; - line-height: normal; - } + .picture-select { + display: inline-flex; + padding: 7px 16px; + justify-content: center; + align-items: center; + text-align: center; + gap: 10px; + border-radius: 8px; + background: rgba(255, 255, 255, 0.1); + border: none; + margin-top: 107px; + margin-left: 176px; + } - .picture_input_text { - margin-top: 26px; - margin-bottom: 130px; - color: #fff; - text-align: center; - font-size: 18px; - font-style: normal; - font-weight: 600; - line-height: normal; - } + .select-text { + color: var(--text-high-emphasis, rgba(255, 255, 255, 0.87)); + font-size: 14px; + font-style: normal; + font-weight: 600; + line-height: normal; + } + + .picture_input_text { + margin-top: 26px; + margin-bottom: 130px; + color: #fff; + text-align: center; + font-size: 18px; + font-style: normal; + font-weight: 600; + line-height: normal; + } - .preview { - text-align: center; - margin-block: 40px; + .preview { + text-align: center; + margin-block: 40px; + } } `; diff --git a/src/pages/RecommendResult.tsx b/src/pages/RecommendResult.tsx index 1032e3d..5c1f896 100644 --- a/src/pages/RecommendResult.tsx +++ b/src/pages/RecommendResult.tsx @@ -74,7 +74,7 @@ export default function RecommendResult() { return ; case "성과/수치 중심 회고": return ; - case "Personal Retrospective": + case "개인적 회고": return ; case "YWT": return ; diff --git a/src/pages/SelectRetro.tsx b/src/pages/SelectRetro.tsx index 4e10acf..e7612f6 100644 --- a/src/pages/SelectRetro.tsx +++ b/src/pages/SelectRetro.tsx @@ -106,101 +106,103 @@ export default function SelectRetro() { <>
-
-
-

회고하기

-
-

회고 제목

- -
-
-

회고 유형 선택

-
-
- - - - -
-
- - - - -
-
- - +
+
+
+

회고하기

+
+

회고 제목

+ +
+
+

회고 유형 선택

+
+
+ + + + +
+
+ + + + +
+
+ + +
+ {renderActiveComponent()} +
+
+
- {renderActiveComponent()} -
-
-