From 39b4137a53ba44d593d3cffdd36147964941fc6c Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Fri, 13 Nov 2020 22:37:53 +0100 Subject: [PATCH] Rename shared Blazor project to Application --- Samples.sln | 27 ++++++++++++++++++ .../Results/RedirectResult.cs | 5 +++- .../blazor/ElsaDashboard.Blazor.sln | 14 ++++----- .../{Shared => Application}/App.razor | 2 +- .../ClientApp/.gitignore | 0 .../ClientApp/.vscode/extensions.json | 0 .../ClientApp/README.md | 0 .../ClientApp/package-lock.json | 0 .../ClientApp/package.json | 0 .../ClientApp/postcss.config.js | 0 .../ClientApp/posthtml.json | 0 .../ClientApp/public/activity.html | 0 .../ClientApp/public/favicon-16x16.png | Bin .../ClientApp/public/favicon-32x32.png | Bin .../ClientApp/public/favicon.ico | Bin .../ClientApp/public/index.html | 0 .../ClientApp/public/tailwind.css | 0 .../ClientApp/public/tile.png | Bin .../ClientApp/public/workflow-designer.html | 0 .../ClientApp/public/workflow-instances.html | 0 .../ClientApp/public/workflows.html | 0 .../ClientApp/sandbox.config.json | 0 .../ClientApp/src/index.html | 0 .../ClientApp/src/partials/activity.html | 0 .../ClientApp/src/partials/flyoutpanel.html | 0 .../ClientApp/src/partials/layout.html | 0 .../ClientApp/src/partials/navmenu.html | 0 .../ClientApp/src/tailwind.css | 0 .../ClientApp/src/tile.png | Bin .../ClientApp/src/workflow-designer.html | 0 .../ClientApp/src/workflow-instances.html | 0 .../ClientApp/src/workflows.html | 0 .../ClientApp/tailwind.config.js | 0 .../ElsaDashboard.Blazor.Application.csproj | 24 ++++++++++++++++ .../Extensions/ServiceCollectionExtensions.cs | 2 +- .../Models/MenuItem.cs | 2 +- .../Pages/Designer/Activity.razor | 0 .../Pages/Designer/Activity.razor.cs | 2 +- .../Pages/Designer/Designer.razor | 0 .../Pages/Designer/Designer.razor.cs | 7 ++--- .../{Shared => Application}/Pages/Index.razor | 0 .../Pages/Workflows.razor | 0 .../Rpc/IWorkflowDefinitionService.cs | 4 +-- .../Services/FlyoutPanelService.cs | 4 +-- .../Services/IFlyoutPanelService.cs | 2 +- .../Shared/FlyoutPanel.razor | 0 .../Shared/MainLayout.razor | 0 .../Shared/MainLayout.razor.css | 0 .../Shared/NavMenu.razor | 0 .../Shared/NavMenu.razor.cs | 4 +-- .../{Shared => Application}/_Imports.razor | 3 +- .../ElsaDashboard.Blazor.WebAssembly.csproj | 2 +- .../ElsaDashboard.Blazor/Client/Program.cs | 10 +++---- .../Server/ElsaDashboard.Blazor.Server.csproj | 2 +- .../Server/Pages/_Host.cshtml | 16 +++-------- .../ElsaDashboard.Blazor/Server/Program.cs | 4 +-- .../Server/_Imports.razor | 2 +- .../ElsaDashboard.Blazor/Shared/Class1.cs | 7 ----- .../Shared/ElsaDashboard.Blazor.Shared.csproj | 27 ------------------ 59 files changed, 90 insertions(+), 82 deletions(-) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/App.razor (85%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/.gitignore (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/.vscode/extensions.json (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/README.md (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/package-lock.json (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/package.json (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/postcss.config.js (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/posthtml.json (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/public/activity.html (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/public/favicon-16x16.png (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/public/favicon-32x32.png (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/public/favicon.ico (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/public/index.html (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/public/tailwind.css (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/public/tile.png (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/public/workflow-designer.html (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/public/workflow-instances.html (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/public/workflows.html (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/sandbox.config.json (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/src/index.html (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/src/partials/activity.html (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/src/partials/flyoutpanel.html (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/src/partials/layout.html (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/src/partials/navmenu.html (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/src/tailwind.css (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/src/tile.png (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/src/workflow-designer.html (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/src/workflow-instances.html (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/src/workflows.html (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/ClientApp/tailwind.config.js (100%) create mode 100644 src/dashboards/blazor/ElsaDashboard.Blazor/Application/ElsaDashboard.Blazor.Application.csproj rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Extensions/ServiceCollectionExtensions.cs (87%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Models/MenuItem.cs (86%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Pages/Designer/Activity.razor (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Pages/Designer/Activity.razor.cs (78%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Pages/Designer/Designer.razor (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Pages/Designer/Designer.razor.cs (86%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Pages/Index.razor (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Pages/Workflows.razor (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Rpc/IWorkflowDefinitionService.cs (69%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Services/FlyoutPanelService.cs (88%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Services/IFlyoutPanelService.cs (74%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Shared/FlyoutPanel.razor (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Shared/MainLayout.razor (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Shared/MainLayout.razor.css (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Shared/NavMenu.razor (100%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/Shared/NavMenu.razor.cs (85%) rename src/dashboards/blazor/ElsaDashboard.Blazor/{Shared => Application}/_Imports.razor (74%) delete mode 100644 src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Class1.cs delete mode 100644 src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ElsaDashboard.Blazor.Shared.csproj diff --git a/Samples.sln b/Samples.sln index c656172ca..18ebb63a4 100644 --- a/Samples.sln +++ b/Samples.sln @@ -120,6 +120,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "clients", "clients", "{E43F EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Client", "src\clients\Elsa.Client\Elsa.Client.csproj", "{2DA042D6-1E3C-4B15-B48E-BF45426C74E1}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dashboards", "dashboards", "{5583B236-794A-422C-B306-52BB7DFE7EBE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "blazor", "blazor", "{5837821B-CA71-40B6-A9F1-C25D318B4691}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaDashboard.Blazor.WebAssembly", "src\dashboards\blazor\ElsaDashboard.Blazor\Client\ElsaDashboard.Blazor.WebAssembly.csproj", "{D7992973-A251-427A-8BF1-4D5F767A4A77}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaDashboard.Blazor.Server", "src\dashboards\blazor\ElsaDashboard.Blazor\Server\ElsaDashboard.Blazor.Server.csproj", "{5B147B88-965C-4286-926B-333B0F0FFB12}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaDashboard.Blazor.Application", "src\dashboards\blazor\ElsaDashboard.Blazor\Application\ElsaDashboard.Blazor.Application.csproj", "{B14D02C7-9832-4B50-9031-66683601C156}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -291,6 +301,18 @@ Global {2DA042D6-1E3C-4B15-B48E-BF45426C74E1}.Debug|Any CPU.Build.0 = Debug|Any CPU {2DA042D6-1E3C-4B15-B48E-BF45426C74E1}.Release|Any CPU.ActiveCfg = Release|Any CPU {2DA042D6-1E3C-4B15-B48E-BF45426C74E1}.Release|Any CPU.Build.0 = Release|Any CPU + {D7992973-A251-427A-8BF1-4D5F767A4A77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D7992973-A251-427A-8BF1-4D5F767A4A77}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D7992973-A251-427A-8BF1-4D5F767A4A77}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D7992973-A251-427A-8BF1-4D5F767A4A77}.Release|Any CPU.Build.0 = Release|Any CPU + {5B147B88-965C-4286-926B-333B0F0FFB12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5B147B88-965C-4286-926B-333B0F0FFB12}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5B147B88-965C-4286-926B-333B0F0FFB12}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5B147B88-965C-4286-926B-333B0F0FFB12}.Release|Any CPU.Build.0 = Release|Any CPU + {B14D02C7-9832-4B50-9031-66683601C156}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B14D02C7-9832-4B50-9031-66683601C156}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B14D02C7-9832-4B50-9031-66683601C156}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B14D02C7-9832-4B50-9031-66683601C156}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -347,6 +369,11 @@ Global {3529F81C-9256-4C24-A1E6-ADC27093AB49} = {5E5E1E84-DDBC-40D6-B891-0D563A15A44A} {E43FB9E7-7851-4880-B7EE-12B8CEE628D0} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} {2DA042D6-1E3C-4B15-B48E-BF45426C74E1} = {E43FB9E7-7851-4880-B7EE-12B8CEE628D0} + {5583B236-794A-422C-B306-52BB7DFE7EBE} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925} + {5837821B-CA71-40B6-A9F1-C25D318B4691} = {5583B236-794A-422C-B306-52BB7DFE7EBE} + {D7992973-A251-427A-8BF1-4D5F767A4A77} = {5837821B-CA71-40B6-A9F1-C25D318B4691} + {5B147B88-965C-4286-926B-333B0F0FFB12} = {5837821B-CA71-40B6-A9F1-C25D318B4691} + {B14D02C7-9832-4B50-9031-66683601C156} = {5837821B-CA71-40B6-A9F1-C25D318B4691} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8B0975FD-7050-48B0-88C5-48C33378E158} diff --git a/src/activities/Elsa.Activities.Http/Results/RedirectResult.cs b/src/activities/Elsa.Activities.Http/Results/RedirectResult.cs index 6b29917cb..024441b91 100644 --- a/src/activities/Elsa.Activities.Http/Results/RedirectResult.cs +++ b/src/activities/Elsa.Activities.Http/Results/RedirectResult.cs @@ -21,7 +21,10 @@ namespace Elsa.Activities.Http.Results protected override void Execute(ActivityExecutionContext activityExecutionContext) { - var response = _httpContextAccessor.HttpContext.Response; + var httpContext = _httpContextAccessor.HttpContext; + var response = httpContext.Response; + + httpContext.Items[WorkflowHttpResult.Instance] = WorkflowHttpResult.Instance; response.Redirect(Location.ToString(), Permanent); } } diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor.sln b/src/dashboards/blazor/ElsaDashboard.Blazor.sln index d8d45f5b5..1932693ac 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor.sln +++ b/src/dashboards/blazor/ElsaDashboard.Blazor.sln @@ -5,24 +5,20 @@ VisualStudioVersion = 16.0.30615.102 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{963AE286-A579-4299-8A06-926346EABCCD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaDashboard.Blazor.Shared", "ElsaDashboard.Blazor\Shared\ElsaDashboard.Blazor.Shared.csproj", "{B39719A2-6C4C-48A0-89EC-EA573C22D246}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaDashboard.Blazor.WebAssembly", "ElsaDashboard.Blazor\Client\ElsaDashboard.Blazor.WebAssembly.csproj", "{72105B63-D94C-4216-A648-CB1F4AAD7426}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaDashboard.Blazor.Server", "ElsaDashboard.Blazor\Server\ElsaDashboard.Blazor.Server.csproj", "{522BA06A-56E3-41D7-9548-9653FF2BC9F2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{7F1D88F0-7AA2-47F3-AACB-387BCDCFE63B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaDashboard.Blazor.Application", "ElsaDashboard.Blazor\Application\ElsaDashboard.Blazor.Application.csproj", "{FD666570-D8F4-41B6-8FCD-C5988B6E16CD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B39719A2-6C4C-48A0-89EC-EA573C22D246}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B39719A2-6C4C-48A0-89EC-EA573C22D246}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B39719A2-6C4C-48A0-89EC-EA573C22D246}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B39719A2-6C4C-48A0-89EC-EA573C22D246}.Release|Any CPU.Build.0 = Release|Any CPU {72105B63-D94C-4216-A648-CB1F4AAD7426}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {72105B63-D94C-4216-A648-CB1F4AAD7426}.Debug|Any CPU.Build.0 = Debug|Any CPU {72105B63-D94C-4216-A648-CB1F4AAD7426}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -31,6 +27,10 @@ Global {522BA06A-56E3-41D7-9548-9653FF2BC9F2}.Debug|Any CPU.Build.0 = Debug|Any CPU {522BA06A-56E3-41D7-9548-9653FF2BC9F2}.Release|Any CPU.ActiveCfg = Release|Any CPU {522BA06A-56E3-41D7-9548-9653FF2BC9F2}.Release|Any CPU.Build.0 = Release|Any CPU + {FD666570-D8F4-41B6-8FCD-C5988B6E16CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FD666570-D8F4-41B6-8FCD-C5988B6E16CD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FD666570-D8F4-41B6-8FCD-C5988B6E16CD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FD666570-D8F4-41B6-8FCD-C5988B6E16CD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -40,8 +40,8 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {7F1D88F0-7AA2-47F3-AACB-387BCDCFE63B} = {963AE286-A579-4299-8A06-926346EABCCD} - {B39719A2-6C4C-48A0-89EC-EA573C22D246} = {963AE286-A579-4299-8A06-926346EABCCD} {522BA06A-56E3-41D7-9548-9653FF2BC9F2} = {963AE286-A579-4299-8A06-926346EABCCD} {72105B63-D94C-4216-A648-CB1F4AAD7426} = {963AE286-A579-4299-8A06-926346EABCCD} + {FD666570-D8F4-41B6-8FCD-C5988B6E16CD} = {963AE286-A579-4299-8A06-926346EABCCD} EndGlobalSection EndGlobal diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/App.razor b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/App.razor similarity index 85% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/App.razor rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/App.razor index a0d35f78c..1dd72e7c1 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/App.razor +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/App.razor @@ -1,4 +1,4 @@ - + diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/.gitignore b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/.gitignore similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/.gitignore rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/.gitignore diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/.vscode/extensions.json b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/.vscode/extensions.json similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/.vscode/extensions.json rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/.vscode/extensions.json diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/README.md b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/README.md similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/README.md rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/README.md diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/package-lock.json b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/package-lock.json similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/package-lock.json rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/package-lock.json diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/package.json b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/package.json similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/package.json rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/package.json diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/postcss.config.js b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/postcss.config.js similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/postcss.config.js rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/postcss.config.js diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/posthtml.json b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/posthtml.json similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/posthtml.json rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/posthtml.json diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/activity.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/activity.html similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/activity.html rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/activity.html diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/favicon-16x16.png b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/favicon-16x16.png similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/favicon-16x16.png rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/favicon-16x16.png diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/favicon-32x32.png b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/favicon-32x32.png similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/favicon-32x32.png rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/favicon-32x32.png diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/favicon.ico b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/favicon.ico similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/favicon.ico rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/favicon.ico diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/index.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/index.html similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/index.html rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/index.html diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/tailwind.css b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/tailwind.css similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/tailwind.css rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/tailwind.css diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/tile.png b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/tile.png similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/tile.png rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/tile.png diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/workflow-designer.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/workflow-designer.html similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/workflow-designer.html rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/workflow-designer.html diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/workflow-instances.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/workflow-instances.html similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/workflow-instances.html rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/workflow-instances.html diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/workflows.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/workflows.html similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/public/workflows.html rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/public/workflows.html diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/sandbox.config.json b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/sandbox.config.json similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/sandbox.config.json rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/sandbox.config.json diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/index.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/index.html similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/index.html rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/index.html diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/partials/activity.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/partials/activity.html similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/partials/activity.html rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/partials/activity.html diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/partials/flyoutpanel.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/partials/flyoutpanel.html similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/partials/flyoutpanel.html rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/partials/flyoutpanel.html diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/partials/layout.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/partials/layout.html similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/partials/layout.html rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/partials/layout.html diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/partials/navmenu.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/partials/navmenu.html similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/partials/navmenu.html rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/partials/navmenu.html diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/tailwind.css b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/tailwind.css similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/tailwind.css rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/tailwind.css diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/tile.png b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/tile.png similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/tile.png rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/tile.png diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/workflow-designer.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/workflow-designer.html similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/workflow-designer.html rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/workflow-designer.html diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/workflow-instances.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/workflow-instances.html similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/workflow-instances.html rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/workflow-instances.html diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/workflows.html b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/workflows.html similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/src/workflows.html rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/src/workflows.html diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/tailwind.config.js b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/tailwind.config.js similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ClientApp/tailwind.config.js rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/ClientApp/tailwind.config.js diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ElsaDashboard.Blazor.Application.csproj b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ElsaDashboard.Blazor.Application.csproj new file mode 100644 index 000000000..b08c4ecfc --- /dev/null +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/ElsaDashboard.Blazor.Application.csproj @@ -0,0 +1,24 @@ + + + + net5.0 + latest + + + + + + + + + + + + + + + + + + + diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Extensions/ServiceCollectionExtensions.cs b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Extensions/ServiceCollectionExtensions.cs similarity index 87% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Extensions/ServiceCollectionExtensions.cs rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Extensions/ServiceCollectionExtensions.cs index a1b51d30b..e47dc25c6 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Extensions/ServiceCollectionExtensions.cs +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Extensions/ServiceCollectionExtensions.cs @@ -1,4 +1,4 @@ -using ElsaDashboard.Blazor.Shared.Services; +using ElsaDashboard.Blazor.Application.Services; // ReSharper disable once CheckNamespace namespace Microsoft.Extensions.DependencyInjection diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Models/MenuItem.cs b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Models/MenuItem.cs similarity index 86% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Models/MenuItem.cs rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Models/MenuItem.cs index b1da9083e..9750735a5 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Models/MenuItem.cs +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Models/MenuItem.cs @@ -1,4 +1,4 @@ -namespace ElsaDashboard.Blazor.Shared.Models +namespace ElsaDashboard.Blazor.Application.Models { public class MenuItem { diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Pages/Designer/Activity.razor b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Activity.razor similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Pages/Designer/Activity.razor rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Activity.razor diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Pages/Designer/Activity.razor.cs b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Activity.razor.cs similarity index 78% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Pages/Designer/Activity.razor.cs rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Activity.razor.cs index 990bc2719..7f61de120 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Pages/Designer/Activity.razor.cs +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Activity.razor.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; -namespace ElsaDashboard.Blazor.Shared.Pages.Designer +namespace ElsaDashboard.Blazor.Application.Pages.Designer { partial class Activity { diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Pages/Designer/Designer.razor b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Designer.razor similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Pages/Designer/Designer.razor rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Designer.razor diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Pages/Designer/Designer.razor.cs b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Designer.razor.cs similarity index 86% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Pages/Designer/Designer.razor.cs rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Designer.razor.cs index e486a1e02..7179700f8 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Pages/Designer/Designer.razor.cs +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Designer.razor.cs @@ -1,11 +1,10 @@ -using System; -using System.Threading.Tasks; -using ElsaDashboard.Blazor.Shared.Services; +using System.Threading.Tasks; +using ElsaDashboard.Blazor.Application.Services; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; using Microsoft.JSInterop; -namespace ElsaDashboard.Blazor.Shared.Pages.Designer +namespace ElsaDashboard.Blazor.Application.Pages.Designer { partial class Designer { diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Pages/Index.razor b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Index.razor similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Pages/Index.razor rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Index.razor diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Pages/Workflows.razor b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Workflows.razor similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Pages/Workflows.razor rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Workflows.razor diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Rpc/IWorkflowDefinitionService.cs b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Rpc/IWorkflowDefinitionService.cs similarity index 69% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Rpc/IWorkflowDefinitionService.cs rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Rpc/IWorkflowDefinitionService.cs index 939298bbb..f28e94e5c 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Rpc/IWorkflowDefinitionService.cs +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Rpc/IWorkflowDefinitionService.cs @@ -1,8 +1,6 @@ -using System.Collections.Generic; -using System.Threading.Tasks; using ProtoBuf; -namespace ElsaDashboard.Blazor.Shared.Rpc +namespace ElsaDashboard.Blazor.Application.Rpc { [ProtoContract] public interface IWorkflowDefinitionService diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Services/FlyoutPanelService.cs b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Services/FlyoutPanelService.cs similarity index 88% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Services/FlyoutPanelService.cs rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Services/FlyoutPanelService.cs index 65a1defd3..6199a1b2c 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Services/FlyoutPanelService.cs +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Services/FlyoutPanelService.cs @@ -2,7 +2,7 @@ using System.Threading.Tasks; using Microsoft.JSInterop; -namespace ElsaDashboard.Blazor.Shared.Services +namespace ElsaDashboard.Blazor.Application.Services { public class FlyoutPanelService : IFlyoutPanelService, IAsyncDisposable { @@ -34,7 +34,7 @@ namespace ElsaDashboard.Blazor.Shared.Services private async Task InitModuleAsync() { - _module = await _jsRuntime.InvokeAsync("import", "./_content/ElsaDashboard.Blazor.Shared/flyoutPanel.js"); + _module = await _jsRuntime.InvokeAsync("import", "./_content/ElsaDashboard.Blazor.Application/flyoutPanel.js"); } } } \ No newline at end of file diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Services/IFlyoutPanelService.cs b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Services/IFlyoutPanelService.cs similarity index 74% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Services/IFlyoutPanelService.cs rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Services/IFlyoutPanelService.cs index 3cb4c5758..0b4fd5cf0 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Services/IFlyoutPanelService.cs +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Services/IFlyoutPanelService.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace ElsaDashboard.Blazor.Shared.Services +namespace ElsaDashboard.Blazor.Application.Services { public interface IFlyoutPanelService { diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Shared/FlyoutPanel.razor b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/FlyoutPanel.razor similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Shared/FlyoutPanel.razor rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/FlyoutPanel.razor diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Shared/MainLayout.razor b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/MainLayout.razor similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Shared/MainLayout.razor rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/MainLayout.razor diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Shared/MainLayout.razor.css b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/MainLayout.razor.css similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Shared/MainLayout.razor.css rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/MainLayout.razor.css diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Shared/NavMenu.razor b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/NavMenu.razor similarity index 100% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Shared/NavMenu.razor rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/NavMenu.razor diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Shared/NavMenu.razor.cs b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/NavMenu.razor.cs similarity index 85% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Shared/NavMenu.razor.cs rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/NavMenu.razor.cs index 22cf6129d..b3cf27820 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Shared/NavMenu.razor.cs +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/NavMenu.razor.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using ElsaDashboard.Blazor.Shared.Models; +using ElsaDashboard.Blazor.Application.Models; -namespace ElsaDashboard.Blazor.Shared.Shared +namespace ElsaDashboard.Blazor.Application.Shared { partial class NavMenu { diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/_Imports.razor b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/_Imports.razor similarity index 74% rename from src/dashboards/blazor/ElsaDashboard.Blazor/Shared/_Imports.razor rename to src/dashboards/blazor/ElsaDashboard.Blazor/Application/_Imports.razor index cb84300f9..5cfe51cd6 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/_Imports.razor +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Application/_Imports.razor @@ -5,4 +5,5 @@ @using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using ElsaDashboard.Blazor.Shared.Shared +@using ElsaDashboard.Blazor.Application.Models +@using ElsaDashboard.Blazor.Application.Shared diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Client/ElsaDashboard.Blazor.WebAssembly.csproj b/src/dashboards/blazor/ElsaDashboard.Blazor/Client/ElsaDashboard.Blazor.WebAssembly.csproj index 06bc56af5..231769bc3 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Client/ElsaDashboard.Blazor.WebAssembly.csproj +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Client/ElsaDashboard.Blazor.WebAssembly.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Client/Program.cs b/src/dashboards/blazor/ElsaDashboard.Blazor/Client/Program.cs index 371b3561c..6039a6ac8 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Client/Program.cs +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Client/Program.cs @@ -3,7 +3,6 @@ using Microsoft.Extensions.DependencyInjection; using System; using System.Net.Http; using System.Threading.Tasks; -using ElsaDashboard.Blazor.Shared; namespace ElsaDashboard.Blazor.WebAssembly { @@ -12,13 +11,12 @@ namespace ElsaDashboard.Blazor.WebAssembly public static async Task Main(string[] args) { var builder = WebAssemblyHostBuilder.CreateDefault(args); - builder.RootComponents.Add("#app"); - - var services =builder.Services; - services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }); + var services = builder.Services; + + services.AddScoped(sp => new HttpClient {BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)}); services.AddElsaDashboard(); await builder.Build().RunAsync(); } } -} +} \ No newline at end of file diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Server/ElsaDashboard.Blazor.Server.csproj b/src/dashboards/blazor/ElsaDashboard.Blazor/Server/ElsaDashboard.Blazor.Server.csproj index 991bd0d8b..fd85172e6 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Server/ElsaDashboard.Blazor.Server.csproj +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Server/ElsaDashboard.Blazor.Server.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Server/Pages/_Host.cshtml b/src/dashboards/blazor/ElsaDashboard.Blazor/Server/Pages/_Host.cshtml index 7f3deb0e6..333acdeed 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Server/Pages/_Host.cshtml +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Server/Pages/_Host.cshtml @@ -1,5 +1,5 @@ @page "/" -@using ElsaDashboard.Blazor.Shared +@using ElsaDashboard.Blazor.Application @namespace ElsaDashboard.Blazor.Server.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @{ @@ -22,16 +22,8 @@ -@if (Program.UseBlazorServer) -{ - -} -else -{ -
- Loading... -
-} + +
@@ -52,6 +44,6 @@ else { } - + \ No newline at end of file diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Server/Program.cs b/src/dashboards/blazor/ElsaDashboard.Blazor/Server/Program.cs index abe426ce2..a61d1edba 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Server/Program.cs +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Server/Program.cs @@ -7,8 +7,8 @@ namespace ElsaDashboard.Blazor.Server { public class Program { - public static bool UseBlazorServer = false; - public static RenderMode RenderMode => UseBlazorServer ? RenderMode.Server: RenderMode.WebAssembly; + public static bool UseBlazorServer = true; + public static RenderMode RenderMode => UseBlazorServer ? RenderMode.ServerPrerendered: RenderMode.WebAssemblyPrerendered; private static Type StartupType => UseBlazorServer ? typeof(BlazorServerStartup) : typeof(BlazorWebAssemblyStartup); public static void Main(string[] args) diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Server/_Imports.razor b/src/dashboards/blazor/ElsaDashboard.Blazor/Server/_Imports.razor index cb84300f9..7ae847772 100644 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Server/_Imports.razor +++ b/src/dashboards/blazor/ElsaDashboard.Blazor/Server/_Imports.razor @@ -5,4 +5,4 @@ @using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using ElsaDashboard.Blazor.Shared.Shared +@using ElsaDashboard.Blazor.Application \ No newline at end of file diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Class1.cs b/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Class1.cs deleted file mode 100644 index 776a0a95b..000000000 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace ElsaDashboard.Blazor.Shared -{ - public class Class1 - { - - } -} \ No newline at end of file diff --git a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ElsaDashboard.Blazor.Shared.csproj b/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ElsaDashboard.Blazor.Shared.csproj deleted file mode 100644 index 69e007020..000000000 --- a/src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ElsaDashboard.Blazor.Shared.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - net5.0 - - - - - - - - - - - - - - - - - - - - - - -