diff --git a/packages/fakeyou/src/App.scss b/packages/fakeyou/src/App.scss index 58b3d0d3d3..26ca8d8bd4 100644 --- a/packages/fakeyou/src/App.scss +++ b/packages/fakeyou/src/App.scss @@ -24,10 +24,12 @@ body { .bg-gradient { background: rgb(13, 16, 25) !important; - background: linear-gradient(325deg, - rgba(13, 16, 25, 1) 0%, - rgba(42, 21, 34, 1) 55%, - rgba(16, 14, 26, 1) 100%) !important; + background: linear-gradient( + 325deg, + rgba(13, 16, 25, 1) 0%, + rgba(42, 21, 34, 1) 55%, + rgba(16, 14, 26, 1) 100% + ) !important; background-repeat: no-repeat; background-attachment: fixed; } @@ -159,10 +161,6 @@ nav { width: 100vw; } - .dropdown-menu { - transition: all 0.1s; - } - .nav-login { font-size: 15px; font-weight: 600; @@ -178,25 +176,23 @@ nav { } a.top-bar-text:hover { - color: $primary !important; + color: $primary !important; } .top-bar { display: flex; align-items: center; - background-color: rgba($white, 0.05); + background-color: rgba($white, 0.04); margin-bottom: 5px; padding: 10px 0; backdrop-filter: blur(5px); - -webkit-backdrop-filter: blur(5px); border-bottom: 1px solid; - border-color: rgba(255, 255, 255, 0.04); + border-color: rgba(255, 255, 255, 0.06); .top-bar-text { - color: #fff; + color: rgba($white, 0.7); font-size: 12px; font-weight: 400; - opacity: 0.7; transition: 0.2s; } } @@ -412,4 +408,4 @@ a.top-bar-text:hover { } } } -} \ No newline at end of file +} diff --git a/packages/fakeyou/src/v2/view/NewTopNavFc.tsx b/packages/fakeyou/src/v2/view/NewTopNavFc.tsx index 69fef4954f..f691a1c2dd 100644 --- a/packages/fakeyou/src/v2/view/NewTopNavFc.tsx +++ b/packages/fakeyou/src/v2/view/NewTopNavFc.tsx @@ -53,7 +53,7 @@ function NewTopNavFc(props: Props) { // : "navbar-burger"; return ( - <> +
@@ -69,24 +69,13 @@ function NewTopNavFc(props: Props) { > Developers -

- Online: 1,204 + Online Users: 1,204

- Queued: 48 + TTS Queued: 48

@@ -249,51 +238,6 @@ function NewTopNavFc(props: Props) {
-
  • - - - English - - -
  • -
  • -
    -
  • -
  • @@ -337,7 +281,7 @@ function NewTopNavFc(props: Props) {

  • - +
    ); } 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 f78a0abcdf..ba262e8b8c 100644 --- a/packages/fakeyou/src/v2/view/about/about_page/AboutPage.tsx +++ b/packages/fakeyou/src/v2/view/about/about_page/AboutPage.tsx @@ -3,7 +3,7 @@ import { Link } from "react-router-dom"; import { distance, delay, delay2, duration } from "../../../../data/animation"; const Fade = require("react-reveal/Fade"); -interface Props { } +interface Props {} function AboutPage(props: Props) { return ( @@ -24,8 +24,8 @@ function AboutPage(props: Props) {
    -
    - + +

    A Glimpse of the Future @@ -37,8 +37,8 @@ function AboutPage(props: Props) { of production and creative tooling.

    - -
    +
    +
    @@ -131,21 +131,24 @@ function AboutPage(props: Props) {


    - Vegito1089, Shin, Ashurath, MakaveliGH, Blutarch Mann, Yahia, Tim Squid, Seuneramet, Matt, Seth, CookiePPP,{" "} + Vegito1089, Shin, Ashurath, MakaveliGH, Blutarch Mann, Yahia, + Tim Squid, Seuneramet, Matt, Seth, CookiePPP,{" "} @r9y9 - , BFlat, Raisin. + + , BFlat, Raisin.


    The following papers, models, and resources were used: -

    +
    +
    Wav2Lip {" "} - (MIT license),{" "} {/* Non-commercial */} + (MIT license), {/* Non-commercial */} {t("ttsListPage.loading")} diff --git a/packages/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx b/packages/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx index cdb11abaab..b7301817d0 100644 --- a/packages/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx +++ b/packages/fakeyou/src/v2/view/tts/tts_model_list/TtsModelListFc.tsx @@ -37,6 +37,8 @@ import { Trans } from "react-i18next"; import { TwitchTtsNotice } from "./notices/TwitchTtsNotice"; import { PleaseFollowNotice } from "./notices/PleaseFollowNotice"; import { distance, delay, delay2, duration } from "../../../../data/animation"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { faVolumeUp } from "@fortawesome/free-solid-svg-icons"; const Fade = require("react-reveal/Fade"); export interface EnqueueJobResponsePayload { @@ -336,7 +338,10 @@ function TtsModelListFc(props: Props) {

    -

    Create TTS

    +

    + + Create TTS +

    , + success: boolean; + templates: Array; } interface W2lTemplate { - template_token: string, - template_type: string, - creator_user_token: string, - username: string, - display_name: string, - title: string, - frame_width: number, - frame_height: number, - duration_millis: number, - maybe_image_object_name: string, - maybe_video_object_name: string, - created_at: string, - updated_at: string, + template_token: string; + template_type: string; + creator_user_token: string; + username: string; + display_name: string; + title: string; + frame_width: number; + frame_height: number; + duration_millis: number; + maybe_image_object_name: string; + maybe_video_object_name: string; + created_at: string; + updated_at: string; } interface Props { - sessionWrapper: SessionWrapper, + sessionWrapper: SessionWrapper; } function W2lTemplateListFc(props: Props) { @@ -38,35 +40,40 @@ function W2lTemplateListFc(props: Props) { const endpointUrl = api.listW2l(); fetch(endpointUrl, { - method: 'GET', + method: "GET", headers: { - 'Accept': 'application/json', + Accept: "application/json", }, - credentials: 'include', + credentials: "include", }) - .then(res => res.json()) - .then(res => { + .then((res) => res.json()) + .then((res) => { const templatesResponse: W2lTemplateListResponsePayload = res; if (!templatesResponse.success) { return; } - setW2lTemplates(templatesResponse.templates) + setW2lTemplates(templatesResponse.templates); }) - .catch(e => { + .catch((e) => { //this.props.onSpeakErrorCallback(); }); }, []); // NB: Empty array dependency sets to run ONLY on mount - let templateElements: Array = []; - w2lTemplates.forEach(t => { + w2lTemplates.forEach((t) => { let object = null; - if (t.maybe_image_object_name !== undefined && t.maybe_image_object_name !== null) { + if ( + t.maybe_image_object_name !== undefined && + t.maybe_image_object_name !== null + ) { object = t.maybe_image_object_name; - } else if (t.maybe_video_object_name !== undefined && t.maybe_video_object_name !== null) { + } else if ( + t.maybe_video_object_name !== undefined && + t.maybe_video_object_name !== null + ) { object = t.maybe_video_object_name; } else { console.warn(`No image for template ${t.template_token}`); @@ -77,13 +84,15 @@ function W2lTemplateListFc(props: Props) { let link = `/w2l/${t.template_token}`; - templateElements.push(( + templateElements.push(
    - template + + template +
    - )); + ); }); let allRowsOfTemplateElements: Array = []; @@ -96,13 +105,13 @@ function W2lTemplateListFc(props: Props) { //let nextRowSize = getRandomInt(3, 4); let nextRowSize = 3; - templateElements.forEach(el => { + templateElements.forEach((el) => { rowOfTemplateElements.push(el); if (rowOfTemplateElements.length === nextRowSize) { allRowsOfTemplateElements.push(
    - {rowOfTemplateElements.map(el => el)} + {rowOfTemplateElements.map((el) => el)}
    ); rowOfTemplateElements = []; @@ -121,7 +130,7 @@ function W2lTemplateListFc(props: Props) { if (rowOfTemplateElements.length !== 0) { allRowsOfTemplateElements.push(
    - {rowOfTemplateElements.map(el => el)} + {rowOfTemplateElements.map((el) => el)}
    ); rowOfTemplateElements = []; @@ -131,46 +140,49 @@ function W2lTemplateListFc(props: Props) { if (props.sessionWrapper.isLoggedIn()) { extraDetails = ( -

    - Pick a template, then you can make it lip sync. - If you want to use your own video or image, you can - upload it as a template. - You'll then be able to use it whenever you want! +

    + Pick a template, then you can make it lip sync. If you want to use your + own video or image, you can + upload it as a template. You'll then be + able to use it whenever you want!

    ); - } else { extraDetails = ( -

    - Pick a template, then you can make it lip sync. - If you want to use your own video or image, you'll - need to create an account. - You'll then be able to upload and reuse your templates - whenever you want! +

    + Pick a template, then you can make it lip sync. If you want to use your + own video or image, you'll need to{" "} + create an account. You'll then be able to + upload and reuse your templates whenever you want!

    ); } return (
    -
    -

    Video lip sync templates

    + +
    +
    +

    Video Lip Sync Templates

    +
    +
    {extraDetails}
    +
    +
    - {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. +

    +

    - - {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.

    - -
    -
    - ) + ); } export { W2lTemplateListFc };