From 3e1e2eceda31df3e29275f6581de430c4a366882 Mon Sep 17 00:00:00 2001 From: BFlat Date: Fri, 3 Nov 2023 08:07:10 +0700 Subject: [PATCH 1/8] use voice page --- .../fakeyou.com/src/v2/view/PageContainer.tsx | 10 ++ .../VoiceDesignerUseVoicePage.tsx | 157 ++++++++++++++++++ 2 files changed, 167 insertions(+) create mode 100644 packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerUseVoicePage.tsx diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index 6104ababfa..6449e3b2b6 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -93,6 +93,7 @@ import TtsModelSearchPage from "./pages/tts/tts_model_search/TtsModelSearchPage" import MediaPage from "./pages/media/MediaPage"; import { VoiceDesignerMainPage } from "./pages/voice_designer/VoiceDesignerMainPage"; import { VoiceDesignerVoiceEditPage } from "./pages/voice_designer/VoiceDesignerVoiceEditPage"; +import VoiceDesignerUseVoicePage from "./pages/voice_designer/VoiceDesignerUseVoicePage"; interface Props { sessionWrapper: SessionWrapper; @@ -644,6 +645,15 @@ class PageContainer extends React.Component< + + + + diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerUseVoicePage.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerUseVoicePage.tsx new file mode 100644 index 0000000000..87812c021b --- /dev/null +++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerUseVoicePage.tsx @@ -0,0 +1,157 @@ +import React from "react"; +import { + faEdit, + faEye, + faMemo, + faMemoCircleInfo, + faMessages, + faTrash, +} from "@fortawesome/pro-solid-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import Panel from "components/common/Panel/Panel"; +import { Link } from "react-router-dom"; +import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper"; +import PageHeader from "components/layout/PageHeader"; +import { CommentComponent } from "v2/view/_common/comments/CommentComponent"; +import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; +import { RatingButtons } from "v2/view/_common/ratings/RatingButtons"; +import { RatingStats } from "v2/view/_common/ratings/RatingStats"; +import ShareButton from "components/common/ShareButton/ShareButton"; +import Container from "components/common/Container/Container"; + +interface VoiceDesignerUseVoicePageProps { + sessionWrapper: SessionWrapper; + sessionSubscriptionsWrapper: SessionSubscriptionsWrapper; +} + +export default function VoiceDesignerUseVoicePage( + props: VoiceDesignerUseVoicePageProps +) { + // let { token } = useParams() as { token: string }; + + const title = "Solid Snake"; + const subText = ( +
+
+ RVCv2 +
+

+ V2V model by Vegito1089 +

+
+ ); + const tags = ["Speaking", "English", "Character", "Singing", "Spanish"]; + + let modelCreatorLink = Creator Name; + let modelTitle = title; + let modelDescription = "This is a description of the model"; + let modelUseCount = 10000; + let modelLanguage = "English"; + let modelType = "RVCv2"; + let modelUploadDate = "2021-09-10T06:15:04Z"; + let modelVisibility = ( +
+ + Public +
+ ); + let modelCreatorBanned = "good standing"; + let modelCreationIp = "0.0.0.0.0"; + let modelUpdateIp = "0.0.0.0.0"; + let frontPageFeatured = "no"; + let moderatorDeletedAt = "not deleted"; + let userDeletedAt = "not deleted"; + + const voiceDetails = [ + { label: "Creator", value: modelCreatorLink }, + { label: "Title", value: modelTitle }, + { label: "Use count", value: modelUseCount }, + { label: "Spoken language", value: modelLanguage }, + { label: "Model type", value: modelType }, + { label: "Upload date (UTC)", value: modelUploadDate }, + { label: "Visibility", value: modelVisibility }, + ]; + + const voiceDetailsModerator = [ + { label: "Creator is banned?", value: modelCreatorBanned }, + { label: "Creation IP address", value: modelCreationIp }, + { label: "Update IP address", value: modelUpdateIp }, + { label: "Mod deleted at (UTC)", value: moderatorDeletedAt }, + { label: "User deleted at (UTC)", value: userDeletedAt }, + { label: "Front page featured?", value: frontPageFeatured }, + ]; + + const shareUrl = window.location.href; + const shareButton = ; + + return ( + + + + {/* TTS Voice Generation */} + + {modelDescription && ( + +

+ + Description +

+

{modelDescription}

+ + )} + + +

+ + Voice Details +

+ + + {voiceDetails.map((item, index) => ( + + + + + ))} + {props.sessionWrapper.canBanUsers() && + voiceDetailsModerator.map((item, index) => ( + + + + + ))} + +
+ {item.label} + {item.value}
+ {item.label} + {item.value}
+ + {props.sessionWrapper.canBanUsers() && ( +
+ + + Edit Model Details + + + + Delete Model + +
+ )} + + + +

+ + Comments +

+ + + + ); +} From 9126a8e12fa552503322203b19f424beba5ebfde Mon Sep 17 00:00:00 2001 From: kasisnu <5044120+kasisnu@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:48:56 +0530 Subject: [PATCH 2/8] fixes: screen flashing on state refreshes --- packages/fakeyou.com/package.json | 2 + packages/fakeyou.com/src/App.tsx | 20 +- yarn.lock | 349 +++++++++++++++++++++++++++++- 3 files changed, 362 insertions(+), 9 deletions(-) diff --git a/packages/fakeyou.com/package.json b/packages/fakeyou.com/package.json index 9c1b289121..38e9a327c2 100644 --- a/packages/fakeyou.com/package.json +++ b/packages/fakeyou.com/package.json @@ -22,6 +22,7 @@ "@testing-library/user-event": "^7.2.1", "@tippyjs/react": "^4.2.6", "@types/axios": "^0.14.0", + "@types/deep-equal": "^1.0.3", "@types/google.analytics": "^0.0.42", "@types/gtag.js": "^0.0.12", "@types/howler": "^2.1.2", @@ -35,6 +36,7 @@ "bulma": "^0.9.0", "craco": "^0.0.3", "date-fns": "2.22.1", + "deep-equal": "^2.2.2", "framer-motion": "^6.5.1", "howler": "^2.2.0", "i18next": "^21.6.11", diff --git a/packages/fakeyou.com/src/App.tsx b/packages/fakeyou.com/src/App.tsx index a2e050ab72..75fb661494 100644 --- a/packages/fakeyou.com/src/App.tsx +++ b/packages/fakeyou.com/src/App.tsx @@ -36,6 +36,7 @@ import { TtsCategoryType } from "./AppWrapper"; import { FAKEYOU_MERGED_TRANSLATIONS } from "./_i18n/FakeYouTranslations"; import i18n from "i18next"; import { initReactI18next } from "react-i18next"; +import deepEqual from "deep-equal"; import { VocoderUploadJob } from "@storyteller/components/src/jobs/VocoderUploadJobs"; import { GetRemoteDownloadJobStatus, @@ -308,9 +309,12 @@ class App extends React.Component { } else { cookies.remove('logged_in_username', { path: '/' }); } - this.setState({ - sessionWrapper: sessionWrapper, - }); + + if (!deepEqual(sessionWrapper, this.state.sessionWrapper)) { + this.setState({ + sessionWrapper: sessionWrapper, + }); + } }; querySessionSubscriptions = async () => { @@ -325,10 +329,14 @@ class App extends React.Component { } else { cookies.remove('logged_in_user_plan', { path: '/' }); } + console.log(sessionSubscriptionsWrapper); + console.log(deepEqual(sessionSubscriptionsWrapper, this.state.sessionSubscriptionsWrapper)) - this.setState({ - sessionSubscriptionsWrapper: sessionSubscriptionsWrapper, - }); + if (!deepEqual(sessionSubscriptionsWrapper, this.state.sessionSubscriptionsWrapper)) { + this.setState({ + sessionSubscriptionsWrapper: sessionSubscriptionsWrapper, + }); + } }; queryLanguage = async () => { diff --git a/yarn.lock b/yarn.lock index bf6cdd2679..df1f9bd527 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4427,6 +4427,7 @@ __metadata: "@testing-library/user-event": ^7.2.1 "@tippyjs/react": ^4.2.6 "@types/axios": ^0.14.0 + "@types/deep-equal": ^1.0.3 "@types/google.analytics": ^0.0.42 "@types/gtag.js": ^0.0.12 "@types/howler": ^2.1.2 @@ -4444,6 +4445,7 @@ __metadata: bulma: ^0.9.0 craco: ^0.0.3 date-fns: 2.22.1 + deep-equal: ^2.2.2 framer-motion: ^6.5.1 howler: ^2.2.0 i18next: ^21.6.11 @@ -5118,6 +5120,13 @@ __metadata: languageName: node linkType: hard +"@types/deep-equal@npm:^1.0.3": + version: 1.0.3 + resolution: "@types/deep-equal@npm:1.0.3" + checksum: eddd9a381dac9d2bb99846e8f42a5e568f54610485cdcb6dd08ae60e597d406331f25f3bb1e63d0ecf28b6376d304ac635106b9a86a25c43d496406c4f29f298 + languageName: node + linkType: hard + "@types/eslint-scope@npm:^3.7.0": version: 3.7.3 resolution: "@types/eslint-scope@npm:3.7.3" @@ -6624,6 +6633,16 @@ __metadata: languageName: node linkType: hard +"array-buffer-byte-length@npm:^1.0.0": + version: 1.0.0 + resolution: "array-buffer-byte-length@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + is-array-buffer: ^3.0.1 + checksum: 044e101ce150f4804ad19c51d6c4d4cfa505c5b2577bd179256e4aa3f3f6a0a5e9874c78cd428ee566ac574c8a04d7ce21af9fe52e844abfdccb82b33035a7c3 + languageName: node + linkType: hard + "array-differ@npm:^3.0.0": version: 3.0.0 resolution: "array-differ@npm:3.0.0" @@ -6838,6 +6857,13 @@ __metadata: languageName: node linkType: hard +"available-typed-arrays@npm:^1.0.5": + version: 1.0.5 + resolution: "available-typed-arrays@npm:1.0.5" + checksum: 20eb47b3cefd7db027b9bbb993c658abd36d4edd3fe1060e83699a03ee275b0c9b216cc076ff3f2db29073225fb70e7613987af14269ac1fe2a19803ccc97f1a + languageName: node + linkType: hard + "aws-sign2@npm:~0.7.0": version: 0.7.0 resolution: "aws-sign2@npm:0.7.0" @@ -7647,6 +7673,17 @@ __metadata: languageName: node linkType: hard +"call-bind@npm:^1.0.4": + version: 1.0.5 + resolution: "call-bind@npm:1.0.5" + dependencies: + function-bind: ^1.1.2 + get-intrinsic: ^1.2.1 + set-function-length: ^1.1.1 + checksum: 449e83ecbd4ba48e7eaac5af26fea3b50f8f6072202c2dd7c5a6e7a6308f2421abe5e13a3bbd55221087f76320c5e09f25a8fdad1bab2b77c68ae74d92234ea5 + languageName: node + linkType: hard + "callsites@npm:^3.0.0": version: 3.1.0 resolution: "callsites@npm:3.1.0" @@ -9134,6 +9171,32 @@ __metadata: languageName: node linkType: hard +"deep-equal@npm:^2.2.2": + version: 2.2.2 + resolution: "deep-equal@npm:2.2.2" + dependencies: + array-buffer-byte-length: ^1.0.0 + call-bind: ^1.0.2 + es-get-iterator: ^1.1.3 + get-intrinsic: ^1.2.1 + is-arguments: ^1.1.1 + is-array-buffer: ^3.0.2 + is-date-object: ^1.0.5 + is-regex: ^1.1.4 + is-shared-array-buffer: ^1.0.2 + isarray: ^2.0.5 + object-is: ^1.1.5 + object-keys: ^1.1.1 + object.assign: ^4.1.4 + regexp.prototype.flags: ^1.5.0 + side-channel: ^1.0.4 + which-boxed-primitive: ^1.0.2 + which-collection: ^1.0.1 + which-typed-array: ^1.1.9 + checksum: eb61c35157b6ecb96a5359b507b083fbff8ddb4c86a78a781ee38485f77a667465e45d63ee2ebd8a00e86d94c80e499906900cd82c2debb400237e1662cd5397 + languageName: node + linkType: hard + "deep-is@npm:^0.1.3, deep-is@npm:~0.1.3": version: 0.1.4 resolution: "deep-is@npm:0.1.4" @@ -9166,6 +9229,17 @@ __metadata: languageName: node linkType: hard +"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.1": + version: 1.1.1 + resolution: "define-data-property@npm:1.1.1" + dependencies: + get-intrinsic: ^1.2.1 + gopd: ^1.0.1 + has-property-descriptors: ^1.0.0 + checksum: a29855ad3f0630ea82e3c5012c812efa6ca3078d5c2aa8df06b5f597c1cde6f7254692df41945851d903e05a1668607b6d34e778f402b9ff9ffb38111f1a3f0d + languageName: node + linkType: hard + "define-lazy-prop@npm:^2.0.0": version: 2.0.0 resolution: "define-lazy-prop@npm:2.0.0" @@ -9182,6 +9256,17 @@ __metadata: languageName: node linkType: hard +"define-properties@npm:^1.1.4, define-properties@npm:^1.2.0": + version: 1.2.1 + resolution: "define-properties@npm:1.2.1" + dependencies: + define-data-property: ^1.0.1 + has-property-descriptors: ^1.0.0 + object-keys: ^1.1.1 + checksum: b4ccd00597dd46cb2d4a379398f5b19fca84a16f3374e2249201992f36b30f6835949a9429669ee6b41b6e837205a163eadd745e472069e70dfc10f03e5fcc12 + languageName: node + linkType: hard + "define-property@npm:^0.2.5": version: 0.2.5 resolution: "define-property@npm:0.2.5" @@ -9850,6 +9935,23 @@ __metadata: languageName: node linkType: hard +"es-get-iterator@npm:^1.1.3": + version: 1.1.3 + resolution: "es-get-iterator@npm:1.1.3" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.1.3 + has-symbols: ^1.0.3 + is-arguments: ^1.1.1 + is-map: ^2.0.2 + is-set: ^2.0.2 + is-string: ^1.0.7 + isarray: ^2.0.5 + stop-iteration-iterator: ^1.0.0 + checksum: 8fa118da42667a01a7c7529f8a8cca514feeff243feec1ce0bb73baaa3514560bd09d2b3438873cf8a5aaec5d52da248131de153b28e2638a061b6e4df13267d + languageName: node + linkType: hard + "es-module-lexer@npm:^0.9.0": version: 0.9.3 resolution: "es-module-lexer@npm:0.9.3" @@ -10783,6 +10885,15 @@ __metadata: languageName: node linkType: hard +"for-each@npm:^0.3.3": + version: 0.3.3 + resolution: "for-each@npm:0.3.3" + dependencies: + is-callable: ^1.1.3 + checksum: 6c48ff2bc63362319c65e2edca4a8e1e3483a2fabc72fbe7feaf8c73db94fc7861bd53bc02c8a66a0c1dd709da6b04eec42e0abdd6b40ce47305ae92a25e5d28 + languageName: node + linkType: hard + "for-in@npm:^1.0.2": version: 1.0.2 resolution: "for-in@npm:1.0.2" @@ -11041,6 +11152,13 @@ __metadata: languageName: node linkType: hard +"function-bind@npm:^1.1.2": + version: 1.1.2 + resolution: "function-bind@npm:1.1.2" + checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1 + languageName: node + linkType: hard + "functional-red-black-tree@npm:^1.0.1": version: 1.0.1 resolution: "functional-red-black-tree@npm:1.0.1" @@ -11048,6 +11166,13 @@ __metadata: languageName: node linkType: hard +"functions-have-names@npm:^1.2.3": + version: 1.2.3 + resolution: "functions-have-names@npm:1.2.3" + checksum: c3f1f5ba20f4e962efb71344ce0a40722163e85bee2101ce25f88214e78182d2d2476aa85ef37950c579eb6cf6ee811c17b3101bb84004bb75655f3e33f3fdb5 + languageName: node + linkType: hard + "gauge@npm:^4.0.3": version: 4.0.4 resolution: "gauge@npm:4.0.4" @@ -11105,6 +11230,18 @@ __metadata: languageName: node linkType: hard +"get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.2": + version: 1.2.2 + resolution: "get-intrinsic@npm:1.2.2" + dependencies: + function-bind: ^1.1.2 + has-proto: ^1.0.1 + has-symbols: ^1.0.3 + hasown: ^2.0.0 + checksum: 447ff0724df26829908dc033b62732359596fcf66027bc131ab37984afb33842d9cd458fd6cecadfe7eac22fd8a54b349799ed334cf2726025c921c7250e7417 + languageName: node + linkType: hard + "get-own-enumerable-property-symbols@npm:^3.0.0": version: 3.0.2 resolution: "get-own-enumerable-property-symbols@npm:3.0.2" @@ -11350,6 +11487,15 @@ __metadata: languageName: node linkType: hard +"gopd@npm:^1.0.1": + version: 1.0.1 + resolution: "gopd@npm:1.0.1" + dependencies: + get-intrinsic: ^1.1.3 + checksum: a5ccfb8806e0917a94e0b3de2af2ea4979c1da920bc381667c260e00e7cafdbe844e2cb9c5bcfef4e5412e8bf73bab837285bc35c7ba73aaaf0134d4583393a6 + languageName: node + linkType: hard + "graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.2, graceful-fs@npm:^4.2.3, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.9 resolution: "graceful-fs@npm:4.2.9" @@ -11450,6 +11596,22 @@ __metadata: languageName: node linkType: hard +"has-property-descriptors@npm:^1.0.0": + version: 1.0.1 + resolution: "has-property-descriptors@npm:1.0.1" + dependencies: + get-intrinsic: ^1.2.2 + checksum: 2bcc6bf6ec6af375add4e4b4ef586e43674850a91ad4d46666d0b28ba8e1fd69e424c7677d24d60f69470ad0afaa2f3197f508b20b0bb7dd99a8ab77ffc4b7c4 + languageName: node + linkType: hard + +"has-proto@npm:^1.0.1": + version: 1.0.1 + resolution: "has-proto@npm:1.0.1" + checksum: febc5b5b531de8022806ad7407935e2135f1cc9e64636c3916c6842bd7995994ca3b29871ecd7954bd35f9e2986c17b3b227880484d22259e2f8e6ce63fd383e + languageName: node + linkType: hard + "has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2": version: 1.0.2 resolution: "has-symbols@npm:1.0.2" @@ -11457,6 +11619,13 @@ __metadata: languageName: node linkType: hard +"has-symbols@npm:^1.0.3": + version: 1.0.3 + resolution: "has-symbols@npm:1.0.3" + checksum: a054c40c631c0d5741a8285010a0777ea0c068f99ed43e5d6eb12972da223f8af553a455132fdb0801bdcfa0e0f443c0c03a68d8555aa529b3144b446c3f2410 + languageName: node + linkType: hard + "has-tostringtag@npm:^1.0.0": version: 1.0.0 resolution: "has-tostringtag@npm:1.0.0" @@ -11542,6 +11711,15 @@ __metadata: languageName: node linkType: hard +"hasown@npm:^2.0.0": + version: 2.0.0 + resolution: "hasown@npm:2.0.0" + dependencies: + function-bind: ^1.1.2 + checksum: 6151c75ca12554565098641c98a40f4cc86b85b0fd5b6fe92360967e4605a4f9610f7757260b4e8098dd1c2ce7f4b095f2006fe72a570e3b6d2d28de0298c176 + languageName: node + linkType: hard + "he@npm:^1.2.0": version: 1.2.0 resolution: "he@npm:1.2.0" @@ -12097,6 +12275,17 @@ __metadata: languageName: node linkType: hard +"internal-slot@npm:^1.0.4": + version: 1.0.6 + resolution: "internal-slot@npm:1.0.6" + dependencies: + get-intrinsic: ^1.2.2 + hasown: ^2.0.0 + side-channel: ^1.0.4 + checksum: 7872454888047553ce97a3fa1da7cc054a28ec5400a9c2e9f4dbe4fe7c1d041cb8e8301467614b80d4246d50377aad2fb58860b294ed74d6700cc346b6f89549 + languageName: node + linkType: hard + "ip@npm:^1.1.0, ip@npm:^1.1.5": version: 1.1.5 resolution: "ip@npm:1.1.5" @@ -12143,7 +12332,7 @@ __metadata: languageName: node linkType: hard -"is-arguments@npm:^1.0.4": +"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1": version: 1.1.1 resolution: "is-arguments@npm:1.1.1" dependencies: @@ -12153,6 +12342,17 @@ __metadata: languageName: node linkType: hard +"is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.2": + version: 3.0.2 + resolution: "is-array-buffer@npm:3.0.2" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.0 + is-typed-array: ^1.1.10 + checksum: dcac9dda66ff17df9cabdc58214172bf41082f956eab30bb0d86bc0fab1e44b690fc8e1f855cf2481245caf4e8a5a006a982a71ddccec84032ed41f9d8da8c14 + languageName: node + linkType: hard + "is-arrayish@npm:^0.2.1": version: 0.2.1 resolution: "is-arrayish@npm:0.2.1" @@ -12204,6 +12404,13 @@ __metadata: languageName: node linkType: hard +"is-callable@npm:^1.1.3": + version: 1.2.7 + resolution: "is-callable@npm:1.2.7" + checksum: 61fd57d03b0d984e2ed3720fb1c7a897827ea174bd44402878e059542ea8c4aeedee0ea0985998aa5cc2736b2fa6e271c08587addb5b3959ac52cf665173d1ac + languageName: node + linkType: hard + "is-callable@npm:^1.1.4, is-callable@npm:^1.2.4": version: 1.2.4 resolution: "is-callable@npm:1.2.4" @@ -12258,7 +12465,7 @@ __metadata: languageName: node linkType: hard -"is-date-object@npm:^1.0.1": +"is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5": version: 1.0.5 resolution: "is-date-object@npm:1.0.5" dependencies: @@ -12369,6 +12576,13 @@ __metadata: languageName: node linkType: hard +"is-map@npm:^2.0.1, is-map@npm:^2.0.2": + version: 2.0.2 + resolution: "is-map@npm:2.0.2" + checksum: ace3d0ecd667bbdefdb1852de601268f67f2db725624b1958f279316e13fecb8fa7df91fd60f690d7417b4ec180712f5a7ee967008e27c65cfd475cc84337728 + languageName: node + linkType: hard + "is-module@npm:^1.0.0": version: 1.0.0 resolution: "is-module@npm:1.0.0" @@ -12504,6 +12718,13 @@ __metadata: languageName: node linkType: hard +"is-set@npm:^2.0.1, is-set@npm:^2.0.2": + version: 2.0.2 + resolution: "is-set@npm:2.0.2" + checksum: b64343faf45e9387b97a6fd32be632ee7b269bd8183701f3b3f5b71a7cf00d04450ed8669d0bd08753e08b968beda96fca73a10fd0ff56a32603f64deba55a57 + languageName: node + linkType: hard + "is-shared-array-buffer@npm:^1.0.1": version: 1.0.1 resolution: "is-shared-array-buffer@npm:1.0.1" @@ -12511,6 +12732,15 @@ __metadata: languageName: node linkType: hard +"is-shared-array-buffer@npm:^1.0.2": + version: 1.0.2 + resolution: "is-shared-array-buffer@npm:1.0.2" + dependencies: + call-bind: ^1.0.2 + checksum: 9508929cf14fdc1afc9d61d723c6e8d34f5e117f0bffda4d97e7a5d88c3a8681f633a74f8e3ad1fe92d5113f9b921dc5ca44356492079612f9a247efbce7032a + languageName: node + linkType: hard + "is-ssh@npm:^1.3.0": version: 1.3.3 resolution: "is-ssh@npm:1.3.3" @@ -12561,6 +12791,15 @@ __metadata: languageName: node linkType: hard +"is-typed-array@npm:^1.1.10": + version: 1.1.12 + resolution: "is-typed-array@npm:1.1.12" + dependencies: + which-typed-array: ^1.1.11 + checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796 + languageName: node + linkType: hard + "is-typedarray@npm:^1.0.0, is-typedarray@npm:~1.0.0": version: 1.0.0 resolution: "is-typedarray@npm:1.0.0" @@ -12568,6 +12807,13 @@ __metadata: languageName: node linkType: hard +"is-weakmap@npm:^2.0.1": + version: 2.0.1 + resolution: "is-weakmap@npm:2.0.1" + checksum: 1222bb7e90c32bdb949226e66d26cb7bce12e1e28e3e1b40bfa6b390ba3e08192a8664a703dff2a00a84825f4e022f9cd58c4599ff9981ab72b1d69479f4f7f6 + languageName: node + linkType: hard + "is-weakref@npm:^1.0.1": version: 1.0.2 resolution: "is-weakref@npm:1.0.2" @@ -12577,6 +12823,16 @@ __metadata: languageName: node linkType: hard +"is-weakset@npm:^2.0.1": + version: 2.0.2 + resolution: "is-weakset@npm:2.0.2" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.1.1 + checksum: 5d8698d1fa599a0635d7ca85be9c26d547b317ed8fd83fc75f03efbe75d50001b5eececb1e9971de85fcde84f69ae6f8346bc92d20d55d46201d328e4c74a367 + languageName: node + linkType: hard + "is-windows@npm:^1.0.2": version: 1.0.2 resolution: "is-windows@npm:1.0.2" @@ -12614,6 +12870,13 @@ __metadata: languageName: node linkType: hard +"isarray@npm:^2.0.5": + version: 2.0.5 + resolution: "isarray@npm:2.0.5" + checksum: bd5bbe4104438c4196ba58a54650116007fa0262eccef13a4c55b2e09a5b36b59f1e75b9fcc49883dd9d4953892e6fc007eef9e9155648ceea036e184b0f930a + languageName: node + linkType: hard + "isexe@npm:^2.0.0": version: 2.0.0 resolution: "isexe@npm:2.0.0" @@ -15134,7 +15397,7 @@ __metadata: languageName: node linkType: hard -"object-is@npm:^1.0.1": +"object-is@npm:^1.0.1, object-is@npm:^1.1.5": version: 1.1.5 resolution: "object-is@npm:1.1.5" dependencies: @@ -15172,6 +15435,18 @@ __metadata: languageName: node linkType: hard +"object.assign@npm:^4.1.4": + version: 4.1.4 + resolution: "object.assign@npm:4.1.4" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.1.4 + has-symbols: ^1.0.3 + object-keys: ^1.1.1 + checksum: 76cab513a5999acbfe0ff355f15a6a125e71805fcf53de4e9d4e082e1989bdb81d1e329291e1e4e0ae7719f0e4ef80e88fb2d367ae60500d79d25a6224ac8864 + languageName: node + linkType: hard + "object.entries@npm:^1.1.5": version: 1.1.5 resolution: "object.entries@npm:1.1.5" @@ -17832,6 +18107,17 @@ __metadata: languageName: node linkType: hard +"regexp.prototype.flags@npm:^1.5.0": + version: 1.5.1 + resolution: "regexp.prototype.flags@npm:1.5.1" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + set-function-name: ^2.0.0 + checksum: 869edff00288442f8d7fa4c9327f91d85f3b3acf8cbbef9ea7a220345cf23e9241b6def9263d2c1ebcf3a316b0aa52ad26a43a84aa02baca3381717b3e307f47 + languageName: node + linkType: hard + "regexpp@npm:^3.2.0": version: 3.2.0 resolution: "regexpp@npm:3.2.0" @@ -18537,6 +18823,29 @@ __metadata: languageName: node linkType: hard +"set-function-length@npm:^1.1.1": + version: 1.1.1 + resolution: "set-function-length@npm:1.1.1" + dependencies: + define-data-property: ^1.1.1 + get-intrinsic: ^1.2.1 + gopd: ^1.0.1 + has-property-descriptors: ^1.0.0 + checksum: c131d7569cd7e110cafdfbfbb0557249b538477624dfac4fc18c376d879672fa52563b74029ca01f8f4583a8acb35bb1e873d573a24edb80d978a7ee607c6e06 + languageName: node + linkType: hard + +"set-function-name@npm:^2.0.0": + version: 2.0.1 + resolution: "set-function-name@npm:2.0.1" + dependencies: + define-data-property: ^1.0.1 + functions-have-names: ^1.2.3 + has-property-descriptors: ^1.0.0 + checksum: 4975d17d90c40168eee2c7c9c59d023429f0a1690a89d75656306481ece0c3c1fb1ebcc0150ea546d1913e35fbd037bace91372c69e543e51fc5d1f31a9fa126 + languageName: node + linkType: hard + "set-value@npm:^2.0.0, set-value@npm:^2.0.1": version: 2.0.1 resolution: "set-value@npm:2.0.1" @@ -19121,6 +19430,15 @@ __metadata: languageName: node linkType: hard +"stop-iteration-iterator@npm:^1.0.0": + version: 1.0.0 + resolution: "stop-iteration-iterator@npm:1.0.0" + dependencies: + internal-slot: ^1.0.4 + checksum: d04173690b2efa40e24ab70e5e51a3ff31d56d699550cfad084104ab3381390daccb36652b25755e420245f3b0737de66c1879eaa2a8d4fc0a78f9bf892fcb42 + languageName: node + linkType: hard + "stream-browserify@npm:^2.0.1": version: 2.0.2 resolution: "stream-browserify@npm:2.0.2" @@ -21089,6 +21407,31 @@ __metadata: languageName: node linkType: hard +"which-collection@npm:^1.0.1": + version: 1.0.1 + resolution: "which-collection@npm:1.0.1" + dependencies: + is-map: ^2.0.1 + is-set: ^2.0.1 + is-weakmap: ^2.0.1 + is-weakset: ^2.0.1 + checksum: c815bbd163107ef9cb84f135e6f34453eaf4cca994e7ba85ddb0d27cea724c623fae2a473ceccfd5549c53cc65a5d82692de418166df3f858e1e5dc60818581c + languageName: node + linkType: hard + +"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.9": + version: 1.1.13 + resolution: "which-typed-array@npm:1.1.13" + dependencies: + available-typed-arrays: ^1.0.5 + call-bind: ^1.0.4 + for-each: ^0.3.3 + gopd: ^1.0.1 + has-tostringtag: ^1.0.0 + checksum: 3828a0d5d72c800e369d447e54c7620742a4cc0c9baf1b5e8c17e9b6ff90d8d861a3a6dd4800f1953dbf80e5e5cec954a289e5b4a223e3bee4aeb1f8c5f33309 + languageName: node + linkType: hard + "which@npm:^1.3.1": version: 1.3.1 resolution: "which@npm:1.3.1" From 831c2d0825652d2e1ffe02bb24c3ab748bfc5abd Mon Sep 17 00:00:00 2001 From: kasisnu <5044120+kasisnu@users.noreply.github.com> Date: Mon, 6 Nov 2023 12:12:59 +0530 Subject: [PATCH 3/8] skip create account request on form errors --- .../fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx b/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx index 2222f08f87..e8a9724b2d 100644 --- a/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx @@ -185,10 +185,10 @@ function SignupPage(props: Props) { Analytics.accountSignupAttempt(); if ( - !usernameValid || - !emailValid || - !passwordValid || - !passwordConfirmationValid + (usernameValid !== FieldTriState.TRUE) || + (emailValid !== FieldTriState.TRUE) || + (passwordValid !== FieldTriState.TRUE) || + (passwordConfirmationValid !== FieldTriState.TRUE) ) { return false; } From 9386ffca7928366876460e1c3fd86af9e2fc227f Mon Sep 17 00:00:00 2001 From: kasisnu <5044120+kasisnu@users.noreply.github.com> Date: Tue, 7 Nov 2023 12:03:35 +0530 Subject: [PATCH 4/8] smol lint fix --- packages/fakeyou.com/src/App.tsx | 2 -- .../src/v2/view/pages/voice_designer/DatasetEditor.tsx | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/fakeyou.com/src/App.tsx b/packages/fakeyou.com/src/App.tsx index 75fb661494..b9ebb74f97 100644 --- a/packages/fakeyou.com/src/App.tsx +++ b/packages/fakeyou.com/src/App.tsx @@ -329,8 +329,6 @@ class App extends React.Component { } else { cookies.remove('logged_in_user_plan', { path: '/' }); } - console.log(sessionSubscriptionsWrapper); - console.log(deepEqual(sessionSubscriptionsWrapper, this.state.sessionSubscriptionsWrapper)) if (!deepEqual(sessionSubscriptionsWrapper, this.state.sessionSubscriptionsWrapper)) { this.setState({ diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/DatasetEditor.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/DatasetEditor.tsx index a4d21ed0b1..8c1b4f57cc 100644 --- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/DatasetEditor.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/DatasetEditor.tsx @@ -62,10 +62,10 @@ export default function DatasetEditor({ sessionWrapper, value }: Props) { { value: "es", label: "Spanish" }, { value: "fr", label: "French" }, ]; - + // eslint-disable-next-line @typescript-eslint/no-unused-vars const [abc,abcSet] = useState("123"); - console.log("🚜", visibility, language, title); + console.log("🚜", visibility, language, title); return From 11aff18246d33c191335fb5b46fb9a194ba59d9a Mon Sep 17 00:00:00 2001 From: BFlat Date: Thu, 9 Nov 2023 00:28:19 +0700 Subject: [PATCH 5/8] update --- .../layout/PageHeader/PageHeader.tsx | 13 ++-- .../fakeyou.com/src/scss/site-refresh.scss | 2 +- .../fakeyou.com/src/v2/view/PageContainer.tsx | 6 +- .../VoiceDesignerUseVoicePage.tsx | 67 +++++++++++++++++-- 4 files changed, 74 insertions(+), 14 deletions(-) diff --git a/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx b/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx index b5c1d88bae..7a810b111e 100644 --- a/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx +++ b/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx @@ -8,7 +8,7 @@ import BackButton from "components/common/BackButton"; interface BackConfig { label: string; to: string; -}; +} interface PageHeaderProps { back?: BackConfig; @@ -57,9 +57,12 @@ export default function PageHeader({ return (
- {( back || showBackButton) && ( + {(back || showBackButton) && (
- +
)}
@@ -73,7 +76,9 @@ export default function PageHeader({ {/* {icon} */} {title} -

{subText}

+

+ {subText} +

{showButton && (
diff --git a/packages/fakeyou.com/src/scss/site-refresh.scss b/packages/fakeyou.com/src/scss/site-refresh.scss index 7a6f936ce9..dfe07cad14 100644 --- a/packages/fakeyou.com/src/scss/site-refresh.scss +++ b/packages/fakeyou.com/src/scss/site-refresh.scss @@ -739,7 +739,7 @@ styles with important tags: } .session-tts-section { - height: 100%; + // height: 100%; overflow-x: hidden; overflow-y: auto; overscroll-behavior: contain; diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index 959349bedb..6c75f0b9ef 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -654,7 +654,7 @@ class PageContainer extends React.Component< exact path="/voice-designer/dataset/:dataset_token/edit" {...{ - sessionWrapper: this.props.sessionWrapper + sessionWrapper: this.props.sessionWrapper, }} component={DatasetEditor} /> @@ -676,11 +676,13 @@ class PageContainer extends React.Component< sessionSubscriptionsWrapper={ this.props.sessionSubscriptionsWrapper } + inferenceJobs={this.props.inferenceJobs} + ttsInferenceJobs={this.props.ttsInferenceJobs} /> - + diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerUseVoicePage.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerUseVoicePage.tsx index 87812c021b..723141ad76 100644 --- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerUseVoicePage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerUseVoicePage.tsx @@ -1,11 +1,13 @@ -import React from "react"; +import React, { useState } from "react"; import { + faBarsStaggered, faEdit, faEye, faMemo, faMemoCircleInfo, faMessages, faTrash, + faWaveformLines, } from "@fortawesome/pro-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import Panel from "components/common/Panel/Panel"; @@ -14,20 +16,27 @@ import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session import PageHeader from "components/layout/PageHeader"; import { CommentComponent } from "v2/view/_common/comments/CommentComponent"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; -import { RatingButtons } from "v2/view/_common/ratings/RatingButtons"; -import { RatingStats } from "v2/view/_common/ratings/RatingStats"; -import ShareButton from "components/common/ShareButton/ShareButton"; import Container from "components/common/Container/Container"; +import { useSession } from "hooks"; +import TextArea from "components/common/TextArea"; +import { Button } from "components/common"; +import { SessionTtsInferenceResultList } from "v2/view/_common/SessionTtsInferenceResultsList"; +import { InferenceJob } from "@storyteller/components/src/jobs/InferenceJob"; +import { TtsInferenceJob } from "@storyteller/components/src/jobs/TtsInferenceJobs"; interface VoiceDesignerUseVoicePageProps { sessionWrapper: SessionWrapper; sessionSubscriptionsWrapper: SessionSubscriptionsWrapper; + inferenceJobs: Array; + ttsInferenceJobs: Array; } export default function VoiceDesignerUseVoicePage( props: VoiceDesignerUseVoicePageProps ) { + const { user } = useSession(); // let { token } = useParams() as { token: string }; + const [textBuffer, setTextBuffer] = useState(""); const title = "Solid Snake"; const subText = ( @@ -36,7 +45,7 @@ export default function VoiceDesignerUseVoicePage( RVCv2

- V2V model by Vegito1089 + TTS model by Vegito1089

); @@ -82,13 +91,57 @@ export default function VoiceDesignerUseVoicePage( ]; const shareUrl = window.location.href; - const shareButton = ; + + const handleFormSubmit = async (ev: React.FormEvent) => { + ev.preventDefault(); + }; + + const handleChangeText = (ev: React.FormEvent) => { + const textValue = (ev.target as HTMLTextAreaElement).value; + setTextBuffer(textValue); + }; return ( - {/* TTS Voice Generation */} + +
+
+
+

+ + Use Voice +

+