diff --git a/packages/fakeyou.com/src/common/FrontendUrlConfig.ts b/packages/fakeyou.com/src/common/FrontendUrlConfig.ts index 27bef5d090..4db287e5d5 100644 --- a/packages/fakeyou.com/src/common/FrontendUrlConfig.ts +++ b/packages/fakeyou.com/src/common/FrontendUrlConfig.ts @@ -18,20 +18,35 @@ class FrontendUrlConfig { return `/signup?sub=${pricingPlanKey}`; } + static loginPage() : string { + return '/login'; + } + + // Pricing page + + static pricingPage(): string { + return '/pricing'; + } + + static pricingPageWithReferer(fromPage: string): string { + // NB: This is to more easily track the referer page in Google Analytics + return `/pricing?from=${fromPage}`; + } + // Standalone pages static aboutUsPage(): string { return '/about'; } - static pricingPage(): string { - return '/pricing'; - } - static termsPage(): string { return '/terms'; } + static privacyPage(): string { + return '/privacy'; + } + static patronsPage(): string { return '/patrons'; } diff --git a/packages/fakeyou.com/src/v2/view/_common/SessionTtsInferenceResultsList.tsx b/packages/fakeyou.com/src/v2/view/_common/SessionTtsInferenceResultsList.tsx index 6fa94f8dc7..f2823e1768 100644 --- a/packages/fakeyou.com/src/v2/view/_common/SessionTtsInferenceResultsList.tsx +++ b/packages/fakeyou.com/src/v2/view/_common/SessionTtsInferenceResultsList.tsx @@ -16,6 +16,7 @@ import { container, sessionItem } from "../../../data/animation"; import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper"; import { Analytics } from "../../../common/Analytics"; import { SessionTtsAudioPlayer } from "./SessionTtsAudioPlayer"; +import { FrontendUrlConfig } from "../../../common/FrontendUrlConfig"; interface Props { ttsInferenceJobs: Array; @@ -166,7 +167,7 @@ function SessionTtsInferenceResultList(props: Props) { Don't want to wait? Step to the front of the line with a{" "} { Analytics.ttsTooSlowUpgradePremium(); }} diff --git a/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx b/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx index e74a2372b8..b49ce8a47d 100644 --- a/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx +++ b/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx @@ -159,19 +159,19 @@ function FooterNav(props: Props) {

Info

  • - Pricing + Pricing
  • - About + About
  • - Terms of Use + Terms of Use
  • - Privacy Policy + Privacy Policy
  • API Docs diff --git a/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx b/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx index 6e3b02d818..c8c5e7779c 100644 --- a/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx +++ b/packages/fakeyou.com/src/v2/view/nav/TopNav.tsx @@ -62,11 +62,11 @@ function TopNav(props: Props) { let history = useHistory(); - let myDataLink = "/signup"; + let myDataLink = FrontendUrlConfig.signupPage(); if (props.sessionWrapper.isLoggedIn()) { - let username = props.sessionWrapper.getUsername(); - myDataLink = `/profile/${username}`; + let username = props.sessionWrapper.getUsername() as string; // NB: Should be present if logged in + myDataLink = FrontendUrlConfig.userProfilePage(username); } // NB: The responses from the "job count" endpoint are cached in a distributed manner. @@ -152,7 +152,7 @@ function TopNav(props: Props) { let userOrLoginButton = ( <> - + {t("nav.TopNav.buttons.login")} @@ -162,7 +162,7 @@ function TopNav(props: Props) { let signupOrLogOutButton = ( <> - + @@ -183,7 +183,7 @@ function TopNav(props: Props) { gravatar = ; } - let url = `/profile/${displayName}`; + let url = FrontendUrlConfig.userProfilePage(displayName); userOrLoginButton = ( <> @@ -326,7 +326,7 @@ function TopNav(props: Props) {
    • { Analytics.topbarClickPricing() } } className="nav-link" > diff --git a/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx b/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx index f705b2f6c0..51dcd328b5 100644 --- a/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx @@ -243,7 +243,7 @@ function SignupPage(props: Props) { let redirectWasSuccessful = await afterSignupRedirect(); if (!redirectWasSuccessful) { - window.location.href = FrontendUrlConfig.pricingPage(); + window.location.href = FrontendUrlConfig.pricingPageWithReferer("signup"); } } @@ -257,7 +257,7 @@ function SignupPage(props: Props) { return await BeginStripeCheckoutFlow(maybeInternalPlanKey); } - let redirectUrl = FrontendUrlConfig.pricingPage(); + let redirectUrl = FrontendUrlConfig.pricingPageWithReferer("signup"); history.push(redirectUrl); return true; diff --git a/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_list/TtsPageHero.tsx b/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_list/TtsPageHero.tsx index aca8be6087..ad94f41032 100644 --- a/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_list/TtsPageHero.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/tts/tts_model_list/TtsPageHero.tsx @@ -13,6 +13,7 @@ import { import { item, image } from "../../../../../data/animation"; import { motion } from "framer-motion"; import { Analytics } from "../../../../../common/Analytics"; +import { FrontendUrlConfig } from "../../../../../common/FrontendUrlConfig"; interface Props { sessionWrapper: SessionWrapper; @@ -61,7 +62,7 @@ export function TtsPageHero(props: Props) { viewPricingButton = ( <> { Analytics.ttsClickHeroViewPricing(); }} @@ -76,8 +77,8 @@ export function TtsPageHero(props: Props) { } if (props.sessionWrapper.isLoggedIn()) { - let displayName = props.sessionWrapper.getDisplayName(); - let url = `/profile/${displayName}`; + let displayName = props.sessionWrapper.getDisplayName() as string; // NB: If logged in, should be string + let url = FrontendUrlConfig.userProfilePage(displayName); myProfileButton = ( <> { Analytics.ttsClickHeroUpgradePlan(); }}