diff --git a/global.json b/global.json index 41c9ad2ed..e9f309cde 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.100", + "version": "8.0.119", "rollForward": "latestFeature", "allowPrerelease": false } diff --git a/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs b/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs index 729f88c5b..4bd6eb699 100644 --- a/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs +++ b/src/Modules/Grand.Module.Installer/Extensions/PermissionExtensions.cs @@ -212,7 +212,8 @@ public static IEnumerable DefaultPermissions() StandardPermission.ManageShipments, StandardPermission.ManageMerchandiseReturns, StandardPermission.ManageCheckoutAttribute, - StandardPermission.ManageReports + StandardPermission.ManageReports, + StandardPermission.ManageBlog ] }, diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Create.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Create.cshtml new file mode 100644 index 000000000..a7ccf4a68 --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Create.cshtml @@ -0,0 +1,38 @@ +@model BlogPostModel +@{ + //page title + ViewBag.Title = Loc["Admin.Content.Blog.BlogPosts.AddNew"]; + Layout = Constants.LayoutStore; +} +
+ +
+
+
+
+
+ + @Loc["Admin.Content.Blog.BlogPosts.AddNew"] + + @Html.ActionLink(Loc["Admin.Content.Blog.BlogPosts.BackToList"], "List") + +
+
+
+ + + +
+
+
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Edit.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Edit.cshtml new file mode 100644 index 000000000..b4e68c03e --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Edit.cshtml @@ -0,0 +1,46 @@ +@model BlogPostModel +@{ + //page title + ViewBag.Title = Loc["Admin.Content.Blog.BlogPosts.EditBlogPostDetails"]; + Layout = Constants.LayoutStore; +} +
+ +
+
+
+
+
+ + @Loc["Admin.Content.Blog.BlogPosts.EditBlogPostDetails"] - @Model.Title + + @Html.ActionLink(Loc["Admin.Content.Blog.BlogPosts.BackToList"], "List") + +
+
+
+ + + + + @Loc["Admin.Common.Delete"] + +
+
+
+ +
+ +
+
+
+
+
+ \ No newline at end of file diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/List.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/List.cshtml new file mode 100644 index 000000000..beba9c691 --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/List.cshtml @@ -0,0 +1,102 @@ +@inject AdminAreaSettings adminAreaSettings +@{ + //page title + ViewBag.Title = Loc["Admin.Content.Blog.BlogPosts"]; + Layout = Constants.LayoutStore; +} + +
+
+
+
+
+ + @Loc["Admin.Content.Blog.BlogPosts"] +
+
+ + @Loc["Admin.Common.AddNew"] + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Partials/CreateOrUpdate.TabComments.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Partials/CreateOrUpdate.TabComments.cshtml new file mode 100644 index 000000000..af5f3cd32 --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Partials/CreateOrUpdate.TabComments.cshtml @@ -0,0 +1,93 @@ +@model BlogPostModel +@inject AdminAreaSettings adminAreaSettings +@if (!string.IsNullOrEmpty(Model.Id)) +{ +
+ +
+
+
+ +
+ + +} +else +{ +
+ @Loc["Admin.Content.Blog.BlogPosts.SaveBeforeEdit"] +
+} \ No newline at end of file diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Partials/CreateOrUpdate.TabInfo.cshtml new file mode 100644 index 000000000..e4634bf65 --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Partials/CreateOrUpdate.TabInfo.cshtml @@ -0,0 +1,146 @@ +@using System.Text.Encodings.Web +@using Microsoft.AspNetCore.Mvc.Razor +@model BlogPostModel +@inject IBlogService blogService + + + +@{ + Func + template = @
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+ +
; +} + +
+ + +
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ @{ + ViewData["Reference"] = "Blog"; + ViewData["ObjectId"] = Model.Id; + } + +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+ +
\ No newline at end of file diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Partials/CreateOrUpdate.TabSeo.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Partials/CreateOrUpdate.TabSeo.cshtml new file mode 100644 index 000000000..7245e6193 --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Partials/CreateOrUpdate.TabSeo.cshtml @@ -0,0 +1,75 @@ +@using Microsoft.AspNetCore.Mvc.Razor +@model BlogPostModel + + +@{ + Func + template = @
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+ +
; +} + +
+ +
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ + \ No newline at end of file diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Partials/CreateOrUpdate.cshtml new file mode 100644 index 000000000..cbe792d42 --- /dev/null +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Blog/Partials/CreateOrUpdate.cshtml @@ -0,0 +1,30 @@ +@model BlogPostModel + +
+ + + + + +
+ +
+ + + + +
+ +
+ + + + +
+ +
+ + + + + \ No newline at end of file diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml index baff7dc33..4d17948f3 100644 --- a/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/_ViewImports.cshtml @@ -29,6 +29,8 @@ @using Grand.Web.AdminShared.Models.Common @using Grand.Web.AdminShared.Models.Customers @using Grand.Web.AdminShared.Models.Cms +@using Grand.Web.AdminShared.Models.News +@using Grand.Web.AdminShared.Models.Blogs @inject LocService Loc @inject IEnumTranslationService EnumTranslationService \ No newline at end of file diff --git a/src/Web/Grand.Web.Store/Controllers/BlogController.cs b/src/Web/Grand.Web.Store/Controllers/BlogController.cs new file mode 100644 index 000000000..e3e173003 --- /dev/null +++ b/src/Web/Grand.Web.Store/Controllers/BlogController.cs @@ -0,0 +1,269 @@ +using Grand.Business.Core.Extensions; +using Grand.Business.Core.Interfaces.Cms; +using Grand.Business.Core.Interfaces.Common.Directory; +using Grand.Business.Core.Interfaces.Common.Localization; +using Grand.Domain.Permissions; +using Grand.Infrastructure; +using Grand.Web.AdminShared.Extensions; +using Grand.Web.AdminShared.Extensions.Mapping; +using Grand.Web.AdminShared.Interfaces; +using Grand.Web.AdminShared.Models.Blogs; +using Grand.Web.Common.DataSource; +using Grand.Web.Common.Filters; +using Grand.Web.Common.Security.Authorization; +using Microsoft.AspNetCore.Mvc; + +namespace Grand.Web.Store.Controllers; + +[PermissionAuthorize(PermissionSystemName.Blog)] +public class BlogController : BaseStoreController +{ + #region Constructors + + public BlogController( + IBlogViewModelService blogViewModelService, + IBlogService blogService, + ILanguageService languageService, + ITranslationService translationService, + IDateTimeService dateTimeService, + IContextAccessor contextAccessor) + { + _blogViewModelService = blogViewModelService; + _blogService = blogService; + _languageService = languageService; + _translationService = translationService; + _dateTimeService = dateTimeService; + _contextAccessor = contextAccessor; + } + + #endregion + + #region Fields + + private readonly IBlogViewModelService _blogViewModelService; + private readonly IBlogService _blogService; + private readonly ILanguageService _languageService; + private readonly ITranslationService _translationService; + private readonly IDateTimeService _dateTimeService; + private readonly IContextAccessor _contextAccessor; + + #endregion + + #region Blog posts + + public IActionResult Index() + { + return RedirectToAction("List"); + } + + public IActionResult List() + { + return View(); + } + + [PermissionAuthorizeAction(PermissionActionName.List)] + [HttpPost] + public async Task List(DataSourceRequest command) + { + var blogPosts = await _blogViewModelService.PrepareBlogPostsModel(command.Page, command.PageSize); + var gridModel = new DataSourceResult + { + Data = blogPosts.blogPosts, + Total = blogPosts.totalCount + }; + return Json(gridModel); + } + + [PermissionAuthorizeAction(PermissionActionName.Create)] + public async Task Create() + { + ViewBag.AllLanguages = await _languageService.GetAllLanguages(true); + var model = new BlogPostModel + { + //default values + AllowComments = true + }; + + //locales + await AddLocales(_languageService, model.Locales); + return View(model); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + [HttpPost] + [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")] + public async Task Create(BlogPostModel model, bool continueEditing) + { + if (ModelState.IsValid) + { + model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId]; + var blogPost = await _blogViewModelService.InsertBlogPostModel(model); + Success(_translationService.GetResource("Admin.Content.Blog.BlogPosts.Added")); + return continueEditing ? RedirectToAction("Edit", new { id = blogPost.Id }) : RedirectToAction("List"); + } + + //If we got this far, something failed, redisplay form + ViewBag.AllLanguages = await _languageService.GetAllLanguages(true); + return View(model); + } + + [PermissionAuthorizeAction(PermissionActionName.Preview)] + public async Task Edit(string id) + { + var blogPost = await _blogService.GetBlogPostById(id); + if (blogPost == null) + //No blog post found with the specified id + return RedirectToAction("List"); + + if (!blogPost.LimitedToStores || (blogPost.LimitedToStores && + blogPost.Stores.Contains(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId) && + blogPost.Stores.Count > 1)) + { + Warning(_translationService.GetResource("Admin.Content.Blog.BlogPosts.Permissions")); + } + else + { + if (!blogPost.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)) + return RedirectToAction("List"); + } + + ViewBag.AllLanguages = await _languageService.GetAllLanguages(true); + var model = blogPost.ToModel(_dateTimeService); + //locales + await AddLocales(_languageService, model.Locales, (locale, languageId) => + { + locale.Title = blogPost.GetTranslation(x => x.Title, languageId, false); + locale.Body = blogPost.GetTranslation(x => x.Body, languageId, false); + locale.BodyOverview = blogPost.GetTranslation(x => x.BodyOverview, languageId, false); + locale.MetaKeywords = blogPost.GetTranslation(x => x.MetaKeywords, languageId, false); + locale.MetaDescription = blogPost.GetTranslation(x => x.MetaDescription, languageId, false); + locale.MetaTitle = blogPost.GetTranslation(x => x.MetaTitle, languageId, false); + locale.SeName = blogPost.GetSeName(languageId, false); + }); + return View(model); + } + + [PermissionAuthorizeAction(PermissionActionName.Edit)] + [HttpPost] + [ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")] + public async Task Edit(BlogPostModel model, bool continueEditing) + { + var blogPost = await _blogService.GetBlogPostById(model.Id); + if (blogPost == null) + //No blog post found with the specified id + return RedirectToAction("List"); + + if (!blogPost.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)) + return RedirectToAction("Edit", new { id = blogPost.Id }); + + if (ModelState.IsValid) + { + model.Stores = [_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId]; + blogPost = await _blogViewModelService.UpdateBlogPostModel(model, blogPost); + Success(_translationService.GetResource("Admin.Content.Blog.BlogPosts.Updated")); + + if (continueEditing) + { + //selected tab + await SaveSelectedTabIndex(); + + return RedirectToAction("Edit", new { id = blogPost.Id }); + } + + return RedirectToAction("List"); + } + + //If we got this far, something failed, redisplay form + ViewBag.AllLanguages = await _languageService.GetAllLanguages(true); + + return View(model); + } + + [PermissionAuthorizeAction(PermissionActionName.Delete)] + [HttpPost] + public async Task Delete(string id) + { + var blogPost = await _blogService.GetBlogPostById(id); + if (blogPost == null) + //No blog post found with the specified id + return RedirectToAction("List"); + + if (!blogPost.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)) + return RedirectToAction("List"); + + if (ModelState.IsValid) + { + await _blogService.DeleteBlogPost(blogPost); + + Success(_translationService.GetResource("Admin.Content.Blog.BlogPosts.Deleted")); + return RedirectToAction("List"); + } + + Error(ModelState); + return RedirectToAction("Edit", new { id = blogPost.Id }); + } + + [PermissionAuthorizeAction(PermissionActionName.Preview)] + public async Task Preview(string id) + { + var blogPost = await _blogService.GetBlogPostById(id); + if (blogPost == null) + return RedirectToAction("List"); + + if (!blogPost.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)) + return RedirectToAction("List"); + + var model = blogPost.ToModel(_dateTimeService); + return View(model); + } + + #endregion + + #region Comments + + public IActionResult Comments(string filterByBlogPostId) + { + return RedirectToAction("Edit", new { id = filterByBlogPostId }); + } + + [PermissionAuthorizeAction(PermissionActionName.List)] + [HttpPost] + public async Task Comments(string filterByBlogPostId, DataSourceRequest command) + { + var model = await _blogViewModelService.PrepareBlogPostCommentsModel(filterByBlogPostId, command.Page, + command.PageSize); + var gridModel = new DataSourceResult + { + Data = model.blogComments, + Total = model.totalCount + }; + return Json(gridModel); + } + + [PermissionAuthorizeAction(PermissionActionName.Delete)] + [HttpPost] + public async Task CommentDelete(string id) + { + var comment = await _blogService.GetBlogCommentById(id); + if (comment == null) + throw new ArgumentException("No comment found with the specified id"); + + var blogPost = await _blogService.GetBlogPostById(comment.BlogPostId); + if (blogPost == null) + throw new ArgumentException("No blog post found with the specified id"); + + if (!blogPost.AccessToEntityByStore(_contextAccessor.WorkContext.CurrentCustomer.StaffStoreId)) + throw new ArgumentException("This blog post is not assigned to your store"); + + await _blogService.DeleteBlogComment(comment); + + //update totals + var comments = await _blogService.GetBlogCommentsByBlogPostId(blogPost.Id); + blogPost.CommentCount = comments.Count; + await _blogService.UpdateBlogPost(blogPost); + + return new JsonResult(""); + } + + #endregion +} \ No newline at end of file