diff --git a/packages/components/src/elements/Gravatar.tsx b/packages/components/src/elements/Gravatar.tsx index 79bd318a52..6e7bf3f586 100644 --- a/packages/components/src/elements/Gravatar.tsx +++ b/packages/components/src/elements/Gravatar.tsx @@ -7,7 +7,7 @@ interface Props { } function Gravatar(props: Props) { - const gravatarUrl = `https://www.gravatar.com/avatar/${props.email_hash}?s=${props.size}`; + const gravatarUrl = `https://www.gravatar.com/avatar/${props.email_hash}?s=${props.size}&d=https://fakeyou.com/images/avatars/default-pfp.png`; let altText = "gravatar"; if (props.username !== undefined) { @@ -16,9 +16,11 @@ function Gravatar(props: Props) { return ( {altText} ); } diff --git a/packages/fakeyou.com/public/images/default-pfp.png b/packages/fakeyou.com/public/images/default-pfp.png new file mode 100644 index 0000000000..efbe57fced Binary files /dev/null and b/packages/fakeyou.com/public/images/default-pfp.png differ diff --git a/packages/fakeyou.com/src/scss/site-refresh.scss b/packages/fakeyou.com/src/scss/site-refresh.scss index a60e013237..ae3e512a78 100644 --- a/packages/fakeyou.com/src/scss/site-refresh.scss +++ b/packages/fakeyou.com/src/scss/site-refresh.scss @@ -1029,6 +1029,34 @@ styles with important tags: .textarea-comment { resize: none; + overflow-x: none; + } + + .btn-comment { + padding: 8px 20px; + 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; + } + + .gravatar-img { + pointer-events: none; } } diff --git a/packages/fakeyou.com/src/v2/view/_common/comments/CommentComponent.tsx b/packages/fakeyou.com/src/v2/view/_common/comments/CommentComponent.tsx index 189931cf4e..df52f0b593 100644 --- a/packages/fakeyou.com/src/v2/view/_common/comments/CommentComponent.tsx +++ b/packages/fakeyou.com/src/v2/view/_common/comments/CommentComponent.tsx @@ -41,7 +41,7 @@ function CommentComponent(props: Props) { }, [loadComments]); return ( -
+
*/ function CommentList(props: Props) { - // NB: It's more convenient to show recent data first {.reverse()} var reversedComments = props.comments.slice(); @@ -37,9 +36,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(); @@ -49,52 +48,62 @@ function CommentList(props: Props) { if (canDelete) { maybeDeleteButton = ( <> + · - ) + ); } + let profileLink = `/profile/${comment.username}`; + rows.push( - - -
+ + +
+
- - {comment.user_display_name} - - · - {relativeCreateTime} -
- {/* +
+ + {comment.user_display_name} + + · + + {relativeCreateTime} + + + {maybeDeleteButton} +
+ {/* It's okay to set "dangerous" html here as the server safely created it from markdown and shields against user injection attempts. Don't do this with other server data, though, unless you know that field 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..0e77627fc1 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,48 @@ 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(); } }; + 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) { + gravatar = ; + } + let commentButton = <>; if (buttonVisible) { commentButton = ( - +
+ + +
); } @@ -98,18 +126,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..a0e830f889 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,9 @@ 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 { faTrashCheck } from "@fortawesome/pro-solid-svg-icons"; interface Props { @@ -10,7 +12,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 +29,41 @@ 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/firehose/FirehoseEventListPage.tsx b/packages/fakeyou.com/src/v2/view/pages/firehose/FirehoseEventListPage.tsx index 533500d4f4..a4f743372f 100644 --- a/packages/fakeyou.com/src/v2/view/pages/firehose/FirehoseEventListPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/firehose/FirehoseEventListPage.tsx @@ -106,18 +106,20 @@ function FirehoseEventListPage(props: Props) { let link = `/profile/${event.maybe_target_username}`; userLink = {event.maybe_target_display_name}; gravatar = ( - +
+ +
); } switch (event.event_type) { case "user_sign_up": inner = ( - + {gravatar}   @@ -128,7 +130,7 @@ function FirehoseEventListPage(props: Props) { break; case "user_badge_granted": inner = ( - + {gravatar}   @@ -139,7 +141,7 @@ function FirehoseEventListPage(props: Props) { break; case "tts_model_upload_started": inner = ( - + {gravatar}   @@ -150,7 +152,7 @@ function FirehoseEventListPage(props: Props) { break; case "tts_model_upload_completed": inner = ( - + {gravatar}   @@ -161,7 +163,7 @@ function FirehoseEventListPage(props: Props) { break; case "tts_inference_started": inner = ( - + {gravatar}   @@ -172,7 +174,7 @@ function FirehoseEventListPage(props: Props) { break; case "tts_inference_completed": inner = ( - + {gravatar}   @@ -183,7 +185,7 @@ function FirehoseEventListPage(props: Props) { break; case "w2l_template_upload_started": inner = ( - + {gravatar}   @@ -194,7 +196,7 @@ function FirehoseEventListPage(props: Props) { break; case "w2l_template_upload_completed": inner = ( - + {gravatar}   @@ -205,7 +207,7 @@ function FirehoseEventListPage(props: Props) { break; case "w2l_inference_started": inner = ( - + {gravatar}   @@ -216,7 +218,7 @@ function FirehoseEventListPage(props: Props) { break; case "w2l_inference_completed": inner = ( - + {gravatar}   @@ -227,7 +229,7 @@ function FirehoseEventListPage(props: Props) { break; case "twitter_mention": inner = ( - + {gravatar}   @@ -238,7 +240,7 @@ function FirehoseEventListPage(props: Props) { break; case "twitter_retweet": inner = ( - + {gravatar}   @@ -249,7 +251,7 @@ function FirehoseEventListPage(props: Props) { break; case "discord_join": inner = ( - + {gravatar}   @@ -260,7 +262,7 @@ function FirehoseEventListPage(props: Props) { break; case "discord_message": inner = ( - + {gravatar}   @@ -271,7 +273,7 @@ function FirehoseEventListPage(props: Props) { break; case "twitch_subscribe": inner = ( - + {gravatar}   @@ -282,7 +284,7 @@ function FirehoseEventListPage(props: Props) { break; case "twitch_follow": inner = ( - + {gravatar}   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..06b2e78c81 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,7 +535,7 @@ function ProfilePage(this: any, props: Props) { role="tabpanel" aria-labelledby="comments-tab" > -
+
Use global m-factor? (default no) - {ttsModel?.maybe_moderator_fields?.use_default_m_factor ? "yes" : "no"} + + {ttsModel?.maybe_moderator_fields?.use_default_m_factor + ? "yes" + : "no"} + Custom m-factor (optional) - {ttsModel?.maybe_moderator_fields?.maybe_custom_m_factor} + + {ttsModel?.maybe_moderator_fields?.maybe_custom_m_factor} + @@ -666,11 +673,11 @@ function TtsModelViewPage(props: Props) { let ratingButtons = <>; if (props.sessionWrapper.isLoggedIn()) { ratingButtons = ( - - ) + ); } // NB: Investors might not like the in-your-face "over 1 year ago" dates. @@ -690,10 +697,9 @@ function TtsModelViewPage(props: Props) { -
@@ -815,6 +821,19 @@ function TtsModelViewPage(props: Props) { + +
+

Comments

+
+ +
+
+
+

diff --git a/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_view/TtsResultViewPage.tsx b/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_view/TtsResultViewPage.tsx index f639cf9f37..9ef12c106c 100644 --- a/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_view/TtsResultViewPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/tts/tts_result_view/TtsResultViewPage.tsx @@ -40,6 +40,7 @@ import { import { BackLink } from "../../../_common/BackLink"; import { TextExpander } from "../../../_common/TextExpander"; import { usePrefixedDocumentTitle } from "../../../../../common/UsePrefixedDocumentTitle"; +import { CommentComponent } from "../../../_common/comments/CommentComponent"; interface Props { sessionWrapper: SessionWrapper; @@ -595,10 +596,24 @@ function TtsResultViewPage(props: Props) { + + + +
+

Comments

+
+ +
+
+
); } diff --git a/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_view/W2lResultViewPage.tsx b/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_view/W2lResultViewPage.tsx index e09382fc69..1cb84941ec 100644 --- a/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_view/W2lResultViewPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_result_view/W2lResultViewPage.tsx @@ -20,6 +20,7 @@ import { faDownload, faEdit, faTrash } from "@fortawesome/free-solid-svg-icons"; import { motion } from "framer-motion"; import { container, item, panel } from "../../../../../data/animation"; import { usePrefixedDocumentTitle } from "../../../../../common/UsePrefixedDocumentTitle"; +import { CommentComponent } from "../../../_common/comments/CommentComponent"; interface Props { sessionWrapper: SessionWrapper; @@ -50,9 +51,10 @@ function W2lResultViewPage(props: Props) { getInferenceResult(token); }, [token, getInferenceResult]); // NB: Empty array dependency sets to run ONLY on mount - const documentTitle = w2lInferenceResult?.template_title === undefined - ? undefined - : `Deep Fake ${w2lInferenceResult.template_title} Lip Sync Video Result`; + const documentTitle = + w2lInferenceResult?.template_title === undefined + ? undefined + : `Deep Fake ${w2lInferenceResult.template_title} Lip Sync Video Result`; usePrefixedDocumentTitle(documentTitle); if (notFoundState) { @@ -352,6 +354,19 @@ function W2lResultViewPage(props: Props) { + + +
+

Comments

+
+ +
+
+
); } diff --git a/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_view/W2lTemplateViewPage.tsx b/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_view/W2lTemplateViewPage.tsx index 1d8d6d47ce..ce506e5ccd 100644 --- a/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_view/W2lTemplateViewPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/w2l/w2l_template_view/W2lTemplateViewPage.tsx @@ -27,6 +27,7 @@ import { motion } from "framer-motion"; import { container, item, panel } from "../../../../../data/animation"; import { ThirdPartyLinks } from "@storyteller/components/src/constants/ThirdPartyLinks"; import { usePrefixedDocumentTitle } from "../../../../../common/UsePrefixedDocumentTitle"; +import { CommentComponent } from "../../../_common/comments/CommentComponent"; interface EnqueueJobResponsePayload { success: boolean; @@ -58,7 +59,10 @@ function W2lTemplateViewPage(props: Props) { const [modApprovedFormValue, setModApprovedFormValue] = useState(true); - const documentTitle = w2lTemplate?.title === undefined ? undefined : `Create Deep Fake ${w2lTemplate.title} Lip Sync Video`; + const documentTitle = + w2lTemplate?.title === undefined + ? undefined + : `Create Deep Fake ${w2lTemplate.title} Lip Sync Video`; usePrefixedDocumentTitle(documentTitle); const getTemplate = useCallback( @@ -275,9 +279,7 @@ function W2lTemplateViewPage(props: Props) { let creatorLink = ; if (!!w2lTemplate?.creator_display_name) { - const creatorUrl = WebUrl.userProfilePage( - w2lTemplate?.creator_username - ); + const creatorUrl = WebUrl.userProfilePage(w2lTemplate?.creator_username); creatorLink = ( Template: {w2lTemplate?.title} - +

@@ -544,6 +543,19 @@ function W2lTemplateViewPage(props: Props) {
+ +
+

Comments

+
+ +
+
+
+