Browse Source

Upgrade to ABP v5.0.1

and remove all unused namespaces in code
pull/84/head
berkansasmaz 5 years ago
parent
commit
f293e2e47d
No known key found for this signature in database GPG Key ID: 884D815C3F32BE00
  1. 6
      src/EventHub.Admin.Application.Contracts/EventHub.Admin.Application.Contracts.csproj
  2. 3
      src/EventHub.Admin.Application.Contracts/Users/IUserAppService.cs
  3. 6
      src/EventHub.Admin.Application/EventHub.Admin.Application.csproj
  4. 7
      src/EventHub.Admin.Application/Events/Registrations/EventRegistrationAppService.cs
  5. 1
      src/EventHub.Admin.Application/Organizations/Memberships/OrganizationMembershipAppService.cs
  6. 6
      src/EventHub.Admin.HttpApi.Client/EventHub.Admin.HttpApi.Client.csproj
  7. 1
      src/EventHub.Admin.HttpApi.Host/Controllers/Events/Registrations/EventRegistrationController.cs
  8. 4
      src/EventHub.Admin.HttpApi.Host/Controllers/Users/UserController.cs
  9. 10
      src/EventHub.Admin.HttpApi.Host/EventHub.Admin.HttpApi.Host.csproj
  10. 1
      src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs
  11. 6
      src/EventHub.Admin.HttpApi/EventHub.Admin.HttpApi.csproj
  12. 12
      src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs
  13. 10
      src/EventHub.Admin.Web/EventHub.Admin.Web.csproj
  14. 2
      src/EventHub.Admin.Web/Pages/AttendeeDetail.razor
  15. 10
      src/EventHub.Admin.Web/Pages/AttendeeDetail.razor.cs
  16. 5
      src/EventHub.Admin.Web/Pages/EventManagement.razor
  17. 17
      src/EventHub.Admin.Web/Pages/EventManagement.razor.cs
  18. 5
      src/EventHub.Admin.Web/Pages/OrganizationManagement.razor
  19. 5
      src/EventHub.Admin.Web/Pages/OrganizationManagement.razor.cs
  20. 1
      src/EventHub.Admin.Web/Pages/OrganizationMembershipManagement.razor
  21. 2
      src/EventHub.Application.Contracts/EventHub.Application.Contracts.csproj
  22. 1
      src/EventHub.Application.Contracts/Events/EventDetailDto.cs
  23. 2
      src/EventHub.Application/EventHub.Application.csproj
  24. 2
      src/EventHub.Application/Events/Registrations/EventRegistrationAppService.cs
  25. 1
      src/EventHub.Application/Organizations/OrganizationAppService.cs
  26. 1
      src/EventHub.Application/Properties/AssemblyInfo.cs
  27. 6
      src/EventHub.BackgroundServices/EventHub.BackgroundServices.csproj
  28. 1
      src/EventHub.DbMigrator/Data/EventHubSampleDataSeedContributor.cs
  29. 2
      src/EventHub.DbMigrator/DbMigratorHostedService.cs
  30. 2
      src/EventHub.DbMigrator/EventHub.DbMigrator.csproj
  31. 1
      src/EventHub.DbMigrator/Program.cs
  32. 14
      src/EventHub.Domain.Shared/EventHub.Domain.Shared.csproj
  33. 4
      src/EventHub.Domain.Shared/EventHubDomainSharedModule.cs
  34. 5
      src/EventHub.Domain.Shared/EventHubModuleExtensionConfigurator.cs
  35. 18
      src/EventHub.Domain/EventHub.Domain.csproj
  36. 4
      src/EventHub.Domain/EventHubDomainModule.cs
  37. 1
      src/EventHub.Domain/Events/EventManager.cs
  38. 1
      src/EventHub.Domain/Organizations/Memberships/IOrganizationMembershipRepository.cs
  39. 1
      src/EventHub.Domain/Organizations/Organization.cs
  40. 1
      src/EventHub.Domain/Properties/AssemblyInfo.cs
  41. 2
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EntityFrameworkCoreEventHubDbSchemaMigrator.cs
  42. 1
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContext.cs
  43. 1
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContextModelCreatingExtensions.cs
  44. 5
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubEfCoreEntityExtensionMappings.cs
  45. 12
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubEntityFrameworkCoreModule.cs
  46. 7
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/Events/Registrations/EventRegistrationRepository.cs
  47. 18
      src/EventHub.EntityFrameworkCore/EventHub.EntityFrameworkCore.csproj
  48. 1
      src/EventHub.EntityFrameworkCore/Properties/AssemblyInfo.cs
  49. 2
      src/EventHub.HttpApi.Client/EventHub.HttpApi.Client.csproj
  50. 2
      src/EventHub.HttpApi.Client/EventHubHttpApiClientModule.cs
  51. 10
      src/EventHub.HttpApi.Host/EventHub.HttpApi.Host.csproj
  52. 16
      src/EventHub.HttpApi.Host/EventHubHttpApiHostModule.cs
  53. 1
      src/EventHub.HttpApi/Controllers/Events/Registrations/EventRegistrationController.cs
  54. 1
      src/EventHub.HttpApi/Controllers/Organizations/Memberships/OrganizationMembershipController.cs
  55. 1
      src/EventHub.HttpApi/Controllers/Organizations/OrganizationController.cs
  56. 2
      src/EventHub.HttpApi/EventHub.HttpApi.csproj
  57. 6
      src/EventHub.HttpApi/EventHubHttpApiModule.cs
  58. 14
      src/EventHub.IdentityServer/EventHub.IdentityServer.csproj
  59. 4
      src/EventHub.IdentityServer/EventHubBrandingProvider.cs
  60. 14
      src/EventHub.IdentityServer/EventHubIdentityServerModule.cs
  61. 4
      src/EventHub.IdentityServer/Pages/Account/LoggedOut.cshtml
  62. 4
      src/EventHub.IdentityServer/Pages/Account/Manage.cshtml
  63. 2
      src/EventHub.IdentityServer/package.json
  64. 2
      src/EventHub.IdentityServer/wwwroot/libs/abp/utils/abp-utils.umd.js.map
  65. 2
      src/EventHub.IdentityServer/wwwroot/libs/abp/utils/abp-utils.umd.min.js.map
  66. 238
      src/EventHub.IdentityServer/yarn.lock
  67. 4
      src/EventHub.Web.Theme/EventHub.Web.Theme.csproj
  68. 3
      src/EventHub.Web.Theme/Helpers/TagHelpers/GravatarTagHelper.cs
  69. 9
      src/EventHub.Web.Theme/Themes/EventHub/Components/Footer/Default.cshtml
  70. 11
      src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
  71. 3
      src/EventHub.Web.Theme/Themes/EventHub/Components/Menu/Default.cshtml
  72. 3
      src/EventHub.Web.Theme/Themes/EventHub/Components/Menu/_MenuItem.cshtml
  73. 3
      src/EventHub.Web.Theme/Themes/EventHub/Components/Toolbar/Default.cshtml
  74. 6
      src/EventHub.Web.Theme/Themes/EventHub/Components/Toolbar/LanguageSwitch/Default.cshtml
  75. 13
      src/EventHub.Web.Theme/Themes/EventHub/Components/Toolbar/UserMenu/Default.cshtml
  76. 10
      src/EventHub.Web.Theme/Themes/EventHub/Layouts/Account.cshtml
  77. 6
      src/EventHub.Web.Theme/Themes/EventHub/Layouts/Application.cshtml
  78. 4
      src/EventHub.Web/Components/Toolbar/LoginLink/Default.cshtml
  79. 18
      src/EventHub.Web/EventHub.Web.csproj
  80. 4
      src/EventHub.Web/EventHubBrandingProvider.cs
  81. 1
      src/EventHub.Web/EventHubWebAutoMapperProfile.cs
  82. 21
      src/EventHub.Web/EventHubWebModule.cs
  83. 2
      src/EventHub.Web/Menus/EventHubMenuContributor.cs
  84. 2
      src/EventHub.Web/Menus/EventHubToolbarContributor.cs
  85. 2
      src/EventHub.Web/Pages/Events/Components/CreateOrEditEventArea/_sessionSection.cshtml
  86. 1
      src/EventHub.Web/Pages/Events/Components/EventsArea/_eventListSection.cshtml
  87. 2
      src/EventHub.Web/Pages/Events/Components/LocationArea/Default.cshtml
  88. 4
      src/EventHub.Web/Pages/Events/Components/RegistrationArea/Default.cshtml
  89. 4
      src/EventHub.Web/Pages/Events/Detail.cshtml
  90. 5
      src/EventHub.Web/Pages/Index.cshtml
  91. 2
      src/EventHub.Web/Pages/Organizations/Components/JoinArea/Default.cshtml
  92. 3
      src/EventHub.Web/Pages/Organizations/Components/OrganizationsArea/OrganizationsAreaViewComponent.cs
  93. 1
      src/EventHub.Web/Pages/Organizations/Edit.cshtml
  94. 1
      src/EventHub.Web/Pages/Organizations/Edit.cshtml.cs
  95. 1
      src/EventHub.Web/Pages/Organizations/Profile.cshtml
  96. 2
      src/EventHub.Web/Pages/Payment/PostCheckout.cshtml
  97. 3
      src/EventHub.Web/Pages/Payment/PreCheckout.cshtml
  98. 6
      src/EventHub.Web/Pages/User.cshtml
  99. 1
      src/EventHub.Web/Properties/AssemblyInfo.cs
  100. 2
      src/EventHub.Web/package.json

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

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

3
src/EventHub.Admin.Application.Contracts/Users/IUserAppService.cs

@ -1,5 +1,4 @@
using System; using System.Threading.Tasks;
using System.Threading.Tasks;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.Application.Services; using Volo.Abp.Application.Services;

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

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

7
src/EventHub.Admin.Application/Events/Registrations/EventRegistrationAppService.cs

@ -1,14 +1,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Linq.Dynamic.Core;
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Admin.Permissions; using EventHub.Admin.Permissions;
using Volo.Abp.Application.Dtos;
using EventHub.Events.Registrations;
using Microsoft.AspNetCore.Authorization;
using EventHub.Events; using EventHub.Events;
using EventHub.Events.Registrations;
using EventHub.Users; using EventHub.Users;
using Microsoft.AspNetCore.Authorization;
using Volo.Abp.Application.Dtos;
namespace EventHub.Admin.Events.Registrations namespace EventHub.Admin.Events.Registrations
{ {

1
src/EventHub.Admin.Application/Organizations/Memberships/OrganizationMembershipAppService.cs

@ -11,7 +11,6 @@ using Volo.Abp.Application.Services;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using Volo.Abp.Identity; using Volo.Abp.Identity;
namespace EventHub.Admin.Organizations.Memberships namespace EventHub.Admin.Organizations.Memberships
{ {
[Authorize(EventHubPermissions.Organizations.Memberships.Default)] [Authorize(EventHubPermissions.Organizations.Memberships.Default)]

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

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

1
src/EventHub.Admin.HttpApi.Host/Controllers/Events/Registrations/EventRegistrationController.cs

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Admin.Events.Registrations; using EventHub.Admin.Events.Registrations;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;

4
src/EventHub.Admin.HttpApi.Host/Controllers/Users/UserController.cs

@ -1,6 +1,6 @@
using EventHub.Admin.Users; using System.Threading.Tasks;
using EventHub.Admin.Users;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc;

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

@ -15,11 +15,11 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Swashbuckle" Version="5.0.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -2,7 +2,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq;
using EventHub.Admin.Events; using EventHub.Admin.Events;
using EventHub.Admin.Organizations; using EventHub.Admin.Organizations;
using EventHub.Admin.Utils; using EventHub.Admin.Utils;

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

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

12
src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs

@ -1,11 +1,11 @@
using Blazorise; using System;
using EventHub.Admin.Users;
using Microsoft.AspNetCore.Components;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Blazorise;
using Blazorise.DataGrid; using Blazorise.DataGrid;
using EventHub.Admin.Users;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.Web;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
@ -120,9 +120,11 @@ namespace EventHub.Admin.Web.Components.UserPicker
await SaveFormAsync.InvokeAsync(); await SaveFormAsync.InvokeAsync();
} }
private void ClosingUserPickerModal(ModalClosingEventArgs eventArgs) private Task ClosingUserPickerModal(ModalClosingEventArgs eventArgs)
{ {
eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing; eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing;
return Task.CompletedTask;
} }
} }
} }

10
src/EventHub.Admin.Web/EventHub.Admin.Web.csproj

@ -11,16 +11,16 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Blazorise.Bootstrap" Version="0.9.5-preview2.1" /> <PackageReference Include="Blazorise.Bootstrap" Version="0.9.5" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5-preview2.1" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="0.9.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Autofac.WebAssembly" Version="5.0.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Identity.Blazor.WebAssembly" Version="5.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/EventHub.Admin.Web/Pages/AttendeeDetail.razor

@ -11,7 +11,7 @@
<CardHeader> <CardHeader>
<h2>@L["Attendees"]</h2> <h2>@L["Attendees"]</h2>
<Paragraph Alignment="TextAlignment.Right"> <Paragraph Alignment="TextAlignment.End">
@if (CanAddAttendee) @if (CanAddAttendee)
{ {
<Button Color="Color.Primary" <Button Color="Color.Primary"

10
src/EventHub.Admin.Web/Pages/AttendeeDetail.razor.cs

@ -1,15 +1,15 @@
using Microsoft.AspNetCore.Components; using System;
using System;
using System.Threading.Tasks;
using EventHub.Admin.Events.Registrations;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
using Blazorise; using Blazorise;
using Volo.Abp.Application.Dtos;
using Blazorise.DataGrid; using Blazorise.DataGrid;
using EventHub.Admin.Events.Registrations;
using EventHub.Admin.Permissions; using EventHub.Admin.Permissions;
using EventHub.Admin.Web.Components.UserPicker; using EventHub.Admin.Web.Components.UserPicker;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components;
using Volo.Abp.Application.Dtos;
namespace EventHub.Admin.Web.Pages namespace EventHub.Admin.Web.Pages
{ {

5
src/EventHub.Admin.Web/Pages/EventManagement.razor

@ -1,11 +1,10 @@
@page "/events" @page "/events"
@using Microsoft.AspNetCore.Authorization
@using EventHub.Admin.Permissions
@using EventHub.Admin.Events @using EventHub.Admin.Events
@using EventHub.Admin.Permissions
@using EventHub.Events @using EventHub.Events
@using EventHub.Web @using EventHub.Web
@using Microsoft.AspNetCore.Authorization
@using Microsoft.Extensions.Options @using Microsoft.Extensions.Options
@using Volo.Abp.AspNetCore.Components.Notifications
@inherits EventHubComponentBase @inherits EventHubComponentBase
@attribute [Authorize(EventHubPermissions.Events.Default)] @attribute [Authorize(EventHubPermissions.Events.Default)]
@inject IEventAppService EventAppService @inject IEventAppService EventAppService

17
src/EventHub.Admin.Web/Pages/EventManagement.razor.cs

@ -1,17 +1,16 @@
using EventHub.Admin.Events; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Blazorise; using Blazorise;
using Blazorise.DataGrid; using Blazorise.DataGrid;
using Volo.Abp.Application.Dtos; using EventHub.Admin.Events;
using System;
using System.ComponentModel;
using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.Web;
using System.IO;
using System.Globalization;
using EventHub.Events;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Content; using Volo.Abp.Content;
namespace EventHub.Admin.Web.Pages namespace EventHub.Admin.Web.Pages
@ -102,9 +101,11 @@ namespace EventHub.Admin.Web.Pages
await EditEventModal.Show(); await EditEventModal.Show();
} }
private void OnEditModalClosing(CancelEventArgs e) private Task OnEditModalClosing(CancelEventArgs e)
{ {
SelectedTabInEditModal = EventEditTabs.EventInfo.ToString(); SelectedTabInEditModal = EventEditTabs.EventInfo.ToString();
return Task.CompletedTask;
} }
private void OnSelectedTabChangedInEditModal(string name) private void OnSelectedTabChangedInEditModal(string name)

5
src/EventHub.Admin.Web/Pages/OrganizationManagement.razor

@ -1,10 +1,9 @@
@page "/organizations" @page "/organizations"
@using Volo.Abp.BlazoriseUI.Components
@using EventHub.Admin.Permissions
@using Microsoft.AspNetCore.Authorization
@using EventHub.Admin.Organizations @using EventHub.Admin.Organizations
@using EventHub.Admin.Permissions
@using EventHub.Organizations @using EventHub.Organizations
@using EventHub.Web @using EventHub.Web
@using Microsoft.AspNetCore.Authorization
@using Microsoft.Extensions.Options @using Microsoft.Extensions.Options
@using Volo.Abp.AspNetCore.Components.Notifications @using Volo.Abp.AspNetCore.Components.Notifications
@inherits EventHubComponentBase @inherits EventHubComponentBase

5
src/EventHub.Admin.Web/Pages/OrganizationManagement.razor.cs

@ -153,10 +153,13 @@ namespace EventHub.Admin.Web.Pages
SelectedTabInEditModal = name; SelectedTabInEditModal = name;
} }
private void OnEditModalClosing(CancelEventArgs e) private Task OnEditModalClosing(CancelEventArgs e)
{ {
IsLoadingProfileImage = false; IsLoadingProfileImage = false;
SelectedTabInEditModal = TabContentInEditModal.OrganizationProfile.ToString(); SelectedTabInEditModal = TabContentInEditModal.OrganizationProfile.ToString();
return Task.CompletedTask;
} }
private async Task OnKeyPress(KeyboardEventArgs e) private async Task OnKeyPress(KeyboardEventArgs e)

1
src/EventHub.Admin.Web/Pages/OrganizationMembershipManagement.razor

@ -1,5 +1,4 @@
@page "/organization-memberships/{OrganizationId:guid?}" @page "/organization-memberships/{OrganizationId:guid?}"
@using Volo.Abp.BlazoriseUI.Components
@using EventHub.Admin.Organizations.Memberships @using EventHub.Admin.Organizations.Memberships
@using EventHub.Admin.Permissions @using EventHub.Admin.Permissions
@using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Authorization

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

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

1
src/EventHub.Application.Contracts/Events/EventDetailDto.cs

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
namespace EventHub.Events namespace EventHub.Events

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

@ -14,7 +14,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Ddd.Application" Version="5.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@ -5,8 +5,8 @@ using System.Threading.Tasks;
using EventHub.Users; using EventHub.Users;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.Users;
using Volo.Abp.Identity; using Volo.Abp.Identity;
using Volo.Abp.Users;
namespace EventHub.Events.Registrations namespace EventHub.Events.Registrations
{ {

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

@ -10,7 +10,6 @@ using Volo.Abp.Authorization;
using Volo.Abp.BlobStoring; using Volo.Abp.BlobStoring;
using Volo.Abp.Content; using Volo.Abp.Content;
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

1
src/EventHub.Application/Properties/AssemblyInfo.cs

@ -1,2 +1,3 @@
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
[assembly:InternalsVisibleToAttribute("EventHub.Application.Tests")] [assembly:InternalsVisibleToAttribute("EventHub.Application.Tests")]

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

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

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

@ -5,7 +5,6 @@ using System.Threading.Tasks;
using EventHub.Events; using EventHub.Events;
using EventHub.Events.Registrations; using EventHub.Events.Registrations;
using EventHub.Organizations; using EventHub.Organizations;
using EventHub.Users;
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using Volo.Abp.Data; using Volo.Abp.Data;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;

2
src/EventHub.DbMigrator/DbMigratorHostedService.cs

@ -1,8 +1,8 @@
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Data;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using EventHub.Data;
using Serilog; using Serilog;
using Volo.Abp; using Volo.Abp;

2
src/EventHub.DbMigrator/EventHub.DbMigrator.csproj

@ -27,7 +27,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="5.0.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\EventHub.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\EventHub.EntityFrameworkCore\EventHub.EntityFrameworkCore.csproj" />

1
src/EventHub.DbMigrator/Program.cs

@ -1,4 +1,3 @@
using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;

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

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

4
src/EventHub.Domain.Shared/EventHubDomainSharedModule.cs

@ -1,8 +1,10 @@
using EventHub.Localization; using EventHub.Localization;
using EventHub.Web; using EventHub.Web;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Payment;
using Volo.Abp.AuditLogging; using Volo.Abp.AuditLogging;
using Volo.Abp.BackgroundJobs; using Volo.Abp.BackgroundJobs;
using Volo.Abp.BlobStoring.Database;
using Volo.Abp.Identity; using Volo.Abp.Identity;
using Volo.Abp.IdentityServer; using Volo.Abp.IdentityServer;
using Volo.Abp.Localization; using Volo.Abp.Localization;
@ -12,8 +14,6 @@ using Volo.Abp.PermissionManagement;
using Volo.Abp.SettingManagement; using Volo.Abp.SettingManagement;
using Volo.Abp.Validation.Localization; using Volo.Abp.Validation.Localization;
using Volo.Abp.VirtualFileSystem; using Volo.Abp.VirtualFileSystem;
using Volo.Abp.BlobStoring.Database;
using Payment;
namespace EventHub namespace EventHub
{ {

5
src/EventHub.Domain.Shared/EventHubModuleExtensionConfigurator.cs

@ -1,7 +1,4 @@
using System.ComponentModel.DataAnnotations; using Volo.Abp.Threading;
using Volo.Abp.Identity;
using Volo.Abp.ObjectExtending;
using Volo.Abp.Threading;
namespace EventHub namespace EventHub
{ {

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

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

4
src/EventHub.Domain/EventHubDomainModule.cs

@ -1,7 +1,9 @@
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.DependencyInjection.Extensions;
using Payment;
using Volo.Abp.AuditLogging; using Volo.Abp.AuditLogging;
using Volo.Abp.BackgroundJobs; using Volo.Abp.BackgroundJobs;
using Volo.Abp.BlobStoring.Database;
using Volo.Abp.Emailing; using Volo.Abp.Emailing;
using Volo.Abp.Identity; using Volo.Abp.Identity;
using Volo.Abp.IdentityServer; using Volo.Abp.IdentityServer;
@ -9,9 +11,7 @@ using Volo.Abp.Modularity;
using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.PermissionManagement.Identity;
using Volo.Abp.PermissionManagement.IdentityServer; using Volo.Abp.PermissionManagement.IdentityServer;
using Volo.Abp.SettingManagement; using Volo.Abp.SettingManagement;
using Volo.Abp.BlobStoring.Database;
using Volo.Abp.VirtualFileSystem; using Volo.Abp.VirtualFileSystem;
using Payment;
namespace EventHub namespace EventHub
{ {

1
src/EventHub.Domain/Events/EventManager.cs

@ -1,5 +1,4 @@
using System; using System;
using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Countries; using EventHub.Countries;
using EventHub.Events.Registrations; using EventHub.Events.Registrations;

1
src/EventHub.Domain/Organizations/Memberships/IOrganizationMembershipRepository.cs

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using Volo.Abp.Identity;
namespace EventHub.Organizations.Memberships namespace EventHub.Organizations.Memberships
{ {

1
src/EventHub.Domain/Organizations/Organization.cs

@ -1,7 +1,6 @@
using System; using System;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Domain.Entities.Auditing; using Volo.Abp.Domain.Entities.Auditing;
using Volo.Abp.Timing;
namespace EventHub.Organizations namespace EventHub.Organizations
{ {

1
src/EventHub.Domain/Properties/AssemblyInfo.cs

@ -1,4 +1,5 @@
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
[assembly:InternalsVisibleToAttribute("EventHub.Application.Tests")] [assembly:InternalsVisibleToAttribute("EventHub.Application.Tests")]
[assembly:InternalsVisibleToAttribute("EventHub.Domain.Tests")] [assembly:InternalsVisibleToAttribute("EventHub.Domain.Tests")]
[assembly:InternalsVisibleToAttribute("EventHub.TestBase")] [assembly:InternalsVisibleToAttribute("EventHub.TestBase")]

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

@ -1,8 +1,8 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Data;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using EventHub.Data;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
namespace EventHub.EntityFrameworkCore namespace EventHub.EntityFrameworkCore

1
src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContext.cs

@ -5,7 +5,6 @@ using EventHub.Organizations;
using EventHub.Organizations.Memberships; using EventHub.Organizations.Memberships;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Payment.EntityFrameworkCore; using Payment.EntityFrameworkCore;
using System;
using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.AuditLogging.EntityFrameworkCore;
using Volo.Abp.BackgroundJobs.EntityFrameworkCore; using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
using Volo.Abp.BlobStoring.Database.EntityFrameworkCore; using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;

1
src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContextModelCreatingExtensions.cs

@ -4,7 +4,6 @@ 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 System;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.EntityFrameworkCore.Modeling; using Volo.Abp.EntityFrameworkCore.Modeling;
using Volo.Abp.Identity; using Volo.Abp.Identity;

5
src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubEfCoreEntityExtensionMappings.cs

@ -1,7 +1,4 @@
using Microsoft.EntityFrameworkCore; using Volo.Abp.Threading;
using Volo.Abp.Identity;
using Volo.Abp.ObjectExtending;
using Volo.Abp.Threading;
namespace EventHub.EntityFrameworkCore namespace EventHub.EntityFrameworkCore
{ {

12
src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubEntityFrameworkCoreModule.cs

@ -1,16 +1,16 @@
using System;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Payment.EntityFrameworkCore;
using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.AuditLogging.EntityFrameworkCore;
using Volo.Abp.BackgroundJobs.EntityFrameworkCore; using Volo.Abp.BackgroundJobs.EntityFrameworkCore;
using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore.PostgreSql;
using Volo.Abp.Identity.EntityFrameworkCore; using Volo.Abp.Identity.EntityFrameworkCore;
using Volo.Abp.IdentityServer.EntityFrameworkCore; using Volo.Abp.IdentityServer.EntityFrameworkCore;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.PermissionManagement.EntityFrameworkCore;
using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore;
using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore.PostgreSql;
using System;
using Payment.EntityFrameworkCore;
namespace EventHub.EntityFrameworkCore namespace EventHub.EntityFrameworkCore
{ {
@ -31,10 +31,6 @@ namespace EventHub.EntityFrameworkCore
public override void PreConfigureServices(ServiceConfigurationContext context) public override void PreConfigureServices(ServiceConfigurationContext context)
{ {
EventHubEfCoreEntityExtensionMappings.Configure(); EventHubEfCoreEntityExtensionMappings.Configure();
//allows to use DateTime with timezone (by default)
//See: https://www.npgsql.org/efcore/release-notes/6.0.html#opting-out-of-the-new-timestamp-mapping-logic
AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
} }
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)

7
src/EventHub.EntityFrameworkCore/EntityFrameworkCore/Events/Registrations/EventRegistrationRepository.cs

@ -1,12 +1,11 @@
using EventHub.Events.Registrations; using System;
using System; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Linq.Dynamic.Core; using System.Linq.Dynamic.Core;
using System.Collections.Generic;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Events.Registrations;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Volo.Abp.Domain.Repositories;
using Volo.Abp.Domain.Repositories.EntityFrameworkCore; using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.Identity; using Volo.Abp.Identity;

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

@ -8,7 +8,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\modules\payment\src\Payment.EntityFrameworkCore\Payment.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\..\modules\payment\src\Payment.EntityFrameworkCore\Payment.EntityFrameworkCore.csproj" />
</ItemGroup> </ItemGroup>
@ -17,16 +16,15 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="5.0.1" />
<ProjectReference Include="..\EventHub.Domain\EventHub.Domain.csproj" /> <ProjectReference Include="..\EventHub.Domain\EventHub.Domain.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="5.0.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" /> <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="5.0.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="5.0.1" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="5.0.1" />
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="5.0.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="5.0.1" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="5.0.0-rc.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

1
src/EventHub.EntityFrameworkCore/Properties/AssemblyInfo.cs

@ -1,2 +1,3 @@
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
[assembly:InternalsVisibleToAttribute("EventHub.EntityFrameworkCore.Tests")] [assembly:InternalsVisibleToAttribute("EventHub.EntityFrameworkCore.Tests")]

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

@ -13,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Http.Client" Version="5.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/EventHub.HttpApi.Client/EventHubHttpApiClientModule.cs

@ -1,7 +1,7 @@
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Payment;
using Volo.Abp.Http.Client; using Volo.Abp.Http.Client;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
using Payment;
using Volo.Abp.VirtualFileSystem; using Volo.Abp.VirtualFileSystem;
namespace EventHub namespace EventHub

10
src/EventHub.HttpApi.Host/EventHub.HttpApi.Host.csproj

@ -15,11 +15,11 @@
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0" />
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Swashbuckle" Version="5.0.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -2,22 +2,21 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using EventHub.EntityFrameworkCore;
using EventHub.Events;
using EventHub.Organizations;
using EventHub.Utils;
using EventHub.Web;
using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Localization;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using EventHub.EntityFrameworkCore;
using EventHub.Events;
using EventHub.Organizations;
using EventHub.Utils;
using EventHub.Web;
using Microsoft.AspNetCore.Localization;
using StackExchange.Redis;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi.Models;
using StackExchange.Redis;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
@ -31,7 +30,6 @@ using Volo.Abp.Localization;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
using Volo.Abp.Swashbuckle; using Volo.Abp.Swashbuckle;
using Volo.Abp.Timing; using Volo.Abp.Timing;
using Volo.Abp.UI.Navigation.Urls;
using Volo.Abp.VirtualFileSystem; using Volo.Abp.VirtualFileSystem;
namespace EventHub namespace EventHub

1
src/EventHub.HttpApi/Controllers/Events/Registrations/EventRegistrationController.cs

@ -4,7 +4,6 @@ using EventHub.Events.Registrations;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.AspNetCore.Mvc;
namespace EventHub.Controllers.Events.Registrations namespace EventHub.Controllers.Events.Registrations
{ {

1
src/EventHub.HttpApi/Controllers/Organizations/Memberships/OrganizationMembershipController.cs

@ -4,7 +4,6 @@ using EventHub.Organizations.Memberships;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.AspNetCore.Mvc;
namespace EventHub.Controllers.Organizations.Memberships namespace EventHub.Controllers.Organizations.Memberships
{ {

1
src/EventHub.HttpApi/Controllers/Organizations/OrganizationController.cs

@ -4,7 +4,6 @@ using EventHub.Organizations;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.Content; using Volo.Abp.Content;
using Volo.Abp.VirtualFileSystem; using Volo.Abp.VirtualFileSystem;

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

@ -13,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="5.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
src/EventHub.HttpApi/EventHubHttpApiModule.cs

@ -1,9 +1,9 @@
using Localization.Resources.AbpUi; using EventHub.Localization;
using EventHub.Localization; using Localization.Resources.AbpUi;
using Payment;
using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.Localization; using Volo.Abp.Localization;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
using Payment;
namespace EventHub namespace EventHub
{ {

14
src/EventHub.IdentityServer/EventHub.IdentityServer.csproj

@ -42,13 +42,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Autofac" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="5.0.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="5.0.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Account.Web.IdentityServer" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Account.Application" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Account.Application" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.Account.HttpApi" Version="5.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
src/EventHub.IdentityServer/EventHubBrandingProvider.cs

@ -1,5 +1,5 @@
using Volo.Abp.Ui.Branding; using Volo.Abp.DependencyInjection;
using Volo.Abp.DependencyInjection; using Volo.Abp.Ui.Branding;
namespace EventHub namespace EventHub
{ {

14
src/EventHub.IdentityServer/EventHubIdentityServerModule.cs

@ -1,11 +1,5 @@
using System.IO; using System.IO;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using Localization.Resources.AbpUi;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using EventHub.EntityFrameworkCore; using EventHub.EntityFrameworkCore;
using EventHub.Localization; using EventHub.Localization;
using EventHub.Utils; using EventHub.Utils;
@ -14,8 +8,14 @@ using EventHub.Web.Theme;
using EventHub.Web.Theme.Bundling; using EventHub.Web.Theme.Bundling;
using IdentityServer4.Configuration; using IdentityServer4.Configuration;
using IdentityServer4.Extensions; using IdentityServer4.Extensions;
using Localization.Resources.AbpUi;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using StackExchange.Redis; using StackExchange.Redis;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Account; using Volo.Abp.Account;
@ -41,8 +41,6 @@ namespace EventHub
typeof(AbpCachingStackExchangeRedisModule), typeof(AbpCachingStackExchangeRedisModule),
typeof(AbpAccountWebIdentityServerModule), typeof(AbpAccountWebIdentityServerModule),
typeof(AbpAccountApplicationModule), typeof(AbpAccountApplicationModule),
//we need to add AbpAccountHttpApiModule temporarily. (https://github.com/volosoft/volo/pull/7925).
//It should be removed with 5.0-beta.2.
typeof(AbpAccountHttpApiModule), typeof(AbpAccountHttpApiModule),
typeof(EventHubWebThemeModule), typeof(EventHubWebThemeModule),
typeof(EventHubEntityFrameworkCoreModule), typeof(EventHubEntityFrameworkCoreModule),

4
src/EventHub.IdentityServer/Pages/Account/LoggedOut.cshtml

@ -1,9 +1,9 @@
page "/Account/LoggedOut" page "/Account/LoggedOut"
@model Volo.Abp.Account.Web.Pages.Account.LoggedOutModel
@using Volo.Abp.Account.Localization
@using Microsoft.AspNetCore.Mvc.Localization @using Microsoft.AspNetCore.Mvc.Localization
@using Volo.Abp.Account.Localization
@using Volo.Abp.Account.Web.Pages.Account @using Volo.Abp.Account.Web.Pages.Account
@using Volo.Abp.AspNetCore.Mvc.UI.Theming @using Volo.Abp.AspNetCore.Mvc.UI.Theming
@model Volo.Abp.Account.Web.Pages.Account.LoggedOutModel
@inject IThemeManager ThemeManager @inject IThemeManager ThemeManager
@inject IHtmlLocalizer<AccountResource> L @inject IHtmlLocalizer<AccountResource> L
@{ @{

4
src/EventHub.IdentityServer/Pages/Account/Manage.cshtml

@ -1,10 +1,10 @@
@page @page
@inject IThemeManager ThemeManager
@inject IHtmlLocalizer<AccountResource> L
@using Microsoft.AspNetCore.Mvc.Localization @using Microsoft.AspNetCore.Mvc.Localization
@using Volo.Abp.Account.Localization @using Volo.Abp.Account.Localization
@using Volo.Abp.Account.Web.Pages.Account @using Volo.Abp.Account.Web.Pages.Account
@using Volo.Abp.AspNetCore.Mvc.UI.Theming @using Volo.Abp.AspNetCore.Mvc.UI.Theming
@inject IThemeManager ThemeManager
@inject IHtmlLocalizer<AccountResource> L
@model ManageModel @model ManageModel
@{ @{
Layout = ThemeManager.CurrentTheme.GetApplicationLayout(); Layout = ThemeManager.CurrentTheme.GetApplicationLayout();

2
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": "~5.0.0-rc.1", "@abp/aspnetcore.mvc.ui.theme.basic": "~5.0.1",
"owl.carousel": "^2.3.4" "owl.carousel": "^2.3.4"
} }
} }

2
src/EventHub.IdentityServer/wwwroot/libs/abp/utils/abp-utils.umd.js.map

File diff suppressed because one or more lines are too long

2
src/EventHub.IdentityServer/wwwroot/libs/abp/utils/abp-utils.umd.min.js.map

File diff suppressed because one or more lines are too long

238
src/EventHub.IdentityServer/yarn.lock

@ -2,37 +2,37 @@
# yarn lockfile v1 # yarn lockfile v1
"@abp/aspnetcore.mvc.ui.theme.basic@~5.0.0-rc.1": "@abp/aspnetcore.mvc.ui.theme.basic@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.0.0-rc.1.tgz#cd575ab35b5cf9c9c2d3ab02fc6ff5fb1851a622" resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.0.1.tgz#884a4bc9ea043654891be56cd7e7c7bbf9bbad8c"
integrity sha512-/tezLoIaqMJTlV78EbyKkJY30XpayiXJg2apq6/LnSddDIDKaRdlWe1gfXBjFrkOVkdhdSPrvOIy95a284cY/Q== integrity sha512-JGTQyg3Zyfda84yg/Geq6rGuBN2SX4gIOaFL2h8BX9bA8CVuBC+zcwfO1bBsP89xfTyPvdSAGBvSfhCjPwsukQ==
dependencies: dependencies:
"@abp/aspnetcore.mvc.ui.theme.shared" "~5.0.0-rc.1" "@abp/aspnetcore.mvc.ui.theme.shared" "~5.0.1"
"@abp/aspnetcore.mvc.ui.theme.shared@~5.0.0-rc.1": "@abp/aspnetcore.mvc.ui.theme.shared@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.0.0-rc.1.tgz#053ee1d8f69eea1559d6600d7f7b5a645968d6bf" resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.0.1.tgz#77a4900424603e0be048f3507aa852701f3139a2"
integrity sha512-XbCXZ8mka5RCezYR54YRiUn+SgTyVgo/2F42UJ8ZJKMHKo8nQGMFANWuuJ4qHamApEqKZZmmdWp37BnpQ7JMMw== integrity sha512-mn9HEOHBkmBr7d/VUt0bfg9K58IyRDb7j3ZiDoHo263WLXJkf0+C7MEbv/zxfDHW4NeztsNCd3ugA7PdTxPzmA==
dependencies: dependencies:
"@abp/aspnetcore.mvc.ui" "~5.0.0-rc.1" "@abp/aspnetcore.mvc.ui" "~5.0.1"
"@abp/bootstrap" "~5.0.0-rc.1" "@abp/bootstrap" "~5.0.1"
"@abp/bootstrap-datepicker" "~5.0.0-rc.1" "@abp/bootstrap-datepicker" "~5.0.1"
"@abp/datatables.net-bs5" "~5.0.0-rc.1" "@abp/datatables.net-bs5" "~5.0.1"
"@abp/font-awesome" "~5.0.0-rc.1" "@abp/font-awesome" "~5.0.1"
"@abp/jquery-form" "~5.0.0-rc.1" "@abp/jquery-form" "~5.0.1"
"@abp/jquery-validation-unobtrusive" "~5.0.0-rc.1" "@abp/jquery-validation-unobtrusive" "~5.0.1"
"@abp/lodash" "~5.0.0-rc.1" "@abp/lodash" "~5.0.1"
"@abp/luxon" "~5.0.0-rc.1" "@abp/luxon" "~5.0.1"
"@abp/malihu-custom-scrollbar-plugin" "~5.0.0-rc.1" "@abp/malihu-custom-scrollbar-plugin" "~5.0.1"
"@abp/select2" "~5.0.0-rc.1" "@abp/select2" "~5.0.1"
"@abp/sweetalert2" "~5.0.0-rc.1" "@abp/sweetalert2" "~5.0.1"
"@abp/timeago" "~5.0.0-rc.1" "@abp/timeago" "~5.0.1"
"@abp/toastr" "~5.0.0-rc.1" "@abp/toastr" "~5.0.1"
"@abp/aspnetcore.mvc.ui@~5.0.0-rc.1": "@abp/aspnetcore.mvc.ui@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.0.0-rc.1.tgz#17e16731a4b840ccf208ec9fa651783776b7ed28" resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.0.1.tgz#f5aa4e0dcc10878f590e30836887f3f9861e91e3"
integrity sha512-eLH0tj5KMwwFRL1JnN1zjM1lkJyB16ElpQ0W56tjiTx0S++QChMrBFhbKXxIfsFylNv9bhaInamq3pXKrXKhAg== integrity sha512-bN15UcNhTqeo0RXlIYws7Jd8ZfSBsVM6Y5wiAqbq1Q3Lvs1uLmryhZpn6sHmKw2Z3Lnhec7VjnZN0FwNpzEqUw==
dependencies: dependencies:
ansi-colors "^4.1.1" ansi-colors "^4.1.1"
extend-object "^1.0.0" extend-object "^1.0.0"
@ -41,145 +41,145 @@
merge-stream "^2.0.0" merge-stream "^2.0.0"
micromatch "^4.0.2" micromatch "^4.0.2"
"@abp/bootstrap-datepicker@~5.0.0-rc.1": "@abp/bootstrap-datepicker@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.0.0-rc.1.tgz#750e3cfc93124ecb10805e511d499ba03ec8b446" resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.0.1.tgz#52116a154e343d84c87257ad1ef10b54012f4c33"
integrity sha512-VkuX0qdHt8zYe7jJt4Y03kr4UnFYmqqBC2DyyaipUvy9KncUsui/t5enn7GN5ZWE9phF9ek4Fga3mRRIgs3bZg== integrity sha512-ZJWaZKzGzshBAfyBqaUScfWqeBVfWGbZIwIplF8VKtDGcyI8R54bqDsydhS88CCnolRz4+tfq3QY6yAXrUEKAw==
dependencies: dependencies:
bootstrap-datepicker "^1.9.0" bootstrap-datepicker "^1.9.0"
"@abp/bootstrap@~5.0.0-rc.1": "@abp/bootstrap@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.0.0-rc.1.tgz#a9adb676908612e4f83c184d0d2188f1d561e6c4" resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.0.1.tgz#d542a8fd7151e22eda1643e313a67f9892c50533"
integrity sha512-TCFwjX3o1lOkV4n3ZmD0PtsXPfBaaOAkLh4fMZTxF9EfBLtH6u0y3LsOviPAjiee+BmjYy2vO+9cgS6TQP8HBw== integrity sha512-wyVAp6a4OIwlqK7AZozs7wpsBZgzG55EKeChBBfUXloJPuirQHxccFNE41aAYWfKur+wj25WD5NBnzFuKyNYiQ==
dependencies: dependencies:
"@abp/core" "~5.0.0-rc.1" "@abp/core" "~5.0.1"
bootstrap "^5.1.0" bootstrap "^5.1.0"
bootstrap-v4-rtl "4.6.0-1" bootstrap-v4-rtl "4.6.0-1"
"@abp/core@~5.0.0-rc.1": "@abp/core@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.0.0-rc.1.tgz#1b7d88dcd2855e0fd0cec92b32f9a770f744c1da" resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.0.1.tgz#904fa2c22bcbf42deb56abf772c3a53362807a2f"
integrity sha512-E/j8aAsgVPcUS2bhTggpbqBHoavlAW9s2IS5GZ2rd8nKTd8aV2oa9lH0CgYN2Yswgd1mr9aA4Mz+/Se5mumyRA== integrity sha512-QzX35Oa+Vncu2OP1tXvGjAVFznmD1tZRn4tlDQgn36B2MU06UEO0JSx7JVedPvhzQZceUe5+WWMfuYNM2xeBTw==
dependencies: dependencies:
"@abp/utils" "~5.0.0-rc.1" "@abp/utils" "~5.0.1"
"@abp/datatables.net-bs5@~5.0.0-rc.1": "@abp/datatables.net-bs5@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.0.0-rc.1.tgz#45998d0469ee79eb006973981b26b541cd1bc6d0" resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.0.1.tgz#b8afa2255e374c86c50e57bd57c2b36a86d6a890"
integrity sha512-TwSFY396xY9SRy93LNlKvuj3XnLpt3NGFv2/CnKizeVF6ike/nwun1NjNhLRZ1b1kfs6LsHoolYzhOfkJeoH1A== integrity sha512-1fuCk+K4xW3XnDFo2+kPXHMoOTol4HLRcWVRELjoBQ5YbTxEPsbrhfNUeUsECDAmkxoqY7G3MEdtIVwmy5NPpg==
dependencies: dependencies:
"@abp/datatables.net" "~5.0.0-rc.1" "@abp/datatables.net" "~5.0.1"
datatables.net-bs5 "^1.10.25" datatables.net-bs5 "^1.10.25"
"@abp/datatables.net@~5.0.0-rc.1": "@abp/datatables.net@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.0.0-rc.1.tgz#4f286a2e253f67a7522a5e8b6f6767d5fc324983" resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.0.1.tgz#0ce5bdf7aa5bf224b93a22758a016c50562d6569"
integrity sha512-r1RjBde+8zacolfsolc4DBcLVyG3A/Fb4ptP3x8/HPQl7lkLCLTd9xS0/w3HeD62wFiugZvHjt82gD5A48CYUA== integrity sha512-x9D2YNtnOJRrKXi2Pwrqzz9sIOrn3o6x2c8ZxjyC54vh+SLQtLycAzQw7OyaZGdbFkudlJiCuME/FiuZvht8Og==
dependencies: dependencies:
"@abp/jquery" "~5.0.0-rc.1" "@abp/jquery" "~5.0.1"
datatables.net "^1.10.21" datatables.net "^1.10.21"
"@abp/font-awesome@~5.0.0-rc.1": "@abp/font-awesome@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.0.0-rc.1.tgz#a2fdcb8111ddac8558b92feb935abb12103d0592" resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.0.1.tgz#661753403499925661f880c53214841dd34f5210"
integrity sha512-1rinXJdRurXIwxIszYt/6dS5EKrJPgBWKF2E8Mxc+ODN3/NboMYNrdKm3FAxHX3YB36fmW+qsBXH9aTVDohvCw== integrity sha512-C+alReNvHZzST55ITBTyFqhdTehPo5ondzfqc9QlyB3Kwk1DIq0CaLqfS2xU5glYGDSqKi7xfkyQnJdwu2hKRA==
dependencies: dependencies:
"@abp/core" "~5.0.0-rc.1" "@abp/core" "~5.0.1"
"@fortawesome/fontawesome-free" "^5.13.0" "@fortawesome/fontawesome-free" "^5.13.0"
"@abp/jquery-form@~5.0.0-rc.1": "@abp/jquery-form@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.0.0-rc.1.tgz#c2bbf6532d88d8f7eb96d5ff8f8720d9166ab106" resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.0.1.tgz#20fa51946f68a7acd6ef3dd3d8d1349307f681b4"
integrity sha512-Yz5RpBzslciR6DEOvw2OjA1uDD0zf2JECbzAoy1BaY3iEFy0EUwLDhYKQmWcyoo6/2yMrPMBJlghpirmi5B9Vg== integrity sha512-Q7GG0+XFXs7pDoa4p3r7vm8+sUh5ohwovedPNVghtX8Rm2I1sfVfJKamPr24PCAyJcFVntU1WCt/CngneES3pw==
dependencies: dependencies:
"@abp/jquery" "~5.0.0-rc.1" "@abp/jquery" "~5.0.1"
jquery-form "^4.3.0" jquery-form "^4.3.0"
"@abp/jquery-validation-unobtrusive@~5.0.0-rc.1": "@abp/jquery-validation-unobtrusive@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.0.0-rc.1.tgz#6d39c58f1ad0b48d23521dc31904dfca4bc074c9" resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.0.1.tgz#50798d3c087d0b103944b3a9e7c39a1f51db9fdc"
integrity sha512-PcZE6JlcMRjIk042MkwvGQjJ88zdMM/o99A3cnT0UMkAwHl8z28R7OjWjhlZhrYznOtwEtp3yNhPrNn7OdtmNw== integrity sha512-w5SAYB0EZRbOhIFcCUXWvoGB/dWj3zyQOarbvzJ9LelgrXvvoissaaSSqq6BySjr1UigIWBCVuruAQssizmXBQ==
dependencies: dependencies:
"@abp/jquery-validation" "~5.0.0-rc.1" "@abp/jquery-validation" "~5.0.1"
jquery-validation-unobtrusive "^3.2.11" jquery-validation-unobtrusive "^3.2.11"
"@abp/jquery-validation@~5.0.0-rc.1": "@abp/jquery-validation@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.0.0-rc.1.tgz#f76d5c631a24f292327e01dfa7f557a6643055b1" resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.0.1.tgz#5932060d1fdf04a81e998caac959188aefdf1669"
integrity sha512-FZwDN6FVx2WAMfK2QSpI081H1GBd8Tdbw60T0Kmc6m/qfQqLuwY3gPbUCrAS1J91eyvwxOVEycIIJ1Np/UhRmA== integrity sha512-T5p0U2cWh6Jov55AiUxJYRw92L6ubFXfqL0EkaePV5AnoetVXheluhq9gQAKnwVAqtc/3Rxkr/lO047catUkjw==
dependencies: dependencies:
"@abp/jquery" "~5.0.0-rc.1" "@abp/jquery" "~5.0.1"
jquery-validation "^1.19.2" jquery-validation "^1.19.2"
"@abp/jquery@~5.0.0-rc.1": "@abp/jquery@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.0.0-rc.1.tgz#4ff643273b57dde7bb2af53ce62ab753bb13e0be" resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.0.1.tgz#1522ba1e0c488bffdc30a230ab35e225ae32d028"
integrity sha512-tK/eE0mq7UhPjQLJgluR06pHHIH64fcHCtL+V2V/u1u0dmHa6Fd6LpHGuekGdlZI7QLs6n6DiG6tkv4Cdf8W/g== integrity sha512-AacK4cy/RpzBfRYf7Jjn+TmVm72TW0jEjRoQ3TOXmlOrunRph05mQm72Ux2o8+Z1lOwxJKRz5gKSbRTfa6Tgpw==
dependencies: dependencies:
"@abp/core" "~5.0.0-rc.1" "@abp/core" "~5.0.1"
jquery "~3.6.0" jquery "~3.6.0"
"@abp/lodash@~5.0.0-rc.1": "@abp/lodash@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.0.0-rc.1.tgz#00e31f74eb28329caae96250c4439c5b2800acdb" resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.0.1.tgz#ad22895772ce65e52941dddb84d0a7d26c521d59"
integrity sha512-6oO1m3vnXhNfITLyNubShKmIX92DMpgPJDJmUpoNiDMf0J1G0oHHauKW9X7aTEHlxIA0sK9xk8kIKSvgS9SThA== integrity sha512-r1QqZCXfDd0YQnE4MkcY291H5jWFdZtGeYmwjIkn7aeOZ0PP9qsDPkWTwPwbpfmnz4DhmIdO5a1rveWz/J5ZwQ==
dependencies: dependencies:
"@abp/core" "~5.0.0-rc.1" "@abp/core" "~5.0.1"
lodash "^4.17.15" lodash "^4.17.15"
"@abp/luxon@~5.0.0-rc.1": "@abp/luxon@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.0.0-rc.1.tgz#ce185ebdefe1c416fcf85124226440f1334b05a6" resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.0.1.tgz#7930e30db60e63b486a51030c60e09b54bcb3867"
integrity sha512-fGN/6lHKIqCGe6pv49G2lRK5/7ezUYhZW+2A0oRtyEHsdjhXiZobTVnT/lqawqEs8aR2sJyc7lwCmRnO4jTrug== integrity sha512-cXbnyAI9Gn2bZBQuCN46UFOkzb+djA3LMgpeMlTTv0aA87PrjzT60EPQ4a9FLovESqNnblaQ9Je43QwoGH8kZA==
dependencies: dependencies:
"@abp/core" "~5.0.0-rc.1" "@abp/core" "~5.0.1"
luxon "^1.24.1" luxon "^1.24.1"
"@abp/malihu-custom-scrollbar-plugin@~5.0.0-rc.1": "@abp/malihu-custom-scrollbar-plugin@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.0.0-rc.1.tgz#8b14c53b52603bcc283d1916133038ff25b5f18b" resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.0.1.tgz#268ec30eef8ba72a0c8cb997e55d48a1508b2719"
integrity sha512-lEM2UwfoK+sUZlL7QiNgvFrXxq1Vb4nJbFmz4eZftZ1Zhj7akq5xxfWdq2jTwM4DQWFhr1OOAVaYHYx0tSCHpA== integrity sha512-mqF6OizoWp6kg5pztNfF78+mbfyX3JAXDfv+ZUCvjtAqllIzyOUIqRSXULDkAcDeCC1+PluRsd+uSltIppC5hA==
dependencies: dependencies:
"@abp/core" "~5.0.0-rc.1" "@abp/core" "~5.0.1"
malihu-custom-scrollbar-plugin "^3.1.5" malihu-custom-scrollbar-plugin "^3.1.5"
"@abp/select2@~5.0.0-rc.1": "@abp/select2@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.0.0-rc.1.tgz#2b1e554ec9c96d5259c56c8f20d4b1b3d0bdb559" resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.0.1.tgz#644c46c7c942a6b9d36bc76c7132f32ad577933b"
integrity sha512-usATVW8Mbd/iSt74BQQZbvFei+Fz3IqDCJXW6stHJ4CqOkoJit6lA0cfMv9Az0ApOFf4ucgNgmsrYW3k31jPlQ== integrity sha512-FHVqEebQS3XiYn5TMEhGaQJOAYnPqxivKpeOB0F0F2bEDGqt3OXh05KcQBOm+sDSScq3c7T7HLr9mMzlYtyHXw==
dependencies: dependencies:
"@abp/core" "~5.0.0-rc.1" "@abp/core" "~5.0.1"
select2 "^4.0.13" select2 "^4.0.13"
"@abp/sweetalert2@~5.0.0-rc.1": "@abp/sweetalert2@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.0.0-rc.1.tgz#f677853dd5e1e7bdba5d06cff816befcdf0e58b9" resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.0.1.tgz#acf2acfc04619c7907237238bfaeb63f2d75fb22"
integrity sha512-JW87ed0YhCCd1O2TGX7BoSs5ts0/F4O4D5nv3vvvDgoqXdn0Q1hCXKjeIjfstSIFXAt/e20Cw0azvsYCFaCh3w== integrity sha512-CPqXIaHK7Ff6i8gNhxoZ9r3te9LIEiDCUpdHNtgRVMCaLbywfkiLyirlfRIB6lxRWSw8BZ+M/azdp5uzidW8Vw==
dependencies: dependencies:
"@abp/core" "~5.0.0-rc.1" "@abp/core" "~5.0.1"
sweetalert2 "^11.0.18" sweetalert2 "^11.0.18"
"@abp/timeago@~5.0.0-rc.1": "@abp/timeago@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.0.0-rc.1.tgz#f826f111d9d89258d5ac57a633a86e55d5604033" resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.0.1.tgz#09ca6302304de09baa5ac8c72b950515ab0d0451"
integrity sha512-zcNG+3EnI/HLLKm4xJXbwjyFsUtFQey+j7zI9zEcXR4JZS+n5ltFSvcV+jLJDL0qcnwpB9008PXR0Jsqpzcmng== integrity sha512-6onXho8R6eiWfncONZFBn18OwgQPKIaRM73rVevpRGJTf2pylcHtCp4uHGsoqgCc+TQU7FyoKTTkg4lfvCQa0A==
dependencies: dependencies:
"@abp/jquery" "~5.0.0-rc.1" "@abp/jquery" "~5.0.1"
timeago "^1.6.7" timeago "^1.6.7"
"@abp/toastr@~5.0.0-rc.1": "@abp/toastr@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.0.0-rc.1.tgz#2c9a52c71eb60115a05f70465a191febb068ab2f" resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.0.1.tgz#a3959df1de0c4640fabf508da9ccd3ed37ae2b03"
integrity sha512-SItT5xMfAQsb7ME+v9PQ+6+dUa905T5+Ws7CNMDKZWD59HPxqaoTRHtTOqzn/8pGMyCiXYzNeTdCESkRFdKWKQ== integrity sha512-ndL1uj2ce4PbGDzxh+QCIWYu+GAmW1Xwma4aJcq5zKo+xhlLJJnTe6QFGKr7wSsTVZMB7z1Pp2olvXH6an82+g==
dependencies: dependencies:
"@abp/jquery" "~5.0.0-rc.1" "@abp/jquery" "~5.0.1"
toastr "^2.1.4" toastr "^2.1.4"
"@abp/utils@~5.0.0-rc.1": "@abp/utils@~5.0.1":
version "5.0.0-rc.1" version "5.0.1"
resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.0.0-rc.1.tgz#ba89a9de73288661db295f3bce9ea0e47c669f42" resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.0.1.tgz#57934383004a21172bf7e08130813c08946894fb"
integrity sha512-bOgH+hz7B7MnrqR/Aqy34CKiAnZItD/tLBXysea+MldzvAKdssmqe2RLA/6lApzLaF3SbOttoXXpa1q432vAlg== integrity sha512-WLCWe7iJ8krxsz8Z7E+8GDaGZuG/6PZDdqPcMIh95opi0kvcLxb+mjPXXpiXdtFzW7O09a+NaNOxorsEFxjoKw==
dependencies: dependencies:
just-compare "^1.3.0" just-compare "^1.3.0"

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="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="5.0.1" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="5.0.0-rc.1" /> <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared" Version="5.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
src/EventHub.Web.Theme/Helpers/TagHelpers/GravatarTagHelper.cs

@ -1,6 +1,7 @@
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.Linq; using System.Linq;
using System.Net;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text; using System.Text;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
@ -97,7 +98,7 @@ namespace EventHub.Web.Theme.Helpers.TagHelpers
private string GetDefaultImageParameter() private string GetDefaultImageParameter()
{ {
return "&d=" + (!string.IsNullOrEmpty(DefaultImageUrl) return "&d=" + (!string.IsNullOrEmpty(DefaultImageUrl)
? System.Net.WebUtility.UrlEncode(DefaultImageUrl) ? WebUtility.UrlEncode(DefaultImageUrl)
: GetEnumDescription(DefaultImage)); : GetEnumDescription(DefaultImage));
} }

9
src/EventHub.Web.Theme/Themes/EventHub/Components/Footer/Default.cshtml

@ -1,7 +1,8 @@
@using EventHub.Web @using Microsoft.AspNetCore.Http.Extensions
@using Microsoft.AspNetCore.Http.Extensions
@using Microsoft.Extensions.Options @using Microsoft.Extensions.Options
@using Volo.Abp.Users @using Volo.Abp.Users
@using EventHub.Web
@using System.Net
@inject ICurrentUser CurrentUser @inject ICurrentUser CurrentUser
@inject IOptions<EventHubUrlOptions> UrlOptions @inject IOptions<EventHubUrlOptions> UrlOptions
@ -20,8 +21,8 @@
<h5>Account</h5> <h5>Account</h5>
<div class="footer-links"> <div class="footer-links">
<a href="@UrlOptions.Value.Account/account/register?returnUrl=@UrlOptions.Value.Www@(System.Net.WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery()))" class="d-block">Sign Up</a> <a href="@UrlOptions.Value.Account/account/register?returnUrl=@UrlOptions.Value.Www@(WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery()))" class="d-block">Sign Up</a>
<a href="/account/login?returnUrl=@(System.Net.WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery()))" class="d-block">Log In</a> <a href="/account/login?returnUrl=@(WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery()))" class="d-block">Log In</a>
</div> </div>
} }

11
src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml

@ -1,17 +1,18 @@
@using EventHub.Web @using Microsoft.AspNetCore.Http.Extensions
@using Microsoft.Extensions.Localization @using Microsoft.Extensions.Localization
@using Volo.Abp.Users
@using EventHub.Localization
@using Microsoft.AspNetCore.Http.Extensions
@using Microsoft.Extensions.Options @using Microsoft.Extensions.Options
@using Volo.Abp.Localization @using Volo.Abp.Localization
@using Volo.Abp.Users
@using EventHub.Localization
@using EventHub.Web
@using System.Net
@inject ICurrentUser CurrentUser @inject ICurrentUser CurrentUser
@inject ILanguageProvider LanguageProvider @inject ILanguageProvider LanguageProvider
@inject IStringLocalizer<EventHubResource> L @inject IStringLocalizer<EventHubResource> L
@inject IOptions<EventHubUrlOptions> UrlOptions @inject IOptions<EventHubUrlOptions> UrlOptions
@{ @{
var returnUrl = System.Net.WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery()); var returnUrl = WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery());
if (returnUrl.IsNullOrWhiteSpace()) if (returnUrl.IsNullOrWhiteSpace())
{ {
returnUrl = "/"; returnUrl = "/";

3
src/EventHub.Web.Theme/Themes/EventHub/Components/Menu/Default.cshtml

@ -1,5 +1,4 @@
@using Volo.Abp.UI.Navigation @model Volo.Abp.UI.Navigation.ApplicationMenu
@model ApplicationMenu
@foreach (var menuItem in Model.Items) @foreach (var menuItem in Model.Items)
{ {
var elementId = string.IsNullOrEmpty(menuItem.ElementId) ? string.Empty : $"id=\"{menuItem.ElementId}\""; var elementId = string.IsNullOrEmpty(menuItem.ElementId) ? string.Empty : $"id=\"{menuItem.ElementId}\"";

3
src/EventHub.Web.Theme/Themes/EventHub/Components/Menu/_MenuItem.cshtml

@ -1,5 +1,4 @@
@using Volo.Abp.UI.Navigation @model Volo.Abp.UI.Navigation.ApplicationMenuItem
@model ApplicationMenuItem
@{ @{
var elementId = string.IsNullOrEmpty(Model.ElementId) ? string.Empty : $"id=\"{Model.ElementId}\""; var elementId = string.IsNullOrEmpty(Model.ElementId) ? string.Empty : $"id=\"{Model.ElementId}\"";
var cssClass = string.IsNullOrEmpty(Model.CssClass) ? string.Empty : Model.CssClass; var cssClass = string.IsNullOrEmpty(Model.CssClass) ? string.Empty : Model.CssClass;

3
src/EventHub.Web.Theme/Themes/EventHub/Components/Toolbar/Default.cshtml

@ -1,5 +1,4 @@
@using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars @model Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars.Toolbar
@model Toolbar
@foreach (var toolbarItem in Model.Items.OrderBy(i => i.Order)) @foreach (var toolbarItem in Model.Items.OrderBy(i => i.Order))
{ {
<li class="nav-item">@(await Component.InvokeAsync(toolbarItem.ComponentType))</li> <li class="nav-item">@(await Component.InvokeAsync(toolbarItem.ComponentType))</li>

6
src/EventHub.Web.Theme/Themes/EventHub/Components/Toolbar/LanguageSwitch/Default.cshtml

@ -1,5 +1,5 @@
@using System.Linq @using Microsoft.AspNetCore.Http.Extensions
@using Microsoft.AspNetCore.Http.Extensions @using System.Net
@model EventHub.Web.Theme.Themes.EventHub.Components.Toolbar.LanguageSwitch.LanguageSwitchViewComponentModel @model EventHub.Web.Theme.Themes.EventHub.Components.Toolbar.LanguageSwitch.LanguageSwitchViewComponentModel
@if (Model.OtherLanguages.Any()) @if (Model.OtherLanguages.Any())
{ {
@ -11,7 +11,7 @@
<div class="dropdown-menu dropdown-menu-right border-0 shadow-sm" aria-labelledby="dropdownMenuLink"> <div class="dropdown-menu dropdown-menu-right border-0 shadow-sm" aria-labelledby="dropdownMenuLink">
@foreach (var language in Model.OtherLanguages) @foreach (var language in Model.OtherLanguages)
{ {
<a class="dropdown-item" href="~/Abp/Languages/Switch?culture=@(language.CultureName)&uiCulture=@(language.UiCultureName)&returnUrl=@(System.Net.WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery()))">@language.DisplayName</a> <a class="dropdown-item" href="~/Abp/Languages/Switch?culture=@(language.CultureName)&uiCulture=@(language.UiCultureName)&returnUrl=@(WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery()))">@language.DisplayName</a>
} }
</div> </div>
</div> </div>

13
src/EventHub.Web.Theme/Themes/EventHub/Components/Toolbar/UserMenu/Default.cshtml

@ -1,12 +1,11 @@
@using Localization.Resources.AbpUi @inject ICurrentUser CurrentUser
@using Microsoft.AspNetCore.Mvc.Localization
@using Volo.Abp.MultiTenancy
@using Volo.Abp.UI.Navigation
@using Volo.Abp.Users
@inject ICurrentUser CurrentUser
@inject ICurrentTenant CurrentTenant @inject ICurrentTenant CurrentTenant
@inject IHtmlLocalizer<AbpUiResource> L @inject IHtmlLocalizer<AbpUiResource> L
@model ApplicationMenu @using Volo.Abp.Users
@using Volo.Abp.MultiTenancy
@using Localization.Resources.AbpUi
@using Microsoft.AspNetCore.Mvc.Localization
@model Volo.Abp.UI.Navigation.ApplicationMenu
<div class="dropdown"> <div class="dropdown">
<a class="nav-link dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@if (CurrentUser.TenantId != null) @if (CurrentUser.TenantId != null)

10
src/EventHub.Web.Theme/Themes/EventHub/Layouts/Account.cshtml

@ -1,14 +1,14 @@
@using Microsoft.Extensions.Localization @using Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook
@using Microsoft.Extensions.Options
@using Volo.Abp.AspNetCore.MultiTenancy
@using Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook
@using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.Localization @using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.Localization
@using Volo.Abp.AspNetCore.Mvc.UI.Theming @using Volo.Abp.AspNetCore.Mvc.UI.Theming
@using Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetScripts @using Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetScripts
@using Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetStyles @using Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetStyles
@using Volo.Abp.MultiTenancy
@using Volo.Abp.Localization @using Volo.Abp.Localization
@using Volo.Abp.MultiTenancy
@using Volo.Abp.Ui.Branding @using Volo.Abp.Ui.Branding
@using Microsoft.Extensions.Options
@using Volo.Abp.AspNetCore.MultiTenancy
@using Microsoft.Extensions.Localization
@using EventHub.Web.Theme.Bundling @using EventHub.Web.Theme.Bundling
@using EventHub.Web.Theme.Themes.EventHub.Components.MainNavbar @using EventHub.Web.Theme.Themes.EventHub.Components.MainNavbar
@using EventHub.Web.Theme.Themes.EventHub.Components.PageAlerts @using EventHub.Web.Theme.Themes.EventHub.Components.PageAlerts

6
src/EventHub.Web.Theme/Themes/EventHub/Layouts/Application.cshtml

@ -5,13 +5,13 @@
@using Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetStyles @using Volo.Abp.AspNetCore.Mvc.UI.Widgets.Components.WidgetStyles
@using Volo.Abp.Localization @using Volo.Abp.Localization
@using Volo.Abp.Ui.Branding @using Volo.Abp.Ui.Branding
@using Microsoft.AspNetCore.Http.Extensions
@using Microsoft.Extensions.Options
@using EventHub.Web
@using EventHub.Web.Theme.Bundling @using EventHub.Web.Theme.Bundling
@using EventHub.Web.Theme.Themes.EventHub.Components.Footer @using EventHub.Web.Theme.Themes.EventHub.Components.Footer
@using EventHub.Web.Theme.Themes.EventHub.Components.MainNavbar @using EventHub.Web.Theme.Themes.EventHub.Components.MainNavbar
@using EventHub.Web.Theme.Themes.EventHub.Components.PageAlerts @using EventHub.Web.Theme.Themes.EventHub.Components.PageAlerts
@using EventHub.Web
@using Microsoft.AspNetCore.Http.Extensions
@using Microsoft.Extensions.Options
@inject IBrandingProvider BrandingProvider @inject IBrandingProvider BrandingProvider
@inject IPageLayout PageLayout @inject IPageLayout PageLayout
@inject IOptions<EventHubUrlOptions> UrlOptions @inject IOptions<EventHubUrlOptions> UrlOptions

4
src/EventHub.Web/Components/Toolbar/LoginLink/Default.cshtml

@ -1,4 +1,4 @@
@using Microsoft.AspNetCore.Mvc.Localization @using EventHub.Localization
@using EventHub.Localization @using Microsoft.AspNetCore.Mvc.Localization
@inject IHtmlLocalizer<EventHubResource> L @inject IHtmlLocalizer<EventHubResource> L
<a class="nav-link" role="button" href="~/Account/Login">@L["Login"]</a> <a class="nav-link" role="button" href="~/Account/Login">@L["Login"]</a>

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

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

4
src/EventHub.Web/EventHubBrandingProvider.cs

@ -1,5 +1,5 @@
using Volo.Abp.Ui.Branding; using Volo.Abp.DependencyInjection;
using Volo.Abp.DependencyInjection; using Volo.Abp.Ui.Branding;
namespace EventHub.Web namespace EventHub.Web
{ {

1
src/EventHub.Web/EventHubWebAutoMapperProfile.cs

@ -4,7 +4,6 @@ using EventHub.Organizations;
using EventHub.Web.Pages.Events.Components.CreateOrEditEventArea; using EventHub.Web.Pages.Events.Components.CreateOrEditEventArea;
using EventHub.Web.Pages.Organizations; using EventHub.Web.Pages.Organizations;
using Volo.Abp.AutoMapper; using Volo.Abp.AutoMapper;
using EditPageModel = EventHub.Web.Pages.Events.EditPageModel;
namespace EventHub.Web namespace EventHub.Web
{ {

21
src/EventHub.Web/EventHubWebModule.cs

@ -1,22 +1,22 @@
using System; using System;
using System.IO; using System.IO;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.IdentityModel.Protocols.OpenIdConnect;
using EventHub.Localization; using EventHub.Localization;
using EventHub.Web.Menus; using EventHub.Web.Menus;
using EventHub.Web.PaymentRequests; using EventHub.Web.PaymentRequests;
using EventHub.Web.Theme; using EventHub.Web.Theme;
using EventHub.Web.Theme.Bundling; using EventHub.Web.Theme.Bundling;
using EventHub.Web.Utils; using EventHub.Web.Utils;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.RazorPages;
using StackExchange.Redis; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.IdentityModel.Protocols.OpenIdConnect;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi.Models;
using Payment.Web;
using StackExchange.Redis;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Account; using Volo.Abp.Account;
using Volo.Abp.AspNetCore.Authentication.OpenIdConnect; using Volo.Abp.AspNetCore.Authentication.OpenIdConnect;
@ -34,10 +34,9 @@ using Volo.Abp.Http.Client;
using Volo.Abp.Http.Client.IdentityModel.Web; using Volo.Abp.Http.Client.IdentityModel.Web;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
using Volo.Abp.Swashbuckle; using Volo.Abp.Swashbuckle;
using Volo.Abp.UI.Navigation.Urls;
using Volo.Abp.UI.Navigation; using Volo.Abp.UI.Navigation;
using Volo.Abp.UI.Navigation.Urls;
using Volo.Abp.VirtualFileSystem; using Volo.Abp.VirtualFileSystem;
using Payment.Web;
namespace EventHub.Web namespace EventHub.Web
{ {

2
src/EventHub.Web/Menus/EventHubMenuContributor.cs

@ -1,8 +1,8 @@
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Localization;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using EventHub.Localization;
using Volo.Abp.Account.Localization; using Volo.Abp.Account.Localization;
using Volo.Abp.UI.Navigation; using Volo.Abp.UI.Navigation;
using Volo.Abp.Users; using Volo.Abp.Users;

2
src/EventHub.Web/Menus/EventHubToolbarContributor.cs

@ -1,8 +1,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Web.Components.Toolbar.CreateButton; using EventHub.Web.Components.Toolbar.CreateButton;
using Microsoft.Extensions.DependencyInjection;
using EventHub.Web.Components.Toolbar.LoginLink; using EventHub.Web.Components.Toolbar.LoginLink;
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars;
using Volo.Abp.Users; using Volo.Abp.Users;

2
src/EventHub.Web/Pages/Events/Components/CreateOrEditEventArea/_sessionSection.cshtml

@ -1,5 +1,5 @@
@using EventHub.Web.Pages.Events
@using EventHub.Events @using EventHub.Events
@using EventHub.Web.Pages.Events
@using EventHub.Web.Pages.Events.Components.CreateOrEditEventArea @using EventHub.Web.Pages.Events.Components.CreateOrEditEventArea
@using Microsoft.AspNetCore.Http @using Microsoft.AspNetCore.Http
@model List<EventHub.Events.TrackDto> @model List<EventHub.Events.TrackDto>

1
src/EventHub.Web/Pages/Events/Components/EventsArea/_eventListSection.cshtml

@ -1,4 +1,3 @@
@using System.Globalization
@using EventHub.Web @using EventHub.Web
@using EventHub.Web.Pages.Events @using EventHub.Web.Pages.Events
@using Microsoft.Extensions.Options @using Microsoft.Extensions.Options

2
src/EventHub.Web/Pages/Events/Components/LocationArea/Default.cshtml

@ -1,7 +1,7 @@
@inject IHtmlLocalizer<EventHubResource> L
@using EventHub.Localization @using EventHub.Localization
@using EventHub.Web.Pages.Events @using EventHub.Web.Pages.Events
@using Microsoft.AspNetCore.Mvc.Localization @using Microsoft.AspNetCore.Mvc.Localization
@inject IHtmlLocalizer<EventHubResource> L
@model EventHub.Web.Pages.Events.Components.LocationArea.LocationAreaViewComponent.LocationAreaViewComponentModel @model EventHub.Web.Pages.Events.Components.LocationArea.LocationAreaViewComponent.LocationAreaViewComponentModel
<div data-event-id="@Model.EventId"> <div data-event-id="@Model.EventId">
@if (Model.IsRegistered) @if (Model.IsRegistered)

4
src/EventHub.Web/Pages/Events/Components/RegistrationArea/Default.cshtml

@ -1,6 +1,6 @@
@using EventHub.Localization @inject IHtmlLocalizer<EventHubResource> L
@using EventHub.Localization
@using Microsoft.AspNetCore.Mvc.Localization @using Microsoft.AspNetCore.Mvc.Localization
@inject IHtmlLocalizer<EventHubResource> L
@model EventHub.Web.Pages.Events.Components.RegistrationArea.RegistrationAreaViewComponent.RegistrationAreaViewComponentModel @model EventHub.Web.Pages.Events.Components.RegistrationArea.RegistrationAreaViewComponent.RegistrationAreaViewComponentModel
<div data-event-id="@Model.EventId"> <div data-event-id="@Model.EventId">
@if (Model.IsLoggedIn) @if (Model.IsLoggedIn)

4
src/EventHub.Web/Pages/Events/Detail.cshtml

@ -1,5 +1,7 @@
@page "/events/{url}" @page "/events/{url}"
@inject IHtmlLocalizer<EventHubResource> L @inject IHtmlLocalizer<EventHubResource> L
@inject ICurrentUser CurrentUser
@inject IClock Clock
@using EventHub.Localization @using EventHub.Localization
@using EventHub.Web @using EventHub.Web
@using EventHub.Web.Pages.Events @using EventHub.Web.Pages.Events
@ -11,8 +13,6 @@
@using Microsoft.Extensions.Options @using Microsoft.Extensions.Options
@using Volo.Abp.Timing @using Volo.Abp.Timing
@using Volo.Abp.Users @using Volo.Abp.Users
@inject ICurrentUser CurrentUser
@inject IClock Clock
@model EventHub.Web.Pages.Events.DetailPageModel @model EventHub.Web.Pages.Events.DetailPageModel
@inject IOptions<EventHubUrlOptions> UrlOptions @inject IOptions<EventHubUrlOptions> UrlOptions

5
src/EventHub.Web/Pages/Index.cshtml

@ -1,14 +1,13 @@
@page @page
@model EventHub.Web.Pages.IndexModel
@using System.Globalization @using System.Globalization
@using Microsoft.AspNetCore.Mvc.Localization
@using EventHub.Localization @using EventHub.Localization
@using EventHub.Web @using EventHub.Web
@using EventHub.Web.Helpers
@using EventHub.Web.Pages.Events.Components.EventsArea @using EventHub.Web.Pages.Events.Components.EventsArea
@using Microsoft.AspNetCore.Mvc.Localization
@using Microsoft.Extensions.Options @using Microsoft.Extensions.Options
@using Volo.Abp.Timing @using Volo.Abp.Timing
@using Volo.Abp.Users @using Volo.Abp.Users
@model EventHub.Web.Pages.IndexModel
@inject ICurrentUser CurrentUser @inject ICurrentUser CurrentUser
@inject IClock Clock @inject IClock Clock
@inject IHtmlLocalizer<EventHubResource> L @inject IHtmlLocalizer<EventHubResource> L

2
src/EventHub.Web/Pages/Organizations/Components/JoinArea/Default.cshtml

@ -1,6 +1,6 @@
@inject IHtmlLocalizer<EventHubResource> L
@using EventHub.Localization @using EventHub.Localization
@using Microsoft.AspNetCore.Mvc.Localization @using Microsoft.AspNetCore.Mvc.Localization
@inject IHtmlLocalizer<EventHubResource> L
@model EventHub.Web.Pages.Organizations.Components.JoinArea.JoinAreaViewComponent.MembershipAreaViewComponentModel @model EventHub.Web.Pages.Organizations.Components.JoinArea.JoinAreaViewComponent.MembershipAreaViewComponentModel
<abp-card class="detail-head mt-4 font-weight-bold" data-organization-id="@Model.OrganizationId"> <abp-card class="detail-head mt-4 font-weight-bold" data-organization-id="@Model.OrganizationId">
<abp-card-body> <abp-card-body>

3
src/EventHub.Web/Pages/Organizations/Components/OrganizationsArea/OrganizationsAreaViewComponent.cs

@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using EventHub.Organizations; using EventHub.Organizations;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Volo.Abp.Application.Dtos;
using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.AspNetCore.Mvc.UI.Widgets; using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
@ -38,7 +37,7 @@ namespace EventHub.Web.Pages.Organizations.Components.OrganizationsArea
return View( return View(
"~/Pages/Organizations/Components/OrganizationsArea/Default.cshtml", "~/Pages/Organizations/Components/OrganizationsArea/Default.cshtml",
new OrganizationsAreaViewComponent.ListAreaViewComponentModel new ListAreaViewComponentModel
{ {
Organizations = result.Items, Organizations = result.Items,
TotalCount = result.TotalCount, TotalCount = result.TotalCount,

1
src/EventHub.Web/Pages/Organizations/Edit.cshtml

@ -5,7 +5,6 @@
@using EventHub.Web @using EventHub.Web
@using Microsoft.AspNetCore.Mvc.Localization @using Microsoft.AspNetCore.Mvc.Localization
@using Microsoft.Extensions.Options @using Microsoft.Extensions.Options
@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
@model EventHub.Web.Pages.Organizations.EditPageModel @model EventHub.Web.Pages.Organizations.EditPageModel
@inject IOptions<EventHubUrlOptions> UrlOptions @inject IOptions<EventHubUrlOptions> UrlOptions

1
src/EventHub.Web/Pages/Organizations/Edit.cshtml.cs

@ -8,7 +8,6 @@ using JetBrains.Annotations;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
using Volo.Abp.Content; using Volo.Abp.Content;
namespace EventHub.Web.Pages.Organizations namespace EventHub.Web.Pages.Organizations

1
src/EventHub.Web/Pages/Organizations/Profile.cshtml

@ -5,7 +5,6 @@
@using EventHub.Web.Pages.Events.Components.EventsArea @using EventHub.Web.Pages.Events.Components.EventsArea
@using EventHub.Web.Pages.Organizations.Components.JoinArea @using EventHub.Web.Pages.Organizations.Components.JoinArea
@using EventHub.Web.Pages.Organizations.Components.MembersArea @using EventHub.Web.Pages.Organizations.Components.MembersArea
@using EventHub.Web.PaymentRequests
@using Microsoft.AspNetCore.Mvc.Localization @using Microsoft.AspNetCore.Mvc.Localization
@using Microsoft.Extensions.Options @using Microsoft.Extensions.Options
@using Volo.Abp.AspNetCore.Mvc.UI.Packages.SweetAlert2 @using Volo.Abp.AspNetCore.Mvc.UI.Packages.SweetAlert2

2
src/EventHub.Web/Pages/Payment/PostCheckout.cshtml

@ -1,9 +1,9 @@
@page @page
@inherits Payment.Web.Pages.PaymentPageBase
@using EventHub.Web @using EventHub.Web
@using Microsoft.Extensions.Options @using Microsoft.Extensions.Options
@using Payment.PaymentRequests @using Payment.PaymentRequests
@using Volo.Abp.Users @using Volo.Abp.Users
@inherits Payment.Web.Pages.PaymentPageBase
@model EventHub.Web.Pages.Payment.CustomPostCheckoutPageModel @model EventHub.Web.Pages.Payment.CustomPostCheckoutPageModel
@inject IOptions<EventHubUrlOptions> UrlOptions @inject IOptions<EventHubUrlOptions> UrlOptions
@inject ICurrentUser CurrentUser @inject ICurrentUser CurrentUser

3
src/EventHub.Web/Pages/Payment/PreCheckout.cshtml

@ -1,12 +1,11 @@
@page @page
@inherits Payment.Web.Pages.PaymentPageBase
@using EventHub.Organizations @using EventHub.Organizations
@using EventHub.Web.PaymentRequests @using EventHub.Web.PaymentRequests
@using Microsoft.AspNetCore.Http @using Microsoft.AspNetCore.Http
@using Microsoft.Extensions.Options @using Microsoft.Extensions.Options
@using Newtonsoft.Json @using Newtonsoft.Json
@using Payment.Web.Pages.Payment @using Payment.Web.Pages.Payment
@using Payment.PaymentRequests
@inherits Payment.Web.Pages.PaymentPageBase
@model Payment.Web.Pages.Payment.PreCheckoutPageModel @model Payment.Web.Pages.Payment.PreCheckoutPageModel
@inject IOptionsSnapshot<PremiumPlanInfoOptions> PremiumPlanInfoOptionsSnapshot @inject IOptionsSnapshot<PremiumPlanInfoOptions> PremiumPlanInfoOptionsSnapshot

6
src/EventHub.Web/Pages/User.cshtml

@ -1,4 +1,7 @@
@page "/users/{userName}" @page "/users/{userName}"
@inject ICurrentUser CurrentUser
@inject IClock Clock
@inject IHtmlLocalizer<EventHubResource> L
@using System.Globalization @using System.Globalization
@using EventHub.Localization @using EventHub.Localization
@using EventHub.Web.Pages.Events.Components.EventsArea @using EventHub.Web.Pages.Events.Components.EventsArea
@ -6,9 +9,6 @@
@using Microsoft.AspNetCore.Mvc.Localization @using Microsoft.AspNetCore.Mvc.Localization
@using Volo.Abp.Timing @using Volo.Abp.Timing
@using Volo.Abp.Users @using Volo.Abp.Users
@inject ICurrentUser CurrentUser
@inject IClock Clock
@inject IHtmlLocalizer<EventHubResource> L
@model EventHub.Web.Pages.UserModel @model EventHub.Web.Pages.UserModel
@section styles { @section styles {

1
src/EventHub.Web/Properties/AssemblyInfo.cs

@ -1,2 +1,3 @@
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
[assembly:InternalsVisibleToAttribute("EventHub.Web.Tests")] [assembly:InternalsVisibleToAttribute("EventHub.Web.Tests")]

2
src/EventHub.Web/package.json

@ -3,7 +3,7 @@
"name": "my-app", "name": "my-app",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~5.0.0-rc.1", "@abp/aspnetcore.mvc.ui.theme.basic": "~5.0.1",
"awesomplete": "^1.1.5", "awesomplete": "^1.1.5",
"daterangepicker": "^3.1.0", "daterangepicker": "^3.1.0",
"owl.carousel": "^2.3.4" "owl.carousel": "^2.3.4"

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save