Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import type { Team } from "@/api/team";
import { CheckoutButton } from "@/components/billing";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { ToolTipLabel } from "@/components/ui/tooltip";
import { TrackedLinkTW } from "@/components/ui/tracked-link";
import { cn } from "@/lib/utils";
import { CheckIcon, CircleDollarSignIcon } from "lucide-react";
import type React from "react";
import { TEAM_PLANS } from "utils/pricing";
import { CheckoutButton } from "../../../@/components/billing";
import { remainingDays } from "../../../utils/date-utils";
import { FeatureItem } from "./FeatureItem";

type ButtonProps = React.ComponentProps<typeof Button>;

Expand Down Expand Up @@ -154,3 +155,30 @@ export const PricingCard: React.FC<PricingCardProps> = ({
</div>
);
};

type FeatureItemProps = {
text: string | string[];
};

function FeatureItem({ text }: FeatureItemProps) {
const titleStr = Array.isArray(text) ? text[0] : text;

return (
<div className="flex items-center gap-2">
<CheckIcon className="size-4 shrink-0 text-green-500" />
{Array.isArray(text) ? (
<div className="flex items-center gap-2">
<p className="text-muted-foreground">
{titleStr}{" "}
<span className="text-muted-foreground md:hidden">{text[1]}</span>
</p>
<ToolTipLabel label={text[1]}>
<CircleDollarSignIcon className="hidden size-4 text-muted-foreground md:block" />
</ToolTipLabel>
</div>
) : (
<p className="text-muted-foreground">{titleStr}</p>
)}
</div>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { toUnits } from "thirdweb";
import type { ChainMetadata } from "thirdweb/chains";
import { useActiveAccount, useWalletBalance } from "thirdweb/react";
import { z } from "zod";
import { isOnboardingComplete } from "../../../../../../login/isOnboardingRequired";
import { isOnboardingComplete } from "../../../../../../login/onboarding/isOnboardingRequired";

function formatTime(seconds: number) {
const rtf = new Intl.RelativeTimeFormat("en", { numeric: "auto" });
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/app/account/settings/getAccount.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { API_SERVER_URL } from "@/constants/env";
import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
import { getAuthToken } from "../../api/lib/getAuthToken";
import { isOnboardingComplete } from "../../login/isOnboardingRequired";
import { loginRedirect } from "../../login/loginRedirect";
import { isOnboardingComplete } from "../../login/onboarding/isOnboardingRequired";

/**
* Just get the account object without enforcing onboarding.
Expand Down
4 changes: 2 additions & 2 deletions apps/dashboard/src/app/login/LoginPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import { ClientOnly } from "../../components/ClientOnly/ClientOnly";
import { ThirdwebMiniLogo } from "../components/ThirdwebMiniLogo";
import { getSDKTheme } from "../components/sdk-component-theme";
import { doLogin, doLogout, getLoginPayload, isLoggedIn } from "./auth-actions";
import { isOnboardingComplete } from "./isOnboardingRequired";
import { isOnboardingComplete } from "./onboarding/isOnboardingRequired";

const LazyOnboardingUI = lazy(
() => import("../../components/onboarding/on-boarding-ui.client"),
() => import("./onboarding/on-boarding-ui.client"),
);

const wallets = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"use client";

import { PricingCard } from "@/components/blocks/pricing-card";
import { Button } from "@/components/ui/button";
import { PricingCard } from "components/homepage/sections/PricingCard";
import { ArrowRightIcon } from "lucide-react";
import { TitleAndDescription } from "./Title";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
"use client";

import type { Team } from "@/api/team";
import { Spinner } from "@/components/ui/Spinner/Spinner";
import { Button } from "@/components/ui/button";
import {
Expand All @@ -13,19 +16,18 @@ import {
} from "@3rdweb-sdk/react/hooks/useApi";
import { useLoggedInUser } from "@3rdweb-sdk/react/hooks/useLoggedInUser";
import { zodResolver } from "@hookform/resolvers/zod";
import {
type EmailConfirmationValidationSchema,
emailConfirmationValidationSchema,
} from "components/settings/Account/validations";
import { useTrack } from "hooks/analytics/useTrack";
import { useTxNotifications } from "hooks/useTxNotifications";
import { REGEXP_ONLY_DIGITS_AND_CHARS } from "input-otp";
import { useState } from "react";
import { useForm } from "react-hook-form";
import { toast } from "sonner";
import { shortenString } from "utils/usedapp-external";
import type { Team } from "../../@/api/team";
import { TitleAndDescription } from "./Title";
import {
type EmailConfirmationValidationSchema,
emailConfirmationValidationSchema,
} from "./validations";

interface OnboardingConfirmEmailProps {
email: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
"use client";

import { Spinner } from "@/components/ui/Spinner/Spinner";
import { Button } from "@/components/ui/button";
import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
import { useMutation } from "@tanstack/react-query";
import { AccountForm } from "components/settings/Account/AccountForm";
import { useState } from "react";
import { useActiveWallet, useDisconnect } from "thirdweb/react";
import { doLogout } from "../../app/login/auth-actions";
import { doLogout } from "../auth-actions";
import { AccountForm } from "./AccountForm";
import { TitleAndDescription } from "./Title";

type OnboardingGeneralProps = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
"use client";

import { Spinner } from "@/components/ui/Spinner/Spinner";
import { Button } from "@/components/ui/button";
import { TrackedLinkTW } from "@/components/ui/tracked-link";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { JSX } from "react";

type TitleAndDescriptionProps = {
heading: string | JSX.Element;
description: string | JSX.Element;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
"use client";
import type { Team } from "@/api/team";
import { cn } from "@/lib/utils";
import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
import { useTrack } from "hooks/analytics/useTrack";
import { useState } from "react";
import { useTrack } from "../../hooks/analytics/useTrack";
import { OnboardingChoosePlan } from "./ChoosePlan";
import { OnboardingConfirmEmail } from "./ConfirmEmail";
import { OnboardingGeneral } from "./General";
import { OnboardingLinkWallet } from "./LinkWallet";
import type { OnboardingScreen } from "./types";
import { useSkipOnboarding } from "./useSkipOnboarding";

type OnboardingScreen =
| { id: "onboarding" }
| { id: "linking" }
| { id: "confirming" }
| { id: "confirmLinking" }
| { id: "plan"; team: Team };

function OnboardingUI(props: {
account: Account;
onComplete: () => void;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
"use client";

import { useUpdateAccount } from "@3rdweb-sdk/react/hooks/useApi";
import { useTrack } from "../../hooks/analytics/useTrack";
import { useTrack } from "hooks/analytics/useTrack";

export function useSkipOnboarding() {
const mutation = useUpdateAccount();
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/src/app/login/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { redirect } from "next/navigation";
import { getRawAccount } from "../account/settings/getAccount";
import { LoginAndOnboardingPage } from "./LoginPage";
import { isOnboardingComplete } from "./isOnboardingRequired";
import { isOnboardingComplete } from "./onboarding/isOnboardingRequired";

export default async function Page(props: {
searchParams: Promise<{
Expand Down
29 changes: 0 additions & 29 deletions apps/dashboard/src/components/homepage/sections/FeatureItem.tsx

This file was deleted.

8 changes: 0 additions & 8 deletions apps/dashboard/src/components/onboarding/types.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Team } from "@/api/team";
import { PricingCard } from "components/homepage/sections/PricingCard";
import { PricingCard } from "@/components/blocks/pricing-card";
import { useMemo } from "react";
import { getValidTeamPlan } from "../../../../app/team/components/TeamHeader/getValidTeamPlan";

Expand Down
Loading