diff --git a/TIAM.Database.Test/TIAM.Database.Test.csproj b/TIAM.Database.Test/TIAM.Database.Test.csproj
index d6159c6f..994f246e 100644
--- a/TIAM.Database.Test/TIAM.Database.Test.csproj
+++ b/TIAM.Database.Test/TIAM.Database.Test.csproj
@@ -29,7 +29,7 @@
-
+
diff --git a/TIAM.Database.Test/appsettings.json b/TIAM.Database.Test/appsettings.json
index 25727897..03d4be0f 100644
--- a/TIAM.Database.Test/appsettings.json
+++ b/TIAM.Database.Test/appsettings.json
@@ -21,6 +21,10 @@
"AyCode": {
"ProjectId": "684f34d1-163a-4077-918f-a9d9df5ce789",
+ "Urls": {
+ "BaseUrl": "https://localhost:7116",
+ "ApiBaseUrl": "https://localhost:7116"
+ },
"Logger": {
"AppType": "Server",
"LogLevel": "Detail",
diff --git a/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj b/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj
index e6a1d7d7..89238bed 100644
--- a/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj
+++ b/TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj
@@ -27,7 +27,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/TIAM.Services.Server.Tests/appsettings.json b/TIAM.Services.Server.Tests/appsettings.json
index 98370e9d..e3c21245 100644
--- a/TIAM.Services.Server.Tests/appsettings.json
+++ b/TIAM.Services.Server.Tests/appsettings.json
@@ -22,6 +22,10 @@
"AyCode": {
"ProjectId": "684f34d1-163a-4077-918f-a9d9df5ce789",
+ "Urls": {
+ "BaseUrl": "https://localhost:7116",
+ "ApiBaseUrl": "https://localhost:7116"
+ },
"Logger": {
"AppType": "Server",
"LogLevel": "Detail",
diff --git a/TIAMWebApp/Server/TIAMWebApp.Server.csproj b/TIAMWebApp/Server/TIAMWebApp.Server.csproj
index f23cf7ee..5eb22e51 100644
--- a/TIAMWebApp/Server/TIAMWebApp.Server.csproj
+++ b/TIAMWebApp/Server/TIAMWebApp.Server.csproj
@@ -19,14 +19,14 @@
-
+
-
-
-
+
+
+
diff --git a/TIAMWebApp/Server/appsettings.json b/TIAMWebApp/Server/appsettings.json
index 03453113..08c999a4 100644
--- a/TIAMWebApp/Server/appsettings.json
+++ b/TIAMWebApp/Server/appsettings.json
@@ -22,6 +22,10 @@
"AyCode": {
"ProjectId": "684f34d1-163a-4077-918f-a9d9df5ce789",
+ "Urls": {
+ "BaseUrl": "https://localhost:7116",
+ "ApiBaseUrl": "https://localhost:7116"
+ },
"Logger": {
"AppType": "Server",
"LogLevel": "Detail",
diff --git a/TIAMWebApp/Shared/Models/ClientSide/Setting.cs b/TIAMWebApp/Shared/Models/ClientSide/Setting.cs
index fa257804..83fdc1ff 100644
--- a/TIAMWebApp/Shared/Models/ClientSide/Setting.cs
+++ b/TIAMWebApp/Shared/Models/ClientSide/Setting.cs
@@ -1,23 +1,30 @@
-namespace TIAMWebApp.Shared.Application.Models.ClientSide
+using Microsoft.Extensions.Configuration;
+
+namespace TIAMWebApp.Shared.Application.Models.ClientSide
{
- //appsettings.json
public class Setting
{
public static UserBasicDetails UserBasicDetails { get; set; }
- //public const string BaseUrl = "https://touriam.mangoweb.hu";
- //public const string ApiBaseUrl = "https://touriam.mangoweb.hu";
+ //public static string BaseUrl = "https://touriam.mangoweb.hu";
+ //public static string ApiBaseUrl = "https://touriam.mangoweb.hu";
#if RELEASE
- public const string BaseUrl = "https://test.touriam.com";
- public const string ApiBaseUrl = "https://test.touriam.com";
- //public const string BaseUrl = "https://touriam.com";
- //public const string ApiBaseUrl = "https://touriam.com";
- //public const string BaseUrl = "https://qa.touriam.com";
- //public const string ApiBaseUrl = "https://qa.touriam.com";
+ public static string BaseUrl = "https://test.touriam.com";
+ public static string ApiBaseUrl = "https://test.touriam.com";
+ //public static string BaseUrl = "https://touriam.com";
+ //public static string ApiBaseUrl = "https://touriam.com";
+ //public static string BaseUrl = "https://qa.touriam.com";
+ //public static string ApiBaseUrl = "https://qa.touriam.com";
#else
- public const string BaseUrl = "https://localhost:7116";
- public const string ApiBaseUrl = "https://localhost:7116";
+ public static string BaseUrl = "https://localhost:7116";
+ public static string ApiBaseUrl = "https://localhost:7116";
#endif
- public const bool DarkMode = false;
+ public static bool DarkMode = false;
public static string Locale { get; set; }
+
+ public Setting(IConfiguration configuration)
+ {
+ //BaseUrl = configuration["AyCode:Urls:BaseUrl"]!;
+ //ApiBaseUrl = configuration["AyCode:Urls:ApiBaseUrl"]!;
+ }
}
}
diff --git a/Tiam.Services.Client.Tests/Tiam.Services.Client.Tests.csproj b/Tiam.Services.Client.Tests/Tiam.Services.Client.Tests.csproj
index c69f5b79..802507ab 100644
--- a/Tiam.Services.Client.Tests/Tiam.Services.Client.Tests.csproj
+++ b/Tiam.Services.Client.Tests/Tiam.Services.Client.Tests.csproj
@@ -14,7 +14,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+