Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Plugin Widgets.Slider - change type of project to Microsoft.NET.Sdk.Razor

KrzysztofPajakf6fe1af41140
diff --git a/src/Plugins/Widgets.Slider/Controllers/WidgetsSliderController.cs b/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs
similarity index 88%
rename from src/Plugins/Widgets.Slider/Controllers/WidgetsSliderController.cs
rename to src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs
index 37133f1df..3dcc331fa 100644
--- a/src/Plugins/Widgets.Slider/Controllers/WidgetsSliderController.cs
+++ b/src/Plugins/Widgets.Slider/Areas/Admin/Controllers/WidgetsSliderController.cs
@@ -24,34 +24,25 @@ namespace Widgets.Slider.Controllers
[PermissionAuthorize(PermissionSystemName.Widgets)]
public class WidgetsSliderController : BasePluginController
{
- private readonly IStoreService _storeService;
private readonly IPictureService _pictureService;
private readonly ITranslationService _translationService;
private readonly ISliderService _sliderService;
private readonly ILanguageService _languageService;
- private readonly ICategoryService _categoryService;
- private readonly ICollectionService _collectionService;
private readonly SliderWidgetSettings _sliderWidgetSettings;
private readonly ISettingService _settingService;
public WidgetsSliderController(
- IStoreService storeService,
IPictureService pictureService,
ITranslationService translationService,
ISliderService sliderService,
ILanguageService languageService,
- ICategoryService categoryService,
- ICollectionService collectionService,
ISettingService settingService,
SliderWidgetSettings sliderWidgetSettings)
{
- _storeService = storeService;
_pictureService = pictureService;
_translationService = translationService;
_sliderService = sliderService;
_languageService = languageService;
- _categoryService = categoryService;
- _collectionService = collectionService;
_settingService = settingService;
_sliderWidgetSettings = sliderWidgetSettings;
}
@@ -61,7 +52,7 @@ namespace Widgets.Slider.Controllers
model.DisplayOrder = _sliderWidgetSettings.DisplayOrder;
model.CustomerGroups = _sliderWidgetSettings.LimitedToGroups?.ToArray();
model.Stores = _sliderWidgetSettings.LimitedToStores?.ToArray();
- return View("~/Plugins/Widgets.Slider/Views/List.cshtml", model);
+ return View(model);
}
[HttpPost]
@@ -103,7 +94,7 @@ namespace Widgets.Slider.Controllers
//locales
await AddLocales(_languageService, model.Locales);
- return View("~/Plugins/Widgets.Slider/Views/Create.cshtml", model);
+ return View(model);
}
[HttpPost, ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
public async Task<IActionResult> Create(SlideModel model, bool continueEditing)
@@ -119,8 +110,7 @@ namespace Widgets.Slider.Controllers
return continueEditing ? RedirectToAction("Edit", new { id = pictureSlider.Id }) : RedirectToAction("Configure");
}
-
- return View("~/Plugins/Widgets.Slider/Views/Create.cshtml", model);
+ return View(model);
}
public async Task<IActionResult> Edit(string id)
{
@@ -137,7 +127,7 @@ namespace Widgets.Slider.Controllers
locale.Description = slide.GetTranslation(x => x.Description, languageId, false);
});
- return View("~/Plugins/Widgets.Slider/Views/Edit.cshtml", model);
+ return View(model);
}
[HttpPost, ArgumentNameFilter(KeyName = "save-continue", Argument = "continueEditing")]
@@ -156,7 +146,7 @@ namespace Widgets.Slider.Controllers
return continueEditing ? RedirectToAction("Edit", new { id = pictureSlider.Id }) : RedirectToAction("Configure");
}
- return View("~/Plugins/Widgets.Slider/Views/Edit.cshtml", model);
+ return View(model);
}
public async Task<IActionResult> Delete(string id)
diff --git a/src/Plugins/Widgets.Slider/Views/List.cshtml b/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/Configure.cshtml
similarity index 97%
rename from src/Plugins/Widgets.Slider/Views/List.cshtml
rename to src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/Configure.cshtml
index 111249f67..126ea9191 100644
--- a/src/Plugins/Widgets.Slider/Views/List.cshtml
+++ b/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/Configure.cshtml
@@ -24,7 +24,7 @@
<div id="slider-grid"></div>
</div>
<div class="x_content form">
- <partial name="~/Plugins/Widgets.Slider/Views/_Settings.cshtml" model="Model"/>
+ <partial name="_Settings.cshtml" model="Model"/>
</div>
</div>
</div>
diff --git a/src/Plugins/Widgets.Slider/Views/Create.cshtml b/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/Create.cshtml
similarity index 92%
rename from src/Plugins/Widgets.Slider/Views/Create.cshtml
rename to src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/Create.cshtml
index 220f1da18..405c9be6a 100644
--- a/src/Plugins/Widgets.Slider/Views/Create.cshtml
+++ b/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/Create.cshtml
@@ -24,7 +24,7 @@
</div>
</div>
<div class="x_content form">
- <partial name="~/Plugins/Widgets.Slider/Views/_CreateOrUpdate.cshtml" model="Model" />
+ <partial name="_CreateOrUpdate.cshtml" model="Model" />
</div>
</div>
</div>
diff --git a/src/Plugins/Widgets.Slider/Views/Edit.cshtml b/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/Edit.cshtml
similarity index 92%
rename from src/Plugins/Widgets.Slider/Views/Edit.cshtml
rename to src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/Edit.cshtml
index cb9c8bdc5..ce9b9896c 100644
--- a/src/Plugins/Widgets.Slider/Views/Edit.cshtml
+++ b/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/Edit.cshtml
@@ -24,7 +24,7 @@
</div>
</div>
<div class="x_content form">
- <partial name="~/Plugins/Widgets.Slider/Views/_CreateOrUpdate.cshtml" model="Model" />
+ <partial name="_CreateOrUpdate.cshtml" model="Model" />
</div>
</div>
</div>
diff --git a/src/Plugins/Widgets.Slider/Views/_CreateOrUpdate.TabInfo.cshtml b/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/_CreateOrUpdate.TabInfo.cshtml
similarity index 100%
rename from src/Plugins/Widgets.Slider/Views/_CreateOrUpdate.TabInfo.cshtml
rename to src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/_CreateOrUpdate.TabInfo.cshtml
diff --git a/src/Plugins/Widgets.Slider/Views/_CreateOrUpdate.cshtml b/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/_CreateOrUpdate.cshtml
similarity index 100%
rename from src/Plugins/Widgets.Slider/Views/_CreateOrUpdate.cshtml
rename to src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/_CreateOrUpdate.cshtml
diff --git a/src/Plugins/Widgets.Slider/Views/_Settings.cshtml b/src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/_Settings.cshtml
similarity index 100%
rename from src/Plugins/Widgets.Slider/Views/_Settings.cshtml
rename to src/Plugins/Widgets.Slider/Areas/Admin/Views/WidgetsSlider/_Settings.cshtml
diff --git a/src/Plugins/Widgets.Slider/Areas/Admin/Views/_ViewImports.cshtml b/src/Plugins/Widgets.Slider/Areas/Admin/Views/_ViewImports.cshtml
new file mode 100644
index 000000000..585228251
--- /dev/null
+++ b/src/Plugins/Widgets.Slider/Areas/Admin/Views/_ViewImports.cshtml
@@ -0,0 +1,14 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Grand.Web.Common
+@addTagHelper *, Grand.Web
+
+@using Microsoft.AspNetCore.Mvc.ViewFeatures
+@using Microsoft.AspNetCore.Mvc.Razor
+@using Grand.Infrastructure.Extensions
+@using Grand.Domain.Common
+@using Widgets.Slider.Models
+@using Widgets.Slider.Domain
+@using Grand.Web.Common
+@using Grand.Web.Common.Extensions
+
+@inject Grand.Web.Common.Localization.LocService Loc
diff --git a/src/Plugins/Widgets.Slider/Components/SliderViewComponent.cs b/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs
similarity index 90%
rename from src/Plugins/Widgets.Slider/Components/SliderViewComponent.cs
rename to src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs
index 97f352a23..b72f26ce0 100644
--- a/src/Plugins/Widgets.Slider/Components/SliderViewComponent.cs
+++ b/src/Plugins/Widgets.Slider/Components/WidgetSliderComponent.cs
@@ -11,14 +11,14 @@ using Widgets.Slider.Services;
namespace Widgets.Slider.ViewComponents
{
- [ViewComponent(Name = "Widgets.Slider")]
- public class SliderViewComponent : ViewComponent
+ [ViewComponent(Name = "WidgetSlider")]
+ public class WidgetSliderComponent : ViewComponent
{
private readonly IPictureService _pictureService;
private readonly ISliderService _sliderService;
private readonly IWorkContext _workContext;
- public SliderViewComponent(
+ public WidgetSliderComponent(
IPictureService pictureService,
ISliderService sliderService,
IWorkContext workContext)
@@ -42,8 +42,7 @@ namespace Widgets.Slider.ViewComponents
int i = 1;
foreach (var item in sliders.OrderBy(x => x.DisplayOrder))
{
- model.Slide.Add(new PublicInfoModel.Slider()
- {
+ model.Slide.Add(new PublicInfoModel.Slider() {
Link = item.Link,
PictureUrl = await GetPictureUrl(item.PictureId),
Name = item.GetTranslation(x => x.Name, _workContext.WorkingLanguage.Id),
@@ -79,7 +78,7 @@ namespace Widgets.Slider.ViewComponents
if (!model.Slide.Any())
return Content("");
- return View("/Plugins/Widgets.Slider/Views/Slider.cshtml", model);
+ return View(model);
}
}
}
\ No newline at end of file
diff --git a/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs b/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs
index 239900dd8..f547722e4 100644
--- a/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs
+++ b/src/Plugins/Widgets.Slider/SliderWidgetProvider.cs
@@ -44,7 +44,7 @@ namespace Widgets.Slider
public Task<string> GetPublicViewComponentName(string widgetZone)
{
- return Task.FromResult("Widgets.Slider");
+ return Task.FromResult("WidgetSlider");
}
}
diff --git a/src/Plugins/Widgets.Slider/Views/Slider.cshtml b/src/Plugins/Widgets.Slider/Views/Shared/Components/WidgetSlider/Default.cshtml
similarity index 100%
rename from src/Plugins/Widgets.Slider/Views/Slider.cshtml
rename to src/Plugins/Widgets.Slider/Views/Shared/Components/WidgetSlider/Default.cshtml
diff --git a/src/Plugins/Widgets.Slider/Widgets.Slider.csproj b/src/Plugins/Widgets.Slider/Widgets.Slider.csproj
index 2a3d868bf..e9d403edb 100644
--- a/src/Plugins/Widgets.Slider/Widgets.Slider.csproj
+++ b/src/Plugins/Widgets.Slider/Widgets.Slider.csproj
@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<Copyright>Copyright © UNIT-SOFT Sp. z o.o.</Copyright>
<Company>UNIT-SOFT Sp. z o.o.</Company>
<Authors>UNIT-SOFT Sp. z o.o.</Authors>
<PackageProjectUrl>https://grandnode.com/</PackageProjectUrl>
+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -73,29 +74,5 @@
<None Update="logo.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
- <None Update="Views\Create.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Views\Edit.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Views\List.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Views\Slider.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Views\_CreateOrUpdate.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Views\_CreateOrUpdate.TabInfo.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Views\_Settings.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Update="Views\_ViewImports.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
</ItemGroup>
</Project>
\ No newline at end of file