Browse Source

Merge pull request #46 from volosoft/remove-dbmigrations

Remove EventHub.EntityFrameworkCore.DbMigrations project
pull/50/head
Halil İbrahim Kalkan 5 years ago
committed by GitHub
parent
commit
a7e048b3d0
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      EventHub.sln
  2. 6
      src/EventHub.Admin.Application.Contracts/EventHub.Admin.Application.Contracts.csproj
  3. 6
      src/EventHub.Admin.Application/EventHub.Admin.Application.csproj
  4. 6
      src/EventHub.Admin.HttpApi.Client/EventHub.Admin.HttpApi.Client.csproj
  5. 12
      src/EventHub.Admin.HttpApi.Host/EventHub.Admin.HttpApi.Host.csproj
  6. 2
      src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs
  7. 6
      src/EventHub.Admin.HttpApi/EventHub.Admin.HttpApi.csproj
  8. 6
      src/EventHub.Admin.Web/EventHub.Admin.Web.csproj
  9. 8
      src/EventHub.Admin.Web/EventHubBlazorModule.cs
  10. 2
      src/EventHub.Admin.Web/_Imports.razor
  11. 2
      src/EventHub.Application.Contracts/EventHub.Application.Contracts.csproj
  12. 2
      src/EventHub.Application/EventHub.Application.csproj
  13. 7
      src/EventHub.Application/EventHubApplicationAutoMapperProfile.cs
  14. 5
      src/EventHub.Application/Events/EventAppService.cs
  15. 8
      src/EventHub.Application/Events/Registrations/EventRegistrationAppService.cs
  16. 4
      src/EventHub.Application/Events/Registrations/EventRegistrationNotifier.cs
  17. 7
      src/EventHub.Application/Organizations/Memberships/OrganizationMembershipAppService.cs
  18. 5
      src/EventHub.Application/Organizations/OrganizationAppService.cs
  19. 7
      src/EventHub.Application/Users/UserAppService.cs
  20. 6
      src/EventHub.BackgroundServices/EventHub.BackgroundServices.csproj
  21. 5
      src/EventHub.BackgroundServices/Events/EventReminderNotifier.cs
  22. 5
      src/EventHub.BackgroundServices/Events/EventTimingChangeNotifier.cs
  23. 5
      src/EventHub.BackgroundServices/Events/NewEventNotifier.cs
  24. 4
      src/EventHub.DbMigrator/Data/EventHubSampleDataSeedContributor.cs
  25. 4
      src/EventHub.DbMigrator/EventHub.DbMigrator.csproj
  26. 2
      src/EventHub.DbMigrator/EventHubDbMigratorModule.cs
  27. 14
      src/EventHub.Domain.Shared/EventHub.Domain.Shared.csproj
  28. 2
      src/EventHub.Domain/Countries/Country.cs
  29. 2
      src/EventHub.Domain/Data/EventHubDbMigrationService.cs
  30. 18
      src/EventHub.Domain/EventHub.Domain.csproj
  31. 8
      src/EventHub.Domain/Events/Registrations/EventRegistrationManager.cs
  32. 6
      src/EventHub.Domain/Organizations/Memberships/OrganizationMembershipManager.cs
  33. 78
      src/EventHub.Domain/Users/AppUser.cs
  34. 22
      src/EventHub.Domain/Users/EventHubIdentityUserExtensions.cs
  35. 16
      src/EventHub.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EventHubEntityFrameworkCoreDbMigrationsModule.cs
  36. 47
      src/EventHub.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EventHubMigrationsDbContext.cs
  37. 18
      src/EventHub.EntityFrameworkCore.DbMigrations/EventHub.EntityFrameworkCore.DbMigrations.csproj
  38. 2636
      src/EventHub.EntityFrameworkCore.DbMigrations/Migrations/20210421100913_Initial.Designer.cs
  39. 23
      src/EventHub.EntityFrameworkCore.DbMigrations/Migrations/20210428213802_Added_CountryName_To_Event.cs
  40. 35
      src/EventHub.EntityFrameworkCore.DbMigrations/Migrations/20210614064205_Moved_IsTimingChangeEmailSent_To_Event.cs
  41. 2
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreEventHubDbSchemaMigrator.cs
  42. 52
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContext.cs
  43. 8
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContextFactory.cs
  44. 22
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContextModelCreatingExtensions.cs
  45. 6
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubEntityFrameworkCoreModule.cs
  46. 20
      src/EventHub.EntityFrameworkCore/EventHub.EntityFrameworkCore.csproj
  47. 17
      src/EventHub.EntityFrameworkCore/Migrations/20210623133429_Initial.Designer.cs
  48. 3159
      src/EventHub.EntityFrameworkCore/Migrations/20210623133429_Initial.cs
  49. 34
      src/EventHub.EntityFrameworkCore/Migrations/20210704104839_Upgrade_Abp_4_4.Designer.cs
  50. 33
      src/EventHub.EntityFrameworkCore/Migrations/20210704104839_Upgrade_Abp_4_4.cs
  51. 19
      src/EventHub.EntityFrameworkCore/Migrations/EventHubDbContextModelSnapshot.cs
  52. 2
      src/EventHub.HttpApi.Client/EventHub.HttpApi.Client.csproj
  53. 12
      src/EventHub.HttpApi.Host/EventHub.HttpApi.Host.csproj
  54. 2
      src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs
  55. 2
      src/EventHub.HttpApi/EventHub.HttpApi.csproj
  56. 17
      src/EventHub.IdentityServer/EventHub.IdentityServer.csproj
  57. 2
      src/EventHub.IdentityServer/EventHubIdentityServerModule.cs
  58. 4
      src/EventHub.IdentityServer/package.json
  59. 7
      src/EventHub.IdentityServer/wwwroot/libs/abp/core/abp.js
  60. 15
      src/EventHub.IdentityServer/wwwroot/libs/abp/jquery/abp.jquery.js
  61. 509
      src/EventHub.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap-rtl.css
  62. 2
      src/EventHub.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap-rtl.css.map
  63. 214
      src/EventHub.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.css
  64. 2
      src/EventHub.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.css.map
  65. 10
      src/EventHub.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.min.css
  66. 2
      src/EventHub.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.min.css.map
  67. 1034
      src/EventHub.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.js
  68. 2
      src/EventHub.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.js.map
  69. 8
      src/EventHub.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js
  70. 2
      src/EventHub.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js.map
  71. 330
      src/EventHub.IdentityServer/yarn.lock
  72. 4
      src/EventHub.Web.Theme/EventHub.Web.Theme.csproj
  73. 18
      src/EventHub.Web/EventHub.Web.csproj
  74. 2
      src/EventHub.Web/EventHubWebModule.cs
  75. 4
      src/EventHub.Web/package.json
  76. 7
      src/EventHub.Web/wwwroot/libs/abp/core/abp.js
  77. 15
      src/EventHub.Web/wwwroot/libs/abp/jquery/abp.jquery.js
  78. 509
      src/EventHub.Web/wwwroot/libs/bootstrap/css/bootstrap-rtl.css
  79. 2
      src/EventHub.Web/wwwroot/libs/bootstrap/css/bootstrap-rtl.css.map
  80. 214
      src/EventHub.Web/wwwroot/libs/bootstrap/css/bootstrap.css
  81. 2
      src/EventHub.Web/wwwroot/libs/bootstrap/css/bootstrap.css.map
  82. 10
      src/EventHub.Web/wwwroot/libs/bootstrap/css/bootstrap.min.css
  83. 2
      src/EventHub.Web/wwwroot/libs/bootstrap/css/bootstrap.min.css.map
  84. 1034
      src/EventHub.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.js
  85. 2
      src/EventHub.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.js.map
  86. 8
      src/EventHub.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js
  87. 2
      src/EventHub.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js.map
  88. 330
      src/EventHub.Web/yarn.lock
  89. 6
      test/EventHub.EntityFrameworkCore.Tests/EntityFrameworkCore/EventHubEntityFrameworkCoreTestModule.cs
  90. 4
      test/EventHub.EntityFrameworkCore.Tests/EventHub.EntityFrameworkCore.Tests.csproj
  91. 6
      test/EventHub.TestBase/EventHub.TestBase.csproj
  92. 9
      test/EventHub.TestBase/EventHubTestBase.cs
  93. 13
      tye.yaml

7
EventHub.sln

@ -15,8 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{04DBDB01-7
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHub.Application.Tests", "test\EventHub.Application.Tests\EventHub.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHub.Application.Tests", "test\EventHub.Application.Tests\EventHub.Application.Tests.csproj", "{50B2631D-129C-47B3-A587-029CCD6099BC}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHub.EntityFrameworkCore.DbMigrations", "src\EventHub.EntityFrameworkCore.DbMigrations\EventHub.EntityFrameworkCore.DbMigrations.csproj", "{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHub.Domain.Shared", "src\EventHub.Domain.Shared\EventHub.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHub.Domain.Shared", "src\EventHub.Domain.Shared\EventHub.Domain.Shared.csproj", "{42F719ED-8413-4895-B5B4-5AB56079BC66}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHub.Application.Contracts", "src\EventHub.Application.Contracts\EventHub.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventHub.Application.Contracts", "src\EventHub.Application.Contracts\EventHub.Application.Contracts.csproj", "{520659C8-C734-4298-A3DA-B539DB9DFC0B}"
@ -89,10 +87,6 @@ Global
{50B2631D-129C-47B3-A587-029CCD6099BC}.Debug|Any CPU.Build.0 = Debug|Any CPU {50B2631D-129C-47B3-A587-029CCD6099BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.ActiveCfg = Release|Any CPU {50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.Build.0 = Release|Any CPU {50B2631D-129C-47B3-A587-029CCD6099BC}.Release|Any CPU.Build.0 = Release|Any CPU
{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0}.Release|Any CPU.Build.0 = Release|Any CPU
{42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.Build.0 = Debug|Any CPU {42F719ED-8413-4895-B5B4-5AB56079BC66}.Debug|Any CPU.Build.0 = Debug|Any CPU
{42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.ActiveCfg = Release|Any CPU {42F719ED-8413-4895-B5B4-5AB56079BC66}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -182,7 +176,6 @@ Global
{554AD327-6DBA-4F8F-96F8-81CE7A0C863F} = {81F0EB50-4CF9-402D-B723-A07E95F8D7CB} {554AD327-6DBA-4F8F-96F8-81CE7A0C863F} = {81F0EB50-4CF9-402D-B723-A07E95F8D7CB}
{42F719ED-8413-4895-B5B4-5AB56079BC66} = {81F0EB50-4CF9-402D-B723-A07E95F8D7CB} {42F719ED-8413-4895-B5B4-5AB56079BC66} = {81F0EB50-4CF9-402D-B723-A07E95F8D7CB}
{C956DD76-69C8-4A9C-83EA-D17DF83340FD} = {81F0EB50-4CF9-402D-B723-A07E95F8D7CB} {C956DD76-69C8-4A9C-83EA-D17DF83340FD} = {81F0EB50-4CF9-402D-B723-A07E95F8D7CB}
{0372FA84-C517-4EB3-9A9F-B9ACAC0CA5E0} = {81F0EB50-4CF9-402D-B723-A07E95F8D7CB}
{BAA6ED88-6783-48EF-8691-46F4BED14023} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {BAA6ED88-6783-48EF-8691-46F4BED14023} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
{073C361E-B8F4-49F5-93CC-72A3FF49C026} = {BAA6ED88-6783-48EF-8691-46F4BED14023} {073C361E-B8F4-49F5-93CC-72A3FF49C026} = {BAA6ED88-6783-48EF-8691-46F4BED14023}
{F8CF0FE2-9F75-4940-92EC-3D021416DEBF} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {F8CF0FE2-9F75-4940-92EC-3D021416DEBF} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}

6
src/EventHub.Admin.Application.Contracts/EventHub.Admin.Application.Contracts.csproj

@ -12,9 +12,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="4.2.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
src/EventHub.Admin.Application/EventHub.Admin.Application.csproj

@ -13,9 +13,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Account.Application" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Identity.Application" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="4.2.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
src/EventHub.Admin.HttpApi.Client/EventHub.Admin.HttpApi.Client.csproj

@ -12,9 +12,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="4.2.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

12
src/EventHub.Admin.HttpApi.Host/EventHub.Admin.HttpApi.Host.csproj

@ -15,17 +15,17 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.*" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.*" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.*" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.*" />
<PackageReference Include="Volo.Abp.Autofac" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Swashbuckle" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\EventHub.Admin.Application\EventHub.Admin.Application.csproj" /> <ProjectReference Include="..\EventHub.Admin.Application\EventHub.Admin.Application.csproj" />
<ProjectReference Include="..\EventHub.Admin.HttpApi\EventHub.Admin.HttpApi.csproj" /> <ProjectReference Include="..\EventHub.Admin.HttpApi\EventHub.Admin.HttpApi.csproj" />
<ProjectReference Include="..\EventHub.EntityFrameworkCore.DbMigrations\EventHub.EntityFrameworkCore.DbMigrations.csproj" /> <ProjectReference Include="..\EventHub.EntityFrameworkCore\EventHub.EntityFrameworkCore.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs

@ -32,7 +32,7 @@ namespace EventHub.Admin
[DependsOn( [DependsOn(
typeof(EventHubAdminApplicationModule), typeof(EventHubAdminApplicationModule),
typeof(EventHubAdminHttpApiModule), typeof(EventHubAdminHttpApiModule),
typeof(EventHubEntityFrameworkCoreDbMigrationsModule), typeof(EventHubEntityFrameworkCoreModule),
typeof(AbpAutofacModule), typeof(AbpAutofacModule),
typeof(AbpCachingStackExchangeRedisModule), typeof(AbpCachingStackExchangeRedisModule),
typeof(AbpAspNetCoreSerilogModule), typeof(AbpAspNetCoreSerilogModule),

6
src/EventHub.Admin.HttpApi/EventHub.Admin.HttpApi.csproj

@ -12,9 +12,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Account.HttpApi" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="4.2.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
src/EventHub.Admin.Web/EventHub.Admin.Web.csproj

@ -18,9 +18,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.Blazor" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

8
src/EventHub.Admin.Web/EventHubBlazorModule.cs

@ -7,12 +7,12 @@ using IdentityModel;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic;
using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme; using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme;
using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic;
using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.Routing;
using Volo.Abp.Autofac.WebAssembly; using Volo.Abp.Autofac.WebAssembly;
using Volo.Abp.AutoMapper; using Volo.Abp.AutoMapper;
using Volo.Abp.Identity.Blazor; using Volo.Abp.Identity.Blazor.WebAssembly;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
using Volo.Abp.UI.Navigation; using Volo.Abp.UI.Navigation;
@ -22,7 +22,7 @@ namespace EventHub.Admin.Web
typeof(AbpAutofacWebAssemblyModule), typeof(AbpAutofacWebAssemblyModule),
typeof(EventHubAdminHttpApiClientModule), typeof(EventHubAdminHttpApiClientModule),
typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule), typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule),
typeof(AbpIdentityBlazorModule) typeof(AbpIdentityBlazorWebAssemblyModule)
)] )]
public class EventHubBlazorModule : AbpModule public class EventHubBlazorModule : AbpModule
{ {

2
src/EventHub.Admin.Web/_Imports.razor

@ -5,7 +5,7 @@
@using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Web
@using Microsoft.AspNetCore.Components.WebAssembly.Http @using Microsoft.AspNetCore.Components.WebAssembly.Http
@using Microsoft.JSInterop @using Microsoft.JSInterop
@using Volo.Abp.AspNetCore.Components.WebAssembly @using Volo.Abp.AspNetCore.Components.Web
@using Blazorise @using Blazorise
@using Blazorise.DataGrid @using Blazorise.DataGrid
@using Volo.Abp.BlazoriseUI @using Volo.Abp.BlazoriseUI

2
src/EventHub.Application.Contracts/EventHub.Application.Contracts.csproj

@ -12,7 +12,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/EventHub.Application/EventHub.Application.csproj

@ -13,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Ddd.Application" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

7
src/EventHub.Application/EventHubApplicationAutoMapperProfile.cs

@ -7,6 +7,7 @@ using EventHub.Organizations;
using EventHub.Organizations.Memberships; using EventHub.Organizations.Memberships;
using EventHub.Users; using EventHub.Users;
using Volo.Abp.AutoMapper; using Volo.Abp.AutoMapper;
using Volo.Abp.Identity;
namespace EventHub namespace EventHub
{ {
@ -17,7 +18,7 @@ namespace EventHub
CreateMap<Organization, OrganizationInListDto>(); CreateMap<Organization, OrganizationInListDto>();
CreateMap<Organization, OrganizationProfileDto>(); CreateMap<Organization, OrganizationProfileDto>();
CreateMap<AppUser, OrganizationMemberDto>(); CreateMap<IdentityUser, OrganizationMemberDto>();
CreateMap<Event, EventDto>(); CreateMap<Event, EventDto>();
CreateMap<Event, EventInListDto>() CreateMap<Event, EventInListDto>()
@ -29,14 +30,14 @@ namespace EventHub
.Ignore(x => x.OrganizationName) .Ignore(x => x.OrganizationName)
.Ignore(x => x.OrganizationDisplayName); .Ignore(x => x.OrganizationDisplayName);
CreateMap<AppUser, EventAttendeeDto>(); CreateMap<IdentityUser, EventAttendeeDto>();
CreateMap<Event, EventLocationDto>() CreateMap<Event, EventLocationDto>()
.Ignore(x => x.Country); .Ignore(x => x.Country);
CreateMap<Country, CountryLookupDto>(); CreateMap<Country, CountryLookupDto>();
CreateMap<AppUser, UserDto>(); CreateMap<IdentityUser, UserDto>();
} }
} }
} }

5
src/EventHub.Application/Events/EventAppService.cs

@ -11,6 +11,7 @@ using Volo.Abp.Application.Dtos;
using Volo.Abp.Authorization; using Volo.Abp.Authorization;
using Volo.Abp.BlobStoring; using Volo.Abp.BlobStoring;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using Volo.Abp.Identity;
using Volo.Abp.Users; using Volo.Abp.Users;
namespace EventHub.Events namespace EventHub.Events
@ -22,7 +23,7 @@ namespace EventHub.Events
private readonly IRepository<EventRegistration, Guid> _eventRegistrationRepository; private readonly IRepository<EventRegistration, Guid> _eventRegistrationRepository;
private readonly IRepository<Event, Guid> _eventRepository; private readonly IRepository<Event, Guid> _eventRepository;
private readonly IRepository<Organization, Guid> _organizationRepository; private readonly IRepository<Organization, Guid> _organizationRepository;
private readonly IRepository<AppUser, Guid> _userRepository; private readonly IRepository<IdentityUser, Guid> _userRepository;
private readonly IRepository<Country, Guid> _countriesRepository; private readonly IRepository<Country, Guid> _countriesRepository;
private readonly IBlobContainer<EventCoverImageContainer> _eventBlobContainer; private readonly IBlobContainer<EventCoverImageContainer> _eventBlobContainer;
@ -32,7 +33,7 @@ namespace EventHub.Events
IRepository<EventRegistration, Guid> eventRegistrationRepository, IRepository<EventRegistration, Guid> eventRegistrationRepository,
IRepository<Event, Guid> eventRepository, IRepository<Event, Guid> eventRepository,
IRepository<Organization, Guid> organizationRepository, IRepository<Organization, Guid> organizationRepository,
IRepository<AppUser, Guid> userRepository, IRepository<IdentityUser, Guid> userRepository,
IRepository<Country, Guid> countriesRepository, IRepository<Country, Guid> countriesRepository,
IBlobContainer<EventCoverImageContainer> eventBlobContainer) IBlobContainer<EventCoverImageContainer> eventBlobContainer)
{ {

8
src/EventHub.Application/Events/Registrations/EventRegistrationAppService.cs

@ -2,25 +2,25 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Users;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using Volo.Abp.Users; using Volo.Abp.Users;
using Volo.Abp.Identity;
namespace EventHub.Events.Registrations namespace EventHub.Events.Registrations
{ {
public class EventRegistrationAppService : EventHubAppService, IEventRegistrationAppService public class EventRegistrationAppService : EventHubAppService, IEventRegistrationAppService
{ {
private readonly EventRegistrationManager _eventRegistrationManager; private readonly EventRegistrationManager _eventRegistrationManager;
private readonly IRepository<AppUser, Guid> _userRepository; private readonly IRepository<IdentityUser, Guid> _userRepository;
private readonly IRepository<Event, Guid> _eventRepository; private readonly IRepository<Event, Guid> _eventRepository;
private readonly IRepository<EventRegistration, Guid> _eventRegistrationRepository; private readonly IRepository<EventRegistration, Guid> _eventRegistrationRepository;
private readonly EventRegistrationNotifier _eventRegistrationNotifier; private readonly EventRegistrationNotifier _eventRegistrationNotifier;
public EventRegistrationAppService( public EventRegistrationAppService(
EventRegistrationManager eventRegistrationManager, EventRegistrationManager eventRegistrationManager,
IRepository<AppUser, Guid> userRepository, IRepository<IdentityUser, Guid> userRepository,
IRepository<Event, Guid> eventRepository, IRepository<Event, Guid> eventRepository,
IRepository<EventRegistration, Guid> eventRegistrationRepository, IRepository<EventRegistration, Guid> eventRegistrationRepository,
EventRegistrationNotifier eventRegistrationNotifier) EventRegistrationNotifier eventRegistrationNotifier)
@ -77,7 +77,7 @@ namespace EventHub.Events.Registrations
return new PagedResultDto<EventAttendeeDto>( return new PagedResultDto<EventAttendeeDto>(
totalCount, totalCount,
ObjectMapper.Map<List<AppUser>, List<EventAttendeeDto>>(users) ObjectMapper.Map<List<IdentityUser>, List<EventAttendeeDto>>(users)
); );
} }

4
src/EventHub.Application/Events/Registrations/EventRegistrationNotifier.cs

@ -1,8 +1,8 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Emailing; using EventHub.Emailing;
using EventHub.Users;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Emailing; using Volo.Abp.Emailing;
using Volo.Abp.Identity;
using Volo.Abp.TextTemplating; using Volo.Abp.TextTemplating;
namespace EventHub.Events.Registrations namespace EventHub.Events.Registrations
@ -22,7 +22,7 @@ namespace EventHub.Events.Registrations
public async Task NotifyAsync( public async Task NotifyAsync(
Event @event, Event @event,
AppUser user) IdentityUser user)
{ {
if (user is null || @event is null) if (user is null || @event is null)
{ {

7
src/EventHub.Application/Organizations/Memberships/OrganizationMembershipAppService.cs

@ -6,6 +6,7 @@ using EventHub.Users;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using Volo.Abp.Identity;
using Volo.Abp.Users; using Volo.Abp.Users;
namespace EventHub.Organizations.Memberships namespace EventHub.Organizations.Memberships
@ -13,13 +14,13 @@ namespace EventHub.Organizations.Memberships
public class OrganizationMembershipAppService : EventHubAppService, IOrganizationMembershipAppService public class OrganizationMembershipAppService : EventHubAppService, IOrganizationMembershipAppService
{ {
private readonly OrganizationMembershipManager _organizationMembershipManager; private readonly OrganizationMembershipManager _organizationMembershipManager;
private readonly IRepository<AppUser, Guid> _userRepository; private readonly IRepository<IdentityUser, Guid> _userRepository;
private readonly IRepository<Organization, Guid> _organizationRepository; private readonly IRepository<Organization, Guid> _organizationRepository;
private readonly IRepository<OrganizationMembership, Guid> _organizationMembershipsRepository; private readonly IRepository<OrganizationMembership, Guid> _organizationMembershipsRepository;
public OrganizationMembershipAppService( public OrganizationMembershipAppService(
OrganizationMembershipManager organizationMembershipManager, OrganizationMembershipManager organizationMembershipManager,
IRepository<AppUser, Guid> userRepository, IRepository<IdentityUser, Guid> userRepository,
IRepository<Organization, Guid> organizationRepository, IRepository<Organization, Guid> organizationRepository,
IRepository<OrganizationMembership, Guid> organizationMembershipsRepository) IRepository<OrganizationMembership, Guid> organizationMembershipsRepository)
{ {
@ -72,7 +73,7 @@ namespace EventHub.Organizations.Memberships
return new PagedResultDto<OrganizationMemberDto>( return new PagedResultDto<OrganizationMemberDto>(
totalCount, totalCount,
ObjectMapper.Map<List<AppUser>, List<OrganizationMemberDto>>(users) ObjectMapper.Map<List<IdentityUser>, List<OrganizationMemberDto>>(users)
); );
} }
} }

5
src/EventHub.Application/Organizations/OrganizationAppService.cs

@ -9,6 +9,7 @@ using Volo.Abp.Application.Dtos;
using Volo.Abp.Authorization; using Volo.Abp.Authorization;
using Volo.Abp.BlobStoring; using Volo.Abp.BlobStoring;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using Volo.Abp.Identity;
using Volo.Abp.Users; using Volo.Abp.Users;
namespace EventHub.Organizations namespace EventHub.Organizations
@ -19,14 +20,14 @@ namespace EventHub.Organizations
private readonly IRepository<OrganizationMembership, Guid> _organizationMembershipsRepository; private readonly IRepository<OrganizationMembership, Guid> _organizationMembershipsRepository;
private readonly OrganizationManager _organizationManager; private readonly OrganizationManager _organizationManager;
private readonly IBlobContainer<OrganizationProfilePictureContainer> _organizationBlobContainer; private readonly IBlobContainer<OrganizationProfilePictureContainer> _organizationBlobContainer;
private readonly IRepository<AppUser, Guid> _userRepository; private readonly IRepository<IdentityUser, Guid> _userRepository;
public OrganizationAppService( public OrganizationAppService(
IRepository<Organization, Guid> organizationRepository, IRepository<Organization, Guid> organizationRepository,
IRepository<OrganizationMembership, Guid> organizationMembershipsRepository, IRepository<OrganizationMembership, Guid> organizationMembershipsRepository,
OrganizationManager organizationManager, OrganizationManager organizationManager,
IBlobContainer<OrganizationProfilePictureContainer> organizationBlobContainer, IBlobContainer<OrganizationProfilePictureContainer> organizationBlobContainer,
IRepository<AppUser, Guid> userRepository) IRepository<IdentityUser, Guid> userRepository)
{ {
_organizationRepository = organizationRepository; _organizationRepository = organizationRepository;
_organizationMembershipsRepository = organizationMembershipsRepository; _organizationMembershipsRepository = organizationMembershipsRepository;

7
src/EventHub.Application/Users/UserAppService.cs

@ -2,14 +2,15 @@ using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Members; using EventHub.Members;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using Volo.Abp.Identity;
namespace EventHub.Users namespace EventHub.Users
{ {
public class UserAppService : EventHubAppService, IUserAppService public class UserAppService : EventHubAppService, IUserAppService
{ {
private readonly IRepository<AppUser, Guid> _userRepository; private readonly IRepository<IdentityUser, Guid> _userRepository;
public UserAppService(IRepository<AppUser, Guid> userRepository) public UserAppService(IRepository<IdentityUser, Guid> userRepository)
{ {
_userRepository = userRepository; _userRepository = userRepository;
} }
@ -18,7 +19,7 @@ namespace EventHub.Users
{ {
var user = await _userRepository.FindAsync(x => x.UserName == username); var user = await _userRepository.FindAsync(x => x.UserName == username);
return ObjectMapper.Map<AppUser, UserDto>(user); return ObjectMapper.Map<IdentityUser, UserDto>(user);
} }
} }
} }

6
src/EventHub.BackgroundServices/EventHub.BackgroundServices.csproj

@ -14,9 +14,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.BackgroundWorkers" Version="4.2.1" /> <PackageReference Include="Volo.Abp.BackgroundWorkers" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

5
src/EventHub.BackgroundServices/Events/EventReminderNotifier.cs

@ -7,6 +7,7 @@ using EventHub.Users;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using Volo.Abp.Emailing; using Volo.Abp.Emailing;
using Volo.Abp.Identity;
using Volo.Abp.Linq; using Volo.Abp.Linq;
using Volo.Abp.TextTemplating; using Volo.Abp.TextTemplating;
@ -16,14 +17,14 @@ namespace EventHub.Events
{ {
private readonly IEmailSender _emailSender; private readonly IEmailSender _emailSender;
private readonly ITemplateRenderer _templateRenderer; private readonly ITemplateRenderer _templateRenderer;
private readonly IRepository<AppUser, Guid> _userRepository; private readonly IRepository<IdentityUser, Guid> _userRepository;
private readonly IRepository<EventRegistration, Guid> _eventRegistrationRepository; private readonly IRepository<EventRegistration, Guid> _eventRegistrationRepository;
private readonly IAsyncQueryableExecuter _asyncExecuter; private readonly IAsyncQueryableExecuter _asyncExecuter;
public EventReminderNotifier( public EventReminderNotifier(
IEmailSender emailSender, IEmailSender emailSender,
ITemplateRenderer templateRenderer, ITemplateRenderer templateRenderer,
IRepository<AppUser, Guid> userRepository, IRepository<IdentityUser, Guid> userRepository,
IRepository<EventRegistration, Guid> eventRegistrationRepository, IRepository<EventRegistration, Guid> eventRegistrationRepository,
IAsyncQueryableExecuter asyncExecuter) IAsyncQueryableExecuter asyncExecuter)
{ {

5
src/EventHub.BackgroundServices/Events/EventTimingChangeNotifier.cs

@ -7,6 +7,7 @@ using EventHub.Users;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using Volo.Abp.Emailing; using Volo.Abp.Emailing;
using Volo.Abp.Identity;
using Volo.Abp.Linq; using Volo.Abp.Linq;
using Volo.Abp.TextTemplating; using Volo.Abp.TextTemplating;
@ -17,14 +18,14 @@ namespace EventHub.Events
private readonly IEmailSender _emailSender; private readonly IEmailSender _emailSender;
private readonly ITemplateRenderer _templateRenderer; private readonly ITemplateRenderer _templateRenderer;
private readonly IAsyncQueryableExecuter _asyncExecuter; private readonly IAsyncQueryableExecuter _asyncExecuter;
private readonly IRepository<AppUser, Guid> _userRepository; private readonly IRepository<IdentityUser, Guid> _userRepository;
private readonly IRepository<EventRegistration, Guid> _eventRegistrationRepository; private readonly IRepository<EventRegistration, Guid> _eventRegistrationRepository;
public EventTimingChangeNotifier( public EventTimingChangeNotifier(
IEmailSender emailSender, IEmailSender emailSender,
ITemplateRenderer templateRenderer, ITemplateRenderer templateRenderer,
IAsyncQueryableExecuter asyncExecuter, IAsyncQueryableExecuter asyncExecuter,
IRepository<AppUser, Guid> userRepository, IRepository<IdentityUser, Guid> userRepository,
IRepository<EventRegistration, Guid> eventRegistrationRepository) IRepository<EventRegistration, Guid> eventRegistrationRepository)
{ {
_emailSender = emailSender; _emailSender = emailSender;

5
src/EventHub.BackgroundServices/Events/NewEventNotifier.cs

@ -7,6 +7,7 @@ using EventHub.Users;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using Volo.Abp.Emailing; using Volo.Abp.Emailing;
using Volo.Abp.Identity;
using Volo.Abp.Linq; using Volo.Abp.Linq;
using Volo.Abp.TextTemplating; using Volo.Abp.TextTemplating;
@ -17,14 +18,14 @@ namespace EventHub.Events
private readonly IEmailSender _emailSender; private readonly IEmailSender _emailSender;
private readonly ITemplateRenderer _templateRenderer; private readonly ITemplateRenderer _templateRenderer;
private readonly IRepository<OrganizationMembership, Guid> _organizationMembershipsRepository; private readonly IRepository<OrganizationMembership, Guid> _organizationMembershipsRepository;
private readonly IRepository<AppUser, Guid> _userRepository; private readonly IRepository<IdentityUser, Guid> _userRepository;
private readonly IAsyncQueryableExecuter _asyncExecuter; private readonly IAsyncQueryableExecuter _asyncExecuter;
public NewEventNotifier( public NewEventNotifier(
IEmailSender emailSender, IEmailSender emailSender,
ITemplateRenderer templateRenderer, ITemplateRenderer templateRenderer,
IRepository<OrganizationMembership, Guid> organizationMembershipsRepository, IRepository<OrganizationMembership, Guid> organizationMembershipsRepository,
IRepository<AppUser, Guid> userRepository, IRepository<IdentityUser, Guid> userRepository,
IAsyncQueryableExecuter asyncExecuter) IAsyncQueryableExecuter asyncExecuter)
{ {
_emailSender = emailSender; _emailSender = emailSender;

4
src/EventHub.DbMigrator/Data/EventHubSampleDataSeedContributor.cs

@ -24,7 +24,7 @@ namespace EventHub.DbMigrator.Data
private readonly IRepository<Event, Guid> _eventRepository; private readonly IRepository<Event, Guid> _eventRepository;
private readonly EventManager _eventManager; private readonly EventManager _eventManager;
private readonly EventRegistrationManager _eventRegistrationManager; private readonly EventRegistrationManager _eventRegistrationManager;
private readonly IRepository<AppUser, Guid> _userRepository; private readonly IRepository<IdentityUser, Guid> _userRepository;
private Guid _userSandraId; private Guid _userSandraId;
private Guid _userSergeyId; private Guid _userSergeyId;
@ -46,7 +46,7 @@ namespace EventHub.DbMigrator.Data
IRepository<Event, Guid> eventRepository, IRepository<Event, Guid> eventRepository,
EventManager eventManager, EventManager eventManager,
EventRegistrationManager eventRegistrationManager, EventRegistrationManager eventRegistrationManager,
IRepository<AppUser, Guid> userRepository) IRepository<IdentityUser, Guid> userRepository)
{ {
_guidGenerator = guidGenerator; _guidGenerator = guidGenerator;
_identityUserManager = identityUserManager; _identityUserManager = identityUserManager;

4
src/EventHub.DbMigrator/EventHub.DbMigrator.csproj

@ -27,10 +27,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="4.4.0-rc.1" />
<ProjectReference Include="..\EventHub.Application.Contracts\EventHub.Application.Contracts.csproj" /> <ProjectReference Include="..\EventHub.Application.Contracts\EventHub.Application.Contracts.csproj" />
<ProjectReference Include="..\EventHub.Admin.Application.Contracts\EventHub.Admin.Application.Contracts.csproj" /> <ProjectReference Include="..\EventHub.Admin.Application.Contracts\EventHub.Admin.Application.Contracts.csproj" />
<ProjectReference Include="..\EventHub.EntityFrameworkCore.DbMigrations\EventHub.EntityFrameworkCore.DbMigrations.csproj" /> <ProjectReference Include="..\EventHub.EntityFrameworkCore\EventHub.EntityFrameworkCore.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/EventHub.DbMigrator/EventHubDbMigratorModule.cs

@ -8,7 +8,7 @@ namespace EventHub.DbMigrator
{ {
[DependsOn( [DependsOn(
typeof(AbpAutofacModule), typeof(AbpAutofacModule),
typeof(EventHubEntityFrameworkCoreDbMigrationsModule), typeof(EventHubEntityFrameworkCoreModule),
typeof(EventHubApplicationContractsModule), typeof(EventHubApplicationContractsModule),
typeof(EventHubAdminApplicationContractsModule) typeof(EventHubAdminApplicationContractsModule)
)] )]

14
src/EventHub.Domain.Shared/EventHub.Domain.Shared.csproj

@ -9,13 +9,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.BlobStoring.Database.Domain.Shared" Version="4.2.1" /> <PackageReference Include="Volo.Abp.BlobStoring.Database.Domain.Shared" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="4.2.1" /> <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="4.2.1" /> <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="4.2.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="4.2.1" /> <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/EventHub.Domain/Countries/Country.cs

@ -4,7 +4,7 @@ using Volo.Abp.Domain.Entities;
namespace EventHub.Countries namespace EventHub.Countries
{ {
public class Country : Entity<Guid> public class Country : BasicAggregateRoot<Guid>
{ {
public string Name { get; private set; } public string Name { get; private set; }

2
src/EventHub.Domain/Data/EventHubDbMigrationService.cs

@ -121,7 +121,7 @@ namespace EventHub.Data
var srcDirectoryPath = Path.Combine(slnDirectoryPath, "src"); var srcDirectoryPath = Path.Combine(slnDirectoryPath, "src");
return Directory.GetDirectories(srcDirectoryPath) return Directory.GetDirectories(srcDirectoryPath)
.FirstOrDefault(d => d.EndsWith(".DbMigrations")); .FirstOrDefault(d => d.EndsWith(".EntityFrameworkCore"));
} }
private static string GetSolutionDirectoryPath() private static string GetSolutionDirectoryPath()

18
src/EventHub.Domain/EventHub.Domain.csproj

@ -13,15 +13,15 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.BlobStoring.Database.Domain" Version="4.2.1" /> <PackageReference Include="Volo.Abp.BlobStoring.Database.Domain" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Emailing" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Emailing" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Identity.Domain" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="4.2.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.2.1" /> <PackageReference Include="Volo.Abp.IdentityServer.Domain" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="4.2.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="4.2.1" /> <PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="4.2.1" /> <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
src/EventHub.Domain/Events/Registrations/EventRegistrationManager.cs

@ -1,9 +1,9 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Users;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using Volo.Abp.Domain.Services; using Volo.Abp.Domain.Services;
using Volo.Abp.Identity;
namespace EventHub.Events.Registrations namespace EventHub.Events.Registrations
{ {
@ -18,7 +18,7 @@ namespace EventHub.Events.Registrations
public async Task RegisterAsync( public async Task RegisterAsync(
Event @event, Event @event,
AppUser user) IdentityUser user)
{ {
if (IsPastEvent(@event)) if (IsPastEvent(@event))
{ {
@ -49,7 +49,7 @@ namespace EventHub.Events.Registrations
public async Task UnregisterAsync( public async Task UnregisterAsync(
Event @event, Event @event,
AppUser user) IdentityUser user)
{ {
if (IsPastEvent(@event)) if (IsPastEvent(@event))
{ {
@ -63,7 +63,7 @@ namespace EventHub.Events.Registrations
public async Task<bool> IsRegisteredAsync( public async Task<bool> IsRegisteredAsync(
Event @event, Event @event,
AppUser user) IdentityUser user)
{ {
return await _eventRegistrationRepository return await _eventRegistrationRepository
.AnyAsync(x => x.EventId == @event.Id && x.UserId == user.Id); .AnyAsync(x => x.EventId == @event.Id && x.UserId == user.Id);

6
src/EventHub.Domain/Organizations/Memberships/OrganizationMembershipManager.cs

@ -1,8 +1,8 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Users;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using Volo.Abp.Domain.Services; using Volo.Abp.Domain.Services;
using Volo.Abp.Identity;
namespace EventHub.Organizations.Memberships namespace EventHub.Organizations.Memberships
{ {
@ -17,7 +17,7 @@ namespace EventHub.Organizations.Memberships
public async Task JoinAsync( public async Task JoinAsync(
Organization organization, Organization organization,
AppUser user) IdentityUser user)
{ {
if (await IsJoinedAsync(organization, user)) if (await IsJoinedAsync(organization, user))
{ {
@ -35,7 +35,7 @@ namespace EventHub.Organizations.Memberships
public async Task<bool> IsJoinedAsync( public async Task<bool> IsJoinedAsync(
Organization organization, Organization organization,
AppUser user) IdentityUser user)
{ {
return await _organizationMembershipsRepository return await _organizationMembershipsRepository
.AnyAsync(x => x.OrganizationId == organization.Id && x.UserId == user.Id); .AnyAsync(x => x.OrganizationId == organization.Id && x.UserId == user.Id);

78
src/EventHub.Domain/Users/AppUser.cs

@ -1,78 +0,0 @@
using System;
using Volo.Abp.Domain.Entities.Auditing;
using Volo.Abp.Users;
namespace EventHub.Users
{
/* This entity shares the same table/collection ("AbpUsers" by default) with the
* IdentityUser entity of the Identity module.
*
* - You can define your custom properties into this class.
* - You never create or delete this entity, because it is Identity module's job.
* - You can query users from database with this entity.
* - You can update values of your custom properties.
*/
public class AppUser : FullAuditedAggregateRoot<Guid>, IUser
{
#region Base properties
/* These properties are shared with the IdentityUser entity of the Identity module.
* Do not change these properties through this class. Instead, use Identity module
* services (like IdentityUserManager) to change them.
* So, this properties are designed as read only!
*/
public virtual Guid? TenantId { get; private set; }
public virtual string UserName { get; private set; }
public virtual string Name { get; private set; }
public virtual string Surname { get; private set; }
public virtual string Email { get; private set; }
public virtual bool EmailConfirmed { get; private set; }
public virtual string PhoneNumber { get; private set; }
public virtual bool PhoneNumberConfirmed { get; private set; }
#endregion
/* Add your own properties here. Example:
*
* public string MyProperty { get; set; }
*
* If you add a property and using the EF Core, remember these;
*
* 1. Update EventHubDbContext.OnModelCreating
* to configure the mapping for your new property
* 2. Update EventHubEfCoreEntityExtensionMappings to extend the IdentityUser entity
* and add your new property to the migration.
* 3. Use the Add-Migration to add a new database migration.
* 4. Run the .DbMigrator project (or use the Update-Database command) to apply
* schema change to the database.
*/
private AppUser()
{
}
public string GetFullNameOrUsername()
{
if (!string.IsNullOrWhiteSpace(Name) && !string.IsNullOrWhiteSpace(Surname))
{
return Name + " " + Surname;
}
if (!string.IsNullOrWhiteSpace(Name))
{
return Name;
}
return UserName;
}
}
}

22
src/EventHub.Domain/Users/EventHubIdentityUserExtensions.cs

@ -0,0 +1,22 @@
using Volo.Abp.Identity;
namespace EventHub.Users
{
public static class EventHubIdentityUserExtensions
{
public static string GetFullNameOrUsername(this IdentityUser user)
{
if (!string.IsNullOrWhiteSpace(user.Name) && !string.IsNullOrWhiteSpace(user.Surname))
{
return user.Name + " " + user.Surname;
}
if (!string.IsNullOrWhiteSpace(user.Name))
{
return user.Name;
}
return user.UserName;
}
}
}

16
src/EventHub.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EventHubEntityFrameworkCoreDbMigrationsModule.cs

@ -1,16 +0,0 @@
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.Modularity;
namespace EventHub.EntityFrameworkCore
{
[DependsOn(
typeof(EventHubEntityFrameworkCoreModule)
)]
public class EventHubEntityFrameworkCoreDbMigrationsModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
context.Services.AddAbpDbContext<EventHubMigrationsDbContext>();
}
}
}

47
src/EventHub.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EventHubMigrationsDbContext.cs

@ -1,47 +0,0 @@
using EventHub.Events.Registrations;
using Microsoft.EntityFrameworkCore;
using Volo.Abp.AuditLogging.EntityFrameworkCore;
using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.Identity;
using Volo.Abp.Identity.EntityFrameworkCore;
using Volo.Abp.IdentityServer.EntityFrameworkCore;
using Volo.Abp.PermissionManagement.EntityFrameworkCore;
using Volo.Abp.SettingManagement.EntityFrameworkCore;
using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
namespace EventHub.EntityFrameworkCore
{
/* This DbContext is only used for database migrations.
* It is not used on runtime. See EventHubDbContext for the runtime DbContext.
* It is a unified model that includes configuration for
* all used modules and your application.
*/
public class EventHubMigrationsDbContext : AbpDbContext<EventHubMigrationsDbContext>
{
public EventHubMigrationsDbContext(DbContextOptions<EventHubMigrationsDbContext> options)
: base(options)
{
}
protected override void OnModelCreating(ModelBuilder builder)
{
base.OnModelCreating(builder);
/* Include modules to your migration db context */
builder.ConfigurePermissionManagement();
builder.ConfigureSettingManagement();
builder.ConfigureBackgroundJobs();
builder.ConfigureAuditLogging();
builder.ConfigureIdentity();
builder.ConfigureIdentityServer();
/* Configure your own tables/entities inside the ConfigureEventHub method */
builder.ConfigureEventHub(true);
builder.ConfigureBlobStoring();
}
}
}

18
src/EventHub.EntityFrameworkCore.DbMigrations/EventHub.EntityFrameworkCore.DbMigrations.csproj

@ -1,18 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\common.props" />
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<RootNamespace>EventHub</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\EventHub.EntityFrameworkCore\EventHub.EntityFrameworkCore.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.*" />
</ItemGroup>
</Project>

2636
src/EventHub.EntityFrameworkCore.DbMigrations/Migrations/20210421100913_Initial.Designer.cs

File diff suppressed because it is too large

23
src/EventHub.EntityFrameworkCore.DbMigrations/Migrations/20210428213802_Added_CountryName_To_Event.cs

@ -1,23 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace EventHub.Migrations
{
public partial class Added_CountryName_To_Event : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "CountryName",
table: "EhEvents",
type: "text",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "CountryName",
table: "EhEvents");
}
}
}

35
src/EventHub.EntityFrameworkCore.DbMigrations/Migrations/20210614064205_Moved_IsTimingChangeEmailSent_To_Event.cs

@ -1,35 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace EventHub.Migrations
{
public partial class Moved_IsTimingChangeEmailSent_To_Event : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "IsTimingChangeEmailSent",
table: "EhEventRegistrations");
migrationBuilder.AddColumn<bool>(
name: "IsTimingChangeEmailSent",
table: "EhEvents",
type: "boolean",
nullable: false,
defaultValue: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "IsTimingChangeEmailSent",
table: "EhEvents");
migrationBuilder.AddColumn<bool>(
name: "IsTimingChangeEmailSent",
table: "EhEventRegistrations",
type: "boolean",
nullable: false,
defaultValue: true);
}
}
}

2
src/EventHub.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EntityFrameworkCoreEventHubDbSchemaMigrator.cs → src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreEventHubDbSchemaMigrator.cs

@ -27,7 +27,7 @@ namespace EventHub.EntityFrameworkCore
*/ */
await _serviceProvider await _serviceProvider
.GetRequiredService<EventHubMigrationsDbContext>() .GetRequiredService<EventHubDbContext>()
.Database .Database
.MigrateAsync(); .MigrateAsync();
} }

52
src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContext.cs

@ -4,12 +4,17 @@ using EventHub.Events.Registrations;
using EventHub.Organizations; using EventHub.Organizations;
using EventHub.Organizations.Memberships; using EventHub.Organizations.Memberships;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using EventHub.Users; using Volo.Abp.AuditLogging.EntityFrameworkCore;
using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
using Volo.Abp.Data; using Volo.Abp.Data;
using Volo.Abp.DependencyInjection;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore.Modeling;
using Volo.Abp.Identity; using Volo.Abp.Identity;
using Volo.Abp.Users.EntityFrameworkCore; using Volo.Abp.Identity.EntityFrameworkCore;
using Volo.Abp.IdentityServer.EntityFrameworkCore;
using Volo.Abp.PermissionManagement.EntityFrameworkCore;
using Volo.Abp.SettingManagement.EntityFrameworkCore;
namespace EventHub.EntityFrameworkCore namespace EventHub.EntityFrameworkCore
{ {
@ -23,14 +28,27 @@ namespace EventHub.EntityFrameworkCore
* used modules (as explained above). See EventHubMigrationsDbContext for migrations. * used modules (as explained above). See EventHubMigrationsDbContext for migrations.
*/ */
[ConnectionStringName("Default")] [ConnectionStringName("Default")]
public class EventHubDbContext : AbpDbContext<EventHubDbContext> [ReplaceDbContext(typeof(IIdentityDbContext))]
public class EventHubDbContext :
AbpDbContext<EventHubDbContext>,
IIdentityDbContext
{ {
public DbSet<AppUser> Users { get; set; }
public DbSet<Organization> Organizations { get; set; } public DbSet<Organization> Organizations { get; set; }
public DbSet<OrganizationMembership> OrganizationMemberships { get; set; } public DbSet<OrganizationMembership> OrganizationMemberships { get; set; }
public DbSet<Event> Events { get; set; } public DbSet<Event> Events { get; set; }
public DbSet<EventRegistration> EventRegistrations { get; set; } public DbSet<EventRegistration> EventRegistrations { get; set; }
public DbSet<Country> Countries { get; set; } public DbSet<Country> Countries { get; set; }
#region Entities from the used modules
public DbSet<IdentityUser> Users { get; set; }
public DbSet<IdentityRole> Roles { get; set; }
public DbSet<IdentityClaimType> ClaimTypes { get; set; }
public DbSet<OrganizationUnit> OrganizationUnits { get; set; }
public DbSet<IdentitySecurityLog> SecurityLogs { get; set; }
public DbSet<IdentityLinkUser> LinkUsers { get; set; }
#endregion
public EventHubDbContext(DbContextOptions<EventHubDbContext> options) public EventHubDbContext(DbContextOptions<EventHubDbContext> options)
: base(options) : base(options)
@ -42,23 +60,15 @@ namespace EventHub.EntityFrameworkCore
{ {
base.OnModelCreating(builder); base.OnModelCreating(builder);
/* Configure the shared tables (with included modules) here */ builder.ConfigurePermissionManagement();
builder.ConfigureSettingManagement();
builder.Entity<AppUser>(b => builder.ConfigureBackgroundJobs();
{ builder.ConfigureAuditLogging();
b.ToTable(AbpIdentityDbProperties.DbTablePrefix + "Users"); //Sharing the same table "AbpUsers" with the IdentityUser builder.ConfigureIdentity();
builder.ConfigureIdentityServer();
b.ConfigureByConvention(); builder.ConfigureBlobStoring();
b.ConfigureAbpUser();
/* Configure mappings for your additional properties
* Also see the EventHubEfCoreEntityExtensionMappings class
*/
});
/* Configure your own tables/entities inside the ConfigureEventHub method */
builder.ConfigureEventHub(false); builder.ConfigureEventHub();
} }
} }
} }

8
src/EventHub.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/EventHubMigrationsDbContextFactory.cs → src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContextFactory.cs

@ -7,18 +7,18 @@ namespace EventHub.EntityFrameworkCore
{ {
/* This class is needed for EF Core console commands /* This class is needed for EF Core console commands
* (like Add-Migration and Update-Database commands) */ * (like Add-Migration and Update-Database commands) */
public class EventHubMigrationsDbContextFactory : IDesignTimeDbContextFactory<EventHubMigrationsDbContext> public class EventHubDbContextFactory : IDesignTimeDbContextFactory<EventHubDbContext>
{ {
public EventHubMigrationsDbContext CreateDbContext(string[] args) public EventHubDbContext CreateDbContext(string[] args)
{ {
EventHubEfCoreEntityExtensionMappings.Configure(); EventHubEfCoreEntityExtensionMappings.Configure();
var configuration = BuildConfiguration(); var configuration = BuildConfiguration();
var builder = new DbContextOptionsBuilder<EventHubMigrationsDbContext>() var builder = new DbContextOptionsBuilder<EventHubDbContext>()
.UseNpgsql(configuration.GetConnectionString("Default")); .UseNpgsql(configuration.GetConnectionString("Default"));
return new EventHubMigrationsDbContext(builder.Options); return new EventHubDbContext(builder.Options);
} }
private static IConfigurationRoot BuildConfiguration() private static IConfigurationRoot BuildConfiguration()

22
src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContextModelCreatingExtensions.cs

@ -12,9 +12,7 @@ namespace EventHub.EntityFrameworkCore
{ {
public static class EventHubDbContextModelCreatingExtensions public static class EventHubDbContextModelCreatingExtensions
{ {
public static void ConfigureEventHub( public static void ConfigureEventHub(this ModelBuilder builder)
this ModelBuilder builder,
bool isMigrationDbContext)
{ {
Check.NotNull(builder, nameof(builder)); Check.NotNull(builder, nameof(builder));
@ -29,11 +27,7 @@ namespace EventHub.EntityFrameworkCore
b.Property(x => x.Name).IsRequired().HasMaxLength(OrganizationConsts.MaxNameLength); b.Property(x => x.Name).IsRequired().HasMaxLength(OrganizationConsts.MaxNameLength);
b.Property(x => x.DisplayName).IsRequired().HasMaxLength(OrganizationConsts.MaxDisplayNameLength); b.Property(x => x.DisplayName).IsRequired().HasMaxLength(OrganizationConsts.MaxDisplayNameLength);
b.Property(x => x.Description).IsRequired().HasMaxLength(OrganizationConsts.MaxDescriptionNameLength); b.Property(x => x.Description).IsRequired().HasMaxLength(OrganizationConsts.MaxDescriptionNameLength);
b.HasOne<IdentityUser>().WithMany().HasForeignKey(x => x.OwnerUserId).IsRequired().OnDelete(DeleteBehavior.NoAction);
if (isMigrationDbContext)
{
b.HasOne<IdentityUser>().WithMany().HasForeignKey(x => x.OwnerUserId).IsRequired().OnDelete(DeleteBehavior.NoAction);
}
b.HasIndex(x => x.Name); b.HasIndex(x => x.Name);
b.HasIndex(x => x.DisplayName); b.HasIndex(x => x.DisplayName);
@ -46,11 +40,7 @@ namespace EventHub.EntityFrameworkCore
b.ConfigureByConvention(); b.ConfigureByConvention();
b.HasOne<Organization>().WithMany().HasForeignKey(x => x.OrganizationId).IsRequired().OnDelete(DeleteBehavior.NoAction); b.HasOne<Organization>().WithMany().HasForeignKey(x => x.OrganizationId).IsRequired().OnDelete(DeleteBehavior.NoAction);
b.HasOne<IdentityUser>().WithMany().HasForeignKey(x => x.UserId).IsRequired().OnDelete(DeleteBehavior.NoAction);
if (isMigrationDbContext)
{
b.HasOne<IdentityUser>().WithMany().HasForeignKey(x => x.UserId).IsRequired().OnDelete(DeleteBehavior.NoAction);
}
b.HasIndex(x => new {x.OrganizationId, x.UserId}); b.HasIndex(x => new {x.OrganizationId, x.UserId});
}); });
@ -89,11 +79,7 @@ namespace EventHub.EntityFrameworkCore
b.ConfigureByConvention(); b.ConfigureByConvention();
b.HasOne<Event>().WithMany().HasForeignKey(x => x.EventId).IsRequired().OnDelete(DeleteBehavior.NoAction); b.HasOne<Event>().WithMany().HasForeignKey(x => x.EventId).IsRequired().OnDelete(DeleteBehavior.NoAction);
b.HasOne<IdentityUser>().WithMany().HasForeignKey(x => x.UserId).IsRequired().OnDelete(DeleteBehavior.NoAction);
if (isMigrationDbContext)
{
b.HasOne<IdentityUser>().WithMany().HasForeignKey(x => x.UserId).IsRequired().OnDelete(DeleteBehavior.NoAction);
}
b.HasIndex(x => new {x.EventId, x.UserId}); b.HasIndex(x => new {x.EventId, x.UserId});
}); });

6
src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubEntityFrameworkCoreModule.cs

@ -34,15 +34,11 @@ namespace EventHub.EntityFrameworkCore
{ {
context.Services.AddAbpDbContext<EventHubDbContext>(options => context.Services.AddAbpDbContext<EventHubDbContext>(options =>
{ {
/* Remove "includeAllEntities: true" to create options.AddDefaultRepositories();
* default repositories only for aggregate roots */
options.AddDefaultRepositories(includeAllEntities: true);
}); });
Configure<AbpDbContextOptions>(options => Configure<AbpDbContextOptions>(options =>
{ {
/* The main point to change your DBMS.
* See also EventHubMigrationsDbContextFactory for EF Core tooling. */
options.UseNpgsql(); options.UseNpgsql();
}); });
} }

20
src/EventHub.EntityFrameworkCore/EventHub.EntityFrameworkCore.csproj

@ -8,15 +8,19 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="4.2.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="4.4.0-rc.1" />
<ProjectReference Include="..\EventHub.Domain\EventHub.Domain.csproj" /> <ProjectReference Include="..\EventHub.Domain\EventHub.Domain.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="4.2.1" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="4.2.1" /> <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="4.2.1" /> <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="4.2.1" /> <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="4.2.1" /> <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

17
src/EventHub.EntityFrameworkCore.DbMigrations/Migrations/20210614064205_Moved_IsTimingChangeEmailSent_To_Event.Designer.cs → src/EventHub.EntityFrameworkCore/Migrations/20210623133429_Initial.Designer.cs

@ -10,9 +10,9 @@ using Volo.Abp.EntityFrameworkCore;
namespace EventHub.Migrations namespace EventHub.Migrations
{ {
[DbContext(typeof(EventHubMigrationsDbContext))] [DbContext(typeof(EventHubDbContext))]
[Migration("20210614064205_Moved_IsTimingChangeEmailSent_To_Event")] [Migration("20210623133429_Initial")]
partial class Moved_IsTimingChangeEmailSent_To_Event partial class Initial
{ {
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
{ {
@ -26,7 +26,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("EventHub.Countries.Country", b => modelBuilder.Entity("EventHub.Countries.Country", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("Name") b.Property<string>("Name")
@ -44,7 +43,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("EventHub.Events.Event", b => modelBuilder.Entity("EventHub.Events.Event", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<int?>("Capacity") b.Property<int?>("Capacity")
@ -174,7 +172,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("EventHub.Events.Registrations.EventRegistration", b => modelBuilder.Entity("EventHub.Events.Registrations.EventRegistration", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -213,7 +210,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("EventHub.Organizations.Memberships.OrganizationMembership", b => modelBuilder.Entity("EventHub.Organizations.Memberships.OrganizationMembership", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -252,7 +248,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("EventHub.Organizations.Organization", b => modelBuilder.Entity("EventHub.Organizations.Organization", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -728,7 +723,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -775,7 +769,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<Guid?>("SourceTenantId") b.Property<Guid?>("SourceTenantId")
@ -801,7 +794,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -878,7 +870,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b => modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("Action") b.Property<string>("Action")
@ -953,7 +944,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<int>("AccessFailedCount") b.Property<int>("AccessFailedCount")
@ -1233,7 +1223,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b => modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("Code") b.Property<string>("Code")

3159
src/EventHub.EntityFrameworkCore.DbMigrations/Migrations/20210421100913_Initial.cs → src/EventHub.EntityFrameworkCore/Migrations/20210623133429_Initial.cs

File diff suppressed because it is too large

34
src/EventHub.EntityFrameworkCore.DbMigrations/Migrations/20210428213802_Added_CountryName_To_Event.Designer.cs → src/EventHub.EntityFrameworkCore/Migrations/20210704104839_Upgrade_Abp_4_4.Designer.cs

@ -10,9 +10,9 @@ using Volo.Abp.EntityFrameworkCore;
namespace EventHub.Migrations namespace EventHub.Migrations
{ {
[DbContext(typeof(EventHubMigrationsDbContext))] [DbContext(typeof(EventHubDbContext))]
[Migration("20210428213802_Added_CountryName_To_Event")] [Migration("20210704104839_Upgrade_Abp_4_4")]
partial class Added_CountryName_To_Event partial class Upgrade_Abp_4_4
{ {
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
{ {
@ -20,13 +20,12 @@ namespace EventHub.Migrations
modelBuilder modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql) .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
.HasAnnotation("Relational:MaxIdentifierLength", 63) .HasAnnotation("Relational:MaxIdentifierLength", 63)
.HasAnnotation("ProductVersion", "5.0.5") .HasAnnotation("ProductVersion", "5.0.7")
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn); .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
modelBuilder.Entity("EventHub.Countries.Country", b => modelBuilder.Entity("EventHub.Countries.Country", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("Name") b.Property<string>("Name")
@ -44,7 +43,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("EventHub.Events.Event", b => modelBuilder.Entity("EventHub.Events.Event", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<int?>("Capacity") b.Property<int?>("Capacity")
@ -109,6 +107,11 @@ namespace EventHub.Migrations
b.Property<bool>("IsRemindingEmailSent") b.Property<bool>("IsRemindingEmailSent")
.HasColumnType("boolean"); .HasColumnType("boolean");
b.Property<bool>("IsTimingChangeEmailSent")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(true);
b.Property<string>("Language") b.Property<string>("Language")
.HasMaxLength(16) .HasMaxLength(16)
.HasColumnType("character varying(16)"); .HasColumnType("character varying(16)");
@ -169,7 +172,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("EventHub.Events.Registrations.EventRegistration", b => modelBuilder.Entity("EventHub.Events.Registrations.EventRegistration", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -193,12 +195,6 @@ namespace EventHub.Migrations
.HasColumnType("text") .HasColumnType("text")
.HasColumnName("ExtraProperties"); .HasColumnName("ExtraProperties");
b.Property<bool>("IsTimingChangeEmailSent")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(true)
.HasColumnName("IsTimingChangeEmailSent");
b.Property<Guid>("UserId") b.Property<Guid>("UserId")
.HasColumnType("uuid"); .HasColumnType("uuid");
@ -214,7 +210,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("EventHub.Organizations.Memberships.OrganizationMembership", b => modelBuilder.Entity("EventHub.Organizations.Memberships.OrganizationMembership", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -253,7 +248,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("EventHub.Organizations.Organization", b => modelBuilder.Entity("EventHub.Organizations.Organization", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -391,9 +385,7 @@ namespace EventHub.Migrations
.HasColumnName("CorrelationId"); .HasColumnName("CorrelationId");
b.Property<string>("Exceptions") b.Property<string>("Exceptions")
.HasMaxLength(4000) .HasColumnType("text");
.HasColumnType("character varying(4000)")
.HasColumnName("Exceptions");
b.Property<int>("ExecutionDuration") b.Property<int>("ExecutionDuration")
.HasColumnType("integer") .HasColumnType("integer")
@ -729,7 +721,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -776,7 +767,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<Guid?>("SourceTenantId") b.Property<Guid?>("SourceTenantId")
@ -802,7 +792,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -879,7 +868,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b => modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("Action") b.Property<string>("Action")
@ -954,7 +942,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<int>("AccessFailedCount") b.Property<int>("AccessFailedCount")
@ -1234,7 +1221,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b => modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("Code") b.Property<string>("Code")

33
src/EventHub.EntityFrameworkCore/Migrations/20210704104839_Upgrade_Abp_4_4.cs

@ -0,0 +1,33 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace EventHub.Migrations
{
public partial class Upgrade_Abp_4_4 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "Exceptions",
table: "AbpAuditLogs",
type: "text",
nullable: true,
oldClrType: typeof(string),
oldType: "character varying(4000)",
oldMaxLength: 4000,
oldNullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "Exceptions",
table: "AbpAuditLogs",
type: "character varying(4000)",
maxLength: 4000,
nullable: true,
oldClrType: typeof(string),
oldType: "text",
oldNullable: true);
}
}
}

19
src/EventHub.EntityFrameworkCore.DbMigrations/Migrations/EventHubMigrationsDbContextModelSnapshot.cs → src/EventHub.EntityFrameworkCore/Migrations/EventHubDbContextModelSnapshot.cs

@ -9,8 +9,8 @@ using Volo.Abp.EntityFrameworkCore;
namespace EventHub.Migrations namespace EventHub.Migrations
{ {
[DbContext(typeof(EventHubMigrationsDbContext))] [DbContext(typeof(EventHubDbContext))]
partial class EventHubMigrationsDbContextModelSnapshot : ModelSnapshot partial class EventHubDbContextModelSnapshot : ModelSnapshot
{ {
protected override void BuildModel(ModelBuilder modelBuilder) protected override void BuildModel(ModelBuilder modelBuilder)
{ {
@ -24,7 +24,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("EventHub.Countries.Country", b => modelBuilder.Entity("EventHub.Countries.Country", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("Name") b.Property<string>("Name")
@ -42,7 +41,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("EventHub.Events.Event", b => modelBuilder.Entity("EventHub.Events.Event", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<int?>("Capacity") b.Property<int?>("Capacity")
@ -172,7 +170,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("EventHub.Events.Registrations.EventRegistration", b => modelBuilder.Entity("EventHub.Events.Registrations.EventRegistration", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -211,7 +208,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("EventHub.Organizations.Memberships.OrganizationMembership", b => modelBuilder.Entity("EventHub.Organizations.Memberships.OrganizationMembership", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -250,7 +246,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("EventHub.Organizations.Organization", b => modelBuilder.Entity("EventHub.Organizations.Organization", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -388,9 +383,7 @@ namespace EventHub.Migrations
.HasColumnName("CorrelationId"); .HasColumnName("CorrelationId");
b.Property<string>("Exceptions") b.Property<string>("Exceptions")
.HasMaxLength(4000) .HasColumnType("text");
.HasColumnType("character varying(4000)")
.HasColumnName("Exceptions");
b.Property<int>("ExecutionDuration") b.Property<int>("ExecutionDuration")
.HasColumnType("integer") .HasColumnType("integer")
@ -726,7 +719,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -773,7 +765,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<Guid?>("SourceTenantId") b.Property<Guid?>("SourceTenantId")
@ -799,7 +790,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp") b.Property<string>("ConcurrencyStamp")
@ -876,7 +866,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b => modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("Action") b.Property<string>("Action")
@ -951,7 +940,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<int>("AccessFailedCount") b.Property<int>("AccessFailedCount")
@ -1231,7 +1219,6 @@ namespace EventHub.Migrations
modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b => modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
{ {
b.Property<Guid>("Id") b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid"); .HasColumnType("uuid");
b.Property<string>("Code") b.Property<string>("Code")

2
src/EventHub.HttpApi.Client/EventHub.HttpApi.Client.csproj

@ -12,7 +12,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Http.Client" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

12
src/EventHub.HttpApi.Host/EventHub.HttpApi.Host.csproj

@ -15,17 +15,17 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.*" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.*" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="5.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.*" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.*" />
<PackageReference Include="Volo.Abp.Autofac" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Swashbuckle" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\EventHub.Application\EventHub.Application.csproj" /> <ProjectReference Include="..\EventHub.Application\EventHub.Application.csproj" />
<ProjectReference Include="..\EventHub.HttpApi\EventHub.HttpApi.csproj" /> <ProjectReference Include="..\EventHub.HttpApi\EventHub.HttpApi.csproj" />
<ProjectReference Include="..\EventHub.EntityFrameworkCore.DbMigrations\EventHub.EntityFrameworkCore.DbMigrations.csproj" /> <ProjectReference Include="..\EventHub.EntityFrameworkCore\EventHub.EntityFrameworkCore.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs

@ -33,7 +33,7 @@ namespace EventHub
[DependsOn( [DependsOn(
typeof(EventHubApplicationModule), typeof(EventHubApplicationModule),
typeof(EventHubHttpApiModule), typeof(EventHubHttpApiModule),
typeof(EventHubEntityFrameworkCoreDbMigrationsModule), typeof(EventHubEntityFrameworkCoreModule),
typeof(AbpAutofacModule), typeof(AbpAutofacModule),
typeof(AbpCachingStackExchangeRedisModule), typeof(AbpCachingStackExchangeRedisModule),
typeof(AbpAspNetCoreSerilogModule), typeof(AbpAspNetCoreSerilogModule),

2
src/EventHub.HttpApi/EventHub.HttpApi.csproj

@ -12,7 +12,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

17
src/EventHub.IdentityServer/EventHub.IdentityServer.csproj

@ -39,13 +39,16 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Account.Application" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Account.Application" Version="4.4.0-rc.1" />
<ProjectReference Include="..\EventHub.EntityFrameworkCore.DbMigrations\EventHub.EntityFrameworkCore.DbMigrations.csproj" /> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EventHub.EntityFrameworkCore\EventHub.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EventHub.Web.Theme\EventHub.Web.Theme.csproj" /> <ProjectReference Include="..\EventHub.Web.Theme\EventHub.Web.Theme.csproj" />
</ItemGroup> </ItemGroup>

2
src/EventHub.IdentityServer/EventHubIdentityServerModule.cs

@ -39,7 +39,7 @@ namespace EventHub
typeof(AbpAccountWebIdentityServerModule), typeof(AbpAccountWebIdentityServerModule),
typeof(AbpAccountApplicationModule), typeof(AbpAccountApplicationModule),
typeof(EventHubWebThemeModule), typeof(EventHubWebThemeModule),
typeof(EventHubEntityFrameworkCoreDbMigrationsModule), typeof(EventHubEntityFrameworkCoreModule),
typeof(AbpAspNetCoreSerilogModule) typeof(AbpAspNetCoreSerilogModule)
)] )]
public class EventHubIdentityServerModule : AbpModule public class EventHubIdentityServerModule : AbpModule

4
src/EventHub.IdentityServer/package.json

@ -3,7 +3,7 @@
"name": "my-app-identityserver", "name": "my-app-identityserver",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~4.2.1", "@abp/aspnetcore.mvc.ui.theme.basic": "~4.4.0-rc.1",
"owl.carousel": "^2.3.4" "owl.carousel": "^2.3.4"
} }
} }

7
src/EventHub.IdentityServer/wwwroot/libs/abp/core/abp.js

@ -684,6 +684,13 @@ var abp = abp || {};
document.cookie = cookieValue; document.cookie = cookieValue;
} }
/**
* Escape HTML to help prevent XSS attacks.
*/
abp.utils.htmlEscape = function (html) {
return typeof html === 'string' ? html.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;') : html;
}
/* SECURITY ***************************************/ /* SECURITY ***************************************/
abp.security = abp.security || {}; abp.security = abp.security || {};
abp.security.antiForgery = abp.security.antiForgery || {}; abp.security.antiForgery = abp.security.antiForgery || {};

15
src/EventHub.IdentityServer/wwwroot/libs/abp/jquery/abp.jquery.js

@ -99,19 +99,28 @@ var abp = abp || {};
options.success = undefined; options.success = undefined;
options.error = undefined; options.error = undefined;
return $.Deferred(function ($dfd) { var xhr = null;
$.ajax(options) var promise = $.Deferred(function ($dfd) {
xhr = $.ajax(options)
.done(function (data, textStatus, jqXHR) { .done(function (data, textStatus, jqXHR) {
$dfd.resolve(data); $dfd.resolve(data);
userOptions.success && userOptions.success(data); userOptions.success && userOptions.success(data);
}).fail(function (jqXHR) { }).fail(function (jqXHR) {
if(jqXHR.statusText === 'abort') {
//ajax request is abort, ignore error handle.
return;
}
if (jqXHR.getResponseHeader('_AbpErrorFormat') === 'true') { if (jqXHR.getResponseHeader('_AbpErrorFormat') === 'true') {
abp.ajax.handleAbpErrorResponse(jqXHR, userOptions, $dfd); abp.ajax.handleAbpErrorResponse(jqXHR, userOptions, $dfd);
} else { } else {
abp.ajax.handleNonAbpErrorResponse(jqXHR, userOptions, $dfd); abp.ajax.handleNonAbpErrorResponse(jqXHR, userOptions, $dfd);
} }
}); });
}); }).promise();
promise['jqXHR'] = xhr;
return promise;
}; };
$.extend(abp.ajax, { $.extend(abp.ajax, {

509
src/EventHub.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap-rtl.css

File diff suppressed because it is too large

2
src/EventHub.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap-rtl.css.map

File diff suppressed because one or more lines are too long

214
src/EventHub.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.css

@ -1,8 +1,8 @@
/*! /*!
* Bootstrap v4.5.0 (https://getbootstrap.com/) * Bootstrap v4.6.0 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors * Copyright 2011-2021 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc. * Copyright 2011-2021 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/ */
:root { :root {
--blue: #007bff; --blue: #007bff;
@ -31,7 +31,7 @@
--breakpoint-md: 768px; --breakpoint-md: 768px;
--breakpoint-lg: 992px; --breakpoint-lg: 992px;
--breakpoint-xl: 1200px; --breakpoint-xl: 1200px;
--font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
} }
@ -54,7 +54,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
body { body {
margin: 0; margin: 0;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-size: 1rem; font-size: 1rem;
font-weight: 400; font-weight: 400;
line-height: 1.5; line-height: 1.5;
@ -163,12 +163,12 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
a:not([href]) { a:not([href]):not([class]) {
color: inherit; color: inherit;
text-decoration: none; text-decoration: none;
} }
a:not([href]):hover { a:not([href]):not([class]):hover {
color: inherit; color: inherit;
text-decoration: none; text-decoration: none;
} }
@ -216,6 +216,7 @@ caption {
th { th {
text-align: inherit; text-align: inherit;
text-align: -webkit-match-parent;
} }
label { label {
@ -227,9 +228,8 @@ button {
border-radius: 0; border-radius: 0;
} }
button:focus { button:focus:not(:focus-visible) {
outline: 1px dotted; outline: 0;
outline: 5px auto -webkit-focus-ring-color;
} }
input, input,
@ -539,39 +539,12 @@ pre code {
overflow-y: scroll; overflow-y: scroll;
} }
.container { .container,
width: 100%; .container-fluid,
padding-right: 15px; .container-sm,
padding-left: 15px; .container-md,
margin-right: auto; .container-lg,
margin-left: auto; .container-xl {
}
@media (min-width: 576px) {
.container {
max-width: 540px;
}
}
@media (min-width: 768px) {
.container {
max-width: 720px;
}
}
@media (min-width: 992px) {
.container {
max-width: 960px;
}
}
@media (min-width: 1200px) {
.container {
max-width: 1140px;
}
}
.container-fluid, .container-sm, .container-md, .container-lg, .container-xl {
width: 100%; width: 100%;
padding-right: 15px; padding-right: 15px;
padding-left: 15px; padding-left: 15px;
@ -640,7 +613,6 @@ pre code {
flex-basis: 0; flex-basis: 0;
-ms-flex-positive: 1; -ms-flex-positive: 1;
flex-grow: 1; flex-grow: 1;
min-width: 0;
max-width: 100%; max-width: 100%;
} }
@ -884,7 +856,6 @@ pre code {
flex-basis: 0; flex-basis: 0;
-ms-flex-positive: 1; -ms-flex-positive: 1;
flex-grow: 1; flex-grow: 1;
min-width: 0;
max-width: 100%; max-width: 100%;
} }
.row-cols-sm-1 > * { .row-cols-sm-1 > * {
@ -1087,7 +1058,6 @@ pre code {
flex-basis: 0; flex-basis: 0;
-ms-flex-positive: 1; -ms-flex-positive: 1;
flex-grow: 1; flex-grow: 1;
min-width: 0;
max-width: 100%; max-width: 100%;
} }
.row-cols-md-1 > * { .row-cols-md-1 > * {
@ -1290,7 +1260,6 @@ pre code {
flex-basis: 0; flex-basis: 0;
-ms-flex-positive: 1; -ms-flex-positive: 1;
flex-grow: 1; flex-grow: 1;
min-width: 0;
max-width: 100%; max-width: 100%;
} }
.row-cols-lg-1 > * { .row-cols-lg-1 > * {
@ -1493,7 +1462,6 @@ pre code {
flex-basis: 0; flex-basis: 0;
-ms-flex-positive: 1; -ms-flex-positive: 1;
flex-grow: 1; flex-grow: 1;
min-width: 0;
max-width: 100%; max-width: 100%;
} }
.row-cols-xl-1 > * { .row-cols-xl-1 > * {
@ -2259,6 +2227,7 @@ textarea.form-control {
.valid-tooltip { .valid-tooltip {
position: absolute; position: absolute;
top: 100%; top: 100%;
left: 0;
z-index: 5; z-index: 5;
display: none; display: none;
max-width: 100%; max-width: 100%;
@ -2271,6 +2240,11 @@ textarea.form-control {
border-radius: 0.25rem; border-radius: 0.25rem;
} }
.form-row > .col > .valid-tooltip,
.form-row > [class*="col-"] > .valid-tooltip {
left: 5px;
}
.was-validated :valid ~ .valid-feedback, .was-validated :valid ~ .valid-feedback,
.was-validated :valid ~ .valid-tooltip, .was-validated :valid ~ .valid-tooltip,
.is-valid ~ .valid-feedback, .is-valid ~ .valid-feedback,
@ -2300,7 +2274,7 @@ textarea.form-control {
.was-validated .custom-select:valid, .custom-select.is-valid { .was-validated .custom-select:valid, .custom-select.is-valid {
border-color: #28a745; border-color: #28a745;
padding-right: calc(0.75em + 2.3125rem); padding-right: calc(0.75em + 2.3125rem);
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px, url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem); background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") right 0.75rem center/8px 10px no-repeat, #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem) no-repeat;
} }
.was-validated .custom-select:valid:focus, .custom-select.is-valid:focus { .was-validated .custom-select:valid:focus, .custom-select.is-valid:focus {
@ -2359,6 +2333,7 @@ textarea.form-control {
.invalid-tooltip { .invalid-tooltip {
position: absolute; position: absolute;
top: 100%; top: 100%;
left: 0;
z-index: 5; z-index: 5;
display: none; display: none;
max-width: 100%; max-width: 100%;
@ -2371,6 +2346,11 @@ textarea.form-control {
border-radius: 0.25rem; border-radius: 0.25rem;
} }
.form-row > .col > .invalid-tooltip,
.form-row > [class*="col-"] > .invalid-tooltip {
left: 5px;
}
.was-validated :invalid ~ .invalid-feedback, .was-validated :invalid ~ .invalid-feedback,
.was-validated :invalid ~ .invalid-tooltip, .was-validated :invalid ~ .invalid-tooltip,
.is-invalid ~ .invalid-feedback, .is-invalid ~ .invalid-feedback,
@ -2400,7 +2380,7 @@ textarea.form-control {
.was-validated .custom-select:invalid, .custom-select.is-invalid { .was-validated .custom-select:invalid, .custom-select.is-invalid {
border-color: #dc3545; border-color: #dc3545;
padding-right: calc(0.75em + 2.3125rem); padding-right: calc(0.75em + 2.3125rem);
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px, url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem); background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") right 0.75rem center/8px 10px no-repeat, #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e") center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem) no-repeat;
} }
.was-validated .custom-select:invalid:focus, .custom-select.is-invalid:focus { .was-validated .custom-select:invalid:focus, .custom-select.is-invalid:focus {
@ -3417,7 +3397,7 @@ input[type="button"].btn-block {
.dropdown-item:hover, .dropdown-item:focus { .dropdown-item:hover, .dropdown-item:focus {
color: #16181b; color: #16181b;
text-decoration: none; text-decoration: none;
background-color: #f8f9fa; background-color: #e9ecef;
} }
.dropdown-item.active, .dropdown-item:active { .dropdown-item.active, .dropdown-item:active {
@ -3427,7 +3407,7 @@ input[type="button"].btn-block {
} }
.dropdown-item.disabled, .dropdown-item:disabled { .dropdown-item.disabled, .dropdown-item:disabled {
color: #6c757d; color: #adb5bd;
pointer-events: none; pointer-events: none;
background-color: transparent; background-color: transparent;
} }
@ -3626,12 +3606,6 @@ input[type="button"].btn-block {
z-index: 4; z-index: 4;
} }
.input-group > .form-control:not(:last-child),
.input-group > .custom-select:not(:last-child) {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.input-group > .form-control:not(:first-child), .input-group > .form-control:not(:first-child),
.input-group > .custom-select:not(:first-child) { .input-group > .custom-select:not(:first-child) {
border-top-left-radius: 0; border-top-left-radius: 0;
@ -3646,14 +3620,23 @@ input[type="button"].btn-block {
} }
.input-group > .custom-file:not(:last-child) .custom-file-label, .input-group > .custom-file:not(:last-child) .custom-file-label,
.input-group > .custom-file:not(:last-child) .custom-file-label::after { .input-group > .custom-file:not(:first-child) .custom-file-label {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
.input-group:not(.has-validation) > .form-control:not(:last-child),
.input-group:not(.has-validation) > .custom-select:not(:last-child),
.input-group:not(.has-validation) > .custom-file:not(:last-child) .custom-file-label::after {
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
.input-group > .custom-file:not(:first-child) .custom-file-label { .input-group.has-validation > .form-control:nth-last-child(n + 3),
border-top-left-radius: 0; .input-group.has-validation > .custom-select:nth-last-child(n + 3),
border-bottom-left-radius: 0; .input-group.has-validation > .custom-file:nth-last-child(n + 3) .custom-file-label::after {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
} }
.input-group-prepend, .input-group-prepend,
@ -3756,8 +3739,10 @@ input[type="button"].btn-block {
.input-group > .input-group-prepend > .btn, .input-group > .input-group-prepend > .btn,
.input-group > .input-group-prepend > .input-group-text, .input-group > .input-group-prepend > .input-group-text,
.input-group > .input-group-append:not(:last-child) > .btn, .input-group:not(.has-validation) > .input-group-append:not(:last-child) > .btn,
.input-group > .input-group-append:not(:last-child) > .input-group-text, .input-group:not(.has-validation) > .input-group-append:not(:last-child) > .input-group-text,
.input-group.has-validation > .input-group-append:nth-last-child(n + 3) > .btn,
.input-group.has-validation > .input-group-append:nth-last-child(n + 3) > .input-group-text,
.input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle), .input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle),
.input-group > .input-group-append:last-child > .input-group-text:not(:last-child) { .input-group > .input-group-append:last-child > .input-group-text:not(:last-child) {
border-top-right-radius: 0; border-top-right-radius: 0;
@ -3776,9 +3761,12 @@ input[type="button"].btn-block {
.custom-control { .custom-control {
position: relative; position: relative;
z-index: 1;
display: block; display: block;
min-height: 1.5rem; min-height: 1.5rem;
padding-left: 1.5rem; padding-left: 1.5rem;
-webkit-print-color-adjust: exact;
color-adjust: exact;
} }
.custom-control-inline { .custom-control-inline {
@ -3851,7 +3839,7 @@ input[type="button"].btn-block {
width: 1rem; width: 1rem;
height: 1rem; height: 1rem;
content: ""; content: "";
background: no-repeat 50% / 50% 50%; background: 50% / 50% 50% no-repeat;
} }
.custom-checkbox .custom-control-label::before { .custom-checkbox .custom-control-label::before {
@ -3940,7 +3928,7 @@ input[type="button"].btn-block {
line-height: 1.5; line-height: 1.5;
color: #495057; color: #495057;
vertical-align: middle; vertical-align: middle;
background: #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px; background: #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") right 0.75rem center/8px 10px no-repeat;
border: 1px solid #ced4da; border: 1px solid #ced4da;
border-radius: 0.25rem; border-radius: 0.25rem;
-webkit-appearance: none; -webkit-appearance: none;
@ -4009,6 +3997,7 @@ input[type="button"].btn-block {
width: 100%; width: 100%;
height: calc(1.5em + 0.75rem + 2px); height: calc(1.5em + 0.75rem + 2px);
margin: 0; margin: 0;
overflow: hidden;
opacity: 0; opacity: 0;
} }
@ -4038,6 +4027,7 @@ input[type="button"].btn-block {
z-index: 1; z-index: 1;
height: calc(1.5em + 0.75rem + 2px); height: calc(1.5em + 0.75rem + 2px);
padding: 0.375rem 0.75rem; padding: 0.375rem 0.75rem;
overflow: hidden;
font-weight: 400; font-weight: 400;
line-height: 1.5; line-height: 1.5;
color: #495057; color: #495057;
@ -4074,7 +4064,7 @@ input[type="button"].btn-block {
} }
.custom-range:focus { .custom-range:focus {
outline: none; outline: 0;
} }
.custom-range:focus::-webkit-slider-thumb { .custom-range:focus::-webkit-slider-thumb {
@ -4269,11 +4259,8 @@ input[type="button"].btn-block {
border-bottom: 1px solid #dee2e6; border-bottom: 1px solid #dee2e6;
} }
.nav-tabs .nav-item {
margin-bottom: -1px;
}
.nav-tabs .nav-link { .nav-tabs .nav-link {
margin-bottom: -1px;
border: 1px solid transparent; border: 1px solid transparent;
border-top-left-radius: 0.25rem; border-top-left-radius: 0.25rem;
border-top-right-radius: 0.25rem; border-top-right-radius: 0.25rem;
@ -4312,12 +4299,14 @@ input[type="button"].btn-block {
background-color: #007bff; background-color: #007bff;
} }
.nav-fill > .nav-link,
.nav-fill .nav-item { .nav-fill .nav-item {
-ms-flex: 1 1 auto; -ms-flex: 1 1 auto;
flex: 1 1 auto; flex: 1 1 auto;
text-align: center; text-align: center;
} }
.nav-justified > .nav-link,
.nav-justified .nav-item { .nav-justified .nav-item {
-ms-flex-preferred-size: 0; -ms-flex-preferred-size: 0;
flex-basis: 0; flex-basis: 0;
@ -4427,8 +4416,12 @@ input[type="button"].btn-block {
height: 1.5em; height: 1.5em;
vertical-align: middle; vertical-align: middle;
content: ""; content: "";
background: no-repeat center center; background: 50% / 100% 100% no-repeat;
background-size: 100% 100%; }
.navbar-nav-scroll {
max-height: 75vh;
overflow-y: auto;
} }
@media (max-width: 575.98px) { @media (max-width: 575.98px) {
@ -4462,6 +4455,9 @@ input[type="button"].btn-block {
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.navbar-expand-sm .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand-sm .navbar-collapse { .navbar-expand-sm .navbar-collapse {
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
@ -4504,6 +4500,9 @@ input[type="button"].btn-block {
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.navbar-expand-md .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand-md .navbar-collapse { .navbar-expand-md .navbar-collapse {
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
@ -4546,6 +4545,9 @@ input[type="button"].btn-block {
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.navbar-expand-lg .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand-lg .navbar-collapse { .navbar-expand-lg .navbar-collapse {
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
@ -4588,6 +4590,9 @@ input[type="button"].btn-block {
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.navbar-expand-xl .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand-xl .navbar-collapse { .navbar-expand-xl .navbar-collapse {
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
@ -4632,6 +4637,10 @@ input[type="button"].btn-block {
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.navbar-expand .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand .navbar-collapse { .navbar-expand .navbar-collapse {
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
@ -4775,6 +4784,11 @@ input[type="button"].btn-block {
border-bottom-left-radius: calc(0.25rem - 1px); border-bottom-left-radius: calc(0.25rem - 1px);
} }
.card > .card-header + .list-group,
.card > .list-group + .card-footer {
border-top: 0;
}
.card-body { .card-body {
-ms-flex: 1 1 auto; -ms-flex: 1 1 auto;
flex: 1 1 auto; flex: 1 1 auto;
@ -4814,10 +4828,6 @@ input[type="button"].btn-block {
border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0; border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0;
} }
.card-header + .list-group .list-group-item:first-child {
border-top: 0;
}
.card-footer { .card-footer {
padding: 0.75rem 1.25rem; padding: 0.75rem 1.25rem;
background-color: rgba(0, 0, 0, 0.03); background-color: rgba(0, 0, 0, 0.03);
@ -4847,6 +4857,7 @@ input[type="button"].btn-block {
bottom: 0; bottom: 0;
left: 0; left: 0;
padding: 1.25rem; padding: 1.25rem;
border-radius: calc(0.25rem - 1px);
} }
.card-img, .card-img,
@ -4958,6 +4969,10 @@ input[type="button"].btn-block {
} }
} }
.accordion {
overflow-anchor: none;
}
.accordion > .card { .accordion > .card {
overflow: hidden; overflow: hidden;
} }
@ -4990,17 +5005,12 @@ input[type="button"].btn-block {
border-radius: 0.25rem; border-radius: 0.25rem;
} }
.breadcrumb-item {
display: -ms-flexbox;
display: flex;
}
.breadcrumb-item + .breadcrumb-item { .breadcrumb-item + .breadcrumb-item {
padding-left: 0.5rem; padding-left: 0.5rem;
} }
.breadcrumb-item + .breadcrumb-item::before { .breadcrumb-item + .breadcrumb-item::before {
display: inline-block; float: left;
padding-right: 0.5rem; padding-right: 0.5rem;
color: #6c757d; color: #6c757d;
content: "/"; content: "/";
@ -5310,6 +5320,7 @@ a.badge-dark:focus, a.badge-dark.focus {
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
z-index: 2;
padding: 0.75rem 1.25rem; padding: 0.75rem 1.25rem;
color: inherit; color: inherit;
} }
@ -5482,8 +5493,8 @@ a.badge-dark:focus, a.badge-dark.focus {
} }
.progress-bar-animated { .progress-bar-animated {
-webkit-animation: progress-bar-stripes 1s linear infinite; -webkit-animation: 1s linear infinite progress-bar-stripes;
animation: progress-bar-stripes 1s linear infinite; animation: 1s linear infinite progress-bar-stripes;
} }
@media (prefers-reduced-motion: reduce) { @media (prefers-reduced-motion: reduce) {
@ -5876,15 +5887,14 @@ a.close.disabled {
} }
.toast { .toast {
-ms-flex-preferred-size: 350px;
flex-basis: 350px;
max-width: 350px; max-width: 350px;
overflow: hidden;
font-size: 0.875rem; font-size: 0.875rem;
background-color: rgba(255, 255, 255, 0.85); background-color: rgba(255, 255, 255, 0.85);
background-clip: padding-box; background-clip: padding-box;
border: 1px solid rgba(0, 0, 0, 0.1); border: 1px solid rgba(0, 0, 0, 0.1);
box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.1); box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.1);
-webkit-backdrop-filter: blur(10px);
backdrop-filter: blur(10px);
opacity: 0; opacity: 0;
border-radius: 0.25rem; border-radius: 0.25rem;
} }
@ -5916,6 +5926,8 @@ a.close.disabled {
background-color: rgba(255, 255, 255, 0.85); background-color: rgba(255, 255, 255, 0.85);
background-clip: padding-box; background-clip: padding-box;
border-bottom: 1px solid rgba(0, 0, 0, 0.05); border-bottom: 1px solid rgba(0, 0, 0, 0.05);
border-top-left-radius: calc(0.25rem - 1px);
border-top-right-radius: calc(0.25rem - 1px);
} }
.toast-body { .toast-body {
@ -6161,7 +6173,7 @@ a.close.disabled {
z-index: 1070; z-index: 1070;
display: block; display: block;
margin: 0; margin: 0;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
line-height: 1.5; line-height: 1.5;
@ -6274,7 +6286,7 @@ a.close.disabled {
z-index: 1060; z-index: 1060;
display: block; display: block;
max-width: 276px; max-width: 276px;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
line-height: 1.5; line-height: 1.5;
@ -6562,7 +6574,7 @@ a.close.disabled {
display: inline-block; display: inline-block;
width: 20px; width: 20px;
height: 20px; height: 20px;
background: no-repeat 50% / 100% 100%; background: 50% / 100% 100% no-repeat;
} }
.carousel-control-prev-icon { .carousel-control-prev-icon {
@ -6651,8 +6663,8 @@ a.close.disabled {
border: 0.25em solid currentColor; border: 0.25em solid currentColor;
border-right-color: transparent; border-right-color: transparent;
border-radius: 50%; border-radius: 50%;
-webkit-animation: spinner-border .75s linear infinite; -webkit-animation: .75s linear infinite spinner-border;
animation: spinner-border .75s linear infinite; animation: .75s linear infinite spinner-border;
} }
.spinner-border-sm { .spinner-border-sm {
@ -6693,8 +6705,8 @@ a.close.disabled {
background-color: currentColor; background-color: currentColor;
border-radius: 50%; border-radius: 50%;
opacity: 0; opacity: 0;
-webkit-animation: spinner-grow .75s linear infinite; -webkit-animation: .75s linear infinite spinner-grow;
animation: spinner-grow .75s linear infinite; animation: .75s linear infinite spinner-grow;
} }
.spinner-grow-sm { .spinner-grow-sm {
@ -6702,6 +6714,14 @@ a.close.disabled {
height: 1rem; height: 1rem;
} }
@media (prefers-reduced-motion: reduce) {
.spinner-border,
.spinner-grow {
-webkit-animation-duration: 1.5s;
animation-duration: 1.5s;
}
}
.align-baseline { .align-baseline {
vertical-align: baseline !important; vertical-align: baseline !important;
} }
@ -7970,7 +7990,6 @@ button.bg-dark:focus {
.user-select-all { .user-select-all {
-webkit-user-select: all !important; -webkit-user-select: all !important;
-moz-user-select: all !important; -moz-user-select: all !important;
-ms-user-select: all !important;
user-select: all !important; user-select: all !important;
} }
@ -10182,6 +10201,7 @@ a.text-dark:hover, a.text-dark:focus {
} }
.text-break { .text-break {
word-break: break-word !important;
word-wrap: break-word !important; word-wrap: break-word !important;
} }

2
src/EventHub.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.css.map

File diff suppressed because one or more lines are too long

10
src/EventHub.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.min.css

File diff suppressed because one or more lines are too long

2
src/EventHub.IdentityServer/wwwroot/libs/bootstrap/css/bootstrap.min.css.map

File diff suppressed because one or more lines are too long

1034
src/EventHub.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.js

File diff suppressed because it is too large

2
src/EventHub.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.js.map

File diff suppressed because one or more lines are too long

8
src/EventHub.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js

File diff suppressed because one or more lines are too long

2
src/EventHub.IdentityServer/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js.map

File diff suppressed because one or more lines are too long

330
src/EventHub.IdentityServer/yarn.lock

@ -2,186 +2,184 @@
# yarn lockfile v1 # yarn lockfile v1
"@abp/aspnetcore.mvc.ui.theme.basic@~4.2.1": "@abp/aspnetcore.mvc.ui.theme.basic@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.2.1.tgz#78b465ab8fcd68a38e2b868717d00e5f5d3b0c61" resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.4.0-rc.1.tgz#327a26fd71183ea2b4264ce12e4558310e8243b3"
integrity sha512-Tb0g4mtdSsjQkadvnjjRjObEhweUvigto0BTv5SzRNi0oQLW8ZVUcFmuMWB09nJAIPrbuA3QuPUlXzFcv2gsdg== integrity sha512-YycorI8c5EUx0Wi50R+Vrvd3m52RTntDB51y0u+2/UebEP9TkJfw0BowLDRqISLKQ1cqnrh5U+JlwPIUFD9hTA==
dependencies: dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~4.2.1" "@abp/aspnetcore.mvc.ui.theme.shared" "~4.4.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.shared@~4.2.1": "@abp/aspnetcore.mvc.ui.theme.shared@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.2.1.tgz#18205c13f137dad9876c4153f34273a7c8e69854" resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.4.0-rc.1.tgz#fe3b8aab3db2a5406b68db0355942e1267c1c81e"
integrity sha512-+f54CysWpEKfxjIIjhnTKW0jJ0Rg+wS6yxb9Rg3qxA5iEUkxp3B+NB5wA9rT5YcY9APrwVpiw1miNRmq5ZvFXg== integrity sha512-QA861zNC2nrNxy5P7A7YtJrA6cRz6yvGIZEnasqYUQ3pqrmkV526AoPJrxIYfn8gjs2FiUHcEIirYx9IriL0Pg==
dependencies: dependencies:
"@abp/aspnetcore.mvc.ui" "~4.2.1" "@abp/aspnetcore.mvc.ui" "~4.4.0-rc.1"
"@abp/bootstrap" "~4.2.1" "@abp/bootstrap" "~4.4.0-rc.1"
"@abp/bootstrap-datepicker" "~4.2.1" "@abp/bootstrap-datepicker" "~4.4.0-rc.1"
"@abp/datatables.net-bs4" "~4.2.1" "@abp/datatables.net-bs4" "~4.4.0-rc.1"
"@abp/font-awesome" "~4.2.1" "@abp/font-awesome" "~4.4.0-rc.1"
"@abp/jquery-form" "~4.2.1" "@abp/jquery-form" "~4.4.0-rc.1"
"@abp/jquery-validation-unobtrusive" "~4.2.1" "@abp/jquery-validation-unobtrusive" "~4.4.0-rc.1"
"@abp/lodash" "~4.2.1" "@abp/lodash" "~4.4.0-rc.1"
"@abp/luxon" "~4.2.1" "@abp/luxon" "~4.4.0-rc.1"
"@abp/malihu-custom-scrollbar-plugin" "~4.2.1" "@abp/malihu-custom-scrollbar-plugin" "~4.4.0-rc.1"
"@abp/select2" "~4.2.1" "@abp/select2" "~4.4.0-rc.1"
"@abp/sweetalert" "~4.2.1" "@abp/sweetalert" "~4.4.0-rc.1"
"@abp/timeago" "~4.2.1" "@abp/timeago" "~4.4.0-rc.1"
"@abp/toastr" "~4.2.1" "@abp/toastr" "~4.4.0-rc.1"
"@abp/aspnetcore.mvc.ui@~4.2.1": "@abp/aspnetcore.mvc.ui@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.2.1.tgz#2ad368af731678213ff3d8448a3dd30a2f1f66c9" resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.4.0-rc.1.tgz#c086d5b1b4fa2b977779ed6e666e897879c7f3cf"
integrity sha512-/a/KDVQ3EuETSSe+KqmsR24w6RWHvaokvmmOjL+tCpFQyeaYAZ88E9pvM5hC9HVR24FCHTiARiXwgMTw2eZFyQ== integrity sha512-cBzMQYmPJiXxo3z6PhLV5Sq61sWTN5e4139tpQepma4ctYBlV1+jQnNxmfCRVQio98YDk72kdkOtt7qQtP+TlA==
dependencies: dependencies:
ansi-colors "^4.1.1" ansi-colors "^4.1.1"
extend-object "^1.0.0" extend-object "^1.0.0"
fs-extra "^9.0.1"
glob "^7.1.6" glob "^7.1.6"
gulp "^4.0.2" gulp "^4.0.2"
merge-stream "^2.0.0" merge-stream "^2.0.0"
micromatch "^4.0.2" micromatch "^4.0.2"
path "^0.12.7"
"@abp/bootstrap-datepicker@~4.2.1": "@abp/bootstrap-datepicker@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.2.1.tgz#87fe913aa6923a39206f4481af3b02309e2cebd5" resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.4.0-rc.1.tgz#9885772427e4dbcc98d76a404a6a85e84e32671f"
integrity sha512-35uaM+OBUqsBBIF08NUu7XBVIgwVQIjJard92Px7eR0EJ2AW6f5hNlJQYfPkYVdmkPIpG16qWctICB+L2W3ZKA== integrity sha512-Rb27WGmTTk4duDkQP8wO6N1xjSgXvmgW7zbKsoyzBPrySDsT+MyCXKWyslyEBg0Fk4HUhiRARVRAecOBnFq+dg==
dependencies: dependencies:
bootstrap-datepicker "^1.9.0" bootstrap-datepicker "^1.9.0"
"@abp/bootstrap@~4.2.1": "@abp/bootstrap@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.2.1.tgz#12d8b0cddb5fca55888e01644ff49ed7d78069e9" resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.4.0-rc.1.tgz#cf5caf4e33e3afcd763603622c22c1585f49d21b"
integrity sha512-1Z4atDgHDxesjBh5uPb442NALcUucS2Lt56CaN5UPBXQvAPr72cw4hfKbW08KJ0ab7WME0uCi1vYZFM28/zqTg== integrity sha512-TytaRAVAxH/zIA3xLv/Kt909dou4EO57lnqz/wNorzoBxXdwmSDcIGx7IZkmQwXih8Sj+opC4QORJ6w02FMprA==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
bootstrap "^4.5.0" bootstrap "^4.6.0"
bootstrap-v4-rtl "4.4.1-2" bootstrap-v4-rtl "4.6.0-1"
"@abp/core@~4.2.1": "@abp/core@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.2.1.tgz#1e74b0ffbc8c938e8de2f320594637910a09cbab" resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.4.0-rc.1.tgz#cf31b5a0136e388d6d300b5274ccaedd6f886b42"
integrity sha512-EiJSgUytS9Mrv8GZr9pwIzxwlrP82hEcS67cAgDxBc4QOhtMXhGZBMjDBHoIkOt6Db/ua0iPC700w0Utt5kWZQ== integrity sha512-q8yh3nQhBV85hfn3D0K3yWoj7wxvTw7ZjYA3+YpIClyG3/W4+PB/eAC7+VjybMxX4BMpt/694kYHNd7s78DxRA==
dependencies: dependencies:
"@abp/utils" "^4.2.1" "@abp/utils" "^4.4.0-rc.1"
"@abp/datatables.net-bs4@~4.2.1": "@abp/datatables.net-bs4@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.2.1.tgz#fa6d711e6af352672879130a931fc2d27e5fd9e7" resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.4.0-rc.1.tgz#8b597f4205c5cf6eeab252968767f27bead51cbf"
integrity sha512-T66P74F58n4P5xwfhekriSr66A35okrXw61mlMXqeet8ACtxiM55MhXw89qvsL0qo5qG/a9d9MWPYNmZgXvKSQ== integrity sha512-Tuoa5qOv4XPo7EJHU9lzFYFn0DFVG3jFTaCxruKLybPXnNCmyzgwLuQmD0U2hI/oRGb0JILcD6QCfOqfOs7Jsg==
dependencies: dependencies:
"@abp/datatables.net" "~4.2.1" "@abp/datatables.net" "~4.4.0-rc.1"
datatables.net-bs4 "^1.10.21" datatables.net-bs4 "^1.10.21"
"@abp/datatables.net@~4.2.1": "@abp/datatables.net@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.2.1.tgz#a5f3549b7b581619bbffb398b2172ed7789d0486" resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.4.0-rc.1.tgz#c8996770323bd4310c4d2b057d5ceb396aa159f2"
integrity sha512-ZxpSW6PhJupjecTC25MEKTdjePvg2xNouqioL9L7V3lPJ6S3fsqNs9QFjFjpv0vltzXMaZgJTSuxilmR6s6piw== integrity sha512-67Gy/nNE3z8XfGUdQGpA491r6NOPpyBChrqnenhsMiNq65ZJVcJDgtc5KLc8hDXMvNFtuTXNRBgLpK8Xs5R/LQ==
dependencies: dependencies:
"@abp/jquery" "~4.2.1" "@abp/jquery" "~4.4.0-rc.1"
datatables.net "^1.10.21" datatables.net "^1.10.21"
"@abp/font-awesome@~4.2.1": "@abp/font-awesome@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.2.1.tgz#81d718b08a1f08bf35dd0887f9c6c9f1ea5416ee" resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.4.0-rc.1.tgz#8305b6e26b22afd29a71407c033362bdf3cf6eec"
integrity sha512-kWAOqN7OtiBA7gd3VLH7pft1A5KYnJGJCn56xoqWIqLyHrSapwI5IMOojRDr+WhQJXk5EGE+rnmqRP51MYo4NQ== integrity sha512-vmPn7Kvy2F1WHFzypymnGKQtYCkYSZMH288wuhdvqEPosHsmK583eqFuoF1kXE4T2D84nhyXC/mGxv2053NvQQ==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
"@fortawesome/fontawesome-free" "^5.13.0" "@fortawesome/fontawesome-free" "^5.13.0"
"@abp/jquery-form@~4.2.1": "@abp/jquery-form@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.2.1.tgz#bbc21aafd88aa0f89619ce72fbafc917812d15e4" resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.4.0-rc.1.tgz#ba4c468014cd3f95641daf856e024ad5153268a4"
integrity sha512-xnxaaOExhz7/8/P6XGvQuKitpuVjzoZz+r1Kr+W9gVy0dWZcCOfeVi4kdpxDFpqUmQJQJi0tvdVkFHx/hAkB7g== integrity sha512-hWEousKP7h4C8IQj9a/4aYSCi7HXiBQemRt9tCyERQMMD1lz22+PYVrFJvnVJT0nh/t9tbfKzpW6pRHorQu4fA==
dependencies: dependencies:
"@abp/jquery" "~4.2.1" "@abp/jquery" "~4.4.0-rc.1"
jquery-form "^4.3.0" jquery-form "^4.3.0"
"@abp/jquery-validation-unobtrusive@~4.2.1": "@abp/jquery-validation-unobtrusive@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.2.1.tgz#36681e75e43e8f708bbd5d6e359eefd8dcce86df" resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.4.0-rc.1.tgz#399c82f2d5818f484998a90776a19fd89fb09ff4"
integrity sha512-STuVKdSUNjrW3q30GcszgzecHDdPmL3aA0jPsRJr0S2Wp5CQOe0dB7d5xyAnADIL68cPXjZWlz1OyXSQ2LixeQ== integrity sha512-GSQaOp3xjhQp91C6rbPFpTC78yv6wqy8N21ZV0Ncl1f5jTMi34XBD2ysT5ruhzjDhEEmihULwzGZdkNTBCmmkw==
dependencies: dependencies:
"@abp/jquery-validation" "~4.2.1" "@abp/jquery-validation" "~4.4.0-rc.1"
jquery-validation-unobtrusive "^3.2.11" jquery-validation-unobtrusive "^3.2.11"
"@abp/jquery-validation@~4.2.1": "@abp/jquery-validation@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.2.1.tgz#209b0acb500ac301bb66b3f04bc18b9c574e2fcf" resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.4.0-rc.1.tgz#f27e0ecf9787a7b4a733067f28dd757bbd2a1b86"
integrity sha512-g87I0nO7Jk2d4Jt7PlLk/bHu5xQFH4+mbHwH4oRLAzflDhRNtNB+uVF35HK/1shprmSlZt6X+bHz652SEqD81g== integrity sha512-nATvgXwLoZVJrOV8NGo2QyOrLbblethTBiJ8TgonOXJAiWOQlIKNgsVKeyy8/nF3W48NqDgsZagt1JNXNEbcYg==
dependencies: dependencies:
"@abp/jquery" "~4.2.1" "@abp/jquery" "~4.4.0-rc.1"
jquery-validation "^1.19.2" jquery-validation "^1.19.2"
"@abp/jquery@~4.2.1": "@abp/jquery@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.2.1.tgz#b8ed11cbc02d33cdc99cacbaf5089343a0f164c5" resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.4.0-rc.1.tgz#de1d8824b422ac96e4a07ee167058c00411786d9"
integrity sha512-xcoSu/2qc2AEF+dCTNHTCWjAo1dIcohHVPM3Yh36bb+JEcnruYYRokqZc4pzkh0GQamE1eMVGi3QOAmuURtbCg== integrity sha512-StOe74MNhXqTNAdnCkrG/UM77keR9TYEiZ2vLOW23cteOgV8ohhJXH7xhNKfFkiQBla88utt7Txyx8VNA12E/Q==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
jquery "~3.5.1" jquery "~3.6.0"
"@abp/lodash@~4.2.1": "@abp/lodash@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.2.1.tgz#87b7f48cf494553f7cd43dddf625a90581555ae7" resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.4.0-rc.1.tgz#1a07a87e9f360a4a1f2ed4fd19743145aa411e33"
integrity sha512-hDwzR/Q9GqXPdQaijQ3B4GIWZ8z9clCW9vU59qbELD8xBZIJalTSrUGnIT8YNB9O5tNFb2FWJJbw5Nh8K7lu1A== integrity sha512-Gm10DDUTulWIw4XnPDXiy7A2xfGPD1UueRqLhrJ0JT0mgnys6Kaib49tsnzDhPJBv07Oufnw+p57Aq+YUOF4fg==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
lodash "^4.17.15" lodash "^4.17.15"
"@abp/luxon@~4.2.1": "@abp/luxon@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.2.1.tgz#e29c1fe9903beb0fc4d32cab90a5de4ebc768e43" resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.4.0-rc.1.tgz#5c3f4ac1fcdfb80d79a4dd50381eaff38637949f"
integrity sha512-Sussnocvw75EbJ1j0Ohn7F+SBQy9xPbiG6RJExdDFzxhUNsVp5wJF2Jm8hOZB3DYkeGAOskY5RoIG0abfE/j3w== integrity sha512-bfLgQJE3WAEIC3HxfCFTdMNWNs/nCe9pDGN8qsiUmQ0P0ZEQzkXvNSRe9idQP2Cbn/0q0+y44oa9v2sLT1LGsQ==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
luxon "^1.24.1" luxon "^1.24.1"
"@abp/malihu-custom-scrollbar-plugin@~4.2.1": "@abp/malihu-custom-scrollbar-plugin@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.2.1.tgz#0c491d772ab0bb03d7eead0b9715bddb44252d56" resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.4.0-rc.1.tgz#370a459024f62abfb58c73cc63c42e3183374e82"
integrity sha512-qBnBMzj4G/dAMShmF4EXr55hkMehC1+cB6Jjl1wPHgMV8QPafznBKGyM6KWxGhrl8K6nCErBbidgQKpYqtWhNA== integrity sha512-bzlQDE9u99nPw0XOqORSUd57IwN2N7EmJgSrsZ1kY5YRqA1KXZFMoUBxuBHvYR38+IAN6h79wF2yMxT79dTU6w==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
malihu-custom-scrollbar-plugin "^3.1.5" malihu-custom-scrollbar-plugin "^3.1.5"
"@abp/select2@~4.2.1": "@abp/select2@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.2.1.tgz#2f397cc1754135642385333bf47a1a106dd9b165" resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.4.0-rc.1.tgz#219e3999bae4bae26bfaf2290e9cc6b79f3632eb"
integrity sha512-g1AUGof5daULbVFCokR9JS1/4gIpEWKB5/+rRJBmnje2hUgBA3llD5PCOh5WRHA7urJJOD/5BjWlFdozluUAyg== integrity sha512-qhJZOt6e9mTggS8Qn779OtUZADwbvtErZa4xgRgwS4lzBJEpQjZzfBVnKQZ7K74MOn7nHRFvC4dTEDbzhcfukg==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
select2 "^4.0.13" select2 "^4.0.13"
"@abp/sweetalert@~4.2.1": "@abp/sweetalert@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.2.1.tgz#bdbc28c3f73b314b8ca792ea73390fe9f558c03f" resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.4.0-rc.1.tgz#35f678daca1bb9839e8789c0a8da58c7423f5faa"
integrity sha512-xTi0oSjAkFMIDHgF8YB+oqFCl4gNfnt7mGHvEjJwpCEQSkuML9QsiGvw1TpXyHP7npOWSjjVpoyEBS2HXC778Q== integrity sha512-lY7lYcR9fs+k468Cr9l5kZaH6+FAqc765teSsJrIAdr1fxnDPzZWxoSSqNc3a8mEg125c2NwOD8L+AYOGqMFiQ==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
sweetalert "^2.1.2" sweetalert "^2.1.2"
"@abp/timeago@~4.2.1": "@abp/timeago@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.2.1.tgz#38474ed4455e94c687a3124e1a6e77c3b29a87d3" resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.4.0-rc.1.tgz#ba6c9c01727016b06e70eacfbc218bbe033b3a93"
integrity sha512-46+2plKizUcRn2VWN5WPWvwEVz+xoKOmsH1tEJ8WKKNxjeNRAsfeOslbfIEks89hTXLQemP3txAbq9V3E8pwQw== integrity sha512-fxRMdYrnZTC2FbBXJfX5nlKVILXFmxRdZ4PW+DhSolsDSG2FR3yesbqS2SWoLuGvr81oBIkXbECaf7S/oWA2Iw==
dependencies: dependencies:
"@abp/jquery" "~4.2.1" "@abp/jquery" "~4.4.0-rc.1"
timeago "^1.6.7" timeago "^1.6.7"
"@abp/toastr@~4.2.1": "@abp/toastr@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.2.1.tgz#9e30607f7ff7067588d0a660226d338003c37707" resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.4.0-rc.1.tgz#a559665b3516f0f1eaba1c2b6fdd91d47cf25b62"
integrity sha512-fdlMZjffEO/05aeG8BjTspARKGtUu2SpoFViTeHGhSPsCW55BvuehIgRhyOEQNfMqJz8m0cVR0R2q+WPFWf1XA== integrity sha512-7BUywNmL/hXzR4hpcQejcA9YMsLGRisqdOTpZy7abkD4wicuchHy1tr9cBSLbDIgA8oMIqM9ubh3VvPoe6pl4A==
dependencies: dependencies:
"@abp/jquery" "~4.2.1" "@abp/jquery" "~4.4.0-rc.1"
toastr "^2.1.4" toastr "^2.1.4"
"@abp/utils@^4.2.1": "@abp/utils@^4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.2.1.tgz#1f5bfa7aae0065ec4dc38f1f5dc393b664c92d5c" resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.4.0-rc.1.tgz#704764e60aae7beec2fc3ac9fff6217c1c70ddf6"
integrity sha512-V7XYC38u4C+UpXQr28KA1KHL5nNgDsFHfZULPnkwPxV8DuhzemmPYN3qmSXi5hfSfp+psNCX3GYZRMCI57kHgQ== integrity sha512-HOmxzOKueogv5mZ6b7SLzBlANYmtL3R8XFypPTky98qYYYWktSxgDkEnyvpe20+yuxKkzVW7sf/swKWEt2onIQ==
dependencies: dependencies:
just-compare "^1.3.0" just-compare "^1.3.0"
@ -357,11 +355,6 @@ async-settle@^1.0.0:
dependencies: dependencies:
async-done "^1.2.2" async-done "^1.2.2"
at-least-node@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
atob@^2.1.1: atob@^2.1.1:
version "2.1.2" version "2.1.2"
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@ -412,15 +405,15 @@ bootstrap-datepicker@^1.9.0:
dependencies: dependencies:
jquery ">=1.7.1 <4.0.0" jquery ">=1.7.1 <4.0.0"
bootstrap-v4-rtl@4.4.1-2: bootstrap-v4-rtl@4.6.0-1:
version "4.4.1-2" version "4.6.0-1"
resolved "https://registry.yarnpkg.com/bootstrap-v4-rtl/-/bootstrap-v4-rtl-4.4.1-2.tgz#93f2a5096f1a0a5462729a7b66a97a40972cc595" resolved "https://registry.yarnpkg.com/bootstrap-v4-rtl/-/bootstrap-v4-rtl-4.6.0-1.tgz#8fc502e800308fb725151128dd288df1c027cd8e"
integrity sha512-x9jZLEQzeOlkfxnR73aE/LjTD6hlqU6BbKVKdGasDByEP7dHBaxYaDGX54pfpHTom2QFqQ3t6y0WkDZW6DrQhw== integrity sha512-ChcbO5JeEQx6/Yz40YZLq3A4RIWcCmCCiRpweF5wg32/Q8CfWrwDNpcDTJ2SU+aSAewUJoCSzf/tRxhAgnZuog==
bootstrap@^4.5.0: bootstrap@^4.6.0:
version "4.5.0" version "4.6.0"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.0.tgz#97d9dbcb5a8972f8722c9962483543b907d9b9ec" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
integrity sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA== integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
brace-expansion@^1.1.7: brace-expansion@^1.1.7:
version "1.1.11" version "1.1.11"
@ -964,16 +957,6 @@ fragment-cache@^0.2.1:
dependencies: dependencies:
map-cache "^0.2.2" map-cache "^0.2.2"
fs-extra@^9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
dependencies:
at-least-node "^1.0.0"
graceful-fs "^4.2.0"
jsonfile "^6.0.1"
universalify "^1.0.0"
fs-minipass@^1.2.5: fs-minipass@^1.2.5:
version "1.2.6" version "1.2.6"
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
@ -1123,11 +1106,6 @@ graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
graceful-fs@^4.2.0:
version "4.2.4"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
gulp-cli@^2.2.0: gulp-cli@^2.2.0:
version "2.2.0" version "2.2.0"
resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.2.0.tgz#5533126eeb7fe415a7e3e84a297d334d5cf70ebc" resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.2.0.tgz#5533126eeb7fe415a7e3e84a297d334d5cf70ebc"
@ -1244,7 +1222,7 @@ inflight@^1.0.4:
once "^1.3.0" once "^1.3.0"
wrappy "1" wrappy "1"
inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
version "2.0.3" version "2.0.3"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
@ -1495,30 +1473,16 @@ jquery@>=1.12.0, "jquery@>=1.5.0 <4.0", jquery@>=1.7, "jquery@>=1.7.1 <4.0.0", j
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
jquery@>=1.8.3: jquery@>=1.8.3, jquery@~3.6.0:
version "3.6.0" version "3.6.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
jquery@~3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
json-stable-stringify-without-jsonify@^1.0.1: json-stable-stringify-without-jsonify@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
jsonfile@^6.0.1:
version "6.1.0"
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
dependencies:
universalify "^2.0.0"
optionalDependencies:
graceful-fs "^4.1.6"
just-compare@^1.3.0: just-compare@^1.3.0:
version "1.3.0" version "1.3.0"
resolved "https://registry.yarnpkg.com/just-compare/-/just-compare-1.3.0.tgz#a53c31373f150a5b238555c243af4d8a38d7a0e5" resolved "https://registry.yarnpkg.com/just-compare/-/just-compare-1.3.0.tgz#a53c31373f150a5b238555c243af4d8a38d7a0e5"
@ -2053,14 +2017,6 @@ path-type@^1.0.0:
pify "^2.0.0" pify "^2.0.0"
pinkie-promise "^2.0.0" pinkie-promise "^2.0.0"
path@^0.12.7:
version "0.12.7"
resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"
integrity sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=
dependencies:
process "^0.11.1"
util "^0.10.3"
picomatch@^2.0.5: picomatch@^2.0.5:
version "2.2.2" version "2.2.2"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
@ -2098,11 +2054,6 @@ process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
process@^0.11.1:
version "0.11.10"
resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
promise-polyfill@^6.0.2: promise-polyfill@^6.0.2:
version "6.1.0" version "6.1.0"
resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-6.1.0.tgz#dfa96943ea9c121fca4de9b5868cb39d3472e057" resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-6.1.0.tgz#dfa96943ea9c121fca4de9b5868cb39d3472e057"
@ -2674,16 +2625,6 @@ unique-stream@^2.0.2:
json-stable-stringify-without-jsonify "^1.0.1" json-stable-stringify-without-jsonify "^1.0.1"
through2-filter "^3.0.0" through2-filter "^3.0.0"
universalify@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
universalify@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
unset-value@^1.0.0: unset-value@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@ -2712,13 +2653,6 @@ util-deprecate@~1.0.1:
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
util@^0.10.3:
version "0.10.4"
resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
dependencies:
inherits "2.0.3"
v8flags@^3.0.1: v8flags@^3.0.1:
version "3.1.3" version "3.1.3"
resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8" resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8"

4
src/EventHub.Web.Theme/EventHub.Web.Theme.csproj

@ -30,8 +30,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

18
src/EventHub.Web/EventHub.Web.csproj

@ -27,15 +27,15 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AutoMapper" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AutoMapper" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.Client" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.2.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Swashbuckle" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/EventHub.Web/EventHubWebModule.cs

@ -228,7 +228,7 @@ namespace EventHub.Web
} }
app.UseCorrelationId(); app.UseCorrelationId();
app.UseVirtualFiles(); app.UseStaticFiles();
app.UseRouting(); app.UseRouting();
app.UseAuthentication(); app.UseAuthentication();
app.UseAuthorization(); app.UseAuthorization();

4
src/EventHub.Web/package.json

@ -3,8 +3,8 @@
"name": "my-app", "name": "my-app",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~4.2.1", "@abp/aspnetcore.mvc.ui.theme.basic": "~4.4.0-rc.1",
"daterangepicker": "^3.1.0", "daterangepicker": "^3.1.0",
"owl.carousel": "^2.3.4" "owl.carousel": "^2.3.4"
} }
} }

7
src/EventHub.Web/wwwroot/libs/abp/core/abp.js

@ -684,6 +684,13 @@ var abp = abp || {};
document.cookie = cookieValue; document.cookie = cookieValue;
} }
/**
* Escape HTML to help prevent XSS attacks.
*/
abp.utils.htmlEscape = function (html) {
return typeof html === 'string' ? html.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;') : html;
}
/* SECURITY ***************************************/ /* SECURITY ***************************************/
abp.security = abp.security || {}; abp.security = abp.security || {};
abp.security.antiForgery = abp.security.antiForgery || {}; abp.security.antiForgery = abp.security.antiForgery || {};

15
src/EventHub.Web/wwwroot/libs/abp/jquery/abp.jquery.js

@ -99,19 +99,28 @@ var abp = abp || {};
options.success = undefined; options.success = undefined;
options.error = undefined; options.error = undefined;
return $.Deferred(function ($dfd) { var xhr = null;
$.ajax(options) var promise = $.Deferred(function ($dfd) {
xhr = $.ajax(options)
.done(function (data, textStatus, jqXHR) { .done(function (data, textStatus, jqXHR) {
$dfd.resolve(data); $dfd.resolve(data);
userOptions.success && userOptions.success(data); userOptions.success && userOptions.success(data);
}).fail(function (jqXHR) { }).fail(function (jqXHR) {
if(jqXHR.statusText === 'abort') {
//ajax request is abort, ignore error handle.
return;
}
if (jqXHR.getResponseHeader('_AbpErrorFormat') === 'true') { if (jqXHR.getResponseHeader('_AbpErrorFormat') === 'true') {
abp.ajax.handleAbpErrorResponse(jqXHR, userOptions, $dfd); abp.ajax.handleAbpErrorResponse(jqXHR, userOptions, $dfd);
} else { } else {
abp.ajax.handleNonAbpErrorResponse(jqXHR, userOptions, $dfd); abp.ajax.handleNonAbpErrorResponse(jqXHR, userOptions, $dfd);
} }
}); });
}); }).promise();
promise['jqXHR'] = xhr;
return promise;
}; };
$.extend(abp.ajax, { $.extend(abp.ajax, {

509
src/EventHub.Web/wwwroot/libs/bootstrap/css/bootstrap-rtl.css

File diff suppressed because it is too large

2
src/EventHub.Web/wwwroot/libs/bootstrap/css/bootstrap-rtl.css.map

File diff suppressed because one or more lines are too long

214
src/EventHub.Web/wwwroot/libs/bootstrap/css/bootstrap.css

@ -1,8 +1,8 @@
/*! /*!
* Bootstrap v4.5.0 (https://getbootstrap.com/) * Bootstrap v4.6.0 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors * Copyright 2011-2021 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc. * Copyright 2011-2021 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/ */
:root { :root {
--blue: #007bff; --blue: #007bff;
@ -31,7 +31,7 @@
--breakpoint-md: 768px; --breakpoint-md: 768px;
--breakpoint-lg: 992px; --breakpoint-lg: 992px;
--breakpoint-xl: 1200px; --breakpoint-xl: 1200px;
--font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
} }
@ -54,7 +54,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
body { body {
margin: 0; margin: 0;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-size: 1rem; font-size: 1rem;
font-weight: 400; font-weight: 400;
line-height: 1.5; line-height: 1.5;
@ -163,12 +163,12 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
a:not([href]) { a:not([href]):not([class]) {
color: inherit; color: inherit;
text-decoration: none; text-decoration: none;
} }
a:not([href]):hover { a:not([href]):not([class]):hover {
color: inherit; color: inherit;
text-decoration: none; text-decoration: none;
} }
@ -216,6 +216,7 @@ caption {
th { th {
text-align: inherit; text-align: inherit;
text-align: -webkit-match-parent;
} }
label { label {
@ -227,9 +228,8 @@ button {
border-radius: 0; border-radius: 0;
} }
button:focus { button:focus:not(:focus-visible) {
outline: 1px dotted; outline: 0;
outline: 5px auto -webkit-focus-ring-color;
} }
input, input,
@ -539,39 +539,12 @@ pre code {
overflow-y: scroll; overflow-y: scroll;
} }
.container { .container,
width: 100%; .container-fluid,
padding-right: 15px; .container-sm,
padding-left: 15px; .container-md,
margin-right: auto; .container-lg,
margin-left: auto; .container-xl {
}
@media (min-width: 576px) {
.container {
max-width: 540px;
}
}
@media (min-width: 768px) {
.container {
max-width: 720px;
}
}
@media (min-width: 992px) {
.container {
max-width: 960px;
}
}
@media (min-width: 1200px) {
.container {
max-width: 1140px;
}
}
.container-fluid, .container-sm, .container-md, .container-lg, .container-xl {
width: 100%; width: 100%;
padding-right: 15px; padding-right: 15px;
padding-left: 15px; padding-left: 15px;
@ -640,7 +613,6 @@ pre code {
flex-basis: 0; flex-basis: 0;
-ms-flex-positive: 1; -ms-flex-positive: 1;
flex-grow: 1; flex-grow: 1;
min-width: 0;
max-width: 100%; max-width: 100%;
} }
@ -884,7 +856,6 @@ pre code {
flex-basis: 0; flex-basis: 0;
-ms-flex-positive: 1; -ms-flex-positive: 1;
flex-grow: 1; flex-grow: 1;
min-width: 0;
max-width: 100%; max-width: 100%;
} }
.row-cols-sm-1 > * { .row-cols-sm-1 > * {
@ -1087,7 +1058,6 @@ pre code {
flex-basis: 0; flex-basis: 0;
-ms-flex-positive: 1; -ms-flex-positive: 1;
flex-grow: 1; flex-grow: 1;
min-width: 0;
max-width: 100%; max-width: 100%;
} }
.row-cols-md-1 > * { .row-cols-md-1 > * {
@ -1290,7 +1260,6 @@ pre code {
flex-basis: 0; flex-basis: 0;
-ms-flex-positive: 1; -ms-flex-positive: 1;
flex-grow: 1; flex-grow: 1;
min-width: 0;
max-width: 100%; max-width: 100%;
} }
.row-cols-lg-1 > * { .row-cols-lg-1 > * {
@ -1493,7 +1462,6 @@ pre code {
flex-basis: 0; flex-basis: 0;
-ms-flex-positive: 1; -ms-flex-positive: 1;
flex-grow: 1; flex-grow: 1;
min-width: 0;
max-width: 100%; max-width: 100%;
} }
.row-cols-xl-1 > * { .row-cols-xl-1 > * {
@ -2259,6 +2227,7 @@ textarea.form-control {
.valid-tooltip { .valid-tooltip {
position: absolute; position: absolute;
top: 100%; top: 100%;
left: 0;
z-index: 5; z-index: 5;
display: none; display: none;
max-width: 100%; max-width: 100%;
@ -2271,6 +2240,11 @@ textarea.form-control {
border-radius: 0.25rem; border-radius: 0.25rem;
} }
.form-row > .col > .valid-tooltip,
.form-row > [class*="col-"] > .valid-tooltip {
left: 5px;
}
.was-validated :valid ~ .valid-feedback, .was-validated :valid ~ .valid-feedback,
.was-validated :valid ~ .valid-tooltip, .was-validated :valid ~ .valid-tooltip,
.is-valid ~ .valid-feedback, .is-valid ~ .valid-feedback,
@ -2300,7 +2274,7 @@ textarea.form-control {
.was-validated .custom-select:valid, .custom-select.is-valid { .was-validated .custom-select:valid, .custom-select.is-valid {
border-color: #28a745; border-color: #28a745;
padding-right: calc(0.75em + 2.3125rem); padding-right: calc(0.75em + 2.3125rem);
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px, url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem); background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") right 0.75rem center/8px 10px no-repeat, #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem) no-repeat;
} }
.was-validated .custom-select:valid:focus, .custom-select.is-valid:focus { .was-validated .custom-select:valid:focus, .custom-select.is-valid:focus {
@ -2359,6 +2333,7 @@ textarea.form-control {
.invalid-tooltip { .invalid-tooltip {
position: absolute; position: absolute;
top: 100%; top: 100%;
left: 0;
z-index: 5; z-index: 5;
display: none; display: none;
max-width: 100%; max-width: 100%;
@ -2371,6 +2346,11 @@ textarea.form-control {
border-radius: 0.25rem; border-radius: 0.25rem;
} }
.form-row > .col > .invalid-tooltip,
.form-row > [class*="col-"] > .invalid-tooltip {
left: 5px;
}
.was-validated :invalid ~ .invalid-feedback, .was-validated :invalid ~ .invalid-feedback,
.was-validated :invalid ~ .invalid-tooltip, .was-validated :invalid ~ .invalid-tooltip,
.is-invalid ~ .invalid-feedback, .is-invalid ~ .invalid-feedback,
@ -2400,7 +2380,7 @@ textarea.form-control {
.was-validated .custom-select:invalid, .custom-select.is-invalid { .was-validated .custom-select:invalid, .custom-select.is-invalid {
border-color: #dc3545; border-color: #dc3545;
padding-right: calc(0.75em + 2.3125rem); padding-right: calc(0.75em + 2.3125rem);
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px, url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem); background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") right 0.75rem center/8px 10px no-repeat, #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e") center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem) no-repeat;
} }
.was-validated .custom-select:invalid:focus, .custom-select.is-invalid:focus { .was-validated .custom-select:invalid:focus, .custom-select.is-invalid:focus {
@ -3417,7 +3397,7 @@ input[type="button"].btn-block {
.dropdown-item:hover, .dropdown-item:focus { .dropdown-item:hover, .dropdown-item:focus {
color: #16181b; color: #16181b;
text-decoration: none; text-decoration: none;
background-color: #f8f9fa; background-color: #e9ecef;
} }
.dropdown-item.active, .dropdown-item:active { .dropdown-item.active, .dropdown-item:active {
@ -3427,7 +3407,7 @@ input[type="button"].btn-block {
} }
.dropdown-item.disabled, .dropdown-item:disabled { .dropdown-item.disabled, .dropdown-item:disabled {
color: #6c757d; color: #adb5bd;
pointer-events: none; pointer-events: none;
background-color: transparent; background-color: transparent;
} }
@ -3626,12 +3606,6 @@ input[type="button"].btn-block {
z-index: 4; z-index: 4;
} }
.input-group > .form-control:not(:last-child),
.input-group > .custom-select:not(:last-child) {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.input-group > .form-control:not(:first-child), .input-group > .form-control:not(:first-child),
.input-group > .custom-select:not(:first-child) { .input-group > .custom-select:not(:first-child) {
border-top-left-radius: 0; border-top-left-radius: 0;
@ -3646,14 +3620,23 @@ input[type="button"].btn-block {
} }
.input-group > .custom-file:not(:last-child) .custom-file-label, .input-group > .custom-file:not(:last-child) .custom-file-label,
.input-group > .custom-file:not(:last-child) .custom-file-label::after { .input-group > .custom-file:not(:first-child) .custom-file-label {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
.input-group:not(.has-validation) > .form-control:not(:last-child),
.input-group:not(.has-validation) > .custom-select:not(:last-child),
.input-group:not(.has-validation) > .custom-file:not(:last-child) .custom-file-label::after {
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
.input-group > .custom-file:not(:first-child) .custom-file-label { .input-group.has-validation > .form-control:nth-last-child(n + 3),
border-top-left-radius: 0; .input-group.has-validation > .custom-select:nth-last-child(n + 3),
border-bottom-left-radius: 0; .input-group.has-validation > .custom-file:nth-last-child(n + 3) .custom-file-label::after {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
} }
.input-group-prepend, .input-group-prepend,
@ -3756,8 +3739,10 @@ input[type="button"].btn-block {
.input-group > .input-group-prepend > .btn, .input-group > .input-group-prepend > .btn,
.input-group > .input-group-prepend > .input-group-text, .input-group > .input-group-prepend > .input-group-text,
.input-group > .input-group-append:not(:last-child) > .btn, .input-group:not(.has-validation) > .input-group-append:not(:last-child) > .btn,
.input-group > .input-group-append:not(:last-child) > .input-group-text, .input-group:not(.has-validation) > .input-group-append:not(:last-child) > .input-group-text,
.input-group.has-validation > .input-group-append:nth-last-child(n + 3) > .btn,
.input-group.has-validation > .input-group-append:nth-last-child(n + 3) > .input-group-text,
.input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle), .input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle),
.input-group > .input-group-append:last-child > .input-group-text:not(:last-child) { .input-group > .input-group-append:last-child > .input-group-text:not(:last-child) {
border-top-right-radius: 0; border-top-right-radius: 0;
@ -3776,9 +3761,12 @@ input[type="button"].btn-block {
.custom-control { .custom-control {
position: relative; position: relative;
z-index: 1;
display: block; display: block;
min-height: 1.5rem; min-height: 1.5rem;
padding-left: 1.5rem; padding-left: 1.5rem;
-webkit-print-color-adjust: exact;
color-adjust: exact;
} }
.custom-control-inline { .custom-control-inline {
@ -3851,7 +3839,7 @@ input[type="button"].btn-block {
width: 1rem; width: 1rem;
height: 1rem; height: 1rem;
content: ""; content: "";
background: no-repeat 50% / 50% 50%; background: 50% / 50% 50% no-repeat;
} }
.custom-checkbox .custom-control-label::before { .custom-checkbox .custom-control-label::before {
@ -3940,7 +3928,7 @@ input[type="button"].btn-block {
line-height: 1.5; line-height: 1.5;
color: #495057; color: #495057;
vertical-align: middle; vertical-align: middle;
background: #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px; background: #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") right 0.75rem center/8px 10px no-repeat;
border: 1px solid #ced4da; border: 1px solid #ced4da;
border-radius: 0.25rem; border-radius: 0.25rem;
-webkit-appearance: none; -webkit-appearance: none;
@ -4009,6 +3997,7 @@ input[type="button"].btn-block {
width: 100%; width: 100%;
height: calc(1.5em + 0.75rem + 2px); height: calc(1.5em + 0.75rem + 2px);
margin: 0; margin: 0;
overflow: hidden;
opacity: 0; opacity: 0;
} }
@ -4038,6 +4027,7 @@ input[type="button"].btn-block {
z-index: 1; z-index: 1;
height: calc(1.5em + 0.75rem + 2px); height: calc(1.5em + 0.75rem + 2px);
padding: 0.375rem 0.75rem; padding: 0.375rem 0.75rem;
overflow: hidden;
font-weight: 400; font-weight: 400;
line-height: 1.5; line-height: 1.5;
color: #495057; color: #495057;
@ -4074,7 +4064,7 @@ input[type="button"].btn-block {
} }
.custom-range:focus { .custom-range:focus {
outline: none; outline: 0;
} }
.custom-range:focus::-webkit-slider-thumb { .custom-range:focus::-webkit-slider-thumb {
@ -4269,11 +4259,8 @@ input[type="button"].btn-block {
border-bottom: 1px solid #dee2e6; border-bottom: 1px solid #dee2e6;
} }
.nav-tabs .nav-item {
margin-bottom: -1px;
}
.nav-tabs .nav-link { .nav-tabs .nav-link {
margin-bottom: -1px;
border: 1px solid transparent; border: 1px solid transparent;
border-top-left-radius: 0.25rem; border-top-left-radius: 0.25rem;
border-top-right-radius: 0.25rem; border-top-right-radius: 0.25rem;
@ -4312,12 +4299,14 @@ input[type="button"].btn-block {
background-color: #007bff; background-color: #007bff;
} }
.nav-fill > .nav-link,
.nav-fill .nav-item { .nav-fill .nav-item {
-ms-flex: 1 1 auto; -ms-flex: 1 1 auto;
flex: 1 1 auto; flex: 1 1 auto;
text-align: center; text-align: center;
} }
.nav-justified > .nav-link,
.nav-justified .nav-item { .nav-justified .nav-item {
-ms-flex-preferred-size: 0; -ms-flex-preferred-size: 0;
flex-basis: 0; flex-basis: 0;
@ -4427,8 +4416,12 @@ input[type="button"].btn-block {
height: 1.5em; height: 1.5em;
vertical-align: middle; vertical-align: middle;
content: ""; content: "";
background: no-repeat center center; background: 50% / 100% 100% no-repeat;
background-size: 100% 100%; }
.navbar-nav-scroll {
max-height: 75vh;
overflow-y: auto;
} }
@media (max-width: 575.98px) { @media (max-width: 575.98px) {
@ -4462,6 +4455,9 @@ input[type="button"].btn-block {
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.navbar-expand-sm .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand-sm .navbar-collapse { .navbar-expand-sm .navbar-collapse {
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
@ -4504,6 +4500,9 @@ input[type="button"].btn-block {
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.navbar-expand-md .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand-md .navbar-collapse { .navbar-expand-md .navbar-collapse {
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
@ -4546,6 +4545,9 @@ input[type="button"].btn-block {
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.navbar-expand-lg .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand-lg .navbar-collapse { .navbar-expand-lg .navbar-collapse {
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
@ -4588,6 +4590,9 @@ input[type="button"].btn-block {
-ms-flex-wrap: nowrap; -ms-flex-wrap: nowrap;
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.navbar-expand-xl .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand-xl .navbar-collapse { .navbar-expand-xl .navbar-collapse {
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
@ -4632,6 +4637,10 @@ input[type="button"].btn-block {
flex-wrap: nowrap; flex-wrap: nowrap;
} }
.navbar-expand .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand .navbar-collapse { .navbar-expand .navbar-collapse {
display: -ms-flexbox !important; display: -ms-flexbox !important;
display: flex !important; display: flex !important;
@ -4775,6 +4784,11 @@ input[type="button"].btn-block {
border-bottom-left-radius: calc(0.25rem - 1px); border-bottom-left-radius: calc(0.25rem - 1px);
} }
.card > .card-header + .list-group,
.card > .list-group + .card-footer {
border-top: 0;
}
.card-body { .card-body {
-ms-flex: 1 1 auto; -ms-flex: 1 1 auto;
flex: 1 1 auto; flex: 1 1 auto;
@ -4814,10 +4828,6 @@ input[type="button"].btn-block {
border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0; border-radius: calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0;
} }
.card-header + .list-group .list-group-item:first-child {
border-top: 0;
}
.card-footer { .card-footer {
padding: 0.75rem 1.25rem; padding: 0.75rem 1.25rem;
background-color: rgba(0, 0, 0, 0.03); background-color: rgba(0, 0, 0, 0.03);
@ -4847,6 +4857,7 @@ input[type="button"].btn-block {
bottom: 0; bottom: 0;
left: 0; left: 0;
padding: 1.25rem; padding: 1.25rem;
border-radius: calc(0.25rem - 1px);
} }
.card-img, .card-img,
@ -4958,6 +4969,10 @@ input[type="button"].btn-block {
} }
} }
.accordion {
overflow-anchor: none;
}
.accordion > .card { .accordion > .card {
overflow: hidden; overflow: hidden;
} }
@ -4990,17 +5005,12 @@ input[type="button"].btn-block {
border-radius: 0.25rem; border-radius: 0.25rem;
} }
.breadcrumb-item {
display: -ms-flexbox;
display: flex;
}
.breadcrumb-item + .breadcrumb-item { .breadcrumb-item + .breadcrumb-item {
padding-left: 0.5rem; padding-left: 0.5rem;
} }
.breadcrumb-item + .breadcrumb-item::before { .breadcrumb-item + .breadcrumb-item::before {
display: inline-block; float: left;
padding-right: 0.5rem; padding-right: 0.5rem;
color: #6c757d; color: #6c757d;
content: "/"; content: "/";
@ -5310,6 +5320,7 @@ a.badge-dark:focus, a.badge-dark.focus {
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
z-index: 2;
padding: 0.75rem 1.25rem; padding: 0.75rem 1.25rem;
color: inherit; color: inherit;
} }
@ -5482,8 +5493,8 @@ a.badge-dark:focus, a.badge-dark.focus {
} }
.progress-bar-animated { .progress-bar-animated {
-webkit-animation: progress-bar-stripes 1s linear infinite; -webkit-animation: 1s linear infinite progress-bar-stripes;
animation: progress-bar-stripes 1s linear infinite; animation: 1s linear infinite progress-bar-stripes;
} }
@media (prefers-reduced-motion: reduce) { @media (prefers-reduced-motion: reduce) {
@ -5876,15 +5887,14 @@ a.close.disabled {
} }
.toast { .toast {
-ms-flex-preferred-size: 350px;
flex-basis: 350px;
max-width: 350px; max-width: 350px;
overflow: hidden;
font-size: 0.875rem; font-size: 0.875rem;
background-color: rgba(255, 255, 255, 0.85); background-color: rgba(255, 255, 255, 0.85);
background-clip: padding-box; background-clip: padding-box;
border: 1px solid rgba(0, 0, 0, 0.1); border: 1px solid rgba(0, 0, 0, 0.1);
box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.1); box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, 0.1);
-webkit-backdrop-filter: blur(10px);
backdrop-filter: blur(10px);
opacity: 0; opacity: 0;
border-radius: 0.25rem; border-radius: 0.25rem;
} }
@ -5916,6 +5926,8 @@ a.close.disabled {
background-color: rgba(255, 255, 255, 0.85); background-color: rgba(255, 255, 255, 0.85);
background-clip: padding-box; background-clip: padding-box;
border-bottom: 1px solid rgba(0, 0, 0, 0.05); border-bottom: 1px solid rgba(0, 0, 0, 0.05);
border-top-left-radius: calc(0.25rem - 1px);
border-top-right-radius: calc(0.25rem - 1px);
} }
.toast-body { .toast-body {
@ -6161,7 +6173,7 @@ a.close.disabled {
z-index: 1070; z-index: 1070;
display: block; display: block;
margin: 0; margin: 0;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
line-height: 1.5; line-height: 1.5;
@ -6274,7 +6286,7 @@ a.close.disabled {
z-index: 1060; z-index: 1060;
display: block; display: block;
max-width: 276px; max-width: 276px;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
line-height: 1.5; line-height: 1.5;
@ -6562,7 +6574,7 @@ a.close.disabled {
display: inline-block; display: inline-block;
width: 20px; width: 20px;
height: 20px; height: 20px;
background: no-repeat 50% / 100% 100%; background: 50% / 100% 100% no-repeat;
} }
.carousel-control-prev-icon { .carousel-control-prev-icon {
@ -6651,8 +6663,8 @@ a.close.disabled {
border: 0.25em solid currentColor; border: 0.25em solid currentColor;
border-right-color: transparent; border-right-color: transparent;
border-radius: 50%; border-radius: 50%;
-webkit-animation: spinner-border .75s linear infinite; -webkit-animation: .75s linear infinite spinner-border;
animation: spinner-border .75s linear infinite; animation: .75s linear infinite spinner-border;
} }
.spinner-border-sm { .spinner-border-sm {
@ -6693,8 +6705,8 @@ a.close.disabled {
background-color: currentColor; background-color: currentColor;
border-radius: 50%; border-radius: 50%;
opacity: 0; opacity: 0;
-webkit-animation: spinner-grow .75s linear infinite; -webkit-animation: .75s linear infinite spinner-grow;
animation: spinner-grow .75s linear infinite; animation: .75s linear infinite spinner-grow;
} }
.spinner-grow-sm { .spinner-grow-sm {
@ -6702,6 +6714,14 @@ a.close.disabled {
height: 1rem; height: 1rem;
} }
@media (prefers-reduced-motion: reduce) {
.spinner-border,
.spinner-grow {
-webkit-animation-duration: 1.5s;
animation-duration: 1.5s;
}
}
.align-baseline { .align-baseline {
vertical-align: baseline !important; vertical-align: baseline !important;
} }
@ -7970,7 +7990,6 @@ button.bg-dark:focus {
.user-select-all { .user-select-all {
-webkit-user-select: all !important; -webkit-user-select: all !important;
-moz-user-select: all !important; -moz-user-select: all !important;
-ms-user-select: all !important;
user-select: all !important; user-select: all !important;
} }
@ -10182,6 +10201,7 @@ a.text-dark:hover, a.text-dark:focus {
} }
.text-break { .text-break {
word-break: break-word !important;
word-wrap: break-word !important; word-wrap: break-word !important;
} }

2
src/EventHub.Web/wwwroot/libs/bootstrap/css/bootstrap.css.map

File diff suppressed because one or more lines are too long

10
src/EventHub.Web/wwwroot/libs/bootstrap/css/bootstrap.min.css

File diff suppressed because one or more lines are too long

2
src/EventHub.Web/wwwroot/libs/bootstrap/css/bootstrap.min.css.map

File diff suppressed because one or more lines are too long

1034
src/EventHub.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.js

File diff suppressed because it is too large

2
src/EventHub.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.js.map

File diff suppressed because one or more lines are too long

8
src/EventHub.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js

File diff suppressed because one or more lines are too long

2
src/EventHub.Web/wwwroot/libs/bootstrap/js/bootstrap.bundle.min.js.map

File diff suppressed because one or more lines are too long

330
src/EventHub.Web/yarn.lock

@ -2,186 +2,184 @@
# yarn lockfile v1 # yarn lockfile v1
"@abp/aspnetcore.mvc.ui.theme.basic@~4.2.1": "@abp/aspnetcore.mvc.ui.theme.basic@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.2.1.tgz#78b465ab8fcd68a38e2b868717d00e5f5d3b0c61" resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-4.4.0-rc.1.tgz#327a26fd71183ea2b4264ce12e4558310e8243b3"
integrity sha512-Tb0g4mtdSsjQkadvnjjRjObEhweUvigto0BTv5SzRNi0oQLW8ZVUcFmuMWB09nJAIPrbuA3QuPUlXzFcv2gsdg== integrity sha512-YycorI8c5EUx0Wi50R+Vrvd3m52RTntDB51y0u+2/UebEP9TkJfw0BowLDRqISLKQ1cqnrh5U+JlwPIUFD9hTA==
dependencies: dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~4.2.1" "@abp/aspnetcore.mvc.ui.theme.shared" "~4.4.0-rc.1"
"@abp/aspnetcore.mvc.ui.theme.shared@~4.2.1": "@abp/aspnetcore.mvc.ui.theme.shared@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.2.1.tgz#18205c13f137dad9876c4153f34273a7c8e69854" resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-4.4.0-rc.1.tgz#fe3b8aab3db2a5406b68db0355942e1267c1c81e"
integrity sha512-+f54CysWpEKfxjIIjhnTKW0jJ0Rg+wS6yxb9Rg3qxA5iEUkxp3B+NB5wA9rT5YcY9APrwVpiw1miNRmq5ZvFXg== integrity sha512-QA861zNC2nrNxy5P7A7YtJrA6cRz6yvGIZEnasqYUQ3pqrmkV526AoPJrxIYfn8gjs2FiUHcEIirYx9IriL0Pg==
dependencies: dependencies:
"@abp/aspnetcore.mvc.ui" "~4.2.1" "@abp/aspnetcore.mvc.ui" "~4.4.0-rc.1"
"@abp/bootstrap" "~4.2.1" "@abp/bootstrap" "~4.4.0-rc.1"
"@abp/bootstrap-datepicker" "~4.2.1" "@abp/bootstrap-datepicker" "~4.4.0-rc.1"
"@abp/datatables.net-bs4" "~4.2.1" "@abp/datatables.net-bs4" "~4.4.0-rc.1"
"@abp/font-awesome" "~4.2.1" "@abp/font-awesome" "~4.4.0-rc.1"
"@abp/jquery-form" "~4.2.1" "@abp/jquery-form" "~4.4.0-rc.1"
"@abp/jquery-validation-unobtrusive" "~4.2.1" "@abp/jquery-validation-unobtrusive" "~4.4.0-rc.1"
"@abp/lodash" "~4.2.1" "@abp/lodash" "~4.4.0-rc.1"
"@abp/luxon" "~4.2.1" "@abp/luxon" "~4.4.0-rc.1"
"@abp/malihu-custom-scrollbar-plugin" "~4.2.1" "@abp/malihu-custom-scrollbar-plugin" "~4.4.0-rc.1"
"@abp/select2" "~4.2.1" "@abp/select2" "~4.4.0-rc.1"
"@abp/sweetalert" "~4.2.1" "@abp/sweetalert" "~4.4.0-rc.1"
"@abp/timeago" "~4.2.1" "@abp/timeago" "~4.4.0-rc.1"
"@abp/toastr" "~4.2.1" "@abp/toastr" "~4.4.0-rc.1"
"@abp/aspnetcore.mvc.ui@~4.2.1": "@abp/aspnetcore.mvc.ui@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.2.1.tgz#2ad368af731678213ff3d8448a3dd30a2f1f66c9" resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-4.4.0-rc.1.tgz#c086d5b1b4fa2b977779ed6e666e897879c7f3cf"
integrity sha512-/a/KDVQ3EuETSSe+KqmsR24w6RWHvaokvmmOjL+tCpFQyeaYAZ88E9pvM5hC9HVR24FCHTiARiXwgMTw2eZFyQ== integrity sha512-cBzMQYmPJiXxo3z6PhLV5Sq61sWTN5e4139tpQepma4ctYBlV1+jQnNxmfCRVQio98YDk72kdkOtt7qQtP+TlA==
dependencies: dependencies:
ansi-colors "^4.1.1" ansi-colors "^4.1.1"
extend-object "^1.0.0" extend-object "^1.0.0"
fs-extra "^9.0.1"
glob "^7.1.6" glob "^7.1.6"
gulp "^4.0.2" gulp "^4.0.2"
merge-stream "^2.0.0" merge-stream "^2.0.0"
micromatch "^4.0.2" micromatch "^4.0.2"
path "^0.12.7"
"@abp/bootstrap-datepicker@~4.2.1": "@abp/bootstrap-datepicker@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.2.1.tgz#87fe913aa6923a39206f4481af3b02309e2cebd5" resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-4.4.0-rc.1.tgz#9885772427e4dbcc98d76a404a6a85e84e32671f"
integrity sha512-35uaM+OBUqsBBIF08NUu7XBVIgwVQIjJard92Px7eR0EJ2AW6f5hNlJQYfPkYVdmkPIpG16qWctICB+L2W3ZKA== integrity sha512-Rb27WGmTTk4duDkQP8wO6N1xjSgXvmgW7zbKsoyzBPrySDsT+MyCXKWyslyEBg0Fk4HUhiRARVRAecOBnFq+dg==
dependencies: dependencies:
bootstrap-datepicker "^1.9.0" bootstrap-datepicker "^1.9.0"
"@abp/bootstrap@~4.2.1": "@abp/bootstrap@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.2.1.tgz#12d8b0cddb5fca55888e01644ff49ed7d78069e9" resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-4.4.0-rc.1.tgz#cf5caf4e33e3afcd763603622c22c1585f49d21b"
integrity sha512-1Z4atDgHDxesjBh5uPb442NALcUucS2Lt56CaN5UPBXQvAPr72cw4hfKbW08KJ0ab7WME0uCi1vYZFM28/zqTg== integrity sha512-TytaRAVAxH/zIA3xLv/Kt909dou4EO57lnqz/wNorzoBxXdwmSDcIGx7IZkmQwXih8Sj+opC4QORJ6w02FMprA==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
bootstrap "^4.5.0" bootstrap "^4.6.0"
bootstrap-v4-rtl "4.4.1-2" bootstrap-v4-rtl "4.6.0-1"
"@abp/core@~4.2.1": "@abp/core@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.2.1.tgz#1e74b0ffbc8c938e8de2f320594637910a09cbab" resolved "https://registry.yarnpkg.com/@abp/core/-/core-4.4.0-rc.1.tgz#cf31b5a0136e388d6d300b5274ccaedd6f886b42"
integrity sha512-EiJSgUytS9Mrv8GZr9pwIzxwlrP82hEcS67cAgDxBc4QOhtMXhGZBMjDBHoIkOt6Db/ua0iPC700w0Utt5kWZQ== integrity sha512-q8yh3nQhBV85hfn3D0K3yWoj7wxvTw7ZjYA3+YpIClyG3/W4+PB/eAC7+VjybMxX4BMpt/694kYHNd7s78DxRA==
dependencies: dependencies:
"@abp/utils" "^4.2.1" "@abp/utils" "^4.4.0-rc.1"
"@abp/datatables.net-bs4@~4.2.1": "@abp/datatables.net-bs4@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.2.1.tgz#fa6d711e6af352672879130a931fc2d27e5fd9e7" resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-4.4.0-rc.1.tgz#8b597f4205c5cf6eeab252968767f27bead51cbf"
integrity sha512-T66P74F58n4P5xwfhekriSr66A35okrXw61mlMXqeet8ACtxiM55MhXw89qvsL0qo5qG/a9d9MWPYNmZgXvKSQ== integrity sha512-Tuoa5qOv4XPo7EJHU9lzFYFn0DFVG3jFTaCxruKLybPXnNCmyzgwLuQmD0U2hI/oRGb0JILcD6QCfOqfOs7Jsg==
dependencies: dependencies:
"@abp/datatables.net" "~4.2.1" "@abp/datatables.net" "~4.4.0-rc.1"
datatables.net-bs4 "^1.10.21" datatables.net-bs4 "^1.10.21"
"@abp/datatables.net@~4.2.1": "@abp/datatables.net@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.2.1.tgz#a5f3549b7b581619bbffb398b2172ed7789d0486" resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-4.4.0-rc.1.tgz#c8996770323bd4310c4d2b057d5ceb396aa159f2"
integrity sha512-ZxpSW6PhJupjecTC25MEKTdjePvg2xNouqioL9L7V3lPJ6S3fsqNs9QFjFjpv0vltzXMaZgJTSuxilmR6s6piw== integrity sha512-67Gy/nNE3z8XfGUdQGpA491r6NOPpyBChrqnenhsMiNq65ZJVcJDgtc5KLc8hDXMvNFtuTXNRBgLpK8Xs5R/LQ==
dependencies: dependencies:
"@abp/jquery" "~4.2.1" "@abp/jquery" "~4.4.0-rc.1"
datatables.net "^1.10.21" datatables.net "^1.10.21"
"@abp/font-awesome@~4.2.1": "@abp/font-awesome@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.2.1.tgz#81d718b08a1f08bf35dd0887f9c6c9f1ea5416ee" resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-4.4.0-rc.1.tgz#8305b6e26b22afd29a71407c033362bdf3cf6eec"
integrity sha512-kWAOqN7OtiBA7gd3VLH7pft1A5KYnJGJCn56xoqWIqLyHrSapwI5IMOojRDr+WhQJXk5EGE+rnmqRP51MYo4NQ== integrity sha512-vmPn7Kvy2F1WHFzypymnGKQtYCkYSZMH288wuhdvqEPosHsmK583eqFuoF1kXE4T2D84nhyXC/mGxv2053NvQQ==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
"@fortawesome/fontawesome-free" "^5.13.0" "@fortawesome/fontawesome-free" "^5.13.0"
"@abp/jquery-form@~4.2.1": "@abp/jquery-form@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.2.1.tgz#bbc21aafd88aa0f89619ce72fbafc917812d15e4" resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-4.4.0-rc.1.tgz#ba4c468014cd3f95641daf856e024ad5153268a4"
integrity sha512-xnxaaOExhz7/8/P6XGvQuKitpuVjzoZz+r1Kr+W9gVy0dWZcCOfeVi4kdpxDFpqUmQJQJi0tvdVkFHx/hAkB7g== integrity sha512-hWEousKP7h4C8IQj9a/4aYSCi7HXiBQemRt9tCyERQMMD1lz22+PYVrFJvnVJT0nh/t9tbfKzpW6pRHorQu4fA==
dependencies: dependencies:
"@abp/jquery" "~4.2.1" "@abp/jquery" "~4.4.0-rc.1"
jquery-form "^4.3.0" jquery-form "^4.3.0"
"@abp/jquery-validation-unobtrusive@~4.2.1": "@abp/jquery-validation-unobtrusive@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.2.1.tgz#36681e75e43e8f708bbd5d6e359eefd8dcce86df" resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-4.4.0-rc.1.tgz#399c82f2d5818f484998a90776a19fd89fb09ff4"
integrity sha512-STuVKdSUNjrW3q30GcszgzecHDdPmL3aA0jPsRJr0S2Wp5CQOe0dB7d5xyAnADIL68cPXjZWlz1OyXSQ2LixeQ== integrity sha512-GSQaOp3xjhQp91C6rbPFpTC78yv6wqy8N21ZV0Ncl1f5jTMi34XBD2ysT5ruhzjDhEEmihULwzGZdkNTBCmmkw==
dependencies: dependencies:
"@abp/jquery-validation" "~4.2.1" "@abp/jquery-validation" "~4.4.0-rc.1"
jquery-validation-unobtrusive "^3.2.11" jquery-validation-unobtrusive "^3.2.11"
"@abp/jquery-validation@~4.2.1": "@abp/jquery-validation@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.2.1.tgz#209b0acb500ac301bb66b3f04bc18b9c574e2fcf" resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-4.4.0-rc.1.tgz#f27e0ecf9787a7b4a733067f28dd757bbd2a1b86"
integrity sha512-g87I0nO7Jk2d4Jt7PlLk/bHu5xQFH4+mbHwH4oRLAzflDhRNtNB+uVF35HK/1shprmSlZt6X+bHz652SEqD81g== integrity sha512-nATvgXwLoZVJrOV8NGo2QyOrLbblethTBiJ8TgonOXJAiWOQlIKNgsVKeyy8/nF3W48NqDgsZagt1JNXNEbcYg==
dependencies: dependencies:
"@abp/jquery" "~4.2.1" "@abp/jquery" "~4.4.0-rc.1"
jquery-validation "^1.19.2" jquery-validation "^1.19.2"
"@abp/jquery@~4.2.1": "@abp/jquery@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.2.1.tgz#b8ed11cbc02d33cdc99cacbaf5089343a0f164c5" resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-4.4.0-rc.1.tgz#de1d8824b422ac96e4a07ee167058c00411786d9"
integrity sha512-xcoSu/2qc2AEF+dCTNHTCWjAo1dIcohHVPM3Yh36bb+JEcnruYYRokqZc4pzkh0GQamE1eMVGi3QOAmuURtbCg== integrity sha512-StOe74MNhXqTNAdnCkrG/UM77keR9TYEiZ2vLOW23cteOgV8ohhJXH7xhNKfFkiQBla88utt7Txyx8VNA12E/Q==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
jquery "~3.5.1" jquery "~3.6.0"
"@abp/lodash@~4.2.1": "@abp/lodash@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.2.1.tgz#87b7f48cf494553f7cd43dddf625a90581555ae7" resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-4.4.0-rc.1.tgz#1a07a87e9f360a4a1f2ed4fd19743145aa411e33"
integrity sha512-hDwzR/Q9GqXPdQaijQ3B4GIWZ8z9clCW9vU59qbELD8xBZIJalTSrUGnIT8YNB9O5tNFb2FWJJbw5Nh8K7lu1A== integrity sha512-Gm10DDUTulWIw4XnPDXiy7A2xfGPD1UueRqLhrJ0JT0mgnys6Kaib49tsnzDhPJBv07Oufnw+p57Aq+YUOF4fg==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
lodash "^4.17.15" lodash "^4.17.15"
"@abp/luxon@~4.2.1": "@abp/luxon@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.2.1.tgz#e29c1fe9903beb0fc4d32cab90a5de4ebc768e43" resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-4.4.0-rc.1.tgz#5c3f4ac1fcdfb80d79a4dd50381eaff38637949f"
integrity sha512-Sussnocvw75EbJ1j0Ohn7F+SBQy9xPbiG6RJExdDFzxhUNsVp5wJF2Jm8hOZB3DYkeGAOskY5RoIG0abfE/j3w== integrity sha512-bfLgQJE3WAEIC3HxfCFTdMNWNs/nCe9pDGN8qsiUmQ0P0ZEQzkXvNSRe9idQP2Cbn/0q0+y44oa9v2sLT1LGsQ==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
luxon "^1.24.1" luxon "^1.24.1"
"@abp/malihu-custom-scrollbar-plugin@~4.2.1": "@abp/malihu-custom-scrollbar-plugin@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.2.1.tgz#0c491d772ab0bb03d7eead0b9715bddb44252d56" resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-4.4.0-rc.1.tgz#370a459024f62abfb58c73cc63c42e3183374e82"
integrity sha512-qBnBMzj4G/dAMShmF4EXr55hkMehC1+cB6Jjl1wPHgMV8QPafznBKGyM6KWxGhrl8K6nCErBbidgQKpYqtWhNA== integrity sha512-bzlQDE9u99nPw0XOqORSUd57IwN2N7EmJgSrsZ1kY5YRqA1KXZFMoUBxuBHvYR38+IAN6h79wF2yMxT79dTU6w==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
malihu-custom-scrollbar-plugin "^3.1.5" malihu-custom-scrollbar-plugin "^3.1.5"
"@abp/select2@~4.2.1": "@abp/select2@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.2.1.tgz#2f397cc1754135642385333bf47a1a106dd9b165" resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-4.4.0-rc.1.tgz#219e3999bae4bae26bfaf2290e9cc6b79f3632eb"
integrity sha512-g1AUGof5daULbVFCokR9JS1/4gIpEWKB5/+rRJBmnje2hUgBA3llD5PCOh5WRHA7urJJOD/5BjWlFdozluUAyg== integrity sha512-qhJZOt6e9mTggS8Qn779OtUZADwbvtErZa4xgRgwS4lzBJEpQjZzfBVnKQZ7K74MOn7nHRFvC4dTEDbzhcfukg==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
select2 "^4.0.13" select2 "^4.0.13"
"@abp/sweetalert@~4.2.1": "@abp/sweetalert@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.2.1.tgz#bdbc28c3f73b314b8ca792ea73390fe9f558c03f" resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-4.4.0-rc.1.tgz#35f678daca1bb9839e8789c0a8da58c7423f5faa"
integrity sha512-xTi0oSjAkFMIDHgF8YB+oqFCl4gNfnt7mGHvEjJwpCEQSkuML9QsiGvw1TpXyHP7npOWSjjVpoyEBS2HXC778Q== integrity sha512-lY7lYcR9fs+k468Cr9l5kZaH6+FAqc765teSsJrIAdr1fxnDPzZWxoSSqNc3a8mEg125c2NwOD8L+AYOGqMFiQ==
dependencies: dependencies:
"@abp/core" "~4.2.1" "@abp/core" "~4.4.0-rc.1"
sweetalert "^2.1.2" sweetalert "^2.1.2"
"@abp/timeago@~4.2.1": "@abp/timeago@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.2.1.tgz#38474ed4455e94c687a3124e1a6e77c3b29a87d3" resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-4.4.0-rc.1.tgz#ba6c9c01727016b06e70eacfbc218bbe033b3a93"
integrity sha512-46+2plKizUcRn2VWN5WPWvwEVz+xoKOmsH1tEJ8WKKNxjeNRAsfeOslbfIEks89hTXLQemP3txAbq9V3E8pwQw== integrity sha512-fxRMdYrnZTC2FbBXJfX5nlKVILXFmxRdZ4PW+DhSolsDSG2FR3yesbqS2SWoLuGvr81oBIkXbECaf7S/oWA2Iw==
dependencies: dependencies:
"@abp/jquery" "~4.2.1" "@abp/jquery" "~4.4.0-rc.1"
timeago "^1.6.7" timeago "^1.6.7"
"@abp/toastr@~4.2.1": "@abp/toastr@~4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.2.1.tgz#9e30607f7ff7067588d0a660226d338003c37707" resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-4.4.0-rc.1.tgz#a559665b3516f0f1eaba1c2b6fdd91d47cf25b62"
integrity sha512-fdlMZjffEO/05aeG8BjTspARKGtUu2SpoFViTeHGhSPsCW55BvuehIgRhyOEQNfMqJz8m0cVR0R2q+WPFWf1XA== integrity sha512-7BUywNmL/hXzR4hpcQejcA9YMsLGRisqdOTpZy7abkD4wicuchHy1tr9cBSLbDIgA8oMIqM9ubh3VvPoe6pl4A==
dependencies: dependencies:
"@abp/jquery" "~4.2.1" "@abp/jquery" "~4.4.0-rc.1"
toastr "^2.1.4" toastr "^2.1.4"
"@abp/utils@^4.2.1": "@abp/utils@^4.4.0-rc.1":
version "4.2.1" version "4.4.0-rc.1"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.2.1.tgz#1f5bfa7aae0065ec4dc38f1f5dc393b664c92d5c" resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.4.0-rc.1.tgz#704764e60aae7beec2fc3ac9fff6217c1c70ddf6"
integrity sha512-V7XYC38u4C+UpXQr28KA1KHL5nNgDsFHfZULPnkwPxV8DuhzemmPYN3qmSXi5hfSfp+psNCX3GYZRMCI57kHgQ== integrity sha512-HOmxzOKueogv5mZ6b7SLzBlANYmtL3R8XFypPTky98qYYYWktSxgDkEnyvpe20+yuxKkzVW7sf/swKWEt2onIQ==
dependencies: dependencies:
just-compare "^1.3.0" just-compare "^1.3.0"
@ -357,11 +355,6 @@ async-settle@^1.0.0:
dependencies: dependencies:
async-done "^1.2.2" async-done "^1.2.2"
at-least-node@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
atob@^2.1.1: atob@^2.1.1:
version "2.1.2" version "2.1.2"
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@ -412,15 +405,15 @@ bootstrap-datepicker@^1.9.0:
dependencies: dependencies:
jquery ">=1.7.1 <4.0.0" jquery ">=1.7.1 <4.0.0"
bootstrap-v4-rtl@4.4.1-2: bootstrap-v4-rtl@4.6.0-1:
version "4.4.1-2" version "4.6.0-1"
resolved "https://registry.yarnpkg.com/bootstrap-v4-rtl/-/bootstrap-v4-rtl-4.4.1-2.tgz#93f2a5096f1a0a5462729a7b66a97a40972cc595" resolved "https://registry.yarnpkg.com/bootstrap-v4-rtl/-/bootstrap-v4-rtl-4.6.0-1.tgz#8fc502e800308fb725151128dd288df1c027cd8e"
integrity sha512-x9jZLEQzeOlkfxnR73aE/LjTD6hlqU6BbKVKdGasDByEP7dHBaxYaDGX54pfpHTom2QFqQ3t6y0WkDZW6DrQhw== integrity sha512-ChcbO5JeEQx6/Yz40YZLq3A4RIWcCmCCiRpweF5wg32/Q8CfWrwDNpcDTJ2SU+aSAewUJoCSzf/tRxhAgnZuog==
bootstrap@^4.5.0: bootstrap@^4.6.0:
version "4.5.0" version "4.6.0"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.0.tgz#97d9dbcb5a8972f8722c9962483543b907d9b9ec" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7"
integrity sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA== integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==
brace-expansion@^1.1.7: brace-expansion@^1.1.7:
version "1.1.11" version "1.1.11"
@ -972,16 +965,6 @@ fragment-cache@^0.2.1:
dependencies: dependencies:
map-cache "^0.2.2" map-cache "^0.2.2"
fs-extra@^9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
dependencies:
at-least-node "^1.0.0"
graceful-fs "^4.2.0"
jsonfile "^6.0.1"
universalify "^1.0.0"
fs-minipass@^1.2.5: fs-minipass@^1.2.5:
version "1.2.6" version "1.2.6"
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
@ -1131,11 +1114,6 @@ graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
graceful-fs@^4.2.0:
version "4.2.4"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
gulp-cli@^2.2.0: gulp-cli@^2.2.0:
version "2.2.0" version "2.2.0"
resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.2.0.tgz#5533126eeb7fe415a7e3e84a297d334d5cf70ebc" resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.2.0.tgz#5533126eeb7fe415a7e3e84a297d334d5cf70ebc"
@ -1252,7 +1230,7 @@ inflight@^1.0.4:
once "^1.3.0" once "^1.3.0"
wrappy "1" wrappy "1"
inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
version "2.0.3" version "2.0.3"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
@ -1498,7 +1476,7 @@ jquery-validation@^1.19.2:
resolved "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.19.2.tgz#c602831b0d8c5881400af424e872757ce241eff9" resolved "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.19.2.tgz#c602831b0d8c5881400af424e872757ce241eff9"
integrity sha512-yHaAqOGaAB7+p2u5lpzhhQVt3CBMUw3fHcuCJ7nXmXz0LWLHPN7yOhwnocp5nrn2SmnXR1jpV+whx2j1kLz1tQ== integrity sha512-yHaAqOGaAB7+p2u5lpzhhQVt3CBMUw3fHcuCJ7nXmXz0LWLHPN7yOhwnocp5nrn2SmnXR1jpV+whx2j1kLz1tQ==
jquery@>=1.10, jquery@>=1.8.3: jquery@>=1.10, jquery@>=1.8.3, jquery@~3.6.0:
version "3.6.0" version "3.6.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
@ -1508,25 +1486,11 @@ jquery@>=1.12.0, "jquery@>=1.5.0 <4.0", jquery@>=1.7, "jquery@>=1.7.1 <4.0.0", j
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
jquery@~3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
json-stable-stringify-without-jsonify@^1.0.1: json-stable-stringify-without-jsonify@^1.0.1:
version "1.0.1" version "1.0.1"
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
jsonfile@^6.0.1:
version "6.1.0"
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
dependencies:
universalify "^2.0.0"
optionalDependencies:
graceful-fs "^4.1.6"
just-compare@^1.3.0: just-compare@^1.3.0:
version "1.3.0" version "1.3.0"
resolved "https://registry.yarnpkg.com/just-compare/-/just-compare-1.3.0.tgz#a53c31373f150a5b238555c243af4d8a38d7a0e5" resolved "https://registry.yarnpkg.com/just-compare/-/just-compare-1.3.0.tgz#a53c31373f150a5b238555c243af4d8a38d7a0e5"
@ -2066,14 +2030,6 @@ path-type@^1.0.0:
pify "^2.0.0" pify "^2.0.0"
pinkie-promise "^2.0.0" pinkie-promise "^2.0.0"
path@^0.12.7:
version "0.12.7"
resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"
integrity sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=
dependencies:
process "^0.11.1"
util "^0.10.3"
picomatch@^2.0.5: picomatch@^2.0.5:
version "2.2.2" version "2.2.2"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
@ -2111,11 +2067,6 @@ process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
process@^0.11.1:
version "0.11.10"
resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
promise-polyfill@^6.0.2: promise-polyfill@^6.0.2:
version "6.1.0" version "6.1.0"
resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-6.1.0.tgz#dfa96943ea9c121fca4de9b5868cb39d3472e057" resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-6.1.0.tgz#dfa96943ea9c121fca4de9b5868cb39d3472e057"
@ -2687,16 +2638,6 @@ unique-stream@^2.0.2:
json-stable-stringify-without-jsonify "^1.0.1" json-stable-stringify-without-jsonify "^1.0.1"
through2-filter "^3.0.0" through2-filter "^3.0.0"
universalify@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
universalify@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
unset-value@^1.0.0: unset-value@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@ -2725,13 +2666,6 @@ util-deprecate@~1.0.1:
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
util@^0.10.3:
version "0.10.4"
resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901"
integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==
dependencies:
inherits "2.0.3"
v8flags@^3.0.1: v8flags@^3.0.1:
version "3.1.3" version "3.1.3"
resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8" resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8"

6
test/EventHub.EntityFrameworkCore.Tests/EntityFrameworkCore/EventHubEntityFrameworkCoreTestModule.cs

@ -11,7 +11,7 @@ using Volo.Abp.Modularity;
namespace EventHub.EntityFrameworkCore namespace EventHub.EntityFrameworkCore
{ {
[DependsOn( [DependsOn(
typeof(EventHubEntityFrameworkCoreDbMigrationsModule), typeof(EventHubEntityFrameworkCoreModule),
typeof(EventHubTestBaseModule), typeof(EventHubTestBaseModule),
typeof(AbpEntityFrameworkCoreSqliteModule) typeof(AbpEntityFrameworkCoreSqliteModule)
)] )]
@ -47,11 +47,11 @@ namespace EventHub.EntityFrameworkCore
var connection = new SqliteConnection("Data Source=:memory:"); var connection = new SqliteConnection("Data Source=:memory:");
connection.Open(); connection.Open();
var options = new DbContextOptionsBuilder<EventHubMigrationsDbContext>() var options = new DbContextOptionsBuilder<EventHubDbContext>()
.UseSqlite(connection) .UseSqlite(connection)
.Options; .Options;
using (var context = new EventHubMigrationsDbContext(options)) using (var context = new EventHubDbContext(options))
{ {
context.GetService<IRelationalDatabaseCreator>().CreateTables(); context.GetService<IRelationalDatabaseCreator>().CreateTables();
} }

4
test/EventHub.EntityFrameworkCore.Tests/EventHub.EntityFrameworkCore.Tests.csproj

@ -8,9 +8,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\EventHub.EntityFrameworkCore.DbMigrations\EventHub.EntityFrameworkCore.DbMigrations.csproj" /> <ProjectReference Include="..\..\src\EventHub.EntityFrameworkCore\EventHub.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\EventHub.TestBase\EventHub.TestBase.csproj" /> <ProjectReference Include="..\EventHub.TestBase\EventHub.TestBase.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="4.2.1" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="4.4.0-rc.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
test/EventHub.TestBase/EventHub.TestBase.csproj

@ -8,9 +8,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.TestBase" Version="4.2.1" /> <PackageReference Include="Volo.Abp.TestBase" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="4.4.0-rc.1" />
<PackageReference Include="Volo.Abp.Authorization" Version="4.2.1" /> <PackageReference Include="Volo.Abp.Authorization" Version="4.4.0-rc.1" />
<ProjectReference Include="..\..\src\EventHub.Domain\EventHub.Domain.csproj" /> <ProjectReference Include="..\..\src\EventHub.Domain\EventHub.Domain.csproj" />
</ItemGroup> </ItemGroup>

9
test/EventHub.TestBase/EventHubTestBase.cs

@ -2,7 +2,6 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Events; using EventHub.Events;
using EventHub.Organizations; using EventHub.Organizations;
using EventHub.Users;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Entities;
@ -125,20 +124,20 @@ namespace EventHub
return @event; return @event;
} }
protected virtual async Task<AppUser> GetUserOrNullAsync(Guid id) protected virtual async Task<IdentityUser> GetUserOrNullAsync(Guid id)
{ {
var userRepository = GetRequiredService<IRepository<AppUser, Guid>>(); var userRepository = GetRequiredService<IRepository<IdentityUser, Guid>>();
return await WithUnitOfWorkAsync( return await WithUnitOfWorkAsync(
() => userRepository.FindAsync(id) () => userRepository.FindAsync(id)
); );
} }
protected virtual async Task<AppUser> GetUserAsync(Guid id) protected virtual async Task<IdentityUser> GetUserAsync(Guid id)
{ {
var user = await GetUserOrNullAsync(id); var user = await GetUserOrNullAsync(id);
if (user == null) if (user == null)
{ {
throw new EntityNotFoundException(typeof(AppUser), id); throw new EntityNotFoundException(typeof(IdentityUser), id);
} }
return user; return user;

13
tye.yaml

@ -1,10 +1,5 @@
name: myprojectname name: myprojectname
services: services:
- name: redis
image: redis:6.0.10-alpine
bindings:
- port: 6379
connectionString: "${host}:${port}"
- name: identityserver - name: identityserver
project: src/EventHub.IdentityServer/EventHub.IdentityServer.csproj project: src/EventHub.IdentityServer/EventHub.IdentityServer.csproj
bindings: bindings:
@ -21,6 +16,14 @@ services:
env: env:
- Kestrel__Certificates__Default__Path=../../etc/dev-cert/localhost.pfx - Kestrel__Certificates__Default__Path=../../etc/dev-cert/localhost.pfx
- Kestrel__Certificates__Default__Password=e8202f07-66e5-4619-be07-72ba76fde97f - Kestrel__Certificates__Default__Password=e8202f07-66e5-4619-be07-72ba76fde97f
- name: admin-api
project: src/EventHub.Admin.HttpApi.Host/EventHub.Admin.HttpApi.Host.csproj
bindings:
- protocol: https
port: 44305
env:
- Kestrel__Certificates__Default__Path=../../etc/dev-cert/localhost.pfx
- Kestrel__Certificates__Default__Password=e8202f07-66e5-4619-be07-72ba76fde97f
- name: web - name: web
project: src/EventHub.Web/EventHub.Web.csproj project: src/EventHub.Web/EventHub.Web.csproj
bindings: bindings:

Loading…
Cancel
Save