From 7fab75c0ceae03cb3e583cc4ee378a7d71d39dcc Mon Sep 17 00:00:00 2001 From: Yoonji Lee Date: Mon, 13 Jan 2025 03:25:16 +0900 Subject: [PATCH 01/13] =?UTF-8?q?feat:=20=EB=8C=93=EA=B8=80=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B4=88=EA=B8=B0=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/component/Comment/Comment.css.ts | 0 src/common/component/Comment/Comment.tsx | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/common/component/Comment/Comment.css.ts create mode 100644 src/common/component/Comment/Comment.tsx diff --git a/src/common/component/Comment/Comment.css.ts b/src/common/component/Comment/Comment.css.ts new file mode 100644 index 00000000..e69de29b diff --git a/src/common/component/Comment/Comment.tsx b/src/common/component/Comment/Comment.tsx new file mode 100644 index 00000000..e69de29b From 2199e410530c3418743a4e471138cbef4371d879 Mon Sep 17 00:00:00 2001 From: Yoonji Lee Date: Mon, 13 Jan 2025 03:37:03 +0900 Subject: [PATCH 02/13] =?UTF-8?q?feat:=20=EC=95=84=EC=9D=B4=EC=BD=98=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/svgs/Ellipse 57.svg | 3 +++ public/svgs/ellipses.svg | 9 +++++++++ public/svgs/message.svg | 5 +++++ src/asset/svg/Ellipse57.tsx | 13 +++++++++++++ src/asset/svg/Ellipses.tsx | 20 ++++++++++++++++++++ src/asset/svg/Message.tsx | 19 +++++++++++++++++++ src/asset/svg/index.ts | 3 +++ src/common/component/Comment/Comment.tsx | 9 +++++++++ 8 files changed, 81 insertions(+) create mode 100644 public/svgs/Ellipse 57.svg create mode 100644 public/svgs/ellipses.svg create mode 100644 public/svgs/message.svg create mode 100644 src/asset/svg/Ellipse57.tsx create mode 100644 src/asset/svg/Ellipses.tsx create mode 100644 src/asset/svg/Message.tsx diff --git a/public/svgs/Ellipse 57.svg b/public/svgs/Ellipse 57.svg new file mode 100644 index 00000000..bec9d693 --- /dev/null +++ b/public/svgs/Ellipse 57.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/svgs/ellipses.svg b/public/svgs/ellipses.svg new file mode 100644 index 00000000..e0a32212 --- /dev/null +++ b/public/svgs/ellipses.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/svgs/message.svg b/public/svgs/message.svg new file mode 100644 index 00000000..f1522977 --- /dev/null +++ b/public/svgs/message.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/asset/svg/Ellipse57.tsx b/src/asset/svg/Ellipse57.tsx new file mode 100644 index 00000000..0c81e649 --- /dev/null +++ b/src/asset/svg/Ellipse57.tsx @@ -0,0 +1,13 @@ +import type { SVGProps } from "react"; +const SvgEllipse57 = (props: SVGProps) => ( + + + +); +export default SvgEllipse57; diff --git a/src/asset/svg/Ellipses.tsx b/src/asset/svg/Ellipses.tsx new file mode 100644 index 00000000..375921bc --- /dev/null +++ b/src/asset/svg/Ellipses.tsx @@ -0,0 +1,20 @@ +import type { SVGProps } from "react"; +const SvgEllipses = (props: SVGProps) => ( + + + + + +); +export default SvgEllipses; diff --git a/src/asset/svg/Message.tsx b/src/asset/svg/Message.tsx new file mode 100644 index 00000000..67f80eb3 --- /dev/null +++ b/src/asset/svg/Message.tsx @@ -0,0 +1,19 @@ +import type { SVGProps } from "react"; +const SvgMessage = (props: SVGProps) => ( + + + +); +export default SvgMessage; diff --git a/src/asset/svg/index.ts b/src/asset/svg/index.ts index 583aa3f4..aaa4c0fe 100644 --- a/src/asset/svg/index.ts +++ b/src/asset/svg/index.ts @@ -1,3 +1,6 @@ +export { default as Ellipse57 } from "./Ellipse57"; +export { default as Ellipses } from "./Ellipses"; +export { default as Message } from "./Message"; export { default as Plus } from "./Plus"; export { default as React } from "./React"; export { default as Vite } from "./Vite"; diff --git a/src/common/component/Comment/Comment.tsx b/src/common/component/Comment/Comment.tsx index e69de29b..764d5cc8 100644 --- a/src/common/component/Comment/Comment.tsx +++ b/src/common/component/Comment/Comment.tsx @@ -0,0 +1,9 @@ +import + +const Comment.css = () => { + return ( +
Comment.css
+ ) + } + + export default Comment.css \ No newline at end of file From 6762b2a2d4af3889fca16a588af3eb0faf38c722 Mon Sep 17 00:00:00 2001 From: Yoonji Lee Date: Mon, 13 Jan 2025 03:55:31 +0900 Subject: [PATCH 03/13] =?UTF-8?q?feat:=20=EB=AA=A9=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EB=A7=8C=EB=93=A4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/component/Comment/Comment.tsx | 9 --------- src/mock/mockComments.ts | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 src/mock/mockComments.ts diff --git a/src/common/component/Comment/Comment.tsx b/src/common/component/Comment/Comment.tsx index 764d5cc8..e69de29b 100644 --- a/src/common/component/Comment/Comment.tsx +++ b/src/common/component/Comment/Comment.tsx @@ -1,9 +0,0 @@ -import - -const Comment.css = () => { - return ( -
Comment.css
- ) - } - - export default Comment.css \ No newline at end of file diff --git a/src/mock/mockComments.ts b/src/mock/mockComments.ts new file mode 100644 index 00000000..6cf46965 --- /dev/null +++ b/src/mock/mockComments.ts @@ -0,0 +1,14 @@ +const mockComments = { + comments: [ + { + id: 1, + nickname: "리트리버사랑해", + breed: "골든리트리버", + petAge: 12, + content: "호흡기 문제일 수 있는데 다른 증상은 없나요?", + createdAt: "1시간전", + }, + ], +}; + +export default mockComments; From f0851af95afbf3fd9b8a48b3a78d029531c5a0f5 Mon Sep 17 00:00:00 2001 From: Yoonji Lee Date: Mon, 13 Jan 2025 23:46:59 +0900 Subject: [PATCH 04/13] =?UTF-8?q?feat:=20=EB=8C=93=EA=B8=80=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 12 ++ src/common/component/Comment/Comment.css.ts | 103 ++++++++++++++++++ src/common/component/Comment/Comment.tsx | 36 ++++++ .../component/Comment}/mock/mockComments.ts | 0 src/page/main/index/Main.tsx | 3 +- 6 files changed, 154 insertions(+), 1 deletion(-) rename src/{ => common/component/Comment}/mock/mockComments.ts (100%) diff --git a/package.json b/package.json index 511046af..5aedd3e3 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "dependencies": { "@tanstack/react-query": "^5.62.11", "@vanilla-extract/css": "^1.17.0", + "@vanilla-extract/recipes": "^0.5.5", "axios": "^1.7.9", "openapi-typescript": "^7.5.2", "react": "^18.3.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 799e7587..41e51b6d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,6 +14,9 @@ importers: '@vanilla-extract/css': specifier: ^1.17.0 version: 1.17.0 + '@vanilla-extract/recipes': + specifier: ^0.5.5 + version: 0.5.5(@vanilla-extract/css@1.17.0) axios: specifier: ^1.7.9 version: 1.7.9 @@ -971,6 +974,11 @@ packages: '@vanilla-extract/private@1.0.6': resolution: {integrity: sha512-ytsG/JLweEjw7DBuZ/0JCN4WAQgM9erfSTdS1NQY778hFQSZ6cfCDEZZ0sgVm4k54uNz6ImKB33AYvSR//fjxw==} + '@vanilla-extract/recipes@0.5.5': + resolution: {integrity: sha512-VadU7+IFUwLNLMgks29AHav/K5h7DOEfTU91RItn5vwdPfzduodNg317YbgWCcpm7FSXkuR3B3X8ZOi95UOozA==} + peerDependencies: + '@vanilla-extract/css': ^1.0.0 + '@vanilla-extract/vite-plugin@4.0.19': resolution: {integrity: sha512-NtE/sAIesCAu+6JHlanLgmfDJn/cqG8dfElfh5n1PvG2LTSMVMQhVbDefxcVhGjw1lt5QbG+u3dpZMY7KPwJhw==} peerDependencies: @@ -2364,6 +2372,10 @@ snapshots: '@vanilla-extract/private@1.0.6': {} + '@vanilla-extract/recipes@0.5.5(@vanilla-extract/css@1.17.0)': + dependencies: + '@vanilla-extract/css': 1.17.0 + '@vanilla-extract/vite-plugin@4.0.19(@types/node@22.10.5)(vite@6.0.7(@types/node@22.10.5))': dependencies: '@vanilla-extract/integration': 7.1.12(@types/node@22.10.5) diff --git a/src/common/component/Comment/Comment.css.ts b/src/common/component/Comment/Comment.css.ts index e69de29b..afdf2778 100644 --- a/src/common/component/Comment/Comment.css.ts +++ b/src/common/component/Comment/Comment.css.ts @@ -0,0 +1,103 @@ +import { style } from "@vanilla-extract/css"; +import { font, semanticColor } from "@style/styles.css"; + +export const commentContainer = style([ + { + position: "relative", + display: "flex", + flexDirection: "column", + width: "33.5rem", + padding: "8px 0px", + gap: "0.4rem", + }, +]); + +export const containerOptionsIcon = style([ + { + position: "absolute", + right: "0.8rem", + top: "0.8rem", + }, +]); + +export const commentItem = style([ + { + display: "flex", + alignItems: "flex-start", + gap: "0.4rem", + }, +]); + +export const contentContainer = style([ + { + flex: 1, + display: "flex", + flexDirection: "column", + gap: "0.4rem", + }, +]); + +export const header = style([ + { + display: "flex", + alignItems: "center", + gap: "0.8rem", + }, +]); + +export const headerInfo = style([ + { + display: "flex", + flexDirection: "column", + }, +]); + +export const nickname = style([ + font.label01, + { + fontWeight: 600, + color: semanticColor.text.assistive, + letterSpacing: "-0.024rem", + }, +]); + +export const meta = style([ + font.label01, + { + color: semanticColor.text.assistive, + fontWeight: 500, + letterSpacing: "-0.024rem", + }, +]); + +export const text = style([ + font.heading03, + { + color: semanticColor.text.normal, + fontWeight: "500", + lineHeight: "2.24rem", + letterSpacing: "-0.16rem", + padding: "0px 11px 0px 40px", + }, +]); + +export const replyContainer = style([ + { + display: "flex", + alignItems: "center", + padding: "0px 11px 0px 40px", + }, +]); + +export const replyText = style([ + font.label01, + { + color: semanticColor.text.assistiveLight, + }, +]); + +export const icon = style([ + { + gap: "0.4rem", + }, +]); diff --git a/src/common/component/Comment/Comment.tsx b/src/common/component/Comment/Comment.tsx index e69de29b..dbf10550 100644 --- a/src/common/component/Comment/Comment.tsx +++ b/src/common/component/Comment/Comment.tsx @@ -0,0 +1,36 @@ +import * as styles from "./Comment.css"; +import { Ellipse57, Message, Ellipses } from "@asset/svg"; +import mockComments from "@common/component/Comment/mock/mockComments"; + +const Comment = () => { + const { comments } = mockComments; + + return ( +
+ {comments.map((comment) => ( +
+
+
+ +
+ + {comment.nickname} + + {comment.breed}·{comment.petAge}살 · {comment.createdAt} + +
+
+

{comment.content}

+ +
+ +

답글쓰기

+
+
+
+ ))} +
+ ); +}; + +export default Comment; diff --git a/src/mock/mockComments.ts b/src/common/component/Comment/mock/mockComments.ts similarity index 100% rename from src/mock/mockComments.ts rename to src/common/component/Comment/mock/mockComments.ts diff --git a/src/page/main/index/Main.tsx b/src/page/main/index/Main.tsx index bb28eff5..9311b7a3 100644 --- a/src/page/main/index/Main.tsx +++ b/src/page/main/index/Main.tsx @@ -1,8 +1,9 @@ +import Comment from "@common/component/Comment/Comment"; /* localhost:5173/main */ const Main = () => { - return
Main
; + return ; }; export default Main; From cb5b42ec3aeba20358651114054ca4ff13766bd1 Mon Sep 17 00:00:00 2001 From: Yoonji Lee Date: Mon, 13 Jan 2025 23:53:01 +0900 Subject: [PATCH 05/13] =?UTF-8?q?main=20=EB=8F=8C=EB=A0=A4=EB=86=93?= =?UTF-8?q?=EA=B8=B0!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/main/index/Main.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/page/main/index/Main.tsx b/src/page/main/index/Main.tsx index 9311b7a3..14b22e20 100644 --- a/src/page/main/index/Main.tsx +++ b/src/page/main/index/Main.tsx @@ -1,9 +1,8 @@ -import Comment from "@common/component/Comment/Comment"; /* localhost:5173/main */ const Main = () => { - return ; + return; }; export default Main; From d98f5b7037709a1e188a980c760c05606ac9692a Mon Sep 17 00:00:00 2001 From: Yoonji Lee Date: Tue, 14 Jan 2025 03:37:33 +0900 Subject: [PATCH 06/13] =?UTF-8?q?fix:=20px=20->=20rem=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/component/Comment/Comment.css.ts | 6 +++--- src/common/component/Comment/mock/mockComments.ts | 2 ++ src/page/main/index/Main.tsx | 8 +++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/common/component/Comment/Comment.css.ts b/src/common/component/Comment/Comment.css.ts index afdf2778..bfca4a8c 100644 --- a/src/common/component/Comment/Comment.css.ts +++ b/src/common/component/Comment/Comment.css.ts @@ -7,7 +7,7 @@ export const commentContainer = style([ display: "flex", flexDirection: "column", width: "33.5rem", - padding: "8px 0px", + padding: "0.8rem 0rem", gap: "0.4rem", }, ]); @@ -77,7 +77,7 @@ export const text = style([ fontWeight: "500", lineHeight: "2.24rem", letterSpacing: "-0.16rem", - padding: "0px 11px 0px 40px", + padding: "0rem 1.1rem 0rem 4rem", }, ]); @@ -85,7 +85,7 @@ export const replyContainer = style([ { display: "flex", alignItems: "center", - padding: "0px 11px 0px 40px", + padding: "0rem 1.1rem 0rem 4rem", }, ]); diff --git a/src/common/component/Comment/mock/mockComments.ts b/src/common/component/Comment/mock/mockComments.ts index 6cf46965..c5688e6d 100644 --- a/src/common/component/Comment/mock/mockComments.ts +++ b/src/common/component/Comment/mock/mockComments.ts @@ -1,3 +1,5 @@ +/* 지워질 데이터입니당 */ + const mockComments = { comments: [ { diff --git a/src/page/main/index/Main.tsx b/src/page/main/index/Main.tsx index 14b22e20..ec317989 100644 --- a/src/page/main/index/Main.tsx +++ b/src/page/main/index/Main.tsx @@ -1,8 +1,14 @@ +import Comment from "@common/component/Comment/Comment"; + /* localhost:5173/main */ const Main = () => { - return; + return ( +
+ +
+ ); }; export default Main; From 939c726f1f42f8276736ce181c17a9461d9895ff Mon Sep 17 00:00:00 2001 From: Yoonji Lee Date: Tue, 14 Jan 2025 03:43:45 +0900 Subject: [PATCH 07/13] =?UTF-8?q?fix:=20svg=20=EC=9D=B4=EB=A6=84=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 --- public/svgs/{Ellipse 57.svg => ic_Ellipse 57.svg} | 0 public/svgs/{ellipses.svg => ic_ellipses.svg} | 0 public/svgs/{message.svg => ic_message.svg} | 0 src/asset/svg/{Ellipse57.tsx => IcEllipse57.tsx} | 5 +++-- src/asset/svg/{Ellipses.tsx => IcEllipses.tsx} | 5 +++-- src/asset/svg/{Message.tsx => IcMessage.tsx} | 5 +++-- src/asset/svg/index.ts | 6 +++--- src/common/component/Comment/Comment.tsx | 8 ++++---- 8 files changed, 16 insertions(+), 13 deletions(-) rename public/svgs/{Ellipse 57.svg => ic_Ellipse 57.svg} (100%) rename public/svgs/{ellipses.svg => ic_ellipses.svg} (100%) rename public/svgs/{message.svg => ic_message.svg} (100%) rename src/asset/svg/{Ellipse57.tsx => IcEllipse57.tsx} (63%) rename src/asset/svg/{Ellipses.tsx => IcEllipses.tsx} (78%) rename src/asset/svg/{Message.tsx => IcMessage.tsx} (86%) diff --git a/public/svgs/Ellipse 57.svg b/public/svgs/ic_Ellipse 57.svg similarity index 100% rename from public/svgs/Ellipse 57.svg rename to public/svgs/ic_Ellipse 57.svg diff --git a/public/svgs/ellipses.svg b/public/svgs/ic_ellipses.svg similarity index 100% rename from public/svgs/ellipses.svg rename to public/svgs/ic_ellipses.svg diff --git a/public/svgs/message.svg b/public/svgs/ic_message.svg similarity index 100% rename from public/svgs/message.svg rename to public/svgs/ic_message.svg diff --git a/src/asset/svg/Ellipse57.tsx b/src/asset/svg/IcEllipse57.tsx similarity index 63% rename from src/asset/svg/Ellipse57.tsx rename to src/asset/svg/IcEllipse57.tsx index 0c81e649..8800eeca 100644 --- a/src/asset/svg/Ellipse57.tsx +++ b/src/asset/svg/IcEllipse57.tsx @@ -1,5 +1,6 @@ +import * as React from "react"; import type { SVGProps } from "react"; -const SvgEllipse57 = (props: SVGProps) => ( +const SvgIcEllipse57 = (props: SVGProps) => ( ) => ( ); -export default SvgEllipse57; +export default SvgIcEllipse57; diff --git a/src/asset/svg/Ellipses.tsx b/src/asset/svg/IcEllipses.tsx similarity index 78% rename from src/asset/svg/Ellipses.tsx rename to src/asset/svg/IcEllipses.tsx index 375921bc..edac0496 100644 --- a/src/asset/svg/Ellipses.tsx +++ b/src/asset/svg/IcEllipses.tsx @@ -1,5 +1,6 @@ +import * as React from "react"; import type { SVGProps } from "react"; -const SvgEllipses = (props: SVGProps) => ( +const SvgIcEllipses = (props: SVGProps) => ( ) => ( ); -export default SvgEllipses; +export default SvgIcEllipses; diff --git a/src/asset/svg/Message.tsx b/src/asset/svg/IcMessage.tsx similarity index 86% rename from src/asset/svg/Message.tsx rename to src/asset/svg/IcMessage.tsx index 67f80eb3..0eb3b8ce 100644 --- a/src/asset/svg/Message.tsx +++ b/src/asset/svg/IcMessage.tsx @@ -1,5 +1,6 @@ +import * as React from "react"; import type { SVGProps } from "react"; -const SvgMessage = (props: SVGProps) => ( +const SvgIcMessage = (props: SVGProps) => ( ) => ( /> ); -export default SvgMessage; +export default SvgIcMessage; diff --git a/src/asset/svg/index.ts b/src/asset/svg/index.ts index aaa4c0fe..03e18588 100644 --- a/src/asset/svg/index.ts +++ b/src/asset/svg/index.ts @@ -1,6 +1,6 @@ -export { default as Ellipse57 } from "./Ellipse57"; -export { default as Ellipses } from "./Ellipses"; -export { default as Message } from "./Message"; +export { default as IcEllipse57 } from "./IcEllipse57"; +export { default as IcEllipses } from "./IcEllipses"; +export { default as IcMessage } from "./IcMessage"; export { default as Plus } from "./Plus"; export { default as React } from "./React"; export { default as Vite } from "./Vite"; diff --git a/src/common/component/Comment/Comment.tsx b/src/common/component/Comment/Comment.tsx index dbf10550..08c274e2 100644 --- a/src/common/component/Comment/Comment.tsx +++ b/src/common/component/Comment/Comment.tsx @@ -1,5 +1,5 @@ import * as styles from "./Comment.css"; -import { Ellipse57, Message, Ellipses } from "@asset/svg"; +import { IcEllipse57, IcMessage, IcEllipses } from "@asset/svg"; import mockComments from "@common/component/Comment/mock/mockComments"; const Comment = () => { @@ -11,9 +11,9 @@ const Comment = () => {
- +
- + {comment.nickname} {comment.breed}·{comment.petAge}살 · {comment.createdAt} @@ -23,7 +23,7 @@ const Comment = () => {

{comment.content}

- +

답글쓰기

From 6c73a94879924635efc9df28242226465b34ecff Mon Sep 17 00:00:00 2001 From: Yoonji Lee Date: Tue, 14 Jan 2025 04:04:03 +0900 Subject: [PATCH 08/13] =?UTF-8?q?fix:=20=EB=82=B4=EC=9A=A9=20=EB=84=98?= =?UTF-8?q?=EC=B9=98=EC=A7=80=20=EC=95=8A=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/component/Comment/Comment.css.ts | 6 +++++- src/common/component/Comment/Comment.tsx | 3 ++- src/common/component/Comment/mock/mockComments.ts | 2 +- src/page/main/index/Main.tsx | 8 +++++++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/common/component/Comment/Comment.css.ts b/src/common/component/Comment/Comment.css.ts index bfca4a8c..081fa691 100644 --- a/src/common/component/Comment/Comment.css.ts +++ b/src/common/component/Comment/Comment.css.ts @@ -12,10 +12,14 @@ export const commentContainer = style([ }, ]); +export const pStyle = style({ + padding: "0rem, 1.1rem, 0rem, 4rem", +}); + export const containerOptionsIcon = style([ { position: "absolute", - right: "0.8rem", + left: "31.1rem", top: "0.8rem", }, ]); diff --git a/src/common/component/Comment/Comment.tsx b/src/common/component/Comment/Comment.tsx index 08c274e2..aded3915 100644 --- a/src/common/component/Comment/Comment.tsx +++ b/src/common/component/Comment/Comment.tsx @@ -20,8 +20,9 @@ const Comment = () => {
+

{comment.content}

- +

답글쓰기

diff --git a/src/common/component/Comment/mock/mockComments.ts b/src/common/component/Comment/mock/mockComments.ts index c5688e6d..69f0c8be 100644 --- a/src/common/component/Comment/mock/mockComments.ts +++ b/src/common/component/Comment/mock/mockComments.ts @@ -7,7 +7,7 @@ const mockComments = { nickname: "리트리버사랑해", breed: "골든리트리버", petAge: 12, - content: "호흡기 문제일 수 있는데 다른 증상은 없나요?", + content: "호흡기 문제일 수 있는데 다른 증상은 없나요?호흡기 문제일 수 있는데 다른 증상은 없나요?호흡기 문제일 수 있는데 다른 증상은 없나요?호흡기 문제일 수 있는데 다른 증상은 없나요?호흡기 문제일 수 있는데 다른 증상은 없나요?호흡기 문제일 수 있는데 다른 증상은 없나요?", createdAt: "1시간전", }, ], diff --git a/src/page/main/index/Main.tsx b/src/page/main/index/Main.tsx index 14b22e20..ec317989 100644 --- a/src/page/main/index/Main.tsx +++ b/src/page/main/index/Main.tsx @@ -1,8 +1,14 @@ +import Comment from "@common/component/Comment/Comment"; + /* localhost:5173/main */ const Main = () => { - return; + return ( +
+ +
+ ); }; export default Main; From 6e78357d4b7e633c26e942891446b922815503d2 Mon Sep 17 00:00:00 2001 From: Yoonji Lee Date: Tue, 14 Jan 2025 05:04:43 +0900 Subject: [PATCH 09/13] =?UTF-8?q?fix:=20props,=20interface=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 32 +++++++++++++------ src/common/component/Comment/Comment.css.ts | 6 ++++ src/common/component/Comment/Comment.tsx | 23 +++++++++---- .../component/Comment/mock/mockComments.ts | 16 ---------- src/page/main/index/Main.tsx | 15 ++++++++- 6 files changed, 61 insertions(+), 32 deletions(-) delete mode 100644 src/common/component/Comment/mock/mockComments.ts diff --git a/package.json b/package.json index 42402ded..6837775e 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "@vanilla-extract/recipes": "^0.5.5", "axios": "^1.7.9", "openapi-typescript": "^7.5.2", + "prop-types": "^15.8.1", "react": "^18.3.1", "react-dom": "^18.3.1", "react-router-dom": "^7.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a903d57f..44f72bea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,6 +26,9 @@ importers: openapi-typescript: specifier: ^7.5.2 version: 7.5.2(typescript@5.6.3) + prop-types: + specifier: ^15.8.1 + version: 15.8.1 react: specifier: ^18.3.1 version: 18.3.1 @@ -985,11 +988,6 @@ packages: peerDependencies: '@vanilla-extract/css': ^1.0.0 - '@vanilla-extract/recipes@0.5.5': - resolution: {integrity: sha512-VadU7+IFUwLNLMgks29AHav/K5h7DOEfTU91RItn5vwdPfzduodNg317YbgWCcpm7FSXkuR3B3X8ZOi95UOozA==} - peerDependencies: - '@vanilla-extract/css': ^1.0.0 - '@vanilla-extract/vite-plugin@4.0.19': resolution: {integrity: sha512-NtE/sAIesCAu+6JHlanLgmfDJn/cqG8dfElfh5n1PvG2LTSMVMQhVbDefxcVhGjw1lt5QbG+u3dpZMY7KPwJhw==} peerDependencies: @@ -1385,6 +1383,10 @@ packages: nth-check@2.1.1: resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} + object-assign@4.1.1: + resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} + engines: {node: '>=0.10.0'} + once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} @@ -1444,6 +1446,9 @@ packages: engines: {node: '>=10.13.0'} hasBin: true + prop-types@15.8.1: + resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==} + proxy-from-env@1.1.0: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} @@ -1452,6 +1457,9 @@ packages: peerDependencies: react: ^18.3.1 + react-is@16.13.1: + resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} + react-router-dom@7.1.1: resolution: {integrity: sha512-vSrQHWlJ5DCfyrhgo0k6zViOe9ToK8uT5XGSmnuC2R3/g261IdIMpZVqfjD6vWSXdnf5Czs4VA/V60oVR6/jnA==} engines: {node: '>=20.0.0'} @@ -2387,10 +2395,6 @@ snapshots: '@vanilla-extract/private@1.0.6': {} - '@vanilla-extract/recipes@0.5.5(@vanilla-extract/css@1.17.0)': - dependencies: - '@vanilla-extract/css': 1.17.0 - '@vanilla-extract/recipes@0.5.5(@vanilla-extract/css@1.17.0)': dependencies: '@vanilla-extract/css': 1.17.0 @@ -2807,6 +2811,8 @@ snapshots: dependencies: boolbase: 1.0.0 + object-assign@4.1.1: {} + once@1.4.0: dependencies: wrappy: 1.0.2 @@ -2872,6 +2878,12 @@ snapshots: prettier@2.8.8: {} + prop-types@15.8.1: + dependencies: + loose-envify: 1.4.0 + object-assign: 4.1.1 + react-is: 16.13.1 + proxy-from-env@1.1.0: {} react-dom@18.3.1(react@18.3.1): @@ -2880,6 +2892,8 @@ snapshots: react: 18.3.1 scheduler: 0.23.2 + react-is@16.13.1: {} + react-router-dom@7.1.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: react: 18.3.1 diff --git a/src/common/component/Comment/Comment.css.ts b/src/common/component/Comment/Comment.css.ts index 081fa691..5a783f2e 100644 --- a/src/common/component/Comment/Comment.css.ts +++ b/src/common/component/Comment/Comment.css.ts @@ -105,3 +105,9 @@ export const icon = style([ gap: "0.4rem", }, ]); + +export const profileImage = style({ + width: "3.2rem", + height: "3.2rem", + borderRadius: "50%", +}); diff --git a/src/common/component/Comment/Comment.tsx b/src/common/component/Comment/Comment.tsx index aded3915..9bf04a33 100644 --- a/src/common/component/Comment/Comment.tsx +++ b/src/common/component/Comment/Comment.tsx @@ -1,17 +1,28 @@ import * as styles from "./Comment.css"; import { IcEllipse57, IcMessage, IcEllipses } from "@asset/svg"; -import mockComments from "@common/component/Comment/mock/mockComments"; -const Comment = () => { - const { comments } = mockComments; +interface CommentData { + id: number; + nickname: string; + breed: string; + petAge: number; + createdAt: string; + content: string; + profileImage: string; +} +interface CommentProps { + comments: CommentData[]; +} + +const Comment = ({ comments }: CommentProps) => { return (
{comments.map((comment) => (
- +
{comment.nickname} @@ -20,8 +31,8 @@ const Comment = () => {
-
-

{comment.content}

+
+

{comment.content}

diff --git a/src/common/component/Comment/mock/mockComments.ts b/src/common/component/Comment/mock/mockComments.ts deleted file mode 100644 index 69f0c8be..00000000 --- a/src/common/component/Comment/mock/mockComments.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* 지워질 데이터입니당 */ - -const mockComments = { - comments: [ - { - id: 1, - nickname: "리트리버사랑해", - breed: "골든리트리버", - petAge: 12, - content: "호흡기 문제일 수 있는데 다른 증상은 없나요?호흡기 문제일 수 있는데 다른 증상은 없나요?호흡기 문제일 수 있는데 다른 증상은 없나요?호흡기 문제일 수 있는데 다른 증상은 없나요?호흡기 문제일 수 있는데 다른 증상은 없나요?호흡기 문제일 수 있는데 다른 증상은 없나요?", - createdAt: "1시간전", - }, - ], -}; - -export default mockComments; diff --git a/src/page/main/index/Main.tsx b/src/page/main/index/Main.tsx index ec317989..a7668489 100644 --- a/src/page/main/index/Main.tsx +++ b/src/page/main/index/Main.tsx @@ -4,9 +4,22 @@ import Comment from "@common/component/Comment/Comment"; localhost:5173/main */ const Main = () => { + const mockComments = [ + { + id: 1, + nickname: "댕댕이주인", + breed: "골든리트리버", + petAge: 5, + createdAt: "2025-01-14", + content: "우리 댕댕이는 오늘도 너무 귀여워요!", + profileImage: + "data:image/jpeg;base64,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", + }, + ]; + return (
- +
); }; From 555cd9d1cc09c0ab17b8aa50dafd2e227da31092 Mon Sep 17 00:00:00 2001 From: Yoonji Lee Date: Tue, 14 Jan 2025 16:22:55 +0900 Subject: [PATCH 10/13] =?UTF-8?q?fix:=20=EB=8B=B5=EA=B8=80=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=20=EA=B0=84=EC=86=8C=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/component/Comment/Comment.css.ts | 14 +++----------- src/common/component/Comment/Comment.tsx | 5 +++-- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/common/component/Comment/Comment.css.ts b/src/common/component/Comment/Comment.css.ts index 5a783f2e..af3d2067 100644 --- a/src/common/component/Comment/Comment.css.ts +++ b/src/common/component/Comment/Comment.css.ts @@ -90,19 +90,11 @@ export const replyContainer = style([ display: "flex", alignItems: "center", padding: "0rem 1.1rem 0rem 4rem", + gap: "0.4rem", }, -]); - -export const replyText = style([ - font.label01, - { - color: semanticColor.text.assistiveLight, - }, -]); - -export const icon = style([ + font.label01, { - gap: "0.4rem", + color: semanticColor.text.assistiveLight, }, ]); diff --git a/src/common/component/Comment/Comment.tsx b/src/common/component/Comment/Comment.tsx index 9bf04a33..a7d98d50 100644 --- a/src/common/component/Comment/Comment.tsx +++ b/src/common/component/Comment/Comment.tsx @@ -35,8 +35,8 @@ const Comment = ({ comments }: CommentProps) => {

{comment.content}

- -

답글쓰기

+ +

답글쓰기

@@ -44,5 +44,6 @@ const Comment = ({ comments }: CommentProps) => {
); }; +``; export default Comment; From 1784d8ddf9aedac9bb2d8a70e1bcef4a22deb83d Mon Sep 17 00:00:00 2001 From: Yoonji Lee Date: Tue, 14 Jan 2025 16:38:32 +0900 Subject: [PATCH 11/13] =?UTF-8?q?fix:=20text=20=EC=8A=A4=ED=83=80=EC=9D=BC?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/component/Comment/Comment.css.ts | 10 +++------- src/common/component/Comment/Comment.tsx | 6 +++--- src/page/main/index/Main.tsx | 3 ++- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/common/component/Comment/Comment.css.ts b/src/common/component/Comment/Comment.css.ts index af3d2067..646b0a07 100644 --- a/src/common/component/Comment/Comment.css.ts +++ b/src/common/component/Comment/Comment.css.ts @@ -12,10 +12,6 @@ export const commentContainer = style([ }, ]); -export const pStyle = style({ - padding: "0rem, 1.1rem, 0rem, 4rem", -}); - export const containerOptionsIcon = style([ { position: "absolute", @@ -90,11 +86,11 @@ export const replyContainer = style([ display: "flex", alignItems: "center", padding: "0rem 1.1rem 0rem 4rem", - gap: "0.4rem", + gap: "0.4rem", }, - font.label01, + font.label01, { - color: semanticColor.text.assistiveLight, + color: semanticColor.text.assistiveLight, }, ]); diff --git a/src/common/component/Comment/Comment.tsx b/src/common/component/Comment/Comment.tsx index a7d98d50..bdeb07e9 100644 --- a/src/common/component/Comment/Comment.tsx +++ b/src/common/component/Comment/Comment.tsx @@ -31,9 +31,9 @@ const Comment = ({ comments }: CommentProps) => {
-
-

{comment.content}

-
+ +

{comment.content}

+

답글쓰기

diff --git a/src/page/main/index/Main.tsx b/src/page/main/index/Main.tsx index a7668489..2686e0bc 100644 --- a/src/page/main/index/Main.tsx +++ b/src/page/main/index/Main.tsx @@ -11,7 +11,8 @@ const Main = () => { breed: "골든리트리버", petAge: 5, createdAt: "2025-01-14", - content: "우리 댕댕이는 오늘도 너무 귀여워요!", + content: + "우리 댕댕이는 오늘도 너무 귀여워요!귀여워요!귀여워요!귀여워요!귀여워요!귀여워요!귀여워요!귀여워요!귀여워요!", profileImage: "data:image/jpeg;base64,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", }, From 08adcce8543344b46fc9adda5a089bf4ae8c28be Mon Sep 17 00:00:00 2001 From: kong Date: Tue, 14 Jan 2025 17:53:33 +0900 Subject: [PATCH 12/13] =?UTF-8?q?fix:=20=EC=B6=A9=EB=8F=8C=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pnpm-lock.yaml | 9 --------- src/page/main/index/Main.tsx | 8 +++++++- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7c326213..0c194a4f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -988,11 +988,6 @@ packages: peerDependencies: '@vanilla-extract/css': ^1.0.0 - '@vanilla-extract/recipes@0.5.5': - resolution: {integrity: sha512-VadU7+IFUwLNLMgks29AHav/K5h7DOEfTU91RItn5vwdPfzduodNg317YbgWCcpm7FSXkuR3B3X8ZOi95UOozA==} - peerDependencies: - '@vanilla-extract/css': ^1.0.0 - '@vanilla-extract/vite-plugin@4.0.19': resolution: {integrity: sha512-NtE/sAIesCAu+6JHlanLgmfDJn/cqG8dfElfh5n1PvG2LTSMVMQhVbDefxcVhGjw1lt5QbG+u3dpZMY7KPwJhw==} peerDependencies: @@ -2394,10 +2389,6 @@ snapshots: '@vanilla-extract/private@1.0.6': {} - '@vanilla-extract/recipes@0.5.5(@vanilla-extract/css@1.17.0)': - dependencies: - '@vanilla-extract/css': 1.17.0 - '@vanilla-extract/recipes@0.5.5(@vanilla-extract/css@1.17.0)': dependencies: '@vanilla-extract/css': 1.17.0 diff --git a/src/page/main/index/Main.tsx b/src/page/main/index/Main.tsx index ece5bdf4..172daadb 100644 --- a/src/page/main/index/Main.tsx +++ b/src/page/main/index/Main.tsx @@ -1,7 +1,13 @@ +import Comment from "@common/component/Comment/Comment"; import Nav from "@common/component/Nav/Nav"; const Main = () => { - return