[frontend] restructure components

This commit is contained in:
2025-10-12 05:06:13 +02:00
parent 01b84042ab
commit 9b20b08ab2
24 changed files with 830 additions and 248 deletions
+2 -1
View File
@@ -1,3 +1,4 @@
{ {
"php.version": "8.4" "php.version": "8.4",
"files.autoSave": "onFocusChange",
} }
+175
View File
@@ -0,0 +1,175 @@
## creative commons
# Attribution-NonCommercial-ShareAlike 4.0 International
Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
### Using Creative Commons Public Licenses
Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
* __Considerations for licensors:__ Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. [More considerations for licensors](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors).
* __Considerations for the public:__ By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensors permission is not necessary for any reasonfor example, because of any applicable exception or limitation to copyrightthen that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. [More considerations for the public](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees).
## Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License
By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
### Section 1 Definitions.
a. __Adapted Material__ means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
b. __Adapter's License__ means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
c. __BY-NC-SA Compatible License__ means a license listed at [creativecommons.org/compatiblelicenses](http://creativecommons.org/compatiblelicenses), approved by Creative Commons as essentially the equivalent of this Public License.
d. __Copyright and Similar Rights__ means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
e. __Effective Technological Measures__ means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
f. __Exceptions and Limitations__ means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
g. __License Elements__ means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution, NonCommercial, and ShareAlike.
h. __Licensed Material__ means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
i. __Licensed Rights__ means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
j. __Licensor__ means the individual(s) or entity(ies) granting rights under this Public License.
k. __NonCommercial__ means not primarily intended for or directed towards commercial advantage or monetary compensation. For purposes of this Public License, the exchange of the Licensed Material for other material subject to Copyright and Similar Rights by digital file-sharing or similar means is NonCommercial provided there is no payment of monetary compensation in connection with the exchange.
l. __Share__ means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
m. __Sui Generis Database Rights__ means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
n. __You__ means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
### Section 2 Scope.
a. ___License grant.___
1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
A. reproduce and Share the Licensed Material, in whole or in part, for NonCommercial purposes only; and
B. produce, reproduce, and Share Adapted Material for NonCommercial purposes only.
2. __Exceptions and Limitations.__ For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
3. __Term.__ The term of this Public License is specified in Section 6(a).
4. __Media and formats; technical modifications allowed.__ The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
5. __Downstream recipients.__
A. __Offer from the Licensor Licensed Material.__ Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
B. __Additional offer from the Licensor Adapted Material.__ Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapters License You apply.
C. __No downstream restrictions.__ You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
6. __No endorsement.__ Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
b. ___Other rights.___
1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
2. Patent and trademark rights are not licensed under this Public License.
3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties, including when the Licensed Material is used other than for NonCommercial purposes.
### Section 3 License Conditions.
Your exercise of the Licensed Rights is expressly made subject to the following conditions.
a. ___Attribution.___
1. If You Share the Licensed Material (including in modified form), You must:
A. retain the following if it is supplied by the Licensor with the Licensed Material:
i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
ii. a copyright notice;
iii. a notice that refers to this Public License;
iv. a notice that refers to the disclaimer of warranties;
v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
b. ___ShareAlike.___
In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
1. The Adapters License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-NC-SA Compatible License.
2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
### Section 4 Sui Generis Database Rights.
Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database for NonCommercial purposes only;
b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and
c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
### Section 5 Disclaimer of Warranties and Limitation of Liability.
a. __Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.__
b. __To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.__
c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
### Section 6 Term and Termination.
a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
2. upon express reinstatement by the Licensor.
For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
c. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
d. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
### Section 7 Other Terms and Conditions.
a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
### Section 8 Interpretation.
a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
> Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at [creativecommons.org/policies](http://creativecommons.org/policies), Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
>
> Creative Commons may be contacted at creativecommons.org
+12 -8
View File
@@ -1,7 +1,15 @@
# Points of Interest # Points of Interest
[![Backend Quality](https://github.com/bernard-ng/points-of-interest/actions/workflows/backend-quality.yml/badge.svg)](https://github.com/bernard-ng/points-of-interest/actions/workflows/backend-quality.yml)
[![Backend Tests](https://github.com/bernard-ng/points-of-interest/actions/workflows/backend-tests.yml/badge.svg)](https://github.com/bernard-ng/points-of-interest/actions/workflows/backend-tests.yml)
[![Frontend Quality](https://github.com/bernard-ng/points-of-interest/actions/workflows/frontend-quality.yml/badge.svg)](https://github.com/bernard-ng/points-of-interest/actions/workflows/frontend-quality.yml)
---
This repository hosts a proof-of-concept "points of interest" application composed of a Symfony API and a React client. Users can submit nearby signals and explore aggregated heatmaps that visualise recent activity. This repository hosts a proof-of-concept "points of interest" application composed of a Symfony API and a React client. Users can submit nearby signals and explore aggregated heatmaps that visualise recent activity.
![Screenshot](./screenshot.png)
## Project structure ## Project structure
- `server/` Symfony 7 API that stores and broadcasts signal submissions. - `server/` Symfony 7 API that stores and broadcasts signal submissions.
@@ -10,11 +18,8 @@ This repository hosts a proof-of-concept "points of interest" application compos
## Prerequisites ## Prerequisites
- Node.js 20+ - Node.js 20+
- npm 10+ - PHP 8.4+
- PHP 8.2+ - Docker
- Composer 2+
- Docker (to run the bundled Postgres + PostGIS service)
- PostgreSQL 16 with the PostGIS extension (a ready-to-use container is provided via Docker Compose)
## Running the API server ## Running the API server
@@ -22,8 +27,7 @@ This repository hosts a proof-of-concept "points of interest" application compos
cd server cd server
composer install composer install
# Boot the Postgres + PostGIS container docker compose up
docker compose up -d postgres
# Prepare the database schema # Prepare the database schema
php bin/console doctrine:database:create --if-not-exists php bin/console doctrine:database:create --if-not-exists
@@ -31,7 +35,7 @@ php bin/console doctrine:migrations:migrate --no-interaction
php bin/console doctrine:fixtures:load php bin/console doctrine:fixtures:load
# Start the Symfony development server # Start the Symfony development server
symfony server:start symfony serve --no-tls
``` ```
The API listens on `http://127.0.0.1:8000` by default. Adjust the Mercure hub and other environment variables in `.env` as needed. The API listens on `http://127.0.0.1:8000` by default. Adjust the Mercure hub and other environment variables in `.env` as needed.
+54 -192
View File
@@ -1,63 +1,29 @@
import { useCallback, useEffect, useMemo, useState } from "react"; import { useCallback, useEffect, useMemo, useState } from "react";
import { Menu } from "lucide-react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { toast } from "sonner"; import { toast } from "sonner";
import { AppHeader } from "@/components/layout/app-header"; import { ConfirmSignalDialog } from "@/components/app/confirm-signal-dialog";
import { HeaderOverlay } from "@/components/app/header-overlay";
import { SidebarPanels } from "@/components/app/sidebar-panels";
import { MapViewport } from "@/components/map/map-viewport"; import { MapViewport } from "@/components/map/map-viewport";
import { ActivityPanel } from "@/components/panels/activity-panel"; // Alert dialog moved into a dedicated component
import { HotspotStatsPanel } from "@/components/panels/hotspot-stats-panel"; import { SidebarProvider, Sidebar, SidebarContent, SidebarInset } from "@/components/ui/sidebar";
import { OverviewPanel } from "@/components/panels/overview-panel";
import {
AlertDialog,
AlertDialogAction,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog";
import { Button } from "@/components/ui/button";
import { ScrollArea } from "@/components/ui/scroll-area";
import {
SidebarProvider,
Sidebar,
SidebarHeader,
SidebarContent,
SidebarTrigger,
SidebarInset,
} from "@/components/ui/sidebar";
import { Toaster } from "@/components/ui/sonner"; import { Toaster } from "@/components/ui/sonner";
import { useFeedDerivations } from "@/hooks/use-feed-derivations";
import { useHotspotFeed } from "@/hooks/use-hotsop-feed"; import { useHotspotFeed } from "@/hooks/use-hotsop-feed";
import { useLeafletHeatmap, type TileProvider } from "@/hooks/use-leaflet-heatmap"; import { useLeafletHeatmap } from "@/hooks/use-leaflet-heatmap";
import { useUserLocation } from "@/hooks/use-user-location"; import { useUserLocation } from "@/hooks/use-user-location";
import { distanceInKm, formatCoordinate, formatRelativeTime, formatTimestamp } from "@/lib/utils"; import { formatCoordinate, formatRelativeTime } from "@/lib/utils";
import { useAppStore } from "@/store/use-app-store"; import { useAppStore } from "@/store/use-app-store";
import type { Point } from "@/types/api"; import type { Point } from "@/types/api";
import { MapTilesPanel } from "./components/panels/map-tiles-panel";
const RADIUS_KM = 1; const RADIUS_KM = 1;
export default function App() { export default function App() {
const [pendingSpot, setPendingSpot] = useState<Point | null>(null); const [pendingSpot, setPendingSpot] = useState<Point | null>(null);
const [isConfirmOpen, setIsConfirmOpen] = useState(false); const [isConfirmOpen, setIsConfirmOpen] = useState(false);
const [isConfirming, setIsConfirming] = useState(false); const [isConfirming, setIsConfirming] = useState(false);
const [tileProvider, setTileProvider] = useState<TileProvider>("openstreetmap");
const [isDetailsOpen, setIsDetailsOpen] = useState(() => {
if (typeof window === "undefined") {
return false;
}
return window.innerWidth >= 1024;
});
const [isHeaderCollapsed, setIsHeaderCollapsed] = useState(() => {
if (typeof window === "undefined") {
return false;
}
return window.innerWidth < 768;
});
const { t, i18n } = useTranslation(); const { t, i18n } = useTranslation();
const locale = i18n.language === "fr" ? "fr-FR" : "en-US"; const locale = i18n.language === "fr" ? "fr-FR" : "en-US";
@@ -73,6 +39,14 @@ export default function App() {
const userLocation = useAppStore(state => state.userLocation); const userLocation = useAppStore(state => state.userLocation);
const locationError = useAppStore(state => state.locationError); const locationError = useAppStore(state => state.locationError);
const isRequestingLocation = useAppStore(state => state.isRequestingLocation); const isRequestingLocation = useAppStore(state => state.isRequestingLocation);
const isDetailsOpen = useAppStore(state => state.isSidebarOpen);
const setIsDetailsOpen = useAppStore(state => state.setIsSidebarOpen);
const isHeaderCollapsed = useAppStore(state => state.isHeaderCollapsed);
const setIsHeaderCollapsed = useAppStore(state => state.setIsHeaderCollapsed);
const isMobileHeaderOpen = useAppStore(state => state.isMobileHeaderOpen);
const setIsMobileHeaderOpen = useAppStore(state => state.setIsMobileHeaderOpen);
const tileProvider = useAppStore(state => state.tileProvider);
const setTileProvider = useAppStore(state => state.setTileProvider);
const { refresh: refreshLocation } = useUserLocation(); const { refresh: refreshLocation } = useUserLocation();
const { const {
@@ -99,21 +73,7 @@ export default function App() {
[selectVisibleLatestByUser, userLocation] [selectVisibleLatestByUser, userLocation]
); );
const localTotals = useMemo(() => { // Derived lists depend on focusOn; initialize map first, then derive.
const uniqueUsers = new Set<string>();
visibleLatestByUser.forEach(point => uniqueUsers.add(point.userKey));
return { points: visiblePoints.length, contributors: uniqueUsers.size };
}, [visibleLatestByUser, visiblePoints]);
const myVisibleSignal = useMemo(() => {
if (!myLatestPoint) {
return null;
}
if (userLocation && distanceInKm(userLocation, myLatestPoint.signalLocation) > RADIUS_KM) {
return null;
}
return myLatestPoint;
}, [myLatestPoint, userLocation]);
const statusLabel = t(`status.${status}`); const statusLabel = t(`status.${status}`);
const lastUpdatedLabel = lastUpdated ? formatRelativeTime(lastUpdated, locale) : t("common.never"); const lastUpdatedLabel = lastUpdated ? formatRelativeTime(lastUpdated, locale) : t("common.never");
@@ -142,6 +102,19 @@ export default function App() {
tileProvider, tileProvider,
}); });
const { localTotals, myVisibleSignal, dangerCells, recentActivity } = useFeedDerivations({
visibleDensity,
visiblePoints,
visibleLatestByUser,
userLocation: userLocation ?? null,
focusOn,
distanceFormatter,
t,
locale,
myLatestPoint: myLatestPoint ?? null,
radiusKm: RADIUS_KM,
});
useEffect(() => { useEffect(() => {
if (!error) { if (!error) {
return; return;
@@ -193,60 +166,7 @@ export default function App() {
setIsConfirmOpen(true); setIsConfirmOpen(true);
}, [userLocation]); }, [userLocation]);
const dangerCells = useMemo( // recentActivity and dangerCells returned above
() =>
[...visibleDensity]
.sort((a, b) => b.intensity - a.intensity)
.slice(0, 5)
.map((cell, index) => {
const coordinates = t("common.coordinates", {
lat: formatCoordinate(cell.lat, locale),
lng: formatCoordinate(cell.lng, locale),
});
const distanceLabel = userLocation
? `${distanceFormatter.format(distanceInKm(userLocation, cell))} km`
: null;
return {
id: `${cell.lat}-${cell.lng}-${index}`,
title: t("hotspots.itemTitle", { index: index + 1 }),
subtitle:
distanceLabel !== null
? t("hotspots.itemSubtitleWithDistance", { distance: distanceLabel, coordinates })
: t("hotspots.itemSubtitle", { coordinates }),
intensity: cell.intensity,
onFocus: () => focusOn({ lat: cell.lat, lng: cell.lng }, 15),
};
}),
[visibleDensity, userLocation, focusOn, distanceFormatter, t, locale]
);
const recentActivity = useMemo(
() =>
[...visiblePoints]
.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime())
.slice(0, 8)
.map(point => {
const coordinates = t("common.coordinates", {
lat: formatCoordinate(point.signalLocation.lat, locale),
lng: formatCoordinate(point.signalLocation.lng, locale),
});
const distanceLabel = userLocation
? t("activityItem.distance", {
distance: `${distanceFormatter.format(distanceInKm(userLocation, point.signalLocation))} km`,
})
: formatTimestamp(point.createdAt, locale);
return {
id: point.id,
title: coordinates,
subtitle: t("activityItem.user", { id: point.userKey.slice(0, 4).toUpperCase() }),
timestampLabel: formatRelativeTime(point.createdAt, locale),
distanceLabel,
onFocus: () => focusOn({ lat: point.signalLocation.lat, lng: point.signalLocation.lng }, 15),
};
}),
[visiblePoints, userLocation, focusOn, distanceFormatter, t, locale]
);
const confirmationLat = pendingSpot ? formatCoordinate(pendingSpot.lat, locale) : "--"; const confirmationLat = pendingSpot ? formatCoordinate(pendingSpot.lat, locale) : "--";
const confirmationLng = pendingSpot ? formatCoordinate(pendingSpot.lng, locale) : "--"; const confirmationLng = pendingSpot ? formatCoordinate(pendingSpot.lng, locale) : "--";
const isDialogDisabled = !pendingSpot || isConfirming; const isDialogDisabled = !pendingSpot || isConfirming;
@@ -256,38 +176,23 @@ export default function App() {
<> <>
<SidebarProvider open={isDetailsOpen} onOpenChange={setIsDetailsOpen}> <SidebarProvider open={isDetailsOpen} onOpenChange={setIsDetailsOpen}>
<Sidebar side="left"> <Sidebar side="left">
<SidebarHeader>
<div className="flex flex-col">
<span className="text-sm font-semibold">{t("details.title")}</span>
<span className="text-xs text-muted-foreground">{t("details.description")}</span>
</div>
</SidebarHeader>
<SidebarContent> <SidebarContent>
<ScrollArea className="h-full"> <SidebarPanels
<div className="flex flex-col gap-4 p-4 pb-6"> localTotals={localTotals}
<OverviewPanel
nearbySignals={localTotals.points}
uniqueContributors={localTotals.contributors}
lastUpdatedLabel={lastUpdatedLabel} lastUpdatedLabel={lastUpdatedLabel}
mySignalLabel={myVisibleSignal ? formatRelativeTime(myVisibleSignal.createdAt, locale) : null} myVisibleSignalCreatedAt={myVisibleSignal ? myVisibleSignal.createdAt : null}
error={error} error={error}
onReport={handleManualReport} onReport={handleManualReport}
onRetry={handleRefresh} onRetry={handleRefresh}
isPosting={isPosting || isConfirming} isBusy={isPosting || isConfirming}
locationHint={locationHint} locationHint={locationHint}
showLocationCta={showLocationCta} showLocationCta={showLocationCta}
disableReport={!hasLocation}
/>
<MapTilesPanel tileProvider={tileProvider} setTileProvider={setTileProvider} />
<HotspotStatsPanel
hasLocation={hasLocation} hasLocation={hasLocation}
radiusKm={RADIUS_KM} tileProvider={tileProvider}
locationHint={locationHint} setTileProvider={setTileProvider}
cells={dangerCells} dangerCells={dangerCells}
recentActivity={recentActivity}
/> />
<ActivityPanel items={recentActivity} emptyMessage={t("activity.empty")} />
</div>
</ScrollArea>
</SidebarContent> </SidebarContent>
</Sidebar> </Sidebar>
@@ -302,16 +207,7 @@ export default function App() {
className="min-h-screen" className="min-h-screen"
/> />
{/* Top overlay: left = sidebar trigger, right = AppHeader */} <HeaderOverlay
<div className="pointer-events-none absolute inset-0 flex flex-col">
<div className="flex items-start justify-between gap-3 p-4 sm:p-6">
<div className="pointer-events-auto hidden sm:flex">
<SidebarTrigger aria-label={detailsToggleLabel} aria-expanded={isDetailsOpen}>
<Menu className="h-4 w-4" />
</SidebarTrigger>
</div>
<div className="pointer-events-auto">
<AppHeader
status={status} status={status}
statusLabel={statusLabel} statusLabel={statusLabel}
lastUpdatedLabel={lastUpdatedLabel} lastUpdatedLabel={lastUpdatedLabel}
@@ -323,29 +219,15 @@ export default function App() {
disableHeat={visibleDensity.length === 0} disableHeat={visibleDensity.length === 0}
disableLocate={!hasLocation} disableLocate={!hasLocation}
disableMySignal={!myVisibleSignal} disableMySignal={!myVisibleSignal}
collapsed={isHeaderCollapsed} isDetailsOpen={isDetailsOpen}
onToggleCollapse={() => setIsHeaderCollapsed(prev => !prev)} detailsToggleLabel={detailsToggleLabel}
isHeaderCollapsed={isHeaderCollapsed}
setIsHeaderCollapsed={setIsHeaderCollapsed}
isMobileHeaderOpen={isMobileHeaderOpen}
setIsMobileHeaderOpen={setIsMobileHeaderOpen}
/> />
</div>
</div>
</div>
{!isDetailsOpen && ( <ConfirmSignalDialog
<div className="pointer-events-auto fixed bottom-4 left-4 z-30 sm:hidden">
<Button
variant="secondary"
size="sm"
onClick={() => setIsDetailsOpen(true)}
aria-label={detailsToggleLabel}
className="flex items-center gap-2 rounded-full border border-border/60 bg-background/85 px-4 py-2 text-xs font-semibold uppercase tracking-wide shadow-lg backdrop-blur"
>
<Menu className="h-4 w-4" />
<span>{t("details.open")}</span>
</Button>
</div>
)}
<AlertDialog
open={isConfirmOpen} open={isConfirmOpen}
onOpenChange={nextOpen => { onOpenChange={nextOpen => {
setIsConfirmOpen(nextOpen); setIsConfirmOpen(nextOpen);
@@ -354,33 +236,13 @@ export default function App() {
setIsConfirming(false); setIsConfirming(false);
} }
}} }}
> latitudeLabel={confirmationLat}
<AlertDialogContent> longitudeLabel={confirmationLng}
<AlertDialogHeader> radiusKm={RADIUS_KM}
<AlertDialogTitle>{t("dialog.confirmSignal.title")}</AlertDialogTitle> isConfirming={isConfirming}
<AlertDialogDescription>{t("dialog.confirmSignal.description")}</AlertDialogDescription> isDisabled={isDialogDisabled}
</AlertDialogHeader> onConfirm={handleConfirmSignal}
<div className="rounded-2xl border border-border/60 bg-muted/40 p-4 text-sm"> />
<div className="flex items-center justify-between">
<span className="text-muted-foreground">{t("dialog.confirmSignal.latitude")}</span>
<span className="font-medium text-foreground">{confirmationLat}°</span>
</div>
<div className="mt-3 flex items-center justify-between">
<span className="text-muted-foreground">{t("dialog.confirmSignal.longitude")}</span>
<span className="font-medium text-foreground">{confirmationLng}°</span>
</div>
<p className="mt-4 text-xs text-muted-foreground">
{t("dialog.confirmSignal.reach", { radius: RADIUS_KM })}
</p>
</div>
<AlertDialogFooter>
<AlertDialogCancel disabled={isConfirming}>{t("dialog.confirmSignal.cancel")}</AlertDialogCancel>
<AlertDialogAction onClick={handleConfirmSignal} disabled={isDialogDisabled}>
{isConfirming ? t("dialog.confirmSignal.sending") : t("dialog.confirmSignal.confirm")}
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</div> </div>
</SidebarInset> </SidebarInset>
</SidebarProvider> </SidebarProvider>
@@ -0,0 +1,64 @@
import { useTranslation } from "react-i18next";
import {
AlertDialog,
AlertDialogAction,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from "@/components/ui/alert-dialog";
interface ConfirmSignalDialogProps {
open: boolean;
onOpenChange: (next: boolean) => void;
latitudeLabel: string;
longitudeLabel: string;
radiusKm: number;
isConfirming: boolean;
isDisabled: boolean;
onConfirm: () => void;
}
export function ConfirmSignalDialog({
open,
onOpenChange,
latitudeLabel,
longitudeLabel,
radiusKm,
isConfirming,
isDisabled,
onConfirm,
}: ConfirmSignalDialogProps) {
const { t } = useTranslation();
return (
<AlertDialog open={open} onOpenChange={onOpenChange}>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>{t("dialog.confirmSignal.title")}</AlertDialogTitle>
<AlertDialogDescription>{t("dialog.confirmSignal.description")}</AlertDialogDescription>
</AlertDialogHeader>
<div className="rounded-2xl border border-border/60 bg-muted/40 p-4 text-sm">
<div className="flex items-center justify-between">
<span className="text-muted-foreground">{t("dialog.confirmSignal.latitude")}</span>
<span className="font-medium text-foreground">{latitudeLabel}°</span>
</div>
<div className="mt-3 flex items-center justify-between">
<span className="text-muted-foreground">{t("dialog.confirmSignal.longitude")}</span>
<span className="font-medium text-foreground">{longitudeLabel}°</span>
</div>
<p className="mt-4 text-xs text-muted-foreground">{t("dialog.confirmSignal.reach", { radius: radiusKm })}</p>
</div>
<AlertDialogFooter>
<AlertDialogCancel disabled={isConfirming}>{t("dialog.confirmSignal.cancel")}</AlertDialogCancel>
<AlertDialogAction onClick={onConfirm} disabled={isDisabled}>
{isConfirming ? t("dialog.confirmSignal.sending") : t("dialog.confirmSignal.confirm")}
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
);
}
@@ -0,0 +1,162 @@
import { Menu } from "lucide-react";
import { useTranslation } from "react-i18next";
import { AppHeader } from "@/components/layout/app-header";
import { Badge } from "@/components/ui/badge";
import { SidebarTrigger } from "@/components/ui/sidebar";
import type { FeedStatus } from "@/types/api";
interface HeaderOverlayProps {
status: FeedStatus;
statusLabel: string;
lastUpdatedLabel: string;
onRefresh: () => void;
onFocusHeat: () => void;
onLocateUser: () => void;
onFocusMySignal: () => void;
disableRefresh: boolean;
disableHeat: boolean;
disableLocate: boolean;
disableMySignal: boolean;
isDetailsOpen: boolean;
detailsToggleLabel: string;
isHeaderCollapsed: boolean;
setIsHeaderCollapsed: (collapsed: boolean) => void;
isMobileHeaderOpen: boolean;
setIsMobileHeaderOpen: (open: boolean) => void;
}
export function HeaderOverlay({
status,
statusLabel,
lastUpdatedLabel,
onRefresh,
onFocusHeat,
onLocateUser,
onFocusMySignal,
disableRefresh,
disableHeat,
disableLocate,
disableMySignal,
isDetailsOpen,
detailsToggleLabel,
isHeaderCollapsed,
setIsHeaderCollapsed,
isMobileHeaderOpen,
setIsMobileHeaderOpen,
}: HeaderOverlayProps) {
const { t } = useTranslation();
return (
<div className="pointer-events-none absolute inset-0 flex flex-col">
{/* Desktop variant */}
<div className="hidden items-start justify-between gap-3 p-2 sm:flex sm:p-6">
<div className="pointer-events-auto">
<SidebarTrigger aria-label={detailsToggleLabel} aria-expanded={isDetailsOpen}>
<Menu className="h-4 w-4" />
</SidebarTrigger>
</div>
<div className="pointer-events-auto">
{isHeaderCollapsed ? (
<button
type="button"
onClick={() => setIsHeaderCollapsed(false)}
className="rounded-3xl border border-border/60 bg-background/90 p-2 shadow-xl backdrop-blur transition hover:bg-background"
aria-label={t("header.actions.expand")}
aria-expanded={!isHeaderCollapsed}
>
<Badge
variant="secondary"
className="inline-flex items-center gap-2 rounded-full border border-border/60 bg-muted/60 px-3 py-2 text-xs font-medium uppercase tracking-wide"
>
<span
className={`flex items-center gap-2 ${status === "error" ? "text-destructive" : "text-success"}`}
aria-live="polite"
>
<span className="relative block h-2.5 w-2.5 rounded-full bg-current">
<span className="status-dot relative block h-2.5 w-2.5 rounded-full bg-current" />
</span>
{statusLabel}
</span>
<span className="text-[10px] uppercase text-muted-foreground">
{t("header.badge.updated", { time: lastUpdatedLabel })}
</span>
</Badge>
</button>
) : (
<div className="transition-all duration-300 ease-out">
<AppHeader
status={status}
statusLabel={statusLabel}
lastUpdatedLabel={lastUpdatedLabel}
onRefresh={onRefresh}
onFocusHeat={onFocusHeat}
onLocateUser={onLocateUser}
onFocusMySignal={onFocusMySignal}
disableRefresh={disableRefresh}
disableHeat={disableHeat}
disableLocate={disableLocate}
disableMySignal={disableMySignal}
collapsed={isHeaderCollapsed}
onToggleCollapse={() => setIsHeaderCollapsed(true)}
/>
</div>
)}
</div>
</div>
{/* Mobile variant */}
<div className="pointer-events-none sm:hidden">
<div className="pointer-events-auto px-4 pt-4">
{isMobileHeaderOpen ? (
<div className="transition-all duration-300 ease-out">
<AppHeader
status={status}
statusLabel={statusLabel}
lastUpdatedLabel={lastUpdatedLabel}
onRefresh={onRefresh}
onFocusHeat={onFocusHeat}
onLocateUser={onLocateUser}
onFocusMySignal={onFocusMySignal}
disableRefresh={disableRefresh}
disableHeat={disableHeat}
disableLocate={disableLocate}
disableMySignal={disableMySignal}
collapsed={false}
onToggleCollapse={() => setIsMobileHeaderOpen(false)}
/>
</div>
) : (
<div className="flex items-center justify-between">
<SidebarTrigger aria-label={detailsToggleLabel} aria-expanded={isDetailsOpen} />
<button
type="button"
onClick={() => setIsMobileHeaderOpen(true)}
className="rounded-3xl border border-border/60 bg-background/90 p-2 shadow-xl backdrop-blur transition hover:bg-background"
aria-label={t("header.actions.expand")}
>
<Badge
variant="secondary"
className="inline-flex items-center gap-2 rounded-full border border-border/60 bg-muted/60 px-3 py-2 text-xs font-medium uppercase tracking-wide"
>
<span
className={`flex items-center gap-2 ${status === "error" ? "text-destructive" : "text-success"}`}
aria-live="polite"
>
<span className="relative block h-2.5 w-2.5 rounded-full bg-current">
<span className="status-dot relative block h-2.5 w-2.5 rounded-full bg-current" />
</span>
{statusLabel}
</span>
<span className="text-[10px] uppercase text-muted-foreground">
{t("header.badge.updated", { time: lastUpdatedLabel })}
</span>
</Badge>
</button>
</div>
)}
</div>
</div>
</div>
);
}
@@ -0,0 +1,87 @@
import { useTranslation } from "react-i18next";
import { ActivityPanel } from "@/components/panels/activity-panel";
import { HotspotStatsPanel } from "@/components/panels/hotspot-stats-panel";
import { MapTilesPanel } from "@/components/panels/map-tiles-panel";
import { OverviewPanel } from "@/components/panels/overview-panel";
import { ScrollArea } from "@/components/ui/scroll-area";
import type { FeedError } from "@/hooks/use-hotsop-feed";
import type { TileProvider } from "@/hooks/use-leaflet-heatmap";
import { formatRelativeTime } from "@/lib/utils";
type DangerCell = {
id: string;
title: string;
subtitle: string;
intensity: number;
onFocus: () => void;
};
type ActivityItem = {
id: string;
title: string;
subtitle: string;
timestampLabel: string;
distanceLabel: string;
onFocus: () => void;
};
interface SidebarPanelsProps {
localTotals: { points: number; contributors: number };
lastUpdatedLabel: string;
myVisibleSignalCreatedAt: string | null;
error: FeedError | null;
onReport: () => void;
onRetry: () => void;
isBusy: boolean;
locationHint: string;
showLocationCta: boolean;
hasLocation: boolean;
tileProvider: TileProvider;
setTileProvider: (p: TileProvider) => void;
dangerCells: DangerCell[];
recentActivity: ActivityItem[];
}
export function SidebarPanels({
localTotals,
lastUpdatedLabel,
myVisibleSignalCreatedAt,
error,
onReport,
onRetry,
isBusy,
locationHint,
showLocationCta,
hasLocation,
tileProvider,
setTileProvider,
dangerCells,
recentActivity,
}: SidebarPanelsProps) {
const { i18n, t } = useTranslation();
const locale = i18n.language === "fr" ? "fr-FR" : "en-US";
return (
<ScrollArea className="h-full">
<div className="flex flex-col gap-4 p-4 pb-6">
<OverviewPanel
nearbySignals={localTotals.points}
uniqueContributors={localTotals.contributors}
lastUpdatedLabel={lastUpdatedLabel}
mySignalLabel={myVisibleSignalCreatedAt ? formatRelativeTime(myVisibleSignalCreatedAt, locale) : null}
error={error}
onReport={onReport}
onRetry={onRetry}
isPosting={isBusy}
locationHint={locationHint}
showLocationCta={showLocationCta}
disableReport={!hasLocation}
/>
<HotspotStatsPanel hasLocation={hasLocation} radiusKm={1} locationHint={locationHint} cells={dangerCells} />
<ActivityPanel items={recentActivity} emptyMessage={t("activity.empty")} />
<MapTilesPanel tileProvider={tileProvider} setTileProvider={setTileProvider} />
</div>
</ScrollArea>
);
}
+8 -10
View File
@@ -48,14 +48,12 @@ export function AppHeader({
<Badge <Badge
variant="secondary" variant="secondary"
className={cn( className={cn(
"inline-flex items-center gap-2 rounded-full border border-border/60 bg-muted/60 px-3 py-1 text-xs font-medium uppercase tracking-wide", "inline-flex items-center gap-2 rounded-full border border-border/60 bg-muted/60 px-3 py-2 text-xs font-medium uppercase tracking-wide",
collapsed && "px-2 py-1 text-[11px] font-semibold" collapsed && "px-2 py-1 text-[11px] font-semibold"
)} )}
> >
<span className={`flex items-center gap-2 ${isError ? "text-destructive" : "text-primary"}`} aria-live="polite"> <span className={`flex items-center gap-2 ${isError ? "text-destructive" : "text-success"}`} aria-live="polite">
<span className="relative block h-2.5 w-2.5 rounded-full bg-current"> <span className="status-dot relative block h-2.5 w-2.5 rounded-full bg-current" />
<span className="absolute inset-[-0.35rem] rounded-full border border-current opacity-40 animate-status-pulse" />
</span>
{statusLabel} {statusLabel}
</span> </span>
{!collapsed && ( {!collapsed && (
@@ -69,7 +67,7 @@ export function AppHeader({
return ( return (
<header <header
className={cn( className={cn(
"flex w-full xl:max-w-[420px] flex-col gap-3 rounded-3xl border border-border/60 bg-background/90 p-4 text-sm shadow-xl backdrop-blur transition-all", "flex w-full xl:max-w-[420px] flex-col gap-3 rounded-xl border border-border/60 bg-sidebar p-4 text-sm shadow-xl backdrop-blur transition-all",
collapsed && "max-w-[240px] bg-background/80 p-3", collapsed && "max-w-[240px] bg-background/80 p-3",
className className
)} )}
@@ -82,7 +80,7 @@ export function AppHeader({
</div> </div>
</div> </div>
<Button <Button
variant="ghost" variant="secondary"
size="icon" size="icon"
onClick={onToggleCollapse} onClick={onToggleCollapse}
aria-label={collapsed ? t("header.actions.expand") : t("header.actions.collapse")} aria-label={collapsed ? t("header.actions.expand") : t("header.actions.collapse")}
@@ -95,7 +93,7 @@ export function AppHeader({
{!collapsed && ( {!collapsed && (
<div className="flex flex-wrap items-center gap-2"> <div className="flex flex-wrap items-center gap-2">
<Button <Button
variant="ghost" variant="secondary"
size="icon" size="icon"
onClick={onRefresh} onClick={onRefresh}
disabled={disableRefresh} disabled={disableRefresh}
@@ -113,7 +111,7 @@ export function AppHeader({
<Focus className="h-4 w-4" /> <Focus className="h-4 w-4" />
</Button> </Button>
<Button <Button
variant="ghost" variant="secondary"
size="icon" size="icon"
onClick={onLocateUser} onClick={onLocateUser}
disabled={disableLocate} disabled={disableLocate}
@@ -122,7 +120,7 @@ export function AppHeader({
<LocateFixed className="h-4 w-4" /> <LocateFixed className="h-4 w-4" />
</Button> </Button>
<Button <Button
variant="ghost" variant="secondary"
size="icon" size="icon"
onClick={onFocusMySignal} onClick={onFocusMySignal}
disabled={disableMySignal} disabled={disableMySignal}
@@ -11,13 +11,13 @@ export function LanguageToggle() {
return ( return (
<Button <Button
variant="ghost" variant="secondary"
size="sm" size="sm"
onClick={() => { onClick={() => {
i18n.changeLanguage(next).catch(() => undefined); i18n.changeLanguage(next).catch(() => undefined);
}} }}
aria-label={t("common.aria.language", { language: nextLabel })} aria-label={t("common.aria.language", { language: nextLabel })}
className="h-9 rounded-full border border-border/60 bg-background/80 px-3 backdrop-blur" className="h-9 px-3"
> >
<span className="sr-only">{t("language.label")}</span> <span className="sr-only">{t("language.label")}</span>
<Globe className="h-4 w-4" /> <Globe className="h-4 w-4" />
@@ -10,11 +10,10 @@ export function ThemeToggle() {
return ( return (
<Button <Button
variant="ghost" variant="secondary"
size="icon" size="icon"
onClick={toggleTheme} onClick={toggleTheme}
aria-label={isDark ? t("common.aria.theme.light") : t("common.aria.theme.dark")} aria-label={isDark ? t("common.aria.theme.light") : t("common.aria.theme.dark")}
className="rounded-full border border-border/60 bg-background/80 backdrop-blur"
> >
{isDark ? <Sun className="h-4 w-4" /> : <Moon className="h-4 w-4" />} {isDark ? <Sun className="h-4 w-4" /> : <Moon className="h-4 w-4" />}
</Button> </Button>
@@ -38,7 +38,7 @@ export function ActivityPanel({ items, emptyMessage }: ActivityPanelProps) {
<ScrollArea className="max-h-[280px] pr-2"> <ScrollArea className="max-h-[280px] pr-2">
<ul className="space-y-3"> <ul className="space-y-3">
{items.map(item => ( {items.map(item => (
<li key={item.id} className="rounded-2xl border border-border/60 bg-muted/50 p-3"> <li key={item.id} className="rounded-xl border border-border/60 bg-muted/50 p-3">
<div className="flex items-center justify-between gap-3"> <div className="flex items-center justify-between gap-3">
<div className="flex flex-col"> <div className="flex flex-col">
<span className="text-sm font-medium text-foreground">{item.title}</span> <span className="text-sm font-medium text-foreground">{item.title}</span>
@@ -40,7 +40,7 @@ export function HotspotStatsPanel({ hasLocation, radiusKm, locationHint, cells }
<ScrollArea className="max-h-[280px] pr-2"> <ScrollArea className="max-h-[280px] pr-2">
<ul className="space-y-3"> <ul className="space-y-3">
{cells.map(cell => ( {cells.map(cell => (
<li key={cell.id} className="rounded-2xl border border-border/60 bg-muted/50 p-3"> <li key={cell.id} className="rounded-xl border border-border/60 bg-muted/50 p-3">
<div className="flex items-center justify-between gap-3"> <div className="flex items-center justify-between gap-3">
<div className="flex flex-col"> <div className="flex flex-col">
<span className="text-sm font-semibold text-foreground">{cell.title}</span> <span className="text-sm font-semibold text-foreground">{cell.title}</span>
@@ -37,10 +37,9 @@ export function MapTilesPanel({ tileProvider, setTileProvider }: MapTilesPanelPr
<Button <Button
key={option.value} key={option.value}
type="button" type="button"
variant={tileProvider === option.value ? "default" : "outline"} variant={tileProvider === option.value ? "default" : "secondary"}
size="sm" size="sm"
onClick={() => setTileProvider(option.value)} onClick={() => setTileProvider(option.value)}
className="w-full"
> >
{option.label} {option.label}
</Button> </Button>
@@ -49,11 +49,11 @@ export function OverviewPanel({
</CardHeader> </CardHeader>
<CardContent className="space-y-4"> <CardContent className="space-y-4">
<div className="grid grid-cols-2 gap-3"> <div className="grid grid-cols-2 gap-3">
<div className="rounded-2xl border border-border/60 bg-muted/50 p-3"> <div className="rounded-xl border border-border/60 bg-muted/50 p-3">
<span className="text-xs uppercase text-muted-foreground">{t("overview.stats.signals")}</span> <span className="text-xs uppercase text-muted-foreground">{t("overview.stats.signals")}</span>
<p className="text-xl font-semibold">{nearbySignals}</p> <p className="text-xl font-semibold">{nearbySignals}</p>
</div> </div>
<div className="rounded-2xl border border-border/60 bg-muted/50 p-3"> <div className="rounded-xl border border-border/60 bg-muted/50 p-3">
<span className="text-xs uppercase text-muted-foreground">{t("overview.stats.contributors")}</span> <span className="text-xs uppercase text-muted-foreground">{t("overview.stats.contributors")}</span>
<p className="text-xl font-semibold">{uniqueContributors}</p> <p className="text-xl font-semibold">{uniqueContributors}</p>
</div> </div>
+4 -1
View File
@@ -243,7 +243,10 @@ function SidebarTrigger({ className, onClick, ...props }: React.ComponentProps<t
data-slot="sidebar-trigger" data-slot="sidebar-trigger"
variant="default" variant="default"
size="icon" size="icon"
className={cn("size-10 rounded-full", className)} className={cn(
"size-10 bg-sidebar rounded-full shadow-xl text-sidebar-foreground hover:bg-sidebar/90 cursor-pointer",
className
)}
onClick={event => { onClick={event => {
onClick?.(event); onClick?.(event);
toggleSidebar(); toggleSidebar();
+119
View File
@@ -0,0 +1,119 @@
import { useMemo } from "react";
import type { TFunction } from "i18next";
import { distanceInKm, formatCoordinate, formatRelativeTime, formatTimestamp } from "@/lib/utils";
import type { Point, Signal, SignalDensityCell } from "@/types/api";
type DangerCell = {
id: string;
title: string;
subtitle: string;
intensity: number;
onFocus: () => void;
};
type ActivityItem = {
id: string;
title: string;
subtitle: string;
timestampLabel: string;
distanceLabel: string;
onFocus: () => void;
};
interface UseFeedDerivationsArgs {
visibleDensity: SignalDensityCell[];
visiblePoints: Signal[];
visibleLatestByUser: Signal[];
userLocation: Point | null;
focusOn: (position: Point, zoom?: number) => void;
distanceFormatter: Intl.NumberFormat;
t: TFunction;
locale: string;
myLatestPoint: Signal | null;
radiusKm: number;
}
export function useFeedDerivations({
visibleDensity,
visiblePoints,
visibleLatestByUser,
userLocation,
focusOn,
distanceFormatter,
t,
locale,
myLatestPoint,
radiusKm,
}: UseFeedDerivationsArgs) {
const localTotals = useMemo(() => {
const uniqueUsers = new Set<string>();
visibleLatestByUser.forEach(point => uniqueUsers.add(point.userKey));
return { points: visiblePoints.length, contributors: uniqueUsers.size };
}, [visibleLatestByUser, visiblePoints]);
const myVisibleSignal = useMemo(() => {
if (!myLatestPoint) return null;
if (userLocation && distanceInKm(userLocation, myLatestPoint.signalLocation) > radiusKm) {
return null;
}
return myLatestPoint;
}, [myLatestPoint, userLocation, radiusKm]);
const dangerCells: DangerCell[] = useMemo(
() =>
[...visibleDensity]
.sort((a, b) => b.intensity - a.intensity)
.slice(0, 5)
.map((cell, index) => {
const coordinates = t("common.coordinates", {
lat: formatCoordinate(cell.lat, locale),
lng: formatCoordinate(cell.lng, locale),
});
const distanceLabel = userLocation
? `${distanceFormatter.format(distanceInKm(userLocation, cell))} km`
: null;
return {
id: `${cell.lat}-${cell.lng}-${index}`,
title: t("hotspots.itemTitle", { index: index + 1 }),
subtitle:
distanceLabel !== null
? t("hotspots.itemSubtitleWithDistance", { distance: distanceLabel, coordinates })
: t("hotspots.itemSubtitle", { coordinates }),
intensity: cell.intensity,
onFocus: () => focusOn({ lat: cell.lat, lng: cell.lng }, 15),
};
}),
[visibleDensity, userLocation, focusOn, distanceFormatter, t, locale]
);
const recentActivity: ActivityItem[] = useMemo(
() =>
[...visiblePoints]
.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime())
.slice(0, 8)
.map(point => {
const coordinates = t("common.coordinates", {
lat: formatCoordinate(point.signalLocation.lat, locale),
lng: formatCoordinate(point.signalLocation.lng, locale),
});
const distanceLabel: string = userLocation
? (t("activityItem.distance", {
distance: `${distanceFormatter.format(distanceInKm(userLocation, point.signalLocation))} km`,
}) as string)
: formatTimestamp(point.createdAt, locale);
return {
id: point.id,
title: coordinates,
subtitle: t("activityItem.user", { id: point.userKey.slice(0, 4).toUpperCase() }),
timestampLabel: formatRelativeTime(point.createdAt, locale),
distanceLabel,
onFocus: () => focusOn({ lat: point.signalLocation.lat, lng: point.signalLocation.lng }, 15),
};
}),
[visiblePoints, userLocation, focusOn, distanceFormatter, t, locale]
);
return { localTotals, myVisibleSignal, dangerCells, recentActivity };
}
+35 -3
View File
@@ -103,7 +103,7 @@ export function useLeafletHeatmap({
worldCopyJump: true, worldCopyJump: true,
minZoom: 4, minZoom: 4,
zoomControl: false, zoomControl: false,
attributionControl: false, attributionControl: true,
}) })
.setView([INITIAL_VIEW.lat, INITIAL_VIEW.lng], DEFAULT_ZOOM); .setView([INITIAL_VIEW.lat, INITIAL_VIEW.lng], DEFAULT_ZOOM);
@@ -163,6 +163,38 @@ export function useLeafletHeatmap({
return () => { return () => {
map.off("click", handleClick); map.off("click", handleClick);
window.removeEventListener("resize", onResize); window.removeEventListener("resize", onResize);
// Be explicit when tearing down layers to avoid animation-queued redraws
try {
const hl = heatLayerRef.current ?? heatLayer;
if (hl) {
// Cancel any pending requestAnimationFrame used internally by the heat layer
const anyL = L as unknown as { Util: { cancelAnimFrame: (id: any) => void } };
const anyHl = hl as any;
if (anyHl._frame) {
anyL.Util.cancelAnimFrame(anyHl._frame);
}
if (typeof anyHl.remove === "function") {
anyHl.remove();
} else if (typeof anyHl.removeFrom === "function") {
anyHl.removeFrom(map);
}
}
} catch {
// noop
}
try {
userLayer.remove();
} catch {
// noop
}
try {
tileLayer.remove();
} catch {
// noop
}
map.remove(); map.remove();
mapRef.current = null; mapRef.current = null;
heatLayerRef.current = null; heatLayerRef.current = null;
@@ -205,8 +237,8 @@ export function useLeafletHeatmap({
}, [createTileLayer, tileProvider]); }, [createTileLayer, tileProvider]);
useEffect(() => { useEffect(() => {
const heatLayer = heatLayerRef.current; const heatLayer = heatLayerRef.current as any;
if (!heatLayer) { if (!heatLayer || !heatLayer._map) {
return; return;
} }
+27 -2
View File
@@ -19,6 +19,8 @@
--secondary-foreground: oklch(0.205 0 0); --secondary-foreground: oklch(0.205 0 0);
--warning: oklch(0.84 0.16 84); --warning: oklch(0.84 0.16 84);
--warning-foreground: oklch(0.28 0.07 46); --warning-foreground: oklch(0.28 0.07 46);
--success: oklch(0.7395 0.2268 142.8504);
--success-foreground: oklch(0 0 0);
--muted: oklch(0.97 0 0); --muted: oklch(0.97 0 0);
--muted-foreground: oklch(0.556 0 0); --muted-foreground: oklch(0.556 0 0);
--accent: oklch(0.97 0 0); --accent: oklch(0.97 0 0);
@@ -55,6 +57,8 @@
--secondary-foreground: oklch(0.985 0 0); --secondary-foreground: oklch(0.985 0 0);
--warning: oklch(0.41 0.11 46); --warning: oklch(0.41 0.11 46);
--warning-foreground: oklch(0.99 0.02 95); --warning-foreground: oklch(0.99 0.02 95);
--success: oklch(0.7395 0.2268 142.8504);
--success-foreground: oklch(0 0 0);
--muted: oklch(0.269 0 0); --muted: oklch(0.269 0 0);
--muted-foreground: oklch(0.708 0 0); --muted-foreground: oklch(0.708 0 0);
--accent: oklch(0.269 0 0); --accent: oklch(0.269 0 0);
@@ -93,6 +97,8 @@
--color-primary-foreground: var(--primary-foreground); --color-primary-foreground: var(--primary-foreground);
--color-secondary: var(--secondary); --color-secondary: var(--secondary);
--color-secondary-foreground: var(--secondary-foreground); --color-secondary-foreground: var(--secondary-foreground);
--color-success: var(--success);
--color-success-foreground: var(--success-foreground);
--color-warning: var(--warning); --color-warning: var(--warning);
--color-warning-foreground: var(--warning-foreground); --color-warning-foreground: var(--warning-foreground);
--color-muted: var(--muted); --color-muted: var(--muted);
@@ -125,6 +131,10 @@
body { body {
@apply bg-background text-foreground; @apply bg-background text-foreground;
} }
button {
@apply cursor-pointer;
}
} }
@layer components { @layer components {
@@ -154,13 +164,28 @@
} }
@layer utilities { @layer utilities {
@keyframes status-pulse {
0% {
transform: scale(0.8);
opacity: 0.5;
}
70% {
transform: scale(1.8);
opacity: 0;
}
100% {
opacity: 0;
}
}
.status-dot::after { .status-dot::after {
content: ""; content: "";
position: absolute; position: absolute;
inset: -0.35rem; inset: -0.35rem;
border-radius: 9999px; border-radius: 9999px;
border: 1px solid currentColor; border: 2px solid currentColor;
opacity: 0.35; opacity: 0.35;
animation: animate-pulse 2.4s ease-out infinite; animation: status-pulse 2s ease-out infinite;
will-change: transform, opacity;
} }
} }
+18
View File
@@ -1,5 +1,6 @@
import { create } from "zustand"; import { create } from "zustand";
import type { TileProvider } from "@/hooks/use-leaflet-heatmap";
import type { Point } from "@/types/api"; import type { Point } from "@/types/api";
type Nullable<T> = T | null; type Nullable<T> = T | null;
@@ -8,16 +9,33 @@ interface AppState {
userLocation: Nullable<Point>; userLocation: Nullable<Point>;
locationError: Nullable<string>; locationError: Nullable<string>;
isRequestingLocation: boolean; isRequestingLocation: boolean;
// UI state
isSidebarOpen: boolean;
isHeaderCollapsed: boolean;
isMobileHeaderOpen: boolean;
tileProvider: TileProvider;
setUserLocation: (location: Nullable<Point>) => void; setUserLocation: (location: Nullable<Point>) => void;
setLocationError: (error: Nullable<string>) => void; setLocationError: (error: Nullable<string>) => void;
setIsRequestingLocation: (isRequesting: boolean) => void; setIsRequestingLocation: (isRequesting: boolean) => void;
setIsSidebarOpen: (open: boolean) => void;
setIsHeaderCollapsed: (collapsed: boolean) => void;
setIsMobileHeaderOpen: (open: boolean) => void;
setTileProvider: (provider: TileProvider) => void;
} }
export const useAppStore = create<AppState>(set => ({ export const useAppStore = create<AppState>(set => ({
userLocation: null, userLocation: null,
locationError: null, locationError: null,
isRequestingLocation: false, isRequestingLocation: false,
isSidebarOpen: typeof window !== "undefined" ? window.innerWidth >= 1024 : false,
isHeaderCollapsed: typeof window !== "undefined" ? window.innerWidth < 768 : false,
isMobileHeaderOpen: false,
tileProvider: "openstreetmap",
setUserLocation: userLocation => set({ userLocation }), setUserLocation: userLocation => set({ userLocation }),
setLocationError: locationError => set({ locationError }), setLocationError: locationError => set({ locationError }),
setIsRequestingLocation: isRequestingLocation => set({ isRequestingLocation }), setIsRequestingLocation: isRequestingLocation => set({ isRequestingLocation }),
setIsSidebarOpen: isSidebarOpen => set({ isSidebarOpen }),
setIsHeaderCollapsed: isHeaderCollapsed => set({ isHeaderCollapsed }),
setIsMobileHeaderOpen: isMobileHeaderOpen => set({ isMobileHeaderOpen }),
setTileProvider: tileProvider => set({ tileProvider }),
})); }));
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 MiB

+12
View File
@@ -14,6 +14,18 @@ services:
retries: 5 retries: 5
volumes: volumes:
- postgres_data:/var/lib/postgresql/data - postgres_data:/var/lib/postgresql/data
adminer:
image: adminer:latest
depends_on:
- postgres
environment:
APP_ENV: dev
ADMINER_DESIGN: pepa-linha
ADMINER_DEFAULT_SERVER: postgres
ports:
- "8082:8080"
###> symfony/mercure-bundle ### ###> symfony/mercure-bundle ###
mercure: mercure:
image: dunglas/mercure image: dunglas/mercure
+2
View File
@@ -7,6 +7,8 @@ doctrine:
use_savepoints: true use_savepoints: true
mapping_types: mapping_types:
geography: string geography: string
types:
App\Doctrine\Type\SignalIdType: App\Doctrine\Type\SignalIdType
orm: orm:
auto_generate_proxy_classes: true auto_generate_proxy_classes: true
enable_lazy_ghost_objects: true enable_lazy_ghost_objects: true
+19
View File
@@ -0,0 +1,19 @@
<?php
namespace App\Doctrine\Type;
use App\Entity\Identifier\SignalId;
use Symfony\Bridge\Doctrine\Types\AbstractUidType;
final class SignalIdType extends AbstractUidType
{
public function getName(): string
{
return self::class;
}
protected function getUidClass(): string
{
return SignalId::class;
}
}
+2 -1
View File
@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace App\Entity; namespace App\Entity;
use App\Doctrine\Type\SignalIdType;
use App\Entity\Identifier\SignalId; use App\Entity\Identifier\SignalId;
use App\Repository\SignalRepository; use App\Repository\SignalRepository;
use App\ValueObject\Point; use App\ValueObject\Point;
@@ -20,7 +21,7 @@ readonly class Signal
#[ORM\Column(type: Types::STRING, length: 64)] public string $userKey, #[ORM\Column(type: Types::STRING, length: 64)] public string $userKey,
#[ORM\Embedded(class: Point::class, columnPrefix: 'user_')] public Point $userLocation, #[ORM\Embedded(class: Point::class, columnPrefix: 'user_')] public Point $userLocation,
#[ORM\Embedded(class: Point::class, columnPrefix: 'signal_')] public Point $signalLocation, #[ORM\Embedded(class: Point::class, columnPrefix: 'signal_')] public Point $signalLocation,
#[ORM\Id] #[ORM\GeneratedValue(strategy: 'NONE')] #[ORM\Column(type: 'uuid')] public SignalId $id = new SignalId(), #[ORM\Id] #[ORM\GeneratedValue(strategy: 'NONE')] #[ORM\Column(type: SignalIdType::class)] public SignalId $id = new SignalId(),
#[ORM\Column(name: 'created_at', type: Types::DATETIME_IMMUTABLE)] public \DateTimeImmutable $createdAt = new \DateTimeImmutable() #[ORM\Column(name: 'created_at', type: Types::DATETIME_IMMUTABLE)] public \DateTimeImmutable $createdAt = new \DateTimeImmutable()
) { ) {
} }