Refactor catalog layout: replace Teleport with provide/inject
All checks were successful
Build Docker Image / build (push) Successful in 4m1s
All checks were successful
Build Docker Image / build (push) Successful in 4m1s
- Create useCatalogLayout composable for data transfer from pages to layout - Layout now owns SearchBar and CatalogMap components directly - Pages provide data via provideCatalogLayout() - Fixes navigation glitches (multiple SearchBars) when switching tabs - Support custom subNavItems for clientarea pages - Unify 6 pages to use catalog layout: - catalog/offers, suppliers, hubs - clientarea/orders, addresses, offers
This commit is contained in:
@@ -1,76 +1,5 @@
|
||||
<template>
|
||||
<div>
|
||||
<!-- SearchBar teleported to layout -->
|
||||
<Teleport to="#catalog-searchbar">
|
||||
<div class="px-4 lg:px-6 py-2">
|
||||
<CatalogSearchBar
|
||||
v-model:search-query="searchQuery"
|
||||
:active-filters="activeFilterBadges"
|
||||
:displayed-count="displayItems.length"
|
||||
:total-count="total"
|
||||
@remove-filter="onRemoveFilter"
|
||||
@search="onSearch"
|
||||
>
|
||||
<template #filters>
|
||||
<div class="p-2 space-y-3">
|
||||
<div>
|
||||
<div class="text-xs font-semibold mb-1 text-base-content/70">{{ t('catalogHubsSection.filters.transport') }}</div>
|
||||
<ul class="menu menu-compact">
|
||||
<li v-for="filter in filters" :key="filter.id">
|
||||
<a
|
||||
:class="{ active: selectedFilter === filter.id }"
|
||||
@click="selectedFilter = filter.id"
|
||||
>
|
||||
{{ filter.label }}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="divider my-0"></div>
|
||||
<div>
|
||||
<div class="text-xs font-semibold mb-1 text-base-content/70">{{ t('catalogHubsSection.filters.country') }}</div>
|
||||
<ul class="menu menu-compact max-h-48 overflow-y-auto">
|
||||
<li v-for="filter in countryFilters" :key="filter.id">
|
||||
<a
|
||||
:class="{ active: selectedCountry === filter.id }"
|
||||
@click="selectedCountry = filter.id"
|
||||
>
|
||||
{{ filter.label }}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</CatalogSearchBar>
|
||||
</div>
|
||||
</Teleport>
|
||||
|
||||
<!-- Map teleported to layout -->
|
||||
<Teleport to="#catalog-map">
|
||||
<div class="h-full w-full relative">
|
||||
<!-- 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="hubs-map"
|
||||
:items="useServerClustering ? [] : itemsWithCoords"
|
||||
:clustered-points="useServerClustering ? clusteredNodes : []"
|
||||
:use-server-clustering="useServerClustering"
|
||||
point-color="#10b981"
|
||||
:hovered-item-id="hoveredHubId"
|
||||
:hovered-item="hoveredItem"
|
||||
@select-item="onMapSelect"
|
||||
@bounds-change="onBoundsChange"
|
||||
/>
|
||||
</ClientOnly>
|
||||
</div>
|
||||
</Teleport>
|
||||
|
||||
<!-- List content -->
|
||||
<div v-if="isLoading" class="flex items-center justify-center py-8">
|
||||
<Card padding="lg">
|
||||
@@ -117,7 +46,9 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { h, defineComponent } from 'vue'
|
||||
import type { MapBounds } from '~/components/catalog/CatalogMap.vue'
|
||||
import { provideCatalogLayout } from '~/composables/useCatalogLayout'
|
||||
|
||||
definePageMeta({
|
||||
layout: 'catalog'
|
||||
@@ -147,9 +78,6 @@ const hoveredHubId = ref<string>()
|
||||
// Search bar
|
||||
const searchQuery = ref('')
|
||||
|
||||
// Map ref
|
||||
const mapRef = ref<{ flyTo: (lat: number, lng: number, zoom?: number) => void } | null>(null)
|
||||
|
||||
// Server-side clustering
|
||||
const useServerClustering = true
|
||||
const { clusteredNodes, fetchClusters } = useClusteredNodes()
|
||||
@@ -231,10 +159,6 @@ const onSearch = () => {
|
||||
|
||||
const onSelectHub = (hub: any) => {
|
||||
selectedHubId.value = hub.uuid
|
||||
// Fly to hub on map
|
||||
if (hub.latitude && hub.longitude) {
|
||||
mapRef.value?.flyTo(Number(hub.latitude), Number(hub.longitude), 8)
|
||||
}
|
||||
}
|
||||
|
||||
// Handle selection from map
|
||||
@@ -258,6 +182,65 @@ const isFirstInCountry = (hub: any) => {
|
||||
return false
|
||||
}
|
||||
|
||||
// Filter component for the layout
|
||||
const HubsFilterComponent = defineComponent({
|
||||
setup() {
|
||||
return () => h('div', { class: 'p-2 space-y-3' }, [
|
||||
// Transport filter
|
||||
h('div', {}, [
|
||||
h('div', { class: 'text-xs font-semibold mb-1 text-base-content/70' }, t('catalogHubsSection.filters.transport')),
|
||||
h('ul', { class: 'menu menu-compact' },
|
||||
filters.value.map(filter =>
|
||||
h('li', { key: filter.id },
|
||||
h('a', {
|
||||
class: selectedFilter.value === filter.id ? 'active' : '',
|
||||
onClick: () => { selectedFilter.value = filter.id }
|
||||
}, filter.label)
|
||||
)
|
||||
)
|
||||
)
|
||||
]),
|
||||
// Divider
|
||||
h('div', { class: 'divider my-0' }),
|
||||
// Country filter
|
||||
h('div', {}, [
|
||||
h('div', { class: 'text-xs font-semibold mb-1 text-base-content/70' }, t('catalogHubsSection.filters.country')),
|
||||
h('ul', { class: 'menu menu-compact max-h-48 overflow-y-auto' },
|
||||
countryFilters.value.map(filter =>
|
||||
h('li', { key: filter.id },
|
||||
h('a', {
|
||||
class: selectedCountry.value === filter.id ? 'active' : '',
|
||||
onClick: () => { selectedCountry.value = filter.id }
|
||||
}, filter.label)
|
||||
)
|
||||
)
|
||||
)
|
||||
])
|
||||
])
|
||||
}
|
||||
})
|
||||
|
||||
// Provide data to layout
|
||||
provideCatalogLayout({
|
||||
searchQuery,
|
||||
activeFilters: activeFilterBadges,
|
||||
displayedCount: computed(() => displayItems.value.length),
|
||||
totalCount: computed(() => total.value),
|
||||
onSearch,
|
||||
onRemoveFilter,
|
||||
filterComponent: HubsFilterComponent,
|
||||
mapItems: itemsWithCoords,
|
||||
mapId: 'hubs-map',
|
||||
pointColor: '#10b981',
|
||||
hoveredItemId: hoveredHubId,
|
||||
hoveredItem,
|
||||
onMapSelect,
|
||||
onBoundsChange,
|
||||
searchWithMap,
|
||||
useServerClustering,
|
||||
clusteredNodes
|
||||
})
|
||||
|
||||
await init()
|
||||
|
||||
useHead(() => ({
|
||||
|
||||
Reference in New Issue
Block a user