From 9a0b95d26b8fb6c9ccf151be6f5ecf56e2276753 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 1 Apr 2023 02:56:13 -0700 Subject: [PATCH] Select Trump models on page --- packages/components/src/api/ApiConfig.ts | 3 ++ .../fakeyou.com/src/v2/view/PageContainer.tsx | 4 +- .../{ => character}/trump/TrumpTtsPage.tsx | 37 +++++++++++++++---- .../trump/TrumpTtsPageHero.tsx | 10 ++--- .../trump/search/SearchOmnibar.tsx | 2 +- .../components/ScopedVoiceModelOptions.tsx | 8 ++-- .../search/components/SearchFieldClass.ts | 0 .../search/components/VoiceCountLabel.tsx | 4 +- .../trump/search/filters/CategoryOptions.tsx | 4 +- .../trump/search/filters/LanguageOptions.tsx | 4 +- 10 files changed, 50 insertions(+), 26 deletions(-) rename packages/fakeyou.com/src/v2/view/pages/{ => character}/trump/TrumpTtsPage.tsx (91%) rename packages/fakeyou.com/src/v2/view/pages/{ => character}/trump/TrumpTtsPageHero.tsx (84%) rename packages/fakeyou.com/src/v2/view/pages/{ => character}/trump/search/SearchOmnibar.tsx (97%) rename packages/fakeyou.com/src/v2/view/pages/{ => character}/trump/search/components/ScopedVoiceModelOptions.tsx (94%) rename packages/fakeyou.com/src/v2/view/pages/{ => character}/trump/search/components/SearchFieldClass.ts (100%) rename packages/fakeyou.com/src/v2/view/pages/{ => character}/trump/search/components/VoiceCountLabel.tsx (95%) rename packages/fakeyou.com/src/v2/view/pages/{ => character}/trump/search/filters/CategoryOptions.tsx (97%) rename packages/fakeyou.com/src/v2/view/pages/{ => character}/trump/search/filters/LanguageOptions.tsx (94%) diff --git a/packages/components/src/api/ApiConfig.ts b/packages/components/src/api/ApiConfig.ts index ca754d2924..ada9b5f4e8 100644 --- a/packages/components/src/api/ApiConfig.ts +++ b/packages/components/src/api/ApiConfig.ts @@ -95,6 +95,9 @@ class ApiConfig { } } + //v2ApiHost = "api.dev.fakeyou.com:12345"; + //useSsl = false; + this.domain = domain; this.useSsl = useSsl; this.v2ApiHost = v2ApiHost; diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index e248d681ad..b426004016 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -66,7 +66,7 @@ import { GetComputedTtsCategoryAssignmentsSuccessResponse } from "@storyteller/c import { NewsPage } from "./pages/news/NewsPage"; import { LandingPage } from "./pages/landing/LandingPage"; import { ChannelsPage } from "./pages/channels/Channels"; -import { TrumpTtsPage } from "./pages/trump/TrumpTtsPage"; +import { TrumpTtsPage } from "./pages/character/trump/TrumpTtsPage"; //import { LandingPage } from "./pages/landing/LandingPage"; //import { VcModelListPage } from "./pages/vc/vc_model_list/VcModelListPage"; @@ -480,7 +480,7 @@ class PageContainer extends React.Component { - + ([ + "TM:pmd1wm3kf6az", // Development: "Fake Donald Trump #1" + "TM:7rrwdhdq8ezq", // Development: "Fake Donald Trump #2" + //"TM:aejrk66wq3ss", // Production: "Donald Trump (bibby's model)" + "TM:pyzss4phqk6r", // Production: "Donald Trump (Sarcastic)" + "TM:4v0ft4j72y2g", // Production: "Donald Trump (Angry)" + "TM:03690khwpsbz", // Production: "Donald Trump (Casual Speech)" + ]); + + let trumpModels = props.ttsModels.filter((model) => { + return TOKENS.has(model.model_token); + }) + + let maybeSelectedModel = props.maybeSelectedTtsModel; + + if (maybeSelectedModel !== undefined && !TOKENS.has(maybeSelectedModel.model_token)) { + // If we don't select a trump model by default (which is rare), the list will be empty. + // We'll set it here. + maybeSelectedModel = trumpModels[0]; + } + return ( { - const images = ["mascot/trump.webp"]; + const images = ["/mascot/trump.webp"]; return images[Math.floor(Math.random() * images.length)]; }, []); @@ -57,7 +57,7 @@ export function TtsPageHero(props: Props) { const titleIcon = ; const title = <>Donald Trump TTS; const subText = ( - <>Type your text below and hear it in the voice of Donald Trump. + <>FakeYou has the very best Donald Trump AI voice on the internet. Use deep fake Donald Trump to say your favorite memes. ); const actionButtons = ( <> diff --git a/packages/fakeyou.com/src/v2/view/pages/trump/search/SearchOmnibar.tsx b/packages/fakeyou.com/src/v2/view/pages/character/trump/search/SearchOmnibar.tsx similarity index 97% rename from packages/fakeyou.com/src/v2/view/pages/trump/search/SearchOmnibar.tsx rename to packages/fakeyou.com/src/v2/view/pages/character/trump/search/SearchOmnibar.tsx index 77832ed760..a56b86517b 100644 --- a/packages/fakeyou.com/src/v2/view/pages/trump/search/SearchOmnibar.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/character/trump/search/SearchOmnibar.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { TtsCategoryType } from "../../../../../AppWrapper"; +import { TtsCategoryType } from "../../../../../../AppWrapper"; import { TtsModelListItem } from "@storyteller/components/src/api/tts/ListTtsModels"; import { ScopedVoiceModelOptions } from "./components/ScopedVoiceModelOptions"; import { VoiceCountLabel } from "./components/VoiceCountLabel"; diff --git a/packages/fakeyou.com/src/v2/view/pages/trump/search/components/ScopedVoiceModelOptions.tsx b/packages/fakeyou.com/src/v2/view/pages/character/trump/search/components/ScopedVoiceModelOptions.tsx similarity index 94% rename from packages/fakeyou.com/src/v2/view/pages/trump/search/components/ScopedVoiceModelOptions.tsx rename to packages/fakeyou.com/src/v2/view/pages/character/trump/search/components/ScopedVoiceModelOptions.tsx index f69d899705..83e92181d4 100644 --- a/packages/fakeyou.com/src/v2/view/pages/trump/search/components/ScopedVoiceModelOptions.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/character/trump/search/components/ScopedVoiceModelOptions.tsx @@ -1,12 +1,12 @@ import React from "react"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { TtsModelListItem } from "@storyteller/components/src/api/tts/ListTtsModels"; -import { TtsCategoryType } from "../../../../../../AppWrapper"; +import { TtsCategoryType } from "../../../../../../../AppWrapper"; import Select, { createFilter } from "react-select"; import { SearchFieldClass } from "./SearchFieldClass"; -import { FastReactSelectOption } from "../../../../_common/react_select/FastReactSelectOption"; -import { Analytics } from "../../../../../../common/Analytics"; -import { FixedSingleValueSelectOption } from "../../../../_common/react_select/FixedSingleValueSelectOption"; +import { FastReactSelectOption } from "../../../../../_common/react_select/FastReactSelectOption"; +import { Analytics } from "../../../../../../../common/Analytics"; +import { FixedSingleValueSelectOption } from "../../../../../_common/react_select/FixedSingleValueSelectOption"; import { faMicrophone } from "@fortawesome/pro-duotone-svg-icons"; interface Props { diff --git a/packages/fakeyou.com/src/v2/view/pages/trump/search/components/SearchFieldClass.ts b/packages/fakeyou.com/src/v2/view/pages/character/trump/search/components/SearchFieldClass.ts similarity index 100% rename from packages/fakeyou.com/src/v2/view/pages/trump/search/components/SearchFieldClass.ts rename to packages/fakeyou.com/src/v2/view/pages/character/trump/search/components/SearchFieldClass.ts diff --git a/packages/fakeyou.com/src/v2/view/pages/trump/search/components/VoiceCountLabel.tsx b/packages/fakeyou.com/src/v2/view/pages/character/trump/search/components/VoiceCountLabel.tsx similarity index 95% rename from packages/fakeyou.com/src/v2/view/pages/trump/search/components/VoiceCountLabel.tsx rename to packages/fakeyou.com/src/v2/view/pages/character/trump/search/components/VoiceCountLabel.tsx index 51bf89b5c4..7780d70480 100644 --- a/packages/fakeyou.com/src/v2/view/pages/trump/search/components/VoiceCountLabel.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/character/trump/search/components/VoiceCountLabel.tsx @@ -1,9 +1,9 @@ import React from "react"; import { TtsModelListItem } from "@storyteller/components/src/api/tts/ListTtsModels"; -import { TtsCategoryType } from "../../../../../../AppWrapper"; +import { TtsCategoryType } from "../../../../../../../AppWrapper"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faShuffle } from "@fortawesome/pro-solid-svg-icons"; -import { Analytics } from "../../../../../../common/Analytics"; +import { Analytics } from "../../../../../../../common/Analytics"; import { GetRandomArrayValue } from "@storyteller/components/src/utils/GetRandomArrayValue"; import Tippy from "@tippyjs/react"; import "tippy.js/dist/tippy.css"; diff --git a/packages/fakeyou.com/src/v2/view/pages/trump/search/filters/CategoryOptions.tsx b/packages/fakeyou.com/src/v2/view/pages/character/trump/search/filters/CategoryOptions.tsx similarity index 97% rename from packages/fakeyou.com/src/v2/view/pages/trump/search/filters/CategoryOptions.tsx rename to packages/fakeyou.com/src/v2/view/pages/character/trump/search/filters/CategoryOptions.tsx index 244888a430..98b91193ed 100644 --- a/packages/fakeyou.com/src/v2/view/pages/trump/search/filters/CategoryOptions.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/character/trump/search/filters/CategoryOptions.tsx @@ -2,11 +2,11 @@ import React from "react"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faArrowRightLong, faTags } from "@fortawesome/free-solid-svg-icons"; import { TtsModelListItem } from "@storyteller/components/src/api/tts/ListTtsModels"; -import { TtsCategoryType } from "../../../../../../AppWrapper"; +import { TtsCategoryType } from "../../../../../../../AppWrapper"; //import { useTranslation } from "react-i18next"; import Select from "react-select"; import { SearchFieldClass } from "../components/SearchFieldClass"; -import { Analytics } from "../../../../../../common/Analytics"; +import { Analytics } from "../../../../../../../common/Analytics"; import { t } from "i18next"; interface Props { diff --git a/packages/fakeyou.com/src/v2/view/pages/trump/search/filters/LanguageOptions.tsx b/packages/fakeyou.com/src/v2/view/pages/character/trump/search/filters/LanguageOptions.tsx similarity index 94% rename from packages/fakeyou.com/src/v2/view/pages/trump/search/filters/LanguageOptions.tsx rename to packages/fakeyou.com/src/v2/view/pages/character/trump/search/filters/LanguageOptions.tsx index 2eafeb569a..eb7bf6d251 100644 --- a/packages/fakeyou.com/src/v2/view/pages/trump/search/filters/LanguageOptions.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/character/trump/search/filters/LanguageOptions.tsx @@ -3,8 +3,8 @@ import { faGlobe } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import Select from "react-select"; import { SearchFieldClass } from "../components/SearchFieldClass"; -import { AVAILABLE_TTS_LANGUAGE_CATEGORY_MAP } from "../../../../../../_i18n/AvailableLanguageMap"; -import { Analytics } from "../../../../../../common/Analytics"; +import { AVAILABLE_TTS_LANGUAGE_CATEGORY_MAP } from "../../../../../../../_i18n/AvailableLanguageMap"; +import { Analytics } from "../../../../../../../common/Analytics"; import { t } from "i18next"; interface Props {