From 768f701be8eb30606a596c924cda2bcf12467c0e Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Sun, 7 Apr 2019 00:14:46 +0300 Subject: [PATCH] Arrange namespaces --- .../client-simulation/Volo.ClientSimulation.sln | 7 +++++++ ...ebModule.cs => ClientSimulationDemoModule.cs} | 5 ++--- .../Controllers/HomeController.cs | 13 +++++++++++++ .../Pages/{ => ClientSimulation}/Index.cshtml | 6 +++--- .../Pages/{ => ClientSimulation}/Index.cshtml.cs | 0 .../Pages/{ => ClientSimulation}/Index.js | 0 .../{ => ClientSimulation}/SimulationArea.cshtml | 0 .../SimulationArea.cshtml.cs | 0 .../{ => ClientSimulation}/SimulationArea.css | 0 .../{ => ClientSimulation}/SimulationArea.js | 2 +- .../SimulationArea.min.css | 0 .../{ => ClientSimulation}/SimulationArea.scss | 0 .../demo/Volo.ClientSimulation.Demo/Startup.cs | 2 +- .../Volo.ClientSimulation.Demo.csproj | 2 +- .../compilerconfig.json | 4 ++-- .../ClientSimulationWebModule.cs | 14 ++++++++++++++ .../Volo.ClientSimulation.Web.csproj | 16 ++++++++++++++++ 17 files changed, 60 insertions(+), 11 deletions(-) rename utils/client-simulation/demo/Volo.ClientSimulation.Demo/{ClientSimulationWebModule.cs => ClientSimulationDemoModule.cs} (89%) create mode 100644 utils/client-simulation/demo/Volo.ClientSimulation.Demo/Controllers/HomeController.cs rename utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/{ => ClientSimulation}/Index.cshtml (50%) rename utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/{ => ClientSimulation}/Index.cshtml.cs (100%) rename utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/{ => ClientSimulation}/Index.js (100%) rename utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/{ => ClientSimulation}/SimulationArea.cshtml (100%) rename utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/{ => ClientSimulation}/SimulationArea.cshtml.cs (100%) rename utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/{ => ClientSimulation}/SimulationArea.css (100%) rename utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/{ => ClientSimulation}/SimulationArea.js (88%) rename utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/{ => ClientSimulation}/SimulationArea.min.css (100%) rename utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/{ => ClientSimulation}/SimulationArea.scss (100%) create mode 100644 utils/client-simulation/src/Volo.ClientSimulation.Web/ClientSimulationWebModule.cs create mode 100644 utils/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.csproj diff --git a/utils/client-simulation/Volo.ClientSimulation.sln b/utils/client-simulation/Volo.ClientSimulation.sln index a5846983d9..38062068bd 100644 --- a/utils/client-simulation/Volo.ClientSimulation.sln +++ b/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} diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/ClientSimulationWebModule.cs b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/ClientSimulationDemoModule.cs similarity index 89% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/ClientSimulationWebModule.cs rename to utils/client-simulation/demo/Volo.ClientSimulation.Demo/ClientSimulationDemoModule.cs index 62ff819c9f..6dea7a0d5b 100644 --- a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/ClientSimulationWebModule.cs +++ b/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(options => { - //TODO: Temporary add a DemoScenario options.Scenarios.Add( new ScenarioConfiguration( typeof(DemoScenario), diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Controllers/HomeController.cs b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Controllers/HomeController.cs new file mode 100644 index 0000000000..1ba3870e59 --- /dev/null +++ b/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"); + } + } +} diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/Index.cshtml b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.cshtml similarity index 50% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/Index.cshtml rename to utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.cshtml index d8c0b0e957..2a102c2151 100644 --- a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/Index.cshtml +++ b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.cshtml @@ -3,13 +3,13 @@ @model Volo.ClientSimulation.Demo.Pages.IndexModel @section styles { - + } @section scripts { - - + + }
\ No newline at end of file diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/Index.cshtml.cs b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.cshtml.cs similarity index 100% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/Index.cshtml.cs rename to utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.cshtml.cs diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/Index.js b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.js similarity index 100% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/Index.js rename to utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.js diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/SimulationArea.cshtml b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.cshtml similarity index 100% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/SimulationArea.cshtml rename to utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.cshtml diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/SimulationArea.cshtml.cs b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.cshtml.cs similarity index 100% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/SimulationArea.cshtml.cs rename to utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.cshtml.cs diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/SimulationArea.css b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.css similarity index 100% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/SimulationArea.css rename to utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.css diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/SimulationArea.js b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.js similarity index 88% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/SimulationArea.js rename to utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.js index e94f965ce5..24a4d46460 100644 --- a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/SimulationArea.js +++ b/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); }) diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/SimulationArea.min.css b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.min.css similarity index 100% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/SimulationArea.min.css rename to utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.min.css diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/SimulationArea.scss b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.scss similarity index 100% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/SimulationArea.scss rename to utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.scss diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Startup.cs b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Startup.cs index 2b7cad286d..5b1f1debce 100644 --- a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Startup.cs +++ b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Startup.cs @@ -9,7 +9,7 @@ namespace Volo.ClientSimulation.Demo { public IServiceProvider ConfigureServices(IServiceCollection services) { - services.AddApplication(options => + services.AddApplication(options => { options.UseAutofac(); }); diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj index 8dc9fab4ce..98aeb84b25 100644 --- a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj +++ b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj @@ -14,7 +14,7 @@ - + diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/compilerconfig.json b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/compilerconfig.json index d3e2a7ea96..a81e7aafed 100644 --- a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/compilerconfig.json +++ b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/compilerconfig.json @@ -1,6 +1,6 @@ [ { - "outputFile": "Pages/SimulationArea.css", - "inputFile": "Pages/SimulationArea.scss" + "outputFile": "Pages/ClientSimulation/SimulationArea.css", + "inputFile": "Pages/ClientSimulation/SimulationArea.scss" } ] \ No newline at end of file diff --git a/utils/client-simulation/src/Volo.ClientSimulation.Web/ClientSimulationWebModule.cs b/utils/client-simulation/src/Volo.ClientSimulation.Web/ClientSimulationWebModule.cs new file mode 100644 index 0000000000..f32f5b0643 --- /dev/null +++ b/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 + { + + } +} diff --git a/utils/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.csproj b/utils/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.csproj new file mode 100644 index 0000000000..f54c6394b4 --- /dev/null +++ b/utils/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.csproj @@ -0,0 +1,16 @@ + + + + netcoreapp2.2 + Volo.ClientSimulation + + + + + + + + + + +