From 5d1da060d3d219a7b0761ed59c8ce9aead041a9b Mon Sep 17 00:00:00 2001 From: chloe_choi Date: Fri, 14 Feb 2025 15:24:39 +0900 Subject: [PATCH 1/3] FLOW-14 feat: message component added, component folder revised --- src/components/.gitkeep | 0 .../.gitkeep => components/chat/Message.tsx} | 0 .../.gitkeep => components/chat/Reply.tsx} | 0 src/components/{ => shared}/Button.tsx | 0 src/components/{ => shared}/Checkbox.tsx | 0 src/components/{ => shared}/DropDown.tsx | 0 src/components/{ => user}/LoginLabel.tsx | 0 src/components/{ => user}/LoginTextInput.tsx | 0 tailwind.config.js | 63 +++++++++++++++---- 9 files changed, 50 insertions(+), 13 deletions(-) delete mode 100644 src/components/.gitkeep rename src/{api/.gitkeep => components/chat/Message.tsx} (100%) rename src/{assets/.gitkeep => components/chat/Reply.tsx} (100%) rename src/components/{ => shared}/Button.tsx (100%) rename src/components/{ => shared}/Checkbox.tsx (100%) rename src/components/{ => shared}/DropDown.tsx (100%) rename src/components/{ => user}/LoginLabel.tsx (100%) rename src/components/{ => user}/LoginTextInput.tsx (100%) diff --git a/src/components/.gitkeep b/src/components/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/api/.gitkeep b/src/components/chat/Message.tsx similarity index 100% rename from src/api/.gitkeep rename to src/components/chat/Message.tsx diff --git a/src/assets/.gitkeep b/src/components/chat/Reply.tsx similarity index 100% rename from src/assets/.gitkeep rename to src/components/chat/Reply.tsx diff --git a/src/components/Button.tsx b/src/components/shared/Button.tsx similarity index 100% rename from src/components/Button.tsx rename to src/components/shared/Button.tsx diff --git a/src/components/Checkbox.tsx b/src/components/shared/Checkbox.tsx similarity index 100% rename from src/components/Checkbox.tsx rename to src/components/shared/Checkbox.tsx diff --git a/src/components/DropDown.tsx b/src/components/shared/DropDown.tsx similarity index 100% rename from src/components/DropDown.tsx rename to src/components/shared/DropDown.tsx diff --git a/src/components/LoginLabel.tsx b/src/components/user/LoginLabel.tsx similarity index 100% rename from src/components/LoginLabel.tsx rename to src/components/user/LoginLabel.tsx diff --git a/src/components/LoginTextInput.tsx b/src/components/user/LoginTextInput.tsx similarity index 100% rename from src/components/LoginTextInput.tsx rename to src/components/user/LoginTextInput.tsx diff --git a/tailwind.config.js b/tailwind.config.js index e9e5aa2..3676c4d 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -7,12 +7,49 @@ export default { './src/App.tsx', ], theme: { - fontSize: { - lg: '16px', - base: '14px', - sm: '12px', - }, extend: { + fontFamily: { + sans: ["gg sans", "sans-serif"], + display: ["ABC Ginto Nord Trial", "sans-serif"], + regular: ['gg sans Regular', 'sans-serif'], + bold: ['gg sans Bold', 'sans-serif'], + medium: ['gg sans Medium', 'sans-serif'], + semibold: ['gg sans Semibold', 'sans-serif'], + kr: ['NotoSansKR-VariableFont_wght', 'sans-serif'], + }, + fontSize: { + "heading-sm": "0.875rem", // 14px + "heading-md": "1rem", // 16px + "heading-lg": "1.25rem", // 20px + "heading-xl": "1.5rem", // 24px + "heading-xxl": "2rem", // 32px + "text-xxs": "0.625rem", // 10px + "text-xs": "0.75rem", // 12px + "text-sm": "0.875rem", // 14px + "text-md": "1rem", // 16px + "text-lg": "1.25rem", // 20px + "display-sm": "1.5rem", // 24px + "display-md": "2.125rem", // 34px + "display-lg": "2.75rem", // 44px + lg: '16px', + base: '14px', + sm: '12px', + }, + fontWeight: { + normal: "400", + medium: "500", + semibold: "600", + bold: "700", + extrabold: "800", + black: "900", + }, + lineHeight: { + none: "1", + tight: "1.1", + snug: "1.2", + normal: "1.5", + relaxed: "1.75", + }, colors: { 'wrapper': '#313338', 'sidebar': '#2E3036', @@ -21,13 +58,13 @@ export default { 'des': '#DCDDDE', 'primary': '#5865F2', 'panel': '#292b2f', - }, - fontFamily: { - regular: ['gg sans Regular', 'sans-serif'], - bold: ['gg sans Bold', 'sans-serif'], - medium: ['gg sans Medium', 'sans-serif'], - semibold: ['gg sans Semibold', 'sans-serif'], - kr: ['NotoSansKR-VariableFont_wght', 'sans-serif'], + 'blurple': '#5865F2', // CMYK 80, 60, 0, 0 + 'green': '#57F287', // CMYK 50, 0, 55, 0 + 'yellow': '#FEE75C', // CMYK 0, 5, 80, 0 + 'fuchsia': '#EB459E', // CMYK 0, 90, 0, 0 + 'red': '#ED4245', // CMYK 0, 90, 65, 0 + 'white': '#FFFFFF', // CMYK 0, 0, 0, 0 + 'black': '#000000', // CMYK 35, 0, 0, 100 }, width: { 'wrapper': '72px', @@ -37,4 +74,4 @@ export default { }, }, plugins: [], -} +}; \ No newline at end of file From 46e511baaf0f9e2b16d76a21a0f97d19a791bf02 Mon Sep 17 00:00:00 2001 From: Choi Seung-eun <138289674+xeunnie@users.noreply.github.com> Date: Fri, 14 Feb 2025 15:54:13 +0900 Subject: [PATCH 2/3] FLOW-14 feat: message component added, component folder revised --- src/components/chat/Message.tsx | 66 +++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/src/components/chat/Message.tsx b/src/components/chat/Message.tsx index e69de29..f4ce8c9 100644 --- a/src/components/chat/Message.tsx +++ b/src/components/chat/Message.tsx @@ -0,0 +1,66 @@ +import React from 'react'; + +type AvatarProps = { + imageUrl: string; + altText: string; +}; + +const Avatar: React.FC = ({ imageUrl, altText }) => { + return ( +
+
+ {altText} +
+ ); +}; + +type MessageHeaderProps = { + username: string; + timestamp: string; +}; + +const MessageHeader: React.FC = ({ username, timestamp }) => { + return ( +
+
{username}
+
{timestamp}
+
+ ); +}; + +type MessageContentProps = { + content: string; +}; + +const MessageContent: React.FC = ({ content }) => { + return ( +
+
{content}
+
+ ); +}; + +type MessageProps = { + avatarUrl: string; + username: string; + timestamp: string; + content: string; +}; + +const Message: React.FC = ({ avatarUrl, username, timestamp, content }) => { + return ( +
+ +
+ + +
+
+ ); +}; + +export default Message; From f462825eb84e0eabfa48afa33b7f325a83977ef9 Mon Sep 17 00:00:00 2001 From: Choi Seung-eun <138289674+xeunnie@users.noreply.github.com> Date: Fri, 14 Feb 2025 15:56:37 +0900 Subject: [PATCH 3/3] FLOW-14 feat: message component added, component folder revised --- src/components/chat/Reply.tsx | 58 +++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/src/components/chat/Reply.tsx b/src/components/chat/Reply.tsx index e69de29..30529a3 100644 --- a/src/components/chat/Reply.tsx +++ b/src/components/chat/Reply.tsx @@ -0,0 +1,58 @@ +import React from 'react'; + +const MentionIcon: React.FC = () => { + return ( + + + + ); +}; + +type MentionAvatarProps = { + avatarUrl: string; +}; + +const MentionAvatar: React.FC = ({ avatarUrl }) => { + return ( +
+
+ Mention avatar +
+ ); +}; + +type MentionTextProps = { + username: string; + message: string; +}; + +const MentionText: React.FC = ({ username, message }) => { + return ( +
+
@{username}
+
{message}
+
+ ); +}; + +type MentionMessageProps = { + avatarUrl: string; + username: string; + message: string; +}; + +const MentionMessage: React.FC = ({ avatarUrl, username, message }) => { + return ( +
+
+ +
+
+ + +
+
+ ); +}; + +export default MentionMessage;