-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11 from jcdcdev/dev
feature: multi target (Umbraco 10-13)
- Loading branch information
Showing
115 changed files
with
4,244 additions
and
452 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...rds.TestSite/Dashboards/BasicDashboard.cs → src/TestSite.10/Dashboards/BasicDashboard.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ds.TestSite/Dashboards/NoViewDashboard.cs → ...TestSite.10/Dashboards/NoViewDashboard.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 4 additions & 1 deletion
5
...nity.SimpleDashboards.TestSite/Program.cs → src/TestSite.10/Program.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 10 additions & 1 deletion
11
...nity.SimpleDashboards.TestSite/Startup.cs → src/TestSite.10/Startup.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
src/TestSite.10/Views/Components/ExampleDashboardAsyncViewComponent.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| using System; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.AspNetCore.Mvc; | ||
| using Umbraco.Community.SimpleDashboards.Web; | ||
|
|
||
| namespace TestSite.Ten.Views.Components; | ||
|
|
||
| public class ExampleDashboardAsyncViewComponent : DashboardAsyncViewComponent | ||
| { | ||
| public override async Task<IViewComponentResult> InvokeAsync(DashboardModel model) | ||
| { | ||
| // Simulate async workload | ||
| await Task.Delay(TimeSpan.FromMilliseconds(1)); | ||
| return Content($"Hello {model.Dashboard.Alias}"); | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...mponents/ExampleDashboardViewComponent.cs → ...mponents/ExampleDashboardViewComponent.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| @using Umbraco.Extensions | ||
| @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridArea> | ||
|
|
||
| <div class="umb-block-grid__area" | ||
| data-area-col-span="@Model.ColumnSpan" | ||
| data-area-row-span="@Model.RowSpan" | ||
| data-area-alias="@Model.Alias" | ||
| style="--umb-block-grid--grid-columns: @Model.ColumnSpan;--umb-block-grid--area-column-span: @Model.ColumnSpan; --umb-block-grid--area-row-span: @Model.RowSpan;"> | ||
| @await Html.GetBlockGridItemsHtmlAsync(Model) | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| @using Umbraco.Extensions | ||
| @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem> | ||
| @{ | ||
| if (Model?.Areas.Any() != true) { return; } | ||
| } | ||
|
|
||
| <div class="umb-block-grid__area-container" | ||
| style="--umb-block-grid--area-grid-columns: @(Model.AreaGridColumns?.ToString() ?? Model.GridColumns?.ToString() ?? "12");"> | ||
| @foreach (var area in Model.Areas) | ||
| { | ||
| @await Html.GetBlockGridItemAreaHtmlAsync(area) | ||
| } | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| @using Umbraco.Extensions | ||
| @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridModel> | ||
| @{ | ||
| if (Model?.Any() != true) { return; } | ||
| } | ||
|
|
||
| <div class="umb-block-grid" | ||
| data-grid-columns="@(Model.GridColumns?.ToString() ?? "12");" | ||
| style="--umb-block-grid--grid-columns: @(Model.GridColumns?.ToString() ?? "12");"> | ||
| @await Html.GetBlockGridItemsHtmlAsync(Model) | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| @using Umbraco.Cms.Core.Models.Blocks | ||
| @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<IEnumerable<BlockGridItem>> | ||
| @{ | ||
| if (Model?.Any() != true) { return; } | ||
| } | ||
|
|
||
| <div class="umb-block-grid__layout-container"> | ||
| @foreach (var item in Model) | ||
| { | ||
|
|
||
| <div | ||
| class="umb-block-grid__layout-item" | ||
| data-content-element-type-alias="@item.Content.ContentType.Alias" | ||
| data-content-element-type-key="@item.Content.ContentType.Key" | ||
| data-element-udi="@item.ContentUdi" | ||
| data-col-span="@item.ColumnSpan" | ||
| data-row-span="@item.RowSpan" | ||
| style=" --umb-block-grid--item-column-span: @item.ColumnSpan; --umb-block-grid--item-row-span: @item.RowSpan; "> | ||
| @{ | ||
| var partialViewName = "blockgrid/Components/" + item.Content.ContentType.Alias; | ||
| try | ||
| { | ||
| @await Html.PartialAsync(partialViewName, item) | ||
| } | ||
| catch (InvalidOperationException) | ||
| { | ||
| <p> | ||
| <strong>Could not render component of type: @(item.Content.ContentType.Alias)</strong> | ||
| <br/> | ||
| This likely happened because the partial view <em>@partialViewName</em> could not be found. | ||
| </p> | ||
| } | ||
| } | ||
| </div> | ||
| } | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockListModel> | ||
| @{ | ||
| if (Model?.Any() != true) { return; } | ||
| } | ||
| <div class="umb-block-list"> | ||
| @foreach (var block in Model) | ||
| { | ||
| if (block?.ContentUdi == null) { continue; } | ||
| var data = block.Content; | ||
|
|
||
| @await Html.PartialAsync("blocklist/Components/" + data.ContentType.Alias, block) | ||
| } | ||
| </div> |
106 changes: 106 additions & 0 deletions
106
src/TestSite.10/Views/Partials/grid/bootstrap3-fluid.cshtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| @using System.Web | ||
| @using Microsoft.AspNetCore.Html | ||
| @using Newtonsoft.Json.Linq | ||
| @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic> | ||
|
|
||
| @* | ||
| Razor helpers located at the bottom of this file | ||
| *@ | ||
|
|
||
| @if (Model is JObject && Model?.sections is not null) | ||
| { | ||
| var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1; | ||
|
|
||
| <div class="umb-grid"> | ||
| @if (oneColumn) | ||
| { | ||
| foreach (var section in Model.sections) | ||
| { | ||
| <div class="grid-section"> | ||
| @foreach (var row in section.rows) | ||
| { | ||
| renderRow(row); | ||
| } | ||
| </div> | ||
| } | ||
| } | ||
| else | ||
| { | ||
| <div class="row clearfix"> | ||
| @foreach (var sec in Model.sections) | ||
| { | ||
| <div class="grid-section"> | ||
| <div class="[email protected] column"> | ||
| @foreach (var row in sec.rows) | ||
| { | ||
| renderRow(row); | ||
| } | ||
| </div> | ||
| </div> | ||
| } | ||
| </div> | ||
| } | ||
| </div> | ||
| } | ||
|
|
||
| @functions{ | ||
|
|
||
| private async Task renderRow(dynamic row) | ||
| { | ||
| <div @RenderElementAttributes(row)> | ||
| <div class="row clearfix"> | ||
| @foreach (var area in row.areas) | ||
| { | ||
| <div class="[email protected] column"> | ||
| <div @RenderElementAttributes(area)> | ||
| @foreach (var control in area.controls) | ||
| { | ||
| if (control?.editor?.view != null) | ||
| { | ||
| <text>@await Html.PartialAsync("grid/editors/base", (object)control)</text> | ||
| } | ||
| } | ||
| </div> | ||
| </div> | ||
| } | ||
| </div> | ||
| </div> | ||
| } | ||
| } | ||
|
|
||
| @functions{ | ||
|
|
||
| public static HtmlString RenderElementAttributes(dynamic contentItem) | ||
| { | ||
| var attrs = new List<string>(); | ||
| JObject cfg = contentItem.config; | ||
|
|
||
| if (cfg != null) | ||
| { | ||
| foreach (JProperty property in cfg.Properties()) | ||
| { | ||
| var propertyValue = HttpUtility.HtmlAttributeEncode(property.Value.ToString()); | ||
| attrs.Add(property.Name + "=\"" + propertyValue + "\""); | ||
| } | ||
| } | ||
|
|
||
| JObject style = contentItem.styles; | ||
|
|
||
| if (style != null) { | ||
| var cssVals = new List<string>(); | ||
| foreach (JProperty property in style.Properties()) | ||
| { | ||
| var propertyValue = property.Value.ToString(); | ||
| if (string.IsNullOrWhiteSpace(propertyValue) == false) | ||
| { | ||
| cssVals.Add(property.Name + ":" + propertyValue + ";"); | ||
| } | ||
| } | ||
|
|
||
| if (cssVals.Any()) | ||
| attrs.Add("style='" + HttpUtility.HtmlAttributeEncode(string.Join(" ", cssVals)) + "'"); | ||
| } | ||
|
|
||
| return new HtmlString(string.Join(" ", attrs)); | ||
| } | ||
| } |
Oops, something went wrong.