diff --git a/src/app/components/login-page/login-page.component.html b/src/app/components/login-page/login-page.component.html index 5d8c20c..ad6dd20 100644 --- a/src/app/components/login-page/login-page.component.html +++ b/src/app/components/login-page/login-page.component.html @@ -17,7 +17,7 @@ 'opacity-0 scale-50 pointer-events-none': !isLoginModalOpen, 'opacity-100 scale-100': isLoginModalOpen }" - class="fixed top-0 right-0 left-0 z-50 flex justify-center items-center w-full h-full transition-opacity transition-transform duration-300 ease-in-out" + class="fixed top-0 right-0 left-0 z-50 flex justify-center items-center w-full h-full transition-transform duration-300 ease-in-out" >
@@ -29,7 +29,7 @@ class="flex items-center justify-between p-4 md:p-5 border-b rounded-t dark:border-gray-600" >

- Sign in to our platform + Se connecter à Memory Map

@@ -61,7 +61,7 @@ Identifiant @@ -77,7 +77,7 @@ Mot de passe Remember me + >Se souvenir de moi + Lost Password?Mot de passe oublié ?
@@ -118,12 +118,14 @@ (click)="login()" class="w-full text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800" > - Login to your account + Se connecter
- Not registered? - Create accountCréer un compte
diff --git a/src/app/components/login-page/login-page.component.ts b/src/app/components/login-page/login-page.component.ts index 93a1853..93778af 100644 --- a/src/app/components/login-page/login-page.component.ts +++ b/src/app/components/login-page/login-page.component.ts @@ -90,4 +90,9 @@ export class LoginPageComponent { closeLoginModal() { this.modalService.closeModal(this.modalId); } + + openRegisterModal() { + this.modalService.closeModal(this.modalId); + this.modalService.openModal('register-modal'); + } } diff --git a/src/app/components/register-page/register-page.component.html b/src/app/components/register-page/register-page.component.html index 788428b..ba8e3b1 100644 --- a/src/app/components/register-page/register-page.component.html +++ b/src/app/components/register-page/register-page.component.html @@ -37,7 +37,7 @@ class="flex items-center justify-between p-4 md:p-5 border-b rounded-t dark:border-gray-600" >

- Formulaire d'inscription + S'inscrire à Memory Map

@@ -122,6 +122,14 @@ > Démarrer l'aventure ! +
+ Déjà un compte ? + Se connecter +
diff --git a/src/app/components/register-page/register-page.component.ts b/src/app/components/register-page/register-page.component.ts index b1aefbe..62de0f0 100644 --- a/src/app/components/register-page/register-page.component.ts +++ b/src/app/components/register-page/register-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/local-storage/local-storage.service'; +import { ModalService } from '../../services/modal/modal.service'; import { RegisterService } from '../../services/register/register.service'; @Component({ @@ -22,11 +24,14 @@ export class RegisterPageComponent { user: User = { login: '', password: '' }; errorMessage: string = ''; isRegisterModalOpen: boolean = false; + modalId: string = 'register-modal'; + private modalSub!: Subscription; constructor( private registerService: RegisterService, private fb: FormBuilder, private localStorageService: LocalStorageService, + private modalService: ModalService, private router: Router ) { this.userForm = this.fb.group( @@ -45,6 +50,18 @@ export class RegisterPageComponent { ); } + ngOnInit() { + this.modalSub = this.modalService + .getModalState(this.modalId) + .subscribe((open) => { + this.isRegisterModalOpen = open; + }); + } + + ngOnDestroy() { + this.modalSub.unsubscribe(); + } + passwordMatchValidator(formGroup: FormGroup) { const password = formGroup.get('password')?.value; const verifyPassword = formGroup.get('verifyPassword')?.value; @@ -80,10 +97,15 @@ export class RegisterPageComponent { } openRegisterModal() { - this.isRegisterModalOpen = true; + this.modalService.openModal(this.modalId); } closeRegisterModal() { - this.isRegisterModalOpen = false; + this.modalService.closeModal(this.modalId); + } + + openLoginModal() { + this.modalService.closeModal(this.modalId); + this.modalService.openModal('login-modal'); } }