diff --git a/EnvelopeGenerator.Application/Contracts/IEnvelopeMailService.cs b/EnvelopeGenerator.Application/Contracts/IEnvelopeMailService.cs index 7495f268..f4b00369 100644 --- a/EnvelopeGenerator.Application/Contracts/IEnvelopeMailService.cs +++ b/EnvelopeGenerator.Application/Contracts/IEnvelopeMailService.cs @@ -1,5 +1,5 @@ using DigitalData.Core.DTO; -using DigitalData.EmailProfilerDispatcher.Application.Contracts; +using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts; using EnvelopeGenerator.Application.DTOs; using EnvelopeGenerator.Common; diff --git a/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs b/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs index 574dd9df..3d16fad5 100644 --- a/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs +++ b/EnvelopeGenerator.Application/DTOs/EnvelopeDto.cs @@ -1,7 +1,5 @@ -using DigitalData.EmailProfilerDispatcher.Domain.Attributes; +using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes; using DigitalData.UserManager.Application.DTOs.User; -using DigitalData.UserManager.Domain.Entities; -using EnvelopeGenerator.Application.DTOs.EnvelopeHistory; using EnvelopeGenerator.Domain.Entities; namespace EnvelopeGenerator.Application.DTOs diff --git a/EnvelopeGenerator.Application/DTOs/EnvelopeReceiverDto.cs b/EnvelopeGenerator.Application/DTOs/EnvelopeReceiverDto.cs index c9c74fa6..7a62f280 100644 --- a/EnvelopeGenerator.Application/DTOs/EnvelopeReceiverDto.cs +++ b/EnvelopeGenerator.Application/DTOs/EnvelopeReceiverDto.cs @@ -1,6 +1,4 @@ -using DigitalData.EmailProfilerDispatcher.Domain.Attributes; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text.Json.Serialization; +using DigitalData.EmailProfilerDispatcher.Abstraction.Attributes; namespace EnvelopeGenerator.Application.DTOs { diff --git a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj index 229b4652..bd3fd91e 100644 --- a/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj +++ b/EnvelopeGenerator.Application/EnvelopeGenerator.Application.csproj @@ -12,10 +12,12 @@ - + + - + + @@ -24,15 +26,6 @@ - - ..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Application.dll - - - ..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Domain.dll - - - ..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Infrastructure.dll - ..\..\WebUserManager\DigitalData.UserManager.Application\bin\Debug\net7.0\DigitalData.UserManager.Application.dll diff --git a/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs b/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs index cd97446d..59f83118 100644 --- a/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs +++ b/EnvelopeGenerator.Application/Services/EnvelopeMailService.cs @@ -1,8 +1,8 @@ using AutoMapper; using DigitalData.Core.DTO; -using DigitalData.EmailProfilerDispatcher.Application.DTOs.EmailOut; -using DigitalData.EmailProfilerDispatcher.Application.Services; -using DigitalData.EmailProfilerDispatcher.Infrastructure.Contracts; +using DigitalData.EmailProfilerDispatcher.Abstraction.Contracts; +using DigitalData.EmailProfilerDispatcher.Abstraction.DTOs.EmailOut; +using DigitalData.EmailProfilerDispatcher.Abstraction.Services; using DigitalData.UserManager.Application; using EnvelopeGenerator.Application.Contracts; using EnvelopeGenerator.Application.DTOs; diff --git a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj index 2aae1eea..d89fc975 100644 --- a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj +++ b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj @@ -7,10 +7,12 @@ - + + - + + diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/angular.json b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/angular.json index 838b33df..f3d97eb1 100644 --- a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/angular.json +++ b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/angular.json @@ -76,7 +76,7 @@ }, "defaultConfiguration": "development", "options": { - "proxyConfig": "src/proxy.conf.json" + "proxyConfig": "proxy.conf.json" } }, "extract-i18n": { diff --git a/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/proxy.conf.json b/EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/proxy.conf.json similarity index 100% rename from EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/src/proxy.conf.json rename to EnvelopeGenerator.GeneratorAPI/ClientApp/envelope-generator-ui/proxy.conf.json diff --git a/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj b/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj index d306e9d7..bf9bc5a6 100644 --- a/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj +++ b/EnvelopeGenerator.GeneratorAPI/EnvelopeGenerator.GeneratorAPI.csproj @@ -7,11 +7,11 @@ - - + + - + diff --git a/EnvelopeGenerator.Infrastructure/EGDbContext.cs b/EnvelopeGenerator.Infrastructure/EGDbContext.cs index c5f9ebb7..a367bf47 100644 --- a/EnvelopeGenerator.Infrastructure/EGDbContext.cs +++ b/EnvelopeGenerator.Infrastructure/EGDbContext.cs @@ -1,8 +1,9 @@ -using DigitalData.EmailProfilerDispatcher.Domain.Entities; +using DigitalData.EmailProfilerDispatcher.Abstraction.Entities; +using DigitalData.UserManager.Infrastructure; using EnvelopeGenerator.Domain.Entities; using Microsoft.EntityFrameworkCore; -namespace DigitalData.UserManager.Infrastructure.Repositories +namespace EnvelopeGenerator.Infrastructure { public class EGDbContext : DbContext { diff --git a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj index 59585657..b84db569 100644 --- a/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj +++ b/EnvelopeGenerator.Infrastructure/EnvelopeGenerator.Infrastructure.csproj @@ -7,8 +7,8 @@ - - + + all @@ -22,9 +22,6 @@ - - ..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Domain.dll - ..\..\WebUserManager\DigitalData.UserManager.Domain\bin\Debug\net7.0\DigitalData.UserManager.Domain.dll diff --git a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj index a1e05add..a754281b 100644 --- a/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj +++ b/EnvelopeGenerator.Web/EnvelopeGenerator.Web.csproj @@ -12,11 +12,12 @@ - - + + - + + @@ -52,15 +53,6 @@ D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.v21.2.dll - - ..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Application.dll - - - ..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Domain.dll - - - ..\..\EmailProfilerDispatcher\DigitalData.EmailProfilerDispatcher.Application\bin\Debug\net7.0\DigitalData.EmailProfilerDispatcher.Infrastructure.dll - ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll diff --git a/EnvelopeGenerator.Web/Program.cs b/EnvelopeGenerator.Web/Program.cs index ddd4d546..431c989e 100644 --- a/EnvelopeGenerator.Web/Program.cs +++ b/EnvelopeGenerator.Web/Program.cs @@ -13,8 +13,9 @@ using DigitalData.Core.DTO; using System.Text.Encodings.Web; using Ganss.Xss; using Microsoft.Extensions.Options; -using DigitalData.EmailProfilerDispatcher.Application; using EnvelopeGenerator.Application; +using DigitalData.EmailProfilerDispatcher; +using EnvelopeGenerator.Infrastructure; var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger(); logger.Info("Logging initialized!");