Simplify OfferResultCard and use daisyUI Steps
All checks were successful
Build Docker Image / build (push) Successful in 4m42s
All checks were successful
Build Docker Image / build (push) Successful in 4m42s
- Remove sourceName, latitude, longitude props from OfferResultCard - Remove LocationMiniMap component (not needed, main map is on the side) - Convert RouteStepper to use daisyUI steps-horizontal - Update hub page and CalcResultContent to remove unused props
This commit is contained in:
@@ -20,14 +20,11 @@
|
|||||||
<OfferResultCard
|
<OfferResultCard
|
||||||
v-for="option in productRouteOptions"
|
v-for="option in productRouteOptions"
|
||||||
:key="option.sourceUuid"
|
:key="option.sourceUuid"
|
||||||
:source-name="option.sourceName || 'Склад'"
|
|
||||||
:location-name="getOfferData(option.sourceUuid)?.locationName"
|
:location-name="getOfferData(option.sourceUuid)?.locationName"
|
||||||
:product-name="productName"
|
:product-name="productName"
|
||||||
:price-per-unit="getOfferData(option.sourceUuid)?.pricePerUnit"
|
:price-per-unit="getOfferData(option.sourceUuid)?.pricePerUnit"
|
||||||
:currency="getOfferData(option.sourceUuid)?.currency"
|
:currency="getOfferData(option.sourceUuid)?.currency"
|
||||||
:unit="getOfferData(option.sourceUuid)?.unit"
|
:unit="getOfferData(option.sourceUuid)?.unit"
|
||||||
:latitude="option.sourceLat"
|
|
||||||
:longitude="option.sourceLon"
|
|
||||||
:stages="getRouteStages(option)"
|
:stages="getRouteStages(option)"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,103 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="rounded-lg overflow-hidden border border-base-300">
|
|
||||||
<ClientOnly>
|
|
||||||
<MapboxMap
|
|
||||||
:key="mapId"
|
|
||||||
:map-id="mapId"
|
|
||||||
:style="`height: ${height}px; width: 100%;`"
|
|
||||||
:options="mapOptions"
|
|
||||||
@load="onMapCreated"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<template #fallback>
|
|
||||||
<div :style="`height: ${height}px`" class="w-full bg-base-200 flex items-center justify-center">
|
|
||||||
<span class="loading loading-spinner loading-xs"></span>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</ClientOnly>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import type { Map as MapboxMapType } from 'mapbox-gl'
|
|
||||||
import { getCurrentInstance } from 'vue'
|
|
||||||
|
|
||||||
const props = withDefaults(defineProps<{
|
|
||||||
latitude: number
|
|
||||||
longitude: number
|
|
||||||
height?: number
|
|
||||||
}>(), {
|
|
||||||
height: 120
|
|
||||||
})
|
|
||||||
|
|
||||||
const mapRef = ref<MapboxMapType | null>(null)
|
|
||||||
|
|
||||||
const instanceId = getCurrentInstance()?.uid || Math.floor(Math.random() * 100000)
|
|
||||||
const mapId = computed(() => `location-mini-map-${instanceId}`)
|
|
||||||
|
|
||||||
const mapOptions = computed(() => ({
|
|
||||||
style: 'mapbox://styles/mapbox/streets-v12',
|
|
||||||
center: [props.longitude, props.latitude] as [number, number],
|
|
||||||
zoom: 5,
|
|
||||||
interactive: false,
|
|
||||||
attributionControl: false
|
|
||||||
}))
|
|
||||||
|
|
||||||
const onMapCreated = (map: MapboxMapType) => {
|
|
||||||
mapRef.value = map
|
|
||||||
|
|
||||||
const initMap = () => {
|
|
||||||
map.addSource('location-point', {
|
|
||||||
type: 'geojson',
|
|
||||||
data: {
|
|
||||||
type: 'Feature',
|
|
||||||
properties: {},
|
|
||||||
geometry: {
|
|
||||||
type: 'Point',
|
|
||||||
coordinates: [props.longitude, props.latitude]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
map.addLayer({
|
|
||||||
id: 'location-point-layer',
|
|
||||||
type: 'circle',
|
|
||||||
source: 'location-point',
|
|
||||||
paint: {
|
|
||||||
'circle-radius': 8,
|
|
||||||
'circle-color': '#10b981',
|
|
||||||
'circle-stroke-width': 2,
|
|
||||||
'circle-stroke-color': '#ffffff'
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
if (map.loaded()) {
|
|
||||||
initMap()
|
|
||||||
} else {
|
|
||||||
map.on('load', initMap)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
watch(
|
|
||||||
() => [props.latitude, props.longitude],
|
|
||||||
() => {
|
|
||||||
const map = mapRef.value
|
|
||||||
if (!map) return
|
|
||||||
|
|
||||||
map.setCenter([props.longitude, props.latitude])
|
|
||||||
|
|
||||||
const source = map.getSource('location-point') as mapboxgl.GeoJSONSource | undefined
|
|
||||||
if (source) {
|
|
||||||
source.setData({
|
|
||||||
type: 'Feature',
|
|
||||||
properties: {},
|
|
||||||
geometry: {
|
|
||||||
type: 'Point',
|
|
||||||
coordinates: [props.longitude, props.latitude]
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
</script>
|
|
||||||
@@ -1,32 +1,18 @@
|
|||||||
<template>
|
<template>
|
||||||
<Card padding="md" interactive @click="$emit('select')">
|
<Card padding="md" interactive @click="$emit('select')">
|
||||||
<!-- Header: Source name + Location + Price -->
|
<!-- Header: Location + Price -->
|
||||||
<div class="flex items-start justify-between mb-3">
|
<div class="flex items-start justify-between mb-3">
|
||||||
<div>
|
<div>
|
||||||
<Text weight="semibold">{{ sourceName }}</Text>
|
<Text weight="semibold">{{ locationName || 'Локация' }}</Text>
|
||||||
<Text v-if="locationName" tone="muted" size="sm">{{ locationName }}</Text>
|
<Text v-if="productName" tone="muted" size="sm">{{ productName }}</Text>
|
||||||
</div>
|
|
||||||
<div class="text-right">
|
|
||||||
<Text v-if="priceDisplay" weight="semibold" class="text-primary text-lg">
|
|
||||||
{{ priceDisplay }}
|
|
||||||
</Text>
|
|
||||||
</div>
|
</div>
|
||||||
|
<Text v-if="priceDisplay" weight="semibold" class="text-primary text-lg">
|
||||||
|
{{ priceDisplay }}
|
||||||
|
</Text>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Product name + Route stepper -->
|
<!-- Route stepper -->
|
||||||
<div v-if="productName" class="mb-3">
|
<RouteStepper v-if="stages.length > 0" :stages="stages" />
|
||||||
<Text size="sm" class="mb-1">{{ productName }}</Text>
|
|
||||||
<RouteStepper v-if="stages.length > 0" :stages="stages" />
|
|
||||||
</div>
|
|
||||||
<RouteStepper v-else-if="stages.length > 0" :stages="stages" class="mb-3" />
|
|
||||||
|
|
||||||
<!-- Mini map -->
|
|
||||||
<LocationMiniMap
|
|
||||||
v-if="latitude && longitude"
|
|
||||||
:latitude="latitude"
|
|
||||||
:longitude="longitude"
|
|
||||||
:height="100"
|
|
||||||
/>
|
|
||||||
</Card>
|
</Card>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -34,14 +20,11 @@
|
|||||||
import type { RouteStage } from './RouteStepper.vue'
|
import type { RouteStage } from './RouteStepper.vue'
|
||||||
|
|
||||||
const props = withDefaults(defineProps<{
|
const props = withDefaults(defineProps<{
|
||||||
sourceName: string
|
|
||||||
locationName?: string
|
locationName?: string
|
||||||
productName?: string
|
productName?: string
|
||||||
pricePerUnit?: number | null
|
pricePerUnit?: number | null
|
||||||
currency?: string | null
|
currency?: string | null
|
||||||
unit?: string | null
|
unit?: string | null
|
||||||
latitude?: number | null
|
|
||||||
longitude?: number | null
|
|
||||||
stages?: RouteStage[]
|
stages?: RouteStage[]
|
||||||
}>(), {
|
}>(), {
|
||||||
stages: () => []
|
stages: () => []
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="flex items-center gap-1 flex-wrap text-xs">
|
<ul class="steps steps-horizontal text-xs w-full">
|
||||||
<template v-for="(stage, index) in stages" :key="index">
|
<li
|
||||||
<div v-if="index > 0" class="w-3 h-px bg-base-300" />
|
v-for="(stage, index) in stages"
|
||||||
<div class="flex items-center gap-0.5">
|
:key="index"
|
||||||
<span>{{ getTransportIcon(stage.transportType) }}</span>
|
class="step step-primary"
|
||||||
<span class="text-base-content/70">{{ formatDistance(stage.distanceKm) }}км</span>
|
:data-content="getTransportIcon(stage.transportType)"
|
||||||
</div>
|
>
|
||||||
</template>
|
{{ formatDistance(stage.distanceKm) }} км
|
||||||
</div>
|
</li>
|
||||||
|
</ul>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
@@ -27,6 +28,7 @@ const getTransportIcon = (type?: string | null) => {
|
|||||||
case 'sea':
|
case 'sea':
|
||||||
return '🚢'
|
return '🚢'
|
||||||
case 'road':
|
case 'road':
|
||||||
|
case 'auto':
|
||||||
default:
|
default:
|
||||||
return '🚛'
|
return '🚛'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,14 +60,11 @@
|
|||||||
|
|
||||||
<template #card="{ item }">
|
<template #card="{ item }">
|
||||||
<OfferResultCard
|
<OfferResultCard
|
||||||
:source-name="item.name"
|
|
||||||
:location-name="getOfferData(item.uuid)?.locationName"
|
:location-name="getOfferData(item.uuid)?.locationName"
|
||||||
:product-name="selectedProductName"
|
:product-name="selectedProductName"
|
||||||
:price-per-unit="getOfferData(item.uuid)?.pricePerUnit"
|
:price-per-unit="getOfferData(item.uuid)?.pricePerUnit"
|
||||||
:currency="getOfferData(item.uuid)?.currency"
|
:currency="getOfferData(item.uuid)?.currency"
|
||||||
:unit="getOfferData(item.uuid)?.unit"
|
:unit="getOfferData(item.uuid)?.unit"
|
||||||
:latitude="item.latitude"
|
|
||||||
:longitude="item.longitude"
|
|
||||||
:stages="item.stages"
|
:stages="item.stages"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
Reference in New Issue
Block a user