From 987f924141d23390b1d92f5d19bf371b61d448b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= Date: Mon, 11 Nov 2019 15:17:05 +0100 Subject: [PATCH] Ajout de variables d'environnement pour la Prod et le Local (url de l'API) --- .../src/environments/environment.prod.ts | 4 +- .../src/environments/environment.ts | 4 +- .../src/services/serviceApiGet.ts | 75 +++++++++++++------ .../src/services/serviceApiPost.ts | 31 ++++---- 4 files changed, 76 insertions(+), 38 deletions(-) diff --git a/Front/skydivelogs-app/src/environments/environment.prod.ts b/Front/skydivelogs-app/src/environments/environment.prod.ts index 3612073..9374e8d 100644 --- a/Front/skydivelogs-app/src/environments/environment.prod.ts +++ b/Front/skydivelogs-app/src/environments/environment.prod.ts @@ -1,3 +1,5 @@ export const environment = { - production: true + production: true, + urlApi: "https://skydivelogsapi.azurewebsites.net", + debugMode: false }; diff --git a/Front/skydivelogs-app/src/environments/environment.ts b/Front/skydivelogs-app/src/environments/environment.ts index b7f639a..0457f23 100644 --- a/Front/skydivelogs-app/src/environments/environment.ts +++ b/Front/skydivelogs-app/src/environments/environment.ts @@ -4,5 +4,7 @@ // The list of which env maps to which file can be found in `.angular-cli.json`. export const environment = { - production: false + production: false, + urlApi: "http://localhost:5000", + debugMode: false }; diff --git a/Front/skydivelogs-app/src/services/serviceApiGet.ts b/Front/skydivelogs-app/src/services/serviceApiGet.ts index 977c9f0..291a178 100644 --- a/Front/skydivelogs-app/src/services/serviceApiGet.ts +++ b/Front/skydivelogs-app/src/services/serviceApiGet.ts @@ -1,24 +1,34 @@ -import { Injectable } from '@angular/core'; -import { HttpClient, HttpHeaders } from '@angular/common/http'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; - -import { DropZoneResp } from '../models/dropzone'; -import { JumpResp } from '../models/jump'; -import { AircraftResp } from '../models/aircraft'; -import { JumpTypeResp } from '../models/jumpType'; -import { StatsResp, StatsByDzResp, StatsByAircraftResp, StatsByJumpTypeResp, StatsByRigResp, StatsByYearResp } from '../models/statsresp'; +import { Injectable } from "@angular/core"; +import { HttpClient, HttpHeaders } from "@angular/common/http"; +import { Observable } from "rxjs"; +import { map } from "rxjs/operators"; +import { DropZoneResp } from "../models/dropzone"; +import { JumpResp } from "../models/jump"; +import { AircraftResp } from "../models/aircraft"; +import { JumpTypeResp } from "../models/jumpType"; +import { + StatsResp, + StatsByDzResp, + StatsByAircraftResp, + StatsByJumpTypeResp, + StatsByRigResp, + StatsByYearResp +} from "../models/statsresp"; +import { environment } from "../environments/environment"; @Injectable() export class ServiceApiGet { private readonly headers = new HttpHeaders({ - 'Access-Control-Allow-Origin': 'http://localhost:5000', + "Access-Control-Allow-Origin": environment.urlApi }); - constructor(private http: HttpClient) { } + constructor(private http: HttpClient) {} public getListOfDropZones(): Observable> { - return this.http.get>('http://localhost:5000/api/DropZone', { headers: this.headers }) + return this.http + .get>(`${environment.urlApi}/api/DropZone`, { + headers: this.headers + }) .pipe( map(response => { const details = response.map(data => new DropZoneResp(data)); @@ -28,24 +38,47 @@ export class ServiceApiGet { } public getListOfJumps(): Observable> { - return this.http.get>('http://localhost:5000/api/Jump', { headers: this.headers }); + return this.http.get>(`${environment.urlApi}/api/Jump`, { + headers: this.headers + }); } public getListOfAircrafts(): Observable> { - return this.http.get>('http://localhost:5000/api/Aircraft', { headers: this.headers }); + return this.http.get>( + `${environment.urlApi}/api/Aircraft`, + { headers: this.headers } + ); } public getListOfJumpTypes(): Observable> { - return this.http.get>('http://localhost:5000/api/JumpType', { headers: this.headers }); + return this.http.get>( + `${environment.urlApi}/api/JumpType`, + { headers: this.headers } + ); } public getStatsOfJumps(): StatsResp { const resultat = new StatsResp(); - resultat.statsByDz = this.http.get('http://localhost:5000/api/Stats/ByDz', { headers: this.headers }); - resultat.statsByAircraft = this.http.get('http://localhost:5000/api/Stats/ByAircraft', { headers: this.headers }); - resultat.statsByJumpType = this.http.get('http://localhost:5000/api/Stats/ByJumpType', { headers: this.headers }); - resultat.statsByRig = this.http.get('http://localhost:5000/api/Stats/ByRig', { headers: this.headers }); - resultat.statsByYear = this.http.get('http://localhost:5000/api/Stats/ByYear', { headers: this.headers }); + resultat.statsByDz = this.http.get( + `${environment.urlApi}/api/Stats/ByDz`, + { headers: this.headers } + ); + resultat.statsByAircraft = this.http.get( + `${environment.urlApi}/api/Stats/ByAircraft`, + { headers: this.headers } + ); + resultat.statsByJumpType = this.http.get( + `${environment.urlApi}/api/Stats/ByJumpType`, + { headers: this.headers } + ); + resultat.statsByRig = this.http.get( + `${environment.urlApi}/api/Stats/ByRig`, + { headers: this.headers } + ); + resultat.statsByYear = this.http.get( + `${environment.urlApi}/api/Stats/ByYear`, + { headers: this.headers } + ); return resultat; } diff --git a/Front/skydivelogs-app/src/services/serviceApiPost.ts b/Front/skydivelogs-app/src/services/serviceApiPost.ts index 12ba2f7..5ce530d 100644 --- a/Front/skydivelogs-app/src/services/serviceApiPost.ts +++ b/Front/skydivelogs-app/src/services/serviceApiPost.ts @@ -1,17 +1,18 @@ -import { Injectable } from '@angular/core'; -import { HttpClient, HttpHeaders } from '@angular/common/http'; - -import { JumpReq } from '../models/jump'; +import { Injectable } from "@angular/core"; +import { HttpClient, HttpHeaders } from "@angular/common/http"; +import { JumpReq } from "../models/jump"; +import { environment } from "../environments/environment"; @Injectable() export class ServiceApiPost { private readonly headers = new HttpHeaders({ - 'Access-Control-Allow-Origin': 'http://localhost:5000', + "Access-Control-Allow-Origin": environment.urlApi }); - constructor(private http: HttpClient) { } + constructor(private http: HttpClient) {} - public AddJumps(selectedJumpType: number, + public AddJumps( + selectedJumpType: number, selectedAircraft: number, selectedDz: number, selectedRig: number, @@ -19,8 +20,8 @@ export class ServiceApiPost { jumpDate: Date, defaultExitAltitude: number, defaultDeployAltitude: number, - countOfJumps: number) { - + countOfJumps: number + ) { for (let i = 0; i < countOfJumps; i++) { const bodyNewjump: JumpReq = { jumpTypeId: selectedJumpType, @@ -30,7 +31,7 @@ export class ServiceApiPost { exitAltitude: defaultExitAltitude, deployAltitude: defaultDeployAltitude, gearId: selectedRig, - notes: '', + notes: "", id: 0, jumpDate: jumpDate }; @@ -43,7 +44,8 @@ export class ServiceApiPost { } } - public AddListOfJump(selectedJumpType: number, + public AddListOfJump( + selectedJumpType: number, selectedAircraft: number, selectedDz: number, selectedRig: number, @@ -52,15 +54,14 @@ export class ServiceApiPost { endDate: Date, defaultExitAltitude: number, defaultDeployAltitude: number, - countOfJumps: number) { - + countOfJumps: number + ) { const diffInTime = endDate.getTime() - beginDate.getTime(); const diffInDays = Math.round(diffInTime / (1000 * 3600 * 24)); const countOfJumpsPerDay = Math.trunc(countOfJumps / diffInDays); let temp: Date = beginDate; for (let i = 1; temp.getDate() < endDate.getDate(); i++) { - this.AddJumps( selectedJumpType, selectedAircraft, @@ -76,7 +77,7 @@ export class ServiceApiPost { temp.setDate(temp.getDate() + 1); } - const restfJumps = countOfJumps - (countOfJumpsPerDay * (diffInDays - 1)); + const restfJumps = countOfJumps - countOfJumpsPerDay * (diffInDays - 1); this.AddJumps( selectedJumpType, selectedAircraft,