Arrange namespaces

utils/client-simulation/Volo.ClientSimulation.sln

@@ -11,6 +11,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{61863D05-6
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.ClientSimulation.Demo", "demo\Volo.ClientSimulation.Demo\Volo.ClientSimulation.Demo.csproj", "{B5BFE88A-60B6-4289-969A-1A72BF6DFDF0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.ClientSimulation.Web", "src\Volo.ClientSimulation.Web\Volo.ClientSimulation.Web.csproj", "{1888142B-23AE-45C5-8AE8-43920066D8D8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,6 +27,10 @@ Global
 		{B5BFE88A-60B6-4289-969A-1A72BF6DFDF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B5BFE88A-60B6-4289-969A-1A72BF6DFDF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B5BFE88A-60B6-4289-969A-1A72BF6DFDF0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1888142B-23AE-45C5-8AE8-43920066D8D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1888142B-23AE-45C5-8AE8-43920066D8D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1888142B-23AE-45C5-8AE8-43920066D8D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1888142B-23AE-45C5-8AE8-43920066D8D8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -32,6 +38,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{BB780A98-727D-49CF-9A4C-91E6EA7047AD} = {42503D63-D292-4A18-8ECE-8270167DD842}
 		{B5BFE88A-60B6-4289-969A-1A72BF6DFDF0} = {61863D05-6DA0-4730-9A38-77D1AE304268}
+		{1888142B-23AE-45C5-8AE8-43920066D8D8} = {42503D63-D292-4A18-8ECE-8270167DD842}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1AF598E1-2012-47B4-A591-ADC9F327600A}

utils/client-simulation/demo/Volo.ClientSimulation.Demo/ClientSimulationWebModule.cs → utils/client-simulation/demo/Volo.ClientSimulation.Demo/ClientSimulationDemoModule.cs

@@ -11,15 +11,14 @@ namespace Volo.ClientSimulation.Demo
     [DependsOn(
         typeof(AbpAspNetCoreMvcUiBasicThemeModule),
         typeof(AbpAutofacModule),
-        typeof(ClientSimulationModule)
+        typeof(ClientSimulationWebModule)
         )]
-    public class ClientSimulationWebModule : AbpModule
+    public class ClientSimulationDemoModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             Configure<ClientSimulationOptions>(options =>
             {
-                //TODO: Temporary add a DemoScenario
                 options.Scenarios.Add(
                     new ScenarioConfiguration(
                         typeof(DemoScenario),

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

@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace Volo.ClientSimulation.Demo.Controllers
+{
+    public class HomeController : AbpController
+    {
+        public RedirectToPageResult Index()
+        {
+            return RedirectToPage("/ClientSimulation/Index");
+        }
+    }
+}

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

@@ -3,13 +3,13 @@
 @model Volo.ClientSimulation.Demo.Pages.IndexModel
 @section styles {
     <abp-style-bundle>
-        <abp-style src="/Pages/SimulationArea.css" />
+        <abp-style src="/Pages/ClientSimulation/SimulationArea.css" />
     </abp-style-bundle>
 }
 @section scripts {
     <abp-script-bundle>
-        <abp-script src="/Pages/SimulationArea.js" />
+        <abp-script src="/Pages/ClientSimulation/SimulationArea.js" />
-        <abp-script src="/Pages/Index.js" />
+        <abp-script src="/Pages/ClientSimulation/Index.js" />
     </abp-script-bundle>
 }
 <div id="SimulationArea"></div>

utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/SimulationArea.js → utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.js

@@ -4,7 +4,7 @@
     var $mainContainer = null;
 
     function refreshSimulationArea() {
-        $.get('/SimulationArea')
+        $.get('/ClientSimulation/SimulationArea')
             .done(function(result) {
                 $mainContainer.html(result);
             })

utils/client-simulation/demo/Volo.ClientSimulation.Demo/Startup.cs

@@ -9,7 +9,7 @@ namespace Volo.ClientSimulation.Demo
     {
         public IServiceProvider ConfigureServices(IServiceCollection services)
         {
-            services.AddApplication<ClientSimulationWebModule>(options =>
+            services.AddApplication<ClientSimulationDemoModule>(options =>
             {
                 options.UseAutofac();
             });

utils/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj

@@ -14,7 +14,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
-    <ProjectReference Include="..\..\src\Volo.ClientSimulation\Volo.ClientSimulation.csproj" />
+    <ProjectReference Include="..\..\src\Volo.ClientSimulation.Web\Volo.ClientSimulation.Web.csproj" />
   </ItemGroup>
 
   <ItemGroup>

utils/client-simulation/demo/Volo.ClientSimulation.Demo/compilerconfig.json

@@ -1,6 +1,6 @@
 [
   {
-    "outputFile": "Pages/SimulationArea.css",
+    "outputFile": "Pages/ClientSimulation/SimulationArea.css",
-    "inputFile": "Pages/SimulationArea.scss"
+    "inputFile": "Pages/ClientSimulation/SimulationArea.scss"
   }
 ]

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

@@ -0,0 +1,14 @@
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
+using Volo.Abp.Modularity;
+
+namespace Volo.ClientSimulation
+{
+    [DependsOn(
+        typeof(ClientSimulationModule),
+        typeof(AbpAspNetCoreMvcUiThemeSharedModule)
+        )]
+    public class ClientSimulationWebModule : AbpModule
+    {
+
+    }
+}

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

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <RootNamespace>Volo.ClientSimulation</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Volo.ClientSimulation\Volo.ClientSimulation.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
+  </ItemGroup>
+
+</Project>