.github/README.md

@@ -22,13 +22,13 @@ The Umbraco v15 version of this package is [available via NuGet](https://www.nug
 To install the package, you can use either .NET CLI:
 
 ```
-dotnet add package Umbraco.Community.BlockPreview --version 3.2.0
+dotnet add package Umbraco.Community.BlockPreview --version 3.3.0
 ```
 
 or the NuGet Package Manager:
 
 ```
-Install-Package Umbraco.Community.BlockPreview -Version 3.2.0
+Install-Package Umbraco.Community.BlockPreview -Version 3.3.0
 ```
 
 ## Setup

.github/workflows/build.yml

@@ -0,0 +1,50 @@
+name: SonarQube
+on:
+  push:
+    branches:
+      - v3/dev
+      - v2/dev
+      - v1/dev
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  build:
+    name: Build and analyze
+    runs-on: windows-latest
+    steps:
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: 'zulu' # Alternative distribution options are available.
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Cache SonarQube Cloud packages
+        uses: actions/cache@v4
+        with:
+          path: ~\sonar\cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache SonarQube Cloud scanner
+        id: cache-sonar-scanner
+        uses: actions/cache@v4
+        with:
+          path: .\.sonar\scanner
+          key: ${{ runner.os }}-sonar-scanner
+          restore-keys: ${{ runner.os }}-sonar-scanner
+      - name: Install SonarQube Cloud scanner
+        if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
+        shell: powershell
+        run: |
+          New-Item -Path .\.sonar\scanner -ItemType Directory
+          dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
+      - name: Build and analyze
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        shell: powershell
+        run: |
+          cd src
+          ..\.sonar\scanner\dotnet-sonarscanner begin /k:"rickbutterfield_Umbraco.Community.BlockPreview" /o:"rickbutterfielddev" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
+          dotnet build
+          ..\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"

VERSION

@@ -1 +1 @@
-3.2.0
+3.3.0

src/Umbraco.Cms.15.x/Program.cs

@@ -12,12 +12,12 @@
         options.BlockGrid = new()
         {
             Enabled = true,
-            //ContentTypes = [InspirationBlock.ModelTypeAlias],
             Stylesheet = "/css/myblockgridlayout.css"
         };
         options.BlockList = new()
         {
-            Enabled = true
+            Enabled = true,
+            Stylesheet = "/css/myblockgridlayout.css"
         };
         options.RichText.Enabled = true;
     })

src/Umbraco.Cms.15.x/Properties/launchSettings.json

@@ -5,7 +5,7 @@
     "anonymousAuthentication": true,
     "iisExpress": {
       "applicationUrl": "http://localhost:26292",
-      "sslPort": 44367
+      "sslPort": 44368
     }
   },
   "profiles": {
@@ -20,7 +20,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:44367;http://localhost:26292",
+      "applicationUrl": "https://localhost:44368;http://localhost:26292",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }      

src/Umbraco.Cms.15.x/Umbraco.Cms.15.x.csproj

@@ -5,15 +5,12 @@
 		<Nullable>enable</Nullable>
 		<RootNamespace>Umbraco.Cms._15.x</RootNamespace>
 	</PropertyGroup>
-	<ItemGroup>
-	  <Content Remove="appsettings-schema.blockpreview.json" />
-	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Umbraco.Cms" Version="15.1.2" />
-		<PackageReference Include="Umbraco.Cms.Core" Version="15.1.2" />
-		<PackageReference Include="Umbraco.Cms.StaticAssets" Version="15.1.2" />
-		<PackageReference Include="uSync" Version="15.1.0" />
+		<PackageReference Include="Umbraco.Cms" Version="15.3.0" />
+		<PackageReference Include="Umbraco.Cms.Core" Version="15.3.0" />
+		<PackageReference Include="Umbraco.Cms.StaticAssets" Version="15.3.0" />
+		<PackageReference Include="uSync" Version="15.1.5" />
 	</ItemGroup>
 
 	<ItemGroup>

src/Umbraco.Cms.15.x/Views/Partials/blockgrid/Components/heroBlock.cshtml

@@ -1,10 +1,16 @@
-@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem<HeroBlock>>
+@inherits UmbracoViewPage<BlockGridItem<HeroBlock, BlockSettings>>
 @{
     var backgroundColor = Model.Content.BackgroundColor;
     var image = Model.Content.Image;
     var hasBrightContrast = Model.Content.Contrast == "#ffffff";
 }
 
+<pre>Dropdown: @Model.Content.Height</pre>
+<pre>Content Picker: @Model.Content.ContentPicker?.Name (@Model.Content.ContentPicker?.Url())</pre>
+<pre>MNTP: @Model.Content.Mntp?.Name() (@Model.Content.Mntp?.Id)</pre>
+@* <pre>MNTP: @(string.Join(", ", Model.Content.Mntp.Select(x => x.Name))) (@(string.Join(", ", Model.Content.Mntp.Select(x => x.Id))))</pre> *@
+<pre>Settings Dropdown: @Model.Settings?.Dropdown</pre>
+
 <div 
     class="hero"
     style="background-color:@backgroundColor"
@@ -24,5 +30,4 @@
         }
     </div>
 </div>
-
-<pre>Content Picker: @Model.Content.ContentPicker?.Name (@Model.Content.ContentPicker?.Url())</pre>
+

src/Umbraco.Cms.15.x/Views/Partials/blocklist/Components/heroBlock.cshtml

@@ -2,12 +2,15 @@
 @{
     var backgroundColor = Model.Content.BackgroundColor;
     var image = Model.Content.Image;
-    var hasBrightContrast = Model.Content.Contrast == "ffffff";
+    var hasBrightContrast = Model.Content.Contrast == "#ffffff";
 }
 
+<pre>Dropdown: @Model.Content.Height</pre>
+<pre>Content Picker: @Model.Content.ContentPicker?.Name (@Model.Content.ContentPicker?.Url())</pre>
+
 <div 
     class="hero"
-    style="background-color:#@backgroundColor"
+    style="background-color:@backgroundColor"
 @(hasBrightContrast ? "bright-contrast" : null)>
 
     @if (image is not null) {

src/Umbraco.Cms.15.x/Views/Partials/blocklist/Components/nestedBlockList.cshtml

@@ -0,0 +1,3 @@
+@inherits UmbracoViewPage<BlockListItem<NestedBlockList>>
+
+@await Html.GetBlockListHtmlAsync(Model.Content.BlockList)

src/Umbraco.Cms.15.x/Views/Partials/richtext/Components/heroBlock.cshtml

@@ -0,0 +1,26 @@
+@inherits UmbracoViewPage<RichTextBlockItem<HeroBlock>>
+@{
+    var backgroundColor = Model.Content.BackgroundColor;
+    var image = Model.Content.Image;
+    var hasBrightContrast = Model.Content.Contrast == "#ffffff";
+}
+
+<pre>Dropdown: @Model.Content.Height</pre>
+<pre>Content Picker: @Model.Content.ContentPicker?.Name (@Model.Content.ContentPicker?.Url())</pre>
+
+<div 
+    class="hero"
+    style="background-color:@backgroundColor"
+@(hasBrightContrast ? "bright-contrast" : null)>
+
+    @if (image is not null) {
+        <div class="hero-background" style="background-image: url(@image.GetCropUrl(width:3840))">
+        </div>
+    }
+
+
+    <div class="hero-content">
+        <h1>@Model.Content.Headline</h1>
+    </div>
+</div>
+

src/Umbraco.Cms.15.x/uSync/v15/Content/block-list-test.config

@@ -10,47 +10,138 @@
     <SortOrder>2</SortOrder>
     <Published Default="true" />
     <Schedule />
-    <Template Key="21af993e-d1d4-4a3b-a7d8-971c3202eddc">BlockList</Template>
+    <Template Key="c021e223-9e49-4725-b942-eb2562f00b84">BlockList</Template>
   </Info>
   <Properties>
     <content>
       <Value><![CDATA[{
-  "layout": {
-    "Umbraco.BlockList": [
-      {
-        "contentUdi": "umb://element/b753b77647ca40e7bbef7637237fd560",
-        "settingsUdi": "umb://element/edf219148160418b96da6d11d063fa7a"
-      }
-    ]
-  },
   "contentData": [
     {
-      "contentTypeKey": "432b58a8-01b7-47dc-8664-f72bf1045f66",
-      "udi": "umb://element/b753b77647ca40e7bbef7637237fd560",
-      "headline": "Test",
-      "image": [
+      "contentTypeKey": "43e5784f-e3f1-4725-8d2c-876cadaba21b",
+      "key": "11d9782e-7e5a-45a1-9152-dbfd11f28973",
+      "udi": null,
+      "values": [
         {
-          "key": "59b1c1a0-203d-491f-ac3e-0311a0c00330",
-          "mediaKey": "65a066c2-b30d-497b-a53c-968e3f9a20d1"
+          "alias": "blockList",
+          "culture": null,
+          "editorAlias": null,
+          "segment": null,
+          "value": {
+            "contentData": [
+              {
+                "contentTypeKey": "432b58a8-01b7-47dc-8664-f72bf1045f66",
+                "key": "262c697d-b9db-47f7-9f5d-507fab25accd",
+                "udi": null,
+                "values": [
+                  {
+                    "alias": "headline",
+                    "culture": null,
+                    "editorAlias": null,
+                    "segment": null,
+                    "value": "Test"
+                  },
+                  {
+                    "alias": "contentPicker",
+                    "culture": null,
+                    "editorAlias": null,
+                    "segment": null,
+                    "value": "umb://document/6e2ff1f7114e484ba407918daded1aa6"
+                  },
+                  {
+                    "alias": "height",
+                    "culture": null,
+                    "editorAlias": null,
+                    "segment": null,
+                    "value": [
+                      "150"
+                    ]
+                  },
+                  {
+                    "alias": "image",
+                    "culture": null,
+                    "editorAlias": null,
+                    "segment": null,
+                    "value": [
+                      {
+                        "key": "bd823f3e-1587-4437-a946-58790b2be204",
+                        "mediaKey": "ff67c98b-dc69-43ec-859a-d22bba816664",
+                        "mediaTypeAlias": "Image",
+                        "crops": [],
+                        "focalPoint": null
+                      }
+                    ]
+                  },
+                  {
+                    "alias": "backgroundColor",
+                    "culture": null,
+                    "editorAlias": null,
+                    "segment": null,
+                    "value": {
+                      "label": "113635",
+                      "value": "#113635"
+                    }
+                  },
+                  {
+                    "alias": "contrast",
+                    "culture": null,
+                    "editorAlias": null,
+                    "segment": null,
+                    "value": {
+                      "label": "ffffff",
+                      "value": "#ffffff"
+                    }
+                  }
+                ]
+              }
+            ],
+            "settingsData": [
+              {
+                "contentTypeKey": "1a16c578-dacc-4552-ad07-26553c8a34fd",
+                "key": "da8cc569-a488-42db-a62d-e86d5d5c5857",
+                "udi": null,
+                "values": []
+              }
+            ],
+            "expose": [
+              {
+                "contentKey": "262c697d-b9db-47f7-9f5d-507fab25accd",
+                "culture": null,
+                "segment": null
+              }
+            ],
+            "Layout": {
+              "Umbraco.BlockList": [
+                {
+                  "contentKey": "262c697d-b9db-47f7-9f5d-507fab25accd",
+                  "contentUdi": null,
+                  "settingsKey": "da8cc569-a488-42db-a62d-e86d5d5c5857",
+                  "settingsUdi": null
+                }
+              ]
+            }
+          }
         }
-      ],
-      "backgroundColor": "",
-      "contrast": {
-        "value": "ffffff",
-        "label": "ffffff",
-        "sortOrder": 1,
-        "id": "2"
-      }
+      ]
     }
   ],
-  "settingsData": [
+  "settingsData": [],
+  "expose": [
     {
-      "contentTypeKey": "1a16c578-dacc-4552-ad07-26553c8a34fd",
-      "udi": "umb://element/edf219148160418b96da6d11d063fa7a",
-      "backgroundColor": "",
-      "contrast": ""
+      "contentKey": "11d9782e-7e5a-45a1-9152-dbfd11f28973",
+      "culture": null,
+      "segment": null
     }
-  ]
+  ],
+  "Layout": {
+    "Umbraco.BlockList": [
+      {
+        "contentKey": "11d9782e-7e5a-45a1-9152-dbfd11f28973",
+        "contentUdi": null,
+        "settingsKey": null,
+        "settingsUdi": null
+      }
+    ]
+  }
 }]]></Value>
     </content>
   </Properties>