Merge pull request 'fix: Fix bug where the password reset form doesnt show up when using (CAS-81)' (!201) from bugfix/password-reset-in-modal into main
Reviewed-on: #201
This commit is contained in:
commit
5c64b86bc4
2 changed files with 25 additions and 3 deletions
|
@ -182,7 +182,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@if (showLogin() || showRegister()) {
|
@if (showLogin() || showRegister() || showRecoverPassword()) {
|
||||||
<div
|
<div
|
||||||
class="fixed inset-0 bg-black/50 z-40"
|
class="fixed inset-0 bg-black/50 z-40"
|
||||||
(click)="hideAuthForms()"
|
(click)="hideAuthForms()"
|
||||||
|
@ -194,7 +194,11 @@
|
||||||
<div class="fixed inset-0 flex items-center justify-center z-50 p-4" role="presentation">
|
<div class="fixed inset-0 flex items-center justify-center z-50 p-4" role="presentation">
|
||||||
<div class="relative" role="dialog" aria-modal="true">
|
<div class="relative" role="dialog" aria-modal="true">
|
||||||
@if (showLogin()) {
|
@if (showLogin()) {
|
||||||
<app-login (switchForm)="showRegisterForm()" (closeDialog)="hideAuthForms()"></app-login>
|
<app-login
|
||||||
|
(forgotPassword)="showRecoverPasswordForm()"
|
||||||
|
(switchForm)="showRegisterForm()"
|
||||||
|
(closeDialog)="hideAuthForms()"
|
||||||
|
></app-login>
|
||||||
}
|
}
|
||||||
@if (showRegister()) {
|
@if (showRegister()) {
|
||||||
<app-register
|
<app-register
|
||||||
|
@ -202,6 +206,12 @@
|
||||||
(closeDialog)="hideAuthForms()"
|
(closeDialog)="hideAuthForms()"
|
||||||
></app-register>
|
></app-register>
|
||||||
}
|
}
|
||||||
|
@if (showRecoverPassword()) {
|
||||||
|
<app-recover-password
|
||||||
|
(closeDialog)="hideAuthForms()"
|
||||||
|
(switchToLogin)="showLoginForm()"
|
||||||
|
></app-recover-password>
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,11 +11,12 @@ import { ActivatedRoute, RouterLink } from '@angular/router';
|
||||||
import { AuthService } from '@service/auth.service';
|
import { AuthService } from '@service/auth.service';
|
||||||
import { LoginComponent } from '../auth/login/login.component';
|
import { LoginComponent } from '../auth/login/login.component';
|
||||||
import { RegisterComponent } from '../auth/register/register.component';
|
import { RegisterComponent } from '../auth/register/register.component';
|
||||||
|
import { RecoverPasswordComponent } from '../auth/recover-password/recover-password.component';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-landing-page',
|
selector: 'app-landing-page',
|
||||||
standalone: true,
|
standalone: true,
|
||||||
imports: [NgFor, RouterLink, LoginComponent, RegisterComponent],
|
imports: [NgFor, RouterLink, LoginComponent, RegisterComponent, RecoverPasswordComponent],
|
||||||
templateUrl: './landing.component.html',
|
templateUrl: './landing.component.html',
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
})
|
})
|
||||||
|
@ -26,6 +27,7 @@ export class LandingComponent implements OnInit, OnDestroy {
|
||||||
route: ActivatedRoute = inject(ActivatedRoute);
|
route: ActivatedRoute = inject(ActivatedRoute);
|
||||||
showLogin = signal(false);
|
showLogin = signal(false);
|
||||||
showRegister = signal(false);
|
showRegister = signal(false);
|
||||||
|
showRecoverPassword = signal(false);
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.startAutoplay();
|
this.startAutoplay();
|
||||||
|
@ -43,18 +45,28 @@ export class LandingComponent implements OnInit, OnDestroy {
|
||||||
showLoginForm() {
|
showLoginForm() {
|
||||||
this.showLogin.set(true);
|
this.showLogin.set(true);
|
||||||
this.showRegister.set(false);
|
this.showRegister.set(false);
|
||||||
|
this.showRecoverPassword.set(false);
|
||||||
document.body.style.overflow = 'hidden';
|
document.body.style.overflow = 'hidden';
|
||||||
}
|
}
|
||||||
|
|
||||||
showRegisterForm() {
|
showRegisterForm() {
|
||||||
this.showRegister.set(true);
|
this.showRegister.set(true);
|
||||||
this.showLogin.set(false);
|
this.showLogin.set(false);
|
||||||
|
this.showRecoverPassword.set(false);
|
||||||
|
document.body.style.overflow = 'hidden';
|
||||||
|
}
|
||||||
|
|
||||||
|
showRecoverPasswordForm() {
|
||||||
|
this.showRecoverPassword.set(true);
|
||||||
|
this.showLogin.set(false);
|
||||||
|
this.showRegister.set(false);
|
||||||
document.body.style.overflow = 'hidden';
|
document.body.style.overflow = 'hidden';
|
||||||
}
|
}
|
||||||
|
|
||||||
hideAuthForms() {
|
hideAuthForms() {
|
||||||
this.showLogin.set(false);
|
this.showLogin.set(false);
|
||||||
this.showRegister.set(false);
|
this.showRegister.set(false);
|
||||||
|
this.showRecoverPassword.set(false);
|
||||||
document.body.style.overflow = 'auto';
|
document.body.style.overflow = 'auto';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Reference in a new issue