From c9a16acd4ed948c81495c303a4db86daa5b2cc7f Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Wed, 17 Oct 2018 11:25:31 +0200 Subject: [PATCH] WIP --- Flowsharp.sln | 59 +++++++++++-------- .../Areas/MyFeature/Pages/Page1.cshtml | 1 - .../Flowsharp.Web.Components.csproj | 13 +++- .../ViewComponents/WorkflowEditor.cs | 14 +++++ .../Views/Index1.cshtml | 6 ++ .../Index1.cshtml.cs} | 6 +- .../Components/WorkflowEditor/Default.cshtml | 5 ++ .../Views/_ViewImports.cshtml | 2 + .../Flowsharp.Web.Dashboard.csproj | 1 - .../Pages/Index.cshtml | 2 +- src/Flowsharp.Web.Dashboard/Startup.cs | 6 +- 11 files changed, 82 insertions(+), 33 deletions(-) delete mode 100644 src/Flowsharp.Web.Components/Areas/MyFeature/Pages/Page1.cshtml create mode 100644 src/Flowsharp.Web.Components/ViewComponents/WorkflowEditor.cs create mode 100644 src/Flowsharp.Web.Components/Views/Index1.cshtml rename src/Flowsharp.Web.Components/{Areas/MyFeature/Pages/Page1.cshtml.cs => Views/Index1.cshtml.cs} (67%) create mode 100644 src/Flowsharp.Web.Components/Views/Shared/Components/WorkflowEditor/Default.cshtml create mode 100644 src/Flowsharp.Web.Components/Views/_ViewImports.cshtml diff --git a/Flowsharp.sln b/Flowsharp.sln index 5034d3834..570215325 100644 --- a/Flowsharp.sln +++ b/Flowsharp.sln @@ -5,31 +5,37 @@ VisualStudioVersion = 15.0.28010.2036 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Core", "src\Flowsharp.Core\Flowsharp.Core.csproj", "{300EE2D5-54C5-46F2-AD03-BB43589EA074}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Samples.Console", "src\Flowsharp.Samples.Console\Flowsharp.Samples.Console.csproj", "{48EDB976-3227-4DFD-BBB3-3BC9AEA19A88}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Samples.Console", "src\Flowsharp.Samples.Console\Flowsharp.Samples.Console.csproj", "{48EDB976-3227-4DFD-BBB3-3BC9AEA19A88}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "items", "items", "{7165BB9E-F22C-40D2-B7B1-CA3EFA2529A0}" -ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - .gitignore = .gitignore - README.md = README.md - Nuget.Config = Nuget.Config -EndProjectSection + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + .gitignore = .gitignore + Nuget.Config = Nuget.Config + README.md = README.md + EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Abstractions", "src\Flowsharp.Abstractions\Flowsharp.Abstractions.csproj", "{3130C574-557C-4DA2-933E-AED7A9EBE48A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Abstractions", "src\Flowsharp.Abstractions\Flowsharp.Abstractions.csproj", "{3130C574-557C-4DA2-933E-AED7A9EBE48A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Persistence.Abstractions", "src\Flowsharp.Persistence.Abstractions\Flowsharp.Persistence.Abstractions.csproj", "{A5829896-89C5-4C4E-ADC7-C806C8077316}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Persistence.Abstractions", "src\Flowsharp.Persistence.Abstractions\Flowsharp.Persistence.Abstractions.csproj", "{A5829896-89C5-4C4E-ADC7-C806C8077316}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Persistence.InMemory", "src\Flowsharp.Persistence.InMemory\Flowsharp.Persistence.InMemory.csproj", "{E93A1A6B-708F-4DCC-A399-1B8EC7682F92}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Persistence.InMemory", "src\Flowsharp.Persistence.InMemory\Flowsharp.Persistence.InMemory.csproj", "{E93A1A6B-708F-4DCC-A399-1B8EC7682F92}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Runtime", "src\Flowsharp.Runtime\Flowsharp.Runtime.csproj", "{3C1DCAA2-D77E-4F96-9899-DA8E0E0C757F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Runtime", "src\Flowsharp.Runtime\Flowsharp.Runtime.csproj", "{3C1DCAA2-D77E-4F96-9899-DA8E0E0C757F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Runtime.Abstractions", "src\Flowsharp.Runtime.Abstractions\Flowsharp.Runtime.Abstractions.csproj", "{792362BF-D26D-46E9-8970-E5668941AA75}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Runtime.Abstractions", "src\Flowsharp.Runtime.Abstractions\Flowsharp.Runtime.Abstractions.csproj", "{792362BF-D26D-46E9-8970-E5668941AA75}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Web.Dashboard", "src\Flowsharp.Web.Dashboard\Flowsharp.Web.Dashboard.csproj", "{11836D0B-9EFF-4C84-A075-90DCB4B48EB6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Web.Dashboard", "src\Flowsharp.Web.Dashboard\Flowsharp.Web.Dashboard.csproj", "{11836D0B-9EFF-4C84-A075-90DCB4B48EB6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowsharp.Web.Components", "src\Flowsharp.Web.Components\Flowsharp.Web.Components.csproj", "{61F479BD-6DE3-4E2F-A980-80EC121E159B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowsharp.Web.Components", "src\Flowsharp.Web.Components\Flowsharp.Web.Components.csproj", "{61F479BD-6DE3-4E2F-A980-80EC121E159B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{35F44BE9-13D0-417C-A01A-F0787BEE6DC3}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{B33F1927-FF0A-4826-80C6-F480E9C43892}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{D15B5282-5CBE-4DFB-AF3B-F4B28CFA55AB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -77,18 +83,21 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {300EE2D5-54C5-46F2-AD03-BB43589EA074} = {35F44BE9-13D0-417C-A01A-F0787BEE6DC3} + {48EDB976-3227-4DFD-BBB3-3BC9AEA19A88} = {D15B5282-5CBE-4DFB-AF3B-F4B28CFA55AB} + {3130C574-557C-4DA2-933E-AED7A9EBE48A} = {35F44BE9-13D0-417C-A01A-F0787BEE6DC3} + {A5829896-89C5-4C4E-ADC7-C806C8077316} = {35F44BE9-13D0-417C-A01A-F0787BEE6DC3} + {E93A1A6B-708F-4DCC-A399-1B8EC7682F92} = {35F44BE9-13D0-417C-A01A-F0787BEE6DC3} + {3C1DCAA2-D77E-4F96-9899-DA8E0E0C757F} = {35F44BE9-13D0-417C-A01A-F0787BEE6DC3} + {792362BF-D26D-46E9-8970-E5668941AA75} = {35F44BE9-13D0-417C-A01A-F0787BEE6DC3} + {11836D0B-9EFF-4C84-A075-90DCB4B48EB6} = {B33F1927-FF0A-4826-80C6-F480E9C43892} + {61F479BD-6DE3-4E2F-A980-80EC121E159B} = {B33F1927-FF0A-4826-80C6-F480E9C43892} + {35F44BE9-13D0-417C-A01A-F0787BEE6DC3} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} + {B33F1927-FF0A-4826-80C6-F480E9C43892} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} + {D15B5282-5CBE-4DFB-AF3B-F4B28CFA55AB} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8B0975FD-7050-48B0-88C5-48C33378E158} EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {300EE2D5-54C5-46F2-AD03-BB43589EA074} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} - {48EDB976-3227-4DFD-BBB3-3BC9AEA19A88} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} - {3130C574-557C-4DA2-933E-AED7A9EBE48A} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} - {A5829896-89C5-4C4E-ADC7-C806C8077316} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} - {E93A1A6B-708F-4DCC-A399-1B8EC7682F92} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} - {3C1DCAA2-D77E-4F96-9899-DA8E0E0C757F} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} - {792362BF-D26D-46E9-8970-E5668941AA75} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} - {11836D0B-9EFF-4C84-A075-90DCB4B48EB6} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} - {61F479BD-6DE3-4E2F-A980-80EC121E159B} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} - EndGlobalSection EndGlobal diff --git a/src/Flowsharp.Web.Components/Areas/MyFeature/Pages/Page1.cshtml b/src/Flowsharp.Web.Components/Areas/MyFeature/Pages/Page1.cshtml deleted file mode 100644 index f154c9984..000000000 --- a/src/Flowsharp.Web.Components/Areas/MyFeature/Pages/Page1.cshtml +++ /dev/null @@ -1 +0,0 @@ -

Hello Razor Lib Pages!

\ No newline at end of file diff --git a/src/Flowsharp.Web.Components/Flowsharp.Web.Components.csproj b/src/Flowsharp.Web.Components/Flowsharp.Web.Components.csproj index 8dfc329c3..bdebe1f63 100644 --- a/src/Flowsharp.Web.Components/Flowsharp.Web.Components.csproj +++ b/src/Flowsharp.Web.Components/Flowsharp.Web.Components.csproj @@ -5,6 +5,17 @@ - + + + + + + $(IncludeRazorContentInPack) + + + + + + diff --git a/src/Flowsharp.Web.Components/ViewComponents/WorkflowEditor.cs b/src/Flowsharp.Web.Components/ViewComponents/WorkflowEditor.cs new file mode 100644 index 000000000..a867c0017 --- /dev/null +++ b/src/Flowsharp.Web.Components/ViewComponents/WorkflowEditor.cs @@ -0,0 +1,14 @@ +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; + +namespace Flowsharp.Web.Components.ViewComponents +{ + public class WorkflowEditor : ViewComponent + { + public async Task InvokeAsync(CancellationToken cancellationToken) + { + return View(); + } + } +} \ No newline at end of file diff --git a/src/Flowsharp.Web.Components/Views/Index1.cshtml b/src/Flowsharp.Web.Components/Views/Index1.cshtml new file mode 100644 index 000000000..2f3ec8925 --- /dev/null +++ b/src/Flowsharp.Web.Components/Views/Index1.cshtml @@ -0,0 +1,6 @@ +@page +@model Index1Model +@{ +} + +

Hello Razor Class Library Pages!

\ No newline at end of file diff --git a/src/Flowsharp.Web.Components/Areas/MyFeature/Pages/Page1.cshtml.cs b/src/Flowsharp.Web.Components/Views/Index1.cshtml.cs similarity index 67% rename from src/Flowsharp.Web.Components/Areas/MyFeature/Pages/Page1.cshtml.cs rename to src/Flowsharp.Web.Components/Views/Index1.cshtml.cs index 72e0a31c5..b73d28d47 100644 --- a/src/Flowsharp.Web.Components/Areas/MyFeature/Pages/Page1.cshtml.cs +++ b/src/Flowsharp.Web.Components/Views/Index1.cshtml.cs @@ -1,13 +1,13 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -namespace Flowsharp.Web.Components.MyFeature.Pages +namespace Flowsharp.Web.Components.Pages { - public class Page1Model : PageModel + public class Index1Model : PageModel { public void OnGet() { diff --git a/src/Flowsharp.Web.Components/Views/Shared/Components/WorkflowEditor/Default.cshtml b/src/Flowsharp.Web.Components/Views/Shared/Components/WorkflowEditor/Default.cshtml new file mode 100644 index 000000000..62fbdb2d5 --- /dev/null +++ b/src/Flowsharp.Web.Components/Views/Shared/Components/WorkflowEditor/Default.cshtml @@ -0,0 +1,5 @@ +@model dynamic + +
+ Workflow editor +
\ No newline at end of file diff --git a/src/Flowsharp.Web.Components/Views/_ViewImports.cshtml b/src/Flowsharp.Web.Components/Views/_ViewImports.cshtml new file mode 100644 index 000000000..b1585dfdd --- /dev/null +++ b/src/Flowsharp.Web.Components/Views/_ViewImports.cshtml @@ -0,0 +1,2 @@ +@namespace Flowsharp.Web.Components.Pages +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers \ No newline at end of file diff --git a/src/Flowsharp.Web.Dashboard/Flowsharp.Web.Dashboard.csproj b/src/Flowsharp.Web.Dashboard/Flowsharp.Web.Dashboard.csproj index 8bfedf7d7..57788f250 100644 --- a/src/Flowsharp.Web.Dashboard/Flowsharp.Web.Dashboard.csproj +++ b/src/Flowsharp.Web.Dashboard/Flowsharp.Web.Dashboard.csproj @@ -10,7 +10,6 @@ - diff --git a/src/Flowsharp.Web.Dashboard/Pages/Index.cshtml b/src/Flowsharp.Web.Dashboard/Pages/Index.cshtml index cb86d8354..a84457106 100644 --- a/src/Flowsharp.Web.Dashboard/Pages/Index.cshtml +++ b/src/Flowsharp.Web.Dashboard/Pages/Index.cshtml @@ -5,4 +5,4 @@ }

Index

-@* @Component.InvokeAsync("WorkflowEditor") *@ \ No newline at end of file +@await Component.InvokeAsync("WorkflowEditor") \ No newline at end of file diff --git a/src/Flowsharp.Web.Dashboard/Startup.cs b/src/Flowsharp.Web.Dashboard/Startup.cs index d929fba65..3463e3ae4 100644 --- a/src/Flowsharp.Web.Dashboard/Startup.cs +++ b/src/Flowsharp.Web.Dashboard/Startup.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.DependencyInjection; namespace Flowsharp.Web.Dashboard @@ -9,7 +10,7 @@ namespace Flowsharp.Web.Dashboard { public void ConfigureServices(IServiceCollection services) { - services.AddMvc(); + services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1); } public void Configure(IApplicationBuilder app, IHostingEnvironment env) @@ -19,6 +20,9 @@ namespace Flowsharp.Web.Dashboard app.UseDeveloperExceptionPage(); } + app.UseHttpsRedirection(); + app.UseStaticFiles(); + app.UseCookiePolicy(); app.UseMvc(); } }