From 993dc9c00f236fc450decfe568349f18f14b1bc6 Mon Sep 17 00:00:00 2001
From: kasisnu <5044120+kasisnu@users.noreply.github.com>
Date: Wed, 22 Nov 2023 17:37:46 +0530
Subject: [PATCH 1/2] require users to login for voice designer
---
.../fakeyou.com/src/v2/view/PageContainer.tsx | 18 +-
.../voice_designer/VoiceDesignerFormPage.tsx | 7 +-
.../voice_designer/VoiceDesignerMainPage.tsx | 164 ++++++++++++------
.../VoiceDesignerUseVoicePage.tsx | 6 +
.../voice_designer/components/VdPageHero.tsx | 103 +++++++++++
.../components/steps/UploadSamples.tsx | 1 +
6 files changed, 241 insertions(+), 58 deletions(-)
create mode 100644 packages/fakeyou.com/src/v2/view/pages/voice_designer/components/VdPageHero.tsx
diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx
index b4a31f7b73..edd1671dba 100644
--- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx
+++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx
@@ -644,7 +644,10 @@ class PageContainer extends React.Component<
path="/voice-designer/create"
>
@@ -654,7 +657,10 @@ class PageContainer extends React.Component<
path="/voice-designer/dataset/:dataset_token/edit"
>
@@ -664,7 +670,10 @@ class PageContainer extends React.Component<
path="/voice-designer/dataset/:dataset_token/upload"
>
@@ -687,6 +696,9 @@ class PageContainer extends React.Component<
>;
+ if (!isLoggedIn) {
+ pageHeader = (
+ )
+ } else {
+ pageHeader = (
+ )
+ }
+
+ let body = <>>;
+
+ if (!isLoggedIn) {
+ body = (
+
+
+

+

+
+ {/*
+ Join Our Community
+
*/}
+
+ This feature requires a subscription
+
+ Log in or Sign Up!
+
+ Also join us on Discord so that we know what you're thinking.
+
+
+
+
+
+
+ )
+ } else {
+ body = (
+ <>
+
+
+
+
+
+
+
+
+ >
+ )
+ }
+
return (
<>
-
-
-
-
+ {pageHeader}
-
-
-
-
+ {body}
{/* Delete Modal */}
diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerUseVoicePage.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerUseVoicePage.tsx
index f66555a637..38f28ba008 100644
--- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerUseVoicePage.tsx
+++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerUseVoicePage.tsx
@@ -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 (
diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/VdPageHero.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/VdPageHero.tsx
new file mode 100644
index 0000000000..4d15a9b252
--- /dev/null
+++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/VdPageHero.tsx
@@ -0,0 +1,103 @@
+import React, { useMemo } from "react";
+import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper";
+import { Link } from "react-router-dom";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import {
+ faStar,
+ faUser,
+ faArrowRight,
+ faMicrophoneStand,
+} from "@fortawesome/pro-solid-svg-icons";
+
+import { useLocalize } from "hooks";
+import { PageHeaderWithImage } from "v2/view/_common/PageHeaderWithImage";
+import { WebUrl } from "common/WebUrl";
+import { Analytics } from "common/Analytics";
+
+interface Props {
+ sessionWrapper: SessionWrapper;
+}
+
+export function VdPageHero(props: Props) {
+ const { t } = useLocalize("VcModelListPage");
+ const randomImage = useMemo(() => {
+ const images = ["/images/header/voice-designer.png"];
+
+ return images[Math.floor(Math.random() * images.length)];
+ }, []);
+
+ let signUpButton = <>>;
+ let viewPricingButton = <>>;
+ let loginButton = <>>;
+ const loggedIn = props.sessionWrapper.isLoggedIn();
+
+ if (!loggedIn) {
+ signUpButton = (
+ <>
+ {
+ Analytics.ttsClickHeroSignup();
+ }}
+ >
+
+
+ >
+ );
+ viewPricingButton = (
+ <>
+ {
+ Analytics.ttsClickHeroViewPricing();
+ }}
+ >
+
+
+ >
+ );
+
+ loginButton = (
+ <>
+
+
+
+ >
+ );
+ }
+
+ const titleIcon = (
+
+ );
+ const title = <>{"Voice Designer"}>;
+ const subText = <>{t("heroText")}>;
+ const actionButtons = (
+ <>
+ {signUpButton}
+ {loginButton}
+ {viewPricingButton}
+ >
+ );
+
+ return (
+ <>
+
+ >
+ );
+}
diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/UploadSamples.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/UploadSamples.tsx
index af3fdf0b02..97d0f45537 100644
--- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/UploadSamples.tsx
+++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/UploadSamples.tsx
@@ -1,6 +1,7 @@
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 }) {
/* eslint-disable @typescript-eslint/no-unused-vars */
From 4824dfb54e1057e7facd06320d717d5f87016c26 Mon Sep 17 00:00:00 2001
From: BFlat
Date: Wed, 22 Nov 2023 22:14:24 +0700
Subject: [PATCH 2/2] not logged in styling fix
---
.../layout/PageHeader/PageHeader.tsx | 45 +++-
.../voice_designer/VoiceDesignerMainPage.tsx | 194 ++++++++++--------
.../voice_designer/components/VdPageHero.tsx | 103 ----------
.../components/steps/UploadSamples.tsx | 24 ++-
4 files changed, 167 insertions(+), 199 deletions(-)
delete mode 100644 packages/fakeyou.com/src/v2/view/pages/voice_designer/components/VdPageHero.tsx
diff --git a/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx b/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx
index 6b4bb69918..2f9d25689b 100644
--- a/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx
+++ b/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx
@@ -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 && }>
);
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 ? : null;
+ const secondaryButtonProps = {
+ ...(secondaryButton ? secondaryButton : {}),
+ ...(secondaryButtonIcon && { icon: secondaryButtonIcon }),
+ ...(secondaryButtonLabel && { label: secondaryButtonLabel }),
+ ...(secondaryButtonOnClick && { onClick: secondaryButtonOnClick }),
+ ...(secondaryButtonTo && { to: secondaryButtonTo }),
+ ...(secondaryButtonVariant && { variant: secondaryButtonVariant }),
+ };
+
+ const HeaderBtn = () =>
+ button || showButton ? : null;
+
+ const HeaderBtnTwo = () =>
+ secondaryButton ? : null;
if (!panel) {
return (
@@ -95,9 +119,10 @@ export default function PageHeader({
{subText}
- { ( button || showButton ) && (
-
+ {(button || showButton) && (
+
+
)}
diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerMainPage.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerMainPage.tsx
index 1c1bb1c8fe..2f409336c5 100644
--- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerMainPage.tsx
+++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/VoiceDesignerMainPage.tsx
@@ -1,8 +1,14 @@
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, useSession } from "hooks";
+import { useLocalize } from "hooks";
import Panel from "components/common/Panel";
import PageHeader from "components/layout/PageHeader";
import Container from "components/common/Container";
@@ -16,9 +22,9 @@ import {
FrontendInferenceJobType,
// InferenceJob,
} from "@storyteller/components/src/jobs/InferenceJob";
-import { VdPageHero } from "./components/VdPageHero";
import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper";
import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper";
+import { Button } from "components/common";
interface Props {
sessionWrapper: SessionWrapper;
@@ -45,7 +51,6 @@ function VoiceDesignerMainPage(props: Props) {
text: "",
});
-
const history = useHistory();
if (pathname === "/voice-designer" || pathname === "/voice-designer/") {
@@ -157,107 +162,130 @@ function VoiceDesignerMainPage(props: Props) {
"Voice created successfully",
][status];
- const button = {
+ const createVoiceButton = {
label: `Create new voice`,
icon: faPlus,
to: "/voice-designer/create",
};
+ 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 = (
- )
+
+ );
} else {
pageHeader = (
- )
+
+ );
}
let body = <>>;
if (!isLoggedIn) {
body = (
-
-
-

-

+
+
+
+
Please log in to access voice creation.
+
+
+ If you don't have an account yet, sign up now to unlock this
+ feature!
+
+
+
+
+
+
+
- {/*
- Join Our Community
-
*/}
-
- This feature requires a subscription
-
- Log in or Sign Up!
-
- Also join us on Discord so that we know what you're thinking.
-
-
-
-
-
-
- )
+
+ );
} else {
body = (
<>
-
-
-
-
-
-
-
-
- >
- )
+
+
+
+
+
+
+
+ >
+ );
}
return (
diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/VdPageHero.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/VdPageHero.tsx
deleted file mode 100644
index 4d15a9b252..0000000000
--- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/VdPageHero.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import React, { useMemo } from "react";
-import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper";
-import { Link } from "react-router-dom";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import {
- faStar,
- faUser,
- faArrowRight,
- faMicrophoneStand,
-} from "@fortawesome/pro-solid-svg-icons";
-
-import { useLocalize } from "hooks";
-import { PageHeaderWithImage } from "v2/view/_common/PageHeaderWithImage";
-import { WebUrl } from "common/WebUrl";
-import { Analytics } from "common/Analytics";
-
-interface Props {
- sessionWrapper: SessionWrapper;
-}
-
-export function VdPageHero(props: Props) {
- const { t } = useLocalize("VcModelListPage");
- const randomImage = useMemo(() => {
- const images = ["/images/header/voice-designer.png"];
-
- return images[Math.floor(Math.random() * images.length)];
- }, []);
-
- let signUpButton = <>>;
- let viewPricingButton = <>>;
- let loginButton = <>>;
- const loggedIn = props.sessionWrapper.isLoggedIn();
-
- if (!loggedIn) {
- signUpButton = (
- <>
-
{
- Analytics.ttsClickHeroSignup();
- }}
- >
-
-
- >
- );
- viewPricingButton = (
- <>
-
{
- Analytics.ttsClickHeroViewPricing();
- }}
- >
-
-
- >
- );
-
- loginButton = (
- <>
-
-
-
- >
- );
- }
-
- const titleIcon = (
-
- );
- const title = <>{"Voice Designer"}>;
- const subText = <>{t("heroText")}>;
- const actionButtons = (
- <>
- {signUpButton}
- {loginButton}
- {viewPricingButton}
- >
- );
-
- return (
- <>
-
- >
- );
-}
diff --git a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/UploadSamples.tsx b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/UploadSamples.tsx
index 97d0f45537..bd081a25b7 100644
--- a/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/UploadSamples.tsx
+++ b/packages/fakeyou.com/src/v2/view/pages/voice_designer/components/steps/UploadSamples.tsx
@@ -1,9 +1,17 @@
import React, { useState } from "react";
import VoiceDesignerUploadComponent from "../VoiceDesignerUploadComponent";
import { v4 as uuidv4 } from "uuid";
-import { SessionContext } from 'context';
+// 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);
@@ -26,7 +34,17 @@ function UploadSamples({ audioProps, datasetToken, setAudioSamplesReady }: { aud