From cd6407c16b5bd3de962ad01439d5f1a21f1194f8 Mon Sep 17 00:00:00 2001 From: Chamsol Kim Date: Mon, 25 Aug 2025 12:06:08 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix=20[]=20=EB=A9=94=EC=9D=B8=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20'=EA=B5=AC=EA=B2=BD=ED=95=B4=20=EB=B3=B4?= =?UTF-8?q?=EA=B8=B0'=20=EB=B2=84=ED=8A=BC=EC=9D=84=20`PrimaryButton`?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/main-page.jsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/main-page.jsx b/src/pages/main-page.jsx index 455c6ee..b26be4c 100644 --- a/src/pages/main-page.jsx +++ b/src/pages/main-page.jsx @@ -4,6 +4,8 @@ import emojiImg from "../assets/ld-emoji.png"; import cardImg1 from "../assets/ld-img01.png"; import cardImg2 from "../assets/ld-img02.png"; import cardImg3 from "../assets/ld-img03.png"; +import { PrimaryButton } from "../components/button/button"; +import BUTTON_SIZE from "../components/button/button-size"; const Content = styled.div` width: 100%; @@ -115,6 +117,10 @@ const PointBadge = styled.div` width: fit-content; `; +const MoveButton = styled(PrimaryButton)` + width: 280px; +`; + function MainPage() { return ( @@ -158,7 +164,7 @@ function MainPage() { }} > - + From 0bfabfc215204da946535c0df6546575a9409047 Mon Sep 17 00:00:00 2001 From: Chamsol Kim Date: Mon, 25 Aug 2025 12:11:13 +0900 Subject: [PATCH 2/5] =?UTF-8?q?refactor=20[]=20Formatter=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/404-page.jsx | 6 +++--- src/pages/create-post-page.jsx | 9 --------- src/pages/send-message-page.jsx | 12 ++++++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/pages/404-page.jsx b/src/pages/404-page.jsx index cde6c03..e0354cd 100644 --- a/src/pages/404-page.jsx +++ b/src/pages/404-page.jsx @@ -1,10 +1,10 @@ -import React, { useEffect } from "react"; +import { useEffect } from "react"; import { useNavigate } from "react-router"; -import { PrimaryButton } from "../components/button/button"; -import BUTTON_SIZE from "../components/button/button-size"; import styled from "styled-components"; import CrushedPaperPlane from "../assets/ic-paperairplane.svg"; import logoImage from "../assets/logo.svg"; +import { PrimaryButton } from "../components/button/button"; +import BUTTON_SIZE from "../components/button/button-size"; import { media } from "../utils/media"; const TopContainer = styled.article` diff --git a/src/pages/create-post-page.jsx b/src/pages/create-post-page.jsx index 69d2f08..cba1a1b 100644 --- a/src/pages/create-post-page.jsx +++ b/src/pages/create-post-page.jsx @@ -116,15 +116,6 @@ function CreatePostPage() { } }; - const handleBackgroundSelect = (e) => { - let typeSelect = e.target.textContent; - - if (typeSelect === "컬러" || typeSelect === "이미지") { - setBackgroundType(typeSelect); - setSelected(0); - } - }; - const handleCreate = async () => { if (!trimmed) { setNameError("이름을 입력해 주세요"); // 이거 안전장치로 필요할까요? diff --git a/src/pages/send-message-page.jsx b/src/pages/send-message-page.jsx index 7ddbeb4..231c0d8 100644 --- a/src/pages/send-message-page.jsx +++ b/src/pages/send-message-page.jsx @@ -1,16 +1,16 @@ import { useState } from "react"; -import TextField from "../components/text-field/text-field"; -import TEXT_FIELD_TYPE from "../components/text-field/text-field-type"; -import Colors from "../components/color/colors"; +import { useNavigate, useParams } from "react-router"; import styled from "styled-components"; +import { apiClient } from "../api/client"; import Avatar from "../components/avatar/avatar"; import AVATAR_SIZE from "../components/avatar/avatar-size"; -import BUTTON_SIZE from "../components/button/button-size"; -import { useNavigate, useParams } from "react-router"; import { PrimaryButton } from "../components/button/button"; +import BUTTON_SIZE from "../components/button/button-size"; +import Colors from "../components/color/colors"; import TextEditor from "../components/text-editor/text-editor"; +import TextField from "../components/text-field/text-field"; +import TEXT_FIELD_TYPE from "../components/text-field/text-field-type"; import { media } from "../utils/media"; -import { apiClient } from "../api/client"; const SendContainer = styled.div` display: flex; From 7373aab44369cef13c6702f1e46bee19c5d43ffd Mon Sep 17 00:00:00 2001 From: Chamsol Kim Date: Mon, 25 Aug 2025 12:20:06 +0900 Subject: [PATCH 3/5] =?UTF-8?q?feat=20[]=20MessageCard=EC=97=90=20font=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/font/message-font.js | 15 +++++++++++++++ src/features/message/components/message-card.jsx | 4 +++- src/pages/send-message-page.jsx | 8 +------- 3 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 src/components/font/message-font.js diff --git a/src/components/font/message-font.js b/src/components/font/message-font.js new file mode 100644 index 0000000..9a37060 --- /dev/null +++ b/src/components/font/message-font.js @@ -0,0 +1,15 @@ +const messageFontFamily = Object.freeze({ + "Noto Sans": "Noto Sans", + "Pretendard": "Pretendard", + "나눔명조": "Nanum Myeongjo", + "나눔손글씨 손편지체": "NanumPenScript" +}); + +const fontOptions = Object.freeze([ + { title: "Noto Sans", fontFamily: "Noto Sans" }, + { title: "Pretendard", fontFamily: "Pretendard" }, + { title: "나눔명조", fontFamily: "Nanum Myeongjo" }, + { title: "나눔손글씨 손편지체", fontFamily: "NanumPenScript" }, +]); + +export { fontOptions, messageFontFamily }; diff --git a/src/features/message/components/message-card.jsx b/src/features/message/components/message-card.jsx index 6a355da..d96f358 100644 --- a/src/features/message/components/message-card.jsx +++ b/src/features/message/components/message-card.jsx @@ -3,6 +3,7 @@ import deleteImage from "../../../assets/ic-trash.svg"; import { OutlinedButton } from "../../../components/button/button"; import BUTTON_SIZE from "../../../components/button/button-size"; import Colors from "../../../components/color/colors"; +import { messageFontFamily } from "../../../components/font/message-font"; import { formatDate } from "../../../utils/formatter"; import { media } from "../../../utils/media"; import MessageCardBase from "./message-card-base"; @@ -18,6 +19,7 @@ const Header = styled.header` const Content = styled.div` margin: 16px 0; + font-family: ${({ $fontFamily }) => $fontFamily}; font-size: 18px; font-weight: 400; line-height: 28px; @@ -79,7 +81,7 @@ function MessageCard({ isEditing, index, message, onClick, onDelete }) { /> )} - {message.content} + {message.content} {formatDate(message.createdAt, ".")} diff --git a/src/pages/send-message-page.jsx b/src/pages/send-message-page.jsx index 231c0d8..79e134a 100644 --- a/src/pages/send-message-page.jsx +++ b/src/pages/send-message-page.jsx @@ -7,6 +7,7 @@ import AVATAR_SIZE from "../components/avatar/avatar-size"; import { PrimaryButton } from "../components/button/button"; import BUTTON_SIZE from "../components/button/button-size"; import Colors from "../components/color/colors"; +import { fontOptions } from "../components/font/message-font"; import TextEditor from "../components/text-editor/text-editor"; import TextField from "../components/text-field/text-field"; import TEXT_FIELD_TYPE from "../components/text-field/text-field-type"; @@ -175,13 +176,6 @@ function SendMessagePage() { trimmed !== "" && content.replace(/<[^>]+>/g, "").trim() !== ""; // 정규식 유효성 검사로 html 태그 찾기("<"로 시작해서 ">"로 끝나는 문자 중 > 를 제외한(^ not) 모든 문자 제외) - const fontOptions = [ - { title: "Noto Sans", fontFamily: "Noto Sans" }, - { title: "Pretendard", fontFamily: "Pretendard" }, - { title: "나눔명조", fontFamily: "Nanum Myeongjo" }, - { title: "나눔손글씨 손편지체", fontFamily: "NanumPenScript" }, - ]; - return ( From c910890953b6e492f17624a46cd7964024d97f9e Mon Sep 17 00:00:00 2001 From: Chamsol Kim Date: Mon, 25 Aug 2025 12:21:40 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix=20[]=20=EB=A1=A4=EB=A7=81=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=ED=8D=BC=EC=97=90=20=EB=A9=94=EC=8B=9C=EC=A7=80?= =?UTF-8?q?=EA=B0=80=20=EC=A0=81=EC=9D=84=20=EB=95=8C=20background=20image?= =?UTF-8?q?=20=EC=98=81=EC=97=AD=EC=9D=B4=20=ED=99=94=EB=A9=B4=EC=9D=84=20?= =?UTF-8?q?=EA=BD=89=20=EC=B1=84=EC=9A=B0=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/messages-page.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/messages-page.jsx b/src/pages/messages-page.jsx index e97fcd8..25f37c9 100644 --- a/src/pages/messages-page.jsx +++ b/src/pages/messages-page.jsx @@ -53,6 +53,7 @@ const BackgroundColor = styled.div` `; const BackgroundImage = styled.div` + height: 100%; ${({ $backgroundImageUrl }) => $backgroundImageUrl ? ` From 1697ab35259cb86cf96d99efd4e7de641a126db3 Mon Sep 17 00:00:00 2001 From: Chamsol Kim Date: Mon, 25 Aug 2025 12:24:32 +0900 Subject: [PATCH 5/5] =?UTF-8?q?feat=20[]=20Reaction=EC=9D=B4=20=EC=97=86?= =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20reaction=20=EB=AA=A9=EB=A1=9D=EC=9D=84?= =?UTF-8?q?=20=EB=B3=B4=EC=97=AC=EC=A3=BC=EC=A7=80=20=EC=95=8A=EC=9D=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rolling-paper/components/header/rolling-paper-header.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/rolling-paper/components/header/rolling-paper-header.jsx b/src/features/rolling-paper/components/header/rolling-paper-header.jsx index 3bb87df..0a95fe5 100644 --- a/src/features/rolling-paper/components/header/rolling-paper-header.jsx +++ b/src/features/rolling-paper/components/header/rolling-paper-header.jsx @@ -126,7 +126,7 @@ function RollingPaperHeader({ profiles={messages.map((message) => message.profileImageURL)} /> )} - + {reactions.length > 0 && } {isEditing || (