Fix geo GraphQL schema mismatch: camelCase → snake_case

All geo .graphql operations and consuming code updated to match
server schema which uses snake_case field/argument names.
Removed non-existent QuoteCalculations query, using NearestOffers instead.

.gitea/workflows/build.yaml

@@ -26,12 +26,6 @@ jobs:
           context: .
           push: true
           tags: gitea.dsrptlab.com/optovia/webapp/webapp:latest
-          build-args: |
-            INFISICAL_API_URL=${{ secrets.INFISICAL_API_URL }}
-            INFISICAL_CLIENT_ID=${{ secrets.INFISICAL_CLIENT_ID }}
-            INFISICAL_CLIENT_SECRET=${{ secrets.INFISICAL_CLIENT_SECRET }}
-            INFISICAL_PROJECT_ID=${{ secrets.INFISICAL_PROJECT_ID }}
-            INFISICAL_ENV=prod
 
       - name: Deploy to Dokploy
-        run: curl -X POST "https://dokploy.optovia.ru/api/deploy/0_iNAXPDx28BLZIddGTzB"
+        run: curl -k -X POST "https://dokploy.optovia.ru/api/deploy/0_iNAXPDx28BLZIddGTzB"

.storybook/main.ts

@@ -1,46 +0,0 @@
-import path from 'node:path'
-import type { StorybookConfig } from '@storybook/vue3-vite'
-import vue from '@vitejs/plugin-vue'
-
-const config: StorybookConfig = {
-  stories: ['../app/components/**/*.stories.@(js|ts)'],
-  addons: ['@storybook/addon-essentials', '@storybook/addon-interactions'],
-  framework: {
-    name: '@storybook/vue3-vite',
-    options: {}
-  },
-  core: {
-    disableTelemetry: true
-  },
-  docs: {
-    autodocs: false
-  },
-  viteFinal: async (baseConfig) => {
-    const projectRoot = path.resolve(__dirname, '..')
-    baseConfig.resolve = baseConfig.resolve || {}
-    baseConfig.resolve.alias = {
-      ...baseConfig.resolve.alias,
-      '~': path.resolve(__dirname, '../app'),
-      '@': path.resolve(__dirname, '../app'),
-      '@graphql-typed-document-node/core': path.resolve(__dirname, './shims/graphql-typed-document-node-core.ts')
-    }
-    baseConfig.plugins = baseConfig.plugins || []
-    baseConfig.plugins.push(vue())
-    baseConfig.root = projectRoot
-    baseConfig.server = {
-      ...(baseConfig.server || {}),
-      fs: {
-        ...(baseConfig.server?.fs || {}),
-        allow: Array.from(
-          new Set([
-            ...(baseConfig.server?.fs?.allow || []),
-            projectRoot
-          ])
-        )
-      }
-    }
-    return baseConfig
-  }
-}
-
-export default config

.storybook/preview.ts

@@ -1,23 +0,0 @@
-import type { Preview } from '@storybook/vue3'
-import { setup } from '@storybook/vue3'
-
-import '../app/assets/css/tailwind.css'
-
-setup((app) => {
-  app.config.globalProperties.$t = (key: string) => key
-  app.config.globalProperties.$d = (value: any) => value
-})
-
-const preview: Preview = {
-  parameters: {
-    actions: { argTypesRegex: '^on[A-Z].*' },
-    controls: {
-      matchers: {
-        color: /(background|color)$/i,
-        date: /Date$/
-      }
-    }
-  }
-}
-
-export default preview

.storybook/shims/graphql-typed-document-node-core.ts

@@ -1,10 +0,0 @@
-// Minimal runtime shim so Vite/Storybook can resolve generated GraphQL imports.
-import type { DocumentNode } from 'graphql'
-
-export type TypedDocumentNode<TResult = any, TVariables = Record<string, any>> = DocumentNode & {
-  __resultType?: TResult
-  __variablesType?: TVariables
-}
-
-// Runtime placeholder; generated files import the symbol but do not use the value.
-export const TypedDocumentNode = {} as unknown as TypedDocumentNode

Dockerfile

@@ -2,28 +2,21 @@ FROM node:22-slim AS build
 
 ENV PNPM_HOME=/pnpm
 ENV PATH=$PNPM_HOME:$PATH
+ENV NODE_OPTIONS=--max-old-space-size=2048
+ENV NUXT_SOURCEMAP=false
+ENV NUXT_MINIFY=false
+ENV SENTRY_ENABLED=false
+ENV NUXT_TELEMETRY_DISABLED=1
 
 WORKDIR /app
 
 RUN corepack enable
 
-ARG INFISICAL_API_URL
-ARG INFISICAL_CLIENT_ID
-ARG INFISICAL_CLIENT_SECRET
-ARG INFISICAL_PROJECT_ID
-ARG INFISICAL_ENV
-
-ENV INFISICAL_API_URL=$INFISICAL_API_URL \
-    INFISICAL_CLIENT_ID=$INFISICAL_CLIENT_ID \
-    INFISICAL_CLIENT_SECRET=$INFISICAL_CLIENT_SECRET \
-    INFISICAL_PROJECT_ID=$INFISICAL_PROJECT_ID \
-    INFISICAL_ENV=$INFISICAL_ENV
-
 COPY package.json pnpm-lock.yaml ./
 RUN pnpm install --frozen-lockfile
 
 COPY . .
-RUN node scripts/load-secrets.mjs && . ./.env.infisical && pnpm run build
+RUN pnpm run build
 
 FROM node:22-slim
 
@@ -41,4 +34,4 @@ COPY --from=build /app/package.json ./package.json
 
 EXPOSE 3000
 
-CMD ["sh", "-c", "node scripts/load-secrets.mjs && . ./.env.infisical && node --import ./.output/server/sentry.server.config.mjs .output/server/index.mjs"]
+CMD ["sh", "-c", "node scripts/load-secrets.mjs && . ./.env.infisical && if [ \"$SENTRY_ENABLED\" = \"false\" ] || [ ! -f ./.output/server/sentry.server.config.mjs ]; then node .output/server/index.mjs; else node --import ./.output/server/sentry.server.config.mjs .output/server/index.mjs; fi"]

app/app.vue

@@ -7,7 +7,7 @@
 <script setup lang="ts">
 useHead({
   htmlAttrs: {
-    'data-theme': 'cmyk',
+    'data-theme': 'cupcake',
   },
   script: []
 })

app/assets/css/tailwind.css

@@ -2,10 +2,64 @@
 @plugin "daisyui";
 
 @plugin "daisyui/theme" {
-  name: "silk";
+  name: "cupcake";
   default: true;
   prefersdark: false;
   color-scheme: "light";
+  --color-base-100: oklch(97.788% 0.004 56.375);
+  --color-base-200: oklch(93.982% 0.007 61.449);
+  --color-base-300: oklch(91.586% 0.006 53.44);
+  --color-base-content: oklch(23.574% 0.066 313.189);
+  --color-primary: oklch(85% 0.138 181.071);
+  --color-primary-content: oklch(43% 0.078 188.216);
+  --color-secondary: oklch(89% 0.061 343.231);
+  --color-secondary-content: oklch(45% 0.187 3.815);
+  --color-accent: oklch(90% 0.076 70.697);
+  --color-accent-content: oklch(47% 0.157 37.304);
+  --color-neutral: oklch(27% 0.006 286.033);
+  --color-neutral-content: oklch(92% 0.004 286.32);
+  --color-info: oklch(68% 0.169 237.323);
+  --color-info-content: oklch(29% 0.066 243.157);
+  --color-success: oklch(69% 0.17 162.48);
+  --color-success-content: oklch(26% 0.051 172.552);
+  --color-warning: oklch(79% 0.184 86.047);
+  --color-warning-content: oklch(28% 0.066 53.813);
+  --color-error: oklch(64% 0.246 16.439);
+  --color-error-content: oklch(27% 0.105 12.094);
+  --radius-selector: 2rem;
+  --radius-field: 2rem;
+  --radius-box: 2rem;
+  --size-selector: 0.3125rem;
+  --size-field: 0.3125rem;
+  --border: 0.5px;
+  --depth: 1;
+  --noise: 0;
+}
+
+@layer components {
+  .glass-topfade {
+    background: linear-gradient(
+      180deg,
+      rgba(255, 255, 255, 0.4) 0%,
+      rgba(255, 255, 255, 0.18) 45%,
+      rgba(255, 255, 255, 0) 100%
+    );
+  }
+
+  .glass-soft {
+    @apply bg-white/10 border border-white/10 backdrop-blur-md;
+  }
+
+  .glass-bright {
+    @apply bg-white/30 border border-white/20 backdrop-blur-md;
+  }
+}
+
+@plugin "daisyui/theme" {
+  name: "silk";
+  default: false;
+  prefersdark: false;
+  color-scheme: "light";
   --color-base-100: oklch(97% 0.0035 67.78);
   --color-base-200: oklch(95% 0.0081 61.42);
   --color-base-300: oklch(90% 0.0081 61.42);

app/components/BankSearchRussia.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './BankSearchRussia.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'BankSearchRussia',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/BankSearchRussia.vue

@@ -47,13 +47,22 @@ interface BankData {
   correspondentAccount: string
 }
 
+interface BankSuggestion {
+  value: string
+  data: {
+    bic: string
+    correspondent_account?: string
+    address?: { value: string }
+  }
+}
+
 interface Props {
   modelValue?: BankData
 }
 
 interface Emits {
   (e: 'update:modelValue', value: BankData): void
-  (e: 'select', bank: any): void
+  (e: 'select', bank: BankSuggestion): void
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -67,14 +76,14 @@ const props = withDefaults(defineProps<Props>(), {
 const emit = defineEmits<Emits>()
 
 const query = ref('')
-const suggestions = ref([])
+const suggestions = ref<BankSuggestion[]>([])
 const loading = ref(false)
 const showDropdown = ref(false)
 
 // Hide dropdown when clicking outside
 onMounted(() => {
-  document.addEventListener('click', (e) => {
+  document.addEventListener('click', (e: MouseEvent) => {
-    if (!e.target?.closest('.relative')) {
+    if (!(e.target as HTMLElement)?.closest('.relative')) {
       showDropdown.value = false
     }
   })
@@ -114,7 +123,7 @@ const onInput = async () => {
   }
 }
 
-const selectBank = (bank: any) => {
+const selectBank = (bank: BankSuggestion) => {
   query.value = bank.value
   showDropdown.value = false
   

app/components/CabinetBreadcrumbs.vue

@@ -44,6 +44,7 @@ const breadcrumbs = computed(() => {
   let currentPath = '/clientarea'
   for (let i = 0; i < segments.length; i++) {
     const segment = segments[i]
+    if (!segment) continue
     currentPath += `/${segment}`
     const isLast = i === segments.length - 1
 

app/components/CalcResultContent.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './CalcResultContent.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'CalcResultContent',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/CalcResultContent.vue

@@ -1,86 +1,65 @@
 <template>
-  <div class="space-y-10">
+  <div class="space-y-6">
+    <!-- Header -->
     <Card padding="lg" class="border border-base-300">
       <RouteSummaryHeader :title="summaryTitle" :meta="summaryMeta" />
     </Card>
 
+    <!-- Loading -->
     <div v-if="pending" class="text-sm text-base-content/60">
       Загрузка маршрутов...
     </div>
 
+    <!-- Error -->
     <div v-else-if="error" class="text-sm text-error">
       Ошибка загрузки маршрутов: {{ error.message }}
     </div>
 
-    <div v-else-if="productRouteOptions.length > 0 || legacyRoutes.length > 0" class="space-y-10">
+    <!-- Results -->
-      <div v-if="productRouteOptions.length" class="space-y-10">
+    <div v-else-if="productRouteOptions.length > 0" class="space-y-4">
-        <div
+      <OfferResultCard
-          v-for="(option, optionIndex) in productRouteOptions"
+        v-for="(option, index) in productRouteOptions"
-          :key="option.sourceUuid || optionIndex"
+        :key="option.sourceUuid ?? index"
-          class="space-y-6"
+        :supplier-name="getSupplierName(option.sourceUuid)"
-        >
+        :location-name="getOfferData(option.sourceUuid)?.locationName"
-          <div class="space-y-1">
+        :product-name="productName"
-            <Heading :level="3" weight="semibold">Источник {{ optionIndex + 1 }}</Heading>
+        :price-per-unit="parseFloat(getOfferData(option.sourceUuid)?.pricePerUnit || '0') || null"
-            <Text tone="muted" size="sm">{{ option.sourceName || 'Склад' }}</Text>
+        :quantity="getOfferData(option.sourceUuid)?.quantity"
-          </div>
+        :currency="getOfferData(option.sourceUuid)?.currency"
-
+        :unit="getOfferData(option.sourceUuid)?.unit"
-          <div v-if="option.routes?.length" class="space-y-6">
+        :stages="getRouteStages(option)"
-            <Card
+        :total-time-seconds="option.routes?.[0]?.totalTimeSeconds ?? null"
-              v-for="(route, routeIndex) in option.routes"
+        :kyc-profile-uuid="getKycProfileUuid(option.sourceUuid)"
-              :key="routeIndex"
+        @select="navigateToOffer(option.sourceUuid)"
-              padding="lg"
+      />
-              class="border border-base-300"
-            >
-              <Stack gap="4">
-                <div class="flex flex-wrap items-center justify-between gap-2">
-                  <Text weight="semibold">Маршрут {{ routeIndex + 1 }}</Text>
-                  <Text tone="muted" size="sm">
-                    {{ formatDistance(route.totalDistanceKm) }} км · {{ formatDuration(route.totalTimeSeconds) }}
-                  </Text>
-                </div>
-
-                <RouteStagesList :stages="mapRouteStages(route)" />
-
-                <div class="divider my-0"></div>
-
-                <RequestRoutesMap :routes="[route]" :height="240" />
-              </Stack>
-            </Card>
-          </div>
-
-          <Text v-else tone="muted" size="sm">
-            Маршруты от источника не найдены.
-          </Text>
-        </div>
-      </div>
-
-      <template v-if="!productRouteOptions.length && legacyRoutes.length">
-        <div class="space-y-6">
-          <Card
-            v-for="(route, routeIndex) in legacyRoutes"
-            :key="routeIndex"
-            padding="lg"
-            class="border border-base-300"
-          >
-            <Stack gap="4">
-              <div class="flex flex-wrap items-center justify-between gap-2">
-                <Text weight="semibold">Маршрут {{ routeIndex + 1 }}</Text>
-                <Text tone="muted" size="sm">
-                  {{ formatDistance(route.totalDistanceKm) }} км · {{ formatDuration(route.totalTimeSeconds) }}
-                </Text>
-              </div>
-
-              <RouteStagesList :stages="mapRouteStages(route)" />
-
-              <div class="divider my-0"></div>
-
-              <RequestRoutesMap :routes="[route]" :height="240" />
-            </Stack>
-          </Card>
-        </div>
-      </template>
     </div>
 
+    <!-- Legacy routes (fallback) -->
+    <div v-else-if="legacyRoutes.length > 0" class="space-y-6">
+      <Card
+        v-for="(route, routeIndex) in legacyRoutes"
+        :key="routeIndex"
+        padding="lg"
+        class="border border-base-300"
+      >
+        <Stack gap="4">
+          <div class="flex flex-wrap items-center justify-between gap-2">
+            <Text weight="semibold">Маршрут {{ routeIndex + 1 }}</Text>
+            <Text tone="muted" size="sm">
+              {{ formatDistance(route.totalDistanceKm) }} км · {{ formatDuration(route.totalTimeSeconds) }}
+            </Text>
+          </div>
+
+          <RouteStagesList :stages="mapRouteStages(route)" />
+
+          <div class="divider my-0"></div>
+
+          <RequestRoutesMap :routes="[route]" :height="240" />
+        </Stack>
+      </Card>
+    </div>
+
+    <!-- Empty -->
     <div v-else class="text-sm text-base-content/60">
       Маршруты не найдены. Возможно, нет связи между точками в графе.
     </div>
@@ -88,16 +67,41 @@
 </template>
 
 <script setup lang="ts">
-import { FindRoutesDocument } from '~/composables/graphql/public/geo-generated'
+import { GetNodeDocument, NearestOffersDocument } from '~/composables/graphql/public/geo-generated'
-import type { RoutePathType } from '~/composables/graphql/public/geo-generated'
 import type { RouteStageItem } from '~/components/RouteStagesList.vue'
 
+interface RouteStage {
+  fromUuid?: string | null
+  fromName?: string | null
+  toName?: string | null
+  distanceKm?: number | null
+  travelTimeSeconds?: number | null
+  transportType?: string | null
+}
+
+interface RoutePathType {
+  totalDistanceKm?: number | null
+  totalTimeSeconds?: number | null
+  stages?: (RouteStage | null)[]
+}
+import { GetOfferDocument, GetSupplierProfileByTeamDocument, type GetOfferQueryResult, type GetSupplierProfileByTeamQueryResult } from '~/composables/graphql/public/exchange-generated'
+import type { OfferWithRoute, RouteStage } from '~/composables/graphql/public/geo-generated'
+
 const route = useRoute()
+const localePath = useLocalePath()
 const searchStore = useSearchStore()
+const { execute } = useGraphQL()
 
 const productName = computed(() => searchStore.searchForm.product || (route.query.product as string) || 'Товар')
 const locationName = computed(() => searchStore.searchForm.location || (route.query.location as string) || 'Назначение')
-const quantity = computed(() => (route.query.quantity as string) || (searchStore.searchForm as any)?.quantity)
+const quantity = computed(() => (route.query.quantity as string) || searchStore.searchForm.quantity)
+
+// Offer data for prices
+type OfferData = NonNullable<GetOfferQueryResult['getOffer']>
+const offersData = ref<Map<string, OfferData>>(new Map())
+// Supplier data for KYC profile UUID (by team_uuid)
+type SupplierData = NonNullable<GetSupplierProfileByTeamQueryResult['getSupplierProfileByTeam']>
+const suppliersData = ref<Map<string, SupplierData>>(new Map())
 
 const summaryTitle = computed(() => `${productName.value} → ${locationName.value}`)
 const summaryMeta = computed(() => {
@@ -108,10 +112,9 @@ const summaryMeta = computed(() => {
   return meta
 })
 
-// Determine context (new flow: product + destination; legacy: from param)
+// Determine context
 const productUuid = computed(() => (route.query.productUuid as string) || searchStore.searchForm.productUuid)
 const destinationUuid = computed(() => (route.query.locationUuid as string) || searchStore.searchForm.locationUuid)
-const legacyFromUuid = computed(() => route.params.id as string | undefined)
 
 type ProductRouteOption = {
   sourceUuid?: string | null
@@ -122,95 +125,68 @@ type ProductRouteOption = {
   routes?: RoutePathType[] | null
 }
 
-const fetchProductRoutes = async () => {
+const fetchOffersByHub = async () => {
   if (!productUuid.value || !destinationUuid.value) return null
-  const { client } = useApolloClient('publicGeo')
-  const { default: gql } = await import('graphql-tag')
 
-  const query = gql`
+  // 1. Get hub node to get coordinates
-    query FindProductRoutes($productUuid: String!, $toUuid: String!, $limitSources: Int, $limitRoutes: Int) {
+  const hubData = await execute(GetNodeDocument, { uuid: destinationUuid.value }, 'public', 'geo')
-      findProductRoutes(
+  const hub = hubData?.node
-        productUuid: $productUuid
-        toUuid: $toUuid
-        limitSources: $limitSources
-        limitRoutes: $limitRoutes
-      ) {
-        sourceUuid
-        sourceName
-        sourceLat
-        sourceLon
-        distanceKm
-        routes {
-          totalDistanceKm
-          totalTimeSeconds
-          stages {
-            fromUuid
-            fromName
-            fromLat
-            fromLon
-            toUuid
-            toName
-            toLat
-            toLon
-            distanceKm
-            travelTimeSeconds
-            transportType
-          }
-        }
-      }
-    }
-  `
 
-  const { data } = await client.query({
+  if (!hub?.latitude || !hub?.longitude) {
-    query,
+    console.warn('Hub has no coordinates')
-    variables: {
+    return null
+  }
+
+  // 2. Find offers near hub for this product WITH routes calculated on backend
+  const offersResponse = await execute(
+    NearestOffersDocument,
+    {
+      lat: hub.latitude,
+      lon: hub.longitude,
       productUuid: productUuid.value,
-      toUuid: destinationUuid.value,
+      hubUuid: destinationUuid.value, // Pass hubUuid to get routes calculated on backend
-      limitSources: 5,
+      radius: 500,
-      limitRoutes: 1
+      limit: 5
-    }
+    },
-  })
+    'public',
-  return data
+    'geo'
-}
+  )
 
-const fetchLegacyRoutes = async () => {
+  const offers = offersResponse?.nearest_offers || []
-  if (!legacyFromUuid.value || !destinationUuid.value) return null
+
-  const { client } = useApolloClient('publicGeo')
+  // Offers already include routes from backend
-  const { data } = await client.query({
+  const offersWithRoutes = offers
-    query: FindRoutesDocument,
+    .filter((offer): offer is NonNullable<OfferWithRoute> => offer !== null)
-    variables: {
+    .map((offer) => ({
-      fromUuid: legacyFromUuid.value,
+      sourceUuid: offer.uuid,
-      toUuid: destinationUuid.value,
+      sourceName: offer.product_name,
-      limit: 3
+      sourceLat: offer.latitude,
-    }
+      sourceLon: offer.longitude,
-  })
+      distanceKm: offer.distance_km,
-  return data
+      routes: offer.routes || []
+    }))
+
+  return { offersByHub: offersWithRoutes }
 }
 
 const { data: productRoutesData, pending, error } = await useAsyncData(
-  () => `product-routes-${productUuid.value}-${destinationUuid.value}-${legacyFromUuid.value || 'none'}`,
+  () => `offers-by-hub-${productUuid.value}-${destinationUuid.value}`,
   async () => {
-    // Prefer product-based routes; fallback to legacy if no product
     if (productUuid.value && destinationUuid.value) {
-      return await fetchProductRoutes()
+      return await fetchOffersByHub()
-    }
-    if (legacyFromUuid.value && destinationUuid.value) {
-      return await fetchLegacyRoutes()
     }
     return null
   },
-  { watch: [productUuid, destinationUuid, legacyFromUuid] }
+  { watch: [productUuid, destinationUuid] }
 )
 
 const productRouteOptions = computed(() => {
-  const options = productRoutesData.value?.findProductRoutes as ProductRouteOption[] | undefined
+  const options = productRoutesData.value?.offersByHub as ProductRouteOption[] | undefined
   return options?.filter(Boolean) || []
 })
 
-const legacyRoutes = computed(() => {
+const legacyRoutes = computed<RoutePathType[]>(() => {
-  const data = productRoutesData.value?.findRoutes
+  return []  // Legacy routes removed
-  if (!data) return []
-  return (data as (RoutePathType | null)[]).filter((r): r is RoutePathType => r !== null)
 })
 
 const mapRouteStages = (route: RoutePathType): RouteStageItem[] => {
@@ -226,6 +202,100 @@ const mapRouteStages = (route: RoutePathType): RouteStageItem[] => {
     }))
 }
 
+// Get route stages for OfferResultCard stepper
+const getRouteStages = (option: ProductRouteOption) => {
+  const route = option.routes?.[0]
+  if (!route?.stages) return []
+  return route.stages
+    .filter((stage): stage is NonNullable<RouteStage> => stage !== null)
+    .map((stage) => ({
+      transportType: stage.transport_type,
+      distanceKm: stage.distance_km,
+      travelTimeSeconds: stage.travel_time_seconds,
+      fromName: stage.from_name
+    }))
+}
+
+// Get offer data for card
+const getOfferData = (uuid?: string | null) => {
+  if (!uuid) return null
+  return offersData.value.get(uuid)
+}
+
+// Get KYC profile UUID by offer UUID
+const getKycProfileUuid = (offerUuid?: string | null) => {
+  if (!offerUuid) return null
+  const offer = offersData.value.get(offerUuid)
+  if (!offer?.teamUuid) return null
+  const supplier = suppliersData.value.get(offer.teamUuid)
+  return supplier?.kycProfileUuid || null
+}
+
+const getSupplierName = (offerUuid?: string | null) => {
+  if (!offerUuid) return null
+  const offer = offersData.value.get(offerUuid)
+  if (!offer?.teamUuid) return null
+  const supplier = suppliersData.value.get(offer.teamUuid)
+  return supplier?.name || null
+}
+
+// Navigate to offer detail page
+const navigateToOffer = (offerUuid?: string | null) => {
+  if (!offerUuid) return
+  navigateTo(localePath(`/catalog/offers/detail/${offerUuid}`))
+}
+
+// Load offer details for prices
+const loadOfferDetails = async (options: ProductRouteOption[]) => {
+  if (options.length === 0) {
+    offersData.value.clear()
+    suppliersData.value.clear()
+    return
+  }
+
+  const newOffersData = new Map<string, OfferData>()
+  const newSuppliersData = new Map<string, SupplierData>()
+  const teamUuidsToLoad = new Set<string>()
+
+  // First, load all offers
+  await Promise.all(options.map(async (option) => {
+    if (!option.sourceUuid) return
+    try {
+      const data = await execute(GetOfferDocument, { uuid: option.sourceUuid }, 'public', 'exchange')
+      if (data?.getOffer) {
+        newOffersData.set(option.sourceUuid, data.getOffer)
+        if (data.getOffer.teamUuid) {
+          teamUuidsToLoad.add(data.getOffer.teamUuid)
+        }
+      }
+    } catch (error) {
+      console.error('Error loading offer:', option.sourceUuid, error)
+    }
+  }))
+
+  // Then, load supplier profiles for all team UUIDs
+  await Promise.all([...teamUuidsToLoad].map(async (teamUuid) => {
+    try {
+      const data = await execute(GetSupplierProfileByTeamDocument, { teamUuid }, 'public', 'exchange')
+      if (data?.getSupplierProfileByTeam) {
+        newSuppliersData.set(teamUuid, data.getSupplierProfileByTeam)
+      }
+    } catch (error) {
+      console.error('Error loading supplier:', teamUuid, error)
+    }
+  }))
+
+  offersData.value = newOffersData
+  suppliersData.value = newSuppliersData
+}
+
+// Watch for route options and load offers
+watch(productRouteOptions, (options) => {
+  if (options.length > 0) {
+    loadOfferDetails(options)
+  }
+}, { immediate: true })
+
 // Formatting helpers
 const formatDistance = (km: number | null | undefined) => {
   if (!km) return '0'

app/components/CompanyCard.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './CompanyCard.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'CompanyCard',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/CompanySearchRussia.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './CompanySearchRussia.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'CompanySearchRussia',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/CompanySearchRussia.vue

@@ -48,13 +48,24 @@ interface CompanyData {
   address: string
 }
 
+interface CompanySuggestion {
+  value: string
+  unrestricted_value: string
+  data: {
+    inn: string
+    kpp?: string
+    ogrn?: string
+    address?: { value: string }
+  }
+}
+
 interface Props {
   modelValue?: CompanyData
 }
 
 interface Emits {
   (e: 'update:modelValue', value: CompanyData): void
-  (e: 'select', company: any): void
+  (e: 'select', company: CompanySuggestion): void
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -71,14 +82,14 @@ const props = withDefaults(defineProps<Props>(), {
 const emit = defineEmits<Emits>()
 
 const query = ref('')
-const suggestions = ref([])
+const suggestions = ref<CompanySuggestion[]>([])
 const loading = ref(false)
 const showDropdown = ref(false)
 
 // Hide dropdown when clicking outside
 onMounted(() => {
-  document.addEventListener('click', (e) => {
+  document.addEventListener('click', (e: MouseEvent) => {
-    if (!e.target?.closest('.relative')) {
+    if (!(e.target as HTMLElement)?.closest('.relative')) {
       showDropdown.value = false
     }
   })
@@ -118,7 +129,7 @@ const onInput = async () => {
   }
 }
 
-const selectCompany = (company: any) => {
+const selectCompany = (company: CompanySuggestion) => {
   query.value = company.value
   showDropdown.value = false
 

app/components/FooterPublic.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './FooterPublic.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'FooterPublic',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/GanttTimeline.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './GanttTimeline.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'GanttTimeline',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/GoodsContent.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './GoodsContent.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'GoodsContent',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/GoodsContent.vue

@@ -24,38 +24,40 @@
 
     <Grid v-else :cols="1" :md="2" :lg="3" :gap="4">
       <ProductCard
-        v-for="product in productsData"
+        v-for="(product, index) in productsData"
-        :key="product.uuid"
+        :key="product?.uuid ?? index"
-        :product="product"
+        :product="product!"
         selectable
-        @select="selectProduct(product)"
+        @select="selectProduct(product!)"
       />
     </Grid>
   </Stack>
 </template>
 
 <script setup lang="ts">
-import { GetProductsDocument } from '~/composables/graphql/public/exchange-generated'
+import { GetProductsDocument, type GetProductsQueryResult } from '~/composables/graphql/public/exchange-generated'
+
+type Product = NonNullable<NonNullable<GetProductsQueryResult['getProducts']>[number]>
 
 const searchStore = useSearchStore()
 
 const { data, pending, error, refresh } = await useServerQuery('products', GetProductsDocument, {}, 'public', 'exchange')
 const productsData = computed(() => data.value?.getProducts || [])
 
-const selectProduct = (product: any) => {
+const selectProduct = (product: Product) => {
   searchStore.setProduct(product.name)
   searchStore.setProductUuid(product.uuid)
   const locationUuid = searchStore.searchForm.locationUuid
+  const quantity = searchStore.searchForm.quantity
+
+  const query: Record<string, string> = {}
+  if (quantity) query.quantity = String(quantity)
+
   if (locationUuid) {
+    // Both product and hub selected -> show offers
     navigateTo({
-      path: '/request',
+      path: `/catalog`,
-      query: {
+      query: { product: product.uuid, hub: locationUuid, ...query }
-        productUuid: product.uuid,
-        product: product.name,
-        locationUuid,
-        location: searchStore.searchForm.location,
-        quantity: searchStore.searchForm.quantity || undefined
-      }
     })
     return
   }

app/components/KYCFormRussia.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './KYCFormRussia.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'KYCFormRussia',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/KYCFormRussia.vue

@@ -4,13 +4,13 @@
       <!-- Company Section -->
       <div class="card bg-base-100 border border-base-300 shadow-sm">
         <div class="card-body gap-4">
-          <h3 class="card-title text-base-content">Company details</h3>
+          <h3 class="card-title text-base-content">{{ t('kycRussia.form.companyDetails') }}</h3>
 
           <div class="space-y-4">
             <!-- Company search with DADATA -->
             <div>
               <label class="block text-sm font-medium text-base-content mb-2">
-                Organization search
+                {{ t('kycRussia.form.organizationSearch') }}
               </label>
               <CompanySearchRussia v-model="formData.company" @select="onCompanySelect" />
             </div>
@@ -18,7 +18,7 @@
             <!-- Company details (auto-filled from DADATA) -->
             <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
               <div>
-                <label class="block text-sm font-medium text-base-content mb-2">INN</label>
+                <label class="block text-sm font-medium text-base-content mb-2">{{ t('kycRussia.form.inn') }}</label>
                 <input
                   v-model="formData.company.inn"
                   class="input input-bordered w-full"
@@ -26,7 +26,7 @@
                 />
               </div>
               <div>
-                <label class="block text-sm font-medium text-base-content mb-2">KPP</label>
+                <label class="block text-sm font-medium text-base-content mb-2">{{ t('kycRussia.form.kpp') }}</label>
                 <input
                   v-model="formData.company.kpp"
                   class="input input-bordered w-full"
@@ -36,7 +36,7 @@
             </div>
 
             <div>
-              <label class="block text-sm font-medium text-base-content mb-2">OGRN</label>
+              <label class="block text-sm font-medium text-base-content mb-2">{{ t('kycRussia.form.ogrn') }}</label>
               <input
                 v-model="formData.company.ogrn"
                 class="input input-bordered w-full"
@@ -45,7 +45,7 @@
             </div>
 
             <div>
-              <label class="block text-sm font-medium text-base-content mb-2">Address</label>
+              <label class="block text-sm font-medium text-base-content mb-2">{{ t('kycRussia.form.address') }}</label>
               <textarea
                 v-model="formData.company.address"
                 class="textarea textarea-bordered w-full min-h-[120px]"
@@ -60,13 +60,13 @@
       <!-- Bank Section -->
       <div class="card bg-base-100 border border-base-300 shadow-sm">
         <div class="card-body gap-4">
-          <h3 class="card-title text-base-content">Bank details</h3>
+          <h3 class="card-title text-base-content">{{ t('kycRussia.form.bankDetails') }}</h3>
 
           <div class="space-y-4">
             <!-- Bank search with DADATA -->
             <div>
               <label class="block text-sm font-medium text-base-content mb-2">
-                Bank search
+                {{ t('kycRussia.form.bankSearch') }}
               </label>
               <BankSearchRussia v-model="formData.bank" @select="onBankSelect" />
             </div>
@@ -74,7 +74,7 @@
             <!-- Bank details -->
             <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
               <div>
-                <label class="block text-sm font-medium text-base-content mb-2">BIC</label>
+                <label class="block text-sm font-medium text-base-content mb-2">{{ t('kycRussia.form.bic') }}</label>
                 <input
                   v-model="formData.bank.bik"
                   class="input input-bordered w-full"
@@ -82,7 +82,7 @@
                 />
               </div>
               <div>
-                <label class="block text-sm font-medium text-base-content mb-2">Corr. account</label>
+                <label class="block text-sm font-medium text-base-content mb-2">{{ t('kycRussia.form.corrAccount') }}</label>
                 <input
                   v-model="formData.bank.correspondentAccount"
                   class="input input-bordered w-full"
@@ -97,41 +97,41 @@
       <!-- Contact Section -->
       <div class="card bg-base-100 border border-base-300 shadow-sm">
         <div class="card-body gap-4">
-          <h3 class="card-title text-base-content">Contact details</h3>
+          <h3 class="card-title text-base-content">{{ t('kycRussia.form.contactDetails') }}</h3>
 
           <div class="space-y-4">
             <div>
               <label class="block text-sm font-medium text-base-content mb-2">
-                Contact person *
+                {{ t('kycRussia.form.contactPerson') }} *
               </label>
               <input
                 v-model="formData.contact.person"
                 type="text"
                 required
                 class="input input-bordered w-full"
-                placeholder="Full name of company representative"
+                :placeholder="t('kycRussia.form.placeholders.contactPerson')"
               />
             </div>
 
             <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
               <div>
-                <label class="block text-sm font-medium text-base-content mb-2">Email *</label>
+                <label class="block text-sm font-medium text-base-content mb-2">{{ t('kycRussia.form.email') }} *</label>
                 <input
                   v-model="formData.contact.email"
                   type="email"
                   required
                   class="input input-bordered w-full"
-                  placeholder="email@company.ru"
+                  :placeholder="t('kycRussia.form.placeholders.email')"
                 />
               </div>
               <div>
-                <label class="block text-sm font-medium text-base-content mb-2">Phone *</label>
+                <label class="block text-sm font-medium text-base-content mb-2">{{ t('kycRussia.form.phone') }} *</label>
                 <input
                   v-model="formData.contact.phone"
                   type="tel"
                   required
                   class="input input-bordered w-full"
-                  placeholder="+7 (xxx) xxx-xx-xx"
+                  :placeholder="t('kycRussia.form.placeholders.phone')"
                 />
               </div>
             </div>
@@ -146,7 +146,7 @@
           :disabled="loading || !isFormValid"
           class="btn btn-primary"
         >
-          {{ loading ? 'Sending...' : 'Submit for review' }}
+          {{ loading ? t('kycRussia.form.sending') : t('kycRussia.form.submit') }}
         </button>
       </div>
     </form>
@@ -154,8 +154,44 @@
 </template>
 
 <script setup lang="ts">
+interface KycSubmitData {
+  company_name: string
+  company_full_name: string
+  inn: string
+  kpp: string
+  ogrn: string
+  address: string
+  bank_name: string
+  bik: string
+  correspondent_account: string
+  contact_person: string
+  contact_email: string
+  contact_phone: string
+}
+
+interface CompanySuggestion {
+  value: string
+  unrestricted_value: string
+  data: {
+    inn: string
+    kpp?: string
+    ogrn?: string
+    address?: { value: string }
+  }
+}
+
+interface BankSuggestion {
+  value: string
+  data: {
+    bic: string
+    correspondent_account?: string
+  }
+}
+
+const { t } = useI18n()
+
 const emit = defineEmits<{
-  submit: [data: any]
+  submit: [data: KycSubmitData]
 }>()
 
 const loading = ref(false)
@@ -193,7 +229,7 @@ const isFormValid = computed(() => {
 })
 
 // Handlers
-const onCompanySelect = (company: any) => {
+const onCompanySelect = (company: CompanySuggestion) => {
   formData.value.company = {
     companyName: company.value,
     companyFullName: company.unrestricted_value,
@@ -204,7 +240,7 @@ const onCompanySelect = (company: any) => {
   }
 }
 
-const onBankSelect = (bank: any) => {
+const onBankSelect = (bank: BankSuggestion) => {
   formData.value.bank = {
     bankName: bank.value,
     bik: bank.data.bic,

app/components/KycProfileCard.vue

@@ -0,0 +1,155 @@
+<template>
+  <Card v-if="kycProfileUuid" padding="md">
+    <!-- Loading -->
+    <div v-if="pending" class="flex items-center gap-2">
+      <Spinner size="sm" />
+      <Text tone="muted" size="sm">Загрузка данных о компании...</Text>
+    </div>
+
+    <!-- Error or no data -->
+    <div v-else-if="!profileData" class="text-sm text-base-content/60">
+      Данные о компании недоступны
+    </div>
+
+    <!-- Profile data -->
+    <Stack v-else gap="4">
+      <!-- Header -->
+      <div class="flex items-start justify-between">
+        <div>
+          <Text weight="semibold" size="lg">{{ profileData.name }}</Text>
+          <div class="flex items-center gap-2 mt-1">
+            <span v-if="profileData.companyType" class="badge badge-outline badge-sm">
+              {{ profileData.companyType }}
+            </span>
+            <span v-if="profileData.registrationYear" class="text-xs text-base-content/60">
+              с {{ profileData.registrationYear }} г.
+            </span>
+            <span v-if="profileData.isActive" class="badge badge-success badge-xs">Активна</span>
+            <span v-else class="badge badge-error badge-xs">Неактивна</span>
+          </div>
+        </div>
+      </div>
+
+      <!-- Details grid -->
+      <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+        <!-- INN -->
+        <div v-if="profileData.inn">
+          <Text tone="muted" size="sm">ИНН</Text>
+          <Text weight="medium">{{ profileData.inn }}</Text>
+        </div>
+
+        <!-- OGRN -->
+        <div v-if="profileData.ogrn">
+          <Text tone="muted" size="sm">ОГРН</Text>
+          <Text weight="medium">{{ profileData.ogrn }}</Text>
+        </div>
+
+        <!-- Director -->
+        <div v-if="profileData.director">
+          <Text tone="muted" size="sm">Руководитель</Text>
+          <Text weight="medium">{{ profileData.director }}</Text>
+        </div>
+
+        <!-- Capital -->
+        <div v-if="profileData.capital">
+          <Text tone="muted" size="sm">Уставный капитал</Text>
+          <Text weight="medium">{{ profileData.capital }}</Text>
+        </div>
+
+        <!-- Address -->
+        <div v-if="profileData.address" class="md:col-span-2">
+          <Text tone="muted" size="sm">Адрес</Text>
+          <Text weight="medium">{{ profileData.address }}</Text>
+        </div>
+
+        <!-- Activities -->
+        <div v-if="profileData.activities?.length" class="md:col-span-2">
+          <Text tone="muted" size="sm">Виды деятельности</Text>
+          <div class="flex flex-wrap gap-1 mt-1">
+            <span
+              v-for="(activity, idx) in profileData.activities.slice(0, 5)"
+              :key="idx"
+              class="badge badge-ghost badge-sm"
+            >
+              {{ activity }}
+            </span>
+            <span v-if="profileData.activities.length > 5" class="text-xs text-base-content/60">
+              +{{ profileData.activities.length - 5 }}
+            </span>
+          </div>
+        </div>
+      </div>
+
+      <!-- Footer: sources and last updated -->
+      <div class="flex items-center justify-between text-xs text-base-content/50 pt-2 border-t border-base-200">
+        <span v-if="profileData.sources?.length">
+          Источники: {{ profileData.sources.join(', ') }}
+        </span>
+        <span v-if="profileData.lastUpdated">
+          Обновлено: {{ formatDate(profileData.lastUpdated) }}
+        </span>
+      </div>
+    </Stack>
+  </Card>
+</template>
+
+<script setup lang="ts">
+import { GetKycProfileFullDocument } from '~/composables/graphql/public/kyc-generated'
+
+const props = defineProps<{
+  kycProfileUuid?: string | null
+}>()
+
+const { execute } = useGraphQL()
+
+const profileData = ref<{
+  inn?: string | null
+  ogrn?: string | null
+  name?: string | null
+  companyType?: string | null
+  registrationYear?: number | null
+  isActive?: boolean | null
+  address?: string | null
+  director?: string | null
+  capital?: string | null
+  activities?: (string | null)[] | null
+  sources?: (string | null)[] | null
+  lastUpdated?: string | null
+} | null>(null)
+
+const pending = ref(false)
+
+const loadProfile = async () => {
+  if (!props.kycProfileUuid) return
+  pending.value = true
+  try {
+    const data = await execute(
+      GetKycProfileFullDocument,
+      { profileUuid: props.kycProfileUuid },
+      'public',
+      'kyc'
+    )
+    profileData.value = data?.kycProfileFull || null
+  } catch (error) {
+    console.error('Error loading KYC profile:', error)
+  } finally {
+    pending.value = false
+  }
+}
+
+watch(() => props.kycProfileUuid, (uuid) => {
+  if (uuid) {
+    loadProfile()
+  } else {
+    profileData.value = null
+  }
+}, { immediate: true })
+
+const formatDate = (dateStr: string) => {
+  try {
+    return new Date(dateStr).toLocaleDateString('ru-RU')
+  } catch {
+    return dateStr
+  }
+}
+</script>

app/components/LangSwitcher.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './LangSwitcher.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'LangSwitcher',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/LocationsContent.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './LocationsContent.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'LocationsContent',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/LocationsContent.vue

@@ -2,22 +2,22 @@
   <Stack gap="8">
     <!-- My addresses (for authenticated users) -->
     <Stack v-if="isAuthenticated && teamAddresses?.length" gap="4">
-      <PageHeader title="My addresses">
+      <PageHeader :title="t('locations.myAddresses')">
         <template #actions>
           <NuxtLink
             :to="localePath('/clientarea/addresses')"
             class="btn btn-sm btn-ghost gap-2"
           >
             <Icon name="lucide:settings" size="16" />
-            Manage
+            {{ t('locations.manage') }}
           </NuxtLink>
         </template>
       </PageHeader>
 
       <Grid :cols="1" :md="2" :lg="3" :gap="4">
         <Card
-          v-for="addr in teamAddresses"
+          v-for="(addr, index) in teamAddresses"
-          :key="addr.uuid"
+          :key="addr.uuid ?? index"
           padding="small"
           interactive
           @click="selectTeamAddress(addr)"
@@ -26,7 +26,7 @@
             <Stack direction="row" align="center" gap="2">
               <Icon name="lucide:map-pin" size="18" class="text-primary" />
               <Text size="base" weight="semibold">{{ addr.name }}</Text>
-              <Pill v-if="addr.isDefault" variant="outline" size="sm">Default</Pill>
+              <Pill v-if="addr.isDefault" variant="outline" size="sm">{{ t('locations.default') }}</Pill>
             </Stack>
             <Text tone="muted" size="sm">{{ addr.address }}</Text>
           </Stack>
@@ -36,7 +36,7 @@
 
     <!-- Terminals and logistics hubs -->
     <Stack gap="4">
-      <PageHeader title="Terminals and logistics hubs" />
+      <PageHeader :title="t('locations.terminalsAndHubs')" />
 
       <div v-if="pending" class="flex items-center justify-center p-8">
         <span class="loading loading-spinner loading-lg" />
@@ -44,21 +44,21 @@
 
       <Alert v-else-if="error" variant="error">
         <Stack gap="2">
-          <Heading :level="4" weight="semibold">Load error</Heading>
+          <Heading :level="4" weight="semibold">{{ t('locations.loadError') }}</Heading>
-          <Button @click="refresh()">Try again</Button>
+          <Button @click="refresh()">{{ t('locations.tryAgain') }}</Button>
         </Stack>
       </Alert>
 
       <EmptyState
         v-else-if="!locationsData?.length"
-        title="No locations"
+        :title="t('locations.noLocations')"
-        description="Logistics hubs not added yet"
+        :description="t('locations.noHubsDescription')"
       />
 
       <Grid v-else :cols="1" :md="2" :lg="3" :gap="4">
         <HubCard
-          v-for="location in locationsData"
+          v-for="(location, index) in locationsData"
-          :key="location.uuid"
+          :key="location.uuid ?? index"
           :hub="location"
           selectable
           @select="selectLocation(location)"
@@ -69,8 +69,19 @@
 </template>
 
 <script setup lang="ts">
-import { GetNodesDocument } from '~/composables/graphql/public/geo-generated'
+import { HubsListDocument, type HubsListQueryResult } from '~/composables/graphql/public/geo-generated'
 
+type HubItem = NonNullable<NonNullable<HubsListQueryResult['hubs_list']>[number]>
+type HubWithDistance = HubItem & { distance?: string }
+
+interface TeamAddress {
+  uuid?: string | null
+  name?: string | null
+  address?: string | null
+  isDefault?: boolean | null
+}
+
+const { t } = useI18n()
 const searchStore = useSearchStore()
 const { isAuthenticated } = useAuth()
 const localePath = useLocalePath()
@@ -83,36 +94,38 @@ const calculateDistance = (lat: number, lng: number) => {
 }
 
 // Load logistics hubs
-const { data: locationsDataRaw, pending, error, refresh } = await useServerQuery('locations', GetNodesDocument, {}, 'public', 'geo')
+const { data: locationsDataRaw, pending, error, refresh } = await useServerQuery('locations', HubsListDocument, { limit: 100 }, 'public', 'geo')
-const locationsData = computed(() => {
+const locationsData = computed<HubWithDistance[]>(() => {
-  return (locationsDataRaw.value || []).map((location: any) => ({
+  return (locationsDataRaw.value?.hubs_list || [])
-    ...location,
+    .filter((location): location is HubItem => location !== null)
-    distance: location?.latitude && location?.longitude
+    .map((location) => ({
-      ? calculateDistance(location.latitude, location.longitude)
+      ...location,
-      : undefined,
+      distance: location.latitude && location.longitude
-  }))
+        ? calculateDistance(location.latitude, location.longitude)
+        : undefined,
+    }))
 })
 
 // Load team addresses (if authenticated)
-const teamAddresses = ref<any[]>([])
+const teamAddresses = ref<TeamAddress[]>([])
 
 if (isAuthenticated.value) {
   try {
     const { GetTeamAddressesDocument } = await import('~/composables/graphql/team/teams-generated')
     const { data: addressData } = await useServerQuery('locations-team-addresses', GetTeamAddressesDocument, {}, 'team', 'teams')
-    teamAddresses.value = addressData.value?.teamAddresses || []
+    teamAddresses.value = (addressData.value?.teamAddresses || []).filter((a): a is NonNullable<typeof a> => a !== null)
   } catch (e) {
     console.log('Team addresses not available')
   }
 }
 
-const selectLocation = (location: any) => {
+const selectLocation = (location: HubWithDistance) => {
   searchStore.setLocation(location.name)
   searchStore.setLocationUuid(location.uuid)
   history.back()
 }
 
-const selectTeamAddress = (addr: any) => {
+const selectTeamAddress = (addr: TeamAddress) => {
   searchStore.setLocation(addr.address)
   searchStore.setLocationUuid(addr.uuid)
   history.back()

app/components/MapSidebar.vue

@@ -3,7 +3,7 @@
     <!-- Header with back button -->
     <div class="p-4 border-b border-base-300">
       <NuxtLink
-        :to="localePath('/catalog')"
+        :to="localePath('/catalog?select=product')"
         class="btn btn-sm btn-ghost gap-2"
       >
         <Icon name="lucide:arrow-left" size="18" />
@@ -52,8 +52,8 @@
       <!-- Hubs Tab -->
       <div v-else-if="activeTab === 'hubs'" class="space-y-2">
         <HubCard
-          v-for="hub in hubs"
+          v-for="(hub, index) in hubs"
-          :key="hub.uuid"
+          :key="hub.uuid ?? index"
           :hub="hub"
           selectable
           :is-selected="selectedItemId === hub.uuid"
@@ -67,8 +67,8 @@
       <!-- Suppliers Tab -->
       <div v-else-if="activeTab === 'suppliers'" class="space-y-2">
         <SupplierCard
-          v-for="supplier in suppliers"
+          v-for="(supplier, index) in suppliers"
-          :key="supplier.uuid"
+          :key="supplier.uuid ?? index"
           :supplier="supplier"
           selectable
           :is-selected="selectedItemId === supplier.uuid"
@@ -81,15 +81,20 @@
 
       <!-- Offers Tab -->
       <div v-else-if="activeTab === 'offers'" class="space-y-2">
-        <OfferCard
+        <OfferResultCard
-          v-for="offer in offers"
+          v-for="(offer, index) in offersWithPrice"
-          :key="offer.uuid"
+          :key="offer.uuid ?? index"
-          :offer="offer"
+          :supplier-name="offer.supplierName"
-          selectable
+          :location-name="offer.locationName || offer.locationCountry"
-          :is-selected="selectedItemId === offer.uuid"
+          :product-name="offer.productName"
+          :price-per-unit="offer.pricePerUnit ? Number(offer.pricePerUnit) : null"
+          :quantity="offer.quantity"
+          :currency="offer.currency"
+          :unit="offer.unit"
+          :stages="[]"
           @select="$emit('select', offer, 'offer')"
         />
-        <div v-if="offers.length === 0" class="text-center text-base-content/50 py-8">
+        <div v-if="offersWithPrice.length === 0" class="text-center text-base-content/50 py-8">
           {{ t('catalogMap.empty.offers') }}
         </div>
       </div>
@@ -98,20 +103,63 @@
 </template>
 
 <script setup lang="ts">
-defineProps<{
+interface Hub {
+  uuid?: string | null
+  name?: string | null
+  country?: string | null
+  countryCode?: string | null
+  distance?: string
+  transportTypes?: (string | null)[] | null
+}
+
+interface Supplier {
+  uuid?: string | null
+  teamUuid?: string | null
+  name?: string | null
+  country?: string | null
+  countryCode?: string | null
+  logo?: string | null
+  onTimeRate?: number | null
+  offersCount?: number | null
+  isVerified?: boolean | null
+}
+
+interface Offer {
+  uuid?: string | null
+  productUuid?: string | null
+  productName?: string | null
+  categoryName?: string | null
+  supplierName?: string | null
+  locationUuid?: string | null
+  locationName?: string | null
+  locationCountry?: string | null
+  locationCountryCode?: string | null
+  quantity?: number | string | null
+  unit?: string | null
+  pricePerUnit?: number | string | null
+  currency?: string | null
+  status?: string | null
+  validUntil?: string | null
+}
+
+const props = defineProps<{
   activeTab: 'hubs' | 'suppliers' | 'offers'
-  hubs: any[]
+  hubs: Hub[]
-  suppliers: any[]
+  suppliers: Supplier[]
-  offers: any[]
+  offers: Offer[]
   selectedItemId: string | null
   isLoading: boolean
 }>()
 
 defineEmits<{
   'update:activeTab': [tab: 'hubs' | 'suppliers' | 'offers']
-  'select': [item: any, type: string]
+  'select': [item: Hub | Supplier | Offer, type: 'hub' | 'supplier' | 'offer']
 }>()
 
 const localePath = useLocalePath()
 const { t } = useI18n()
+
+const offersWithPrice = computed(() =>
+  (props.offers || []).filter(o => o?.pricePerUnit != null)
+)
 </script>

app/components/MapboxGlobe.client.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './MapboxGlobe.client.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'MapboxGlobe.client',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/MapboxGlobe.client.vue

@@ -228,15 +228,16 @@ const onMapCreated = (map: MapboxMap) => {
     // Click on cluster to zoom in
     map.on('click', 'clusters', (e) => {
       const features = map.queryRenderedFeatures(e.point, { layers: ['clusters'] })
-      if (!features.length) return
+      const feature = features[0]
+      if (!feature) return
 
-      const clusterId = features[0].properties?.cluster_id
+      const clusterId = feature.properties?.cluster_id
       const source = map.getSource('locations') as mapboxgl.GeoJSONSource
 
       source.getClusterExpansionZoom(clusterId, (err, zoom) => {
         if (err) return
 
-        const geometry = features[0].geometry as GeoJSON.Point
+        const geometry = feature.geometry as GeoJSON.Point
         map.easeTo({
           center: geometry.coordinates as [number, number],
           zoom: zoom || 4
@@ -247,10 +248,11 @@ const onMapCreated = (map: MapboxMap) => {
     // Click on individual point
     map.on('click', 'unclustered-point', (e) => {
       const features = map.queryRenderedFeatures(e.point, { layers: ['unclustered-point'] })
-      if (!features.length) return
+      const feature = features[0]
+      if (!feature) return
 
-      const featureProps = features[0].properties
+      const featureProps = feature.properties
-      const geometry = features[0].geometry as GeoJSON.Point
+      const geometry = feature.geometry as GeoJSON.Point
 
       const location: Location = {
         uuid: featureProps?.uuid,

app/components/NearbyConnectionsSection.vue

@@ -38,9 +38,9 @@
               </div>
               <Stack v-if="autoEdges.length > 0" gap="2">
                 <NuxtLink
-                  v-for="edge in autoEdges"
+                  v-for="(edge, index) in autoEdges"
-                  :key="edge.toUuid"
+                  :key="edge.to_uuid ?? index"
-                  :to="localePath(`/catalog/hubs/${edge.toUuid}`)"
+                  :to="localePath(`/catalog/hubs/${edge.to_uuid}`)"
                   class="flex flex-col gap-2 p-3 rounded-lg border border-base-300 hover:bg-base-200 transition-colors"
                 >
                   <div class="flex items-center justify-between">
@@ -49,11 +49,11 @@
                         <Icon name="lucide:map-pin" size="16" class="text-primary" />
                       </div>
                       <div>
-                        <div class="font-medium">{{ edge.toName }}</div>
+                        <div class="font-medium">{{ edge.to_name }}</div>
                       </div>
                     </div>
                     <div class="text-right">
-                      <div class="font-semibold text-primary">{{ edge.distanceKm }} km</div>
+                      <div class="font-semibold text-primary">{{ edge.distance_km }} km</div>
                     </div>
                   </div>
                 </NuxtLink>
@@ -70,9 +70,9 @@
               </div>
               <Stack v-if="railEdges.length > 0" gap="2">
                 <NuxtLink
-                  v-for="edge in railEdges"
+                  v-for="(edge, index) in railEdges"
-                  :key="edge.toUuid"
+                  :key="edge.to_uuid ?? index"
-                  :to="localePath(`/catalog/hubs/${edge.toUuid}`)"
+                  :to="localePath(`/catalog/hubs/${edge.to_uuid}`)"
                   class="flex flex-col gap-2 p-3 rounded-lg border border-base-300 hover:bg-base-200 transition-colors"
                 >
                   <div class="flex items-center justify-between">
@@ -81,11 +81,11 @@
                         <Icon name="lucide:map-pin" size="16" class="text-emerald-500" />
                       </div>
                       <div>
-                        <div class="font-medium">{{ edge.toName }}</div>
+                        <div class="font-medium">{{ edge.to_name }}</div>
                       </div>
                     </div>
                     <div class="text-right">
-                      <div class="font-semibold text-emerald-600">{{ edge.distanceKm }} km</div>
+                      <div class="font-semibold text-emerald-600">{{ edge.distance_km }} km</div>
                     </div>
                   </div>
                 </NuxtLink>
@@ -104,7 +104,7 @@
 <script setup lang="ts">
 import type { Map as MapboxMapType } from 'mapbox-gl'
 import { LngLatBounds, Popup } from 'mapbox-gl'
-import type { EdgeType } from '~/composables/graphql/public/geo-generated'
+import type { Edge } from '~/composables/graphql/public/geo-generated'
 
 interface CurrentHub {
   uuid: string
@@ -119,8 +119,8 @@ interface RouteGeometry {
 }
 
 const props = defineProps<{
-  autoEdges: EdgeType[]
+  autoEdges: Edge[]
-  railEdges: EdgeType[]
+  railEdges: Edge[]
   hub: CurrentHub
   railHub: CurrentHub
   autoRouteGeometries: RouteGeometry[]
@@ -147,8 +147,8 @@ const mapCenter = computed<[number, number]>(() => {
 
   const allEdges = [...props.autoEdges, ...props.railEdges]
   allEdges.forEach((edge) => {
-    if (edge.toLatitude && edge.toLongitude) {
+    if (edge.to_latitude && edge.to_longitude) {
-      points.push([edge.toLongitude, edge.toLatitude])
+      points.push([edge.to_longitude, edge.to_latitude])
     }
   })
 
@@ -161,7 +161,7 @@ const mapCenter = computed<[number, number]>(() => {
 })
 
 const mapZoom = computed(() => {
-  const distances = [...props.autoEdges, ...props.railEdges].map(e => e.distanceKm || 0)
+  const distances = [...props.autoEdges, ...props.railEdges].map(e => e.distance_km || 0)
   if (distances.length === 0) return 5
 
   const maxDistance = Math.max(...distances)
@@ -190,21 +190,21 @@ const buildRouteFeatureCollection = (routes: RouteGeometry[], transportType: 'au
   }))
 })
 
-const buildNeighborsFeatureCollection = (edges: EdgeType[], transportType: 'auto' | 'rail') => ({
+const buildNeighborsFeatureCollection = (edges: Edge[], transportType: 'auto' | 'rail') => ({
   type: 'FeatureCollection' as const,
   features: edges
-    .filter(e => e.toLatitude && e.toLongitude)
+    .filter(e => e.to_latitude && e.to_longitude)
     .map(edge => ({
       type: 'Feature' as const,
       properties: {
-        uuid: edge.toUuid,
+        uuid: edge.to_uuid,
-        name: edge.toName,
+        name: edge.to_name,
-        distanceKm: edge.distanceKm,
+        distanceKm: edge.distance_km,
         transportType
       },
       geometry: {
         type: 'Point' as const,
-        coordinates: [edge.toLongitude!, edge.toLatitude!]
+        coordinates: [edge.to_longitude!, edge.to_latitude!]
       }
     }))
 })
@@ -292,8 +292,10 @@ const addHubSource = (map: MapboxMapType, id: string, hub: CurrentHub, color: st
   })
 
   map.on('click', `${id}-circle`, (e) => {
-    const coordinates = (e.features![0].geometry as GeoJSON.Point).coordinates.slice() as [number, number]
+    const feature = e.features?.[0]
-    const name = e.features![0].properties?.name
+    if (!feature) return
+    const coordinates = (feature.geometry as GeoJSON.Point).coordinates.slice() as [number, number]
+    const name = feature.properties?.name
 
     new Popup()
       .setLngLat(coordinates)
@@ -390,8 +392,10 @@ const onMapCreated = (map: MapboxMapType) => {
     })
 
     const onNeighborsClick = (e: mapboxgl.MapLayerMouseEvent) => {
-      const coordinates = (e.features![0].geometry as GeoJSON.Point).coordinates.slice() as [number, number]
+      const feature = e.features?.[0]
-      const featureProps = e.features![0].properties
+      if (!feature) return
+      const coordinates = (feature.geometry as GeoJSON.Point).coordinates.slice() as [number, number]
+      const featureProps = feature.properties
       const name = featureProps?.name
       const distanceKm = featureProps?.distanceKm
 

app/components/NearbyHubsSection.vue

@@ -37,9 +37,9 @@
         <div class="order-1 lg:order-2">
           <Stack gap="2">
             <NuxtLink
-              v-for="edge in edges"
+              v-for="(edge, index) in edges"
-              :key="edge.toUuid"
+              :key="edge.to_uuid ?? index"
-              :to="localePath(`/catalog/hubs/${edge.toUuid}`)"
+              :to="localePath(`/catalog/hubs/${edge.to_uuid}`)"
               class="flex flex-col gap-2 p-3 rounded-lg border border-base-300 hover:bg-base-200 transition-colors"
             >
               <div class="flex items-center justify-between">
@@ -48,11 +48,11 @@
                     <Icon name="lucide:map-pin" size="16" class="text-primary" />
                   </div>
                   <div>
-                    <div class="font-medium">{{ edge.toName }}</div>
+                    <div class="font-medium">{{ edge.to_name }}</div>
                   </div>
                 </div>
                 <div class="text-right">
-                  <div class="font-semibold text-primary">{{ edge.distanceKm }} km</div>
+                  <div class="font-semibold text-primary">{{ edge.distance_km }} km</div>
                 </div>
               </div>
             </NuxtLink>
@@ -66,7 +66,7 @@
 <script setup lang="ts">
 import type { Map as MapboxMapType } from 'mapbox-gl'
 import { LngLatBounds, Popup } from 'mapbox-gl'
-import type { EdgeType } from '~/composables/graphql/public/geo-generated'
+import type { Edge } from '~/composables/graphql/public/geo-generated'
 
 interface CurrentHub {
   uuid: string
@@ -81,7 +81,7 @@ interface RouteGeometry {
 }
 
 const props = defineProps<{
-  edges: EdgeType[]
+  edges: Edge[]
   currentHub: CurrentHub
   routeGeometries: RouteGeometry[]
   transportType: 'auto' | 'rail'
@@ -124,8 +124,8 @@ const mapCenter = computed<[number, number]>(() => {
     return [0, 0]
   }
 
-  const allLats = [props.currentHub.latitude, ...props.edges.map(e => e.toLatitude!).filter(Boolean)]
+  const allLats = [props.currentHub.latitude, ...props.edges.map(e => e.to_latitude!).filter(Boolean)]
-  const allLngs = [props.currentHub.longitude, ...props.edges.map(e => e.toLongitude!).filter(Boolean)]
+  const allLngs = [props.currentHub.longitude, ...props.edges.map(e => e.to_longitude!).filter(Boolean)]
 
   const avgLng = allLngs.reduce((a, b) => a + b, 0) / allLngs.length
   const avgLat = allLats.reduce((a, b) => a + b, 0) / allLats.length
@@ -166,16 +166,16 @@ const buildRouteFeatureCollection = () => ({
 
 const buildNeighborsFeatureCollection = () => ({
   type: 'FeatureCollection' as const,
-  features: props.edges.filter(e => e.toLatitude && e.toLongitude).map(edge => ({
+  features: props.edges.filter(e => e.to_latitude && e.to_longitude).map(edge => ({
     type: 'Feature' as const,
     properties: {
-      uuid: edge.toUuid,
+      uuid: edge.to_uuid,
-      name: edge.toName,
+      name: edge.to_name,
-      distanceKm: edge.distanceKm
+      distanceKm: edge.distance_km
     },
     geometry: {
       type: 'Point' as const,
-      coordinates: [edge.toLongitude!, edge.toLatitude!]
+      coordinates: [edge.to_longitude!, edge.to_latitude!]
     }
   }))
 })
@@ -304,8 +304,10 @@ const onMapCreated = (map: MapboxMapType) => {
 
     // Popups on click
     map.on('click', 'current-hub-circle', (e) => {
-      const coordinates = (e.features![0].geometry as GeoJSON.Point).coordinates.slice() as [number, number]
+      const feature = e.features?.[0]
-      const name = e.features![0].properties?.name
+      if (!feature) return
+      const coordinates = (feature.geometry as GeoJSON.Point).coordinates.slice() as [number, number]
+      const name = feature.properties?.name
 
       new Popup()
         .setLngLat(coordinates)
@@ -314,8 +316,10 @@ const onMapCreated = (map: MapboxMapType) => {
     })
 
     map.on('click', 'neighbors-circles', (e) => {
-      const coordinates = (e.features![0].geometry as GeoJSON.Point).coordinates.slice() as [number, number]
+      const feature = e.features?.[0]
-      const featureProps = e.features![0].properties
+      if (!feature) return
+      const coordinates = (feature.geometry as GeoJSON.Point).coordinates.slice() as [number, number]
+      const featureProps = feature.properties
       const name = featureProps?.name
       const distanceKm = featureProps?.distanceKm
 

app/components/NovuNotificationBell.client.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './NovuNotificationBell.client.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'NovuNotificationBell.client',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/NovuNotificationBell.client.vue

@@ -47,14 +47,14 @@
       >
         <!-- Header -->
         <div class="flex items-center justify-between px-6 py-4 border-b border-base-300">
-          <h3 class="text-lg font-semibold text-base-content">Notifications</h3>
+          <h3 class="text-lg font-semibold text-base-content">{{ t('notifications.title') }}</h3>
           <div class="flex items-center gap-3">
             <button
               v-if="unreadCount > 0"
               @click="handleMarkAllAsRead"
               class="text-sm text-primary hover:text-primary/80 font-medium"
             >
-              Mark all as read
+              {{ t('notifications.markAllAsRead') }}
             </button>
             <button
               @click="isOpen = false"
@@ -82,7 +82,7 @@
             <svg class="w-12 h-12 text-base-content/30 mb-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
               <path stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M15 17h5l-1.405-1.405A2.032 2.032 0 0118 14.158V11a6 6 0 10-12 0v3.159c0 .538-.214 1.055-.595 1.436L4 17h5m6 0v1a3 3 0 11-6 0v-1m6 0H9" />
             </svg>
-            <p class="text-sm text-base-content/60">No notifications</p>
+            <p class="text-sm text-base-content/60">{{ t('notifications.empty') }}</p>
           </div>
 
           <!-- Notification Items -->
@@ -107,7 +107,7 @@
                 <!-- Content -->
                 <div class="flex-1 min-w-0">
                   <p class="text-sm text-base-content line-clamp-2">
-                    {{ notification.content || notification.payload?.body || 'New notification' }}
+                    {{ notification.content || notification.payload?.body || t('notifications.new') }}
                   </p>
                   <p class="mt-1 text-xs text-base-content/60">
                     {{ formatTime(notification.createdAt) }}
@@ -125,7 +125,7 @@
             @click="isOpen = false"
             class="text-xs text-primary hover:text-primary/80 font-medium"
           >
-            All notifications
+            {{ t('notifications.viewAll') }}
           </NuxtLink>
         </div>
       </div>
@@ -136,6 +136,8 @@
 <script setup lang="ts">
 import { onClickOutside } from '@vueuse/core'
 
+const { t } = useI18n()
+
 const props = defineProps<{
   subscriberId: string
 }>()
@@ -192,10 +194,10 @@ const formatTime = (dateString: string) => {
   const diffHours = Math.floor(diffMins / 60)
   const diffDays = Math.floor(diffHours / 24)
 
-  if (diffMins < 1) return 'Just now'
+  if (diffMins < 1) return t('notifications.time.justNow')
-  if (diffMins < 60) return `${diffMins} min ago`
+  if (diffMins < 60) return t('notifications.time.minutesAgo', { n: diffMins })
-  if (diffHours < 24) return `${diffHours} h ago`
+  if (diffHours < 24) return t('notifications.time.hoursAgo', { n: diffHours })
-  if (diffDays < 7) return `${diffDays} d ago`
+  if (diffDays < 7) return t('notifications.time.daysAgo', { n: diffDays })
 
   return date.toLocaleDateString('ru-RU', { day: 'numeric', month: 'short' })
 }

app/components/OrderCalendar.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './OrderCalendar.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'OrderCalendar',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/OrderMap.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './OrderMap.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'OrderMap',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/OrderTimeline.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './OrderTimeline.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'OrderTimeline',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/OrdersRoutesMap.client.vue

@@ -113,14 +113,14 @@ const fetchRouteGeometry = async (stage: RouteStage): Promise<[number, number][]
   if (stage.transportType === 'auto' || stage.transportType === 'rail') {
     try {
       const RouteDocument = stage.transportType === 'auto' ? GetAutoRouteDocument : GetRailRouteDocument
-      const routeField = stage.transportType === 'auto' ? 'autoRoute' : 'railRoute'
+      const routeField = stage.transportType === 'auto' ? 'auto_route' : 'rail_route'
 
       const routeData = await execute(RouteDocument, {
         fromLat: stage.fromLat,
         fromLon: stage.fromLon,
         toLat: stage.toLat,
         toLon: stage.toLon
-      }, 'public', 'geo')
+      }, 'public', 'geo') as Record<string, any>
 
       const geometry = routeData?.[routeField]?.geometry
       if (typeof geometry === 'string') {
@@ -363,13 +363,15 @@ const onMapCreated = (map: MapboxMapType) => {
 
     // Click on marker
     map.on('click', 'orders-markers-circles', (e) => {
-      const props = e.features?.[0]?.properties
+      const feature = e.features?.[0]
+      if (!feature) return
+      const props = feature.properties
       const orderId = props?.orderId
       if (orderId) {
         emit('select-order', orderId)
       }
 
-      const coordinates = (e.features?.[0].geometry as GeoJSON.Point).coordinates.slice() as [number, number]
+      const coordinates = (feature.geometry as GeoJSON.Point).coordinates.slice() as [number, number]
       new Popup()
         .setLngLat(coordinates)
         .setHTML(`<strong>${props?.name || 'Point'}</strong><br/>${props?.orderName || ''}`)

app/components/RequestRoutesMap.vue

@@ -90,6 +90,7 @@ const routeMarkers = computed(() => {
     if (!stages.length) return
     const first = stages[0]
     const last = stages[stages.length - 1]
+    if (!first || !last) return
 
     if (typeof first.fromLat === 'number' && typeof first.fromLon === 'number') {
       markers.push({
@@ -181,9 +182,9 @@ const fetchStageGeometry = async (stage: RouteStage, routeIndex: number, stageIn
   if (stage.transportType === 'auto' || stage.transportType === 'rail') {
     try {
       const RouteDocument = stage.transportType === 'auto' ? GetAutoRouteDocument : GetRailRouteDocument
-      const routeField = stage.transportType === 'auto' ? 'autoRoute' : 'railRoute'
+      const routeField = stage.transportType === 'auto' ? 'auto_route' : 'rail_route'
 
-      const routeData = await execute(RouteDocument, { fromLat, fromLon, toLat, toLon }, 'public', 'geo')
+      const routeData = await execute(RouteDocument, { fromLat, fromLon, toLat, toLon }, 'public', 'geo') as Record<string, any>
       const geometry = routeData?.[routeField]?.geometry
 
       if (typeof geometry === 'string') {
@@ -341,8 +342,10 @@ const onMapCreated = (map: MapboxMapType) => {
     })
 
     map.on('click', 'request-markers-circles', (e) => {
-      const coordinates = (e.features?.[0].geometry as GeoJSON.Point).coordinates.slice() as [number, number]
+      const feature = e.features?.[0]
-      const featureProps = e.features?.[0].properties
+      if (!feature) return
+      const coordinates = (feature.geometry as GeoJSON.Point).coordinates.slice() as [number, number]
+      const featureProps = feature.properties
       const title = featureProps?.name || 'Точка'
       const label = featureProps?.label || ''
 

app/components/RouteMap.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './RouteMap.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'RouteMap',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/RouteMap.vue

@@ -4,7 +4,7 @@
       <MapboxMap
         :key="mapId"
         :map-id="mapId"
-        :style="`height: ${height}px; width: 100%;`"
+        :style="`height: ${heightValue}px; width: 100%;`"
         class="rounded-lg border border-base-300"
         :options="mapOptions"
         @load="onMapCreated"
@@ -26,16 +26,46 @@ import type { Map as MapboxMapType } from 'mapbox-gl'
 import { LngLatBounds, Popup } from 'mapbox-gl'
 import { getCurrentInstance } from 'vue'
 
-const props = defineProps({
+interface StageCompany {
-  stages: {
+  uuid?: string | null
-    type: Array,
+  name?: string | null
-    default: () => []
+}
-  },
+
-  height: {
+interface StageTrip {
-    type: Number,
+  uuid?: string | null
-    default: 400
+  company?: StageCompany | null
-  }
+}
-})
+
+interface RouteStage {
+  uuid?: string | null
+  stageType?: string | null
+  sourceLatitude?: number | null
+  sourceLongitude?: number | null
+  sourceLocationName?: string | null
+  destinationLatitude?: number | null
+  destinationLongitude?: number | null
+  destinationLocationName?: string | null
+  locationLatitude?: number | null
+  locationLongitude?: number | null
+  locationName?: string | null
+  selectedCompany?: StageCompany | null
+  trips?: StageTrip[] | null
+}
+
+interface RoutePoint {
+  id: string
+  name: string
+  lat: number
+  lng: number
+  companies: StageCompany[]
+}
+
+const props = defineProps<{
+  stages?: RouteStage[]
+  height?: number
+}>()
+
+const defaultHeight = 400
 
 const { t } = useI18n()
 const mapRef = ref<MapboxMapType | null>(null)
@@ -44,10 +74,12 @@ const didFitBounds = ref(false)
 const instanceId = getCurrentInstance()?.uid || Math.floor(Math.random() * 100000)
 const mapId = computed(() => `route-map-${instanceId}`)
 
-const routePoints = computed(() => {
+const heightValue = computed(() => props.height ?? defaultHeight)
-  const points: Array<{ id: string; name: string; lat: number; lng: number; companies: any[] }> = []
 
-  props.stages.forEach((stage: any) => {
+const routePoints = computed(() => {
+  const points: RoutePoint[] = []
+
+  props.stages?.forEach((stage: RouteStage) => {
     if (stage.stageType === 'transport') {
       if (stage.sourceLatitude && stage.sourceLongitude) {
         const existingPoint = points.find(p => p.lat === stage.sourceLatitude && p.lng === stage.sourceLongitude)
@@ -227,8 +259,10 @@ const onMapCreated = (map: MapboxMapType) => {
     })
 
     map.on('click', 'route-points-layer', (e) => {
-      const coordinates = (e.features?.[0].geometry as GeoJSON.Point).coordinates.slice() as [number, number]
+      const feature = e.features?.[0]
-      const props = e.features?.[0].properties
+      if (!feature) return
+      const coordinates = (feature.geometry as GeoJSON.Point).coordinates.slice() as [number, number]
+      const props = feature.properties
       const name = props?.name || t('routeMap.points.service')
 
       new Popup()
@@ -261,16 +295,16 @@ watch(
   { deep: true }
 )
 
-const getStageCompanies = (stage: any) => {
+const getStageCompanies = (stage: RouteStage): StageCompany[] => {
-  const companies: any[] = []
+  const companies: StageCompany[] = []
 
   if (stage.selectedCompany) {
     companies.push(stage.selectedCompany)
   }
 
-  const uniqueCompanies = new Set()
+  const uniqueCompanies = new Set<string>()
-  stage.trips?.forEach((trip: any) => {
+  stage.trips?.forEach((trip: StageTrip) => {
-    if (trip.company && !uniqueCompanies.has(trip.company.uuid)) {
+    if (trip.company && trip.company.uuid && !uniqueCompanies.has(trip.company.uuid)) {
       uniqueCompanies.add(trip.company.uuid)
       companies.push(trip.company)
     }

app/components/Sidebar.vue

@@ -38,8 +38,8 @@
           </li>
           <li>
             <NuxtLink
-              :to="localePath('/catalog/offers')"
+              :to="localePath('/catalog?select=product')"
-              :class="{ active: isActive('/catalog/offers') }"
+              :class="{ active: isCatalogActive('product') }"
               class="tooltip tooltip-right"
               :data-tip="t('nav.offers')"
             >
@@ -48,8 +48,8 @@
           </li>
           <li>
             <NuxtLink
-              :to="localePath('/catalog/suppliers')"
+              :to="localePath('/catalog?select=supplier')"
-              :class="{ active: isActive('/catalog/suppliers') }"
+              :class="{ active: isCatalogActive('supplier') }"
               class="tooltip tooltip-right"
               :data-tip="t('nav.suppliers')"
             >
@@ -58,8 +58,8 @@
           </li>
           <li>
             <NuxtLink
-              :to="localePath('/catalog/hubs')"
+              :to="localePath('/catalog?select=hub')"
-              :class="{ active: isActive('/catalog/hubs') }"
+              :class="{ active: isCatalogActive('hub') }"
               class="tooltip tooltip-right"
               :data-tip="t('nav.hubs')"
             >
@@ -169,19 +169,19 @@
                   </NuxtLink>
                 </li>
                 <li>
-                  <NuxtLink :to="localePath('/catalog/offers')" :class="{ active: isActive('/catalog/offers') }">
+                  <NuxtLink :to="localePath('/catalog?select=product')" :class="{ active: isCatalogActive('product') }">
                     <Icon name="lucide:tag" size="18" />
                     {{ t('nav.offers') }}
                   </NuxtLink>
                 </li>
                 <li>
-                  <NuxtLink :to="localePath('/catalog/suppliers')" :class="{ active: isActive('/catalog/suppliers') }">
+                  <NuxtLink :to="localePath('/catalog?select=supplier')" :class="{ active: isCatalogActive('supplier') }">
                     <Icon name="lucide:building-2" size="18" />
                     {{ t('nav.suppliers') }}
                   </NuxtLink>
                 </li>
                 <li>
-                  <NuxtLink :to="localePath('/catalog/hubs')" :class="{ active: isActive('/catalog/hubs') }">
+                  <NuxtLink :to="localePath('/catalog?select=hub')" :class="{ active: isCatalogActive('hub') }">
                     <Icon name="lucide:warehouse" size="18" />
                     {{ t('nav.hubs') }}
                   </NuxtLink>
@@ -379,6 +379,24 @@ const isActive = (path: string) => {
   return current.startsWith(localePath(path) + '/')
 }
 
+// Check if catalog section is active based on query params
+const isCatalogActive = (type: 'product' | 'supplier' | 'hub') => {
+  const catalogPath = localePath('/catalog')
+  if (!route.path.startsWith(catalogPath)) return false
+
+  const { select, product, supplier, hub } = route.query
+
+  // If we're in selection mode for this type
+  if (select === type) return true
+
+  // If this type has been selected (in the flow)
+  if (type === 'product' && (product || select === 'product')) return true
+  if (type === 'supplier' && supplier) return true
+  if (type === 'hub' && hub) return true
+
+  return false
+}
+
 const isExactActive = (path: string) => {
   return route.path === localePath(path)
 }

app/components/SupplierInfoBlock.vue

@@ -0,0 +1,70 @@
+<template>
+  <div v-if="kycProfileUuid && companyData" class="space-y-2">
+    <div class="flex items-center gap-2">
+      <span class="badge badge-outline badge-sm">{{ companyData.companyType || 'Компания' }}</span>
+      <span v-if="companyData.registrationYear" class="text-xs text-base-content/60">
+        с {{ companyData.registrationYear }} г.
+      </span>
+      <span v-if="companyData.isActive" class="badge badge-success badge-xs">Активна</span>
+    </div>
+    <div v-if="companyData.sourcesCount" class="text-xs text-base-content/60">
+      {{ companyData.sourcesCount }} {{ pluralize(companyData.sourcesCount, 'источник', 'источника', 'источников') }} данных
+    </div>
+  </div>
+  <div v-else-if="kycProfileUuid && pending" class="text-xs text-base-content/60">
+    Загрузка данных...
+  </div>
+</template>
+
+<script setup lang="ts">
+import { GetKycProfileTeaserDocument } from '~/composables/graphql/public/kyc-generated'
+
+const props = defineProps<{
+  kycProfileUuid?: string | null
+}>()
+
+const { execute } = useGraphQL()
+
+const companyData = ref<{
+  companyType?: string | null
+  registrationYear?: number | null
+  isActive?: boolean | null
+  sourcesCount?: number | null
+} | null>(null)
+
+const pending = ref(false)
+
+const loadCompanyData = async () => {
+  if (!props.kycProfileUuid) return
+  pending.value = true
+  try {
+    const data = await execute(
+      GetKycProfileTeaserDocument,
+      { profileUuid: props.kycProfileUuid },
+      'public',
+      'kyc'
+    )
+    companyData.value = data?.kycProfileTeaser || null
+  } catch (error) {
+    console.error('Error loading company data:', error)
+  } finally {
+    pending.value = false
+  }
+}
+
+watch(() => props.kycProfileUuid, (uuid) => {
+  if (uuid) {
+    loadCompanyData()
+  } else {
+    companyData.value = null
+  }
+}, { immediate: true })
+
+const pluralize = (n: number, one: string, few: string, many: string) => {
+  const mod10 = n % 10
+  const mod100 = n % 100
+  if (mod10 === 1 && mod100 !== 11) return one
+  if (mod10 >= 2 && mod10 <= 4 && (mod100 < 10 || mod100 >= 20)) return few
+  return many
+}
+</script>

app/components/TeamCard.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './TeamCard.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'TeamCard',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/TeamCard.vue

@@ -40,6 +40,19 @@
 </template>
 
 <script setup lang="ts">
+interface TeamMember {
+  id: string
+  userId: string
+  role?: string | null
+}
+
+interface Team {
+  id?: string | null
+  name: string
+  createdAt?: string | null
+  members?: TeamMember[] | null
+}
+
 interface Props {
   team: Team
 }
@@ -49,7 +62,7 @@ const membersCount = computed(() => props.team?.members?.length || 1)
 const displayMembers = computed(() => (props.team?.members || []).slice(0, 3))
 const remainingMembers = computed(() => Math.max(0, membersCount.value - 3))
 
-const formatDate = (dateString: string) => {
+const formatDate = (dateString: string | null | undefined) => {
   if (!dateString) return ''
   try {
     return new Date(dateString).toLocaleDateString('ru-RU')

app/components/TeamCreateForm.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './TeamCreateForm.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'TeamCreateForm',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/TeamCreateForm.vue

@@ -70,6 +70,7 @@
 <script setup lang="ts">
 import { CreateTeamDocument } from '~/composables/graphql/user/teams-generated'
 
+const { t } = useI18n()
 const emit = defineEmits(['teamCreated', 'cancel'])
 
 const teamName = ref('')
@@ -93,9 +94,9 @@ const handleSubmit = async () => {
     emit('teamCreated', result.createTeam?.team)
     teamName.value = ''
     teamType.value = 'BUYER'
-  } catch (err: any) {
+  } catch (err: unknown) {
     hasError.value = true
-    error.value = err?.message || $t('teams.errors.create_failed')
+    error.value = err instanceof Error ? err.message : t('teams.errors.create_failed')
     console.error('Error creating team:', err)
   } finally {
     isLoading.value = false

app/components/TimelineStages.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './TimelineStages.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'TimelineStages',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/TopBar.vue

@@ -45,10 +45,10 @@
             tabindex="0"
             class="dropdown-content menu bg-base-100 rounded-box z-50 w-72 p-2 shadow-lg border border-base-300 mt-1"
           >
-            <li class="menu-title"><span>Quick actions</span></li>
+            <li class="menu-title"><span>{{ t('topbar.quickActions') }}</span></li>
-            <li><a @click="navigateToAction('/catalog')">Find materials</a></li>
+            <li><a @click="navigateToAction('/catalog')">{{ t('topbar.findMaterials') }}</a></li>
-            <li><a @click="navigateToAction('/clientarea/orders')">My orders</a></li>
+            <li><a @click="navigateToAction('/clientarea/orders')">{{ t('topbar.myOrders') }}</a></li>
-            <li><a @click="navigateToAction('/clientarea/profile')">Profile settings</a></li>
+            <li><a @click="navigateToAction('/clientarea/profile')">{{ t('topbar.profileSettings') }}</a></li>
           </ul>
         </div>
 
@@ -110,7 +110,7 @@
                   <details>
                     <summary>
                       <Icon name="lucide:globe" size="16" />
-                      Language
+                      {{ t('topbar.language') }}
                     </summary>
                     <ul>
                       <li v-for="loc in locales" :key="loc.code">
@@ -161,7 +161,7 @@ defineProps<{
 }>()
 
 const localePath = useLocalePath()
-const { locale, locales } = useI18n()
+const { t, locale, locales } = useI18n()
 const switchLocalePath = useSwitchLocalePath()
 const locationStore = useLocationStore()
 

app/components/TripBadge.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './TripBadge.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'TripBadge',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/UserAvatar.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './UserAvatar.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'UserAvatar',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ai/AiChatSidebar.vue

@@ -0,0 +1,159 @@
+<template>
+  <aside
+    class="fixed top-0 left-0 bottom-0 z-50 overflow-hidden transition-[width] duration-300"
+    :style="{ width: open ? width : '0px' }"
+    aria-label="AI assistant"
+  >
+    <div
+      class="h-full flex flex-col bg-base-100/80 backdrop-blur-xl border-r border-white/10 shadow-xl transition-opacity duration-200"
+      :class="open ? 'opacity-100' : 'opacity-0 pointer-events-none'"
+    >
+      <div class="flex items-center justify-between px-4 py-3 border-b border-white/10">
+        <div class="flex items-center gap-2">
+          <div class="w-8 h-8 rounded-full bg-primary/20 flex items-center justify-center">
+            <Icon name="lucide:bot" size="16" class="text-primary" />
+          </div>
+          <div class="font-semibold text-base-content">{{ $t('aiAssistants.view.agentName') }}</div>
+        </div>
+        <button
+          class="btn btn-ghost btn-xs btn-circle text-base-content/60 hover:text-base-content"
+          aria-label="Close"
+          @click="emit('close')"
+        >
+          <Icon name="lucide:x" size="14" />
+        </button>
+      </div>
+
+      <div ref="chatContainer" class="flex-1 overflow-y-auto p-4 space-y-3">
+        <div
+          v-for="(message, idx) in chat"
+          :key="idx"
+          class="flex"
+          :class="message.role === 'user' ? 'justify-end' : 'justify-start'"
+        >
+          <div
+            class="max-w-[90%] rounded-2xl px-3 py-2 shadow-sm"
+            :class="message.role === 'user' ? 'bg-primary text-primary-content' : 'bg-base-100 text-base-content border border-base-300'"
+          >
+            <Text weight="semibold" class="mb-1">
+              {{ message.role === 'user' ? $t('aiAssistants.view.you') : $t('aiAssistants.view.agentName') }}
+            </Text>
+            <Text :tone="message.role === 'user' ? undefined : 'muted'">
+              {{ message.content }}
+            </Text>
+          </div>
+        </div>
+        <div v-if="isStreaming" class="text-sm text-base-content/60">
+          {{ $t('aiAssistants.view.typing') }}
+        </div>
+      </div>
+
+      <div class="border-t border-base-300 bg-base-100/70 p-3">
+        <form class="flex items-end gap-2" @submit.prevent="handleSend">
+          <div class="flex-1">
+            <Textarea
+              v-model="input"
+              :placeholder="$t('aiAssistants.view.placeholder')"
+              rows="2"
+              class="w-full"
+            />
+          </div>
+          <div class="flex flex-col gap-2">
+            <Button type="submit" size="sm" :loading="isSending" :disabled="!input.trim()">
+              {{ $t('aiAssistants.view.send') }}
+            </Button>
+            <Button type="button" size="sm" variant="ghost" @click="resetChat" :disabled="isSending">
+              {{ $t('aiAssistants.view.reset') }}
+            </Button>
+          </div>
+        </form>
+        <div class="text-xs text-error text-center mt-2" v-if="error">
+          {{ error }}
+        </div>
+      </div>
+    </div>
+  </aside>
+</template>
+
+<script setup lang="ts">
+const props = defineProps<{
+  open: boolean
+  width: string
+}>()
+
+const emit = defineEmits<{
+  (e: 'close'): void
+}>()
+
+const { t } = useI18n()
+const runtimeConfig = useRuntimeConfig()
+
+const agentUrl = computed(() => runtimeConfig.public.langAgentUrl || '')
+const chatContainer = ref<HTMLElement | null>(null)
+const chat = ref<{ role: 'user' | 'assistant', content: string }[]>([
+  { role: 'assistant', content: t('aiAssistants.view.welcome') }
+])
+const input = ref('')
+const isSending = ref(false)
+const isStreaming = ref(false)
+const error = ref('')
+
+const scrollToBottom = () => {
+  nextTick(() => {
+    if (chatContainer.value) {
+      chatContainer.value.scrollTop = chatContainer.value.scrollHeight
+    }
+  })
+}
+
+const handleSend = async () => {
+  if (!input.value.trim()) return
+  error.value = ''
+  const userMessage = input.value.trim()
+  chat.value.push({ role: 'user', content: userMessage })
+  input.value = ''
+  isSending.value = true
+  isStreaming.value = true
+  scrollToBottom()
+
+  try {
+    const body = {
+      input: {
+        messages: chat.value.map((m) => ({
+          type: m.role === 'assistant' ? 'ai' : 'human',
+          content: m.content
+        }))
+      }
+    }
+
+    const response = await $fetch(`${agentUrl.value}/invoke`, {
+      method: 'POST',
+      body
+    })
+
+    const outputMessages = (response as any)?.output?.messages || []
+    const last = outputMessages[outputMessages.length - 1]
+    const content = last?.content?.[0]?.text || last?.content || t('aiAssistants.view.emptyResponse')
+    chat.value.push({ role: 'assistant', content })
+    scrollToBottom()
+  } catch (e: unknown) {
+    console.error('Agent error', e)
+    error.value = e instanceof Error ? e.message : t('aiAssistants.view.error')
+    chat.value.push({ role: 'assistant', content: t('aiAssistants.view.error') })
+    scrollToBottom()
+  } finally {
+    isSending.value = false
+    isStreaming.value = false
+  }
+}
+
+const resetChat = () => {
+  chat.value = [{ role: 'assistant', content: t('aiAssistants.view.welcome') }]
+  input.value = ''
+  error.value = ''
+}
+
+watch(() => props.open, (isOpen) => {
+  if (isOpen) scrollToBottom()
+})
+</script>

app/components/catalog/AddressCard.vue

@@ -48,5 +48,5 @@ defineEmits<{
 const localePath = useLocalePath()
 const { t } = useI18n()
 
-const linkable = computed(() => !props.selectable && props.address.uuid)
+const linkable = computed(() => !props.selectable && !!props.address.uuid)
 </script>

app/components/catalog/AddressDetailBottomSheet.vue

@@ -0,0 +1,178 @@
+<template>
+  <Transition name="address-slide">
+    <div
+      v-if="isOpen && addressUuid"
+      class="fixed inset-x-0 bottom-0 z-50 flex justify-center px-3 md:px-4"
+      style="height: 72vh"
+    >
+      <!-- Backdrop (clickable to close) -->
+      <div
+        class="absolute inset-0 -top-[32vh] bg-gradient-to-t from-black/45 via-black/20 to-transparent"
+        @click="emit('close')"
+      />
+
+      <!-- Sheet content -->
+      <div class="relative flex w-full max-w-[980px] flex-col overflow-hidden rounded-t-[2rem] border border-white/60 bg-base-100/95 shadow-[0_-24px_70px_rgba(15,23,42,0.3)] backdrop-blur-xl">
+        <!-- Header with drag handle and close -->
+        <div class="sticky top-0 z-10 border-b border-base-300 bg-base-100/90">
+          <div class="flex justify-center py-2">
+            <div class="h-1.5 w-12 rounded-full bg-base-content/20" />
+          </div>
+          <div class="flex items-center justify-between px-6 pb-4">
+            <template v-if="address">
+              <div class="flex items-center gap-3 flex-1 min-w-0">
+                <div class="flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-xl bg-success/20 text-2xl">
+                  {{ isoToEmoji(address.countryCode) }}
+                </div>
+                <div class="min-w-0">
+                  <div class="truncate text-xl font-black text-base-content">{{ address.name }}</div>
+                  <div class="truncate text-sm text-base-content/60">{{ address.address }}</div>
+                </div>
+              </div>
+            </template>
+
+            <template v-else>
+              <div class="flex items-center gap-3 flex-1">
+                <div class="h-10 w-10 animate-pulse rounded-xl bg-base-300/70" />
+                <div class="flex-1">
+                  <div class="h-5 w-48 animate-pulse rounded bg-base-300/70" />
+                  <div class="mt-1 h-4 w-32 animate-pulse rounded bg-base-300/70" />
+                </div>
+              </div>
+            </template>
+
+            <button class="btn btn-ghost btn-sm btn-circle flex-shrink-0 text-base-content/60 hover:text-base-content" @click="emit('close')">
+              <Icon name="lucide:x" size="20" />
+            </button>
+          </div>
+        </div>
+
+        <!-- Content -->
+        <div v-if="address" class="h-[calc(72vh-110px)] overflow-y-auto px-6 py-4 space-y-4">
+          <!-- Location info -->
+          <div class="rounded-2xl border border-base-300 bg-base-100 p-4">
+            <div class="mb-3 flex items-center gap-2 text-base-content">
+              <Icon name="lucide:map-pin" size="18" />
+              <span class="text-lg font-black">{{ t('profileAddresses.detail.location') }}</span>
+            </div>
+            <div class="space-y-2 text-sm">
+              <div class="flex items-start gap-2 text-base-content/80">
+                <Icon name="lucide:navigation" size="14" class="mt-0.5 flex-shrink-0 text-base-content/50" />
+                <span>{{ address.address }}</span>
+              </div>
+              <div v-if="address.latitude && address.longitude" class="flex items-center gap-2 text-base-content/60">
+                <Icon name="lucide:crosshair" size="14" class="text-base-content/50" />
+                <span class="font-mono text-xs">{{ address.latitude.toFixed(6) }}, {{ address.longitude.toFixed(6) }}</span>
+              </div>
+            </div>
+          </div>
+
+          <!-- Map preview -->
+          <div v-if="address.latitude && address.longitude" class="rounded-2xl border border-base-300 bg-base-100 p-4">
+            <div class="mb-3 flex items-center gap-2 text-base-content">
+              <Icon name="lucide:map" size="18" />
+              <span class="text-lg font-black">{{ t('profileAddresses.detail.map') }}</span>
+            </div>
+            <div class="h-48 overflow-hidden rounded-xl">
+              <ClientOnly>
+                <MapboxMap
+                  :map-id="'address-preview-' + addressUuid"
+                  style="width: 100%; height: 100%"
+                  :options="{
+                    style: 'mapbox://styles/mapbox/light-v11',
+                    center: [address.longitude, address.latitude],
+                    zoom: 14,
+                    interactive: false
+                  }"
+                >
+                  <MapboxDefaultMarker
+                    :marker-id="'address-marker'"
+                    :lnglat="[address.longitude, address.latitude]"
+                    color="#10b981"
+                  />
+                </MapboxMap>
+              </ClientOnly>
+            </div>
+          </div>
+
+          <!-- Actions -->
+          <div class="flex gap-3">
+            <NuxtLink :to="localePath(`/clientarea/addresses/${addressUuid}`)" class="flex-1">
+              <button class="btn btn-sm w-full btn-outline">
+                <Icon name="lucide:pencil" size="14" class="mr-2" />
+                {{ t('profileAddresses.actions.edit') }}
+              </button>
+            </NuxtLink>
+            <button
+              class="btn btn-sm bg-error/20 border-error/30 text-error hover:bg-error/30"
+              @click="handleDelete"
+              :disabled="isDeleting"
+            >
+              <Icon name="lucide:trash-2" size="14" />
+            </button>
+          </div>
+        </div>
+
+        <!-- Loading state -->
+        <div v-else class="px-6 py-4 space-y-4">
+          <div class="h-24 animate-pulse rounded-xl bg-base-300/70" />
+          <div class="h-48 animate-pulse rounded-xl bg-base-300/70" />
+        </div>
+      </div>
+    </div>
+  </Transition>
+</template>
+
+<script setup lang="ts">
+const props = defineProps<{
+  isOpen: boolean
+  addressUuid: string | null
+}>()
+
+const emit = defineEmits<{
+  'close': []
+  'deleted': []
+}>()
+
+const { t } = useI18n()
+const localePath = useLocalePath()
+
+const { items, isoToEmoji, deleteAddress } = useTeamAddresses()
+
+const isDeleting = ref(false)
+
+const address = computed(() => {
+  if (!props.addressUuid) return null
+  return items.value.find(a => a.uuid === props.addressUuid) || null
+})
+
+const handleDelete = async () => {
+  if (!props.addressUuid) return
+  isDeleting.value = true
+  const success = await deleteAddress(props.addressUuid)
+  isDeleting.value = false
+  if (success) {
+    emit('deleted')
+    emit('close')
+  }
+}
+</script>
+
+<style scoped>
+.address-slide-enter-active,
+.address-slide-leave-active {
+  transition: transform 0.4s cubic-bezier(0.16, 1, 0.3, 1), opacity 0.3s ease;
+}
+
+.address-slide-enter-from,
+.address-slide-leave-to {
+  transform: translateY(100%);
+  opacity: 0;
+}
+
+.address-slide-enter-to,
+.address-slide-leave-from {
+  transform: translateY(0);
+  opacity: 1;
+}
+</style>

app/components/catalog/CatalogBreadcrumbs.vue

@@ -0,0 +1,51 @@
+<template>
+  <div class="breadcrumbs text-sm">
+    <ul>
+      <li v-for="(crumb, index) in breadcrumbs" :key="index">
+        <NuxtLink v-if="crumb.to" :to="crumb.to" class="hover:text-primary">
+          {{ crumb.label }}
+        </NuxtLink>
+        <span v-else class="text-base-content">{{ crumb.label }}</span>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script setup lang="ts">
+const props = defineProps<{
+  hubId?: string
+  hubName?: string
+  productId?: string
+  productName?: string
+}>()
+
+const localePath = useLocalePath()
+const { t } = useI18n()
+
+const breadcrumbs = computed(() => {
+  const crumbs: Array<{ label: string; to?: string }> = []
+
+  // Hubs list
+  crumbs.push({
+    label: t('breadcrumbs.hubs', 'Hubs'),
+    to: localePath('/catalog?select=hub')
+  })
+
+  // Hub
+  if (props.hubId) {
+    crumbs.push({
+      label: props.hubName || `#${props.hubId.slice(0, 8)}...`,
+      to: props.productId ? localePath(`/catalog/hubs/${props.hubId}`) : undefined
+    })
+  }
+
+  // Product
+  if (props.productId) {
+    crumbs.push({
+      label: props.productName || `#${props.productId.slice(0, 8)}...`
+    })
+  }
+
+  return crumbs
+})
+</script>

app/components/catalog/CatalogHero.vue

@@ -0,0 +1,42 @@
+<template>
+  <div class="flex flex-col items-center justify-center min-h-[60vh] text-center px-4">
+    <h1 class="text-4xl font-bold mb-4">{{ t('catalog.hero.title') }}</h1>
+    <p class="text-lg text-base-content/70 mb-8 max-w-lg">
+      {{ t('catalog.hero.subtitle') }}
+    </p>
+
+    <div class="flex flex-wrap justify-center gap-4">
+      <button
+        class="btn btn-lg btn-primary gap-2"
+        @click="$emit('start-select', 'product')"
+      >
+        <Icon name="lucide:package" size="24" />
+        {{ t('catalog.filters.product') }}
+      </button>
+
+      <button
+        class="btn btn-lg btn-outline gap-2"
+        @click="$emit('start-select', 'supplier')"
+      >
+        <Icon name="lucide:factory" size="24" />
+        {{ t('catalog.filters.supplier') }}
+      </button>
+
+      <button
+        class="btn btn-lg btn-outline gap-2"
+        @click="$emit('start-select', 'hub')"
+      >
+        <Icon name="lucide:map-pin" size="24" />
+        {{ t('catalog.filters.hub') }}
+      </button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+defineEmits<{
+  (e: 'start-select', type: string): void
+}>()
+
+const { t } = useI18n()
+</script>

app/components/catalog/CatalogHubsSection.vue

@@ -4,7 +4,7 @@
       <Stack direction="row" align="center" justify="between">
         <Heading :level="2">{{ t('catalogHubsSection.header.title') }}</Heading>
         <NuxtLink
-          :to="localePath('/catalog/hubs')"
+          :to="localePath('/catalog?select=hub')"
           class="btn btn-sm btn-ghost"
         >
           <span>{{ t('catalogHubsSection.actions.view_all') }}</span>
@@ -17,8 +17,8 @@
           <Text weight="semibold" class="mb-3">{{ country.name }}</Text>
           <Grid :cols="1" :md="2" :lg="3" :gap="4">
             <HubCard
-              v-for="hub in country.hubs"
+              v-for="(hub, index) in country.hubs"
-              :key="hub.uuid"
+              :key="hub.uuid ?? index"
               :hub="hub"
             />
           </Grid>

app/components/catalog/CatalogMap.vue

@@ -17,14 +17,14 @@
 <script setup lang="ts">
 import type { Map as MapboxMapType } from 'mapbox-gl'
 import { LngLatBounds } from 'mapbox-gl'
-import type { ClusterPointType } from '~/composables/graphql/public/geo-generated'
+import type { ClusterPoint } from '~/composables/graphql/public/geo-generated'
 
 interface MapItem {
-  uuid: string
+  uuid?: string | null
-  name: string
+  name?: string | null
-  latitude: number
+  latitude?: number | null
-  longitude: number
+  longitude?: number | null
-  country?: string
+  country?: string | null
 }
 
 export interface MapBounds {
@@ -43,24 +43,40 @@ interface HoveredItem {
 const props = withDefaults(defineProps<{
   mapId: string
   items?: MapItem[]
-  clusteredPoints?: ClusterPointType[]
+  clusteredPoints?: ClusterPoint[]
+  clusteredPointsByType?: Partial<Record<'offer' | 'hub' | 'supplier', ClusterPoint[]>>
   useServerClustering?: boolean
   hoveredItemId?: string | null
   hoveredItem?: HoveredItem | null
   pointColor?: string
+  entityType?: 'offer' | 'hub' | 'supplier'
   initialCenter?: [number, number]
   initialZoom?: number
+  infoLoading?: boolean
+  fitPaddingLeft?: number
+  relatedPoints?: Array<{
+    uuid: string
+    name: string
+    latitude: number
+    longitude: number
+    type: 'hub' | 'supplier' | 'offer'
+  }>
 }>(), {
-  pointColor: '#10b981',
+  pointColor: '#f97316',
+  entityType: 'offer',
   initialCenter: () => [37.64, 55.76],
   initialZoom: 2,
   useServerClustering: false,
+  infoLoading: false,
+  fitPaddingLeft: 0,
   items: () => [],
-  clusteredPoints: () => []
+  clusteredPoints: () => [],
+  clusteredPointsByType: undefined,
+  relatedPoints: () => []
 })
 
 const emit = defineEmits<{
-  'select-item': [uuid: string]
+  'select-item': [uuid: string, properties?: Record<string, any>]
   'bounds-change': [bounds: MapBounds]
 }>()
 
@@ -69,6 +85,119 @@ const { flyThroughSpace } = useMapboxFlyAnimation()
 const didFitBounds = ref(false)
 const mapInitialized = ref(false)
 
+const usesTypedClusters = computed(() => {
+  const typed = props.clusteredPointsByType
+  return !!typed && Object.keys(typed).length > 0
+})
+
+const buildFitPadding = (base: number) => {
+  const extraLeft = Math.max(0, props.fitPaddingLeft || 0)
+  return {
+    top: base,
+    bottom: base,
+    left: base + extraLeft,
+    right: base
+  }
+}
+
+// Entity type icons - SVG data URLs with specific colors
+const createEntityIcon = (type: 'offer' | 'hub' | 'supplier', color: string) => {
+  const icons = {
+    offer: `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M6 2 3 6v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V6l-3-4Z"/><path d="M3 6h18"/><path d="M16 10a4 4 0 0 1-8 0"/></svg>`,
+    hub: `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 8.35V20a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V8.35A2 2 0 0 1 3.26 6.5l8-3.2a2 2 0 0 1 1.48 0l8 3.2A2 2 0 0 1 22 8.35Z"/><path d="M6 18h12"/><path d="M6 14h12"/><rect width="12" height="12" x="6" y="10"/></svg>`,
+    supplier: `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V8l-7 5V8l-7 5V4a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2Z"/><path d="M17 18h1"/><path d="M12 18h1"/><path d="M7 18h1"/></svg>`
+  }
+  return icons[type]
+}
+
+// Load icon into map as image
+const loadEntityIcon = async (map: MapboxMapType, type: 'offer' | 'hub' | 'supplier', color: string) => {
+  const iconName = `entity-icon-${type}`
+  if (map.hasImage(iconName)) {
+    map.removeImage(iconName)
+  }
+
+  const svg = createEntityIcon(type, color)
+  const img = new Image(32, 32)
+
+  return new Promise<void>((resolve) => {
+    img.onload = () => {
+      const canvas = document.createElement('canvas')
+      canvas.width = 32
+      canvas.height = 32
+      const ctx = canvas.getContext('2d')
+      if (ctx) {
+        // Draw colored circle background
+        ctx.beginPath()
+        ctx.arc(16, 16, 15, 0, 2 * Math.PI)
+        ctx.fillStyle = color
+        ctx.fill()
+        ctx.strokeStyle = 'white'
+        ctx.lineWidth = 2
+        ctx.stroke()
+        // Draw icon on top
+        ctx.drawImage(img, 4, 4, 24, 24)
+      }
+
+      const imageData = ctx?.getImageData(0, 0, 32, 32)
+      if (imageData) {
+        map.addImage(iconName, { width: 32, height: 32, data: imageData.data })
+      }
+      resolve()
+    }
+    img.src = 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(svg)
+  })
+}
+
+// Standard colors for entity types
+const ENTITY_COLORS = {
+  hub: '#22c55e',      // green
+  supplier: '#3b82f6', // blue
+  offer: '#f97316'     // orange
+} as const
+
+const CLUSTER_TYPES: Array<'offer' | 'hub' | 'supplier'> = ['offer', 'hub', 'supplier']
+
+// Load all icons for related points (each type with its standard color)
+const loadRelatedPointIcons = async (map: MapboxMapType) => {
+  const types: Array<'hub' | 'supplier' | 'offer'> = ['hub', 'supplier', 'offer']
+  for (const type of types) {
+    const iconName = `related-icon-${type}`
+    if (map.hasImage(iconName)) {
+      map.removeImage(iconName)
+    }
+
+    const svg = createEntityIcon(type, ENTITY_COLORS[type])
+    const img = new Image(32, 32)
+
+    await new Promise<void>((resolve) => {
+      img.onload = () => {
+        const canvas = document.createElement('canvas')
+        canvas.width = 32
+        canvas.height = 32
+        const ctx = canvas.getContext('2d')
+        if (ctx) {
+          ctx.beginPath()
+          ctx.arc(16, 16, 15, 0, 2 * Math.PI)
+          ctx.fillStyle = ENTITY_COLORS[type]
+          ctx.fill()
+          ctx.strokeStyle = 'white'
+          ctx.lineWidth = 2
+          ctx.stroke()
+          ctx.drawImage(img, 4, 4, 24, 24)
+        }
+
+        const imageData = ctx?.getImageData(0, 0, 32, 32)
+        if (imageData) {
+          map.addImage(iconName, { width: 32, height: 32, data: imageData.data })
+        }
+        resolve()
+      }
+      img.src = 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(svg)
+    })
+  }
+}
+
 const mapOptions = computed(() => ({
   style: 'mapbox://styles/mapbox/satellite-streets-v12',
   center: props.initialCenter,
@@ -80,11 +209,13 @@ const mapOptions = computed(() => ({
 // Client-side clustering GeoJSON (when not using server clustering)
 const geoJsonData = computed(() => ({
   type: 'FeatureCollection' as const,
-  features: props.items.map(item => ({
+  features: props.items
-    type: 'Feature' as const,
+    .filter(item => item.latitude != null && item.longitude != null)
-    properties: { uuid: item.uuid, name: item.name, country: item.country },
+    .map(item => ({
-    geometry: { type: 'Point' as const, coordinates: [item.longitude, item.latitude] }
+      type: 'Feature' as const,
-  }))
+      properties: { uuid: item.uuid, name: item.name, country: item.country },
+      geometry: { type: 'Point' as const, coordinates: [item.longitude!, item.latitude!] }
+    }))
 }))
 
 // Server-side clustering GeoJSON
@@ -96,7 +227,7 @@ const serverClusteredGeoJson = computed(() => ({
       id: point!.id,
       name: point!.name,
       count: point!.count ?? 1,
-      expansionZoom: point!.expansionZoom,
+      expansionZoom: point!.expansion_zoom,
       isCluster: (point!.count ?? 1) > 1
     },
     geometry: {
@@ -106,6 +237,33 @@ const serverClusteredGeoJson = computed(() => ({
   }))
 }))
 
+const serverClusteredGeoJsonByType = computed(() => {
+  const build = (points: ClusterPoint[] | undefined, type: 'offer' | 'hub' | 'supplier') => ({
+    type: 'FeatureCollection' as const,
+    features: (points || []).filter(Boolean).map(point => ({
+      type: 'Feature' as const,
+      properties: {
+        id: point!.id,
+        name: point!.name,
+        count: point!.count ?? 1,
+        expansionZoom: point!.expansion_zoom,
+        isCluster: (point!.count ?? 1) > 1,
+        type
+      },
+      geometry: {
+        type: 'Point' as const,
+        coordinates: [point!.longitude ?? 0, point!.latitude ?? 0]
+      }
+    }))
+  })
+
+  return {
+    offer: build(props.clusteredPointsByType?.offer, 'offer'),
+    hub: build(props.clusteredPointsByType?.hub, 'hub'),
+    supplier: build(props.clusteredPointsByType?.supplier, 'supplier')
+  }
+})
+
 // Hovered point GeoJSON (separate layer on top)
 const hoveredPointGeoJson = computed(() => ({
   type: 'FeatureCollection' as const,
@@ -119,8 +277,39 @@ const hoveredPointGeoJson = computed(() => ({
   }] : []
 }))
 
+// Related points GeoJSON (for Info mode)
+const relatedPointsGeoJson = computed(() => {
+  if (!props.relatedPoints || props.relatedPoints.length === 0) {
+    return { type: 'FeatureCollection' as const, features: [] }
+  }
+
+  return {
+    type: 'FeatureCollection' as const,
+    features: props.relatedPoints.map(point => ({
+      type: 'Feature' as const,
+      properties: {
+        uuid: point.uuid,
+        name: point.name,
+        type: point.type
+      },
+      geometry: {
+        type: 'Point' as const,
+        coordinates: [point.longitude, point.latitude]
+      }
+    }))
+  }
+})
+
 const sourceId = computed(() => `${props.mapId}-points`)
 const hoveredSourceId = computed(() => `${props.mapId}-hovered`)
+const relatedSourceId = computed(() => `${props.mapId}-related`)
+
+const getServerSourceId = (type: 'offer' | 'hub' | 'supplier') => `${props.mapId}-server-${type}`
+const getServerClusterLayerId = (type: 'offer' | 'hub' | 'supplier') => `${props.mapId}-server-${type}-clusters`
+const getServerClusterCountLayerId = (type: 'offer' | 'hub' | 'supplier') => `${props.mapId}-server-${type}-cluster-count`
+const getServerPointLayerId = (type: 'offer' | 'hub' | 'supplier') => `${props.mapId}-server-${type}-points`
+const getServerPointLabelLayerId = (type: 'offer' | 'hub' | 'supplier') => `${props.mapId}-server-${type}-point-labels`
+
 
 const emitBoundsChange = (map: MapboxMapType) => {
   const bounds = map.getBounds()
@@ -135,7 +324,7 @@ const emitBoundsChange = (map: MapboxMapType) => {
 }
 
 const onMapCreated = (map: MapboxMapType) => {
-  const initMap = () => {
+  const initMap = async () => {
     map.setFog({
       color: 'rgb(186, 210, 235)',
       'high-color': 'rgb(36, 92, 223)',
@@ -145,9 +334,13 @@ const onMapCreated = (map: MapboxMapType) => {
     })
 
     if (props.useServerClustering) {
-      initServerClusteringLayers(map)
+      if (usesTypedClusters.value) {
+        await initServerClusteringLayersByType(map)
+      } else {
+        await initServerClusteringLayers(map)
+      }
     } else {
-      initClientClusteringLayers(map)
+      await initClientClusteringLayers(map)
     }
 
     // Emit initial bounds
@@ -166,7 +359,10 @@ const onMapCreated = (map: MapboxMapType) => {
   }
 }
 
-const initClientClusteringLayers = (map: MapboxMapType) => {
+const initClientClusteringLayers = async (map: MapboxMapType) => {
+  // Load entity icon first
+  await loadEntityIcon(map, props.entityType, props.pointColor)
+
   map.addSource(sourceId.value, {
     type: 'geojson',
     data: geoJsonData.value,
@@ -203,19 +399,13 @@ const initClientClusteringLayers = (map: MapboxMapType) => {
 
   map.addLayer({
     id: 'unclustered-point',
-    type: 'circle',
+    type: 'symbol',
     source: sourceId.value,
     filter: ['!', ['has', 'point_count']],
-    paint: {
+    layout: {
-      'circle-radius': 12,
+      'icon-image': `entity-icon-${props.entityType}`,
-      'circle-color': [
+      'icon-size': 1,
-        'case',
+      'icon-allow-overlap': true
-        ['==', ['get', 'uuid'], props.hoveredItemId || ''],
-        '#facc15', // yellow when hovered
-        props.pointColor
-      ],
-      'circle-stroke-width': 3,
-      'circle-stroke-color': '#ffffff'
     }
   })
 
@@ -226,7 +416,7 @@ const initClientClusteringLayers = (map: MapboxMapType) => {
     filter: ['!', ['has', 'point_count']],
     layout: {
       'text-field': ['get', 'name'],
-      'text-offset': [0, 1.5],
+      'text-offset': [0, 1.8],
       'text-size': 12,
       'text-font': ['Open Sans Bold', 'Arial Unicode MS Bold']
     },
@@ -239,20 +429,22 @@ const initClientClusteringLayers = (map: MapboxMapType) => {
 
   map.on('click', 'clusters', (e) => {
     const features = map.queryRenderedFeatures(e.point, { layers: ['clusters'] })
-    if (!features.length) return
+    const feature = features[0]
-    const clusterId = features[0].properties?.cluster_id
+    if (!feature) return
+    const clusterId = feature.properties?.cluster_id
     const source = map.getSource(sourceId.value) as mapboxgl.GeoJSONSource
     source.getClusterExpansionZoom(clusterId, (err, zoom) => {
       if (err) return
-      const geometry = features[0].geometry as GeoJSON.Point
+      const geometry = feature.geometry as GeoJSON.Point
       map.easeTo({ center: geometry.coordinates as [number, number], zoom: zoom || 4 })
     })
   })
 
   map.on('click', 'unclustered-point', (e) => {
     const features = map.queryRenderedFeatures(e.point, { layers: ['unclustered-point'] })
-    if (!features.length) return
+    const feature = features[0]
-    emit('select-item', features[0].properties?.uuid)
+    if (!feature) return
+    emit('select-item', feature.properties?.uuid)
   })
 
   map.on('mouseenter', 'clusters', () => { map.getCanvas().style.cursor = 'pointer' })
@@ -260,24 +452,117 @@ const initClientClusteringLayers = (map: MapboxMapType) => {
   map.on('mouseenter', 'unclustered-point', () => { map.getCanvas().style.cursor = 'pointer' })
   map.on('mouseleave', 'unclustered-point', () => { map.getCanvas().style.cursor = '' })
 
+  // Hovered point layer (on top of everything) - "target" effect with border
+  map.addSource(hoveredSourceId.value, {
+    type: 'geojson',
+    data: hoveredPointGeoJson.value
+  })
+  // Outer ring (white)
+  map.addLayer({
+    id: 'hovered-point-ring',
+    type: 'circle',
+    source: hoveredSourceId.value,
+    paint: {
+      'circle-radius': 20,
+      'circle-color': 'transparent',
+      'circle-stroke-width': 3,
+      'circle-stroke-color': '#ffffff'
+    }
+  })
+  // Inner point (same as entity color)
+  map.addLayer({
+    id: 'hovered-point-layer',
+    type: 'circle',
+    source: hoveredSourceId.value,
+    paint: {
+      'circle-radius': 14,
+      'circle-color': props.pointColor,
+      'circle-stroke-width': 3,
+      'circle-stroke-color': '#ffffff'
+    }
+  })
+
+  // Related points layer (for Info mode - icons by type)
+  await loadRelatedPointIcons(map)
+
+  map.addSource(relatedSourceId.value, {
+    type: 'geojson',
+    data: relatedPointsGeoJson.value
+  })
+  map.addLayer({
+    id: `${props.mapId}-related-points`,
+    type: 'symbol',
+    source: relatedSourceId.value,
+    layout: {
+      'icon-image': [
+        'match',
+        ['get', 'type'],
+        'hub', 'related-icon-hub',
+        'supplier', 'related-icon-supplier',
+        'offer', 'related-icon-offer',
+        'related-icon-offer'  // default
+      ],
+      'icon-size': 1,
+      'icon-allow-overlap': true
+    }
+  })
+  map.addLayer({
+    id: `${props.mapId}-related-labels`,
+    type: 'symbol',
+    source: relatedSourceId.value,
+    layout: {
+      'text-field': ['get', 'name'],
+      'text-size': 11,
+      'text-anchor': 'top',
+      'text-offset': [0, 1.5]
+    },
+    paint: {
+      'text-color': '#ffffff',
+      'text-halo-color': '#000000',
+      'text-halo-width': 1
+    }
+  })
+
+  // Click handlers for related points
+  map.on('click', `${props.mapId}-related-points`, (e) => {
+    const features = map.queryRenderedFeatures(e.point, { layers: [`${props.mapId}-related-points`] })
+    const feature = features[0]
+    if (!feature) return
+    const props_data = feature.properties as Record<string, any> | undefined
+    emit('select-item', props_data?.uuid, props_data)
+  })
+
+  map.on('mouseenter', `${props.mapId}-related-points`, () => {
+    map.getCanvas().style.cursor = 'pointer'
+  })
+
+  map.on('mouseleave', `${props.mapId}-related-points`, () => {
+    map.getCanvas().style.cursor = ''
+  })
+
   // Auto-fit bounds to all items
   if (!didFitBounds.value && props.items.length > 0) {
     const bounds = new LngLatBounds()
     props.items.forEach(item => {
-      bounds.extend([item.longitude, item.latitude])
+      if (item.longitude != null && item.latitude != null) {
+        bounds.extend([item.longitude, item.latitude])
+      }
     })
-    map.fitBounds(bounds, { padding: 50, maxZoom: 10 })
+    map.fitBounds(bounds, { padding: buildFitPadding(50), maxZoom: 10 })
     didFitBounds.value = true
   }
 }
 
-const initServerClusteringLayers = (map: MapboxMapType) => {
+const initServerClusteringLayers = async (map: MapboxMapType) => {
+  // Load entity icon first
+  await loadEntityIcon(map, props.entityType, props.pointColor)
+
   map.addSource(sourceId.value, {
     type: 'geojson',
     data: serverClusteredGeoJson.value
   })
 
-  // Clusters (count > 1)
+  // Clusters (count > 1) - circle with count
   map.addLayer({
     id: 'server-clusters',
     type: 'circle',
@@ -304,22 +589,16 @@ const initServerClusteringLayers = (map: MapboxMapType) => {
     paint: { 'text-color': '#ffffff' }
   })
 
-  // Individual points (count == 1)
+  // Individual points (count == 1) - icon with entity type
   map.addLayer({
     id: 'server-points',
-    type: 'circle',
+    type: 'symbol',
     source: sourceId.value,
     filter: ['==', ['get', 'count'], 1],
-    paint: {
+    layout: {
-      'circle-radius': 12,
+      'icon-image': `entity-icon-${props.entityType}`,
-      'circle-color': [
+      'icon-size': 1,
-        'case',
+      'icon-allow-overlap': true
-        ['==', ['get', 'id'], props.hoveredItemId || ''],
-        '#facc15', // yellow when hovered
-        props.pointColor
-      ],
-      'circle-stroke-width': 3,
-      'circle-stroke-color': '#ffffff'
     }
   })
 
@@ -330,7 +609,7 @@ const initServerClusteringLayers = (map: MapboxMapType) => {
     filter: ['==', ['get', 'count'], 1],
     layout: {
       'text-field': ['get', 'name'],
-      'text-offset': [0, 1.5],
+      'text-offset': [0, 1.8],
       'text-size': 12,
       'text-font': ['Open Sans Bold', 'Arial Unicode MS Bold']
     },
@@ -344,20 +623,23 @@ const initServerClusteringLayers = (map: MapboxMapType) => {
   // Click on cluster to zoom in
   map.on('click', 'server-clusters', (e) => {
     const features = map.queryRenderedFeatures(e.point, { layers: ['server-clusters'] })
-    if (!features.length) return
+    const feature = features[0]
-    const expansionZoom = features[0].properties?.expansionZoom
+    if (!feature) return
-    const geometry = features[0].geometry as GeoJSON.Point
+    const expansionZoom = feature.properties?.expansionZoom
+    const geometry = feature.geometry as GeoJSON.Point
     map.easeTo({
       center: geometry.coordinates as [number, number],
       zoom: expansionZoom || map.getZoom() + 2
     })
   })
 
-  // Click on individual point
+  // Click on individual point - emit full properties
   map.on('click', 'server-points', (e) => {
     const features = map.queryRenderedFeatures(e.point, { layers: ['server-points'] })
-    if (!features.length) return
+    const feature = features[0]
-    emit('select-item', features[0].properties?.id)
+    if (!feature) return
+    const props = feature.properties || {}
+    emit('select-item', props.id, props)
   })
 
   map.on('mouseenter', 'server-clusters', () => { map.getCanvas().style.cursor = 'pointer' })
@@ -365,33 +647,301 @@ const initServerClusteringLayers = (map: MapboxMapType) => {
   map.on('mouseenter', 'server-points', () => { map.getCanvas().style.cursor = 'pointer' })
   map.on('mouseleave', 'server-points', () => { map.getCanvas().style.cursor = '' })
 
+  // Hovered point layer (on top of everything) - "target" effect with border
+  map.addSource(hoveredSourceId.value, {
+    type: 'geojson',
+    data: hoveredPointGeoJson.value
+  })
+  // Outer ring (white)
+  map.addLayer({
+    id: 'hovered-point-ring',
+    type: 'circle',
+    source: hoveredSourceId.value,
+    paint: {
+      'circle-radius': 20,
+      'circle-color': 'transparent',
+      'circle-stroke-width': 3,
+      'circle-stroke-color': '#ffffff'
+    }
+  })
+  // Inner point (same as entity color)
+  map.addLayer({
+    id: 'hovered-point-layer',
+    type: 'circle',
+    source: hoveredSourceId.value,
+    paint: {
+      'circle-radius': 14,
+      'circle-color': props.pointColor,
+      'circle-stroke-width': 3,
+      'circle-stroke-color': '#ffffff'
+    }
+  })
+
+  // Related points layer (for Info mode - icons by type)
+  await loadRelatedPointIcons(map)
+
+  map.addSource(relatedSourceId.value, {
+    type: 'geojson',
+    data: relatedPointsGeoJson.value
+  })
+  map.addLayer({
+    id: `${props.mapId}-related-points`,
+    type: 'symbol',
+    source: relatedSourceId.value,
+    layout: {
+      'icon-image': [
+        'match',
+        ['get', 'type'],
+        'hub', 'related-icon-hub',
+        'supplier', 'related-icon-supplier',
+        'offer', 'related-icon-offer',
+        'related-icon-offer'  // default
+      ],
+      'icon-size': 1,
+      'icon-allow-overlap': true
+    }
+  })
+  map.addLayer({
+    id: `${props.mapId}-related-labels`,
+    type: 'symbol',
+    source: relatedSourceId.value,
+    layout: {
+      'text-field': ['get', 'name'],
+      'text-size': 11,
+      'text-anchor': 'top',
+      'text-offset': [0, 1.5]
+    },
+    paint: {
+      'text-color': '#ffffff',
+      'text-halo-color': '#000000',
+      'text-halo-width': 1
+    }
+  })
+
+  // Click handlers for related points
+  map.on('click', `${props.mapId}-related-points`, (e) => {
+    const features = map.queryRenderedFeatures(e.point, { layers: [`${props.mapId}-related-points`] })
+    const feature = features[0]
+    if (!feature) return
+    const props_data = feature.properties as Record<string, any> | undefined
+    emit('select-item', props_data?.uuid, props_data)
+  })
+
+  map.on('mouseenter', `${props.mapId}-related-points`, () => {
+    map.getCanvas().style.cursor = 'pointer'
+  })
+
+  map.on('mouseleave', `${props.mapId}-related-points`, () => {
+    map.getCanvas().style.cursor = ''
+  })
+}
+
+const initServerClusteringLayersByType = async (map: MapboxMapType) => {
+  for (const type of CLUSTER_TYPES) {
+    await loadEntityIcon(map, type, ENTITY_COLORS[type])
+
+    const sourceIdByType = getServerSourceId(type)
+    map.addSource(sourceIdByType, {
+      type: 'geojson',
+      data: serverClusteredGeoJsonByType.value[type]
+    })
+
+    const clusterLayerId = getServerClusterLayerId(type)
+    const clusterCountLayerId = getServerClusterCountLayerId(type)
+    const pointLayerId = getServerPointLayerId(type)
+    const pointLabelLayerId = getServerPointLabelLayerId(type)
+
+    map.addLayer({
+      id: clusterLayerId,
+      type: 'circle',
+      source: sourceIdByType,
+      filter: ['>', ['get', 'count'], 1],
+      paint: {
+        'circle-color': ENTITY_COLORS[type],
+        'circle-radius': ['step', ['get', 'count'], 20, 10, 30, 50, 40],
+        'circle-opacity': 0.8,
+        'circle-stroke-width': 2,
+        'circle-stroke-color': '#ffffff'
+      },
+      layout: {}
+    })
+
+    map.addLayer({
+      id: clusterCountLayerId,
+      type: 'symbol',
+      source: sourceIdByType,
+      filter: ['>', ['get', 'count'], 1],
+      layout: {
+        'text-field': ['get', 'count'],
+        'text-size': 14
+      },
+      paint: { 'text-color': '#ffffff' }
+    })
+
+    map.addLayer({
+      id: pointLayerId,
+      type: 'symbol',
+      source: sourceIdByType,
+      filter: ['==', ['get', 'count'], 1],
+      layout: {
+        'icon-image': `entity-icon-${type}`,
+        'icon-size': 1,
+        'icon-allow-overlap': true
+      }
+    })
+
+    map.addLayer({
+      id: pointLabelLayerId,
+      type: 'symbol',
+      source: sourceIdByType,
+      filter: ['==', ['get', 'count'], 1],
+      layout: {
+        'text-field': ['get', 'name'],
+        'text-offset': [0, 1.8],
+        'text-size': 12,
+        'text-font': ['Open Sans Bold', 'Arial Unicode MS Bold']
+      },
+      paint: {
+        'text-color': '#ffffff',
+        'text-halo-color': '#000000',
+        'text-halo-width': 1.5
+      }
+    })
+
+    map.on('click', clusterLayerId, (e) => {
+      const features = map.queryRenderedFeatures(e.point, { layers: [clusterLayerId] })
+      const feature = features[0]
+      if (!feature) return
+      const expansionZoom = feature.properties?.expansionZoom
+      const geometry = feature.geometry as GeoJSON.Point
+      map.easeTo({
+        center: geometry.coordinates as [number, number],
+        zoom: expansionZoom || map.getZoom() + 2
+      })
+    })
+
+    map.on('click', pointLayerId, (e) => {
+      const features = map.queryRenderedFeatures(e.point, { layers: [pointLayerId] })
+      const feature = features[0]
+      if (!feature) return
+      const props_data = feature.properties as Record<string, any> | undefined
+      emit('select-item', props_data?.id, props_data)
+    })
+
+    map.on('mouseenter', clusterLayerId, () => { map.getCanvas().style.cursor = 'pointer' })
+    map.on('mouseleave', clusterLayerId, () => { map.getCanvas().style.cursor = '' })
+    map.on('mouseenter', pointLayerId, () => { map.getCanvas().style.cursor = 'pointer' })
+    map.on('mouseleave', pointLayerId, () => { map.getCanvas().style.cursor = '' })
+  }
+
   // Hovered point layer (on top of everything)
   map.addSource(hoveredSourceId.value, {
     type: 'geojson',
     data: hoveredPointGeoJson.value
   })
+  map.addLayer({
+    id: 'hovered-point-ring',
+    type: 'circle',
+    source: hoveredSourceId.value,
+    paint: {
+      'circle-radius': 20,
+      'circle-color': 'transparent',
+      'circle-stroke-width': 3,
+      'circle-stroke-color': '#ffffff'
+    }
+  })
   map.addLayer({
     id: 'hovered-point-layer',
     type: 'circle',
     source: hoveredSourceId.value,
     paint: {
       'circle-radius': 14,
-      'circle-color': '#3b82f6',
+      'circle-color': props.pointColor,
       'circle-stroke-width': 3,
       'circle-stroke-color': '#ffffff'
     }
   })
+
+  // Related points layer
+  await loadRelatedPointIcons(map)
+
+  map.addSource(relatedSourceId.value, {
+    type: 'geojson',
+    data: relatedPointsGeoJson.value
+  })
+  map.addLayer({
+    id: `${props.mapId}-related-points`,
+    type: 'symbol',
+    source: relatedSourceId.value,
+    layout: {
+      'icon-image': [
+        'match',
+        ['get', 'type'],
+        'hub', 'related-icon-hub',
+        'supplier', 'related-icon-supplier',
+        'offer', 'related-icon-offer',
+        'related-icon-offer'
+      ],
+      'icon-size': 1,
+      'icon-allow-overlap': true
+    }
+  })
+  map.addLayer({
+    id: `${props.mapId}-related-labels`,
+    type: 'symbol',
+    source: relatedSourceId.value,
+    layout: {
+      'text-field': ['get', 'name'],
+      'text-size': 11,
+      'text-anchor': 'top',
+      'text-offset': [0, 1.5]
+    },
+    paint: {
+      'text-color': '#ffffff',
+      'text-halo-color': '#000000',
+      'text-halo-width': 1
+    }
+  })
+
+  map.on('click', `${props.mapId}-related-points`, (e) => {
+    const features = map.queryRenderedFeatures(e.point, { layers: [`${props.mapId}-related-points`] })
+    const feature = features[0]
+    if (!feature) return
+    const props_data = feature.properties as Record<string, any> | undefined
+    emit('select-item', props_data?.uuid, props_data)
+  })
+
+  map.on('mouseenter', `${props.mapId}-related-points`, () => {
+    map.getCanvas().style.cursor = 'pointer'
+  })
+
+  map.on('mouseleave', `${props.mapId}-related-points`, () => {
+    map.getCanvas().style.cursor = ''
+  })
 }
 
 // Update map data when items or clusteredPoints change
 watch(() => props.useServerClustering ? serverClusteredGeoJson.value : geoJsonData.value, (newData) => {
   if (!mapRef.value || !mapInitialized.value) return
+  if (usesTypedClusters.value) return
   const source = mapRef.value.getSource(sourceId.value) as mapboxgl.GeoJSONSource | undefined
   if (source) {
     source.setData(newData)
   }
 }, { deep: true })
 
+watch(() => serverClusteredGeoJsonByType.value, (newData) => {
+  if (!mapRef.value || !mapInitialized.value) return
+  if (!usesTypedClusters.value) return
+  for (const type of CLUSTER_TYPES) {
+    const sourceIdByType = getServerSourceId(type)
+    const source = mapRef.value.getSource(sourceIdByType) as mapboxgl.GeoJSONSource | undefined
+    if (source) {
+      source.setData(newData[type])
+    }
+  }
+}, { deep: true })
+
 // Update hovered point layer when hoveredItem changes
 watch(() => props.hoveredItem, () => {
   if (!mapRef.value || !mapInitialized.value) return
@@ -401,8 +951,71 @@ watch(() => props.hoveredItem, () => {
   }
 }, { deep: true })
 
+// Update related points layer when relatedPoints changes
+watch(() => props.relatedPoints, () => {
+  if (!mapRef.value || !mapInitialized.value) return
+
+  // Update the source data immediately
+  const source = mapRef.value.getSource(relatedSourceId.value) as mapboxgl.GeoJSONSource | undefined
+  if (source) {
+    source.setData(relatedPointsGeoJson.value)
+  }
+}, { deep: true })
+
+// no visibility toggling; layers are data-driven by query
+
+// Fit bounds when info loading finishes (all related data loaded)
+watch(() => props.infoLoading, (loading, wasLoading) => {
+  // Only fit bounds when loading changes from true to false (data finished loading)
+  if (wasLoading && !loading && props.relatedPoints && props.relatedPoints.length > 0) {
+    if (!mapRef.value) return
+    const bounds = new LngLatBounds()
+    props.relatedPoints.forEach(p => {
+      bounds.extend([p.longitude, p.latitude])
+    })
+    if (!bounds.isEmpty()) {
+      mapRef.value.fitBounds(bounds, { padding: buildFitPadding(80), maxZoom: 12 })
+    }
+  }
+})
+
+// Watch for pointColor or entityType changes - update colors and icons
+watch([() => props.pointColor, () => props.entityType], async ([newColor, newType]) => {
+  if (!mapRef.value || !mapInitialized.value) return
+  const map = mapRef.value
+
+  // Reload icon with new color and type
+  await loadEntityIcon(map, newType, newColor)
+
+  // Update cluster circle colors
+  if (props.useServerClustering) {
+    if (usesTypedClusters.value) {
+      return
+    }
+    if (map.getLayer('server-clusters')) {
+      map.setPaintProperty('server-clusters', 'circle-color', newColor)
+    }
+    if (map.getLayer('server-points')) {
+      map.setLayoutProperty('server-points', 'icon-image', `entity-icon-${newType}`)
+    }
+  } else {
+    if (map.getLayer('clusters')) {
+      map.setPaintProperty('clusters', 'circle-color', newColor)
+    }
+    if (map.getLayer('unclustered-point')) {
+      map.setLayoutProperty('unclustered-point', 'icon-image', `entity-icon-${newType}`)
+    }
+  }
+
+  // Update hovered point color
+  if (map.getLayer('hovered-point-layer')) {
+    map.setPaintProperty('hovered-point-layer', 'circle-color', newColor)
+  }
+})
+
 // fitBounds for server clustering when first data arrives
 watch(() => props.clusteredPoints, (points) => {
+  if (usesTypedClusters.value) return
   if (!mapRef.value || !mapInitialized.value) return
   if (!didFitBounds.value && points && points.length > 0) {
     const bounds = new LngLatBounds()
@@ -412,12 +1025,31 @@ watch(() => props.clusteredPoints, (points) => {
       }
     })
     if (!bounds.isEmpty()) {
-      mapRef.value.fitBounds(bounds, { padding: 50, maxZoom: 6 })
+      mapRef.value.fitBounds(bounds, { padding: buildFitPadding(50), maxZoom: 6 })
       didFitBounds.value = true
     }
   }
 }, { immediate: true })
 
+watch(() => props.clusteredPointsByType, () => {
+  if (!usesTypedClusters.value) return
+  if (!mapRef.value || !mapInitialized.value) return
+  if (didFitBounds.value) return
+
+  const bounds = new LngLatBounds()
+  CLUSTER_TYPES.forEach(type => {
+    const points = serverClusteredGeoJsonByType.value[type]?.features ?? []
+    points.forEach((p) => {
+      const coords = (p.geometry as GeoJSON.Point).coordinates as [number, number]
+      bounds.extend(coords)
+    })
+  })
+  if (!bounds.isEmpty()) {
+    mapRef.value.fitBounds(bounds, { padding: buildFitPadding(50), maxZoom: 6 })
+    didFitBounds.value = true
+  }
+}, { deep: true, immediate: true })
+
 // Expose flyTo method for external use (with space fly animation)
 const flyTo = async (lat: number, lng: number, zoom = 8) => {
   if (!mapRef.value) return

app/components/catalog/CatalogMapPanel.vue

@@ -23,8 +23,8 @@
       <!-- Hubs Tab -->
       <template v-if="activeTab === 'hubs'">
         <HubCard
-          v-for="hub in hubs"
+          v-for="(hub, index) in hubs"
-          :key="hub.uuid"
+          :key="hub.uuid ?? index"
           :hub="hub"
           selectable
           :is-selected="selectedId === hub.uuid"
@@ -37,16 +37,20 @@
 
       <!-- Offers Tab -->
       <template v-if="activeTab === 'offers'">
-        <OfferCard
+        <OfferResultCard
-          v-for="offer in offers"
+          v-for="(offer, index) in offersWithPrice"
-          :key="offer.uuid"
+          :key="offer.uuid ?? index"
-          :offer="offer"
+          :supplier-name="offer.supplierName"
-          selectable
+          :location-name="offer.locationName"
-          compact
+          :product-name="offer.productName || offer.title || undefined"
-          :is-selected="selectedId === offer.uuid"
+          :price-per-unit="offer.pricePerUnit ? Number(offer.pricePerUnit) : null"
+          :quantity="offer.quantity"
+          :currency="offer.currency"
+          :unit="offer.unit"
+          :stages="[]"
           @select="selectOffer(offer)"
         />
-        <Text v-if="offers.length === 0" tone="muted" size="sm" class="text-center py-4">
+        <Text v-if="offersWithPrice.length === 0" tone="muted" size="sm" class="text-center py-4">
           {{ t('catalogMap.empty.offers') }}
         </Text>
       </template>
@@ -54,8 +58,8 @@
       <!-- Suppliers Tab -->
       <template v-if="activeTab === 'suppliers'">
         <SupplierCard
-          v-for="supplier in suppliers"
+          v-for="(supplier, index) in suppliers"
-          :key="supplier.uuid"
+          :key="supplier.uuid ?? index"
           :supplier="supplier"
           selectable
           :is-selected="selectedId === supplier.uuid"
@@ -82,11 +86,16 @@ interface Hub {
 interface Offer {
   uuid?: string | null
   title?: string | null
+  productName?: string | null
   locationName?: string | null
+  supplierName?: string | null
   status?: string | null
   latitude?: number | null
   longitude?: number | null
-  lines?: any[] | null
+  quantity?: number | string | null
+  pricePerUnit?: number | string | null
+  currency?: string | null
+  unit?: string | null
 }
 
 interface Supplier {
@@ -114,9 +123,13 @@ const selectedId = ref<string | null>(null)
 
 const { t } = useI18n()
 
+const offersWithPrice = computed(() =>
+  (props.offers || []).filter(o => o?.pricePerUnit != null)
+)
+
 const tabs = computed(() => [
   { id: 'hubs' as const, label: 'catalogMap.tabs.hubs', count: props.hubs.length },
-  { id: 'offers' as const, label: 'catalogMap.tabs.offers', count: props.offers.length },
+  { id: 'offers' as const, label: 'catalogMap.tabs.offers', count: offersWithPrice.value.length },
   { id: 'suppliers' as const, label: 'catalogMap.tabs.suppliers', count: props.suppliers.length }
 ])
 

app/components/catalog/CatalogMapSidebar.vue

@@ -15,7 +15,7 @@
     <div v-if="filters && filters.length > 0" class="p-4 border-b border-base-300">
       <CatalogFilters
         :filters="filters"
-        :model-value="selectedFilter"
+        :model-value="selectedFilter ?? 'all'"
         @update:model-value="$emit('update:selectedFilter', $event)"
       />
     </div>

app/components/catalog/CatalogOffersSection.vue

@@ -4,7 +4,7 @@
       <Stack direction="row" align="center" justify="between">
         <Heading :level="2">{{ t('catalogOffersSection.header.title') }}</Heading>
         <NuxtLink
-          :to="localePath('/catalog/offers')"
+          :to="localePath('/catalog?select=product')"
           class="btn btn-sm btn-ghost"
         >
           <span>{{ t('catalogOffersSection.actions.view_all') }}</span>
@@ -13,23 +13,30 @@
       </Stack>
 
       <Grid :cols="1" :md="2" :lg="3" :gap="4">
-        <OfferCard
+        <OfferResultCard
-          v-for="offer in offers"
+          v-for="(offer, index) in offersWithPrice"
-          :key="offer.uuid"
+          :key="offer.uuid ?? index"
-          :offer="offer"
+          :supplier-name="offer.supplierName"
+          :location-name="offer.locationName"
+          :product-name="offer.title || undefined"
+          :price-per-unit="offer.pricePerUnit ? Number(offer.pricePerUnit) : null"
+          :quantity="offer.quantity"
+          :currency="offer.currency"
+          :unit="offer.unit"
+          :stages="[]"
         />
       </Grid>
 
       <Stack v-if="totalOffers > 0" direction="row" align="center" justify="between">
         <Text tone="muted">
-          {{ t('common.pagination.showing', { shown: offers.length, total: totalOffers }) }}
+          {{ t('common.pagination.showing', { shown: offersWithPrice.length, total: totalOffers }) }}
         </Text>
         <Button v-if="canLoadMore" variant="outline" @click="loadMore">
           {{ t('common.actions.load_more') }}
         </Button>
       </Stack>
 
-      <Stack v-if="offers.length === 0" align="center" gap="2">
+      <Stack v-if="offersWithPrice.length === 0" align="center" gap="2">
         <Text tone="muted">{{ t('catalogOffersSection.empty.no_offers') }}</Text>
       </Stack>
     </Stack>
@@ -46,9 +53,14 @@ interface Offer {
   uuid?: string | null
   title?: string | null
   locationName?: string | null
+  supplierName?: string | null
   status?: string | null
   validUntil?: string | null
   lines?: (OfferLine | null)[] | null
+  quantity?: number | string | null
+  pricePerUnit?: number | string | null
+  currency?: string | null
+  unit?: string | null
 }
 
 const props = defineProps<{
@@ -61,7 +73,10 @@ const props = defineProps<{
 const localePath = useLocalePath()
 const { t } = useI18n()
 
-const totalOffers = computed(() => props.total ?? props.offers.length)
+const offersWithPrice = computed(() =>
+  (props.offers || []).filter(o => o?.pricePerUnit != null)
+)
+const totalOffers = computed(() => props.total ?? offersWithPrice.value.length)
 const canLoadMore = computed(() => props.canLoadMore ?? false)
 const loadMore = () => {
   props.onLoadMore?.()

app/components/catalog/CatalogSearchBar.vue

@@ -15,7 +15,13 @@
           class="badge badge-sm badge-primary gap-1 cursor-pointer hover:badge-error transition-colors"
           @click="$emit('remove-filter', filter.id)"
         >
-          {{ filter.label }}
+          <template v-if="filter.key">
+            <span class="opacity-70">{{ filter.key }}:</span>
+            <span>{{ filter.label }}</span>
+          </template>
+          <template v-else>
+            {{ filter.label }}
+          </template>
           <svg xmlns="http://www.w3.org/2000/svg" class="h-3 w-3" viewBox="0 0 20 20" fill="currentColor">
             <path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd" />
           </svg>
@@ -96,6 +102,7 @@
 interface FilterOption {
   id: string
   label: string
+  key?: string // Optional key for "Key: Value" format badges
 }
 
 interface SortOption {

app/components/catalog/CatalogSuppliersSection.vue

@@ -4,7 +4,7 @@
       <Stack direction="row" align="center" justify="between">
         <Heading :level="2">{{ t('catalogSuppliersSection.header.title') }}</Heading>
         <NuxtLink
-          :to="localePath('/catalog/suppliers')"
+          :to="localePath('/catalog?select=supplier')"
           class="btn btn-sm btn-ghost"
         >
           <span>{{ t('catalogSuppliersSection.actions.view_all') }}</span>
@@ -14,8 +14,8 @@
 
       <Grid :cols="1" :md="2" :lg="3" :gap="4">
         <SupplierCard
-          v-for="supplier in suppliers"
+          v-for="(supplier, index) in suppliers"
-          :key="supplier.uuid"
+          :key="supplier.uuid ?? index"
           :supplier="supplier"
         />
       </Grid>

app/components/catalog/ExplorePanel.vue

@@ -0,0 +1,80 @@
+<template>
+  <div class="flex flex-col gap-4">
+    <!-- View toggle -->
+    <div class="join join-horizontal">
+      <button
+        class="btn btn-sm join-item"
+        :class="{ 'btn-active': mapViewMode === 'offers' }"
+        @click="setMapViewMode('offers')"
+      >
+        <Icon name="lucide:shopping-bag" size="16" />
+        <span class="hidden sm:inline">{{ $t('catalog.views.offers') }}</span>
+      </button>
+      <button
+        class="btn btn-sm join-item"
+        :class="{ 'btn-active': mapViewMode === 'hubs' }"
+        @click="setMapViewMode('hubs')"
+      >
+        <Icon name="lucide:warehouse" size="16" />
+        <span class="hidden sm:inline">{{ $t('catalog.views.hubs') }}</span>
+      </button>
+      <button
+        class="btn btn-sm join-item"
+        :class="{ 'btn-active': mapViewMode === 'suppliers' }"
+        @click="setMapViewMode('suppliers')"
+      >
+        <Icon name="lucide:factory" size="16" />
+        <span class="hidden sm:inline">{{ $t('catalog.views.suppliers') }}</span>
+      </button>
+    </div>
+
+    <!-- Selected item info -->
+    <div v-if="selectedItem" class="card bg-base-100 shadow-lg">
+      <div class="card-body p-4">
+        <div class="flex items-start justify-between gap-2">
+          <div>
+            <h3 class="card-title text-base">{{ selectedItem.name }}</h3>
+            <p v-if="selectedItem.country" class="text-sm text-base-content/70">
+              {{ selectedItem.country }}
+            </p>
+          </div>
+          <button class="btn btn-ghost btn-sm btn-circle" @click="emit('close-selected')">
+            <Icon name="lucide:x" size="16" />
+          </button>
+        </div>
+
+        <div class="card-actions justify-end mt-2">
+          <button class="btn btn-primary btn-sm" @click="emit('view-details', selectedItem)">
+            {{ $t('common.viewDetails') }}
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <!-- Hint when nothing selected -->
+    <div v-else class="text-sm text-base-content/60">
+      <p>{{ $t('catalog.explore.subtitle') }}</p>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+interface SelectedItem {
+  uuid: string
+  name?: string | null
+  country?: string | null
+  latitude?: number | null
+  longitude?: number | null
+}
+
+defineProps<{
+  selectedItem?: SelectedItem | null
+}>()
+
+const emit = defineEmits<{
+  'close-selected': []
+  'view-details': [item: SelectedItem]
+}>()
+
+const { mapViewMode, setMapViewMode } = useCatalogSearch()
+</script>

app/components/catalog/HubCard.vue

@@ -1,7 +1,7 @@
 <template>
   <component
     :is="linkable ? NuxtLink : 'div'"
-    :to="linkable ? localePath(`/catalog/hubs/${hub.uuid}`) : undefined"
+    :to="linkable ? resolvedLink : undefined"
     class="block"
     :class="{ 'cursor-pointer': selectable }"
     @click="selectable && $emit('select')"
@@ -16,16 +16,35 @@
       ]"
     >
       <div class="flex flex-col gap-1">
-        <!-- Title -->
+        <!-- Title + distance/compass -->
-        <Text size="base" weight="semibold" class="truncate">{{ hub.name }}</Text>
+        <div class="flex items-start justify-between gap-2">
-        <!-- Country left, distance right -->
+          <Text size="base" weight="semibold" class="truncate">{{ hub.name }}</Text>
+          <div class="flex items-center gap-2 text-xs text-base-content/60 whitespace-nowrap">
+            <Text v-if="distanceLabel" size="xs" class="text-base-content/60">{{ distanceLabel }}</Text>
+            <div v-if="bearing !== null" class="flex items-center gap-1">
+              <div class="w-6 h-6 rounded-full border border-base-content/10 bg-base-200/40 flex items-center justify-center">
+                <Icon
+                  name="lucide:arrow-up"
+                  size="12"
+                  class="text-base-content/60"
+                  :style="{ transform: `rotate(${bearing}deg)` }"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- Country -->
         <div class="flex items-center justify-between">
           <Text tone="muted" size="sm">
             {{ countryFlag }} {{ hub.country || t('catalogMap.labels.country_unknown') }}
           </Text>
-          <span v-if="hub.distance" class="badge badge-neutral badge-dash text-xs">
+        </div>
-            {{ hub.distance }}
+        <!-- Transport icons bottom -->
-          </span>
+        <div v-if="hub.transport_types?.length" class="flex items-center gap-1 pt-1">
+          <Icon v-if="hasTransport('auto')" name="lucide:truck" size="14" class="text-base-content/50" />
+          <Icon v-if="hasTransport('rail')" name="lucide:train-front" size="14" class="text-base-content/50" />
+          <Icon v-if="hasTransport('sea')" name="lucide:ship" size="14" class="text-base-content/50" />
+          <Icon v-if="hasTransport('air')" name="lucide:plane" size="14" class="text-base-content/50" />
         </div>
       </div>
     </Card>
@@ -39,14 +58,20 @@ interface Hub {
   uuid?: string | null
   name?: string | null
   country?: string | null
-  countryCode?: string | null
+  country_code?: string | null
+  latitude?: number | null
+  longitude?: number | null
   distance?: string
+  distance_km?: number | null
+  transport_types?: (string | null)[] | null
 }
 
 const props = defineProps<{
   hub: Hub
+  origin?: { latitude: number; longitude: number } | null
   selectable?: boolean
   isSelected?: boolean
+  linkTo?: string
 }>()
 
 defineEmits<{
@@ -57,7 +82,8 @@ defineEmits<{
 const localePath = useLocalePath()
 const { t } = useI18n()
 
-const linkable = computed(() => !props.selectable && props.hub.uuid)
+const linkable = computed(() => !props.selectable && !!(props.linkTo || props.hub.uuid))
+const resolvedLink = computed(() => props.linkTo || localePath(`/catalog/hubs/${props.hub.uuid}`))
 
 // ISO code to emoji flag
 const isoToEmoji = (code: string): string => {
@@ -65,9 +91,39 @@ const isoToEmoji = (code: string): string => {
 }
 
 const countryFlag = computed(() => {
-  if (props.hub.countryCode) {
+  if (props.hub.country_code) {
-    return isoToEmoji(props.hub.countryCode)
+    return isoToEmoji(props.hub.country_code)
   }
   return '🌍'
 })
+
+const hasTransport = (type: string) => props.hub.transport_types?.some(t => t === type)
+const distanceLabel = computed(() => {
+  if (props.hub.distance) return props.hub.distance
+  if (props.hub.distance_km != null) return `${Math.round(props.hub.distance_km)} km`
+  return ''
+})
+
+const toRadians = (deg: number) => (deg * Math.PI) / 180
+const toDegrees = (rad: number) => (rad * 180) / Math.PI
+
+const bearing = computed(() => {
+  const origin = props.origin
+  const lat2 = props.hub.latitude
+  const lon2 = props.hub.longitude
+  if (!origin || lat2 == null || lon2 == null) return null
+  const lat1 = origin.latitude
+  const lon1 = origin.longitude
+  if (lat1 == null || lon1 == null) return null
+
+  const φ1 = toRadians(lat1)
+  const φ2 = toRadians(lat2)
+  const Δλ = toRadians(lon2 - lon1)
+
+  const y = Math.sin(Δλ) * Math.cos(φ2)
+  const x = Math.cos(φ1) * Math.sin(φ2) - Math.sin(φ1) * Math.cos(φ2) * Math.cos(Δλ)
+  const θ = Math.atan2(y, x)
+  const deg = (toDegrees(θ) + 360) % 360
+  return deg
+})
 </script>

app/components/catalog/InfoPanel.vue

@@ -0,0 +1,504 @@
+<template>
+  <div class="flex flex-col h-full">
+    <!-- Header with close button -->
+    <div class="flex-shrink-0 p-4 border-b border-white/10">
+      <div class="flex items-center justify-between">
+        <div class="flex items-center gap-2">
+          <div
+            class="flex items-center justify-center w-6 h-6 rounded-full"
+            :style="{ backgroundColor: badgeColor }"
+          >
+            <Icon :name="entityIcon" size="14" class="text-white" />
+          </div>
+          <h3 class="font-semibold text-base text-white">{{ entityName }}</h3>
+        </div>
+        <div class="flex items-center gap-2">
+          <button
+            v-if="(entityType === 'hub' || entityType === 'supplier') && entity?.uuid"
+            class="rounded-full glass-bright border border-white/30 shadow-lg p-1.5 transition-transform hover:scale-105"
+            @click="emit('pin', entityType, { uuid: entity?.uuid, name: entity?.name })"
+            aria-label="Pin"
+            title="Pin"
+          >
+            <Icon name="lucide:pin" size="16" class="text-white" />
+          </button>
+          <button class="btn btn-ghost btn-xs btn-circle text-white/60 hover:text-white" @click="emit('close')">
+            <Icon name="lucide:x" size="16" />
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <!-- Content (scrollable) -->
+    <div class="flex-1 overflow-y-auto p-4">
+      <!-- Loading state -->
+      <div v-if="loading" class="flex items-center justify-center py-8">
+        <span class="loading loading-spinner loading-md text-white" />
+      </div>
+
+      <!-- Content -->
+      <div v-else-if="entity" class="flex flex-col gap-4">
+        <!-- Entity Info Header (text, not card) -->
+        <div class="mb-2">
+          <!-- Location for hub/supplier -->
+          <p v-if="entityLocation" class="text-sm text-white/70 flex items-center gap-1">
+            <Icon name="lucide:map-pin" size="14" />
+            {{ entityLocation }}
+          </p>
+
+          <!-- Price for offer -->
+          <p v-if="entityType === 'offer' && entity?.pricePerUnit" class="text-sm text-white/70 flex items-center gap-1">
+            <Icon name="lucide:tag" size="14" />
+            {{ formatPrice(entity.pricePerUnit) }} {{ entity.currency || 'RUB' }}/{{ entity.unit || 't' }}
+          </p>
+
+          <!-- Supplier for offer (clickable name) -->
+          <button
+            v-if="entityType === 'offer' && entity?.teamUuid"
+            class="text-sm text-primary hover:underline flex items-center gap-1 mt-1"
+            @click="emit('open-info', 'supplier', entity.teamUuid)"
+          >
+            <Icon name="lucide:factory" size="14" />
+            <span v-if="loadingSuppliers" class="loading loading-spinner loading-xs" />
+            <span v-else>{{ supplierDisplayName || $t('catalog.info.supplier') }}</span>
+          </button>
+        </div>
+
+        <!-- KYC Teaser Section (for supplier) -->
+        <section v-if="entityType === 'supplier' && kycTeaser" class="bg-white/5 rounded-lg p-3">
+          <h3 class="text-sm font-semibold text-white/80 mb-2 flex items-center gap-2">
+            <Icon name="lucide:shield-check" size="16" />
+            {{ $t('catalog.info.kycTeaser') }}
+          </h3>
+
+          <div class="flex flex-col gap-2 text-sm">
+            <!-- Company Type -->
+            <div class="flex items-center justify-between">
+              <span class="text-white/60">{{ $t('catalog.info.companyType') }}</span>
+              <span class="text-white">{{ kycTeaser.companyType }}</span>
+            </div>
+
+            <!-- Registration Year -->
+            <div class="flex items-center justify-between">
+              <span class="text-white/60">{{ $t('catalog.info.registrationYear') }}</span>
+              <span class="text-white">{{ kycTeaser.registrationYear }}</span>
+            </div>
+
+            <!-- Status -->
+            <div class="flex items-center justify-between">
+              <span class="text-white/60">{{ $t('catalog.info.status') }}</span>
+              <span :class="kycTeaser.isActive ? 'text-success' : 'text-error'">
+                {{ kycTeaser.isActive ? $t('catalog.info.active') : $t('catalog.info.inactive') }}
+              </span>
+            </div>
+
+            <!-- Sources Count -->
+            <div class="flex items-center justify-between">
+              <span class="text-white/60">{{ $t('catalog.info.sourcesCount') }}</span>
+              <span class="text-white">{{ kycTeaser.sourcesCount }}</span>
+            </div>
+          </div>
+
+          <!-- View Full Profile Button -->
+          <button
+            class="btn btn-ghost btn-xs text-primary mt-3 w-full"
+            @click="emit('open-kyc', kycProfileUuid)"
+          >
+            <Icon name="lucide:external-link" size="14" />
+            {{ $t('catalog.info.viewFullKyc') }}
+          </button>
+        </section>
+
+        <!-- Products Section (for hub/supplier) - hide when product selected -->
+        <section v-if="(entityType === 'hub' || entityType === 'supplier') && !selectedProduct">
+          <h3 class="text-sm font-semibold text-white/80 mb-2 flex items-center gap-2">
+            <Icon name="lucide:package" size="16" />
+            {{ productsSectionTitle }}
+            <span v-if="loadingProducts" class="loading loading-spinner loading-xs" />
+            <span v-else-if="relatedProducts.length > 0" class="text-white/50">({{ relatedProducts.length }})</span>
+          </h3>
+
+          <div v-if="!loadingProducts && relatedProducts.length === 0" class="text-white/50 text-sm py-2">
+            {{ $t('catalog.empty.noProducts') }}
+          </div>
+          <div v-else-if="!loadingProducts" class="flex flex-col gap-2">
+            <div
+              v-for="(product, index) in relatedProducts"
+              :key="product.uuid ?? index"
+              class="relative group"
+            >
+              <ProductCard
+                :product="product"
+                compact
+                selectable
+                @select="onProductSelect(product)"
+              />
+              <button
+                class="absolute -top-2 -right-2 opacity-0 group-hover:opacity-100 transition-opacity rounded-full glass-bright border border-white/30 shadow-lg p-1.5 hover:scale-105"
+                @click.stop="emit('pin', 'product', product)"
+                aria-label="Pin product"
+                title="Pin"
+              >
+                <Icon name="lucide:pin" size="16" class="text-white" />
+              </button>
+            </div>
+          </div>
+        </section>
+
+        <!-- Offers Section (after product selected) -->
+        <section v-if="(entityType === 'hub' || entityType === 'supplier') && selectedProduct">
+          <div class="flex items-center justify-between mb-2">
+            <h3 class="text-sm font-semibold text-white/80 flex items-center gap-2">
+              <Icon name="lucide:shopping-bag" size="16" />
+              {{ $t('catalog.headers.offers') }}
+              <span v-if="loadingOffers" class="loading loading-spinner loading-xs" />
+              <span v-else-if="offersWithPrice.length > 0" class="text-white/50">({{ offersWithPrice.length }})</span>
+            </h3>
+            <button
+              class="flex items-center gap-2 px-2 py-1 rounded-full border border-white/15 bg-white/10 text-xs text-white/80 hover:bg-white/20 transition-colors"
+              @click="emit('select-product', null)"
+            >
+              <Icon name="lucide:package" size="12" />
+              <span class="max-w-32 truncate">{{ selectedProductName }}</span>
+              <Icon name="lucide:x" size="12" />
+            </button>
+          </div>
+
+          <div v-if="!loadingOffers && offersWithPrice.length === 0" class="text-white/50 text-sm py-2">
+            {{ $t('catalog.empty.noOffers') }}
+          </div>
+          <div v-else-if="!loadingOffers" class="flex flex-col gap-2">
+            <OfferResultCard
+              v-for="(offer, index) in offersWithPrice"
+              :key="offer.uuid ?? index"
+              :supplier-name="getOfferSupplierName(offer)"
+              :location-name="offer.country || ''"
+              :product-name="offer.product_name"
+              :price-per-unit="offer.price_per_unit ? Number(offer.price_per_unit) : null"
+              :quantity="offer.quantity"
+              :currency="offer.currency"
+              :unit="offer.unit"
+              :stages="getOfferStages(offer)"
+              :total-time-seconds="offer.routes?.[0]?.total_time_seconds ?? null"
+              @select="onOfferSelect(offer)"
+            />
+          </div>
+        </section>
+
+        <!-- Suppliers Section (for hub only) -->
+        <section v-if="entityType === 'hub' && !selectedProduct">
+          <h3 class="text-sm font-semibold text-white/80 mb-2 flex items-center gap-2">
+            <Icon name="lucide:factory" size="16" />
+            {{ $t('catalog.info.suppliersNearby') }}
+            <span v-if="loadingSuppliers" class="loading loading-spinner loading-xs" />
+            <span v-else-if="relatedSuppliers.length > 0" class="text-white/50">({{ relatedSuppliers.length }})</span>
+          </h3>
+
+          <div v-if="!loadingSuppliers && relatedSuppliers.length === 0" class="text-white/50 text-sm py-2">
+            {{ $t('catalog.info.noSuppliers') }}
+          </div>
+          <div v-else-if="!loadingSuppliers" class="flex flex-col gap-2">
+            <div
+              v-for="(supplier, index) in relatedSuppliers"
+              :key="supplier.uuid ?? index"
+              class="relative group"
+            >
+              <SupplierCard
+                :supplier="supplier"
+                selectable
+                @select="onSupplierSelect(supplier)"
+              />
+              <button
+                class="absolute -top-2 -right-2 opacity-0 group-hover:opacity-100 transition-opacity rounded-full glass-bright border border-white/30 shadow-lg p-1.5 hover:scale-105"
+                @click.stop="emit('pin', 'supplier', supplier)"
+                aria-label="Pin supplier"
+                title="Pin"
+              >
+                <Icon name="lucide:pin" size="16" class="text-white" />
+              </button>
+            </div>
+          </div>
+        </section>
+
+        <!-- Hubs Section (for supplier/offer) -->
+        <section v-if="entityType === 'supplier' || entityType === 'offer'">
+          <h3 class="text-sm font-semibold text-white/80 mb-2 flex items-center gap-2">
+            <Icon name="lucide:warehouse" size="16" />
+            {{ $t('catalog.info.nearestHubs') }}
+            <span v-if="loadingHubs" class="loading loading-spinner loading-xs" />
+            <span v-else-if="relatedHubs.length > 0" class="text-white/50">({{ relatedHubs.length }})</span>
+          </h3>
+
+          <div v-if="!loadingHubs && relatedHubs.length === 0" class="text-white/50 text-sm py-2">
+            {{ $t('catalog.info.noHubs') }}
+          </div>
+          <div v-else-if="!loadingHubs" class="space-y-4">
+            <template v-if="railHubs.length">
+              <div class="grid grid-cols-2 gap-2">
+                <Card padding="small" class="border border-white/10 bg-white/5">
+                  <div class="flex items-center gap-2">
+                    <div class="w-8 h-8 rounded-lg bg-white/10 flex items-center justify-center">
+                      <Icon name="lucide:train-front" size="16" class="text-white/80" />
+                    </div>
+                    <div class="text-sm text-white/80">{{ $t('catalog.info.railHubs') }}</div>
+                  </div>
+                </Card>
+                <div
+                  v-for="(hub, index) in railHubs"
+                  :key="hub.uuid ?? index"
+                  class="relative group"
+                >
+                  <HubCard
+                    :hub="hub"
+                    :origin="originCoords"
+                    selectable
+                    @select="onHubSelect(hub)"
+                  />
+                  <button
+                    class="absolute -top-2 -right-2 opacity-0 group-hover:opacity-100 transition-opacity rounded-full glass-bright border border-white/30 shadow-lg p-1.5 hover:scale-105"
+                    @click.stop="emit('pin', 'hub', hub)"
+                    aria-label="Pin hub"
+                    title="Pin"
+                  >
+                    <Icon name="lucide:pin" size="16" class="text-white" />
+                  </button>
+                </div>
+              </div>
+            </template>
+
+            <template v-if="seaHubs.length">
+              <div class="grid grid-cols-2 gap-2">
+                <Card padding="small" class="border border-white/10 bg-white/5">
+                  <div class="flex items-center gap-2">
+                    <div class="w-8 h-8 rounded-lg bg-white/10 flex items-center justify-center">
+                      <Icon name="lucide:ship" size="16" class="text-white/80" />
+                    </div>
+                    <div class="text-sm text-white/80">{{ $t('catalog.info.seaHubs') }}</div>
+                  </div>
+                </Card>
+                <div
+                  v-for="(hub, index) in seaHubs"
+                  :key="hub.uuid ?? index"
+                  class="relative group"
+                >
+                  <HubCard
+                    :hub="hub"
+                    :origin="originCoords"
+                    selectable
+                    @select="onHubSelect(hub)"
+                  />
+                  <button
+                    class="absolute -top-2 -right-2 opacity-0 group-hover:opacity-100 transition-opacity rounded-full glass-bright border border-white/30 shadow-lg p-1.5 hover:scale-105"
+                    @click.stop="emit('pin', 'hub', hub)"
+                    aria-label="Pin hub"
+                    title="Pin"
+                  >
+                    <Icon name="lucide:pin" size="16" class="text-white" />
+                  </button>
+                </div>
+              </div>
+            </template>
+          </div>
+        </section>
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { InfoEntityType } from '~/composables/useCatalogSearch'
+import type {
+  InfoEntity,
+  InfoProductItem,
+  InfoHubItem,
+  InfoSupplierItem,
+  InfoOfferItem
+} from '~/composables/useCatalogInfo'
+import type { RouteStage } from '~/composables/graphql/public/geo-generated'
+
+const props = defineProps<{
+  entityType: InfoEntityType
+  entityId: string
+  entity: InfoEntity | null
+  relatedProducts?: InfoProductItem[]
+  relatedHubs?: InfoHubItem[]
+  relatedSuppliers?: InfoSupplierItem[]
+  relatedOffers?: InfoOfferItem[]
+  selectedProduct?: string | null
+  currentTab?: string
+  loading?: boolean
+  loadingProducts?: boolean
+  loadingHubs?: boolean
+  loadingSuppliers?: boolean
+  loadingOffers?: boolean
+}>()
+
+const emit = defineEmits<{
+  'close': []
+  'open-info': [type: InfoEntityType, uuid: string]
+  'select-product': [uuid: string | null]
+  'select-offer': [offer: { uuid: string; productUuid?: string | null }]
+  'update:current-tab': [tab: string]
+  'open-kyc': [uuid: string | undefined]
+  'pin': [type: 'product' | 'hub' | 'supplier', item: { uuid?: string | null; name?: string | null }]
+}>()
+
+const { t } = useI18n()
+const { entityColors } = useCatalogSearch()
+
+// Safe accessors for optional arrays
+const relatedProducts = computed(() => props.relatedProducts ?? [])
+const relatedHubs = computed(() => props.relatedHubs ?? [])
+const relatedSuppliers = computed(() => props.relatedSuppliers ?? [])
+const relatedOffers = computed(() => props.relatedOffers ?? [])
+const offersWithPrice = computed(() =>
+  relatedOffers.value.filter(o => o?.price_per_unit != null)
+)
+
+const suppliersByUuid = computed(() => {
+  const map = new Map<string, string>()
+  relatedSuppliers.value.forEach(supplier => {
+    if (supplier?.uuid && supplier?.name) {
+      map.set(supplier.uuid, supplier.name)
+    }
+    if (supplier?.teamUuid && supplier?.name) {
+      map.set(supplier.teamUuid, supplier.name)
+    }
+  })
+  return map
+})
+
+const getOfferSupplierName = (offer: InfoOfferItem) => {
+  if (offer.supplier_name) return offer.supplier_name
+  if (offer.supplier_uuid && suppliersByUuid.value.has(offer.supplier_uuid)) {
+    return suppliersByUuid.value.get(offer.supplier_uuid)
+  }
+  return null
+}
+
+const selectedProductName = computed(() => {
+  if (!props.selectedProduct) return ''
+  const match = relatedProducts.value.find(p => p.uuid === props.selectedProduct)
+  return match?.name || props.selectedProduct.slice(0, 8) + '...'
+})
+
+// Entity name
+const entityName = computed(() => {
+  return props.entity?.name || props.entity?.productName || props.entityId.slice(0, 8) + '...'
+})
+
+// Entity location (address, city, country)
+const entityLocation = computed(() => {
+  if (!props.entity) return null
+  const parts = [props.entity.address, props.entity.city, props.entity.country].filter(Boolean)
+  return parts.length > 0 ? parts.join(', ') : null
+})
+
+const originCoords = computed(() => {
+  const lat = props.entity?.locationLatitude ?? props.entity?.latitude
+  const lon = props.entity?.locationLongitude ?? props.entity?.longitude
+  if (lat == null || lon == null) return null
+  return { latitude: Number(lat), longitude: Number(lon) }
+})
+
+// Products section title based on entity type
+const productsSectionTitle = computed(() => {
+  return props.entityType === 'hub'
+    ? t('catalog.info.productsHere')
+    : t('catalog.info.productsFromSupplier')
+})
+
+// Badge color
+const badgeColor = computed(() => {
+  if (props.entityType === 'hub') return entityColors.hub
+  if (props.entityType === 'supplier') return entityColors.supplier
+  if (props.entityType === 'offer') return entityColors.offer
+  return '#666'
+})
+
+const entityIcon = computed(() => {
+  if (props.entityType === 'hub') return 'lucide:warehouse'
+  if (props.entityType === 'supplier') return 'lucide:factory'
+  if (props.entityType === 'offer') return 'lucide:shopping-bag'
+  return 'lucide:info'
+})
+
+// Supplier name for offer (from entity or relatedSuppliers)
+const supplierDisplayName = computed(() => {
+  if (props.entity?.supplierName) return props.entity.supplierName
+  if (props.entity?.teamName) return props.entity.teamName
+  if (relatedSuppliers.value.length > 0 && relatedSuppliers.value[0]?.name) {
+    return relatedSuppliers.value[0].name
+  }
+  return null
+})
+
+// Format price
+const formatPrice = (price: number | string) => {
+  const num = typeof price === 'string' ? parseFloat(price) : price
+  return new Intl.NumberFormat('ru-RU').format(num)
+}
+
+const railHubs = computed(() =>
+  relatedHubs.value.filter(h => h.transport_types?.includes('rail'))
+)
+
+const seaHubs = computed(() =>
+  relatedHubs.value.filter(h => h.transport_types?.includes('sea'))
+)
+
+// Mock KYC teaser data (will be replaced with real data later)
+const kycTeaser = computed(() => {
+  if (props.entityType !== 'supplier') return null
+  // Mock data for now
+  return {
+    companyType: 'ООО',
+    registrationYear: 2018,
+    isActive: true,
+    sourcesCount: 3
+  }
+})
+
+// KYC Profile UUID - use real if available, otherwise mock for demo
+const MOCK_KYC_UUID = 'demo-kyc-profile'
+const kycProfileUuid = computed(() => {
+  return props.entity?.kycProfileUuid || MOCK_KYC_UUID
+})
+
+// Handlers for selecting related items
+const onProductSelect = (product: InfoProductItem) => {
+  emit('select-product', product.uuid)
+}
+
+const onOfferSelect = (offer: InfoOfferItem) => {
+  if (offer.uuid) {
+    emit('select-offer', { uuid: offer.uuid, productUuid: offer.product_uuid })
+  }
+}
+
+const onHubSelect = (hub: InfoHubItem) => {
+  if (hub.uuid) {
+    emit('open-info', 'hub', hub.uuid)
+  }
+}
+
+const onSupplierSelect = (supplier: InfoSupplierItem) => {
+  if (supplier.uuid) {
+    emit('open-info', 'supplier', supplier.uuid)
+  }
+}
+
+const getOfferStages = (offer: InfoOfferItem) => {
+  const route = offer.routes?.[0]
+  if (!route?.stages) return []
+  return route.stages
+    .filter((stage): stage is NonNullable<RouteStage> => stage !== null)
+    .map(stage => ({
+      transportType: stage.transport_type,
+      distanceKm: stage.distance_km,
+      travelTimeSeconds: stage.travel_time_seconds,
+      fromName: stage.from_name
+    }))
+}
+</script>

app/components/catalog/KycBottomSheet.vue

@@ -0,0 +1,304 @@
+<template>
+  <Transition name="kyc-slide">
+    <div
+      v-if="isOpen"
+      class="fixed inset-x-0 bottom-0 z-50 flex flex-col"
+      style="height: 70vh"
+    >
+      <!-- Backdrop (clickable to close) -->
+      <div
+        class="absolute inset-0 -top-[30vh] bg-black/30"
+        @click="emit('close')"
+      />
+
+      <!-- Sheet content -->
+      <div class="relative flex-1 bg-black/40 backdrop-blur-xl rounded-t-2xl border-t border-white/20 shadow-2xl overflow-hidden">
+        <!-- Header with drag handle and close -->
+        <div class="sticky top-0 z-10 bg-black/30 backdrop-blur-md border-b border-white/10">
+          <div class="flex justify-center py-2">
+            <div class="w-12 h-1.5 bg-white/30 rounded-full" />
+          </div>
+          <div class="flex items-center justify-between px-6 pb-4">
+            <div class="flex items-center gap-3">
+              <div class="w-10 h-10 bg-primary/20 rounded-xl flex items-center justify-center">
+                <Icon name="lucide:building-2" size="24" class="text-primary" />
+              </div>
+              <div>
+                <Text weight="bold" size="lg" class="text-white">{{ companyName }}</Text>
+                <div class="flex items-center gap-2 mt-0.5">
+                  <span class="badge badge-success badge-sm">{{ $t('catalog.info.active') }}</span>
+                  <span class="badge badge-outline badge-sm text-white/60">{{ companyType }}</span>
+                </div>
+              </div>
+            </div>
+            <button class="btn btn-ghost btn-sm btn-circle text-white/60 hover:text-white" @click="emit('close')">
+              <Icon name="lucide:x" size="20" />
+            </button>
+          </div>
+        </div>
+
+        <!-- Scrollable content -->
+        <div class="overflow-y-auto h-[calc(70vh-100px)] px-6 py-4">
+          <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
+            <!-- Left Column -->
+            <div class="flex flex-col gap-4">
+              <!-- Реквизиты -->
+              <div class="bg-white/5 rounded-xl p-4 border border-white/10">
+                <Text weight="semibold" class="text-white mb-3 flex items-center gap-2">
+                  <Icon name="lucide:file-text" size="18" />
+                  Реквизиты
+                </Text>
+                <div class="grid grid-cols-2 gap-3 text-sm">
+                  <div>
+                    <Text tone="muted" size="xs" class="text-white/50">ИНН</Text>
+                    <Text class="text-white font-mono">{{ inn }}</Text>
+                  </div>
+                  <div>
+                    <Text tone="muted" size="xs" class="text-white/50">КПП</Text>
+                    <Text class="text-white font-mono">{{ kpp }}</Text>
+                  </div>
+                  <div>
+                    <Text tone="muted" size="xs" class="text-white/50">ОГРН</Text>
+                    <Text class="text-white font-mono">{{ ogrn }}</Text>
+                  </div>
+                  <div>
+                    <Text tone="muted" size="xs" class="text-white/50">Год регистрации</Text>
+                    <Text class="text-white">{{ registrationYear }}</Text>
+                  </div>
+                </div>
+              </div>
+
+              <!-- Руководство -->
+              <div class="bg-white/5 rounded-xl p-4 border border-white/10">
+                <Text weight="semibold" class="text-white mb-3 flex items-center gap-2">
+                  <Icon name="lucide:user-cog" size="18" />
+                  Руководство
+                </Text>
+                <div class="flex items-center gap-3 p-2 bg-white/5 rounded-lg">
+                  <div class="avatar placeholder">
+                    <div class="w-9 h-9 rounded-full bg-primary text-primary-content text-sm">
+                      <span>{{ directorInitials }}</span>
+                    </div>
+                  </div>
+                  <div>
+                    <Text weight="medium" size="sm" class="text-white">{{ directorName }}</Text>
+                    <Text size="xs" class="text-white/50">Генеральный директор</Text>
+                  </div>
+                </div>
+              </div>
+
+              <!-- Учредители -->
+              <div class="bg-white/5 rounded-xl p-4 border border-white/10">
+                <Text weight="semibold" class="text-white mb-3 flex items-center gap-2">
+                  <Icon name="lucide:users" size="18" />
+                  Учредители
+                </Text>
+                <div class="space-y-2">
+                  <div
+                    v-for="(founder, i) in founders"
+                    :key="i"
+                    class="flex items-center justify-between p-2 bg-white/5 rounded-lg"
+                  >
+                    <div class="flex items-center gap-2">
+                      <div class="avatar placeholder">
+                        <div class="w-8 h-8 rounded-full bg-secondary text-secondary-content text-xs">
+                          <span>{{ founder.initials }}</span>
+                        </div>
+                      </div>
+                      <div>
+                        <Text size="sm" class="text-white">{{ founder.name }}</Text>
+                        <Text size="xs" class="text-white/50">Физ. лицо</Text>
+                      </div>
+                    </div>
+                    <span class="badge badge-primary badge-sm">{{ founder.share }}%</span>
+                  </div>
+                </div>
+                <div class="mt-3 pt-3 border-t border-white/10 flex justify-between">
+                  <Text size="xs" class="text-white/50">Уставный капитал</Text>
+                  <Text weight="semibold" size="sm" class="text-white">{{ authorizedCapital }}</Text>
+                </div>
+              </div>
+            </div>
+
+            <!-- Right Column -->
+            <div class="flex flex-col gap-4">
+              <!-- Контакты -->
+              <div class="bg-white/5 rounded-xl p-4 border border-white/10">
+                <Text weight="semibold" class="text-white mb-3 flex items-center gap-2">
+                  <Icon name="lucide:contact" size="18" />
+                  Контакты
+                </Text>
+                <div class="space-y-2 text-sm">
+                  <div class="flex items-center gap-2 text-white/80">
+                    <Icon name="lucide:map-pin" size="14" class="text-white/50" />
+                    <span>{{ address }}</span>
+                  </div>
+                  <div class="flex items-center gap-2 text-white/80">
+                    <Icon name="lucide:phone" size="14" class="text-white/50" />
+                    <span>{{ phone }}</span>
+                  </div>
+                  <div class="flex items-center gap-2 text-white/80">
+                    <Icon name="lucide:mail" size="14" class="text-white/50" />
+                    <span>{{ email }}</span>
+                  </div>
+                </div>
+              </div>
+
+              <!-- Финансы -->
+              <div class="bg-white/5 rounded-xl p-4 border border-white/10">
+                <Text weight="semibold" class="text-white mb-3 flex items-center gap-2">
+                  <Icon name="lucide:bar-chart-3" size="18" />
+                  Финансы (2024)
+                </Text>
+                <div class="space-y-3">
+                  <div>
+                    <div class="flex justify-between mb-1">
+                      <Text size="xs" class="text-white/50">Выручка</Text>
+                      <Text size="xs" class="text-success">↑ 15%</Text>
+                    </div>
+                    <Text weight="bold" class="text-white">{{ revenue }}</Text>
+                  </div>
+                  <div>
+                    <div class="flex justify-between mb-1">
+                      <Text size="xs" class="text-white/50">Чистая прибыль</Text>
+                      <Text size="xs" class="text-success">↑ 23%</Text>
+                    </div>
+                    <Text weight="bold" class="text-white">{{ profit }}</Text>
+                  </div>
+                  <div class="pt-2 border-t border-white/10 flex justify-between">
+                    <Text size="xs" class="text-white/50">Сотрудников</Text>
+                    <Text weight="medium" size="sm" class="text-white">{{ employees }}</Text>
+                  </div>
+                </div>
+              </div>
+
+              <!-- Арбитраж -->
+              <div class="bg-white/5 rounded-xl p-4 border border-white/10">
+                <Text weight="semibold" class="text-white mb-3 flex items-center gap-2">
+                  <Icon name="lucide:scale" size="18" />
+                  Арбитражные дела
+                </Text>
+                <div class="space-y-2">
+                  <div class="flex items-center justify-between text-sm">
+                    <div class="flex items-center gap-2">
+                      <span class="badge badge-warning badge-xs">Истец</span>
+                      <Text class="text-white/80">{{ arbitration.plaintiff.count }} дела</Text>
+                    </div>
+                    <Text class="text-white">{{ arbitration.plaintiff.amount }}</Text>
+                  </div>
+                  <div class="flex items-center justify-between text-sm">
+                    <div class="flex items-center gap-2">
+                      <span class="badge badge-error badge-xs">Ответчик</span>
+                      <Text class="text-white/80">{{ arbitration.defendant.count }} дело</Text>
+                    </div>
+                    <Text class="text-white">{{ arbitration.defendant.amount }}</Text>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- ОКВЭД (full width) -->
+          <div class="mt-4 bg-white/5 rounded-xl p-4 border border-white/10">
+            <Text weight="semibold" class="text-white mb-3 flex items-center gap-2">
+              <Icon name="lucide:briefcase" size="18" />
+              Виды деятельности (ОКВЭД)
+            </Text>
+            <div class="space-y-2">
+              <div class="flex items-start gap-2 p-2 bg-primary/10 rounded-lg border border-primary/20">
+                <span class="badge badge-primary badge-xs mt-0.5">Осн.</span>
+                <Text size="sm" class="text-white">{{ mainActivity }}</Text>
+              </div>
+              <div
+                v-for="(activity, i) in additionalActivities"
+                :key="i"
+                class="flex items-start gap-2 p-2 bg-white/5 rounded-lg"
+              >
+                <span class="badge badge-ghost badge-xs mt-0.5 text-white/50">Доп.</span>
+                <Text size="sm" class="text-white/80">{{ activity }}</Text>
+              </div>
+            </div>
+          </div>
+
+          <!-- Sources footer -->
+          <div class="mt-4 flex items-center justify-between text-xs text-white/40 px-1">
+            <span class="flex items-center gap-1">
+              <Icon name="lucide:database" size="12" />
+              Источники: ЕГРЮЛ, ФНС, Росстат
+            </span>
+            <span>Обновлено: {{ lastUpdated }}</span>
+          </div>
+
+          <!-- Demo notice -->
+          <div class="mt-4 alert bg-info/20 border border-info/30 text-info text-sm">
+            <Icon name="lucide:info" size="16" />
+            <span>{{ $t('kyc.demo.notice') }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </Transition>
+</template>
+
+<script setup lang="ts">
+const props = defineProps<{
+  isOpen: boolean
+  uuid: string | null
+}>()
+
+const emit = defineEmits<{
+  'close': []
+}>()
+
+// Demo data (will be replaced with real data from API)
+const isDemo = computed(() => props.uuid === 'demo-kyc-profile')
+
+const companyName = computed(() => isDemo.value ? 'ООО "АГРОТОРГ ПЛЮС"' : 'Загрузка...')
+const companyType = computed(() => 'ООО')
+const inn = computed(() => '7707456789')
+const kpp = computed(() => '770701001')
+const ogrn = computed(() => '1157746123456')
+const registrationYear = computed(() => '2015')
+const directorName = computed(() => 'Петров Сергей Александрович')
+const directorInitials = computed(() => 'ПС')
+const founders = computed(() => [
+  { name: 'Петров Сергей Александрович', initials: 'ПС', share: 60 },
+  { name: 'Иванова Анна Петровна', initials: 'ИА', share: 40 }
+])
+const authorizedCapital = computed(() => '500 000 ₽')
+const address = computed(() => 'г. Москва, ул. Складская, д. 15, оф. 301')
+const phone = computed(() => '+7 (495) 123-45-67')
+const email = computed(() => 'info@agrotorg-plus.ru')
+const revenue = computed(() => '245 800 000 ₽')
+const profit = computed(() => '18 450 000 ₽')
+const employees = computed(() => '47 человек')
+const arbitration = computed(() => ({
+  plaintiff: { count: 3, amount: '1 250 000 ₽' },
+  defendant: { count: 1, amount: '320 000 ₽' }
+}))
+const mainActivity = computed(() => '46.21 - Торговля оптовая зерном, семенами и кормами')
+const additionalActivities = computed(() => [
+  '46.11 - Деятельность агентов по оптовой торговле',
+  '52.10 - Деятельность по складированию и хранению'
+])
+const lastUpdated = computed(() => new Date().toLocaleDateString('ru-RU'))
+</script>
+
+<style scoped>
+.kyc-slide-enter-active,
+.kyc-slide-leave-active {
+  transition: transform 0.4s cubic-bezier(0.16, 1, 0.3, 1), opacity 0.3s ease;
+}
+
+.kyc-slide-enter-from,
+.kyc-slide-leave-to {
+  transform: translateY(100%);
+  opacity: 0;
+}
+
+.kyc-slide-enter-to,
+.kyc-slide-leave-from {
+  transform: translateY(0);
+  opacity: 1;
+}
+</style>

app/components/catalog/MapPanel.vue

@@ -0,0 +1,13 @@
+<template>
+  <div class="flex flex-col h-full">
+    <!-- Header: белое стекло (negative margins to expand beyond parent padding) -->
+    <div class="sticky top-0 z-10 -mx-4 -mt-4 px-4 pt-4 pb-3 rounded-t-xl bg-white/90 backdrop-blur-md border-b border-white/20">
+      <slot name="header" />
+    </div>
+
+    <!-- Content: тёмный (negative margins to expand beyond parent padding) -->
+    <div class="flex-1 -mx-4 -mb-4 px-4 pt-3 pb-4 overflow-y-auto">
+      <slot />
+    </div>
+  </div>
+</template>

app/components/catalog/OfferCard.vue

@@ -1,118 +0,0 @@
-<template>
-  <component
-    :is="linkable ? NuxtLink : 'div'"
-    :to="linkable ? localePath(`/catalog/offers/${offer.uuid}`) : undefined"
-    class="block"
-    :class="{ 'cursor-pointer': selectable }"
-    @click="selectable && $emit('select')"
-  >
-    <Card
-      padding="small"
-      :interactive="linkable || selectable"
-      :class="[
-        isSelected && 'ring-2 ring-primary ring-offset-2'
-      ]"
-    >
-      <div class="flex flex-col gap-1">
-        <!-- Product title -->
-        <Text size="base" weight="semibold" class="truncate">{{ offer.productName }}</Text>
-        <!-- Quantity -->
-        <div v-if="offer.quantity" class="flex">
-          <span class="badge badge-neutral badge-dash text-xs">
-            {{ t('catalogOfferCard.labels.quantity_with_unit', { quantity: offer.quantity, unit: displayUnit }) }}
-          </span>
-        </div>
-        <!-- Price -->
-        <div v-if="offer.pricePerUnit" class="font-semibold text-primary text-sm">
-          {{ formatPrice(offer.pricePerUnit, offer.currency) }}/{{ displayUnit }}
-        </div>
-        <!-- Country below -->
-        <Text v-if="!compact" tone="muted" size="sm">
-          {{ countryFlag }} {{ offer.locationCountry || offer.locationName || t('catalogOfferCard.labels.country_unknown') }}
-        </Text>
-      </div>
-    </Card>
-  </component>
-</template>
-
-<script setup lang="ts">
-import { NuxtLink } from '#components'
-
-interface Offer {
-  uuid?: string | null
-  // Product
-  productUuid?: string | null
-  productName?: string | null
-  categoryName?: string | null
-  // Location
-  locationUuid?: string | null
-  locationName?: string | null
-  locationCountry?: string | null
-  locationCountryCode?: string | null
-  // Price
-  quantity?: number | string | null
-  unit?: string | null
-  pricePerUnit?: number | string | null
-  currency?: string | null
-  // Misc
-  status?: string | null
-  validUntil?: string | null
-}
-
-const props = defineProps<{
-  offer: Offer
-  selectable?: boolean
-  isSelected?: boolean
-  compact?: boolean
-}>()
-
-defineEmits<{
-  (e: 'select'): void
-}>()
-
-const localePath = useLocalePath()
-const { t } = useI18n()
-
-const linkable = computed(() => !props.selectable && props.offer.uuid)
-
-const formattedDate = computed(() => {
-  if (!props.offer.validUntil) return ''
-  try {
-    return new Intl.DateTimeFormat('ru', {
-      day: 'numeric',
-      month: 'short'
-    }).format(new Date(props.offer.validUntil))
-  } catch {
-    return props.offer.validUntil
-  }
-})
-
-const formatPrice = (price: number | string | null | undefined, currency: string | null | undefined) => {
-  if (!price) return ''
-  const num = typeof price === 'string' ? parseFloat(price) : price
-  const curr = currency || 'USD'
-  try {
-    return new Intl.NumberFormat('ru', {
-      style: 'currency',
-      currency: curr,
-      maximumFractionDigits: 0
-    }).format(num)
-  } catch {
-    return `${num} ${curr}`
-  }
-}
-
-// ISO code to emoji flag
-const isoToEmoji = (code: string): string => {
-  return code.toUpperCase().split('').map(char => String.fromCodePoint(0x1F1E6 - 65 + char.charCodeAt(0))).join('')
-}
-
-const countryFlag = computed(() => {
-  if (props.offer.locationCountryCode) {
-    return isoToEmoji(props.offer.locationCountryCode)
-  }
-  return '🌍'
-})
-
-const displayUnit = computed(() => props.offer.unit || t('catalogOfferCard.labels.default_unit'))
-</script>

app/components/catalog/OfferResultCard.vue

@@ -0,0 +1,227 @@
+<template>
+  <Card padding="md" interactive :class="groupClass" @click="$emit('select')">
+    <!-- Header: Supplier + Price -->
+    <div class="flex items-start justify-between gap-4">
+      <div class="flex flex-col gap-1">
+        <div class="flex items-center gap-2">
+          <div class="w-6 h-6 rounded-full flex items-center justify-center" style="background-color: #3b82f6">
+            <Icon name="lucide:factory" size="14" class="text-white" />
+          </div>
+          <Text weight="semibold">{{ supplierDisplay }}</Text>
+        </div>
+
+        <div class="flex items-center gap-2 text-sm text-base-content/70">
+          <Icon name="lucide:map-pin" size="14" class="text-base-content/60" />
+          <span>{{ originDisplay }}</span>
+        </div>
+
+        <div v-if="productName" class="flex items-center gap-2 text-sm text-base-content/70">
+          <Icon name="lucide:package" size="14" class="text-base-content/60" />
+          <span>{{ productName }}</span>
+        </div>
+
+        <div v-if="quantityDisplay" class="flex items-center gap-2 text-sm text-base-content/70">
+          <Icon name="lucide:scale" size="14" class="text-base-content/60" />
+          <span>{{ quantityDisplay }}</span>
+        </div>
+      </div>
+
+      <div class="text-right">
+        <Text v-if="priceDisplay" weight="semibold" class="text-primary text-lg">
+          {{ priceDisplay }}
+        </Text>
+        <Text v-if="durationDisplay" size="xs" class="text-base-content/60">
+          {{ t('catalogOfferCard.labels.duration_label') }} {{ durationDisplay }}
+        </Text>
+      </div>
+    </div>
+
+    <!-- Supplier info -->
+    <SupplierInfoBlock v-if="kycProfileUuid" :kyc-profile-uuid="kycProfileUuid" class="mb-3" />
+
+    <!-- Route lines -->
+    <div v-if="routeRows.length" class="mt-3 pt-2 border-t border-base-200/60">
+      <div v-for="(row, index) in routeRows" :key="index" class="flex items-center gap-2 text-sm text-base-content/70">
+        <Icon :name="row.icon" size="14" class="text-base-content/60" />
+        <span>{{ row.distanceLabel }}</span>
+      </div>
+    </div>
+  </Card>
+</template>
+
+<script setup lang="ts">
+interface RouteStage {
+  transportType?: string | null
+  distanceKm?: number | null
+  travelTimeSeconds?: number | null
+  fromName?: string | null
+}
+
+const props = withDefaults(defineProps<{
+  locationName?: string
+  supplierName?: string
+  productName?: string
+  pricePerUnit?: number | null
+  quantity?: number | string | null
+  currency?: string | null
+  unit?: string | null
+  stages?: RouteStage[]
+  totalTimeSeconds?: number | null
+  kycProfileUuid?: string | null
+  grouped?: boolean
+}>(), {
+  stages: () => [],
+  grouped: false
+})
+
+defineEmits<{
+  select: []
+}>()
+
+const { t } = useI18n()
+
+const supplierDisplay = computed(() => {
+  return props.supplierName || t('catalogOfferCard.labels.supplier_unknown')
+})
+
+const originDisplay = computed(() => {
+  const fromStage = props.stages?.find(stage => stage?.fromName)?.fromName
+  return props.locationName || fromStage || t('catalogOfferCard.labels.origin_unknown')
+})
+
+const priceDisplay = computed(() => {
+  if (props.pricePerUnit == null) return null
+  const currSymbol = getCurrencySymbol(props.currency)
+  const unitName = getUnitName(props.unit)
+  const basePrice = Number(props.pricePerUnit)
+  const totalPrice = basePrice + (logisticsCost.value ?? 0)
+  const formattedPrice = totalPrice.toLocaleString()
+  return `${currSymbol}${formattedPrice}/${unitName}`
+})
+
+const quantityDisplay = computed(() => {
+  if (props.quantity == null || props.quantity === '') return null
+  const quantityValue = Number(props.quantity)
+  if (Number.isNaN(quantityValue)) return null
+  const formattedQuantity = quantityValue.toLocaleString()
+  const unitName = getUnitName(props.unit)
+  return t('catalogOfferCard.labels.quantity_with_unit', {
+    quantity: formattedQuantity,
+    unit: unitName
+  })
+})
+
+const getCurrencySymbol = (currency?: string | null) => {
+  switch (currency?.toUpperCase()) {
+    case 'USD': return '$'
+    case 'EUR': return '€'
+    case 'RUB': return '₽'
+    case 'CNY': return '¥'
+    default: return '$'
+  }
+}
+
+const getUnitName = (unit?: string | null) => {
+  switch (unit?.toLowerCase()) {
+    case 'т':
+    case 't':
+    case 'ton':
+    case 'tonne':
+      return t('catalogOfferCard.labels.default_unit')
+    case 'кг':
+    case 'kg':
+      return t('catalogOfferCard.labels.unit_kg')
+    default:
+      return t('catalogOfferCard.labels.default_unit')
+  }
+}
+
+const formatDistance = (km?: number | null) => {
+  if (km == null) return null
+  const formatted = Math.round(km).toLocaleString()
+  return t('catalogOfferCard.labels.distance_km', { km: formatted })
+}
+
+const formatDurationDays = (days?: number | null) => {
+  if (!days) return null
+  const rounded = Math.max(1, Math.ceil(days))
+  return t('catalogOfferCard.labels.duration_days', { days: rounded })
+}
+
+const getTransportIcon = (type?: string | null) => {
+  switch (type) {
+    case 'rail':
+      return 'lucide:train-front'
+    case 'sea':
+      return 'lucide:ship'
+    case 'road':
+    case 'auto':
+    default:
+      return 'lucide:truck'
+  }
+}
+
+const getTransportRate = (type?: string | null) => {
+  switch (type) {
+    case 'rail':
+      return 0.12
+    case 'sea':
+      return 0.06
+    case 'road':
+    case 'auto':
+    default:
+      return 0.22
+  }
+}
+
+const getTransportSpeedPerDay = (type?: string | null) => {
+  switch (type) {
+    case 'rail':
+      return 900
+    case 'sea':
+      return 800
+    case 'road':
+    case 'auto':
+    default:
+      return 600
+  }
+}
+
+const logisticsCost = computed(() => {
+  if (!props.stages?.length) return null
+  return props.stages.reduce((sum, stage) => {
+    const km = stage?.distanceKm
+    if (km == null) return sum
+    return sum + km * getTransportRate(stage?.transportType) + 40
+  }, 0)
+})
+
+const totalDurationDays = computed(() => {
+  if (!props.stages?.length) return null
+  const stageDays = props.stages.reduce((sum, stage) => {
+    const km = stage?.distanceKm
+    if (km == null) return sum
+    return sum + km / getTransportSpeedPerDay(stage?.transportType)
+  }, 0)
+  const transfers = Math.max(0, props.stages.length - 1) * 0.5
+  const buffer = 1
+  return stageDays + transfers + buffer
+})
+
+const durationDisplay = computed(() => formatDurationDays(totalDurationDays.value))
+
+const groupClass = computed(() => {
+  if (!props.grouped) return ''
+  return 'rounded-none shadow-none hover:shadow-none'
+})
+
+const routeRows = computed(() =>
+  (props.stages || [])
+    .filter(stage => stage?.distanceKm != null)
+    .map(stage => ({
+      icon: getTransportIcon(stage?.transportType),
+      distanceLabel: formatDistance(stage?.distanceKm)
+    }))
+    .filter(row => !!row.distanceLabel)
+)
+</script>

app/components/catalog/OffersBreadcrumbs.vue

@@ -0,0 +1,51 @@
+<template>
+  <div class="breadcrumbs text-sm">
+    <ul>
+      <li v-for="(crumb, index) in breadcrumbs" :key="index">
+        <NuxtLink v-if="crumb.to" :to="crumb.to" class="hover:text-primary">
+          {{ crumb.label }}
+        </NuxtLink>
+        <span v-else class="text-base-content">{{ crumb.label }}</span>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script setup lang="ts">
+const props = defineProps<{
+  productId?: string
+  productName?: string
+  hubId?: string
+  hubName?: string
+}>()
+
+const localePath = useLocalePath()
+const { t } = useI18n()
+
+const breadcrumbs = computed(() => {
+  const crumbs: Array<{ label: string; to?: string }> = []
+
+  // Catalog root
+  crumbs.push({
+    label: t('breadcrumbs.products', 'Products'),
+    to: localePath('/catalog?select=product')
+  })
+
+  // Product
+  if (props.productId) {
+    crumbs.push({
+      label: props.productName || `#${props.productId.slice(0, 8)}...`,
+      to: props.hubId ? localePath(`/catalog?product=${props.productId}`) : undefined
+    })
+  }
+
+  // Hub
+  if (props.hubId) {
+    crumbs.push({
+      label: props.hubName || `#${props.hubId.slice(0, 8)}...`
+    })
+  }
+
+  return crumbs
+})
+</script>

app/components/catalog/OrderDetailBottomSheet.vue

@@ -0,0 +1,391 @@
+<template>
+  <Transition name="order-slide">
+    <div
+      v-if="isOpen && orderUuid"
+      class="fixed inset-x-0 bottom-0 z-50 flex justify-center px-3 md:px-4"
+      style="height: 72vh"
+    >
+      <!-- Backdrop (clickable to close) -->
+      <div
+        class="absolute inset-0 -top-[32vh] bg-gradient-to-t from-black/45 via-black/20 to-transparent"
+        @click="emit('close')"
+      />
+
+      <!-- Sheet content -->
+      <div class="relative flex w-full max-w-[980px] flex-col overflow-hidden rounded-t-[2rem] border border-white/60 bg-base-100/95 shadow-[0_-24px_70px_rgba(15,23,42,0.3)] backdrop-blur-xl">
+        <!-- Header with drag handle and close -->
+        <div class="sticky top-0 z-10 border-b border-base-300 bg-base-100/90">
+          <div class="flex justify-center py-2">
+            <div class="h-1.5 w-12 rounded-full bg-base-content/20" />
+          </div>
+          <div class="flex items-center justify-between px-6 pb-4">
+            <template v-if="hasOrderError">
+              <div class="flex-1">
+                <div class="font-black text-base-content">{{ t('common.error') }}</div>
+                <div class="text-sm text-base-content/60">{{ orderError }}</div>
+              </div>
+            </template>
+
+            <template v-else-if="!isLoadingOrder && order">
+              <div class="flex items-center gap-3 flex-1 min-w-0">
+                <div class="flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-xl bg-primary/15">
+                  <Icon name="lucide:package" size="24" class="text-primary" />
+                </div>
+                <div class="min-w-0">
+                  <div class="truncate text-xl font-black text-base-content">{{ orderTitle }}</div>
+                  <div class="mt-0.5 flex items-center gap-2">
+                    <span class="badge badge-primary badge-sm">#{{ order.name }}</span>
+                    <span v-if="order.status" class="badge badge-outline badge-sm">{{ order.status }}</span>
+                  </div>
+                </div>
+              </div>
+            </template>
+
+            <template v-else>
+              <div class="flex items-center gap-3 flex-1">
+                <div class="h-10 w-10 animate-pulse rounded-xl bg-base-300/70" />
+                <div class="flex-1">
+                  <div class="h-5 w-48 animate-pulse rounded bg-base-300/70" />
+                  <div class="mt-1 h-4 w-32 animate-pulse rounded bg-base-300/70" />
+                </div>
+              </div>
+            </template>
+
+            <button class="btn btn-ghost btn-sm btn-circle flex-shrink-0 text-base-content/60 hover:text-base-content" @click="emit('close')">
+              <Icon name="lucide:x" size="20" />
+            </button>
+          </div>
+        </div>
+
+        <!-- Error state -->
+        <div v-if="hasOrderError" class="px-6 py-8 text-center">
+          <div class="mb-4 text-base-content/70">{{ orderError }}</div>
+          <button class="btn btn-sm btn-outline" @click="loadOrder">
+            {{ t('ordersDetail.errors.retry') }}
+          </button>
+        </div>
+
+        <!-- Scrollable content -->
+        <div v-else-if="order" class="h-[calc(72vh-110px)] overflow-y-auto px-6 py-4 space-y-4">
+          <!-- Order meta -->
+          <div class="flex flex-wrap gap-2 text-sm">
+            <span v-for="(meta, idx) in orderMeta" :key="idx" class="rounded-full border border-base-300 bg-base-200 px-3 py-1 text-base-content/70">
+              {{ meta }}
+            </span>
+          </div>
+
+          <!-- Route stages -->
+          <div v-if="orderStageItems.length" class="rounded-2xl border border-base-300 bg-base-100 p-4">
+            <div class="mb-3 flex items-center gap-2 text-base-content">
+              <Icon name="lucide:route" size="18" />
+              <span class="text-lg font-black">{{ t('ordersDetail.sections.stages.title', 'Маршрут') }}</span>
+            </div>
+            <div class="space-y-3">
+              <div
+                v-for="(stage, idx) in orderStageItems"
+                :key="stage.key || idx"
+                class="flex gap-3"
+              >
+                <div class="flex flex-col items-center">
+                  <div class="h-3 w-3 rounded-full bg-primary" />
+                  <div v-if="idx < orderStageItems.length - 1" class="my-1 w-0.5 flex-1 bg-base-300" />
+                </div>
+                <div class="flex-1 pb-3">
+                  <div class="text-sm font-bold text-base-content">{{ stage.from }}</div>
+                  <div v-if="stage.to && stage.to !== stage.from" class="mt-0.5 text-xs text-base-content/60">
+                    → {{ stage.to }}
+                  </div>
+                  <div v-if="stage.meta?.length" class="mt-1 text-xs text-base-content/50">
+                    {{ stage.meta.join(' · ') }}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- Timeline -->
+          <div v-if="order.stages?.length" class="rounded-2xl border border-base-300 bg-base-100 p-4">
+            <div class="mb-3 flex items-center gap-2 text-base-content">
+              <Icon name="lucide:calendar" size="18" />
+              <span class="text-lg font-black">{{ t('ordersDetail.sections.timeline.title') }}</span>
+            </div>
+            <GanttTimeline
+              :stages="order.stages"
+              :showLoading="true"
+              :showUnloading="true"
+            />
+          </div>
+
+          <!-- Map preview (small) -->
+          <div v-if="orderRoutesForMap.length" class="rounded-2xl border border-base-300 bg-base-100 p-4">
+            <div class="mb-3 flex items-center gap-2 text-base-content">
+              <Icon name="lucide:map" size="18" />
+              <span class="text-lg font-black">{{ t('ordersDetail.sections.map.title', 'Карта') }}</span>
+            </div>
+            <RequestRoutesMap :routes="orderRoutesForMap" :height="200" />
+          </div>
+        </div>
+
+        <!-- Loading state -->
+        <div v-else class="px-6 py-4 space-y-4">
+          <div class="h-20 animate-pulse rounded-xl bg-base-300/70" />
+          <div class="h-32 animate-pulse rounded-xl bg-base-300/70" />
+          <div class="h-48 animate-pulse rounded-xl bg-base-300/70" />
+        </div>
+      </div>
+    </div>
+  </Transition>
+</template>
+
+<script setup lang="ts">
+import { GetOrderDocument, type GetOrderQueryResult } from '~/composables/graphql/team/orders-generated'
+import type { RouteStageItem } from '~/components/RouteStagesList.vue'
+
+// Types from GraphQL
+type OrderType = NonNullable<GetOrderQueryResult['getOrder']>
+type StageType = NonNullable<NonNullable<OrderType['stages']>[number]>
+type CompanyType = NonNullable<StageType['selectedCompany']>
+
+const props = defineProps<{
+  isOpen: boolean
+  orderUuid: string | null
+}>()
+
+const emit = defineEmits<{
+  'close': []
+}>()
+
+const { t } = useI18n()
+
+const order = ref<OrderType | null>(null)
+const isLoadingOrder = ref(false)
+const hasOrderError = ref(false)
+const orderError = ref('')
+
+// Load order when uuid changes
+watch(() => props.orderUuid, async (uuid) => {
+  if (uuid && props.isOpen) {
+    await loadOrder()
+  }
+}, { immediate: true })
+
+// Also load when opening
+watch(() => props.isOpen, async (open) => {
+  if (open && props.orderUuid) {
+    await loadOrder()
+  } else if (!open) {
+    // Reset state when closing
+    order.value = null
+    hasOrderError.value = false
+    orderError.value = ''
+  }
+})
+
+const orderTitle = computed(() => {
+  const source = order.value?.sourceLocationName || t('ordersDetail.labels.source_unknown')
+  const destination = order.value?.destinationLocationName || t('ordersDetail.labels.destination_unknown')
+  return `${source} → ${destination}`
+})
+
+const orderMeta = computed(() => {
+  const meta: string[] = []
+
+  const line = order.value?.orderLines?.[0]
+  if (line?.quantity) {
+    meta.push(`${line.quantity} ${line.unit || t('ordersDetail.labels.unit_tons')}`)
+  }
+  if (line?.productName) {
+    meta.push(line.productName)
+  }
+  if (order.value?.totalAmount) {
+    meta.push(formatPrice(order.value.totalAmount, order.value?.currency))
+  }
+
+  const durationDays = getOrderDuration()
+  if (durationDays) {
+    meta.push(`${durationDays} ${t('ordersDetail.labels.delivery_days')}`)
+  }
+
+  return meta
+})
+
+const orderRoutesForMap = computed(() => {
+  const stages = (order.value?.stages || [])
+    .filter((stage): stage is StageType => stage !== null)
+    .map((stage) => {
+      if (stage.stageType === 'transport') {
+        if (!stage.sourceLatitude || !stage.sourceLongitude || !stage.destinationLatitude || !stage.destinationLongitude) return null
+        return {
+          fromLat: stage.sourceLatitude,
+          fromLon: stage.sourceLongitude,
+          fromName: stage.sourceLocationName,
+          toLat: stage.destinationLatitude,
+          toLon: stage.destinationLongitude,
+          toName: stage.destinationLocationName,
+          transportType: stage.transportType
+        }
+      }
+      return null
+    })
+    .filter(Boolean)
+
+  if (!stages.length) return []
+  return [{ stages }]
+})
+
+// Company summary type
+interface CompanySummary {
+  name: string | null | undefined
+  totalWeight: number
+  tripsCount: number
+  company: CompanyType | null | undefined
+}
+
+const orderStageItems = computed<RouteStageItem[]>(() => {
+  return (order.value?.stages || [])
+    .filter((stage): stage is StageType => stage !== null)
+    .map((stage) => {
+      const isTransport = stage.stageType === 'transport'
+      const from = isTransport ? stage.sourceLocationName : stage.locationName
+      const to = isTransport ? stage.destinationLocationName : stage.locationName
+
+      const meta: string[] = []
+      const dateRange = getStageDateRange(stage)
+      if (dateRange) {
+        meta.push(dateRange)
+      }
+
+      const companies = getCompaniesSummary(stage)
+      companies.forEach((company: CompanySummary) => {
+        meta.push(
+          `${company.name} · ${company.totalWeight || 0}${t('ordersDetail.labels.weight_unit')} · ${company.tripsCount || 0} ${t('ordersDetail.labels.trips')}`
+        )
+      })
+
+      return {
+        key: stage.uuid ?? undefined,
+        from: from ?? undefined,
+        to: to ?? undefined,
+        label: stage.name ?? undefined,
+        meta
+      }
+    })
+})
+
+const loadOrder = async () => {
+  if (!props.orderUuid) return
+
+  try {
+    isLoadingOrder.value = true
+    hasOrderError.value = false
+    const { data, error: orderErrorResp } = await useServerQuery('order-detail-sheet', GetOrderDocument, { orderUuid: props.orderUuid }, 'team', 'orders')
+    if (orderErrorResp.value) throw orderErrorResp.value
+    order.value = data.value?.getOrder ?? null
+  } catch (err: unknown) {
+    hasOrderError.value = true
+    orderError.value = err instanceof Error ? err.message : t('ordersDetail.errors.load_failed')
+  } finally {
+    isLoadingOrder.value = false
+  }
+}
+
+const formatPrice = (price: number, currency?: string | null) => {
+  if (!price) return t('ordersDetail.labels.price_zero')
+  return new Intl.NumberFormat('ru-RU', {
+    style: 'currency',
+    currency: currency || 'RUB',
+    minimumFractionDigits: 0
+  }).format(price)
+}
+
+const getCompaniesSummary = (stage: StageType): CompanySummary[] => {
+  const companies: CompanySummary[] = []
+  if (stage.stageType === 'service' && stage.selectedCompany) {
+    companies.push({
+      name: stage.selectedCompany.name,
+      totalWeight: 0,
+      tripsCount: 0,
+      company: stage.selectedCompany
+    })
+    return companies
+  }
+
+  if (stage.stageType === 'transport' && stage.trips?.length) {
+    const companiesMap = new Map<string, CompanySummary>()
+    stage.trips.forEach((trip) => {
+      if (!trip) return
+      const companyName = trip.company?.name || t('ordersDetail.labels.company_unknown')
+      const weight = trip.plannedWeight || 0
+      if (companiesMap.has(companyName)) {
+        const existing = companiesMap.get(companyName)!
+        existing.totalWeight += weight
+        existing.tripsCount += 1
+      } else {
+        companiesMap.set(companyName, {
+          name: companyName,
+          totalWeight: weight,
+          tripsCount: 1,
+          company: trip.company
+        })
+      }
+    })
+    return Array.from(companiesMap.values())
+  }
+  return []
+}
+
+const getOrderDuration = () => {
+  if (!order.value?.stages?.length) return 0
+  let minDate: Date | null = null
+  let maxDate: Date | null = null
+  order.value.stages.forEach((stage) => {
+    if (!stage) return
+    stage.trips?.forEach((trip) => {
+      if (!trip) return
+      const startDate = new Date(trip.plannedLoadingDate || trip.actualLoadingDate || '')
+      const endDate = new Date(trip.plannedUnloadingDate || trip.actualUnloadingDate || '')
+      if (!minDate || startDate < minDate) minDate = startDate
+      if (!maxDate || endDate > maxDate) maxDate = endDate
+    })
+  })
+  if (!minDate || !maxDate) return 0
+  const diffTime = Math.abs((maxDate as Date).getTime() - (minDate as Date).getTime())
+  return Math.ceil(diffTime / (1000 * 60 * 60 * 24))
+}
+
+const getStageDateRange = (stage: StageType) => {
+  if (!stage.trips?.length) return t('ordersDetail.labels.dates_undefined')
+  let minDate: Date | null = null
+  let maxDate: Date | null = null
+  stage.trips.forEach((trip) => {
+    if (!trip) return
+    const startDate = new Date(trip.plannedLoadingDate || trip.actualLoadingDate || '')
+    const endDate = new Date(trip.plannedUnloadingDate || trip.actualUnloadingDate || '')
+    if (!minDate || startDate < minDate) minDate = startDate
+    if (!maxDate || endDate > maxDate) maxDate = endDate
+  })
+  if (!minDate || !maxDate) return t('ordersDetail.labels.dates_undefined')
+  const formatDate = (date: Date) => date.toLocaleDateString('ru-RU', { day: 'numeric', month: 'short' })
+  if ((minDate as Date).toDateString() === (maxDate as Date).toDateString()) return formatDate(minDate as Date)
+  return `${formatDate(minDate as Date)} - ${formatDate(maxDate as Date)}`
+}
+</script>
+
+<style scoped>
+.order-slide-enter-active,
+.order-slide-leave-active {
+  transition: transform 0.4s cubic-bezier(0.16, 1, 0.3, 1), opacity 0.3s ease;
+}
+
+.order-slide-enter-from,
+.order-slide-leave-to {
+  transform: translateY(100%);
+  opacity: 0;
+}
+
+.order-slide-enter-to,
+.order-slide-leave-from {
+  transform: translateY(0);
+  opacity: 1;
+}
+</style>

app/components/catalog/ProductCard.vue

@@ -9,17 +9,59 @@
     <Card
       padding="sm"
       :interactive="linkable || selectable"
+      class="relative overflow-hidden"
       :class="[
         isSelected && 'ring-2 ring-primary ring-offset-2'
       ]"
     >
-      <Stack gap="2">
+      <!-- Sparkline background -->
-        <Stack gap="1">
+      <div v-if="effectivePriceHistory.length > 1" class="absolute inset-0 opacity-15">
-          <Text size="base" weight="semibold">{{ product.name }}</Text>
+        <ClientOnly>
-          <Text tone="muted">{{ product.categoryName || t('catalogProduct.labels.category_unknown') }}</Text>
+          <apexchart
-        </Stack>
+            type="area"
-        <Text v-if="product.description && !compact" tone="muted" size="sm">{{ product.description }}</Text>
+            height="100%"
-      </Stack>
+            :options="chartOptions"
+            :series="chartSeries"
+          />
+        </ClientOnly>
+      </div>
+
+      <!-- Content -->
+      <div class="relative z-10">
+        <div class="flex items-start gap-3">
+          <!-- Product icon -->
+          <div class="w-10 h-10 shrink-0 bg-primary/10 text-primary rounded-lg flex items-center justify-center">
+            <Icon name="lucide:package" size="20" />
+          </div>
+
+          <!-- Info -->
+          <div class="min-w-0 flex-1">
+            <div class="flex items-center justify-between gap-2 mb-1">
+              <Text size="base" weight="semibold" class="truncate">{{ product.name }}</Text>
+              <span
+                v-if="trend !== 0"
+                class="text-xs font-medium shrink-0"
+                :class="trend > 0 ? 'text-success' : 'text-error'"
+              >
+                {{ trend > 0 ? '↑' : '↓' }} {{ Math.abs(trend) }}%
+              </span>
+            </div>
+
+            <div class="flex items-center justify-between gap-2">
+              <Text v-if="product.offersCount" tone="muted" size="sm">
+                {{ product.offersCount }} {{ t('catalog.offers', product.offersCount) }}
+              </Text>
+              <Text v-if="effectivePrice" size="sm" class="text-primary font-bold shrink-0">
+                {{ formattedPrice }}
+              </Text>
+            </div>
+
+            <Text v-if="product.description && !compact" tone="muted" size="sm" class="mt-1">
+              {{ product.description }}
+            </Text>
+          </div>
+        </div>
+      </div>
     </Card>
   </component>
 </template>
@@ -30,16 +72,21 @@ import { NuxtLink } from '#components'
 interface Product {
   uuid?: string | null
   name?: string | null
-  categoryName?: string | null
   description?: string | null
+  offersCount?: number | null
 }
 
-const props = defineProps<{
+const props = withDefaults(defineProps<{
   product: Product
   selectable?: boolean
   isSelected?: boolean
   compact?: boolean
-}>()
+  priceHistory?: number[]
+  currentPrice?: number | null
+  currency?: string | null
+}>(), {
+  priceHistory: () => []
+})
 
 defineEmits<{
   (e: 'select'): void
@@ -48,5 +95,84 @@ defineEmits<{
 const localePath = useLocalePath()
 const { t } = useI18n()
 
-const linkable = computed(() => !props.selectable && props.product.uuid)
+const linkable = computed(() => !props.selectable && !!props.product.uuid)
+
+// Generate mock price history based on uuid for consistency
+const effectivePriceHistory = computed(() => {
+  if (props.priceHistory && props.priceHistory.length > 0) {
+    return props.priceHistory
+  }
+  if (!props.product.uuid) return []
+  const seed = props.product.uuid.split('').reduce((acc, char) => acc + char.charCodeAt(0), 0)
+  const basePrice = 100 + (seed % 200)
+  return Array.from({ length: 7 }, (_, i) => {
+    const variation = Math.sin(seed + i * 0.5) * 20 + Math.cos(seed * 0.3 + i) * 10
+    return Math.round(basePrice + variation)
+  })
+})
+
+// Effective price - use provided or last from history
+const effectivePrice = computed(() => {
+  if (props.currentPrice) return props.currentPrice
+  if (effectivePriceHistory.value.length > 0) {
+    return effectivePriceHistory.value[effectivePriceHistory.value.length - 1]
+  }
+  return null
+})
+
+// Price formatting
+const formattedPrice = computed(() => {
+  if (!effectivePrice.value) return ''
+  const symbol = getCurrencySymbol(props.currency)
+  return `${symbol}${effectivePrice.value.toLocaleString()}`
+})
+
+const getCurrencySymbol = (currency?: string | null) => {
+  switch (currency?.toUpperCase()) {
+    case 'USD': return '$'
+    case 'EUR': return '€'
+    case 'RUB': return '₽'
+    case 'CNY': return '¥'
+    default: return '$'
+  }
+}
+
+// Calculate trend from price history
+const trend = computed(() => {
+  if (effectivePriceHistory.value.length < 2) return 0
+  const first = effectivePriceHistory.value[0]
+  const last = effectivePriceHistory.value[effectivePriceHistory.value.length - 1]
+  if (!first || first === 0 || !last) return 0
+  return Math.round(((last - first) / first) * 100)
+})
+
+// Chart configuration
+const chartOptions = computed(() => ({
+  chart: {
+    type: 'area',
+    sparkline: { enabled: true },
+    animations: { enabled: false }
+  },
+  stroke: {
+    curve: 'smooth',
+    width: 2
+  },
+  fill: {
+    type: 'gradient',
+    gradient: {
+      shadeIntensity: 1,
+      opacityFrom: 0.4,
+      opacityTo: 0.1
+    }
+  },
+  colors: [trend.value >= 0 ? '#22c55e' : '#ef4444'],
+  tooltip: { enabled: false },
+  xaxis: { labels: { show: false } },
+  yaxis: { labels: { show: false } }
+}))
+
+const chartSeries = computed(() => [{
+  name: 'Price',
+  data: effectivePriceHistory.value.length > 0 ? effectivePriceHistory.value : [0]
+}])
 </script>

app/components/catalog/QuoteForm.vue

@@ -0,0 +1,71 @@
+<template>
+  <div class="flex flex-col gap-4">
+    <h3 class="font-semibold text-lg">{{ $t('catalog.quote.title') }}</h3>
+
+    <!-- Quantity input -->
+    <div class="form-control">
+      <label class="label py-1">
+        <span class="label-text text-xs text-base-content/70">{{ $t('catalog.filters.quantity') }}</span>
+      </label>
+      <input
+        v-model="localQuantity"
+        type="number"
+        :placeholder="$t('catalog.quote.enterQty')"
+        class="input input-bordered input-sm"
+        min="1"
+        @blur="emit('update-quantity', localQuantity)"
+        @keyup.enter="emit('update-quantity', localQuantity)"
+      />
+    </div>
+
+    <!-- Action buttons -->
+    <div class="flex gap-2 mt-2">
+      <button
+        class="btn btn-primary flex-1"
+        :disabled="!canSearch"
+        @click="emit('search')"
+      >
+        <Icon name="lucide:search" size="16" />
+        {{ $t('catalog.quote.search') }}
+      </button>
+      <button
+        v-if="hasAnyFilter"
+        class="btn btn-ghost btn-sm"
+        @click="emit('clear-all')"
+      >
+        {{ $t('catalog.quote.clear') }}
+      </button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+const props = defineProps<{
+  productId?: string
+  productLabel?: string
+  hubId?: string
+  hubLabel?: string
+  supplierId?: string
+  supplierLabel?: string
+  quantity?: string
+  canSearch: boolean
+}>()
+
+const emit = defineEmits<{
+  'edit-filter': [type: string]
+  'remove-filter': [type: string]
+  'update-quantity': [value: string]
+  'search': []
+  'clear-all': []
+}>()
+
+const localQuantity = ref(props.quantity || '')
+
+watch(() => props.quantity, (newVal) => {
+  localQuantity.value = newVal || ''
+})
+
+const hasAnyFilter = computed(() => {
+  return !!(props.productId || props.hubId || props.supplierId || props.quantity)
+})
+</script>

app/components/catalog/QuotePanel.vue

@@ -0,0 +1,148 @@
+<template>
+  <div class="flex flex-col h-full">
+    <!-- Header -->
+    <div class="flex-shrink-0 p-4 border-b border-white/10">
+      <div class="flex items-center justify-between">
+        <h3 class="font-semibold text-base text-white">{{ $t('catalog.headers.offers') }}</h3>
+        <span class="badge badge-neutral">{{ totalOffers }}</span>
+      </div>
+    </div>
+
+    <!-- Content (scrollable) -->
+    <div class="flex-1 overflow-y-auto p-4">
+      <div v-if="loading" class="flex items-center justify-center py-8">
+        <span class="loading loading-spinner loading-md text-white" />
+      </div>
+
+      <div v-else-if="offersWithPrice.length === 0" class="text-center py-8 text-white/60">
+        <Icon name="lucide:search-x" size="32" class="mb-2" />
+        <p>{{ $t('catalog.empty.noOffers') }}</p>
+      </div>
+
+<div v-else class="flex flex-col gap-3">
+  <div
+    v-for="group in offerGroups"
+    :key="group.id"
+    class="flex flex-col gap-0"
+  >
+    <div
+      v-if="group.offers.length > 1"
+      class="rounded-2xl overflow-hidden border border-base-200/60 divide-y divide-base-200/60"
+    >
+      <div
+        v-for="offer in group.offers"
+        :key="offer.uuid"
+        class="cursor-pointer"
+        @click="emit('select-offer', offer)"
+      >
+        <OfferResultCard
+          grouped
+          :supplier-name="offer.supplier_name"
+          :location-name="offer.country || ''"
+          :product-name="offer.product_name"
+          :price-per-unit="offer.price_per_unit ? Number(offer.price_per_unit) : null"
+          :quantity="offer.quantity"
+          :currency="offer.currency"
+          :unit="offer.unit"
+          :stages="getOfferStages(offer)"
+          :total-time-seconds="offer.routes?.[0]?.total_time_seconds ?? null"
+        />
+      </div>
+    </div>
+
+    <div
+      v-else
+      v-for="offer in group.offers"
+      :key="offer.uuid"
+      class="cursor-pointer"
+      @click="emit('select-offer', offer)"
+    >
+      <OfferResultCard
+        :supplier-name="offer.supplier_name"
+        :location-name="offer.country || ''"
+        :product-name="offer.product_name"
+        :price-per-unit="offer.price_per_unit ? Number(offer.price_per_unit) : null"
+        :quantity="offer.quantity"
+        :currency="offer.currency"
+        :unit="offer.unit"
+        :stages="getOfferStages(offer)"
+        :total-time-seconds="offer.routes?.[0]?.total_time_seconds ?? null"
+      />
+    </div>
+  </div>
+</div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+interface Offer {
+  uuid: string
+  product_name?: string | null
+  product_uuid?: string | null
+  supplier_name?: string | null
+  supplier_uuid?: string | null
+  quantity?: number | string | null
+  unit?: string | null
+  price_per_unit?: number | string | null
+  currency?: string | null
+  country?: string | null
+  country_code?: string | null
+  routes?: Array<{
+    total_time_seconds?: number | null
+    stages?: Array<{
+      transport_type?: string | null
+      distance_km?: number | null
+      travel_time_seconds?: number | null
+      from_name?: string | null
+    } | null> | null
+  } | null> | null
+}
+
+interface OfferGroup {
+  id: string
+  offers: Offer[]
+}
+
+const emit = defineEmits<{
+  'select-offer': [offer: Offer]
+}>()
+
+const props = defineProps<{
+  loading: boolean
+  offers: Offer[]
+  calculations?: OfferGroup[]
+}>()
+
+const offersWithPrice = computed(() =>
+  (props.offers || []).filter(o => o?.price_per_unit != null)
+)
+
+const totalOffers = computed(() => {
+  if (props.calculations?.length) {
+    return props.calculations.reduce((sum, calc) => sum + (calc.offers?.length || 0), 0)
+  }
+  return props.offers.length
+})
+
+const offerGroups = computed<OfferGroup[]>(() => {
+  if (props.calculations?.length) return props.calculations
+  return offersWithPrice.value.map(offer => ({
+    id: offer.uuid,
+    offers: [offer]
+  }))
+})
+
+const getOfferStages = (offer: Offer) => {
+  const route = offer.routes?.[0]
+  if (!route?.stages) return []
+  return route.stages
+    .filter((stage): stage is NonNullable<typeof stage> => stage !== null)
+    .map((stage) => ({
+      transportType: stage.transport_type,
+      distanceKm: stage.distance_km,
+      travelTimeSeconds: stage.travel_time_seconds,
+      fromName: stage.from_name
+    }))
+}
+</script>

app/components/catalog/RouteStepper.vue

@@ -0,0 +1,83 @@
+<template>
+  <div class="flex items-center w-full py-2">
+    <!-- Start node -->
+    <div class="flex flex-col items-center shrink-0">
+      <div class="w-3 h-3 rounded-full bg-primary border-2 border-primary"></div>
+      <Text v-if="startName" size="xs" tone="muted" class="mt-1 max-w-16 truncate text-center">{{ startName }}</Text>
+    </div>
+
+    <!-- Stages (line + transport icon + distance -> node) -->
+    <template v-for="(stage, i) in stages" :key="i">
+      <!-- Line segment with transport icon and distance -->
+      <div class="flex-1 flex flex-col items-center mx-1 min-w-12">
+        <!-- Line with icon in the middle -->
+        <div class="flex items-center w-full">
+          <div class="h-0.5 bg-primary/60 flex-1"></div>
+          <span class="px-1.5 text-sm" :title="getTransportName(stage.transportType)">
+            {{ getTransportIcon(stage.transportType) }}
+          </span>
+          <div class="h-0.5 bg-primary/60 flex-1"></div>
+        </div>
+        <!-- Distance label -->
+        <Text size="xs" tone="muted" class="mt-0.5 whitespace-nowrap">
+          {{ formatDistance(stage.distanceKm) }} км
+        </Text>
+      </div>
+
+      <!-- Intermediate/End node -->
+      <div class="flex flex-col items-center shrink-0">
+        <div
+          class="rounded-full border-2"
+          :class="i === stages.length - 1 ? 'w-3 h-3 bg-success border-success' : 'w-2.5 h-2.5 bg-base-100 border-primary'"
+        ></div>
+        <Text v-if="i === stages.length - 1 && endName" size="xs" tone="muted" class="mt-1 max-w-16 truncate text-center">
+          {{ endName }}
+        </Text>
+      </div>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+export interface RouteStage {
+  transportType?: string | null
+  distanceKm?: number | null
+}
+
+defineProps<{
+  stages: RouteStage[]
+  startName?: string
+  endName?: string
+}>()
+
+const getTransportIcon = (type?: string | null) => {
+  switch (type) {
+    case 'rail':
+      return '🚂'
+    case 'sea':
+      return '🚢'
+    case 'road':
+    case 'auto':
+    default:
+      return '🚛'
+  }
+}
+
+const getTransportName = (type?: string | null) => {
+  switch (type) {
+    case 'rail':
+      return 'Ж/Д'
+    case 'sea':
+      return 'Море'
+    case 'road':
+    case 'auto':
+    default:
+      return 'Авто'
+  }
+}
+
+const formatDistance = (km?: number | null) => {
+  if (!km) return '0'
+  return Math.round(km).toLocaleString()
+}
+</script>

app/components/catalog/SelectionPanel.vue

@@ -0,0 +1,197 @@
+<template>
+  <div class="flex flex-col h-full">
+    <!-- Header -->
+    <div class="flex-shrink-0 p-4 border-b border-white/10">
+      <div class="flex items-center justify-between mb-3">
+        <h3 class="font-semibold text-base text-white">{{ title }}</h3>
+        <button class="btn btn-ghost btn-xs btn-circle text-white/60 hover:text-white" @click="emit('close')">
+          <Icon name="lucide:x" size="16" />
+        </button>
+      </div>
+    </div>
+
+    <!-- Content (scrollable) -->
+    <div class="flex-1 overflow-y-auto p-4">
+      <div v-if="loading" class="flex items-center justify-center py-8">
+        <span class="loading loading-spinner loading-md text-white" />
+      </div>
+
+      <div v-else-if="items.length === 0" class="text-center py-8 text-white/60">
+        <Icon name="lucide:search-x" size="32" class="mb-2" />
+        <p>{{ $t('catalog.empty.noResults') }}</p>
+      </div>
+
+      <div v-else class="flex flex-col gap-2">
+        <!-- Products -->
+        <template v-if="selectMode === 'product'">
+          <div
+            v-for="(item, index) in items"
+            :key="item.uuid ?? index"
+            class="relative group"
+            @mouseenter="emit('hover', item.uuid ?? null)"
+            @mouseleave="emit('hover', null)"
+          >
+            <ProductCard
+              :product="item"
+              selectable
+              compact
+              @select="onSelect(item)"
+            />
+            <button
+              class="absolute -top-2 -right-2 opacity-0 group-hover:opacity-100 transition-opacity rounded-full glass-bright border border-white/30 shadow-lg p-1.5 hover:scale-105"
+              @click.stop="emit('pin', 'product', item)"
+              aria-label="Pin product"
+              title="Pin"
+            >
+              <Icon name="lucide:pin" size="16" class="text-white" />
+            </button>
+          </div>
+        </template>
+
+        <!-- Hubs -->
+        <template v-else-if="selectMode === 'hub'">
+          <div
+            v-for="(item, index) in items"
+            :key="item.uuid ?? index"
+            class="relative group"
+            @mouseenter="emit('hover', item.uuid ?? null)"
+            @mouseleave="emit('hover', null)"
+          >
+            <HubCard
+              :hub="item"
+              selectable
+              @select="onSelect(item)"
+            />
+            <button
+              class="absolute -top-2 -right-2 opacity-0 group-hover:opacity-100 transition-opacity rounded-full glass-bright border border-white/30 shadow-lg p-1.5 hover:scale-105"
+              @click.stop="emit('pin', 'hub', item)"
+              aria-label="Pin hub"
+              title="Pin"
+            >
+              <Icon name="lucide:pin" size="16" class="text-white" />
+            </button>
+          </div>
+        </template>
+
+        <!-- Suppliers -->
+        <template v-else-if="selectMode === 'supplier'">
+          <div
+            v-for="(item, index) in items"
+            :key="item.uuid ?? index"
+            class="relative group"
+            @mouseenter="emit('hover', item.uuid ?? null)"
+            @mouseleave="emit('hover', null)"
+          >
+            <SupplierCard
+              :supplier="item"
+              selectable
+              @select="onSelect(item)"
+            />
+            <button
+              class="absolute -top-2 -right-2 opacity-0 group-hover:opacity-100 transition-opacity rounded-full glass-bright border border-white/30 shadow-lg p-1.5 hover:scale-105"
+              @click.stop="emit('pin', 'supplier', item)"
+              aria-label="Pin supplier"
+              title="Pin"
+            >
+              <Icon name="lucide:pin" size="16" class="text-white" />
+            </button>
+          </div>
+        </template>
+
+        <!-- Infinite scroll sentinel -->
+        <div
+          v-if="hasMore"
+          ref="loadMoreSentinel"
+          class="flex items-center justify-center py-4"
+        >
+          <span v-if="loadingMore" class="loading loading-spinner loading-sm text-white/60" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { SelectMode } from '~/composables/useCatalogSearch'
+
+interface Item {
+  uuid?: string | null
+  name?: string | null
+  country?: string | null
+}
+
+const props = defineProps<{
+  selectMode: SelectMode
+  products?: Item[]
+  hubs?: Item[]
+  suppliers?: Item[]
+  loading?: boolean
+  loadingMore?: boolean
+  hasMore?: boolean
+}>()
+
+const emit = defineEmits<{
+  'select': [type: string, item: Item]
+  'close': []
+  'load-more': []
+  'hover': [uuid: string | null]
+  'pin': [type: 'product' | 'hub' | 'supplier', item: Item]
+}>()
+
+const { t } = useI18n()
+
+const loadMoreSentinel = ref<HTMLElement | null>(null)
+
+// Infinite scroll using IntersectionObserver
+let observer: IntersectionObserver | null = null
+
+onMounted(() => {
+  observer = new IntersectionObserver(
+    (entries) => {
+      const entry = entries[0]
+      if (entry?.isIntersecting && props.hasMore && !props.loadingMore) {
+        emit('load-more')
+      }
+    },
+    { threshold: 0.1 }
+  )
+})
+
+watch(loadMoreSentinel, (el) => {
+  if (el && observer) {
+    observer.observe(el)
+  }
+})
+
+onUnmounted(() => {
+  if (observer) {
+    observer.disconnect()
+    observer = null
+  }
+})
+
+const title = computed(() => {
+  switch (props.selectMode) {
+    case 'product': return t('catalog.headers.selectProduct')
+    case 'hub': return t('catalog.headers.selectHub')
+    case 'supplier': return t('catalog.headers.selectSupplier')
+    default: return ''
+  }
+})
+
+const items = computed(() => {
+  switch (props.selectMode) {
+    case 'product': return props.products || []
+    case 'hub': return props.hubs || []
+    case 'supplier': return props.suppliers || []
+    default: return []
+  }
+})
+
+// Select item and emit
+const onSelect = (item: Item) => {
+  if (props.selectMode && item.uuid) {
+    emit('select', props.selectMode, item)
+  }
+}
+</script>

app/components/catalog/SupplierCard.vue

@@ -1,7 +1,7 @@
 <template>
   <component
     :is="linkable ? NuxtLink : 'div'"
-    :to="linkable ? localePath(`/catalog/suppliers/${supplier.teamUuid || supplier.uuid}`) : undefined"
+    :to="linkable ? localePath(`/catalog?supplier=${supplier.uuid}`) : undefined"
     class="block"
     :class="{ 'cursor-pointer': selectable }"
     @click="selectable && $emit('select')"
@@ -13,29 +13,41 @@
         isSelected && 'ring-2 ring-primary ring-offset-2'
       ]"
     >
-      <div class="flex flex-col gap-1">
+      <div class="flex flex-col gap-3">
-        <!-- Logo -->
+        <!-- Top row: Info + Logo (logo on right) -->
-        <div v-if="supplier.logo" class="w-12 h-12 mb-1">
+        <div class="flex gap-3 items-start">
-          <img :src="supplier.logo" :alt="supplier.name || ''" class="w-full h-full object-contain rounded">
+          <!-- Info (left) -->
+          <div class="min-w-0 flex-1">
+            <!-- Name with verified badge -->
+            <div class="flex items-center gap-1.5">
+              <span v-if="supplier.isVerified" class="text-primary text-sm">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-4 h-4">
+                  <path fill-rule="evenodd" d="M8.603 3.799A4.49 4.49 0 0 1 12 2.25c1.357 0 2.573.6 3.397 1.549a4.49 4.49 0 0 1 3.498 1.307 4.491 4.491 0 0 1 1.307 3.497A4.49 4.49 0 0 1 21.75 12a4.49 4.49 0 0 1-1.549 3.397 4.491 4.491 0 0 1-1.307 3.497 4.491 4.491 0 0 1-3.497 1.307A4.49 4.49 0 0 1 12 21.75a4.49 4.49 0 0 1-3.397-1.549 4.49 4.49 0 0 1-3.498-1.306 4.491 4.491 0 0 1-1.307-3.498A4.49 4.49 0 0 1 2.25 12c0-1.357.6-2.573 1.549-3.397a4.49 4.49 0 0 1 1.307-3.497 4.49 4.49 0 0 1 3.497-1.307Zm7.007 6.387a.75.75 0 1 0-1.22-.872l-3.236 4.53L9.53 12.22a.75.75 0 0 0-1.06 1.06l2.25 2.25a.75.75 0 0 0 1.14-.094l3.75-5.25Z" clip-rule="evenodd" />
+                </svg>
+              </span>
+              <Text size="base" weight="semibold" class="truncate">{{ supplier.name }}</Text>
+            </div>
+            <!-- Country -->
+            <Text tone="muted" size="sm">
+              {{ countryFlag }} {{ supplier.country || t('catalogMap.labels.country_unknown') }}
+            </Text>
+          </div>
+
+          <!-- Logo (right) -->
+          <div v-if="supplier.logo" class="w-12 h-12 shrink-0">
+            <img :src="supplier.logo" :alt="supplier.name || ''" class="w-full h-full object-contain rounded">
+          </div>
+          <div v-else class="w-12 h-12 shrink-0 bg-primary/10 text-primary font-bold rounded flex items-center justify-center text-lg">
+            {{ supplier.name?.charAt(0) }}
+          </div>
         </div>
-        <div v-else class="w-12 h-12 bg-primary/10 text-primary font-bold rounded flex items-center justify-center text-lg mb-1">
+
-          {{ supplier.name?.charAt(0) }}
+        <!-- Bottom row: Badges/Chips -->
-        </div>
-        <!-- Title -->
-        <Text size="base" weight="semibold" class="truncate">{{ supplier.name }}</Text>
-        <!-- Badges -->
         <div class="flex flex-wrap gap-1">
-          <span v-if="supplier.isVerified" class="badge badge-neutral badge-dash text-xs">
+          <span v-if="reliabilityLabel" class="badge badge-neutral badge-sm">
-            {{ t('catalogSupplier.badges.verified') }}
-          </span>
-          <span class="badge badge-neutral badge-dash text-xs">
             {{ reliabilityLabel }}
           </span>
         </div>
-        <!-- Country below -->
-        <Text tone="muted" size="sm">
-          {{ countryFlag }} {{ supplier.country || t('catalogMap.labels.country_unknown') }}
-        </Text>
       </div>
     </Card>
   </component>
@@ -69,7 +81,7 @@ defineEmits<{
 const localePath = useLocalePath()
 const { t } = useI18n()
 
-const linkable = computed(() => !props.selectable && (props.supplier.teamUuid || props.supplier.uuid))
+const linkable = computed(() => !props.selectable && !!props.supplier.uuid)
 
 const reliabilityLabel = computed(() => {
   if (props.supplier.onTimeRate !== undefined && props.supplier.onTimeRate !== null) {

app/components/catalog/SuppliersBreadcrumbs.vue

@@ -0,0 +1,63 @@
+<template>
+  <div class="breadcrumbs text-sm">
+    <ul>
+      <li v-for="(crumb, index) in breadcrumbs" :key="index">
+        <NuxtLink v-if="crumb.to" :to="crumb.to" class="hover:text-primary">
+          {{ crumb.label }}
+        </NuxtLink>
+        <span v-else class="text-base-content">{{ crumb.label }}</span>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script setup lang="ts">
+const props = defineProps<{
+  supplierId?: string
+  supplierName?: string
+  productId?: string
+  productName?: string
+  hubId?: string
+  hubName?: string
+}>()
+
+const localePath = useLocalePath()
+const { t } = useI18n()
+
+const breadcrumbs = computed(() => {
+  const crumbs: Array<{ label: string; to?: string }> = []
+
+  // Suppliers list
+  crumbs.push({
+    label: t('breadcrumbs.suppliers', 'Suppliers'),
+    to: localePath('/catalog?select=supplier')
+  })
+
+  // Supplier
+  if (props.supplierId) {
+    const hasNext = props.productId
+    crumbs.push({
+      label: props.supplierName || `#${props.supplierId.slice(0, 8)}...`,
+      to: hasNext ? localePath(`/catalog?supplier=${props.supplierId}`) : undefined
+    })
+  }
+
+  // Product
+  if (props.productId) {
+    const hasNext = props.hubId
+    crumbs.push({
+      label: props.productName || `#${props.productId.slice(0, 8)}...`,
+      to: hasNext ? localePath(`/catalog?supplier=${props.supplierId}&product=${props.productId}`) : undefined
+    })
+  }
+
+  // Hub
+  if (props.hubId) {
+    crumbs.push({
+      label: props.hubName || `#${props.hubId.slice(0, 8)}...`
+    })
+  }
+
+  return crumbs
+})
+</script>

app/components/hero/HeroBackground.vue

@@ -0,0 +1,34 @@
+<template>
+  <div class="absolute inset-0 overflow-hidden bg-slate-900">
+    <!-- Lottie animation -->
+    <ClientOnly>
+      <DotLottieVue
+        src="/animations/supply-chain.lottie"
+        autoplay
+        loop
+        :layout="{ fit: 'cover', align: [0.5, 0.5] }"
+        class="absolute top-0 left-0 w-full"
+        :style="{
+          height: '100vh',
+          opacity: 1 - collapseProgress * 0.7,
+          transform: `scale(${1 + collapseProgress * 0.1})`
+        }"
+      />
+    </ClientOnly>
+
+    <!-- Overlay for text readability - only when hero starts collapsing -->
+    <div
+      v-if="collapseProgress > 0.5"
+      class="absolute inset-0 bg-gradient-to-b from-slate-900/60 via-slate-900/40 to-slate-900/70"
+      :style="{ opacity: (collapseProgress - 0.5) * 2 }"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { DotLottieVue } from '@lottiefiles/dotlottie-vue'
+
+defineProps<{
+  collapseProgress: number
+}>()
+</script>

app/components/navigation/MainNavigation.vue

@@ -1,71 +1,295 @@
 <template>
-  <header class="sticky top-0 z-40 bg-base-100 border-b border-base-300">
+  <header
-    <div class="relative flex items-center h-16 px-4 lg:px-6">
+    class="relative overflow-hidden"
-      <!-- Left: Logo -->
+    :class="headerClasses"
-      <div class="flex items-center">
+    :style="{ height: `${height}px` }"
-        <NuxtLink :to="localePath('/')" class="flex items-center gap-2">
+  >
-          <span class="font-bold text-xl">Optovia</span>
+    <div class="absolute top-0 left-0 right-0 pointer-events-none glass-topfade" :style="glassStyle" />
-        </NuxtLink>
+    <!-- Single row: Logo + Search + Icons -->
+    <div
+      class="relative z-10 flex px-4 lg:px-6 gap-4"
+      :class="isHeroLayout ? 'items-start pt-4' : 'items-center'"
+      :style="rowStyle"
+    >
+      <!-- Left: Logo + AI button + Nav links (top aligned) -->
+      <div class="flex items-center flex-shrink-0 rounded-full glass-bright">
+        <div class="flex items-center gap-2 px-4 py-2">
+          <NuxtLink :to="localePath('/')" class="flex items-center gap-2">
+            <span class="font-bold text-xl" :class="useWhiteText ? 'text-white' : 'text-base-content'">Optovia</span>
+          </NuxtLink>
+          <button
+            class="w-8 h-8 rounded-full flex items-center justify-center transition-colors"
+            :class="[
+              useWhiteText
+                ? (chatOpen ? 'bg-white/20 text-white' : 'text-white/70 hover:text-white hover:bg-white/10')
+                : (chatOpen ? 'bg-base-300 text-base-content' : 'text-base-content/70 hover:text-base-content hover:bg-base-200')
+            ]"
+            aria-label="Toggle AI assistant"
+            @click="$emit('toggle-chat')"
+          >
+            <Icon name="lucide:bot" size="18" />
+          </button>
+        </div>
+
+        <!-- Service nav links -->
+        <div v-if="showModeToggle" class="w-px h-6 bg-white/20 self-center" />
+        <div v-if="showModeToggle" class="flex items-center px-3 py-2">
+          <nav class="flex items-center gap-1">
+            <button
+              class="px-3 py-1 text-sm font-medium rounded-full transition-colors"
+              :class="showActiveMode && catalogMode === 'explore' && !isClientArea
+                ? (useWhiteText ? 'bg-white/20 text-white' : 'bg-base-300 text-base-content')
+                : (useWhiteText ? 'text-white/70 hover:text-white hover:bg-white/10' : 'text-base-content/70 hover:text-base-content hover:bg-base-200')"
+              @click="$emit('set-catalog-mode', 'explore')"
+            >
+              {{ $t('catalog.modes.explore') }}
+            </button>
+            <button
+              class="px-3 py-1 text-sm font-medium rounded-full transition-colors"
+              :class="showActiveMode && catalogMode === 'quote' && !isClientArea
+                ? (useWhiteText ? 'bg-white/20 text-white' : 'bg-base-300 text-base-content')
+                : (useWhiteText ? 'text-white/70 hover:text-white hover:bg-white/10' : 'text-base-content/70 hover:text-base-content hover:bg-base-200')"
+              @click="$emit('set-catalog-mode', 'quote')"
+            >
+              {{ $t('catalog.modes.quote') }}
+            </button>
+            <!-- Role switcher: Я клиент + dropdown -->
+            <div v-if="loggedIn" class="flex items-center">
+              <NuxtLink
+                :to="localePath(currentRole === 'SELLER' ? '/clientarea/offers' : '/clientarea/orders')"
+                class="px-3 py-1 text-sm font-medium rounded-lg transition-colors"
+                :class="isClientArea
+                  ? (useWhiteText ? 'bg-white/20 text-white' : 'bg-base-300 text-base-content')
+                  : (useWhiteText ? 'text-white/70 hover:text-white hover:bg-white/10' : 'text-base-content/70 hover:text-base-content hover:bg-base-200')"
+              >
+                {{ currentRole === 'SELLER' ? $t('cabinetNav.roles.seller') : $t('cabinetNav.roles.client') }}
+              </NuxtLink>
+
+              <!-- Dropdown для переключения роли (если есть обе роли) -->
+              <div v-if="hasMultipleRoles" class="dropdown dropdown-end">
+                <button
+                  tabindex="0"
+                  class="p-1 ml-0.5 transition-colors"
+                  :class="useWhiteText ? 'text-white/50 hover:text-white' : 'text-base-content/50 hover:text-base-content'"
+                >
+                  <Icon name="lucide:chevron-down" size="14" />
+                </button>
+                <ul tabindex="0" class="dropdown-content menu bg-base-100 rounded-box z-50 w-48 p-2 shadow-lg border border-base-300">
+                  <li>
+                    <a
+                      :class="{ active: currentRole === 'BUYER' }"
+                      @click="$emit('switch-role', 'BUYER')"
+                    >
+                      {{ $t('cabinetNav.roles.client') }}
+                    </a>
+                  </li>
+                  <li>
+                    <a
+                      :class="{ active: currentRole === 'SELLER' }"
+                      @click="$emit('switch-role', 'SELLER')"
+                    >
+                      {{ $t('cabinetNav.roles.seller') }}
+                    </a>
+                  </li>
+                </ul>
+              </div>
+            </div>
+          </nav>
+        </div>
       </div>
 
-      <!-- Center: Main tabs (absolutely centered on page) -->
+      <!-- Center: Search input OR Client Area tabs (vertically centered) -->
-      <nav class="hidden md:flex items-center gap-1 absolute left-1/2 -translate-x-1/2">
+      <div
-        <NuxtLink
+        class="flex-1 flex flex-col items-center max-w-2xl mx-auto gap-2 transition-all"
-          v-for="tab in visibleTabs"
+        :class="isHeroLayout ? 'justify-start' : 'justify-center'"
-          :key="tab.key"
+        :style="centerStyle"
-          :to="localePath(tab.path)"
+      >
-          class="px-4 py-2 rounded-full font-medium text-sm transition-colors hover:bg-base-200"
+        <!-- Hero slot for home page title -->
-          :class="{ 'bg-base-200 text-primary': isActiveTab(tab.key) }"
+        <slot name="hero" />
-        >
-          {{ tab.label }}
-        </NuxtLink>
-      </nav>
 
-      <!-- Right: AI + Globe + Team + User -->
+        <!-- Client Area tabs -->
-      <div class="flex items-center gap-2 ml-auto">
+        <template v-if="isClientArea">
-        <!-- AI Assistant button -->
+          <div class="flex items-center gap-1 rounded-full glass-bright p-1">
-        <NuxtLink :to="localePath('/clientarea/ai')" class="btn btn-ghost btn-circle">
+            <!-- BUYER tabs -->
-          <Icon name="lucide:bot" size="20" />
+            <template v-if="currentRole !== 'SELLER'">
-        </NuxtLink>
-
-        <!-- Globe (language/currency) dropdown -->
-        <div class="dropdown dropdown-end">
-          <button tabindex="0" class="btn btn-ghost btn-circle">
-            <Icon name="lucide:globe" size="20" />
-          </button>
-          <div tabindex="0" class="dropdown-content bg-base-100 rounded-box z-50 w-52 p-4 shadow-lg border border-base-300">
-            <div class="font-semibold mb-2">{{ $t('common.language') }}</div>
-            <div class="flex gap-2 mb-4">
               <NuxtLink
-                v-for="loc in locales"
+                :to="localePath('/clientarea/orders')"
-                :key="loc.code"
+                class="px-4 py-2 rounded-full text-sm font-medium transition-colors whitespace-nowrap"
-                :to="switchLocalePath(loc.code)"
+                :class="isClientAreaTabActive('/clientarea/orders') ? 'bg-primary text-primary-content' : 'text-base-content/70 hover:text-base-content hover:bg-base-200/50'"
-                class="btn btn-sm"
-                :class="locale === loc.code ? 'btn-primary' : 'btn-ghost'"
               >
-                {{ loc.code.toUpperCase() }}
+                {{ $t('cabinetNav.orders') }}
               </NuxtLink>
-            </div>
+              <NuxtLink
-            <div class="font-semibold mb-2">{{ $t('common.theme') }}</div>
+                :to="localePath('/clientarea/addresses')"
+                class="px-4 py-2 rounded-full text-sm font-medium transition-colors whitespace-nowrap"
+                :class="isClientAreaTabActive('/clientarea/addresses') ? 'bg-primary text-primary-content' : 'text-base-content/70 hover:text-base-content hover:bg-base-200/50'"
+              >
+                {{ $t('cabinetNav.addresses') }}
+              </NuxtLink>
+            </template>
+
+            <!-- SELLER tabs -->
+            <template v-else>
+              <NuxtLink
+                :to="localePath('/clientarea/offers')"
+                class="px-4 py-2 rounded-full text-sm font-medium transition-colors whitespace-nowrap"
+                :class="isClientAreaTabActive('/clientarea/offers') ? 'bg-primary text-primary-content' : 'text-base-content/70 hover:text-base-content hover:bg-base-200/50'"
+              >
+                {{ $t('cabinetNav.myOffers') }}
+              </NuxtLink>
+            </template>
+          </div>
+        </template>
+
+        <!-- Quote mode: Simple segmented input with search inside (white glass) -->
+        <template v-else-if="catalogMode === 'quote'">
+          <div class="flex items-center w-full rounded-full glass-bright overflow-hidden">
+            <!-- Product segment -->
             <button
-              class="btn btn-sm btn-ghost w-full justify-start"
+              class="flex-1 px-4 py-2 text-left hover:bg-base-200/50 rounded-l-full transition-colors min-w-0"
-              @click="$emit('toggle-theme')"
+              @click="$emit('edit-token', 'product')"
             >
-              <Icon :name="theme === 'night' ? 'lucide:sun' : 'lucide:moon'" size="16" />
+              <div class="text-xs text-base-content/60">{{ $t('catalog.filters.product') }}</div>
-              {{ theme === 'night' ? $t('common.theme_light') : $t('common.theme_dark') }}
+              <div class="font-medium truncate text-base-content">{{ productLabel || $t('catalog.quote.selectProduct') }}</div>
             </button>
+            <div class="w-px h-8 bg-white/20 self-center" />
+            <!-- Hub segment -->
+            <button
+              class="flex-1 px-4 py-2 text-left hover:bg-base-200/50 transition-colors min-w-0"
+              @click="$emit('edit-token', 'hub')"
+            >
+              <div class="text-xs text-base-content/60">{{ $t('catalog.filters.hub') }}</div>
+              <div class="font-medium truncate text-base-content">{{ hubLabel || $t('catalog.quote.selectHub') }}</div>
+            </button>
+            <div class="w-px h-8 bg-white/20 self-center" />
+            <!-- Quantity segment (inline input) -->
+            <div class="flex-1 px-4 py-2 min-w-0">
+              <div class="text-xs text-base-content/60">{{ $t('catalog.filters.quantity') }}</div>
+              <div class="flex items-center gap-1">
+                <input
+                  v-model="localQuantity"
+                  type="number"
+                  min="0"
+                  step="0.1"
+                  placeholder="—"
+                  class="w-16 font-medium bg-transparent outline-none text-base-content [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+                  @blur="$emit('update-quantity', localQuantity)"
+                  @keyup.enter="$emit('update-quantity', localQuantity)"
+                />
+                <span v-if="localQuantity" class="text-base-content/60 text-sm">{{ $t('units.t') }}</span>
+              </div>
+            </div>
+            <!-- Search button inside -->
+            <button
+              class="btn btn-primary btn-circle m-1"
+              :disabled="!canSearch"
+              @click="$emit('search')"
+            >
+              <Icon name="lucide:search" size="18" />
+            </button>
+          </div>
+        </template>
+
+        <!-- Explore mode: Regular pill input + chips (white glass) -->
+        <template v-else>
+          <!-- Big pill input -->
+          <div
+            class="flex items-center gap-3 w-full px-5 py-3 rounded-full glass-bright focus-within:border-primary focus-within:ring-2 focus-within:ring-primary/20 transition-all cursor-text"
+            @click="focusInput"
+          >
+            <Icon name="lucide:search" size="22" class="text-primary flex-shrink-0" />
+
+            <!-- Tokens + input inline (no wrap to prevent height change) -->
+            <div class="flex items-center gap-2 flex-1 min-w-0 overflow-hidden">
+              <!-- Active filter tokens (outline style with icon in circle) -->
+              <div
+                v-for="token in activeTokens"
+                :key="token.type"
+                class="flex items-center gap-1.5 px-2.5 py-1.5 rounded-full border-2 cursor-pointer hover:opacity-80 transition-all flex-shrink-0"
+                :style="{ borderColor: getTokenColor(token.type), color: getTokenColor(token.type) }"
+                @click.stop="$emit('edit-token', token.type)"
+              >
+                <span
+                  class="w-5 h-5 rounded-full flex items-center justify-center flex-shrink-0"
+                  :style="{ backgroundColor: getTokenColor(token.type) }"
+                >
+                  <Icon :name="getTokenIcon(token.type)" size="12" class="text-white" />
+                </span>
+                <span class="max-w-28 truncate font-medium text-sm">{{ token.label }}</span>
+                <button
+                  class="hover:text-error ml-0.5"
+                  @click.stop="$emit('remove-token', token.type)"
+                >
+                  <Icon name="lucide:x" size="14" />
+                </button>
+              </div>
+
+              <!-- Search input -->
+              <input
+                ref="inputRef"
+                v-model="localSearchQuery"
+                type="text"
+                :placeholder="placeholder"
+                class="flex-1 min-w-32 bg-transparent outline-none text-lg text-base-content placeholder:text-base-content/50"
+                @input="$emit('update:search-query', localSearchQuery)"
+              />
+            </div>
+          </div>
+        </template>
+      </div>
+
+      <!-- Right: Globe + Team + User (top aligned like logo) -->
+      <div class="flex items-center flex-shrink-0 rounded-full glass-bright">
+        <div class="w-px h-6 bg-white/20 self-center" />
+        <div class="flex items-center px-2 py-2">
+          <!-- Globe (language/currency) dropdown -->
+          <div class="dropdown dropdown-end">
+            <button
+              tabindex="0"
+              class="w-8 h-8 rounded-full flex items-center justify-center transition-colors"
+              :class="useWhiteText ? 'text-white/70 hover:text-white hover:bg-white/10' : 'text-base-content/70 hover:text-base-content hover:bg-base-200'"
+            >
+              <Icon name="lucide:globe" size="18" />
+            </button>
+            <div tabindex="0" class="dropdown-content bg-base-100 rounded-box z-50 w-52 p-4 shadow-lg border border-base-300">
+              <div class="font-semibold mb-2">{{ $t('common.language') }}</div>
+              <div class="flex gap-2 mb-4">
+                <NuxtLink
+                  v-for="loc in locales"
+                  :key="loc.code"
+                  :to="switchLocalePath(loc.code)"
+                  class="btn btn-sm"
+                  :class="locale === loc.code ? 'btn-primary' : 'btn-ghost'"
+                >
+                  {{ loc.code.toUpperCase() }}
+                </NuxtLink>
+              </div>
+              <div class="font-semibold mb-2">{{ $t('common.theme') }}</div>
+              <button
+                class="btn btn-sm btn-ghost w-full justify-start"
+                @click="$emit('toggle-theme')"
+              >
+                <Icon :name="theme === 'night' ? 'lucide:sun' : 'lucide:moon'" size="16" />
+                {{ theme === 'night' ? $t('common.theme_light') : $t('common.theme_dark') }}
+              </button>
+            </div>
           </div>
         </div>
 
         <!-- Team dropdown -->
-        <template v-if="loggedIn && userData?.teams?.length">
+        <div v-if="loggedIn && userData?.teams?.length" class="w-px h-6 bg-white/20 self-center" />
+        <div v-if="loggedIn && userData?.teams?.length" class="flex items-center px-2 py-2">
           <div class="dropdown dropdown-end">
-            <button tabindex="0" class="btn btn-ghost gap-2">
+            <button
-              <Icon name="lucide:building-2" size="18" />
+              tabindex="0"
-              <span class="hidden sm:inline max-w-32 truncate">
+              class="h-8 flex items-center gap-1 px-2 rounded-lg transition-colors"
+              :class="useWhiteText ? 'text-white/70 hover:text-white hover:bg-white/10' : 'text-base-content/70 hover:text-base-content hover:bg-base-200'"
+            >
+              <Icon name="lucide:building-2" size="16" />
+              <span class="hidden lg:inline max-w-24 truncate text-xs">
                 {{ userData?.activeTeam?.name || $t('common.selectTeam') }}
               </span>
-              <Icon name="lucide:chevron-down" size="14" />
+              <Icon name="lucide:chevron-down" size="12" />
             </button>
             <ul tabindex="0" class="dropdown-content menu bg-base-100 rounded-box z-50 w-56 p-2 shadow-lg border border-base-300">
               <li class="menu-title"><span>{{ $t('common.teams') }}</span></li>
@@ -86,21 +310,26 @@
               </li>
             </ul>
           </div>
-        </template>
+        </div>
 
         <!-- User menu -->
-        <template v-if="sessionChecked">
+        <div v-if="sessionChecked" class="w-px h-6 bg-white/20 self-center" />
+        <div v-if="sessionChecked" class="flex items-center px-2 py-2">
           <template v-if="loggedIn">
             <div class="dropdown dropdown-end">
-              <div tabindex="0" role="button" class="btn btn-ghost btn-circle avatar">
+              <div
-                <div class="w-10 rounded-full">
+                tabindex="0"
-                  <div v-if="userAvatarSvg" v-html="userAvatarSvg" class="w-full h-full" />
+                role="button"
-                  <div
+                class="w-8 h-8 rounded-full overflow-hidden ring-2 transition-all cursor-pointer"
-                    v-else
+                :class="useWhiteText ? 'ring-white/20 hover:ring-white/40' : 'ring-base-300 hover:ring-primary'"
-                    class="w-full h-full bg-primary flex items-center justify-center text-primary-content font-bold text-sm"
+              >
-                  >
+                <div v-if="userAvatarSvg" v-html="userAvatarSvg" class="w-full h-full" />
-                    {{ userInitials }}
+                <div
-                  </div>
+                  v-else
+                  class="w-full h-full flex items-center justify-center font-bold text-xs"
+                  :class="useWhiteText ? 'bg-white/20 text-white' : 'bg-base-300 text-base-content'"
+                >
+                  {{ userInitials }}
                 </div>
               </div>
               <ul
@@ -127,37 +356,34 @@
             </div>
           </template>
           <template v-else>
-            <button @click="$emit('sign-in')" class="btn btn-primary btn-sm">
+            <button
+              @click="$emit('sign-in')"
+              class="px-4 py-1.5 rounded-full text-sm font-medium transition-colors"
+              :class="useWhiteText ? 'bg-white/20 text-white hover:bg-white/30' : 'bg-primary text-primary-content hover:bg-primary-focus'"
+            >
               {{ $t('auth.login') }}
             </button>
           </template>
-        </template>
+        </div>
       </div>
     </div>
 
-    <!-- Mobile tabs (shown below header on small screens) -->
-    <nav class="md:hidden flex items-center justify-center gap-1 py-2 border-t border-base-300 overflow-x-auto">
-      <NuxtLink
-        v-for="tab in visibleTabs"
-        :key="tab.key"
-        :to="localePath(tab.path)"
-        class="px-4 py-2 rounded-full text-sm font-medium hover:bg-base-200"
-        :class="{ 'bg-base-200 text-primary': isActiveTab(tab.key) }"
-      >
-        {{ tab.label }}
-      </NuxtLink>
-    </nav>
   </header>
 </template>
 
 <script setup lang="ts">
-const props = defineProps<{
+import type { SelectMode } from '~/composables/useCatalogSearch'
+import { entityColors } from '~/composables/useCatalogSearch'
+
+import type { CatalogMode } from '~/composables/useCatalogSearch'
+
+const props = withDefaults(defineProps<{
   sessionChecked?: boolean
   loggedIn?: boolean
   userAvatarSvg?: string
   userName?: string
   userInitials?: string
-  theme?: 'default' | 'night'
+  theme?: 'cupcake' | 'night'
   userData?: {
     id?: string
     activeTeam?: { name?: string; teamType?: string }
@@ -165,38 +391,162 @@ const props = defineProps<{
     teams?: Array<{ id?: string; name?: string; logtoOrgId?: string }>
   } | null
   isSeller?: boolean
-}>()
+  // Role switching props
-
+  hasMultipleRoles?: boolean
-defineEmits(['toggle-theme', 'sign-out', 'sign-in', 'switch-team'])
+  currentRole?: string
-
+  // Search props
-const localePath = useLocalePath()
+  activeTokens?: Array<{ type: string; id: string; label: string; icon: string }>
-const { locale, locales } = useI18n()
+  availableChips?: Array<{ type: string; label: string }>
-const switchLocalePath = useSwitchLocalePath()
+  selectMode?: SelectMode
-const route = useRoute()
+  searchQuery?: string
-const { t } = useI18n()
+  // Catalog mode props
-
+  catalogMode?: CatalogMode
-const tabs = computed(() => [
+  // Quote mode props
-  { key: 'search', label: t('cabinetNav.search'), path: '/', auth: false },
+  productLabel?: string
-  { key: 'catalog', label: t('cabinetNav.catalog'), path: '/catalog/offers', auth: false },
+  hubLabel?: string
-  { key: 'orders', label: t('cabinetNav.orders'), path: '/clientarea/orders', auth: true },
+  quantity?: string
-  { key: 'seller', label: t('cabinetNav.seller'), path: '/clientarea/offers', auth: true, seller: true },
+  canSearch?: boolean
-])
+  showModeToggle?: boolean
-
+  showActiveMode?: boolean  // Whether to show active state on mode toggle
-const visibleTabs = computed(() => {
+  // Glass style applied when header is collapsed
-  return tabs.value.filter(tab => {
+  isCollapsed?: boolean
-    if (tab.auth && !props.loggedIn) return false
+  // Home page flag for transparent background
-    if (tab.seller && !props.isSeller) return false
+  isHomePage?: boolean
-    return true
+  // Client area flag - shows cabinet tabs instead of search
-  })
+  isClientArea?: boolean
+  // AI chat sidebar state
+  chatOpen?: boolean
+  // Dynamic height for hero effect
+  height?: number
+  // Collapse progress for hero layout
+  collapseProgress?: number
+}>(), {
+  height: 100,
+  collapseProgress: 1
 })
 
-const isActiveTab = (key: string) => {
+defineEmits([
-  const path = route.path
+  'toggle-chat',
-  if (key === 'search') return path === '/' || path === '/en' || path === '/ru'
+  'toggle-theme',
-  if (key === 'catalog') return path.startsWith('/catalog') || path.includes('/en/catalog') || path.includes('/ru/catalog')
+  'sign-out',
-  if (key === 'orders') return path.includes('/clientarea/orders') || path.includes('/clientarea/addresses') || path.includes('/clientarea/billing')
+  'sign-in',
-  if (key === 'seller') return path.includes('/clientarea/offers')
+  'switch-team',
-  return false
+  'switch-role',
-}
+  // Search events
-</script>
+  'start-select',
+  'cancel-select',
+  'edit-token',
+  'remove-token',
+  'update:search-query',
+  'update-quantity',
+  // Quote mode
+  'search',
+  'set-catalog-mode'
+])
 
+const localePath = useLocalePath()
+const route = useRoute()
+const { locale, locales } = useI18n()
+const switchLocalePath = useSwitchLocalePath()
+const { t } = useI18n()
+const { chatOpen } = toRefs(props)
+
+// Check if client area tab is active
+const isClientAreaTabActive = (path: string) => {
+  const currentPath = route.path
+  const localizedPath = localePath(path)
+  return currentPath === localizedPath || currentPath.startsWith(localizedPath + '/')
+}
+
+const inputRef = ref<HTMLInputElement>()
+const localSearchQuery = ref(props.searchQuery || '')
+const localQuantity = ref(props.quantity || '')
+
+watch(() => props.searchQuery, (val) => {
+  localSearchQuery.value = val || ''
+})
+
+watch(() => props.quantity, (val) => {
+  localQuantity.value = val || ''
+})
+
+const focusInput = () => {
+  inputRef.value?.focus()
+}
+
+const placeholder = computed(() => {
+  if (props.selectMode === 'product') return t('catalog.search.searchProducts')
+  if (props.selectMode === 'supplier') return t('catalog.search.searchSuppliers')
+  if (props.selectMode === 'hub') return t('catalog.search.searchHubs')
+  if (!props.activeTokens?.length) return t('catalog.search.placeholder')
+  return t('catalog.search.refine')
+})
+
+const selectModeLabel = computed(() => {
+  if (props.selectMode === 'product') return t('catalog.filters.product')
+  if (props.selectMode === 'supplier') return t('catalog.filters.supplier')
+  if (props.selectMode === 'hub') return t('catalog.filters.hub')
+  return ''
+})
+
+const selectModeIcon = computed(() => {
+  if (props.selectMode === 'product') return 'lucide:package'
+  if (props.selectMode === 'supplier') return 'lucide:factory'
+  if (props.selectMode === 'hub') return 'lucide:map-pin'
+  return 'lucide:search'
+})
+
+const getTokenColor = (type: string) => {
+  return entityColors[type as keyof typeof entityColors] || entityColors.product
+}
+
+const getTokenIcon = (type: string) => {
+  const icons: Record<string, string> = {
+    product: 'lucide:shopping-bag',
+    hub: 'lucide:warehouse',
+    supplier: 'lucide:factory'
+  }
+  return icons[type] || 'lucide:tag'
+}
+
+const isHeroLayout = computed(() => props.isHomePage && !props.isClientArea)
+const topRowHeight = 100
+
+const rowStyle = computed(() => {
+  if (isHeroLayout.value) {
+    return { height: `${topRowHeight}px` }
+  }
+  return { height: `${props.height}px` }
+})
+
+const glassStyle = computed(() => {
+  if (isHeroLayout.value) {
+    return { height: `${topRowHeight}px` }
+  }
+  return { height: '100%' }
+})
+
+const centerStyle = computed(() => {
+  if (!isHeroLayout.value) return {}
+  const heroHeight = props.height || topRowHeight
+  const minTop = 0
+  const maxTop = Math.max(120, Math.round(heroHeight * 0.42))
+  const progress = Math.min(1, Math.max(0, props.collapseProgress || 0))
+  const top = Math.round(maxTop - (maxTop - minTop) * progress)
+  return { marginTop: `${top}px` }
+})
+
+// Header background classes
+const headerClasses = computed(() => {
+  if (props.isHomePage && !props.isCollapsed) {
+    return 'bg-transparent'
+  }
+  if (props.isCollapsed) {
+    return 'bg-transparent backdrop-blur-xl'
+  }
+  return 'bg-transparent backdrop-blur-xl'
+})
+
+// Use white text on dark backgrounds (collapsed or home page with animation)
+const useWhiteText = computed(() => props.isCollapsed || props.isHomePage)
+</script>

app/components/navigation/SubNavigation.vue

@@ -1,15 +1,6 @@
 <template>
-  <nav v-if="items.length > 0" class="sticky top-16 z-30 bg-base-100 border-b border-base-300">
+  <nav v-if="items.length > 0" class="bg-base-100 shadow-sm">
     <div class="flex items-center gap-1 py-2 px-4 lg:px-6 overflow-x-auto">
-      <!-- Collapse button (chevron up) -->
-      <button
-        v-if="showCollapseButton"
-        class="btn btn-ghost btn-xs btn-circle mr-1 flex-shrink-0"
-        @click="emit('collapse')"
-      >
-        <Icon name="lucide:chevron-up" size="16" />
-      </button>
-
       <NuxtLink
         v-for="item in items"
         :key="item.path"
@@ -26,11 +17,6 @@
 <script setup lang="ts">
 const props = defineProps<{
   section: 'catalog' | 'orders' | 'seller' | 'settings'
-  showCollapseButton?: boolean
-}>()
-
-const emit = defineEmits<{
-  collapse: []
 }>()
 
 const localePath = useLocalePath()
@@ -39,9 +25,9 @@ const { t } = useI18n()
 
 const sectionItems = computed(() => ({
   catalog: [
-    { label: 'Предложения', path: '/catalog/offers' },
+    { label: 'Предложения', path: '/catalog?select=product' },
-    { label: t('cabinetNav.suppliers'), path: '/catalog/suppliers' },
+    { label: t('cabinetNav.suppliers'), path: '/catalog?select=supplier' },
-    { label: t('cabinetNav.hubs'), path: '/catalog/hubs' },
+    { label: t('cabinetNav.hubs'), path: '/catalog?select=hub' },
   ],
   orders: [
     { label: t('cabinetNav.orders'), path: '/clientarea/orders' },

app/components/page/CatalogPage.vue

@@ -1,282 +1,429 @@
 <template>
-  <div class="flex flex-col flex-1 min-h-0">
+  <div class="fixed inset-0 flex flex-col">
-    <!-- Loading state -->
+    <!-- Fullscreen Map -->
-    <div v-if="loading" class="flex-1 flex items-center justify-center">
+    <div class="absolute inset-0">
-      <Card padding="lg">
+      <ClientOnly>
-        <Stack align="center" justify="center" gap="3">
+        <CatalogMap
-          <Spinner />
+          ref="mapRef"
-          <Text tone="muted">{{ $t('catalogLanding.states.loading') }}</Text>
+          :map-id="mapId"
-        </Stack>
+          :items="isInfoMode ? [] : (useServerClustering ? [] : itemsWithCoords)"
-      </Card>
+          :clustered-points="isInfoMode ? [] : (useServerClustering && !useTypedClusters ? clusteredNodes : [])"
+          :clustered-points-by-type="isInfoMode ? undefined : (useServerClustering && useTypedClusters ? clusteredPointsByType : undefined)"
+          :use-server-clustering="useServerClustering && !isInfoMode"
+          :point-color="activePointColor"
+          :entity-type="activeEntityType"
+          :hovered-item-id="hoveredId"
+          :hovered-item="hoveredItem"
+          :related-points="relatedPoints"
+          :info-loading="infoLoading"
+          :fit-padding-left="fitPaddingLeft"
+          @select-item="onMapSelect"
+          @bounds-change="onBoundsChange"
+        />
+      </ClientOnly>
     </div>
 
-    <!-- Content -->
+    <!-- View mode loading indicator -->
-    <template v-else>
+    <div
-      <!-- Search bar slot (sticky third bar - like navigation) -->
+      v-if="clusterLoading || loading"
-      <div v-if="$slots.searchBar" class="sticky z-20 -mx-3 lg:-mx-6 px-3 lg:px-6 py-2 bg-base-100 border-b border-base-300" :class="searchBarTopClass">
+      class="absolute top-[116px] left-1/2 -translate-x-1/2 z-30 flex items-center gap-2 glass-soft rounded-full px-4 py-2"
-        <slot name="searchBar" :displayed-count="displayItems.length" :total-count="totalCount" />
+    >
+      <span class="loading loading-spinner loading-sm text-white" />
+      <span class="text-white text-sm">{{ $t('common.loading') }}</span>
+    </div>
+
+    <!-- List button (LEFT, opens panel) - hide when panel is open -->
+    <button
+      v-if="!isPanelOpen"
+      class="absolute top-[116px] left-4 z-20 hidden lg:flex items-center gap-2 glass-soft rounded-full px-3 py-1.5 text-white text-sm hover:bg-white/15 transition-colors"
+      @click="openPanel"
+    >
+      <Icon name="lucide:menu" size="16" />
+      <span>{{ $t('catalog.list') }}</span>
+    </button>
+
+    <!-- Filter by bounds checkbox (LEFT, next to panel when open) - only in selection mode -->
+    <label
+      v-if="selectMode !== null"
+      class="absolute top-[116px] left-[calc(1rem+32rem+1rem)] z-20 hidden lg:flex items-center gap-2 glass-soft rounded-full px-3 py-1.5 cursor-pointer text-white text-sm hover:bg-white/15 transition-colors"
+    >
+      <input
+        type="checkbox"
+        :checked="filterByBounds"
+        class="checkbox checkbox-xs checkbox-primary"
+        @change="$emit('update:filter-by-bounds', ($event.target as HTMLInputElement).checked)"
+      />
+      <span>{{ $t('catalog.search.filterByMap') }}</span>
+    </label>
+
+
+    <!-- View toggle (top RIGHT overlay, below header) - hide in info mode or when hideViewToggle -->
+    <div v-if="!isInfoMode && !hideViewToggle" class="absolute top-[116px] right-4 z-20 hidden lg:flex items-center gap-2">
+      <!-- View mode toggle -->
+      <div class="flex gap-1 glass-bright rounded-full p-1">
+        <button
+          v-if="showOffersToggle"
+          class="flex items-center gap-2 px-3 py-1.5 rounded-full text-sm font-medium transition-colors"
+          :class="mapViewMode === 'offers' ? 'bg-white/20 text-white' : 'text-white/70 hover:text-white hover:bg-white/10'"
+          @click="setMapViewMode('offers')"
+        >
+          <span class="w-5 h-5 rounded-full flex items-center justify-center" style="background-color: #f97316">
+            <Icon name="lucide:shopping-bag" size="12" class="text-white" />
+          </span>
+          {{ $t('catalog.views.offers') }}
+        </button>
+        <button
+          v-if="showHubsToggle"
+          class="flex items-center gap-2 px-3 py-1.5 rounded-full text-sm font-medium transition-colors"
+          :class="mapViewMode === 'hubs' ? 'bg-white/20 text-white' : 'text-white/70 hover:text-white hover:bg-white/10'"
+          @click="setMapViewMode('hubs')"
+        >
+          <span class="w-5 h-5 rounded-full flex items-center justify-center" style="background-color: #22c55e">
+            <Icon name="lucide:warehouse" size="12" class="text-white" />
+          </span>
+          {{ $t('catalog.views.hubs') }}
+        </button>
+        <button
+          v-if="showSuppliersToggle"
+          class="flex items-center gap-2 px-3 py-1.5 rounded-full text-sm font-medium transition-colors"
+          :class="mapViewMode === 'suppliers' ? 'bg-white/20 text-white' : 'text-white/70 hover:text-white hover:bg-white/10'"
+          @click="setMapViewMode('suppliers')"
+        >
+          <span class="w-5 h-5 rounded-full flex items-center justify-center" style="background-color: #3b82f6">
+            <Icon name="lucide:factory" size="12" class="text-white" />
+          </span>
+          {{ $t('catalog.views.suppliers') }}
+        </button>
+      </div>
+    </div>
+
+    <!-- Left panel (slides from left when isPanelOpen is true) -->
+    <Transition name="slide-left">
+      <div
+        v-if="isPanelOpen"
+        class="absolute top-[116px] left-4 bottom-4 z-30 max-w-[calc(100vw-2rem)] hidden lg:block"
+        :class="panelWidth"
+      >
+        <div class="glass-soft rounded-2xl shadow-lg h-full flex flex-col text-white">
+          <slot name="panel" />
+        </div>
+      </div>
+    </Transition>
+
+    <!-- Mobile bottom sheet -->
+    <div class="lg:hidden absolute bottom-0 left-0 right-0 z-20">
+      <!-- Mobile controls: List button + view toggle -->
+      <div class="flex justify-between px-4 mb-2">
+        <!-- List button (mobile) -->
+        <button
+          class="flex items-center gap-2 glass-soft rounded-full px-3 py-2 text-white text-sm"
+          @click="openPanel"
+        >
+          <Icon name="lucide:menu" size="16" />
+          <span>{{ $t('catalog.list') }}</span>
+        </button>
+
+        <!-- Mobile view toggle - hide in info mode or when hideViewToggle -->
+        <div v-if="!isInfoMode && !hideViewToggle" class="flex gap-1 glass-bright rounded-full p-1">
+          <button
+            v-if="showOffersToggle"
+            class="flex items-center justify-center w-8 h-8 rounded-full transition-colors"
+            :class="mapViewMode === 'offers' ? 'bg-white/20' : 'hover:bg-white/10'"
+            @click="setMapViewMode('offers')"
+          >
+            <span class="w-5 h-5 rounded-full flex items-center justify-center" style="background-color: #f97316">
+              <Icon name="lucide:shopping-bag" size="12" class="text-white" />
+            </span>
+          </button>
+          <button
+            v-if="showHubsToggle"
+            class="flex items-center justify-center w-8 h-8 rounded-full transition-colors"
+            :class="mapViewMode === 'hubs' ? 'bg-white/20' : 'hover:bg-white/10'"
+            @click="setMapViewMode('hubs')"
+          >
+            <span class="w-5 h-5 rounded-full flex items-center justify-center" style="background-color: #22c55e">
+              <Icon name="lucide:warehouse" size="12" class="text-white" />
+            </span>
+          </button>
+          <button
+            v-if="showSuppliersToggle"
+            class="flex items-center justify-center w-8 h-8 rounded-full transition-colors"
+            :class="mapViewMode === 'suppliers' ? 'bg-white/20' : 'hover:bg-white/10'"
+            @click="setMapViewMode('suppliers')"
+          >
+            <span class="w-5 h-5 rounded-full flex items-center justify-center" style="background-color: #3b82f6">
+              <Icon name="lucide:factory" size="12" class="text-white" />
+            </span>
+          </button>
+        </div>
       </div>
 
-      <!-- With Map: Split Layout -->
+      <!-- Mobile panel (collapsible) - only when panel is open -->
-      <template v-if="withMap">
+      <Transition name="slide-up">
-        <!-- Desktop: side-by-side -->
+        <div
-        <div class="hidden lg:flex flex-1 gap-4 min-h-0 py-4">
+          v-if="isPanelOpen"
-          <!-- Left: List (scrollable) -->
+          class="glass-soft rounded-t-2xl shadow-lg transition-all duration-300 text-white h-[60vh]"
-          <div class="w-2/5 overflow-y-auto pr-2">
+        >
-            <Stack gap="4">
+          <!-- Drag handle / close -->
-              <slot name="header" />
+          <div
-              <slot name="filters" />
+            class="flex justify-center py-2 cursor-pointer"
-
+            @click="closePanel"
-              <Stack gap="3">
+          >
-                <div
+            <div class="w-10 h-1 bg-white/30 rounded-full" />
-                  v-for="item in displayItems"
-                  :key="item.uuid"
-                  :class="{ 'ring-2 ring-primary rounded-lg': item.uuid === selectedId }"
-                  @click="onItemClick(item)"
-                  @mouseenter="emit('update:hoveredId', item.uuid)"
-                  @mouseleave="emit('update:hoveredId', undefined)"
-                >
-                  <slot name="card" :item="item" />
-                </div>
-              </Stack>
-
-              <slot name="pagination" />
-
-              <Stack v-if="displayItems.length === 0" align="center" gap="2">
-                <slot name="empty">
-                  <Text tone="muted">{{ $t('common.values.not_available') }}</Text>
-                </slot>
-              </Stack>
-            </Stack>
           </div>
 
-          <!-- Right: Map (fixed position) -->
+          <div class="px-4 pb-4 overflow-y-auto h-[calc(60vh-2rem)]">
-          <div class="w-3/5 relative">
+            <slot name="panel" />
-            <div class="fixed right-6 w-[calc(60%-3rem)] rounded-lg overflow-hidden" :class="[mapTopClass, mapHeightClass]">
-              <!-- Search with map checkbox -->
-              <label class="absolute top-4 left-4 z-10 bg-white/90 backdrop-blur px-3 py-2 rounded-lg shadow flex items-center gap-2 cursor-pointer">
-                <input type="checkbox" v-model="searchWithMap" class="checkbox checkbox-sm" />
-                <span class="text-sm">{{ $t('catalogMap.searchWithMap') }}</span>
-              </label>
-              <ClientOnly>
-                <CatalogMap
-                  ref="mapRef"
-                  :map-id="mapId"
-                  :items="useServerClustering ? [] : itemsWithCoords"
-                  :clustered-points="useServerClustering ? clusteredNodes : []"
-                  :use-server-clustering="useServerClustering"
-                  :point-color="pointColor"
-                  :hovered-item-id="hoveredId"
-                  :hovered-item="hoveredItem"
-                  @select-item="onMapSelect"
-                  @bounds-change="onBoundsChange"
-                />
-              </ClientOnly>
-            </div>
           </div>
         </div>
-
+      </Transition>
-        <!-- Mobile: toggle between list and map -->
+    </div>
-        <div class="lg:hidden flex-1 flex flex-col min-h-0">
-          <div class="flex-1 overflow-y-auto py-4" v-show="mobileView === 'list'">
-            <Stack gap="4">
-              <slot name="header" />
-              <slot name="filters" />
-
-              <Stack gap="3">
-                <div
-                  v-for="item in displayItems"
-                  :key="item.uuid"
-                  :class="{ 'ring-2 ring-primary rounded-lg': item.uuid === selectedId }"
-                  @click="onItemClick(item)"
-                  @mouseenter="emit('update:hoveredId', item.uuid)"
-                  @mouseleave="emit('update:hoveredId', undefined)"
-                >
-                  <slot name="card" :item="item" />
-                </div>
-              </Stack>
-
-              <slot name="pagination" />
-
-              <Stack v-if="displayItems.length === 0" align="center" gap="2">
-                <slot name="empty">
-                  <Text tone="muted">{{ $t('common.values.not_available') }}</Text>
-                </slot>
-              </Stack>
-            </Stack>
-          </div>
-
-          <div class="flex-1 relative" v-show="mobileView === 'map'">
-            <!-- Search with map checkbox (mobile) -->
-            <label class="absolute top-4 left-4 z-10 bg-white/90 backdrop-blur px-3 py-2 rounded-lg shadow flex items-center gap-2 cursor-pointer">
-              <input type="checkbox" v-model="searchWithMap" class="checkbox checkbox-sm" />
-              <span class="text-sm">{{ $t('catalogMap.searchWithMap') }}</span>
-            </label>
-            <ClientOnly>
-              <CatalogMap
-                ref="mobileMapRef"
-                :map-id="`${mapId}-mobile`"
-                :items="useServerClustering ? [] : itemsWithCoords"
-                :clustered-points="useServerClustering ? clusteredNodes : []"
-                :use-server-clustering="useServerClustering"
-                :point-color="pointColor"
-                :hovered-item-id="hoveredId"
-                :hovered-item="hoveredItem"
-                @select-item="onMapSelect"
-                @bounds-change="onBoundsChange"
-              />
-            </ClientOnly>
-          </div>
-
-          <!-- Mobile toggle -->
-          <div class="fixed bottom-4 left-1/2 -translate-x-1/2 z-30">
-            <div class="btn-group shadow-lg">
-              <button
-                class="btn btn-sm"
-                :class="{ 'btn-active': mobileView === 'list' }"
-                @click="mobileView = 'list'"
-              >
-                {{ $t('common.list') }}
-              </button>
-              <button
-                class="btn btn-sm"
-                :class="{ 'btn-active': mobileView === 'map' }"
-                @click="mobileView = 'map'"
-              >
-                {{ $t('common.map') }}
-              </button>
-            </div>
-          </div>
-        </div>
-      </template>
-
-      <!-- Without Map: Simple List -->
-      <div v-else class="flex-1 overflow-y-auto py-4">
-        <Stack gap="4">
-          <slot name="header" />
-          <slot name="filters" />
-
-          <Stack gap="3">
-            <div
-              v-for="item in items"
-              :key="item.uuid"
-              @click="onItemClick(item)"
-            >
-              <slot name="card" :item="item" />
-            </div>
-          </Stack>
-
-          <slot name="pagination" />
-
-          <Stack v-if="items.length === 0" align="center" gap="2">
-            <slot name="empty">
-              <Text tone="muted">{{ $t('common.values.not_available') }}</Text>
-            </slot>
-          </Stack>
-        </Stack>
-      </div>
-    </template>
   </div>
 </template>
 
 <script setup lang="ts">
 import type { MapBounds } from '~/components/catalog/CatalogMap.vue'
 
+const { mapViewMode, setMapViewMode, selectMode, startSelect, cancelSelect } = useCatalogSearch()
+
+// Panel is open when selectMode is set OR when showPanel prop is true (info/quote)
+const isPanelOpen = computed(() => props.showPanel || selectMode.value !== null)
+
+const isDesktop = ref(false)
+onMounted(() => {
+  const media = window.matchMedia('(min-width: 1024px)')
+  const update = () => {
+    isDesktop.value = media.matches
+  }
+  update()
+  media.addEventListener('change', update)
+  onUnmounted(() => {
+    media.removeEventListener('change', update)
+  })
+})
+
+const panelWidthPx = computed(() => {
+  const match = props.panelWidth.match(/w-\[(\d+(?:\.\d+)?)rem\]/)
+  if (match) return Number(match[1]) * 16
+  if (props.panelWidth === 'w-96') return 24 * 16
+  if (props.panelWidth === 'w-80') return 20 * 16
+  return 0
+})
+
+const fitPaddingLeft = computed(() => {
+  if (!isPanelOpen.value || !isDesktop.value || panelWidthPx.value === 0) return 0
+  const leftInset = 16
+  const rightInset = 16
+  return leftInset + panelWidthPx.value + rightInset
+})
+
+// Open panel based on current mapViewMode
+const openPanel = () => {
+  const newSelectMode = mapViewMode.value === 'hubs' ? 'hub'
+    : mapViewMode.value === 'suppliers' ? 'supplier'
+    : 'product'
+  startSelect(newSelectMode)
+}
+
+// Close panel
+const closePanel = () => {
+  cancelSelect()
+}
+
+// Point color based on map view mode
+const VIEW_MODE_COLORS = {
+  offers: '#f97316',   // orange
+  hubs: '#22c55e',     // green
+  suppliers: '#3b82f6' // blue
+} as const
+
+const activePointColor = computed(() => VIEW_MODE_COLORS[mapViewMode.value] || VIEW_MODE_COLORS.offers)
+
+// Entity type for icons based on view mode
+const VIEW_MODE_ENTITY_TYPES = {
+  offers: 'offer',
+  hubs: 'hub',
+  suppliers: 'supplier'
+} as const
+
+const activeEntityType = computed(() => VIEW_MODE_ENTITY_TYPES[mapViewMode.value] || VIEW_MODE_ENTITY_TYPES.offers)
+
+// Node type for server clustering based on view mode
+const VIEW_MODE_NODE_TYPES = {
+  offers: 'offer',
+  hubs: 'logistics',
+  suppliers: 'supplier'
+} as const
+
+const activeClusterNodeType = computed(() => VIEW_MODE_NODE_TYPES[mapViewMode.value] || VIEW_MODE_NODE_TYPES.offers)
+
+// Store current bounds for refetching when view mode changes
+const currentBounds = ref<MapBounds | null>(null)
+
 interface MapItem {
-  uuid: string
+  uuid?: string | null
   latitude?: number | null
   longitude?: number | null
-  name?: string
+  name?: string | null
-  country?: string
+  country?: string | null
-  [key: string]: any
 }
 
 const props = withDefaults(defineProps<{
-  items: MapItem[]
-  mapItems?: MapItem[]  // Optional separate items for map (if different from list items)
   loading?: boolean
-  withMap?: boolean
+  useServerClustering?: boolean
-  useServerClustering?: boolean  // Use server-side h3 clustering for ALL points
+  clusterNodeType?: string
+  useTypedClusters?: boolean
   mapId?: string
   pointColor?: string
-  selectedId?: string
   hoveredId?: string
-  hasSubNav?: boolean
+  items?: MapItem[]
-  totalCount?: number  // Total count for search bar counter (can differ from items.length with pagination)
+  showPanel?: boolean
+  filterByBounds?: boolean
+  infoLoading?: boolean
+  forceInfoMode?: boolean
+  panelWidth?: string
+  hideViewToggle?: boolean
+  showOffersToggle?: boolean
+  showHubsToggle?: boolean
+  showSuppliersToggle?: boolean
+  clusterProductUuid?: string
+  clusterHubUuid?: string
+  clusterSupplierUuid?: string
+  relatedPoints?: Array<{
+    uuid: string
+    name: string
+    latitude: number
+    longitude: number
+    type: 'hub' | 'supplier' | 'offer'
+  }>
 }>(), {
   loading: false,
-  withMap: true,
+  useServerClustering: true,
-  useServerClustering: false,
+  clusterNodeType: 'offer',
+  useTypedClusters: false,
   mapId: 'catalog-map',
-  pointColor: '#3b82f6',
+  pointColor: '#f97316',
-  hasSubNav: true,
+  items: () => [],
-  totalCount: 0
+  showPanel: false,
-})
+  filterByBounds: false,
-
+  infoLoading: false,
-// Inject header collapsed state from layout
+  forceInfoMode: false,
-const headerCollapsed = inject<Ref<boolean>>('headerCollapsed', ref(false))
+  panelWidth: 'w-96',
-
+  hideViewToggle: false,
-// Map positioning - dynamic based on search bar presence and header collapsed state
+  showOffersToggle: true,
-// Expanded: MainNav (4rem) + SubNav (3rem) = 7rem, with SearchBar = 10rem
+  showHubsToggle: true,
-// Collapsed: CollapsedBar (2rem), with SearchBar = 5rem
+  showSuppliersToggle: true,
-const slots = useSlots()
+  clusterProductUuid: undefined,
-const hasSearchBar = computed(() => !!slots.searchBar)
+  clusterHubUuid: undefined,
-
+  clusterSupplierUuid: undefined,
-// SearchBar position: below header (sticky)
+  relatedPoints: () => []
-const searchBarTopClass = computed(() => {
-  if (headerCollapsed.value) {
-    return 'top-8' // 2rem collapsed bar
-  }
-  return 'top-[7rem]' // 4rem MainNav + 3rem SubNav
-})
-
-// Map position: below header + searchbar (fixed)
-const mapTopClass = computed(() => {
-  if (headerCollapsed.value) {
-    return hasSearchBar.value ? 'top-[5rem]' : 'top-8' // collapsed bar + searchbar
-  }
-  return hasSearchBar.value ? 'top-[10rem]' : 'top-[7rem]' // full header + searchbar
-})
-
-const mapHeightClass = computed(() => {
-  if (headerCollapsed.value) {
-    return hasSearchBar.value ? 'h-[calc(100vh-6rem)]' : 'h-[calc(100vh-3rem)]'
-  }
-  return hasSearchBar.value ? 'h-[calc(100vh-11rem)]' : 'h-[calc(100vh-8rem)]'
 })
 
 const emit = defineEmits<{
   'select': [item: MapItem]
-  'update:selectedId': [uuid: string]
+  'bounds-change': [bounds: MapBounds]
   'update:hoveredId': [uuid: string | undefined]
+  'update:filter-by-bounds': [value: boolean]
 }>()
 
-// Server-side clustering
+const useTypedClusters = computed(() => props.useTypedClusters && props.useServerClustering)
-const { clusteredNodes, fetchClusters } = useClusteredNodes()
 
-// Search with map checkbox
+const clusterProductUuid = computed(() => props.clusterProductUuid ?? undefined)
-const searchWithMap = ref(false)
+const clusterHubUuid = computed(() => props.clusterHubUuid ?? undefined)
-const currentBounds = ref<MapBounds | null>(null)
+const clusterSupplierUuid = computed(() => props.clusterSupplierUuid ?? undefined)
 
-const onBoundsChange = (bounds: MapBounds) => {
+// Server-side clustering (single-type mode)
-  currentBounds.value = bounds
+const { clusteredNodes, fetchClusters, loading: singleClusterLoading, clearNodes } = useClusteredNodes(
-  if (props.useServerClustering) {
+  undefined,
-    fetchClusters(bounds)
+  activeClusterNodeType,
-  }
+)
+
+// Server-side clustering (typed mode)
+const offerClusters = useClusteredNodes(undefined, ref('offer'))
+const hubClusters = useClusteredNodes(undefined, ref('logistics'))
+const supplierClusters = useClusteredNodes(undefined, ref('supplier'))
+
+const clusteredPointsByType = computed(() => ({
+  offer: offerClusters.clusteredNodes.value,
+  hub: hubClusters.clusteredNodes.value,
+  supplier: supplierClusters.clusteredNodes.value
+}))
+
+const activeClusterType = computed<'offer' | 'hub' | 'supplier'>(() => {
+  if (mapViewMode.value === 'hubs') return 'hub'
+  if (mapViewMode.value === 'suppliers') return 'supplier'
+  return 'offer'
+})
+
+const clusterLoading = computed(() => {
+  if (!useTypedClusters.value) return singleClusterLoading.value
+  if (activeClusterType.value === 'hub') return hubClusters.loading.value
+  if (activeClusterType.value === 'supplier') return supplierClusters.loading.value
+  return offerClusters.loading.value
+})
+
+const clearInactiveClusters = (active: 'offer' | 'hub' | 'supplier') => {
+  if (active !== 'offer') offerClusters.clearNodes()
+  if (active !== 'hub') hubClusters.clearNodes()
+  if (active !== 'supplier') supplierClusters.clearNodes()
 }
 
-// Filtered items when searchWithMap is enabled
+const fetchActiveClusters = async () => {
-const displayItems = computed(() => {
+  if (!currentBounds.value) return
-  if (!searchWithMap.value || !currentBounds.value) return props.items
+  clearInactiveClusters(activeClusterType.value)
-  return props.items.filter(item => {
+  if (activeClusterType.value === 'hub') {
-    if (item.latitude == null || item.longitude == null) return false
+    await hubClusters.fetchClusters(currentBounds.value)
-    const { west, east, north, south } = currentBounds.value!
+    return
-    const lng = Number(item.longitude)
+  }
-    const lat = Number(item.latitude)
+  if (activeClusterType.value === 'supplier') {
-    return lng >= west && lng <= east && lat >= south && lat <= north
+    await supplierClusters.fetchClusters(currentBounds.value)
-  })
+    return
+  }
+  await offerClusters.fetchClusters(currentBounds.value)
+}
+
+// Refetch clusters when view mode changes
+watch(mapViewMode, async () => {
+  if (!props.useServerClustering) return
+  if (isInfoMode.value) return
+  if (useTypedClusters.value) {
+    clearInactiveClusters(activeClusterType.value)
+    if (currentBounds.value) {
+      await fetchActiveClusters()
+    }
+    return
+  }
+  // Clear old data first
+  clearNodes()
+  // Refetch with current bounds if available
+  if (currentBounds.value) {
+    await fetchClusters(currentBounds.value)
+  }
 })
 
+watch([clusterProductUuid, clusterHubUuid, clusterSupplierUuid], async () => {
+  if (!props.useServerClustering) return
+  if (isInfoMode.value) return
+  if (!currentBounds.value) return
+  if (useTypedClusters.value) {
+    await fetchActiveClusters()
+    return
+  }
+  await fetchClusters(currentBounds.value)
+})
+
+// Map refs
+const mapRef = ref<{ flyTo: (lat: number, lng: number, zoom?: number) => void } | null>(null)
+
+// Selected item from map click
+const selectedMapItem = ref<MapItem | null>(null)
+
+// Mobile panel state
+const mobilePanelExpanded = ref(false)
+
+// Info mode - when relatedPoints are present, hide clusters and show only related points
+const isInfoMode = computed(() => props.forceInfoMode || (props.relatedPoints && props.relatedPoints.length > 0))
+
 // Hovered item with coordinates for map highlight
 const hoveredItem = computed(() => {
   if (!props.hoveredId) return null
@@ -285,12 +432,9 @@ const hoveredItem = computed(() => {
   return { latitude: Number(item.latitude), longitude: Number(item.longitude) }
 })
 
-// Use mapItems if provided, otherwise fall back to items
-const itemsForMap = computed(() => props.mapItems || props.items)
-
 // Filter items with valid coordinates for map (client-side mode only)
 const itemsWithCoords = computed(() =>
-  itemsForMap.value.filter(item =>
+  props.items.filter(item =>
     item.latitude != null &&
     item.longitude != null &&
     !isNaN(Number(item.latitude)) &&
@@ -300,56 +444,75 @@ const itemsWithCoords = computed(() =>
     name: item.name || '',
     latitude: Number(item.latitude),
     longitude: Number(item.longitude),
-    country: item.country,
+    country: item.country
-    orderUuid: item.orderUuid  // Preserve orderUuid for hover matching
   }))
 )
 
-// Mobile view toggle
+const onBoundsChange = (bounds: MapBounds) => {
-const mobileView = ref<'list' | 'map'>('list')
+  currentBounds.value = bounds
-
+  emit('bounds-change', bounds)
-// Map refs
+  // Don't fetch clusters when in info mode
-const mapRef = ref<{ flyTo: (lat: number, lng: number, zoom?: number) => void } | null>(null)
+  if (props.useServerClustering && !isInfoMode.value) {
-const mobileMapRef = ref<{ flyTo: (lat: number, lng: number, zoom?: number) => void } | null>(null)
+    if (useTypedClusters.value) {
-
+      fetchActiveClusters()
-// Handle item click from list
+    } else {
-const onItemClick = (item: MapItem) => {
+      fetchClusters(bounds)
-  emit('select', item)
+    }
-  emit('update:selectedId', item.uuid)
-
-  // Fly to item on map
-  if (props.withMap && item.latitude && item.longitude) {
-    mapRef.value?.flyTo(Number(item.latitude), Number(item.longitude), 8)
-    mobileMapRef.value?.flyTo(Number(item.latitude), Number(item.longitude), 8)
   }
 }
 
 // Handle selection from map
-const onMapSelect = (uuid: string) => {
+const onMapSelect = (uuid: string, properties?: Record<string, any>) => {
   const item = props.items.find(i => i.uuid === uuid)
   if (item) {
+    selectedMapItem.value = item
     emit('select', item)
-    emit('update:selectedId', uuid)
+  } else if (props.useServerClustering) {
+    // For server clustering, include properties from cluster data
+    const mapItem: MapItem = {
+      uuid,
+      name: properties?.name,
+      ...properties
+    }
+    selectedMapItem.value = mapItem
+    emit('select', mapItem)
   }
 }
 
-// Watch selectedId and fly to it
+const onViewDetails = (item: MapItem) => {
-watch(() => props.selectedId, (uuid) => {
+  emit('select', item)
-  if (uuid && props.withMap) {
+}
-    const item = itemsWithCoords.value.find(i => i.uuid === uuid)
-    if (item) {
-      mapRef.value?.flyTo(item.latitude, item.longitude, 8)
-      mobileMapRef.value?.flyTo(item.latitude, item.longitude, 8)
-    }
-  }
-})
-
 
 // Expose flyTo for external use
 const flyTo = (lat: number, lng: number, zoom = 8) => {
   mapRef.value?.flyTo(lat, lng, zoom)
-  mobileMapRef.value?.flyTo(lat, lng, zoom)
 }
 
-defineExpose({ flyTo })
+defineExpose({ flyTo, currentBounds })
 </script>
+
+<style scoped>
+/* Drawer slide animation (desktop - left) */
+.slide-left-enter-active,
+.slide-left-leave-active {
+  transition: transform 0.3s ease, opacity 0.3s ease;
+}
+
+.slide-left-enter-from,
+.slide-left-leave-to {
+  transform: translateX(-100%);
+  opacity: 0;
+}
+
+/* Drawer slide animation (mobile - up) */
+.slide-up-enter-active,
+.slide-up-leave-active {
+  transition: transform 0.3s ease, opacity 0.3s ease;
+}
+
+.slide-up-enter-from,
+.slide-up-leave-to {
+  transform: translateY(100%);
+  opacity: 0;
+}
+</style>

app/components/search/GlobalSearchBar.vue

@@ -1,140 +0,0 @@
-<template>
-  <div class="bg-base-100 py-4 px-4 lg:px-6">
-    <div class="flex items-center justify-center">
-      <form
-        @submit.prevent="handleSearch"
-        class="flex items-center bg-base-100 rounded-full border border-base-300 shadow-sm hover:shadow-md transition-shadow"
-      >
-        <!-- Product field (clickable, navigates to /goods) -->
-        <div
-          class="flex flex-col px-4 py-2 min-w-48 pl-6 rounded-l-full hover:bg-base-200/50 border-r border-base-300 cursor-pointer"
-          @click="goToProductSelection"
-        >
-          <label class="text-xs font-semibold text-base-content/60 mb-0.5">
-            {{ $t('search.product') }}
-          </label>
-          <div class="text-sm" :class="productDisplay ? 'text-base-content' : 'text-base-content/50'">
-            {{ productDisplay || $t('search.product_placeholder') }}
-          </div>
-        </div>
-
-        <!-- Quantity field (editable) -->
-        <div class="flex flex-col px-4 py-2 min-w-48 hover:bg-base-200/50 border-r border-base-300">
-          <label class="text-xs font-semibold text-base-content/60 mb-0.5">
-            {{ $t('search.quantity') }}
-          </label>
-          <input
-            v-model="quantity"
-            type="number"
-            min="1"
-            :placeholder="$t('search.quantity_placeholder')"
-            class="w-full bg-transparent outline-none text-sm"
-            @change="syncQuantityToStore"
-          />
-        </div>
-
-        <!-- Destination field (clickable, navigates to /select-location) -->
-        <div
-          class="flex flex-col px-4 py-2 min-w-48 hover:bg-base-200/50 cursor-pointer"
-          @click="goToLocationSelection"
-        >
-          <label class="text-xs font-semibold text-base-content/60 mb-0.5">
-            {{ $t('search.destination') }}
-          </label>
-          <div class="text-sm" :class="locationDisplay ? 'text-base-content' : 'text-base-content/50'">
-            {{ locationDisplay || $t('search.destination_placeholder') }}
-          </div>
-        </div>
-
-        <!-- Search button -->
-        <button
-          type="submit"
-          class="btn btn-primary btn-circle ml-2 mr-1"
-          :disabled="!canSearch"
-        >
-          <Icon name="lucide:search" size="18" />
-        </button>
-      </form>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-const emit = defineEmits<{
-  search: [params: { productUuid?: string; quantity?: number; locationUuid?: string }]
-}>()
-
-const router = useRouter()
-const localePath = useLocalePath()
-const searchStore = useSearchStore()
-
-// Read from searchStore
-const productDisplay = computed(() => searchStore.searchForm.product || '')
-const productUuid = computed(() => searchStore.searchForm.productUuid || '')
-const locationDisplay = computed(() => searchStore.searchForm.location || '')
-const locationUuid = computed(() => searchStore.searchForm.locationUuid || '')
-
-// Quantity - local state synced with store
-const quantity = ref<number | undefined>(
-  searchStore.searchForm.quantity ? Number(searchStore.searchForm.quantity) : undefined
-)
-
-const syncQuantityToStore = () => {
-  if (quantity.value) {
-    searchStore.setQuantity(String(quantity.value))
-  }
-}
-
-// Navigation to selection pages
-const goToProductSelection = () => {
-  navigateTo(localePath('/goods'))
-}
-
-const goToLocationSelection = () => {
-  navigateTo(localePath('/select-location') + '?mode=search')
-}
-
-// Can search - need at least product selected
-const canSearch = computed(() => {
-  return !!productUuid.value
-})
-
-// Search handler - navigate to /request
-const handleSearch = () => {
-  if (!canSearch.value) return
-
-  // Sync quantity to store
-  syncQuantityToStore()
-
-  const query: Record<string, string | undefined> = {
-    productUuid: productUuid.value || undefined,
-    product: productDisplay.value || undefined,
-    quantity: quantity.value ? String(quantity.value) : undefined,
-    locationUuid: locationUuid.value || undefined,
-    location: locationDisplay.value || undefined
-  }
-
-  // Remove undefined/empty values
-  Object.keys(query).forEach(key => {
-    if (!query[key]) delete query[key]
-  })
-
-  router.push({
-    path: localePath('/request'),
-    query: query as Record<string, string>
-  })
-
-  emit('search', {
-    productUuid: productUuid.value,
-    quantity: quantity.value,
-    locationUuid: locationUuid.value
-  })
-}
-
-// Watch store changes to sync quantity
-watch(() => searchStore.searchForm.quantity, (val) => {
-  if (val) {
-    quantity.value = Number(val)
-  }
-}, { immediate: true })
-</script>

app/components/ui/Alert.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './Alert.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/Alert',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ui/Button.stories.ts

@@ -1,46 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import Button from './Button.vue'
-
-const meta: Meta<typeof Button> = {
-  title: 'UI/Button',
-  component: Button,
-  render: (args) => ({
-    components: { Button },
-    setup() {
-      return { args }
-    },
-    template: '<Button v-bind="args">{{ args.label }}</Button>'
-  }),
-  argTypes: {
-    variant: {
-      control: { type: 'select' },
-      options: ['primary', 'outline']
-    }
-  },
-  tags: ['autodocs']
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {
-    label: 'Primary button',
-    variant: 'primary'
-  }
-}
-
-export const Outline: Story = {
-  args: {
-    label: 'Outline button',
-    variant: 'outline'
-  }
-}
-
-export const FullWidth: Story = {
-  args: {
-    label: 'Full width',
-    variant: 'primary',
-    fullWidth: true
-  }
-}

app/components/ui/Card.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './Card.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/Card',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ui/Card.vue

@@ -35,8 +35,10 @@ const toneMap: Record<string, string> = {
 const cardClass = computed(() => {
   const paddingClass = paddingMap[props.padding] || paddingMap.medium
   const toneClass = toneMap[props.tone] || toneMap.default
-  const interactiveClass = props.interactive ? 'cursor-pointer hover:shadow-lg' : ''
+  const interactiveClass = props.interactive
-  const baseClass = 'card transition-all duration-200'
+    ? 'cursor-pointer hover:shadow-lg transition-shadow duration-200'
+    : ''
+  const baseClass = 'card'
   return [baseClass, paddingClass, toneClass, interactiveClass].filter(Boolean).join(' ')
 })
 </script>

app/components/ui/Container.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './Container.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/Container',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ui/FieldButton.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './FieldButton.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/FieldButton',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ui/FieldButton.vue

@@ -20,7 +20,7 @@ const props = defineProps({
     default: '',
   },
   type: {
-    type: String,
+    type: String as () => 'button' | 'submit' | 'reset',
     default: 'button',
   },
   chevron: {

app/components/ui/Grid.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './Grid.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/Grid',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ui/GridItem.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './GridItem.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/GridItem',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ui/Heading.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './Heading.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/Heading',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ui/IconCircle.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './IconCircle.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/IconCircle',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ui/Input.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './Input.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/Input',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ui/Pill.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './Pill.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/Pill',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ui/Section.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './Section.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/Section',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ui/Select.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './Select.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/Select',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ui/Spinner.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './Spinner.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/Spinner',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ui/Stack.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './Stack.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/Stack',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}

app/components/ui/Text.stories.ts

@@ -1,21 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/vue3'
-import StoryComponent from './Text.vue'
-
-const meta: Meta<typeof StoryComponent> = {
-  title: 'Ui/Text',
-  component: StoryComponent,
-  render: (args) => ({
-    components: { StoryComponent },
-    setup() {
-      return { args }
-    },
-    template: '<StoryComponent v-bind="args" />'
-  })
-}
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Primary: Story = {
-  args: {}
-}