v2.0.0-alpha007

rickbutterfield · Aug 6, 2024 · 00d3f90 · 00d3f90
1 parent 619071b
commit 00d3f90
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 24 deletions.
diff --git a/src/Umbraco.Cms.14.x/Umbraco.Cms.14.x.csproj b/src/Umbraco.Cms.14.x/Umbraco.Cms.14.x.csproj
@@ -9,13 +9,13 @@
 	<ItemGroup>
 		<PackageReference Include="Umbraco.Cms" Version="14.1.0" />
 		<PackageReference Include="Umbraco.Cms.Core" Version="14.1.0" />
-		<PackageReference Include="Umbraco.Community.BlockPreview" Version="2.0.0-alpha006" />
 		<PackageReference Include="uSync" Version="14.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<!-- Opt-in to app-local ICU to ensure consistent globalization APIs across different platforms -->
 		<PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="72.1.0.3" />
+		<ProjectReference Include="..\Umbraco.Community.BlockPreview\Umbraco.Community.BlockPreview.csproj" />
 		<RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="72.1.0.3" Condition="$(RuntimeIdentifier.StartsWith('linux')) or $(RuntimeIdentifier.StartsWith('win')) or ('$(RuntimeIdentifier)' == '' and !$([MSBuild]::IsOSPlatform('osx')))" />
 	</ItemGroup>
 

diff --git a/src/Umbraco.Cms.14.x/Views/home.cshtml b/src/Umbraco.Cms.14.x/Views/home.cshtml
@@ -1,5 +1,7 @@
 @using Umbraco.Cms.Web.Common.PublishedModels;
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Home>
 @{
-	Layout = null;
-}
+	Layout = "Layout.cshtml";
+}
+
+@await Html.GetBlockGridHtmlAsync(Model.Blocks)
diff --git a/src/Umbraco.Cms.14.x/appsettings.Development.json b/src/Umbraco.Cms.14.x/appsettings.Development.json
@@ -42,13 +42,7 @@
       "RuntimeMinification": {
         "UseInMemoryCache": true,
         "CacheBuster": "Timestamp"
-      },
-      //"Security": {
-      //  "BackOfficeHost": "http://localhost:5173",
-      //  "AuthorizeCallbackPathName": "/oauth_complete",
-      //  "AuthorizeCallbackLogoutPathName": "/logout",
-      //  "AuthorizeCallbackErrorPathName": "/error"
-      //}
+      }
     }
   }
 }
diff --git a/src/Umbraco.Community.BlockPreview.UI/Umbraco.Community.BlockPreview.UI.esproj b/src/Umbraco.Community.BlockPreview.UI/Umbraco.Community.BlockPreview.UI.esproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.VisualStudio.JavaScript.Sdk/1.0.784122">
-  <PropertyGroup>
-    <ShouldRunNpmInstall>false</ShouldRunNpmInstall>
-	  <ShouldRunBuildScript>false</ShouldRunBuildScript>
-    <StaticWebAssetSourceId>Umbraco.Community.BlockPreview</StaticWebAssetSourceId>
-    <DebugAssetsDirectory>$(MSBuildProjectDirectory)\dist</DebugAssetsDirectory>
-  </PropertyGroup>
+	<PropertyGroup>
+		<ShouldRunNpmInstall>false</ShouldRunNpmInstall>
+		<ShouldRunBuildScript>false</ShouldRunBuildScript>
+		<StaticWebAssetSourceId>Umbraco.Community.BlockPreview</StaticWebAssetSourceId>
+		<DebugAssetsDirectory>$(MSBuildProjectDirectory)\dist</DebugAssetsDirectory>
+	</PropertyGroup>
 </Project>
diff --git a/src/Umbraco.Community.BlockPreview.UI/public/umbraco-package.json b/src/Umbraco.Community.BlockPreview.UI/public/umbraco-package.json
@@ -2,7 +2,7 @@
   "$schema": "../umbraco-package-schema.json",
   "name": "Umbraco.Community.BlockPreview",
   "id": "Umbraco.Community.BlockPreview",
-  "version": "2.0.0-alpha006",
+  "version": "2.0.0-alpha007",
   "allowTelemetry": true,
   "extensions": [
     {

diff --git a/src/Umbraco.Community.BlockPreview/BlockPreviewComposer.cs b/src/Umbraco.Community.BlockPreview/BlockPreviewComposer.cs
@@ -4,7 +4,6 @@
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Notifications;
-using Umbraco.Community.BlockPreview.Extensions;
 using Umbraco.Community.BlockPreview.Helpers;
 using Umbraco.Community.BlockPreview.Interfaces;
 using Umbraco.Community.BlockPreview.NotificationHandlers;

diff --git a/src/Umbraco.Community.BlockPreview/BlockPreviewOptions.cs b/src/Umbraco.Community.BlockPreview/BlockPreviewOptions.cs
@@ -16,8 +16,8 @@ public BlockPreviewOptions()
 
     public class BlockTypeSettings
     {
-        public bool Enabled { get; set; }
-        public string[]? ViewLocations { get; set; }
-        public string[]? ContentTypes { get; set; }
+        public bool Enabled { get; set; } = false;
+        public string[]? ViewLocations { get; set; } = [];
+        public string[]? ContentTypes { get; set; } = [];
     }
 }
diff --git a/src/Umbraco.Community.BlockPreview/Extensions/BlockPreviewUmbracoBuilderExtensions.cs b/src/Umbraco.Community.BlockPreview/Extensions/BlockPreviewUmbracoBuilderExtensions.cs
@@ -17,7 +17,7 @@ public static IUmbracoBuilder AddBlockPreview(this IUmbracoBuilder builder,
             ArgumentNullException.ThrowIfNull(builder);
 
             var optionsBuilder = builder.Services.AddOptions<BlockPreviewOptions>()
-                .BindConfiguration(Constants.Configuration.AppPluginsRoot)
+                .BindConfiguration(Constants.Configuration.AppSettingsRoot)
                 .ValidateDataAnnotations();
 
             configure?.Invoke(optionsBuilder);

diff --git a/src/Umbraco.Community.BlockPreview/Umbraco.Community.BlockPreview.csproj b/src/Umbraco.Community.BlockPreview/Umbraco.Community.BlockPreview.csproj
@@ -17,7 +17,7 @@
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 
 		<VersionPrefix>2.0.0</VersionPrefix>
-		<VersionSuffix>alpha006</VersionSuffix>
+		<VersionSuffix>alpha007</VersionSuffix>
 		<Authors>Rick Butterfield, Dave Woestenborghs, Matthew Wise</Authors>
 		<Copyright>$([System.DateTime]::UtcNow.ToString(`yyyy`)) © Rick Butterfield</Copyright>
 

diff --git a/...nity.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/umbraco-package.json b/...nity.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/umbraco-package.json
@@ -2,7 +2,7 @@
   "$schema": "../umbraco-package-schema.json",
   "name": "Umbraco.Community.BlockPreview",
   "id": "Umbraco.Community.BlockPreview",
-  "version": "2.0.0-alpha006",
+  "version": "2.0.0-alpha007",
   "allowTelemetry": true,
   "extensions": [
     {