Improving code style.

Lombiq · Jan 16, 2025 · b9fd301 · b9fd301
1 parent 08d874f
commit b9fd301
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 19 deletions.
diff --git a/Lombiq.UIKit.Widgets/Constants/ContentTypes.cs b/Lombiq.UIKit.Widgets/Constants/ContentTypes.cs
@@ -3,7 +3,6 @@ namespace Lombiq.UIKit.Widgets.Constants;
 public static class ContentTypes
 {
     public const string SlidePart = nameof(SlidePart);
-    public const string Slide = "Slide";
-    public const string CarouselWidgetPart = nameof(CarouselWidgetPart);
-    public const string CarouselWidget = "CarouselWidget";
+    public const string Slide = nameof(Slide);
+    public const string CarouselWidget = nameof(CarouselWidget);
 }
diff --git a/Lombiq.UIKit.Widgets/Handlers/SlidePartHandler.cs b/Lombiq.UIKit.Widgets/Handlers/SlidePartHandler.cs
diff --git a/Lombiq.UIKit.Widgets/Migrations/CarouselWidgetMigrations.cs b/Lombiq.UIKit.Widgets/Migrations/CarouselWidgetMigrations.cs
@@ -27,7 +27,7 @@ await _contentDefinitionManager.AlterPartDefinitionAsync<SlidePart>(part => part
             .WithPosition("0")
         ));
 
-        await _contentDefinitionManager.AlterPartDefinitionAsync(ContentTypes.CarouselWidgetPart, part => part
+        await _contentDefinitionManager.AlterPartDefinitionAsync(nameof(CarouselWidgetPart), part => part
             .Attachable()
             .WithSettings(new CarouselWidgetPartSettings())
         );
@@ -42,7 +42,7 @@ await _contentDefinitionManager.AlterTypeDefinitionAsync(ContentTypes.Slide, typ
 
         await _contentDefinitionManager.AlterTypeDefinitionAsync(ContentTypes.CarouselWidget, type => type
             .Securable()
-            .WithPart(ContentTypes.CarouselWidgetPart, part => part.WithSettings(new CarouselWidgetPartSettings()))
+            .WithPart(nameof(CarouselWidgetPart), part => part.WithSettings(new CarouselWidgetPartSettings()))
             .WithPart(nameof(BagPart), part => part.WithSettings(new BagPartSettings
             {
                 ContainedContentTypes = [ContentTypes.Slide],

diff --git a/Lombiq.UIKit.Widgets/Startup.cs b/Lombiq.UIKit.Widgets/Startup.cs
@@ -1,4 +1,3 @@
-using Lombiq.UIKit.Widgets.Handlers;
 using Lombiq.UIKit.Widgets.Migrations;
 using Lombiq.UIKit.Widgets.Models;
 using Lombiq.UIKit.Widgets.Settings;
@@ -14,7 +13,7 @@ public sealed class Startup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddContentPart<SlidePart>().AddHandler<SlidePartHandler>();
+        services.AddContentPart<SlidePart>();
         services.AddContentPart<CarouselWidgetPart>();
         services.AddScoped<IContentTypePartDefinitionDisplayDriver, CarouselWidgetPartSettingsDisplayDriver>();
         services.AddScoped<IDataMigration, CarouselWidgetMigrations>();

diff --git a/Lombiq.UIKit.Widgets/Views/Widget-CarouselWidget.cshtml b/Lombiq.UIKit.Widgets/Views/Widget-CarouselWidget.cshtml
@@ -1,3 +1,4 @@
+@using Lombiq.UIKit.Widgets.Constants
 @using Lombiq.UIKit.Widgets.Models
 @using Lombiq.UIKit.Widgets.Settings
 @using OrchardCore.ContentManagement
@@ -8,7 +9,7 @@
 @inject IContentDefinitionManager _contentDefinitionManager
 
 @{
-    var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync("CarouselWidget");
+    var typeDefinition = await _contentDefinitionManager.GetTypeDefinitionAsync(ContentTypes.CarouselWidget);
     var part = typeDefinition.Parts.Where(part => part.Name == nameof(CarouselWidgetPart)).FirstOrDefault();
     CarouselWidgetPartSettings settings = new CarouselWidgetPartSettings();
     if(part != null)
@@ -22,7 +23,7 @@
         var bagItems = ((ContentItem)Model.ContentItem).As<BagPart>().ContentItems.Select(contentItem => contentItem.As<SlidePart>());
         var items = new List<IShape>();
 
-        bagItems.ForEach(async (slide) => items.Add(await New.Slide(Title: slide.ContentItem.Content.TitlePart.Text, Image: slide.Image.Paths[0])));
+        bagItems.ForEach(async (slide) => items.Add(await New.Slide(Title: slide.ContentItem.DisplayText, Image: slide.Image.Paths[0])));
 
         var carouselSettings = settings.OptionsJsonSerialized;
     }