diff --git a/app/src/components/ui/collaboration/CommentThreads.tsx b/app/src/components/ui/collaboration/CommentThreads.tsx index 50b226e..2d41abc 100644 --- a/app/src/components/ui/collaboration/CommentThreads.tsx +++ b/app/src/components/ui/collaboration/CommentThreads.tsx @@ -3,16 +3,23 @@ import { getAvatarColor } from "../../../modules/collaboration/functions/getAvat const CommentThreads: React.FC = () => { const [expand, setExpand] = useState(false); - const commentsedUsers = [ - { - userId: "1", - userName: "user", - }, - { - userId: "2", - userName: "Admin", - }, - ]; + const commentsedUsers = [{ creatorId: "1" }]; + + const CommentDetails = { + state: "active", + commentId: "c-1", + creatorId: "12", + createdAt: "2 hours ago", + comment: "Thread check", + lastUpdatedAt: "string", + replies: [], + }; + + function getUsername(userId: string) { + console.log(userId); + const UserName = "username"; + return UserName; + } function getDetails(type?: "clicked") { if (type === "clicked") { @@ -36,20 +43,26 @@ const CommentThreads: React.FC = () => { {commentsedUsers.map((val, i) => (
- {val.userName[0]} + {getUsername(val.creatorId)[0]}
))}
-
user
-
4 mins, ago
+
+ {getUsername(CommentDetails.creatorId)} +
+
{CommentDetails.createdAt}
-
hello
-
0 replies
+
{CommentDetails.comment}
+ {CommentDetails.replies.length > 0 && ( +
{CommentDetails.replies.length}
+ )}
diff --git a/app/src/styles/scene/comments.scss b/app/src/styles/scene/comments.scss index 84675c6..02ff683 100644 --- a/app/src/styles/scene/comments.scss +++ b/app/src/styles/scene/comments.scss @@ -1,22 +1,22 @@ @use "../abstracts/variables" as *; @use "../abstracts/mixins" as *; -.comments-main-wrapper{ +.comments-main-wrapper { position: relative; } + .comments-threads-wrapper { position: absolute; top: 0; left: 0; padding: 4px; background: var(--background-color); - border-radius: #{$border-radius-large} #{$border-radius-large} #{$border-radius-large} + border-radius: #{$border-radius-extra-large} #{$border-radius-extra-large} #{$border-radius-extra-large} 0; backdrop-filter: blur(12px); z-index: 1000; transform: translateY(-100%); outline: 1px solid var(--border-color); - transition: all 0.2s ease-out; .comments-threads-container { display: flex; align-items: start; @@ -36,7 +36,7 @@ align-items: start; flex-direction: column; overflow: hidden; - transition: all 0.2s; + transition: all 0.2s ease-in; .header { @include flex-center; gap: 10px; diff --git a/app/src/types/collaborationTypes.d.ts b/app/src/types/collaborationTypes.d.ts index 445949a..26295d5 100644 --- a/app/src/types/collaborationTypes.d.ts +++ b/app/src/types/collaborationTypes.d.ts @@ -10,7 +10,7 @@ interface CommentSchema { replies: Reply[]; } -interface Reply { +export interface Reply { replyId: string; creatorId: string; createdAt: string; @@ -18,4 +18,4 @@ interface Reply { reply: string; } -type CommentsSchema = CommentSchema[]; \ No newline at end of file +type CommentsSchema = CommentSchema[];