AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Release Bugfixes (#2470)

Browse source
This commit is contained in:
Joe Milazzo 2023-12-03 11:54:57 -06:00 • committed by GitHub
parent d796d06fd1
commit bdcd3965fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 194 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

13
UI/Web/src/app/registration/_components/confirm-email/confirm-email.component.ts
View file

@ -1,4 +1,4 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component } from '@angular/core';
import {ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy} from '@angular/core';
import { FormControl, FormGroup, Validators, ReactiveFormsModule } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { ToastrService } from 'ngx-toastr';
@ -9,6 +9,7 @@ import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
import { NgIf, NgFor, NgTemplateOutlet } from '@angular/common';
import { SplashContainerComponent } from '../splash-container/splash-container.component';
import {translate, TranslocoDirective} from "@ngneat/transloco";
import {take} from "rxjs/operators";
@Component({
selector: 'app-confirm-email',
@ -18,7 +19,7 @@ import {translate, TranslocoDirective} from "@ngneat/transloco";
standalone: true,
imports: [SplashContainerComponent, NgIf, NgFor, ReactiveFormsModule, NgbTooltip, NgTemplateOutlet, TranslocoDirective]
})
export class ConfirmEmailComponent {
export class ConfirmEmailComponent implements OnDestroy {
/**
* Email token used for validating
*/
@ -55,6 +56,14 @@ export class ConfirmEmailComponent {
this.cdRef.markForCheck();
}
ngOnDestroy() {
this.accountService.currentUser$.pipe(take(1)).subscribe(user => {
if (user) {
this.navService.showSideNav();
}
});
}
isNullOrEmpty(v: string | null | undefined) {
return v == undefined || v === '' || v === null;
}