diff --git a/.gitignore b/.gitignore index 25676c1..f6d8dd0 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ /Back/skydiveLogs-api/Init/caravan.jpg /Back/skydiveLogs-api/Init/206.jpg /Back/skydiveLogs-api/Data +/Back/skydiveLogs-api.DomainService/bin/Debug/net5.0 +/Back/skydiveLogs-api.DomainService/obj diff --git a/Back/skydiveLogs-api.Business/AircraftService.cs b/Back/skydiveLogs-api.Business/AircraftService.cs index 3258b08..15d7ea9 100644 --- a/Back/skydiveLogs-api.Business/AircraftService.cs +++ b/Back/skydiveLogs-api.Business/AircraftService.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using skydiveLogs_api.Business.Interface; -using skydiveLogs_api.Model; -using skydiveLogs_api.Data.Interface; +using skydiveLogs_api.Business.Interfaces; +using skydiveLogs_api.DomainService.Repositories; +using skydiveLogs_api.Domain; namespace skydiveLogs_api.Business diff --git a/Back/skydiveLogs-api.Business/DropZoneService.cs b/Back/skydiveLogs-api.Business/DropZoneService.cs index c7f91b8..a236899 100644 --- a/Back/skydiveLogs-api.Business/DropZoneService.cs +++ b/Back/skydiveLogs-api.Business/DropZoneService.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using skydiveLogs_api.Business.Interface; -using skydiveLogs_api.Data.Interface; -using skydiveLogs_api.Model; +using skydiveLogs_api.Business.Interfaces; +using skydiveLogs_api.DomainService.Repositories; +using skydiveLogs_api.Domain; namespace skydiveLogs_api.Business diff --git a/Back/skydiveLogs-api.Business/GearService.cs b/Back/skydiveLogs-api.Business/GearService.cs index 53e8928..2866b1a 100644 --- a/Back/skydiveLogs-api.Business/GearService.cs +++ b/Back/skydiveLogs-api.Business/GearService.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using skydiveLogs_api.Business.Interface; -using skydiveLogs_api.Model; -using skydiveLogs_api.Data.Interface; +using skydiveLogs_api.Business.Interfaces; +using skydiveLogs_api.DomainService.Repositories; +using skydiveLogs_api.Domain; namespace skydiveLogs_api.Business diff --git a/Back/skydiveLogs-api.Business/InitDbService.cs b/Back/skydiveLogs-api.Business/InitDbService.cs index d50de27..5b45a7a 100644 --- a/Back/skydiveLogs-api.Business/InitDbService.cs +++ b/Back/skydiveLogs-api.Business/InitDbService.cs @@ -2,8 +2,8 @@ using System.IO; using System.Text.Json; -using skydiveLogs_api.Business.Interface; -using skydiveLogs_api.Model; +using skydiveLogs_api.Business.Interfaces; +using skydiveLogs_api.Domain; namespace skydiveLogs_api.Business diff --git a/Back/skydiveLogs-api.Business/Interface/IAircraftService.cs b/Back/skydiveLogs-api.Business/Interfaces/IAircraftService.cs similarity index 81% rename from Back/skydiveLogs-api.Business/Interface/IAircraftService.cs rename to Back/skydiveLogs-api.Business/Interfaces/IAircraftService.cs index 415f0ae..a0e4365 100644 --- a/Back/skydiveLogs-api.Business/Interface/IAircraftService.cs +++ b/Back/skydiveLogs-api.Business/Interfaces/IAircraftService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; -namespace skydiveLogs_api.Business.Interface +namespace skydiveLogs_api.Business.Interfaces { public interface IAircraftService { diff --git a/Back/skydiveLogs-api.Business/Interface/IDropZoneService.cs b/Back/skydiveLogs-api.Business/Interfaces/IDropZoneService.cs similarity index 80% rename from Back/skydiveLogs-api.Business/Interface/IDropZoneService.cs rename to Back/skydiveLogs-api.Business/Interfaces/IDropZoneService.cs index 37cf401..20c33ec 100644 --- a/Back/skydiveLogs-api.Business/Interface/IDropZoneService.cs +++ b/Back/skydiveLogs-api.Business/Interfaces/IDropZoneService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; -namespace skydiveLogs_api.Business.Interface +namespace skydiveLogs_api.Business.Interfaces { public interface IDropZoneService { diff --git a/Back/skydiveLogs-api.Business/Interface/IGearService.cs b/Back/skydiveLogs-api.Business/Interfaces/IGearService.cs similarity index 81% rename from Back/skydiveLogs-api.Business/Interface/IGearService.cs rename to Back/skydiveLogs-api.Business/Interfaces/IGearService.cs index 05aa72a..6b1d872 100644 --- a/Back/skydiveLogs-api.Business/Interface/IGearService.cs +++ b/Back/skydiveLogs-api.Business/Interfaces/IGearService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; -namespace skydiveLogs_api.Business.Interface +namespace skydiveLogs_api.Business.Interfaces { public interface IGearService { diff --git a/Back/skydiveLogs-api.Business/Interface/IInitDbService.cs b/Back/skydiveLogs-api.Business/Interfaces/IInitDbService.cs similarity index 50% rename from Back/skydiveLogs-api.Business/Interface/IInitDbService.cs rename to Back/skydiveLogs-api.Business/Interfaces/IInitDbService.cs index 0f11d9d..5262378 100644 --- a/Back/skydiveLogs-api.Business/Interface/IInitDbService.cs +++ b/Back/skydiveLogs-api.Business/Interfaces/IInitDbService.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace skydiveLogs_api.Business.Interface +namespace skydiveLogs_api.Business.Interfaces { public interface IInitDbService { diff --git a/Back/skydiveLogs-api.Business/Interface/IJumpService.cs b/Back/skydiveLogs-api.Business/Interfaces/IJumpService.cs similarity index 86% rename from Back/skydiveLogs-api.Business/Interface/IJumpService.cs rename to Back/skydiveLogs-api.Business/Interfaces/IJumpService.cs index 240f919..80e171d 100644 --- a/Back/skydiveLogs-api.Business/Interface/IJumpService.cs +++ b/Back/skydiveLogs-api.Business/Interfaces/IJumpService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; -namespace skydiveLogs_api.Business.Interface +namespace skydiveLogs_api.Business.Interfaces { public interface IJumpService { diff --git a/Back/skydiveLogs-api.Business/Interface/IJumpTypeService.cs b/Back/skydiveLogs-api.Business/Interfaces/IJumpTypeService.cs similarity index 81% rename from Back/skydiveLogs-api.Business/Interface/IJumpTypeService.cs rename to Back/skydiveLogs-api.Business/Interfaces/IJumpTypeService.cs index e41bd44..319056b 100644 --- a/Back/skydiveLogs-api.Business/Interface/IJumpTypeService.cs +++ b/Back/skydiveLogs-api.Business/Interfaces/IJumpTypeService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; -namespace skydiveLogs_api.Business.Interface +namespace skydiveLogs_api.Business.Interfaces { public interface IJumpTypeService { diff --git a/Back/skydiveLogs-api.Business/Interface/IStatsService.cs b/Back/skydiveLogs-api.Business/Interfaces/IStatsService.cs similarity index 87% rename from Back/skydiveLogs-api.Business/Interface/IStatsService.cs rename to Back/skydiveLogs-api.Business/Interfaces/IStatsService.cs index 3d12596..fe2d8eb 100644 --- a/Back/skydiveLogs-api.Business/Interface/IStatsService.cs +++ b/Back/skydiveLogs-api.Business/Interfaces/IStatsService.cs @@ -1,7 +1,9 @@ -using skydiveLogs_api.Model; -using System.Collections.Generic; +using System.Collections.Generic; -namespace skydiveLogs_api.Business.Interface +using skydiveLogs_api.Domain; + + +namespace skydiveLogs_api.Business.Interfaces { public interface IStatsService { diff --git a/Back/skydiveLogs-api.Business/Interface/IUserImageService.cs b/Back/skydiveLogs-api.Business/Interfaces/IUserImageService.cs similarity index 82% rename from Back/skydiveLogs-api.Business/Interface/IUserImageService.cs rename to Back/skydiveLogs-api.Business/Interfaces/IUserImageService.cs index ee7658c..60a1ee2 100644 --- a/Back/skydiveLogs-api.Business/Interface/IUserImageService.cs +++ b/Back/skydiveLogs-api.Business/Interfaces/IUserImageService.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; -namespace skydiveLogs_api.Business.Interface +namespace skydiveLogs_api.Business.Interfaces { public interface IUserImageService { diff --git a/Back/skydiveLogs-api.Business/Interface/IUserService.cs b/Back/skydiveLogs-api.Business/Interfaces/IUserService.cs similarity index 69% rename from Back/skydiveLogs-api.Business/Interface/IUserService.cs rename to Back/skydiveLogs-api.Business/Interfaces/IUserService.cs index e2a414b..ea91d89 100644 --- a/Back/skydiveLogs-api.Business/Interface/IUserService.cs +++ b/Back/skydiveLogs-api.Business/Interfaces/IUserService.cs @@ -1,6 +1,6 @@ -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; -namespace skydiveLogs_api.Business.Interface +namespace skydiveLogs_api.Business.Interfaces { public interface IUserService { diff --git a/Back/skydiveLogs-api.Business/JumpService.cs b/Back/skydiveLogs-api.Business/JumpService.cs index 01d8b82..323ddd5 100644 --- a/Back/skydiveLogs-api.Business/JumpService.cs +++ b/Back/skydiveLogs-api.Business/JumpService.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using skydiveLogs_api.Business.Interface; -using skydiveLogs_api.Model; -using skydiveLogs_api.Data.Interface; +using skydiveLogs_api.Business.Interfaces; +using skydiveLogs_api.DomainService.Repositories; +using skydiveLogs_api.Domain; namespace skydiveLogs_api.Business diff --git a/Back/skydiveLogs-api.Business/JumpTypeService.cs b/Back/skydiveLogs-api.Business/JumpTypeService.cs index 0afda55..233be29 100644 --- a/Back/skydiveLogs-api.Business/JumpTypeService.cs +++ b/Back/skydiveLogs-api.Business/JumpTypeService.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using skydiveLogs_api.Business.Interface; -using skydiveLogs_api.Model; -using skydiveLogs_api.Data.Interface; +using skydiveLogs_api.Business.Interfaces; +using skydiveLogs_api.DomainService.Repositories; +using skydiveLogs_api.Domain; namespace skydiveLogs_api.Business diff --git a/Back/skydiveLogs-api.Business/StatsService.cs b/Back/skydiveLogs-api.Business/StatsService.cs index d1ca193..4aaafeb 100644 --- a/Back/skydiveLogs-api.Business/StatsService.cs +++ b/Back/skydiveLogs-api.Business/StatsService.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using System.Linq; -using skydiveLogs_api.Business.Interface; -using skydiveLogs_api.Data.Interface; -using skydiveLogs_api.Model; +using skydiveLogs_api.Business.Interfaces; +using skydiveLogs_api.Domain; namespace skydiveLogs_api.Business diff --git a/Back/skydiveLogs-api.Business/UserImageService.cs b/Back/skydiveLogs-api.Business/UserImageService.cs index 6e9588e..7f1d919 100644 --- a/Back/skydiveLogs-api.Business/UserImageService.cs +++ b/Back/skydiveLogs-api.Business/UserImageService.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using skydiveLogs_api.Business.Interface; -using skydiveLogs_api.Model; -using skydiveLogs_api.Data.Interface; +using skydiveLogs_api.Business.Interfaces; +using skydiveLogs_api.Domain; +using skydiveLogs_api.DomainService.Repositories; namespace skydiveLogs_api.Business diff --git a/Back/skydiveLogs-api.Business/UserService.cs b/Back/skydiveLogs-api.Business/UserService.cs index 1bf2444..baf24e7 100644 --- a/Back/skydiveLogs-api.Business/UserService.cs +++ b/Back/skydiveLogs-api.Business/UserService.cs @@ -3,9 +3,9 @@ using System.Text; using System.IO; using System; -using skydiveLogs_api.Business.Interface; -using skydiveLogs_api.Model; -using skydiveLogs_api.Data.Interface; +using skydiveLogs_api.Business.Interfaces; +using skydiveLogs_api.DomainService.Repositories; +using skydiveLogs_api.Domain; namespace skydiveLogs_api.Business diff --git a/Back/skydiveLogs-api.Business/skydiveLogs-api.Business.csproj b/Back/skydiveLogs-api.Business/skydiveLogs-api.Business.csproj index 376b014..4dd6214 100644 --- a/Back/skydiveLogs-api.Business/skydiveLogs-api.Business.csproj +++ b/Back/skydiveLogs-api.Business/skydiveLogs-api.Business.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/Back/skydiveLogs-api.Data/AircraftRepository.cs b/Back/skydiveLogs-api.Data/AircraftRepository.cs index 0e0fde6..52c9d27 100644 --- a/Back/skydiveLogs-api.Data/AircraftRepository.cs +++ b/Back/skydiveLogs-api.Data/AircraftRepository.cs @@ -3,11 +3,12 @@ using System.Linq; using LiteDB; -using skydiveLogs_api.Data.Interface; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; +using skydiveLogs_api.DomainService.Repositories; +using skydiveLogs_api.Infrastructure.Interfaces; -namespace skydiveLogs_api.Data +namespace skydiveLogs_api.Infrastructure { public class AircraftRepository : IAircraftRepository { diff --git a/Back/skydiveLogs-api.Data/DropZoneRepository.cs b/Back/skydiveLogs-api.Data/DropZoneRepository.cs index 8cba1d8..8cec9f8 100644 --- a/Back/skydiveLogs-api.Data/DropZoneRepository.cs +++ b/Back/skydiveLogs-api.Data/DropZoneRepository.cs @@ -3,11 +3,12 @@ using System.Linq; using LiteDB; -using skydiveLogs_api.Data.Interface; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; +using skydiveLogs_api.DomainService.Repositories; +using skydiveLogs_api.Infrastructure.Interfaces; -namespace skydiveLogs_api.Data +namespace skydiveLogs_api.Infrastructure { public class DropZoneRepository : IDropZoneRepository { diff --git a/Back/skydiveLogs-api.Data/GearRepository.cs b/Back/skydiveLogs-api.Data/GearRepository.cs index e8447ea..f3ae4b8 100644 --- a/Back/skydiveLogs-api.Data/GearRepository.cs +++ b/Back/skydiveLogs-api.Data/GearRepository.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; -using System.Linq; using LiteDB; -using skydiveLogs_api.Data.Interface; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; +using skydiveLogs_api.DomainService.Repositories; +using skydiveLogs_api.Infrastructure.Interfaces; -namespace skydiveLogs_api.Data +namespace skydiveLogs_api.Infrastructure { public class GearRepository : IGearRepository { diff --git a/Back/skydiveLogs-api.Data/Interface/IAircraftRepository.cs b/Back/skydiveLogs-api.Data/Interface/IAircraftRepository.cs deleted file mode 100644 index 4e0fab6..0000000 --- a/Back/skydiveLogs-api.Data/Interface/IAircraftRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using skydiveLogs_api.Model; - - -namespace skydiveLogs_api.Data.Interface -{ - public interface IAircraftRepository : IRepository - { - } -} diff --git a/Back/skydiveLogs-api.Data/Interface/IDropZoneRepository.cs b/Back/skydiveLogs-api.Data/Interface/IDropZoneRepository.cs deleted file mode 100644 index c63d336..0000000 --- a/Back/skydiveLogs-api.Data/Interface/IDropZoneRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using skydiveLogs_api.Model; - - -namespace skydiveLogs_api.Data.Interface -{ - public interface IDropZoneRepository : IRepository - { - } -} diff --git a/Back/skydiveLogs-api.Data/Interface/IJumpTypeRepository.cs b/Back/skydiveLogs-api.Data/Interface/IJumpTypeRepository.cs deleted file mode 100644 index 4334b92..0000000 --- a/Back/skydiveLogs-api.Data/Interface/IJumpTypeRepository.cs +++ /dev/null @@ -1,9 +0,0 @@ -using skydiveLogs_api.Model; - - -namespace skydiveLogs_api.Data.Interface -{ - public interface IJumpTypeRepository : IRepository - { - } -} diff --git a/Back/skydiveLogs-api.Data/Interface/IDataProvider.cs b/Back/skydiveLogs-api.Data/Interfaces/IDataProvider.cs similarity index 86% rename from Back/skydiveLogs-api.Data/Interface/IDataProvider.cs rename to Back/skydiveLogs-api.Data/Interfaces/IDataProvider.cs index eb9ef7a..852c079 100644 --- a/Back/skydiveLogs-api.Data/Interface/IDataProvider.cs +++ b/Back/skydiveLogs-api.Data/Interfaces/IDataProvider.cs @@ -1,9 +1,9 @@ using LiteDB; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; -namespace skydiveLogs_api.Data.Interface +namespace skydiveLogs_api.Infrastructure.Interfaces { public interface IDataProvider { diff --git a/Back/skydiveLogs-api.Data/JumpRepository.cs b/Back/skydiveLogs-api.Data/JumpRepository.cs index f75ca0b..a56a5f7 100644 --- a/Back/skydiveLogs-api.Data/JumpRepository.cs +++ b/Back/skydiveLogs-api.Data/JumpRepository.cs @@ -2,11 +2,12 @@ using LiteDB; -using skydiveLogs_api.Data.Interface; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; +using skydiveLogs_api.DomainService.Repositories; +using skydiveLogs_api.Infrastructure.Interfaces; -namespace skydiveLogs_api.Data +namespace skydiveLogs_api.Infrastructure { public class JumpRepository : IJumpRepository { diff --git a/Back/skydiveLogs-api.Data/JumpTypeRepository.cs b/Back/skydiveLogs-api.Data/JumpTypeRepository.cs index de18288..ee5adbb 100644 --- a/Back/skydiveLogs-api.Data/JumpTypeRepository.cs +++ b/Back/skydiveLogs-api.Data/JumpTypeRepository.cs @@ -3,11 +3,12 @@ using System.Linq; using LiteDB; -using skydiveLogs_api.Data.Interface; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; +using skydiveLogs_api.DomainService.Repositories; +using skydiveLogs_api.Infrastructure.Interfaces; -namespace skydiveLogs_api.Data +namespace skydiveLogs_api.Infrastructure { public class JumpTypeRepository : IJumpTypeRepository { diff --git a/Back/skydiveLogs-api.Data/LiteDbProvider.cs b/Back/skydiveLogs-api.Data/LiteDbProvider.cs index 3e73fc6..b10352e 100644 --- a/Back/skydiveLogs-api.Data/LiteDbProvider.cs +++ b/Back/skydiveLogs-api.Data/LiteDbProvider.cs @@ -1,9 +1,10 @@ using LiteDB; -using skydiveLogs_api.Data.Interface; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; +using skydiveLogs_api.Infrastructure.Interfaces; -namespace skydiveLogs_api.Data + +namespace skydiveLogs_api.Infrastructure { public class LiteDbProvider : IDataProvider { diff --git a/Back/skydiveLogs-api.Data/UserImageRepository.cs b/Back/skydiveLogs-api.Data/UserImageRepository.cs index 2815ae3..375d089 100644 --- a/Back/skydiveLogs-api.Data/UserImageRepository.cs +++ b/Back/skydiveLogs-api.Data/UserImageRepository.cs @@ -1,13 +1,13 @@ using System.Collections.Generic; -using System.Linq; using LiteDB; -using skydiveLogs_api.Data.Interface; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; +using skydiveLogs_api.DomainService.Repositories; +using skydiveLogs_api.Infrastructure.Interfaces; -namespace skydiveLogs_api.Data +namespace skydiveLogs_api.Infrastructure { public class UserImageRepository : IUserImageRepository { diff --git a/Back/skydiveLogs-api.Data/UserRepository.cs b/Back/skydiveLogs-api.Data/UserRepository.cs index c7a2440..883bf5d 100644 --- a/Back/skydiveLogs-api.Data/UserRepository.cs +++ b/Back/skydiveLogs-api.Data/UserRepository.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; -using System.Linq; using LiteDB; -using skydiveLogs_api.Data.Interface; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; +using skydiveLogs_api.DomainService.Repositories; +using skydiveLogs_api.Infrastructure.Interfaces; -namespace skydiveLogs_api.Data +namespace skydiveLogs_api.Infrastructure { public class UserRepository : IUserRepository { diff --git a/Back/skydiveLogs-api.Data/skydiveLogs-api.Data.csproj b/Back/skydiveLogs-api.Data/skydiveLogs-api.Infrastructure.csproj similarity index 61% rename from Back/skydiveLogs-api.Data/skydiveLogs-api.Data.csproj rename to Back/skydiveLogs-api.Data/skydiveLogs-api.Infrastructure.csproj index 103a004..2fd1fa5 100644 --- a/Back/skydiveLogs-api.Data/skydiveLogs-api.Data.csproj +++ b/Back/skydiveLogs-api.Data/skydiveLogs-api.Infrastructure.csproj @@ -2,7 +2,7 @@ net5.0 - skydiveLogs_api.Data + skydiveLogs_api.Infrastructure @@ -10,7 +10,8 @@ - + + diff --git a/Back/skydiveLogs-api.DomainService/Repositories/IAircraftRepository.cs b/Back/skydiveLogs-api.DomainService/Repositories/IAircraftRepository.cs new file mode 100644 index 0000000..5ae24ef --- /dev/null +++ b/Back/skydiveLogs-api.DomainService/Repositories/IAircraftRepository.cs @@ -0,0 +1,9 @@ +using skydiveLogs_api.Domain; + + +namespace skydiveLogs_api.DomainService.Repositories +{ + public interface IAircraftRepository : IRepository + { + } +} diff --git a/Back/skydiveLogs-api.DomainService/Repositories/IDropZoneRepository.cs b/Back/skydiveLogs-api.DomainService/Repositories/IDropZoneRepository.cs new file mode 100644 index 0000000..7dbf598 --- /dev/null +++ b/Back/skydiveLogs-api.DomainService/Repositories/IDropZoneRepository.cs @@ -0,0 +1,9 @@ +using skydiveLogs_api.Domain; + + +namespace skydiveLogs_api.DomainService.Repositories +{ + public interface IDropZoneRepository : IRepository + { + } +} diff --git a/Back/skydiveLogs-api.Data/Interface/IGearRepository.cs b/Back/skydiveLogs-api.DomainService/Repositories/IGearRepository.cs similarity index 65% rename from Back/skydiveLogs-api.Data/Interface/IGearRepository.cs rename to Back/skydiveLogs-api.DomainService/Repositories/IGearRepository.cs index 82f8fbd..b07585b 100644 --- a/Back/skydiveLogs-api.Data/Interface/IGearRepository.cs +++ b/Back/skydiveLogs-api.DomainService/Repositories/IGearRepository.cs @@ -1,7 +1,7 @@ -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; using System.Collections.Generic; -namespace skydiveLogs_api.Data.Interface +namespace skydiveLogs_api.DomainService.Repositories { public interface IGearRepository : IRepository { diff --git a/Back/skydiveLogs-api.Data/Interface/IJumpRepository.cs b/Back/skydiveLogs-api.DomainService/Repositories/IJumpRepository.cs similarity index 64% rename from Back/skydiveLogs-api.Data/Interface/IJumpRepository.cs rename to Back/skydiveLogs-api.DomainService/Repositories/IJumpRepository.cs index d0c0faa..085c5ff 100644 --- a/Back/skydiveLogs-api.Data/Interface/IJumpRepository.cs +++ b/Back/skydiveLogs-api.DomainService/Repositories/IJumpRepository.cs @@ -1,7 +1,7 @@ -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; using System.Collections.Generic; -namespace skydiveLogs_api.Data.Interface +namespace skydiveLogs_api.DomainService.Repositories { public interface IJumpRepository : IRepository { diff --git a/Back/skydiveLogs-api.DomainService/Repositories/IJumpTypeRepository.cs b/Back/skydiveLogs-api.DomainService/Repositories/IJumpTypeRepository.cs new file mode 100644 index 0000000..aeb734a --- /dev/null +++ b/Back/skydiveLogs-api.DomainService/Repositories/IJumpTypeRepository.cs @@ -0,0 +1,9 @@ +using skydiveLogs_api.Domain; + + +namespace skydiveLogs_api.DomainService.Repositories +{ + public interface IJumpTypeRepository : IRepository + { + } +} diff --git a/Back/skydiveLogs-api.Data/Interface/IRepository.cs b/Back/skydiveLogs-api.DomainService/Repositories/IRepository.cs similarity index 80% rename from Back/skydiveLogs-api.Data/Interface/IRepository.cs rename to Back/skydiveLogs-api.DomainService/Repositories/IRepository.cs index e3a0dcb..2e6ab11 100644 --- a/Back/skydiveLogs-api.Data/Interface/IRepository.cs +++ b/Back/skydiveLogs-api.DomainService/Repositories/IRepository.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace skydiveLogs_api.Data.Interface +namespace skydiveLogs_api.DomainService.Repositories { public interface IRepository { diff --git a/Back/skydiveLogs-api.Data/Interface/IUserImageRepository.cs b/Back/skydiveLogs-api.DomainService/Repositories/IUserImageRepository.cs similarity index 67% rename from Back/skydiveLogs-api.Data/Interface/IUserImageRepository.cs rename to Back/skydiveLogs-api.DomainService/Repositories/IUserImageRepository.cs index 01853c6..87e2739 100644 --- a/Back/skydiveLogs-api.Data/Interface/IUserImageRepository.cs +++ b/Back/skydiveLogs-api.DomainService/Repositories/IUserImageRepository.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; -namespace skydiveLogs_api.Data.Interface +namespace skydiveLogs_api.DomainService.Repositories { public interface IUserImageRepository : IRepository { diff --git a/Back/skydiveLogs-api.Data/Interface/IUserRepository.cs b/Back/skydiveLogs-api.DomainService/Repositories/IUserRepository.cs similarity index 60% rename from Back/skydiveLogs-api.Data/Interface/IUserRepository.cs rename to Back/skydiveLogs-api.DomainService/Repositories/IUserRepository.cs index 2289d6e..c05eb9d 100644 --- a/Back/skydiveLogs-api.Data/Interface/IUserRepository.cs +++ b/Back/skydiveLogs-api.DomainService/Repositories/IUserRepository.cs @@ -1,7 +1,7 @@ -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; -namespace skydiveLogs_api.Data.Interface +namespace skydiveLogs_api.DomainService.Repositories { public interface IUserRepository : IRepository { diff --git a/Back/skydiveLogs-api.DomainService/skydiveLogs-api.DomainService.csproj b/Back/skydiveLogs-api.DomainService/skydiveLogs-api.DomainService.csproj new file mode 100644 index 0000000..62ef106 --- /dev/null +++ b/Back/skydiveLogs-api.DomainService/skydiveLogs-api.DomainService.csproj @@ -0,0 +1,12 @@ + + + + net5.0 + skydiveLogs_api.DomainService + + + + + + + diff --git a/Back/skydiveLogs-api.Ioc/IocService.cs b/Back/skydiveLogs-api.Ioc/IocService.cs index a6155f8..43c2976 100644 --- a/Back/skydiveLogs-api.Ioc/IocService.cs +++ b/Back/skydiveLogs-api.Ioc/IocService.cs @@ -1,8 +1,12 @@ -using System; -using System.Linq; -using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using skydiveLogs_api.DomainService.Repositories; +using skydiveLogs_api.Infrastructure; +using skydiveLogs_api.Business.Interfaces; +using skydiveLogs_api.Business; +using skydiveLogs_api.Infrastructure.Interfaces; + namespace skydiveLogs_api.Ioc { @@ -17,26 +21,26 @@ namespace skydiveLogs_api.Ioc public void Configure() { - _services.AddScoped(); - _services.AddScoped(); - _services.AddScoped(); - _services.AddScoped(); - _services.AddScoped(); - _services.AddScoped(); - _services.AddScoped(); - _services.AddScoped(); - _services.AddScoped(); + _services.AddScoped(); + _services.AddScoped(); + _services.AddScoped(); + _services.AddScoped(); + _services.AddScoped(); + _services.AddScoped(); + _services.AddScoped(); + _services.AddScoped(); + _services.AddScoped(); - _services.AddScoped(); - _services.AddScoped(); - _services.AddScoped(); - _services.AddScoped(); - _services.AddScoped(); - _services.AddScoped(); - _services.AddScoped(); + _services.AddScoped(); + _services.AddScoped(); + _services.AddScoped(); + _services.AddScoped(); + _services.AddScoped(); + _services.AddScoped(); + _services.AddScoped(); string connectionString = _configuration.GetConnectionString("DefaultConnection"); - _services.AddSingleton(c => new Data.LiteDbProvider(connectionString)); + _services.AddSingleton(c => new LiteDbProvider(connectionString)); } private readonly IServiceCollection _services; diff --git a/Back/skydiveLogs-api.Ioc/skydiveLogs-api.Ioc.csproj b/Back/skydiveLogs-api.Ioc/skydiveLogs-api.Ioc.csproj index 493ca84..65b9195 100644 --- a/Back/skydiveLogs-api.Ioc/skydiveLogs-api.Ioc.csproj +++ b/Back/skydiveLogs-api.Ioc/skydiveLogs-api.Ioc.csproj @@ -7,7 +7,7 @@ - + diff --git a/Back/skydiveLogs-api.Model/Aircraft.cs b/Back/skydiveLogs-api.Model/Aircraft.cs index 57760da..019e73e 100644 --- a/Back/skydiveLogs-api.Model/Aircraft.cs +++ b/Back/skydiveLogs-api.Model/Aircraft.cs @@ -1,4 +1,4 @@ -namespace skydiveLogs_api.Model +namespace skydiveLogs_api.Domain { public class Aircraft { diff --git a/Back/skydiveLogs-api.Model/DatabaseOptions.cs b/Back/skydiveLogs-api.Model/DatabaseOptions.cs index dd84ec8..670c418 100644 --- a/Back/skydiveLogs-api.Model/DatabaseOptions.cs +++ b/Back/skydiveLogs-api.Model/DatabaseOptions.cs @@ -1,4 +1,4 @@ -namespace skydiveLogs_api.Model +namespace skydiveLogs_api.Domain { public class DatabaseOptions { diff --git a/Back/skydiveLogs-api.Model/DropZone.cs b/Back/skydiveLogs-api.Model/DropZone.cs index af08984..71d8038 100644 --- a/Back/skydiveLogs-api.Model/DropZone.cs +++ b/Back/skydiveLogs-api.Model/DropZone.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace skydiveLogs_api.Model +namespace skydiveLogs_api.Domain { public class DropZone { diff --git a/Back/skydiveLogs-api.Model/Gear.cs b/Back/skydiveLogs-api.Model/Gear.cs index a944bb6..141ea74 100644 --- a/Back/skydiveLogs-api.Model/Gear.cs +++ b/Back/skydiveLogs-api.Model/Gear.cs @@ -1,4 +1,4 @@ -namespace skydiveLogs_api.Model +namespace skydiveLogs_api.Domain { public class Gear { diff --git a/Back/skydiveLogs-api.Model/Jump.cs b/Back/skydiveLogs-api.Model/Jump.cs index 244fc27..6d76752 100644 --- a/Back/skydiveLogs-api.Model/Jump.cs +++ b/Back/skydiveLogs-api.Model/Jump.cs @@ -1,6 +1,6 @@ using System; -namespace skydiveLogs_api.Model +namespace skydiveLogs_api.Domain { public class Jump { diff --git a/Back/skydiveLogs-api.Model/JumpType.cs b/Back/skydiveLogs-api.Model/JumpType.cs index 26a9830..60a5279 100644 --- a/Back/skydiveLogs-api.Model/JumpType.cs +++ b/Back/skydiveLogs-api.Model/JumpType.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace skydiveLogs_api.Model +namespace skydiveLogs_api.Domain { public class JumpType { diff --git a/Back/skydiveLogs-api.Model/SimpleSummary.cs b/Back/skydiveLogs-api.Model/SimpleSummary.cs index 39459e8..44f6abd 100644 --- a/Back/skydiveLogs-api.Model/SimpleSummary.cs +++ b/Back/skydiveLogs-api.Model/SimpleSummary.cs @@ -1,4 +1,4 @@ -namespace skydiveLogs_api.Model +namespace skydiveLogs_api.Domain { public class SimpleSummary { diff --git a/Back/skydiveLogs-api.Model/Statistic.cs b/Back/skydiveLogs-api.Model/Statistic.cs index 7aacd02..4506743 100644 --- a/Back/skydiveLogs-api.Model/Statistic.cs +++ b/Back/skydiveLogs-api.Model/Statistic.cs @@ -1,4 +1,4 @@ -namespace skydiveLogs_api.Model +namespace skydiveLogs_api.Domain { public class Statistic { diff --git a/Back/skydiveLogs-api.Model/User.cs b/Back/skydiveLogs-api.Model/User.cs index e122861..9f6e320 100644 --- a/Back/skydiveLogs-api.Model/User.cs +++ b/Back/skydiveLogs-api.Model/User.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace skydiveLogs_api.Model +namespace skydiveLogs_api.Domain { public class User { diff --git a/Back/skydiveLogs-api.Model/UserImage.cs b/Back/skydiveLogs-api.Model/UserImage.cs index 179455c..3f8cbda 100644 --- a/Back/skydiveLogs-api.Model/UserImage.cs +++ b/Back/skydiveLogs-api.Model/UserImage.cs @@ -1,4 +1,4 @@ -namespace skydiveLogs_api.Model +namespace skydiveLogs_api.Domain { public class UserImage { diff --git a/Back/skydiveLogs-api.Model/skydiveLogs-api.Model.csproj b/Back/skydiveLogs-api.Model/skydiveLogs-api.Domain.csproj similarity index 69% rename from Back/skydiveLogs-api.Model/skydiveLogs-api.Model.csproj rename to Back/skydiveLogs-api.Model/skydiveLogs-api.Domain.csproj index af7d1ab..46a0374 100644 --- a/Back/skydiveLogs-api.Model/skydiveLogs-api.Model.csproj +++ b/Back/skydiveLogs-api.Model/skydiveLogs-api.Domain.csproj @@ -2,7 +2,7 @@ net5.0 - skydiveLogs_api.Model + skydiveLogs_api.Domain diff --git a/Back/skydiveLogs-api.sln b/Back/skydiveLogs-api.sln index be2db16..3bc2536 100644 --- a/Back/skydiveLogs-api.sln +++ b/Back/skydiveLogs-api.sln @@ -1,17 +1,19 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.852 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31019.35 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "skydiveLogs-api", "skydiveLogs-api\skydiveLogs-api.csproj", "{0AC70CC2-CE52-4CD9-89D6-077800574360}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "skydiveLogs-api.Model", "skydiveLogs-api.Model\skydiveLogs-api.Model.csproj", "{EF101C84-AE0D-4F5E-8BC5-0C55CB0B5D23}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "skydiveLogs-api.Domain", "skydiveLogs-api.Model\skydiveLogs-api.Domain.csproj", "{EF101C84-AE0D-4F5E-8BC5-0C55CB0B5D23}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "skydiveLogs-api.Business", "skydiveLogs-api.Business\skydiveLogs-api.Business.csproj", "{803C3CFD-71D7-452F-848D-BF3DAF876CDF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "skydiveLogs-api.Data", "skydiveLogs-api.Data\skydiveLogs-api.Data.csproj", "{887D2F69-A9E9-46C4-A5D9-3813A2387AA2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "skydiveLogs-api.Infrastructure", "skydiveLogs-api.Data\skydiveLogs-api.Infrastructure.csproj", "{887D2F69-A9E9-46C4-A5D9-3813A2387AA2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "skydiveLogs-api.Ioc", "skydiveLogs-api.Ioc\skydiveLogs-api.Ioc.csproj", "{D2ECA52D-DA50-47D4-8624-4487DE29E0C0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "skydiveLogs-api.Ioc", "skydiveLogs-api.Ioc\skydiveLogs-api.Ioc.csproj", "{D2ECA52D-DA50-47D4-8624-4487DE29E0C0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "skydiveLogs-api.DomainService", "skydiveLogs-api.DomainService\skydiveLogs-api.DomainService.csproj", "{DD5640C0-14B3-4FEA-A856-2C9091404197}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,6 +41,10 @@ Global {D2ECA52D-DA50-47D4-8624-4487DE29E0C0}.Debug|Any CPU.Build.0 = Debug|Any CPU {D2ECA52D-DA50-47D4-8624-4487DE29E0C0}.Release|Any CPU.ActiveCfg = Release|Any CPU {D2ECA52D-DA50-47D4-8624-4487DE29E0C0}.Release|Any CPU.Build.0 = Release|Any CPU + {DD5640C0-14B3-4FEA-A856-2C9091404197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD5640C0-14B3-4FEA-A856-2C9091404197}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD5640C0-14B3-4FEA-A856-2C9091404197}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD5640C0-14B3-4FEA-A856-2C9091404197}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Back/skydiveLogs-api/Controllers/AircraftController.cs b/Back/skydiveLogs-api/Controllers/AircraftController.cs index 09b673f..43f3d9d 100644 --- a/Back/skydiveLogs-api/Controllers/AircraftController.cs +++ b/Back/skydiveLogs-api/Controllers/AircraftController.cs @@ -4,9 +4,9 @@ using Microsoft.AspNetCore.Cors; using AutoMapper; -using skydiveLogs_api.Business.Interface; +using skydiveLogs_api.Domain; +using skydiveLogs_api.Business.Interfaces; using skydiveLogs_api.DataContract; -using skydiveLogs_api.Model; namespace skydiveLogs_api.Controllers diff --git a/Back/skydiveLogs-api/Controllers/Base.cs b/Back/skydiveLogs-api/Controllers/Base.cs index 91f0576..2799bd5 100644 --- a/Back/skydiveLogs-api/Controllers/Base.cs +++ b/Back/skydiveLogs-api/Controllers/Base.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using skydiveLogs_api.Model; +using skydiveLogs_api.Domain; namespace skydiveLogs_api.Controllers diff --git a/Back/skydiveLogs-api/Controllers/DropZoneController.cs b/Back/skydiveLogs-api/Controllers/DropZoneController.cs index a0de808..088fb2f 100644 --- a/Back/skydiveLogs-api/Controllers/DropZoneController.cs +++ b/Back/skydiveLogs-api/Controllers/DropZoneController.cs @@ -4,9 +4,9 @@ using Microsoft.AspNetCore.Cors; using AutoMapper; -using skydiveLogs_api.Business.Interface; +using skydiveLogs_api.Domain; +using skydiveLogs_api.Business.Interfaces; using skydiveLogs_api.DataContract; -using skydiveLogs_api.Model; namespace skydiveLogs_api.Controllers diff --git a/Back/skydiveLogs-api/Controllers/GearController.cs b/Back/skydiveLogs-api/Controllers/GearController.cs index 9d73911..5379f78 100644 --- a/Back/skydiveLogs-api/Controllers/GearController.cs +++ b/Back/skydiveLogs-api/Controllers/GearController.cs @@ -4,9 +4,9 @@ using Microsoft.AspNetCore.Cors; using AutoMapper; -using skydiveLogs_api.Business.Interface; +using skydiveLogs_api.Domain; +using skydiveLogs_api.Business.Interfaces; using skydiveLogs_api.DataContract; -using skydiveLogs_api.Model; namespace skydiveLogs_api.Controllers diff --git a/Back/skydiveLogs-api/Controllers/ImageController.cs b/Back/skydiveLogs-api/Controllers/ImageController.cs index cb92034..17768ed 100644 --- a/Back/skydiveLogs-api/Controllers/ImageController.cs +++ b/Back/skydiveLogs-api/Controllers/ImageController.cs @@ -4,9 +4,9 @@ using Microsoft.AspNetCore.Cors; using AutoMapper; -using skydiveLogs_api.Business.Interface; +using skydiveLogs_api.Domain; +using skydiveLogs_api.Business.Interfaces; using skydiveLogs_api.DataContract; -using skydiveLogs_api.Model; namespace skydiveLogs_api.Controllers diff --git a/Back/skydiveLogs-api/Controllers/JumpController.cs b/Back/skydiveLogs-api/Controllers/JumpController.cs index a033d30..1cc447e 100644 --- a/Back/skydiveLogs-api/Controllers/JumpController.cs +++ b/Back/skydiveLogs-api/Controllers/JumpController.cs @@ -4,9 +4,9 @@ using Microsoft.AspNetCore.Cors; using AutoMapper; -using skydiveLogs_api.Business.Interface; +using skydiveLogs_api.Domain; +using skydiveLogs_api.Business.Interfaces; using skydiveLogs_api.DataContract; -using skydiveLogs_api.Model; namespace skydiveLogs_api.Controllers diff --git a/Back/skydiveLogs-api/Controllers/JumpTypeController.cs b/Back/skydiveLogs-api/Controllers/JumpTypeController.cs index ee0450e..04bca6d 100644 --- a/Back/skydiveLogs-api/Controllers/JumpTypeController.cs +++ b/Back/skydiveLogs-api/Controllers/JumpTypeController.cs @@ -4,9 +4,9 @@ using Microsoft.AspNetCore.Cors; using AutoMapper; -using skydiveLogs_api.Business.Interface; +using skydiveLogs_api.Domain; +using skydiveLogs_api.Business.Interfaces; using skydiveLogs_api.DataContract; -using skydiveLogs_api.Model; namespace skydiveLogs_api.Controllers diff --git a/Back/skydiveLogs-api/Controllers/StatsController.cs b/Back/skydiveLogs-api/Controllers/StatsController.cs index 5b92f91..e5ef1bb 100644 --- a/Back/skydiveLogs-api/Controllers/StatsController.cs +++ b/Back/skydiveLogs-api/Controllers/StatsController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Cors; using AutoMapper; -using skydiveLogs_api.Business.Interface; +using skydiveLogs_api.Business.Interfaces; using skydiveLogs_api.DataContract; diff --git a/Back/skydiveLogs-api/Controllers/UserController.cs b/Back/skydiveLogs-api/Controllers/UserController.cs index 4917665..b732b18 100644 --- a/Back/skydiveLogs-api/Controllers/UserController.cs +++ b/Back/skydiveLogs-api/Controllers/UserController.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Authorization; using Microsoft.IdentityModel.Tokens; using System.IdentityModel.Tokens.Jwt; -using Microsoft.Extensions.Configuration; using System; using System.Text; using System.Security.Claims; @@ -11,9 +10,10 @@ using Microsoft.Extensions.Options; using AutoMapper; -using skydiveLogs_api.Business.Interface; +using skydiveLogs_api.Domain; +using skydiveLogs_api.Business.Interfaces; using skydiveLogs_api.DataContract; -using skydiveLogs_api.Model; +using skydiveLogs_api.Settings; namespace skydiveLogs_api.Controllers diff --git a/Back/skydiveLogs-api/Mapper/ModelProfile.cs b/Back/skydiveLogs-api/Mapper/ModelProfile.cs index 10c972d..e81d9ab 100644 --- a/Back/skydiveLogs-api/Mapper/ModelProfile.cs +++ b/Back/skydiveLogs-api/Mapper/ModelProfile.cs @@ -1,29 +1,32 @@ using AutoMapper; +using skydiveLogs_api.Domain; + + namespace skydiveLogs_api.Mapper { public class ModelProfile : Profile { public ModelProfile() { - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); + CreateMap(); - CreateMap(); + CreateMap(); } } } diff --git a/Back/skydiveLogs-api.Model/CorsSettings.cs b/Back/skydiveLogs-api/Settings/CorsSettings.cs similarity index 54% rename from Back/skydiveLogs-api.Model/CorsSettings.cs rename to Back/skydiveLogs-api/Settings/CorsSettings.cs index a3ec1de..41f9131 100644 --- a/Back/skydiveLogs-api.Model/CorsSettings.cs +++ b/Back/skydiveLogs-api/Settings/CorsSettings.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace skydiveLogs_api.Model +namespace skydiveLogs_api.Settings { public class CorsSettings { diff --git a/Back/skydiveLogs-api.Model/JwtSettings.cs b/Back/skydiveLogs-api/Settings/JwtSettings.cs similarity index 63% rename from Back/skydiveLogs-api.Model/JwtSettings.cs rename to Back/skydiveLogs-api/Settings/JwtSettings.cs index ca49298..58edbf6 100644 --- a/Back/skydiveLogs-api.Model/JwtSettings.cs +++ b/Back/skydiveLogs-api/Settings/JwtSettings.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace skydiveLogs_api.Model +namespace skydiveLogs_api.Settings { public class JwtSettings { diff --git a/Back/skydiveLogs-api/Startup.cs b/Back/skydiveLogs-api/Startup.cs index 39fc0c6..95b234c 100644 --- a/Back/skydiveLogs-api/Startup.cs +++ b/Back/skydiveLogs-api/Startup.cs @@ -9,11 +9,9 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.IdentityModel.Tokens; -using AutoMapper; - using skydiveLogs_api.Ioc; -using skydiveLogs_api.Business.Interface; -using skydiveLogs_api.Model; +using skydiveLogs_api.Settings; +using skydiveLogs_api.Business.Interfaces; namespace skydiveLogs_api diff --git a/Back/skydiveLogs-api/skydiveLogs-api.csproj b/Back/skydiveLogs-api/skydiveLogs-api.csproj index eb537e1..af6cc07 100644 --- a/Back/skydiveLogs-api/skydiveLogs-api.csproj +++ b/Back/skydiveLogs-api/skydiveLogs-api.csproj @@ -28,7 +28,7 @@ - +