Hold /privacy behind a flag until counsel reads it, and fix leftover legal and email copy.
This commit is contained in:
1 parent
ead6c8f716
commit
072e5362f5
43 files changed
+548
-191
No files matched your search
@@ -111,6 +111,8 @@ export type LoginFormProps = {
|
||||
variant?: LoginFormVariant;
|
||||
/** Overrides URL `next` for `requestMagicLink` (e.g. create-flow exit modal). */
|
||||
magicLinkNextPath?: string;
|
||||
/** When false, the login legal line links terms only. */
|
||||
privacyEnabled?: boolean;
|
||||
/** `keepRule`: Continue without saving. */
|
||||
onDismiss?: () => void;
|
||||
/** Sent-state Close, and the dialog chrome close. */
|
||||
@@ -120,6 +122,7 @@ export type LoginFormProps = {
|
||||
export default function LoginForm({
|
||||
variant = "default",
|
||||
magicLinkNextPath,
|
||||
privacyEnabled = false,
|
||||
onDismiss,
|
||||
onClose,
|
||||
}: LoginFormProps) {
|
||||
@@ -365,13 +368,17 @@ export default function LoginForm({
|
||||
>
|
||||
{tFooter("legal.termsOfService")}
|
||||
</Link>
|
||||
{t("legalAnd")}
|
||||
<Link
|
||||
href={tFooter("legal.privacyPolicyHref")}
|
||||
className="text-[var(--color-content-default-tertiary)] underline decoration-solid underline-offset-2"
|
||||
>
|
||||
{tFooter("legal.privacyPolicy")}
|
||||
</Link>
|
||||
{privacyEnabled ? (
|
||||
<>
|
||||
{t("legalAnd")}
|
||||
<Link
|
||||
href={tFooter("legal.privacyPolicyHref")}
|
||||
className="text-[var(--color-content-default-tertiary)] underline decoration-solid underline-offset-2"
|
||||
>
|
||||
{tFooter("legal.privacyPolicy")}
|
||||
</Link>
|
||||
</>
|
||||
) : null}
|
||||
{t("legalSuffix")}
|
||||
</p>
|
||||
</>
|
||||
|
||||
@@ -13,7 +13,13 @@ import { PRODUCTION_SITE_ORIGIN } from "../../../lib/siteMetadata";
|
||||
* Tiers: smallest viewports (below `md`), `md` through `lg`, `lg` and up.
|
||||
* Matches `--breakpoint-md: 640px`, `--breakpoint-lg: 1024px` in `app/tailwind.css`.
|
||||
*/
|
||||
const Footer = memo(({ siteOrigin = PRODUCTION_SITE_ORIGIN }: { siteOrigin?: string }) => {
|
||||
const Footer = memo(({
|
||||
siteOrigin = PRODUCTION_SITE_ORIGIN,
|
||||
privacyEnabled = false,
|
||||
}: {
|
||||
siteOrigin?: string;
|
||||
privacyEnabled?: boolean;
|
||||
}) => {
|
||||
const t = useTranslation("footer");
|
||||
const tChrome = useTranslation("controlsChrome");
|
||||
|
||||
@@ -213,9 +219,11 @@ const Footer = memo(({ siteOrigin = PRODUCTION_SITE_ORIGIN }: { siteOrigin?: str
|
||||
<Link href={t("takeawayHref")} className={legalLinkClass}>
|
||||
{t("takeaway")}
|
||||
</Link>
|
||||
<Link href={t("legal.privacyPolicyHref")} className={legalLinkClass}>
|
||||
{t("legal.privacyPolicy")}
|
||||
</Link>
|
||||
{privacyEnabled ? (
|
||||
<Link href={t("legal.privacyPolicyHref")} className={legalLinkClass}>
|
||||
{t("legal.privacyPolicy")}
|
||||
</Link>
|
||||
) : null}
|
||||
<Link href={t("legal.termsOfServiceHref")} className={legalLinkClass}>
|
||||
{t("legal.termsOfService")}
|
||||
</Link>
|
||||
|
||||
@@ -1,8 +1,14 @@
|
||||
import Footer from "./Footer";
|
||||
import { isPrivacyPolicyEnabled } from "../../../lib/privacyPolicyEnabled";
|
||||
import { getRequestSiteOrigin } from "../../../lib/requestSiteOrigin";
|
||||
|
||||
/** Footer JSON-LD uses the request origin, same host as the page canonical. */
|
||||
export default async function FooterWithOrigin() {
|
||||
const siteOrigin = await getRequestSiteOrigin();
|
||||
return <Footer siteOrigin={siteOrigin} />;
|
||||
return (
|
||||
<Footer
|
||||
siteOrigin={siteOrigin}
|
||||
privacyEnabled={isPrivacyPolicyEnabled()}
|
||||
/>
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user