\ No newline at end of file
diff --git a/src/Our.Umbraco.Honeypot.WebsiteV13/Our.Umbraco.Honeypot.WebsiteV13.csproj b/src/Our.Umbraco.Honeypot.WebsiteV13/Our.Umbraco.Honeypot.WebsiteV13.csproj
new file mode 100644
index 0000000..2fefc8b
--- /dev/null
+++ b/src/Our.Umbraco.Honeypot.WebsiteV13/Our.Umbraco.Honeypot.WebsiteV13.csproj
@@ -0,0 +1,49 @@
+
+ @await Html.GetBlockGridItemsHtmlAsync(Model)
+
diff --git a/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/blockgrid/areas.cshtml b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/blockgrid/areas.cshtml
new file mode 100644
index 0000000..30f987c
--- /dev/null
+++ b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/blockgrid/areas.cshtml
@@ -0,0 +1,13 @@
+@using Umbraco.Extensions
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
+ @foreach (var area in Model.Areas)
+ {
+ @await Html.GetBlockGridItemAreaHtmlAsync(area)
+ }
+
diff --git a/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/blockgrid/default.cshtml b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/blockgrid/default.cshtml
new file mode 100644
index 0000000..e25839e
--- /dev/null
+++ b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/blockgrid/default.cshtml
@@ -0,0 +1,11 @@
+@using Umbraco.Extensions
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
+ @await Html.GetBlockGridItemsHtmlAsync(Model)
+
diff --git a/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/blockgrid/items.cshtml b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/blockgrid/items.cshtml
new file mode 100644
index 0000000..2703fa5
--- /dev/null
+++ b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/blockgrid/items.cshtml
@@ -0,0 +1,36 @@
+@using Umbraco.Cms.Core.Models.Blocks
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
+ @foreach (var item in Model)
+ {
+
+
diff --git a/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/blocklist/default.cshtml b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/blocklist/default.cshtml
new file mode 100644
index 0000000..accca2e
--- /dev/null
+++ b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/blocklist/default.cshtml
@@ -0,0 +1,13 @@
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
+ @{
+ var partialViewName = "blockgrid/Components/" + item.Content.ContentType.Alias;
+ try
+ {
+ @await Html.PartialAsync(partialViewName, item)
+ }
+ catch (InvalidOperationException)
+ {
+
+ }
+
+ Could not render component of type: @(item.Content.ContentType.Alias)
+
+ This likely happened because the partial view @partialViewName could not be found.
+
+ @foreach (var block in Model)
+ {
+ if (block?.ContentUdi == null) { continue; }
+ var data = block.Content;
+
+ @await Html.PartialAsync("blocklist/Components/" + data.ContentType.Alias, block)
+ }
+
diff --git a/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/bootstrap3-fluid.cshtml b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/bootstrap3-fluid.cshtml
new file mode 100644
index 0000000..b92734e
--- /dev/null
+++ b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/bootstrap3-fluid.cshtml
@@ -0,0 +1,106 @@
+@using System.Web
+@using Microsoft.AspNetCore.Html
+@using Newtonsoft.Json.Linq
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
+ @if (oneColumn)
+ {
+ foreach (var section in Model.sections)
+ {
+
+}
+
+@functions{
+
+ private async Task renderRow(dynamic row)
+ {
+
+ @foreach (var row in section.rows)
+ {
+ renderRow(row);
+ }
+
+ }
+ }
+ else
+ {
+
+ @foreach (var sec in Model.sections)
+ {
+
+ }
+
+
+ }
+
+ @foreach (var row in sec.rows)
+ {
+ renderRow(row);
+ }
+
+
+
+ }
+}
+
+@functions{
+
+ public static HtmlString RenderElementAttributes(dynamic contentItem)
+ {
+ var attrs = new List
+ @foreach (var area in row.areas)
+ {
+
+
+
+ }
+
+ @foreach (var control in area.controls)
+ {
+ if (control?.editor?.view != null)
+ {
+ @await Html.PartialAsync("grid/editors/base", (object)control)
+ }
+ }
+
+
+ @if (oneColumn)
+ {
+ foreach (var section in Model.sections)
+ {
+
+}
+
+@functions{
+
+ private async Task renderRow(dynamic row, bool singleColumn)
+ {
+
+ @foreach (var row in section.rows)
+ {
+ renderRow(row, true);
+ }
+
+ }
+ }
+ else
+ {
+
+
+ }
+
+ @foreach (var sec in Model.sections)
+ {
+
+
+
+ }
+
+ @foreach (var row in sec.rows)
+ {
+ renderRow(row, false);
+ }
+
+
+ @if (singleColumn) {
+ @:
+ }
+
+}
+
+@functions{
+
+ public static HtmlString RenderElementAttributes(dynamic contentItem)
+ {
+ var attrs = new List
+ }
+
+ }
+
+ @foreach (var area in row.areas)
+ {
+
+ @if (singleColumn) {
+ @:
+
+ }
+
+ @foreach (var control in area.controls)
+ {
+ if (control?.editor?.view != null)
+ {
+ @await Html.PartialAsync("grid/editors/base", (object)control)
+ }
+ }
+
+ @ex.ToString()+} + +@functions{ + + public static string EditorView(dynamic contentItem) + { + string view = contentItem.editor.render != null ? contentItem.editor.render.ToString() : contentItem.editor.view.ToString(); + view = view.Replace(".html", ".cshtml"); + + if (!view.Contains("/")) + { + view = "grid/editors/" + view; + } + + return view; + } +} diff --git a/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/editors/embed.cshtml b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/editors/embed.cshtml new file mode 100644 index 0000000..74c8fe2 --- /dev/null +++ b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/editors/embed.cshtml @@ -0,0 +1,11 @@ +@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
+ @Html.Raw(embedValue)
+
+}
diff --git a/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/editors/macro.cshtml b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/editors/macro.cshtml
new file mode 100644
index 0000000..a4450d1
--- /dev/null
+++ b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/editors/macro.cshtml
@@ -0,0 +1,15 @@
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage@Model.value.caption
+ } +} diff --git a/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/editors/rte.cshtml b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/editors/rte.cshtml new file mode 100644 index 0000000..9445666 --- /dev/null +++ b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/editors/rte.cshtml @@ -0,0 +1,13 @@ +@using Umbraco.Cms.Core.Templates +@model dynamic +@inject HtmlLocalLinkParser HtmlLocalLinkParser; +@inject HtmlUrlParser HtmlUrlParser; +@inject HtmlImageSourceParser HtmlImageSourceParser; + +@{ + var value = HtmlLocalLinkParser.EnsureInternalLinks(Model?.value.ToString()); + value = HtmlUrlParser.EnsureUrls(value); + value = HtmlImageSourceParser.EnsureImageSources(value); +} + +@Html.Raw(value) diff --git a/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/editors/textstring.cshtml b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/editors/textstring.cshtml new file mode 100644 index 0000000..e6b9352 --- /dev/null +++ b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/Partials/grid/editors/textstring.cshtml @@ -0,0 +1,22 @@ +@model dynamic + +@if (Model?.editor.config.markup is not null) +{ + string markup = Model.editor.config.markup.ToString(); + markup = markup.Replace("#value#", Html.ReplaceLineBreaks((string)Model.value.ToString()).ToString()); + + if (Model.editor.config.style != null) + { + markup = markup.Replace("#style#", Model.editor.config.style.ToString()); + } + +@Model?.value
+
+ @Html.Raw(Model.Content)
+
+
+ @Html.RenderUmbracoFormDependencies(Url)
+
+
+
diff --git a/src/Our.Umbraco.Honeypot.WebsiteV13/Views/_ViewImports.cshtml b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/_ViewImports.cshtml
new file mode 100644
index 0000000..c0e4e4a
--- /dev/null
+++ b/src/Our.Umbraco.Honeypot.WebsiteV13/Views/_ViewImports.cshtml
@@ -0,0 +1,9 @@
+@using Umbraco.Extensions
+@using Our.Umbraco.Honeypot.WebsiteV13
+@using Umbraco.Cms.Web.Common.PublishedModels
+@using Umbraco.Cms.Web.Common.Views
+@using Umbraco.Cms.Core.Models.PublishedContent
+@using Microsoft.AspNetCore.Html
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Smidge
+@inject Smidge.SmidgeHelper SmidgeHelper
diff --git a/src/Our.Umbraco.Honeypot.WebsiteV13/appsettings.Development.json b/src/Our.Umbraco.Honeypot.WebsiteV13/appsettings.Development.json
new file mode 100644
index 0000000..370877b
--- /dev/null
+++ b/src/Our.Umbraco.Honeypot.WebsiteV13/appsettings.Development.json
@@ -0,0 +1,34 @@
+{
+ "$schema": "appsettings-schema.json",
+ "Serilog": {
+ "MinimumLevel": {
+ "Default": "Information"
+ },
+ "WriteTo": [
+ {
+ "Name": "Async",
+ "Args": {
+ "configure": [
+ {
+ "Name": "Console"
+ }
+ ]
+ }
+ }
+ ]
+ },
+ "Umbraco": {
+ "CMS": {
+ "Content": {
+ "MacroErrors": "Throw"
+ },
+ "Hosting": {
+ "Debug": true
+ },
+ "RuntimeMinification": {
+ "UseInMemoryCache": true,
+ "CacheBuster": "Timestamp"
+ }
+ }
+ }
+}
diff --git a/src/Our.Umbraco.Honeypot.WebsiteV13/appsettings.json b/src/Our.Umbraco.Honeypot.WebsiteV13/appsettings.json
new file mode 100644
index 0000000..1e1aa39
--- /dev/null
+++ b/src/Our.Umbraco.Honeypot.WebsiteV13/appsettings.json
@@ -0,0 +1,34 @@
+{
+ "$schema": "appsettings-schema.json",
+ "Serilog": {
+ "MinimumLevel": {
+ "Default": "Information",
+ "Override": {
+ "Microsoft": "Warning",
+ "Microsoft.Hosting.Lifetime": "Information",
+ "System": "Warning"
+ }
+ }
+ },
+ "Umbraco": {
+ "CMS": {
+ "Global": {
+ "Id": "09e4ffa3-1e9e-4fb7-873c-626ba2210e06",
+ "SanitizeTinyMce": true
+ },
+ "Content": {
+ "AllowEditInvariantFromNonDefault": true,
+ "ContentVersionCleanupPolicy": {
+ "EnableCleanup": true
+ }
+ },
+ "Unattended": {
+ "UpgradeUnattended": true
+ }
+ }
+ },
+ "ConnectionStrings": {
+ "umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True;",
+ "umbracoDbDSN_ProviderName": "Microsoft.Data.Sqlite"
+ }
+}
\ No newline at end of file
diff --git a/src/Our.Umbraco.Honeypot.WebsiteV13/wwwroot/favicon.ico b/src/Our.Umbraco.Honeypot.WebsiteV13/wwwroot/favicon.ico
new file mode 100644
index 0000000..c0749dd
Binary files /dev/null and b/src/Our.Umbraco.Honeypot.WebsiteV13/wwwroot/favicon.ico differ
diff --git a/src/Our.Umbraco.Honeypot.sln b/src/Our.Umbraco.Honeypot.sln
index 4e77140..aed2b82 100644
--- a/src/Our.Umbraco.Honeypot.sln
+++ b/src/Our.Umbraco.Honeypot.sln
@@ -26,6 +26,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Our.Umbraco.Honeypot.Websit
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Our.Umbraco.Honeypot.WebsiteV12", "Our.Umbraco.Honeypot.WebsiteV12\Our.Umbraco.Honeypot.WebsiteV12.csproj", "{511E1903-F18D-42B8-9835-24BB21E8D51D}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Our.Umbraco.Honeypot.WebsiteV13", "Our.Umbraco.Honeypot.WebsiteV13\Our.Umbraco.Honeypot.WebsiteV13.csproj", "{FCD5B969-3767-45D8-9BA9-BB73B378B3BE}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -60,6 +62,10 @@ Global
{511E1903-F18D-42B8-9835-24BB21E8D51D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{511E1903-F18D-42B8-9835-24BB21E8D51D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{511E1903-F18D-42B8-9835-24BB21E8D51D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FCD5B969-3767-45D8-9BA9-BB73B378B3BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FCD5B969-3767-45D8-9BA9-BB73B378B3BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FCD5B969-3767-45D8-9BA9-BB73B378B3BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FCD5B969-3767-45D8-9BA9-BB73B378B3BE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -69,6 +75,7 @@ Global
{272F5C6F-71A1-44D4-966C-E0DF86DB139C} = {CD606107-8CC7-47B0-A0EB-C3E169CCA841}
{DE4DA5A5-7E18-4750-B448-24D5CF44016C} = {CD606107-8CC7-47B0-A0EB-C3E169CCA841}
{511E1903-F18D-42B8-9835-24BB21E8D51D} = {CD606107-8CC7-47B0-A0EB-C3E169CCA841}
+ {FCD5B969-3767-45D8-9BA9-BB73B378B3BE} = {CD606107-8CC7-47B0-A0EB-C3E169CCA841}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {71AC7436-4D41-4335-9C2A-0A6ECAF18C87}
diff --git a/src/Our.Umbraco.Honeypot/HoneypotFieldType.cs b/src/Our.Umbraco.Honeypot/HoneypotFieldType.cs
index 6d48381..e1fc49d 100644
--- a/src/Our.Umbraco.Honeypot/HoneypotFieldType.cs
+++ b/src/Our.Umbraco.Honeypot/HoneypotFieldType.cs
@@ -36,16 +36,21 @@ public override string GetDesignView()
return "~/App_Plugins/Our.Umbraco.Honeypot/FieldTypes/Honeypot.html";
}
- public override IEnumerable