Move simulation UI to Volo.ClientSimulation.Web project

utils/client-simulation/demo/Volo.ClientSimulation.Demo/Controllers/HomeController.cs

@@ -5,9 +5,9 @@ namespace Volo.ClientSimulation.Demo.Controllers
 {
     public class HomeController : AbpController
     {
-        public RedirectToPageResult Index()
+        public ActionResult Index()
         {
-            return RedirectToPage("/ClientSimulation/Index");
+            return Redirect("/ClientSimulation");
         }
     }
 }

utils/client-simulation/src/Volo.ClientSimulation.Web/ClientSimulationWebModule.cs

@@ -1,5 +1,6 @@
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.Modularity;
+using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.ClientSimulation
 {
@@ -9,6 +10,12 @@ namespace Volo.ClientSimulation
         )]
     public class ClientSimulationWebModule : AbpModule
     {
-
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<VirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<ClientSimulationWebModule>("Volo.ClientSimulation");
+            });
+        }
     }
 }

utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.cshtml → utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml

@@ -1,6 +1,6 @@
 @page
-@using Volo.ClientSimulation.Demo.Pages
+@using Volo.ClientSimulation.Pages.ClientSimulation
-@model Volo.ClientSimulation.Demo.Pages.IndexModel
+@model Volo.ClientSimulation.Pages.ClientSimulation.IndexModel
 @section styles {
     <abp-style-bundle>
         <abp-style src="/Pages/ClientSimulation/SimulationArea.css" />

utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.cshtml.cs → utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Volo.ClientSimulation.Demo.Pages
+namespace Volo.ClientSimulation.Pages.ClientSimulation
 {
     public class IndexModel : PageModel
     {

utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.cshtml → utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml

@@ -4,8 +4,8 @@
 }
 @using Volo.ClientSimulation
 @using Volo.ClientSimulation.Clients
-@using Volo.ClientSimulation.Demo.Pages
+@using Volo.ClientSimulation.Pages.ClientSimulation
-@model Volo.ClientSimulation.Demo.Pages.SimulationAreaModel
+@model Volo.ClientSimulation.Pages.ClientSimulation.SimulationAreaModel
 <abp-alert alert-type="Primary">
     <form class="d-inline" id="StartButtonForm" method="post" asp-page-handler="Start" data-ajaxForm="true">
         <abp-button button-type="Primary" type="submit" disabled="@(Model.Simulation.State != SimulationState.Stopped)">Start</abp-button>

utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.cshtml.cs → utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs

@@ -2,7 +2,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Volo.ClientSimulation.Demo.Pages
+namespace Volo.ClientSimulation.Pages.ClientSimulation
 {
     public class SimulationAreaModel : PageModel
     {

utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/_ViewImports.cshtml

@@ -0,0 +1,4 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling

utils/client-simulation/src/Volo.ClientSimulation.Web/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:51023/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Volo.ClientSimulation.Web": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:51024/"
+    }
+  }
+}

utils/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.csproj

@@ -1,7 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
+    <IsPackable>true</IsPackable>
+    <OutputType>Library</OutputType>
     <RootNamespace>Volo.ClientSimulation</RootNamespace>
   </PropertyGroup>
 
@@ -13,4 +16,17 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\**\*.*" Exclude="*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Remove="Pages\**\*.cshtml" />
+    <Content Remove="Pages\**\*.js" />
+    <Content Remove="Pages\**\*.css" />
+    <Content Remove="Pages\**\*.scss" />
+    <Content Remove="Properties\launchSettings.json" />
+    <None Include="Properties\launchSettings.json" />
+  </ItemGroup>
+
 </Project>