diff --git a/apps/builder/src/components/SupportBubble.tsx b/apps/builder/src/components/SupportBubble.tsx index 9539e725f..5540f2b36 100644 --- a/apps/builder/src/components/SupportBubble.tsx +++ b/apps/builder/src/components/SupportBubble.tsx @@ -1,6 +1,6 @@ -import { useUser } from "@/features/account/hooks/useUser"; import { planToReadable } from "@/features/billing/helpers/planToReadable"; import { useTypebot } from "@/features/editor/providers/TypebotProvider"; +import { useUser } from "@/features/user/hooks/useUser"; import { useWorkspace } from "@/features/workspace/WorkspaceProvider"; import type { BubbleProps } from "@typebot.io/js"; import { Bubble } from "@typebot.io/nextjs"; diff --git a/apps/builder/src/features/billing/components/ChangePlanForm.tsx b/apps/builder/src/features/billing/components/ChangePlanForm.tsx index 5be22ffc2..89561eb98 100644 --- a/apps/builder/src/features/billing/components/ChangePlanForm.tsx +++ b/apps/builder/src/features/billing/components/ChangePlanForm.tsx @@ -1,12 +1,11 @@ import { TextLink } from "@/components/TextLink"; -import { useUser } from "@/features/account/hooks/useUser"; import { ParentModalProvider } from "@/features/graph/providers/ParentModalProvider"; +import { useUser } from "@/features/user/hooks/useUser"; import type { WorkspaceInApp } from "@/features/workspace/WorkspaceProvider"; import { useToast } from "@/hooks/useToast"; import { trpc } from "@/lib/trpc"; import { HStack, Stack, Text } from "@chakra-ui/react"; import { useTranslate } from "@tolgee/react"; -import { guessIfUserIsEuropean } from "@typebot.io/billing/helpers/guessIfUserIsEuropean"; import { Plan, WorkspaceRole } from "@typebot.io/prisma/enum"; import { useState } from "react"; import type { PreCheckoutModalProps } from "./PreCheckoutModal"; diff --git a/apps/builder/src/features/blocks/inputs/payment/components/StripeConfigModal.tsx b/apps/builder/src/features/blocks/inputs/payment/components/StripeConfigModal.tsx index 7a8d14bc4..12c70ffe3 100644 --- a/apps/builder/src/features/blocks/inputs/payment/components/StripeConfigModal.tsx +++ b/apps/builder/src/features/blocks/inputs/payment/components/StripeConfigModal.tsx @@ -1,7 +1,7 @@ import { MoreInfoTooltip } from "@/components/MoreInfoTooltip"; import { TextLink } from "@/components/TextLink"; import { TextInput } from "@/components/inputs"; -import { useUser } from "@/features/account/hooks/useUser"; +import { useUser } from "@/features/user/hooks/useUser"; import { useWorkspace } from "@/features/workspace/WorkspaceProvider"; import { useToast } from "@/hooks/useToast"; import { trpc } from "@/lib/trpc"; diff --git a/apps/builder/src/features/blocks/inputs/payment/components/UpdateStripeCredentialsModalContent.tsx b/apps/builder/src/features/blocks/inputs/payment/components/UpdateStripeCredentialsModalContent.tsx index 13806e360..5083df4aa 100644 --- a/apps/builder/src/features/blocks/inputs/payment/components/UpdateStripeCredentialsModalContent.tsx +++ b/apps/builder/src/features/blocks/inputs/payment/components/UpdateStripeCredentialsModalContent.tsx @@ -1,7 +1,7 @@ import { MoreInfoTooltip } from "@/components/MoreInfoTooltip"; import { TextLink } from "@/components/TextLink"; import { TextInput } from "@/components/inputs"; -import { useUser } from "@/features/account/hooks/useUser"; +import { useUser } from "@/features/user/hooks/useUser"; import { useWorkspace } from "@/features/workspace/WorkspaceProvider"; import { trpc } from "@/lib/trpc"; import { diff --git a/apps/builder/src/features/blocks/integrations/sendEmail/components/SmtpConfigModal.tsx b/apps/builder/src/features/blocks/integrations/sendEmail/components/SmtpConfigModal.tsx index de032c60c..59da4d2b8 100644 --- a/apps/builder/src/features/blocks/integrations/sendEmail/components/SmtpConfigModal.tsx +++ b/apps/builder/src/features/blocks/integrations/sendEmail/components/SmtpConfigModal.tsx @@ -1,4 +1,4 @@ -import { useUser } from "@/features/account/hooks/useUser"; +import { useUser } from "@/features/user/hooks/useUser"; import { useWorkspace } from "@/features/workspace/WorkspaceProvider"; import { useToast } from "@/hooks/useToast"; import { trpc } from "@/lib/trpc"; diff --git a/apps/builder/src/features/blocks/integrations/sendEmail/components/SmtpUpdateModalContent.tsx b/apps/builder/src/features/blocks/integrations/sendEmail/components/SmtpUpdateModalContent.tsx index bdd947c03..1dd1543bd 100644 --- a/apps/builder/src/features/blocks/integrations/sendEmail/components/SmtpUpdateModalContent.tsx +++ b/apps/builder/src/features/blocks/integrations/sendEmail/components/SmtpUpdateModalContent.tsx @@ -1,4 +1,4 @@ -import { useUser } from "@/features/account/hooks/useUser"; +import { useUser } from "@/features/user/hooks/useUser"; import { useWorkspace } from "@/features/workspace/WorkspaceProvider"; import { useToast } from "@/hooks/useToast"; import { trpc } from "@/lib/trpc"; diff --git a/apps/builder/src/features/blocks/logic/webhook/components/WebhookSettings.tsx b/apps/builder/src/features/blocks/logic/webhook/components/WebhookSettings.tsx index cd2c513ab..0d7b21cd7 100644 --- a/apps/builder/src/features/blocks/logic/webhook/components/WebhookSettings.tsx +++ b/apps/builder/src/features/blocks/logic/webhook/components/WebhookSettings.tsx @@ -2,10 +2,10 @@ import { CopyButton } from "@/components/CopyButton"; import { TableList, type TableListItemProps } from "@/components/TableList"; import { TextLink } from "@/components/TextLink"; import { CodeEditor } from "@/components/inputs/CodeEditor"; -import { useUser } from "@/features/account/hooks/useUser"; import { DataVariableInputs } from "@/features/blocks/integrations/httpRequest/components/ResponseMappingInputs"; import { getDeepKeys } from "@/features/blocks/integrations/httpRequest/helpers/getDeepKeys"; import { useTypebot } from "@/features/editor/providers/TypebotProvider"; +import { useUser } from "@/features/user/hooks/useUser"; import { Accordion, AccordionButton, diff --git a/apps/builder/src/features/dashboard/components/DashboardHeader.tsx b/apps/builder/src/features/dashboard/components/DashboardHeader.tsx index 72fbe1161..9126b01ce 100644 --- a/apps/builder/src/features/dashboard/components/DashboardHeader.tsx +++ b/apps/builder/src/features/dashboard/components/DashboardHeader.tsx @@ -1,7 +1,7 @@ import { EmojiOrImageIcon } from "@/components/EmojiOrImageIcon"; import { HardDriveIcon, SettingsIcon } from "@/components/icons"; -import { useUser } from "@/features/account/hooks/useUser"; import { ParentModalProvider } from "@/features/graph/providers/ParentModalProvider"; +import { useUser } from "@/features/user/hooks/useUser"; import { useWorkspace } from "@/features/workspace/WorkspaceProvider"; import { WorkspaceDropdown } from "@/features/workspace/components/WorkspaceDropdown"; import { WorkspaceSettingsModal } from "@/features/workspace/components/WorkspaceSettingsModal"; diff --git a/apps/builder/src/features/dashboard/components/DashboardPage.tsx b/apps/builder/src/features/dashboard/components/DashboardPage.tsx index c3f280dc6..9d5cad0fc 100644 --- a/apps/builder/src/features/dashboard/components/DashboardPage.tsx +++ b/apps/builder/src/features/dashboard/components/DashboardPage.tsx @@ -1,5 +1,4 @@ import { Seo } from "@/components/Seo"; -import { useUser } from "@/features/account/hooks/useUser"; import { PreCheckoutModal, type PreCheckoutModalProps, @@ -7,6 +6,7 @@ import { import { TypebotDndProvider } from "@/features/folders/TypebotDndProvider"; import { FolderContent } from "@/features/folders/components/FolderContent"; import { ParentModalProvider } from "@/features/graph/providers/ParentModalProvider"; +import { useUser } from "@/features/user/hooks/useUser"; import { useWorkspace } from "@/features/workspace/WorkspaceProvider"; import { trpc } from "@/lib/trpc"; import { Spinner, Stack, Text, VStack } from "@chakra-ui/react"; diff --git a/apps/builder/src/features/editor/components/EditorSettingsModal.tsx b/apps/builder/src/features/editor/components/EditorSettingsModal.tsx index 86bcb88f9..d69222af5 100644 --- a/apps/builder/src/features/editor/components/EditorSettingsModal.tsx +++ b/apps/builder/src/features/editor/components/EditorSettingsModal.tsx @@ -1,4 +1,4 @@ -import { UserPreferencesForm } from "@/features/account/components/UserPreferencesForm"; +import { UserPreferencesForm } from "@/features/user/components/UserPreferencesForm"; import { Modal, ModalBody, diff --git a/apps/builder/src/features/editor/components/SuspectedTypebotBanner.tsx b/apps/builder/src/features/editor/components/SuspectedTypebotBanner.tsx index 93bbc8cf3..f453d12eb 100644 --- a/apps/builder/src/features/editor/components/SuspectedTypebotBanner.tsx +++ b/apps/builder/src/features/editor/components/SuspectedTypebotBanner.tsx @@ -1,5 +1,5 @@ import { TextLink } from "@/components/TextLink"; -import { useUser } from "@/features/account/hooks/useUser"; +import { useUser } from "@/features/user/hooks/useUser"; import { useWorkspace } from "@/features/workspace/WorkspaceProvider"; import { HStack, Text } from "@chakra-ui/react"; import { Plan } from "@typebot.io/prisma/enum"; diff --git a/apps/builder/src/features/editor/components/TypebotNotFoundPage.tsx b/apps/builder/src/features/editor/components/TypebotNotFoundPage.tsx index 871a2d032..5d2324f1b 100644 --- a/apps/builder/src/features/editor/components/TypebotNotFoundPage.tsx +++ b/apps/builder/src/features/editor/components/TypebotNotFoundPage.tsx @@ -1,5 +1,5 @@ import { ChevronLeftIcon } from "@/components/icons"; -import { useUser } from "@/features/account/hooks/useUser"; +import { useUser } from "@/features/user/hooks/useUser"; import { Button, Flex, diff --git a/apps/builder/src/features/editor/components/UnauthenticatedTypebotHeader.tsx b/apps/builder/src/features/editor/components/UnauthenticatedTypebotHeader.tsx index 3f0acdd2f..c90b0f9bb 100644 --- a/apps/builder/src/features/editor/components/UnauthenticatedTypebotHeader.tsx +++ b/apps/builder/src/features/editor/components/UnauthenticatedTypebotHeader.tsx @@ -1,7 +1,7 @@ import { EmojiOrImageIcon } from "@/components/EmojiOrImageIcon"; import { TypebotLogo } from "@/components/TypebotLogo"; import { CopyIcon, PlayIcon } from "@/components/icons"; -import { useUser } from "@/features/account/hooks/useUser"; +import { useUser } from "@/features/user/hooks/useUser"; import { Button, Divider, diff --git a/apps/builder/src/features/graph/components/Graph.tsx b/apps/builder/src/features/graph/components/Graph.tsx index 1d2bd7220..365c4a07c 100644 --- a/apps/builder/src/features/graph/components/Graph.tsx +++ b/apps/builder/src/features/graph/components/Graph.tsx @@ -1,6 +1,6 @@ -import { useUser } from "@/features/account/hooks/useUser"; import { headerHeight } from "@/features/editor/constants"; import { useTypebot } from "@/features/editor/providers/TypebotProvider"; +import { useUser } from "@/features/user/hooks/useUser"; import { Fade, Flex, type FlexProps, useEventListener } from "@chakra-ui/react"; import { createId } from "@paralleldrive/cuid2"; import type { BlockV6 } from "@typebot.io/blocks-core/schemas/schema"; diff --git a/apps/builder/src/features/onboarding/components/OnboardingPage.tsx b/apps/builder/src/features/onboarding/components/OnboardingPage.tsx index 05d2802e9..1bf58b226 100644 --- a/apps/builder/src/features/onboarding/components/OnboardingPage.tsx +++ b/apps/builder/src/features/onboarding/components/OnboardingPage.tsx @@ -1,5 +1,5 @@ import { ChevronLastIcon } from "@/components/icons"; -import { useUser } from "@/features/account/hooks/useUser"; +import { useUser } from "@/features/user/hooks/useUser"; import { Button, Flex, diff --git a/apps/builder/src/features/onboarding/components/VideoOnboardingFloatingWindow.tsx b/apps/builder/src/features/onboarding/components/VideoOnboardingFloatingWindow.tsx index 6ee2f73d8..7229f5228 100644 --- a/apps/builder/src/features/onboarding/components/VideoOnboardingFloatingWindow.tsx +++ b/apps/builder/src/features/onboarding/components/VideoOnboardingFloatingWindow.tsx @@ -1,5 +1,5 @@ import { CloseIcon } from "@/components/icons"; -import { useUser } from "@/features/account/hooks/useUser"; +import { useUser } from "@/features/user/hooks/useUser"; import { Flex, IconButton, diff --git a/apps/builder/src/features/onboarding/components/VideoOnboardingPopover.tsx b/apps/builder/src/features/onboarding/components/VideoOnboardingPopover.tsx index 9a2393105..0b427c5cb 100644 --- a/apps/builder/src/features/onboarding/components/VideoOnboardingPopover.tsx +++ b/apps/builder/src/features/onboarding/components/VideoOnboardingPopover.tsx @@ -1,5 +1,5 @@ import { CloseIcon, VideoPopoverIcon } from "@/components/icons"; -import { useUser } from "@/features/account/hooks/useUser"; +import { useUser } from "@/features/user/hooks/useUser"; import { IconButton, type IconButtonProps, diff --git a/apps/builder/src/features/preview/components/WebPreview.tsx b/apps/builder/src/features/preview/components/WebPreview.tsx index 1cac10de2..9c5e4bc03 100644 --- a/apps/builder/src/features/preview/components/WebPreview.tsx +++ b/apps/builder/src/features/preview/components/WebPreview.tsx @@ -1,8 +1,8 @@ import { ThunderIcon } from "@/components/icons"; -import { useUser } from "@/features/account/hooks/useUser"; import { useEditor } from "@/features/editor/providers/EditorProvider"; import { useTypebot } from "@/features/editor/providers/TypebotProvider"; import { useGraph } from "@/features/graph/providers/GraphProvider"; +import { useUser } from "@/features/user/hooks/useUser"; import { useToast } from "@/hooks/useToast"; import type { ContinueChatResponse } from "@typebot.io/bot-engine/schemas/api"; import { Standard } from "@typebot.io/nextjs"; diff --git a/apps/builder/src/features/templates/components/CreateNewTypebotButtons.tsx b/apps/builder/src/features/templates/components/CreateNewTypebotButtons.tsx index bfd38e453..8dd6e7900 100644 --- a/apps/builder/src/features/templates/components/CreateNewTypebotButtons.tsx +++ b/apps/builder/src/features/templates/components/CreateNewTypebotButtons.tsx @@ -1,5 +1,5 @@ import { DownloadIcon, TemplateIcon, ToolIcon } from "@/components/icons"; -import { useUser } from "@/features/account/hooks/useUser"; +import { useUser } from "@/features/user/hooks/useUser"; import { useWorkspace } from "@/features/workspace/WorkspaceProvider"; import { useToast } from "@/hooks/useToast"; import { trpc } from "@/lib/trpc"; diff --git a/apps/builder/src/features/account/UserProvider.tsx b/apps/builder/src/features/user/UserProvider.tsx similarity index 100% rename from apps/builder/src/features/account/UserProvider.tsx rename to apps/builder/src/features/user/UserProvider.tsx diff --git a/apps/builder/src/features/account/account.spec.ts b/apps/builder/src/features/user/account.spec.ts similarity index 100% rename from apps/builder/src/features/account/account.spec.ts rename to apps/builder/src/features/user/account.spec.ts diff --git a/apps/builder/src/features/account/components/ApiTokensList.tsx b/apps/builder/src/features/user/components/ApiTokensList.tsx similarity index 100% rename from apps/builder/src/features/account/components/ApiTokensList.tsx rename to apps/builder/src/features/user/components/ApiTokensList.tsx diff --git a/apps/builder/src/features/account/components/ApiTokensModal.tsx b/apps/builder/src/features/user/components/ApiTokensModal.tsx similarity index 100% rename from apps/builder/src/features/account/components/ApiTokensModal.tsx rename to apps/builder/src/features/user/components/ApiTokensModal.tsx diff --git a/apps/builder/src/features/account/components/AppearanceRadioGroup.tsx b/apps/builder/src/features/user/components/AppearanceRadioGroup.tsx similarity index 100% rename from apps/builder/src/features/account/components/AppearanceRadioGroup.tsx rename to apps/builder/src/features/user/components/AppearanceRadioGroup.tsx diff --git a/apps/builder/src/features/account/components/CreateTokenModal.tsx b/apps/builder/src/features/user/components/CreateTokenModal.tsx similarity index 100% rename from apps/builder/src/features/account/components/CreateTokenModal.tsx rename to apps/builder/src/features/user/components/CreateTokenModal.tsx diff --git a/apps/builder/src/features/account/components/GraphNavigationRadioGroup.tsx b/apps/builder/src/features/user/components/GraphNavigationRadioGroup.tsx similarity index 100% rename from apps/builder/src/features/account/components/GraphNavigationRadioGroup.tsx rename to apps/builder/src/features/user/components/GraphNavigationRadioGroup.tsx diff --git a/apps/builder/src/features/account/components/MyAccountForm.tsx b/apps/builder/src/features/user/components/MyAccountForm.tsx similarity index 100% rename from apps/builder/src/features/account/components/MyAccountForm.tsx rename to apps/builder/src/features/user/components/MyAccountForm.tsx diff --git a/apps/builder/src/features/account/components/UserPreferencesForm.tsx b/apps/builder/src/features/user/components/UserPreferencesForm.tsx similarity index 100% rename from apps/builder/src/features/account/components/UserPreferencesForm.tsx rename to apps/builder/src/features/user/components/UserPreferencesForm.tsx diff --git a/apps/builder/src/features/account/hooks/useApiTokens.ts b/apps/builder/src/features/user/hooks/useApiTokens.ts similarity index 100% rename from apps/builder/src/features/account/hooks/useApiTokens.ts rename to apps/builder/src/features/user/hooks/useApiTokens.ts diff --git a/apps/builder/src/features/account/hooks/useUser.ts b/apps/builder/src/features/user/hooks/useUser.ts similarity index 100% rename from apps/builder/src/features/account/hooks/useUser.ts rename to apps/builder/src/features/user/hooks/useUser.ts diff --git a/apps/builder/src/features/account/queries/createApiTokenQuery.ts b/apps/builder/src/features/user/queries/createApiTokenQuery.ts similarity index 100% rename from apps/builder/src/features/account/queries/createApiTokenQuery.ts rename to apps/builder/src/features/user/queries/createApiTokenQuery.ts diff --git a/apps/builder/src/features/account/queries/deleteApiTokenQuery.ts b/apps/builder/src/features/user/queries/deleteApiTokenQuery.ts similarity index 100% rename from apps/builder/src/features/account/queries/deleteApiTokenQuery.ts rename to apps/builder/src/features/user/queries/deleteApiTokenQuery.ts diff --git a/apps/builder/src/features/account/queries/updateUserQuery.ts b/apps/builder/src/features/user/queries/updateUserQuery.ts similarity index 100% rename from apps/builder/src/features/account/queries/updateUserQuery.ts rename to apps/builder/src/features/user/queries/updateUserQuery.ts diff --git a/apps/builder/src/features/account/types.ts b/apps/builder/src/features/user/types.ts similarity index 100% rename from apps/builder/src/features/account/types.ts rename to apps/builder/src/features/user/types.ts diff --git a/apps/builder/src/features/workspace/WorkspaceProvider.tsx b/apps/builder/src/features/workspace/WorkspaceProvider.tsx index 16f32ccd6..4c7383669 100644 --- a/apps/builder/src/features/workspace/WorkspaceProvider.tsx +++ b/apps/builder/src/features/workspace/WorkspaceProvider.tsx @@ -6,8 +6,8 @@ import type { Workspace } from "@typebot.io/workspaces/schemas"; import { useRouter } from "next/router"; import type { ReactNode } from "react"; import { createContext, useContext, useEffect, useMemo, useState } from "react"; -import { useUser } from "../account/hooks/useUser"; import { useTypebot } from "../editor/providers/TypebotProvider"; +import { useUser } from "../user/hooks/useUser"; import { parseNewName } from "./helpers/parseNewName"; import { setWorkspaceIdInLocalStorage } from "./helpers/setWorkspaceIdInLocalStorage"; diff --git a/apps/builder/src/features/workspace/components/MembersList.tsx b/apps/builder/src/features/workspace/components/MembersList.tsx index 59fb9912a..3cf2de992 100644 --- a/apps/builder/src/features/workspace/components/MembersList.tsx +++ b/apps/builder/src/features/workspace/components/MembersList.tsx @@ -1,5 +1,5 @@ import { UnlockPlanAlertInfo } from "@/components/UnlockPlanAlertInfo"; -import { useUser } from "@/features/account/hooks/useUser"; +import { useUser } from "@/features/user/hooks/useUser"; import { HStack, Heading, diff --git a/apps/builder/src/features/workspace/components/WorkspaceSettingsModal.tsx b/apps/builder/src/features/workspace/components/WorkspaceSettingsModal.tsx index 381078068..8cdbb29c8 100644 --- a/apps/builder/src/features/workspace/components/WorkspaceSettingsModal.tsx +++ b/apps/builder/src/features/workspace/components/WorkspaceSettingsModal.tsx @@ -6,11 +6,11 @@ import { UsersIcon, WalletIcon, } from "@/components/icons"; -import { MyAccountForm } from "@/features/account/components/MyAccountForm"; -import { UserPreferencesForm } from "@/features/account/components/UserPreferencesForm"; import { BillingSettingsLayout } from "@/features/billing/components/BillingSettingsLayout"; import { CredentialsSettingsForm } from "@/features/credentials/components/CredentialsSettingsForm"; import { useParentModal } from "@/features/graph/providers/ParentModalProvider"; +import { MyAccountForm } from "@/features/user/components/MyAccountForm"; +import { UserPreferencesForm } from "@/features/user/components/UserPreferencesForm"; import { Avatar, Button, diff --git a/apps/builder/src/pages/_app.tsx b/apps/builder/src/pages/_app.tsx index 7c9f67c8e..ffcd6bc14 100644 --- a/apps/builder/src/pages/_app.tsx +++ b/apps/builder/src/pages/_app.tsx @@ -1,8 +1,8 @@ import { NewVersionPopup } from "@/components/NewVersionPopup"; import { SupportBubble } from "@/components/SupportBubble"; import { Toaster } from "@/components/Toaster"; -import { UserProvider } from "@/features/account/UserProvider"; import { TypebotProvider } from "@/features/editor/providers/TypebotProvider"; +import { UserProvider } from "@/features/user/UserProvider"; import { WorkspaceProvider } from "@/features/workspace/WorkspaceProvider"; import { isCloudProdInstance } from "@/helpers/isCloudProdInstance"; import { useRouterProgressBar } from "@/lib/routerProgressBar";