Move login component to views

- Login component is used by the router like other views
-- Though not a view according to the SuiteCRM concept of a view
- Fix eslint inspection errors
This commit is contained in:
Clemente Raposo 2021-01-06 17:19:13 +00:00 committed by Dillon-Brown
parent e9b9819e7d
commit d1534850fb
7 changed files with 13 additions and 11 deletions

View file

@ -26,7 +26,7 @@ export class AppInit {
routes.push({ routes.push({
path: 'Login', path: 'Login',
loadChildren: () => import('../components/login/login.module').then(m => m.LoginUiModule), loadChildren: () => import('../../views/login/components/login/login.module').then(m => m.LoginUiModule),
canActivate: [LoginAuthGuard], canActivate: [LoginAuthGuard],
runGuardsAndResolvers: 'always', runGuardsAndResolvers: 'always',
resolve: { resolve: {

View file

@ -3,7 +3,7 @@ import {Router} from '@angular/router';
import {HttpClient, HttpErrorResponse, HttpHeaders, HttpParams} from '@angular/common/http'; import {HttpClient, HttpErrorResponse, HttpHeaders, HttpParams} from '@angular/common/http';
import {BehaviorSubject, Observable, Subscription, throwError} from 'rxjs'; import {BehaviorSubject, Observable, Subscription, throwError} from 'rxjs';
import {catchError, distinctUntilChanged, finalize, take} from 'rxjs/operators'; import {catchError, distinctUntilChanged, finalize, take} from 'rxjs/operators';
import {LoginUiComponent} from '@components/login/login.component'; import {LoginUiComponent} from '@views/login/components/login/login.component';
import {User} from '@services/user/user'; import {User} from '@services/user/user';
import {MessageService} from '@services/message/message.service'; import {MessageService} from '@services/message/message.service';
import {StateManager} from '@base/store/state-manager'; import {StateManager} from '@base/store/state-manager';
@ -23,11 +23,12 @@ export interface SessionStatus {
providedIn: 'root' providedIn: 'root'
}) })
export class AuthService { export class AuthService {
protected timerSet = false;
private currentUserSubject = new BehaviorSubject<User>({} as User); currentUser$: Observable<User>;
currentUser$ = this.currentUserSubject.asObservable().pipe(distinctUntilChanged());
isUserLoggedIn: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false); isUserLoggedIn: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
defaultTimeout = '3600'; defaultTimeout = '3600';
protected timerSet = false;
private currentUserSubject = new BehaviorSubject<User>({} as User);
constructor( constructor(
private http: HttpClient, private http: HttpClient,
@ -39,6 +40,7 @@ export class AuthService {
protected appStateStore: AppStateStore, protected appStateStore: AppStateStore,
protected localStorage: LocalStorageService protected localStorage: LocalStorageService
) { ) {
this.currentUser$ = this.currentUserSubject.asObservable().pipe(distinctUntilChanged());
} }
getCurrentUser(): User { getCurrentUser(): User {

View file

@ -7,7 +7,7 @@ import {fadeIn} from 'ng-animate';
import {AuthService} from '@services/auth/auth.service'; import {AuthService} from '@services/auth/auth.service';
import {MessageService} from '@services/message/message.service'; import {MessageService} from '@services/message/message.service';
import {RecoverPasswordService} from '@services/process/processes/recover-password/recover-password'; import {RecoverPasswordService} from '@services/process/processes/recover-password/recover-password';
import {SystemConfigStore, SystemConfigMap} from '@store/system-config/system-config.store'; import {SystemConfigMap, SystemConfigStore} from '@store/system-config/system-config.store';
import {LanguageStore, LanguageStringMap} from '@store/language/language.store'; import {LanguageStore, LanguageStringMap} from '@store/language/language.store';
import {Process} from '@services/process/process.service'; import {Process} from '@services/process/process.service';
@ -74,11 +74,11 @@ export class LoginUiComponent {
} }
doLanguageChange(language: string): void { doLanguageChange(language: string): void {
this.languageStore.changeLanguage(language) this.languageStore.changeLanguage(language);
} }
doGetCurrentLanguage(): string { doGetCurrentLanguage(): string {
return this.languageStore.getCurrentLanguage() return this.languageStore.getCurrentLanguage();
} }
flipCard(): void { flipCard(): void {

View file

@ -2,9 +2,9 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common'; import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms'; import {FormsModule} from '@angular/forms';
import {RouterModule} from '@angular/router'; import {RouterModule} from '@angular/router';
import {AppManagerModule} from '../../app-manager/app-manager.module'; import {AppManagerModule} from '@base/app-manager/app-manager.module';
import {LoginUiComponent} from './login.component'; import {LoginUiComponent} from './login.component';
import {LogoUiModule} from '../logo/logo.module'; import {LogoUiModule} from '@components/logo/logo.module';
import {LoginUiRoutes} from './login.routes'; import {LoginUiRoutes} from './login.routes';
import {AngularSvgIconModule} from 'angular-svg-icon'; import {AngularSvgIconModule} from 'angular-svg-icon';
import {ImageModule} from '@components/image/image.module'; import {ImageModule} from '@components/image/image.module';

View file

@ -6,4 +6,4 @@ export const LoginUiRoutes: Route[] = [
path: '', path: '',
component: LoginUiComponent component: LoginUiComponent
} }
]; ];