From 76d441055aa2dc25fa21a61183fd0705b76a1e44 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 24 Apr 2023 00:42:40 -0700 Subject: [PATCH 01/21] work on audio recorder --- .../vc/vc_model_list/components/RecordComponent.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx index cf9313094d..d99e3673ec 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx @@ -12,23 +12,23 @@ export default function RecordComponent() { const { startRecording, stopRecording, recordingBlob, isRecording } = useAudioRecorder(); - const addAudioElement = (blob: any) => { + const handleStopRecording = (blob: any) => { stopRecording(); - setLoading(true); if (recordingBlob) { + console.log('blob', recordingBlob); const url = URL.createObjectURL(recordingBlob); setAudioLink(url); setRecorded(true); - setLoading(false); - return; } + + setLoading(!recordingBlob); }; return (
{isRecording ? ( - ) : ( )} - {recorded ? ( -
- -
- ) : ( - <> - )} +
); } From 5ab6c188bdf140c8710e0b2f549a4cb1041b9ca9 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 24 Apr 2023 01:38:31 -0700 Subject: [PATCH 03/21] seems to handle uploading now --- .../components/RecordComponent.tsx | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx index 3a6ad17c2e..1ca3b6633d 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx @@ -1,8 +1,10 @@ -import React, { useMemo, useState } from "react"; +import React, { useEffect, useMemo, useState } from "react"; +import { v4 as uuidv4 } from "uuid"; import { useAudioRecorder } from "react-audio-voice-recorder"; import { InputVcAudioPlayer } from "../../../../_common/InputVcAudioPlayer"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faMicrophone } from "@fortawesome/pro-solid-svg-icons"; +import { UploadAudio, UploadAudioIsOk, UploadAudioRequest } from "@storyteller/components/src/api/upload/UploadAudio"; interface RecorderProps { recordingBlob: any; @@ -33,7 +35,34 @@ export default function RecordComponent() { const { startRecording, stopRecording, recordingBlob, isRecording } = useAudioRecorder(); - const handleStopRecording = (blob: any) => { + useEffect(() => { + // NB: This is used to detect changes to `recordingBlob` and upload them + if (!recordingBlob) { + return; + } + + (async () => { + let idempotencyToken = uuidv4(); + + console.log('blob', recordingBlob) + + const request : UploadAudioRequest = { + uuid_idempotency_token: idempotencyToken, + file: recordingBlob, + } + + let result = await UploadAudio(request); + + if (UploadAudioIsOk(result)) { + //setIsUploadDisabled(true); + //ggprops.setMediaUploadToken(result.upload_token); + console.log('TOKEN', result.upload_token) + } + })(); + }, [recordingBlob]) + + + const handleStopRecording = async (blob: any) => { stopRecording(); }; From 767af2f0e6f4f44e2e34084349dd661cdfc6368e Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 24 Apr 2023 03:08:43 -0700 Subject: [PATCH 04/21] submit voice conversion jobs --- .../v2/view/pages/vc/vc_model_list/VcModelListPage.tsx | 6 ++++-- .../pages/vc/vc_model_list/components/RecordComponent.tsx | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx index 2483765f0d..b63cfc402d 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx @@ -308,14 +308,16 @@ function VcModelListPage(props: Props) {
- +
+
*/} +
+ +
+
{job.maybeModelTitle}
+

{job.maybeRawInferenceText}

+
+ + {/* */} + + {wavesurfers} + +
+ { + Analytics.ttsClickResultLink(); + }} + className="fw-semibold" + > + + {t("common.SessionTtsInferenceResults.result.shareDownload")} + +
+
+
+ + ); + } + }); + + let noResultsSection = ( +
+
+ +
+ {t("common.SessionTtsInferenceResults.noResults.title")} +
+

{t("common.SessionTtsInferenceResults.noResults.subtitle")}

+
+
+ ); + + if (results.length === 0) { + return <>{noResultsSection}; + } + + let upgradeNotice = <>; + + // Ask non-premium users to upgrade + if ( + results.length !== 0 && + !props.sessionSubscriptionsWrapper.hasPaidFeatures() + ) { + upgradeNotice = ( +
+ + + + Don't want to wait? Step to the back of the line with a{" "} + { + Analytics.ttsTooSlowUpgradePremium(); + }} + className="alert-link fw-semibold" + > + FakeYou membership. + + {" "} + (TTS Queued:{" "} + ~{pendingTtsJobs.pending_job_count}) + +
+ ); + } + + // Users have requested reverse chronological results + results.reverse(); + + return ( + +
+
+ {upgradeNotice} +
{results}
+
+
+
+ ); +} + +export { SessionVoiceConversionResultsList }; diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx index bdb98f8bc4..923be851fd 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx @@ -25,6 +25,7 @@ import { VcModelListSearch } from "./components/VcModelListSearchComponent"; import { EnqueueVoiceConversion, EnqueueVoiceConversionIsSuccess, EnqueueVoiceConversionRequest } from "@storyteller/components/src/api/voice_conversion/EnqueueVoiceConversion"; import { Analytics } from "../../../../../common/Analytics"; import { FrontendInferenceJobType, InferenceJob } from "@storyteller/components/src/jobs/InferenceJob"; +import { SessionVoiceConversionResultsList } from "../../../_common/SessionVoiceConversionResultsList"; interface Props { sessionWrapper: SessionWrapper; @@ -357,7 +358,11 @@ function VcModelListPage(props: Props) { Session VC Results
- {noResultsSection} + + {/*{noResultsSection}*/} {/* Date: Tue, 25 Apr 2023 04:25:19 -0700 Subject: [PATCH 08/21] download link --- packages/fakeyou.com/src/common/Analytics.ts | 4 +++ .../SessionVoiceConversionResultsList.tsx | 21 ++++++++++++--- .../vc/vc_model_list/VcModelListPage.tsx | 27 ------------------- 3 files changed, 22 insertions(+), 30 deletions(-) diff --git a/packages/fakeyou.com/src/common/Analytics.ts b/packages/fakeyou.com/src/common/Analytics.ts index 92ccdec484..35208a4438 100644 --- a/packages/fakeyou.com/src/common/Analytics.ts +++ b/packages/fakeyou.com/src/common/Analytics.ts @@ -231,6 +231,10 @@ class Analytics { Analytics.sendCategorizedEvent(this.VOICE_CONVERSION, 'generate_vc', modelToken); } + static voiceConversionClickDownload() { + Analytics.sendCategorizedEvent(this.VOICE_CONVERSION, 'click_download'); + } + // ========== UI ========== static uiTurnOnAnimations() { diff --git a/packages/fakeyou.com/src/v2/view/_common/SessionVoiceConversionResultsList.tsx b/packages/fakeyou.com/src/v2/view/_common/SessionVoiceConversionResultsList.tsx index 5545894b14..d312c5253b 100644 --- a/packages/fakeyou.com/src/v2/view/_common/SessionVoiceConversionResultsList.tsx +++ b/packages/fakeyou.com/src/v2/view/_common/SessionVoiceConversionResultsList.tsx @@ -9,6 +9,7 @@ import { faClock, faLink, faHeadphonesSimple, + faDownload, } from "@fortawesome/free-solid-svg-icons"; import { motion } from "framer-motion"; import { container, sessionItem } from "../../../data/animation"; @@ -122,10 +123,12 @@ function SessionVoiceConversionResultsList(props: Props) { let audioLink = new BucketConfig().getGcsUrl( job.maybeResultPublicBucketMediaPath ); - let ttsPermalink = `/tts/result/${job.maybeResultToken}`; + //let ttsPermalink = `/tts/result/${job.maybeResultToken}`; let wavesurfers = ; + let audioDownloadFilename = `fakeyou-${job.jobToken}.wav`; + results.push(
{/*
@@ -157,7 +160,7 @@ function SessionVoiceConversionResultsList(props: Props) { {wavesurfers}
- { Analytics.ttsClickResultLink(); @@ -166,7 +169,19 @@ function SessionVoiceConversionResultsList(props: Props) { > {t("common.SessionTtsInferenceResults.result.shareDownload")} - + */} + + { + Analytics.voiceConversionClickDownload(); + }} + download={audioDownloadFilename} + > + + Download File{" "} +
diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx index 923be851fd..f46341df40 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx @@ -160,16 +160,6 @@ function VcModelListPage(props: Props) {
); - // let comingSoon = ( - //
- //
- //
- // - //

This feature is coming soon!

- //
- //
- //
- // ); return ( @@ -362,23 +352,6 @@ function VcModelListPage(props: Props) { inferenceJobs={props.inferenceJobs} sessionSubscriptionsWrapper={props.sessionSubscriptionsWrapper} /> - {/*{noResultsSection}*/} - {/* -
-
Title
-

text

-
- (wavesurfer) -
- - - Details - -
-
*/}
From dc2bf87d81f0ba0f113d0f264b01570ba7b393be Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 25 Apr 2023 04:41:50 -0700 Subject: [PATCH 09/21] begin to categorize jobs --- packages/fakeyou.com/src/App.tsx | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/packages/fakeyou.com/src/App.tsx b/packages/fakeyou.com/src/App.tsx index 56446c57cc..ac08f69a70 100644 --- a/packages/fakeyou.com/src/App.tsx +++ b/packages/fakeyou.com/src/App.tsx @@ -130,7 +130,6 @@ interface State { isShowingBootstrapLanguageNotice: boolean; // Jobs enqueued during this browser session. - inferenceJobs: Array; ttsInferenceJobs: Array; w2lInferenceJobs: Array; ttsModelUploadJobs: Array; @@ -138,6 +137,10 @@ interface State { vocoderUploadJobs: Array; voiceConversionModelUploadJobs: Array; + // Generic inference jobs. + inferenceJobs: Array; + inferenceJobsByCategory: Map>; + // Current text entered textBuffer: string; @@ -152,6 +155,13 @@ function newVocodes() { return discord || twitter || alphaCookie; } +function initInferenceJobsByCategoryMap() : Map { + let inferenceJobsByCategory = new Map(); + inferenceJobsByCategory.set(FrontendInferenceJobType.TextToSpeech, []); + inferenceJobsByCategory.set(FrontendInferenceJobType.VoiceConversion, []); + return inferenceJobsByCategory; +} + function isMacOs() { // Not on macs yet // https://stackoverflow.com/a/38241481 @@ -176,6 +186,8 @@ class App extends React.Component { let showPleaseFollowNotice = false; + let inferenceJobsByCategory = initInferenceJobsByCategoryMap(); + this.state = { enableAlpha: enableAlpha, migrationMode: migrationMode, @@ -194,7 +206,6 @@ class App extends React.Component { isShowingPleaseFollowNotice: showPleaseFollowNotice, isShowingBootstrapLanguageNotice: false, - inferenceJobs: [], ttsInferenceJobs: [], w2lInferenceJobs: [], ttsModelUploadJobs: [], @@ -202,6 +213,9 @@ class App extends React.Component { vocoderUploadJobs: [], voiceConversionModelUploadJobs: [], + inferenceJobs: [], + inferenceJobsByCategory: inferenceJobsByCategory, + textBuffer: "", voiceConversionModels: [], @@ -338,6 +352,8 @@ class App extends React.Component { checkInferenceJob = async (jobToken: string) => { const lookupResult = await GetModelInferenceJobStatus(jobToken); + let inferenceJobsByCategory = initInferenceJobsByCategoryMap(); + if (GetModelInferenceJobStatusIsOk(lookupResult)) { let updatedJobs: Array = []; @@ -347,6 +363,7 @@ class App extends React.Component { !jobStateCanChange(existingJob.jobState) ) { updatedJobs.push(existingJob); + inferenceJobsByCategory.get(existingJob.frontendJobType)?.push(existingJob); return; } @@ -356,10 +373,12 @@ class App extends React.Component { ); updatedJobs.push(updatedJob); + inferenceJobsByCategory.get(updatedJob.frontendJobType)?.push(existingJob); }); this.setState({ inferenceJobs: updatedJobs, + inferenceJobsByCategory: inferenceJobsByCategory, }); } }; From 2827b575c98af17b37b98ba5dbf204408356ebd6 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 25 Apr 2023 04:50:05 -0700 Subject: [PATCH 10/21] separated categories --- packages/fakeyou.com/src/App.tsx | 1 + .../fakeyou.com/src/v2/view/PageContainer.tsx | 3 +++ .../tts/tts_model_list/TtsModelListPage.tsx | 3 ++- .../pages/vc/vc_model_list/VcModelListPage.tsx | 16 ++-------------- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/packages/fakeyou.com/src/App.tsx b/packages/fakeyou.com/src/App.tsx index ac08f69a70..89da118a2f 100644 --- a/packages/fakeyou.com/src/App.tsx +++ b/packages/fakeyou.com/src/App.tsx @@ -770,6 +770,7 @@ class App extends React.Component { } enqueueInferenceJob={this.enqueueInferenceJob} inferenceJobs={this.state.inferenceJobs} + inferenceJobsByCategory={this.state.inferenceJobsByCategory} enqueueTtsJob={this.enqueueTtsJob} ttsInferenceJobs={this.state.ttsInferenceJobs} enqueueW2lJob={this.enqueueW2lJob} diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index 70005c1c35..a04116d278 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -100,6 +100,7 @@ interface Props { enqueueInferenceJob: (jobToken: string, frontendInferenceJobType: FrontendInferenceJobType) => void; inferenceJobs: Array; + inferenceJobsByCategory: Map>; enqueueTtsJob: (jobToken: string) => void; ttsInferenceJobs: Array; @@ -499,6 +500,7 @@ class PageContainer extends React.Component { setMaybeSelectedVoiceConversionModel={this.props.setMaybeSelectedVoiceConversionModel} enqueueInferenceJob={this.props.enqueueInferenceJob} inferenceJobs={this.props.inferenceJobs} + inferenceJobsByCategory={this.props.inferenceJobsByCategory} /> @@ -590,6 +592,7 @@ class PageContainer extends React.Component { } enqueueInferenceJob={this.props.enqueueInferenceJob} inferenceJobs={this.props.inferenceJobs} + inferenceJobsByCategory={this.props.inferenceJobsByCategory} enqueueTtsJob={this.props.enqueueTtsJob} ttsInferenceJobs={this.props.ttsInferenceJobs} ttsModelUploadJobs={this.props.ttsModelUploadJobs} diff --git a/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_list/TtsModelListPage.tsx b/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_list/TtsModelListPage.tsx index 8c9ea4c76e..7815eb29dd 100644 --- a/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_list/TtsModelListPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_list/TtsModelListPage.tsx @@ -94,6 +94,7 @@ interface Props { enqueueInferenceJob: (jobToken: string, frontendInferenceJobType: FrontendInferenceJobType) => void; inferenceJobs: Array; + inferenceJobsByCategory: Map>; enqueueTtsJob: (jobToken: string) => void; ttsInferenceJobs: Array; @@ -609,7 +610,7 @@ function TtsModelListPage(props: Props) {
void; inferenceJobs: Array; + inferenceJobsByCategory: Map>; } function VcModelListPage(props: Props) { @@ -148,19 +149,6 @@ function VcModelListPage(props: Props) { const canBeginConversion = mediaUploadToken !== undefined && props.maybeSelectedVoiceConversionModel !== undefined; console.log('canBeginConversion', canBeginConversion, mediaUploadToken, props.maybeSelectedVoiceConversionModel); - let noResultsSection = ( -
-
- -
- {t("common.SessionTtsInferenceResults.noResults.title")} -
-

{t("common.SessionTtsInferenceResults.noResults.subtitle")}

-
-
- ); - - return (
From a38a8f904e65021f05146b51a30b3e95a9722949 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 25 Apr 2023 05:33:40 -0700 Subject: [PATCH 11/21] switch to landing page --- .../fakeyou.com/src/v2/view/PageContainer.tsx | 20 +++++++++---------- .../src/v2/view/pages/landing/LandingPage.tsx | 14 ++++++++----- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index a04116d278..9d19f30dfa 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -479,15 +479,6 @@ class PageContainer extends React.Component { - - - - { /> - + { } /> + + + + diff --git a/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx b/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx index 634ff30c80..1f74636c33 100644 --- a/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx @@ -109,14 +109,16 @@ function LandingPage(props: Props) { className="display-4 fw-bold lh-2 mb-3 zi-2" variants={item} > - Text to Speech, + AI Music,
- Voice, and AI Tools + Text to Speech, +
+ and Creator Tools
- Use FakeYou deep fake technology to say stuff with your favorite + Use FakeYou deep fake technology to make movies and music with your favorite characters.
@@ -159,7 +161,7 @@ function LandingPage(props: Props) {
@@ -168,7 +170,7 @@ function LandingPage(props: Props) { src="/mascot/VC-img.webp" alt="Voice Conversion" /> -

Voice Conversion

+

Music & Voice Conversion

Speak as your favorite characters
@@ -203,6 +205,7 @@ function LandingPage(props: Props) {
+ {/*
@@ -255,6 +258,7 @@ function LandingPage(props: Props) {
+ */}
From 6c1650594e02e73ff62c2eb6f352b92bf46125ad Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 25 Apr 2023 05:37:42 -0700 Subject: [PATCH 12/21] update links --- packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx | 6 +++++- packages/fakeyou.com/src/v2/view/nav/TopNav.tsx | 6 ++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx b/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx index 6848cf2ccd..b4eba4c83c 100644 --- a/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx +++ b/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx @@ -127,7 +127,11 @@ function FooterNav(props: Props) {

AI Tools

  • - Text to Speech + Text to Speech +
  • + +
  • + Voice Conversion
  • diff --git a/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx b/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx index 77c5914b5d..9a26d510ae 100644 --- a/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx +++ b/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx @@ -38,7 +38,7 @@ import "tippy.js/dist/tippy.css"; import "tippy.js/animations/shift-away.css"; import { ThirdPartyLinks } from "@storyteller/components/src/constants/ThirdPartyLinks"; import { Analytics } from "../../../common/Analytics"; -import { faWaveformLines } from "@fortawesome/pro-solid-svg-icons"; +import { faMicrophoneLines, faWaveformLines } from "@fortawesome/pro-solid-svg-icons"; import { faTvRetro } from "@fortawesome/pro-regular-svg-icons"; // TODO: This is duplicated in SessionTtsInferenceResultsList ! @@ -388,7 +388,7 @@ function TopNav(props: Props) { aria-labelledby="offcanvasNavbarLgDropdown-tts" >
  • - +
  • - {/* TODO(bt, 2023-01-11): Not ready to launch voice conversion
  • - */}
  • From 28c3f5ea971ce749686cdbc7f9be1de9b97f4104 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 25 Apr 2023 05:39:51 -0700 Subject: [PATCH 13/21] remove news link for now --- packages/fakeyou.com/src/v2/view/nav/TopNav.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx b/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx index 9a26d510ae..298f7100c5 100644 --- a/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx +++ b/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx @@ -357,7 +357,7 @@ function TopNav(props: Props) {
  • -
  • + {/*
  • { @@ -368,7 +368,7 @@ function TopNav(props: Props) { {t("nav.TopNav.main.newsLink")} -
  • + */}
  • {/* TODO(echelon): Fix the build warnings about href not being accessible. */} From d6f8db9aa3a71fc56eba02d904e612542787ebb4 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 25 Apr 2023 06:15:40 -0700 Subject: [PATCH 14/21] remove file selection for now --- .../vc/vc_model_list/VcModelListPage.tsx | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx index f46ec9bb58..6a3a9ac633 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx @@ -86,27 +86,26 @@ function VcModelListPage(props: Props) { ttsModelsLoaded, ]); - const handleLoading = useCallback(() => { + /*const handleLoading = useCallback(() => { setLoading(true); setTimeout(() => { setLoading(false); }, 2000); - }, []); + }, []);*/ useEffect(() => { listModels(); - const timeout = setTimeout(() => { - setLoading(false); - }, 2000); - return () => clearTimeout(timeout); + //const timeout = setTimeout(() => { + // setLoading(false); + //}, 2000); + //return () => clearTimeout(timeout); }, [ - handleLoading, + //handleLoading, listModels, ]); const handleClearClick = (ev: React.FormEvent) => { ev.preventDefault(); - return false; }; @@ -232,7 +231,7 @@ function VcModelListPage(props: Props) {
  • -
    + {/*
    @@ -256,7 +255,7 @@ function VcModelListPage(props: Props) { />
    - + */}
    */} +
    + + +
    - +
    @@ -294,6 +297,8 @@ function VcModelListPage(props: Props) {
    @@ -303,7 +308,7 @@ function VcModelListPage(props: Props) { className={speakButtonClass} onClick={handleVoiceConversion} type="submit" - disabled={!canBeginConversion} + disabled={!enableConvertButton} > void, + + formIsCleared: boolean, + setFormIsCleared: (cleared: boolean) => void, } export default function RecordComponent(props: Props) { @@ -45,30 +49,59 @@ export default function RecordComponent(props: Props) { return; } - (async () => { - let idempotencyToken = uuidv4(); + //(async () => { + // let idempotencyToken = uuidv4(); - const request : UploadAudioRequest = { - uuid_idempotency_token: idempotencyToken, - file: recordingBlob, - source: 'device', - } + // const request : UploadAudioRequest = { + // uuid_idempotency_token: idempotencyToken, + // file: recordingBlob, + // source: 'device', + // } - let result = await UploadAudio(request); + // let result = await UploadAudio(request); - if (UploadAudioIsOk(result)) { - //setIsUploadDisabled(true); - //ggprops.setMediaUploadToken(result.upload_token); - props.setMediaUploadToken(result.upload_token); - } - })(); + // if (UploadAudioIsOk(result)) { + // //setIsUploadDisabled(true); + // //ggprops.setMediaUploadToken(result.upload_token); + // props.setMediaUploadToken(result.upload_token); + // } + //})(); }, [recordingBlob]) + const handleStartRecording = async () => { + startRecording(); + props.setFormIsCleared(false); + }; const handleStopRecording = async (blob: any) => { stopRecording(); }; + const handleClear = () => { + stopRecording(); + props.setFormIsCleared(true); + }; + + const handleUpload = async () => { + const request : UploadAudioRequest = { + uuid_idempotency_token: uuidv4(), // TODO: only send on change. + file: recordingBlob, + source: 'device', + } + + let result = await UploadAudio(request); + + if (UploadAudioIsOk(result)) { + //setIsUploadDisabled(true); + //ggprops.setMediaUploadToken(result.upload_token); + props.setMediaUploadToken(result.upload_token); + } + } + + const speakButtonClass = false + ? "btn btn-primary w-100 disabled" + : "btn btn-primary w-100"; + return (
    {isRecording ? ( @@ -84,13 +117,46 @@ export default function RecordComponent(props: Props) {
    ) : ( - )} - + {props.formIsCleared ? ( + <> + ) : ( + + <> + + +
    + + +
    + + ) + + } + ); } From 4e1611d1a47c2eb60b3674e0bee7b5bf881fa3e9 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 25 Apr 2023 18:09:58 -0700 Subject: [PATCH 16/21] improved controls (2) --- .../vc/vc_model_list/VcModelListPage.tsx | 30 ++++++------------- .../components/RecordComponent.tsx | 29 +++++++++--------- 2 files changed, 23 insertions(+), 36 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx index fd1962bfde..38559573f9 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx @@ -43,6 +43,8 @@ interface Props { } function VcModelListPage(props: Props) { + usePrefixedDocumentTitle("Voice Conversion"); + const [loading, setLoading] = useState(false); const [canConvert, setCanConvert] = useState(false); @@ -51,11 +53,11 @@ function VcModelListPage(props: Props) { // Auto generated const [idempotencyToken, setIdempotencyToken] = useState(uuidv4()); - // UI hack + // NB: Something of a UI hack here. + // The 3rd party microphone component doesn't let you clear it, so we emulate form clearing + // with this variable. const [formIsCleared, setFormIsCleared] = useState(false); - usePrefixedDocumentTitle("Voice Conversion"); - let { setVoiceConversionModels, voiceConversionModels, @@ -63,10 +65,10 @@ function VcModelListPage(props: Props) { setMaybeSelectedVoiceConversionModel, } = props; - const ttsModelsLoaded = voiceConversionModels.length > 0; + const vcModelsLoaded = voiceConversionModels.length > 0; const listModels = useCallback(async () => { - if (ttsModelsLoaded) { + if (vcModelsLoaded) { return; // Already queried. } const models = await ListVoiceConversionModels(); @@ -87,26 +89,12 @@ function VcModelListPage(props: Props) { setVoiceConversionModels, maybeSelectedVoiceConversionModel, setMaybeSelectedVoiceConversionModel, - ttsModelsLoaded, + vcModelsLoaded, ]); - /*const handleLoading = useCallback(() => { - setLoading(true); - setTimeout(() => { - setLoading(false); - }, 2000); - }, []);*/ - useEffect(() => { listModels(); - //const timeout = setTimeout(() => { - // setLoading(false); - //}, 2000); - //return () => clearTimeout(timeout); - }, [ - //handleLoading, - listModels, - ]); + }, [listModels]); const handleClearClick = (ev: React.FormEvent) => { ev.preventDefault(); diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx index e2db9f10b4..f5298d5e0c 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx @@ -33,7 +33,7 @@ function RecordedAudioComponent(props: RecorderProps) { } interface Props { - setMediaUploadToken: (token: string) => void, + setMediaUploadToken: (token?: string) => void, formIsCleared: boolean, setFormIsCleared: (cleared: boolean) => void, @@ -70,15 +70,16 @@ export default function RecordComponent(props: Props) { const handleStartRecording = async () => { startRecording(); - props.setFormIsCleared(false); }; const handleStopRecording = async (blob: any) => { stopRecording(); + props.setFormIsCleared(false); }; const handleClear = () => { stopRecording(); + props.setMediaUploadToken(undefined); // clear props.setFormIsCleared(true); }; @@ -92,15 +93,16 @@ export default function RecordComponent(props: Props) { let result = await UploadAudio(request); if (UploadAudioIsOk(result)) { - //setIsUploadDisabled(true); - //ggprops.setMediaUploadToken(result.upload_token); props.setMediaUploadToken(result.upload_token); } } - const speakButtonClass = false - ? "btn btn-primary w-100 disabled" - : "btn btn-primary w-100"; + const enableMediaReview = !props.formIsCleared && recordingBlob !== undefined; + const enableUploadButton = !props.formIsCleared && recordingBlob !== undefined && !isRecording; + + const speakButtonClass = enableUploadButton + ? "btn btn-primary w-100" + : "btn btn-primary w-100 disabled"; return (
    @@ -123,10 +125,7 @@ export default function RecordComponent(props: Props) { )} - {props.formIsCleared ? ( - <> - ) : ( - + {enableMediaReview ? ( <> @@ -135,7 +134,7 @@ export default function RecordComponent(props: Props) { className={speakButtonClass} onClick={handleUpload} type="submit" - disabled={false} + disabled={!enableUploadButton} > Clear
    - ) - + ) : ( + <> + ) } From 71f9908535f838492902a15d111cad503a25d83d Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 25 Apr 2023 18:20:22 -0700 Subject: [PATCH 17/21] improved controls (3) --- .../vc/vc_model_list/VcModelListPage.tsx | 82 ++++++++++--------- .../components/RecordComponent.tsx | 50 +++++------ .../components/UploadComponent.tsx | 11 ++- 3 files changed, 77 insertions(+), 66 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx index 38559573f9..d5a9d7a245 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx @@ -219,6 +219,8 @@ function VcModelListPage(props: Props) {
    @@ -249,28 +251,28 @@ function VcModelListPage(props: Props) { */} -
    - +
    -
    -
    - +
    + +
    +
    -
    - - + +
    + + +
    + +
    +
    diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx index f5298d5e0c..5c11b09731 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx @@ -7,31 +7,6 @@ import { faMicrophone, faUpload } from "@fortawesome/pro-solid-svg-icons"; import { UploadAudio, UploadAudioIsOk, UploadAudioRequest } from "@storyteller/components/src/api/upload/UploadAudio"; import { faRightLeft, faTrash } from "@fortawesome/free-solid-svg-icons"; -interface RecorderProps { - recordingBlob: any; -} - -function RecordedAudioComponent(props: RecorderProps) { - - // Only generate the URL on change. - const audioLink = useMemo(() => { - if (!props.recordingBlob) { - return; - } - return URL.createObjectURL(props.recordingBlob); - }, [props.recordingBlob]); - - if (!props.recordingBlob) { - return <>; - } - - return ( -
    - -
    - ); -} - interface Props { setMediaUploadToken: (token?: string) => void, @@ -160,6 +135,31 @@ export default function RecordComponent(props: Props) { ); } +interface RecorderProps { + recordingBlob: any; +} + +function RecordedAudioComponent(props: RecorderProps) { + + // Only generate the URL on change. + const audioLink = useMemo(() => { + if (!props.recordingBlob) { + return; + } + return URL.createObjectURL(props.recordingBlob); + }, [props.recordingBlob]); + + if (!props.recordingBlob) { + return <>; + } + + return ( +
    + +
    + ); +} + /* In case you'd like to update colors of the icons just follow the instruction here: https://github.com/samhirtarif/react-audio-recorder/issues/19#issuecomment-1420248073 diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx index 6374c4f5a9..a2dbef9806 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx @@ -9,7 +9,10 @@ import { UploadAudio, UploadAudioIsOk, UploadAudioRequest } from "@storyteller/c const FILE_TYPES = ["MP3", "WAV", "FLAC"]; interface Props { - setMediaUploadToken: (token: string) => void, + setMediaUploadToken: (token?: string) => void, + + formIsCleared: boolean, + setFormIsCleared: (cleared: boolean) => void, } function UploadComponent(props: Props) { @@ -25,6 +28,7 @@ function UploadComponent(props: Props) { setIdempotencyToken(uuidv4()); const audioUrl = URL.createObjectURL(file); setAudioLink(audioUrl ?? ""); + props.setFormIsCleared(false); }; const handleDragOver = (e: React.DragEvent): void => { @@ -39,6 +43,11 @@ function UploadComponent(props: Props) { e.currentTarget.classList.remove("upload-zone-drag"); }; + const handleClear = () => { + props.setMediaUploadToken(undefined); // clear + props.setFormIsCleared(true); + }; + const handleUploadFile = async () => { if (file === undefined) { return false; From 8493ae5d93acfb69d0133c3822aa45e990bc7b6a Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 25 Apr 2023 18:37:30 -0700 Subject: [PATCH 18/21] improved controls (4) --- .../vc_model_list/components/UploadComponent.tsx | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx index a2dbef9806..ebd883e456 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx @@ -1,4 +1,4 @@ -import { faFileArrowUp, faFileAudio } from "@fortawesome/pro-solid-svg-icons"; +import { faFileArrowUp, faFileAudio, faTrash } from "@fortawesome/pro-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import React, { useState } from "react"; import { FileUploader } from "react-drag-drop-files"; @@ -24,6 +24,7 @@ function UploadComponent(props: Props) { const [idempotencyToken, setIdempotencyToken] = useState(uuidv4()); const handleChange = (file: any) => { + console.log('handle change'); setFile(file); setIdempotencyToken(uuidv4()); const audioUrl = URL.createObjectURL(file); @@ -44,6 +45,9 @@ function UploadComponent(props: Props) { }; const handleClear = () => { + setFile(null); + setAudioLink(""); + setIdempotencyToken(uuidv4()); props.setMediaUploadToken(undefined); // clear props.setFormIsCleared(true); }; @@ -169,6 +173,14 @@ function UploadComponent(props: Props) { /> Upload Audio + + ) : ( <> From be195adf2cfa19ee6f0c5ce83a02d525dcdc028d Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 25 Apr 2023 18:49:12 -0700 Subject: [PATCH 19/21] improved controls (5) --- .../src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx | 3 ++- .../pages/vc/vc_model_list/components/RecordComponent.tsx | 7 +++++++ .../pages/vc/vc_model_list/components/UploadComponent.tsx | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx index d5a9d7a245..724d155247 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx @@ -221,6 +221,7 @@ function VcModelListPage(props: Props) { setMediaUploadToken={setMediaUploadToken} formIsCleared={formIsCleared} setFormIsCleared={setFormIsCleared} + setCanConvert={setCanConvert} /> @@ -289,11 +290,11 @@ function VcModelListPage(props: Props) { setMediaUploadToken={setMediaUploadToken} formIsCleared={formIsCleared} setFormIsCleared={setFormIsCleared} + setCanConvert={setCanConvert} /> -
    @@ -291,6 +295,7 @@ function VcModelListPage(props: Props) { formIsCleared={formIsCleared} setFormIsCleared={setFormIsCleared} setCanConvert={setCanConvert} + changeConvertIdempotencyToken={changeConvertIdempotencyToken} /> diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx index 4c279fb865..2cb9fb92d8 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx @@ -14,6 +14,7 @@ interface Props { setFormIsCleared: (cleared: boolean) => void, setCanConvert: (canConvert: boolean) => void, + changeConvertIdempotencyToken: () => void, } export default function RecordComponent(props: Props) { @@ -61,6 +62,7 @@ export default function RecordComponent(props: Props) { props.setMediaUploadToken(undefined); // clear props.setFormIsCleared(true); props.setCanConvert(false); + props.changeConvertIdempotencyToken(); }; const handleUpload = async () => { @@ -76,6 +78,7 @@ export default function RecordComponent(props: Props) { props.setMediaUploadToken(result.upload_token); props.setFormIsCleared(false); props.setCanConvert(true); + props.changeConvertIdempotencyToken(); } } diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx index 20d41f5691..089e940d64 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/UploadComponent.tsx @@ -15,6 +15,7 @@ interface Props { setFormIsCleared: (cleared: boolean) => void, setCanConvert: (canConvert: boolean) => void, + changeConvertIdempotencyToken: () => void, } function UploadComponent(props: Props) { @@ -33,6 +34,7 @@ function UploadComponent(props: Props) { setAudioLink(audioUrl ?? ""); props.setFormIsCleared(false); props.setCanConvert(false); + props.changeConvertIdempotencyToken(); }; const handleDragOver = (e: React.DragEvent): void => { @@ -54,6 +56,7 @@ function UploadComponent(props: Props) { props.setMediaUploadToken(undefined); // clear props.setFormIsCleared(true); props.setCanConvert(false); + props.changeConvertIdempotencyToken(); }; const handleUploadFile = async () => { From d721a5e4f0052acd08a081ea5641ce0e2e827acb Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 25 Apr 2023 19:16:53 -0700 Subject: [PATCH 21/21] fix build errors --- .../_common/SessionVoiceConversionResultsList.tsx | 1 - packages/fakeyou.com/src/v2/view/nav/TopNav.tsx | 1 - .../src/v2/view/pages/landing/LandingPage.tsx | 5 ----- .../pages/vc/vc_model_list/VcModelListPage.tsx | 14 ++------------ .../vc_model_list/components/RecordComponent.tsx | 4 ++-- 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/_common/SessionVoiceConversionResultsList.tsx b/packages/fakeyou.com/src/v2/view/_common/SessionVoiceConversionResultsList.tsx index d312c5253b..64ac3462ef 100644 --- a/packages/fakeyou.com/src/v2/view/_common/SessionVoiceConversionResultsList.tsx +++ b/packages/fakeyou.com/src/v2/view/_common/SessionVoiceConversionResultsList.tsx @@ -7,7 +7,6 @@ import { JobState } from "@storyteller/components/src/jobs/JobStates"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faClock, - faLink, faHeadphonesSimple, faDownload, } from "@fortawesome/free-solid-svg-icons"; diff --git a/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx b/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx index 298f7100c5..a7ffdac5e8 100644 --- a/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx +++ b/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx @@ -39,7 +39,6 @@ import "tippy.js/animations/shift-away.css"; import { ThirdPartyLinks } from "@storyteller/components/src/constants/ThirdPartyLinks"; import { Analytics } from "../../../common/Analytics"; import { faMicrophoneLines, faWaveformLines } from "@fortawesome/pro-solid-svg-icons"; -import { faTvRetro } from "@fortawesome/pro-regular-svg-icons"; // TODO: This is duplicated in SessionTtsInferenceResultsList ! // Default to querying every 15 seconds, but make it configurable serverside diff --git a/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx b/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx index 1f74636c33..72e47d6a13 100644 --- a/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx @@ -9,11 +9,6 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faUsers, faStar, - faShapes, - faMicrophoneAlt, - faPaintBrush, - faPersonRunning, - faMusic, faArrowRight, faUser, } from "@fortawesome/free-solid-svg-icons"; diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx index 57271f9273..45d0601cb9 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/VcModelListPage.tsx @@ -1,21 +1,15 @@ import React, { useState, useEffect, useCallback } from "react"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; -import { t } from "i18next"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { motion } from "framer-motion"; import { v4 as uuidv4 } from "uuid"; import { container, panel } from "../../../../../data/animation"; import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper"; import { VcPageHero } from "./components/VcPageHero"; -import Select, { createFilter } from "react-select"; -import { SearchFieldClass } from "../../tts/tts_model_list/search/components/SearchFieldClass"; import { faBarsStaggered, - faFiles, - faHeadphones, faMicrophone, faRightLeft, - faTrash, } from "@fortawesome/pro-solid-svg-icons"; import UploadComponent from "./components/UploadComponent"; import RecordComponent from "./components/RecordComponent"; @@ -45,7 +39,6 @@ interface Props { function VcModelListPage(props: Props) { usePrefixedDocumentTitle("Voice Conversion"); - const [loading, setLoading] = useState(false); const [canConvert, setCanConvert] = useState(false); const [mediaUploadToken, setMediaUploadToken] = useState(undefined); @@ -95,11 +88,6 @@ function VcModelListPage(props: Props) { listModels(); }, [listModels]); - const handleClearClick = (ev: React.FormEvent) => { - ev.preventDefault(); - return false; - }; - const changeConvertIdempotencyToken = () => { setConvertIdempotencyToken(uuidv4()); } @@ -135,6 +123,8 @@ function VcModelListPage(props: Props) { ev.preventDefault(); }; + const loading = false; // TODO: Remove. + const speakButtonClass = loading ? "btn btn-primary w-100 disabled" : "btn btn-primary w-100"; diff --git a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx index 2cb9fb92d8..8e7c6bc59f 100644 --- a/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/vc/vc_model_list/components/RecordComponent.tsx @@ -1,11 +1,11 @@ -import React, { useEffect, useMemo, useState } from "react"; +import React, { useEffect, useMemo } from "react"; import { v4 as uuidv4 } from "uuid"; import { useAudioRecorder } from "react-audio-voice-recorder"; import { InputVcAudioPlayer } from "../../../../_common/InputVcAudioPlayer"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faMicrophone, faUpload } from "@fortawesome/pro-solid-svg-icons"; import { UploadAudio, UploadAudioIsOk, UploadAudioRequest } from "@storyteller/components/src/api/upload/UploadAudio"; -import { faRightLeft, faTrash } from "@fortawesome/free-solid-svg-icons"; +import { faTrash } from "@fortawesome/free-solid-svg-icons"; interface Props { setMediaUploadToken: (token?: string) => void,