diff --git a/src/components/dashboard/dashboard-home.tsx b/src/components/dashboard/dashboard-home.tsx
deleted file mode 100644
index 5a63d65..0000000
--- a/src/components/dashboard/dashboard-home.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-'use client'
-
-import { Building2, Phone } from 'lucide-react'
-import { useRouter } from 'next/navigation'
-import { useEffect } from 'react'
-
-import { Card } from '@/components/ui/card'
-import { useAuthContext } from '@/contexts/AuthContext'
-import { useSidebar } from '@/hooks/useSidebar'
-
-import { Sidebar } from './sidebar'
-
-export function DashboardHome() {
- const { user } = useAuthContext()
- const { getSidebarMargin } = useSidebar()
- const router = useRouter()
-
- // Перенаправляем в зависимости от типа организации
- useEffect(() => {
- if (user?.organization?.type) {
- switch (user.organization.type) {
- case 'LOGIST':
- router.replace('/logistics/home')
- break
- case 'SELLER':
- router.replace('/seller/home')
- break
- case 'FULFILLMENT':
- router.replace('/fulfillment/home')
- break
- case 'WHOLESALE':
- router.replace('/wholesale/home')
- break
- }
- }
- }, [user, router])
-
- const getOrganizationName = () => {
- if (user?.organization?.name) {
- return user.organization.name
- }
- if (user?.organization?.fullName) {
- return user.organization.fullName
- }
- return 'Вашей организации'
- }
-
- return (
-
-
-
-
-
- {/* Информация об организации */}
-
-
-
-
Организация
-
-
-
{getOrganizationName()}
- {user?.organization?.inn &&
ИНН: {user.organization.inn}
}
-
-
- {/* Контактная информация */}
-
-
-
-
+{user?.phone}
-
Основной номер
-
-
- {/* Статистика или дополнительная информация */}
-
-
-
-
Система управления бизнесом
-
Версия 1.0
-
-
-
-
- )
-}
diff --git a/src/components/dashboard/dashboard.tsx b/src/components/dashboard/dashboard.tsx
deleted file mode 100644
index 2bd1f2b..0000000
--- a/src/components/dashboard/dashboard.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-
-import { useSidebar } from '@/hooks/useSidebar'
-
-import { DashboardHome } from './dashboard-home'
-import { Sidebar } from './sidebar'
-import { UserSettings } from './user-settings'
-
-export type DashboardSection = 'home' | 'settings'
-
-export function Dashboard() {
- const { getSidebarMargin } = useSidebar()
- const [activeSection] = useState
('home')
-
- const renderContent = () => {
- switch (activeSection) {
- case 'settings':
- return
- case 'home':
- default:
- return
- }
- }
-
- return (
-
-
-
- {renderContent()}
-
-
- )
-}
diff --git a/src/components/fulfillment-supplies/fulfillment-supplies-layout.tsx b/src/components/fulfillment-supplies/fulfillment-supplies-layout.tsx
index 496650d..fe66d53 100644
--- a/src/components/fulfillment-supplies/fulfillment-supplies-layout.tsx
+++ b/src/components/fulfillment-supplies/fulfillment-supplies-layout.tsx
@@ -38,7 +38,7 @@ function Breadcrumbs({ pathname }: { pathname: string }) {
const getBreadcrumbs = (path: string) => {
const segments = path.split('/').filter(Boolean)
- const breadcrumbs = [{ name: 'Главная', href: '/dashboard', icon: Home }]
+ const breadcrumbs = [{ name: 'Главная', href: '/fulfillment/home', icon: Home }]
// Вариант 1: Только новая архитектура (активный)
if (segments[0] === 'fulfillment') {
diff --git a/src/lib/routing.ts b/src/lib/routing.ts
new file mode 100644
index 0000000..9aff672
--- /dev/null
+++ b/src/lib/routing.ts
@@ -0,0 +1,66 @@
+/**
+ * 🎯 Утилита прямого роутинга пользователей в соответствии с типом организации
+ *
+ * ЦЕЛЬ: Убрать двойные редиректы Registration → /dashboard → /role/home
+ * РЕШЕНИЕ: Прямой роутинг Registration → /role/home
+ */
+
+interface UserWithOrganization {
+ id: string
+ phone: string
+ organization?: {
+ id: string
+ type: 'FULFILLMENT' | 'SELLER' | 'LOGIST' | 'WHOLESALE'
+ }
+}
+
+/**
+ * Определяет правильный путь домашней страницы для пользователя
+ * на основе типа его организации
+ */
+export const getHomePathFromUser = (user: UserWithOrganization): string => {
+ // Проверяем наличие пользователя и организации
+ if (!user?.organization?.type) {
+ console.error('❌ getHomePathFromUser - Missing user or organization data:', {
+ hasUser: !!user,
+ hasOrganization: !!user?.organization,
+ organizationType: user?.organization?.type,
+ })
+ return '/register' // Возврат для повторного выбора
+ }
+
+ // Маппинг типов организаций на домашние страницы
+ const homeRoutes = {
+ LOGIST: '/logistics/home',
+ SELLER: '/seller/home',
+ FULFILLMENT: '/fulfillment/home',
+ WHOLESALE: '/wholesale/home',
+ } as const
+
+ const organizationType = user.organization.type as keyof typeof homeRoutes
+ const homePath = homeRoutes[organizationType]
+
+ if (!homePath) {
+ console.error(`❌ getHomePathFromUser - Unknown organization type: ${organizationType}`)
+ return '/register' // Fallback
+ }
+
+ console.warn(`✅ getHomePathFromUser - Directing ${organizationType} to ${homePath}`)
+ return homePath
+}
+
+/**
+ * Fallback функция для случаев когда нужен роутинг без полных данных пользователя
+ */
+export const getHomePathFromOrganizationType = (
+ organizationType: 'FULFILLMENT' | 'SELLER' | 'LOGIST' | 'WHOLESALE',
+): string => {
+ const homeRoutes = {
+ LOGIST: '/logistics/home',
+ SELLER: '/seller/home',
+ FULFILLMENT: '/fulfillment/home',
+ WHOLESALE: '/wholesale/home',
+ } as const
+
+ return homeRoutes[organizationType] || '/register'
+}