sandre/SkydiveLogs
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update Angular

Browse Source 
+ Add a config file to use Docker
This commit is contained in:
Sébastien André
2021-02-15 15:20:52 +01:00
parent 54781e2444
commit b8a32bc01e
8 changed files with 2951 additions and 1692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Front/skydivelogs-app/src/services/base.service.ts
View File

@@ -1,4 +1,3 @@
import { Injector } from '@angular/core';
import { HttpHeaders } from '@angular/common/http';
import { ConfigurationHelper } from './configuration-helper';
@@ -10,12 +9,14 @@ export class BaseService {
constructor() {
ConfigurationHelper.settings.subscribe(settings =>
{
let tmpApiUrl : string = settings.apiUrl;
this.headers = new HttpHeaders({
'Access-Control-Allow-Origin': tmpApiUrl
});
this.apiUrl = tmpApiUrl + '/api';
if (settings != null) {
let tmpApiUrl : string = settings.apiUrl;
this.headers = new HttpHeaders({
'Access-Control-Allow-Origin': tmpApiUrl
});
this.apiUrl = tmpApiUrl + '/api';
}
});
// const config: ConfigurationHelper = injector.get(ConfigurationHelper);

3
Front/skydivelogs-app/src/services/configuration-helper.ts
View File

@@ -8,7 +8,7 @@ import { IAppSettings } from '../models/app-settings';
@Injectable({ providedIn: "root" })
export class ConfigurationHelper {
private static settingsSource = new BehaviorSubject<IAppSettings>();
private static settingsSource = new BehaviorSubject<IAppSettings>(null);
public static settings = ConfigurationHelper.settingsSource.asObservable();
constructor(private http: HttpClient) {}
@@ -20,7 +20,6 @@ export class ConfigurationHelper {
this.http.get(jsonFile)
.toPromise()
.then((response : IAppSettings) => {
//ConfigurationHelper.settings = <IAppSettings>response;
ConfigurationHelper.settingsSource.next(<IAppSettings>response);
resolve();
})