mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-16 06:42:14 +00:00
Merge pull request #381 from storytold/nov-22-mithoo
require users to login for voice designer
This commit is contained in:
6 files changed
+185
-34
No files matched your search
@@ -21,6 +21,12 @@ interface PageHeaderProps {
|
||||
extension?: React.ReactNode;
|
||||
buttonLabel?: string;
|
||||
button?: ButtonProps;
|
||||
secondaryButtonLabel?: string;
|
||||
secondaryButton?: ButtonProps;
|
||||
secondaryButtonVariant?: "primary" | "secondary" | "danger";
|
||||
secondaryButtonTo?: string;
|
||||
secondaryButtonIcon?: IconDefinition;
|
||||
secondaryButtonOnClick?: () => void;
|
||||
buttonVariant?: "primary" | "secondary" | "danger";
|
||||
buttonTo?: string;
|
||||
buttonIcon?: IconDefinition;
|
||||
@@ -51,22 +57,40 @@ export default function PageHeader({
|
||||
showBackButton,
|
||||
backbuttonTo,
|
||||
backbuttonLabel,
|
||||
secondaryButton,
|
||||
secondaryButtonLabel,
|
||||
secondaryButtonVariant = "secondary",
|
||||
secondaryButtonTo,
|
||||
secondaryButtonIcon,
|
||||
secondaryButtonOnClick,
|
||||
}: PageHeaderProps) {
|
||||
|
||||
const icon = (
|
||||
<>{titleIcon && <FontAwesomeIcon icon={titleIcon} className="me-3" />}</>
|
||||
);
|
||||
|
||||
const buttonProps = {
|
||||
...button ? button : {},
|
||||
...buttonIcon && { icon: buttonIcon },
|
||||
...buttonLabel && { label: buttonLabel },
|
||||
...buttonOnClick && { onClick: buttonOnClick },
|
||||
...buttonTo && { to: buttonTo },
|
||||
...buttonVariant && { variant: buttonVariant }
|
||||
...(button ? button : {}),
|
||||
...(buttonIcon && { icon: buttonIcon }),
|
||||
...(buttonLabel && { label: buttonLabel }),
|
||||
...(buttonOnClick && { onClick: buttonOnClick }),
|
||||
...(buttonTo && { to: buttonTo }),
|
||||
...(buttonVariant && { variant: buttonVariant }),
|
||||
};
|
||||
|
||||
const HeaderBtn = () => button || showButton ? <Button { ...buttonProps }/> : null;
|
||||
const secondaryButtonProps = {
|
||||
...(secondaryButton ? secondaryButton : {}),
|
||||
...(secondaryButtonIcon && { icon: secondaryButtonIcon }),
|
||||
...(secondaryButtonLabel && { label: secondaryButtonLabel }),
|
||||
...(secondaryButtonOnClick && { onClick: secondaryButtonOnClick }),
|
||||
...(secondaryButtonTo && { to: secondaryButtonTo }),
|
||||
...(secondaryButtonVariant && { variant: secondaryButtonVariant }),
|
||||
};
|
||||
|
||||
const HeaderBtn = () =>
|
||||
button || showButton ? <Button {...buttonProps} /> : null;
|
||||
|
||||
const HeaderBtnTwo = () =>
|
||||
secondaryButton ? <Button {...secondaryButtonProps} /> : null;
|
||||
|
||||
if (!panel) {
|
||||
return (
|
||||
@@ -95,9 +119,10 @@ export default function PageHeader({
|
||||
{subText}
|
||||
</p>
|
||||
</div>
|
||||
{ ( button || showButton ) && (
|
||||
<div className="d-md-flex">
|
||||
{(button || showButton) && (
|
||||
<div className="d-flex gap-3">
|
||||
<HeaderBtn />
|
||||
<HeaderBtnTwo />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -644,7 +644,10 @@ class PageContainer extends React.Component<
|
||||
path="/voice-designer/create"
|
||||
>
|
||||
<VoiceDesignerFormPage {...{
|
||||
enqueueInferenceJob: this.props.enqueueInferenceJob
|
||||
enqueueInferenceJob: this.props.enqueueInferenceJob,
|
||||
sessionWrapper: this.props.sessionWrapper,
|
||||
sessionSubscriptionsWrapper:
|
||||
this.props.sessionSubscriptionsWrapper
|
||||
}}/>
|
||||
</Route>
|
||||
|
||||
@@ -654,7 +657,10 @@ class PageContainer extends React.Component<
|
||||
path="/voice-designer/dataset/:dataset_token/edit"
|
||||
>
|
||||
<VoiceDesignerFormPage {...{
|
||||
enqueueInferenceJob: this.props.enqueueInferenceJob
|
||||
enqueueInferenceJob: this.props.enqueueInferenceJob,
|
||||
sessionWrapper: this.props.sessionWrapper,
|
||||
sessionSubscriptionsWrapper:
|
||||
this.props.sessionSubscriptionsWrapper
|
||||
}}/>
|
||||
</Route>
|
||||
|
||||
@@ -664,7 +670,10 @@ class PageContainer extends React.Component<
|
||||
path="/voice-designer/dataset/:dataset_token/upload"
|
||||
>
|
||||
<VoiceDesignerFormPage {...{
|
||||
enqueueInferenceJob: this.props.enqueueInferenceJob
|
||||
enqueueInferenceJob: this.props.enqueueInferenceJob,
|
||||
sessionWrapper: this.props.sessionWrapper,
|
||||
sessionSubscriptionsWrapper:
|
||||
this.props.sessionSubscriptionsWrapper
|
||||
}}/>
|
||||
</Route>
|
||||
|
||||
@@ -687,6 +696,9 @@ class PageContainer extends React.Component<
|
||||
|
||||
<Route path="/voice-designer">
|
||||
<VoiceDesignerMainPage {...{
|
||||
sessionWrapper:this.props.sessionWrapper,
|
||||
sessionSubscriptionsWrapper:
|
||||
this.props.sessionSubscriptionsWrapper,
|
||||
enqueueInferenceJob: this.props.enqueueInferenceJob,
|
||||
inferenceJobs: this.props.inferenceJobs,
|
||||
inferenceJobsByCategory: this.props.inferenceJobsByCategory
|
||||
|
||||
@@ -24,12 +24,13 @@ import useVoiceRequests from "./useVoiceRequests";
|
||||
import useUploadedFiles from "hooks/useUploadedFiles";
|
||||
|
||||
import { FrontendInferenceJobType } from "@storyteller/components/src/jobs/InferenceJob";
|
||||
import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper";
|
||||
|
||||
interface RouteParams {
|
||||
dataset_token?: string;
|
||||
}
|
||||
|
||||
function VoiceDesignerFormPage({ enqueueInferenceJob }: { enqueueInferenceJob: any }) {
|
||||
function VoiceDesignerFormPage({ enqueueInferenceJob, sessionWrapper }: { enqueueInferenceJob: any, sessionWrapper: SessionWrapper }) {
|
||||
const history = useHistory();
|
||||
const { datasets, inputCtrl, languages, visibilityOptions, voices } = useVoiceRequests({});
|
||||
const [language, languageSet] = useState("en");
|
||||
@@ -168,6 +169,10 @@ function VoiceDesignerFormPage({ enqueueInferenceJob }: { enqueueInferenceJob: a
|
||||
}
|
||||
},[dataset_token,datasets,fetched]);
|
||||
|
||||
if (!sessionWrapper.isLoggedIn()) {
|
||||
history.push("/voice-designer");
|
||||
}
|
||||
|
||||
return (
|
||||
<Container type="panel">
|
||||
<PageHeader
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
import React, { useState } from "react";
|
||||
import { Redirect, useHistory, useLocation } from "react-router-dom";
|
||||
import { faPlus, faWaveform } from "@fortawesome/pro-solid-svg-icons";
|
||||
import {
|
||||
faPenToSquare,
|
||||
faPlus,
|
||||
faRightToBracket,
|
||||
faStar,
|
||||
faWaveform,
|
||||
} from "@fortawesome/pro-solid-svg-icons";
|
||||
import InferenceJobsList from "components/layout/InferenceJobsList";
|
||||
import { useLocalize } from "hooks";
|
||||
import Panel from "components/common/Panel";
|
||||
@@ -16,12 +22,17 @@ import {
|
||||
FrontendInferenceJobType,
|
||||
// InferenceJob,
|
||||
} from "@storyteller/components/src/jobs/InferenceJob";
|
||||
import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper";
|
||||
import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper";
|
||||
import { Button } from "components/common";
|
||||
|
||||
function VoiceDesignerMainPage({
|
||||
inferenceJobsByCategory,
|
||||
}: {
|
||||
interface Props {
|
||||
sessionWrapper: SessionWrapper;
|
||||
sessionSubscriptionsWrapper: SessionSubscriptionsWrapper;
|
||||
inferenceJobsByCategory: any;
|
||||
}) {
|
||||
}
|
||||
|
||||
function VoiceDesignerMainPage(props: Props) {
|
||||
usePrefixedDocumentTitle("AI Voice Designer");
|
||||
const { pathname } = useLocation();
|
||||
const { t } = useLocalize("FaceAnimator");
|
||||
@@ -151,27 +162,90 @@ function VoiceDesignerMainPage({
|
||||
"Voice created successfully",
|
||||
][status];
|
||||
|
||||
const button = {
|
||||
const createVoiceButton = {
|
||||
label: `Create new voice`,
|
||||
icon: faPlus,
|
||||
to: "/voice-designer/create",
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
<Container type="panel">
|
||||
<PageHeader
|
||||
button={button}
|
||||
title="Voice Designer"
|
||||
titleIcon={faWaveform}
|
||||
subText="Create your own AI voice by providing audio files of the voice you want to clone."
|
||||
panel={false}
|
||||
imageUrl="/images/header/voice-designer.png"
|
||||
/>
|
||||
const signUpButton = {
|
||||
label: `Sign Up`,
|
||||
icon: faPenToSquare,
|
||||
to: "/signup",
|
||||
};
|
||||
|
||||
const pricingButton = {
|
||||
label: `View Pricing`,
|
||||
icon: faStar,
|
||||
to: "/pricing",
|
||||
};
|
||||
|
||||
const isLoggedIn = props.sessionWrapper.isLoggedIn();
|
||||
let pageHeader = <></>;
|
||||
if (!isLoggedIn) {
|
||||
pageHeader = (
|
||||
<PageHeader
|
||||
button={signUpButton}
|
||||
secondaryButton={pricingButton}
|
||||
title="Voice Designer"
|
||||
titleIcon={faWaveform}
|
||||
subText="Create your own AI voice by providing audio files of the voice you want to clone."
|
||||
panel={false}
|
||||
imageUrl="/images/header/voice-designer.png"
|
||||
/>
|
||||
);
|
||||
} else {
|
||||
pageHeader = (
|
||||
<PageHeader
|
||||
button={createVoiceButton}
|
||||
title="Voice Designer"
|
||||
titleIcon={faWaveform}
|
||||
subText="Create your own AI voice by providing audio files of the voice you want to clone."
|
||||
panel={false}
|
||||
imageUrl="/images/header/voice-designer.png"
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
let body = <></>;
|
||||
|
||||
if (!isLoggedIn) {
|
||||
body = (
|
||||
<Panel padding={true}>
|
||||
<div className="d-flex flex-column align-items-center py-3 my-3 py-md-4 my-md-4 gap-4">
|
||||
<div className="text-center">
|
||||
<h4 className="fw-bold">Please log in to access voice creation.</h4>
|
||||
|
||||
<p className="text-center opacity-75">
|
||||
If you don't have an account yet, sign up now to unlock this
|
||||
feature!
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="d-flex gap-3 align-items-center">
|
||||
<Button
|
||||
label="Sign Up"
|
||||
variant="primary"
|
||||
icon={faPenToSquare}
|
||||
to="/signup"
|
||||
/>
|
||||
<Button
|
||||
label="Login"
|
||||
variant="secondary"
|
||||
icon={faRightToBracket}
|
||||
to="/login"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</Panel>
|
||||
);
|
||||
} else {
|
||||
body = (
|
||||
<>
|
||||
<InferenceJobsList
|
||||
{...{
|
||||
t,
|
||||
inferenceJobs: inferenceJobsByCategory.get(
|
||||
inferenceJobs: props.inferenceJobsByCategory.get(
|
||||
FrontendInferenceJobType.VoiceDesignerCreateVoice
|
||||
),
|
||||
statusTxt,
|
||||
@@ -210,6 +284,16 @@ function VoiceDesignerMainPage({
|
||||
/>
|
||||
</div>
|
||||
</Panel>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<Container type="panel">
|
||||
{pageHeader}
|
||||
|
||||
{body}
|
||||
</Container>
|
||||
|
||||
{/* Delete Modal */}
|
||||
|
||||
@@ -31,6 +31,7 @@ import { GetVoice } from "@storyteller/components/src/api/voice_designer/voices/
|
||||
import Skeleton from "components/common/Skeleton";
|
||||
import useVoiceRequests from "./useVoiceRequests";
|
||||
import { v4 as uuidv4 } from "uuid";
|
||||
import { useHistory } from "react-router-dom";
|
||||
|
||||
interface VoiceDesignerUseVoicePageProps {
|
||||
sessionWrapper: SessionWrapper;
|
||||
@@ -62,6 +63,7 @@ export default function VoiceDesignerUseVoicePage(
|
||||
});
|
||||
const { inference } = useVoiceRequests({});
|
||||
const [isEnqueuing, setIsEnqueuing] = useState(false);
|
||||
const history = useHistory();
|
||||
|
||||
const getVoiceDetails = useCallback(async (voice_token) => {
|
||||
try {
|
||||
@@ -189,6 +191,10 @@ export default function VoiceDesignerUseVoicePage(
|
||||
);
|
||||
}
|
||||
|
||||
if (!props.sessionWrapper.isLoggedIn()) {
|
||||
history.push("/voice-designer");
|
||||
}
|
||||
|
||||
return (
|
||||
<Container type="panel">
|
||||
<PageHeader title={voiceData.title} subText={subText} />
|
||||
|
||||
+21
-2
@@ -1,8 +1,17 @@
|
||||
import React, { useState } from "react";
|
||||
import VoiceDesignerUploadComponent from "../VoiceDesignerUploadComponent";
|
||||
import { v4 as uuidv4 } from "uuid";
|
||||
// import { SessionContext } from 'context';
|
||||
|
||||
function UploadSamples({ audioProps, datasetToken, setAudioSamplesReady }: { audioProps: any, datasetToken?: string, setAudioSamplesReady:any }) {
|
||||
function UploadSamples({
|
||||
audioProps,
|
||||
datasetToken,
|
||||
setAudioSamplesReady,
|
||||
}: {
|
||||
audioProps: any;
|
||||
datasetToken?: string;
|
||||
setAudioSamplesReady: any;
|
||||
}) {
|
||||
/* eslint-disable @typescript-eslint/no-unused-vars */
|
||||
const [convertLoading, setConvertLoading] = useState(false);
|
||||
const [canConvert, setCanConvert] = useState(false);
|
||||
@@ -25,7 +34,17 @@ function UploadSamples({ audioProps, datasetToken, setAudioSamplesReady }: { aud
|
||||
<div>
|
||||
<label className="sub-title">Upload Audio</label>
|
||||
<div className="d-flex flex-column gap-3 upload-component">
|
||||
<VoiceDesignerUploadComponent {...{ changeConvertIdempotencyToken, datasetToken, formIsCleared, setCanConvert, setFormIsCleared, setMediaUploadToken, setAudioSamplesReady }}/>
|
||||
<VoiceDesignerUploadComponent
|
||||
{...{
|
||||
changeConvertIdempotencyToken,
|
||||
datasetToken,
|
||||
formIsCleared,
|
||||
setCanConvert,
|
||||
setFormIsCleared,
|
||||
setMediaUploadToken,
|
||||
setAudioSamplesReady,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user