diff --git a/app/(auth)/forgot-password/page.tsx b/app/(auth)/forgot-password/page.tsx index 379ab95c..de1f0237 100644 --- a/app/(auth)/forgot-password/page.tsx +++ b/app/(auth)/forgot-password/page.tsx @@ -3,7 +3,7 @@ import { CardContent, CardHeader } from "@/components/ui/card"; import { TooltipProvider } from "@/components/ui/tooltip"; import { ForgotPasswordForm } from "@/features/auth/components/forgot-password-form"; import { env } from "@/env.mjs"; -import { CardAuth } from "@/features/layout/card-auth"; +import { CardAuth } from "@/features/layout/components/card-auth"; import { redirect } from "next/navigation"; export default async function RoutePage(props: { searchParams: Promise<{ callbackUrl: string | undefined }> }) { diff --git a/app/(auth)/guard/page.tsx b/app/(auth)/guard/page.tsx index b0b46b67..a4815a0e 100644 --- a/app/(auth)/guard/page.tsx +++ b/app/(auth)/guard/page.tsx @@ -3,7 +3,7 @@ import {TooltipProvider} from "@/components/ui/tooltip"; import {GuardForm} from "@/features/auth/components/guard-form"; import {cookies} from "next/headers"; import {redirect} from "next/navigation"; -import {CardAuth} from "@/features/layout/card-auth"; +import {CardAuth} from "@/features/layout/components/card-auth"; export default async function GuardPage() { diff --git a/app/(auth)/login/page.tsx b/app/(auth)/login/page.tsx index 8fe44e73..6cf323ce 100644 --- a/app/(auth)/login/page.tsx +++ b/app/(auth)/login/page.tsx @@ -6,7 +6,7 @@ import { TooltipProvider } from "@/components/ui/tooltip"; import { CardContent, CardHeader } from "@/components/ui/card"; import Link from "next/link"; import { Separator } from "@/components/ui/separator"; -import { CardAuth } from "@/features/layout/card-auth"; +import { CardAuth } from "@/features/layout/components/card-auth"; import { env } from "@/env.mjs"; export const metadata: Metadata = { diff --git a/app/(auth)/reset-password/page.tsx b/app/(auth)/reset-password/page.tsx index 6231e45c..d7f32b5e 100644 --- a/app/(auth)/reset-password/page.tsx +++ b/app/(auth)/reset-password/page.tsx @@ -4,7 +4,7 @@ import { ResetPasswordForm } from "@/features/auth/components/reset-password-for import { redirect } from "next/navigation"; import { auth } from "@/lib/auth/auth"; import { Avatar, AvatarImage, AvatarFallback } from "@radix-ui/react-avatar"; -import { CardAuth } from "@/features/layout/card-auth"; +import { CardAuth } from "@/features/layout/components/card-auth"; import { env } from "@/env.mjs"; export default async function RoutePage(props: { searchParams: Promise<{ token: string | undefined }> }) { diff --git a/app/(customer)/dashboard/(admin)/admin/organizations/[organizationId]/page.tsx b/app/(customer)/dashboard/(admin)/admin/organizations/[organizationId]/page.tsx index 97d388b4..d7750135 100644 --- a/app/(customer)/dashboard/(admin)/admin/organizations/[organizationId]/page.tsx +++ b/app/(customer)/dashboard/(admin)/admin/organizations/[organizationId]/page.tsx @@ -3,7 +3,7 @@ import {eq} from "drizzle-orm"; import {db} from "@/db"; import * as drizzleDb from "@/db"; import {PageParams} from "@/types/next"; -import {Page} from "@/features/layout/page"; +import {Page} from "@/features/layout/components/page"; import {OrganizationManagement} from "@/features/organizations/admin-organization-management"; import {buildOrganizationWithMembers} from "@/utils/common"; import {isUUID} from "@/utils/text"; diff --git a/app/(customer)/dashboard/(admin)/admin/organizations/page.tsx b/app/(customer)/dashboard/(admin)/admin/organizations/page.tsx index 6adff5d5..f47c33de 100644 --- a/app/(customer)/dashboard/(admin)/admin/organizations/page.tsx +++ b/app/(customer)/dashboard/(admin)/admin/organizations/page.tsx @@ -1,5 +1,5 @@ import {PageParams} from "@/types/next"; -import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page"; +import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page"; import {db} from "@/db"; import { AdminOrganizationAddModal diff --git a/app/(customer)/dashboard/(admin)/admin/settings/page.tsx b/app/(customer)/dashboard/(admin)/admin/settings/page.tsx index 2401de95..d048466f 100644 --- a/app/(customer)/dashboard/(admin)/admin/settings/page.tsx +++ b/app/(customer)/dashboard/(admin)/admin/settings/page.tsx @@ -1,5 +1,5 @@ import {PageParams} from "@/types/next"; -import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page"; +import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page"; import {db} from "@/db"; import {logger} from "@/lib/logger"; import {notFound} from "next/navigation"; diff --git a/app/(customer)/dashboard/(admin)/admin/users/page.tsx b/app/(customer)/dashboard/(admin)/admin/users/page.tsx index 367f19c6..a92ca247 100644 --- a/app/(customer)/dashboard/(admin)/admin/users/page.tsx +++ b/app/(customer)/dashboard/(admin)/admin/users/page.tsx @@ -1,5 +1,5 @@ import {PageParams} from "@/types/next"; -import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page"; +import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page"; import {db} from "@/db"; import {desc, isNull} from "drizzle-orm"; import {AdminUserList} from "@/features/users/admin-user-list"; diff --git a/app/(customer)/dashboard/(admin)/agents/[agentId]/page.tsx b/app/(customer)/dashboard/(admin)/agents/[agentId]/page.tsx index 00a45dfa..acb37153 100644 --- a/app/(customer)/dashboard/(admin)/agents/[agentId]/page.tsx +++ b/app/(customer)/dashboard/(admin)/agents/[agentId]/page.tsx @@ -4,7 +4,7 @@ import { PageContent, PageDescription, PageTitle, -} from "@/features/layout/page"; +} from "@/features/layout/components/page"; import { db } from "@/db"; import * as drizzleDb from "@/db"; import {eq, isNull} from "drizzle-orm"; diff --git a/app/(customer)/dashboard/(admin)/agents/page.tsx b/app/(customer)/dashboard/(admin)/agents/page.tsx index 5ee04b4e..a17511db 100644 --- a/app/(customer)/dashboard/(admin)/agents/page.tsx +++ b/app/(customer)/dashboard/(admin)/agents/page.tsx @@ -1,7 +1,7 @@ import {PageParams} from "@/types/next"; import {AgentCard} from "@/features/agents/components/agent-card"; import {CardsWithPagination} from "@/components/common/cards-with-pagination"; -import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page"; +import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page"; import {notFound} from "next/navigation"; import {db} from "@/db"; import * as drizzleDb from "@/db"; diff --git a/app/(customer)/dashboard/(admin)/notifications/channels/page.tsx b/app/(customer)/dashboard/(admin)/notifications/channels/page.tsx index 29048238..c0121df8 100644 --- a/app/(customer)/dashboard/(admin)/notifications/channels/page.tsx +++ b/app/(customer)/dashboard/(admin)/notifications/channels/page.tsx @@ -1,5 +1,5 @@ import {PageParams} from "@/types/next"; -import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page"; +import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page"; import {Metadata} from "next"; import {db} from "@/db"; import {notificationChannel, NotificationChannelWith} from "@/db/schema/09_notification-channel"; diff --git a/app/(customer)/dashboard/(admin)/notifications/logs/page.tsx b/app/(customer)/dashboard/(admin)/notifications/logs/page.tsx index 71331d70..056aca41 100644 --- a/app/(customer)/dashboard/(admin)/notifications/logs/page.tsx +++ b/app/(customer)/dashboard/(admin)/notifications/logs/page.tsx @@ -1,5 +1,5 @@ import {PageParams} from "@/types/next"; -import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page"; +import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page"; import {Metadata} from "next"; import {NotificationLogsList} from "@/features/notifications/notification-logs-list"; import {notFound} from "next/navigation"; diff --git a/app/(customer)/dashboard/(admin)/storages/channels/page.tsx b/app/(customer)/dashboard/(admin)/storages/channels/page.tsx index 7809778e..3df6251e 100644 --- a/app/(customer)/dashboard/(admin)/storages/channels/page.tsx +++ b/app/(customer)/dashboard/(admin)/storages/channels/page.tsx @@ -1,5 +1,5 @@ import {PageParams} from "@/types/next"; -import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page"; +import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page"; import {Metadata} from "next"; import {ChannelsSection} from "@/features/channel/components/channels-section"; import {db} from "@/db"; diff --git a/app/(customer)/dashboard/(organization)/migration/page.tsx b/app/(customer)/dashboard/(organization)/migration/page.tsx index c6119d4b..0d8c4ce8 100644 --- a/app/(customer)/dashboard/(organization)/migration/page.tsx +++ b/app/(customer)/dashboard/(organization)/migration/page.tsx @@ -1,5 +1,5 @@ import {PageParams} from "@/types/next"; -import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page"; +import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page"; import {notFound} from "next/navigation"; import {getOrganization} from "@/lib/auth/auth"; import {Metadata} from "next"; diff --git a/app/(customer)/dashboard/(organization)/projects/[projectId]/database/[databaseId]/page.tsx b/app/(customer)/dashboard/(organization)/projects/[projectId]/database/[databaseId]/page.tsx index 3c30c806..6b955fa6 100644 --- a/app/(customer)/dashboard/(organization)/projects/[projectId]/database/[databaseId]/page.tsx +++ b/app/(customer)/dashboard/(organization)/projects/[projectId]/database/[databaseId]/page.tsx @@ -1,6 +1,6 @@ import { PageParams } from "@/types/next"; import { notFound, redirect } from "next/navigation"; -import { Page } from "@/features/layout/page"; +import { Page } from "@/features/layout/components/page"; import { db } from "@/db"; import { eq, and, inArray } from "drizzle-orm"; import * as drizzleDb from "@/db"; diff --git a/app/(customer)/dashboard/(organization)/projects/[projectId]/page.tsx b/app/(customer)/dashboard/(organization)/projects/[projectId]/page.tsx index 536315fb..8b44967b 100644 --- a/app/(customer)/dashboard/(organization)/projects/[projectId]/page.tsx +++ b/app/(customer)/dashboard/(organization)/projects/[projectId]/page.tsx @@ -1,5 +1,5 @@ import { PageParams } from "@/types/next"; -import { Page, PageContent, PageTitle } from "@/features/layout/page"; +import { Page, PageContent, PageTitle } from "@/features/layout/components/page"; import { ButtonDeleteProject } from "@/features/projects/project-delete-button"; import { CardsWithPagination } from "@/components/common/cards-with-pagination"; import { ProjectDatabaseCard } from "@/features/projects/project-database-card"; diff --git a/app/(customer)/dashboard/(organization)/projects/page.tsx b/app/(customer)/dashboard/(organization)/projects/page.tsx index ed617318..6490b3d8 100644 --- a/app/(customer)/dashboard/(organization)/projects/page.tsx +++ b/app/(customer)/dashboard/(organization)/projects/page.tsx @@ -1,6 +1,6 @@ import {PageParams} from "@/types/next"; import {CardsWithPagination} from "@/components/common/cards-with-pagination"; -import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page"; +import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page"; import {ProjectCard} from "@/features/projects/project-card"; import {db} from "@/db"; import {notFound} from "next/navigation"; diff --git a/app/(customer)/dashboard/(organization)/settings/agents/[agentId]/page.tsx b/app/(customer)/dashboard/(organization)/settings/agents/[agentId]/page.tsx index c6e3a3d0..be04a33a 100644 --- a/app/(customer)/dashboard/(organization)/settings/agents/[agentId]/page.tsx +++ b/app/(customer)/dashboard/(organization)/settings/agents/[agentId]/page.tsx @@ -4,7 +4,7 @@ import { PageContent, PageDescription, PageTitle, -} from "@/features/layout/page"; +} from "@/features/layout/components/page"; import {db} from "@/db"; import * as drizzleDb from "@/db"; import {eq} from "drizzle-orm"; diff --git a/app/(customer)/dashboard/(organization)/settings/page.tsx b/app/(customer)/dashboard/(organization)/settings/page.tsx index c212713b..39d4da5c 100644 --- a/app/(customer)/dashboard/(organization)/settings/page.tsx +++ b/app/(customer)/dashboard/(organization)/settings/page.tsx @@ -4,7 +4,7 @@ import { PageContent, PageHeader, PageTitle, -} from "@/features/layout/page"; +} from "@/features/layout/components/page"; import {currentUser} from "@/lib/auth/current-user"; import {getActiveMember, getOrganization} from "@/lib/auth/auth"; import {notFound} from "next/navigation"; diff --git a/app/(customer)/dashboard/(organization)/statistics/page.tsx b/app/(customer)/dashboard/(organization)/statistics/page.tsx index c781c7e8..8d3e1da3 100644 --- a/app/(customer)/dashboard/(organization)/statistics/page.tsx +++ b/app/(customer)/dashboard/(organization)/statistics/page.tsx @@ -1,5 +1,5 @@ import {PageParams} from "@/types/next"; -import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page"; +import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page"; import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card"; import {EvolutionLineChart} from "@/features/statistics/evolution-line-chart"; import {PercentageLineChart} from "@/features/statistics/percentage-line-chart"; diff --git a/app/(customer)/dashboard/home/page.tsx b/app/(customer)/dashboard/home/page.tsx index 77e256e5..ab47d8c9 100644 --- a/app/(customer)/dashboard/home/page.tsx +++ b/app/(customer)/dashboard/home/page.tsx @@ -1,5 +1,5 @@ import {PageParams} from "@/types/next"; -import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page"; +import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/components/page"; import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card"; import {Building2, Database, DatabaseBackup, Folder, RefreshCcw, Server, Workflow} from "lucide-react"; import {currentUser} from "@/lib/auth/current-user"; diff --git a/app/(customer)/dashboard/layout.tsx b/app/(customer)/dashboard/layout.tsx index 74a40963..ce78a87e 100644 --- a/app/(customer)/dashboard/layout.tsx +++ b/app/(customer)/dashboard/layout.tsx @@ -2,8 +2,8 @@ import { ReactNode } from "react"; import { redirect } from "next/navigation"; import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar"; -import { AppSidebar } from "@/features/layout/app-sidebar"; -import { Header } from "@/features/layout/header"; +import { AppSidebar } from "@/features/layout/components/app-sidebar"; +import { Header } from "@/features/layout/components/header"; import { currentUser } from "@/lib/auth/current-user"; import { isOnboardingDone } from "@/db/services/setting"; import { env } from "@/env.mjs"; diff --git a/src/features/auth/components/register-form.tsx b/src/features/auth/components/register-form.tsx index f82e65e4..2054199a 100644 --- a/src/features/auth/components/register-form.tsx +++ b/src/features/auth/components/register-form.tsx @@ -17,7 +17,7 @@ import { } from "@/features/auth/schemas/register-form.schema"; import { signUp } from "@/lib/auth/auth-client"; import { useZodForm } from "@/components/ui/form"; -import { CardAuth } from "@/features/layout/card-auth"; +import { CardAuth } from "@/features/layout/components/card-auth"; import { FormField } from "@/components/ui/form"; import { FormItem } from "@/components/ui/form"; import { FormLabel } from "@/components/ui/form"; diff --git a/src/features/database/components/database-content.tsx b/src/features/database/components/database-content.tsx index 093e1149..5f481571 100644 --- a/src/features/database/components/database-content.tsx +++ b/src/features/database/components/database-content.tsx @@ -12,7 +12,7 @@ import { PageContent, PageDescription, PageTitle, -} from "@/features/layout/page"; +} from "@/features/layout/components/page"; import {capitalizeFirstLetter} from "@/utils/text"; import {RetentionPolicySheet} from "@/features/database/components/retention-policy-sheet"; import {CronButton} from "@/features/database/components/cron-button"; diff --git a/src/features/layout/app-sidebar.tsx b/src/features/layout/components/app-sidebar.tsx similarity index 79% rename from src/features/layout/app-sidebar.tsx rename to src/features/layout/components/app-sidebar.tsx index 82455d56..a4020af1 100644 --- a/src/features/layout/app-sidebar.tsx +++ b/src/features/layout/components/app-sidebar.tsx @@ -6,12 +6,12 @@ import { SidebarMenu, SidebarMenuItem } from "@/components/ui/sidebar"; -import {SidebarLogo} from "@/features/layout/logo-sidebar"; -import {SidebarMenuCustomMain} from "@/features/layout/menu-sidebar-main"; -import {SideBarFooterCredit} from "@/features/layout/side-bar-footer-credit"; +import {SidebarLogo} from "@/features/layout/components/logo-sidebar"; +import {SidebarMenuCustomMain} from "@/features/layout/components/menu-sidebar-main"; +import {SideBarFooterCredit} from "@/features/layout/components/side-bar-footer-credit"; import {OrganizationCombobox} from "@/features/organizations/organization-combobox"; import {env} from "@/env.mjs"; -import {LoggedInButton} from "@/features/layout/logged-in-button.server"; +import {LoggedInButton} from "@/features/layout/components/logged-in-button.server"; export function AppSidebar({ updateNotification }: { updateNotification?: ReactNode } = {}) { const projectName = env.PROJECT_NAME; diff --git a/src/features/layout/card-auth.tsx b/src/features/layout/components/card-auth.tsx similarity index 100% rename from src/features/layout/card-auth.tsx rename to src/features/layout/components/card-auth.tsx diff --git a/src/features/layout/demo-reset-banner.tsx b/src/features/layout/components/demo-reset-banner.tsx similarity index 100% rename from src/features/layout/demo-reset-banner.tsx rename to src/features/layout/components/demo-reset-banner.tsx diff --git a/src/features/layout/header.tsx b/src/features/layout/components/header.tsx similarity index 86% rename from src/features/layout/header.tsx rename to src/features/layout/components/header.tsx index ed3d0f7b..dd0dd8bb 100644 --- a/src/features/layout/header.tsx +++ b/src/features/layout/components/header.tsx @@ -4,9 +4,9 @@ import {SidebarTrigger} from "@/components/ui/sidebar"; import {currentUser} from "@/lib/auth/current-user"; import {BreadCrumbsWrapper} from "@/components/common/bread-crumbs"; import GitHubStarsButtonCustom from "@/components/common/github-button"; -import {LoggedInButton} from "@/features/layout/logged-in-button.server"; +import {LoggedInButton} from "@/features/layout/components/logged-in-button.server"; import { env } from "@/env.mjs"; -import { DemoResetBanner } from "@/features/layout/demo-reset-banner"; +import { DemoResetBanner } from "@/features/layout/components/demo-reset-banner"; export const Header = async ({ actions }: { actions?: ReactNode } = {}) => { const user = await currentUser(); diff --git a/src/features/layout/logged-in-button.server.tsx b/src/features/layout/components/logged-in-button.server.tsx similarity index 100% rename from src/features/layout/logged-in-button.server.tsx rename to src/features/layout/components/logged-in-button.server.tsx diff --git a/src/features/layout/logged-in-button.tsx b/src/features/layout/components/logged-in-button.tsx similarity index 100% rename from src/features/layout/logged-in-button.tsx rename to src/features/layout/components/logged-in-button.tsx diff --git a/src/features/layout/logged-in-dropdown.tsx b/src/features/layout/components/logged-in-dropdown.tsx similarity index 98% rename from src/features/layout/logged-in-dropdown.tsx rename to src/features/layout/components/logged-in-dropdown.tsx index 2fc4b6b0..99047935 100644 --- a/src/features/layout/logged-in-dropdown.tsx +++ b/src/features/layout/components/logged-in-dropdown.tsx @@ -5,7 +5,7 @@ import { useRouter } from "next/navigation"; import { LogOut, User } from "lucide-react"; import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"; import { signOut } from "@/lib/auth/auth-client"; -import { ProfileModal } from "@/features/layout/profile-modal"; +import { ProfileModal } from "@/features/layout/components/profile-modal"; import { Account, Session, User as UserType } from "@/db/schema/02_user"; import { AuthProviderConfig } from "@/lib/auth/config"; import type { AvatarMode } from "@/features/onboarding/types"; diff --git a/src/features/layout/logo-sidebar.tsx b/src/features/layout/components/logo-sidebar.tsx similarity index 100% rename from src/features/layout/logo-sidebar.tsx rename to src/features/layout/components/logo-sidebar.tsx diff --git a/src/features/layout/menu-sidebar-main.tsx b/src/features/layout/components/menu-sidebar-main.tsx similarity index 99% rename from src/features/layout/menu-sidebar-main.tsx rename to src/features/layout/components/menu-sidebar-main.tsx index c161fc2f..403eb850 100644 --- a/src/features/layout/menu-sidebar-main.tsx +++ b/src/features/layout/components/menu-sidebar-main.tsx @@ -10,7 +10,7 @@ import { Building, UserRoundCog, Mail, PackageOpen, Logs, Megaphone, Blocks, Warehouse, BookOpen, Hammer, ChevronsLeftRightEllipsis } from "lucide-react"; -import {SidebarGroupItem, SidebarMenuCustomBase} from "@/features/layout/menu-sidebar"; +import {SidebarGroupItem, SidebarMenuCustomBase} from "@/features/layout/components/menu-sidebar"; import {authClient} from "@/lib/auth/auth-client"; diff --git a/src/features/layout/menu-sidebar.tsx b/src/features/layout/components/menu-sidebar.tsx similarity index 100% rename from src/features/layout/menu-sidebar.tsx rename to src/features/layout/components/menu-sidebar.tsx diff --git a/src/features/layout/page.tsx b/src/features/layout/components/page.tsx similarity index 100% rename from src/features/layout/page.tsx rename to src/features/layout/components/page.tsx diff --git a/src/features/layout/profile-modal.tsx b/src/features/layout/components/profile-modal.tsx similarity index 100% rename from src/features/layout/profile-modal.tsx rename to src/features/layout/components/profile-modal.tsx diff --git a/src/features/layout/profile-sidebar.tsx b/src/features/layout/components/profile-sidebar.tsx similarity index 100% rename from src/features/layout/profile-sidebar.tsx rename to src/features/layout/components/profile-sidebar.tsx diff --git a/src/features/layout/side-bar-footer-credit.tsx b/src/features/layout/components/side-bar-footer-credit.tsx similarity index 100% rename from src/features/layout/side-bar-footer-credit.tsx rename to src/features/layout/components/side-bar-footer-credit.tsx