From cd5e05dfbe68879831b1cf1052999acfbd8bba79 Mon Sep 17 00:00:00 2001 From: Pas <74743263+Pasithea0@users.noreply.github.com> Date: Sun, 19 Jan 2025 23:49:59 -0700 Subject: [PATCH] update onboarding mobile --- src/pages/onboarding/Onboarding.tsx | 66 +++++++++++++++++++++++------ src/pages/onboarding/utils.tsx | 37 ++++++++++++++++ 2 files changed, 91 insertions(+), 12 deletions(-) diff --git a/src/pages/onboarding/Onboarding.tsx b/src/pages/onboarding/Onboarding.tsx index f1e62643..77eda7b5 100644 --- a/src/pages/onboarding/Onboarding.tsx +++ b/src/pages/onboarding/Onboarding.tsx @@ -1,4 +1,3 @@ -import classNames from "classnames"; import { Trans, useTranslation } from "react-i18next"; import { Button } from "@/components/buttons/Button"; @@ -12,18 +11,15 @@ import { useNavigateOnboarding, useRedirectBack, } from "@/pages/onboarding/onboardingHooks"; -import { Card, CardContent, Link } from "@/pages/onboarding/utils"; +import { + Card, + CardContent, + Link, + MiniCardContent, +} from "@/pages/onboarding/utils"; import { PageTitle } from "@/pages/parts/util/PageTitle"; import { getProxyUrls } from "@/utils/proxyUrls"; -function HorizontalLine(props: { className?: string }) { - return ( -
-
-
- ); -} - export function OnboardingPage() { const navigate = useNavigateOnboarding(); const skipModal = useModal("skip"); @@ -67,7 +63,8 @@ export function OnboardingPage() { {t("onboarding.start.explainer")} -
+ {/* Desktop Cards */} +
navigate("/onboarding/extension")} className="md:w-1/3 md:h-full" @@ -78,7 +75,9 @@ export function OnboardingPage() { subtitle={t("onboarding.start.options.extension.quality")} description={t("onboarding.start.options.extension.description")} > - {t("onboarding.start.options.extension.action")} + + {t("onboarding.start.options.extension.action")} +
@@ -130,6 +129,49 @@ export function OnboardingPage() { )}
+ + {/* Mobile Cards */} +
+ navigate("/onboarding/extension")} + className="md:w-1/3 md:h-full" + > + + + navigate("/onboarding/proxy")} + className="md:w-1/3" + > + + + {noProxies ? null : ( + completeAndRedirect() // Skip modal on Safari + : skipModal.show // Show modal on other browsers + } + className="md:w-1/3" + > + + + )} +
); diff --git a/src/pages/onboarding/utils.tsx b/src/pages/onboarding/utils.tsx index 3a57952b..d60fceba 100644 --- a/src/pages/onboarding/utils.tsx +++ b/src/pages/onboarding/utils.tsx @@ -60,6 +60,43 @@ export function CardContent(props: { ); } +export function MiniCardContent(props: { + title: ReactNode; + description: ReactNode; + subtitle: ReactNode; + colorClass: string; + children?: React.ReactNode; +}) { + return ( +
+
+
+ + {props.subtitle} + + {props.title} +
+ +
+ + {props.description} + +
{props.children}
+
+ ); +} + export function Link(props: { children?: React.ReactNode; to?: string;