From bf2491eaf7973d67b6f2510dbd5e96332cf74aab Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Wed, 15 Sep 2021 08:56:02 -0400 Subject: [PATCH 001/198] feat: add starting module --- StatCan.OrchardCore.sln | 47 ++++++++++++- .../StatCan.OrchardCore.Radar/Constants.cs | 10 +++ .../Controllers/HomeController.cs | 17 +++++ .../StatCan.OrchardCore.Radar/Manifest.cs | 66 +++++++++++++++++++ src/Apps/StatCan.OrchardCore.Radar/Startup.cs | 26 ++++++++ .../StatCan.OrchardCore.Radar.csproj | 20 ++++++ .../Views/Home/Index.cshtml | 1 + ...Can.OrchardCore.Application.Targets.csproj | 1 + 8 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Constants.cs create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Controllers/HomeController.cs create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Manifest.cs create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Startup.cs create mode 100644 src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Home/Index.cshtml diff --git a/StatCan.OrchardCore.sln b/StatCan.OrchardCore.sln index 4081461c1..20deb1875 100644 --- a/StatCan.OrchardCore.sln +++ b/StatCan.OrchardCore.sln @@ -94,7 +94,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Apps", "Apps", "{E8DD6EC8-A EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatCan.OrchardCore.Scheduling", "src\Apps\StatCan.OrchardCore.Scheduling\StatCan.OrchardCore.Scheduling.csproj", "{56F32388-650F-433C-919F-8C265F99411D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StatCan.OrchardCore.Configuration", "src\Modules\StatCan.OrchardCore.Configuration\StatCan.OrchardCore.Configuration.csproj", "{DEA6A849-3230-43DE-A9A0-3C22DA8E316E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatCan.OrchardCore.Configuration", "src\Modules\StatCan.OrchardCore.Configuration\StatCan.OrchardCore.Configuration.csproj", "{DEA6A849-3230-43DE-A9A0-3C22DA8E316E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatCan.OrchardCore.Vuetify", "src\Modules\StatCan.OrchardCore.Vuetify\StatCan.OrchardCore.Vuetify.csproj", "{2383A37A-3D99-4060-B147-F4EB81FA826D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatCan.OrchardCore.Menu", "src\Modules\StatCan.OrchardCore.Menu\StatCan.OrchardCore.Menu.csproj", "{DDD0D2BF-B04E-42F1-ABCC-A5D3290692FB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatCan.OrchardCore.Radar", "src\Apps\StatCan.OrchardCore.Radar\StatCan.OrchardCore.Radar.csproj", "{B94484A0-D043-4D37-AE5C-82B729D56CA3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -466,6 +472,42 @@ Global {DEA6A849-3230-43DE-A9A0-3C22DA8E316E}.Release|x64.Build.0 = Release|Any CPU {DEA6A849-3230-43DE-A9A0-3C22DA8E316E}.Release|x86.ActiveCfg = Release|Any CPU {DEA6A849-3230-43DE-A9A0-3C22DA8E316E}.Release|x86.Build.0 = Release|Any CPU + {2383A37A-3D99-4060-B147-F4EB81FA826D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2383A37A-3D99-4060-B147-F4EB81FA826D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2383A37A-3D99-4060-B147-F4EB81FA826D}.Debug|x64.ActiveCfg = Debug|Any CPU + {2383A37A-3D99-4060-B147-F4EB81FA826D}.Debug|x64.Build.0 = Debug|Any CPU + {2383A37A-3D99-4060-B147-F4EB81FA826D}.Debug|x86.ActiveCfg = Debug|Any CPU + {2383A37A-3D99-4060-B147-F4EB81FA826D}.Debug|x86.Build.0 = Debug|Any CPU + {2383A37A-3D99-4060-B147-F4EB81FA826D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2383A37A-3D99-4060-B147-F4EB81FA826D}.Release|Any CPU.Build.0 = Release|Any CPU + {2383A37A-3D99-4060-B147-F4EB81FA826D}.Release|x64.ActiveCfg = Release|Any CPU + {2383A37A-3D99-4060-B147-F4EB81FA826D}.Release|x64.Build.0 = Release|Any CPU + {2383A37A-3D99-4060-B147-F4EB81FA826D}.Release|x86.ActiveCfg = Release|Any CPU + {2383A37A-3D99-4060-B147-F4EB81FA826D}.Release|x86.Build.0 = Release|Any CPU + {DDD0D2BF-B04E-42F1-ABCC-A5D3290692FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DDD0D2BF-B04E-42F1-ABCC-A5D3290692FB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DDD0D2BF-B04E-42F1-ABCC-A5D3290692FB}.Debug|x64.ActiveCfg = Debug|Any CPU + {DDD0D2BF-B04E-42F1-ABCC-A5D3290692FB}.Debug|x64.Build.0 = Debug|Any CPU + {DDD0D2BF-B04E-42F1-ABCC-A5D3290692FB}.Debug|x86.ActiveCfg = Debug|Any CPU + {DDD0D2BF-B04E-42F1-ABCC-A5D3290692FB}.Debug|x86.Build.0 = Debug|Any CPU + {DDD0D2BF-B04E-42F1-ABCC-A5D3290692FB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DDD0D2BF-B04E-42F1-ABCC-A5D3290692FB}.Release|Any CPU.Build.0 = Release|Any CPU + {DDD0D2BF-B04E-42F1-ABCC-A5D3290692FB}.Release|x64.ActiveCfg = Release|Any CPU + {DDD0D2BF-B04E-42F1-ABCC-A5D3290692FB}.Release|x64.Build.0 = Release|Any CPU + {DDD0D2BF-B04E-42F1-ABCC-A5D3290692FB}.Release|x86.ActiveCfg = Release|Any CPU + {DDD0D2BF-B04E-42F1-ABCC-A5D3290692FB}.Release|x86.Build.0 = Release|Any CPU + {B94484A0-D043-4D37-AE5C-82B729D56CA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B94484A0-D043-4D37-AE5C-82B729D56CA3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B94484A0-D043-4D37-AE5C-82B729D56CA3}.Debug|x64.ActiveCfg = Debug|Any CPU + {B94484A0-D043-4D37-AE5C-82B729D56CA3}.Debug|x64.Build.0 = Debug|Any CPU + {B94484A0-D043-4D37-AE5C-82B729D56CA3}.Debug|x86.ActiveCfg = Debug|Any CPU + {B94484A0-D043-4D37-AE5C-82B729D56CA3}.Debug|x86.Build.0 = Debug|Any CPU + {B94484A0-D043-4D37-AE5C-82B729D56CA3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B94484A0-D043-4D37-AE5C-82B729D56CA3}.Release|Any CPU.Build.0 = Release|Any CPU + {B94484A0-D043-4D37-AE5C-82B729D56CA3}.Release|x64.ActiveCfg = Release|Any CPU + {B94484A0-D043-4D37-AE5C-82B729D56CA3}.Release|x64.Build.0 = Release|Any CPU + {B94484A0-D043-4D37-AE5C-82B729D56CA3}.Release|x86.ActiveCfg = Release|Any CPU + {B94484A0-D043-4D37-AE5C-82B729D56CA3}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -506,6 +548,9 @@ Global {E8DD6EC8-AA09-440F-937A-1901293389E1} = {8EA5EBF0-41C6-11EA-890A-ED68CBADDC1F} {56F32388-650F-433C-919F-8C265F99411D} = {E8DD6EC8-AA09-440F-937A-1901293389E1} {DEA6A849-3230-43DE-A9A0-3C22DA8E316E} = {5E638520-41E8-11EA-885A-BDD3BB7B4F92} + {2383A37A-3D99-4060-B147-F4EB81FA826D} = {8BEC45F6-4F23-4994-9959-50C1DB93ABC3} + {DDD0D2BF-B04E-42F1-ABCC-A5D3290692FB} = {8BEC45F6-4F23-4994-9959-50C1DB93ABC3} + {B94484A0-D043-4D37-AE5C-82B729D56CA3} = {E8DD6EC8-AA09-440F-937A-1901293389E1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8FF197F3-C3E2-4D83-80AC-D59BE36DD4AF} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs new file mode 100644 index 000000000..b49e38bb2 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs @@ -0,0 +1,10 @@ +namespace StatCan.OrchardCore.Radar +{ + public static class Constants + { + public static class Features + { + public const string Radar = "StatCan.OrchardCore.Radar"; + } + } +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Controllers/HomeController.cs b/src/Apps/StatCan.OrchardCore.Radar/Controllers/HomeController.cs new file mode 100644 index 000000000..a5ba67aec --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Controllers/HomeController.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; + +namespace StatCan.OrchardCore.Radar.Controllers +{ + public class HomeController : Controller + { + public ActionResult Index() + { + return View(); + } + } +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Manifest.cs b/src/Apps/StatCan.OrchardCore.Radar/Manifest.cs new file mode 100644 index 000000000..ff5da6ae9 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Manifest.cs @@ -0,0 +1,66 @@ +using OrchardCore.Modules.Manifest; +using StatCan.OrchardCore.Radar; +using static StatCan.OrchardCore.Manifest.StatCanManifestConstants; + +[assembly: Module( + Name = "Digital Radar", + Author = DigitalInnovationTeam, + Website = DigitalInnovationWebsite, + Version = Version, + Description = "The Digital Radar platform", + Category = "Applications" +)] + +[assembly: Feature( + Id = Constants.Features.Radar, + Name = "Radar", + Description = "The Digital Radar Application", + Category = "Applications", + Dependencies = new [] + { + // SaaS + "OrchardCore.HomeRoute", + "OrchardCore.Admin", + "OrchardCore.Diagnostics", + "OrchardCore.DynamicCache", + "OrchardCore.Features", + "OrchardCore.Navigation", + "OrchardCore.Recipes", + "OrchardCore.Resources", + "OrchardCore.Roles", + "OrchardCore.Settings", + "OrchardCore.Themes", + "OrchardCore.Users", + + // CMS + "OrchardCore.Alias", + "OrchardCore.AdminMenu", + "OrchardCore.Autoroute", + "OrchardCore.Html", + "OrchardCore.ContentFields", + "OrchardCore.ContentPreview", + "OrchardCore.Contents", + "OrchardCore.Contents.FileContentDefinition", + "OrchardCore.ContentTypes", + "OrchardCore.CustomSettings", + "OrchardCore.Deployment", + "OrchardCore.Deployment.Remote", + "OrchardCore.Feeds", + "OrchardCore.Flows", + "OrchardCore.Indexing", + "OrchardCore.Layers", + "OrchardCore.Lucene", + "OrchardCore.Lists", + "OrchardCore.Markdown", + "OrchardCore.Media", + "OrchardCore.Menu", + "OrchardCore.Placements", + "OrchardCore.Queries", + "OrchardCore.Shortcodes.Templates", + "OrchardCore.Rules", + "OrchardCore.Taxonomies", + "OrchardCore.Title", + "OrchardCore.Templates", + "OrchardCore.Widgets", + } +)] diff --git a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs new file mode 100644 index 000000000..b9e621d66 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs @@ -0,0 +1,26 @@ +using System; +using Fluid; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Routing; +using Microsoft.Extensions.DependencyInjection; +using OrchardCore.Modules; + +namespace StatCan.OrchardCore.Radar +{ + public class Startup : StartupBase + { + public override void ConfigureServices(IServiceCollection services) + { + } + + public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider) + { + routes.MapAreaControllerRoute( + name: "Home", + areaName: "StatCan.OrchardCore.Radar", + pattern: "Home/Index", + defaults: new { controller = "Home", action = "Index" } + ); + } + } +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj new file mode 100644 index 000000000..4eb94323f --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj @@ -0,0 +1,20 @@ + + + + $(AspNetCoreTargetFramework) + true + ..\..\..\roslynator.ruleset + + + + + + + + + + + + + + diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Home/Index.cshtml b/src/Apps/StatCan.OrchardCore.Radar/Views/Home/Index.cshtml new file mode 100644 index 000000000..a1ab916e5 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Home/Index.cshtml @@ -0,0 +1 @@ +Template \ No newline at end of file diff --git a/src/Lib/StatCan.OrchardCore.Application.Targets/StatCan.OrchardCore.Application.Targets.csproj b/src/Lib/StatCan.OrchardCore.Application.Targets/StatCan.OrchardCore.Application.Targets.csproj index d054430f8..6584eca49 100644 --- a/src/Lib/StatCan.OrchardCore.Application.Targets/StatCan.OrchardCore.Application.Targets.csproj +++ b/src/Lib/StatCan.OrchardCore.Application.Targets/StatCan.OrchardCore.Application.Targets.csproj @@ -31,6 +31,7 @@ + From d7d836d8a4664b96a80225caa9766b45f3b49062 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Wed, 15 Sep 2021 12:44:43 -0400 Subject: [PATCH 002/198] feat: add radar entity migration --- .../StatCan.OrchardCore.Radar/Manifest.cs | 43 +- .../StatCan.OrchardCore.Radar/Migrations.cs | 23 + .../Migrations/radar.recipe.json | 1138 +++++++++++++++++ src/Apps/StatCan.OrchardCore.Radar/Startup.cs | 3 +- 4 files changed, 1166 insertions(+), 41 deletions(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations.cs create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations/radar.recipe.json diff --git a/src/Apps/StatCan.OrchardCore.Radar/Manifest.cs b/src/Apps/StatCan.OrchardCore.Radar/Manifest.cs index ff5da6ae9..e5db7f50e 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Manifest.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Manifest.cs @@ -16,51 +16,14 @@ Name = "Radar", Description = "The Digital Radar Application", Category = "Applications", - Dependencies = new [] + Dependencies = new[] { - // SaaS - "OrchardCore.HomeRoute", - "OrchardCore.Admin", - "OrchardCore.Diagnostics", - "OrchardCore.DynamicCache", - "OrchardCore.Features", - "OrchardCore.Navigation", - "OrchardCore.Recipes", - "OrchardCore.Resources", - "OrchardCore.Roles", - "OrchardCore.Settings", - "OrchardCore.Themes", - "OrchardCore.Users", - - // CMS - "OrchardCore.Alias", - "OrchardCore.AdminMenu", "OrchardCore.Autoroute", - "OrchardCore.Html", - "OrchardCore.ContentFields", - "OrchardCore.ContentPreview", "OrchardCore.Contents", - "OrchardCore.Contents.FileContentDefinition", - "OrchardCore.ContentTypes", - "OrchardCore.CustomSettings", - "OrchardCore.Deployment", - "OrchardCore.Deployment.Remote", - "OrchardCore.Feeds", + "OrchardCore.ContentFields", "OrchardCore.Flows", - "OrchardCore.Indexing", - "OrchardCore.Layers", - "OrchardCore.Lucene", - "OrchardCore.Lists", - "OrchardCore.Markdown", - "OrchardCore.Media", - "OrchardCore.Menu", - "OrchardCore.Placements", - "OrchardCore.Queries", - "OrchardCore.Shortcodes.Templates", - "OrchardCore.Rules", "OrchardCore.Taxonomies", "OrchardCore.Title", - "OrchardCore.Templates", - "OrchardCore.Widgets", + "StatCan.OrchardCore.ContentPermissions", } )] diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs new file mode 100644 index 000000000..79970c485 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -0,0 +1,23 @@ +using System.Threading.Tasks; +using OrchardCore.Data.Migration; +using OrchardCore.Recipes.Services; + +namespace StatCan.OrchardCore.Radar +{ + public class Migrations: DataMigration + { + private readonly IRecipeMigrator _recipeMigrator; + + public Migrations(IRecipeMigrator recipeMigrator) + { + _recipeMigrator = recipeMigrator; + } + + public async Task CreateAsync() + { + await _recipeMigrator.ExecuteAsync("radar.recipe.json", this); + + return 1; + } + } +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations/radar.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Migrations/radar.recipe.json new file mode 100644 index 000000000..427a0c62a --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations/radar.recipe.json @@ -0,0 +1,1138 @@ +{ + "steps": [ + { + "name": "ContentDefinition", + "ContentTypes": [ + { + "Name": "Topic", + "DisplayName": "Topic", + "Settings": { + "ContentTypeSettings": { + "Listable": true, + "Draftable": true, + "Versionable": true, + "Securable": true + }, + "FullTextAspectSettings": {} + }, + "ContentTypePartDefinitionRecords": [ + { + "PartName": "Topic", + "Name": "Topic", + "Settings": { + "ContentTypePartSettings": { + "Position": "2" + } + } + }, + { + "PartName": "TitlePart", + "Name": "TitlePart", + "Settings": { + "ContentTypePartSettings": { + "Position": "0" + }, + "TitlePartSettings": { + "Options": 1, + "Pattern": "{{ ContentItem.Content.Topic.Name.Text }}" + }, + "ContentIndexSettings": {} + } + } + ] + }, + { + "Name": "Proposal", + "DisplayName": "Proposal", + "Settings": { + "ContentTypeSettings": { + "Creatable": true, + "Listable": true, + "Draftable": true, + "Versionable": true, + "Securable": true + }, + "FullTextAspectSettings": {} + }, + "ContentTypePartDefinitionRecords": [ + { + "PartName": "Proposal", + "Name": "Proposal", + "Settings": { + "ContentTypePartSettings": { + "Position": "2" + } + } + }, + { + "PartName": "RadarEntity", + "Name": "RadarEntity", + "Settings": { + "ContentTypePartSettings": { + "Position": "1" + } + } + }, + { + "PartName": "TitlePart", + "Name": "TitlePart", + "Settings": { + "ContentTypePartSettings": { + "Position": "0" + }, + "TitlePartSettings": { + "Options": 2, + "Pattern": "{{ ContentItem.Content.RadarEntityPart.Name.Text }}" + }, + "ContentIndexSettings": {} + } + }, + { + "PartName": "ContentPermissionsPart", + "Name": "ContentPermissionsPart", + "Settings": { + "ContentTypePartSettings": { + "Position": "3" + } + } + }, + { + "PartName": "BagPart", + "Name": "Workspace", + "Settings": { + "ContentTypePartSettings": { + "DisplayName": "Workspace", + "Description": "Add an Artifact to your workspace of this proposal", + "Position": "4" + }, + "BagPartSettings": { + "ContainedContentTypes": [ + "Artifact" + ] + }, + "ContentIndexSettings": {} + } + } + ] + }, + { + "Name": "ProjectType", + "DisplayName": "ProjectType", + "Settings": { + "ContentTypeSettings": { + "Listable": true, + "Draftable": true, + "Versionable": true, + "Securable": true + }, + "FullTextAspectSettings": {} + }, + "ContentTypePartDefinitionRecords": [ + { + "PartName": "ProjectType", + "Name": "ProjectType", + "Settings": { + "ContentTypePartSettings": { + "Position": "1" + } + } + }, + { + "PartName": "TitlePart", + "Name": "TitlePart", + "Settings": { + "ContentTypePartSettings": { + "Position": "0" + }, + "TitlePartSettings": { + "Options": 2, + "Pattern": "{{ ContentItem.Content.ProjectType.Name.Text }}" + }, + "ContentIndexSettings": {} + } + } + ] + }, + { + "Name": "ProposalType", + "DisplayName": "ProposalType", + "Settings": { + "ContentTypeSettings": { + "Listable": true, + "Draftable": true, + "Versionable": true, + "Securable": true + }, + "FullTextAspectSettings": {} + }, + "ContentTypePartDefinitionRecords": [ + { + "PartName": "ProposalType", + "Name": "ProposalType", + "Settings": { + "ContentTypePartSettings": { + "Position": "1" + } + } + }, + { + "PartName": "TitlePart", + "Name": "TitlePart", + "Settings": { + "ContentTypePartSettings": { + "Position": "0" + }, + "TitlePartSettings": { + "Options": 2, + "Pattern": "{{ ContentItem.Content.ProposalType.Name.Text }}" + }, + "ContentIndexSettings": {} + } + } + ] + }, + { + "Name": "CommunityType", + "DisplayName": "CommunityType", + "Settings": { + "ContentTypeSettings": { + "Listable": true, + "Draftable": true, + "Versionable": true, + "Securable": true + }, + "FullTextAspectSettings": {} + }, + "ContentTypePartDefinitionRecords": [ + { + "PartName": "CommunityType", + "Name": "CommunityType", + "Settings": { + "ContentTypePartSettings": { + "Position": "1" + } + } + }, + { + "PartName": "TitlePart", + "Name": "TitlePart", + "Settings": { + "ContentTypePartSettings": { + "Position": "0" + }, + "TitlePartSettings": { + "Options": 2, + "Pattern": "{{ ContentItem.Content.CommunityType.Name.Text }}" + }, + "ContentIndexSettings": {} + } + } + ] + }, + { + "Name": "Artifact", + "DisplayName": "Artifact", + "Settings": { + "ContentTypeSettings": { + "Creatable": true, + "Listable": true, + "Draftable": true, + "Versionable": true, + "Securable": true + }, + "FullTextAspectSettings": {} + }, + "ContentTypePartDefinitionRecords": [ + { + "PartName": "Artifact", + "Name": "Artifact", + "Settings": { + "ContentTypePartSettings": { + "Position": "1" + } + } + }, + { + "PartName": "TitlePart", + "Name": "TitlePart", + "Settings": { + "ContentTypePartSettings": { + "Position": "0" + } + } + } + ] + }, + { + "Name": "Event", + "DisplayName": "Event", + "Settings": { + "ContentTypeSettings": { + "Creatable": true, + "Listable": true, + "Draftable": true, + "Versionable": true, + "Securable": true + }, + "FullTextAspectSettings": {} + }, + "ContentTypePartDefinitionRecords": [ + { + "PartName": "Event", + "Name": "Event", + "Settings": { + "ContentTypePartSettings": { + "Position": "1" + } + } + }, + { + "PartName": "ContentPermissionsPart", + "Name": "ContentPermissionsPart", + "Settings": { + "ContentTypePartSettings": { + "Position": "5" + } + } + }, + { + "PartName": "RadarEntity", + "Name": "RadarEntity", + "Settings": { + "ContentTypePartSettings": { + "Position": "2" + } + } + }, + { + "PartName": "TitlePart", + "Name": "TitlePart", + "Settings": { + "ContentTypePartSettings": { + "Position": "0" + }, + "TitlePartSettings": { + "Options": 2, + "Pattern": "{{ ContentItem.Content.RadarEntityPart.Name.Text }}" + }, + "ContentIndexSettings": {} + } + }, + { + "PartName": "BagPart", + "Name": "EventOrganizer", + "Settings": { + "ContentTypePartSettings": { + "DisplayName": "EventOrganizer", + "Description": "Event Organizer", + "Position": "3" + }, + "BagPartSettings": { + "ContainedContentTypes": [ + "EventOrganizer" + ] + }, + "ContentIndexSettings": {} + } + }, + { + "PartName": "BagPart", + "Name": "Workspace", + "Settings": { + "ContentTypePartSettings": { + "DisplayName": "Workspace", + "Description": "Add an Artifact to your workspace of this event", + "Position": "4" + }, + "BagPartSettings": { + "ContainedContentTypes": [ + "Artifact" + ] + }, + "ContentIndexSettings": {} + } + } + ] + }, + { + "Name": "EventOrganizer", + "DisplayName": "EventOrganizer", + "Settings": { + "ContentTypeSettings": { + "Creatable": true, + "Listable": true, + "Draftable": true, + "Versionable": true, + "Securable": true + }, + "FullTextAspectSettings": {} + }, + "ContentTypePartDefinitionRecords": [ + { + "PartName": "EventOrganizer", + "Name": "EventOrganizer", + "Settings": { + "ContentTypePartSettings": { + "Position": "1" + } + } + }, + { + "PartName": "TitlePart", + "Name": "TitlePart", + "Settings": { + "ContentTypePartSettings": { + "Position": "0" + }, + "TitlePartSettings": { + "Options": 1, + "Pattern": "{% assign users = ContentItem.Content.EventOrganier.UserPicker.UserIds | users_by_id %}\r\n{% for user in users %}\r\n {{ user.UserName }} - {{ user.Email }}\r\n{% endfor %}" + }, + "ContentIndexSettings": {} + } + } + ] + }, + { + "Name": "CommunityMember", + "DisplayName": "CommunityMember", + "Settings": { + "ContentTypeSettings": { + "Creatable": true, + "Listable": true, + "Draftable": true, + "Versionable": true, + "Securable": true + }, + "FullTextAspectSettings": {} + }, + "ContentTypePartDefinitionRecords": [ + { + "PartName": "CommunityMember", + "Name": "CommunityMember", + "Settings": { + "ContentTypePartSettings": { + "Position": "1" + } + } + }, + { + "PartName": "TitlePart", + "Name": "TitlePart", + "Settings": { + "ContentTypePartSettings": { + "Position": "0" + }, + "TitlePartSettings": { + "Options": 1, + "Pattern": "{% assign users = ContentItem.Content.EventOrganier.UserPicker.UserIds | users_by_id %}\r\n{% for user in users %}\r\n {{ user.UserName }} - {{ user.Email }}\r\n{% endfor %}" + }, + "ContentIndexSettings": {} + } + } + ] + }, + { + "Name": "Community", + "DisplayName": "Community", + "Settings": { + "ContentTypeSettings": { + "Creatable": true, + "Listable": true, + "Draftable": true, + "Versionable": true, + "Securable": true + }, + "FullTextAspectSettings": {} + }, + "ContentTypePartDefinitionRecords": [ + { + "PartName": "Community", + "Name": "Community", + "Settings": { + "ContentTypePartSettings": { + "Position": "4" + } + } + }, + { + "PartName": "TitlePart", + "Name": "TitlePart", + "Settings": { + "ContentTypePartSettings": { + "Position": "0" + }, + "TitlePartSettings": { + "Options": 2, + "Pattern": "{{ ContentItem.Content.RadarEntity.Name.Text }}" + }, + "ContentIndexSettings": {} + } + }, + { + "PartName": "RadarEntity", + "Name": "RadarEntity", + "Settings": { + "ContentTypePartSettings": { + "Position": "1" + } + } + }, + { + "PartName": "ContentPermissionsPart", + "Name": "ContentPermissionsPart", + "Settings": { + "ContentTypePartSettings": { + "Position": "5" + } + } + }, + { + "PartName": "BagPart", + "Name": "Workspace", + "Settings": { + "ContentTypePartSettings": { + "DisplayName": "Workspace", + "Description": "Add an Artifact to your workspace of this community", + "Position": "2" + }, + "BagPartSettings": { + "ContainedContentTypes": [ + "Artifact" + ] + }, + "ContentIndexSettings": {} + } + }, + { + "PartName": "BagPart", + "Name": "CommunityMember", + "Settings": { + "ContentTypePartSettings": { + "DisplayName": "Community Member", + "Description": "Add a member to this community", + "Position": "3" + }, + "BagPartSettings": { + "ContainedContentTypes": [ + "CommunityMember" + ] + }, + "ContentIndexSettings": {} + } + } + ] + }, + { + "Name": "ProjectMember", + "DisplayName": "ProjectMember", + "Settings": { + "ContentTypeSettings": { + "Creatable": true, + "Listable": true, + "Draftable": true, + "Versionable": true, + "Securable": true + }, + "FullTextAspectSettings": {} + }, + "ContentTypePartDefinitionRecords": [ + { + "PartName": "ProjectMember", + "Name": "ProjectMember", + "Settings": { + "ContentTypePartSettings": { + "Position": "1" + } + } + }, + { + "PartName": "TitlePart", + "Name": "TitlePart", + "Settings": { + "ContentTypePartSettings": { + "Position": "0" + }, + "TitlePartSettings": { + "Options": 1, + "Pattern": "{% assign users = ContentItem.Content.EventOrganier.UserPicker.UserIds | users_by_id %}\r\n{% for user in users %}\r\n {{ user.UserName }} - {{ user.Email }}\r\n{% endfor %}" + }, + "ContentIndexSettings": {} + } + } + ] + }, + { + "Name": "Project", + "DisplayName": "Project", + "Settings": { + "ContentTypeSettings": { + "Creatable": true, + "Listable": true, + "Draftable": true, + "Versionable": true, + "Securable": true + }, + "FullTextAspectSettings": {} + }, + "ContentTypePartDefinitionRecords": [ + { + "PartName": "Project", + "Name": "Project", + "Settings": { + "ContentTypePartSettings": { + "Position": "4" + } + } + }, + { + "PartName": "RadarEntity", + "Name": "RadarEntity", + "Settings": { + "ContentTypePartSettings": { + "Position": "1" + } + } + }, + { + "PartName": "TitlePart", + "Name": "TitlePart", + "Settings": { + "ContentTypePartSettings": { + "Position": "0" + }, + "TitlePartSettings": { + "Options": 2, + "Pattern": "{{ ContentItem.Content.RadarEntity.Name.Text }}" + }, + "ContentIndexSettings": {} + } + }, + { + "PartName": "ContentPermissionsPart", + "Name": "ContentPermissionsPart", + "Settings": { + "ContentTypePartSettings": { + "Position": "5" + } + } + }, + { + "PartName": "BagPart", + "Name": "Workspace", + "Settings": { + "ContentTypePartSettings": { + "DisplayName": "Workspace", + "Description": "Add an Artifact to your workspace of this project", + "Position": "2" + }, + "BagPartSettings": { + "ContainedContentTypes": [ + "Artifact" + ] + }, + "ContentIndexSettings": {} + } + }, + { + "PartName": "BagPart", + "Name": "ProjectMember", + "Settings": { + "ContentTypePartSettings": { + "DisplayName": "Project Member", + "Description": "Add a member to this project", + "Position": "3" + }, + "BagPartSettings": { + "ContainedContentTypes": [ + "ProjectMember" + ] + }, + "ContentIndexSettings": {} + } + } + ] + } + ], + "ContentParts": [ + { + "Name": "RadarEntity", + "Settings": { + "ContentPartSettings": { + "Attachable": true + } + }, + "ContentPartFieldDefinitionRecords": [ + { + "FieldName": "TextField", + "Name": "Name", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Name", + "Position": "0" + } + } + }, + { + "FieldName": "TextField", + "Name": "Description", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Description", + "Position": "1" + } + } + }, + { + "FieldName": "ContentPickerField", + "Name": "RelatedEntity", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Related Entity", + "Position": "3" + }, + "ContentPickerFieldSettings": { + "Multiple": true, + "DisplayedContentTypes": [ + "Proposal" + ] + }, + "ContentIndexSettings": {} + } + }, + { + "FieldName": "TaxonomyField", + "Name": "Topics", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Topics", + "Editor": "Tags", + "DisplayMode": "Tags", + "Position": "2" + }, + "ContentIndexSettings": {}, + "TaxonomyFieldSettings": { + "TaxonomyContentItemId": "43p29bmfpe85a319g7t98waa40", + "Unique": true + }, + "TaxonomyFieldTagsEditorSettings": { + "Open": false + } + } + } + ] + }, + { + "Name": "Topic", + "Settings": {}, + "ContentPartFieldDefinitionRecords": [ + { + "FieldName": "TextField", + "Name": "Name", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Name" + } + } + }, + { + "FieldName": "TextField", + "Name": "Description", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Description" + } + } + } + ] + }, + { + "Name": "Proposal", + "Settings": {}, + "ContentPartFieldDefinitionRecords": [ + { + "FieldName": "TaxonomyField", + "Name": "Type", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Type", + "Editor": "Tags", + "DisplayMode": "Tags", + "Position": "0" + }, + "ContentIndexSettings": {}, + "TaxonomyFieldSettings": { + "Required": true, + "TaxonomyContentItemId": "4fn9mss5kdqfmy0b7qwbnneb5s", + "Unique": true + }, + "TaxonomyFieldTagsEditorSettings": { + "Open": false + } + } + } + ] + }, + { + "Name": "ProjectType", + "Settings": {}, + "ContentPartFieldDefinitionRecords": [ + { + "FieldName": "TextField", + "Name": "Name", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Name", + "Position": "0" + } + } + }, + { + "FieldName": "TextField", + "Name": "Description", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Description", + "Position": "1" + } + } + } + ] + }, + { + "Name": "ProposalType", + "Settings": {}, + "ContentPartFieldDefinitionRecords": [ + { + "FieldName": "TextField", + "Name": "Name", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Name", + "Position": "0" + } + } + }, + { + "FieldName": "TextField", + "Name": "Description", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Description", + "Position": "1" + } + } + } + ] + }, + { + "Name": "CommunityType", + "Settings": {}, + "ContentPartFieldDefinitionRecords": [ + { + "FieldName": "TextField", + "Name": "Name", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Name", + "Position": "0" + } + } + }, + { + "FieldName": "TextField", + "Name": "Description", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Description", + "Position": "1" + } + } + } + ] + }, + { + "Name": "Event", + "Settings": {}, + "ContentPartFieldDefinitionRecords": [ + { + "FieldName": "UserPickerField", + "Name": "Attendees", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Attendees", + "Position": "0" + } + } + }, + { + "FieldName": "DateTimeField", + "Name": "StartDate", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Start Date", + "Position": "1" + } + } + }, + { + "FieldName": "DateTimeField", + "Name": "EndDate", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "End Date", + "Position": "2" + } + } + } + ] + }, + { + "Name": "EventOrganizer", + "Settings": {}, + "ContentPartFieldDefinitionRecords": [ + { + "FieldName": "UserPickerField", + "Name": "Organizer", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Organizer", + "Position": "0" + }, + "UserPickerFieldSettings": { + "Required": true, + "DisplayAllUsers": true, + "DisplayedRoles": [] + }, + "ContentIndexSettings": {} + } + }, + { + "FieldName": "TextField", + "Name": "Role", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Role", + "Position": "1" + } + } + } + ] + }, + { + "Name": "CommunityMember", + "Settings": {}, + "ContentPartFieldDefinitionRecords": [ + { + "FieldName": "UserPickerField", + "Name": "Member", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Member", + "Position": "0" + }, + "UserPickerFieldSettings": { + "Required": true, + "DisplayAllUsers": true, + "DisplayedRoles": [] + }, + "ContentIndexSettings": {} + } + } + ] + }, + { + "Name": "Community", + "Settings": {}, + "ContentPartFieldDefinitionRecords": [ + { + "FieldName": "TaxonomyField", + "Name": "Type", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Type", + "Position": "0" + }, + "ContentIndexSettings": {}, + "TaxonomyFieldSettings": { + "Required": true, + "TaxonomyContentItemId": "4be7bdq6y7k9f1wpf1q6h8kwd9", + "Unique": true + } + } + } + ] + }, + { + "Name": "ProjectMember", + "Settings": {}, + "ContentPartFieldDefinitionRecords": [ + { + "FieldName": "UserPickerField", + "Name": "Member", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Member", + "Position": "0" + }, + "UserPickerFieldSettings": { + "Required": true, + "DisplayAllUsers": true, + "DisplayedRoles": [] + }, + "ContentIndexSettings": {} + } + } + ] + }, + { + "Name": "Project", + "Settings": {}, + "ContentPartFieldDefinitionRecords": [ + { + "FieldName": "TaxonomyField", + "Name": "Type", + "Settings": { + "ContentPartFieldSettings": { + "DisplayName": "Type", + "Position": "0" + }, + "ContentIndexSettings": {}, + "TaxonomyFieldSettings": { + "Required": true, + "TaxonomyContentItemId": "4fg74m81qafx3zp342n8csj2wm", + "Unique": true + } + } + } + ] + } + ] + }, + { + "name": "content", + "data": [ + { + "ContentItemId": "43p29bmfpe85a319g7t98waa40", + "ContentItemVersionId": "496gng475pa3r2s6w4v724zjxz", + "ContentType": "Taxonomy", + "DisplayText": "Topics", + "Latest": true, + "Published": true, + "ModifiedUtc": "2021-09-15T13:22:03.8522685Z", + "PublishedUtc": "2021-09-15T13:22:03.8580812Z", + "CreatedUtc": "2021-09-15T13:22:03.8522685Z", + "Owner": "4rbm0rzcxcvx7xndye0hp63nw3", + "Author": "admin", + "TitlePart": { + "Title": "Topics" + }, + "AliasPart": { + "Alias": "topics" + }, + "AutoroutePart": { + "Path": "topics", + "SetHomepage": false, + "Disabled": false, + "RouteContainedItems": false, + "Absolute": false + }, + "TaxonomyPart": { + "TermContentType": "Topic", + "Terms": [] + } + }, + { + "ContentItemId": "4fg74m81qafx3zp342n8csj2wm", + "ContentItemVersionId": "47q1vnrggydfj7ah65mqahj5cn", + "ContentType": "Taxonomy", + "DisplayText": "ProjectType", + "Latest": true, + "Published": true, + "ModifiedUtc": "2021-09-15T13:42:45.0701723Z", + "PublishedUtc": "2021-09-15T13:42:45.0777122Z", + "CreatedUtc": "2021-09-15T13:42:45.0701723Z", + "Owner": "4rbm0rzcxcvx7xndye0hp63nw3", + "Author": "admin", + "TitlePart": { + "Title": "ProjectType" + }, + "AliasPart": { + "Alias": "projecttype" + }, + "AutoroutePart": { + "Path": "projecttype", + "SetHomepage": false, + "Disabled": false, + "RouteContainedItems": false, + "Absolute": false + }, + "TaxonomyPart": { + "TermContentType": "ProjectType", + "Terms": [] + } + }, + { + "ContentItemId": "4fn9mss5kdqfmy0b7qwbnneb5s", + "ContentItemVersionId": "4k50x7trga6cn4rpsmwsc92qmx", + "ContentType": "Taxonomy", + "DisplayText": "ProposalType", + "Latest": true, + "Published": true, + "ModifiedUtc": "2021-09-15T13:46:00.5646917Z", + "PublishedUtc": "2021-09-15T13:46:00.5693251Z", + "CreatedUtc": "2021-09-15T13:46:00.5646917Z", + "Owner": "4rbm0rzcxcvx7xndye0hp63nw3", + "Author": "admin", + "TitlePart": { + "Title": "ProposalType" + }, + "AliasPart": { + "Alias": "proposaltype" + }, + "AutoroutePart": { + "Path": "proposaltype", + "SetHomepage": false, + "Disabled": false, + "RouteContainedItems": false, + "Absolute": false + }, + "TaxonomyPart": { + "TermContentType": "ProposalType", + "Terms": [] + } + }, + { + "ContentItemId": "4be7bdq6y7k9f1wpf1q6h8kwd9", + "ContentItemVersionId": "44gxhx8fymzh54vvf64nnwma4a", + "ContentType": "Taxonomy", + "DisplayText": "CommunityType", + "Latest": true, + "Published": true, + "ModifiedUtc": "2021-09-15T14:45:27.1221385Z", + "PublishedUtc": "2021-09-15T14:45:27.1263705Z", + "CreatedUtc": "2021-09-15T14:45:27.1221385Z", + "Owner": "4rbm0rzcxcvx7xndye0hp63nw3", + "Author": "admin", + "TitlePart": { + "Title": "CommunityType" + }, + "AliasPart": { + "Alias": "communitytype" + }, + "AutoroutePart": { + "Path": "communitytype", + "SetHomepage": false, + "Disabled": false, + "RouteContainedItems": false, + "Absolute": false + }, + "TaxonomyPart": { + "TermContentType": "CommunityType", + "Terms": [] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs index b9e621d66..5a0dfdc22 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs @@ -1,9 +1,9 @@ using System; -using Fluid; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using OrchardCore.Modules; +using OrchardCore.Data.Migration; namespace StatCan.OrchardCore.Radar { @@ -11,6 +11,7 @@ public class Startup : StartupBase { public override void ConfigureServices(IServiceCollection services) { + services.AddScoped(); } public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider) From 211276a649201372addf1e01d80ad2a5bfdad863 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Wed, 15 Sep 2021 13:09:19 -0400 Subject: [PATCH 003/198] fix: title part --- .../Migrations/radar.recipe.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations/radar.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Migrations/radar.recipe.json index 427a0c62a..301eb6b82 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations/radar.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations/radar.recipe.json @@ -82,7 +82,7 @@ }, "TitlePartSettings": { "Options": 2, - "Pattern": "{{ ContentItem.Content.RadarEntityPart.Name.Text }}" + "Pattern": "{{ ContentItem.Content.RadarEntity.Name.Text }}" }, "ContentIndexSettings": {} } @@ -313,7 +313,7 @@ }, "TitlePartSettings": { "Options": 2, - "Pattern": "{{ ContentItem.Content.RadarEntityPart.Name.Text }}" + "Pattern": "{{ ContentItem.Content.RadarEntity.Name.Text }}" }, "ContentIndexSettings": {} } @@ -1046,7 +1046,7 @@ "ContentItemId": "4fg74m81qafx3zp342n8csj2wm", "ContentItemVersionId": "47q1vnrggydfj7ah65mqahj5cn", "ContentType": "Taxonomy", - "DisplayText": "ProjectType", + "DisplayText": "Project Type", "Latest": true, "Published": true, "ModifiedUtc": "2021-09-15T13:42:45.0701723Z", @@ -1055,7 +1055,7 @@ "Owner": "4rbm0rzcxcvx7xndye0hp63nw3", "Author": "admin", "TitlePart": { - "Title": "ProjectType" + "Title": "Project Type" }, "AliasPart": { "Alias": "projecttype" @@ -1076,7 +1076,7 @@ "ContentItemId": "4fn9mss5kdqfmy0b7qwbnneb5s", "ContentItemVersionId": "4k50x7trga6cn4rpsmwsc92qmx", "ContentType": "Taxonomy", - "DisplayText": "ProposalType", + "DisplayText": "Proposal Type", "Latest": true, "Published": true, "ModifiedUtc": "2021-09-15T13:46:00.5646917Z", @@ -1085,7 +1085,7 @@ "Owner": "4rbm0rzcxcvx7xndye0hp63nw3", "Author": "admin", "TitlePart": { - "Title": "ProposalType" + "Title": "Proposal Type" }, "AliasPart": { "Alias": "proposaltype" @@ -1106,7 +1106,7 @@ "ContentItemId": "4be7bdq6y7k9f1wpf1q6h8kwd9", "ContentItemVersionId": "44gxhx8fymzh54vvf64nnwma4a", "ContentType": "Taxonomy", - "DisplayText": "CommunityType", + "DisplayText": "Community Type", "Latest": true, "Published": true, "ModifiedUtc": "2021-09-15T14:45:27.1221385Z", @@ -1115,7 +1115,7 @@ "Owner": "4rbm0rzcxcvx7xndye0hp63nw3", "Author": "admin", "TitlePart": { - "Title": "CommunityType" + "Title": "Community Type" }, "AliasPart": { "Alias": "communitytype" From 5a19dc1116ec21e43a0a770f7fab925123d2200d Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Wed, 15 Sep 2021 15:32:40 -0400 Subject: [PATCH 004/198] feat: add taxonomy code migration --- .../StatCan.OrchardCore.Radar/Constants.cs | 9 + .../StatCan.OrchardCore.Radar/Migrations.cs | 23 -- .../Migrations/TaxonomyMigrations.cs | 233 ++++++++++++++++++ src/Apps/StatCan.OrchardCore.Radar/Startup.cs | 3 +- .../StatCan.OrchardCore.Radar.csproj | 6 + 5 files changed, 250 insertions(+), 24 deletions(-) delete mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations.cs create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations/TaxonomyMigrations.cs diff --git a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs index b49e38bb2..301266827 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs @@ -6,5 +6,14 @@ public static class Features { public const string Radar = "StatCan.OrchardCore.Radar"; } + + public static class ContentTypes + { + // Taxonomies + public const string Topic = "Topic"; + public const string ProposalType = "ProposalType"; + public const string ProjectType = "ProjectType"; + public const string CommunityType = "CommunityType"; + } } } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs deleted file mode 100644 index 79970c485..000000000 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using OrchardCore.Data.Migration; -using OrchardCore.Recipes.Services; - -namespace StatCan.OrchardCore.Radar -{ - public class Migrations: DataMigration - { - private readonly IRecipeMigrator _recipeMigrator; - - public Migrations(IRecipeMigrator recipeMigrator) - { - _recipeMigrator = recipeMigrator; - } - - public async Task CreateAsync() - { - await _recipeMigrator.ExecuteAsync("radar.recipe.json", this); - - return 1; - } - } -} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations/TaxonomyMigrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations/TaxonomyMigrations.cs new file mode 100644 index 000000000..b723f9b62 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations/TaxonomyMigrations.cs @@ -0,0 +1,233 @@ +using System.Threading.Tasks; + +using OrchardCore.ContentManagement; +using OrchardCore.ContentManagement.Metadata; +using OrchardCore.ContentManagement.Metadata.Settings; +using OrchardCore.Data.Migration; +using OrchardCore.Title.Models; +using OrchardCore.Taxonomies.Models; + +namespace StatCan.OrchardCore.Radar.Migrations +{ + public class TaxonomyMigrations : DataMigration + { + private readonly IContentDefinitionManager _contentDefinitionManager; + private readonly IContentManager _contentManager; + + public TaxonomyMigrations(IContentDefinitionManager contentDefinitionManager, IContentManager contentManager) + { + _contentDefinitionManager = contentDefinitionManager; + _contentManager = contentManager; + } + + public async Task CreateAsync() + { + Topic(); + ProposalType(); + ProjectType(); + CommunityType(); + + await CreateTopicsTaxonomy(); + await CreateProposalTypesTaxonomy(); + await CreateProjectTypesTaxonomy(); + await CreateCommunityTypesTaxonoy(); + + return 1; + } + + private void Topic() + { + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Topic, type => type + .DisplayedAs("Topic") + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart("Topic", part => part + .WithPosition("2") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedHidden, + Pattern = "{{ ContentItem.Content.Topic.Name.Text }}", + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.Topic, part => part + .WithField("Name", field => field + .OfType("TextField") + .WithDisplayName("Name") + ) + .WithField("Description", field => field + .OfType("TextField") + .WithDisplayName("Description") + ) + ); + } + + private void ProposalType() + { + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.ProposalType, type => type + .DisplayedAs("Proposal Type") + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart("ProposalType", part => part + .WithPosition("1") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedHidden, + Pattern = "{{ ContentItem.Content.ProposalType.Name.Text }}", + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.ProposalType, part => part + .WithField("Name", field => field + .OfType("TextField") + .WithDisplayName("Name") + .WithPosition("0") + ) + .WithField("Description", field => field + .OfType("TextField") + .WithDisplayName("Description") + .WithPosition("1") + ) + ); + } + + private void ProjectType() + { + _contentDefinitionManager.AlterTypeDefinition("ProjectType", type => type + .DisplayedAs("Project Type") + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart("ProjectType", part => part + .WithPosition("1") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedHidden, + Pattern = "{{ ContentItem.Content.ProjectType.Name.Text }}", + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition("ProjectType", part => part + .WithField("Name", field => field + .OfType("TextField") + .WithDisplayName("Name") + .WithPosition("0") + ) + .WithField("Description", field => field + .OfType("TextField") + .WithDisplayName("Description") + .WithPosition("1") + ) + ); + } + + private void CommunityType() + { + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.CommunityType, type => type + .DisplayedAs("Community Type") + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart("CommunityType", part => part + .WithPosition("1") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedHidden, + Pattern = "{{ ContentItem.Content.CommunityType.Name.Text }}", + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.CommunityType, part => part + .WithField("Name", field => field + .OfType("TextField") + .WithDisplayName("Name") + .WithPosition("0") + ) + .WithField("Description", field => field + .OfType("TextField") + .WithDisplayName("Description") + .WithPosition("1") + ) + ); + + } + + private async Task CreateTopicsTaxonomy() + { + var topics = await _contentManager.NewAsync("Taxonomy"); + + topics.DisplayText = "Topics"; // Instead of TitlePart.Title + topics.Alter(part => + { + part.TermContentType = Constants.ContentTypes.Topic; + }); + + await _contentManager.CreateAsync(topics, VersionOptions.Published); + await _contentManager.PublishAsync(topics); + } + + private async Task CreateProposalTypesTaxonomy() + { + var proposalTypes = await _contentManager.NewAsync("Taxonomy"); + + proposalTypes.DisplayText = "Proposal Types"; // Instead of TitlePart.Title + proposalTypes.Alter(part => + { + part.TermContentType = Constants.ContentTypes.ProposalType; + }); + + await _contentManager.CreateAsync(proposalTypes, VersionOptions.Published); + await _contentManager.PublishAsync(proposalTypes); + } + + private async Task CreateProjectTypesTaxonomy() + { + var projectTypes = await _contentManager.NewAsync("Taxonomy"); + + projectTypes.DisplayText = "Project Types"; // Instead of TitlePart.Title + projectTypes.Alter(part => + { + part.TermContentType = Constants.ContentTypes.ProjectType; + }); + + await _contentManager.CreateAsync(projectTypes, VersionOptions.Published); + await _contentManager.PublishAsync(projectTypes); + } + + private async Task CreateCommunityTypesTaxonoy() + { + var communityTypes = await _contentManager.NewAsync("Taxonomy"); + + communityTypes.DisplayText = "Communities Types"; // Instead of TitlePart.Title + communityTypes.Alter(part => + { + part.TermContentType = Constants.ContentTypes.CommunityType; + }); + + await _contentManager.CreateAsync(communityTypes, VersionOptions.Published); + await _contentManager.PublishAsync(communityTypes); + } + } +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs index 5a0dfdc22..9ceff0c9b 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection; using OrchardCore.Modules; using OrchardCore.Data.Migration; +using StatCan.OrchardCore.Radar.Migrations; namespace StatCan.OrchardCore.Radar { @@ -11,7 +12,7 @@ public class Startup : StartupBase { public override void ConfigureServices(IServiceCollection services) { - services.AddScoped(); + services.AddScoped(); } public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider) diff --git a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj index 4eb94323f..2a5dc4ae5 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj +++ b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj @@ -13,6 +13,12 @@ + + + + + + From db1f570b22e70837d9266311ecd51d541bf284cc Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Wed, 15 Sep 2021 16:02:25 -0400 Subject: [PATCH 005/198] feat: add artifact code migration --- .../StatCan.OrchardCore.Radar/Constants.cs | 3 ++ .../Migrations/ArtifactMigration.cs | 41 +++++++++++++++++++ src/Apps/StatCan.OrchardCore.Radar/Startup.cs | 1 + 3 files changed, 45 insertions(+) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations/ArtifactMigration.cs diff --git a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs index 301266827..4fb440e17 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs @@ -14,6 +14,9 @@ public static class ContentTypes public const string ProposalType = "ProposalType"; public const string ProjectType = "ProjectType"; public const string CommunityType = "CommunityType"; + + // Entities + public const string Aritifact = "Aritifact"; } } } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations/ArtifactMigration.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations/ArtifactMigration.cs new file mode 100644 index 000000000..75e297658 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations/ArtifactMigration.cs @@ -0,0 +1,41 @@ +using OrchardCore.ContentManagement.Metadata; +using OrchardCore.ContentManagement.Metadata.Settings; +using OrchardCore.Data.Migration; + +namespace StatCan.OrchardCore.Radar.Migrations +{ + public class ArtifactMigration: DataMigration + { + private readonly IContentDefinitionManager _contentDefinitionManager; + + public ArtifactMigration(IContentDefinitionManager contentDefinitionManager) + { + _contentDefinitionManager = contentDefinitionManager; + } + + public int Create() + { + CreateArtifact(); + + return 1; + } + + private void CreateArtifact() + { + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Aritifact, type => type + .DisplayedAs("Artifact") + .Creatable() + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart("Artifact", part => part + .WithPosition("1") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + ) +); + } + } +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs index 9ceff0c9b..31a26b258 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs @@ -13,6 +13,7 @@ public class Startup : StartupBase public override void ConfigureServices(IServiceCollection services) { services.AddScoped(); + services.AddScoped(); } public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider) From f96cfabdda86548d58c03c2635da7782e70f4b9d Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Thu, 16 Sep 2021 12:16:43 -0400 Subject: [PATCH 006/198] feat: use code migration --- .../StatCan.OrchardCore.Radar/Constants.cs | 11 + .../StatCan.OrchardCore.Radar/Manifest.cs | 1 + .../StatCan.OrchardCore.Radar/Migrations.cs | 673 ++++++++++ .../Migrations/ArtifactMigration.cs | 41 - .../Migrations/TaxonomyMigrations.cs | 233 ---- .../Migrations/radar.recipe.json | 1138 ----------------- src/Apps/StatCan.OrchardCore.Radar/Startup.cs | 4 +- .../StatCan.OrchardCore.Radar.csproj | 5 +- 8 files changed, 690 insertions(+), 1416 deletions(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations.cs delete mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations/ArtifactMigration.cs delete mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations/TaxonomyMigrations.cs delete mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations/radar.recipe.json diff --git a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs index 4fb440e17..1d40749e1 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs @@ -17,6 +17,17 @@ public static class ContentTypes // Entities public const string Aritifact = "Aritifact"; + public const string Proposal = "Proposal"; + public const string Project = "Project"; + public const string Event = "Event"; + public const string Community = "Community"; + + public const string ProjectMember = "ProjectMember"; + public const string EventOrganizer = "EventOrganizer"; + public const string CommunityMember = "CommunityMember"; + + // Parts + public const string RadarEntity = "RadarEntity"; } } } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Manifest.cs b/src/Apps/StatCan.OrchardCore.Radar/Manifest.cs index e5db7f50e..5b6564abd 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Manifest.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Manifest.cs @@ -20,6 +20,7 @@ { "OrchardCore.Autoroute", "OrchardCore.Contents", + "OrhcardCore.ContentManagement", "OrchardCore.ContentFields", "OrchardCore.Flows", "OrchardCore.Taxonomies", diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs new file mode 100644 index 000000000..11f163190 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -0,0 +1,673 @@ +using System; +using System.Threading.Tasks; +using System.Collections.Generic; +using OrchardCore.ContentManagement; +using OrchardCore.ContentManagement.Metadata; +using OrchardCore.ContentManagement.Metadata.Settings; +using OrchardCore.Data.Migration; +using OrchardCore.Taxonomies.Models; +using OrchardCore.Title.Models; +using OrchardCore.ContentFields.Fields; +using OrchardCore.ContentFields.Settings; +using OrchardCore.Taxonomies.Fields; +using OrchardCore.Taxonomies.Settings; +using OrchardCore.Flows.Models; + +namespace StatCan.OrchardCore.Radar +{ + public class Migrations : DataMigration + { + private readonly IContentDefinitionManager _contentDefinitionManager; + private readonly IContentManager _contentManager; + + private readonly Dictionary _taxonomyIds; + + public Migrations(IContentDefinitionManager contentDefinitionManager, IContentManager contentManager) + { + _contentDefinitionManager = contentDefinitionManager; + _contentManager = contentManager; + + _taxonomyIds = new Dictionary(); + } + + public async Task CreateAsync() + { + CreateTaxonomies(); + await CreateTaxonomyItems(); + CreateArtifact(); + CreateRadarEntityPart(); + CreateProposal(); + CreateProject(); + CreateEvent(); + CreateCommunity(); + + return 1; + } + + private void CreateTaxonomies() + { + // Topic + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Topic, type => type + .DisplayedAs("Topic") + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart("Topic", part => part + .WithPosition("2") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedHidden, + Pattern = "{{ ContentItem.Content.Topic.Name.Text }}", + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.Topic, part => part + .WithField("Name", field => field + .OfType("TextField") + .WithDisplayName("Name") + ) + .WithField("Description", field => field + .OfType("TextField") + .WithDisplayName("Description") + ) + ); + + // Proposal Type + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.ProposalType, type => type + .DisplayedAs("Proposal Type") + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart("ProposalType", part => part + .WithPosition("1") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedHidden, + Pattern = "{{ ContentItem.Content.ProposalType.Name.Text }}", + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.ProposalType, part => part + .WithField("Name", field => field + .OfType("TextField") + .WithDisplayName("Name") + .WithPosition("0") + ) + .WithField("Description", field => field + .OfType("TextField") + .WithDisplayName("Description") + .WithPosition("1") + ) + ); + + // Project Type + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.ProjectType, type => type + .DisplayedAs("Project Type") + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart("ProjectType", part => part + .WithPosition("1") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedHidden, + Pattern = "{{ ContentItem.Content.ProjectType.Name.Text }}", + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.ProjectType, part => part + .WithField("Name", field => field + .OfType("TextField") + .WithDisplayName("Name") + .WithPosition("0") + ) + .WithField("Description", field => field + .OfType("TextField") + .WithDisplayName("Description") + .WithPosition("1") + ) + ); + + // Community Type + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.CommunityType, type => type + .DisplayedAs("Community Type") + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart("CommunityType", part => part + .WithPosition("1") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedHidden, + Pattern = "{{ ContentItem.Content.CommunityType.Name.Text }}", + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.CommunityType, part => part + .WithField("Name", field => field + .OfType("TextField") + .WithDisplayName("Name") + .WithPosition("0") + ) + .WithField("Description", field => field + .OfType("TextField") + .WithDisplayName("Description") + .WithPosition("1") + ) + ); + } + + private async Task CreateTaxonomyItems() + { + // Topics + var topics = await _contentManager.NewAsync("Taxonomy"); + _taxonomyIds.Add("Topics", topics.ContentItemId); + + topics.DisplayText = "Topics"; // Instead of TitlePart.Title + topics.Alter(part => + { + part.TermContentType = Constants.ContentTypes.Topic; + }); + + await _contentManager.CreateAsync(topics, VersionOptions.Published); + await _contentManager.PublishAsync(topics); + + // Proposal Type + var proposalTypes = await _contentManager.NewAsync("Taxonomy"); + _taxonomyIds.Add("Proposal Types", proposalTypes.ContentItemId); + + proposalTypes.DisplayText = "Proposal Types"; // Instead of TitlePart.Title + proposalTypes.Alter(part => + { + part.TermContentType = Constants.ContentTypes.ProposalType; + }); + + await _contentManager.CreateAsync(proposalTypes, VersionOptions.Published); + await _contentManager.PublishAsync(proposalTypes); + + // Project Type + var projectTypes = await _contentManager.NewAsync("Taxonomy"); + _taxonomyIds.Add("Project Types", proposalTypes.ContentItemId); + + projectTypes.DisplayText = "Project Types"; // Instead of TitlePart.Title + projectTypes.Alter(part => + { + part.TermContentType = Constants.ContentTypes.ProjectType; + }); + + await _contentManager.CreateAsync(projectTypes, VersionOptions.Published); + await _contentManager.PublishAsync(projectTypes); + + // Community Type + var communityTypes = await _contentManager.NewAsync("Taxonomy"); + _taxonomyIds.Add("Community Types", communityTypes.ContentItemId); + + communityTypes.DisplayText = "Community Types"; // Instead of TitlePart.Title + communityTypes.Alter(part => + { + part.TermContentType = Constants.ContentTypes.CommunityType; + }); + + await _contentManager.CreateAsync(communityTypes, VersionOptions.Published); + await _contentManager.PublishAsync(communityTypes); + } + + private void CreateArtifact() + { + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Aritifact, type => type + .DisplayedAs("Artifact") + .Creatable() + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart("Artifact", part => part + .WithPosition("1") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + ) + ); + } + + private void CreateRadarEntityPart() + { + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.RadarEntity, part => part + .Attachable() + .WithDescription("Provides fields for an entity in Radar") + .WithField("Name", field => field + .OfType(nameof(TextField)) + .WithDisplayName("Name") + ) + .WithField("Description", field => field + .OfType(nameof(TextField)) + .WithDisplayName("Description") + ) + .WithField("Topics", field => field + .OfType(nameof(TaxonomyField)) + .WithDisplayName("Topics") + .WithEditor("Tags") + .WithDisplayMode("Tags") + .WithSettings(new TaxonomyFieldSettings + { + Unique = false, + TaxonomyContentItemId = _taxonomyIds.GetValueOrDefault("Topics") + }) + .WithSettings(new TaxonomyFieldTagsEditorSettings + { + Open = false, + }) + + ) + .WithField("RelatedEntity", field => field + .OfType(nameof(ContentPickerField)) + .WithDisplayName("Related Entity") + .WithSettings(new ContentPickerFieldSettings + { + Multiple = true, + Required = false + }) + ) + ); + } + + private void CreateProposal() + { + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Proposal, type => type + .DisplayedAs("Proposal") + .Creatable() + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart(Constants.ContentTypes.Proposal, part => part + .WithPosition("2") + ) + .WithPart(Constants.ContentTypes.RadarEntity, part => part + .WithPosition("1") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedHidden, + Pattern = "{{ ContentItem.Content.RadarEntity.Name.Text }}", + }) + ) + .WithPart("ContentPermissionsPart", part => part + .WithPosition("3") + ) + .WithPart("Workspace", part => part + .WithDisplayName("Workspace") + .WithDescription("Add an Artifact to your workspace of this proposal") + .WithPosition("4") + .WithSettings(new BagPartSettings + { + ContainedContentTypes = new[] { Constants.ContentTypes.Aritifact }, + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.Proposal, part => part + .WithField("Type", field => field + .OfType("TaxonomyField") + .WithDisplayName("Type") + .WithEditor("Tags") + .WithDisplayMode("Tags") + .WithPosition("0") + .WithSettings(new TaxonomyFieldSettings + { + Required = true, + TaxonomyContentItemId = _taxonomyIds.GetValueOrDefault("Proposal Types"), + Unique = true, + }) + .WithSettings(new TaxonomyFieldTagsEditorSettings + { + Open = false, + }) + ) + ); + } + + private void CreateProject() + { + // Project Member + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.ProjectMember, type => type + .DisplayedAs("ProjectMember") + .Creatable() + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart(Constants.ContentTypes.ProjectMember, part => part + .WithPosition("1") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedHidden, + Pattern = @"{% assign users = ContentItem.Content.EventOrganier.UserPicker.UserIds | users_by_id %} + {% for user in users %} + {{ user.UserName }} - {{ user.Email }} + {% endfor %}", + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.ProjectMember, part => part + .WithField("Member", field => field + .OfType("UserPickerField") + .WithDisplayName("Member") + .WithPosition("0") + .WithSettings(new UserPickerFieldSettings + { + Required = true, + DisplayAllUsers = true, + DisplayedRoles = Array.Empty(), + }) + ) + ); + + // Project + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Project, type => type + .DisplayedAs("Project") + .Creatable() + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart(Constants.ContentTypes.Project, part => part + .WithPosition("4") + ) + .WithPart(Constants.ContentTypes.RadarEntity, part => part + .WithPosition("1") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedHidden, + Pattern = "{{ ContentItem.Content.RadarEntity.Name.Text }}", + }) + ) + .WithPart("ContentPermissionsPart", part => part + .WithPosition("5") + ) + .WithPart("Workspace", part => part + .WithDisplayName("Workspace") + .WithDescription("Add an Artifact to your workspace of this project") + .WithPosition("2") + .WithSettings(new BagPartSettings + { + ContainedContentTypes = new[] { Constants.ContentTypes.Aritifact }, + }) + ) + .WithPart(Constants.ContentTypes.ProjectMember, part => part + .WithDisplayName("Project Member") + .WithDescription("Add a member to this project") + .WithPosition("3") + .WithSettings(new BagPartSettings + { + ContainedContentTypes = new[] { Constants.ContentTypes.ProjectMember }, + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.Project, part => part + .WithField("Type", field => field + .OfType("TaxonomyField") + .WithEditor("Tags") + .WithDisplayMode("Tags") + .WithDisplayName("Type") + .WithPosition("0") + .WithSettings(new TaxonomyFieldSettings + { + Required = true, + TaxonomyContentItemId = _taxonomyIds.GetValueOrDefault("Project Types"), + Unique = true, + }) + .WithSettings(new TaxonomyFieldTagsEditorSettings + { + Open = false, + }) + ) + ); + } + + private void CreateEvent() + { + // Event Organizer + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.EventOrganizer, type => type + .DisplayedAs("Event Organizer") + .Creatable() + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart(Constants.ContentTypes.EventOrganizer, part => part + .WithPosition("1") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedHidden, + Pattern = @"{% assign users = ContentItem.Content.EventOrganier.UserPicker.UserIds | users_by_id %} + {% for user in users %} + {{ user.UserName }} - {{ user.Email }} + {% endfor %}", + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.EventOrganizer, part => part + .WithField("Organizer", field => field + .OfType("UserPickerField") + .WithDisplayName("Organizer") + .WithPosition("0") + .WithSettings(new UserPickerFieldSettings + { + Required = true, + DisplayAllUsers = true, + DisplayedRoles = Array.Empty(), + }) + ) + .WithField("Role", field => field + .OfType("TextField") + .WithDisplayName("Role") + .WithPosition("1") + ) + ); + + // Event + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Event, type => type + .DisplayedAs("Event") + .Creatable() + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart(Constants.ContentTypes.Event, part => part + .WithPosition("1") + ) + .WithPart("ContentPermissionsPart", part => part + .WithPosition("5") + ) + .WithPart(Constants.ContentTypes.RadarEntity, part => part + .WithPosition("2") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedDisabled, + Pattern = "{{ ContentItem.Content.RadarEntity.Name.Text }}", + }) + ) + .WithPart(Constants.ContentTypes.EventOrganizer, part => part + .WithDisplayName("Event Organizer") + .WithDescription("Event Organizer") + .WithPosition("3") + .WithSettings(new BagPartSettings + { + ContainedContentTypes = new[] { Constants.ContentTypes.EventOrganizer }, + }) + ) + .WithPart("Workspace", part => part + .WithDisplayName("Workspace") + .WithDescription("Add an Artifact to your workspace of this event") + .WithPosition("4") + .WithSettings(new BagPartSettings + { + ContainedContentTypes = new[] { Constants.ContentTypes.Aritifact }, + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.Event, part => part + .WithField("Attendees", field => field + .OfType("UserPickerField") + .WithDisplayName("Attendees") + .WithPosition("0") + ) + .WithField("StartDate", field => field + .OfType("DateTimeField") + .WithDisplayName("Start Date") + .WithPosition("1") + ) + .WithField("EndDate", field => field + .OfType("DateTimeField") + .WithDisplayName("End Date") + .WithPosition("2") + ) + ); + } + + private void CreateCommunity() + { + // Community Member + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.CommunityMember, type => type + .DisplayedAs("Community Member") + .Creatable() + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart(Constants.ContentTypes.CommunityMember, part => part + .WithPosition("1") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedHidden, + Pattern = @"{% assign users = ContentItem.Content.EventOrganier.UserPicker.UserIds | users_by_id %} + {% for user in users %} + {{ user.UserName }} - {{ user.Email }} + {% endfor %}", + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.CommunityMember, part => part + .WithField("Member", field => field + .OfType("UserPickerField") + .WithDisplayName("Member") + .WithPosition("0") + .WithSettings(new UserPickerFieldSettings + { + Required = true, + DisplayAllUsers = true, + DisplayedRoles = Array.Empty(), + }) + ) + ); + + // Community + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Community, type => type + .DisplayedAs("Community") + .Creatable() + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart(Constants.ContentTypes.Community, part => part + .WithPosition("4") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + .WithSettings(new TitlePartSettings + { + Options = TitlePartOptions.GeneratedHidden, + Pattern = "{{ ContentItem.Content.RadarEntity.Name.Text }}", + }) + ) + .WithPart(Constants.ContentTypes.RadarEntity, part => part + .WithPosition("1") + ) + .WithPart("ContentPermissionsPart", part => part + .WithPosition("5") + ) + .WithPart("Workspace", part => part + .WithDisplayName("Workspace") + .WithDescription("Add an Artifact to your workspace of this community") + .WithPosition("2") + .WithSettings(new BagPartSettings + { + ContainedContentTypes = new[] { Constants.ContentTypes.Aritifact }, + }) + ) + .WithPart(Constants.ContentTypes.CommunityMember, part => part + .WithDisplayName("Community Member") + .WithDescription("Add a member to this community") + .WithPosition("3") + .WithSettings(new BagPartSettings + { + ContainedContentTypes = new[] { Constants.ContentTypes.CommunityMember }, + }) + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.Community, part => part + .WithField("Type", field => field + .OfType("TaxonomyField") + .WithDisplayName("Type") + .WithEditor("Tags") + .WithDisplayMode("Tags") + .WithPosition("0") + .WithSettings(new TaxonomyFieldSettings + { + Required = true, + TaxonomyContentItemId = _taxonomyIds.GetValueOrDefault("Community Types"), + Unique = true, + }) + .WithSettings(new TaxonomyFieldTagsEditorSettings + { + Open = false, + }) + ) + ); + } + } +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations/ArtifactMigration.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations/ArtifactMigration.cs deleted file mode 100644 index 75e297658..000000000 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations/ArtifactMigration.cs +++ /dev/null @@ -1,41 +0,0 @@ -using OrchardCore.ContentManagement.Metadata; -using OrchardCore.ContentManagement.Metadata.Settings; -using OrchardCore.Data.Migration; - -namespace StatCan.OrchardCore.Radar.Migrations -{ - public class ArtifactMigration: DataMigration - { - private readonly IContentDefinitionManager _contentDefinitionManager; - - public ArtifactMigration(IContentDefinitionManager contentDefinitionManager) - { - _contentDefinitionManager = contentDefinitionManager; - } - - public int Create() - { - CreateArtifact(); - - return 1; - } - - private void CreateArtifact() - { - _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Aritifact, type => type - .DisplayedAs("Artifact") - .Creatable() - .Listable() - .Draftable() - .Versionable() - .Securable() - .WithPart("Artifact", part => part - .WithPosition("1") - ) - .WithPart("TitlePart", part => part - .WithPosition("0") - ) -); - } - } -} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations/TaxonomyMigrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations/TaxonomyMigrations.cs deleted file mode 100644 index b723f9b62..000000000 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations/TaxonomyMigrations.cs +++ /dev/null @@ -1,233 +0,0 @@ -using System.Threading.Tasks; - -using OrchardCore.ContentManagement; -using OrchardCore.ContentManagement.Metadata; -using OrchardCore.ContentManagement.Metadata.Settings; -using OrchardCore.Data.Migration; -using OrchardCore.Title.Models; -using OrchardCore.Taxonomies.Models; - -namespace StatCan.OrchardCore.Radar.Migrations -{ - public class TaxonomyMigrations : DataMigration - { - private readonly IContentDefinitionManager _contentDefinitionManager; - private readonly IContentManager _contentManager; - - public TaxonomyMigrations(IContentDefinitionManager contentDefinitionManager, IContentManager contentManager) - { - _contentDefinitionManager = contentDefinitionManager; - _contentManager = contentManager; - } - - public async Task CreateAsync() - { - Topic(); - ProposalType(); - ProjectType(); - CommunityType(); - - await CreateTopicsTaxonomy(); - await CreateProposalTypesTaxonomy(); - await CreateProjectTypesTaxonomy(); - await CreateCommunityTypesTaxonoy(); - - return 1; - } - - private void Topic() - { - _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Topic, type => type - .DisplayedAs("Topic") - .Listable() - .Draftable() - .Versionable() - .Securable() - .WithPart("Topic", part => part - .WithPosition("2") - ) - .WithPart("TitlePart", part => part - .WithPosition("0") - .WithSettings(new TitlePartSettings - { - Options = TitlePartOptions.GeneratedHidden, - Pattern = "{{ ContentItem.Content.Topic.Name.Text }}", - }) - ) - ); - - _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.Topic, part => part - .WithField("Name", field => field - .OfType("TextField") - .WithDisplayName("Name") - ) - .WithField("Description", field => field - .OfType("TextField") - .WithDisplayName("Description") - ) - ); - } - - private void ProposalType() - { - _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.ProposalType, type => type - .DisplayedAs("Proposal Type") - .Listable() - .Draftable() - .Versionable() - .Securable() - .WithPart("ProposalType", part => part - .WithPosition("1") - ) - .WithPart("TitlePart", part => part - .WithPosition("0") - .WithSettings(new TitlePartSettings - { - Options = TitlePartOptions.GeneratedHidden, - Pattern = "{{ ContentItem.Content.ProposalType.Name.Text }}", - }) - ) - ); - - _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.ProposalType, part => part - .WithField("Name", field => field - .OfType("TextField") - .WithDisplayName("Name") - .WithPosition("0") - ) - .WithField("Description", field => field - .OfType("TextField") - .WithDisplayName("Description") - .WithPosition("1") - ) - ); - } - - private void ProjectType() - { - _contentDefinitionManager.AlterTypeDefinition("ProjectType", type => type - .DisplayedAs("Project Type") - .Listable() - .Draftable() - .Versionable() - .Securable() - .WithPart("ProjectType", part => part - .WithPosition("1") - ) - .WithPart("TitlePart", part => part - .WithPosition("0") - .WithSettings(new TitlePartSettings - { - Options = TitlePartOptions.GeneratedHidden, - Pattern = "{{ ContentItem.Content.ProjectType.Name.Text }}", - }) - ) - ); - - _contentDefinitionManager.AlterPartDefinition("ProjectType", part => part - .WithField("Name", field => field - .OfType("TextField") - .WithDisplayName("Name") - .WithPosition("0") - ) - .WithField("Description", field => field - .OfType("TextField") - .WithDisplayName("Description") - .WithPosition("1") - ) - ); - } - - private void CommunityType() - { - _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.CommunityType, type => type - .DisplayedAs("Community Type") - .Listable() - .Draftable() - .Versionable() - .Securable() - .WithPart("CommunityType", part => part - .WithPosition("1") - ) - .WithPart("TitlePart", part => part - .WithPosition("0") - .WithSettings(new TitlePartSettings - { - Options = TitlePartOptions.GeneratedHidden, - Pattern = "{{ ContentItem.Content.CommunityType.Name.Text }}", - }) - ) - ); - - _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.CommunityType, part => part - .WithField("Name", field => field - .OfType("TextField") - .WithDisplayName("Name") - .WithPosition("0") - ) - .WithField("Description", field => field - .OfType("TextField") - .WithDisplayName("Description") - .WithPosition("1") - ) - ); - - } - - private async Task CreateTopicsTaxonomy() - { - var topics = await _contentManager.NewAsync("Taxonomy"); - - topics.DisplayText = "Topics"; // Instead of TitlePart.Title - topics.Alter(part => - { - part.TermContentType = Constants.ContentTypes.Topic; - }); - - await _contentManager.CreateAsync(topics, VersionOptions.Published); - await _contentManager.PublishAsync(topics); - } - - private async Task CreateProposalTypesTaxonomy() - { - var proposalTypes = await _contentManager.NewAsync("Taxonomy"); - - proposalTypes.DisplayText = "Proposal Types"; // Instead of TitlePart.Title - proposalTypes.Alter(part => - { - part.TermContentType = Constants.ContentTypes.ProposalType; - }); - - await _contentManager.CreateAsync(proposalTypes, VersionOptions.Published); - await _contentManager.PublishAsync(proposalTypes); - } - - private async Task CreateProjectTypesTaxonomy() - { - var projectTypes = await _contentManager.NewAsync("Taxonomy"); - - projectTypes.DisplayText = "Project Types"; // Instead of TitlePart.Title - projectTypes.Alter(part => - { - part.TermContentType = Constants.ContentTypes.ProjectType; - }); - - await _contentManager.CreateAsync(projectTypes, VersionOptions.Published); - await _contentManager.PublishAsync(projectTypes); - } - - private async Task CreateCommunityTypesTaxonoy() - { - var communityTypes = await _contentManager.NewAsync("Taxonomy"); - - communityTypes.DisplayText = "Communities Types"; // Instead of TitlePart.Title - communityTypes.Alter(part => - { - part.TermContentType = Constants.ContentTypes.CommunityType; - }); - - await _contentManager.CreateAsync(communityTypes, VersionOptions.Published); - await _contentManager.PublishAsync(communityTypes); - } - } -} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations/radar.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Migrations/radar.recipe.json deleted file mode 100644 index 301eb6b82..000000000 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations/radar.recipe.json +++ /dev/null @@ -1,1138 +0,0 @@ -{ - "steps": [ - { - "name": "ContentDefinition", - "ContentTypes": [ - { - "Name": "Topic", - "DisplayName": "Topic", - "Settings": { - "ContentTypeSettings": { - "Listable": true, - "Draftable": true, - "Versionable": true, - "Securable": true - }, - "FullTextAspectSettings": {} - }, - "ContentTypePartDefinitionRecords": [ - { - "PartName": "Topic", - "Name": "Topic", - "Settings": { - "ContentTypePartSettings": { - "Position": "2" - } - } - }, - { - "PartName": "TitlePart", - "Name": "TitlePart", - "Settings": { - "ContentTypePartSettings": { - "Position": "0" - }, - "TitlePartSettings": { - "Options": 1, - "Pattern": "{{ ContentItem.Content.Topic.Name.Text }}" - }, - "ContentIndexSettings": {} - } - } - ] - }, - { - "Name": "Proposal", - "DisplayName": "Proposal", - "Settings": { - "ContentTypeSettings": { - "Creatable": true, - "Listable": true, - "Draftable": true, - "Versionable": true, - "Securable": true - }, - "FullTextAspectSettings": {} - }, - "ContentTypePartDefinitionRecords": [ - { - "PartName": "Proposal", - "Name": "Proposal", - "Settings": { - "ContentTypePartSettings": { - "Position": "2" - } - } - }, - { - "PartName": "RadarEntity", - "Name": "RadarEntity", - "Settings": { - "ContentTypePartSettings": { - "Position": "1" - } - } - }, - { - "PartName": "TitlePart", - "Name": "TitlePart", - "Settings": { - "ContentTypePartSettings": { - "Position": "0" - }, - "TitlePartSettings": { - "Options": 2, - "Pattern": "{{ ContentItem.Content.RadarEntity.Name.Text }}" - }, - "ContentIndexSettings": {} - } - }, - { - "PartName": "ContentPermissionsPart", - "Name": "ContentPermissionsPart", - "Settings": { - "ContentTypePartSettings": { - "Position": "3" - } - } - }, - { - "PartName": "BagPart", - "Name": "Workspace", - "Settings": { - "ContentTypePartSettings": { - "DisplayName": "Workspace", - "Description": "Add an Artifact to your workspace of this proposal", - "Position": "4" - }, - "BagPartSettings": { - "ContainedContentTypes": [ - "Artifact" - ] - }, - "ContentIndexSettings": {} - } - } - ] - }, - { - "Name": "ProjectType", - "DisplayName": "ProjectType", - "Settings": { - "ContentTypeSettings": { - "Listable": true, - "Draftable": true, - "Versionable": true, - "Securable": true - }, - "FullTextAspectSettings": {} - }, - "ContentTypePartDefinitionRecords": [ - { - "PartName": "ProjectType", - "Name": "ProjectType", - "Settings": { - "ContentTypePartSettings": { - "Position": "1" - } - } - }, - { - "PartName": "TitlePart", - "Name": "TitlePart", - "Settings": { - "ContentTypePartSettings": { - "Position": "0" - }, - "TitlePartSettings": { - "Options": 2, - "Pattern": "{{ ContentItem.Content.ProjectType.Name.Text }}" - }, - "ContentIndexSettings": {} - } - } - ] - }, - { - "Name": "ProposalType", - "DisplayName": "ProposalType", - "Settings": { - "ContentTypeSettings": { - "Listable": true, - "Draftable": true, - "Versionable": true, - "Securable": true - }, - "FullTextAspectSettings": {} - }, - "ContentTypePartDefinitionRecords": [ - { - "PartName": "ProposalType", - "Name": "ProposalType", - "Settings": { - "ContentTypePartSettings": { - "Position": "1" - } - } - }, - { - "PartName": "TitlePart", - "Name": "TitlePart", - "Settings": { - "ContentTypePartSettings": { - "Position": "0" - }, - "TitlePartSettings": { - "Options": 2, - "Pattern": "{{ ContentItem.Content.ProposalType.Name.Text }}" - }, - "ContentIndexSettings": {} - } - } - ] - }, - { - "Name": "CommunityType", - "DisplayName": "CommunityType", - "Settings": { - "ContentTypeSettings": { - "Listable": true, - "Draftable": true, - "Versionable": true, - "Securable": true - }, - "FullTextAspectSettings": {} - }, - "ContentTypePartDefinitionRecords": [ - { - "PartName": "CommunityType", - "Name": "CommunityType", - "Settings": { - "ContentTypePartSettings": { - "Position": "1" - } - } - }, - { - "PartName": "TitlePart", - "Name": "TitlePart", - "Settings": { - "ContentTypePartSettings": { - "Position": "0" - }, - "TitlePartSettings": { - "Options": 2, - "Pattern": "{{ ContentItem.Content.CommunityType.Name.Text }}" - }, - "ContentIndexSettings": {} - } - } - ] - }, - { - "Name": "Artifact", - "DisplayName": "Artifact", - "Settings": { - "ContentTypeSettings": { - "Creatable": true, - "Listable": true, - "Draftable": true, - "Versionable": true, - "Securable": true - }, - "FullTextAspectSettings": {} - }, - "ContentTypePartDefinitionRecords": [ - { - "PartName": "Artifact", - "Name": "Artifact", - "Settings": { - "ContentTypePartSettings": { - "Position": "1" - } - } - }, - { - "PartName": "TitlePart", - "Name": "TitlePart", - "Settings": { - "ContentTypePartSettings": { - "Position": "0" - } - } - } - ] - }, - { - "Name": "Event", - "DisplayName": "Event", - "Settings": { - "ContentTypeSettings": { - "Creatable": true, - "Listable": true, - "Draftable": true, - "Versionable": true, - "Securable": true - }, - "FullTextAspectSettings": {} - }, - "ContentTypePartDefinitionRecords": [ - { - "PartName": "Event", - "Name": "Event", - "Settings": { - "ContentTypePartSettings": { - "Position": "1" - } - } - }, - { - "PartName": "ContentPermissionsPart", - "Name": "ContentPermissionsPart", - "Settings": { - "ContentTypePartSettings": { - "Position": "5" - } - } - }, - { - "PartName": "RadarEntity", - "Name": "RadarEntity", - "Settings": { - "ContentTypePartSettings": { - "Position": "2" - } - } - }, - { - "PartName": "TitlePart", - "Name": "TitlePart", - "Settings": { - "ContentTypePartSettings": { - "Position": "0" - }, - "TitlePartSettings": { - "Options": 2, - "Pattern": "{{ ContentItem.Content.RadarEntity.Name.Text }}" - }, - "ContentIndexSettings": {} - } - }, - { - "PartName": "BagPart", - "Name": "EventOrganizer", - "Settings": { - "ContentTypePartSettings": { - "DisplayName": "EventOrganizer", - "Description": "Event Organizer", - "Position": "3" - }, - "BagPartSettings": { - "ContainedContentTypes": [ - "EventOrganizer" - ] - }, - "ContentIndexSettings": {} - } - }, - { - "PartName": "BagPart", - "Name": "Workspace", - "Settings": { - "ContentTypePartSettings": { - "DisplayName": "Workspace", - "Description": "Add an Artifact to your workspace of this event", - "Position": "4" - }, - "BagPartSettings": { - "ContainedContentTypes": [ - "Artifact" - ] - }, - "ContentIndexSettings": {} - } - } - ] - }, - { - "Name": "EventOrganizer", - "DisplayName": "EventOrganizer", - "Settings": { - "ContentTypeSettings": { - "Creatable": true, - "Listable": true, - "Draftable": true, - "Versionable": true, - "Securable": true - }, - "FullTextAspectSettings": {} - }, - "ContentTypePartDefinitionRecords": [ - { - "PartName": "EventOrganizer", - "Name": "EventOrganizer", - "Settings": { - "ContentTypePartSettings": { - "Position": "1" - } - } - }, - { - "PartName": "TitlePart", - "Name": "TitlePart", - "Settings": { - "ContentTypePartSettings": { - "Position": "0" - }, - "TitlePartSettings": { - "Options": 1, - "Pattern": "{% assign users = ContentItem.Content.EventOrganier.UserPicker.UserIds | users_by_id %}\r\n{% for user in users %}\r\n {{ user.UserName }} - {{ user.Email }}\r\n{% endfor %}" - }, - "ContentIndexSettings": {} - } - } - ] - }, - { - "Name": "CommunityMember", - "DisplayName": "CommunityMember", - "Settings": { - "ContentTypeSettings": { - "Creatable": true, - "Listable": true, - "Draftable": true, - "Versionable": true, - "Securable": true - }, - "FullTextAspectSettings": {} - }, - "ContentTypePartDefinitionRecords": [ - { - "PartName": "CommunityMember", - "Name": "CommunityMember", - "Settings": { - "ContentTypePartSettings": { - "Position": "1" - } - } - }, - { - "PartName": "TitlePart", - "Name": "TitlePart", - "Settings": { - "ContentTypePartSettings": { - "Position": "0" - }, - "TitlePartSettings": { - "Options": 1, - "Pattern": "{% assign users = ContentItem.Content.EventOrganier.UserPicker.UserIds | users_by_id %}\r\n{% for user in users %}\r\n {{ user.UserName }} - {{ user.Email }}\r\n{% endfor %}" - }, - "ContentIndexSettings": {} - } - } - ] - }, - { - "Name": "Community", - "DisplayName": "Community", - "Settings": { - "ContentTypeSettings": { - "Creatable": true, - "Listable": true, - "Draftable": true, - "Versionable": true, - "Securable": true - }, - "FullTextAspectSettings": {} - }, - "ContentTypePartDefinitionRecords": [ - { - "PartName": "Community", - "Name": "Community", - "Settings": { - "ContentTypePartSettings": { - "Position": "4" - } - } - }, - { - "PartName": "TitlePart", - "Name": "TitlePart", - "Settings": { - "ContentTypePartSettings": { - "Position": "0" - }, - "TitlePartSettings": { - "Options": 2, - "Pattern": "{{ ContentItem.Content.RadarEntity.Name.Text }}" - }, - "ContentIndexSettings": {} - } - }, - { - "PartName": "RadarEntity", - "Name": "RadarEntity", - "Settings": { - "ContentTypePartSettings": { - "Position": "1" - } - } - }, - { - "PartName": "ContentPermissionsPart", - "Name": "ContentPermissionsPart", - "Settings": { - "ContentTypePartSettings": { - "Position": "5" - } - } - }, - { - "PartName": "BagPart", - "Name": "Workspace", - "Settings": { - "ContentTypePartSettings": { - "DisplayName": "Workspace", - "Description": "Add an Artifact to your workspace of this community", - "Position": "2" - }, - "BagPartSettings": { - "ContainedContentTypes": [ - "Artifact" - ] - }, - "ContentIndexSettings": {} - } - }, - { - "PartName": "BagPart", - "Name": "CommunityMember", - "Settings": { - "ContentTypePartSettings": { - "DisplayName": "Community Member", - "Description": "Add a member to this community", - "Position": "3" - }, - "BagPartSettings": { - "ContainedContentTypes": [ - "CommunityMember" - ] - }, - "ContentIndexSettings": {} - } - } - ] - }, - { - "Name": "ProjectMember", - "DisplayName": "ProjectMember", - "Settings": { - "ContentTypeSettings": { - "Creatable": true, - "Listable": true, - "Draftable": true, - "Versionable": true, - "Securable": true - }, - "FullTextAspectSettings": {} - }, - "ContentTypePartDefinitionRecords": [ - { - "PartName": "ProjectMember", - "Name": "ProjectMember", - "Settings": { - "ContentTypePartSettings": { - "Position": "1" - } - } - }, - { - "PartName": "TitlePart", - "Name": "TitlePart", - "Settings": { - "ContentTypePartSettings": { - "Position": "0" - }, - "TitlePartSettings": { - "Options": 1, - "Pattern": "{% assign users = ContentItem.Content.EventOrganier.UserPicker.UserIds | users_by_id %}\r\n{% for user in users %}\r\n {{ user.UserName }} - {{ user.Email }}\r\n{% endfor %}" - }, - "ContentIndexSettings": {} - } - } - ] - }, - { - "Name": "Project", - "DisplayName": "Project", - "Settings": { - "ContentTypeSettings": { - "Creatable": true, - "Listable": true, - "Draftable": true, - "Versionable": true, - "Securable": true - }, - "FullTextAspectSettings": {} - }, - "ContentTypePartDefinitionRecords": [ - { - "PartName": "Project", - "Name": "Project", - "Settings": { - "ContentTypePartSettings": { - "Position": "4" - } - } - }, - { - "PartName": "RadarEntity", - "Name": "RadarEntity", - "Settings": { - "ContentTypePartSettings": { - "Position": "1" - } - } - }, - { - "PartName": "TitlePart", - "Name": "TitlePart", - "Settings": { - "ContentTypePartSettings": { - "Position": "0" - }, - "TitlePartSettings": { - "Options": 2, - "Pattern": "{{ ContentItem.Content.RadarEntity.Name.Text }}" - }, - "ContentIndexSettings": {} - } - }, - { - "PartName": "ContentPermissionsPart", - "Name": "ContentPermissionsPart", - "Settings": { - "ContentTypePartSettings": { - "Position": "5" - } - } - }, - { - "PartName": "BagPart", - "Name": "Workspace", - "Settings": { - "ContentTypePartSettings": { - "DisplayName": "Workspace", - "Description": "Add an Artifact to your workspace of this project", - "Position": "2" - }, - "BagPartSettings": { - "ContainedContentTypes": [ - "Artifact" - ] - }, - "ContentIndexSettings": {} - } - }, - { - "PartName": "BagPart", - "Name": "ProjectMember", - "Settings": { - "ContentTypePartSettings": { - "DisplayName": "Project Member", - "Description": "Add a member to this project", - "Position": "3" - }, - "BagPartSettings": { - "ContainedContentTypes": [ - "ProjectMember" - ] - }, - "ContentIndexSettings": {} - } - } - ] - } - ], - "ContentParts": [ - { - "Name": "RadarEntity", - "Settings": { - "ContentPartSettings": { - "Attachable": true - } - }, - "ContentPartFieldDefinitionRecords": [ - { - "FieldName": "TextField", - "Name": "Name", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Name", - "Position": "0" - } - } - }, - { - "FieldName": "TextField", - "Name": "Description", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Description", - "Position": "1" - } - } - }, - { - "FieldName": "ContentPickerField", - "Name": "RelatedEntity", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Related Entity", - "Position": "3" - }, - "ContentPickerFieldSettings": { - "Multiple": true, - "DisplayedContentTypes": [ - "Proposal" - ] - }, - "ContentIndexSettings": {} - } - }, - { - "FieldName": "TaxonomyField", - "Name": "Topics", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Topics", - "Editor": "Tags", - "DisplayMode": "Tags", - "Position": "2" - }, - "ContentIndexSettings": {}, - "TaxonomyFieldSettings": { - "TaxonomyContentItemId": "43p29bmfpe85a319g7t98waa40", - "Unique": true - }, - "TaxonomyFieldTagsEditorSettings": { - "Open": false - } - } - } - ] - }, - { - "Name": "Topic", - "Settings": {}, - "ContentPartFieldDefinitionRecords": [ - { - "FieldName": "TextField", - "Name": "Name", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Name" - } - } - }, - { - "FieldName": "TextField", - "Name": "Description", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Description" - } - } - } - ] - }, - { - "Name": "Proposal", - "Settings": {}, - "ContentPartFieldDefinitionRecords": [ - { - "FieldName": "TaxonomyField", - "Name": "Type", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Type", - "Editor": "Tags", - "DisplayMode": "Tags", - "Position": "0" - }, - "ContentIndexSettings": {}, - "TaxonomyFieldSettings": { - "Required": true, - "TaxonomyContentItemId": "4fn9mss5kdqfmy0b7qwbnneb5s", - "Unique": true - }, - "TaxonomyFieldTagsEditorSettings": { - "Open": false - } - } - } - ] - }, - { - "Name": "ProjectType", - "Settings": {}, - "ContentPartFieldDefinitionRecords": [ - { - "FieldName": "TextField", - "Name": "Name", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Name", - "Position": "0" - } - } - }, - { - "FieldName": "TextField", - "Name": "Description", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Description", - "Position": "1" - } - } - } - ] - }, - { - "Name": "ProposalType", - "Settings": {}, - "ContentPartFieldDefinitionRecords": [ - { - "FieldName": "TextField", - "Name": "Name", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Name", - "Position": "0" - } - } - }, - { - "FieldName": "TextField", - "Name": "Description", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Description", - "Position": "1" - } - } - } - ] - }, - { - "Name": "CommunityType", - "Settings": {}, - "ContentPartFieldDefinitionRecords": [ - { - "FieldName": "TextField", - "Name": "Name", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Name", - "Position": "0" - } - } - }, - { - "FieldName": "TextField", - "Name": "Description", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Description", - "Position": "1" - } - } - } - ] - }, - { - "Name": "Event", - "Settings": {}, - "ContentPartFieldDefinitionRecords": [ - { - "FieldName": "UserPickerField", - "Name": "Attendees", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Attendees", - "Position": "0" - } - } - }, - { - "FieldName": "DateTimeField", - "Name": "StartDate", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Start Date", - "Position": "1" - } - } - }, - { - "FieldName": "DateTimeField", - "Name": "EndDate", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "End Date", - "Position": "2" - } - } - } - ] - }, - { - "Name": "EventOrganizer", - "Settings": {}, - "ContentPartFieldDefinitionRecords": [ - { - "FieldName": "UserPickerField", - "Name": "Organizer", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Organizer", - "Position": "0" - }, - "UserPickerFieldSettings": { - "Required": true, - "DisplayAllUsers": true, - "DisplayedRoles": [] - }, - "ContentIndexSettings": {} - } - }, - { - "FieldName": "TextField", - "Name": "Role", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Role", - "Position": "1" - } - } - } - ] - }, - { - "Name": "CommunityMember", - "Settings": {}, - "ContentPartFieldDefinitionRecords": [ - { - "FieldName": "UserPickerField", - "Name": "Member", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Member", - "Position": "0" - }, - "UserPickerFieldSettings": { - "Required": true, - "DisplayAllUsers": true, - "DisplayedRoles": [] - }, - "ContentIndexSettings": {} - } - } - ] - }, - { - "Name": "Community", - "Settings": {}, - "ContentPartFieldDefinitionRecords": [ - { - "FieldName": "TaxonomyField", - "Name": "Type", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Type", - "Position": "0" - }, - "ContentIndexSettings": {}, - "TaxonomyFieldSettings": { - "Required": true, - "TaxonomyContentItemId": "4be7bdq6y7k9f1wpf1q6h8kwd9", - "Unique": true - } - } - } - ] - }, - { - "Name": "ProjectMember", - "Settings": {}, - "ContentPartFieldDefinitionRecords": [ - { - "FieldName": "UserPickerField", - "Name": "Member", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Member", - "Position": "0" - }, - "UserPickerFieldSettings": { - "Required": true, - "DisplayAllUsers": true, - "DisplayedRoles": [] - }, - "ContentIndexSettings": {} - } - } - ] - }, - { - "Name": "Project", - "Settings": {}, - "ContentPartFieldDefinitionRecords": [ - { - "FieldName": "TaxonomyField", - "Name": "Type", - "Settings": { - "ContentPartFieldSettings": { - "DisplayName": "Type", - "Position": "0" - }, - "ContentIndexSettings": {}, - "TaxonomyFieldSettings": { - "Required": true, - "TaxonomyContentItemId": "4fg74m81qafx3zp342n8csj2wm", - "Unique": true - } - } - } - ] - } - ] - }, - { - "name": "content", - "data": [ - { - "ContentItemId": "43p29bmfpe85a319g7t98waa40", - "ContentItemVersionId": "496gng475pa3r2s6w4v724zjxz", - "ContentType": "Taxonomy", - "DisplayText": "Topics", - "Latest": true, - "Published": true, - "ModifiedUtc": "2021-09-15T13:22:03.8522685Z", - "PublishedUtc": "2021-09-15T13:22:03.8580812Z", - "CreatedUtc": "2021-09-15T13:22:03.8522685Z", - "Owner": "4rbm0rzcxcvx7xndye0hp63nw3", - "Author": "admin", - "TitlePart": { - "Title": "Topics" - }, - "AliasPart": { - "Alias": "topics" - }, - "AutoroutePart": { - "Path": "topics", - "SetHomepage": false, - "Disabled": false, - "RouteContainedItems": false, - "Absolute": false - }, - "TaxonomyPart": { - "TermContentType": "Topic", - "Terms": [] - } - }, - { - "ContentItemId": "4fg74m81qafx3zp342n8csj2wm", - "ContentItemVersionId": "47q1vnrggydfj7ah65mqahj5cn", - "ContentType": "Taxonomy", - "DisplayText": "Project Type", - "Latest": true, - "Published": true, - "ModifiedUtc": "2021-09-15T13:42:45.0701723Z", - "PublishedUtc": "2021-09-15T13:42:45.0777122Z", - "CreatedUtc": "2021-09-15T13:42:45.0701723Z", - "Owner": "4rbm0rzcxcvx7xndye0hp63nw3", - "Author": "admin", - "TitlePart": { - "Title": "Project Type" - }, - "AliasPart": { - "Alias": "projecttype" - }, - "AutoroutePart": { - "Path": "projecttype", - "SetHomepage": false, - "Disabled": false, - "RouteContainedItems": false, - "Absolute": false - }, - "TaxonomyPart": { - "TermContentType": "ProjectType", - "Terms": [] - } - }, - { - "ContentItemId": "4fn9mss5kdqfmy0b7qwbnneb5s", - "ContentItemVersionId": "4k50x7trga6cn4rpsmwsc92qmx", - "ContentType": "Taxonomy", - "DisplayText": "Proposal Type", - "Latest": true, - "Published": true, - "ModifiedUtc": "2021-09-15T13:46:00.5646917Z", - "PublishedUtc": "2021-09-15T13:46:00.5693251Z", - "CreatedUtc": "2021-09-15T13:46:00.5646917Z", - "Owner": "4rbm0rzcxcvx7xndye0hp63nw3", - "Author": "admin", - "TitlePart": { - "Title": "Proposal Type" - }, - "AliasPart": { - "Alias": "proposaltype" - }, - "AutoroutePart": { - "Path": "proposaltype", - "SetHomepage": false, - "Disabled": false, - "RouteContainedItems": false, - "Absolute": false - }, - "TaxonomyPart": { - "TermContentType": "ProposalType", - "Terms": [] - } - }, - { - "ContentItemId": "4be7bdq6y7k9f1wpf1q6h8kwd9", - "ContentItemVersionId": "44gxhx8fymzh54vvf64nnwma4a", - "ContentType": "Taxonomy", - "DisplayText": "Community Type", - "Latest": true, - "Published": true, - "ModifiedUtc": "2021-09-15T14:45:27.1221385Z", - "PublishedUtc": "2021-09-15T14:45:27.1263705Z", - "CreatedUtc": "2021-09-15T14:45:27.1221385Z", - "Owner": "4rbm0rzcxcvx7xndye0hp63nw3", - "Author": "admin", - "TitlePart": { - "Title": "Community Type" - }, - "AliasPart": { - "Alias": "communitytype" - }, - "AutoroutePart": { - "Path": "communitytype", - "SetHomepage": false, - "Disabled": false, - "RouteContainedItems": false, - "Absolute": false - }, - "TaxonomyPart": { - "TermContentType": "CommunityType", - "Terms": [] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs index 31a26b258..5a0dfdc22 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs @@ -4,7 +4,6 @@ using Microsoft.Extensions.DependencyInjection; using OrchardCore.Modules; using OrchardCore.Data.Migration; -using StatCan.OrchardCore.Radar.Migrations; namespace StatCan.OrchardCore.Radar { @@ -12,8 +11,7 @@ public class Startup : StartupBase { public override void ConfigureServices(IServiceCollection services) { - services.AddScoped(); - services.AddScoped(); + services.AddScoped(); } public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider) diff --git a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj index 2a5dc4ae5..a75b9040c 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj +++ b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj @@ -12,9 +12,12 @@ - + + + + From de4f2cc1d96cb29d75bed7412afa535d541b9cbc Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Thu, 16 Sep 2021 16:01:28 -0400 Subject: [PATCH 007/198] wip: add setup recipe --- .../Migrations/AppMigration.cs | 24 ++++ .../EntityMigration.cs} | 6 +- .../Migrations/app.recipe.json | 104 ++++++++++++++++++ .../Migrations/init.recipe.json | 86 +++++++++++++++ .../Recipes/radar.setup.recipe.json | 57 ++++++++++ src/Apps/StatCan.OrchardCore.Radar/Startup.cs | 4 +- .../StatCan.OrchardCore.Radar.csproj | 3 +- .../assets/images/radar-icon-white.svg | 18 +++ 8 files changed, 297 insertions(+), 5 deletions(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations/AppMigration.cs rename src/Apps/StatCan.OrchardCore.Radar/{Migrations.cs => Migrations/EntityMigration.cs} (99%) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations/app.recipe.json create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations/init.recipe.json create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/assets/images/radar-icon-white.svg diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations/AppMigration.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations/AppMigration.cs new file mode 100644 index 000000000..1576f6769 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations/AppMigration.cs @@ -0,0 +1,24 @@ +using System.Threading.Tasks; +using OrchardCore.Recipes.Services; +using OrchardCore.Data.Migration; + +namespace StatCan.OrchardCore.Radar.Migrations +{ + public class AppMigration : DataMigration + { + private readonly IRecipeMigrator _recipeMigrator; + + public AppMigration(IRecipeMigrator recipeMigrator) + { + _recipeMigrator = recipeMigrator; + } + + public async Task CreateAsync() + { + await _recipeMigrator.ExecuteAsync("init.recipe.json", this); + await _recipeMigrator.ExecuteAsync("app.recipe.json", this); + + return 1; + } + } +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations/EntityMigration.cs similarity index 99% rename from src/Apps/StatCan.OrchardCore.Radar/Migrations.cs rename to src/Apps/StatCan.OrchardCore.Radar/Migrations/EntityMigration.cs index 11f163190..62c34a49b 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations/EntityMigration.cs @@ -13,16 +13,16 @@ using OrchardCore.Taxonomies.Settings; using OrchardCore.Flows.Models; -namespace StatCan.OrchardCore.Radar +namespace StatCan.OrchardCore.Radar.Migrations { - public class Migrations : DataMigration + public class EntityMigration : DataMigration { private readonly IContentDefinitionManager _contentDefinitionManager; private readonly IContentManager _contentManager; private readonly Dictionary _taxonomyIds; - public Migrations(IContentDefinitionManager contentDefinitionManager, IContentManager contentManager) + public EntityMigration(IContentDefinitionManager contentDefinitionManager, IContentManager contentManager) { _contentDefinitionManager = contentDefinitionManager; _contentManager = contentManager; diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations/app.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Migrations/app.recipe.json new file mode 100644 index 000000000..d2e2e63c1 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations/app.recipe.json @@ -0,0 +1,104 @@ +{ + "name": "", + "displayName": "", + "description": "", + "author": "", + "website": "", + "version": "", + "issetuprecipe": false, + "categories": [], + "tags": [], + "steps": [ + { + "name": "themes", + "admin": "DigitalAdmin", + "site": "VuetifyTheme" + }, + { + "name": "Settings", + "Calendar": null, + "UseCdn": false, + "TimeZoneId": "America/Toronto", + "AppendVersion": true, + "LocalizationSettings": { + "DefaultCulture": "en", + "SupportedCultures": [ "fr", "en" ] + }, + "AdminSettings": { + "DisplayMenuFilter": true + }, + "LoginSettings": { + "UseSiteTheme": true + }, + "ResetPasswordSettings": { + "UseSiteTheme": true + }, + "RegistrationSettings": { + "UseSiteTheme": true + }, + "LayerSettings": { + "Zones": [ + "Header", + "Breadcrumb", + "NavigationDrawer", + "Footer", + "IEBanner" + ] + } + }, + { + "name": "Layers", + "Layers": [ + { + "Name": "All", + "Rule": "true", + "Description": null + } + ] + }, + { + "name": "media", + "Files": [ + { + "SourcePath": "../wwwroot/assets/images/radar-icon-white.svg", + "TargetPath": "radar-icon-white.svg" + } + ] + }, + { + "name": "custom-settings", + "VuetifyThemeSettings": { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "VuetifyThemeSettings", + "DisplayText": "", + "Latest": false, + "Published": false, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", + "VuetifyThemeSettings": { + "DisplayName": { + "Text": "Radar" + }, + "Logo": { + "Paths": [ + "radar-icon-white.svg" + ], + "MediaTexts": [ + "" + ] + }, + "DisplayMode": { + "Text": "light" + }, + "ThemeOptions": { + "Text": null + } + } + } + } + ] +} \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations/init.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Migrations/init.recipe.json new file mode 100644 index 000000000..73272c4ec --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations/init.recipe.json @@ -0,0 +1,86 @@ +{ + "name": "", + "displayName": "", + "description": "", + "author": "", + "website": "", + "version": "", + "issetuprecipe": false, + "categories": [], + "tags": [], + "steps": [ + { + "name": "Feature", + "enable": [ + "Application.Default", + "StatCan.OrchardCore.Cms.Web", + "OrchardCore.Liquid", + "OrchardCore.Resources", + "OrchardCore.Settings", + "OrchardCore.Contents", + "OrchardCore.ContentTypes", + "OrchardCore.Autoroute", + "OrchardCore.Widgets", + "OrchardCore.Flows", + "OrchardCore.Title", + "OrchardCore.Shortcodes", + "OrchardCore.Html", + "OrchardCore.Admin", + "OrchardCore.Templates", + "OrchardCore.Alias", + "OrchardCore.Features", + "OrchardCore.Scripting", + "OrchardCore.Recipes", + "OrchardCore.ContentFields", + "OrchardCore.Users", + "OrchardCore.Localization", + "OrchardCore.ContentLocalization", + "OrchardCore.ContentLocalization.ContentCulturePicker", + "OrchardCore.ContentPreview", + "OrchardCore.Deployment", + "OrchardCore.Contents.Deployment.Download", + "OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget", + "OrchardCore.CustomSettings", + "OrchardCore.Diagnostics", + "OrchardCore.DynamicCache", + "OrchardCore.Email", + "OrchardCore.Feeds", + "OrchardCore.HomeRoute", + "OrchardCore.Https", + "OrchardCore.Indexing", + "OrchardCore.Rules", + "OrchardCore.Layers", + "OrchardCore.Lists", + "OrchardCore.Markdown", + "OrchardCore.Media", + "OrchardCore.Menu", + "OrchardCore.Microsoft.Authentication.AzureAD", + "OrchardCore.Navigation", + "OrchardCore.Placements", + "OrchardCore.Queries", + "OrchardCore.ReverseProxy", + "OrchardCore.Roles", + "OrchardCore.Shortcodes.Templates", + "OrchardCore.Themes", + "OrchardCore.Users.Registration", + "OrchardCore.Workflows", + "OrchardCore.Workflows.Http", + "OrchardCore.Workflows.Timers", + "StatCan.OrchardCore.ContentPermissions", + "StatCan.OrchardCore.Configuration", + "StatCan.OrchardCore.ContentFields", + "StatCan.OrchardCore.ContentFields.PredefinedGroup", + "StatCan.OrchardCore.DisplayHelpers", + "StatCan.OrchardCore.EmailTemplates", + "StatCan.OrchardCore.GitHub", + "StatCan.OrchardCore.LocalizedText", + "StatCan.OrchardCore.Scripting", + "StatCan.OrchardCore.VueForms", + "StatCan.OrchardCore.VueForms.Localized", + "StatCan.OrchardCore.Vuetify", + "DigitalAdmin", + "VuetifyTheme" + ] + } + ] +} \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json new file mode 100644 index 000000000..8fb359156 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -0,0 +1,57 @@ +{ + "name": "radar-setup", + "displayName": "Radar Setup", + "description": "Recipe used to set the Radar application.", + "author": "Digital Innovation Team", + "website": "https://digital.statcan.gc.ca", + "version": "1.0", + "issetuprecipe": false, + "categories": [ "radar" ], + "tags": [ "innovation", "inno" ], + "steps": [ + { + "name": "media", + "Files": [ + { + "SourcePath": "../wwwroot/assets/images/radar-icon-white.svg", + "TargetPath": "radar-icon-white.svg" + } + ] + }, + { + "name": "custom-settings", + "VuetifyThemeSettings": { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "VuetifyThemeSettings", + "DisplayText": "", + "Latest": false, + "Published": false, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", + "VuetifyThemeSettings": { + "DisplayName": { + "Text": "Radar" + }, + "Logo": { + "Paths": [ + "radar-icon-white.svg" + ], + "MediaTexts": [ + "" + ] + }, + "DisplayMode": { + "Text": "light" + }, + "ThemeOptions": { + "Text": null + } + } + } + } + ] +} \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs index 5a0dfdc22..631a22cc1 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection; using OrchardCore.Modules; using OrchardCore.Data.Migration; +using StatCan.OrchardCore.Radar.Migrations; namespace StatCan.OrchardCore.Radar { @@ -11,7 +12,8 @@ public class Startup : StartupBase { public override void ConfigureServices(IServiceCollection services) { - services.AddScoped(); + services.AddScoped(); + services.AddScoped(); } public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider) diff --git a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj index a75b9040c..634b73c1d 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj +++ b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj @@ -1,4 +1,4 @@ - + $(AspNetCoreTargetFramework) @@ -18,6 +18,7 @@ + diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/assets/images/radar-icon-white.svg b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/assets/images/radar-icon-white.svg new file mode 100644 index 000000000..168b10556 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/assets/images/radar-icon-white.svg @@ -0,0 +1,18 @@ + + + + + + + + + + From 2800e9f24c9ac7b6c0caf41f48822b7558af896a Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Fri, 17 Sep 2021 07:25:13 -0400 Subject: [PATCH 008/198] wip: recipe to initialize radar --- .../EntityMigration.cs => Migrations.cs} | 8 +- .../Migrations/AppMigration.cs | 24 ---- .../Migrations/app.recipe.json | 104 ------------------ .../Migrations/init.recipe.json | 86 --------------- .../Recipes/radar.setup.recipe.json | 51 ++++++++- src/Apps/StatCan.OrchardCore.Radar/Startup.cs | 4 +- 6 files changed, 55 insertions(+), 222 deletions(-) rename src/Apps/StatCan.OrchardCore.Radar/{Migrations/EntityMigration.cs => Migrations.cs} (99%) delete mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations/AppMigration.cs delete mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations/app.recipe.json delete mode 100644 src/Apps/StatCan.OrchardCore.Radar/Migrations/init.recipe.json diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations/EntityMigration.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs similarity index 99% rename from src/Apps/StatCan.OrchardCore.Radar/Migrations/EntityMigration.cs rename to src/Apps/StatCan.OrchardCore.Radar/Migrations.cs index 62c34a49b..3e29f85ec 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations/EntityMigration.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -13,16 +13,16 @@ using OrchardCore.Taxonomies.Settings; using OrchardCore.Flows.Models; -namespace StatCan.OrchardCore.Radar.Migrations +namespace StatCan.OrchardCore.Radar { - public class EntityMigration : DataMigration + public class Migrations : DataMigration { private readonly IContentDefinitionManager _contentDefinitionManager; private readonly IContentManager _contentManager; private readonly Dictionary _taxonomyIds; - public EntityMigration(IContentDefinitionManager contentDefinitionManager, IContentManager contentManager) + public Migrations(IContentDefinitionManager contentDefinitionManager, IContentManager contentManager) { _contentDefinitionManager = contentDefinitionManager; _contentManager = contentManager; @@ -33,7 +33,7 @@ public EntityMigration(IContentDefinitionManager contentDefinitionManager, ICont public async Task CreateAsync() { CreateTaxonomies(); - await CreateTaxonomyItems(); + await CreateTaxonomyItems(); CreateArtifact(); CreateRadarEntityPart(); CreateProposal(); diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations/AppMigration.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations/AppMigration.cs deleted file mode 100644 index 1576f6769..000000000 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations/AppMigration.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Threading.Tasks; -using OrchardCore.Recipes.Services; -using OrchardCore.Data.Migration; - -namespace StatCan.OrchardCore.Radar.Migrations -{ - public class AppMigration : DataMigration - { - private readonly IRecipeMigrator _recipeMigrator; - - public AppMigration(IRecipeMigrator recipeMigrator) - { - _recipeMigrator = recipeMigrator; - } - - public async Task CreateAsync() - { - await _recipeMigrator.ExecuteAsync("init.recipe.json", this); - await _recipeMigrator.ExecuteAsync("app.recipe.json", this); - - return 1; - } - } -} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations/app.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Migrations/app.recipe.json deleted file mode 100644 index d2e2e63c1..000000000 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations/app.recipe.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "name": "", - "displayName": "", - "description": "", - "author": "", - "website": "", - "version": "", - "issetuprecipe": false, - "categories": [], - "tags": [], - "steps": [ - { - "name": "themes", - "admin": "DigitalAdmin", - "site": "VuetifyTheme" - }, - { - "name": "Settings", - "Calendar": null, - "UseCdn": false, - "TimeZoneId": "America/Toronto", - "AppendVersion": true, - "LocalizationSettings": { - "DefaultCulture": "en", - "SupportedCultures": [ "fr", "en" ] - }, - "AdminSettings": { - "DisplayMenuFilter": true - }, - "LoginSettings": { - "UseSiteTheme": true - }, - "ResetPasswordSettings": { - "UseSiteTheme": true - }, - "RegistrationSettings": { - "UseSiteTheme": true - }, - "LayerSettings": { - "Zones": [ - "Header", - "Breadcrumb", - "NavigationDrawer", - "Footer", - "IEBanner" - ] - } - }, - { - "name": "Layers", - "Layers": [ - { - "Name": "All", - "Rule": "true", - "Description": null - } - ] - }, - { - "name": "media", - "Files": [ - { - "SourcePath": "../wwwroot/assets/images/radar-icon-white.svg", - "TargetPath": "radar-icon-white.svg" - } - ] - }, - { - "name": "custom-settings", - "VuetifyThemeSettings": { - "ContentItemId": "[js: uuid()]", - "ContentItemVersionId": null, - "ContentType": "VuetifyThemeSettings", - "DisplayText": "", - "Latest": false, - "Published": false, - "ModifiedUtc": null, - "PublishedUtc": null, - "CreatedUtc": null, - "Owner": "[js: parameters('AdminUserId')]", - "Author": "[js: parameters('AdminUsername')]", - "VuetifyThemeSettings": { - "DisplayName": { - "Text": "Radar" - }, - "Logo": { - "Paths": [ - "radar-icon-white.svg" - ], - "MediaTexts": [ - "" - ] - }, - "DisplayMode": { - "Text": "light" - }, - "ThemeOptions": { - "Text": null - } - } - } - } - ] -} \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations/init.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Migrations/init.recipe.json deleted file mode 100644 index 73272c4ec..000000000 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations/init.recipe.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "name": "", - "displayName": "", - "description": "", - "author": "", - "website": "", - "version": "", - "issetuprecipe": false, - "categories": [], - "tags": [], - "steps": [ - { - "name": "Feature", - "enable": [ - "Application.Default", - "StatCan.OrchardCore.Cms.Web", - "OrchardCore.Liquid", - "OrchardCore.Resources", - "OrchardCore.Settings", - "OrchardCore.Contents", - "OrchardCore.ContentTypes", - "OrchardCore.Autoroute", - "OrchardCore.Widgets", - "OrchardCore.Flows", - "OrchardCore.Title", - "OrchardCore.Shortcodes", - "OrchardCore.Html", - "OrchardCore.Admin", - "OrchardCore.Templates", - "OrchardCore.Alias", - "OrchardCore.Features", - "OrchardCore.Scripting", - "OrchardCore.Recipes", - "OrchardCore.ContentFields", - "OrchardCore.Users", - "OrchardCore.Localization", - "OrchardCore.ContentLocalization", - "OrchardCore.ContentLocalization.ContentCulturePicker", - "OrchardCore.ContentPreview", - "OrchardCore.Deployment", - "OrchardCore.Contents.Deployment.Download", - "OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget", - "OrchardCore.CustomSettings", - "OrchardCore.Diagnostics", - "OrchardCore.DynamicCache", - "OrchardCore.Email", - "OrchardCore.Feeds", - "OrchardCore.HomeRoute", - "OrchardCore.Https", - "OrchardCore.Indexing", - "OrchardCore.Rules", - "OrchardCore.Layers", - "OrchardCore.Lists", - "OrchardCore.Markdown", - "OrchardCore.Media", - "OrchardCore.Menu", - "OrchardCore.Microsoft.Authentication.AzureAD", - "OrchardCore.Navigation", - "OrchardCore.Placements", - "OrchardCore.Queries", - "OrchardCore.ReverseProxy", - "OrchardCore.Roles", - "OrchardCore.Shortcodes.Templates", - "OrchardCore.Themes", - "OrchardCore.Users.Registration", - "OrchardCore.Workflows", - "OrchardCore.Workflows.Http", - "OrchardCore.Workflows.Timers", - "StatCan.OrchardCore.ContentPermissions", - "StatCan.OrchardCore.Configuration", - "StatCan.OrchardCore.ContentFields", - "StatCan.OrchardCore.ContentFields.PredefinedGroup", - "StatCan.OrchardCore.DisplayHelpers", - "StatCan.OrchardCore.EmailTemplates", - "StatCan.OrchardCore.GitHub", - "StatCan.OrchardCore.LocalizedText", - "StatCan.OrchardCore.Scripting", - "StatCan.OrchardCore.VueForms", - "StatCan.OrchardCore.VueForms.Localized", - "StatCan.OrchardCore.Vuetify", - "DigitalAdmin", - "VuetifyTheme" - ] - } - ] -} \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index 8fb359156..284a0335a 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -1,7 +1,7 @@ { "name": "radar-setup", "displayName": "Radar Setup", - "description": "Recipe used to set the Radar application.", + "description": "Recipe used to setup the Radar application.", "author": "Digital Innovation Team", "website": "https://digital.statcan.gc.ca", "version": "1.0", @@ -9,6 +9,55 @@ "categories": [ "radar" ], "tags": [ "innovation", "inno" ], "steps": [ + { + "name": "feature", + "enable": [ + "Application.Default", + "StatCan.OrchardCore.Cms.Web", + "OrchardCore.Resources", + "OrchardCore.Liquid", + "OrchardCore.Settings", + "OrchardCore.Contents", + "OrchardCore.ContentTypes", + "OrchardCore.Autoroute", + "OrchardCore.Widgets", + "OrchardCore.Flows", + "OrchardCore.Title", + "OrchardCore.Shortcodes", + "OrchardCore.Admin", + "OrchardCore.Alias", + "OrchardCore.Features", + "OrchardCore.Scripting", + "OrchardCore.Recipes", + "OrchardCore.ContentFields", + "OrchardCore.Users", + "OrchardCore.Localization", + "OrchardCore.Deployment", + "OrchardCore.CustomSettings", + "OrchardCore.Diagnostics", + "OrchardCore.DynamicCache", + "OrchardCore.HomeRoute", + "OrchardCore.Rules", + "OrchardCore.Layers", + "OrchardCore.Media", + "OrchardCore.Menu", + "OrchardCore.Navigation", + "OrchardCore.Roles", + "OrchardCore.Tenants", + "OrchardCore.Themes", + "StatCan.OrchardCore.ContentFields", + "StatCan.OrchardCore.DisplayHelpers", + "StatCan.OrchardCore.Menu", + "StatCan.OrchardCore.Vuetify", + "TheAdmin", + "VuetifyTheme" + ] + }, + { + "name": "themes", + "admin": "TheAdmin", + "site": "VuetifyTheme" + }, { "name": "media", "Files": [ diff --git a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs index 631a22cc1..5a0dfdc22 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs @@ -4,7 +4,6 @@ using Microsoft.Extensions.DependencyInjection; using OrchardCore.Modules; using OrchardCore.Data.Migration; -using StatCan.OrchardCore.Radar.Migrations; namespace StatCan.OrchardCore.Radar { @@ -12,8 +11,7 @@ public class Startup : StartupBase { public override void ConfigureServices(IServiceCollection services) { - services.AddScoped(); - services.AddScoped(); + services.AddScoped(); } public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider) From 2ecdcec67384007f26adbe025fa6bd4f85c98e7b Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Fri, 17 Sep 2021 08:48:38 -0400 Subject: [PATCH 009/198] feat: add app var --- .../Recipes/radar.setup.recipe.json | 105 ++++++++++-------- 1 file changed, 59 insertions(+), 46 deletions(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index 284a0335a..482f8d719 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -10,54 +10,14 @@ "tags": [ "innovation", "inno" ], "steps": [ { - "name": "feature", - "enable": [ - "Application.Default", - "StatCan.OrchardCore.Cms.Web", - "OrchardCore.Resources", - "OrchardCore.Liquid", - "OrchardCore.Settings", - "OrchardCore.Contents", - "OrchardCore.ContentTypes", - "OrchardCore.Autoroute", - "OrchardCore.Widgets", - "OrchardCore.Flows", - "OrchardCore.Title", - "OrchardCore.Shortcodes", - "OrchardCore.Admin", - "OrchardCore.Alias", - "OrchardCore.Features", - "OrchardCore.Scripting", - "OrchardCore.Recipes", - "OrchardCore.ContentFields", - "OrchardCore.Users", - "OrchardCore.Localization", - "OrchardCore.Deployment", - "OrchardCore.CustomSettings", - "OrchardCore.Diagnostics", - "OrchardCore.DynamicCache", - "OrchardCore.HomeRoute", - "OrchardCore.Rules", - "OrchardCore.Layers", - "OrchardCore.Media", - "OrchardCore.Menu", - "OrchardCore.Navigation", - "OrchardCore.Roles", - "OrchardCore.Tenants", - "OrchardCore.Themes", - "StatCan.OrchardCore.ContentFields", - "StatCan.OrchardCore.DisplayHelpers", - "StatCan.OrchardCore.Menu", - "StatCan.OrchardCore.Vuetify", - "TheAdmin", - "VuetifyTheme" + "name": "recipes", + "Values": [ + { + "executionid": "ThemeSetup", + "name": "vuetify-theme-setup" + } ] }, - { - "name": "themes", - "admin": "TheAdmin", - "site": "VuetifyTheme" - }, { "name": "media", "Files": [ @@ -101,6 +61,59 @@ } } } + }, + { + "name": "content", + "data": [ + { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "VAppBar", + "DisplayText": null, + "Latest": true, + "Published": true, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", + "VAppBar": { + "Props": { + "Values": [ + "dark" + ] + }, + "Color": { + "Text": "#009688" + }, + "Elevation": { + "Value": 10.0 + }, + "ExtensionHeight": { + "Value": 48.0 + }, + "ScrollThreshold": { + "Value": null + }, + "BackgroundImage": { + "Paths": [], + "MediaTexts": [] + }, + "Height": { + "Value": null + }, + "Width": { + "Value": null + } + }, + "LayerMetadata": { + "RenderTitle": false, + "Position": 1.0, + "Zone": "Header", + "Layer": "All" + } + } + ] } ] } \ No newline at end of file From 90aa2fd5a5a06a3dd0313c8eff10e9f9f4b3a833 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Fri, 17 Sep 2021 11:45:13 -0400 Subject: [PATCH 010/198] wip: add landing page --- .../StatCan.OrchardCore.Radar/Assets.json | 9 +++++ .../Assets/css/page.css | 35 +++++++++++++++++++ .../Recipes/radar.setup.recipe.json | 10 +++++- .../ResourceManagementOptionsConfiguration.cs | 25 +++++++++++++ .../StatCan.OrchardCore.Radar.csproj | 3 +- .../Views/Home/Index.cshtml | 1 - .../wwwroot/css/index.css | 35 +++++++++++++++++++ .../{assets => }/images/radar-icon-white.svg | 0 8 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets.json create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/css/page.css create mode 100644 src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs delete mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Home/Index.cshtml create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/index.css rename src/Apps/StatCan.OrchardCore.Radar/wwwroot/{assets => }/images/radar-icon-white.svg (100%) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets.json b/src/Apps/StatCan.OrchardCore.Radar/Assets.json new file mode 100644 index 000000000..21964b0b2 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets.json @@ -0,0 +1,9 @@ +[ + { + "copy": true, + "inputs": [ + "Assets/css/*.css" + ], + "output": "wwwroot/css/index.css" + } +] \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/css/page.css b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/page.css new file mode 100644 index 000000000..7047edabc --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/page.css @@ -0,0 +1,35 @@ +.zigzag { + position: relative; + padding: 8px 8px 32px 8px; + background: #cfece9; +} + + .zigzag:after { + background: linear-gradient(-40deg, hsl(0, 0%, 100%) 16px, transparent 0), linear-gradient(40deg, #ffffff 16px, transparent 0); + background-position: left bottom; + background-repeat: repeat-x; + background-size: 32px 32px; + content: ' '; + display: block; + position: absolute; + bottom: 0px; + left: 0px; + width: 100%; + height: 32px; + } + +.ripple { + background-color: #227069; + background-image: url(../Icons/ripples.svg); + background-size: cover; + background-repeat: no-repeat; + background-position: center bottom -623px; +} + +.rippleFront { + background-color: #cfece9; + background-image: url(../Icons/ripples-white.svg); + background-size: cover; + background-repeat: no-repeat; + background-position: center bottom -590px; +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index 482f8d719..9c01281f6 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -9,6 +9,14 @@ "categories": [ "radar" ], "tags": [ "innovation", "inno" ], "steps": [ + { + "name": "feature", + "disable": [], + "enable": [ + "StatCan.OrchardCore.Vuetify.Grid", + "StatCan.OrchardCore.Vuetify.Image" + ] + }, { "name": "recipes", "Values": [ @@ -22,7 +30,7 @@ "name": "media", "Files": [ { - "SourcePath": "../wwwroot/assets/images/radar-icon-white.svg", + "SourcePath": "../wwwroot/images/radar-icon-white.svg", "TargetPath": "radar-icon-white.svg" } ] diff --git a/src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs b/src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs new file mode 100644 index 000000000..b58f6e1f9 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs @@ -0,0 +1,25 @@ +using Microsoft.Extensions.Options; +using OrchardCore.ResourceManagement; + +namespace StatCan.OrchardCore.Radar +{ + public class ResourceManagementOptionsConfiguration : IConfigureOptions + { + private static ResourceManifest _manifest; + + static ResourceManagementOptionsConfiguration() + { + _manifest = new ResourceManifest(); + + _manifest + .DefineStyle("Radar Stylesheet") + .SetUrl("~/StatCan.OrchardCore.Radar/css/index.css", "~/StatCan.OrchardCore.Radar/css/index.css") + .SetVersion("1.0.0"); + } + + public void Configure(ResourceManagementOptions options) + { + options.ResourceManifests.Add(_manifest); + } + } +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj index 634b73c1d..31fd92785 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj +++ b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj @@ -1,4 +1,4 @@ - + $(AspNetCoreTargetFramework) @@ -19,6 +19,7 @@ + diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Home/Index.cshtml b/src/Apps/StatCan.OrchardCore.Radar/Views/Home/Index.cshtml deleted file mode 100644 index a1ab916e5..000000000 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Home/Index.cshtml +++ /dev/null @@ -1 +0,0 @@ -Template \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/index.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/index.css new file mode 100644 index 000000000..7047edabc --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/index.css @@ -0,0 +1,35 @@ +.zigzag { + position: relative; + padding: 8px 8px 32px 8px; + background: #cfece9; +} + + .zigzag:after { + background: linear-gradient(-40deg, hsl(0, 0%, 100%) 16px, transparent 0), linear-gradient(40deg, #ffffff 16px, transparent 0); + background-position: left bottom; + background-repeat: repeat-x; + background-size: 32px 32px; + content: ' '; + display: block; + position: absolute; + bottom: 0px; + left: 0px; + width: 100%; + height: 32px; + } + +.ripple { + background-color: #227069; + background-image: url(../Icons/ripples.svg); + background-size: cover; + background-repeat: no-repeat; + background-position: center bottom -623px; +} + +.rippleFront { + background-color: #cfece9; + background-image: url(../Icons/ripples-white.svg); + background-size: cover; + background-repeat: no-repeat; + background-position: center bottom -590px; +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/assets/images/radar-icon-white.svg b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/radar-icon-white.svg similarity index 100% rename from src/Apps/StatCan.OrchardCore.Radar/wwwroot/assets/images/radar-icon-white.svg rename to src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/radar-icon-white.svg From 59fa12fe6d899b5d0b924593d0c47eb6aa988128 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Fri, 17 Sep 2021 15:05:32 -0400 Subject: [PATCH 011/198] wip: add landing page header --- .../StatCan.OrchardCore.Radar/Constants.cs | 2 + .../StatCan.OrchardCore.Radar/Migrations.cs | 45 +++++++++++++++++ .../Recipes/radar.setup.recipe.json | 50 +++++++++++++++++++ .../ResourceManagementOptionsConfiguration.cs | 4 +- src/Apps/StatCan.OrchardCore.Radar/Startup.cs | 3 ++ .../Views/Content-LandingPage.liquid | 26 ++++++++++ .../css/{index.css => landing-page.css} | 50 +++++++++++++++---- .../wwwroot/images/ripples-white.svg | 1 + 8 files changed, 170 insertions(+), 11 deletions(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid rename src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/{index.css => landing-page.css} (54%) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/ripples-white.svg diff --git a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs index 1d40749e1..b0a3e5f60 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs @@ -28,6 +28,8 @@ public static class ContentTypes // Parts public const string RadarEntity = "RadarEntity"; + + public const string LandingPage = "LandingPage"; } } } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs index 3e29f85ec..23f279c73 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -41,6 +41,8 @@ public async Task CreateAsync() CreateEvent(); CreateCommunity(); + CreateLandingPage(); + return 1; } @@ -669,5 +671,48 @@ private void CreateCommunity() ) ); } + + private void CreateLandingPage() + { + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.LandingPage, type => type + .DisplayedAs("LandingPage") + .Creatable() + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart(Constants.ContentTypes.LandingPage, part => part + .WithPosition("3") + ) + .WithPart("AutoroutePart", part => part + .WithPosition("2") + ) + .WithPart("LocalizationPart", part => part + .WithPosition("0") + ) + .WithPart("TitlePart", part => part + .WithPosition("1") + ) + .WithPart("FlowPart", part => part + .WithPosition("5") + ) + .WithPart("HtmlBodyPart", part => part + .WithPosition("4") + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.LandingPage, part => part + .WithField("HeaderImage", field => field + .OfType("MediaField") + .WithDisplayName("Header Image") + .WithPosition("0") + ) + .WithField("Description", field => field + .OfType("TextField") + .WithDisplayName("Description") + .WithPosition("1") + ) + ); + } } } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index 9c01281f6..998745707 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -32,6 +32,10 @@ { "SourcePath": "../wwwroot/images/radar-icon-white.svg", "TargetPath": "radar-icon-white.svg" + }, + { + "SourcePath": "../wwwroot/images/ripples-white.svg", + "TargetPath": "ripples-white.svg" } ] }, @@ -73,6 +77,52 @@ { "name": "content", "data": [ + { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "LandingPage", + "DisplayText": "Digital Radar", + "Latest": true, + "Published": true, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", + "LandingPage": { + "HeaderImage": { + "Paths": [ + "ripples-white.svg" + ], + "MediaTexts": [ + "" + ] + }, + "Description": { + "Text": "Explore, manage and discover insights across your projects" + } + }, + "AutoroutePart": { + "Path": "digital-radar", + "SetHomepage": true, + "Disabled": false, + "RouteContainedItems": false, + "Absolute": false + }, + "FlowPart": { + "Widgets": [] + }, + "LocalizationPart": { + "LocalizationSet": "4xwnrm19d4119rg6szffxkfpwt", + "Culture": "en" + }, + "TitlePart": { + "Title": "Digital Radar" + }, + "HtmlBodyPart": { + "Html": "\n
    \n
  • \n \tDiscover pathfinding projects\n
    • \n
  • \n \tExplore technologies and topics\n
    • \n
  • \n \tShare your team's work\n
    • \n
\n" + } + }, { "ContentItemId": "[js: uuid()]", "ContentItemVersionId": null, diff --git a/src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs b/src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs index b58f6e1f9..53ff13e69 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs @@ -12,8 +12,8 @@ static ResourceManagementOptionsConfiguration() _manifest = new ResourceManifest(); _manifest - .DefineStyle("Radar Stylesheet") - .SetUrl("~/StatCan.OrchardCore.Radar/css/index.css", "~/StatCan.OrchardCore.Radar/css/index.css") + .DefineStyle("landing-page-style") + .SetUrl("~/StatCan.OrchardCore.Radar/css/landing-page.css", "~/StatCan.OrchardCore.Radar/css/landing-page.css") .SetVersion("1.0.0"); } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs index 5a0dfdc22..6a00352d7 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs @@ -2,8 +2,10 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Options; using OrchardCore.Modules; using OrchardCore.Data.Migration; +using OrchardCore.ResourceManagement; namespace StatCan.OrchardCore.Radar { @@ -11,6 +13,7 @@ public class Startup : StartupBase { public override void ConfigureServices(IServiceCollection services) { + services.AddTransient, ResourceManagementOptionsConfiguration>(); services.AddScoped(); } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid new file mode 100644 index 000000000..27ba07ef1 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid @@ -0,0 +1,26 @@ +{% style name:"landing-page-style" %} + +{% zone "Header" %} + +{% assign imagePath = Model.ContentItem.Content.LandingPage.HeaderImage.Paths.first %} +
+
+
+
+
+ {{ Model.ContentItem | display_text }} +
+
+ {{ Model.ContentItem.Content.LandingPage.Description.Text }} +
+
+ {{ Model.Content.HtmlBodyPart | shape_render }} +
+
+
+
+
+ +{% endzone %} + + \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/index.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css similarity index 54% rename from src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/index.css rename to src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css index 7047edabc..872899a0e 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/index.css +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css @@ -1,3 +1,43 @@ +.center-text { + text-align: center; +} + +.landing-page-header { + width: 100%; +} + +.header-text { + width: 600px; + margin: auto; +} + +.light-font { + font-weight: lighter; + color: #000000DE; + opacity: 1; +} + +.name { + font-size: 47px; + color: #005247; + font-weight: 300; + white-space: nowrap; +} + +.description { + font-size: 25px; + font-weight: 300; + margin: auto; + width: 60%; + line-height: normal; +} + +.list { + margin: 2rem auto 2rem auto; + white-space: nowrap; + width: fit-content; +} + .zigzag { position: relative; padding: 8px 8px 32px 8px; @@ -18,18 +58,10 @@ height: 32px; } -.ripple { - background-color: #227069; - background-image: url(../Icons/ripples.svg); - background-size: cover; - background-repeat: no-repeat; - background-position: center bottom -623px; -} - .rippleFront { background-color: #cfece9; - background-image: url(../Icons/ripples-white.svg); background-size: cover; background-repeat: no-repeat; background-position: center bottom -590px; + padding: 8rem 0rem 3rem 0rem; } diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/ripples-white.svg b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/ripples-white.svg new file mode 100644 index 000000000..ea7ef8adb --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/ripples-white.svg @@ -0,0 +1 @@ + \ No newline at end of file From 145ed0eb0610f9ab693b7e559687d33bb0febb91 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 20 Sep 2021 07:48:51 -0400 Subject: [PATCH 012/198] feat: add landing page header --- .../StatCan.OrchardCore.Radar/Assets.json | 7 +++ .../Assets/images/canada.svg | 7 +++ .../Assets/images/goc.svg | 56 +++++++++++++++++++ .../Assets/images/radar-icon-white.svg | 18 ++++++ .../Assets/images/ripples-white.svg | 1 + .../StatCan.OrchardCore.Radar/Migrations.cs | 7 +-- .../Recipes/radar.setup.recipe.json | 8 --- .../StatCan.OrchardCore.Radar.csproj | 22 ++++++++ .../Views/Content-LandingPage.liquid | 55 ++++++++++++++---- .../wwwroot/css/landing-page.css | 26 ++++----- .../wwwroot/images/canada.svg | 7 +++ .../wwwroot/images/goc.svg | 56 +++++++++++++++++++ 12 files changed, 232 insertions(+), 38 deletions(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/images/canada.svg create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/images/goc.svg create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/images/radar-icon-white.svg create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/images/ripples-white.svg create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/canada.svg create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/goc.svg diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets.json b/src/Apps/StatCan.OrchardCore.Radar/Assets.json index 21964b0b2..0a8de2139 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Assets.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets.json @@ -5,5 +5,12 @@ "Assets/css/*.css" ], "output": "wwwroot/css/index.css" + }, + { + "copy": true, + "inputs": [ + "Assets/images/*" + ], + "output": "wwwroot/images/@" } ] \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/images/canada.svg b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/canada.svg new file mode 100644 index 000000000..936bd1156 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/canada.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/images/goc.svg b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/goc.svg new file mode 100644 index 000000000..5e59977b4 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/goc.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/images/radar-icon-white.svg b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/radar-icon-white.svg new file mode 100644 index 000000000..168b10556 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/radar-icon-white.svg @@ -0,0 +1,18 @@ + + + + + + + + + + diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/images/ripples-white.svg b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/ripples-white.svg new file mode 100644 index 000000000..ea7ef8adb --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/ripples-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs index 23f279c73..81949b122 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -675,7 +675,7 @@ private void CreateCommunity() private void CreateLandingPage() { _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.LandingPage, type => type - .DisplayedAs("LandingPage") + .DisplayedAs("Landing Page") .Creatable() .Listable() .Draftable() @@ -702,11 +702,6 @@ private void CreateLandingPage() ); _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.LandingPage, part => part - .WithField("HeaderImage", field => field - .OfType("MediaField") - .WithDisplayName("Header Image") - .WithPosition("0") - ) .WithField("Description", field => field .OfType("TextField") .WithDisplayName("Description") diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index 998745707..253c227ad 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -90,14 +90,6 @@ "Owner": "[js: parameters('AdminUserId')]", "Author": "[js: parameters('AdminUsername')]", "LandingPage": { - "HeaderImage": { - "Paths": [ - "ripples-white.svg" - ], - "MediaTexts": [ - "" - ] - }, "Description": { "Text": "Explore, manage and discover insights across your projects" } diff --git a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj index 31fd92785..6c93f4989 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj +++ b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj @@ -6,6 +6,28 @@ ..\..\..\roslynator.ruleset + + + + + + + + + + Never + + + Never + + + Never + + + Never + + + diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid index 27ba07ef1..a886e8f14 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid @@ -5,17 +5,47 @@ {% assign imagePath = Model.ContentItem.Content.LandingPage.HeaderImage.Paths.first %}
-
+
-
- {{ Model.ContentItem | display_text }} -
-
- {{ Model.ContentItem.Content.LandingPage.Description.Text }} -
-
- {{ Model.Content.HtmlBodyPart | shape_render }} -
+ + + +
+ {{ Model.ContentItem | display_text }} +
+ + + + +
+ {{ Model.ContentItem.Content.LandingPage.Description.Text }} +
+ + + + +
+ {{ Model.Content.HtmlBodyPart | shape_render }} +
+ + + + +
+ + +
+ + +
@@ -23,4 +53,7 @@ {% endzone %} - \ No newline at end of file +{% shape_remove_item Model.Content "HtmlBodyPart" %} +{% shape_remove_item Model.Content "LandingPage-Description" %} + +{{ Model.Content | shape_render }} \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css index 872899a0e..f7b34d480 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css @@ -2,13 +2,8 @@ text-align: center; } -.landing-page-header { - width: 100%; -} - .header-text { - width: 600px; - margin: auto; + padding: 0 24rem 0 24rem; } .light-font { @@ -26,16 +21,21 @@ .description { font-size: 25px; - font-weight: 300; - margin: auto; - width: 60%; - line-height: normal; + font-weight: 300; + margin: auto; + line-height: normal; + padding: 0 20rem 0 20rem; } .list { - margin: 2rem auto 2rem auto; - white-space: nowrap; - width: fit-content; + display: flex; + justify-content: center; +} + +.header-footer { + display: flex; + justify-content: space-between; + padding: 0 10rem 0 10rem; } .zigzag { diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/canada.svg b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/canada.svg new file mode 100644 index 000000000..936bd1156 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/canada.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/goc.svg b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/goc.svg new file mode 100644 index 000000000..5e59977b4 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/goc.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 322c044ec267c33b0a5f91a4ceed6baa5e9ba86e Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 20 Sep 2021 10:51:35 -0400 Subject: [PATCH 013/198] feat: add landing page --- .../StatCan.OrchardCore.Radar/Assets.json | 2 +- .../StatCan.OrchardCore.Radar/Migrations.cs | 56 +++++++- .../Recipes/radar.setup.recipe.json | 52 ++++++-- .../Views/Content-LandingPage.liquid | 124 ++++++++++++++++-- .../wwwroot/css/landing-page.css | 29 +++- 5 files changed, 231 insertions(+), 32 deletions(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets.json b/src/Apps/StatCan.OrchardCore.Radar/Assets.json index 0a8de2139..dfa5373fa 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Assets.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets.json @@ -2,7 +2,7 @@ { "copy": true, "inputs": [ - "Assets/css/*.css" + "Assets/css/*" ], "output": "wwwroot/css/index.css" }, diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs index 81949b122..e788621f9 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -693,20 +693,64 @@ private void CreateLandingPage() .WithPart("TitlePart", part => part .WithPosition("1") ) - .WithPart("FlowPart", part => part - .WithPosition("5") - ) - .WithPart("HtmlBodyPart", part => part - .WithPosition("4") - ) ); _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.LandingPage, part => part .WithField("Description", field => field .OfType("TextField") .WithDisplayName("Description") + .WithPosition("8") + ) + .WithField("Activity1", field => field + .OfType("HtmlField") + .WithDisplayName("Activity1") + .WithPosition("2") + ) + .WithField("Activity2", field => field + .OfType("HtmlField") + .WithDisplayName("Activity2") + .WithPosition("3") + ) + .WithField("Activity3", field => field + .OfType("HtmlField") + .WithDisplayName("Activity3") + .WithPosition("4") + ) + .WithField("Activity4", field => field + .OfType("HtmlField") + .WithDisplayName("Activity4") + .WithPosition("5") + ) + .WithField("Trend1", field => field + .OfType("HtmlField") + .WithDisplayName("Trend1") + .WithPosition("7") + ) + .WithField("Activities", field => field + .OfType("TextField") + .WithDisplayName("Activities") .WithPosition("1") ) + .WithField("Trends", field => field + .OfType("TextField") + .WithDisplayName("Trends") + .WithPosition("6") + ) + .WithField("Userguide", field => field + .OfType("HtmlField") + .WithDisplayName("User guide") + .WithPosition("9") + ) + .WithField("Contactus", field => field + .OfType("HtmlField") + .WithDisplayName("Contact us") + .WithPosition("10") + ) + .WithField("Headerlist", field => field + .OfType("HtmlField") + .WithDisplayName("Header list") + .WithPosition("0") + ) ); } } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index 253c227ad..00bcb7c40 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -14,7 +14,7 @@ "disable": [], "enable": [ "StatCan.OrchardCore.Vuetify.Grid", - "StatCan.OrchardCore.Vuetify.Image" + "StatCan.OrchardCore.Vuetify.Card" ] }, { @@ -32,10 +32,6 @@ { "SourcePath": "../wwwroot/images/radar-icon-white.svg", "TargetPath": "radar-icon-white.svg" - }, - { - "SourcePath": "../wwwroot/images/ripples-white.svg", - "TargetPath": "ripples-white.svg" } ] }, @@ -92,6 +88,46 @@ "LandingPage": { "Description": { "Text": "Explore, manage and discover insights across your projects" + }, + "Section1": { + "Text": "Recent activity" + }, + "Section2": { + "Text": "Recent trends" + }, + "Activity1": { + "Text": "Projects", + "Html": "
\n Projects\n
\n
\n In-flight projects\n
" + }, + "Activity2": { + "Text": "Proposals", + "Html": "
\n Committees\n
\n
\n Latest committees\n
" + }, + "Activity3": { + "Text": null, + "Html": "
\n Events\n
\n
\n Upcoming events\n
" + }, + "Activity4": { + "Text": null, + "Html": "
\n Proposals\n
\n
\n Current proposals\n
" + }, + "Trend1": { + "Html": "
\n Topics\n
\n
\n Most used topics across all activities\n
" + }, + "Activities": { + "Text": "Recent activities" + }, + "Trends": { + "Text": "Recent trends" + }, + "Userguide": { + "Html": "
\n User Guide\n
\n
\n Learn more about the Radar\n
" + }, + "Contactus": { + "Html": "
\n Contact Us\n
\n
\n Ask questions and send feedback\n
" + }, + "Headerlist": { + "Html": "\n
    \n
  • \n \tDiscover pathfinding projects\n
    • \n
  • \n \tExplore technologies and topics\n
    • \n
  • \n \tShare your team's work\n
    • \n
\n" } }, "AutoroutePart": { @@ -101,18 +137,12 @@ "RouteContainedItems": false, "Absolute": false }, - "FlowPart": { - "Widgets": [] - }, "LocalizationPart": { "LocalizationSet": "4xwnrm19d4119rg6szffxkfpwt", "Culture": "en" }, "TitlePart": { "Title": "Digital Radar" - }, - "HtmlBodyPart": { - "Html": "\n
    \n
  • \n \tDiscover pathfinding projects\n
    • \n
  • \n \tExplore technologies and topics\n
    • \n
  • \n \tShare your team's work\n
    • \n
\n" } }, { diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid index a886e8f14..c7389ccbe 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid @@ -1,23 +1,21 @@ {% style name:"landing-page-style" %} -{% zone "Header" %} - {% assign imagePath = Model.ContentItem.Content.LandingPage.HeaderImage.Paths.first %}
-
+
- + -
+
{{ Model.ContentItem | display_text }}
-
+
{{ Model.ContentItem.Content.LandingPage.Description.Text }}
@@ -25,7 +23,7 @@
- {{ Model.Content.HtmlBodyPart | shape_render }} + {{ Model.ContentItem.Content.LandingPage.Headerlist.Html | raw }}
@@ -51,9 +49,113 @@
-{% endzone %} +
+ + + +
+ {{ Model.ContentItem.Content.LandingPage.Activities.Text }} +
+ + + + + + +
+ {{ Model.ContentItem.Content.LandingPage.Activity1.Html | raw }} +
+ + + + + + + + + +
+ {{ Model.ContentItem.Content.LandingPage.Activity2.Html | raw }} +
+ + + + + + + + + + + +
+ {{ Model.ContentItem.Content.LandingPage.Activity3.Html | raw }} +
+ + + + + + + + + +
+ {{ Model.ContentItem.Content.LandingPage.Activity4.Html | raw }} +
+ + + + + + + + +
-{% shape_remove_item Model.Content "HtmlBodyPart" %} -{% shape_remove_item Model.Content "LandingPage-Description" %} +
+ + + +
+ {{ Model.ContentItem.Content.LandingPage.Trends.Text }} +
+ + + + + + +
+ {{ Model.ContentItem.Content.LandingPage.Trend1.Html | raw }} +
+ + + + + + + + +
-{{ Model.Content | shape_render }} \ No newline at end of file +
+ + + + +
+ {{ Model.ContentItem.Content.LandingPage.Userguide.Html | raw }} +
+ + + + +
+ {{ Model.ContentItem.Content.LandingPage.Contactus.Html | raw }} +
+ + + + +
\ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css index f7b34d480..48cc5d71a 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css @@ -1,5 +1,5 @@ -.center-text { - text-align: center; +.max-wdith { + max-width: 1200px; } .header-text { @@ -32,16 +32,39 @@ justify-content: center; } +.section-title { + color: #005247; +} + +.section-background { + background: #009C880A; +} + +.front-footer { + background: #009C88; +} + .header-footer { display: flex; justify-content: space-between; padding: 0 10rem 0 10rem; } +.card-background { + background-color: #F6FCFB; +} + +.zigzag-light { + background: #cfece9 0% 0% no-repeat; +} + +.zigzag-dark { + background: #009C88 0% 0% no-repeat; +} + .zigzag { position: relative; padding: 8px 8px 32px 8px; - background: #cfece9; } .zigzag:after { From 04df330489dad118934124d73efdca25a49aa67d Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 20 Sep 2021 14:14:05 -0400 Subject: [PATCH 014/198] feat: add icon and fix zigzag --- .../Views/Content-LandingPage.liquid | 141 ++++++++++++------ .../wwwroot/css/landing-page.css | 64 +++++--- 2 files changed, 139 insertions(+), 66 deletions(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid index c7389ccbe..068ef9c33 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid @@ -2,7 +2,7 @@ {% assign imagePath = Model.ContentItem.Content.LandingPage.HeaderImage.Paths.first %}
-
+
@@ -15,7 +15,7 @@ -
+
{{ Model.ContentItem.Content.LandingPage.Description.Text }}
@@ -29,23 +29,26 @@ -
- +
+
+
+
+
@@ -60,53 +63,85 @@ - - -
- {{ Model.ContentItem.Content.LandingPage.Activity1.Html | raw }} + + +
+ + mdi-flask-outline + +
+ {{ Model.ContentItem.Content.LandingPage.Activity1.Html | raw }} +
+
+
+
- +
- +
- - -
- {{ Model.ContentItem.Content.LandingPage.Activity2.Html | raw }} + + +
+ + mdi-account-multiple + +
+ {{ Model.ContentItem.Content.LandingPage.Activity2.Html | raw }} +
+
+
+
- +
- +
- - -
- {{ Model.ContentItem.Content.LandingPage.Activity3.Html | raw }} + + +
+ + mdi-calendar + +
+ {{ Model.ContentItem.Content.LandingPage.Activity3.Html | raw }} +
+
+
+
- +
- +
- - -
- {{ Model.ContentItem.Content.LandingPage.Activity4.Html | raw }} + + +
+ + mdi-alert-circle-outline + +
+ {{ Model.ContentItem.Content.LandingPage.Activity4.Html | raw }} +
+
+
+
- +
- +
@@ -124,15 +159,23 @@ - - -
- {{ Model.ContentItem.Content.LandingPage.Trend1.Html | raw }} + + +
+ + mdi-pound + +
+ {{ Model.ContentItem.Content.LandingPage.Trend1.Html | raw }} +
+
+
+
- +
- +
@@ -143,16 +186,26 @@ - -
- {{ Model.ContentItem.Content.LandingPage.Userguide.Html | raw }} + +
+ + mdi-book-open-variant + +
+ {{ Model.ContentItem.Content.LandingPage.Userguide.Html | raw }} +
- -
- {{ Model.ContentItem.Content.LandingPage.Contactus.Html | raw }} + +
+ + mdi-email + +
+ {{ Model.ContentItem.Content.LandingPage.Contactus.Html | raw }} +
diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css index 48cc5d71a..753346c2a 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css @@ -24,7 +24,6 @@ font-weight: 300; margin: auto; line-height: normal; - padding: 0 20rem 0 20rem; } .list { @@ -40,6 +39,10 @@ background: #009C880A; } +.card-title { + display: flex; +} + .front-footer { background: #009C88; } @@ -50,36 +53,53 @@ padding: 0 10rem 0 10rem; } -.card-background { +.card-background-light { background-color: #F6FCFB; } -.zigzag-light { +.card-background-dark { background: #cfece9 0% 0% no-repeat; } -.zigzag-dark { +.card-title { background: #009C88 0% 0% no-repeat; } -.zigzag { +.zigzag-container { position: relative; - padding: 8px 8px 32px 8px; -} - - .zigzag:after { - background: linear-gradient(-40deg, hsl(0, 0%, 100%) 16px, transparent 0), linear-gradient(40deg, #ffffff 16px, transparent 0); - background-position: left bottom; - background-repeat: repeat-x; - background-size: 32px 32px; - content: ' '; - display: block; - position: absolute; - bottom: 0px; - left: 0px; - width: 100%; - height: 32px; - } + width: 100%; +} + +.zigzag { + content: ' '; + display: block; + position: absolute; + bottom: 0px; + left: 0px; + width: 100%; + height: 32px; +} + +.zigzag-white { + background: linear-gradient(-40deg, #FFFFFF 16px, transparent 0), linear-gradient(40deg, #FFFFFF 16px, transparent 0); + background-position: left bottom; + background-repeat: repeat-x; + background-size: 32px 32px; +} + +.zigzag-light { + background: linear-gradient(-40deg, #F6FCFB 16px, transparent 0), linear-gradient(40deg, #F6FCFB 16px, transparent 0); + background-position: left bottom; + background-repeat: repeat-x; + background-size: 32px 32px; +} + +.zigzag-dark { + background: linear-gradient(-40deg, #cfece9 16px, transparent 0), linear-gradient(40deg, #cfece9 16px, transparent 0); + background-position: left bottom; + background-repeat: repeat-x; + background-size: 32px 32px; +} .rippleFront { background-color: #cfece9; @@ -87,4 +107,4 @@ background-repeat: no-repeat; background-position: center bottom -590px; padding: 8rem 0rem 3rem 0rem; -} +} \ No newline at end of file From bfb1c050b35afb0c8560f7670502928e939c743a Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 20 Sep 2021 14:28:16 -0400 Subject: [PATCH 015/198] feat: inline injection of stylesheet --- .../ResourceManagementOptionsConfiguration.cs | 25 ------------------- src/Apps/StatCan.OrchardCore.Radar/Startup.cs | 3 --- .../Views/Content-LandingPage.liquid | 2 +- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs diff --git a/src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs b/src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs deleted file mode 100644 index 53ff13e69..000000000 --- a/src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Microsoft.Extensions.Options; -using OrchardCore.ResourceManagement; - -namespace StatCan.OrchardCore.Radar -{ - public class ResourceManagementOptionsConfiguration : IConfigureOptions - { - private static ResourceManifest _manifest; - - static ResourceManagementOptionsConfiguration() - { - _manifest = new ResourceManifest(); - - _manifest - .DefineStyle("landing-page-style") - .SetUrl("~/StatCan.OrchardCore.Radar/css/landing-page.css", "~/StatCan.OrchardCore.Radar/css/landing-page.css") - .SetVersion("1.0.0"); - } - - public void Configure(ResourceManagementOptions options) - { - options.ResourceManifests.Add(_manifest); - } - } -} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs index 6a00352d7..5a0dfdc22 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs @@ -2,10 +2,8 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Options; using OrchardCore.Modules; using OrchardCore.Data.Migration; -using OrchardCore.ResourceManagement; namespace StatCan.OrchardCore.Radar { @@ -13,7 +11,6 @@ public class Startup : StartupBase { public override void ConfigureServices(IServiceCollection services) { - services.AddTransient, ResourceManagementOptionsConfiguration>(); services.AddScoped(); } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid index 068ef9c33..0df94c06d 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid @@ -1,4 +1,4 @@ -{% style name:"landing-page-style" %} +{% style src:"~/StatCan.OrchardCore.Radar/css/landing-page.css" %} {% assign imagePath = Model.ContentItem.Content.LandingPage.HeaderImage.Paths.first %}
From 8e0736bccd8b5e595f498dc8ccc067543ca65ac7 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 20 Sep 2021 14:30:00 -0400 Subject: [PATCH 016/198] fix: trending section bottom padding --- .../StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid index 0df94c06d..21669fac7 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid @@ -148,7 +148,7 @@
-
+
From 2fb487dc494b1ee24a58ee5ac664fa3288d4404a Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 20 Sep 2021 14:30:55 -0400 Subject: [PATCH 017/198] fix: trending section margin --- .../StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid index 21669fac7..7e30f6658 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid @@ -148,7 +148,7 @@
-
+
From 806be64c3cb262b96bf7482ea537a647ec221dfc Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 20 Sep 2021 14:48:26 -0400 Subject: [PATCH 018/198] feat: add landing page as template --- .../Snippets/landingpage.liquid} | 0 .../Recipes/radar.setup.recipe.json | 9 +++++++++ .../StatCan.OrchardCore.Radar/Views/placeholder.liquid | 0 3 files changed, 9 insertions(+) rename src/Apps/StatCan.OrchardCore.Radar/{Views/Content-LandingPage.liquid => Recipes/Snippets/landingpage.liquid} (100%) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/placeholder.liquid diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid b/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid similarity index 100% rename from src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPage.liquid rename to src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index 00bcb7c40..da7f53093 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -194,6 +194,15 @@ } } ] + }, + { + "name": "Templates", + "Templates": { + "Content__LandingPage": { + "Description": "A template for the Landing Page content type", + "Content": "[file:text('Snippets/landingpage.liquid')]" + } + } } ] } \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/placeholder.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/placeholder.liquid new file mode 100644 index 000000000..e69de29bb From e1e4780bbfcc44a2670109a8bc0cdd77295f1c11 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Tue, 21 Sep 2021 08:18:40 -0400 Subject: [PATCH 019/198] fix: named BagPart --- src/Apps/StatCan.OrchardCore.Radar/Migrations.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs index e788621f9..3d6dda461 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -319,7 +319,7 @@ private void CreateProposal() .WithPart("ContentPermissionsPart", part => part .WithPosition("3") ) - .WithPart("Workspace", part => part + .WithPart("Workspace", "BagPart", part => part .WithDisplayName("Workspace") .WithDescription("Add an Artifact to your workspace of this proposal") .WithPosition("4") @@ -416,7 +416,7 @@ private void CreateProject() .WithPart("ContentPermissionsPart", part => part .WithPosition("5") ) - .WithPart("Workspace", part => part + .WithPart("Workspace", "BagPart", part => part .WithDisplayName("Workspace") .WithDescription("Add an Artifact to your workspace of this project") .WithPosition("2") @@ -425,7 +425,7 @@ private void CreateProject() ContainedContentTypes = new[] { Constants.ContentTypes.Aritifact }, }) ) - .WithPart(Constants.ContentTypes.ProjectMember, part => part + .WithPart(Constants.ContentTypes.ProjectMember, "BagPart", part => part .WithDisplayName("Project Member") .WithDescription("Add a member to this project") .WithPosition("3") @@ -527,7 +527,7 @@ private void CreateEvent() Pattern = "{{ ContentItem.Content.RadarEntity.Name.Text }}", }) ) - .WithPart(Constants.ContentTypes.EventOrganizer, part => part + .WithPart(Constants.ContentTypes.EventOrganizer, "BagPart", part => part .WithDisplayName("Event Organizer") .WithDescription("Event Organizer") .WithPosition("3") @@ -536,7 +536,7 @@ private void CreateEvent() ContainedContentTypes = new[] { Constants.ContentTypes.EventOrganizer }, }) ) - .WithPart("Workspace", part => part + .WithPart("Workspace", "BagPart", part => part .WithDisplayName("Workspace") .WithDescription("Add an Artifact to your workspace of this event") .WithPosition("4") @@ -631,7 +631,7 @@ private void CreateCommunity() .WithPart("ContentPermissionsPart", part => part .WithPosition("5") ) - .WithPart("Workspace", part => part + .WithPart("Workspace", "BagPart", part => part .WithDisplayName("Workspace") .WithDescription("Add an Artifact to your workspace of this community") .WithPosition("2") @@ -640,7 +640,7 @@ private void CreateCommunity() ContainedContentTypes = new[] { Constants.ContentTypes.Aritifact }, }) ) - .WithPart(Constants.ContentTypes.CommunityMember, part => part + .WithPart(Constants.ContentTypes.CommunityMember, "BagPart", part => part .WithDisplayName("Community Member") .WithDescription("Add a member to this community") .WithPosition("3") From 1082f17749b4e3fdc9f5b96d431b5471da46283f Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Tue, 21 Sep 2021 10:05:09 -0400 Subject: [PATCH 020/198] feat: use BagPart in landing page --- .../StatCan.OrchardCore.Radar/Constants.cs | 3 + .../StatCan.OrchardCore.Radar/Migrations.cs | 184 +++++++++---- .../Recipes/Snippets/landingpage.liquid | 178 ++++--------- .../Recipes/radar.setup.recipe.json | 244 ++++++++++++++---- .../StatCan.OrchardCore.Radar.csproj | 1 + 5 files changed, 392 insertions(+), 218 deletions(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs index b0a3e5f60..a6aebba3f 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs @@ -30,6 +30,9 @@ public static class ContentTypes public const string RadarEntity = "RadarEntity"; public const string LandingPage = "LandingPage"; + public const string Activity = "Activity"; + public const string Trend = "Trend"; + public const string LandingPageFooterCard = "LandingPageFooterCard"; } } } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs index 3d6dda461..a1bea64e7 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -12,6 +12,7 @@ using OrchardCore.Taxonomies.Fields; using OrchardCore.Taxonomies.Settings; using OrchardCore.Flows.Models; +using OrchardCore.Contents.Models; namespace StatCan.OrchardCore.Radar { @@ -674,6 +675,113 @@ private void CreateCommunity() private void CreateLandingPage() { + // Sections on the landing page + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Activity, type => type + .DisplayedAs("Activity") + .WithSettings(new FullTextAspectSettings + { + IncludeBodyAspect = false, + IncludeDisplayText = false, + }) + .WithPart(Constants.ContentTypes.Activity, part => part + .WithPosition("1") + ) + .WithPart("HtmlBodyPart", part => part + .WithPosition("2") + ) + .WithPart("LiquidPart", part => part + .WithPosition("3") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.Activity, part => part + .WithField("Icon", field => field + .OfType("TextField") + .WithDisplayName("Icon") + .WithPosition("0") + .WithSettings(new TextFieldSettings + { + Hint = "Md Icon name", + Required = true, + }) + ) + ); + + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Trend, type => type + .DisplayedAs("Trend") + .WithSettings(new FullTextAspectSettings + { + IncludeBodyAspect = false, + IncludeDisplayText = false, + }) + .WithPart(Constants.ContentTypes.Trend, part => part + .WithPosition("1") + ) + .WithPart("HtmlBodyPart", part => part + .WithPosition("2") + ) + .WithPart("LiquidPart", part => part + .WithPosition("3") + ) + .WithPart("TitlePart", part => part + .WithPosition("0") + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.Trend, part => part + .WithField("Icon", field => field + .OfType("TextField") + .WithDisplayName("Icon") + .WithPosition("0") + .WithSettings(new TextFieldSettings + { + Hint = "Md Icon name", + Required = true, + }) + ) + ); + + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.LandingPageFooterCard, type => type + .DisplayedAs("Landing Page Footer Card") + .WithSettings(new FullTextAspectSettings + { + IncludeBodyAspect = false, + IncludeDisplayText = false, + }) + .WithPart(Constants.ContentTypes.LandingPageFooterCard, part => part + .WithPosition("0") + ) + .WithPart("HtmlBodyPart", part => part + .WithPosition("1") + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.LandingPageFooterCard, part => part + .WithField("Icon", field => field + .OfType("TextField") + .WithDisplayName("Icon") + .WithPosition("0") + .WithSettings(new TextFieldSettings + { + Hint = "MD Icon name", + Required = true, + }) + ) + .WithField("Link", field => field + .OfType("TextField") + .WithDisplayName("Link") + .WithPosition("1") + .WithSettings(new TextFieldSettings + { + Hint = "A link that the card will go to", + }) + ) + ); + + // Landing Page _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.LandingPage, type => type .DisplayedAs("Landing Page") .Creatable() @@ -693,63 +801,45 @@ private void CreateLandingPage() .WithPart("TitlePart", part => part .WithPosition("1") ) - ); - - _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.LandingPage, part => part - .WithField("Description", field => field - .OfType("TextField") - .WithDisplayName("Description") - .WithPosition("8") - ) - .WithField("Activity1", field => field - .OfType("HtmlField") - .WithDisplayName("Activity1") - .WithPosition("2") - ) - .WithField("Activity2", field => field - .OfType("HtmlField") - .WithDisplayName("Activity2") - .WithPosition("3") - ) - .WithField("Activity3", field => field - .OfType("HtmlField") - .WithDisplayName("Activity3") + .WithPart("Activities", "BagPart", part => part + .WithDisplayName("Activities") + .WithDescription("Add the activity cards here") .WithPosition("4") + .WithSettings(new BagPartSettings + { + ContainedContentTypes = new[] { Constants.ContentTypes.Activity }, + }) ) - .WithField("Activity4", field => field - .OfType("HtmlField") - .WithDisplayName("Activity4") + .WithPart("Trends", "BagPart", part => part + .WithDisplayName("Trends") + .WithDescription("Add the trend card here") .WithPosition("5") + .WithSettings(new BagPartSettings + { + ContainedContentTypes = new[] { Constants.ContentTypes.Trend }, + }) ) - .WithField("Trend1", field => field - .OfType("HtmlField") - .WithDisplayName("Trend1") - .WithPosition("7") - ) - .WithField("Activities", field => field - .OfType("TextField") - .WithDisplayName("Activities") - .WithPosition("1") - ) - .WithField("Trends", field => field - .OfType("TextField") - .WithDisplayName("Trends") + .WithPart("Footer", "BagPart", part => part + .WithDisplayName("Footer") + .WithDescription("Add cards to the landing page footer") .WithPosition("6") + .WithSettings(new BagPartSettings + { + ContainedContentTypes = new[] { Constants.ContentTypes.LandingPageFooterCard }, + }) ) - .WithField("Userguide", field => field - .OfType("HtmlField") - .WithDisplayName("User guide") - .WithPosition("9") - ) - .WithField("Contactus", field => field - .OfType("HtmlField") - .WithDisplayName("Contact us") - .WithPosition("10") + ); + + _contentDefinitionManager.AlterPartDefinition("LandingPage", part => part + .WithField("Description", field => field + .OfType("TextField") + .WithDisplayName("Description") + .WithPosition("0") ) .WithField("Headerlist", field => field .OfType("HtmlField") .WithDisplayName("Header list") - .WithPosition("0") + .WithPosition("1") ) ); } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid b/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid index 7e30f6658..5bdf5a6d0 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid @@ -1,5 +1,6 @@ {% style src:"~/StatCan.OrchardCore.Radar/css/landing-page.css" %} +{% zone "Header" %} {% assign imagePath = Model.ContentItem.Content.LandingPage.HeaderImage.Paths.first %}
@@ -51,99 +52,40 @@
+{% endzone %}
- {{ Model.ContentItem.Content.LandingPage.Activities.Text }} + {{ "Recent activities" | t }}
- - - -
- - mdi-flask-outline - -
- {{ Model.ContentItem.Content.LandingPage.Activity1.Html | raw }} -
-
-
-
-
- -
- -
- - - - - -
- - mdi-account-multiple - -
- {{ Model.ContentItem.Content.LandingPage.Activity2.Html | raw }} -
-
-
-
-
- -
- -
- - - - - - - -
- - mdi-calendar - -
- {{ Model.ContentItem.Content.LandingPage.Activity3.Html | raw }} + {% for activity in Model.ContentItem.Content.Activities.ContentItems %} + + + +
+ + {{ activity.Activity.Icon.Text }} + +
+ {{ activity.HtmlBodyPart.Html | raw }} +
-
-
-
-
- -
- -
- - - - - -
- - mdi-alert-circle-outline - -
- {{ Model.ContentItem.Content.LandingPage.Activity4.Html | raw }} +
+
+ +
+
-
-
-
- -
- -
- - + + + {% endfor %}
@@ -153,31 +95,33 @@
- {{ Model.ContentItem.Content.LandingPage.Trends.Text }} + {{ "Recent trends" | t }}
- - - -
- - mdi-pound - -
- {{ Model.ContentItem.Content.LandingPage.Trend1.Html | raw }} + {% for trend in Model.ContentItem.Content.Trends.ContentItems %} + + + +
+ + {{ trend.Trend.Icon.Text }} + +
+ {{ trend.HtmlBodyPart.Html | raw }} +
+
+
+
+ +
+
-
-
-
- -
- -
- - + + + {% endfor %}
@@ -185,30 +129,20 @@
- - -
- - mdi-book-open-variant - -
- {{ Model.ContentItem.Content.LandingPage.Userguide.Html | raw }} -
-
- - - - -
- - mdi-email - -
- {{ Model.ContentItem.Content.LandingPage.Contactus.Html | raw }} + {% for footerCard in Model.ContentItem.Content.Footer.ContentItems %} + + +
+ + {{ footerCard.LandingPageFooterCard.Icon.Text }} + +
+ {{ footerCard.HtmlBodyPart.Html | raw }} +
-
- - + + + {% endfor %}
\ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index da7f53093..1f4b51306 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -6,8 +6,8 @@ "website": "https://digital.statcan.gc.ca", "version": "1.0", "issetuprecipe": false, - "categories": [ "radar" ], - "tags": [ "innovation", "inno" ], + "categories": ["radar"], + "tags": ["innovation", "inno"], "steps": [ { "name": "feature", @@ -54,12 +54,8 @@ "Text": "Radar" }, "Logo": { - "Paths": [ - "radar-icon-white.svg" - ], - "MediaTexts": [ - "" - ] + "Paths": ["radar-icon-white.svg"], + "MediaTexts": [""] }, "DisplayMode": { "Text": "light" @@ -89,43 +85,6 @@ "Description": { "Text": "Explore, manage and discover insights across your projects" }, - "Section1": { - "Text": "Recent activity" - }, - "Section2": { - "Text": "Recent trends" - }, - "Activity1": { - "Text": "Projects", - "Html": "
\n Projects\n
\n
\n In-flight projects\n
" - }, - "Activity2": { - "Text": "Proposals", - "Html": "
\n Committees\n
\n
\n Latest committees\n
" - }, - "Activity3": { - "Text": null, - "Html": "
\n Events\n
\n
\n Upcoming events\n
" - }, - "Activity4": { - "Text": null, - "Html": "
\n Proposals\n
\n
\n Current proposals\n
" - }, - "Trend1": { - "Html": "
\n Topics\n
\n
\n Most used topics across all activities\n
" - }, - "Activities": { - "Text": "Recent activities" - }, - "Trends": { - "Text": "Recent trends" - }, - "Userguide": { - "Html": "
\n User Guide\n
\n
\n Learn more about the Radar\n
" - }, - "Contactus": { - "Html": "
\n Contact Us\n
\n
\n Ask questions and send feedback\n
" - }, "Headerlist": { "Html": "\n
    \n
  • \n \tDiscover pathfinding projects\n
    • \n
  • \n \tExplore technologies and topics\n
    • \n
  • \n \tShare your team's work\n
    • \n
\n" } @@ -143,6 +102,195 @@ }, "TitlePart": { "Title": "Digital Radar" + }, + "Activities": { + "ContentItems": [ + { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "Activity", + "DisplayText": "Projects", + "Latest": false, + "Published": false, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "", + "Author": "admin", + "Activity": { + "Icon": { + "Text": "mdi-flask-outline" + } + }, + "HtmlBodyPart": { + "Html": "
Projects
In-flight projects
" + }, + "LiquidPart": { + "Liquid": null + }, + "TitlePart": { + "Title": "Projects" + } + }, + { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "Activity", + "DisplayText": "Events", + "Latest": false, + "Published": false, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "", + "Author": "admin", + "Activity": { + "Icon": { + "Text": "mdi-calendar" + } + }, + "HtmlBodyPart": { + "Html": "
Events
Upcoming events
" + }, + "LiquidPart": { + "Liquid": null + }, + "TitlePart": { + "Title": "Events" + } + }, + { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "Activity", + "DisplayText": "Committees", + "Latest": false, + "Published": false, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "", + "Author": "admin", + "Activity": { + "Icon": { + "Text": "mdi-account-multiple" + } + }, + "HtmlBodyPart": { + "Html": "
Committees
Latest committees
" + }, + "LiquidPart": { + "Liquid": null + }, + "TitlePart": { + "Title": "Committees" + } + }, + { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "Activity", + "DisplayText": "Proposals", + "Latest": false, + "Published": false, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "", + "Author": "admin", + "Activity": { + "Icon": { + "Text": "mdi-alert-circle-outline" + } + }, + "HtmlBodyPart": { + "Html": "
Proposals
Current proposals
" + }, + "LiquidPart": { + "Liquid": null + }, + "TitlePart": { + "Title": "Proposals" + } + } + ] + }, + "Trends": { + "ContentItems": [ + { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "Trend", + "DisplayText": "Topics", + "Latest": false, + "Published": false, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "", + "Author": "admin", + "Trend": { + "Icon": { + "Text": "mdi-pound" + } + }, + "HtmlBodyPart": { + "Html": "
Topics
Most used topics across all activities
" + }, + "LiquidPart": { + "Liquid": null + }, + "TitlePart": { + "Title": "Topics" + } + } + ] + }, + "Footer": { + "ContentItems": [ + { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "LandingPageFooterCard", + "DisplayText": "", + "Latest": false, + "Published": false, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "", + "Author": "admin", + "LandingPageFooterCard": { + "Icon": { + "Text": "mdi-book-open-variant" + } + }, + "HtmlBodyPart": { + "Html": "
User Guide
Learn more about the Radar
" + } + }, + { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "LandingPageFooterCard", + "DisplayText": "", + "Latest": false, + "Published": false, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "", + "Author": "admin", + "LandingPageFooterCard": { + "Icon": { + "Text": "mdi-email" + } + }, + "HtmlBodyPart": { + "Html": "
Contact Us
Ask questions and send feedback
" + } + } + ] } }, { @@ -159,9 +307,7 @@ "Author": "[js: parameters('AdminUsername')]", "VAppBar": { "Props": { - "Values": [ - "dark" - ] + "Values": ["dark"] }, "Color": { "Text": "#009688" @@ -205,4 +351,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj index 6c93f4989..733871b5d 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj +++ b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj @@ -30,6 +30,7 @@ + From 9f443b8c7bd5abbeedd3fc32e173142d04c3f6ab Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Tue, 21 Sep 2021 11:25:04 -0400 Subject: [PATCH 021/198] fix: landing page extra div --- .../Recipes/Snippets/landingpage.liquid | 92 +++++++++---------- 1 file changed, 45 insertions(+), 47 deletions(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid b/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid index 5bdf5a6d0..bac31d985 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid @@ -2,55 +2,53 @@ {% zone "Header" %} {% assign imagePath = Model.ContentItem.Content.LandingPage.HeaderImage.Paths.first %} -
-
-
-
- - - -
- {{ Model.ContentItem | display_text }} -
- - - - -
- {{ Model.ContentItem.Content.LandingPage.Description.Text }} -
- - - - -
- {{ Model.ContentItem.Content.LandingPage.Headerlist.Html | raw }} -
- - - - -
- - -
- - - -
-
-
-
+
+
+
+ + + +
+ {{ Model.ContentItem | display_text }} +
+ + + + +
+ {{ Model.ContentItem.Content.LandingPage.Description.Text }} +
+ + + + +
+ {{ Model.ContentItem.Content.LandingPage.Headerlist.Html | raw }} +
+ + + + +
+ + +
+ + +
+
+
+
{% endzone %} From f301fef773e2364bbadb9bb0736d6fb35f777f56 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Tue, 21 Sep 2021 11:26:04 -0400 Subject: [PATCH 022/198] wip: add list view header --- .../Recipes/radar.setup.recipe.json | 16 ++++++++++ .../Views/Content-Proposals.liquid | 29 +++++++++++++++++++ .../wwwroot/css/list-view.css | 26 +++++++++++++++++ .../wwwroot/images/icon_communities.svg | 18 ++++++++++++ .../wwwroot/images/icon_events.svg | 15 ++++++++++ .../wwwroot/images/icon_experiments.svg | 18 ++++++++++++ .../wwwroot/images/icon_opportunities.svg | 16 ++++++++++ 7 files changed, 138 insertions(+) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposals.liquid create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_communities.svg create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_events.svg create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_experiments.svg create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_opportunities.svg diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index 1f4b51306..729ebfa52 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -32,6 +32,22 @@ { "SourcePath": "../wwwroot/images/radar-icon-white.svg", "TargetPath": "radar-icon-white.svg" + }, + { + "SourcePath": "../wwwroot/images/icon_communities.svg", + "TargetPath": "icon_communities.svg" + }, + { + "SourcePath": "../wwwroot/images/icon_events.svg", + "TargetPath": "icon_events.svg" + }, + { + "SourcePath": "../wwwroot/images/icon_experiments.svg", + "TargetPath": "icon_experiments" + }, + { + "SourcePath": "../wwwroot/images/icon_opportunities.svg", + "TargetPath": "icon_opportunities" } ] }, diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposals.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposals.liquid new file mode 100644 index 000000000..9b24b94ca --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposals.liquid @@ -0,0 +1,29 @@ +{% style src:"~/StatCan.OrchardCore.Radar/css/list-view.css" %} + +{% zone "Header" %} +
+
+ + + +
+
{{ Model.ContentItem | display_text }}
+
+
+ + +
+ + +
+ + + +
+
+
+
+
+{% endzone %} \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css new file mode 100644 index 000000000..429638f3d --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css @@ -0,0 +1,26 @@ +.list-header { + padding: 3rem 16rem 4rem 16rem; + background: transparent linear-gradient(180deg, #CFECE9 0%, #ABDED7 100%) 0% 0% no-repeat; +} + +.zigzag-container { + position: relative; + width: 100%; + } + +.zigzag { + content: ' '; + display: block; + position: absolute; + bottom: 0px; + left: 0px; + width: 100%; + height: 32px; +} + +.zigzag-white { + background: linear-gradient(-40deg, #FFFFFF 16px, transparent 0), linear-gradient(40deg, #FFFFFF 16px, transparent 0); + background-position: left bottom; + background-repeat: repeat-x; + background-size: 32px 32px; +} \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_communities.svg b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_communities.svg new file mode 100644 index 000000000..879a10a4a --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_communities.svg @@ -0,0 +1,18 @@ + + + + + + + + + + diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_events.svg b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_events.svg new file mode 100644 index 000000000..0d594863b --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_events.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_experiments.svg b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_experiments.svg new file mode 100644 index 000000000..117556b39 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_experiments.svg @@ -0,0 +1,18 @@ + + + + + + + + + + diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_opportunities.svg b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_opportunities.svg new file mode 100644 index 000000000..025a5660c --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_opportunities.svg @@ -0,0 +1,16 @@ + + + + + + + + + + From e44369604005f12bae94d6efa6c73e440bf4b18a Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Tue, 21 Sep 2021 13:18:42 -0400 Subject: [PATCH 023/198] wip: add table to list view --- .../Views/Content-Proposals.liquid | 43 ++++++++++++- .../wwwroot/css/list-view.css | 62 ++++++++++++++++++- 2 files changed, 101 insertions(+), 4 deletions(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposals.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposals.liquid index 9b24b94ca..f1dd34ae9 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposals.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposals.liquid @@ -1,13 +1,18 @@ {% style src:"~/StatCan.OrchardCore.Radar/css/list-view.css" %} +{% assign proposals = Queries.AllProposalsSQL | query %} + {% zone "Header" %} -
+
-
+
{{ Model.ContentItem | display_text }}
+
+
{{ proposals | size }}
+
@@ -26,4 +31,36 @@
-{% endzone %} \ No newline at end of file +{% endzone %} + +
+ + + + + + + + + + + + {% for proposal in proposals %} + + + + + + + + {% endfor %} + +
{{ "Name" | t }}{{ "Updated" | t }}{{ "Registrar" | t }}{{ "Visibility" | t }}{{ "Created" | t }}
{{ proposal | display_text }}{{ proposal.ModifiedUtc | local | date: "%b %d, %Y" }}{{ proposal.Owner }} + {% if proposal.Published %} + {{ "Published" | t }} + {% else %} + {{ "Draft" | t }} + {% endif %} + {{ proposal.CreatedUtc | local | date: "%b %d, %Y" }}
+ +
\ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css index 429638f3d..a378c5845 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css @@ -1,8 +1,68 @@ .list-header { - padding: 3rem 16rem 4rem 16rem; + padding: 3rem 13rem 4rem 13rem; background: transparent linear-gradient(180deg, #CFECE9 0%, #ABDED7 100%) 0% 0% no-repeat; } +.title-container { + display: flex; + align-items: center; +} + +.bubble { + margin-left: 2rem; + background-color: #F6FCFB; + border: 2px solid #009C88; + border-radius: 50%; + width: 5rem; + height: 5rem; + display: flex; + align-items: center; + justify-content: center; + font-weight: 400; + font-size: 38px; +} + +.bubble-text { + color: #227069; +} + +.table-container { + padding: 0 2rem 0 2rem; + width: 80%; + margin: auto; +} + +.table { + width: 100%; + border-collapse: collapse; + border-spacing: 0; +} + +.table-header { + border-bottom: 2px solid#009C88; +} + +.table-row { + background: #F6FCFB; + height: 48px; + border-bottom: 1px solid #CFECE9; + cursor: pointer; + overflow-wrap: anywhere; +} + +.table-row:hover { + background: #CFECE9; +} + +.name-col { + text-align: left; + padding-left: 1rem; +} + +.table-col { + text-align: center; +} + .zigzag-container { position: relative; width: 100%; From dbe854f5d282a08fa8a4ed890f682a9e2cb3df5c Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Tue, 21 Sep 2021 15:00:07 -0400 Subject: [PATCH 024/198] feat: add search function to list view --- .../Views/Content-Proposals.liquid | 167 +++++++++++------- .../wwwroot/css/list-view.css | 20 +++ 2 files changed, 128 insertions(+), 59 deletions(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposals.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposals.liquid index f1dd34ae9..f793d8fa8 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposals.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposals.liquid @@ -1,66 +1,115 @@ {% style src:"~/StatCan.OrchardCore.Radar/css/list-view.css" %} -{% assign proposals = Queries.AllProposalsSQL | query %} - -{% zone "Header" %} +{% assign proposals = Queries.AllProposalsSQL | query %} {% zone "Header" %}
-
- - - -
-
{{ Model.ContentItem | display_text }}
-
-
{{ proposals | size }}
-
-
-
- - -
- - -
- - - -
-
-
-
+
+ + + +
+
{{ Model.ContentItem | display_text }}
+
+
{{ proposals | size }}
+
+
+
+ + mdi-magnify + + + + + mdi-close + + +
+ + +
+ + +
+ + + +
+
+
+
{% endzone %}
- - - - - - - - - - - - {% for proposal in proposals %} - - - - - - - - {% endfor %} - -
{{ "Name" | t }}{{ "Updated" | t }}{{ "Registrar" | t }}{{ "Visibility" | t }}{{ "Created" | t }}
{{ proposal | display_text }}{{ proposal.ModifiedUtc | local | date: "%b %d, %Y" }}{{ proposal.Owner }} - {% if proposal.Published %} - {{ "Published" | t }} - {% else %} - {{ "Draft" | t }} - {% endif %} - {{ proposal.CreatedUtc | local | date: "%b %d, %Y" }}
- -
\ No newline at end of file + + + + + + + + + + + + {% for proposal in proposals %} + + + + + + + + {% endfor %} + +
{{ "Name" | t }}{{ "Updated" | t }}{{ "Registrar" | t }}{{ "Visibility" | t }}{{ "Created" | t }}
{{ proposal | display_text }} + {{ proposal.ModifiedUtc | local | date: "%b %d, %Y" }} + {{ proposal.Owner }} + {% if proposal.Published %} + {{ "Published" | t }} + {% else %} + {{ "Draft" | t }} + {% endif %} + + {{ proposal.CreatedUtc | local | date: "%b %d, %Y" }} +
+
+ + \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css index a378c5845..fd3e401ec 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css @@ -54,6 +54,26 @@ background: #CFECE9; } +.search-container { + margin: 1rem 0 1.5rem 0; + display: flex; + background: #F6FCFB; + align-items: center; + border-bottom: 2px solid #009C88; + display: flex; + height: 2.2rem; + padding-left: 1rem; + width: fit-content; +} + +input:focus{ + outline: none; +} + +.search-input { + +} + .name-col { text-align: left; padding-left: 1rem; From caa46a40b6049bab24f845932e910f427112f97f Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Wed, 22 Sep 2021 08:51:11 -0400 Subject: [PATCH 025/198] refactor: use generic list content type --- .../Views/Content-EntityList.liquid | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-EntityList.liquid diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-EntityList.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-EntityList.liquid new file mode 100644 index 000000000..f5904ced8 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-EntityList.liquid @@ -0,0 +1,86 @@ +{% style src:"~/StatCan.OrchardCore.Radar/css/list-view.css" %} + +{% zone "Header" %} +
+
+ + + +
+
{{ Model.ContentItem | display_text }}
+
+
+
+
+
+ + mdi-magnify + + + + + mdi-close + + +
+ + +
+ + +
+ + + +
+
+
+
+
+{% endzone %} + +{{ Model.Content.LiquidPart | shape_render }} + + \ No newline at end of file From 9a36cb8992dfa3d67b3865f6ee868d13d814ea3e Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Wed, 22 Sep 2021 11:16:10 -0400 Subject: [PATCH 026/198] feat: add entity list views --- .../StatCan.OrchardCore.Radar/Constants.cs | 2 + .../StatCan.OrchardCore.Radar/Migrations.cs | 46 ++++- .../Recipes/radar.setup.recipe.json | 191 +++++++++++++++++- .../Views/Content-EntityList.liquid | 21 -- .../Views/Content-Proposals.liquid | 115 ----------- .../wwwroot/css/list-view.css | 6 +- 6 files changed, 234 insertions(+), 147 deletions(-) delete mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposals.liquid diff --git a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs index a6aebba3f..94882a61c 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs @@ -29,10 +29,12 @@ public static class ContentTypes // Parts public const string RadarEntity = "RadarEntity"; + // Pages public const string LandingPage = "LandingPage"; public const string Activity = "Activity"; public const string Trend = "Trend"; public const string LandingPageFooterCard = "LandingPageFooterCard"; + public const string EntityList = "EntityList"; } } } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs index a1bea64e7..69d9caca7 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -43,6 +43,7 @@ public async Task CreateAsync() CreateCommunity(); CreateLandingPage(); + CreateEntityList(); return 1; } @@ -210,7 +211,7 @@ private async Task CreateTaxonomyItems() // Project Type var projectTypes = await _contentManager.NewAsync("Taxonomy"); - _taxonomyIds.Add("Project Types", proposalTypes.ContentItemId); + _taxonomyIds.Add("Project Types", projectTypes.ContentItemId); projectTypes.DisplayText = "Project Types"; // Instead of TitlePart.Title projectTypes.Alter(part => @@ -843,5 +844,48 @@ private void CreateLandingPage() ) ); } + + private void CreateEntityList() + { + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.EntityList, type => type + .DisplayedAs("Entity List") + .Creatable() + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithSettings(new FullTextAspectSettings + { + IncludeBodyAspect = false, + IncludeDisplayText = false, + }) + .WithPart(Constants.ContentTypes.EntityList, part => part + .WithPosition("3") + ) + .WithPart("TitlePart", part => part + .WithPosition("1") + ) + .WithPart("LiquidPart", part => part + .WithPosition("4") + ) + .WithPart("LocalizationPart", part => part + .WithPosition("0") + ) + .WithPart("AutoroutePart", part => part + .WithPosition("2") + ) + .WithPart("ContentPermissionsPart", part => part + .WithPosition("5") + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.EntityList, part => part + .WithField("Image", field => field + .OfType("MediaField") + .WithDisplayName("Image") + .WithPosition("0") + ) + ); + } } } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index 729ebfa52..1f3645154 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -5,7 +5,7 @@ "author": "Digital Innovation Team", "website": "https://digital.statcan.gc.ca", "version": "1.0", - "issetuprecipe": false, + "issetuprecipe": true, "categories": ["radar"], "tags": ["innovation", "inno"], "steps": [ @@ -13,8 +13,7 @@ "name": "feature", "disable": [], "enable": [ - "StatCan.OrchardCore.Vuetify.Grid", - "StatCan.OrchardCore.Vuetify.Card" + "StatCan.OrchardCore.Radar" ] }, { @@ -43,11 +42,11 @@ }, { "SourcePath": "../wwwroot/images/icon_experiments.svg", - "TargetPath": "icon_experiments" + "TargetPath": "icon_experiments.svg" }, { "SourcePath": "../wwwroot/images/icon_opportunities.svg", - "TargetPath": "icon_opportunities" + "TargetPath": "icon_opportunities.svg" } ] }, @@ -70,8 +69,8 @@ "Text": "Radar" }, "Logo": { - "Paths": ["radar-icon-white.svg"], - "MediaTexts": [""] + "Paths": [ "radar-icon-white.svg" ], + "MediaTexts": [ "" ] }, "DisplayMode": { "Text": "light" @@ -323,7 +322,7 @@ "Author": "[js: parameters('AdminUsername')]", "VAppBar": { "Props": { - "Values": ["dark"] + "Values": [ "dark" ] }, "Color": { "Text": "#009688" @@ -354,6 +353,182 @@ "Zone": "Header", "Layer": "All" } + }, + { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "EntityList", + "DisplayText": "Proposals", + "Latest": true, + "Published": true, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", + "EntityList": { + "Image": { + "Paths": [ + "icon_opportunities.svg" + ], + "MediaTexts": [ + "" + ] + } + }, + "TitlePart": { + "Title": "Proposals" + }, + "LiquidPart": { + "Liquid": "{% assign proposals = Queries.AllEntitiesSQL | query: contentType: \"Proposal\" %}\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% for proposal in proposals %}\r\n \r\n \r\n \r\n \r\n \r\n {% endfor %}\r\n \r\n
NameCreatedVisibility
{{ proposal | display_text }}\r\n {{ proposal.CreatedUtc | local | date: \"%b %d, %Y\" }}\r\n \r\n {% if proposal.Published %}\r\n \tPublished\r\n {% else %}\r\n \tDraft\r\n {% endif %}\r\n
\r\n
\r\n\r\n" + }, + "LocalizationPart": { + "LocalizationSet": "4swd1468228sw2y908226nvsxd", + "Culture": "en" + }, + "AutoroutePart": { + "Path": "proposals", + "SetHomepage": false, + "Disabled": false, + "RouteContainedItems": false, + "Absolute": false + }, + "ContentPermissionsPart": { + "Enabled": false, + "Roles": [] + } + }, + { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "EntityList", + "DisplayText": "Projects", + "Latest": true, + "Published": true, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", + "EntityList": { + "Image": { + "Paths": [ + "icon_experiments.svg" + ], + "MediaTexts": [ + "" + ] + } + }, + "TitlePart": { + "Title": "Projects" + }, + "LiquidPart": { + "Liquid": "{% assign projects = Queries.AllEntitiesSQL | query: contentType: \"Project\" %}\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% for project in projects %}\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% endfor %}\r\n \r\n
NameUpdatedRegistrarVisibilityCreated
{{ project | display_text }}\r\n {{ project.ModifiedUtc | local | date: \"%b %d, %Y\" }}\r\n {{ project.Owner }}\r\n {% if project.Published %}\r\n \tPublished\r\n {% else %}\r\n \tDraft\r\n {% endif %}\r\n \r\n {{ project.CreatedUtc | local | date: \"%b %d, %Y\" }}\r\n
\r\n
\r\n\r\n" + }, + "LocalizationPart": { + "LocalizationSet": "48aapabjc93c43jwbrkh5c9wwj", + "Culture": "en" + }, + "AutoroutePart": { + "Path": "projects", + "SetHomepage": false, + "Disabled": false, + "RouteContainedItems": false, + "Absolute": false + }, + "ContentPermissionsPart": { + "Enabled": false, + "Roles": [] + } + }, + { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "EntityList", + "DisplayText": "Communities", + "Latest": true, + "Published": true, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", + "EntityList": { + "Image": { + "Paths": [ + "icon_communities.svg" + ], + "MediaTexts": [ + "" + ] + } + }, + "TitlePart": { + "Title": "Communities" + }, + "LiquidPart": { + "Liquid": "{% assign communities = Queries.AllEntitiesSQL | query: contentType: \"Community\" %}\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% for community in communities %}\r\n \r\n \r\n \r\n \r\n \r\n \r\n {% endfor %}\r\n \r\n
NameMembersOwnerType
{{ community | display_text }}\r\n
\r\n mdi-account\r\n \t
{{ community.ContentItem.Content.CommunityMember.ContentItems | size }}
\r\n
\r\n 		{{ community.Owner }}{{ community.ContentItem.Content.Community.Type.TagNames.first }}
\r\n
\r\n\r\n" + }, + "LocalizationPart": { + "LocalizationSet": "4yhc97t6jjsq2w04xzrbe3h451", + "Culture": "en" + }, + "AutoroutePart": { + "Path": "communities", + "SetHomepage": false, + "Disabled": false, + "RouteContainedItems": false, + "Absolute": false + }, + "ContentPermissionsPart": { + "Enabled": false, + "Roles": [] + } + }, + { + "ContentItemId": "[js: uuid()]", + "ContentItemVersionId": null, + "ContentType": "EntityList", + "DisplayText": "Events", + "Latest": true, + "Published": true, + "ModifiedUtc": null, + "PublishedUtc": null, + "CreatedUtc": null, + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", + "EntityList": { + "Image": { + "Paths": [ + "icon_events.svg" + ], + "MediaTexts": [ + "" + ] + } + }, + "TitlePart": { + "Title": "Events" + }, + "LiquidPart": { + "Liquid": "{% assign events = Queries.AllEntitiesSQL | query: contentType: \"Event\" %}\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {% for event in events %}\r\n \r\n \r\n \r\n \r\n \r\n \r\n {% endfor %}\r\n \r\n
NameDateOrganizerVisibility
{{ event | display_text }}\r\n
{{ event.ContentItem.Content.Event.StartDate.Value | local | date: \"%b %d, %Y\" }} - {{ event.ContentItem.Content.Event.EndDate.Value | local | date: \"%b %d, %Y\" }}
\r\n
{{ event.ContentItem.Content.Event.StartDate.Value | local | date: \"%H:%M %p\" }} - {{ event.ContentItem.Content.Event.EndDate.Value | local | date: \"%H:%M %p\" }}
\r\n 		{{ event.ContentItem.Content.EventOrganizer.ContentItems.first.EventOrganizer.Organizer.UserNames.first }}\r\n {% if event.Published %}\r\n \tPublished\r\n {% else %}\r\n \tDraft\r\n {% endif %}\r\n
\r\n
\r\n\r\n" + }, + "LocalizationPart": { + "LocalizationSet": "45btr33t81ass3eb7n7b0gsrmj", + "Culture": "en" + }, + "AutoroutePart": { + "Path": "events", + "SetHomepage": false, + "Disabled": false, + "RouteContainedItems": false, + "Absolute": false + }, + "ContentPermissionsPart": { + "Enabled": false, + "Roles": [] + } } ] }, diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-EntityList.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-EntityList.liquid index f5904ced8..1158c1539 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-EntityList.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-EntityList.liquid @@ -45,27 +45,6 @@ \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css index fd3e401ec..4226fa380 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css @@ -70,8 +70,10 @@ input:focus{ outline: none; } -.search-input { - +.icon-cell { + display: flex; + align-items: center; + justify-content: center; } .name-col { From 5afd2ef2f40d919a43fe5764a927d8e0360954b1 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Wed, 22 Sep 2021 11:54:36 -0400 Subject: [PATCH 027/198] fix: add list query --- .../Recipes/radar.setup.recipe.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index 1f3645154..8598a5810 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -540,6 +540,18 @@ "Content": "[file:text('Snippets/landingpage.liquid')]" } } + }, + { + "name": "Queries", + "Queries": [ + { + "Template": "select DocumentId\r\n from ContentItemIndex \r\n where ContentType = @contentType", + "ReturnDocuments": true, + "Name": "AllEntitiesSQL", + "Source": "Sql", + "Schema": null + } + ] } ] } From cfd8d21a1cbe1e0648297aebd9f109c5123b44a2 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Wed, 22 Sep 2021 15:42:14 -0400 Subject: [PATCH 028/198] feat: add contents to landing page card --- .../Recipes/Snippets/landingpage.liquid | 12 ++-- .../Recipes/radar.setup.recipe.json | 22 +++++-- .../wwwroot/css/landing-page.css | 65 ++++++++++++++++--- 3 files changed, 78 insertions(+), 21 deletions(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid b/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid index bac31d985..7b7a472f9 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid @@ -64,9 +64,9 @@ {% for activity in Model.ContentItem.Content.Activities.ContentItems %} - - -
+
+
+
{{ activity.Activity.Icon.Text }} @@ -77,11 +77,9 @@
- -
-
- + {{ activity.LiquidPart.Liquid | liquid }} +
{% endfor %} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index 8598a5810..51d7c2909 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -141,7 +141,7 @@ "Html": "
Projects
In-flight projects
" }, "LiquidPart": { - "Liquid": null + "Liquid": "{% assign projects = Queries.AllEntitiesWithLimitSQL | query: contentType: \"Project\", num: 5 %}\r\n{% assign projectList = Queries.EntityListSQL | query: name: \"Projects\" | first %}\r\n\r\n
\r\n{% for project in projects %}\r\n
\r\n {{ project | display_text }}\r\n
\r\n{% endfor %}\r\n
\r\n\r\n \r\n All projects\r\n \r\n" }, "TitlePart": { "Title": "Projects" @@ -168,7 +168,7 @@ "Html": "
Events
Upcoming events
" }, "LiquidPart": { - "Liquid": null + "Liquid": "{% assign events = Queries.AllEntitiesWithLimitSQL | query: contentType: \"Event\", num: 5 %}\r\n{% assign eventList = Queries.EntityListSQL | query: name: \"Events\" | first %}\r\n\r\n
\r\n{% for event in events %}\r\n
\r\n {{ event | display_text }}\r\n
\r\n{% endfor %}\r\n
\r\n\r\n \r\n All Events\r\n \r\n" }, "TitlePart": { "Title": "Events" @@ -195,7 +195,7 @@ "Html": "
Committees
Latest committees
" }, "LiquidPart": { - "Liquid": null + "Liquid": "{% assign communities = Queries.AllEntitiesWithLimitSQL | query: contentType: \"Community\", num: 5 %}\r\n{% assign communityList = Queries.EntityListSQL | query: name: \"Communities\" | first %}\r\n\r\n
\r\n{% for community in communities %}\r\n
\r\n {{ community | display_text }}\r\n
\r\n{% endfor %}\r\n
\r\n\r\n \r\n All Committees\r\n \r\n" }, "TitlePart": { "Title": "Committees" @@ -222,7 +222,7 @@ "Html": "
Proposals
Current proposals
" }, "LiquidPart": { - "Liquid": null + "Liquid": "{% assign proposals = Queries.AllEntitiesWithLimitSQL | query: contentType: \"Proposal\", num: 5 %}\r\n{% assign proposalList = Queries.EntityListSQL | query: name: \"Proposals\" | first %}\r\n\r\n
\r\n{% for proposal in proposals %}\r\n
\r\n {{ proposal | display_text }}\r\n
\r\n{% endfor %}\r\n
\r\n\r\n \r\n All Proposals\r\n \r\n" }, "TitlePart": { "Title": "Proposals" @@ -550,6 +550,20 @@ "Name": "AllEntitiesSQL", "Source": "Sql", "Schema": null + }, + { + "Template": "select DocumentId\r\n from ContentItemIndex \r\n where ContentType = 'EntityList' and DisplayText = @name", + "ReturnDocuments": true, + "Name": "EntityListSQL", + "Source": "Sql", + "Schema": null + }, + { + "Template": "select DocumentId\r\n from ContentItemIndex \r\n where ContentType = @contentType\r\n\tlimit @num", + "ReturnDocuments": true, + "Name": "AllEntitiesWithLimitSQL", + "Source": "Sql", + "Schema": null } ] } diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css index 753346c2a..ba053e020 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css @@ -8,7 +8,7 @@ .light-font { font-weight: lighter; - color: #000000DE; + color: #000000de; opacity: 1; } @@ -36,7 +36,7 @@ } .section-background { - background: #009C880A; + background: #009c880a; } .card-title { @@ -44,7 +44,7 @@ } .front-footer { - background: #009C88; + background: #009c88; } .header-footer { @@ -54,15 +54,53 @@ } .card-background-light { - background-color: #F6FCFB; + background-color: #f6fcfb; } .card-background-dark { background: #cfece9 0% 0% no-repeat; } +.card { + display: flex; + flex-direction: column; + background-color: #F6FCFB; + height: 100%; +} + .card-title { - background: #009C88 0% 0% no-repeat; + background: #009c88 0% 0% no-repeat; + display: flex; + flex-direction: column; +} + +.card-title-caption { + display: flex; +} + +.card-body { + padding: 1rem 0 0 6.1rem; + margin-bottom: 1.5rem; + flex-grow: 1; +} + +.card-button { + margin-bottom: 1rem; + margin-left: 1rem; +} + +.card-button:hover { + background-color: #cfece9; + color: #227069; +} + +.card-item-link { + color: #000000 !important; +} + +.card-item-link:hover { + color: #009c88 !important; + text-decoration: underline; } .zigzag-container { @@ -71,7 +109,7 @@ } .zigzag { - content: ' '; + content: " "; display: block; position: absolute; bottom: 0px; @@ -81,21 +119,24 @@ } .zigzag-white { - background: linear-gradient(-40deg, #FFFFFF 16px, transparent 0), linear-gradient(40deg, #FFFFFF 16px, transparent 0); + background: linear-gradient(-40deg, #ffffff 16px, transparent 0), + linear-gradient(40deg, #ffffff 16px, transparent 0); background-position: left bottom; background-repeat: repeat-x; background-size: 32px 32px; } .zigzag-light { - background: linear-gradient(-40deg, #F6FCFB 16px, transparent 0), linear-gradient(40deg, #F6FCFB 16px, transparent 0); + background: linear-gradient(-40deg, #f6fcfb 16px, transparent 0), + linear-gradient(40deg, #f6fcfb 16px, transparent 0); background-position: left bottom; background-repeat: repeat-x; background-size: 32px 32px; } .zigzag-dark { - background: linear-gradient(-40deg, #cfece9 16px, transparent 0), linear-gradient(40deg, #cfece9 16px, transparent 0); + background: linear-gradient(-40deg, #cfece9 16px, transparent 0), + linear-gradient(40deg, #cfece9 16px, transparent 0); background-position: left bottom; background-repeat: repeat-x; background-size: 32px 32px; @@ -107,4 +148,8 @@ background-repeat: no-repeat; background-position: center bottom -590px; padding: 8rem 0rem 3rem 0rem; -} \ No newline at end of file +} + +a { + text-decoration: none; +} From 9e156de8052dc125d935f2dd12a1ea472e66b07d Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Thu, 23 Sep 2021 13:22:36 -0400 Subject: [PATCH 029/198] refactor: generic radar entity --- .../StatCan.OrchardCore.Radar/Constants.cs | 2 +- .../Indexing/RadarEntityPartIndex.cs | 51 ++++++++++++++++++ .../StatCan.OrchardCore.Radar/Migrations.cs | 52 +++++++++++++++++-- .../Models/RadarEntityPart.cs | 16 ++++++ src/Apps/StatCan.OrchardCore.Radar/Startup.cs | 6 +++ 5 files changed, 121 insertions(+), 6 deletions(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Indexing/RadarEntityPartIndex.cs create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Models/RadarEntityPart.cs diff --git a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs index 94882a61c..7c2af9765 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs @@ -27,7 +27,7 @@ public static class ContentTypes public const string CommunityMember = "CommunityMember"; // Parts - public const string RadarEntity = "RadarEntity"; + public const string RadarEntityPart = "RadarEntityPart"; // Pages public const string LandingPage = "LandingPage"; diff --git a/src/Apps/StatCan.OrchardCore.Radar/Indexing/RadarEntityPartIndex.cs b/src/Apps/StatCan.OrchardCore.Radar/Indexing/RadarEntityPartIndex.cs new file mode 100644 index 000000000..4aad07c0b --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Indexing/RadarEntityPartIndex.cs @@ -0,0 +1,51 @@ +using System; +using OrchardCore.ContentManagement; +using YesSql.Indexes; +using StatCan.OrchardCore.Radar.Models; + +/** + * This index is needed for quering all radar entities. This query would provide possibily + * to add any radar entity and avoid hard-coding contenty types in the views. + */ +namespace StatCan.OrchardCore.Radar.Indexing +{ + public class RadarEntityPartIndex : MapIndex + { + public string ContentItemId { get; set; } + + public string ContentType { get; set; } + + public bool Published { get; set; } + } + + public class RadarEntityPartIndexProvider : IndexProvider + { + public override void Describe(DescribeContext context) + { + context.For() + .Map(contentItem => + { + var radarEntityPart = contentItem.As(); + + // Ignore if not a radar entity + if (radarEntityPart == null) + { + return null; + } + + // Ignore previous versions of the content item + if (!contentItem.Latest) + { + return null; + } + + return new RadarEntityPartIndex + { + ContentItemId = contentItem.ContentItemId, + ContentType = contentItem.ContentType, + Published = contentItem.Published + }; + }); + } + } +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs index 69d9caca7..68b60afc7 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -13,6 +13,10 @@ using OrchardCore.Taxonomies.Settings; using OrchardCore.Flows.Models; using OrchardCore.Contents.Models; +using OrchardCore.Autoroute.Models; +using YesSql.Sql; +using StatCan.OrchardCore.Radar.Indexing; +using StatCan.OrchardCore.Radar.Models; namespace StatCan.OrchardCore.Radar { @@ -68,6 +72,9 @@ private void CreateTaxonomies() Pattern = "{{ ContentItem.Content.Topic.Name.Text }}", }) ) + .WithPart("AutoroutePart", part => part + .WithPosition("2") + ) ); _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.Topic, part => part @@ -99,6 +106,9 @@ private void CreateTaxonomies() Pattern = "{{ ContentItem.Content.ProposalType.Name.Text }}", }) ) + .WithPart("AutoroutePart", part => part + .WithPosition("2") + ) ); _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.ProposalType, part => part @@ -132,6 +142,9 @@ private void CreateTaxonomies() Pattern = "{{ ContentItem.Content.ProjectType.Name.Text }}", }) ) + .WithPart("AutoroutePart", part => part + .WithPosition("2") + ) ); _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.ProjectType, part => part @@ -165,6 +178,9 @@ private void CreateTaxonomies() Pattern = "{{ ContentItem.Content.CommunityType.Name.Text }}", }) ) + .WithPart("AutoroutePart", part => part + .WithPosition("2") + ) ); _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.CommunityType, part => part @@ -188,6 +204,11 @@ private async Task CreateTaxonomyItems() _taxonomyIds.Add("Topics", topics.ContentItemId); topics.DisplayText = "Topics"; // Instead of TitlePart.Title + topics.Alter(part => + { + part.Path = "/topics"; + part.RouteContainedItems = true; + }); topics.Alter(part => { part.TermContentType = Constants.ContentTypes.Topic; @@ -201,6 +222,11 @@ private async Task CreateTaxonomyItems() _taxonomyIds.Add("Proposal Types", proposalTypes.ContentItemId); proposalTypes.DisplayText = "Proposal Types"; // Instead of TitlePart.Title + proposalTypes.Alter(part => + { + part.Path = "/proposal-types"; + part.RouteContainedItems = true; + }); proposalTypes.Alter(part => { part.TermContentType = Constants.ContentTypes.ProposalType; @@ -214,6 +240,11 @@ private async Task CreateTaxonomyItems() _taxonomyIds.Add("Project Types", projectTypes.ContentItemId); projectTypes.DisplayText = "Project Types"; // Instead of TitlePart.Title + projectTypes.Alter(part => + { + part.Path = "/project-types"; + part.RouteContainedItems = true; + }); projectTypes.Alter(part => { part.TermContentType = Constants.ContentTypes.ProjectType; @@ -227,6 +258,11 @@ private async Task CreateTaxonomyItems() _taxonomyIds.Add("Community Types", communityTypes.ContentItemId); communityTypes.DisplayText = "Community Types"; // Instead of TitlePart.Title + communityTypes.Alter(part => + { + part.Path = "/community-types"; + part.RouteContainedItems = true; + }); communityTypes.Alter(part => { part.TermContentType = Constants.ContentTypes.CommunityType; @@ -256,7 +292,7 @@ private void CreateArtifact() private void CreateRadarEntityPart() { - _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.RadarEntity, part => part + _contentDefinitionManager.AlterPartDefinition(nameof(RadarEntityPart), part => part .Attachable() .WithDescription("Provides fields for an entity in Radar") .WithField("Name", field => field @@ -293,6 +329,12 @@ private void CreateRadarEntityPart() }) ) ); + + SchemaBuilder.CreateMapIndexTable(table => table + .Column(nameof(RadarEntityPartIndex.ContentItemId), column => column.WithLength(26)) + .Column(nameof(RadarEntityPartIndex.ContentType)) + .Column(nameof(RadarEntityPartIndex.Published)) + ); } private void CreateProposal() @@ -307,7 +349,7 @@ private void CreateProposal() .WithPart(Constants.ContentTypes.Proposal, part => part .WithPosition("2") ) - .WithPart(Constants.ContentTypes.RadarEntity, part => part + .WithPart(nameof(RadarEntityPart), part => part .WithPosition("1") ) .WithPart("TitlePart", part => part @@ -404,7 +446,7 @@ private void CreateProject() .WithPart(Constants.ContentTypes.Project, part => part .WithPosition("4") ) - .WithPart(Constants.ContentTypes.RadarEntity, part => part + .WithPart(nameof(RadarEntityPart), part => part .WithPosition("1") ) .WithPart("TitlePart", part => part @@ -518,7 +560,7 @@ private void CreateEvent() .WithPart("ContentPermissionsPart", part => part .WithPosition("5") ) - .WithPart(Constants.ContentTypes.RadarEntity, part => part + .WithPart(nameof(RadarEntityPart), part => part .WithPosition("2") ) .WithPart("TitlePart", part => part @@ -627,7 +669,7 @@ private void CreateCommunity() Pattern = "{{ ContentItem.Content.RadarEntity.Name.Text }}", }) ) - .WithPart(Constants.ContentTypes.RadarEntity, part => part + .WithPart(nameof(RadarEntityPart), part => part .WithPosition("1") ) .WithPart("ContentPermissionsPart", part => part diff --git a/src/Apps/StatCan.OrchardCore.Radar/Models/RadarEntityPart.cs b/src/Apps/StatCan.OrchardCore.Radar/Models/RadarEntityPart.cs new file mode 100644 index 000000000..781e2b421 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Models/RadarEntityPart.cs @@ -0,0 +1,16 @@ +using OrchardCore.ContentFields.Fields; +using OrchardCore.ContentManagement; +using OrchardCore.Taxonomies.Fields; + +namespace StatCan.OrchardCore.Radar.Models +{ + public class RadarEntityPart : ContentPart + { + public TextField Name { get; set; } + + public TextField Description { get; set; } + public TaxonomyField Topics { get; set; } + + public ContentPickerField RelatedEntity { get; set; } + } +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs index 5a0dfdc22..cfb15d60f 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs @@ -4,6 +4,10 @@ using Microsoft.Extensions.DependencyInjection; using OrchardCore.Modules; using OrchardCore.Data.Migration; +using OrchardCore.ContentManagement; +using YesSql.Indexes; +using StatCan.OrchardCore.Radar.Indexing; +using StatCan.OrchardCore.Radar.Models; namespace StatCan.OrchardCore.Radar { @@ -12,6 +16,8 @@ public class Startup : StartupBase public override void ConfigureServices(IServiceCollection services) { services.AddScoped(); + services.AddContentPart(); + services.AddSingleton(); } public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider) From 8ae9e29d3dce73fce12d738e4fa33bd7066a1c34 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Thu, 23 Sep 2021 16:04:05 -0400 Subject: [PATCH 030/198] feat: add helper to retrieve radar entity --- .../Razor/ContentRazorHelperExtensions.cs | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Razor/ContentRazorHelperExtensions.cs diff --git a/src/Apps/StatCan.OrchardCore.Radar/Razor/ContentRazorHelperExtensions.cs b/src/Apps/StatCan.OrchardCore.Radar/Razor/ContentRazorHelperExtensions.cs new file mode 100644 index 000000000..8a79804ea --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Razor/ContentRazorHelperExtensions.cs @@ -0,0 +1,23 @@ +using Microsoft.Extensions.DependencyInjection; +using OrchardCore; +using OrchardCore.ContentManagement; +using OrchardCore.ContentManagement.Metadata.Records; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +public static class ContentRazorHelperExtensions +{ + public static IList GetContentTypeByContentPartAsync(this IOrchardHelper orchardHelper, string partName = "") + { + var contentDefinitionStore = orchardHelper.HttpContext.RequestServices.GetService(); + + var document = contentDefinitionStore.GetContentDefinitionAsync().GetAwaiter().GetResult().ContentTypeDefinitionRecords; + + return document.Where(contentType => + contentType.ContentTypePartDefinitionRecords.Where(part => part.Name == partName).Count() > 0 + ).ToList(); + } +} From ff82898d680ba1b7e1e5c6a5161e67af378a6866 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Fri, 24 Sep 2021 08:45:47 -0400 Subject: [PATCH 031/198] feat: add topic list view --- .../Recipes/radar.setup.recipe.json | 11 +++ .../StatCan.OrchardCore.Radar.csproj | 4 +- .../Views/Term-Topic.liquid | 64 +++++++++++++++ .../Views/TermContentItem-Topic.liquid | 80 +++++++++++++++++++ .../Views/TermItem-Topic.liquid | 3 + .../wwwroot/css/list-view.css | 5 ++ .../wwwroot/images/icon_topics.svg | 21 +++++ 7 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Term-Topic.liquid create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/TermContentItem-Topic.liquid create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/TermItem-Topic.liquid create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_topics.svg diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index 51d7c2909..e938879ab 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -47,6 +47,10 @@ { "SourcePath": "../wwwroot/images/icon_opportunities.svg", "TargetPath": "icon_opportunities.svg" + }, + { + "SourcePath": "../wwwroot/images/icon_topics.svg", + "TargetPath": "icon_topics.svg" } ] }, @@ -564,6 +568,13 @@ "Name": "AllEntitiesWithLimitSQL", "Source": "Sql", "Schema": null + }, + { + "Template": "select ContentType\r\n\tfrom TaxonomyIndex \r\n\twhere ContentField = @type and TermContentItemId = @id", + "ReturnDocuments": false, + "Name": "TaxonomyEntityCountSQL", + "Source": "Sql", + "Schema": null } ] } diff --git a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj index 733871b5d..116f6b72f 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj +++ b/src/Apps/StatCan.OrchardCore.Radar/StatCan.OrchardCore.Radar.csproj @@ -1,4 +1,4 @@ - + $(AspNetCoreTargetFramework) @@ -30,6 +30,8 @@ + + diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Term-Topic.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Term-Topic.liquid new file mode 100644 index 000000000..62ee7a40f --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Term-Topic.liquid @@ -0,0 +1,64 @@ +{% style src:"~/StatCan.OrchardCore.Radar/css/list-view.css" %} + +{% zone "Header" %} +
+
+ + + +
+
{{ Model.Properties.TaxonomyContentItem | display_text }}
+
+
{{ Model.Items | size }}
+
+
+
+ + mdi-magnify + + + + + mdi-close + + +
+ + +
+ + +
+ + + +
+
+
+
+
+{% endzone %} + +
+ + + + + + + + + + + + + {% for item in Model.Items %} + + {{ item | shape_render }} + + {% endfor %} + +
{{ "Name" | t }}{{ "Popularity" | t }}{{ "Project" | t }}{{ "Community" | t }}{{ "Event" | t }}{{ "Proposal" | t }}
+
diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/TermContentItem-Topic.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/TermContentItem-Topic.liquid new file mode 100644 index 000000000..f3462cf0c --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/TermContentItem-Topic.liquid @@ -0,0 +1,80 @@ +{% assign entities = Queries.TaxonomyEntityCountSQL | query: type: "Topics", id: Model.Properties.TermContentItem.ContentItemId %} + +{% assign projectCount = entities | where: "ContentType", "Project" | size %} +{% assign communityCount = entities | where: "ContentType", "Community" | size %} +{% assign proposalCount = entities | where: "ContentType", "Proposal" | size %} +{% assign eventCount = entities | where: "ContentType", "Event" | size %} + +{% assign popularity = projectCount | plus: communityCount | plus: proposalCount | plus: eventCount %} + + + + + {{ Model.Properties.TermContentItem | display_text }} + + +
+ mdi-star-outline +
{{ popularity }}
+
+ + +
+ mdi-flask-outline +
{{ projectCount }}
+
+ + +
+ mdi-account-multiple +
{{ communityCount }}
+
+ + +
+ mdi-calendar +
{{ eventCount }}
+
+ + +
+ mdi-alert-circle-outline +
{{ proposalCount }}
+
+ + + \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/TermItem-Topic.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/TermItem-Topic.liquid new file mode 100644 index 000000000..8ed421919 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/TermItem-Topic.liquid @@ -0,0 +1,3 @@ +{% shape_clear_alternates Model %} +{% shape_type Model "TermContentItem__Topic" %} +{{ Model | shape_render }} \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css index 4226fa380..b2e27f8a9 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css @@ -105,4 +105,9 @@ input:focus{ background-position: left bottom; background-repeat: repeat-x; background-size: 32px 32px; +} + +a { + text-decoration: none; + color: black !important; } \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_topics.svg b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_topics.svg new file mode 100644 index 000000000..303dda768 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/images/icon_topics.svg @@ -0,0 +1,21 @@ + + + + + + + + + + From e167bd7c4047146ab1ad658371502c794fc49d84 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Fri, 24 Sep 2021 15:11:04 -0400 Subject: [PATCH 032/198] refactor: landing page cards --- .../StatCan.OrchardCore.Radar/Constants.cs | 3 +- .../StatCan.OrchardCore.Radar/Migrations.cs | 61 ++------ .../Recipes/Snippets/landingpage.liquid | 42 +----- .../Recipes/radar.setup.recipe.json | 140 ++++++++++-------- .../Views/Content-LandingPageCard.liquid | 20 +++ .../Views/Content-Topic.Summary.liquid | 10 ++ .../wwwroot/css/landing-page-card.css | 61 ++++++++ .../wwwroot/css/landing-page.css | 54 ------- .../wwwroot/css/topic.css | 19 +++ 9 files changed, 207 insertions(+), 203 deletions(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPageCard.liquid create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-Topic.Summary.liquid create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page-card.css create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/topic.css diff --git a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs index 7c2af9765..4ece9c539 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs @@ -31,8 +31,7 @@ public static class ContentTypes // Pages public const string LandingPage = "LandingPage"; - public const string Activity = "Activity"; - public const string Trend = "Trend"; + public const string LandingPageCard = "LandingPageCard"; public const string LandingPageFooterCard = "LandingPageFooterCard"; public const string EntityList = "EntityList"; } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs index 68b60afc7..38c822fe7 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -718,15 +718,14 @@ private void CreateCommunity() private void CreateLandingPage() { - // Sections on the landing page - _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Activity, type => type - .DisplayedAs("Activity") - .WithSettings(new FullTextAspectSettings - { - IncludeBodyAspect = false, - IncludeDisplayText = false, - }) - .WithPart(Constants.ContentTypes.Activity, part => part + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.LandingPageCard, type => type + .DisplayedAs(Constants.ContentTypes.LandingPageCard) + .Creatable() + .Listable() + .Draftable() + .Versionable() + .Securable() + .WithPart("LandingPageCard", part => part .WithPosition("1") ) .WithPart("HtmlBodyPart", part => part @@ -740,52 +739,14 @@ private void CreateLandingPage() ) ); - _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.Activity, part => part + _contentDefinitionManager.AlterPartDefinition("LandingPageCard", part => part .WithField("Icon", field => field .OfType("TextField") .WithDisplayName("Icon") .WithPosition("0") - .WithSettings(new TextFieldSettings - { - Hint = "Md Icon name", - Required = true, - }) - ) - ); - - _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Trend, type => type - .DisplayedAs("Trend") - .WithSettings(new FullTextAspectSettings - { - IncludeBodyAspect = false, - IncludeDisplayText = false, - }) - .WithPart(Constants.ContentTypes.Trend, part => part - .WithPosition("1") - ) - .WithPart("HtmlBodyPart", part => part - .WithPosition("2") - ) - .WithPart("LiquidPart", part => part - .WithPosition("3") - ) - .WithPart("TitlePart", part => part - .WithPosition("0") ) ); - _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.Trend, part => part - .WithField("Icon", field => field - .OfType("TextField") - .WithDisplayName("Icon") - .WithPosition("0") - .WithSettings(new TextFieldSettings - { - Hint = "Md Icon name", - Required = true, - }) - ) - ); _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.LandingPageFooterCard, type => type .DisplayedAs("Landing Page Footer Card") @@ -850,7 +811,7 @@ private void CreateLandingPage() .WithPosition("4") .WithSettings(new BagPartSettings { - ContainedContentTypes = new[] { Constants.ContentTypes.Activity }, + ContainedContentTypes = new[] { Constants.ContentTypes.LandingPageCard }, }) ) .WithPart("Trends", "BagPart", part => part @@ -859,7 +820,7 @@ private void CreateLandingPage() .WithPosition("5") .WithSettings(new BagPartSettings { - ContainedContentTypes = new[] { Constants.ContentTypes.Trend }, + ContainedContentTypes = new[] { Constants.ContentTypes.LandingPageCard }, }) ) .WithPart("Footer", "BagPart", part => part diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid b/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid index 7b7a472f9..906c5ca83 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/Snippets/landingpage.liquid @@ -64,22 +64,9 @@ {% for activity in Model.ContentItem.Content.Activities.ContentItems %} -
-
-
- - {{ activity.Activity.Icon.Text }} - -
- {{ activity.HtmlBodyPart.Html | raw }} -
-
-
-
-
-
- {{ activity.LiquidPart.Liquid | liquid }} -
+ {% assign activityShape = activity | shape_build_display: "Detail" %} + {% shape_add_classes activityShape "zigzag-light card-background-light" %} + {{ activityShape | shape_render }} {% endfor %} @@ -90,7 +77,7 @@ -
+
{{ "Recent trends" | t }}
@@ -98,24 +85,9 @@ {% for trend in Model.ContentItem.Content.Trends.ContentItems %} - - -
- - {{ trend.Trend.Icon.Text }} - -
- {{ trend.HtmlBodyPart.Html | raw }} -
-
-
-
-
- -
- -
- + {% assign trendShape = trend | shape_build_display: "Detail" %} + {% shape_add_classes trendShape "zigzag-dark card-background-dark" %} + {{ trendShape | shape_render }} {% endfor %} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index e938879ab..30e740699 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -12,9 +12,7 @@ { "name": "feature", "disable": [], - "enable": [ - "StatCan.OrchardCore.Radar" - ] + "enable": ["StatCan.OrchardCore.Radar"] }, { "name": "recipes", @@ -73,8 +71,8 @@ "Text": "Radar" }, "Logo": { - "Paths": [ "radar-icon-white.svg" ], - "MediaTexts": [ "" ] + "Paths": ["radar-icon-white.svg"], + "MediaTexts": [""] }, "DisplayMode": { "Text": "light" @@ -127,16 +125,16 @@ { "ContentItemId": "[js: uuid()]", "ContentItemVersionId": null, - "ContentType": "Activity", + "ContentType": "LandingPageCard", "DisplayText": "Projects", "Latest": false, "Published": false, - "ModifiedUtc": null, + "ModifiedUtc": "2021-09-24T18:52:05.0220266Z", "PublishedUtc": null, "CreatedUtc": null, - "Owner": "", - "Author": "admin", - "Activity": { + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", + "LandingPageCard": { "Icon": { "Text": "mdi-flask-outline" } @@ -154,16 +152,16 @@ { "ContentItemId": "[js: uuid()]", "ContentItemVersionId": null, - "ContentType": "Activity", + "ContentType": "LandingPageCard", "DisplayText": "Events", "Latest": false, "Published": false, - "ModifiedUtc": null, + "ModifiedUtc": "2021-09-24T18:52:05.0220266Z", "PublishedUtc": null, "CreatedUtc": null, - "Owner": "", - "Author": "admin", - "Activity": { + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", + "LandingPageCard": { "Icon": { "Text": "mdi-calendar" } @@ -181,16 +179,16 @@ { "ContentItemId": "[js: uuid()]", "ContentItemVersionId": null, - "ContentType": "Activity", + "ContentType": "LandingPageCard", "DisplayText": "Committees", "Latest": false, "Published": false, - "ModifiedUtc": null, + "ModifiedUtc": "2021-09-24T18:52:05.0220266Z", "PublishedUtc": null, "CreatedUtc": null, - "Owner": "", - "Author": "admin", - "Activity": { + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", + "LandingPageCard": { "Icon": { "Text": "mdi-account-multiple" } @@ -208,16 +206,16 @@ { "ContentItemId": "[js: uuid()]", "ContentItemVersionId": null, - "ContentType": "Activity", + "ContentType": "LandingPageCard", "DisplayText": "Proposals", "Latest": false, "Published": false, - "ModifiedUtc": null, + "ModifiedUtc": "2021-09-24T18:52:05.0220266Z", "PublishedUtc": null, "CreatedUtc": null, - "Owner": "", - "Author": "admin", - "Activity": { + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", + "LandingPageCard": { "Icon": { "Text": "mdi-alert-circle-outline" } @@ -239,16 +237,16 @@ { "ContentItemId": "[js: uuid()]", "ContentItemVersionId": null, - "ContentType": "Trend", + "ContentType": "LandingPageCard", "DisplayText": "Topics", "Latest": false, "Published": false, - "ModifiedUtc": null, + "ModifiedUtc": "2021-09-24T18:52:05.0220266Z", "PublishedUtc": null, "CreatedUtc": null, - "Owner": "", - "Author": "admin", - "Trend": { + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", + "LandingPageCard": { "Icon": { "Text": "mdi-pound" } @@ -257,7 +255,7 @@ "Html": "
Topics
Most used topics across all activities
" }, "LiquidPart": { - "Liquid": null + "Liquid": "{% assign topics = Queries.AllTaxonomiesSQL | query: type: \"Topics\" | first %}\r\n{% assign trending_up = Queries.TopicTrendingUpSQL | query %}\r\n{% assign trending_down = Queries.TopicTrendingDownSQL | query %}\r\n\r\n{% assign entities = Queries.AllTaxonomiesSQL | query: type: \"Topics\" | first %}\r\n{% assign trending_up = Queries.TopicTrendingUpSQL | query %}\r\n{% assign trending_down = Queries.TopicTrendingDownSQL | query %}\r\n\r\n
\r\n
\r\n
\r\n \r\n mdi-trending-up\r\n \r\n
\r\n {% for tup in trending_up %}\r\n {% assign e = topics.ContentItem.Content.TaxonomyPart.Terms | where: \"ContentItemId\", tup.TermContentItemId | first %}\r\n
\r\n {{ e | shape_build_display: \"Summary\" | shape_render }}\r\n
\r\n {% endfor %}\r\n
\r\n
\r\n
\r\n \r\n mdi-trending-down\r\n \r\n
\r\n
\r\n
\r\n\r\n \r\n All Topics\r\n \r\n" }, "TitlePart": { "Title": "Topics" @@ -274,14 +272,17 @@ "DisplayText": "", "Latest": false, "Published": false, - "ModifiedUtc": null, + "ModifiedUtc": "2021-09-24T18:52:05.0220266Z", "PublishedUtc": null, "CreatedUtc": null, - "Owner": "", - "Author": "admin", + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", "LandingPageFooterCard": { "Icon": { "Text": "mdi-book-open-variant" + }, + "Link": { + "Text": null } }, "HtmlBodyPart": { @@ -295,14 +296,17 @@ "DisplayText": "", "Latest": false, "Published": false, - "ModifiedUtc": null, + "ModifiedUtc": "2021-09-24T18:52:05.0220266Z", "PublishedUtc": null, "CreatedUtc": null, - "Owner": "", - "Author": "admin", + "Owner": "[js: parameters('AdminUserId')]", + "Author": "[js: parameters('AdminUsername')]", "LandingPageFooterCard": { "Icon": { "Text": "mdi-email" + }, + "Link": { + "Text": null } }, "HtmlBodyPart": { @@ -326,7 +330,7 @@ "Author": "[js: parameters('AdminUsername')]", "VAppBar": { "Props": { - "Values": [ "dark" ] + "Values": ["dark"] }, "Color": { "Text": "#009688" @@ -372,12 +376,8 @@ "Author": "[js: parameters('AdminUsername')]", "EntityList": { "Image": { - "Paths": [ - "icon_opportunities.svg" - ], - "MediaTexts": [ - "" - ] + "Paths": ["icon_opportunities.svg"], + "MediaTexts": [""] } }, "TitlePart": { @@ -416,12 +416,8 @@ "Author": "[js: parameters('AdminUsername')]", "EntityList": { "Image": { - "Paths": [ - "icon_experiments.svg" - ], - "MediaTexts": [ - "" - ] + "Paths": ["icon_experiments.svg"], + "MediaTexts": [""] } }, "TitlePart": { @@ -460,12 +456,8 @@ "Author": "[js: parameters('AdminUsername')]", "EntityList": { "Image": { - "Paths": [ - "icon_communities.svg" - ], - "MediaTexts": [ - "" - ] + "Paths": ["icon_communities.svg"], + "MediaTexts": [""] } }, "TitlePart": { @@ -504,12 +496,8 @@ "Author": "[js: parameters('AdminUsername')]", "EntityList": { "Image": { - "Paths": [ - "icon_events.svg" - ], - "MediaTexts": [ - "" - ] + "Paths": ["icon_events.svg"], + "MediaTexts": [""] } }, "TitlePart": { @@ -575,6 +563,34 @@ "Name": "TaxonomyEntityCountSQL", "Source": "Sql", "Schema": null + }, + { + "Template": "select DocumentId from ContentItemIndex where DisplayText = 'Topics' and latest = true;", + "ReturnDocuments": true, + "Name": "AllTaxonomiesSQL", + "Source": "Sql", + "Schema": null + }, + { + "Template": "(\r\n select TermContentItemId, count(TermContentItemId) as popularity \r\n \tfrom TaxonomyIndex \r\n \twhere ContentField = 'Topics' \r\n \tgroup by TermContentItemId \r\n \torder by popularity desc \r\n \tlimit 3\r\n)\r\nunion all\r\n(\r\n select TermContentItemId, count(TermContentItemId) as popularity \r\n \tfrom TaxonomyIndex \r\n \twhere ContentField = 'Topics' \r\n \tgroup by TermContentItemId \r\n \torder by popularity asc\r\n \tlimit 3\r\n)", + "ReturnDocuments": false, + "Name": "TaxonomyPopularitySQL", + "Source": "Sql", + "Schema": null + }, + { + "Template": "select TermContentItemId, count(TermContentItemId) as popularity \r\n \tfrom TaxonomyIndex \r\n \twhere ContentField = 'Topics' \r\n \tgroup by TermContentItemId \r\n \torder by popularity desc \r\n \tlimit 3", + "ReturnDocuments": false, + "Name": "TopicTrendingUpSQL", + "Source": "Sql", + "Schema": null + }, + { + "Template": "select TermContentItemId, count(TermContentItemId) as popularity \r\n \tfrom TaxonomyIndex \r\n \twhere ContentField = 'Topics' \r\n \tgroup by TermContentItemId \r\n \torder by popularity asc \r\n \tlimit 3", + "ReturnDocuments": false, + "Name": "TopicTrendingDownSQL", + "Source": "Sql", + "Schema": null } ] } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPageCard.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPageCard.liquid new file mode 100644 index 000000000..e92e3006e --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPageCard.liquid @@ -0,0 +1,20 @@ +{% style src:"~/StatCan.OrchardCore.Radar/css/landing-page-card.css" %} + +{{ Model | console_log }} + +
+
+
+ + {{ Model.ContentItem.Content.LandingPageCard.Icon.Text }} + +
+ {{ Model.ContentItem.Content.HtmlBodyPart.Html | raw }} +
+
+
+
+
+
+ {{ Model.ContentItem.Content.LiquidPart.Liquid | liquid }} +
diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Topic.Summary.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Topic.Summary.liquid new file mode 100644 index 000000000..3d56ec50c --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Topic.Summary.liquid @@ -0,0 +1,10 @@ +{% style src:"~/StatCan.OrchardCore.Radar/css/topic.css" %} + +
+ + mdi-pound + +
+ {{ Model.ContentItem | display_text }} +
+
\ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page-card.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page-card.css new file mode 100644 index 000000000..e4be80194 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page-card.css @@ -0,0 +1,61 @@ +.card-background-light { + background-color: #f6fcfb; +} + +.card-background-dark { + background-color: #cfece9; +} + +.trend-card-body { + display: flex; + flex-direction: column; +} + +.trend-container { + display: flex; +} + +.card { + display: flex; + flex-direction: column; + height: 100%; +} + +.card-title { + background-color: #009c88; + display: flex; + flex-direction: column; +} + +.card-title-caption { + display: flex; +} + +.card-body { + padding: 1rem 0 0 6.1rem; + margin-bottom: 1.5rem; + flex-grow: 1; +} + +.card-button { + margin-bottom: 1rem; + margin-left: 1rem; +} + +.card-button:hover { + background-color: #cfece9; + color: #227069; +} + +.card-item-link { + color: #000000 !important; +} + +.card-item-link:hover { + color: #009c88 !important; + text-decoration: underline; +} + +.card-title { + display: flex; +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css index ba053e020..7bd35a725 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/landing-page.css @@ -39,10 +39,6 @@ background: #009c880a; } -.card-title { - display: flex; -} - .front-footer { background: #009c88; } @@ -53,56 +49,6 @@ padding: 0 10rem 0 10rem; } -.card-background-light { - background-color: #f6fcfb; -} - -.card-background-dark { - background: #cfece9 0% 0% no-repeat; -} - -.card { - display: flex; - flex-direction: column; - background-color: #F6FCFB; - height: 100%; -} - -.card-title { - background: #009c88 0% 0% no-repeat; - display: flex; - flex-direction: column; -} - -.card-title-caption { - display: flex; -} - -.card-body { - padding: 1rem 0 0 6.1rem; - margin-bottom: 1.5rem; - flex-grow: 1; -} - -.card-button { - margin-bottom: 1rem; - margin-left: 1rem; -} - -.card-button:hover { - background-color: #cfece9; - color: #227069; -} - -.card-item-link { - color: #000000 !important; -} - -.card-item-link:hover { - color: #009c88 !important; - text-decoration: underline; -} - .zigzag-container { position: relative; width: 100%; diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/topic.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/topic.css new file mode 100644 index 000000000..aa10c01e0 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/topic.css @@ -0,0 +1,19 @@ +.topic { + background: #009C88 0% 0% no-repeat padding-box; + border-radius: 75px; + display: inline-block; + padding: 2px 10px 0px 9px; + margin-right: 0.9rem; + color: #FFFFFF; + max-width: 100%; + display: flex; +} + +.topic:hover { + background-color: #227069; +} + +.label { + overflow: hidden; + text-overflow: ellipsis; +} \ No newline at end of file From 59d9c35d1373524ecea73272ecd3ada341398d51 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 27 Sep 2021 12:36:47 -0400 Subject: [PATCH 033/198] feat: add proposal details view --- .../StatCan.OrchardCore.Radar/Constants.cs | 2 +- .../StatCan.OrchardCore.Radar/Migrations.cs | 18 ++- .../Views/Content-Artifact.Summary.liquid | 16 +++ .../Views/Content-Proposal.liquid | 93 +++++++++++++ .../Views/Workspace.liquid | 27 ++++ .../wwwroot/css/details-view.css | 127 +++++++++++++++++ .../wwwroot/css/list-view.css | 130 +++++++++--------- 7 files changed, 341 insertions(+), 72 deletions(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-Artifact.Summary.liquid create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposal.liquid create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Workspace.liquid create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/details-view.css diff --git a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs index 4ece9c539..7e92715a0 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs @@ -16,7 +16,7 @@ public static class ContentTypes public const string CommunityType = "CommunityType"; // Entities - public const string Aritifact = "Aritifact"; + public const string Artifact = "Artifact"; public const string Proposal = "Proposal"; public const string Project = "Project"; public const string Event = "Event"; diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs index 38c822fe7..8b87a780e 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -274,7 +274,7 @@ private async Task CreateTaxonomyItems() private void CreateArtifact() { - _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Aritifact, type => type + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.Artifact, type => type .DisplayedAs("Artifact") .Creatable() .Listable() @@ -325,7 +325,8 @@ private void CreateRadarEntityPart() .WithSettings(new ContentPickerFieldSettings { Multiple = true, - Required = false + Required = false, + DisplayedContentTypes = new[] { Constants.ContentTypes.Project, Constants.ContentTypes.Proposal, Constants.ContentTypes.Community, Constants.ContentTypes.Event }, }) ) ); @@ -346,6 +347,9 @@ private void CreateProposal() .Draftable() .Versionable() .Securable() + .WithPart("LocalizationPart", part => part + .WithPosition("0") + ) .WithPart(Constants.ContentTypes.Proposal, part => part .WithPosition("2") ) @@ -357,7 +361,7 @@ private void CreateProposal() .WithSettings(new TitlePartSettings { Options = TitlePartOptions.GeneratedHidden, - Pattern = "{{ ContentItem.Content.RadarEntity.Name.Text }}", + Pattern = "{{ ContentItem.Content.RadarEntityPart.Name.Text }}", }) ) .WithPart("ContentPermissionsPart", part => part @@ -369,7 +373,7 @@ private void CreateProposal() .WithPosition("4") .WithSettings(new BagPartSettings { - ContainedContentTypes = new[] { Constants.ContentTypes.Aritifact }, + ContainedContentTypes = new[] { Constants.ContentTypes.Artifact }, }) ) ); @@ -466,7 +470,7 @@ private void CreateProject() .WithPosition("2") .WithSettings(new BagPartSettings { - ContainedContentTypes = new[] { Constants.ContentTypes.Aritifact }, + ContainedContentTypes = new[] { Constants.ContentTypes.Artifact }, }) ) .WithPart(Constants.ContentTypes.ProjectMember, "BagPart", part => part @@ -586,7 +590,7 @@ private void CreateEvent() .WithPosition("4") .WithSettings(new BagPartSettings { - ContainedContentTypes = new[] { Constants.ContentTypes.Aritifact }, + ContainedContentTypes = new[] { Constants.ContentTypes.Artifact }, }) ) ); @@ -681,7 +685,7 @@ private void CreateCommunity() .WithPosition("2") .WithSettings(new BagPartSettings { - ContainedContentTypes = new[] { Constants.ContentTypes.Aritifact }, + ContainedContentTypes = new[] { Constants.ContentTypes.Artifact }, }) ) .WithPart(Constants.ContentTypes.CommunityMember, "BagPart", part => part diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Artifact.Summary.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Artifact.Summary.liquid new file mode 100644 index 000000000..ed44b62c2 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Artifact.Summary.liquid @@ -0,0 +1,16 @@ + + {{ Model.ContentItem | dispay_text }} + + {% if Model.ContentItem.Published %} + Published + {% else %} + Draft + {% endif %} + + + {{ Model.ContentItem.CreatedUtc | local | date: "%b %d, %Y" }} + + + {{ Model.ContentItem.ModifiedUtc | local | date: "%b %d, %Y" }} + + diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposal.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposal.liquid new file mode 100644 index 000000000..bfe44bdfc --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposal.liquid @@ -0,0 +1,93 @@ +{% style src:"~/StatCan.OrchardCore.Radar/css/details-view.css" %} + +{% zone "Header" %} +
+
+ + + +
+
{{ Model.ContentItem | display_text }}
+
+ {{ Model.ContentItem.Content.RadarEntityPart.Description.Text }} +
+
+ + +
+ + +
+ + + + + + +
+ + mdi-account-plus + +
+ {{ Model.ContentItem.Owner }} +
+
+ + + + + + +
+ {% assign topics = Model.ContentItem.Content.RadarEntityPart.Topics | taxonomy_terms %} + {% for topic in topics %} + {{ topic | shape_build_display: "Summary" | shape_render }} + {% endfor %} +
+ + + +
+
+
+
+
+{% endzone %} + +
+
+
+
+ {{ "Affected Communities" | t }} +
+
+
{{ Model.ContentItem.Content.RadarEntityPart.RelatedEntity.ContentItemIds | size }}
+
+
+
+ + + + + + + + + {% for item in Model.ContentItem.Content.RadarEntityPart.RelatedEntity.ContentItemIds %} + {% assign community = item | content_item_id %} + + + + + {% endfor %} + +
{{ "Name" | t }}{{ "Description" | t }}
{{ community | dispay_text }}{{ community.Content.RadarEntityPart.Description.Text }}
+
+
+ +
+ {{ "Workspace" | shape_new: Model: Model.ContentItem.Content.Workspace | shape_render }} +
+
diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Workspace.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Workspace.liquid new file mode 100644 index 000000000..554cadfff --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Workspace.liquid @@ -0,0 +1,27 @@ +{% assign artifacts = Model.Properties.Model.ContentItems %} + +
+
+ {{ "Workspace" | t }} +
+
+
{{ Model.Properties.Model.ContentItems | size }}
+
+
+
+ + + + + + + + + + + {% for artifact in artifacts %} + {{ artifact | shape_build_display: "Summary" | shape_render }} + {% endfor %} + +
{{ "Name" | t }}{{ "Status" | t }}{{ "Created" | t }}{{ "Updated" | t }}
+
\ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/details-view.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/details-view.css new file mode 100644 index 000000000..05785931a --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/details-view.css @@ -0,0 +1,127 @@ +.header { + padding: 3rem 9rem; + background: transparent linear-gradient(180deg, #cfece9 0%, #abded7 100%) 0% + 0% no-repeat; +} + +.name { + text-align: left; + font-weight: 300; + color: #000000de; + overflow-wrap: anywhere; +} + +.description { + margin-top: 1rem; + color: #227069; +} + +.topics-container { + margin-top: 2rem !important; +} + +.icon-cell { + display: flex; + align-items: center; +} + +.icon-text { + margin-left: 1rem; +} + +.topics-list-container { + display: flex; +} + +.bubble { + margin-left: 2rem; + background-color: #f6fcfb; + border: 2px solid #009c88; + border-radius: 50%; + width: 3rem; + height: 3rem; + display: flex; + align-items: center; + justify-content: center; + font-weight: 400; + font-size: 23px; +} + +.bubble-text { + color: #227069; +} + +.table-container { + width: 100%; + margin: auto; +} + +.table { + width: 100%; + border-collapse: collapse; + border-spacing: 0; +} + +.table-title-container { + display: flex; + align-items: center; + margin-bottom: 1rem; +} + +.table-header { + border-bottom: 2px solid#009C88; +} + +.table-row { + background: #f6fcfb; + height: 48px; + border-bottom: 1px solid #cfece9; + cursor: pointer; + overflow-wrap: anywhere; +} + +.table-row:hover { + background: #cfece9; +} + +.name-col { + text-align: left; + padding-left: 1rem; +} + +.table-col { + overflow: hidden; + text-overflow: ellipsis; + text-align: center; +} + +.sections-container { + padding: 0 5rem 0 5rem; +} + +.section { + margin-bottom: 2rem; +} + +.zigzag { + content: " "; + display: block; + position: absolute; + bottom: 0px; + left: 0px; + width: 100%; + height: 32px; +} + +.zigzag-container { + position: relative; + width: 100%; +} + +.zigzag-white { + background: linear-gradient(-40deg, #ffffff 16px, transparent 0), + linear-gradient(40deg, #ffffff 16px, transparent 0); + background-position: left bottom; + background-repeat: repeat-x; + background-size: 32px 32px; +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css index b2e27f8a9..06a911719 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/list-view.css @@ -1,113 +1,115 @@ .list-header { - padding: 3rem 13rem 4rem 13rem; - background: transparent linear-gradient(180deg, #CFECE9 0%, #ABDED7 100%) 0% 0% no-repeat; + padding: 3rem 13rem 4rem 13rem; + background: transparent linear-gradient(180deg, #cfece9 0%, #abded7 100%) 0% + 0% no-repeat; } .title-container { - display: flex; - align-items: center; + display: flex; + align-items: center; } .bubble { - margin-left: 2rem; - background-color: #F6FCFB; - border: 2px solid #009C88; - border-radius: 50%; - width: 5rem; - height: 5rem; - display: flex; - align-items: center; - justify-content: center; - font-weight: 400; - font-size: 38px; + margin-left: 2rem; + background-color: #f6fcfb; + border: 2px solid #009c88; + border-radius: 50%; + width: 5rem; + height: 5rem; + display: flex; + align-items: center; + justify-content: center; + font-weight: 400; + font-size: 38px; } .bubble-text { - color: #227069; + color: #227069; } .table-container { - padding: 0 2rem 0 2rem; - width: 80%; - margin: auto; + padding: 0 2rem 0 2rem; + width: 80%; + margin: auto; } .table { - width: 100%; - border-collapse: collapse; - border-spacing: 0; + width: 100%; + border-collapse: collapse; + border-spacing: 0; } .table-header { - border-bottom: 2px solid#009C88; + border-bottom: 2px solid#009C88; } .table-row { - background: #F6FCFB; - height: 48px; - border-bottom: 1px solid #CFECE9; - cursor: pointer; - overflow-wrap: anywhere; + background: #f6fcfb; + height: 48px; + border-bottom: 1px solid #cfece9; + cursor: pointer; + overflow-wrap: anywhere; } .table-row:hover { - background: #CFECE9; + background: #cfece9; } .search-container { - margin: 1rem 0 1.5rem 0; - display: flex; - background: #F6FCFB; - align-items: center; - border-bottom: 2px solid #009C88; - display: flex; - height: 2.2rem; - padding-left: 1rem; - width: fit-content; + margin: 1rem 0 1.5rem 0; + display: flex; + background: #f6fcfb; + align-items: center; + border-bottom: 2px solid #009c88; + display: flex; + height: 2.2rem; + padding-left: 1rem; + width: fit-content; } -input:focus{ - outline: none; +input:focus { + outline: none; } .icon-cell { - display: flex; - align-items: center; - justify-content: center; + display: flex; + align-items: center; + justify-content: center; } .name-col { - text-align: left; - padding-left: 1rem; + text-align: left; + padding-left: 1rem; } .table-col { - text-align: center; + text-align: center; } .zigzag-container { - position: relative; - width: 100%; - } - + position: relative; + width: 100%; +} + .zigzag { - content: ' '; - display: block; - position: absolute; - bottom: 0px; - left: 0px; - width: 100%; - height: 32px; + content: " "; + display: block; + position: absolute; + bottom: 0px; + left: 0px; + width: 100%; + height: 32px; } .zigzag-white { - background: linear-gradient(-40deg, #FFFFFF 16px, transparent 0), linear-gradient(40deg, #FFFFFF 16px, transparent 0); - background-position: left bottom; - background-repeat: repeat-x; - background-size: 32px 32px; + background: linear-gradient(-40deg, #ffffff 16px, transparent 0), + linear-gradient(40deg, #ffffff 16px, transparent 0); + background-position: left bottom; + background-repeat: repeat-x; + background-size: 32px 32px; } a { - text-decoration: none; - color: black !important; -} \ No newline at end of file + text-decoration: none; + color: black !important; +} From 84ef91b580224ccb5b3f005dc91a6ae2cf6e4d67 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 27 Sep 2021 14:02:15 -0400 Subject: [PATCH 034/198] feat: add project details view --- .../StatCan.OrchardCore.Radar/Constants.cs | 2 +- .../StatCan.OrchardCore.Radar/Migrations.cs | 15 ++- .../Views/Content-Project.liquid | 109 ++++++++++++++++++ .../Views/Workspace.liquid | 2 +- .../wwwroot/css/details-view.css | 25 ++-- 5 files changed, 132 insertions(+), 21 deletions(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-Project.liquid diff --git a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs index 7e92715a0..74c1951ae 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs @@ -22,7 +22,7 @@ public static class ContentTypes public const string Event = "Event"; public const string Community = "Community"; - public const string ProjectMember = "ProjectMember"; + public const string ProjectMember = "Project Member"; public const string EventOrganizer = "EventOrganizer"; public const string CommunityMember = "CommunityMember"; diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs index 8b87a780e..b1056bcbb 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -403,7 +403,7 @@ private void CreateProject() { // Project Member _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.ProjectMember, type => type - .DisplayedAs("ProjectMember") + .DisplayedAs("Project Member") .Creatable() .Listable() .Draftable() @@ -417,10 +417,8 @@ private void CreateProject() .WithSettings(new TitlePartSettings { Options = TitlePartOptions.GeneratedHidden, - Pattern = @"{% assign users = ContentItem.Content.EventOrganier.UserPicker.UserIds | users_by_id %} - {% for user in users %} - {{ user.UserName }} - {{ user.Email }} - {% endfor %}", + Pattern = @"{% assign user = ContentItem.Content.ProjectMember.Member.UserIds | first | users_by_id %} + {{ user.Properties.UserProfile.UserProfile.FirstName.Text }} {{ user.Properties.UserProfile.UserProfile.LastName.Text }} ", }) ) ); @@ -437,6 +435,11 @@ private void CreateProject() DisplayedRoles = Array.Empty(), }) ) + .WithField("Role", field => field + .OfType("TextField") + .WithDisplayName("Role") + .WithPosition("1") + ) ); // Project @@ -458,7 +461,7 @@ private void CreateProject() .WithSettings(new TitlePartSettings { Options = TitlePartOptions.GeneratedHidden, - Pattern = "{{ ContentItem.Content.RadarEntity.Name.Text }}", + Pattern = "{{ ContentItem.Content.RadarEntityPart.Name.Text }}", }) ) .WithPart("ContentPermissionsPart", part => part diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Project.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Project.liquid new file mode 100644 index 000000000..46d55b88c --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Project.liquid @@ -0,0 +1,109 @@ +{% style src:"~/StatCan.OrchardCore.Radar/css/details-view.css" %} + +{% assign owner = Model.ContentItem.Owner | users_by_id %} + +{% zone "Header" %} +
+
+ + + +
+
{{ Model.ContentItem | display_text }}
+
+ {{ Model.ContentItem.Content.RadarEntityPart.Description.Text }} +
+
+ + +
+ + +
+ + + + + + +
+ + mdi-account-plus + +
+ {{ owner.Properties.UserProfile.UserProfile.FirstName.Text }} {{ owner.Properties.UserProfile.UserProfile.LastName.Text }} +
+
+ + +
+ + mdi-update + +
+ {{ Model.ContentItem.ModifiedUtc | local | date: "%b %d, %Y" }} +
+
+ + + + + + +
+ {% assign topics = Model.ContentItem.Content.RadarEntityPart.Topics | taxonomy_terms %} + {% for topic in topics %} + {{ topic | shape_build_display: "Summary" | shape_render }} + {% endfor %} +
+ + + +
+
+
+
+
+{% endzone %} + +
+
+
+
+ {{ "Contributors" | t }} +
+
+
{{ Model.ContentItem.Content.ProjectMember.ContentItems | size }}
+
+
+
+ + + + + + + + + + + + {% assign members = Model.ContentItem.Content.ProjectMember.ContentItems %} + {% for member in members %} + + + {% endfor %} + +
{{ "Name" | t }}{{ "Role" | t }}
{{ owner.Properties.UserProfile.UserProfile.FirstName.Text }} {{ owner.Properties.UserProfile.UserProfile.LastName.Text }}{{ "Owner" | t }} +
{{ member.DisplayText }} + {{ member.ProjectMember.Role.Text }} +
+
+
+ +
+ {{ "Workspace" | shape_new: Model: Model.ContentItem.Content.Workspace | shape_render }} +
+
diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Workspace.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Workspace.liquid index 554cadfff..8128727f4 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Workspace.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Workspace.liquid @@ -8,7 +8,7 @@
{{ Model.Properties.Model.ContentItems | size }}
-
+
diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/details-view.css b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/details-view.css index 05785931a..8903309cf 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/details-view.css +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/details-view.css @@ -51,21 +51,20 @@ color: #227069; } -.table-container { - width: 100%; - margin: auto; -} - .table { width: 100%; border-collapse: collapse; border-spacing: 0; } +.member-table { + width: 50%; +} + .table-title-container { - display: flex; - align-items: center; - margin-bottom: 1rem; + display: flex; + align-items: center; + margin-bottom: 1rem; } .table-header { @@ -90,17 +89,17 @@ } .table-col { - overflow: hidden; - text-overflow: ellipsis; - text-align: center; + overflow: hidden; + text-overflow: ellipsis; + text-align: center; } .sections-container { - padding: 0 5rem 0 5rem; + padding: 0 5rem 0 5rem; } .section { - margin-bottom: 2rem; + margin-bottom: 2rem; } .zigzag { From 3a9b7d28766a18b93f106ccc0376f2688ffbe11d Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 27 Sep 2021 14:13:14 -0400 Subject: [PATCH 035/198] feat: add user profile --- .../StatCan.OrchardCore.Radar/Constants.cs | 5 +++- .../StatCan.OrchardCore.Radar/Migrations.cs | 28 +++++++++++++++++++ .../Recipes/radar.setup.recipe.json | 5 +++- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs index 74c1951ae..f4bc49770 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Constants.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Constants.cs @@ -22,7 +22,7 @@ public static class ContentTypes public const string Event = "Event"; public const string Community = "Community"; - public const string ProjectMember = "Project Member"; + public const string ProjectMember = "ProjectMember"; public const string EventOrganizer = "EventOrganizer"; public const string CommunityMember = "CommunityMember"; @@ -34,6 +34,9 @@ public static class ContentTypes public const string LandingPageCard = "LandingPageCard"; public const string LandingPageFooterCard = "LandingPageFooterCard"; public const string EntityList = "EntityList"; + + // Custom User Settings + public const string UserProfile = "UserProfile"; } } } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs index b1056bcbb..8563fb00d 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -49,6 +49,8 @@ public async Task CreateAsync() CreateLandingPage(); CreateEntityList(); + CreateUserProfile(); + return 1; } @@ -897,5 +899,31 @@ private void CreateEntityList() ) ); } + + private void CreateUserProfile() + { + _contentDefinitionManager.AlterTypeDefinition(Constants.ContentTypes.UserProfile, type => type + .DisplayedAs("User Profile") + .Versionable() + .Stereotype("CustomUserSettings") + .WithPart(Constants.ContentTypes.UserProfile, part => part + .WithPosition("0") + ) + ); + + _contentDefinitionManager.AlterPartDefinition(Constants.ContentTypes.UserProfile, part => part + .WithField("FirstName", field => field + .OfType("TextField") + .WithDisplayName("First Name") + .WithPosition("0") + ) + .WithField("LastName", field => field + .OfType("TextField") + .WithDisplayName("Last Name") + .WithPosition("1") + ) + ); + + } } } diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index 30e740699..ace02417d 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -12,7 +12,10 @@ { "name": "feature", "disable": [], - "enable": ["StatCan.OrchardCore.Radar"] + "enable": [ + "StatCan.OrchardCore.Radar", + "OrchardCore.Users.CustomUserSettings" + ] }, { "name": "recipes", From 419d0b88b9670b33f7dc478f59ae4f2c5b3d9fe6 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 27 Sep 2021 14:14:46 -0400 Subject: [PATCH 036/198] feat: use user profile in proposal details view --- .../StatCan.OrchardCore.Radar/Views/Content-Proposal.liquid | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposal.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposal.liquid index bfe44bdfc..c2e33d779 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposal.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposal.liquid @@ -1,5 +1,7 @@ {% style src:"~/StatCan.OrchardCore.Radar/css/details-view.css" %} +{% assign owner = Model.ContentItem.Owner | users_by_id %} + {% zone "Header" %}
@@ -31,7 +33,7 @@ mdi-account-plus
- {{ Model.ContentItem.Owner }} + {{ owner.Properties.UserProfile.UserProfile.FirstName.Text }} {{ owner.Properties.UserProfile.UserProfile.LastName.Text }}
From bfebba18d7baf683fde0c8aee88c547e83342232 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 27 Sep 2021 14:29:44 -0400 Subject: [PATCH 037/198] feat: add community details view --- .../StatCan.OrchardCore.Radar/Migrations.cs | 7 +- .../Views/Content-Community.liquid | 109 ++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-Community.liquid diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs index 8563fb00d..8d1f971e8 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -657,6 +657,11 @@ private void CreateCommunity() DisplayedRoles = Array.Empty(), }) ) + .WithField("Role", field => field + .OfType("TextField") + .WithDisplayName("Role") + .WithPosition("1") + ) ); // Community @@ -675,7 +680,7 @@ private void CreateCommunity() .WithSettings(new TitlePartSettings { Options = TitlePartOptions.GeneratedHidden, - Pattern = "{{ ContentItem.Content.RadarEntity.Name.Text }}", + Pattern = "{{ ContentItem.Content.RadarEntityPart.Name.Text }}", }) ) .WithPart(nameof(RadarEntityPart), part => part diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Community.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Community.liquid new file mode 100644 index 000000000..a5aa063a3 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Community.liquid @@ -0,0 +1,109 @@ +{% style src:"~/StatCan.OrchardCore.Radar/css/details-view.css" %} + +{% assign owner = Model.ContentItem.Owner | users_by_id %} + +{% zone "Header" %} +
+
+ + + +
+
{{ Model.ContentItem | display_text }}
+
+ {{ Model.ContentItem.Content.RadarEntityPart.Description.Text }} +
+
+ + +
+ + +
+ + + + + + +
+ + mdi-account-plus + +
+ {{ owner.Properties.UserProfile.UserProfile.FirstName.Text }} {{ owner.Properties.UserProfile.UserProfile.LastName.Text }} +
+
+ + +
+ + mdi-update + +
+ {{ Model.ContentItem.ModifiedUtc | local | date: "%b %d, %Y" }} +
+
+ + + + + + +
+ {% assign topics = Model.ContentItem.Content.RadarEntityPart.Topics | taxonomy_terms %} + {% for topic in topics %} + {{ topic | shape_build_display: "Summary" | shape_render }} + {% endfor %} +
+ + + +
+
+
+
+
+{% endzone %} + +
+
+
+
+ {{ "Members" | t }} +
+
+
{{ Model.ContentItem.Content.CommunityMember.ContentItems | size }}
+
+
+
+
+ + + + + + + + + + + {% assign members = Model.ContentItem.Content.CommunityMember.ContentItems %} + {% for member in members %} + + + {% endfor %} + +
{{ "Name" | t }}{{ "Role" | t }}
{{ owner.Properties.UserProfile.UserProfile.FirstName.Text }} {{ owner.Properties.UserProfile.UserProfile.LastName.Text }}{{ "Owner" | t }} +
{{ member.DisplayText }} + {{ member.CommunityMember.Role.Text }} +
+
+
+ +
+ {{ "Workspace" | shape_new: Model: Model.ContentItem.Content.Workspace | shape_render }} +
+
From 894623be519b18c66fb8cb38d98352ee2281030f Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 27 Sep 2021 14:53:42 -0400 Subject: [PATCH 038/198] feat: add event details view --- .../StatCan.OrchardCore.Radar/Migrations.cs | 8 +- .../Views/Content-Event.liquid | 118 ++++++++++++++++++ 2 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-Event.liquid diff --git a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs index 8d1f971e8..cee034335 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Migrations.cs @@ -577,7 +577,7 @@ private void CreateEvent() .WithSettings(new TitlePartSettings { Options = TitlePartOptions.GeneratedDisabled, - Pattern = "{{ ContentItem.Content.RadarEntity.Name.Text }}", + Pattern = "{{ ContentItem.Content.RadarEntityPart.Name.Text }}", }) ) .WithPart(Constants.ContentTypes.EventOrganizer, "BagPart", part => part @@ -605,6 +605,12 @@ private void CreateEvent() .OfType("UserPickerField") .WithDisplayName("Attendees") .WithPosition("0") + .WithSettings(new UserPickerFieldSettings + { + Multiple = true, + DisplayAllUsers = true, + DisplayedRoles = Array.Empty(), + }) ) .WithField("StartDate", field => field .OfType("DateTimeField") diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Event.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Event.liquid new file mode 100644 index 000000000..d0484370b --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Event.liquid @@ -0,0 +1,118 @@ +{% style src:"~/StatCan.OrchardCore.Radar/css/details-view.css" %} + +{% assign owner = Model.ContentItem.Owner | users_by_id %} + +{% zone "Header" %} +
+
+ + + +
+
{{ Model.ContentItem | display_text }}
+
+ {{ Model.ContentItem.Content.RadarEntityPart.Description.Text }} +
+
+ + +
+ + +
+ + + + + + +
+ + mdi-account-plus + +
+ {{ owner.Properties.UserProfile.UserProfile.FirstName.Text }} {{ owner.Properties.UserProfile.UserProfile.LastName.Text }} +
+
+ + +
+ + mdi-update + +
+ {{ Model.ContentItem.ModifiedUtc | local | date: "%b %d, %Y" }} +
+
+ + +
+ + mdi-calendar + +
+ {{ Model.ContentItem.Content.Event.StartDate.Value | local | date: "%b %d %H:%M %p, %Y" }} - {{ Model.ContentItem.Content.Event.EndDate.Value | local | date: "%b %d %H:%M %p, %Y" }} +
+
+ + + + + + +
+ {% assign topics = Model.ContentItem.Content.RadarEntityPart.Topics | taxonomy_terms %} + {% for topic in topics %} + {{ topic | shape_build_display: "Summary" | shape_render }} + {% endfor %} +
+ + + +
+
+
+
+
+{% endzone %} + +
+
+
+
+ {{ "Attendees" | t }} +
+
+
{{Model.ContentItem.Content.Event.Attendees.UserIds | size | plus: 1 }}
+
+
+
+ + + + + + + + + + + + {% assign members = Model.ContentItem.Content.Event.Attendees.UserIds %} + {% for member in members %} + {% assign user = member | users_by_id %} + + + {% endfor %} + +
{{ "Name" | t }}
{{ owner.Properties.UserProfile.UserProfile.FirstName.Text }} {{ owner.Properties.UserProfile.UserProfile.LastName.Text }}
{{ user.Properties.UserProfile.UserProfile.FirstName.Text }} {{ user.Properties.UserProfile.UserProfile.LastName.Text }} +
+
+
+ +
+ {{ "Workspace" | shape_new: Model: Model.ContentItem.Content.Workspace | shape_render }} +
+
From 7f8f064aeb1ff5f0bdab0f109e41827124b71969 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 27 Sep 2021 14:54:58 -0400 Subject: [PATCH 039/198] fix: members count --- .../StatCan.OrchardCore.Radar/Views/Content-Community.liquid | 2 +- src/Apps/StatCan.OrchardCore.Radar/Views/Content-Project.liquid | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Community.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Community.liquid index a5aa063a3..e656414ea 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Community.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Community.liquid @@ -75,7 +75,7 @@ {{ "Members" | t }}
-
{{ Model.ContentItem.Content.CommunityMember.ContentItems | size }}
+
{{ Model.ContentItem.Content.CommunityMember.ContentItems | size | plus: 1 }}
diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Project.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Project.liquid index 46d55b88c..f52629cad 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Project.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-Project.liquid @@ -75,7 +75,7 @@ {{ "Contributors" | t }}
-
{{ Model.ContentItem.Content.ProjectMember.ContentItems | size }}
+
{{ Model.ContentItem.Content.ProjectMember.ContentItems | size | plus: 1 }}
From 564529d9f4b0a20c0b794c99d8ea357164d2a33e Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Mon, 27 Sep 2021 15:06:02 -0400 Subject: [PATCH 040/198] fix: landing page card links --- .../Recipes/radar.setup.recipe.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json index ace02417d..25f11445d 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Recipes/radar.setup.recipe.json @@ -146,7 +146,7 @@ "Html": "
Projects
In-flight projects
" }, "LiquidPart": { - "Liquid": "{% assign projects = Queries.AllEntitiesWithLimitSQL | query: contentType: \"Project\", num: 5 %}\r\n{% assign projectList = Queries.EntityListSQL | query: name: \"Projects\" | first %}\r\n\r\n
\r\n{% for project in projects %}\r\n
\r\n {{ project | display_text }}\r\n
\r\n{% endfor %}\r\n
\r\n\r\n \r\n All projects\r\n \r\n" + "Liquid": "{% assign projects = Queries.AllEntitiesWithLimitSQL | query: contentType: \"Project\", num: 5 %}\r\n{% assign projectList = Queries.EntityListSQL | query: name: \"Projects\" | first %}\r\n\r\n
\r\n{% for project in projects %}\r\n
\r\n {{ project | display_text }}\r\n
\r\n{% endfor %}\r\n
\r\n\r\n \r\n All projects\r\n \r\n" }, "TitlePart": { "Title": "Projects" @@ -173,7 +173,7 @@ "Html": "
Events
Upcoming events
" }, "LiquidPart": { - "Liquid": "{% assign events = Queries.AllEntitiesWithLimitSQL | query: contentType: \"Event\", num: 5 %}\r\n{% assign eventList = Queries.EntityListSQL | query: name: \"Events\" | first %}\r\n\r\n
\r\n{% for event in events %}\r\n
\r\n {{ event | display_text }}\r\n
\r\n{% endfor %}\r\n
\r\n\r\n \r\n All Events\r\n \r\n" + "Liquid": "{% assign events = Queries.AllEntitiesWithLimitSQL | query: contentType: \"Event\", num: 5 %}\r\n{% assign eventList = Queries.EntityListSQL | query: name: \"Events\" | first %}\r\n\r\n
\r\n{% for event in events %}\r\n
\r\n {{ event | display_text }}\r\n
\r\n{% endfor %}\r\n
\r\n\r\n \r\n All Events\r\n \r\n" }, "TitlePart": { "Title": "Events" @@ -200,7 +200,7 @@ "Html": "
Committees
Latest committees
" }, "LiquidPart": { - "Liquid": "{% assign communities = Queries.AllEntitiesWithLimitSQL | query: contentType: \"Community\", num: 5 %}\r\n{% assign communityList = Queries.EntityListSQL | query: name: \"Communities\" | first %}\r\n\r\n
\r\n{% for community in communities %}\r\n
\r\n {{ community | display_text }}\r\n
\r\n{% endfor %}\r\n
\r\n\r\n \r\n All Committees\r\n \r\n" + "Liquid": "{% assign communities = Queries.AllEntitiesWithLimitSQL | query: contentType: \"Community\", num: 5 %}\r\n{% assign communityList = Queries.EntityListSQL | query: name: \"Communities\" | first %}\r\n\r\n
\r\n{% for community in communities %}\r\n
\r\n {{ community | display_text }}\r\n
\r\n{% endfor %}\r\n
\r\n\r\n \r\n All Committees\r\n \r\n" }, "TitlePart": { "Title": "Committees" @@ -227,7 +227,7 @@ "Html": "
Proposals
Current proposals
" }, "LiquidPart": { - "Liquid": "{% assign proposals = Queries.AllEntitiesWithLimitSQL | query: contentType: \"Proposal\", num: 5 %}\r\n{% assign proposalList = Queries.EntityListSQL | query: name: \"Proposals\" | first %}\r\n\r\n
\r\n{% for proposal in proposals %}\r\n
\r\n {{ proposal | display_text }}\r\n
\r\n{% endfor %}\r\n
\r\n\r\n \r\n All Proposals\r\n \r\n" + "Liquid": "{% assign proposals = Queries.AllEntitiesWithLimitSQL | query: contentType: \"Proposal\", num: 5 %}\r\n{% assign proposalList = Queries.EntityListSQL | query: name: \"Proposals\" | first %}\r\n\r\n
\r\n{% for proposal in proposals %}\r\n
\r\n {{ proposal | display_text }}\r\n
\r\n{% endfor %}\r\n
\r\n\r\n \r\n All Proposals\r\n \r\n" }, "TitlePart": { "Title": "Proposals" @@ -554,7 +554,7 @@ "Schema": null }, { - "Template": "select DocumentId\r\n from ContentItemIndex \r\n where ContentType = @contentType\r\n\tlimit @num", + "Template": "select DocumentId\r\n from ContentItemIndex \r\n where ContentType = @contentType and Published = true and Latest = true\r\n\tlimit @num", "ReturnDocuments": true, "Name": "AllEntitiesWithLimitSQL", "Source": "Sql", From d3db68633ec78b45b40b8535ce3f6b2ae84f3489 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Tue, 28 Sep 2021 10:19:55 -0400 Subject: [PATCH 041/198] fix: remove console log --- .../Views/Content-LandingPageCard.liquid | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPageCard.liquid b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPageCard.liquid index e92e3006e..ae886b761 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPageCard.liquid +++ b/src/Apps/StatCan.OrchardCore.Radar/Views/Content-LandingPageCard.liquid @@ -1,7 +1,5 @@ {% style src:"~/StatCan.OrchardCore.Radar/css/landing-page-card.css" %} -{{ Model | console_log }} -
From 6477c6287e18ac8c40e40574ca2e6683381e3316 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Tue, 28 Sep 2021 11:04:13 -0400 Subject: [PATCH 042/198] feat: add assets to the pipeline --- .../StatCan.OrchardCore.Radar/Assets.json | 2 +- .../Assets/css/details-view.css | 126 ++++++++++++++++++ .../Assets/css/landing-page-card.css | 61 +++++++++ .../Assets/css/landing-page.css | 101 ++++++++++++++ .../Assets/css/list-view.css | 115 ++++++++++++++++ .../Assets/css/page.css | 35 ----- .../Assets/css/topic.css | 19 +++ .../Assets/images/icon_communities.svg | 18 +++ .../Assets/images/icon_events.svg | 15 +++ .../Assets/images/icon_experiments.svg | 18 +++ .../Assets/images/icon_opportunities.svg | 16 +++ .../Assets/images/icon_topics.svg | 21 +++ 12 files changed, 511 insertions(+), 36 deletions(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/css/details-view.css create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/css/landing-page-card.css create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/css/landing-page.css create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/css/list-view.css delete mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/css/page.css create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/css/topic.css create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_communities.svg create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_events.svg create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_experiments.svg create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_opportunities.svg create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_topics.svg diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets.json b/src/Apps/StatCan.OrchardCore.Radar/Assets.json index dfa5373fa..ed011a016 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Assets.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets.json @@ -4,7 +4,7 @@ "inputs": [ "Assets/css/*" ], - "output": "wwwroot/css/index.css" + "output": "wwwroot/css/@" }, { "copy": true, diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/css/details-view.css b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/details-view.css new file mode 100644 index 000000000..8903309cf --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/details-view.css @@ -0,0 +1,126 @@ +.header { + padding: 3rem 9rem; + background: transparent linear-gradient(180deg, #cfece9 0%, #abded7 100%) 0% + 0% no-repeat; +} + +.name { + text-align: left; + font-weight: 300; + color: #000000de; + overflow-wrap: anywhere; +} + +.description { + margin-top: 1rem; + color: #227069; +} + +.topics-container { + margin-top: 2rem !important; +} + +.icon-cell { + display: flex; + align-items: center; +} + +.icon-text { + margin-left: 1rem; +} + +.topics-list-container { + display: flex; +} + +.bubble { + margin-left: 2rem; + background-color: #f6fcfb; + border: 2px solid #009c88; + border-radius: 50%; + width: 3rem; + height: 3rem; + display: flex; + align-items: center; + justify-content: center; + font-weight: 400; + font-size: 23px; +} + +.bubble-text { + color: #227069; +} + +.table { + width: 100%; + border-collapse: collapse; + border-spacing: 0; +} + +.member-table { + width: 50%; +} + +.table-title-container { + display: flex; + align-items: center; + margin-bottom: 1rem; +} + +.table-header { + border-bottom: 2px solid#009C88; +} + +.table-row { + background: #f6fcfb; + height: 48px; + border-bottom: 1px solid #cfece9; + cursor: pointer; + overflow-wrap: anywhere; +} + +.table-row:hover { + background: #cfece9; +} + +.name-col { + text-align: left; + padding-left: 1rem; +} + +.table-col { + overflow: hidden; + text-overflow: ellipsis; + text-align: center; +} + +.sections-container { + padding: 0 5rem 0 5rem; +} + +.section { + margin-bottom: 2rem; +} + +.zigzag { + content: " "; + display: block; + position: absolute; + bottom: 0px; + left: 0px; + width: 100%; + height: 32px; +} + +.zigzag-container { + position: relative; + width: 100%; +} + +.zigzag-white { + background: linear-gradient(-40deg, #ffffff 16px, transparent 0), + linear-gradient(40deg, #ffffff 16px, transparent 0); + background-position: left bottom; + background-repeat: repeat-x; + background-size: 32px 32px; +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/css/landing-page-card.css b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/landing-page-card.css new file mode 100644 index 000000000..e4be80194 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/landing-page-card.css @@ -0,0 +1,61 @@ +.card-background-light { + background-color: #f6fcfb; +} + +.card-background-dark { + background-color: #cfece9; +} + +.trend-card-body { + display: flex; + flex-direction: column; +} + +.trend-container { + display: flex; +} + +.card { + display: flex; + flex-direction: column; + height: 100%; +} + +.card-title { + background-color: #009c88; + display: flex; + flex-direction: column; +} + +.card-title-caption { + display: flex; +} + +.card-body { + padding: 1rem 0 0 6.1rem; + margin-bottom: 1.5rem; + flex-grow: 1; +} + +.card-button { + margin-bottom: 1rem; + margin-left: 1rem; +} + +.card-button:hover { + background-color: #cfece9; + color: #227069; +} + +.card-item-link { + color: #000000 !important; +} + +.card-item-link:hover { + color: #009c88 !important; + text-decoration: underline; +} + +.card-title { + display: flex; +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/css/landing-page.css b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/landing-page.css new file mode 100644 index 000000000..7bd35a725 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/landing-page.css @@ -0,0 +1,101 @@ +.max-wdith { + max-width: 1200px; +} + +.header-text { + padding: 0 24rem 0 24rem; +} + +.light-font { + font-weight: lighter; + color: #000000de; + opacity: 1; +} + +.name { + font-size: 47px; + color: #005247; + font-weight: 300; + white-space: nowrap; +} + +.description { + font-size: 25px; + font-weight: 300; + margin: auto; + line-height: normal; +} + +.list { + display: flex; + justify-content: center; +} + +.section-title { + color: #005247; +} + +.section-background { + background: #009c880a; +} + +.front-footer { + background: #009c88; +} + +.header-footer { + display: flex; + justify-content: space-between; + padding: 0 10rem 0 10rem; +} + +.zigzag-container { + position: relative; + width: 100%; +} + +.zigzag { + content: " "; + display: block; + position: absolute; + bottom: 0px; + left: 0px; + width: 100%; + height: 32px; +} + +.zigzag-white { + background: linear-gradient(-40deg, #ffffff 16px, transparent 0), + linear-gradient(40deg, #ffffff 16px, transparent 0); + background-position: left bottom; + background-repeat: repeat-x; + background-size: 32px 32px; +} + +.zigzag-light { + background: linear-gradient(-40deg, #f6fcfb 16px, transparent 0), + linear-gradient(40deg, #f6fcfb 16px, transparent 0); + background-position: left bottom; + background-repeat: repeat-x; + background-size: 32px 32px; +} + +.zigzag-dark { + background: linear-gradient(-40deg, #cfece9 16px, transparent 0), + linear-gradient(40deg, #cfece9 16px, transparent 0); + background-position: left bottom; + background-repeat: repeat-x; + background-size: 32px 32px; +} + +.rippleFront { + background-color: #cfece9; + background-size: cover; + background-repeat: no-repeat; + background-position: center bottom -590px; + padding: 8rem 0rem 3rem 0rem; +} + +a { + text-decoration: none; +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/css/list-view.css b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/list-view.css new file mode 100644 index 000000000..06a911719 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/list-view.css @@ -0,0 +1,115 @@ +.list-header { + padding: 3rem 13rem 4rem 13rem; + background: transparent linear-gradient(180deg, #cfece9 0%, #abded7 100%) 0% + 0% no-repeat; +} + +.title-container { + display: flex; + align-items: center; +} + +.bubble { + margin-left: 2rem; + background-color: #f6fcfb; + border: 2px solid #009c88; + border-radius: 50%; + width: 5rem; + height: 5rem; + display: flex; + align-items: center; + justify-content: center; + font-weight: 400; + font-size: 38px; +} + +.bubble-text { + color: #227069; +} + +.table-container { + padding: 0 2rem 0 2rem; + width: 80%; + margin: auto; +} + +.table { + width: 100%; + border-collapse: collapse; + border-spacing: 0; +} + +.table-header { + border-bottom: 2px solid#009C88; +} + +.table-row { + background: #f6fcfb; + height: 48px; + border-bottom: 1px solid #cfece9; + cursor: pointer; + overflow-wrap: anywhere; +} + +.table-row:hover { + background: #cfece9; +} + +.search-container { + margin: 1rem 0 1.5rem 0; + display: flex; + background: #f6fcfb; + align-items: center; + border-bottom: 2px solid #009c88; + display: flex; + height: 2.2rem; + padding-left: 1rem; + width: fit-content; +} + +input:focus { + outline: none; +} + +.icon-cell { + display: flex; + align-items: center; + justify-content: center; +} + +.name-col { + text-align: left; + padding-left: 1rem; +} + +.table-col { + text-align: center; +} + +.zigzag-container { + position: relative; + width: 100%; +} + +.zigzag { + content: " "; + display: block; + position: absolute; + bottom: 0px; + left: 0px; + width: 100%; + height: 32px; +} + +.zigzag-white { + background: linear-gradient(-40deg, #ffffff 16px, transparent 0), + linear-gradient(40deg, #ffffff 16px, transparent 0); + background-position: left bottom; + background-repeat: repeat-x; + background-size: 32px 32px; +} + +a { + text-decoration: none; + color: black !important; +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/css/page.css b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/page.css deleted file mode 100644 index 7047edabc..000000000 --- a/src/Apps/StatCan.OrchardCore.Radar/Assets/css/page.css +++ /dev/null @@ -1,35 +0,0 @@ -.zigzag { - position: relative; - padding: 8px 8px 32px 8px; - background: #cfece9; -} - - .zigzag:after { - background: linear-gradient(-40deg, hsl(0, 0%, 100%) 16px, transparent 0), linear-gradient(40deg, #ffffff 16px, transparent 0); - background-position: left bottom; - background-repeat: repeat-x; - background-size: 32px 32px; - content: ' '; - display: block; - position: absolute; - bottom: 0px; - left: 0px; - width: 100%; - height: 32px; - } - -.ripple { - background-color: #227069; - background-image: url(../Icons/ripples.svg); - background-size: cover; - background-repeat: no-repeat; - background-position: center bottom -623px; -} - -.rippleFront { - background-color: #cfece9; - background-image: url(../Icons/ripples-white.svg); - background-size: cover; - background-repeat: no-repeat; - background-position: center bottom -590px; -} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/css/topic.css b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/topic.css new file mode 100644 index 000000000..aa10c01e0 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/topic.css @@ -0,0 +1,19 @@ +.topic { + background: #009C88 0% 0% no-repeat padding-box; + border-radius: 75px; + display: inline-block; + padding: 2px 10px 0px 9px; + margin-right: 0.9rem; + color: #FFFFFF; + max-width: 100%; + display: flex; +} + +.topic:hover { + background-color: #227069; +} + +.label { + overflow: hidden; + text-overflow: ellipsis; +} \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_communities.svg b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_communities.svg new file mode 100644 index 000000000..879a10a4a --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_communities.svg @@ -0,0 +1,18 @@ + + + + + + + + + + diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_events.svg b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_events.svg new file mode 100644 index 000000000..0d594863b --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_events.svg @@ -0,0 +1,15 @@ + + + + + + + + + + diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_experiments.svg b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_experiments.svg new file mode 100644 index 000000000..117556b39 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_experiments.svg @@ -0,0 +1,18 @@ + + + + + + + + + + diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_opportunities.svg b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_opportunities.svg new file mode 100644 index 000000000..025a5660c --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_opportunities.svg @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_topics.svg b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_topics.svg new file mode 100644 index 000000000..303dda768 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/images/icon_topics.svg @@ -0,0 +1,21 @@ + + + + + + + + + + From 8d290e36c8530d4f84b941d3236014ae67714666 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Tue, 28 Sep 2021 13:03:48 -0400 Subject: [PATCH 043/198] feat: add custom vue components --- .../StatCan.OrchardCore.Radar/Assets.json | 6 + .../Assets/js/RadarComponents.js | 3 + .../Assets/js/components/RadarTable.vue | 11 + .../ResourceManagementOptionsConfiguration.cs | 26 ++ src/Apps/StatCan.OrchardCore.Radar/Startup.cs | 3 + .../wwwroot/js/radar-vue-components.umd.js | 366 ++++++++++++++++++ .../js/radar-vue-components.umd.js.map | 1 + .../js/radar-vue-components.umd.min.js | 2 + .../js/radar-vue-components.umd.min.js.map | 1 + 9 files changed, 419 insertions(+) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/js/RadarComponents.js create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/RadarTable.vue create mode 100644 src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/js/radar-vue-components.umd.js create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/js/radar-vue-components.umd.js.map create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/js/radar-vue-components.umd.min.js create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/js/radar-vue-components.umd.min.js.map diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets.json b/src/Apps/StatCan.OrchardCore.Radar/Assets.json index ed011a016..a47aade4d 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Assets.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets.json @@ -12,5 +12,11 @@ "Assets/images/*" ], "output": "wwwroot/images/@" + }, + { + "vue": true, + "file": "Assets/js/RadarComponents.js", + "output": "wwwroot/js", + "name": "radar-vue-components" } ] \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/js/RadarComponents.js b/src/Apps/StatCan.OrchardCore.Radar/Assets/js/RadarComponents.js new file mode 100644 index 000000000..50280b1cb --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/js/RadarComponents.js @@ -0,0 +1,3 @@ +import RadarTable from "./components/RadarTable.vue"; + +Vue.component("radar-table", RadarTable); \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/RadarTable.vue b/src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/RadarTable.vue new file mode 100644 index 000000000..d3a4fb3ed --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/RadarTable.vue @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs b/src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs new file mode 100644 index 000000000..a3c88fa2f --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/ResourceManagementOptionsConfiguration.cs @@ -0,0 +1,26 @@ +using Microsoft.Extensions.Options; +using OrchardCore.ResourceManagement; + +namespace StatCan.OrchardCore.Radar +{ + public class ResourceManagementOptionsConfiguration : IConfigureOptions + { + private static ResourceManifest _manifest; + + static ResourceManagementOptionsConfiguration() + { + _manifest = new ResourceManifest(); + + _manifest + .DefineScript("Radar-vue-components") + .SetDependencies("vuetify-theme") + .SetUrl("~/StatCan.OrchardCore.Radar/js/radar-vue-components.umd.min.js", "~/StatCan.OrchardCore.Radar/js/radar-vue-components.umd.js") + .SetVersion("1.0.0"); + } + + public void Configure(ResourceManagementOptions options) + { + options.ResourceManifests.Add(_manifest); + } + } +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs index cfb15d60f..a3776cb2f 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Startup.cs +++ b/src/Apps/StatCan.OrchardCore.Radar/Startup.cs @@ -8,6 +8,8 @@ using YesSql.Indexes; using StatCan.OrchardCore.Radar.Indexing; using StatCan.OrchardCore.Radar.Models; +using OrchardCore.ResourceManagement; +using Microsoft.Extensions.Options; namespace StatCan.OrchardCore.Radar { @@ -18,6 +20,7 @@ public override void ConfigureServices(IServiceCollection services) services.AddScoped(); services.AddContentPart(); services.AddSingleton(); + services.AddTransient, ResourceManagementOptionsConfiguration>(); } public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilder routes, IServiceProvider serviceProvider) diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/js/radar-vue-components.umd.js b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/js/radar-vue-components.umd.js new file mode 100644 index 000000000..0abcece84 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/js/radar-vue-components.umd.js @@ -0,0 +1,366 @@ +(function webpackUniversalModuleDefinition(root, factory) { + if(typeof exports === 'object' && typeof module === 'object') + module.exports = factory(); + else if(typeof define === 'function' && define.amd) + define([], factory); + else if(typeof exports === 'object') + exports["radar-vue-components"] = factory(); + else + root["radar-vue-components"] = factory(); +})((typeof self !== 'undefined' ? self : this), function() { +return /******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) { +/******/ return installedModules[moduleId].exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter }); +/******/ } +/******/ }; +/******/ +/******/ // define __esModule on exports +/******/ __webpack_require__.r = function(exports) { +/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { +/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); +/******/ } +/******/ Object.defineProperty(exports, '__esModule', { value: true }); +/******/ }; +/******/ +/******/ // create a fake namespace object +/******/ // mode & 1: value is a module id, require it +/******/ // mode & 2: merge all properties of value into the ns +/******/ // mode & 4: return value when already ns object +/******/ // mode & 8|1: behave like require +/******/ __webpack_require__.t = function(value, mode) { +/******/ if(mode & 1) value = __webpack_require__(value); +/******/ if(mode & 8) return value; +/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value; +/******/ var ns = Object.create(null); +/******/ __webpack_require__.r(ns); +/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value }); +/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key)); +/******/ return ns; +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = "fae3"); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ "8875": +/***/ (function(module, exports, __webpack_require__) { + +var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// addapted from the document.currentScript polyfill by Adam Miller +// MIT license +// source: https://github.com/amiller-gh/currentScript-polyfill + +// added support for Firefox https://bugzilla.mozilla.org/show_bug.cgi?id=1620505 + +(function (root, factory) { + if (true) { + !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory), + __WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ? + (__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__), + __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__)); + } else {} +}(typeof self !== 'undefined' ? self : this, function () { + function getCurrentScript () { + var descriptor = Object.getOwnPropertyDescriptor(document, 'currentScript') + // for chrome + if (!descriptor && 'currentScript' in document && document.currentScript) { + return document.currentScript + } + + // for other browsers with native support for currentScript + if (descriptor && descriptor.get !== getCurrentScript && document.currentScript) { + return document.currentScript + } + + // IE 8-10 support script readyState + // IE 11+ & Firefox support stack trace + try { + throw new Error(); + } + catch (err) { + // Find the second match for the "at" string to get file src url from stack. + var ieStackRegExp = /.*at [^(]*\((.*):(.+):(.+)\)$/ig, + ffStackRegExp = /@([^@]*):(\d+):(\d+)\s*$/ig, + stackDetails = ieStackRegExp.exec(err.stack) || ffStackRegExp.exec(err.stack), + scriptLocation = (stackDetails && stackDetails[1]) || false, + line = (stackDetails && stackDetails[2]) || false, + currentLocation = document.location.href.replace(document.location.hash, ''), + pageSource, + inlineScriptSourceRegExp, + inlineScriptSource, + scripts = document.getElementsByTagName('script'); // Live NodeList collection + + if (scriptLocation === currentLocation) { + pageSource = document.documentElement.outerHTML; + inlineScriptSourceRegExp = new RegExp('(?:[^\\n]+?\\n){0,' + (line - 2) + '}[^<]*","import mod from \"-!../../../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../../../node_modules/thread-loader/dist/cjs.js!../../../../../../node_modules/babel-loader/lib/index.js!../../../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./RadarTable.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../../../node_modules/thread-loader/dist/cjs.js!../../../../../../node_modules/babel-loader/lib/index.js!../../../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./RadarTable.vue?vue&type=script&lang=js&\"","/* globals __VUE_SSR_CONTEXT__ */\n\n// IMPORTANT: Do NOT use ES2015 features in this file (except for modules).\n// This module is a runtime utility for cleaner component module output and will\n// be included in the final webpack user bundle.\n\nexport default function normalizeComponent (\n scriptExports,\n render,\n staticRenderFns,\n functionalTemplate,\n injectStyles,\n scopeId,\n moduleIdentifier, /* server only */\n shadowMode /* vue-cli only */\n) {\n // Vue.extend constructor export interop\n var options = typeof scriptExports === 'function'\n ? scriptExports.options\n : scriptExports\n\n // render functions\n if (render) {\n options.render = render\n options.staticRenderFns = staticRenderFns\n options._compiled = true\n }\n\n // functional template\n if (functionalTemplate) {\n options.functional = true\n }\n\n // scopedId\n if (scopeId) {\n options._scopeId = 'data-v-' + scopeId\n }\n\n var hook\n if (moduleIdentifier) { // server build\n hook = function (context) {\n // 2.3 injection\n context =\n context || // cached call\n (this.$vnode && this.$vnode.ssrContext) || // stateful\n (this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext) // functional\n // 2.2 with runInNewContext: true\n if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {\n context = __VUE_SSR_CONTEXT__\n }\n // inject component styles\n if (injectStyles) {\n injectStyles.call(this, context)\n }\n // register component module identifier for async chunk inferrence\n if (context && context._registeredComponents) {\n context._registeredComponents.add(moduleIdentifier)\n }\n }\n // used by ssr in case component is cached and beforeCreate\n // never gets called\n options._ssrRegister = hook\n } else if (injectStyles) {\n hook = shadowMode\n ? function () {\n injectStyles.call(\n this,\n (options.functional ? this.parent : this).$root.$options.shadowRoot\n )\n }\n : injectStyles\n }\n\n if (hook) {\n if (options.functional) {\n // for template-only hot-reload because in that case the render fn doesn't\n // go through the normalizer\n options._injectStyles = hook\n // register for functional component in vue file\n var originalRender = options.render\n options.render = function renderWithStyleInjection (h, context) {\n hook.call(context)\n return originalRender(h, context)\n }\n } else {\n // inject component registration as beforeCreate hook\n var existing = options.beforeCreate\n options.beforeCreate = existing\n ? [].concat(existing, hook)\n : [hook]\n }\n }\n\n return {\n exports: scriptExports,\n options: options\n }\n}\n","import { render, staticRenderFns } from \"./RadarTable.vue?vue&type=template&id=0889469c&\"\nimport script from \"./RadarTable.vue?vue&type=script&lang=js&\"\nexport * from \"./RadarTable.vue?vue&type=script&lang=js&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\nexport default component.exports","import RadarTable from \"./components/RadarTable.vue\";\r\n\r\nVue.component(\"radar-table\", RadarTable);","import './setPublicPath'\nexport * from '~entry'\n"],"sourceRoot":""} \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/wwwroot/js/radar-vue-components.umd.min.js b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/js/radar-vue-components.umd.min.js new file mode 100644 index 000000000..c5f09675b --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/wwwroot/js/radar-vue-components.umd.min.js @@ -0,0 +1,2 @@ +(function(e,t){"object"===typeof exports&&"object"===typeof module?module.exports=t():"function"===typeof define&&define.amd?define([],t):"object"===typeof exports?exports["radar-vue-components"]=t():e["radar-vue-components"]=t()})("undefined"!==typeof self?self:this,(function(){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s="fae3")}({8875:function(e,t,n){var r,o,i;(function(n,c){o=[],r=c,i="function"===typeof r?r.apply(t,o):r,void 0===i||(e.exports=i)})("undefined"!==typeof self&&self,(function(){function e(){var t=Object.getOwnPropertyDescriptor(document,"currentScript");if(!t&&"currentScript"in document&&document.currentScript)return document.currentScript;if(t&&t.get!==e&&document.currentScript)return document.currentScript;try{throw new Error}catch(l){var n,r,o,i=/.*at [^(]*\((.*):(.+):(.+)\)$/gi,c=/@([^@]*):(\d+):(\d+)\s*$/gi,u=i.exec(l.stack)||c.exec(l.stack),a=u&&u[1]||!1,f=u&&u[2]||!1,d=document.location.href.replace(document.location.hash,""),s=document.getElementsByTagName("script");a===d&&(n=document.documentElement.outerHTML,r=new RegExp("(?:[^\\n]+?\\n){0,"+(f-2)+"}[^<]*","import mod from \"-!../../../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../../../node_modules/thread-loader/dist/cjs.js!../../../../../../node_modules/babel-loader/lib/index.js!../../../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./RadarTable.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../../../node_modules/thread-loader/dist/cjs.js!../../../../../../node_modules/babel-loader/lib/index.js!../../../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./RadarTable.vue?vue&type=script&lang=js&\"","/* globals __VUE_SSR_CONTEXT__ */\n\n// IMPORTANT: Do NOT use ES2015 features in this file (except for modules).\n// This module is a runtime utility for cleaner component module output and will\n// be included in the final webpack user bundle.\n\nexport default function normalizeComponent (\n scriptExports,\n render,\n staticRenderFns,\n functionalTemplate,\n injectStyles,\n scopeId,\n moduleIdentifier, /* server only */\n shadowMode /* vue-cli only */\n) {\n // Vue.extend constructor export interop\n var options = typeof scriptExports === 'function'\n ? scriptExports.options\n : scriptExports\n\n // render functions\n if (render) {\n options.render = render\n options.staticRenderFns = staticRenderFns\n options._compiled = true\n }\n\n // functional template\n if (functionalTemplate) {\n options.functional = true\n }\n\n // scopedId\n if (scopeId) {\n options._scopeId = 'data-v-' + scopeId\n }\n\n var hook\n if (moduleIdentifier) { // server build\n hook = function (context) {\n // 2.3 injection\n context =\n context || // cached call\n (this.$vnode && this.$vnode.ssrContext) || // stateful\n (this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext) // functional\n // 2.2 with runInNewContext: true\n if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {\n context = __VUE_SSR_CONTEXT__\n }\n // inject component styles\n if (injectStyles) {\n injectStyles.call(this, context)\n }\n // register component module identifier for async chunk inferrence\n if (context && context._registeredComponents) {\n context._registeredComponents.add(moduleIdentifier)\n }\n }\n // used by ssr in case component is cached and beforeCreate\n // never gets called\n options._ssrRegister = hook\n } else if (injectStyles) {\n hook = shadowMode\n ? function () {\n injectStyles.call(\n this,\n (options.functional ? this.parent : this).$root.$options.shadowRoot\n )\n }\n : injectStyles\n }\n\n if (hook) {\n if (options.functional) {\n // for template-only hot-reload because in that case the render fn doesn't\n // go through the normalizer\n options._injectStyles = hook\n // register for functional component in vue file\n var originalRender = options.render\n options.render = function renderWithStyleInjection (h, context) {\n hook.call(context)\n return originalRender(h, context)\n }\n } else {\n // inject component registration as beforeCreate hook\n var existing = options.beforeCreate\n options.beforeCreate = existing\n ? [].concat(existing, hook)\n : [hook]\n }\n }\n\n return {\n exports: scriptExports,\n options: options\n }\n}\n","import { render, staticRenderFns } from \"./RadarTable.vue?vue&type=template&id=0889469c&\"\nimport script from \"./RadarTable.vue?vue&type=script&lang=js&\"\nexport * from \"./RadarTable.vue?vue&type=script&lang=js&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\nexport default component.exports","import RadarTable from \"./components/RadarTable.vue\";\r\n\r\nVue.component(\"radar-table\", RadarTable);"],"sourceRoot":""} \ No newline at end of file From fde1f9d7c3656ee634d4ddb85a4d71211b00b378 Mon Sep 17 00:00:00 2001 From: Michael Fan <62428476+mfan127@users.noreply.github.com> Date: Wed, 29 Sep 2021 13:57:25 -0400 Subject: [PATCH 044/198] feat: add topic details view --- .../StatCan.OrchardCore.Radar/Assets.json | 13 +- .../Assets/css/table-row.css | 26 + .../Assets/css/table.css | 16 + .../Assets/css/vue-components.css | 31 + .../Assets/js/RadarComponents.js | 6 +- .../Assets/js/components/RadarTable.vue | 11 - .../Assets/js/components/Tab.vue | 17 + .../Assets/js/components/Tabs.vue | 51 + .../Assets/js/radar-vue-components.umd.js | 3268 +++++++++++++++++ .../Assets/js/radar-vue-components.umd.js.map | 1 + .../Assets/js/radar-vue-components.umd.min.js | 2 + .../js/radar-vue-components.umd.min.js.map | 1 + .../Recipes/radar.setup.recipe.json | 7 + .../Views/Content-Community.Summary.liquid | 15 + .../Views/Content-Event.Summary.liquid | 19 + .../Views/Content-Project.Summary.liquid | 21 + .../Views/Content-Proposal.Summary.liquid | 17 + .../Views/Content-Topic.Summary.liquid | 10 +- .../Views/Content-Topic.liquid | 131 + .../wwwroot/css/table-row.css | 26 + .../wwwroot/css/table.css | 16 + .../wwwroot/css/vue-components.css | 31 + .../wwwroot/js/radar-vue-components.css | 5 + .../wwwroot/js/radar-vue-components.umd.js | 2891 ++++++++++++++- .../js/radar-vue-components.umd.js.map | 2 +- .../js/radar-vue-components.umd.min.js | 2 +- .../js/radar-vue-components.umd.min.js.map | 2 +- 27 files changed, 6583 insertions(+), 55 deletions(-) create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/css/table-row.css create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/css/table.css create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/css/vue-components.css delete mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/RadarTable.vue create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/Tab.vue create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/Tabs.vue create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/js/radar-vue-components.umd.js create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/js/radar-vue-components.umd.js.map create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/js/radar-vue-components.umd.min.js create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Assets/js/radar-vue-components.umd.min.js.map create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-Community.Summary.liquid create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-Event.Summary.liquid create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-Project.Summary.liquid create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-Proposal.Summary.liquid create mode 100644 src/Apps/StatCan.OrchardCore.Radar/Views/Content-Topic.liquid create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/table-row.css create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/table.css create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/css/vue-components.css create mode 100644 src/Apps/StatCan.OrchardCore.Radar/wwwroot/js/radar-vue-components.css diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets.json b/src/Apps/StatCan.OrchardCore.Radar/Assets.json index a47aade4d..3d585c458 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Assets.json +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets.json @@ -1,22 +1,19 @@ [ { "copy": true, - "inputs": [ - "Assets/css/*" - ], + "inputs": ["Assets/css/*"], "output": "wwwroot/css/@" }, { "copy": true, - "inputs": [ - "Assets/images/*" - ], + "inputs": ["Assets/images/*"], "output": "wwwroot/images/@" }, { "vue": true, "file": "Assets/js/RadarComponents.js", "output": "wwwroot/js", - "name": "radar-vue-components" + "name": "radar-vue-components", + "watch": ["Assets/js/components/*"] } -] \ No newline at end of file +] diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/css/table-row.css b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/table-row.css new file mode 100644 index 000000000..4a50fcbb8 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/table-row.css @@ -0,0 +1,26 @@ +.table-row { + background: #f6fcfb; + height: 48px; + border-bottom: 1px solid #cfece9; + cursor: pointer; + overflow-wrap: anywhere; +} + +.table-row:hover { + background: #cfece9; +} + +.name-col { + text-align: left; + padding-left: 1rem; +} + +.table-col { + text-align: center; +} + +.icon-cell { + display: flex; + align-items: center; + justify-content: center; +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/css/table.css b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/table.css new file mode 100644 index 000000000..30f052c4b --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/table.css @@ -0,0 +1,16 @@ +.table-header { + border-bottom: 2px solid#009C88; +} + +.name-col { + text-align: left; + padding-left: 1rem; + } + +.table-row { + background: #f6fcfb; + height: 48px; + border-bottom: 1px solid #cfece9; + cursor: pointer; + overflow-wrap: anywhere; +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/css/vue-components.css b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/vue-components.css new file mode 100644 index 000000000..3beefdc14 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/css/vue-components.css @@ -0,0 +1,31 @@ +.tabs { + display: flex; +} + +.selected { + color: #212121; + background-color: #cfece9; + border-bottom: 2px solid #009C88; +} + +.selected:hover { + background-color: #cfece9; +} + +.unselected { + color: #212121; + background-color: #f6fcfb; + border-bottom: 2px solid #FFFFFF; +} + +.unselected:hover { + background-color: #cfece9; +} + +.tab-button { + padding: 0.5rem 1rem; +} + +.tab-header-container { + display: flex; +} diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/js/RadarComponents.js b/src/Apps/StatCan.OrchardCore.Radar/Assets/js/RadarComponents.js index 50280b1cb..cfbcaafbb 100644 --- a/src/Apps/StatCan.OrchardCore.Radar/Assets/js/RadarComponents.js +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/js/RadarComponents.js @@ -1,3 +1,5 @@ -import RadarTable from "./components/RadarTable.vue"; +import Tabs from "./components/Tabs.vue"; +import Tab from "./components/Tab.vue"; -Vue.component("radar-table", RadarTable); \ No newline at end of file +Vue.component("tabs", Tabs); +Vue.component("tab", Tab); diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/RadarTable.vue b/src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/RadarTable.vue deleted file mode 100644 index d3a4fb3ed..000000000 --- a/src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/RadarTable.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/Tab.vue b/src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/Tab.vue new file mode 100644 index 000000000..17fa22b1d --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/Tab.vue @@ -0,0 +1,17 @@ + + + \ No newline at end of file diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/Tabs.vue b/src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/Tabs.vue new file mode 100644 index 000000000..e43528ab7 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/js/components/Tabs.vue @@ -0,0 +1,51 @@ + + + diff --git a/src/Apps/StatCan.OrchardCore.Radar/Assets/js/radar-vue-components.umd.js b/src/Apps/StatCan.OrchardCore.Radar/Assets/js/radar-vue-components.umd.js new file mode 100644 index 000000000..a3e117da4 --- /dev/null +++ b/src/Apps/StatCan.OrchardCore.Radar/Assets/js/radar-vue-components.umd.js @@ -0,0 +1,3268 @@ +(function webpackUniversalModuleDefinition(root, factory) { + if(typeof exports === 'object' && typeof module === 'object') + module.exports = factory(require("vue")); + else if(typeof define === 'function' && define.amd) + define([], factory); + else if(typeof exports === 'object') + exports["radar-vue-components"] = factory(require("vue")); + else + root["radar-vue-components"] = factory(root["Vue"]); +})((typeof self !== 'undefined' ? self : this), function(__WEBPACK_EXTERNAL_MODULE__8bbf__) { +return /******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; +/******/ +/******/ // The require function +/******/ function __webpack_require__(moduleId) { +/******/ +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) { +/******/ return installedModules[moduleId].exports; +/******/ } +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ i: moduleId, +/******/ l: false, +/******/ exports: {} +/******/ }; +/******/ +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); +/******/ +/******/ // Flag the module as loaded +/******/ module.l = true; +/******/ +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } +/******/ +/******/ +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; +/******/ +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; +/******/ +/******/ // define getter function for harmony exports +/******/ __webpack_require__.d = function(exports, name, getter) { +/******/ if(!__webpack_require__.o(exports, name)) { +/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter }); +/******/ } +/******/ }; +/******/ +/******/ // define __esModule on exports +/******/ __webpack_require__.r = function(exports) { +/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { +/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); +/******/ } +/******/ Object.defineProperty(exports, '__esModule', { value: true }); +/******/ }; +/******/ +/******/ // create a fake namespace object +/******/ // mode & 1: value is a module id, require it +/******/ // mode & 2: merge all properties of value into the ns +/******/ // mode & 4: return value when already ns object +/******/ // mode & 8|1: behave like require +/******/ __webpack_require__.t = function(value, mode) { +/******/ if(mode & 1) value = __webpack_require__(value); +/******/ if(mode & 8) return value; +/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value; +/******/ var ns = Object.create(null); +/******/ __webpack_require__.r(ns); +/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value }); +/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key)); +/******/ return ns; +/******/ }; +/******/ +/******/ // getDefaultExport function for compatibility with non-harmony modules +/******/ __webpack_require__.n = function(module) { +/******/ var getter = module && module.__esModule ? +/******/ function getDefault() { return module['default']; } : +/******/ function getModuleExports() { return module; }; +/******/ __webpack_require__.d(getter, 'a', getter); +/******/ return getter; +/******/ }; +/******/ +/******/ // Object.prototype.hasOwnProperty.call +/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); }; +/******/ +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; +/******/ +/******/ +/******/ // Load entry module and return exports +/******/ return __webpack_require__(__webpack_require__.s = "fae3"); +/******/ }) +/************************************************************************/ +/******/ ({ + +/***/ "0b5b": +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_TabTitle_vue_vue_type_style_index_0_id_2d6d52a6_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("6704"); +/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_TabTitle_vue_vue_type_style_index_0_id_2d6d52a6_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_TabTitle_vue_vue_type_style_index_0_id_2d6d52a6_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__); +/* unused harmony reexport * */ + + +/***/ }), + +/***/ "4804": +/***/ (function(module, exports, __webpack_require__) { + +// extracted by mini-css-extract-plugin + +/***/ }), + +/***/ "6544": +/***/ (function(module, exports) { + +// IMPORTANT: Do NOT use ES2015 features in this file (except for modules). +// This module is a runtime utility for cleaner component module output and will +// be included in the final webpack user bundle. + +module.exports = function installComponents (component, components) { + var options = typeof component.exports === 'function' + ? component.exports.extendOptions + : component.options + + if (typeof component.exports === 'function') { + options.components = component.exports.options.components + } + + options.components = options.components || {} + + for (var i in components) { + options.components[i] = options.components[i] || components[i] + } +} + + +/***/ }), + +/***/ "6704": +/***/ (function(module, exports, __webpack_require__) { + +// extracted by mini-css-extract-plugin + +/***/ }), + +/***/ "8875": +/***/ (function(module, exports, __webpack_require__) { + +var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// addapted from the document.currentScript polyfill by Adam Miller +// MIT license +// source: https://github.com/amiller-gh/currentScript-polyfill + +// added support for Firefox https://bugzilla.mozilla.org/show_bug.cgi?id=1620505 + +(function (root, factory) { + if (true) { + !(__WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory), + __WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ? + (__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__), + __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__)); + } else {} +}(typeof self !== 'undefined' ? self : this, function () { + function getCurrentScript () { + var descriptor = Object.getOwnPropertyDescriptor(document, 'currentScript') + // for chrome + if (!descriptor && 'currentScript' in document && document.currentScript) { + return document.currentScript + } + + // for other browsers with native support for currentScript + if (descriptor && descriptor.get !== getCurrentScript && document.currentScript) { + return document.currentScript + } + + // IE 8-10 support script readyState + // IE 11+ & Firefox support stack trace + try { + throw new Error(); + } + catch (err) { + // Find the second match for the "at" string to get file src url from stack. + var ieStackRegExp = /.*at [^(]*\((.*):(.+):(.+)\)$/ig, + ffStackRegExp = /@([^@]*):(\d+):(\d+)\s*$/ig, + stackDetails = ieStackRegExp.exec(err.stack) || ffStackRegExp.exec(err.stack), + scriptLocation = (stackDetails && stackDetails[1]) || false, + line = (stackDetails && stackDetails[2]) || false, + currentLocation = document.location.href.replace(document.location.hash, ''), + pageSource, + inlineScriptSourceRegExp, + inlineScriptSource, + scripts = document.getElementsByTagName('script'); // Live NodeList collection + + if (scriptLocation === currentLocation) { + pageSource = document.documentElement.outerHTML; + inlineScriptSourceRegExp = new RegExp('(?:[^\\n]+?\\n){0,' + (line - 2) + '}[^<]*\r\n","import mod from \"-!../../../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../../../node_modules/thread-loader/dist/cjs.js!../../../../../../node_modules/babel-loader/lib/index.js!../../../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./Tabs.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../../../../node_modules/cache-loader/dist/cjs.js??ref--12-0!../../../../../../node_modules/thread-loader/dist/cjs.js!../../../../../../node_modules/babel-loader/lib/index.js!../../../../../../node_modules/cache-loader/dist/cjs.js??ref--0-0!../../../../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./Tabs.vue?vue&type=script&lang=js&\"","/* globals __VUE_SSR_CONTEXT__ */\n\n// IMPORTANT: Do NOT use ES2015 features in this file (except for modules).\n// This module is a runtime utility for cleaner component module output and will\n// be included in the final webpack user bundle.\n\nexport default function normalizeComponent (\n scriptExports,\n render,\n staticRenderFns,\n functionalTemplate,\n injectStyles,\n scopeId,\n moduleIdentifier, /* server only */\n shadowMode /* vue-cli only */\n) {\n // Vue.extend constructor export interop\n var options = typeof scriptExports === 'function'\n ? scriptExports.options\n : scriptExports\n\n // render functions\n if (render) {\n options.render = render\n options.staticRenderFns = staticRenderFns\n options._compiled = true\n }\n\n // functional template\n if (functionalTemplate) {\n options.functional = true\n }\n\n // scopedId\n if (scopeId) {\n options._scopeId = 'data-v-' + scopeId\n }\n\n var hook\n if (moduleIdentifier) { // server build\n hook = function (context) {\n // 2.3 injection\n context =\n context || // cached call\n (this.$vnode && this.$vnode.ssrContext) || // stateful\n (this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext) // functional\n // 2.2 with runInNewContext: true\n if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {\n context = __VUE_SSR_CONTEXT__\n }\n // inject component styles\n if (injectStyles) {\n injectStyles.call(this, context)\n }\n // register component module identifier for async chunk inferrence\n if (context && context._registeredComponents) {\n context._registeredComponents.add(moduleIdentifier)\n }\n }\n // used by ssr in case component is cached and beforeCreate\n // never gets called\n options._ssrRegister = hook\n } else if (injectStyles) {\n hook = shadowMode\n ? function () {\n injectStyles.call(\n this,\n (options.functional ? this.parent : this).$root.$options.shadowRoot\n )\n }\n : injectStyles\n }\n\n if (hook) {\n if (options.functional) {\n // for template-only hot-reload because in that case the render fn doesn't\n // go through the normalizer\n options._injectStyles = hook\n // register for functional component in vue file\n var originalRender = options.render\n options.render = function renderWithStyleInjection (h, context) {\n hook.call(context)\n return originalRender(h, context)\n }\n } else {\n // inject component registration as beforeCreate hook\n var existing = options.beforeCreate\n options.beforeCreate = existing\n ? [].concat(existing, hook)\n : [hook]\n }\n }\n\n return {\n exports: scriptExports,\n options: options\n }\n}\n","import Vue from 'vue';\n/**\n * This mixin provides `attrs$` and `listeners$` to work around\n * vue bug https://github.com/vuejs/vue/issues/10115\n */\n\nfunction makeWatcher(property) {\n return function (val, oldVal) {\n for (const attr in oldVal) {\n if (!Object.prototype.hasOwnProperty.call(val, attr)) {\n this.$delete(this.$data[property], attr);\n }\n }\n\n for (const attr in val) {\n this.$set(this.$data[property], attr, val[attr]);\n }\n };\n}\n\nexport default Vue.extend({\n data: () => ({\n attrs$: {},\n listeners$: {}\n }),\n\n created() {\n // Work around unwanted re-renders: https://github.com/vuejs/vue/issues/10115\n // Make sure to use `attrs$` instead of `$attrs` (confusing right?)\n this.$watch('$attrs', makeWatcher('attrs$'), {\n immediate: true\n });\n this.$watch('$listeners', makeWatcher('listeners$'), {\n immediate: true\n });\n }\n\n});\n//# sourceMappingURL=index.js.map","import OurVue from 'vue';\nimport { consoleError } from './util/console';\nexport function install(Vue, args = {}) {\n if (install.installed) return;\n install.installed = true;\n\n if (OurVue !== Vue) {\n consoleError(`Multiple instances of Vue detected\nSee https://github.com/vuetifyjs/vuetify/issues/4068\n\nIf you're seeing \"$attrs is readonly\", it's caused by this`);\n }\n\n const components = args.components || {};\n const directives = args.directives || {};\n\n for (const name in directives) {\n const directive = directives[name];\n Vue.directive(name, directive);\n }\n\n (function registerComponents(components) {\n if (components) {\n for (const key in components) {\n const component = components[key];\n\n if (component && !registerComponents(component.$_vuetify_subcomponents)) {\n Vue.component(key, component);\n }\n }\n\n return true;\n }\n\n return false;\n })(components); // Used to avoid multiple mixins being setup\n // when in dev mode and hot module reload\n // https://github.com/vuejs/vue/issues/5089#issuecomment-284260111\n\n\n if (Vue.$_vuetify_installed) return;\n Vue.$_vuetify_installed = true;\n Vue.mixin({\n beforeCreate() {\n const options = this.$options;\n\n if (options.vuetify) {\n options.vuetify.init(this, this.$ssrContext);\n this.$vuetify = Vue.observable(options.vuetify.framework);\n } else {\n this.$vuetify = options.parent && options.parent.$vuetify || this;\n }\n },\n\n beforeMount() {\n // @ts-ignore\n if (this.$options.vuetify && this.$el && this.$el.hasAttribute('data-server-rendered')) {\n // @ts-ignore\n this.$vuetify.isHydrating = true; // @ts-ignore\n\n this.$vuetify.breakpoint.update(true);\n }\n },\n\n mounted() {\n // @ts-ignore\n if (this.$options.vuetify && this.$vuetify.isHydrating) {\n // @ts-ignore\n this.$vuetify.isHydrating = false; // @ts-ignore\n\n this.$vuetify.breakpoint.update();\n }\n }\n\n });\n}\n//# sourceMappingURL=install.js.map","export default {\n badge: 'Badge',\n close: 'Close',\n dataIterator: {\n noResultsText: 'No matching records found',\n loadingText: 'Loading items...'\n },\n dataTable: {\n itemsPerPageText: 'Rows per page:',\n ariaLabel: {\n sortDescending: 'Sorted descending.',\n sortAscending: 'Sorted ascending.',\n sortNone: 'Not sorted.',\n activateNone: 'Activate to remove sorting.',\n activateDescending: 'Activate to sort descending.',\n activateAscending: 'Activate to sort ascending.'\n },\n sortBy: 'Sort by'\n },\n dataFooter: {\n itemsPerPageText: 'Items per page:',\n itemsPerPageAll: 'All',\n nextPage: 'Next page',\n prevPage: 'Previous page',\n firstPage: 'First page',\n lastPage: 'Last page',\n pageText: '{0}-{1} of {2}'\n },\n datePicker: {\n itemsSelected: '{0} selected',\n nextMonthAriaLabel: 'Next month',\n nextYearAriaLabel: 'Next year',\n prevMonthAriaLabel: 'Previous month',\n prevYearAriaLabel: 'Previous year'\n },\n noDataText: 'No data available',\n carousel: {\n prev: 'Previous visual',\n next: 'Next visual',\n ariaLabel: {\n delimiter: 'Carousel slide {0} of {1}'\n }\n },\n calendar: {\n moreEvents: '{0} more'\n },\n fileInput: {\n counter: '{0} files',\n counterSize: '{0} files ({1} in total)'\n },\n timePicker: {\n am: 'AM',\n pm: 'PM'\n },\n pagination: {\n ariaLabel: {\n wrapper: 'Pagination Navigation',\n next: 'Next page',\n previous: 'Previous page',\n page: 'Goto Page {0}',\n currentPage: 'Current Page, Page {0}'\n }\n },\n rating: {\n ariaLabel: {\n icon: 'Rating {0} of {1}'\n }\n }\n};\n//# sourceMappingURL=en.js.map","// Styles\nimport \"../../../src/styles/main.sass\"; // Locale\n\nimport { en } from '../../locale';\nexport const preset = {\n breakpoint: {\n // TODO: update to MD2 spec in v3 - 1280\n mobileBreakpoint: 1264,\n scrollBarWidth: 16,\n thresholds: {\n xs: 600,\n sm: 960,\n md: 1280,\n lg: 1920\n }\n },\n icons: {\n // TODO: remove v3\n iconfont: 'mdi',\n values: {}\n },\n lang: {\n current: 'en',\n locales: {\n en\n },\n // Default translator exists in lang service\n t: undefined\n },\n rtl: false,\n theme: {\n dark: false,\n default: 'light',\n disable: false,\n options: {\n cspNonce: undefined,\n customProperties: undefined,\n minifyTheme: undefined,\n themeCache: undefined,\n variations: true\n },\n themes: {\n light: {\n primary: '#1976D2',\n secondary: '#424242',\n accent: '#82B1FF',\n error: '#FF5252',\n info: '#2196F3',\n success: '#4CAF50',\n warning: '#FB8C00'\n },\n dark: {\n primary: '#2196F3',\n secondary: '#424242',\n accent: '#FF4081',\n error: '#FF5252',\n info: '#2196F3',\n success: '#4CAF50',\n warning: '#FB8C00'\n }\n }\n }\n};\n//# sourceMappingURL=index.js.map","import Vue from 'vue';\nexport function createSimpleFunctional(c, el = 'div', name) {\n return Vue.extend({\n name: name || c.replace(/__/g, '-'),\n functional: true,\n\n render(h, {\n data,\n children\n }) {\n data.staticClass = `${c} ${data.staticClass || ''}`.trim();\n return h(el, data, children);\n }\n\n });\n}\nexport function directiveConfig(binding, defaults = {}) {\n return { ...defaults,\n ...binding.modifiers,\n value: binding.arg,\n ...(binding.value || {})\n };\n}\nexport function addOnceEventListener(el, eventName, cb, options = false) {\n var once = event => {\n cb(event);\n el.removeEventListener(eventName, once, options);\n };\n\n el.addEventListener(eventName, once, options);\n}\nlet passiveSupported = false;\n\ntry {\n if (typeof window !== 'undefined') {\n const testListenerOpts = Object.defineProperty({}, 'passive', {\n get: () => {\n passiveSupported = true;\n }\n });\n window.addEventListener('testListener', testListenerOpts, testListenerOpts);\n window.removeEventListener('testListener', testListenerOpts, testListenerOpts);\n }\n} catch (e) {\n console.warn(e);\n}\n/* eslint-disable-line no-console */\n\n\nexport { passiveSupported };\nexport function addPassiveEventListener(el, event, cb, options) {\n el.addEventListener(event, cb, passiveSupported ? options : false);\n}\nexport function getNestedValue(obj, path, fallback) {\n const last = path.length - 1;\n if (last < 0) return obj === undefined ? fallback : obj;\n\n for (let i = 0; i < last; i++) {\n if (obj == null) {\n return fallback;\n }\n\n obj = obj[path[i]];\n }\n\n if (obj == null) return fallback;\n return obj[path[last]] === undefined ? fallback : obj[path[last]];\n}\nexport function deepEqual(a, b) {\n if (a === b) return true;\n\n if (a instanceof Date && b instanceof Date && a.getTime() !== b.getTime()) {\n // If the values are Date, compare them as timestamps\n return false;\n }\n\n if (a !== Object(a) || b !== Object(b)) {\n // If the values aren't objects, they were already checked for equality\n return false;\n }\n\n const props = Object.keys(a);\n\n if (props.length !== Object.keys(b).length) {\n // Different number of props, don't bother to check\n return false;\n }\n\n return props.every(p => deepEqual(a[p], b[p]));\n}\nexport function getObjectValueByPath(obj, path, fallback) {\n // credit: http://stackoverflow.com/questions/6491463/accessing-nested-javascript-objects-with-string-key#comment55278413_6491621\n if (obj == null || !path || typeof path !== 'string') return fallback;\n if (obj[path] !== undefined) return obj[path];\n path = path.replace(/\\[(\\w+)\\]/g, '.$1'); // convert indexes to properties\n\n path = path.replace(/^\\./, ''); // strip a leading dot\n\n return getNestedValue(obj, path.split('.'), fallback);\n}\nexport function getPropertyFromItem(item, property, fallback) {\n if (property == null) return item === undefined ? fallback : item;\n if (item !== Object(item)) return fallback === undefined ? item : fallback;\n if (typeof property === 'string') return getObjectValueByPath(item, property, fallback);\n if (Array.isArray(property)) return getNestedValue(item, property, fallback);\n if (typeof property !== 'function') return fallback;\n const value = property(item, fallback);\n return typeof value === 'undefined' ? fallback : value;\n}\nexport function createRange(length) {\n return Array.from({\n length\n }, (v, k) => k);\n}\nexport function getZIndex(el) {\n if (!el || el.nodeType !== Node.ELEMENT_NODE) return 0;\n const index = +window.getComputedStyle(el).getPropertyValue('z-index');\n if (!index) return getZIndex(el.parentNode);\n return index;\n}\nconst tagsToReplace = {\n '&': '&',\n '<': '<',\n '>': '>'\n};\nexport function escapeHTML(str) {\n return str.replace(/[&<>]/g, tag => tagsToReplace[tag] || tag);\n}\nexport function filterObjectOnKeys(obj, keys) {\n const filtered = {};\n\n for (let i = 0; i < keys.length; i++) {\n const key = keys[i];\n\n if (typeof obj[key] !== 'undefined') {\n filtered[key] = obj[key];\n }\n }\n\n return filtered;\n}\nexport function convertToUnit(str, unit = 'px') {\n if (str == null || str === '') {\n return undefined;\n } else if (isNaN(+str)) {\n return String(str);\n } else {\n return `${Number(str)}${unit}`;\n }\n}\nexport function kebabCase(str) {\n return (str || '').replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();\n}\nexport function isObject(obj) {\n return obj !== null && typeof obj === 'object';\n} // KeyboardEvent.keyCode aliases\n\nexport const keyCodes = Object.freeze({\n enter: 13,\n tab: 9,\n delete: 46,\n esc: 27,\n space: 32,\n up: 38,\n down: 40,\n left: 37,\n right: 39,\n end: 35,\n home: 36,\n del: 46,\n backspace: 8,\n insert: 45,\n pageup: 33,\n pagedown: 34,\n shift: 16\n});\n/**\n * This remaps internal names like '$cancel' or '$vuetify.icons.cancel'\n * to the current name or component for that icon.\n */\n\nexport function remapInternalIcon(vm, iconName) {\n // Look for custom component in the configuration\n const component = vm.$vuetify.icons.component; // Look for overrides\n\n if (iconName.startsWith('$')) {\n // Get the target icon name\n const iconPath = `$vuetify.icons.values.${iconName.split('$').pop().split('.').pop()}`; // Now look up icon indirection name,\n // e.g. '$vuetify.icons.values.cancel'\n\n const override = getObjectValueByPath(vm, iconPath, iconName);\n if (typeof override === 'string') iconName = override;else return override;\n }\n\n if (component == null) {\n return iconName;\n }\n\n return {\n component,\n props: {\n icon: iconName\n }\n };\n}\nexport function keys(o) {\n return Object.keys(o);\n}\n/**\n * Camelize a hyphen-delimited string.\n */\n\nconst camelizeRE = /-(\\w)/g;\nexport const camelize = str => {\n return str.replace(camelizeRE, (_, c) => c ? c.toUpperCase() : '');\n};\n/**\n * Returns the set difference of B and A, i.e. the set of elements in B but not in A\n */\n\nexport function arrayDiff(a, b) {\n const diff = [];\n\n for (let i = 0; i < b.length; i++) {\n if (a.indexOf(b[i]) < 0) diff.push(b[i]);\n }\n\n return diff;\n}\n/**\n * Makes the first character of a string uppercase\n */\n\nexport function upperFirst(str) {\n return str.charAt(0).toUpperCase() + str.slice(1);\n}\nexport function groupItems(items, groupBy, groupDesc) {\n const key = groupBy[0];\n const groups = [];\n let current;\n\n for (var i = 0; i < items.length; i++) {\n const item = items[i];\n const val = getObjectValueByPath(item, key, null);\n\n if (current !== val) {\n var _val;\n\n current = val;\n groups.push({\n name: (_val = val) != null ? _val : '',\n items: []\n });\n }\n\n groups[groups.length - 1].items.push(item);\n }\n\n return groups;\n}\nexport function wrapInArray(v) {\n return v != null ? Array.isArray(v) ? v : [v] : [];\n}\nexport function sortItems(items, sortBy, sortDesc, locale, customSorters) {\n if (sortBy === null || !sortBy.length) return items;\n const stringCollator = new Intl.Collator(locale, {\n sensitivity: 'accent',\n usage: 'sort'\n });\n return items.sort((a, b) => {\n for (let i = 0; i < sortBy.length; i++) {\n const sortKey = sortBy[i];\n let sortA = getObjectValueByPath(a, sortKey);\n let sortB = getObjectValueByPath(b, sortKey);\n\n if (sortDesc[i]) {\n [sortA, sortB] = [sortB, sortA];\n }\n\n if (customSorters && customSorters[sortKey]) {\n const customResult = customSorters[sortKey](sortA, sortB);\n if (!customResult) continue;\n return customResult;\n } // Check if both cannot be evaluated\n\n\n if (sortA === null && sortB === null) {\n continue;\n }\n\n [sortA, sortB] = [sortA, sortB].map(s => (s || '').toString().toLocaleLowerCase());\n\n if (sortA !== sortB) {\n if (!isNaN(sortA) && !isNaN(sortB)) return Number(sortA) - Number(sortB);\n return stringCollator.compare(sortA, sortB);\n }\n }\n\n return 0;\n });\n}\nexport function defaultFilter(value, search, item) {\n return value != null && search != null && typeof value !== 'boolean' && value.toString().toLocaleLowerCase().indexOf(search.toLocaleLowerCase()) !== -1;\n}\nexport function searchItems(items, search) {\n if (!search) return items;\n search = search.toString().toLowerCase();\n if (search.trim() === '') return items;\n return items.filter(item => Object.keys(item).some(key => defaultFilter(getObjectValueByPath(item, key), search, item)));\n}\n/**\n * Returns:\n * - 'normal' for old style slots - `