From 2ad09ed5785fc40df40fb8a9582b75f5667708c6 Mon Sep 17 00:00:00 2001
From: Alexis Feron <alexisferon081@gmail.com>
Date: Tue, 6 May 2025 23:04:24 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20Improve=20style=20and=20UX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home-navbar/home-navbar.component.html    |  4 +-
 .../leaflet-map/leaflet-map.component.html    | 17 +++---
 .../leaflet-map/leaflet-map.component.ts      | 55 ++++++++++++++-----
 .../local-storage/local-storage.service.ts    | 10 +++-
 src/styles.css                                |  9 +++
 5 files changed, 69 insertions(+), 26 deletions(-)

diff --git a/src/app/components/home-navbar/home-navbar.component.html b/src/app/components/home-navbar/home-navbar.component.html
index b1c2954..20ae616 100644
--- a/src/app/components/home-navbar/home-navbar.component.html
+++ b/src/app/components/home-navbar/home-navbar.component.html
@@ -62,14 +62,14 @@
           <a
             class="block text-gray-900 dark:text-white hover:text-gray-700 dark:hover:text-gray-300"
           >
-            <span class="space-x-2 py-2">
+            <span class="space-x-2">
               <app-login-page></app-login-page>
             </span>
           </a>
         </li>
         <li class="flex items-center space-x-2">
           <a
-            class="block py-2 text-gray-900 dark:text-white hover:text-gray-700 dark:hover:text-gray-300"
+            class="block text-gray-900 dark:text-white hover:text-gray-700 dark:hover:text-gray-300"
           >
             <span>
               <app-register-page></app-register-page>
diff --git a/src/app/components/leaflet-map/leaflet-map.component.html b/src/app/components/leaflet-map/leaflet-map.component.html
index ab8a41d..421ed73 100644
--- a/src/app/components/leaflet-map/leaflet-map.component.html
+++ b/src/app/components/leaflet-map/leaflet-map.component.html
@@ -3,17 +3,17 @@
 </div>
 
 <div
-  class="floating-filters text-center absolute top-20 right-4 flex flex-col space-y-2 z-10 mt-2 bg-white p-3 rounded-xl shadow-lg dark:bg-gray-900 dark:text-white"
+  class="floating-filters text-center absolute top-[86px] right-[14px] flex flex-col space-y-2 z-10 bg-white p-3 rounded-xl shadow-lg dark:bg-gray-900 dark:text-white"
 >
   <div
-    class="filters flex flex-col md:flex-row items-start justify-start gap-4"
+    class="filters flex md:items-center flex-col md:flex-row align-top justify-start gap-4"
   >
-    <label>
+    <label class="flex items-center space-x-2">
       Pays :
       <select
         [(ngModel)]="selectedCountry"
         (change)="onCountryChange(selectedCountry)"
-        class="bg-white dark:bg-gray-900 dark:text-white"
+        class="bg-white dark:bg-gray-900 dark:text-white ml-2"
       >
         <option value="">Tous</option>
         <option *ngFor="let country of availableCountries" [value]="country">
@@ -21,17 +21,18 @@
         </option>
       </select>
     </label>
-    <span class="hidden md:inline">|</span>
+    <div class="hidden md:block h-5 border-l-2"></div>
 
     <!-- Amis taguées -->
-    <label>
+    <label class="flex items-center space-x-2">
       Amis :
       <select
         [(ngModel)]="selectedPerson"
         (change)="onPersonChange(selectedPerson)"
-        class="bg-white dark:bg-gray-900 dark:text-white"
+        class="bg-white dark:bg-gray-900 dark:text-white ml-2"
       >
-        <option value="">Tous</option>
+        <option value="__all__">Tous</option>
+        <option value="__none__">Aucun</option>
         <option *ngFor="let person of availablePersons" [value]="person">
           {{ person }}
         </option>
diff --git a/src/app/components/leaflet-map/leaflet-map.component.ts b/src/app/components/leaflet-map/leaflet-map.component.ts
index 189f1b6..110c9a7 100644
--- a/src/app/components/leaflet-map/leaflet-map.component.ts
+++ b/src/app/components/leaflet-map/leaflet-map.component.ts
@@ -24,7 +24,7 @@ export class LeafletMapComponent implements OnInit {
   availableCountries: string[] = [];
   availablePersons: string[] = [];
   selectedCountry: string = '';
-  selectedPerson: string = '';
+  selectedPerson: string = '__all__';
 
   constructor(
     private viewContainerRef: ViewContainerRef,
@@ -36,6 +36,20 @@ export class LeafletMapComponent implements OnInit {
 
   ngOnInit(): void {
     this.initializeMap();
+
+    this.route.queryParams.subscribe((params) => {
+      const pinId = params['pin'];
+      if (pinId) {
+        const marker = this.markersMap[pinId];
+        if (marker) {
+          marker.openPopup();
+          const latlng = marker.getLatLng();
+          const zoom = this.map.getZoom();
+          const offsetLat = 0.05 / Math.pow(2, zoom - 10);
+          this.map.setView(L.latLng(latlng.lat + offsetLat, latlng.lng), zoom);
+        }
+      }
+    });
   }
 
   private initializeMap(): void {
@@ -132,9 +146,13 @@ export class LeafletMapComponent implements OnInit {
       const matchesCountry = this.selectedCountry
         ? pinCountry === this.selectedCountry
         : true;
-      const matchesPerson = this.selectedPerson
-        ? pin.description?.includes(`@${this.selectedPerson}`)
-        : true;
+      const matchesPerson =
+        this.selectedPerson === '__all__'
+          ? true
+          : this.selectedPerson === '__none__'
+          ? !pin.description?.match(/@\w+/)
+          : pin.description?.includes(`@${this.selectedPerson}`);
+
       return matchesCountry && matchesPerson;
     });
 
@@ -162,17 +180,24 @@ export class LeafletMapComponent implements OnInit {
 
       this.markersMap[pin.id] = marker;
 
-      // Ouvrir automatiquement la pop-up si un ID est passé dans l'URL
-      this.route.queryParams.subscribe((params) => {
-        const pinId = params['pin']; // Récupérer l'ID du Pin depuis les paramètres de requête
-        if (pinId && this.markersMap[pinId]) {
-          this.markersMap[pinId].openPopup(); // Ouvrir la pop-up du marqueur correspondant
-          const latlng = this.markersMap[pinId].getLatLng();
-          const zoom = this.map.getZoom();
-          const offsetLat = 0.05 / Math.pow(2, zoom - 10);
-          this.map.setView(L.latLng(latlng.lat + offsetLat, latlng.lng), zoom);
-        }
-      });
+      this.route.queryParams
+        .subscribe((params) => {
+          const pinId = params['pin'];
+          if (pinId) {
+            const marker = this.markersMap[pinId];
+            if (marker) {
+              marker.openPopup();
+              const latlng = marker.getLatLng();
+              const zoom = this.map.getZoom();
+              const offsetLat = 0.05 / Math.pow(2, zoom - 10);
+              this.map.setView(
+                L.latLng(latlng.lat + offsetLat, latlng.lng),
+                zoom
+              );
+            }
+          }
+        })
+        .unsubscribe();
     });
   }
 
diff --git a/src/app/services/local-storage/local-storage.service.ts b/src/app/services/local-storage/local-storage.service.ts
index f092f9b..6992262 100644
--- a/src/app/services/local-storage/local-storage.service.ts
+++ b/src/app/services/local-storage/local-storage.service.ts
@@ -1,4 +1,6 @@
 import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { ModalService } from '../modal/modal.service';
 
 @Injectable({
   providedIn: 'root',
@@ -6,7 +8,10 @@ import { Injectable } from '@angular/core';
 export class LocalStorageService {
   private readonly AUTH_TOKEN_KEY = 'auth_token';
 
-  constructor() {}
+  constructor(
+    private router: Router,
+    private loginModalService: ModalService
+  ) {}
 
   setToken(token: string): void {
     localStorage.setItem(this.AUTH_TOKEN_KEY, token);
@@ -20,6 +25,9 @@ export class LocalStorageService {
       const expirationDate = new Date(payload.exp * 1000);
       if (expirationDate < new Date()) {
         this.removeToken(); // Remove expired token
+        this.router.navigate(['/']).then(() => {
+          this.loginModalService.openModal(); // Open login modal
+        });
         return null;
       }
     }
diff --git a/src/styles.css b/src/styles.css
index b5c61c9..2135bf0 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -1,3 +1,12 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
+
+/* Exemple avec Tailwind @apply */
+.leaflet-control-zoom {
+  @apply !shadow-none !border-none bg-transparent;
+}
+
+.leaflet-control-zoom a {
+  @apply dark:!bg-gray-900 dark:!text-white !rounded-md m-1 dark:hover:!bg-gray-700 bg-white hover:bg-gray-200 !border-none !shadow-none;
+}