diff --git a/Frontend/src/app/main-view/main-view.component.html b/Frontend/src/app/main-view/main-view.component.html index 56b22a0..99239e5 100644 --- a/Frontend/src/app/main-view/main-view.component.html +++ b/Frontend/src/app/main-view/main-view.component.html @@ -12,7 +12,7 @@ -

DiunaBI

+

DiunaBI {{environment.appTitle}}

diff --git a/Frontend/src/app/main-view/main-view.component.ts b/Frontend/src/app/main-view/main-view.component.ts index d4f89fc..e49c4f7 100644 --- a/Frontend/src/app/main-view/main-view.component.ts +++ b/Frontend/src/app/main-view/main-view.component.ts @@ -5,6 +5,7 @@ import { SwUpdate } from '@angular/service-worker'; import * as moment from 'moment'; import packageInfo from 'package.json'; import { delay } from 'rxjs'; +import { environment } from 'src/environments/environment'; import { AuthService } from '../auth/auth.service'; import { DataService } from '../services/data.service'; import { DeviceService } from '../services/device.service'; @@ -21,6 +22,7 @@ export class MainViewComponent { currentDate = moment().toDate(); flipPhone = false; loading = false; + environment = environment; constructor( public data$: DataService, diff --git a/Frontend/src/environments/environment.prod.ts b/Frontend/src/environments/environment.prod.ts index b389200..df4a7da 100644 --- a/Frontend/src/environments/environment.prod.ts +++ b/Frontend/src/environments/environment.prod.ts @@ -1,4 +1,5 @@ export const environment = { + appTitle: "#{appTitle}#", production: true, api: { url: "https://diunabi.bim-it.pl/api" diff --git a/Frontend/src/environments/environment.ts b/Frontend/src/environments/environment.ts index 9acd79a..4f5d823 100644 --- a/Frontend/src/environments/environment.ts +++ b/Frontend/src/environments/environment.ts @@ -3,10 +3,11 @@ // The list of file replacements can be found in `angular.json`. export const environment = { + appTitle: "DEV", production: false, api: { - url: "http://localhost:5400/api" - //url: "https://diunabi.bim-it.pl/api" + //url: "http://localhost:5400/api" + url: "https://diunabi.bim-it.pl/api" }, google: { clientId: "107631825312-bkfe438ehr9k9ecb2h76g802tj6advma.apps.googleusercontent.com" diff --git a/WebAPI/Controllers/PingController.cs b/WebAPI/Controllers/PingController.cs index fdde72f..9c06d5c 100644 --- a/WebAPI/Controllers/PingController.cs +++ b/WebAPI/Controllers/PingController.cs @@ -18,11 +18,19 @@ namespace WebAPI.Controllers [Authorize] public class PingController : Controller { + private readonly IConfiguration configuration; + public PingController( + IConfiguration _configuration) + { + configuration = _configuration; + } + [HttpGet] [Route("Ping")] + [AllowAnonymous] public IActionResult Ping() { - return Ok(new { data = "Pong" }); + return Ok(configuration["PONG"]); } } } \ No newline at end of file diff --git a/WebAPI/appsettings.Development.json b/WebAPI/appsettings.Development.json index 0c208ae..c8e4e35 100644 --- a/WebAPI/appsettings.Development.json +++ b/WebAPI/appsettings.Development.json @@ -1,4 +1,5 @@ { + "PONG": "Development", "Logging": { "LogLevel": { "Default": "Information", diff --git a/WebAPI/appsettings.json b/WebAPI/appsettings.json index b3ae2a2..40b01fc 100644 --- a/WebAPI/appsettings.json +++ b/WebAPI/appsettings.json @@ -1,4 +1,5 @@ { + "PONG": "#{PING}#", "Logging": { "LogLevel": { "Default": "Information",