From 47923888c1a07a645e24ee386f231e2bb57a37b2 Mon Sep 17 00:00:00 2001 From: BFlat Date: Thu, 14 Mar 2024 11:48:53 +0700 Subject: [PATCH] storyteller landing and dashboard update --- .../src/components/layout/SideNav/SideNav.tsx | 10 ++-- .../fakeyou.com/src/v2/view/PageContainer.tsx | 7 ++- .../v2/view/pages/dashboard/DashboardPage.tsx | 19 ++++++++ .../src/v2/view/pages/landing/LandingPage.tsx | 48 +++++++++---------- .../LandingVideoReel/LandingVideoReel.tsx | 28 ++++++++--- 5 files changed, 76 insertions(+), 36 deletions(-) create mode 100644 packages/fakeyou.com/src/v2/view/pages/dashboard/DashboardPage.tsx diff --git a/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx b/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx index a96377a081..e8c869b32f 100644 --- a/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx +++ b/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx @@ -30,6 +30,8 @@ import { useInferenceJobs, useLocalize } from "hooks"; import { Logout } from "@storyteller/components/src/api/session/Logout"; import { Button } from "components/common"; import { WebUrl } from "common/WebUrl"; +import { DomainConfig, Website } from "utils/domainConfig"; +import { useDomainConfig } from "context/DomainConfigContext"; interface SideNavProps { sessionWrapper: SessionWrapper; @@ -56,6 +58,7 @@ export default function SideNav({ const isOnLoginPage = window.location.pathname.includes("/login"); const isOnSignUpPage = window.location.pathname.includes("/signup"); const isOnStudioPage = window.location.pathname.includes("/studio"); + const domain: DomainConfig = useDomainConfig(); let history = useHistory(); const handleNavLinkClick = () => { @@ -107,7 +110,8 @@ export default function SideNav({ const shouldNotShowSidebar = (!isLoggedIn && (isOnLandingPage || isOnLoginPage || isOnSignUpPage)) || - isOnStudioPage; + isOnStudioPage || + (domain.website === Website.StorytellerAi && isOnLandingPage); const shouldShowSidebar = windowWidth >= 992 && !shouldNotShowSidebar; const sidebarClassName = `sidebar ${ shouldShowSidebar ? "visible" : "" @@ -333,7 +337,7 @@ export default function SideNav({
  • @@ -341,7 +345,7 @@ export default function SideNav({ icon={faHome} className="sidebar-heading-icon" /> - Home + {domain.website === Website.FakeYou ? "Home" : "Dashboard"}
  • diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index d04313e233..df58a8d189 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -127,6 +127,7 @@ import DevTTS from "./pages/dev_tts/DevTTS"; import { StudioIntroPage } from "./pages/storyteller_studio_intro/StudioIntroPage"; import StudioVSTPage from "./pages/storyteller_studio_intro/StudioVST/StudioVSTPage"; import { StudioIntroResultPage } from "./pages/storyteller_studio_intro/StudioIntroResultPage"; +import DashboardPage from "./pages/dashboard/DashboardPage"; interface Props { sessionWrapper: SessionWrapper; @@ -727,6 +728,10 @@ class PageContainer extends React.Component< /> + + + + @@ -812,7 +817,7 @@ class PageContainer extends React.Component< - + {/* Route for initial voice creation */} + + + ); +} diff --git a/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx b/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx index 01c1f8baf0..90c9f2442a 100644 --- a/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx @@ -39,14 +39,17 @@ function LandingPage(props: Props) { const domain: DomainConfig = useDomainConfig(); - const webpageTitle = domain.website === Website.FakeYou ? "FakeYou Celebrity Voice Generator" : ""; + const webpageTitle = + domain.website === Website.FakeYou + ? "FakeYou Celebrity Voice Generator" + : ""; usePrefixedDocumentTitle(webpageTitle); const isLoggedIn = props.sessionWrapper.isLoggedIn(); // DO NOT LEAK THIS YET!! - let protectedStudioOnboarding = <> + let protectedStudioOnboarding = <>; if (props.sessionWrapper.canAccessStudio()) { protectedStudioOnboarding = ( @@ -58,8 +61,8 @@ function LandingPage(props: Props) { return ( <> - {domain.website === Website.StorytellerAi && !isLoggedIn && ( - + {domain.website === Website.StorytellerAi && ( + )} {domain.website === Website.FakeYou ? ( @@ -90,27 +93,22 @@ function LandingPage(props: Props) { ) : ( <> {/* STORYTELLER,AI */} - {!isLoggedIn ? ( - <> - {protectedStudioOnboarding} - - - - - - ) : ( - - )} + + {protectedStudioOnboarding} + + + + + + )} diff --git a/packages/fakeyou.com/src/v2/view/pages/landing/components/LandingVideoReel/LandingVideoReel.tsx b/packages/fakeyou.com/src/v2/view/pages/landing/components/LandingVideoReel/LandingVideoReel.tsx index e526023967..e4b42c9658 100644 --- a/packages/fakeyou.com/src/v2/view/pages/landing/components/LandingVideoReel/LandingVideoReel.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/landing/components/LandingVideoReel/LandingVideoReel.tsx @@ -1,12 +1,26 @@ import { faArrowRight } from "@fortawesome/pro-solid-svg-icons"; import { Button } from "components/common"; -import React, { useEffect } from "react"; +import React, { useEffect, useState } from "react"; import "./LandingVideoReel.scss"; +import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper"; +import { useLocation } from "react-router-dom"; -interface LandingVideoReelProps {} +interface LandingVideoReelProps { + sessionWrapper: SessionWrapper; +} -export default function LandingVideoReel(props: LandingVideoReelProps) { - const isOnLandingPage = window.location.pathname === "/"; +export default function LandingVideoReel({ + sessionWrapper, +}: LandingVideoReelProps) { + const location = useLocation(); + const [isOnLandingPage, setIsOnLandingPage] = useState( + window.location.pathname === "/" + ); + const isLoggedIn = sessionWrapper.isLoggedIn(); + + useEffect(() => { + setIsOnLandingPage(location.pathname === "/"); + }, [location]); useEffect(() => { const contentWrapper = document.getElementById("page-content-wrapper"); @@ -41,7 +55,7 @@ export default function LandingVideoReel(props: LandingVideoReelProps) { searchBar?.classList.remove("landing-search"); contentWrapper?.classList.remove("no-page-padding-top"); }; - }, [isOnLandingPage]); + }, [isOnLandingPage, isLoggedIn]); return (
    @@ -62,8 +76,8 @@ export default function LandingVideoReel(props: LandingVideoReelProps) {