tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #10598 from abpframework/cms-kit/fix-page-rendering 

Cms Kit - Rendering Improvements & Refactoring
pull/10609/head
Ahmet Çotur 5 years ago
committed by GitHub
parent
62a70d1f72 ae6fd8d088
commit
1d05c41e90
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 146 additions and 2161 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2030
      modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210622142314_Initial.Designer.cs
  2. 24
      modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210817095158_ConcurrencyStampUpdate.cs
  3. 104
      modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20211110134400_Initial.Designer.cs
  4. 24
      modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20211110134400_Initial.cs
  5. 100
      modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
  6. 1
      modules/cms-kit/host/Volo.CmsKit.Web.Unified/Program.cs
  7. 7
      modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
  8. 5
      modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml
  9. 9
      modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
  10. 3
      modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml

2030
modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210622142314_Initial.Designer.cs
View File

File diff suppressed because it is too large

24
modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210817095158_ConcurrencyStampUpdate.cs
View File

@ -1,24 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace Volo.CmsKit.Migrations
{
public partial class ConcurrencyStampUpdate : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "ConcurrencyStamp",
table: "CmsComments",
type: "nvarchar(40)",
maxLength: 40,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ConcurrencyStamp",
table: "CmsComments");
}
}
}

104
modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210817095158_ConcurrencyStampUpdate.Designer.cs → modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20211110134400_Initial.Designer.cs
View File

@ -8,20 +8,23 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
using Volo.CmsKit.EntityFrameworkCore; using Volo.CmsKit.EntityFrameworkCore;
#nullable disable
namespace Volo.CmsKit.Migrations namespace Volo.CmsKit.Migrations
{ {
[DbContext(typeof(UnifiedDbContext))] [DbContext(typeof(UnifiedDbContext))]
[Migration("20210817095158_ConcurrencyStampUpdate")] [Migration("20211110134400_Initial")]
partial class ConcurrencyStampUpdate partial class Initial
{ {
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
.HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("ProductVersion", "6.0.0")
.HasAnnotation("ProductVersion", "5.0.9") .HasAnnotation("Relational:MaxIdentifierLength", 128);
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
{ {
@ -128,7 +131,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "UserId", "ExecutionTime"); b.HasIndex("TenantId", "UserId", "ExecutionTime");
b.ToTable("AbpAuditLogs"); b.ToTable("AbpAuditLogs", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
@ -178,7 +181,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime");
b.ToTable("AbpAuditLogActions"); b.ToTable("AbpAuditLogActions", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
@ -228,7 +231,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); b.HasIndex("TenantId", "EntityTypeFullName", "EntityId");
b.ToTable("AbpEntityChanges"); b.ToTable("AbpEntityChanges", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
@ -270,7 +273,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("EntityChangeId"); b.HasIndex("EntityChangeId");
b.ToTable("AbpEntityPropertyChanges"); b.ToTable("AbpEntityPropertyChanges", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b => modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
@ -311,7 +314,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "ContainerId", "Name"); b.HasIndex("TenantId", "ContainerId", "Name");
b.ToTable("AbpBlobs"); b.ToTable("AbpBlobs", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", b => modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", b =>
@ -343,7 +346,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "Name"); b.HasIndex("TenantId", "Name");
b.ToTable("AbpBlobContainers"); b.ToTable("AbpBlobContainers", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b => modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b =>
@ -372,9 +375,11 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("Name", "ProviderName", "ProviderKey"); b.HasIndex("Name", "ProviderName", "ProviderKey")
.IsUnique()
.HasFilter("[ProviderName] IS NOT NULL AND [ProviderKey] IS NOT NULL");
b.ToTable("AbpFeatureValues"); b.ToTable("AbpFeatureValues", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
@ -421,7 +426,7 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("AbpClaimTypes"); b.ToTable("AbpClaimTypes", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
@ -448,7 +453,7 @@ namespace Volo.CmsKit.Migrations
.IsUnique() .IsUnique()
.HasFilter("[SourceTenantId] IS NOT NULL AND [TargetTenantId] IS NOT NULL"); .HasFilter("[SourceTenantId] IS NOT NULL AND [TargetTenantId] IS NOT NULL");
b.ToTable("AbpLinkUsers"); b.ToTable("AbpLinkUsers", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
@ -497,7 +502,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("NormalizedName"); b.HasIndex("NormalizedName");
b.ToTable("AbpRoles"); b.ToTable("AbpRoles", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
@ -525,7 +530,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("RoleId"); b.HasIndex("RoleId");
b.ToTable("AbpRoleClaims"); b.ToTable("AbpRoleClaims", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b => modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
@ -600,7 +605,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "UserId"); b.HasIndex("TenantId", "UserId");
b.ToTable("AbpSecurityLogs"); b.ToTable("AbpSecurityLogs", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
@ -653,6 +658,9 @@ namespace Volo.CmsKit.Migrations
.HasColumnType("nvarchar(max)") .HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties"); .HasColumnName("ExtraProperties");
b.Property<bool>("IsActive")
.HasColumnType("bit");
b.Property<bool>("IsDeleted") b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("bit") .HasColumnType("bit")
@ -752,7 +760,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("UserName"); b.HasIndex("UserName");
b.ToTable("AbpUsers"); b.ToTable("AbpUsers", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
@ -780,7 +788,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("UserId"); b.HasIndex("UserId");
b.ToTable("AbpUserClaims"); b.ToTable("AbpUserClaims", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
@ -809,7 +817,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("LoginProvider", "ProviderKey"); b.HasIndex("LoginProvider", "ProviderKey");
b.ToTable("AbpUserLogins"); b.ToTable("AbpUserLogins", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
@ -836,7 +844,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("UserId", "OrganizationUnitId"); b.HasIndex("UserId", "OrganizationUnitId");
b.ToTable("AbpUserOrganizationUnits"); b.ToTable("AbpUserOrganizationUnits", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
@ -855,7 +863,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("RoleId", "UserId"); b.HasIndex("RoleId", "UserId");
b.ToTable("AbpUserRoles"); b.ToTable("AbpUserRoles", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
@ -880,7 +888,7 @@ namespace Volo.CmsKit.Migrations
b.HasKey("UserId", "LoginProvider", "Name"); b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AbpUserTokens"); b.ToTable("AbpUserTokens", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b => modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
@ -954,7 +962,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("ParentId"); b.HasIndex("ParentId");
b.ToTable("AbpOrganizationUnits"); b.ToTable("AbpOrganizationUnits", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b => modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
@ -981,7 +989,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("RoleId", "OrganizationUnitId"); b.HasIndex("RoleId", "OrganizationUnitId");
b.ToTable("AbpOrganizationUnitRoles"); b.ToTable("AbpOrganizationUnitRoles", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
@ -1011,9 +1019,11 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("Name", "ProviderName", "ProviderKey"); b.HasIndex("TenantId", "Name", "ProviderName", "ProviderKey")
.IsUnique()
.HasFilter("[TenantId] IS NOT NULL");
b.ToTable("AbpPermissionGrants"); b.ToTable("AbpPermissionGrants", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
@ -1042,9 +1052,11 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("Name", "ProviderName", "ProviderKey"); b.HasIndex("Name", "ProviderName", "ProviderKey")
.IsUnique()
.HasFilter("[ProviderName] IS NOT NULL AND [ProviderKey] IS NOT NULL");
b.ToTable("AbpSettings"); b.ToTable("AbpSettings", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b =>
@ -1102,7 +1114,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("Name"); b.HasIndex("Name");
b.ToTable("AbpTenants"); b.ToTable("AbpTenants", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
@ -1121,7 +1133,7 @@ namespace Volo.CmsKit.Migrations
b.HasKey("TenantId", "Name"); b.HasKey("TenantId", "Name");
b.ToTable("AbpTenantConnectionStrings"); b.ToTable("AbpTenantConnectionStrings", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Blogs.Blog", b => modelBuilder.Entity("Volo.CmsKit.Blogs.Blog", b =>
@ -1186,7 +1198,7 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("CmsBlogs"); b.ToTable("CmsBlogs", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Blogs.BlogFeature", b => modelBuilder.Entity("Volo.CmsKit.Blogs.BlogFeature", b =>
@ -1248,7 +1260,7 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("CmsBlogFeatures"); b.ToTable("CmsBlogFeatures", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Blogs.BlogPost", b => modelBuilder.Entity("Volo.CmsKit.Blogs.BlogPost", b =>
@ -1334,7 +1346,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("Slug", "BlogId"); b.HasIndex("Slug", "BlogId");
b.ToTable("CmsBlogPosts"); b.ToTable("CmsBlogPosts", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Comments.Comment", b => modelBuilder.Entity("Volo.CmsKit.Comments.Comment", b =>
@ -1367,6 +1379,10 @@ namespace Volo.CmsKit.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
b.Property<Guid?>("RepliedCommentId") b.Property<Guid?>("RepliedCommentId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -1385,7 +1401,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "EntityType", "EntityId"); b.HasIndex("TenantId", "EntityType", "EntityId");
b.ToTable("CmsComments"); b.ToTable("CmsComments", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.MediaDescriptors.MediaDescriptor", b => modelBuilder.Entity("Volo.CmsKit.MediaDescriptors.MediaDescriptor", b =>
@ -1459,7 +1475,7 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("CmsMediaDescriptors"); b.ToTable("CmsMediaDescriptors", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Menus.MenuItem", b => modelBuilder.Entity("Volo.CmsKit.Menus.MenuItem", b =>
@ -1534,7 +1550,7 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("CmsMenuItems"); b.ToTable("CmsMenuItems", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Pages.Page", b => modelBuilder.Entity("Volo.CmsKit.Pages.Page", b =>
@ -1611,7 +1627,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "Slug"); b.HasIndex("TenantId", "Slug");
b.ToTable("CmsPages"); b.ToTable("CmsPages", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Ratings.Rating", b => modelBuilder.Entity("Volo.CmsKit.Ratings.Rating", b =>
@ -1648,7 +1664,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "EntityType", "EntityId", "CreatorId"); b.HasIndex("TenantId", "EntityType", "EntityId", "CreatorId");
b.ToTable("CmsRatings"); b.ToTable("CmsRatings", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Reactions.UserReaction", b => modelBuilder.Entity("Volo.CmsKit.Reactions.UserReaction", b =>
@ -1690,7 +1706,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "CreatorId", "EntityType", "EntityId", "ReactionName"); b.HasIndex("TenantId", "CreatorId", "EntityType", "EntityId", "ReactionName");
b.ToTable("CmsUserReactions"); b.ToTable("CmsUserReactions", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Tags.EntityTag", b => modelBuilder.Entity("Volo.CmsKit.Tags.EntityTag", b =>
@ -1709,7 +1725,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "EntityId", "TagId"); b.HasIndex("TenantId", "EntityId", "TagId");
b.ToTable("CmsEntityTags"); b.ToTable("CmsEntityTags", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Tags.Tag", b => modelBuilder.Entity("Volo.CmsKit.Tags.Tag", b =>
@ -1776,7 +1792,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "Name"); b.HasIndex("TenantId", "Name");
b.ToTable("CmsTags"); b.ToTable("CmsTags", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Users.CmsUser", b => modelBuilder.Entity("Volo.CmsKit.Users.CmsUser", b =>
@ -1844,7 +1860,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "UserName"); b.HasIndex("TenantId", "UserName");
b.ToTable("CmsUsers"); b.ToTable("CmsUsers", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>

24
modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20210622142314_Initial.cs → modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/20211110134400_Initial.cs
View File

@ -1,6 +1,8 @@
using System; using System;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Volo.CmsKit.Migrations namespace Volo.CmsKit.Migrations
{ {
public partial class Initial : Migration public partial class Initial : Migration
@ -130,8 +132,7 @@ namespace Volo.CmsKit.Migrations
name: "FK_AbpOrganizationUnits_AbpOrganizationUnits_ParentId", name: "FK_AbpOrganizationUnits_AbpOrganizationUnits_ParentId",
column: x => x.ParentId, column: x => x.ParentId,
principalTable: "AbpOrganizationUnits", principalTable: "AbpOrganizationUnits",
principalColumn: "Id", principalColumn: "Id");
onDelete: ReferentialAction.Restrict);
}); });
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
@ -247,6 +248,7 @@ namespace Volo.CmsKit.Migrations
IsExternal = table.Column<bool>(type: "bit", nullable: false, defaultValue: false), IsExternal = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
PhoneNumber = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true), PhoneNumber = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true),
PhoneNumberConfirmed = table.Column<bool>(type: "bit", nullable: false, defaultValue: false), PhoneNumberConfirmed = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
IsActive = table.Column<bool>(type: "bit", nullable: false),
TwoFactorEnabled = table.Column<bool>(type: "bit", nullable: false, defaultValue: false), TwoFactorEnabled = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
LockoutEnd = table.Column<DateTimeOffset>(type: "datetimeoffset", nullable: true), LockoutEnd = table.Column<DateTimeOffset>(type: "datetimeoffset", nullable: true),
LockoutEnabled = table.Column<bool>(type: "bit", nullable: false, defaultValue: false), LockoutEnabled = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
@ -323,7 +325,9 @@ namespace Volo.CmsKit.Migrations
Text = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: false), Text = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: false),
RepliedCommentId = table.Column<Guid>(type: "uniqueidentifier", nullable: true), RepliedCommentId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: false), CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false) CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true)
}, },
constraints: table => constraints: table =>
{ {
@ -865,7 +869,9 @@ namespace Volo.CmsKit.Migrations
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_AbpFeatureValues_Name_ProviderName_ProviderKey", name: "IX_AbpFeatureValues_Name_ProviderName_ProviderKey",
table: "AbpFeatureValues", table: "AbpFeatureValues",
columns: new[] { "Name", "ProviderName", "ProviderKey" }); columns: new[] { "Name", "ProviderName", "ProviderKey" },
unique: true,
filter: "[ProviderName] IS NOT NULL AND [ProviderKey] IS NOT NULL");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_AbpLinkUsers_SourceUserId_SourceTenantId_TargetUserId_TargetTenantId", name: "IX_AbpLinkUsers_SourceUserId_SourceTenantId_TargetUserId_TargetTenantId",
@ -890,9 +896,11 @@ namespace Volo.CmsKit.Migrations
column: "ParentId"); column: "ParentId");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_AbpPermissionGrants_Name_ProviderName_ProviderKey", name: "IX_AbpPermissionGrants_TenantId_Name_ProviderName_ProviderKey",
table: "AbpPermissionGrants", table: "AbpPermissionGrants",
columns: new[] { "Name", "ProviderName", "ProviderKey" }); columns: new[] { "TenantId", "Name", "ProviderName", "ProviderKey" },
unique: true,
filter: "[TenantId] IS NOT NULL");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_AbpRoleClaims_RoleId", name: "IX_AbpRoleClaims_RoleId",
@ -927,7 +935,9 @@ namespace Volo.CmsKit.Migrations
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_AbpSettings_Name_ProviderName_ProviderKey", name: "IX_AbpSettings_Name_ProviderName_ProviderKey",
table: "AbpSettings", table: "AbpSettings",
columns: new[] { "Name", "ProviderName", "ProviderKey" }); columns: new[] { "Name", "ProviderName", "ProviderKey" },
unique: true,
filter: "[ProviderName] IS NOT NULL AND [ProviderKey] IS NOT NULL");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_AbpTenants_Name", name: "IX_AbpTenants_Name",

100
modules/cms-kit/host/Volo.CmsKit.Web.Unified/Migrations/UnifiedDbContextModelSnapshot.cs
View File

@ -7,6 +7,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore;
using Volo.CmsKit.EntityFrameworkCore; using Volo.CmsKit.EntityFrameworkCore;
#nullable disable
namespace Volo.CmsKit.Migrations namespace Volo.CmsKit.Migrations
{ {
[DbContext(typeof(UnifiedDbContext))] [DbContext(typeof(UnifiedDbContext))]
@ -17,9 +19,10 @@ namespace Volo.CmsKit.Migrations
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
.HasAnnotation("Relational:MaxIdentifierLength", 128) .HasAnnotation("ProductVersion", "6.0.0")
.HasAnnotation("ProductVersion", "5.0.9") .HasAnnotation("Relational:MaxIdentifierLength", 128);
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b =>
{ {
@ -126,7 +129,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "UserId", "ExecutionTime"); b.HasIndex("TenantId", "UserId", "ExecutionTime");
b.ToTable("AbpAuditLogs"); b.ToTable("AbpAuditLogs", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>
@ -176,7 +179,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime");
b.ToTable("AbpAuditLogActions"); b.ToTable("AbpAuditLogActions", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b =>
@ -226,7 +229,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); b.HasIndex("TenantId", "EntityTypeFullName", "EntityId");
b.ToTable("AbpEntityChanges"); b.ToTable("AbpEntityChanges", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b =>
@ -268,7 +271,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("EntityChangeId"); b.HasIndex("EntityChangeId");
b.ToTable("AbpEntityPropertyChanges"); b.ToTable("AbpEntityPropertyChanges", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b => modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlob", b =>
@ -309,7 +312,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "ContainerId", "Name"); b.HasIndex("TenantId", "ContainerId", "Name");
b.ToTable("AbpBlobs"); b.ToTable("AbpBlobs", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", b => modelBuilder.Entity("Volo.Abp.BlobStoring.Database.DatabaseBlobContainer", b =>
@ -341,7 +344,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "Name"); b.HasIndex("TenantId", "Name");
b.ToTable("AbpBlobContainers"); b.ToTable("AbpBlobContainers", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b => modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b =>
@ -370,9 +373,11 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("Name", "ProviderName", "ProviderKey"); b.HasIndex("Name", "ProviderName", "ProviderKey")
.IsUnique()
.HasFilter("[ProviderName] IS NOT NULL AND [ProviderKey] IS NOT NULL");
b.ToTable("AbpFeatureValues"); b.ToTable("AbpFeatureValues", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b =>
@ -419,7 +424,7 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("AbpClaimTypes"); b.ToTable("AbpClaimTypes", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b =>
@ -446,7 +451,7 @@ namespace Volo.CmsKit.Migrations
.IsUnique() .IsUnique()
.HasFilter("[SourceTenantId] IS NOT NULL AND [TargetTenantId] IS NOT NULL"); .HasFilter("[SourceTenantId] IS NOT NULL AND [TargetTenantId] IS NOT NULL");
b.ToTable("AbpLinkUsers"); b.ToTable("AbpLinkUsers", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b =>
@ -495,7 +500,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("NormalizedName"); b.HasIndex("NormalizedName");
b.ToTable("AbpRoles"); b.ToTable("AbpRoles", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b =>
@ -523,7 +528,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("RoleId"); b.HasIndex("RoleId");
b.ToTable("AbpRoleClaims"); b.ToTable("AbpRoleClaims", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b => modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b =>
@ -598,7 +603,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "UserId"); b.HasIndex("TenantId", "UserId");
b.ToTable("AbpSecurityLogs"); b.ToTable("AbpSecurityLogs", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b =>
@ -651,6 +656,9 @@ namespace Volo.CmsKit.Migrations
.HasColumnType("nvarchar(max)") .HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties"); .HasColumnName("ExtraProperties");
b.Property<bool>("IsActive")
.HasColumnType("bit");
b.Property<bool>("IsDeleted") b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("bit") .HasColumnType("bit")
@ -750,7 +758,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("UserName"); b.HasIndex("UserName");
b.ToTable("AbpUsers"); b.ToTable("AbpUsers", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b =>
@ -778,7 +786,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("UserId"); b.HasIndex("UserId");
b.ToTable("AbpUserClaims"); b.ToTable("AbpUserClaims", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b =>
@ -807,7 +815,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("LoginProvider", "ProviderKey"); b.HasIndex("LoginProvider", "ProviderKey");
b.ToTable("AbpUserLogins"); b.ToTable("AbpUserLogins", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b =>
@ -834,7 +842,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("UserId", "OrganizationUnitId"); b.HasIndex("UserId", "OrganizationUnitId");
b.ToTable("AbpUserOrganizationUnits"); b.ToTable("AbpUserOrganizationUnits", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b =>
@ -853,7 +861,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("RoleId", "UserId"); b.HasIndex("RoleId", "UserId");
b.ToTable("AbpUserRoles"); b.ToTable("AbpUserRoles", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b =>
@ -878,7 +886,7 @@ namespace Volo.CmsKit.Migrations
b.HasKey("UserId", "LoginProvider", "Name"); b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AbpUserTokens"); b.ToTable("AbpUserTokens", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b => modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b =>
@ -952,7 +960,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("ParentId"); b.HasIndex("ParentId");
b.ToTable("AbpOrganizationUnits"); b.ToTable("AbpOrganizationUnits", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b => modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b =>
@ -979,7 +987,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("RoleId", "OrganizationUnitId"); b.HasIndex("RoleId", "OrganizationUnitId");
b.ToTable("AbpOrganizationUnitRoles"); b.ToTable("AbpOrganizationUnitRoles", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b =>
@ -1009,9 +1017,11 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("Name", "ProviderName", "ProviderKey"); b.HasIndex("TenantId", "Name", "ProviderName", "ProviderKey")
.IsUnique()
.HasFilter("[TenantId] IS NOT NULL");
b.ToTable("AbpPermissionGrants"); b.ToTable("AbpPermissionGrants", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b =>
@ -1040,9 +1050,11 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("Name", "ProviderName", "ProviderKey"); b.HasIndex("Name", "ProviderName", "ProviderKey")
.IsUnique()
.HasFilter("[ProviderName] IS NOT NULL AND [ProviderKey] IS NOT NULL");
b.ToTable("AbpSettings"); b.ToTable("AbpSettings", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b =>
@ -1100,7 +1112,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("Name"); b.HasIndex("Name");
b.ToTable("AbpTenants"); b.ToTable("AbpTenants", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b =>
@ -1119,7 +1131,7 @@ namespace Volo.CmsKit.Migrations
b.HasKey("TenantId", "Name"); b.HasKey("TenantId", "Name");
b.ToTable("AbpTenantConnectionStrings"); b.ToTable("AbpTenantConnectionStrings", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Blogs.Blog", b => modelBuilder.Entity("Volo.CmsKit.Blogs.Blog", b =>
@ -1184,7 +1196,7 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("CmsBlogs"); b.ToTable("CmsBlogs", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Blogs.BlogFeature", b => modelBuilder.Entity("Volo.CmsKit.Blogs.BlogFeature", b =>
@ -1246,7 +1258,7 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("CmsBlogFeatures"); b.ToTable("CmsBlogFeatures", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Blogs.BlogPost", b => modelBuilder.Entity("Volo.CmsKit.Blogs.BlogPost", b =>
@ -1332,7 +1344,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("Slug", "BlogId"); b.HasIndex("Slug", "BlogId");
b.ToTable("CmsBlogPosts"); b.ToTable("CmsBlogPosts", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Comments.Comment", b => modelBuilder.Entity("Volo.CmsKit.Comments.Comment", b =>
@ -1365,6 +1377,10 @@ namespace Volo.CmsKit.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("ExtraProperties")
.HasColumnType("nvarchar(max)")
.HasColumnName("ExtraProperties");
b.Property<Guid?>("RepliedCommentId") b.Property<Guid?>("RepliedCommentId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -1383,7 +1399,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "EntityType", "EntityId"); b.HasIndex("TenantId", "EntityType", "EntityId");
b.ToTable("CmsComments"); b.ToTable("CmsComments", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.MediaDescriptors.MediaDescriptor", b => modelBuilder.Entity("Volo.CmsKit.MediaDescriptors.MediaDescriptor", b =>
@ -1457,7 +1473,7 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("CmsMediaDescriptors"); b.ToTable("CmsMediaDescriptors", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Menus.MenuItem", b => modelBuilder.Entity("Volo.CmsKit.Menus.MenuItem", b =>
@ -1532,7 +1548,7 @@ namespace Volo.CmsKit.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.ToTable("CmsMenuItems"); b.ToTable("CmsMenuItems", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Pages.Page", b => modelBuilder.Entity("Volo.CmsKit.Pages.Page", b =>
@ -1609,7 +1625,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "Slug"); b.HasIndex("TenantId", "Slug");
b.ToTable("CmsPages"); b.ToTable("CmsPages", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Ratings.Rating", b => modelBuilder.Entity("Volo.CmsKit.Ratings.Rating", b =>
@ -1646,7 +1662,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "EntityType", "EntityId", "CreatorId"); b.HasIndex("TenantId", "EntityType", "EntityId", "CreatorId");
b.ToTable("CmsRatings"); b.ToTable("CmsRatings", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Reactions.UserReaction", b => modelBuilder.Entity("Volo.CmsKit.Reactions.UserReaction", b =>
@ -1688,7 +1704,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "CreatorId", "EntityType", "EntityId", "ReactionName"); b.HasIndex("TenantId", "CreatorId", "EntityType", "EntityId", "ReactionName");
b.ToTable("CmsUserReactions"); b.ToTable("CmsUserReactions", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Tags.EntityTag", b => modelBuilder.Entity("Volo.CmsKit.Tags.EntityTag", b =>
@ -1707,7 +1723,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "EntityId", "TagId"); b.HasIndex("TenantId", "EntityId", "TagId");
b.ToTable("CmsEntityTags"); b.ToTable("CmsEntityTags", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Tags.Tag", b => modelBuilder.Entity("Volo.CmsKit.Tags.Tag", b =>
@ -1774,7 +1790,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "Name"); b.HasIndex("TenantId", "Name");
b.ToTable("CmsTags"); b.ToTable("CmsTags", (string)null);
}); });
modelBuilder.Entity("Volo.CmsKit.Users.CmsUser", b => modelBuilder.Entity("Volo.CmsKit.Users.CmsUser", b =>
@ -1842,7 +1858,7 @@ namespace Volo.CmsKit.Migrations
b.HasIndex("TenantId", "UserName"); b.HasIndex("TenantId", "UserName");
b.ToTable("CmsUsers"); b.ToTable("CmsUsers", (string)null);
}); });
modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b =>

1
modules/cms-kit/host/Volo.CmsKit.Web.Unified/Program.cs
View File

@ -15,6 +15,7 @@ namespace Volo.CmsKit
.MinimumLevel.Debug() .MinimumLevel.Debug()
.MinimumLevel.Override("Microsoft", LogEventLevel.Information) .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
.Enrich.FromLogContext() .Enrich.FromLogContext()
.WriteTo.Console()
.WriteTo.File("Logs/logs.txt") .WriteTo.File("Logs/logs.txt")
.CreateLogger(); .CreateLogger();

7
modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
View File

@ -4,11 +4,6 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "^5.0.0-beta.3", "@abp/aspnetcore.mvc.ui.theme.basic": "^5.0.0-beta.3",
"@abp/cms-kit": "5.0.0-beta.3", "@abp/cms-kit": "5.0.0-beta.3"
"@abp/tui-editor": "^5.0.0-beta.3",
"tui-code-snippet": "1.5.2",
"@abp/uppy": "^5.0.0-beta.3",
"slugify": "1.4.6",
"@abp/jstree": "5.0.0-beta.3"
} }
} }

5
modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml
View File

@ -9,6 +9,9 @@
<abp-card> <abp-card>
<abp-card-body> <abp-card-body>
@Html.Raw(await MarkdownRenderer.RenderAsync(Model.Content)) @if (!Model.Content.IsNullOrEmpty())
{
@Html.Raw(await MarkdownRenderer.RenderAsync(Model.Content))
}
</abp-card-body> </abp-card-body>
</abp-card> </abp-card>

9
modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
View File

@ -45,7 +45,10 @@
<small style="opacity:.65;">@Model.BlogPost.CreationTime</small> <small style="opacity:.65;">@Model.BlogPost.CreationTime</small>
</p> </p>
@Html.Raw(await MarkdownRenderer.RenderAsync(Model.BlogPost.Content)) @if(!Model.BlogPost.Content.IsNullOrEmpty())
{
@Html.Raw(await MarkdownRenderer.RenderAsync(Model.BlogPost.Content))
}
<p class="mb-3"> <p class="mb-3">
@if (Model.BlogPost.LastModificationTime != null) @if (Model.BlogPost.LastModificationTime != null)
@ -82,7 +85,6 @@
}) })
} }
} }
</abp-column> </abp-column>
<abp-column size-lg="_6" size-md="_12"> <abp-column size-lg="_6" size-md="_12">
@if (GlobalFeatureManager.Instance.IsEnabled<RatingsFeature>()) @if (GlobalFeatureManager.Instance.IsEnabled<RatingsFeature>())
@ -96,14 +98,11 @@
}) })
} }
} }
</abp-column> </abp-column>
</abp-row> </abp-row>
</abp-card-body> </abp-card-body>
</abp-card> </abp-card>
@if (GlobalFeatureManager.Instance.IsEnabled<CommentsFeature>()) @if (GlobalFeatureManager.Instance.IsEnabled<CommentsFeature>())
{ {
if (Model.CommentsFeature?.IsEnabled == true) if (Model.CommentsFeature?.IsEnabled == true)

3
modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml
View File

@ -49,5 +49,4 @@
<abp-column> <abp-column>
<abp-paginator model="Model.PagerModel" /> <abp-paginator model="Model.PagerModel" />
</abp-column> </abp-column>
</abp-row> </abp-row>
Write Preview
Loading…
Cancel
Save