♻️ (builder) Remove barrel export and flatten folder arch

apps/builder/src/features/workspace/components/AddMemberForm.tsx

@@ -11,8 +11,8 @@ import {
 import { ChevronLeftIcon } from '@/components/icons'
 import { WorkspaceInvitation, WorkspaceRole } from '@typebot.io/prisma'
 import { FormEvent, useState } from 'react'
-import { Member } from '../../types'
-import { sendInvitationQuery } from '../../queries/sendInvitationQuery'
+import { Member } from '../types'
+import { sendInvitationQuery } from '../queries/sendInvitationQuery'
 
 type Props = {
   workspaceId: string

apps/builder/src/features/workspace/components/MembersList.tsx

@@ -11,15 +11,15 @@ import React from 'react'
 import { getSeatsLimit, isSeatsLimitReached } from '@typebot.io/lib/pricing'
 import { AddMemberForm } from './AddMemberForm'
 import { MemberItem } from './MemberItem'
-import { useUser } from '@/features/account'
-import { useWorkspace } from '../../WorkspaceProvider'
-import { useMembers } from '../../hooks/useMembers'
-import { deleteMemberQuery } from '../../queries/deleteMemberQuery'
-import { updateMemberQuery } from '../../queries/updateMemberQuery'
-import { deleteInvitationQuery } from '../../queries/deleteInvitationQuery'
-import { updateInvitationQuery } from '../../queries/updateInvitationQuery'
-import { Member } from '../../types'
 import { isDefined } from '@typebot.io/lib'
+import { useUser } from '@/features/account/hooks/useUser'
+import { useMembers } from '../hooks/useMembers'
+import { deleteInvitationQuery } from '../queries/deleteInvitationQuery'
+import { deleteMemberQuery } from '../queries/deleteMemberQuery'
+import { updateInvitationQuery } from '../queries/updateInvitationQuery'
+import { updateMemberQuery } from '../queries/updateMemberQuery'
+import { Member } from '../types'
+import { useWorkspace } from '../WorkspaceProvider'
 
 export const MembersList = () => {
   const { user } = useUser()

apps/builder/src/features/workspace/components/MembersList/index.ts

@@ -1 +0,0 @@
-export { MembersList } from './MembersList'

apps/builder/src/features/workspace/components/WorkspaceDropdown.tsx

@@ -5,7 +5,7 @@ import {
   PlusIcon,
   LogOutIcon,
 } from '@/components/icons'
-import { PlanTag } from '@/features/billing'
+import { PlanTag } from '@/features/billing/components/PlanTag'
 import { trpc } from '@/lib/trpc'
 import {
   Menu,

apps/builder/src/features/workspace/components/WorkspaceSettingsModal.tsx

@@ -20,9 +20,10 @@ import { useState } from 'react'
 import { MembersList } from './MembersList'
 import { WorkspaceSettingsForm } from './WorkspaceSettingsForm'
 import { useWorkspace } from '../WorkspaceProvider'
-import { MyAccountForm, UserPreferencesForm } from '@/features/account'
-import { BillingContent } from '@/features/billing'
 import packageJson from '../../../../../../package.json'
+import { UserPreferencesForm } from '@/features/account/components/UserPreferencesForm'
+import { MyAccountForm } from '@/features/account/components/MyAccountForm'
+import { BillingSettingsLayout } from '@/features/billing/components/BillingSettingsLayout'
 
 type Props = {
   isOpen: boolean
@@ -175,7 +176,7 @@ const SettingsContent = ({
     case 'members':
       return <MembersList />
     case 'billing':
-      return <BillingContent />
+      return <BillingSettingsLayout />
     default:
       return null
   }

apps/builder/src/features/workspace/components/index.tsx

@@ -1,2 +0,0 @@
-export * from './WorkspaceSettingsModal'
-export * from './WorkspaceDropdown'