From bfb3197fcbfb3849dd5e91f2517abaf33d767760 Mon Sep 17 00:00:00 2001
From: Alexis Feron <alexisferon081@gmail.com>
Date: Thu, 1 May 2025 23:43:52 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20Improve=20token=20expiration=20u?=
 =?UTF-8?q?x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/auth.guard.ts                           |  7 +++++--
 .../home-page/home-page.component.html          |  2 +-
 .../components/home-page/home-page.component.ts |  9 +++++++--
 .../login-page/login-page.component.ts          | 14 ++++++++++++++
 src/app/services/login-modal.service.spec.ts    | 16 ++++++++++++++++
 src/app/services/login-modal.service.ts         | 17 +++++++++++++++++
 6 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 src/app/services/login-modal.service.spec.ts
 create mode 100644 src/app/services/login-modal.service.ts

diff --git a/src/app/auth.guard.ts b/src/app/auth.guard.ts
index d97f993..eaa0597 100644
--- a/src/app/auth.guard.ts
+++ b/src/app/auth.guard.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { CanActivate, Router } from '@angular/router';
 import { LocalStorageService } from './services/localstorage.service';
+import { LoginModalService } from './services/login-modal.service';
 
 @Injectable({
   providedIn: 'root',
@@ -8,7 +9,8 @@ import { LocalStorageService } from './services/localstorage.service';
 export class AuthGuard implements CanActivate {
   constructor(
     private localStorageService: LocalStorageService,
-    private router: Router
+    private router: Router,
+    private loginModalService: LoginModalService
   ) {}
 
   canActivate(): boolean {
@@ -16,7 +18,8 @@ export class AuthGuard implements CanActivate {
     if (token) {
       return true;
     } else {
-      this.router.navigate(['?sign']);
+      this.loginModalService.openModal();
+      this.router.navigate(['/']);
       return false;
     }
   }
diff --git a/src/app/components/home-page/home-page.component.html b/src/app/components/home-page/home-page.component.html
index 772d2e5..8524716 100644
--- a/src/app/components/home-page/home-page.component.html
+++ b/src/app/components/home-page/home-page.component.html
@@ -46,7 +46,7 @@
           important.
         </p>
         <button
-          routerLink="/map"
+          (click)="openLogin()"
           class="inline-flex items-center text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:focus:ring-blue-800"
         >
           Commencez votre aventure
diff --git a/src/app/components/home-page/home-page.component.ts b/src/app/components/home-page/home-page.component.ts
index ceb7926..8b8b1ef 100644
--- a/src/app/components/home-page/home-page.component.ts
+++ b/src/app/components/home-page/home-page.component.ts
@@ -1,11 +1,16 @@
 import { Component } from '@angular/core';
-import { RouterLink } from '@angular/router';
+import { LoginModalService } from '../../services/login-modal.service';
 
 @Component({
   selector: 'app-home-page',
-  imports: [RouterLink],
   templateUrl: './home-page.component.html',
 })
 export class HomePageComponent {
   currentYear = new Date().getFullYear();
+
+  constructor(private loginModalService: LoginModalService) {}
+
+  openLogin() {
+    this.loginModalService.openModal();
+  }
 }
diff --git a/src/app/components/login-page/login-page.component.ts b/src/app/components/login-page/login-page.component.ts
index 7f5076c..9332a97 100644
--- a/src/app/components/login-page/login-page.component.ts
+++ b/src/app/components/login-page/login-page.component.ts
@@ -8,8 +8,10 @@ import {
   Validators,
 } from '@angular/forms';
 import { Router } from '@angular/router';
+import { Subscription } from 'rxjs';
 import { User } from '../../model/User';
 import { LocalStorageService } from '../../services/localstorage.service';
+import { LoginModalService } from '../../services/login-modal.service';
 import { LoginService } from '../../services/login.service';
 
 @Component({
@@ -23,11 +25,13 @@ export class LoginPageComponent {
   user: User = { login: '', password: '' };
   errorMessage: string = '';
   isLoginModalOpen: boolean = false;
+  private modalSub!: Subscription;
 
   constructor(
     private loginService: LoginService,
     private fb: FormBuilder,
     private router: Router,
+    private loginModalService: LoginModalService,
     private localStorageService: LocalStorageService
   ) {
     this.userForm = this.fb.group({
@@ -39,6 +43,16 @@ export class LoginPageComponent {
     });
   }
 
+  ngOnInit() {
+    this.modalSub = this.loginModalService.showModal$.subscribe((open) => {
+      this.isLoginModalOpen = open;
+    });
+  }
+
+  ngOnDestroy() {
+    this.modalSub.unsubscribe();
+  }
+
   public login() {
     if (this.userForm.invalid) {
       this.errorMessage =
diff --git a/src/app/services/login-modal.service.spec.ts b/src/app/services/login-modal.service.spec.ts
new file mode 100644
index 0000000..97fea24
--- /dev/null
+++ b/src/app/services/login-modal.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { LoginModalService } from './login-modal.service';
+
+describe('LoginModalService', () => {
+  let service: LoginModalService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(LoginModalService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/login-modal.service.ts b/src/app/services/login-modal.service.ts
new file mode 100644
index 0000000..6c63e3c
--- /dev/null
+++ b/src/app/services/login-modal.service.ts
@@ -0,0 +1,17 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+
+@Injectable({ providedIn: 'root' })
+export class LoginModalService {
+  private showModalSubject = new BehaviorSubject<boolean>(false);
+
+  showModal$ = this.showModalSubject.asObservable();
+
+  openModal() {
+    this.showModalSubject.next(true);
+  }
+
+  closeModal() {
+    this.showModalSubject.next(false);
+  }
+}