Skip to content

Commit

Permalink
restructured Project folders
Browse files Browse the repository at this point in the history
  • Loading branch information
@suxrobGM
suxrobGM committed Jun 29, 2024
1 parent 66ebd90 commit 4ed67f1
Show file tree
Hide file tree
Showing 420 changed files with 127 additions and 129 deletions.
32 changes: 15 additions & 17 deletions Logistics.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,29 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.1.31903.286
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{45FFBEC0-FFF0-4964-A506-F326A76702CC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{61325513-BB52-47A8-AFDD-755454AD71F8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{7B06ED10-5DDF-4EFB-9CD7-37B9415EDD3D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Domain", "src\Core\Logistics.Domain\Logistics.Domain.csproj", "{E92A6E55-158F-48CE-9774-6E81DB77F81C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Domain", "src\Server\Logistics.Domain\Logistics.Domain.csproj", "{E92A6E55-158F-48CE-9774-6E81DB77F81C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Application.Tenant", "src\Core\Logistics.Application.Tenant\Logistics.Application.Tenant.csproj", "{53B069CE-0FEB-4191-B82D-BCE01159AE90}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Application.Tenant", "src\Server\Logistics.Application.Tenant\Logistics.Application.Tenant.csproj", "{53B069CE-0FEB-4191-B82D-BCE01159AE90}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Infrastructure.EF", "src\Core\Logistics.Infrastructure.EF\Logistics.Infrastructure.EF.csproj", "{0646E83A-CB9F-458A-BD84-8F2AE768CB91}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Infrastructure.EF", "src\Server\Logistics.Infrastructure.EF\Logistics.Infrastructure.EF.csproj", "{0646E83A-CB9F-458A-BD84-8F2AE768CB91}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{F47DBB17-4146-4B24-9E95-5CE0DF59BF35}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Client", "src\Client\Logistics.Client\Logistics.Client.csproj", "{A2272F96-50F5-40EA-88E7-15EA8EEE1022}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.HttpClient", "src\Client\Logistics.HttpClient\Logistics.HttpClient.csproj", "{A2272F96-50F5-40EA-88E7-15EA8EEE1022}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.API", "src\Server\Logistics.API\Logistics.API.csproj", "{48AA06BC-140B-49B8-AD72-95B5FC6A2D4B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Application.Admin", "src\Core\Logistics.Application.Admin\Logistics.Application.Admin.csproj", "{CEE34293-FC12-4E35-999C-EEDE063F8B25}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Application.Admin", "src\Server\Logistics.Application.Admin\Logistics.Application.Admin.csproj", "{CEE34293-FC12-4E35-999C-EEDE063F8B25}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Application.Core", "src\Core\Logistics.Application.Core\Logistics.Application.Core.csproj", "{77D09657-5BE2-4462-AE24-39612759625A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Application.Core", "src\Server\Logistics.Application.Core\Logistics.Application.Core.csproj", "{77D09657-5BE2-4462-AE24-39612759625A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.IdentityServer", "src\Server\Logistics.IdentityServer\Logistics.IdentityServer.csproj", "{CCDB0C07-4270-4253-B91A-9EB9FCDC8A05}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.DbMigrator", "src\Core\Logistics.DbMigrator\Logistics.DbMigrator.csproj", "{F40A53FD-29ED-4D8A-A2CE-E7D08FFFA54F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.DbMigrator", "src\Server\Logistics.DbMigrator\Logistics.DbMigrator.csproj", "{F40A53FD-29ED-4D8A-A2CE-E7D08FFFA54F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Application.Admin.Tests", "test\Logistics.Application.Admin.Tests\Logistics.Application.Admin.Tests.csproj", "{566AE1D3-A3AE-40CC-A781-95B342E6CD88}"
EndProject
Expand All @@ -41,7 +39,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Shared.Models", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Shared.Consts", "src\Shared\Logistics.Shared.Consts\Logistics.Shared.Consts.csproj", "{EF45EFF1-E88C-4EB7-9505-C1A26377E118}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Mappings", "src\Core\Logistics.Mappings\Logistics.Mappings.csproj", "{999E7EC8-AE07-4FD9-8BF2-A1B92C7122F2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Mappings", "src\Server\Logistics.Mappings\Logistics.Mappings.csproj", "{999E7EC8-AE07-4FD9-8BF2-A1B92C7122F2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.AdminApp", "src\Client\Logistics.AdminApp\Logistics.AdminApp.csproj", "{81DAEA98-B520-4F4A-9FDF-FA378A7D6579}"
EndProject
Expand Down Expand Up @@ -263,22 +261,22 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{E92A6E55-158F-48CE-9774-6E81DB77F81C} = {45FFBEC0-FFF0-4964-A506-F326A76702CC}
{53B069CE-0FEB-4191-B82D-BCE01159AE90} = {45FFBEC0-FFF0-4964-A506-F326A76702CC}
{0646E83A-CB9F-458A-BD84-8F2AE768CB91} = {45FFBEC0-FFF0-4964-A506-F326A76702CC}
{A2272F96-50F5-40EA-88E7-15EA8EEE1022} = {61325513-BB52-47A8-AFDD-755454AD71F8}
{48AA06BC-140B-49B8-AD72-95B5FC6A2D4B} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35}
{CEE34293-FC12-4E35-999C-EEDE063F8B25} = {45FFBEC0-FFF0-4964-A506-F326A76702CC}
{77D09657-5BE2-4462-AE24-39612759625A} = {45FFBEC0-FFF0-4964-A506-F326A76702CC}
{CCDB0C07-4270-4253-B91A-9EB9FCDC8A05} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35}
{F40A53FD-29ED-4D8A-A2CE-E7D08FFFA54F} = {45FFBEC0-FFF0-4964-A506-F326A76702CC}
{566AE1D3-A3AE-40CC-A781-95B342E6CD88} = {7B06ED10-5DDF-4EFB-9CD7-37B9415EDD3D}
{920DFC2D-23C4-4662-BE89-1784DB7DC72F} = {61325513-BB52-47A8-AFDD-755454AD71F8}
{1DBE287E-B5F8-4213-BF68-B7932AE641F6} = {D5694866-E7F1-4837-90DA-06CC062C35D4}
{01EAEDA9-AD0A-457E-AACC-33F4B4EC27CC} = {D5694866-E7F1-4837-90DA-06CC062C35D4}
{EF45EFF1-E88C-4EB7-9505-C1A26377E118} = {D5694866-E7F1-4837-90DA-06CC062C35D4}
{999E7EC8-AE07-4FD9-8BF2-A1B92C7122F2} = {45FFBEC0-FFF0-4964-A506-F326A76702CC}
{81DAEA98-B520-4F4A-9FDF-FA378A7D6579} = {61325513-BB52-47A8-AFDD-755454AD71F8}
{CEE34293-FC12-4E35-999C-EEDE063F8B25} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35}
{77D09657-5BE2-4462-AE24-39612759625A} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35}
{53B069CE-0FEB-4191-B82D-BCE01159AE90} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35}
{F40A53FD-29ED-4D8A-A2CE-E7D08FFFA54F} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35}
{E92A6E55-158F-48CE-9774-6E81DB77F81C} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35}
{0646E83A-CB9F-458A-BD84-8F2AE768CB91} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35}
{999E7EC8-AE07-4FD9-8BF2-A1B92C7122F2} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C75A7F7A-4BBD-445A-9FCC-B0D18AAA404B}
Expand Down
2 changes: 1 addition & 1 deletion scripts/add-migration.bat → scripts/add-migration.cmd
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@echo off
title Create Migrations
cd ../src/Core/Logistics.Infrastructure.EF
cd ../src/Server/Logistics.Infrastructure.EF

call :CreateMigration "master database" "MasterDbContext" "Master"
call :CreateMigration "tenant database" "TenantDbContext" "Tenant"
Expand Down
0 scripts/run-adminapp.bat → scripts/run-adminapp.cmd
View file
File renamed without changes.
0 scripts/run-api.bat → scripts/run-api.cmd
View file
File renamed without changes.
0 scripts/run-identity.bat → scripts/run-identity.cmd
View file
File renamed without changes.
0 scripts/run-officeapp.bat → scripts/run-officeapp.cmd
View file
File renamed without changes.
3 changes: 0 additions & 3 deletions scripts/seed-databases.bat
View file

This file was deleted.

3 changes: 3 additions & 0 deletions scripts/seed-databases.cmd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
title Seed Databases
dotnet run --project ../src/Server/Logistics.DbMigrator
2 changes: 1 addition & 1 deletion src/Client/Logistics.AdminApp/Components/Pages/PageBase.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Logistics.Client;
using Logistics.HttpClient;
using Logistics.Shared;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Logistics.AdminApp/Components/Pages/Subscription/EditSubscription.razor.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Logistics.Client.Models;
using Logistics.HttpClient.Models;
using Logistics.Shared;
using Logistics.Shared.Consts;
using Logistics.Shared.Models;
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Logistics.AdminApp/Components/Pages/Subscription/EditSubscriptionPlan.razor.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Logistics.Client.Models;
using Logistics.HttpClient.Models;
using Logistics.Shared.Models;
using Microsoft.AspNetCore.Components;

Expand Down
2 changes: 1 addition & 1 deletion src/Client/Logistics.AdminApp/Components/Pages/Tenant/EditTenant.razor.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Logistics.Client.Models;
using Logistics.HttpClient.Models;
using Logistics.Shared.Consts.Policies;
using Logistics.Shared.Models;
using Microsoft.AspNetCore.Authorization;
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Logistics.AdminApp/Logistics.AdminApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Logistics.Client\Logistics.Client.csproj" />
<ProjectReference Include="..\Logistics.HttpClient\Logistics.HttpClient.csproj" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Client/Logistics.AdminApp/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using Logistics.AdminApp.Components;
using Logistics.AdminApp.Authorization;
using Logistics.Client;
using Logistics.HttpClient;
using Microsoft.AspNetCore.Authorization;
using Radzen;

var builder = WebAssemblyHostBuilder.CreateDefault(args);
builder.RootComponents.Add<App>("#app");
builder.RootComponents.Add<HeadOutlet>("head::after");

builder.Services.AddWebApiClient(builder.Configuration);
builder.Services.AddApiHttpClient(builder.Configuration);
builder.Services.AddAuthorizationCore();
builder.Services.AddRadzenComponents();
builder.Services.AddScoped<IAuthorizationHandler, PermissionHandler>();
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Logistics.DriverApp/Logistics.DriverApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Logistics.Client\Logistics.Client.csproj" />
<ProjectReference Include="..\Logistics.HttpClient\Logistics.HttpClient.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Client/Logistics.DriverApp/Services/Authentication/AuthService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class AuthService : IAuthService
ITokenStorage tokenStorage)
{
#if DEBUG
options.HttpClientFactory = (_) => new HttpClient(InsecureHttpsClient.GetPlatformMessageHandler());
options.HttpClientFactory = (_) => new System.Net.Http.HttpClient(InsecureHttpsClient.GetPlatformMessageHandler());
#endif
_oidcClient = new OidcClient(options);
_oidcClient.Options.Browser = browser;
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Logistics.DriverApp/Services/LocationTracking/LocationTracker.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Logistics.Client.Options;
using Logistics.HttpClient.Options;
using Logistics.DriverApp.Services.Authentication;
using Logistics.Shared.Models;
using Microsoft.AspNetCore.SignalR.Client;
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Logistics.DriverApp/Setup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public static MauiAppBuilder ConfigureServices(this MauiAppBuilder builder)
?? throw new NullReferenceException("Could not get OidcClient form the appsettings.json file");

services.AddSingleton(oidcOptions);
services.AddWebApiClient(configuration);
services.AddApiHttpClient(configuration);
services.AddSingleton<ITokenStorage, TokenStorage>();
services.AddSingleton<ITenantService, TenantService>();
services.AddSingleton<IMapsService, GoogleMapsService>();
Expand Down
4 changes: 2 additions & 2 deletions src/Client/Logistics.DriverApp/_Imports.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
global using Logistics.DriverApp.Helpers;
global using Logistics.DriverApp.Views;
global using Logistics.DriverApp.ViewModels;
global using Logistics.Client;
global using Logistics.Client.Models;
global using Logistics.HttpClient;
global using Logistics.HttpClient.Models;
global using Logistics.Shared;
4 changes: 2 additions & 2 deletions ...gistics.Client/Abstractions/IApiClient.cs → ...ics.HttpClient/Abstractions/IApiClient.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Logistics.Client.Abstractions;
using Logistics.HttpClient.Abstractions;

namespace Logistics.Client;
namespace Logistics.HttpClient;

public interface IApiClient :
ILoadApi,
Expand Down
4 changes: 2 additions & 2 deletions ...gistics.Client/Abstractions/IDriverApi.cs → ...ics.HttpClient/Abstractions/IDriverApi.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Logistics.Client.Models;
using Logistics.HttpClient.Models;
using Logistics.Shared;

namespace Logistics.Client.Abstractions;
namespace Logistics.HttpClient.Abstractions;

public interface IDriverApi
{
Expand Down
4 changes: 2 additions & 2 deletions ...stics.Client/Abstractions/IEmployeeApi.cs → ...s.HttpClient/Abstractions/IEmployeeApi.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Logistics.Client.Models;
using Logistics.HttpClient.Models;
using Logistics.Shared;
using Logistics.Shared.Models;

namespace Logistics.Client.Abstractions;
namespace Logistics.HttpClient.Abstractions;

public interface IEmployeeApi
{
Expand Down
4 changes: 2 additions & 2 deletions ...Logistics.Client/Abstractions/ILoadApi.cs → ...stics.HttpClient/Abstractions/ILoadApi.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Logistics.Client.Models;
using Logistics.HttpClient.Models;
using Logistics.Shared;
using Logistics.Shared.Models;

namespace Logistics.Client.Abstractions;
namespace Logistics.HttpClient.Abstractions;

public interface ILoadApi
{
Expand Down
4 changes: 2 additions & 2 deletions ...ogistics.Client/Abstractions/IStatsApi.cs → ...tics.HttpClient/Abstractions/IStatsApi.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Logistics.Client.Models;
using Logistics.HttpClient.Models;
using Logistics.Shared;
using Logistics.Shared.Models;

namespace Logistics.Client.Abstractions;
namespace Logistics.HttpClient.Abstractions;

public interface IStatsApi
{
Expand Down
4 changes: 2 additions & 2 deletions ...s.Client/Abstractions/ISubscriptionApi.cs → ...tpClient/Abstractions/ISubscriptionApi.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Logistics.Client.Models;
using Logistics.HttpClient.Models;
using Logistics.Shared;
using Logistics.Shared.Models;

namespace Logistics.Client.Abstractions;
namespace Logistics.HttpClient.Abstractions;

public interface ISubscriptionApi
{
Expand Down
4 changes: 2 additions & 2 deletions ...gistics.Client/Abstractions/ITenantApi.cs → ...ics.HttpClient/Abstractions/ITenantApi.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Logistics.Client.Models;
using Logistics.HttpClient.Models;
using Logistics.Shared;
using Logistics.Shared.Models;

namespace Logistics.Client.Abstractions;
namespace Logistics.HttpClient.Abstractions;

public interface ITenantApi
{
Expand Down
4 changes: 2 additions & 2 deletions ...ogistics.Client/Abstractions/ITruckApi.cs → ...tics.HttpClient/Abstractions/ITruckApi.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Logistics.Client.Models;
using Logistics.HttpClient.Models;
using Logistics.Shared;
using Logistics.Shared.Models;

namespace Logistics.Client.Abstractions;
namespace Logistics.HttpClient.Abstractions;

public interface ITruckApi
{
Expand Down
4 changes: 2 additions & 2 deletions ...Logistics.Client/Abstractions/IUserApi.cs → ...stics.HttpClient/Abstractions/IUserApi.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Logistics.Client.Models;
using Logistics.HttpClient.Models;
using Logistics.Shared;
using Logistics.Shared.Models;

namespace Logistics.Client.Abstractions;
namespace Logistics.HttpClient.Abstractions;

public interface IUserApi
{
Expand Down
2 changes: 1 addition & 1 deletion .../Logistics.Client/Constants/LoadConsts.cs → ...istics.HttpClient/Constants/LoadConsts.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Logistics.Client.Constants;
namespace Logistics.HttpClient.Constants;

internal static class LoadConsts
{
Expand Down
2 changes: 1 addition & 1 deletion ...ogistics.Client/Constants/TenantConsts.cs → ...tics.HttpClient/Constants/TenantConsts.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Logistics.Client.Constants;
namespace Logistics.HttpClient.Constants;

internal static class TenantConsts
{
Expand Down
2 changes: 1 addition & 1 deletion ...gistics.Client/Exceptions/ApiException.cs → ...ics.HttpClient/Exceptions/ApiException.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Logistics.Client.Exceptions;
namespace Logistics.HttpClient.Exceptions;

[Serializable]
public class ApiException : Exception
Expand Down
2 changes: 1 addition & 1 deletion .../Logistics.Client/Exceptions/ErrorData.cs → ...istics.HttpClient/Exceptions/ErrorData.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Logistics.Client.Exceptions;
namespace Logistics.HttpClient.Exceptions;

internal class ErrorData
{
Expand Down
8 changes: 4 additions & 4 deletions ...stics.Client/Implementations/ApiClient.cs → ...s.HttpClient/Implementations/ApiClient.cs
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using System.IdentityModel.Tokens.Jwt;
using Logistics.Client.Exceptions;
using Logistics.Client.Models;
using Logistics.Shared.Models;
using Logistics.Client.Options;
using Logistics.HttpClient.Exceptions;
using Logistics.HttpClient.Models;
using Logistics.HttpClient.Options;
using Logistics.Shared;

namespace Logistics.Client.Implementations;
namespace Logistics.HttpClient.Implementations;

internal class ApiClient : GenericApiClient, IApiClient
{
Expand Down
12 changes: 6 additions & 6 deletions ...lient/Implementations/GenericApiClient.cs → ...lient/Implementations/GenericApiClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
using System.Net.Http.Headers;
using System.Text;
using System.Text.Json;
using Logistics.Client.Exceptions;
using Logistics.Client.Utils;
using Logistics.HttpClient.Exceptions;
using Logistics.HttpClient.Utils;

namespace Logistics.Client.Implementations;
namespace Logistics.HttpClient.Implementations;

internal class GenericApiClient
{
private readonly HttpClient _httpClient;
private readonly System.Net.Http.HttpClient _httpClient;
private readonly JsonSerializerOptions _serializerOptions;

public GenericApiClient(string host)
Expand All @@ -30,11 +30,11 @@ public GenericApiClient(string host)
ServerCertificateCustomValidationCallback = (_, _, _, _) => true
};

_httpClient = new HttpClient(handler) { BaseAddress = new Uri(host) };
_httpClient = new System.Net.Http.HttpClient(handler) { BaseAddress = new Uri(host) };
}
catch (PlatformNotSupportedException)
{
_httpClient = new HttpClient { BaseAddress = new Uri(host) };
_httpClient = new System.Net.Http.HttpClient { BaseAddress = new Uri(host) };
}
}

Expand Down
0 .../Logistics.Client/Logistics.Client.csproj → ...cs.HttpClient/Logistics.HttpClient.csproj
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...istics.Client/Models/ConfirmLoadStatus.cs → ...cs.HttpClient/Models/ConfirmLoadStatus.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Logistics.Shared.Consts;

namespace Logistics.Client.Models;
namespace Logistics.HttpClient.Models;

public class ConfirmLoadStatus
{
Expand Down
2 changes: 1 addition & 1 deletion ...Logistics.Client/Models/CreateEmployee.cs → ...stics.HttpClient/Models/CreateEmployee.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Logistics.Client.Models;
namespace Logistics.HttpClient.Models;

public record CreateEmployee
{
Expand Down
4 changes: 2 additions & 2 deletions ...ent/Logistics.Client/Models/CreateLoad.cs → ...Logistics.HttpClient/Models/CreateLoad.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using Logistics.Client.Constants;
using Logistics.HttpClient.Constants;

namespace Logistics.Client.Models;
namespace Logistics.HttpClient.Models;

public record CreateLoad
{
Expand Down
2 changes: 1 addition & 1 deletion ...stics.Client/Models/CreateSubscription.cs → ...s.HttpClient/Models/CreateSubscription.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Logistics.Shared.Consts;

namespace Logistics.Client.Models;
namespace Logistics.HttpClient.Models;

public class CreateSubscription
{
Expand Down
2 changes: 1 addition & 1 deletion ...s.Client/Models/CreateSubscriptionPlan.cs → ...tpClient/Models/CreateSubscriptionPlan.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Logistics.Client.Models;
namespace Logistics.HttpClient.Models;

public class CreateSubscriptionPlan
{
Expand Down
Loading

0 comments on commit 4ed67f1

Please sign in to comment.