diff --git a/src/website/packages/fakeyou.com/src/components/common/LoginBlock/LoginBlock.tsx b/src/website/packages/fakeyou.com/src/components/common/LoginBlock/LoginBlock.tsx new file mode 100644 index 0000000000..8d30642250 --- /dev/null +++ b/src/website/packages/fakeyou.com/src/components/common/LoginBlock/LoginBlock.tsx @@ -0,0 +1,78 @@ +import { Button, Container, Panel } from "components/common"; +import React from "react"; +import { useHistory } from "react-router-dom"; + +interface LoginBlockProps { + title?: string; + message?: string; + redirect?: string; +} + +export default function LoginBlock({ + title = "You need to be logged in to use this product.", + message = "Please login or create an account to proceed.", + redirect, +}: LoginBlockProps) { + const history = useHistory(); + + return ( +
+ + + {/*
+
+ +
+
*/} +
+

{title}

+

{message}

+
+
+
+
+
+
+ ); +} diff --git a/src/website/packages/fakeyou.com/src/components/common/LoginBlock/index.ts b/src/website/packages/fakeyou.com/src/components/common/LoginBlock/index.ts new file mode 100644 index 0000000000..a92c7e4020 --- /dev/null +++ b/src/website/packages/fakeyou.com/src/components/common/LoginBlock/index.ts @@ -0,0 +1 @@ +export { default } from "./LoginBlock"; diff --git a/src/website/packages/fakeyou.com/src/components/common/SessionFetchingSpinner/SessionFetchingSpinner.tsx b/src/website/packages/fakeyou.com/src/components/common/SessionFetchingSpinner/SessionFetchingSpinner.tsx new file mode 100644 index 0000000000..960e768a47 --- /dev/null +++ b/src/website/packages/fakeyou.com/src/components/common/SessionFetchingSpinner/SessionFetchingSpinner.tsx @@ -0,0 +1,21 @@ +import React from "react"; +import Container from "../Container"; +import LoadingSpinner from "../LoadingSpinner"; + +export default function SessionFetchingSpinner() { + return ( + +
+ +
+
+ ); +} diff --git a/src/website/packages/fakeyou.com/src/components/common/SessionFetchingSpinner/index.ts b/src/website/packages/fakeyou.com/src/components/common/SessionFetchingSpinner/index.ts new file mode 100644 index 0000000000..4a1bf54708 --- /dev/null +++ b/src/website/packages/fakeyou.com/src/components/common/SessionFetchingSpinner/index.ts @@ -0,0 +1 @@ +export { default } from "./SessionFetchingSpinner"; diff --git a/src/website/packages/fakeyou.com/src/components/common/index.tsx b/src/website/packages/fakeyou.com/src/components/common/index.tsx index 1a534830eb..c8eaf2cd05 100644 --- a/src/website/packages/fakeyou.com/src/components/common/index.tsx +++ b/src/website/packages/fakeyou.com/src/components/common/index.tsx @@ -25,6 +25,7 @@ import JobsClearButton from "./JobsClearButton"; import JobQueueTicker from "./JobQueueTicker"; import Label from "./Label"; import LikeButton from "./LikeButton"; +import LoginBlock from "./LoginBlock"; import MocapInput from "./MocapInput"; import MasonryGrid from "./MasonryGrid/MasonryGrid"; import Modal, { ModalUtilities } from "./Modal"; @@ -42,6 +43,7 @@ import SelectionBubbles from "./SelectionBubbles"; import SelectModal, { SelectModalData } from "./SelectModal"; import SelectModalVideoTabs from "./SelectModalVideoTabs"; import SelectModalWeightsTabs from "./SelectModalWeightsTabs"; +import SessionFetchingSpinner from "./SessionFetchingSpinner"; import Skeleton from "./Skeleton"; import Slider from "./Slider"; import SocialButton, { Socials } from "./SocialButton"; @@ -93,6 +95,7 @@ export { JobQueueTicker, Label, LikeButton, + LoginBlock, MocapInput, MasonryGrid, Modal, @@ -111,6 +114,7 @@ export { SelectModal, SelectModalVideoTabs, SelectModalWeightsTabs, + SessionFetchingSpinner, Skeleton, Slider, SocialButton, diff --git a/src/website/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/src/website/packages/fakeyou.com/src/v2/view/PageContainer.tsx index e2c20f77a7..ff2c40cad1 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -331,6 +331,7 @@ class PageContainer extends React.Component< {}} sessionWrapper={this.props.sessionWrapper} + querySessionAction={this.props.querySessionAction} /> diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/ai_face_mirror/AIFaceMirror.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/ai_face_mirror/AIFaceMirror.tsx index d4d6ba3fe0..25c43f90e7 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/ai_face_mirror/AIFaceMirror.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/ai_face_mirror/AIFaceMirror.tsx @@ -9,6 +9,8 @@ import { // TextArea, // Slider, Label, + SessionFetchingSpinner, + LoginBlock, // DropdownOptions, } from "components/common"; import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper"; @@ -21,6 +23,7 @@ import { import { EntityInput } from "components/entities"; import { useInferenceJobs, + useSession, // useSession } from "hooks"; import { Link } from "react-router-dom"; @@ -34,6 +37,7 @@ interface Props { } export default function AIFaceMirror({ sessionSubscriptionsWrapper }: Props) { + const { loggedIn, sessionFetched } = useSession(); const [sourceMediaToken, sourceMediaTokenSet] = useState(""); const [removeWatermark, removeWatermarkSet] = useState(false); const [faceDriverToken, faceDriverTokenSet] = useState( @@ -50,7 +54,6 @@ export default function AIFaceMirror({ sessionSubscriptionsWrapper }: Props) { useDocumentTitle("Live Portrait AI. Free Video Animation"); const { enqueue } = useInferenceJobs(); - // const { canBanUsers } = useSession(); const visibilityOptions = [ { label: "Private", value: "private" }, @@ -84,6 +87,19 @@ export default function AIFaceMirror({ sessionSubscriptionsWrapper }: Props) { } }; + if (!sessionFetched) { + return ; + } + + if (!loggedIn) { + return ( + + ); + } + return ( <> diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/live_portrait/LivePortrait.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/live_portrait/LivePortrait.tsx index dd7e619316..7e836e4768 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/live_portrait/LivePortrait.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/live_portrait/LivePortrait.tsx @@ -11,7 +11,9 @@ import { Checkbox, Container, Label, + LoginBlock, Panel, + SessionFetchingSpinner, } from "components/common"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { @@ -32,7 +34,7 @@ import { import Tippy from "@tippyjs/react"; import "tippy.js/dist/tippy.css"; import { v4 as uuidv4 } from "uuid"; -import { useInferenceJobs, useModal } from "hooks"; +import { useInferenceJobs, useModal, useSession } from "hooks"; import { FrontendInferenceJobType, InferenceJob, @@ -68,6 +70,7 @@ export default function LivePortrait({ }: LivePortraitProps) { useDocumentTitle("Live Portrait AI. Free Video Animation"); const { enqueueInferenceJob } = useInferenceJobs(); + const { loggedIn, sessionFetched } = useSession(); const { open, close } = useModal(); const [isEnqueuing, setIsEnqueuing] = useState(false); const [selectedSourceIndex, setSelectedSourceIndex] = useState(0); @@ -652,6 +655,19 @@ export default function LivePortrait({ } }; + if (!sessionFetched) { + return ; + } + + if (!loggedIn) { + return ( + + ); + } + return ( <> diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/login/LoginPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/login/LoginPage.tsx index 9a0c02affb..a835de2b12 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/login/LoginPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/login/LoginPage.tsx @@ -287,7 +287,7 @@ function LoginPage(props: Props) {
Don't have an account?
- Sign up + Sign up

diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx index f1bbc42da0..bd70a42f2d 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx @@ -30,6 +30,7 @@ enum FieldTriState { interface Props { sessionWrapper: SessionWrapper; querySessionCallback: () => void; + querySessionAction: () => void; } function SignupPage(props: Props) { @@ -247,6 +248,7 @@ function SignupPage(props: Props) { } } else if (CreateAccountIsSuccess(response)) { props.querySessionCallback(); + props.querySessionAction(); Analytics.accountSignupComplete(); @@ -604,7 +606,7 @@ function SignupPage(props: Props) {

Already have an account?{" "} - Log in instead. + Log in instead.

diff --git a/src/website/packages/fakeyou.com/src/v2/view/pages/style-video/StyleVideo.tsx b/src/website/packages/fakeyou.com/src/v2/view/pages/style-video/StyleVideo.tsx index 2ce475679e..09bdf7e34c 100644 --- a/src/website/packages/fakeyou.com/src/v2/view/pages/style-video/StyleVideo.tsx +++ b/src/website/packages/fakeyou.com/src/v2/view/pages/style-video/StyleVideo.tsx @@ -11,6 +11,8 @@ import { Slider, Label, DropdownOptions, + SessionFetchingSpinner, + LoginBlock, } from "components/common"; import { EntityInput } from "components/entities"; import { @@ -24,13 +26,12 @@ import { usePrefixedDocumentTitle } from "common/UsePrefixedDocumentTitle"; import { StyleSelectionButton } from "./StyleSelection/StyleSelectionButton"; import useStyleStore from "hooks/useStyleStore"; import StyleOptionPicker from "./StyleSelection/StyleSelectionList"; -import LoadingSpinner from "components/common/LoadingSpinner"; import { isMobile } from "react-device-detect"; import { AITools } from "components/marketing"; export default function StyleVideo() { const { mediaToken: pageMediaToken } = useParams<{ mediaToken: string }>(); - const { styleVideoAccessCheck, sessionFetched } = useSession(); + const { loggedIn, sessionFetched } = useSession(); const [mediaToken, mediaTokenSet] = useState(pageMediaToken || ""); const [IPAToken, IPATokenSet] = useState(""); const [prompt, promptSet] = useState(""); @@ -175,24 +176,19 @@ export default function StyleVideo() { }; if (!sessionFetched) { + return ; + } + + if (!loggedIn) { return ( - -
- -
-
+ ); } - return styleVideoAccessCheck( + return ( <> {vstInfo}