From 2c56480621936949ace9d2868201530bc91b2688 Mon Sep 17 00:00:00 2001 From: BFlat Date: Sun, 19 Mar 2023 12:16:01 +0700 Subject: [PATCH 01/12] comments update --- .../fakeyou.com/src/scss/site-refresh.scss | 24 ++++++++ .../v2/view/_common/comments/CommentList.tsx | 46 +++++++-------- .../_common/comments/CreateCommentForm.tsx | 59 ++++++++++++------- .../comments/SafeDeleteCommentButton.tsx | 48 ++++++++------- .../profile/profile_view/ProfilePage.tsx | 12 ++-- 5 files changed, 116 insertions(+), 73 deletions(-) diff --git a/packages/fakeyou.com/src/scss/site-refresh.scss b/packages/fakeyou.com/src/scss/site-refresh.scss index a60e013237..0a01541688 100644 --- a/packages/fakeyou.com/src/scss/site-refresh.scss +++ b/packages/fakeyou.com/src/scss/site-refresh.scss @@ -1029,6 +1029,30 @@ styles with important tags: .textarea-comment { resize: none; + overflow-x: none; + } + + .btn-comment { + padding: 6px 14px; + font-size: 14px; + } + + .btn-link-white { + color: $white; + opacity: 0.75; + + &:hover { + color: $white; + opacity: 0.5; + } + } + + .btn-link-small { + font-size: 14px; + } + + .comment-time { + font-size: 14px; } } diff --git a/packages/fakeyou.com/src/v2/view/_common/comments/CommentList.tsx b/packages/fakeyou.com/src/v2/view/_common/comments/CommentList.tsx index e2667b4cad..977e517d2c 100644 --- a/packages/fakeyou.com/src/v2/view/_common/comments/CommentList.tsx +++ b/packages/fakeyou.com/src/v2/view/_common/comments/CommentList.tsx @@ -1,12 +1,10 @@ import React from "react"; import { formatDistance } from "date-fns"; -import { - Comment, -} from "@storyteller/components/src/api/comments/ListComments"; +import { Comment } from "@storyteller/components/src/api/comments/ListComments"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { SafeDeleteCommentButton } from "./SafeDeleteCommentButton"; - -const Fade = require("react-reveal/Fade"); +import { motion } from "framer-motion"; +import { container, item } from "../../../../data/animation"; interface Props { entityType: string; @@ -17,13 +15,12 @@ interface Props { } /** - * This is part of a reusable component for putting comments on several + * This is part of a reusable component for putting comments on several * different page types. * * See the documentation on the parent */ function CommentList(props: Props) { - // NB: It's more convenient to show recent data first {.reverse()} var reversedComments = props.comments.slice(); @@ -37,9 +34,9 @@ function CommentList(props: Props) { addSuffix: true, }); - // TODO: We'll soon add backend support for a third party that can delete - // comments - the person that owns the thing the comment is attached to. - // We want profile / model / result owner to be able to clear harassing + // TODO: We'll soon add backend support for a third party that can delete + // comments - the person that owns the thing the comment is attached to. + // We want profile / model / result owner to be able to clear harassing // comments themselves. This isn't ready yet, though. const isAuthor = props.sessionWrapper.userTokenMatches(comment.user_token); const isModerator = props.sessionWrapper.canBanUsers(); @@ -54,19 +51,23 @@ function CommentList(props: Props) { loadComments={props.loadComments} /> - ) + ); } rows.push( - + -
-
+
+
{comment.user_display_name} - · - {relativeCreateTime} + · + + {relativeCreateTime} + + · + {maybeDeleteButton}
{/* It's okay to set "dangerous" html here as the server safely created @@ -75,26 +76,23 @@ function CommentList(props: Props) { is safe from the backend engineers. */}
- {maybeDeleteButton}
- + ); }); return ( -
+ - - {rows} - + {rows}
-
+ ); } diff --git a/packages/fakeyou.com/src/v2/view/_common/comments/CreateCommentForm.tsx b/packages/fakeyou.com/src/v2/view/_common/comments/CreateCommentForm.tsx index 90dda1cd36..6722a0923b 100644 --- a/packages/fakeyou.com/src/v2/view/_common/comments/CreateCommentForm.tsx +++ b/packages/fakeyou.com/src/v2/view/_common/comments/CreateCommentForm.tsx @@ -5,6 +5,7 @@ import { } from "@storyteller/components/src/api/comments/CreateComment"; import { v4 as uuidv4 } from "uuid"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; +import { Gravatar } from "@storyteller/components/src/elements/Gravatar"; interface Props { entityType: string; @@ -14,13 +15,13 @@ interface Props { } /** - * This is part of a reusable component for putting comments on several + * This is part of a reusable component for putting comments on several * different page types. * * See the documentation on the parent */ function CreateCommentForm(props: Props) { - const {entityType, entityToken, loadComments} = props; + const { entityType, entityToken, loadComments } = props; const [commentMarkdown, setCommentMarkdown] = useState(""); const [uuidIdempotencyToken, setUuidIdempotencyToken] = useState( @@ -67,21 +68,35 @@ function CreateCommentForm(props: Props) { } postComment(); + const form = ev.target; + form.reset(); + setButtonVisible(false); return false; }; - const handleKeyDown = (event: React.KeyboardEvent) => { - if (event.key === "Enter") { - event.preventDefault(); + const handleKeyDown = (ev: React.KeyboardEvent) => { + if (ev.key === "Enter") { + ev.preventDefault(); } }; + let gravatarHash = props.sessionWrapper.getEmailGravatarHash(); + let gravatar = ; + if (gravatarHash !== undefined) { + gravatar = ; + } + let commentButton = <>; if (buttonVisible) { commentButton = ( - +
+ + +
); } @@ -97,19 +112,23 @@ function CreateCommentForm(props: Props) { ); if (props.sessionWrapper.isLoggedIn()) { createCommentComponent = ( -
-
-
- + +
+
+ {gravatar} +
+ +
+ {commentButton}
diff --git a/packages/fakeyou.com/src/v2/view/_common/comments/SafeDeleteCommentButton.tsx b/packages/fakeyou.com/src/v2/view/_common/comments/SafeDeleteCommentButton.tsx index f90e0ff3b4..91c580f9cb 100644 --- a/packages/fakeyou.com/src/v2/view/_common/comments/SafeDeleteCommentButton.tsx +++ b/packages/fakeyou.com/src/v2/view/_common/comments/SafeDeleteCommentButton.tsx @@ -1,7 +1,10 @@ import React, { useState } from "react"; -import { DeleteComment, DeleteCommentIsOk } from "@storyteller/components/src/api/comments/DeleteComment"; +import { + DeleteComment, + DeleteCommentIsOk, +} from "@storyteller/components/src/api/comments/DeleteComment"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { faTrash, faTrashRestore } from "@fortawesome/free-solid-svg-icons"; +import { faTrash } from "@fortawesome/free-solid-svg-icons"; import { faTrashCheck } from "@fortawesome/pro-solid-svg-icons"; interface Props { @@ -10,7 +13,7 @@ interface Props { } /** - * This is part of a reusable component for putting comments on several + * This is part of a reusable component for putting comments on several * different page types. * * See the documentation on the parent @@ -27,41 +30,42 @@ function SafeDeleteCommentButton(props: Props) { let deleteButton = <>; - // We ask the user to confirm the deletion. + // We ask the user to confirm the deletion. // This makes it slightly safer and prevents accidental mis-clicks. if (!readyToDelete) { deleteButton = ( <> - - ) + ); } else { deleteButton = ( <> - - - ) + ); } - return ( - <> - {deleteButton} - - ) + return <>{deleteButton}; } export { SafeDeleteCommentButton }; diff --git a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/ProfilePage.tsx b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/ProfilePage.tsx index dbc9211a30..232091d29a 100644 --- a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/ProfilePage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/ProfilePage.tsx @@ -535,13 +535,11 @@ function ProfilePage(this: any, props: Props) { role="tabpanel" aria-labelledby="comments-tab" > -
- -
+
From 99361bdce5c1b0d25495b8895a31390bd1118d37 Mon Sep 17 00:00:00 2001 From: BFlat Date: Sun, 19 Mar 2023 12:23:20 +0700 Subject: [PATCH 02/12] delete button styling fixes --- .../src/v2/view/_common/comments/SafeDeleteCommentButton.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/fakeyou.com/src/v2/view/_common/comments/SafeDeleteCommentButton.tsx b/packages/fakeyou.com/src/v2/view/_common/comments/SafeDeleteCommentButton.tsx index 91c580f9cb..dabf999779 100644 --- a/packages/fakeyou.com/src/v2/view/_common/comments/SafeDeleteCommentButton.tsx +++ b/packages/fakeyou.com/src/v2/view/_common/comments/SafeDeleteCommentButton.tsx @@ -39,7 +39,6 @@ function SafeDeleteCommentButton(props: Props) { onClick={() => setReadyToDelete(true)} className="btn-link btn-link-small p-0 fw-medium" > - Delete From b5b45273f7b1bca8b33f68d2f97d08f0e9f1fea2 Mon Sep 17 00:00:00 2001 From: BFlat Date: Sun, 19 Mar 2023 13:41:05 +0700 Subject: [PATCH 03/12] gravatar border --- packages/components/src/elements/Gravatar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/elements/Gravatar.tsx b/packages/components/src/elements/Gravatar.tsx index 79bd318a52..10c0b78758 100644 --- a/packages/components/src/elements/Gravatar.tsx +++ b/packages/components/src/elements/Gravatar.tsx @@ -16,7 +16,7 @@ function Gravatar(props: Props) { return ( {altText} From d4b029d35739ff7fd5d0318490d49796652b6b59 Mon Sep 17 00:00:00 2001 From: BFlat Date: Sun, 19 Mar 2023 13:41:11 +0700 Subject: [PATCH 04/12] cancel button --- .../view/_common/comments/CreateCommentForm.tsx | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/fakeyou.com/src/v2/view/_common/comments/CreateCommentForm.tsx b/packages/fakeyou.com/src/v2/view/_common/comments/CreateCommentForm.tsx index 6722a0923b..ec271c1a1d 100644 --- a/packages/fakeyou.com/src/v2/view/_common/comments/CreateCommentForm.tsx +++ b/packages/fakeyou.com/src/v2/view/_common/comments/CreateCommentForm.tsx @@ -80,6 +80,15 @@ function CreateCommentForm(props: Props) { } }; + const handleCancelButton = (ev: any) => { + ev.preventDefault(); + const commentTextArea = document.getElementById( + "comment-textarea" + ) as HTMLTextAreaElement; + commentTextArea.value = ""; + setButtonVisible(false); + }; + let gravatarHash = props.sessionWrapper.getEmailGravatarHash(); let gravatar = ; if (gravatarHash !== undefined) { @@ -90,7 +99,11 @@ function CreateCommentForm(props: Props) { if (buttonVisible) { commentButton = (
-