diff --git a/src/app/auth.guard.ts b/src/app/auth.guard.ts index 700f502..f3542d0 100644 --- a/src/app/auth.guard.ts +++ b/src/app/auth.guard.ts @@ -19,7 +19,7 @@ export class AuthGuard implements CanActivate { return true; } else { this.router.navigate(['/']).then(() => { - this.loginModalService.openModal(); + this.loginModalService.openModal('login-modal'); }); return false; } diff --git a/src/app/components/edit-pin-popup/edit-pin-popup.component.ts b/src/app/components/edit-pin-popup/edit-pin-popup.component.ts index 418d855..8c978d0 100644 --- a/src/app/components/edit-pin-popup/edit-pin-popup.component.ts +++ b/src/app/components/edit-pin-popup/edit-pin-popup.component.ts @@ -44,6 +44,7 @@ export class EditPinPopupComponent implements OnInit, AfterViewInit, OnDestroy { inputFocused: boolean = false; files: any[] = []; isPinModalOpen: boolean = false; + @Input() modalId!: string; private modalOpenSubscription!: Subscription; private routerSubscription!: Subscription; @@ -79,7 +80,7 @@ export class EditPinPopupComponent implements OnInit, AfterViewInit, OnDestroy { ngOnInit(): void { // Initialiser le formulaire avec les valeurs de base this.form.patchValue({ - title: this.pin?.title || 'vide', + title: this.pin?.title || '', description: this.pin?.description || '', location: "Chargement de l'adresse...", }); @@ -100,7 +101,6 @@ export class EditPinPopupComponent implements OnInit, AfterViewInit, OnDestroy { .pipe(take(1)) .subscribe( (address) => { - console.log('Adresse récupérée:', address); if (address && address.display_name) { this.form.patchValue({ location: address.display_name }); } else { @@ -119,16 +119,14 @@ export class EditPinPopupComponent implements OnInit, AfterViewInit, OnDestroy { } // S'abonner aux changements d'état du modal - this.modalOpenSubscription = this.modalService.showModal$.subscribe( - (state) => { + this.modalOpenSubscription = this.modalService + .getModalState(this.modalId) + .subscribe((state) => { this.isPinModalOpen = state; - - // Lorsque le modal s'ouvre, s'assurer qu'il est dans le body if (state) { setTimeout(() => this.moveModalToBody(), 0); } - } - ); + }); // S'abonner aux événements de navigation du router this.routerSubscription = this.router.events @@ -217,7 +215,6 @@ export class EditPinPopupComponent implements OnInit, AfterViewInit, OnDestroy { .toPromise(); if (address) { - console.log("Données d'adresse :", JSON.stringify(address)); this.form.get('location')?.setValue(address.display_name); break; } @@ -259,10 +256,10 @@ export class EditPinPopupComponent implements OnInit, AfterViewInit, OnDestroy { } openPinModal() { - this.modalService.openModal(); + this.modalService.openModal(this.modalId); } closePinModal() { - this.modalService.closeModal(); + this.modalService.closeModal(this.modalId); } } diff --git a/src/app/components/home-navbar/home-navbar.component.ts b/src/app/components/home-navbar/home-navbar.component.ts index 84075ef..897944b 100644 --- a/src/app/components/home-navbar/home-navbar.component.ts +++ b/src/app/components/home-navbar/home-navbar.component.ts @@ -14,6 +14,6 @@ export class HomeNavbarComponent { constructor(private modalService: ModalService) {} openLoginModal() { - this.modalService.openModal(); + this.modalService.openModal('login-modal'); } } diff --git a/src/app/components/home-page/home-page.component.ts b/src/app/components/home-page/home-page.component.ts index 1e5ba94..3541cad 100644 --- a/src/app/components/home-page/home-page.component.ts +++ b/src/app/components/home-page/home-page.component.ts @@ -11,6 +11,6 @@ export class HomePageComponent { constructor(private loginModalService: ModalService) {} openLogin() { - this.loginModalService.openModal(); + this.loginModalService.openModal('login-modal'); } } diff --git a/src/app/components/login-page/login-page.component.ts b/src/app/components/login-page/login-page.component.ts index 11ab803..93a1853 100644 --- a/src/app/components/login-page/login-page.component.ts +++ b/src/app/components/login-page/login-page.component.ts @@ -21,6 +21,7 @@ import { ModalService } from '../../services/modal/modal.service'; styleUrl: './login-page.component.css', }) export class LoginPageComponent { + modalId: string = 'login-modal'; userForm: FormGroup; user: User = { login: '', password: '' }; errorMessage: string = ''; @@ -31,7 +32,7 @@ export class LoginPageComponent { private loginService: LoginService, private fb: FormBuilder, private router: Router, - private loginModalService: ModalService, + private modalService: ModalService, private localStorageService: LocalStorageService ) { this.userForm = this.fb.group({ @@ -44,9 +45,11 @@ export class LoginPageComponent { } ngOnInit() { - this.modalSub = this.loginModalService.showModal$.subscribe((open) => { - this.isLoginModalOpen = open; - }); + this.modalSub = this.modalService + .getModalState(this.modalId) + .subscribe((open) => { + this.isLoginModalOpen = open; + }); } ngOnDestroy() { @@ -65,26 +68,26 @@ export class LoginPageComponent { this.loginService.login(this.user.login, this.user.password).subscribe({ next: (response) => { - console.log('Connexion OK: ', response); this.localStorageService.setToken(response.access_token); this.closeLoginModal(); setTimeout(() => { this.router.navigate(['/map']); + this.modalService.closeModal(this.modalId); }, 1); }, error: (response) => { - console.log('Connexion KO: ', response.error.detail); + console.error('Connexion KO: ', response.error.detail); this.errorMessage = response.error.detail; }, }); } openLoginModal() { - this.isLoginModalOpen = true; + this.modalService.openModal(this.modalId); } closeLoginModal() { - this.isLoginModalOpen = false; + this.modalService.closeModal(this.modalId); } } diff --git a/src/app/components/navbar/navbar.component.ts b/src/app/components/navbar/navbar.component.ts index 63aa73b..0eea527 100644 --- a/src/app/components/navbar/navbar.component.ts +++ b/src/app/components/navbar/navbar.component.ts @@ -89,10 +89,6 @@ export class NavbarComponent implements OnInit { debounceTime(300), // Attendre 300ms après la dernière frappe distinctUntilChanged(), // Ignorer si la nouvelle valeur est la même que la précédente switchMap((searchTerm) => { - console.log( - 'Value change : ', - this.searchForm.get('searchControl')?.valueChanges - ); const trimmedQuery = searchTerm?.trim(); if (trimmedQuery && trimmedQuery.length > 1) { return of(this.filterPins(trimmedQuery)); @@ -109,15 +105,12 @@ export class NavbarComponent implements OnInit { ) .subscribe((filteredPins) => { this.pinsFiltered = filteredPins; - console.log('Pins filtrés : ', this.pinsFiltered); }); } filterPins(searchTerm: string): Pin[] { const filteredPins: Pin[] = []; - console.log('Pins : ', this.pins); - if (this.pins.length === 0) { this.pins = this.pinService.getPins(); } @@ -127,7 +120,6 @@ export class NavbarComponent implements OnInit { pin.title && pin.title.toLowerCase().includes(searchTerm.toLowerCase()) ) { - console.log('Search term : ', searchTerm, ' / Pin trouvé : ', pin); filteredPins.push(pin); } }); @@ -144,7 +136,6 @@ export class NavbarComponent implements OnInit { queryParams: queryParams, queryParamsHandling: 'merge', // Conserve les autres paramètres de requête }); - console.log('Redirection avec ID :', pin.id); } onFocus(): void { diff --git a/src/app/components/pin-marker/pin-marker.component.html b/src/app/components/pin-marker/pin-marker.component.html index 341ab9e..3863092 100644 --- a/src/app/components/pin-marker/pin-marker.component.html +++ b/src/app/components/pin-marker/pin-marker.component.html @@ -1,5 +1,5 @@
- +