mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-16 14:52:31 +00:00
updates
This commit is contained in:
1 parent
51388a7cdd
commit
f3924e31da
7 files changed
+110
-150
No files matched your search
@@ -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 {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -53,7 +53,7 @@ function NewTopNavFc(props: Props) {
|
||||
// : "navbar-burger";
|
||||
|
||||
return (
|
||||
<>
|
||||
<div>
|
||||
<div className="top-bar d-none d-lg-flex">
|
||||
<div className="container d-flex">
|
||||
<div className="d-flex gap-4 flex-grow-1">
|
||||
@@ -69,24 +69,13 @@ function NewTopNavFc(props: Props) {
|
||||
>
|
||||
Developers
|
||||
</a>
|
||||
<a
|
||||
className="top-bar-text d-flex align-items-center dropdown-toggle"
|
||||
href="#"
|
||||
id="offcanvasNavbarLgDropdown"
|
||||
role="button"
|
||||
data-bs-toggle="dropdown"
|
||||
aria-expanded="false"
|
||||
>
|
||||
<img className="me-2" src="assets/eng-flag.png" height="12" />
|
||||
ENG
|
||||
</a>
|
||||
</div>
|
||||
<div className="d-flex gap-4">
|
||||
<p className="top-bar-text">
|
||||
Online: <span className="fw-bold text-red">1,204</span>
|
||||
Online Users: <span className="fw-bold text-red">1,204</span>
|
||||
</p>
|
||||
<p className="top-bar-text">
|
||||
Queued: <span className="fw-bold text-red">48</span>
|
||||
TTS Queued: <span className="fw-bold text-red">48</span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
@@ -249,51 +238,6 @@ function NewTopNavFc(props: Props) {
|
||||
<div className="dropdown-divider dropdown-divider-white mt-3"></div>
|
||||
</li>
|
||||
|
||||
<li className="nav-item dropdown d-lg-none">
|
||||
<a
|
||||
className="nav-link dropdown-toggle"
|
||||
href="#"
|
||||
id="offcanvasNavbarLgDropdown"
|
||||
role="button"
|
||||
data-bs-toggle="dropdown"
|
||||
>
|
||||
<img
|
||||
className="me-2"
|
||||
src="assets/eng-flag.png"
|
||||
height="12"
|
||||
/>
|
||||
English
|
||||
</a>
|
||||
<ul
|
||||
className="dropdown-menu"
|
||||
aria-labelledby="offcanvasNavbarLgDropdown"
|
||||
>
|
||||
<li>
|
||||
<a className="dropdown-item" href="">
|
||||
<img
|
||||
className="me-2"
|
||||
src="assets/eng-flag.png"
|
||||
height="12"
|
||||
/>
|
||||
English
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a className="dropdown-item" href="">
|
||||
<img
|
||||
className="me-2"
|
||||
src="assets/esp-flag.png"
|
||||
height="12"
|
||||
/>
|
||||
Spanish
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li className="d-lg-none">
|
||||
<div className="dropdown-divider dropdown-divider-white"></div>
|
||||
</li>
|
||||
|
||||
<li className="ps-3 d-lg-none">
|
||||
<div className="d-flex gap-4 py-2">
|
||||
<p className="top-bar-text">
|
||||
@@ -337,7 +281,7 @@ function NewTopNavFc(props: Props) {
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -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) {
|
||||
</div>
|
||||
</div>
|
||||
<div className="col-lg-6 px-md-2 ps-lg-5 ps-xl-2">
|
||||
<div className="text-center text-lg-start">
|
||||
<Fade bottom cascade duration={duration}>
|
||||
<Fade bottom cascade duration={duration} distance={distance}>
|
||||
<div className="text-center text-lg-start">
|
||||
<div>
|
||||
<h1 className="display-5 fw-bold lh-1 mb-4">
|
||||
A Glimpse of the Future
|
||||
@@ -37,8 +37,8 @@ function AboutPage(props: Props) {
|
||||
of production and creative tooling.
|
||||
</p>
|
||||
</div>
|
||||
</Fade>
|
||||
</div>
|
||||
</div>
|
||||
</Fade>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -131,21 +131,24 @@ function AboutPage(props: Props) {
|
||||
</p>
|
||||
<br />
|
||||
<p>
|
||||
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,{" "}
|
||||
<a
|
||||
href="https://twitter.com/r9y9/"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
@r9y9
|
||||
</a>, BFlat, Raisin.
|
||||
</a>
|
||||
, BFlat, Raisin.
|
||||
</p>
|
||||
|
||||
<br />
|
||||
|
||||
<p>
|
||||
The following papers, models, and resources were used:
|
||||
<br /><br />
|
||||
<br />
|
||||
<br />
|
||||
<a
|
||||
href="https://github.com/NVIDIA/tacotron2"
|
||||
target="_blank"
|
||||
@@ -193,7 +196,7 @@ function AboutPage(props: Props) {
|
||||
>
|
||||
Wav2Lip
|
||||
</a>{" "}
|
||||
(MIT license),{" "} {/* Non-commercial */}
|
||||
(MIT license), {/* Non-commercial */}
|
||||
<a
|
||||
href="http://www.speech.cs.cmu.edu/cgi-bin/cmudict"
|
||||
target="_blank"
|
||||
|
||||
@@ -254,7 +254,7 @@ function SignupPage(props: Props) {
|
||||
}
|
||||
|
||||
let passwordConfirmationInputClass = "form-control";
|
||||
let passwordConfirmationHelpClass = "form-text";
|
||||
let passwordConfirmationHelpClass = "form-text red";
|
||||
switch (passwordConfirmationValid) {
|
||||
case FieldTriState.EMPTY_FALSE:
|
||||
break;
|
||||
|
||||
@@ -272,7 +272,7 @@ export function MultiDropdownSearch(props: Props) {
|
||||
let loadingOption = undefined;
|
||||
|
||||
if (isLoading) {
|
||||
selectClasses = "form-select is-loading";
|
||||
selectClasses = "form-select";
|
||||
loadingOption = (
|
||||
<option key="waiting" value="" disabled={true}>
|
||||
{t("ttsListPage.loading")}
|
||||
|
||||
@@ -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) {
|
||||
<Fade bottom distance={distance} delay={delay2} duration={duration}>
|
||||
<div className="panel p-3 p-lg-4 load-hidden mt-5 mt-lg-0">
|
||||
<i className="fas fa-volume-high"></i>
|
||||
<h1 className="panel-title fw-bold"> Create TTS</h1>
|
||||
<h1 className="panel-title fw-bold">
|
||||
<FontAwesomeIcon icon={faVolumeUp} className="me-3" />
|
||||
Create TTS
|
||||
</h1>
|
||||
<div className="py-6">
|
||||
<div className="d-flex gap-4">
|
||||
<form
|
||||
|
||||
@@ -1,33 +1,35 @@
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import { ApiConfig } from '@storyteller/components';
|
||||
import { SessionWrapper } from '@storyteller/components/src/session/SessionWrapper';
|
||||
import React, { useState, useEffect } from "react";
|
||||
import { ApiConfig } from "@storyteller/components";
|
||||
import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper";
|
||||
import { Link } from "react-router-dom";
|
||||
//import { getRandomInt } from '../../../../v1/api/Utils';
|
||||
import { BucketConfig } from '@storyteller/components/src/api/BucketConfig';
|
||||
import { BucketConfig } from "@storyteller/components/src/api/BucketConfig";
|
||||
import { distance, delay, delay2, duration } from "../../../../data/animation";
|
||||
const Fade = require("react-reveal/Fade");
|
||||
|
||||
interface W2lTemplateListResponsePayload {
|
||||
success: boolean,
|
||||
templates: Array<W2lTemplate>,
|
||||
success: boolean;
|
||||
templates: Array<W2lTemplate>;
|
||||
}
|
||||
|
||||
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<JSX.Element> = [];
|
||||
|
||||
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(
|
||||
<div className="tile is-parent" key={t.template_token}>
|
||||
<article className="tile is-child box">
|
||||
<Link to={link}><img src={url} alt="template" /></Link>
|
||||
<Link to={link}>
|
||||
<img src={url} alt="template" />
|
||||
</Link>
|
||||
</article>
|
||||
</div>
|
||||
));
|
||||
);
|
||||
});
|
||||
|
||||
let allRowsOfTemplateElements: Array<JSX.Element> = [];
|
||||
@@ -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(
|
||||
<div className="tile is-ancestor" key={rowKey}>
|
||||
{rowOfTemplateElements.map(el => el)}
|
||||
{rowOfTemplateElements.map((el) => el)}
|
||||
</div>
|
||||
);
|
||||
rowOfTemplateElements = [];
|
||||
@@ -121,7 +130,7 @@ function W2lTemplateListFc(props: Props) {
|
||||
if (rowOfTemplateElements.length !== 0) {
|
||||
allRowsOfTemplateElements.push(
|
||||
<div className="tile is-ancestor" key={rowKey}>
|
||||
{rowOfTemplateElements.map(el => el)}
|
||||
{rowOfTemplateElements.map((el) => el)}
|
||||
</div>
|
||||
);
|
||||
rowOfTemplateElements = [];
|
||||
@@ -131,46 +140,49 @@ function W2lTemplateListFc(props: Props) {
|
||||
|
||||
if (props.sessionWrapper.isLoggedIn()) {
|
||||
extraDetails = (
|
||||
<p>
|
||||
Pick a template, then you can make it lip sync.
|
||||
If you want to use your own video or image, you can
|
||||
<Link to="/contribute">upload it as a template</Link>.
|
||||
You'll then be able to use it whenever you want!
|
||||
<p className="lead mb-4">
|
||||
Pick a template, then you can make it lip sync. If you want to use your
|
||||
own video or image, you can
|
||||
<Link to="/contribute">upload it as a template</Link>. You'll then be
|
||||
able to use it whenever you want!
|
||||
</p>
|
||||
);
|
||||
|
||||
} else {
|
||||
extraDetails = (
|
||||
<p>
|
||||
Pick a template, then you can make it lip sync.
|
||||
If you want to use your own video or image, you'll
|
||||
need to <Link to="/signup">create an account</Link>.
|
||||
You'll then be able to upload and reuse your templates
|
||||
whenever you want!
|
||||
<p className="lead mb-4">
|
||||
Pick a template, then you can make it lip sync. If you want to use your
|
||||
own video or image, you'll need to{" "}
|
||||
<Link to="/signup">create an account</Link>. You'll then be able to
|
||||
upload and reuse your templates whenever you want!
|
||||
</p>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div>
|
||||
<br />
|
||||
<h1 className="title is-1"> Video lip sync templates </h1>
|
||||
<Fade bottom cascade duration={duration} distance={distance}>
|
||||
<div className="container py-5">
|
||||
<div>
|
||||
<h1 className="display-5 fw-bold mb-3">Video Lip Sync Templates</h1>
|
||||
</div>
|
||||
<div>{extraDetails}</div>
|
||||
</div>
|
||||
</Fade>
|
||||
|
||||
{extraDetails}
|
||||
<div className="container">
|
||||
{allRowsOfTemplateElements.map((el) => el)}
|
||||
</div>
|
||||
|
||||
<div className="container">
|
||||
<p>
|
||||
This feature is based on Wav2Lip by by Prajwal, K R and Mukhopadhyay,
|
||||
Rudrabha and Namboodiri, Vinay P. and Jawahar, C.V.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<br />
|
||||
|
||||
{allRowsOfTemplateElements.map(el => el)}
|
||||
|
||||
<br />
|
||||
|
||||
<p>This feature is based on Wav2Lip by by Prajwal, K R and Mukhopadhyay,
|
||||
Rudrabha and Namboodiri, Vinay P. and Jawahar, C.V.</p>
|
||||
|
||||
<br />
|
||||
|
||||
</div>
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
export { W2lTemplateListFc };
|
||||
Reference in new issue
Block a user