Browse Source

Merge pull request #93 from volosoft/cms-kit

Integrate CMS Kit comments to EventHub
pull/101/head
Halil İbrahim Kalkan 5 years ago
committed by GitHub
parent
commit
40b92df2e5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/EventHub.Admin.Application.Contracts/EventHub.Admin.Application.Contracts.csproj
  2. 2
      src/EventHub.Admin.Application.Contracts/EventHubAdminApplicationContractsModule.cs
  3. 1
      src/EventHub.Admin.Application/EventHub.Admin.Application.csproj
  4. 2
      src/EventHub.Admin.Application/EventHubAdminApplicationModule.cs
  5. 1
      src/EventHub.Admin.HttpApi.Client/EventHub.Admin.HttpApi.Client.csproj
  6. 2
      src/EventHub.Admin.HttpApi.Client/EventHubAdminHttpApiClientModule.cs
  7. 1
      src/EventHub.Admin.HttpApi/EventHub.Admin.HttpApi.csproj
  8. 2
      src/EventHub.Admin.HttpApi/EventHubAdminHttpApiModule.cs
  9. 1
      src/EventHub.Application.Contracts/EventHub.Application.Contracts.csproj
  10. 2
      src/EventHub.Application.Contracts/EventHubApplicationContractsModule.cs
  11. 1
      src/EventHub.Application/EventHub.Application.csproj
  12. 2
      src/EventHub.Application/EventHubApplicationModule.cs
  13. 1
      src/EventHub.Domain.Shared/EventHub.Domain.Shared.csproj
  14. 2
      src/EventHub.Domain.Shared/EventHubDomainSharedModule.cs
  15. 15
      src/EventHub.Domain.Shared/EventHubGlobalFeatureConfigurator.cs
  16. 1
      src/EventHub.Domain.Shared/Localization/EventHub/en.json
  17. 1
      src/EventHub.Domain/EventHub.Domain.csproj
  18. 16
      src/EventHub.Domain/EventHubDomainModule.cs
  19. 11
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContext.cs
  20. 2
      src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubEntityFrameworkCoreModule.cs
  21. 1
      src/EventHub.EntityFrameworkCore/EventHub.EntityFrameworkCore.csproj
  22. 3037
      src/EventHub.EntityFrameworkCore/Migrations/20220210101325_Added_CmsKitPro.Designer.cs
  23. 135
      src/EventHub.EntityFrameworkCore/Migrations/20220210101325_Added_CmsKitPro.cs
  24. 208
      src/EventHub.EntityFrameworkCore/Migrations/EventHubDbContextModelSnapshot.cs
  25. 1
      src/EventHub.HttpApi.Client/EventHub.HttpApi.Client.csproj
  26. 2
      src/EventHub.HttpApi.Client/EventHubHttpApiClientModule.cs
  27. 1
      src/EventHub.HttpApi/EventHub.HttpApi.csproj
  28. 2
      src/EventHub.HttpApi/EventHubHttpApiModule.cs
  29. 1
      src/EventHub.Web/EventHub.Web.csproj
  30. 2
      src/EventHub.Web/EventHubWebModule.cs
  31. 42
      src/EventHub.Web/Pages/Events/Detail.cshtml

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

@ -16,6 +16,7 @@
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="5.0.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="5.0.1" />
<PackageReference Include="Volo.CmsKit.Admin.Application.Contracts" Version="5.0.1" />
</ItemGroup>
</Project>

2
src/EventHub.Admin.Application.Contracts/EventHubAdminApplicationContractsModule.cs

@ -3,6 +3,7 @@ using Volo.Abp.Account;
using Volo.Abp.Identity;
using Volo.Abp.Modularity;
using Volo.Abp.PermissionManagement;
using Volo.CmsKit.Admin;
namespace EventHub.Admin
{
@ -11,6 +12,7 @@ namespace EventHub.Admin
typeof(AbpAccountApplicationContractsModule),
typeof(AbpIdentityApplicationContractsModule),
typeof(AbpPermissionManagementApplicationContractsModule),
typeof(CmsKitAdminApplicationContractsModule),
typeof(PaymentAdminApplicationContractsModule)
)]
public class EventHubAdminApplicationContractsModule : AbpModule

1
src/EventHub.Admin.Application/EventHub.Admin.Application.csproj

@ -17,6 +17,7 @@
<PackageReference Include="Volo.Abp.Account.Application" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="5.0.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="5.0.1" />
<PackageReference Include="Volo.CmsKit.Admin.Application" Version="5.0.1" />
</ItemGroup>
</Project>

2
src/EventHub.Admin.Application/EventHubAdminApplicationModule.cs

@ -4,6 +4,7 @@ using Volo.Abp.AutoMapper;
using Volo.Abp.Identity;
using Volo.Abp.Modularity;
using Volo.Abp.PermissionManagement;
using Volo.CmsKit.Admin;
namespace EventHub.Admin
{
@ -14,6 +15,7 @@ namespace EventHub.Admin
typeof(AbpIdentityApplicationModule),
typeof(AbpPermissionManagementApplicationModule),
typeof(AbpAutoMapperModule),
typeof(CmsKitAdminApplicationModule),
typeof(PaymentAdminApplicationModule)
)]
public class EventHubAdminApplicationModule : AbpModule

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

@ -16,6 +16,7 @@
<PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="5.0.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="5.0.1" />
<PackageReference Include="Volo.CmsKit.Admin.HttpApi.Client" Version="5.0.1" />
</ItemGroup>
</Project>

2
src/EventHub.Admin.HttpApi.Client/EventHubAdminHttpApiClientModule.cs

@ -4,6 +4,7 @@ using Volo.Abp.Account;
using Volo.Abp.Identity;
using Volo.Abp.Modularity;
using Volo.Abp.PermissionManagement;
using Volo.CmsKit.Admin;
namespace EventHub.Admin
{
@ -12,6 +13,7 @@ namespace EventHub.Admin
typeof(AbpAccountHttpApiClientModule),
typeof(AbpIdentityHttpApiClientModule),
typeof(AbpPermissionManagementHttpApiClientModule),
typeof(CmsKitAdminHttpApiClientModule),
typeof(PaymentAdminHttpApiClientModule)
)]
public class EventHubAdminHttpApiClientModule : AbpModule

1
src/EventHub.Admin.HttpApi/EventHub.Admin.HttpApi.csproj

@ -16,6 +16,7 @@
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="5.0.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="5.0.1" />
<PackageReference Include="Volo.CmsKit.Admin.HttpApi" Version="5.0.1" />
</ItemGroup>
</Project>

2
src/EventHub.Admin.HttpApi/EventHubAdminHttpApiModule.cs

@ -3,6 +3,7 @@ using Volo.Abp.Account;
using Volo.Abp.Identity;
using Volo.Abp.Modularity;
using Volo.Abp.PermissionManagement.HttpApi;
using Volo.CmsKit.Admin;
namespace EventHub.Admin
{
@ -11,6 +12,7 @@ namespace EventHub.Admin
typeof(AbpAccountHttpApiModule),
typeof(AbpIdentityHttpApiModule),
typeof(AbpPermissionManagementHttpApiModule),
typeof(CmsKitAdminHttpApiModule),
typeof(PaymentAdminHttpApiModule)
)]
public class EventHubAdminHttpApiModule : AbpModule

1
src/EventHub.Application.Contracts/EventHub.Application.Contracts.csproj

@ -14,6 +14,7 @@
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="5.0.1" />
<PackageReference Include="Volo.CmsKit.Public.Application.Contracts" Version="5.0.1" />
</ItemGroup>
</Project>

2
src/EventHub.Application.Contracts/EventHubApplicationContractsModule.cs

@ -2,12 +2,14 @@
using Volo.Abp.Application;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Modularity;
using Volo.CmsKit.Public;
namespace EventHub
{
[DependsOn(
typeof(EventHubDomainSharedModule),
typeof(AbpDddApplicationContractsModule),
typeof(CmsKitPublicApplicationContractsModule),
typeof(PaymentApplicationContractsModule)
)]
public class EventHubApplicationContractsModule : AbpModule

1
src/EventHub.Application/EventHub.Application.csproj

@ -15,6 +15,7 @@
<ItemGroup>
<PackageReference Include="Volo.Abp.Ddd.Application" Version="5.0.1" />
<PackageReference Include="Volo.CmsKit.Public.Application" Version="5.0.1" />
</ItemGroup>
</Project>

2
src/EventHub.Application/EventHubApplicationModule.cs

@ -2,6 +2,7 @@
using Volo.Abp.Application;
using Volo.Abp.AutoMapper;
using Volo.Abp.Modularity;
using Volo.CmsKit.Public;
namespace EventHub
{
@ -9,6 +10,7 @@ namespace EventHub
typeof(EventHubDomainModule),
typeof(EventHubApplicationContractsModule),
typeof(AbpDddApplicationModule),
typeof(CmsKitPublicApplicationModule),
typeof(PaymentApplicationModule)
)]
public class EventHubApplicationModule : AbpModule

1
src/EventHub.Domain.Shared/EventHub.Domain.Shared.csproj

@ -20,6 +20,7 @@
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="5.0.1" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="5.0.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="5.0.1" />
<PackageReference Include="Volo.CmsKit.Domain.Shared" Version="5.0.1" />
</ItemGroup>
<ItemGroup>

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

@ -14,6 +14,7 @@ using Volo.Abp.PermissionManagement;
using Volo.Abp.SettingManagement;
using Volo.Abp.Validation.Localization;
using Volo.Abp.VirtualFileSystem;
using Volo.CmsKit;
namespace EventHub
{
@ -25,6 +26,7 @@ namespace EventHub
typeof(AbpPermissionManagementDomainSharedModule),
typeof(AbpSettingManagementDomainSharedModule),
typeof(BlobStoringDatabaseDomainSharedModule),
typeof(CmsKitDomainSharedModule),
typeof(PaymentDomainSharedModule)
)]
public class EventHubDomainSharedModule : AbpModule

15
src/EventHub.Domain.Shared/EventHubGlobalFeatureConfigurator.cs

@ -1,4 +1,5 @@
using Volo.Abp.Threading;
using Volo.Abp.GlobalFeatures;
using Volo.Abp.Threading;
namespace EventHub
{
@ -10,13 +11,11 @@ namespace EventHub
{
OneTimeRunner.Run(() =>
{
/* You can configure (enable/disable) global features of the used modules here.
*
* YOU CAN SAFELY DELETE THIS CLASS AND REMOVE ITS USAGES IF YOU DON'T NEED TO IT!
*
* Please refer to the documentation to lear more about the Global Features System:
* https://docs.abp.io/en/abp/latest/Global-Features
*/
GlobalFeatureManager.Instance.Modules.CmsKit(cmsKit =>
{
cmsKit.Tags.Enable();
cmsKit.Comments.Enable();
});
});
}
}

1
src/EventHub.Domain.Shared/Localization/EventHub/en.json

@ -151,6 +151,7 @@
"MinStartTime": "Min Start Time",
"MaxStartTime": "Max Start Time",
"Online": "Online",
"Comments": "Comments",
"InPerson": "In Person",
"UpgradeToPremium": "Upgrade To Premium",
"EventHub:TrackNameAlreadyExist": "The track {Name} already exists",

1
src/EventHub.Domain/EventHub.Domain.csproj

@ -23,6 +23,7 @@
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="5.0.1" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="5.0.1" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="5.0.1" />
<PackageReference Include="Volo.CmsKit.Domain" Version="5.0.1" />
</ItemGroup>
<ItemGroup>

16
src/EventHub.Domain/EventHubDomainModule.cs

@ -12,6 +12,10 @@ using Volo.Abp.PermissionManagement.Identity;
using Volo.Abp.PermissionManagement.IdentityServer;
using Volo.Abp.SettingManagement;
using Volo.Abp.VirtualFileSystem;
using Volo.CmsKit;
using Volo.CmsKit.Comments;
using EventHub.Events;
using Volo.CmsKit.Tags;
namespace EventHub
{
@ -26,6 +30,7 @@ namespace EventHub
typeof(AbpSettingManagementDomainModule),
typeof(AbpEmailingModule),
typeof(BlobStoringDatabaseDomainModule),
typeof(CmsKitDomainModule),
typeof(PaymentDomainModule)
)]
public class EventHubDomainModule : AbpModule
@ -36,6 +41,17 @@ namespace EventHub
{
options.FileSets.AddEmbedded<EventHubDomainModule>();
});
Configure<CmsKitCommentOptions>(options =>
{
options.EntityTypes.Add(new CommentEntityTypeDefinition(nameof(Event)));
});
Configure<CmsKitTagOptions>(options =>
{
options.EntityTypes.Add(new TagEntityTypeDefiniton(nameof(Event)));
});
#if DEBUG
context.Services.Replace(ServiceDescriptor.Singleton<IEmailSender, NullEmailSender>());
#endif

11
src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubDbContext.cs

@ -16,6 +16,16 @@ using Volo.Abp.Identity.EntityFrameworkCore;
using Volo.Abp.IdentityServer.EntityFrameworkCore;
using Volo.Abp.PermissionManagement.EntityFrameworkCore;
using Volo.Abp.SettingManagement.EntityFrameworkCore;
using Volo.CmsKit.Blogs;
using Volo.CmsKit.Comments;
using Volo.CmsKit.EntityFrameworkCore;
using Volo.CmsKit.MediaDescriptors;
using Volo.CmsKit.Menus;
using Volo.CmsKit.Pages;
using Volo.CmsKit.Ratings;
using Volo.CmsKit.Reactions;
using Volo.CmsKit.Tags;
using Volo.CmsKit.Users;
namespace EventHub.EntityFrameworkCore
{
@ -69,6 +79,7 @@ namespace EventHub.EntityFrameworkCore
builder.ConfigureIdentityServer();
builder.ConfigureBlobStoring();
builder.ConfigurePayment();
builder.ConfigureCmsKit();
builder.ConfigureEventHub();
}
}

2
src/EventHub.EntityFrameworkCore/EntityFrameworkCore/EventHubEntityFrameworkCoreModule.cs

@ -11,6 +11,7 @@ using Volo.Abp.IdentityServer.EntityFrameworkCore;
using Volo.Abp.Modularity;
using Volo.Abp.PermissionManagement.EntityFrameworkCore;
using Volo.Abp.SettingManagement.EntityFrameworkCore;
using Volo.CmsKit.EntityFrameworkCore;
namespace EventHub.EntityFrameworkCore
{
@ -24,6 +25,7 @@ namespace EventHub.EntityFrameworkCore
typeof(AbpBackgroundJobsEntityFrameworkCoreModule),
typeof(AbpAuditLoggingEntityFrameworkCoreModule),
typeof(BlobStoringDatabaseEntityFrameworkCoreModule),
typeof(CmsKitEntityFrameworkCoreModule),
typeof(PaymentEntityFrameworkCoreModule)
)]
public class EventHubEntityFrameworkCoreModule : AbpModule

1
src/EventHub.EntityFrameworkCore/EventHub.EntityFrameworkCore.csproj

@ -25,6 +25,7 @@
<PackageReference Include="Volo.Abp.IdentityServer.EntityFrameworkCore" Version="5.0.1" />
<PackageReference Include="Volo.Abp.BackgroundJobs.EntityFrameworkCore" Version="5.0.1" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="5.0.1" />
<PackageReference Include="Volo.CmsKit.EntityFrameworkCore" Version="5.0.1" />
</ItemGroup>
</Project>

3037
src/EventHub.EntityFrameworkCore/Migrations/20220210101325_Added_CmsKitPro.Designer.cs

File diff suppressed because it is too large

135
src/EventHub.EntityFrameworkCore/Migrations/20220210101325_Added_CmsKitPro.cs

@ -0,0 +1,135 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace EventHub.Migrations
{
public partial class Added_CmsKit : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "CmsComments",
columns: table => new
{
Id = table.Column<Guid>(type: "uuid", nullable: false),
TenantId = table.Column<Guid>(type: "uuid", nullable: true),
EntityType = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: false),
EntityId = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: false),
Text = table.Column<string>(type: "character varying(512)", maxLength: 512, nullable: false),
RepliedCommentId = table.Column<Guid>(type: "uuid", nullable: true),
CreatorId = table.Column<Guid>(type: "uuid", nullable: false),
CreationTime = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
ExtraProperties = table.Column<string>(type: "text", nullable: true),
ConcurrencyStamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_CmsComments", x => x.Id);
});
migrationBuilder.CreateTable(
name: "CmsEntityTags",
columns: table => new
{
TagId = table.Column<Guid>(type: "uuid", nullable: false),
EntityId = table.Column<string>(type: "text", nullable: false),
TenantId = table.Column<Guid>(type: "uuid", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_CmsEntityTags", x => new { x.EntityId, x.TagId });
});
migrationBuilder.CreateTable(
name: "CmsTags",
columns: table => new
{
Id = table.Column<Guid>(type: "uuid", nullable: false),
TenantId = table.Column<Guid>(type: "uuid", nullable: true),
EntityType = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: false),
Name = table.Column<string>(type: "character varying(32)", maxLength: 32, nullable: false),
ExtraProperties = table.Column<string>(type: "text", nullable: true),
ConcurrencyStamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: true),
CreationTime = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
CreatorId = table.Column<Guid>(type: "uuid", nullable: true),
LastModificationTime = table.Column<DateTime>(type: "timestamp with time zone", nullable: true),
LastModifierId = table.Column<Guid>(type: "uuid", nullable: true),
IsDeleted = table.Column<bool>(type: "boolean", nullable: false, defaultValue: false),
DeleterId = table.Column<Guid>(type: "uuid", nullable: true),
DeletionTime = table.Column<DateTime>(type: "timestamp with time zone", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_CmsTags", x => x.Id);
});
migrationBuilder.CreateTable(
name: "CmsUsers",
columns: table => new
{
Id = table.Column<Guid>(type: "uuid", nullable: false),
TenantId = table.Column<Guid>(type: "uuid", nullable: true),
UserName = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false),
Email = table.Column<string>(type: "character varying(256)", maxLength: 256, nullable: false),
Name = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: true),
Surname = table.Column<string>(type: "character varying(64)", maxLength: 64, nullable: true),
EmailConfirmed = table.Column<bool>(type: "boolean", nullable: false, defaultValue: false),
PhoneNumber = table.Column<string>(type: "character varying(16)", maxLength: 16, nullable: true),
PhoneNumberConfirmed = table.Column<bool>(type: "boolean", nullable: false, defaultValue: false),
ExtraProperties = table.Column<string>(type: "text", nullable: true),
ConcurrencyStamp = table.Column<string>(type: "character varying(40)", maxLength: 40, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_CmsUsers", x => x.Id);
});
migrationBuilder.CreateIndex(
name: "IX_CmsComments_TenantId_EntityType_EntityId",
table: "CmsComments",
columns: new[] { "TenantId", "EntityType", "EntityId" });
migrationBuilder.CreateIndex(
name: "IX_CmsComments_TenantId_RepliedCommentId",
table: "CmsComments",
columns: new[] { "TenantId", "RepliedCommentId" });
migrationBuilder.CreateIndex(
name: "IX_CmsEntityTags_TenantId_EntityId_TagId",
table: "CmsEntityTags",
columns: new[] { "TenantId", "EntityId", "TagId" });
migrationBuilder.CreateIndex(
name: "IX_CmsTags_TenantId_Name",
table: "CmsTags",
columns: new[] { "TenantId", "Name" });
migrationBuilder.CreateIndex(
name: "IX_CmsUsers_TenantId_Email",
table: "CmsUsers",
columns: new[] { "TenantId", "Email" });
migrationBuilder.CreateIndex(
name: "IX_CmsUsers_TenantId_UserName",
table: "CmsUsers",
columns: new[] { "TenantId", "UserName" });
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "CmsComments");
migrationBuilder.DropTable(
name: "CmsEntityTags");
migrationBuilder.DropTable(
name: "CmsTags");
migrationBuilder.DropTable(
name: "CmsUsers");
}
}
}

208
src/EventHub.EntityFrameworkCore/Migrations/EventHubDbContextModelSnapshot.cs

@ -19,7 +19,7 @@ namespace EventHub.Migrations
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.PostgreSql)
.HasAnnotation("ProductVersion", "6.0.0")
.HasAnnotation("ProductVersion", "6.0.1")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@ -2365,6 +2365,212 @@ namespace EventHub.Migrations
b.ToTable("AbpSettings", (string)null);
});
modelBuilder.Entity("Volo.CmsKit.Comments.Comment", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasMaxLength(40)
.HasColumnType("character varying(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid>("CreatorId")
.HasColumnType("uuid")
.HasColumnName("CreatorId");
b.Property<string>("EntityId")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("EntityType")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<Guid?>("RepliedCommentId")
.HasColumnType("uuid");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.Property<string>("Text")
.IsRequired()
.HasMaxLength(512)
.HasColumnType("character varying(512)");
b.HasKey("Id");
b.HasIndex("TenantId", "RepliedCommentId");
b.HasIndex("TenantId", "EntityType", "EntityId");
b.ToTable("CmsComments", (string)null);
});
modelBuilder.Entity("Volo.CmsKit.Tags.EntityTag", b =>
{
b.Property<string>("EntityId")
.HasColumnType("text");
b.Property<Guid>("TagId")
.HasColumnType("uuid");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("EntityId", "TagId");
b.HasIndex("TenantId", "EntityId", "TagId");
b.ToTable("CmsEntityTags", (string)null);
});
modelBuilder.Entity("Volo.CmsKit.Tags.Tag", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasMaxLength(40)
.HasColumnType("character varying(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("timestamp with time zone")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("uuid")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("uuid")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("timestamp with time zone")
.HasColumnName("DeletionTime");
b.Property<string>("EntityType")
.IsRequired()
.HasMaxLength(64)
.HasColumnType("character varying(64)");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("timestamp with time zone")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("uuid")
.HasColumnName("LastModifierId");
b.Property<string>("Name")
.IsRequired()
.HasMaxLength(32)
.HasColumnType("character varying(32)");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.HasKey("Id");
b.HasIndex("TenantId", "Name");
b.ToTable("CmsTags", (string)null);
});
modelBuilder.Entity("Volo.CmsKit.Users.CmsUser", b =>
{
b.Property<Guid>("Id")
.HasColumnType("uuid");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasMaxLength(40)
.HasColumnType("character varying(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<string>("Email")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("Email");
b.Property<bool>("EmailConfirmed")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(false)
.HasColumnName("EmailConfirmed");
b.Property<string>("ExtraProperties")
.HasColumnType("text")
.HasColumnName("ExtraProperties");
b.Property<string>("Name")
.HasMaxLength(64)
.HasColumnType("character varying(64)")
.HasColumnName("Name");
b.Property<string>("PhoneNumber")
.HasMaxLength(16)
.HasColumnType("character varying(16)")
.HasColumnName("PhoneNumber");
b.Property<bool>("PhoneNumberConfirmed")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(false)
.HasColumnName("PhoneNumberConfirmed");
b.Property<string>("Surname")
.HasMaxLength(64)
.HasColumnType("character varying(64)")
.HasColumnName("Surname");
b.Property<Guid?>("TenantId")
.HasColumnType("uuid")
.HasColumnName("TenantId");
b.Property<string>("UserName")
.IsRequired()
.HasMaxLength(256)
.HasColumnType("character varying(256)")
.HasColumnName("UserName");
b.HasKey("Id");
b.HasIndex("TenantId", "Email");
b.HasIndex("TenantId", "UserName");
b.ToTable("CmsUsers", (string)null);
});
modelBuilder.Entity("EventHub.Events.Event", b =>
{
b.HasOne("EventHub.Countries.Country", null)

1
src/EventHub.HttpApi.Client/EventHub.HttpApi.Client.csproj

@ -14,6 +14,7 @@
<ItemGroup>
<PackageReference Include="Volo.Abp.Http.Client" Version="5.0.1" />
<PackageReference Include="Volo.CmsKit.Public.HttpApi.Client" Version="5.0.1" />
</ItemGroup>
</Project>

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

@ -3,12 +3,14 @@ using Payment;
using Volo.Abp.Http.Client;
using Volo.Abp.Modularity;
using Volo.Abp.VirtualFileSystem;
using Volo.CmsKit.Public;
namespace EventHub
{
[DependsOn(
typeof(EventHubApplicationContractsModule),
typeof(AbpHttpClientModule),
typeof(CmsKitPublicHttpApiClientModule),
typeof(PaymentHttpApiClientModule)
)]
public class EventHubHttpApiClientModule : AbpModule

1
src/EventHub.HttpApi/EventHub.HttpApi.csproj

@ -14,6 +14,7 @@
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="5.0.1" />
<PackageReference Include="Volo.CmsKit.Public.HttpApi" Version="5.0.1" />
</ItemGroup>
</Project>

2
src/EventHub.HttpApi/EventHubHttpApiModule.cs

@ -4,12 +4,14 @@ using Payment;
using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.Localization;
using Volo.Abp.Modularity;
using Volo.CmsKit.Public;
namespace EventHub
{
[DependsOn(
typeof(EventHubApplicationContractsModule),
typeof(AbpAspNetCoreMvcModule),
typeof(CmsKitPublicHttpApiModule),
typeof(PaymentHttpApiModule)
)]
public class EventHubHttpApiModule : AbpModule

1
src/EventHub.Web/EventHub.Web.csproj

@ -36,6 +36,7 @@
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="5.0.1" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="5.0.1" />
<PackageReference Include="Volo.CmsKit.Public.Web" Version="5.0.1" />
</ItemGroup>
<ItemGroup>

2
src/EventHub.Web/EventHubWebModule.cs

@ -37,6 +37,7 @@ using Volo.Abp.Swashbuckle;
using Volo.Abp.UI.Navigation;
using Volo.Abp.UI.Navigation.Urls;
using Volo.Abp.VirtualFileSystem;
using Volo.CmsKit.Public.Web;
namespace EventHub.Web
{
@ -53,6 +54,7 @@ namespace EventHub.Web
typeof(AbpAspNetCoreSerilogModule),
typeof(AbpSwashbuckleModule),
typeof(AbpAccountApplicationContractsModule),
typeof(CmsKitPublicWebModule),
typeof(PaymentWebModule)
)]
public class EventHubWebModule : AbpModule

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

@ -5,6 +5,7 @@
@using EventHub.Localization
@using EventHub.Web
@using EventHub.Web.Pages.Events
@using EventHub.Events
@using EventHub.Web.Pages.Events.Components.AttendeesArea
@using EventHub.Web.Pages.Events.Components.EventsArea
@using EventHub.Web.Pages.Events.Components.LocationArea
@ -13,6 +14,7 @@
@using Microsoft.Extensions.Options
@using Volo.Abp.Timing
@using Volo.Abp.Users
@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Commenting
@model EventHub.Web.Pages.Events.DetailPageModel
@inject IOptions<EventHubUrlOptions> UrlOptions
@ -64,9 +66,15 @@
@await Component.InvokeAsync(typeof(RegistrationAreaViewComponent), new {eventId = Model.Event.Id})
<h5 class="detail-head mt-5 font-weight-bold">Share Event</h5>
<div class="share-container">
<a href="#" target="_blank" id="TwitterShareLink" title="Twitter"><img src="/assets/twitter2.svg"></a>
<a href="#" target="_blank" id="LinkedinShareLink" title="LinkedIn"><img src="/assets/in2.svg"></a>
<a href="#" target="_blank" id="FacebookShareLink" title="Facebook"><img src="/assets/facebook2.png"></a>
<a href="#" target="_blank" id="TwitterShareLink" title="Twitter">
<img src="/assets/twitter2.svg">
</a>
<a href="#" target="_blank" id="LinkedinShareLink" title="LinkedIn">
<img src="/assets/in2.svg">
</a>
<a href="#" target="_blank" id="FacebookShareLink" title="Facebook">
<img src="/assets/facebook2.png">
</a>
</div>
</div>
</div>
@ -82,12 +90,12 @@
<p id="EventDescription">
@Model.Event.Description
</p>
<h5 class="detail-head mt-5 font-weight-bold">Date</h5>
<p>
@EventDateHelper.GetDateRangeText(Model.Event.StartTime, Model.Event.EndTime)
</p>
@await Component.InvokeAsync(typeof(AttendeesAreaViewComponent), new { eventId = Model.Event.Id })
@await Component.InvokeAsync(typeof(AttendeesAreaViewComponent), new {eventId = Model.Event.Id})
</abp-tab>
<abp-tab class="tab" title=" Track / Session">
<table class="table mt-3">
@ -135,13 +143,29 @@
<p id="EventDescription">
@Model.Event.Description
</p>
<h5 class="detail-head mt-5 font-weight-bold">Date</h5>
<p>
@EventDateHelper.GetDateRangeText(Model.Event.StartTime, Model.Event.EndTime)
</p>
@await Component.InvokeAsync(typeof(AttendeesAreaViewComponent), new { eventId = Model.Event.Id })
}
@await Component.InvokeAsync(typeof(AttendeesAreaViewComponent), new {eventId = Model.Event.Id})
}
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-12 mt-4">
<div class="card">
<div class="card-body p-5">
<div class="card-title">
<h4>@L["Comments"]</h3>
</div>
@await Component.InvokeAsync(typeof(CommentingViewComponent), new
{
entityType = "Event",
entityId = @Model.Event.Id.ToString()
})
</div>
</div>
</div>
@ -163,4 +187,4 @@
MaxResultCount = 6,
isPagination = false
})
</div>
</div>
Loading…
Cancel
Save