From b6ad1bb42d2886636edce96d809ca5c3b839b4ad Mon Sep 17 00:00:00 2001 From: BFlat Date: Thu, 26 Sep 2024 09:46:13 +0700 Subject: [PATCH] removed useDomainConfig and useSearch contexts from PageContainer (#709) * removed domain config usage * removed search context * remove search context file --- .../components/common/SearchBar/SearchBar.tsx | 4 +- .../src/components/layout/SideNav/SideNav.tsx | 5 +- .../src/components/layout/TopNav/TopNav.tsx | 33 +- .../src/context/DomainConfigContext.tsx | 22 - .../fakeyou.com/src/context/SearchContext.tsx | 23 - .../fakeyou.com/src/context/index.tsx | 3 +- .../src/hooks/useGlobalSearchStore/index.ts | 1 + .../useGlobalSearchStore.tsx | 21 + .../fakeyou.com/src/v2/view/PageContainer.tsx | 882 +++++++++--------- .../fakeyou.com/src/v2/view/nav/FooterNav.tsx | 11 +- .../pages/about/privacy_page/PrivacyPage.tsx | 4 +- .../view/pages/about/terms_page/TermsPage.tsx | 4 +- .../Beta3DVideoCompositorForm.tsx | 9 +- .../pages/beta_products/BetaLipSyncForm.tsx | 9 +- .../beta_products/BetaVideoCompositorForm.tsx | 9 +- .../beta_products/BetaWebcamActingForm.tsx | 9 +- .../src/v2/view/pages/landing/LandingPage.tsx | 5 +- .../PostlaunchLanding/CreatorTypeformPage.tsx | 9 +- .../PostlaunchLanding/PostlaunchLanding.tsx | 5 +- .../src/v2/view/pages/login/LoginPage.tsx | 28 +- .../src/v2/view/pages/signup/SignupPage.tsx | 14 +- 21 files changed, 550 insertions(+), 560 deletions(-) delete mode 100644 src/website/packages/fakeyou.com/src/context/DomainConfigContext.tsx delete mode 100644 src/website/packages/fakeyou.com/src/context/SearchContext.tsx create mode 100644 src/website/packages/fakeyou.com/src/hooks/useGlobalSearchStore/index.ts create mode 100644 src/website/packages/fakeyou.com/src/hooks/useGlobalSearchStore/useGlobalSearchStore.tsx diff --git a/src/website/packages/fakeyou.com/src/components/common/SearchBar/SearchBar.tsx b/src/website/packages/fakeyou.com/src/components/common/SearchBar/SearchBar.tsx index 2f57e93e38..b5e1f17e3f 100644 --- a/src/website/packages/fakeyou.com/src/components/common/SearchBar/SearchBar.tsx +++ b/src/website/packages/fakeyou.com/src/components/common/SearchBar/SearchBar.tsx @@ -7,8 +7,8 @@ import SearchResultsDropdown from "./SearchResultsDropdown"; import SearchField from "./SearchField"; import "./SearchBar.scss"; import { useHistory, useLocation } from "react-router-dom"; -import { useSearch } from "context/SearchContext"; import debounce from "lodash.debounce"; +import useGlobalSearchStore from "hooks/useGlobalSearchStore"; interface SearchBarProps { autoFocus?: boolean; @@ -26,7 +26,7 @@ export default function SearchBar({ let history = useHistory(); let location = useLocation(); - const { searchTerm, setSearchTerm } = useSearch(); + const { searchTerm, setSearchTerm } = useGlobalSearchStore(); const [foundWeights, setFoundWeights] = useState([]); const [isLoading, setIsLoading] = useState(true); const isOnSearchPage = location.pathname.startsWith("/search"); diff --git a/src/website/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx b/src/website/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx index 1015ffa058..1d913a8c3a 100644 --- a/src/website/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx +++ b/src/website/packages/fakeyou.com/src/components/layout/SideNav/SideNav.tsx @@ -32,10 +32,9 @@ import { Logout } from "@storyteller/components/src/api/session/Logout"; import { Button } from "components/common"; import { WebUrl } from "common/WebUrl"; import { - WebsiteConfig, + GetWebsite, Website, } from "@storyteller/components/src/env/GetWebsite"; -import { useDomainConfig } from "context/DomainConfigContext"; interface SideNavProps { sessionWrapper: SessionWrapper; @@ -65,7 +64,7 @@ export default function SideNav({ const isOnProfilePage = window.location.pathname.includes("/profile/"); const isOnBetaKeyRedeemPage = window.location.pathname.includes("/beta-key/redeem"); - const domain: WebsiteConfig = useDomainConfig(); + const domain = GetWebsite(); let history = useHistory(); const handleNavLinkClick = () => { diff --git a/src/website/packages/fakeyou.com/src/components/layout/TopNav/TopNav.tsx b/src/website/packages/fakeyou.com/src/components/layout/TopNav/TopNav.tsx index 22dd32fea0..6048aac692 100644 --- a/src/website/packages/fakeyou.com/src/components/layout/TopNav/TopNav.tsx +++ b/src/website/packages/fakeyou.com/src/components/layout/TopNav/TopNav.tsx @@ -27,7 +27,6 @@ import { Link, NavLink, useHistory } from "react-router-dom"; import { Logout } from "@storyteller/components/src/api/session/Logout"; import { useLocalize, useModal, useSession } from "hooks"; import { InferenceJobsModal } from "components/modals"; -import { useDomainConfig } from "context/DomainConfigContext"; import NavItem from "../../common/NavItem/NavItem"; import ProfileDropdown from "components/common/ProfileDropdown"; import "./TopNav.scss"; @@ -35,10 +34,14 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { faDiscord } from "@fortawesome/free-brands-svg-icons"; import { GetDiscordLink } from "@storyteller/components/src/env/GetDiscordLink"; import { WebUrl } from "common/WebUrl"; +import { + GetWebsite, + Website, +} from "@storyteller/components/src/env/GetWebsite"; export default function TopNav() { const { queryAppState, sessionWrapper, user } = useSession(); - const domain = useDomainConfig(); + const domain = GetWebsite(); let history = useHistory(); const [isMobileSearchBarVisible, setIsMobileSearchBarVisible] = useState(false); @@ -74,7 +77,7 @@ export default function TopNav() { const loggedIn = sessionWrapper.isLoggedIn(); const showNavItem = (!loggedIn && (isOnLandingPage || isOnLoginPage || isOnSignUpPage)) || - domain.titlePart === "Storyteller AI"; + domain.website === Website.StorytellerAi; const [mobileMenu, setMobileMenu] = useState("d-none"); @@ -201,7 +204,7 @@ export default function TopNav() { if (pageContentWrapper) { if ( - (domain.titlePart === "Storyteller AI" && isOnLandingPage) || + (domain.website === Website.StorytellerAi && isOnLandingPage) || isOnBetaKeyRedeemPage || isOnCreatorOnboardingPage || isOnLoginPage || @@ -215,7 +218,6 @@ export default function TopNav() { } } }, [ - domain.titlePart, isOnLandingPage, isOnBetaKeyRedeemPage, isOnWaitlistSuccessPage, @@ -224,11 +226,12 @@ export default function TopNav() { isOnSignUpPage, isOnWelcomePage, isOnBetaForm, + domain.website, ]); if ( topBarWrapper && - domain.titlePart === "Storyteller AI" && + domain.website === Website.StorytellerAi && isOnLandingPage ) { topBarWrapper.classList.add("topbar-bg-transparent"); @@ -240,7 +243,7 @@ export default function TopNav() { const handleScroll = () => { if ( topBarWrapper && - domain.titlePart === "Storyteller AI" && + domain.website === Website.StorytellerAi && isOnLandingPage ) { if (window.scrollY > 500) { @@ -256,7 +259,7 @@ export default function TopNav() { return () => { window.removeEventListener("scroll", handleScroll); }; - }, [domain.titlePart, isOnLandingPage, topBarWrapper]); + }, [domain.website, isOnLandingPage, topBarWrapper]); if ( isOnBetaKeyRedeemPage || @@ -385,7 +388,7 @@ export default function TopNav() { return ( <> - {/* {domain.titlePart === "Storyteller AI" && + {/* {domain.website === Website.StorytellerAi && isOnLandingPage && !isScrolled && (
- {domain.titlePart === "FakeYou" && ( + {domain.website === Website.FakeYou && (
{/* Search Bar */}
- {domain.titlePart === "FakeYou" && ( + {domain.website === Website.FakeYou && ( <> {(!isOnLandingPage && !isOnLoginPage && @@ -520,7 +523,7 @@ export default function TopNav() {
- {domain.titlePart === "Storyteller AI" && + {domain.website === Website.StorytellerAi && sessionWrapper.canAccessStudio() && (