This commit is contained in:
Chris Chen
2024-03-21 17:47:13 -07:00
parent 6301d6008b
commit b46392bc41
107 changed files with 4606 additions and 228 deletions
@@ -6,10 +6,10 @@ import { LayoutService } from '../../../@core/utils';
import { map, takeUntil, first } from 'rxjs/operators';
import { Subject } from 'rxjs';
import { HeaderService } from '../../../services/header.service';
import { NbAuthService } from '@nebular/auth';
import { AuthService } from '../../../services/auth.service';
import { UserProfileAction } from '../../../entity/Auth';
import { Router } from '@angular/router';
import { LoginUserService } from '../../../services/login-user.service';
import { AuthService } from '../../../services/auth.service';
@Component({
selector: 'ngx-header',
@@ -54,7 +54,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
}];
public get user() {
return this.authService.userAccess;
return this.loginUserService.userAccess;
}
public get userFullName() {
if (this.user) {
@@ -78,7 +78,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
private layoutService: LayoutService,
private breakpointService: NbMediaBreakpointsService,
private headerService: HeaderService,
private oAuthService: NbAuthService,
private loginUserService: LoginUserService,
private authService: AuthService,
protected router: Router,
) {
@@ -23,4 +23,4 @@ import { Component } from '@angular/core';
</nb-layout>
`,
})
export class OneColumnLayoutComponent {}
export class OneColumnLayoutComponent { }