diff --git a/packages/fakeyou/src/App.tsx b/packages/fakeyou/src/App.tsx index 5bf66f2978..2b90ec0c47 100644 --- a/packages/fakeyou/src/App.tsx +++ b/packages/fakeyou/src/App.tsx @@ -1,3 +1,5 @@ +import "./AppNew.scss"; + import React from "react"; import { ApiConfig } from "@storyteller/components"; import { @@ -30,7 +32,6 @@ import { TtsCategoryType } from "./AppWrapper"; import { FAKEYOU_MERGED_TRANSLATIONS } from "./_i18n/FakeYouTranslations"; import i18n from "i18next"; import { initReactI18next } from "react-i18next"; -import { USE_REFRESH } from "./Refresh"; import { VocoderUploadJob } from "@storyteller/components/src/jobs/VocoderUploadJobs"; import { GetRetrievalJobStatus, GetRetrievalJobStatusIsOk } from "@storyteller/components/src/api/retrieval/GetRetrievalJobStatus"; @@ -172,28 +173,6 @@ class App extends React.Component { }; } - componentWillMount() { - // Handle redesign - console.log('componentWillMount', 'useRefresh?', USE_REFRESH); - - if (USE_REFRESH) { - // Redesign-specific CSS - // NB(echelon): Despite the branches here, scss is all combined together at compile time - // in staging and production (not development). To handle those environments, styles are - // additionally applied based on the root "fakeyou-refresh" class, which may have changed - // some of the specificity rules of Bootstrap. - require("./AppNew.scss"); - } else { - // Old design CSS - // NB(echelon): Despite the branches here, scss is all combined together at compile time - // in staging and production (not development). To handle those environments, styles are - // additionally applied based on the root "fakeyou-old" class, which may have changed some - // of the specificity rules of Bulma. - require("./AppOld.scss"); - require("./v2/view/_css/footer.scss"); - } - } - async componentDidMount() { await this.querySession(); await this.queryLanguage(); @@ -624,16 +603,10 @@ class App extends React.Component { }; public render() { - // Redesign features - let mainClassNames = USE_REFRESH ? "bg-gradient" : ""; - if (USE_REFRESH) { - - } - return ( - -
+ +
diff --git a/packages/fakeyou/src/Refresh.ts b/packages/fakeyou/src/Refresh.ts deleted file mode 100644 index cc6249d014..0000000000 --- a/packages/fakeyou/src/Refresh.ts +++ /dev/null @@ -1 +0,0 @@ -export const USE_REFRESH = true; diff --git a/packages/fakeyou/src/index.tsx b/packages/fakeyou/src/index.tsx index 8a5f2e672b..16b95bd78a 100644 --- a/packages/fakeyou/src/index.tsx +++ b/packages/fakeyou/src/index.tsx @@ -2,7 +2,6 @@ import React from 'react'; import ReactDOM from 'react-dom'; import * as serviceWorker from './serviceWorker'; import AppTranslated from './AppTranslated'; -import { USE_REFRESH } from './Refresh'; const IS_IOS : boolean = /iPad|iPhone|iPod/.test(navigator.platform || ""); @@ -10,32 +9,25 @@ const enableSpectrograms = !IS_IOS; const flashVocodesNotice = new URLSearchParams(window.location.search).has('vocodes'); -const designSystemClass = USE_REFRESH ? 'fakeyou-refresh' : 'fakeyou-old'; +const designSystemClass = 'fakeyou-refresh'; + document.getElementsByTagName('html')[0].classList.add(designSystemClass); // We can't include Bootstrap CSS along with Bulma since some of the class names conflict. // TODO(echelon): Once ported, statically move CSS to "index.html". -if (USE_REFRESH) { - const bootstrapCss = document.createElement("link"); - bootstrapCss.setAttribute("rel", "stylesheet"); - bootstrapCss.setAttribute("crossorigin", "anonymous"); - bootstrapCss.setAttribute("integrity", "sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3"); - bootstrapCss.setAttribute("href", "https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css"); - document.getElementsByTagName("head")[0].appendChild(bootstrapCss); +const bootstrapCss = document.createElement("link"); +bootstrapCss.setAttribute("rel", "stylesheet"); +bootstrapCss.setAttribute("crossorigin", "anonymous"); +bootstrapCss.setAttribute("integrity", "sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3"); +bootstrapCss.setAttribute("href", "https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css"); +document.getElementsByTagName("head")[0].appendChild(bootstrapCss); - const bootstrapJs = document.createElement("script"); - bootstrapJs.setAttribute("rel", "stylesheet"); - bootstrapJs.setAttribute("crossorigin", "anonymous"); - bootstrapJs.setAttribute("integrity", "sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p"); - bootstrapJs.setAttribute("src", "https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"); - document.getElementsByTagName("body")[0].appendChild(bootstrapJs); -} else { - const bulmaCss = document.createElement("link"); - bulmaCss.setAttribute("rel", "stylesheet"); - bulmaCss.setAttribute("crossorigin", "anonymous"); - bulmaCss.setAttribute("href", "https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css"); - document.getElementsByTagName("head")[0].prepend(bulmaCss); -} +const bootstrapJs = document.createElement("script"); +bootstrapJs.setAttribute("rel", "stylesheet"); +bootstrapJs.setAttribute("crossorigin", "anonymous"); +bootstrapJs.setAttribute("integrity", "sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p"); +bootstrapJs.setAttribute("src", "https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"); +document.getElementsByTagName("body")[0].appendChild(bootstrapJs); ReactDOM.render( diff --git a/packages/fakeyou/src/v2/view/NewFooterNavFc.tsx b/packages/fakeyou/src/v2/view/NewFooterNavFc.tsx index 4cd60d92d9..8d3addae7d 100644 --- a/packages/fakeyou/src/v2/view/NewFooterNavFc.tsx +++ b/packages/fakeyou/src/v2/view/NewFooterNavFc.tsx @@ -15,7 +15,6 @@ import { faTwitter, faFacebook, } from "@fortawesome/free-brands-svg-icons"; -import { USE_REFRESH } from "../../Refresh"; interface Props { sessionWrapper: SessionWrapper; @@ -34,92 +33,6 @@ function NewFooterNavFc(props: Props) { ); } - if (!USE_REFRESH) { - return ( -
-
-
-

- {t("coreUi.footerNav.textToSpeech")} -  | - {t("coreUi.footerNav.video")} -  | - {t("coreUi.footerNav.upload")} -  | - {t("coreUi.footerNav.leaderboard")} -  | - - {t("coreUi.footerNav.patrons")} - -  | - {t("coreUi.footerNav.feed")} -  | - - {t("coreUi.footerNav.apiDocs")} - -  | - {t("coreUi.footerNav.aboutUs")} -  | - {t("coreUi.footerNav.termsOfUse")} -

- - - -

- - Built by @echelon in Atlanta. - -

- -

- -

- - {moderationLink} -
-
- ); - } - return (
diff --git a/packages/fakeyou/src/v2/view/NewTopNavFc.tsx b/packages/fakeyou/src/v2/view/NewTopNavFc.tsx index b6a5722548..01cc476315 100644 --- a/packages/fakeyou/src/v2/view/NewTopNavFc.tsx +++ b/packages/fakeyou/src/v2/view/NewTopNavFc.tsx @@ -1,12 +1,9 @@ import React, { useEffect, useState } from "react"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { Link, useHistory } from "react-router-dom"; -import { MigrationTopNavSession } from "../../migration/MigrationTopNav_Session"; import { FrontendUrlConfig } from "../../common/FrontendUrlConfig"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { - faGavel, - faGrinBeamSweat, faMicrophone, faVolumeUp, faPlus, @@ -19,8 +16,6 @@ import { faSignOutAlt, } from "@fortawesome/free-solid-svg-icons"; import { faPatreon } from "@fortawesome/free-brands-svg-icons"; -import { t } from "i18next"; -import { USE_REFRESH } from "../../Refresh"; import { Logout } from "@storyteller/components/src/api/session/Logout"; import { Gravatar } from "@storyteller/components/src/elements/Gravatar"; import { GetPendingTtsJobCount, GetPendingTtsJobCountIsOk, GetPendingTtsJobCountSuccessResponse } from "@storyteller/components/src/api/tts/GetPendingTtsJobCount"; @@ -64,202 +59,6 @@ function NewTopNavFc(props: Props) { return () => clearInterval(interval); }, [pendingTtsJobs]); - const [mobileHamburgerIsActive, setMobileHamburgerIsActive] = - useState(false); - - const toggleHamburger = () => { - setMobileHamburgerIsActive(!mobileHamburgerIsActive); - }; - - const closeHamburger = () => { - // TODO: This is an ergonomic hack. - // The hamburger ideally should close whenever it is no longer active. - setMobileHamburgerIsActive(false); - }; - - const navbarClasses = mobileHamburgerIsActive - ? "navbar-menu is-active" - : "navbar-menu"; - const navbarBurgerClasses = mobileHamburgerIsActive - ? "navbar-burger is-active" - : "navbar-burger"; - - if (!USE_REFRESH) { - return ( - <> - - - ); - } - const logoutHandler = async () => { await Logout(); props.querySessionCallback(); diff --git a/packages/fakeyou/src/v2/view/about/about_page/AboutPage.tsx b/packages/fakeyou/src/v2/view/about/about_page/AboutPage.tsx index 91a22591ab..0b4da2281f 100644 --- a/packages/fakeyou/src/v2/view/about/about_page/AboutPage.tsx +++ b/packages/fakeyou/src/v2/view/about/about_page/AboutPage.tsx @@ -1,276 +1,11 @@ import React from "react"; import { Link } from "react-router-dom"; -import { USE_REFRESH } from "../../../../Refresh"; import { motion } from "framer-motion"; import { container, item, image, panel } from "../../../../data/animation"; interface Props {} function AboutPage(props: Props) { - if (!USE_REFRESH) { - return ( -
-
-
-
-
-
- FakeYou Kitsune Mascot! -
-
- -
-

A Glimpse of the Future

-

- We're building FakeYou as just one component - of a broad set of production and creative tooling. -

-
-
-
-
- -

About FakeYou

- -

- Your brain was already capable of imagining things spoken in other - people's voices. This is a demonstration of how far computers have - caught up. One day computers will be able to bring all of the rich and - vivid imagery of your hopes and dreams to life. There's never been a - better time throughout all history to be a creative than now. -

- -

Technology disclosure

- -

- - We'll be happy to remove any of the voices featured here for any - reason. See our terms page for more info. - -

- -

- ”Deep fakes” are kind of like Photoshop when it first came - out. They're impressive, maybe a little bit scary, but they're about - to become the new norm. People will become accustomed to the - technology, and the results will be used mostly for creative good, - unlocking previously costly and unattainable high production values - for individual creators. It's our belief that the next Hollywood will - be you. -

- -

- The technology to clone voices is already out in the open, and the - voices here are built by a community of contributors. We're not the - only website doing this, and plenty of people are producing these same - results on their own at home, independent of our work. You can see - thousands of examples on YouTube and social media. -

- -

- Even if the United States chooses to ban this technology, institutions - in China, Japan, Canada, and other countries all over the world are - rapidly conducting and publishing research on this topic. People - everywhere have access to this easy-to-use technology. State actors - probably have even more sophisiticated versions available. -

- -

- As an interesting point, most if not all of the voices produced by - this website are actually - Linda Johnson with a little bit layered on top. -

- -

- - NVIDIA makes these tools publicly available for you to make your own - voice models - - . Check it out! -

- -

FakeYou was previously Vocodes

- -

- FakeYou.com was previously known as https://vo.codes, - but has been rebranded to better reflect its purpose and direction. - (Not many people know what a vocoder is anyway, so it didn't - make sense to keep the name.) -

- -

Thanks

- -

- Thanks to the following individuals (in no particular order) for help - with data gathering and annotation, Discord moderation, ML advice, - etc. -

- -

- Vegito1089, Shin, Ashurath, MakaveliGH, Blutarch Mann, Yahia, Tim - Squid, Seuneramet, Matt, Seth, CookiePPP, - - @r9y9 - - . -

- -

- The following papers, models, and resources were used: - - Tacotron2 - {" "} - (BSD-3 license), - - glow-tts - {" "} - (MIT license), {/* MIT */} - - MelGAN - {" "} - (BSD-3 license), {/* BSD3 */} - - Multi-band MelGAN - {" "} - (paper), - - HiFi-GAN - {" "} - (paper), - - Wav2Lip - {" "} - (MIT license), {/* Non-commercial */} - - CMUDict - {" "} - (BSD-2 license), - - LJSpeech - {" "} - (public domain), - - VCTK - {" "} - (CC BY 4.0). -

- -

- Videos are generated by the amazing Wav2Lip system{" "} - - (paper) - - , by Prajwal{" "} - - (@prajwalkr14) - - , K R and Mukhopadhyay, Rudrabha and Namboodiri, Vinay P. and Jawahar, - C.V. -

- -

Contact

- -

- Reach out to "echelon" on{" "} - - Twitter - -  and Hacker News. Say hi. -

- -

The Storyteller Company (registered as Learning Machines, LLC)

- -

Built With

- -
-
-
- models are written in pytorch -
-
-
-
- core server components are written in Rust -
-
-
-
- the cluster scales with k8s -
-
-
-
- ); - } - return (
diff --git a/packages/fakeyou/src/v2/view/about/terms_page/TermsPage.tsx b/packages/fakeyou/src/v2/view/about/terms_page/TermsPage.tsx index 0c6d07fe9d..21eafae204 100644 --- a/packages/fakeyou/src/v2/view/about/terms_page/TermsPage.tsx +++ b/packages/fakeyou/src/v2/view/about/terms_page/TermsPage.tsx @@ -1,91 +1,10 @@ import React from "react"; -import { USE_REFRESH } from "../../../../Refresh"; import { motion } from "framer-motion"; import { container, item, panel } from "../../../../data/animation"; interface Props {} function TermsPage(props: Props) { - if (!USE_REFRESH) { - return ( -
-
-
-
-
-
- FakeYou Kitsune Mascot! -
-
- -
-

Terms and Conditions

-

- Please use this technology responsibly. -

-
-
-
-
- -

Terms of Use

- -

- We do not condone the use of FakeYou for any type of deception, slur, - abuse, or mistreatment of any individual or group. Please report such - abuses to our{" "} - community staff on Discord. - Bad actors will have their access revoked and materials deleted. -

- -

- This is a research technololgy for fun. You may not use FakeYou - deepfakes for commercial use. -

- -

- Do not engage in unlawful activity or attempt to impersonate any - person, company, or other entity. All published usages must be labled - as "deep fake". -

- -

- - The audio we generate is watermarked, and we will soon release a - tool to verify that it is deep fake generated and trace it back to - its source. - -

- -

Takedown Requests

- -

- The machine learning models and content at FakeYou are user-submitted, - but we'll be happy to remove content for any reason for copyright - holders, original speakers, voice actors, et al. Please send us an - email to copyright@storyteller.io with details in order - to request a takedown. -

- -

Voice Acting & Musician Jobs

- -

- If you're a voice actor or musician, we're looking to hire talented - performers to help us build commercial-friendly AI voices. (The - user-submitted models on FakeYou are just a technology demonstration - and may not be used commercially.) We want to empower small creators - (game designers, musicians, and more) to voice, sing, and speak - emotion into their work. Please reach out to{" "} - jobs@storyteller.io if you'd like to work with us. We can - pay a flat fee and/or royalty. Please get in touch to learn more! -

-
- ); - } - return (
diff --git a/packages/fakeyou/src/v2/view/clone_voice_requests/VoiceCloneRequestPage.tsx b/packages/fakeyou/src/v2/view/clone_voice_requests/VoiceCloneRequestPage.tsx index 3f085cb6ac..8606958c8b 100644 --- a/packages/fakeyou/src/v2/view/clone_voice_requests/VoiceCloneRequestPage.tsx +++ b/packages/fakeyou/src/v2/view/clone_voice_requests/VoiceCloneRequestPage.tsx @@ -5,7 +5,6 @@ import { faEnvelope, faMicrophone, faRedo, - faUser, } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import React, { useCallback, useEffect, useState } from "react"; @@ -24,7 +23,6 @@ import { } from "@storyteller/components/src/api/clone_requests/CheckVoiceCloneApplication"; import { Link } from "react-router-dom"; import { FrontendUrlConfig } from "../../../common/FrontendUrlConfig"; -import { USE_REFRESH } from "../../../Refresh"; import { motion } from "framer-motion"; import { container, item, image, panel } from "../../../data/animation"; @@ -242,73 +240,45 @@ function VoiceCloneRequestPage(props: Props) { return false; }; - let header = <>; - - if (!USE_REFRESH) { - header = ( - <> -
-
-
-
-
- FakeYou's mascot! -
-
- -
-

Professionally Clone Your Voice

-

(or any voice) for just $70

-
+ let header = ( + <> +
+
+
+
+
-
- - ); - } else { - header = ( - <> -
-
-
-
- -
-
-
-
- - Professionally Clone Your Voice - - - (or any voice) for just $70 +
+
+ + Professionally Clone Your Voice + + + (or any voice) for just $70 + +
+ + Want a Custom Voice You Can Use? -
- - Want a Custom Voice You Can Use? - - - For Music, Videos, Twitch Rewards, API, Friends, Family… - whatever you want! - -
+ + For Music, Videos, Twitch Rewards, API, Friends, Family… + whatever you want! +
- - ); - } +
+ + ); if (formWasSubmitted) { return ( @@ -366,361 +336,6 @@ function VoiceCloneRequestPage(props: Props) { ); } - if (!USE_REFRESH) { - return ( -
- {header} - -
-
-

Want a Custom Voice You Can Use?

-

- For Music, Videos, Twitch Rewards, API, Friends, Family… - whatever you want! -

- - {previouslySubmittedNote} - -

- We have an extremely talented staff that will personally handle - your voice clone request. Please help us understand more about - your voice and how you want to use it, and we'll be in touch - shortly. -

- -
- -

First, how should we get in touch?

- -
- -
- - - - -
-

-

-
- -
- -
- - - - -
-

- Don't forget the #0000 part of your username! -

-

-
- -
- -

Who's voice is this?

- -

- If it's your voice, you'll be able to do anything you want with - it. If it's another person's voice, you may have limits on how you - can use it (eg. limits on commercialization.) That doesn't mean we - can't help you. Even if you just want your favorite character so - you can make Twitter memes, that's fine! -

- -
- -
-
- -
- -
- -
- -
-
- -
- -
- -
- - - - -
-

-

-
- -
- -

How will you use it?

- -

Click as many as you plan to use!

- -
- -
- - -
- - - -
- - - -
- - - -
- - -
- -
- -
- -
- - - - -
-

-

-
- -
- -

Do you want it to be private?

- -

- (We'll accept multiple answers here, because maybe you want to use - it multiple ways.) -

- -
- -
- - -
- - - -
- - -
- -
- -

How's your audio quality?

- -

- It's okay if you don't have a quality source of audio, but the - results are top notch only with a good recording setup. -

- -
- -
- - -
- - -
- -
- -

Anything else?

- -
- -
- -
-
- -
- -
- -
-
- -
- - {errorMessage} - - -
-
-
- ); - } - return ( {header} diff --git a/packages/fakeyou/src/v2/view/firehose/FirehoseEventListFc.tsx b/packages/fakeyou/src/v2/view/firehose/FirehoseEventListFc.tsx index e29c384fb7..1165fd9849 100644 --- a/packages/fakeyou/src/v2/view/firehose/FirehoseEventListFc.tsx +++ b/packages/fakeyou/src/v2/view/firehose/FirehoseEventListFc.tsx @@ -3,7 +3,6 @@ import { ApiConfig } from "@storyteller/components"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { Gravatar } from "@storyteller/components/src/elements/Gravatar"; import { Link } from "react-router-dom"; -import { USE_REFRESH } from "../../../Refresh"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faPlay, @@ -295,36 +294,12 @@ function FirehoseEventListFc(props: Props) { return; } - if (!USE_REFRESH) { - eventItems.push(
  • {inner}
  • ); - } else { - eventItems.push( -
  • - {inner} -
  • - ); - } - }); - - if (!USE_REFRESH) { - return ( -
    -

    Firehose event feed

    -

    - {" "} - The latest FakeYou events refreshed every few seconds -

    - -
    -

    - As you can see, we're really popular. But we owe it to you, - our users. Thank you! -

    -
      {eventItems}
    -
    -
    + eventItems.push( +
  • + {inner} +
  • ); - } + }); return ( diff --git a/packages/fakeyou/src/v2/view/leaderboard/LeaderboardFc.tsx b/packages/fakeyou/src/v2/view/leaderboard/LeaderboardFc.tsx index 98d7212d21..828dd834c1 100644 --- a/packages/fakeyou/src/v2/view/leaderboard/LeaderboardFc.tsx +++ b/packages/fakeyou/src/v2/view/leaderboard/LeaderboardFc.tsx @@ -12,7 +12,6 @@ import { LeaderboardLookupError, } from "../../api/misc/GetLeaderboard"; import { DiscordLink2 } from "@storyteller/components/src/elements/DiscordLink2"; -import { USE_REFRESH } from "../../../Refresh"; import { motion } from "framer-motion"; import { container, item, panel } from "../../../data/animation"; @@ -107,41 +106,6 @@ function LeaderboardFc(props: Props) { }); } - if (!USE_REFRESH) { - return ( -
    -

    Leaderboard

    -

    Our most frequent contributors!

    - -

    - Want to be on the leaderboard?{" "} - Join our Discord and learn more! -

    - - - - - - - - {ttsRows} - - - - - - {w2lRows} - -
    -

    TTS Models Uploaded

    -
    -
    -

    W2L Templates Uploaded

    -
    -
    - ); - } - return (
    diff --git a/packages/fakeyou/src/v2/view/login/LoginPage.tsx b/packages/fakeyou/src/v2/view/login/LoginPage.tsx index 08d0b41610..2f8b41ac15 100644 --- a/packages/fakeyou/src/v2/view/login/LoginPage.tsx +++ b/packages/fakeyou/src/v2/view/login/LoginPage.tsx @@ -11,7 +11,6 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faUser, faKey } from "@fortawesome/free-solid-svg-icons"; import { motion } from "framer-motion"; import { container, panel } from "../../../data/animation"; -import { USE_REFRESH } from "../../../Refresh"; interface Props { sessionWrapper: SessionWrapper; @@ -72,69 +71,9 @@ function LoginPage(props: Props) { let errorWarning = ; if (errorMessage) { - if (!USE_REFRESH) { - errorWarning = ( -
    - Login Error: {errorMessage} -
    - ); - } else { - errorWarning = ( -
    - Login Error: {errorMessage} -
    - ); - } - } - - if (!USE_REFRESH) { - return ( -
    -

    Login

    - - {errorWarning} - -
    -
    - -
    - - - - -
    - {/*

    */} -
    - -
    - -
    - - - - -
    - {/*

    */} -
    - -
    - - -
    + errorWarning = ( +
    + Login Error: {errorMessage}
    ); } diff --git a/packages/fakeyou/src/v2/view/patrons/PatronPage.tsx b/packages/fakeyou/src/v2/view/patrons/PatronPage.tsx index be786e1481..7ebc332a97 100644 --- a/packages/fakeyou/src/v2/view/patrons/PatronPage.tsx +++ b/packages/fakeyou/src/v2/view/patrons/PatronPage.tsx @@ -1,82 +1,17 @@ import React from "react"; -import { BackLink } from "../_common/BackLink"; -import { FrontendUrlConfig } from "../../../common/FrontendUrlConfig"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; import { PATRONS } from "../../../data/Patrons"; import { PatreonLink } from "@storyteller/components/src/elements/PatreonLink"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faPatreon } from "@fortawesome/free-brands-svg-icons"; -import { USE_REFRESH } from "../../../Refresh"; import { motion } from "framer-motion"; import { container, item, image, panel } from "../../../data/animation"; interface Props { sessionWrapper: SessionWrapper; } -; function PatronPage(props: Props) { - if (!USE_REFRESH) { - return ( - <> -
    -
    -
    -
    -
    - FakeYou's mascot! -
    -
    - -
    -

    Thanks to our Patrons!

    -

    Our Patrons help support our work.

    -
    -
    -
    -
    - -
    -
    -

    - Our Patrons help pay offset (but not completely cover) our - expensive server bills. -

    - -
      - {PATRONS.map((patron) => { - return ( -
    • - {patron.username} — ${patron.donationTotal} -
    • - ); - })} -
    - -

    - Patrons will get first looks at new features, get dedicated access - to Patron-only Discord channels, can ask for specific voices from - our in-house audio engineers, and more! -

    - -

    - Please consider{" "} - . -

    - - -
    -
    - - ); - } - return (
    diff --git a/packages/fakeyou/src/v2/view/profile/profile_view/ProfileFc.tsx b/packages/fakeyou/src/v2/view/profile/profile_view/ProfileFc.tsx index 4b12ee69a3..e17031c1c1 100644 --- a/packages/fakeyou/src/v2/view/profile/profile_view/ProfileFc.tsx +++ b/packages/fakeyou/src/v2/view/profile/profile_view/ProfileFc.tsx @@ -35,7 +35,6 @@ import { } from "../../../api/user/GetUserByUsername"; import { format } from "date-fns"; import { FrontendUrlConfig } from "../../../../common/FrontendUrlConfig"; -import { USE_REFRESH } from "../../../../Refresh"; import { container, item, panel } from "../../../../data/animation"; import Tippy from "@tippyjs/react"; import "tippy.js/dist/tippy.css"; @@ -260,50 +259,6 @@ function ProfileFc(props: Props) { badges =
      {badgeList}
    ; } - if (!USE_REFRESH) { - return ( -
    -

    - - {userData.display_name} -

    - - {editProfileButton} - {banUserButton} - -
    - - - {profileRows} -
    - -

    Badges (images coming soon)

    - {badges} - -

    TTS Results

    - - -

    Lipsync Results

    - - -

    Uploaded TTS Models

    - - -

    Uploaded Templates

    - -
    - ); - } - return (
    diff --git a/packages/fakeyou/src/v2/view/signup/SignupPage.tsx b/packages/fakeyou/src/v2/view/signup/SignupPage.tsx index 2901a64b26..60d00ea3ef 100644 --- a/packages/fakeyou/src/v2/view/signup/SignupPage.tsx +++ b/packages/fakeyou/src/v2/view/signup/SignupPage.tsx @@ -8,7 +8,6 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faUser, faEnvelope, faKey } from "@fortawesome/free-solid-svg-icons"; import { Link } from "react-router-dom"; import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; -import { USE_REFRESH } from "../../../Refresh"; import { motion } from "framer-motion"; import { container, panel } from "../../../data/animation"; @@ -222,8 +221,8 @@ function SignupPage(props: Props) { ); } - let usernameInputClass = USE_REFRESH ? "form-control" : "input"; - let usernameHelpClass = USE_REFRESH ? "form-text red" : "help"; + let usernameInputClass = "form-control"; + let usernameHelpClass = "form-text red"; switch (usernameValid) { case FieldTriState.EMPTY_FALSE: break; @@ -237,8 +236,8 @@ function SignupPage(props: Props) { break; } - let emailInputClass = USE_REFRESH ? "form-control" : "input"; - let emailHelpClass = USE_REFRESH ? "form-text red" : "help"; + let emailInputClass = "form-control"; + let emailHelpClass = "form-text red"; switch (emailValid) { case FieldTriState.EMPTY_FALSE: break; @@ -252,8 +251,8 @@ function SignupPage(props: Props) { break; } - let passwordInputClass = USE_REFRESH ? "form-control" : "input"; - let passwordHelpClass = USE_REFRESH ? "form-text red" : "help"; + let passwordInputClass = "form-control"; + let passwordHelpClass = "form-text red"; switch (passwordValid) { case FieldTriState.EMPTY_FALSE: break; @@ -267,8 +266,8 @@ function SignupPage(props: Props) { break; } - let passwordConfirmationInputClass = USE_REFRESH ? "form-control" : "input"; - let passwordConfirmationHelpClass = USE_REFRESH ? "form-text red" : "help"; + let passwordConfirmationInputClass = "form-control"; + let passwordConfirmationHelpClass = "form-text red"; switch (passwordConfirmationValid) { case FieldTriState.EMPTY_FALSE: break; @@ -282,108 +281,6 @@ function SignupPage(props: Props) { break; } - if (!USE_REFRESH) { - return ( -
    -

    Sign Up

    - -
    -
    - -
    - - - - -
    -

    {usernameInvalidReason}

    -
    - -
    - -
    - - - - -
    -

    {emailInvalidReason}

    -
    - -
    - -
    - - - - -
    -

    {passwordInvalidReason}

    -
    - -
    - -
    - - - - -
    -

    - {passwordConfirmationInvalidReason} -

    -
    - -
    - -
    - Remember your password! We don't have password - reset currently, and it'll be a few more weeks before it's added - (there are more important features to work on). If you lose your - password, please let us know in Discord. -
    - - -
    - -
    - - - Already have an account? Log in instead! - -
    - ); - } - return ( -
    -

    Video lip sync templates

    - - {extraDetails} - -
    - - {allRowsOfTemplateElements.map((el) => el)} - -
    - -

    - This feature is based on Wav2Lip by by Prajwal, K R and Mukhopadhyay, - Rudrabha and Namboodiri, Vinay P. and Jawahar, C.V. -

    - -
    -
    - ); - } - return (