From 0b7408a23096d40f311aba678dc9bb294cd5ae66 Mon Sep 17 00:00:00 2001 From: sandre Date: Fri, 16 Jan 2026 14:44:36 +0100 Subject: [PATCH] Environnement "dev" --- Front/skydivelogs-app/angular.json | 2 +- Front/skydivelogs-app/src/app/app.config.ts | 16 +------ .../src/config/config.dev.json | 6 +-- .../src/config/config.prod.json | 6 +-- .../src/environments/environment.dev.ts | 10 ++++ .../src/services/configuration-helper.ts | 48 ++++++++++--------- 6 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 Front/skydivelogs-app/src/environments/environment.dev.ts diff --git a/Front/skydivelogs-app/angular.json b/Front/skydivelogs-app/angular.json index 7a8ddc1..e77a689 100644 --- a/Front/skydivelogs-app/angular.json +++ b/Front/skydivelogs-app/angular.json @@ -63,7 +63,7 @@ "fileReplacements": [ { "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" + "with": "src/environments/environment.dev.ts" } ] } diff --git a/Front/skydivelogs-app/src/app/app.config.ts b/Front/skydivelogs-app/src/app/app.config.ts index b161a1b..9cbde66 100644 --- a/Front/skydivelogs-app/src/app/app.config.ts +++ b/Front/skydivelogs-app/src/app/app.config.ts @@ -2,11 +2,7 @@ import { inject, provideAppInitializer } from "@angular/core"; import { ApplicationConfig, provideZoneChangeDetection } from "@angular/core"; import { provideRouter } from "@angular/router"; import { DatePipe } from "@angular/common"; -import { - HttpClient, - HTTP_INTERCEPTORS, - provideHttpClient, -} from "@angular/common/http"; +import { HTTP_INTERCEPTORS, provideHttpClient } from "@angular/common/http"; import { DateService } from "../services/date.service"; import { AircraftService } from "../services/aircraft.service"; @@ -31,17 +27,9 @@ import { environment } from "../environments/environment"; import { routes } from "./app.routes"; -import { - provideTranslateService, - provideTranslateLoader, -} from "@ngx-translate/core"; +import { provideTranslateService } from "@ngx-translate/core"; import { provideTranslateHttpLoader } from "@ngx-translate/http-loader"; -// AOT compilation support -// export function httpTranslateLoader(http: HttpClient) { -// return new TranslateHttpLoader(http); -// } - // Déclaration de la fonction d'initialisation de la configuration export function initConfig(configService: ConfigurationHelper) { return () => configService.load(environment.env); diff --git a/Front/skydivelogs-app/src/config/config.dev.json b/Front/skydivelogs-app/src/config/config.dev.json index a7a9f70..ba49219 100644 --- a/Front/skydivelogs-app/src/config/config.dev.json +++ b/Front/skydivelogs-app/src/config/config.dev.json @@ -1,4 +1,4 @@ { - "apiUrl": "http://localhost:5000", - "version": "0.28.0" -} \ No newline at end of file + "apiUrl": "http://localhost:5000", + "version": "0.28.0 DEV" +} diff --git a/Front/skydivelogs-app/src/config/config.prod.json b/Front/skydivelogs-app/src/config/config.prod.json index 8db6d9b..ffc98f9 100644 --- a/Front/skydivelogs-app/src/config/config.prod.json +++ b/Front/skydivelogs-app/src/config/config.prod.json @@ -1,4 +1,4 @@ { - "apiUrl": "https://test-divelog.sebastienandre.com", - "version": "0.28.0" -} \ No newline at end of file + "apiUrl": "https://test-divelog.sebastienandre.com", + "version": "0.28.0 PROD" +} diff --git a/Front/skydivelogs-app/src/environments/environment.dev.ts b/Front/skydivelogs-app/src/environments/environment.dev.ts new file mode 100644 index 0000000..8b0b5c0 --- /dev/null +++ b/Front/skydivelogs-app/src/environments/environment.dev.ts @@ -0,0 +1,10 @@ +// The file contents for the current environment will overwrite these during build. +// The build system defaults to the dev environment which uses `environment.ts`, but if you do +// `ng build --env=prod` then `environment.prod.ts` will be used instead. +// The list of which env maps to which file can be found in `.angular-cli.json`. + +export const environment = { + production: false, + debugMode: true, + env: "dev" +}; diff --git a/Front/skydivelogs-app/src/services/configuration-helper.ts b/Front/skydivelogs-app/src/services/configuration-helper.ts index f6bb2b6..2857747 100644 --- a/Front/skydivelogs-app/src/services/configuration-helper.ts +++ b/Front/skydivelogs-app/src/services/configuration-helper.ts @@ -1,31 +1,33 @@ -import { Injectable } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; +import { Injectable } from "@angular/core"; +import { HttpClient } from "@angular/common/http"; -import { BehaviorSubject } from 'rxjs'; - -import { IAppSettings } from '../models/app-settings'; +import { BehaviorSubject } from "rxjs"; +import { IAppSettings } from "../models/app-settings"; @Injectable({ providedIn: "root" }) export class ConfigurationHelper { - private static settingsSource = new BehaviorSubject(null); - public static settings = ConfigurationHelper.settingsSource.asObservable(); - - constructor(private http: HttpClient) {} + private static settingsSource = new BehaviorSubject(null); + public static settings = ConfigurationHelper.settingsSource.asObservable(); - load(env: string) { - const jsonFile = `/config/config.${env}.json`; + constructor(private http: HttpClient) {} - return new Promise((resolve, reject) => { - this.http.get(jsonFile) - .toPromise() - .then((response : IAppSettings) => { - ConfigurationHelper.settingsSource.next(response); - resolve(); - }) - .catch((response: any) => { - reject(`Could not load file '${jsonFile}': ${JSON.stringify(response)}`); - }); + load(env: string) { + const jsonFile = `/config/config.${env}.json`; + + return new Promise((resolve, reject) => { + this.http + .get(jsonFile) + .toPromise() + .then((response: IAppSettings) => { + ConfigurationHelper.settingsSource.next(response); + resolve(); + }) + .catch((response: any) => { + reject( + `Could not load file '${jsonFile}': ${JSON.stringify(response)}` + ); }); - } -} \ No newline at end of file + }); + } +}