Some checks failed
Security Scanning / Trivy Filesystem Scan (push) Failing after 31s
Security Scanning / Security Gate (push) Failing after 2s
CI / Lint → Typecheck → Test → Build (22) (push) Failing after 13s
Deploy / Build API Image (push) Failing after 36s
Deploy / Build Web Image (push) Failing after 12s
Deploy / Build AI Services Image (push) Failing after 12s
Security Scanning / Trivy Scan — API Image (push) Failing after 1m5s
CI / E2E Tests (push) Has been skipped
CodeQL Analysis / CodeQL (javascript-typescript) (push) Failing after 1m24s
E2E Tests / Playwright E2E (push) Failing after 20s
Security Scanning / Dependency Audit (pnpm) (push) Failing after 3s
Deploy / Deploy to Production (push) Has been cancelled
Deploy / Deploy to Staging (push) Has been cancelled
Deploy / Smoke Test Staging (push) Has been cancelled
Deploy / Rollback Staging (push) Has been cancelled
Deploy / Smoke Test Production (push) Has been cancelled
Deploy / Rollback Production (push) Has been cancelled
Security Scanning / Trivy Scan — AI Services Image (push) Has been cancelled
Security Scanning / Trivy Scan — Web Image (push) Has been cancelled
Mapbox theming
--------------
- New hook `lib/mapbox-style.ts` returning streets-v12 (light) or
dark-v11 (dark) from the app's useTheme().
- Six map components now initialise with the themed style and
`map.setStyle(...)` on theme change: project-map, park-map,
listing-map, district-heatmap (plus re-adding its heatmap source
after style.load), neighborhood-poi-map, valuation/comparables-map.
- Marker / popup DOM styles swapped from hard-coded white/#666/#green
to shadcn CSS tokens (--card, --card-foreground, --muted-foreground,
--primary, --border). Global Mapbox popup + control + attribution
skins added in app/globals.css.
- POI filter pills on neighborhood-poi-map were hard-coded `bg-white`
which rendered same-colour text on white in dark mode — switched to
`bg-card`/`bg-card/60` for proper contrast.
- Extend the MockMap in comparables-map.spec.tsx with setStyle/on
so the new theme-sync effect doesn't blow up in tests.
Detail client normaliser (du-an-server)
---------------------------------------
- Project media from the backend is a `string[]` (raw URLs) or richer
`{url,...}` objects. Handle both shapes and drop entries without
a URL so we never feed "" to <Image src>.
- Amenities are `string[]` in the DB but the frontend type expects
`{id,name,icon,category}`; normalise strings into objects so the
AmenitiesTab has stable keys and a displayable name.
Resolves three classes of runtime warnings on /du-an/<slug>:
"Image is missing required 'src' property", "ReactDOM.preload ...
empty href", and "Each child in a list should have a unique 'key'
prop" (AmenitiesTab).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
161 lines
5.5 KiB
TypeScript
161 lines
5.5 KiB
TypeScript
'use client';
|
|
|
|
/* eslint-disable import-x/no-named-as-default-member */
|
|
import mapboxgl from 'mapbox-gl';
|
|
import * as React from 'react';
|
|
import 'mapbox-gl/dist/mapbox-gl.css';
|
|
import { formatPrice } from '@/lib/currency';
|
|
import {
|
|
PROJECT_STATUS_LABELS,
|
|
type ProjectSummary,
|
|
} from '@/lib/du-an-api';
|
|
import { useMapboxStyle } from '@/lib/mapbox-style';
|
|
|
|
interface ProjectMapProps {
|
|
projects: ProjectSummary[];
|
|
className?: string;
|
|
}
|
|
|
|
const DEFAULT_CENTER: [number, number] = [106.6297, 10.8231]; // HCMC
|
|
const DEFAULT_ZOOM = 12;
|
|
|
|
export function ProjectMap({ projects, className }: ProjectMapProps) {
|
|
const mapContainerRef = React.useRef<HTMLDivElement>(null);
|
|
const mapRef = React.useRef<mapboxgl.Map | null>(null);
|
|
const markersRef = React.useRef<mapboxgl.Marker[]>([]);
|
|
const mapStyle = useMapboxStyle();
|
|
|
|
const geoProjects = React.useMemo(
|
|
() => projects.filter((p) => p.latitude != null && p.longitude != null),
|
|
[projects],
|
|
);
|
|
|
|
React.useEffect(() => {
|
|
if (!mapContainerRef.current) return;
|
|
|
|
const token = process.env['NEXT_PUBLIC_MAPBOX_TOKEN'];
|
|
if (!token) return;
|
|
|
|
mapboxgl.accessToken = token;
|
|
|
|
const map = new mapboxgl.Map({
|
|
container: mapContainerRef.current,
|
|
style: mapStyle,
|
|
center: DEFAULT_CENTER,
|
|
zoom: DEFAULT_ZOOM,
|
|
attributionControl: false,
|
|
});
|
|
|
|
map.addControl(new mapboxgl.NavigationControl(), 'top-right');
|
|
map.addControl(new mapboxgl.AttributionControl({ compact: true }), 'bottom-right');
|
|
|
|
mapRef.current = map;
|
|
|
|
return () => {
|
|
map.remove();
|
|
mapRef.current = null;
|
|
};
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, []);
|
|
|
|
React.useEffect(() => {
|
|
const map = mapRef.current;
|
|
if (!map) return;
|
|
// setStyle wipes user-added sources/layers — but these components re-add
|
|
// markers/sources in another effect that fires after geo data changes.
|
|
// We only need to preserve markers. Since markers are DOM-attached, they
|
|
// survive the style swap automatically.
|
|
map.setStyle(mapStyle);
|
|
}, [mapStyle]);
|
|
|
|
React.useEffect(() => {
|
|
const map = mapRef.current;
|
|
if (!map) return;
|
|
|
|
markersRef.current.forEach((m) => m.remove());
|
|
markersRef.current = [];
|
|
|
|
if (geoProjects.length === 0) return;
|
|
|
|
const bounds = new mapboxgl.LngLatBounds();
|
|
|
|
geoProjects.forEach((project) => {
|
|
const el = document.createElement('div');
|
|
el.className = 'project-map-marker';
|
|
el.style.cssText = `
|
|
background: hsl(var(--card));
|
|
color: hsl(var(--card-foreground));
|
|
border-radius: 8px;
|
|
padding: 4px 8px;
|
|
font-size: 11px;
|
|
font-weight: 600;
|
|
box-shadow: 0 2px 6px rgba(0,0,0,0.3);
|
|
white-space: nowrap;
|
|
cursor: pointer;
|
|
border-left: 3px solid hsl(var(--primary));
|
|
transition: transform 0.15s;
|
|
max-width: 160px;
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
`;
|
|
el.textContent = project.name;
|
|
el.addEventListener('mouseenter', () => {
|
|
el.style.transform = 'scale(1.05)';
|
|
});
|
|
el.addEventListener('mouseleave', () => {
|
|
el.style.transform = 'scale(1)';
|
|
});
|
|
|
|
const statusLabel = PROJECT_STATUS_LABELS[project.status];
|
|
const priceText = project.minPrice ? formatPrice(project.minPrice) : 'Liên hệ';
|
|
|
|
const popup = new mapboxgl.Popup({ offset: 15, maxWidth: '240px', closeButton: false })
|
|
.setHTML(
|
|
`<div style="font-family:system-ui,sans-serif;background:hsl(var(--card));color:hsl(var(--card-foreground));padding:8px;border-radius:6px;">
|
|
<p style="font-weight:600;font-size:13px;margin:0 0 4px;">${project.name}</p>
|
|
<p style="font-size:12px;color:hsl(var(--muted-foreground));margin:0 0 4px;">${project.district}, ${project.city}</p>
|
|
<p style="font-size:12px;margin:0 0 4px;">
|
|
<span style="background:hsl(var(--secondary));padding:2px 6px;border-radius:4px;">${statusLabel}</span>
|
|
<span style="margin-left:4px;font-weight:600;color:hsl(var(--primary));">${priceText}</span>
|
|
</p>
|
|
<a href="/du-an/${project.slug}" style="font-size:12px;color:hsl(var(--primary));text-decoration:none;">Xem chi tiết →</a>
|
|
</div>`,
|
|
);
|
|
|
|
const marker = new mapboxgl.Marker({ element: el, anchor: 'left' })
|
|
.setLngLat([project.longitude!, project.latitude!])
|
|
.setPopup(popup)
|
|
.addTo(map);
|
|
|
|
markersRef.current.push(marker);
|
|
bounds.extend([project.longitude!, project.latitude!]);
|
|
});
|
|
|
|
if (geoProjects.length > 1) {
|
|
map.fitBounds(bounds, { padding: 60, maxZoom: 15 });
|
|
} else {
|
|
map.flyTo({ center: [geoProjects[0]!.longitude!, geoProjects[0]!.latitude!], zoom: 14 });
|
|
}
|
|
}, [geoProjects]);
|
|
|
|
const hasToken = typeof process !== 'undefined' && process.env['NEXT_PUBLIC_MAPBOX_TOKEN'];
|
|
|
|
return (
|
|
<div className={`relative overflow-hidden rounded-lg border ${className || 'h-[400px] md:h-[500px]'}`}>
|
|
<div ref={mapContainerRef} className="h-full w-full" />
|
|
|
|
{!hasToken && (
|
|
<div className="absolute inset-0 flex items-center justify-center bg-gradient-to-b from-blue-50 to-green-50">
|
|
<p className="text-sm text-muted-foreground">
|
|
Thiết lập NEXT_PUBLIC_MAPBOX_TOKEN để hiển thị bản đồ
|
|
</p>
|
|
</div>
|
|
)}
|
|
|
|
<div className="absolute bottom-3 left-3 rounded bg-white/90 px-2 py-1 text-xs text-muted-foreground shadow">
|
|
{geoProjects.length} dự án trên bản đồ
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|