Added AlertBlock

usercode · Nov 1, 2022 · f9fe57e · f9fe57e
1 parent 5757278
commit f9fe57e
Show file tree

Hide file tree

Showing 24 changed files with 176 additions and 27 deletions.
diff --git a/src/DragonFly.API.Client/ClientContentService.ContentItem.cs b/src/DragonFly.API.Client/ClientContentService.ContentItem.cs
@@ -42,6 +42,11 @@ public async Task UpdateAsync(ContentItem entity)
         await Client.PutAsJsonAsync($"api/content", entity.ToRest());
     }
 
+    public async Task DeleteAsync(ContentItem entity)
+    {
+        await Client.DeleteAsync($"api/content/{entity.Schema.Name}/{entity.Id}");
+    }
+
     public async Task PublishAsync(string schema, Guid id)
     {
         var response = await Client.PostAsync($"api/content/{schema}/{id}/publish", new StringContent(string.Empty));

diff --git a/src/DragonFly.BlockField.Razor/Extensions/DragonFlyBuilderExtensions.cs b/src/DragonFly.BlockField.Razor/Extensions/DragonFlyBuilderExtensions.cs
@@ -31,6 +31,7 @@ public static IDragonFlyBuilder AddBlockField(this IDragonFlyBuilder builder)
             api.RegisterBlock<QuoteBlock, QuoteBlockView>();
             api.RegisterBlock<ReferenceBlock, ReferenceBlockView>();
             api.RegisterBlock<ContainerBlock, ContainerBlockView>();
+            api.RegisterBlock<AlertBlock, AlertBlockView>();
 
             api.RegisterBlock<UnknownBlock, UnknownBlockView>();
         });

diff --git a/src/DragonFly.BlockField.Razor/Pages/Blocks/AlertBlockView.razor b/src/DragonFly.BlockField.Razor/Pages/Blocks/AlertBlockView.razor
@@ -0,0 +1,8 @@
+@inherits BlockComponent<AlertBlock>
+
+<div class="alert-block">
+    <div class="mb-1">
+        <EnumView TEnum="AlertType" @bind-EnumValue="@Block.AlertType" />
+    </div>
+    <BlocksView Blocks="Block.Blocks" />
+</div>
diff --git a/src/DragonFly.BlockField.Razor/Pages/Blocks/CodeBlockView.razor b/src/DragonFly.BlockField.Razor/Pages/Blocks/CodeBlockView.razor
@@ -4,7 +4,7 @@
     <div class="mb-1">
         <EnumView TEnum="CodeType" @bind-EnumValue="@Block.CodeType" />
     </div>
-    <textarea class="form-control" @bind="@Block.Content" spellcheck="false" style="width:100%; height:40rem" />
+    <textarea class="form-control" @bind="@Block.Content" spellcheck="false" style="height:40rem" />
 </div>
 
 @code {

diff --git a/src/DragonFly.BlockField/BlockFieldManagerExtensions.cs b/src/DragonFly.BlockField/BlockFieldManagerExtensions.cs
@@ -20,6 +20,7 @@ public static void AddDefaults(this BlockFieldManager manager)
         manager.Add<QuoteBlock>();
         manager.Add<ReferenceBlock>();
         manager.Add<ContainerBlock>();
+        manager.Add<AlertBlock>();
 
         manager.Add<UnknownBlock>();
     }

diff --git a/src/DragonFly.BlockField/Blocks/AlertBlock.cs b/src/DragonFly.BlockField/Blocks/AlertBlock.cs
@@ -0,0 +1,28 @@
+// Copyright (c) usercode
+// https://github.com/usercode/DragonFly
+// MIT License
+
+namespace DragonFly.BlockField;
+
+/// <summary>
+/// AlertBlock
+/// </summary>
+public class AlertBlock : Block, IChildBlocks
+{
+    public AlertBlock()
+    {
+        AlertType = AlertType.Info;
+        Blocks = new List<Block>();
+    }
+
+    public override string CssIcon => "fa-solid fa-circle-info";
+
+    public IList<Block> Blocks { get; set; }
+
+    public AlertType AlertType { get; set; }
+
+    public IEnumerable<Block> GetBlocks()
+    {
+        return Blocks;
+    }
+}
diff --git a/src/DragonFly.BlockField/Blocks/AlertType.cs b/src/DragonFly.BlockField/Blocks/AlertType.cs
@@ -0,0 +1,23 @@
+// Copyright (c) usercode
+// https://github.com/usercode/DragonFly
+// MIT License
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DragonFly.BlockField;
+
+public enum AlertType
+{
+    Primary,
+    Secondary,
+    Success,
+    Info,
+    Warning,
+    Danger,
+    Light,
+    Dark
+}
diff --git a/src/DragonFly.ImageWizard/DragonFly.ImageWizard.csproj b/src/DragonFly.ImageWizard/DragonFly.ImageWizard.csproj
@@ -24,11 +24,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ImageWizard.Core" Version="3.7.1" />		
-		<PackageReference Include="ImageWizard.DocNET" Version="3.7.1" />
-		<PackageReference Include="ImageWizard.ImageSharp" Version="3.7.1" />
-		<PackageReference Include="ImageWizard.SvgNet" Version="3.7.1" />
-		<PackageReference Include="ImageWizard.Client" Version="3.7.1" />
+		<PackageReference Include="ImageWizard.Core" Version="3.7.3" />		
+		<PackageReference Include="ImageWizard.DocNET" Version="3.7.3" />
+		<PackageReference Include="ImageWizard.ImageSharp" Version="3.7.3" />
+		<PackageReference Include="ImageWizard.SvgNet" Version="3.7.3" />
+		<PackageReference Include="ImageWizard.Client" Version="3.7.3" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/DragonFly.Razor/Pages/ContentItems/ContentItemDetail.razor.cs b/src/DragonFly.Razor/Pages/ContentItems/ContentItemDetail.razor.cs
@@ -41,15 +41,15 @@ protected override void BuildToolbarItems(IList<ToolbarItem> toolbarItems)
     {
         base.BuildToolbarItems(toolbarItems);
 
-        if(IsNewEntity)
+        if (IsNewEntity)
         {
             toolbarItems.AddCreateButton(this);
         }
         else
         {
             toolbarItems.Add(new ToolbarItem("Publish", BSColor.Success, () => PublishAsync()));
             toolbarItems.Add(new ToolbarItem("Unpublish", BSColor.Dark, () => UnpublishAsync()));
-            toolbarItems.Add(new ToolbarItem("Clone", BSColor.Light, ()=> CloneAsync()));
+            toolbarItems.Add(new ToolbarItem("Clone", BSColor.Light, () => CloneAsync()));
             toolbarItems.AddRefreshButton(this);
             toolbarItems.AddSaveButton(this);
             toolbarItems.AddDeleteButton(this);
@@ -73,7 +73,7 @@ protected override async Task RefreshActionAsync()
 
             Entity = Schema.CreateContent();
 
-            if(CloneFromEntityId != null)
+            if (CloneFromEntityId != null)
             {
                 ContentItem original = await ContentService.GetContentAsync(EntityType, CloneFromEntityId.Value);
 
@@ -105,6 +105,13 @@ protected override async Task UpdateActionAsync()
         await ContentService.UpdateAsync(Entity);
     }
 
+    protected override async Task DeleteActionAsync()
+    {
+        await ContentService.DeleteAsync(Entity);
+
+        NavigationManager.NavigateTo($"content/{EntityType}");
+    }
+
     protected override void OnSaving(SavingEventArgs args)
     {
         ValidationContext = Entity.Validate();
@@ -127,5 +134,5 @@ public async Task PublishAsync()
     public async Task UnpublishAsync()
     {
         await ContentService.UnpublishAsync(Entity.Schema.Name, Entity.Id);
-    }       
+    }
 }
diff --git a/src/DragonFly.Razor/Pages/ContentItems/ContentItemList.razor b/src/DragonFly.Razor/Pages/ContentItems/ContentItemList.razor
@@ -27,7 +27,7 @@
             {
                 <BSListGroup>
 
-                    @foreach (var contentItem in SearchResult.Items)
+                    @foreach (ContentItem contentItem in SearchResult.Items)
                     {
                         <button class="list-group-item list-group-item-action" @onclick="x => OpenItem(contentItem)">
                             <BSRow>

diff --git a/src/DragonFlyTemplate/DragonFlyTemplate.csproj b/src/DragonFlyTemplate/DragonFlyTemplate.csproj
@@ -18,11 +18,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ImageWizard.Client" Version="3.7.1" />
-    <PackageReference Include="ImageWizard.Core" Version="3.7.1" />
-    <PackageReference Include="ImageWizard.ImageSharp" Version="3.7.1" />
-    <PackageReference Include="ImageWizard.OpenGraph" Version="3.7.1" />
-    <PackageReference Include="ImageWizard.SvgNet" Version="3.7.1" />
+    <PackageReference Include="ImageWizard.Client" Version="3.7.3" />
+    <PackageReference Include="ImageWizard.Core" Version="3.7.3" />
+    <PackageReference Include="ImageWizard.ImageSharp" Version="3.7.3" />
+    <PackageReference Include="ImageWizard.OpenGraph" Version="3.7.3" />
+    <PackageReference Include="ImageWizard.SvgNet" Version="3.7.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/DragonFlyTemplate/Extensions/AlertTypeExtensions.cs b/src/DragonFlyTemplate/Extensions/AlertTypeExtensions.cs
@@ -0,0 +1,26 @@
+// Copyright (c) usercode
+// https://github.com/usercode/DragonFly
+// MIT License
+
+using DragonFly.BlockField;
+
+namespace DragonFly.AspNetCore;
+
+public static class AlertTypeExtensions
+{
+    public static string ToBootstrapCssClass(this AlertType alertType)
+    {
+        return alertType switch
+        {
+            AlertType.Primary => "alert-primary",
+            AlertType.Secondary => "alert alert-secondary",
+            AlertType.Success => "alert-success",
+            AlertType.Danger => "alert-danger",
+            AlertType.Warning => "alert-warning",
+            AlertType.Info => "alert-info",
+            AlertType.Light => "alert-light",
+            AlertType.Dark => "alert-dark",
+            _ => string.Empty
+        };
+    }
+}
diff --git a/src/DragonFlyTemplate/Pages/DisplayTemplates/AlertBlock.cshtml b/src/DragonFlyTemplate/Pages/DisplayTemplates/AlertBlock.cshtml
@@ -0,0 +1,10 @@
+@model AlertBlock
+
+@if (Model.Blocks.Any())
+{
+    <div class="block alert-block">
+        <div class="alert @Model.AlertType.ToBootstrapCssClass()">
+            @Html.DisplayFor(m => Model.Blocks)
+        </div>
+    </div>
+}
diff --git a/src/DragonFlyTemplate/Pages/DisplayTemplates/CodeBlock.cshtml b/src/DragonFlyTemplate/Pages/DisplayTemplates/CodeBlock.cshtml
@@ -1,6 +1,6 @@
 @model CodeBlock
 
-@if(Model.Content != null)
+@if (Model.Content != null)
 {
     @*Stream resource = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("DragonFlyTemplate.assets.prism.es5.min.js");
     StreamReader reader = new StreamReader(resource, System.Text.Encoding.UTF8);

diff --git a/src/DragonFlyTemplate/Pages/DisplayTemplates/ContainerBlock.cshtml b/src/DragonFlyTemplate/Pages/DisplayTemplates/ContainerBlock.cshtml
@@ -1,8 +1,8 @@
 @model ContainerBlock
 
-@if(Model.Blocks.Any())
+@if (Model.Blocks.Any())
 {
     <div class="block container-block">
-         @Html.DisplayFor(m => Model.Blocks)
+        @Html.DisplayFor(m => Model.Blocks)
     </div>
 }
diff --git a/src/DragonFlyTemplate/Pages/DisplayTemplates/HtmlBlock.cshtml b/src/DragonFlyTemplate/Pages/DisplayTemplates/HtmlBlock.cshtml
@@ -1,6 +1,6 @@
 @model HtmlBlock
 
-@if(Model.HtmlText != null)
+@if (Model.HtmlText != null)
 {
     <div class="block html-block">
         @Html.Raw(Model.HtmlText)

diff --git a/src/DragonFlyTemplate/Pages/DisplayTemplates/QuoteBlock.cshtml b/src/DragonFlyTemplate/Pages/DisplayTemplates/QuoteBlock.cshtml
@@ -1,9 +1,9 @@
 @model QuoteBlock
 
-@if(Model.Text != null)
+@if (Model.Text != null)
 {
     <div class="block quote-block">
-        <figure class="text-center">        
+        <figure class="text-center">
             <blockquote class="blockquote" cite="@Model.Url">
                 <p>@Model.Text</p>
             </blockquote>

diff --git a/src/DragonFlyTemplate/Pages/DisplayTemplates/SlideshowBlock.cshtml b/src/DragonFlyTemplate/Pages/DisplayTemplates/SlideshowBlock.cshtml
@@ -0,0 +1,26 @@
+@model SlideshowBlock
+
+@if (Model.Blocks.Any())
+{
+    <div class="block slideshow-block">
+        <div class="carousel slide" data-bs-ride="carousel">
+            <div class="carousel-inner">
+                @for (int i = 0; i < Model.Blocks.Count; i++)
+                {
+                    <div class="carousel-item @(i == 0 ? "active" : "")" data-bs-interval="1000000">
+                        @Html.DisplayFor(m => Model.Blocks[i], Model.Blocks[i].Type)
+                    </div>
+                }
+            </div>
+            <button class="carousel-control-prev" type="button" data-bs-target="#carouselExampleControls" data-bs-slide="prev">
+                <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+                <span class="visually-hidden">Previous</span>
+            </button>
+            <button class="carousel-control-next" type="button" data-bs-target="#carouselExampleControls" data-bs-slide="next">
+                <span class="carousel-control-next-icon" aria-hidden="true"></span>
+                <span class="visually-hidden">Next</span>
+            </button>
+
+        </div>
+    </div>
+}
diff --git a/src/DragonFlyTemplate/Pages/DisplayTemplates/TextBlock.cshtml b/src/DragonFlyTemplate/Pages/DisplayTemplates/TextBlock.cshtml
@@ -1,6 +1,6 @@
 @model TextBlock
 
-@if(Model.Text != null)
+@if (Model.Text != null)
 {
     <div class="block text-block">
         <p>@Model.Text</p>

diff --git a/src/DragonFlyTemplate/Pages/DisplayTemplates/UnknownBlock.cshtml b/src/DragonFlyTemplate/Pages/DisplayTemplates/UnknownBlock.cshtml
@@ -1,6 +1,6 @@
 @model UnknownBlock
 
-@if(Model.Content != null)
+@if (Model.Content != null)
 {
     <div class="block unknown-block">
         <code>@Model.Content</code>

diff --git a/src/DragonFlyTemplate/assets/scss/base.scss b/src/DragonFlyTemplate/assets/scss/base.scss
@@ -176,3 +176,6 @@ body > header {
     font-size: 1.25rem;
 }
 
+.carousel-item {
+    height: 200px;
+}
diff --git a/src/DragonFlyTemplate/assets/scss/blocks.scss b/src/DragonFlyTemplate/assets/scss/blocks.scss
@@ -1,3 +1,7 @@
 .block {
-    margin-bottom: 1rem;
+    margin-bottom: 2rem;
+
+    &:last-child {
+        margin-bottom: 0px;
+    }
 }
diff --git a/src/DragonFlyTemplate/wwwroot/assets/css/style.css b/src/DragonFlyTemplate/wwwroot/assets/css/style.css
@@ -242,6 +242,10 @@ body > header .title img {
   font-size: 1.25rem;
 }
 
+.carousel-item {
+  height: 200px;
+}
+
 .project-item {
   margin: 25px 0px;
   padding: 25px 0px;
@@ -271,5 +275,8 @@ body > header .title img {
 }
 
 .block {
-  margin-bottom: 1rem;
+  margin-bottom: 2rem;
+}
+.block:last-child {
+  margin-bottom: 0px;
 }
diff --git a/src/DragonFlyTemplate/wwwroot/assets/css/style.min.css b/src/DragonFlyTemplate/wwwroot/assets/css/style.min.css