Minor refactoring - move storage extensions to grand.web.common project

grandnode · Jun 13, 2022 · 3d5d13d · 3d5d13d
1 parent fc0b66f
commit 3d5d13d
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj b/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj
@@ -14,12 +14,12 @@
     <OutDir>$(OutputPath)</OutDir>
   </PropertyGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Authentication.Facebook\refs" />
-    <RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Authentication.Facebook\ref" />
-  </Target>
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+		<RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Authentication.Facebook\refs" />
+		<RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Authentication.Facebook\ref" />
+	</Target>
 
-  <ItemGroup>
+	<ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.4" />
   </ItemGroup>
 

diff --git a/src/Web/Grand.Web.Admin/Controllers/DownloadController.cs b/src/Web/Grand.Web.Admin/Controllers/DownloadController.cs
@@ -1,10 +1,10 @@
 using Grand.Business.Core.Utilities.Common.Security;
-using Grand.Business.Core.Extensions;
 using Grand.Business.Core.Interfaces.Storage;
 using Grand.Web.Common.Security.Authorization;
 using Grand.Domain.Media;
 using Grand.Web.Admin.Extensions;
 using Microsoft.AspNetCore.Mvc;
+using Grand.Web.Common.Extensions;
 
 namespace Grand.Web.Admin.Controllers
 {
@@ -35,8 +35,7 @@ public async Task<IActionResult> DownloadFile(Guid downloadGuid)
             string contentType = !String.IsNullOrWhiteSpace(download.ContentType)
                 ? download.ContentType
                 : "application/octet-stream";
-            return new FileContentResult(download.DownloadBinary, contentType)
-            {
+            return new FileContentResult(download.DownloadBinary, contentType) {
                 FileDownloadName = fileName + download.Extension
             };
         }
@@ -52,8 +51,7 @@ public async Task<IActionResult> SaveDownloadUrl(string downloadUrl)
                 return Json(new { success = false, error = "URL can't be empty" });
             }
             //insert
-            var download = new Download
-            {
+            var download = new Download {
                 DownloadGuid = Guid.NewGuid(),
                 UseDownloadUrl = true,
                 DownloadUrl = downloadUrl,
@@ -98,8 +96,7 @@ public virtual async Task<IActionResult> AsyncUpload()
                 fileExtension = fileExtension.ToLowerInvariant();
 
 
-            var download = new Download
-            {
+            var download = new Download {
                 DownloadGuid = Guid.NewGuid(),
                 UseDownloadUrl = false,
                 DownloadUrl = "",

diff --git a/src/Web/Grand.Web.Admin/Controllers/PictureController.cs b/src/Web/Grand.Web.Admin/Controllers/PictureController.cs
@@ -1,13 +1,13 @@
 using Grand.Business.Core.Interfaces.Common.Security;
 using Grand.Business.Core.Utilities.Common.Security;
-using Grand.Business.Core.Extensions;
 using Grand.Business.Core.Interfaces.Storage;
 using Grand.Domain.Common;
 using Grand.Domain.Media;
 using Grand.Web.Admin.Extensions;
 using Grand.Web.Common.Security.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.StaticFiles;
+using Grand.Web.Common.Extensions;
 
 namespace Grand.Web.Admin.Controllers
 {

diff --git a/...ness.Core/Extensions/StorageExtensions.cs → ...eb.Common/Extensions/StorageExtensions.cs b/...ness.Core/Extensions/StorageExtensions.cs → ...eb.Common/Extensions/StorageExtensions.cs
@@ -1,9 +1,9 @@
 using Microsoft.AspNetCore.Http;
 
-namespace Grand.Business.Core.Extensions
+namespace Grand.Web.Common.Extensions
 {
     /// <summary>
-    /// Extensions
+    /// Storage extensions
     /// </summary>
     public static class Extensions
     {

diff --git a/src/Web/Grand.Web/Controllers/CommonController.cs b/src/Web/Grand.Web/Controllers/CommonController.cs
@@ -3,7 +3,6 @@
 using Grand.Business.Core.Interfaces.Common.Localization;
 using Grand.Business.Core.Interfaces.Common.Stores;
 using Grand.Business.Core.Interfaces.Marketing.Contacts;
-using Grand.Business.Core.Extensions;
 using Grand.Business.Core.Interfaces.Storage;
 using Grand.Web.Common.Filters;
 using Grand.Web.Common.Security.Captcha;
@@ -27,6 +26,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Net;
 using Grand.Web.Common.Controllers;
+using Grand.Web.Common.Extensions;
 
 namespace Grand.Web.Controllers
 {

diff --git a/src/Web/Grand.Web/Controllers/ProductController.cs b/src/Web/Grand.Web/Controllers/ProductController.cs
@@ -25,6 +25,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Net.Http.Headers;
+using Grand.Web.Common.Extensions;
 
 namespace Grand.Web.Controllers
 {

diff --git a/src/Web/Grand.Web/Controllers/ShoppingCartController.cs b/src/Web/Grand.Web/Controllers/ShoppingCartController.cs
@@ -22,6 +22,7 @@
 using MediatR;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Grand.Web.Common.Extensions;
 
 namespace Grand.Web.Controllers
 {

diff --git a/src/Web/Grand.Web/Controllers/VendorController.cs b/src/Web/Grand.Web/Controllers/VendorController.cs
@@ -12,6 +12,7 @@
 using Grand.Infrastructure;
 using Grand.SharedKernel.Extensions;
 using Grand.Web.Commands.Models.Vendors;
+using Grand.Web.Common.Extensions;
 using Grand.Web.Common.Filters;
 using Grand.Web.Common.Security.Captcha;
 using Grand.Web.Extensions;