diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Properties/launchSettings.json b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Properties/launchSettings.json new file mode 100644 index 0000000000..4741efd73e --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:51860/", + "sslPort": 44364 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "Volo.CmsKit.Admin.Web": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:5001;http://localhost:5000" + } + } +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Properties/launchSettings.json b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Properties/launchSettings.json new file mode 100644 index 0000000000..2dadf9b728 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:51861/", + "sslPort": 44300 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "Volo.CmsKit.Common.Web": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:5001;http://localhost:5000" + } + } +} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml index 46f7749d8b..ebf337ae3d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPost/Default.cshtml @@ -10,19 +10,43 @@ - - @Model.Title - @Model.Author?.UserName - - @Html.Raw(Model.Content) - - - @Model.CreationTime - @if (Model.LastModificationTime != null) - { - @L["LastModification"].Value : @Model.LastModificationTime - } - + + + + @Model.Title + + @@@Model.Author?.UserName + @Model.CreationTime + + @Html.Raw(Model.Content) + + @if (Model.LastModificationTime != null) + { + @L["LastModification"].Value : @Model.LastModificationTime + } + + + + + \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPostComment/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPostComment/Default.cshtml index c34f64eb0c..33206a3344 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPostComment/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Blogs/BlogPostComment/Default.cshtml @@ -8,11 +8,11 @@ @model DefaultBlogPostCommentViewComponent.DefaultBlogPostCommentViewModel - - - @L["Comments"] - + + + @L["Comments"] + @await Component.InvokeAsync(typeof(CommentingViewComponent), new { entityType = Model.EntityType, diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/Default.cshtml index 1dc4ca37ff..4e99b0cb9f 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Commenting/Default.cshtml @@ -25,7 +25,7 @@ } @{ Func GetCommentArea(Guid? repliedCommentId, bool cancelButton = false) => - @ diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml index de6424d083..119813310d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Rating/Default.cshtml @@ -5,57 +5,78 @@ @model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Rating.RatingViewModel @inject IHtmlLocalizer L - - - @if (CurrentUser.IsAuthenticated) - { - - @(Model.CurrentRating != null ? Model.CurrentRating + " " : 0 + "") - @if (Model.CurrentRating != null) - { - - @L["Undo"] - - } - if (Model.Ratings != null) - { - - - + + + + + Rating + + + + + @if (CurrentUser.IsAuthenticated) + { + @if (Model.CurrentRating != null) + { + + @L["Undo"] + + } + if (Model.Ratings != null) + { + + + - - - - - Rating Detail - - × - - - - - - @foreach (var rating in Model.Ratings) - { - - @rating.StarCount @L["Star"] - - - - @rating.Count Rate(s) + + + + + Rating Detail + + × + + + + + @foreach (var rating in Model.Ratings) + { + + @rating.StarCount @L["Star"] + + + + @rating.Count Rate(s) + + } - } + - - - } - } - else - { - "> - - } + } + + + @(Model.CurrentRating != null ? Model.CurrentRating + " " : 0 + "") + + } + else + { + "> + + } + + - \ No newline at end of file + + \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml index b95d679fda..b96f3332bb 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml @@ -4,32 +4,51 @@ @if (CurrentUser.IsAuthenticated || Model.Reactions.Count(r => r.Count > 0) > 0) { - - - + + + + + Reactions + + + + - @if (CurrentUser.IsAuthenticated) - { - - - - - @foreach (var reaction in Model.Reactions) - { - - - - } - - } - @foreach (var reaction in Model.Reactions.Where(r => r.Count > 0)) - { - - - @(reaction.Count) - - } - + @foreach (var reaction in Model.Reactions.Where(r => r.Count > 0)) + { + + + @(reaction.Count) + + } + @if (CurrentUser.IsAuthenticated) + { + + + + + @foreach (var reaction in Model.Reactions) + { + + + + } + + } + + } + + \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/Default.cshtml index f7c61dbc81..f9b94206e5 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/Default.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Tags/Default.cshtml @@ -2,12 +2,39 @@ @model TagViewComponent.TagViewModel -@if (Model.Tags != null) -{ - foreach (var tag in Model.Tags) - { - - @tag.Name - - } -} \ No newline at end of file + + + + + + Tags + + + + + @if (Model.Tags != null) + { + foreach (var tag in Model.Tags) + { + + @tag.Name + + } + } + + + + + + + \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml index 8ad6dd9ca3..28671aa34a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml @@ -54,8 +54,7 @@ }) } } - - + @if (GlobalFeatureManager.Instance.IsEnabled()) { diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml index b58e6d1543..fb304aa0c3 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/Index.cshtml @@ -14,46 +14,35 @@ @foreach (var blog in Model.Blogs.Items) { - + - - - @blog.Title - - - @@@blog.Author?.UserName - - - - @if (blog.CoverImageMediaId != null) - { - - } - else - { - - } - - @blog.ShortDescription - - - - - - - - - - @blog.CreationTime - - + @if (blog.CoverImageMediaId != null) + { + + } + else + { + + } + + @blog.Title + + @@@blog.Author?.UserName + @blog.CreationTime + + @blog.ShortDescription + + @L["Read"] + + } - + + + diff --git a/modules/cms-kit/src/Volo.CmsKit.Web/Properties/launchSettings.json b/modules/cms-kit/src/Volo.CmsKit.Web/Properties/launchSettings.json new file mode 100644 index 0000000000..93fad94768 --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Web/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:51859/", + "sslPort": 44370 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "Volo.CmsKit.Web": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:5001;http://localhost:5000" + } + } +} \ No newline at end of file
+ @@@Model.Author?.UserName + @Model.CreationTime +
+ @if (Model.LastModificationTime != null) + { + @L["LastModification"].Value : @Model.LastModificationTime + } +
+ @@@blog.Author?.UserName + @blog.CreationTime +
@blog.ShortDescription