Add entity color scheme and improve map hover effect
All checks were successful
Build Docker Image / build (push) Successful in 3m6s
All checks were successful
Build Docker Image / build (push) Successful in 3m6s
- Add color scheme: product/offer=orange, supplier=blue, hub=green - Remove 'location' filter (same as hub) - Quantity filter appears only after product is selected - Map hover shows 'target' ring effect (outer white ring) - Tokens in header use entity-specific colors
This commit is contained in:
@@ -208,12 +208,7 @@ const initClientClusteringLayers = (map: MapboxMapType) => {
|
||||
filter: ['!', ['has', 'point_count']],
|
||||
paint: {
|
||||
'circle-radius': 12,
|
||||
'circle-color': [
|
||||
'case',
|
||||
['==', ['get', 'uuid'], props.hoveredItemId || ''],
|
||||
'#facc15', // yellow when hovered
|
||||
props.pointColor
|
||||
],
|
||||
'circle-color': props.pointColor,
|
||||
'circle-stroke-width': 3,
|
||||
'circle-stroke-color': '#ffffff'
|
||||
}
|
||||
@@ -260,6 +255,36 @@ 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'
|
||||
}
|
||||
})
|
||||
|
||||
// Auto-fit bounds to all items
|
||||
if (!didFitBounds.value && props.items.length > 0) {
|
||||
const bounds = new LngLatBounds()
|
||||
@@ -312,12 +337,7 @@ const initServerClusteringLayers = (map: MapboxMapType) => {
|
||||
filter: ['==', ['get', 'count'], 1],
|
||||
paint: {
|
||||
'circle-radius': 12,
|
||||
'circle-color': [
|
||||
'case',
|
||||
['==', ['get', 'id'], props.hoveredItemId || ''],
|
||||
'#facc15', // yellow when hovered
|
||||
props.pointColor
|
||||
],
|
||||
'circle-color': props.pointColor,
|
||||
'circle-stroke-width': 3,
|
||||
'circle-stroke-color': '#ffffff'
|
||||
}
|
||||
@@ -365,18 +385,31 @@ 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)
|
||||
// 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': '#3b82f6',
|
||||
'circle-color': props.pointColor,
|
||||
'circle-stroke-width': 3,
|
||||
'circle-stroke-color': '#ffffff'
|
||||
}
|
||||
|
||||
@@ -27,7 +27,8 @@
|
||||
<div
|
||||
v-for="token in activeTokens"
|
||||
:key="token.type"
|
||||
class="badge badge-lg badge-primary gap-1.5 cursor-pointer hover:badge-secondary transition-colors flex-shrink-0"
|
||||
class="badge badge-lg gap-1.5 cursor-pointer hover:opacity-80 transition-all flex-shrink-0 text-white"
|
||||
:style="{ backgroundColor: getTokenColor(token.type) }"
|
||||
@click.stop="$emit('edit-token', token.type)"
|
||||
>
|
||||
<Icon :name="token.icon" size="14" />
|
||||
@@ -204,6 +205,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import type { SelectMode } from '~/composables/useCatalogSearch'
|
||||
import { entityColors } from '~/composables/useCatalogSearch'
|
||||
|
||||
const props = defineProps<{
|
||||
sessionChecked?: boolean
|
||||
@@ -276,5 +278,9 @@ const selectModeIcon = computed(() => {
|
||||
if (props.selectMode === 'hub') return 'lucide:map-pin'
|
||||
return 'lucide:search'
|
||||
})
|
||||
|
||||
const getTokenColor = (type: string) => {
|
||||
return entityColors[type as keyof typeof entityColors] || entityColors.product
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ export type DisplayMode =
|
||||
| 'grid-offers'
|
||||
|
||||
export interface SearchFilter {
|
||||
type: 'product' | 'supplier' | 'hub' | 'location' | 'quantity'
|
||||
type: 'product' | 'supplier' | 'hub' | 'quantity'
|
||||
id: string
|
||||
label: string
|
||||
}
|
||||
@@ -22,16 +22,22 @@ export interface SearchState {
|
||||
product: { id: string; name: string } | null
|
||||
supplier: { id: string; name: string } | null
|
||||
hub: { id: string; name: string } | null
|
||||
location: { id: string; name: string } | null
|
||||
quantity: string | null
|
||||
}
|
||||
|
||||
// Color scheme for entity types
|
||||
export const entityColors = {
|
||||
product: '#f97316', // orange
|
||||
supplier: '#3b82f6', // blue
|
||||
hub: '#22c55e', // green
|
||||
offer: '#f97316' // orange (same as product context)
|
||||
} as const
|
||||
|
||||
// Filter labels cache (to show names instead of UUIDs)
|
||||
const filterLabels = ref<Record<string, Record<string, string>>>({
|
||||
product: {},
|
||||
supplier: {},
|
||||
hub: {},
|
||||
location: {}
|
||||
hub: {}
|
||||
})
|
||||
|
||||
export function useCatalogSearch() {
|
||||
@@ -51,7 +57,6 @@ export function useCatalogSearch() {
|
||||
const productId = computed(() => route.query.product as string | undefined)
|
||||
const supplierId = computed(() => route.query.supplier as string | undefined)
|
||||
const hubId = computed(() => route.query.hub as string | undefined)
|
||||
const locationId = computed(() => route.query.location as string | undefined)
|
||||
const quantity = computed(() => route.query.qty as string | undefined)
|
||||
|
||||
// Get label for a filter (from cache or fallback to ID)
|
||||
@@ -96,14 +101,6 @@ export function useCatalogSearch() {
|
||||
icon: 'lucide:map-pin'
|
||||
})
|
||||
}
|
||||
if (locationId.value) {
|
||||
tokens.push({
|
||||
type: 'location',
|
||||
id: locationId.value,
|
||||
label: getLabel('location', locationId.value) || t('catalog.filters.location'),
|
||||
icon: 'lucide:navigation'
|
||||
})
|
||||
}
|
||||
if (quantity.value) {
|
||||
tokens.push({
|
||||
type: 'quantity',
|
||||
@@ -129,10 +126,8 @@ export function useCatalogSearch() {
|
||||
if (!hubId.value && selectMode.value !== 'hub') {
|
||||
chips.push({ type: 'hub', label: t('catalog.filters.hub') })
|
||||
}
|
||||
if (!locationId.value) {
|
||||
chips.push({ type: 'location', label: t('catalog.filters.location') })
|
||||
}
|
||||
if (!quantity.value) {
|
||||
// Quantity only available after product is selected
|
||||
if (productId.value && !quantity.value) {
|
||||
chips.push({ type: 'quantity', label: t('catalog.filters.quantity') })
|
||||
}
|
||||
|
||||
@@ -226,10 +221,12 @@ export function useCatalogSearch() {
|
||||
productId,
|
||||
supplierId,
|
||||
hubId,
|
||||
locationId,
|
||||
quantity,
|
||||
searchQuery,
|
||||
|
||||
// Colors
|
||||
entityColors,
|
||||
|
||||
// Computed
|
||||
activeTokens,
|
||||
availableChips,
|
||||
|
||||
@@ -143,11 +143,14 @@ const clusterNodeType = computed(() => {
|
||||
return 'logistics'
|
||||
})
|
||||
|
||||
// Import entity colors
|
||||
const { entityColors } = useCatalogSearch()
|
||||
|
||||
const mapPointColor = computed(() => {
|
||||
if (cardType.value === 'supplier') return '#3b82f6'
|
||||
if (cardType.value === 'hub') return '#10b981'
|
||||
if (cardType.value === 'offer') return '#22c55e'
|
||||
return '#f59e0b'
|
||||
if (cardType.value === 'supplier') return entityColors.supplier // blue
|
||||
if (cardType.value === 'hub') return entityColors.hub // green
|
||||
if (cardType.value === 'offer') return entityColors.offer // orange
|
||||
return entityColors.product // orange
|
||||
})
|
||||
|
||||
const headerText = computed(() => {
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
"product": "Product",
|
||||
"supplier": "Supplier",
|
||||
"hub": "Hub",
|
||||
"location": "Location",
|
||||
"quantity": "Quantity"
|
||||
},
|
||||
"search": {
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
"product": "Товар",
|
||||
"supplier": "Поставщик",
|
||||
"hub": "Хаб",
|
||||
"location": "Локация",
|
||||
"quantity": "Количество"
|
||||
},
|
||||
"search": {
|
||||
|
||||
Reference in New Issue
Block a user