diff --git a/packages/fakeyou.com/src/components/common/Container/Container.tsx b/packages/fakeyou.com/src/components/common/Container/Container.tsx
index ba3a1b05b2..40bd75a515 100644
--- a/packages/fakeyou.com/src/components/common/Container/Container.tsx
+++ b/packages/fakeyou.com/src/components/common/Container/Container.tsx
@@ -29,8 +29,7 @@ export default function PageContainer({
}
// Merge the classNames
- const mergedClassNames =
- `${containerClass} ${className} min-height-100vh`.trim();
+ const mergedClassNames = `${containerClass} ${className}`.trim();
return
- {domain.title === "FakeYou" ? (
-
- © 2023 {domain.title} by{" "}
-
- Storyteller.ai
-
-
- ) : (
-
© 2023 {domain.title}
- )}
+
© {domain.title} 2023
{moderationLink}
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 ab248e763b..2aad262782 100644
--- a/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx
+++ b/packages/fakeyou.com/src/v2/view/pages/landing/LandingPage.tsx
@@ -1,26 +1,21 @@
-import React, { useMemo, useState } from "react";
+import React from "react";
import { usePrefixedDocumentTitle } from "../../../../common/UsePrefixedDocumentTitle";
import { Link } from "react-router-dom";
import { SessionWrapper } from "@storyteller/components/src/session/SessionWrapper";
import { SessionSubscriptionsWrapper } from "@storyteller/components/src/session/SessionSubscriptionsWrapper";
-import { useLocalize, useModal } from "hooks";
+import { useLocalize } from "hooks";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import {
- faStar,
- faArrowRight,
- faUser,
-} from "@fortawesome/free-solid-svg-icons";
+import { faArrowRight } from "@fortawesome/free-solid-svg-icons";
import { faDiscord, faTwitter } from "@fortawesome/free-brands-svg-icons";
-import { WebUrl } from "../../../../common/WebUrl";
import {
+ faCompass,
faFileArrowUp,
faFlask,
- faSearch,
faSparkles,
} from "@fortawesome/pro-solid-svg-icons";
import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClient";
-import Alert from "components/common/Alert/Alert";
-import { Button, Container, Panel } from "components/common";
+// import Alert from "components/common/Alert/Alert";
+import { Button, Container, Modal, Panel } from "components/common";
interface Props {
sessionWrapper: SessionWrapper;
@@ -32,66 +27,65 @@ function LandingPage(props: Props) {
PosthogClient.recordPageview();
const { t } = useLocalize("LandingPage");
const isLoggedIn = props.sessionWrapper.isLoggedIn();
- const isSubscribed = props.sessionSubscriptionsWrapper.hasPaidFeatures();
+ // const isSubscribed = props.sessionSubscriptionsWrapper.hasPaidFeatures();
// const [isFocused, setIsFocused] = useState(false);
- const { open, close } = useModal();
- let signUpButton = <>>;
- let viewPricingButton = <>>;
- let upgradeButton = <>>;
- let myProfileButton = <>>;
+ // let signUpButton = <>>;
+ // let viewPricingButton = <>>;
+ // let upgradeButton = <>>;
+ // let myProfileButton = <>>;
let uploadModelSection = <>>;
- if (!isLoggedIn) {
- signUpButton = (
- <>
- {
- // Analytics.ttsClickHeroSignup();
- // }}
- >
-
-
- >
- );
- viewPricingButton = (
- <>
- {
- // Analytics.ttsClickHeroViewPricing();
- // }}
- >
-
-
- >
- );
- }
+ // if (!isLoggedIn) {
+ // signUpButton = (
+ // <>
+ // {
+ // // Analytics.ttsClickHeroSignup();
+ // // }}
+ // >
+ //
+ //
+ // >
+ // );
+ // viewPricingButton = (
+ // <>
+ // {
+ // // Analytics.ttsClickHeroViewPricing();
+ // // }}
+ // >
+ //
+ //
+ // >
+ // );
+ // }
if (isLoggedIn) {
- let displayName = props.sessionWrapper.getDisplayName() as string; // NB: If logged in, should be string
- let url = WebUrl.userProfilePage(displayName);
- myProfileButton = (
- <>
- {
- // Analytics.ttsClickHeroViewProfile();
- // }}
- >
-
-
- >
- );
+ // let displayName = props.sessionWrapper.getDisplayName() as string; // NB: If logged in, should be string
+ // let url = WebUrl.userProfilePage(displayName);
+ // myProfileButton = (
+ // <>
+ // {
+ // // Analytics.ttsClickHeroViewProfile();
+ // // }}
+ // >
+ //
+ //
+ // >
+ // );
uploadModelSection = (
<>
@@ -121,41 +115,41 @@ function LandingPage(props: Props) {
>
);
- if (!isSubscribed) {
- upgradeButton = (
- <>
- {
- // Analytics.ttsClickHeroUpgradePlan();
- // }}
- >
-
-
- >
- );
- }
+ // if (!isSubscribed) {
+ // upgradeButton = (
+ // <>
+ // {
+ // // Analytics.ttsClickHeroUpgradePlan();
+ // // }}
+ // >
+ //
+ //
+ // >
+ // );
+ // }
}
- const randomHeroImage = useMemo(() => {
- const images = [
- // Main Images:
- "mascot/kitsune_pose2.webp",
- // "mascot/may4th.webp",
- // "mascot/halloween_1.webp",
- // "mascot/halloween_2.webp",
- // "mascot/halloween_3.webp",
- // "mascot/xmas_1.webp",
- // "mascot/xmas_2.webp",
- // "mascot/xmas_3.webp",
- // "mascot/xmas_4.webp",
- ];
+ // const randomHeroImage = useMemo(() => {
+ // const images = [
+ // // Main Images:
+ // "mascot/kitsune_pose2.webp",
+ // // "mascot/may4th.webp",
+ // // "mascot/halloween_1.webp",
+ // // "mascot/halloween_2.webp",
+ // // "mascot/halloween_3.webp",
+ // // "mascot/xmas_1.webp",
+ // // "mascot/xmas_2.webp",
+ // // "mascot/xmas_3.webp",
+ // // "mascot/xmas_4.webp",
+ // ];
- return images[Math.floor(Math.random() * images.length)];
- }, []);
+ // return images[Math.floor(Math.random() * images.length)];
+ // }, []);
// const onFocusHandler = () => {
// setIsFocused(true);
@@ -386,19 +380,22 @@ function LandingPage(props: Props) {
icon={faArrowRight}
iconFlip={true}
label="Sign Up"
- to="/tts"
+ to="/signup"
/>
+
@@ -489,6 +486,14 @@ function LandingPage(props: Props) {
)}
+
+
>
);
}
diff --git a/packages/fakeyou.com/src/v2/view/pages/login/LoginPage.tsx b/packages/fakeyou.com/src/v2/view/pages/login/LoginPage.tsx
index 1135cc46e3..b7faad8d6c 100644
--- a/packages/fakeyou.com/src/v2/view/pages/login/LoginPage.tsx
+++ b/packages/fakeyou.com/src/v2/view/pages/login/LoginPage.tsx
@@ -14,7 +14,7 @@ import { usePrefixedDocumentTitle } from "../../../../common/UsePrefixedDocument
import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClient";
import Container from "components/common/Container";
import Panel from "components/common/Panel";
-import PageHeader from "components/layout/PageHeader";
+import { useDomainConfig } from "context/DomainConfigContext";
interface Props {
sessionWrapper: SessionWrapper;
@@ -25,7 +25,7 @@ interface Props {
function LoginPage(props: Props) {
let history = useHistory();
PosthogClient.recordPageview();
-
+ const domain = useDomainConfig();
const [password, setPassword] = useState("");
const [usernameOrEmail, setUsernameOrEmail] = useState("");
const [errorMessage, setErrorMessage] = useState("");
@@ -90,12 +90,12 @@ function LoginPage(props: Props) {
}
return (
-
-
+
+ Login to {domain.title}
+
{errorWarning}
@@ -132,10 +132,16 @@ function LoginPage(props: Props) {
onChange={handlePasswordChange}
/>
-
-
+
+
Forgot your password?
+
+ Don't have an account? Sign up
+
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 b552cb8d40..02c7310a92 100644
--- a/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx
+++ b/packages/fakeyou.com/src/v2/view/pages/signup/SignupPage.tsx
@@ -18,8 +18,8 @@ import { BeginStripeCheckoutFlow } from "../../../../common/BeginStripeCheckoutF
import { usePrefixedDocumentTitle } from "../../../../common/UsePrefixedDocumentTitle";
import { PosthogClient } from "@storyteller/components/src/analytics/PosthogClient";
import Container from "components/common/Container";
-import PageHeader from "components/layout/PageHeader";
import Panel from "components/common/Panel";
+import { useDomainConfig } from "context/DomainConfigContext";
enum FieldTriState {
EMPTY_FALSE,
@@ -34,6 +34,7 @@ interface Props {
function SignupPage(props: Props) {
let history = useHistory();
+ const domain = useDomainConfig();
const parsedQueryString = queryString.parse(window.location.search);
@@ -349,12 +350,11 @@ function SignupPage(props: Props) {
}
return (
-