Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://git2.aycode.com/Adam/TourIAm

This commit is contained in:
Adam 2024-08-29 15:13:59 +02:00
parent f5bc46bcbd 2b11c329af
commit 099af63d6a
8 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TIAM.Database.Test/TIAM.Database.Test.csproj
View File

@ -29,7 +29,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />

4
TIAM.Database.Test/appsettings.json
View File

@ -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",

2
TIAM.Services.Server.Tests/TIAM.Services.Server.Tests.csproj
View File

@ -27,7 +27,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.8" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
</ItemGroup>

4
TIAM.Services.Server.Tests/appsettings.json
View File

@ -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",

8
TIAMWebApp/Server/TIAMWebApp.Server.csproj
View File

@ -19,14 +19,14 @@
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="8.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
<PackageReference Include="Microsoft.OpenApi" Version="1.6.17" />
<PackageReference Include="Microsoft.OpenApi" Version="1.6.18" />
<PackageReference Include="QRCoderNetCore" Version="1.0.0" />
<PackageReference Include="SendGrid" Version="9.29.3" />
<PackageReference Include="SkiaSharp" Version="2.88.8" />
<PackageReference Include="SkiaSharp.Views.Desktop.Common" Version="2.88.8" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.7.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.7.3" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.3" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.3" />
</ItemGroup>
<ItemGroup>

4
TIAMWebApp/Server/appsettings.json
View File

@ -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",

33
TIAMWebApp/Shared/Models/ClientSide/Setting.cs
View File

@ -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"]!;
}
}
}

2
Tiam.Services.Client.Tests/Tiam.Services.Client.Tests.csproj
View File

@ -14,7 +14,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
</ItemGroup>