diff --git a/Front/skydivelogs-app/src/app/create-user/create-user.component.ts b/Front/skydivelogs-app/src/app/create-user/create-user.component.ts index ba2265d..d4750cf 100644 --- a/Front/skydivelogs-app/src/app/create-user/create-user.component.ts +++ b/Front/skydivelogs-app/src/app/create-user/create-user.component.ts @@ -30,9 +30,9 @@ import { User } from "../../models/user"; MatFormFieldModule, ReactiveFormsModule, MatInputModule, + MatButtonModule, TranslateModule, TranslatePipe, - MatButtonModule, ], }) export class CreateUserComponent implements OnInit { diff --git a/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.ts b/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.ts index 68916b1..c995166 100644 --- a/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.ts +++ b/Front/skydivelogs-app/src/app/jump-infos/jump-infos.component.ts @@ -4,7 +4,9 @@ import { MAT_DIALOG_DATA } from "@angular/material/dialog"; import { TranslateModule } from "@ngx-translate/core"; import { MatCheckboxModule } from "@angular/material/checkbox"; import { MatFormFieldModule } from "@angular/material/form-field"; -import { FormsModule } from "@angular/forms"; +import { FormsModule, ReactiveFormsModule } from "@angular/forms"; +import { MatInputModule } from "@angular/material/input"; +import { MatButtonModule } from "@angular/material/button"; import { AddAction } from "../../models/add-action.enum"; import { JumpResp } from "../../models/jump"; @@ -19,9 +21,12 @@ import { ServiceComm } from "../../services/service-comm.service"; imports: [ TranslateModule, CommonModule, + FormsModule, MatCheckboxModule, MatFormFieldModule, - FormsModule, + ReactiveFormsModule, + MatInputModule, + MatButtonModule, ], }) export class JumpInfosComponent implements OnInit { diff --git a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts index 0f6a0a7..15aafc9 100644 --- a/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts +++ b/Front/skydivelogs-app/src/app/list-of-jumps/list-of-jumps.component.ts @@ -12,6 +12,10 @@ import { CommonModule } from "@angular/common"; import { MatIconModule } from "@angular/material/icon"; import { MatProgressSpinnerModule } from "@angular/material/progress-spinner"; import { MatProgressBarModule } from "@angular/material/progress-bar"; +import { MatButtonModule } from "@angular/material/button"; +import { MatInputModule } from "@angular/material/input"; +import { ReactiveFormsModule } from "@angular/forms"; +import { MatFormFieldModule } from "@angular/material/form-field"; import { AddAction } from "../../models/add-action.enum"; import { Jump } from "../../models/jump"; @@ -27,13 +31,17 @@ import { StatsService } from "../../services/stats.service"; imports: [ TranslateModule, CommonModule, + RouterLink, + RouterModule, MatIconModule, MatPaginatorModule, MatProgressSpinnerModule, MatProgressBarModule, - RouterLink, - RouterModule, MatTableModule, + MatFormFieldModule, + ReactiveFormsModule, + MatInputModule, + MatButtonModule, ], }) export class ListOfJumpsComponent implements OnInit { diff --git a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts index d66d8eb..3d487d1 100644 --- a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts +++ b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.ts @@ -15,7 +15,9 @@ import { MatCheckboxModule } from "@angular/material/checkbox"; import { MatAutocompleteModule } from "@angular/material/autocomplete"; import { MatDatepickerModule } from "@angular/material/datepicker"; import { MatProgressSpinnerModule } from "@angular/material/progress-spinner"; -import { FormsModule } from "@angular/forms"; +import { FormsModule, ReactiveFormsModule } from "@angular/forms"; +import { MatInputModule } from "@angular/material/input"; +import { MatButtonModule } from "@angular/material/button"; import { JumpTypeResp } from "../../models/jumpType"; import { AircraftResp } from "../../models/aircraft"; @@ -57,16 +59,20 @@ class PickDateAdapter extends NativeDateAdapter { imports: [ TranslateModule, CommonModule, + RouterLink, + FormsModule, + RouterModule, MatIconModule, MatOptionModule, MatFormFieldModule, - RouterLink, MatCheckboxModule, MatAutocompleteModule, MatDatepickerModule, MatProgressSpinnerModule, - FormsModule, - RouterModule, + MatFormFieldModule, + ReactiveFormsModule, + MatInputModule, + MatButtonModule, ], }) export class NewJumpComponent implements OnInit { diff --git a/Front/skydivelogs-app/src/services/base.service.ts b/Front/skydivelogs-app/src/services/base.service.ts index 14e2860..137f2b0 100644 --- a/Front/skydivelogs-app/src/services/base.service.ts +++ b/Front/skydivelogs-app/src/services/base.service.ts @@ -1,26 +1,25 @@ -import { HttpHeaders } from '@angular/common/http'; +import { HttpHeaders } from "@angular/common/http"; -import { ConfigurationHelper } from './configuration-helper'; -import { ServiceCacheApi } from './service-cache-api.service'; +import { ConfigurationHelper } from "./configuration-helper"; +import { ServiceCacheApi } from "./service-cache-api.service"; export class BaseService { - protected headers: HttpHeaders; - protected apiUrl: string; - protected serviceCacheApi : ServiceCacheApi; + protected headers: HttpHeaders; + protected apiUrl: string; + protected serviceCacheApi: ServiceCacheApi; - constructor() { - ConfigurationHelper.settings.subscribe(settings => - { - if (settings != null) { - let tmpApiUrl : string = settings.apiUrl; - - this.headers = new HttpHeaders({ - 'Access-Control-Allow-Origin': tmpApiUrl - }); - this.apiUrl = tmpApiUrl + '/api'; - } + constructor() { + ConfigurationHelper.settings.subscribe((settings) => { + if (settings != null) { + let tmpApiUrl: string = settings.apiUrl; + + this.headers = new HttpHeaders({ + "Access-Control-Allow-Origin": tmpApiUrl, }); + this.apiUrl = tmpApiUrl + "/api"; + } + }); - this.serviceCacheApi = new ServiceCacheApi(); - } + this.serviceCacheApi = new ServiceCacheApi(); + } } diff --git a/Front/skydivelogs-app/src/services/service-cache-api.service.ts b/Front/skydivelogs-app/src/services/service-cache-api.service.ts index c40d9fc..9cbdcff 100644 --- a/Front/skydivelogs-app/src/services/service-cache-api.service.ts +++ b/Front/skydivelogs-app/src/services/service-cache-api.service.ts @@ -1,29 +1,28 @@ -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { tap } from 'rxjs/operators'; -import { CacheApiKey } from '../models/cache-api-key.enum'; -import { of } from 'rxjs'; +import { Injectable } from "@angular/core"; +import { Observable } from "rxjs"; +import { tap } from "rxjs/operators"; +import { CacheApiKey } from "../models/cache-api-key.enum"; +import { of } from "rxjs"; -@Injectable({ - providedIn: 'root', -}) +@Injectable({ providedIn: "root" }) export class ServiceCacheApi { private cache: Map>; - constructor() { + constructor() { this.cache = new Map>(); } - public get(key: CacheApiKey, callToApi: Observable) : Observable { + public get(key: CacheApiKey, callToApi: Observable): Observable { const cached = this.cache.get(key); if (cached) { return cached; } else { return callToApi.pipe( - tap(event => { - this.cache.set(key, of(event)); - })); + tap((event) => { + this.cache.set(key, of(event)); + }) + ); } } @@ -31,7 +30,7 @@ export class ServiceCacheApi { this.cache.delete(key); } - public getByKey(key: CacheApiKey) : Observable { + public getByKey(key: CacheApiKey): Observable { return this.cache.get(key); } }