diff --git a/src/app/_helpers/jwt.interceptor.ts b/src/app/_helpers/jwt.interceptor.ts index e425579..cf0eab6 100644 --- a/src/app/_helpers/jwt.interceptor.ts +++ b/src/app/_helpers/jwt.interceptor.ts @@ -10,7 +10,7 @@ export class JwtInterceptor implements HttpInterceptor { intercept(request: HttpRequest, next: HttpHandler): Observable> { // add authorization header with jwt token if available - let currentUser = this._authService.currentUserValue; + const currentUser = this._authService.currentUserValue; if (currentUser && currentUser.token) { request = request.clone({ setHeaders: { @@ -21,4 +21,4 @@ export class JwtInterceptor implements HttpInterceptor { return next.handle(request); } -} \ No newline at end of file +} diff --git a/src/app/_services/authentication.service.ts b/src/app/_services/authentication.service.ts index 0f90ecc..914d1d1 100644 --- a/src/app/_services/authentication.service.ts +++ b/src/app/_services/authentication.service.ts @@ -19,7 +19,7 @@ export class AuthenticationService { constructor( protected http: HttpClient, private _tokenService: TokenService - ) { + ) { this.currentUserSubject = new BehaviorSubject(JSON.parse(localStorage.getItem('currentUser'))); this.currentUser = this.currentUserSubject.asObservable(); } @@ -38,7 +38,7 @@ export class AuthenticationService { // store user details and jwt token in local storage to keep user logged in between page refreshes localStorage.setItem('currentUser', JSON.stringify(user)); this.currentUserSubject.next(user); - console.log('This is USER = ',user) + console.log('This is USER = ', user ); return user; })); } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index ae77cca..d493016 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -2,12 +2,12 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { HomeComponent } from './control-panel/home/home.component'; import { ConfigComponent } from './control-panel/profile/config/config.component'; -import { AuthGuard } from './_helpers/auth.guard'; +import { AuthGuard } from './_helpers/auth.guard'; import { NotFoundComponent } from './control-panel/not-found/not-found.component'; import { ProfileComponent } from './control-panel/profile/profile/profile.component'; import { EditProfileComponent } from './control-panel/profile/edit-profile/edit-profile.component'; -const routes: Routes = +const routes: Routes = [ { path : '', redirectTo: 'home', pathMatch: 'full'}, { path : 'home', component: HomeComponent }, @@ -24,15 +24,14 @@ const routes: Routes = ] }, { path: '**', component: NotFoundComponent} - ]; @NgModule({ - imports: + imports: [ RouterModule.forRoot(routes) ], - exports: + exports: [ RouterModule ] diff --git a/src/app/app.component.ts b/src/app/app.component.ts index dffc625..eb6b5a0 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -12,15 +12,15 @@ import { first } from 'rxjs/operators'; templateUrl: './app.component.html', styleUrls: ['./app.component.css'] }) -export class AppComponent implements OnInit{ +export class AppComponent implements OnInit { title = 'MyControlPanel'; - items : MenuItem[]; + items: MenuItem[]; - public Connected : boolean = false; - public DisplayLoginModal: boolean = false; - public DisplaySignInModal: boolean = false; - public DisplayPersonalField: boolean = false; + public Connected = false; + public DisplayLoginModal = false; + public DisplaySignInModal = false; + public DisplayPersonalField = false; // Login public Username: string = null; @@ -33,17 +33,17 @@ export class AppComponent implements OnInit{ private _translateService: TranslateService, private _authService: AuthenticationService, private _router: Router - ){} + ) {} - ngOnInit(){ + ngOnInit() { this.items = [ {label: 'Update', icon: 'pi pi-refresh'}, - {label: 'Delete', icon: 'pi pi-times'} + {label: 'Delete', icon: 'pi pi-times'} ]; // To Include in a fonction of a dropdown language chose this._translateService.setDefaultLang('fr'); - let currentUser = this._authService.currentUserValue; + const currentUser = this._authService.currentUserValue; console.log(currentUser); if (currentUser && currentUser.token) { @@ -57,9 +57,8 @@ export class AppComponent implements OnInit{ } - - public LogIn() - { + + public LogIn() { /*this._appService.GetToken(this.Username, this.Password) .subscribe(res => { console.log(res.Token); @@ -101,8 +100,7 @@ export class AppComponent implements OnInit{ this._authService.IsLoggedIn = false; this._router.navigate(['/home']); } - public SignUp() - { + public SignUp() { this.DisplaySignInModal = true; } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 131a0d4..0ffcb0a 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -5,7 +5,7 @@ import { NgModule, Provider, APP_INITIALIZER } from '@angular/core'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { HomeComponent } from './control-panel/home/home.component'; -import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http'; +import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http'; import { AlertModule } from 'ngx-bootstrap/alert'; import { BsDatepickerModule } from 'ngx-bootstrap/datepicker'; @@ -22,8 +22,8 @@ import { AppService } from './_services/app.service'; import { FormsModule } from '@angular/forms'; import { CalendarModule } from 'primeng/calendar'; -import {TranslateModule, TranslateLoader} from '@ngx-translate/core'; -import {TranslateHttpLoader} from '@ngx-translate/http-loader'; +import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; +import { TranslateHttpLoader } from '@ngx-translate/http-loader'; import { AuthenticationService } from './_services/authentication.service'; import { ConfigComponent } from './control-panel/profile/config/config.component'; import { NotFoundComponent } from './control-panel/not-found/not-found.component'; @@ -37,15 +37,15 @@ import { ErrorInterceptor } from './_helpers/error.interceptor'; export function initApiConfiguration(config: ApiConfiguration): Function { return () => { - config.rootUrl='https://localhost:5001'; // None = same rooturl + config.rootUrl = 'https://localhost:5001'; // None = same rooturl }; } export const INIT_API_CONFIGURATION: Provider = { - provide:APP_INITIALIZER, - useFactory:initApiConfiguration, + provide: APP_INITIALIZER, + useFactory: initApiConfiguration, deps: [ApiConfiguration], - multi:true + multi: true }; // AoT requires an exported function for factories