From 6c6380b3ebd8a193ec6c70e210186f2694a3140a Mon Sep 17 00:00:00 2001 From: Halil ibrahim Kalkan Date: Sun, 7 Apr 2019 00:22:09 +0300 Subject: [PATCH] Move simulation UI to Volo.ClientSimulation.Web project --- .../Controllers/HomeController.cs | 4 +-- .../ClientSimulationWebModule.cs | 9 ++++++- .../Pages/ClientSimulation/Index.cshtml | 4 +-- .../Pages/ClientSimulation/Index.cshtml.cs | 2 +- .../Pages/ClientSimulation/Index.js | 0 .../ClientSimulation/SimulationArea.cshtml | 4 +-- .../ClientSimulation/SimulationArea.cshtml.cs | 2 +- .../Pages/ClientSimulation/SimulationArea.css | 0 .../Pages/ClientSimulation/SimulationArea.js | 0 .../ClientSimulation/SimulationArea.min.css | 0 .../ClientSimulation/SimulationArea.scss | 0 .../ClientSimulation/_ViewImports.cshtml | 4 +++ .../Properties/launchSettings.json | 27 +++++++++++++++++++ .../Volo.ClientSimulation.Web.csproj | 18 ++++++++++++- 14 files changed, 64 insertions(+), 10 deletions(-) rename utils/client-simulation/{demo/Volo.ClientSimulation.Demo => src/Volo.ClientSimulation.Web}/Pages/ClientSimulation/Index.cshtml (70%) rename utils/client-simulation/{demo/Volo.ClientSimulation.Demo => src/Volo.ClientSimulation.Web}/Pages/ClientSimulation/Index.cshtml.cs (77%) rename utils/client-simulation/{demo/Volo.ClientSimulation.Demo => src/Volo.ClientSimulation.Web}/Pages/ClientSimulation/Index.js (100%) rename utils/client-simulation/{demo/Volo.ClientSimulation.Demo => src/Volo.ClientSimulation.Web}/Pages/ClientSimulation/SimulationArea.cshtml (93%) rename utils/client-simulation/{demo/Volo.ClientSimulation.Demo => src/Volo.ClientSimulation.Web}/Pages/ClientSimulation/SimulationArea.cshtml.cs (92%) rename utils/client-simulation/{demo/Volo.ClientSimulation.Demo => src/Volo.ClientSimulation.Web}/Pages/ClientSimulation/SimulationArea.css (100%) rename utils/client-simulation/{demo/Volo.ClientSimulation.Demo => src/Volo.ClientSimulation.Web}/Pages/ClientSimulation/SimulationArea.js (100%) rename utils/client-simulation/{demo/Volo.ClientSimulation.Demo => src/Volo.ClientSimulation.Web}/Pages/ClientSimulation/SimulationArea.min.css (100%) rename utils/client-simulation/{demo/Volo.ClientSimulation.Demo => src/Volo.ClientSimulation.Web}/Pages/ClientSimulation/SimulationArea.scss (100%) create mode 100644 utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/_ViewImports.cshtml create mode 100644 utils/client-simulation/src/Volo.ClientSimulation.Web/Properties/launchSettings.json diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Controllers/HomeController.cs b/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Controllers/HomeController.cs index 1ba3870e59..ca7e894beb 100644 --- a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Controllers/HomeController.cs +++ b/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"); } } } diff --git a/utils/client-simulation/src/Volo.ClientSimulation.Web/ClientSimulationWebModule.cs b/utils/client-simulation/src/Volo.ClientSimulation.Web/ClientSimulationWebModule.cs index f32f5b0643..f4f15c7302 100644 --- a/utils/client-simulation/src/Volo.ClientSimulation.Web/ClientSimulationWebModule.cs +++ b/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(options => + { + options.FileSets.AddEmbedded("Volo.ClientSimulation"); + }); + } } } diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.cshtml b/utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml similarity index 70% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.cshtml rename to utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml index 2a102c2151..a247d209fb 100644 --- a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.cshtml +++ b/utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml @@ -1,6 +1,6 @@ @page -@using Volo.ClientSimulation.Demo.Pages -@model Volo.ClientSimulation.Demo.Pages.IndexModel +@using Volo.ClientSimulation.Pages.ClientSimulation +@model Volo.ClientSimulation.Pages.ClientSimulation.IndexModel @section styles { diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.cshtml.cs b/utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs similarity index 77% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.cshtml.cs rename to utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.cshtml.cs index 16e667b665..8636bf2567 100644 --- a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.cshtml.cs +++ b/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 { diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.js b/utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.js similarity index 100% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/Index.js rename to utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/Index.js diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.cshtml b/utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml similarity index 93% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.cshtml rename to utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml index 9c5f59570c..73ffe8aa17 100644 --- a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.cshtml +++ b/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 -@model Volo.ClientSimulation.Demo.Pages.SimulationAreaModel +@using Volo.ClientSimulation.Pages.ClientSimulation +@model Volo.ClientSimulation.Pages.ClientSimulation.SimulationAreaModel
Start diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.cshtml.cs b/utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs similarity index 92% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.cshtml.cs rename to utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.cshtml.cs index e22c62f6c5..6faa48d538 100644 --- a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.cshtml.cs +++ b/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 { diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.css b/utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.css similarity index 100% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.css rename to utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.css diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.js b/utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.js similarity index 100% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.js rename to utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.js diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.min.css b/utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.min.css similarity index 100% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.min.css rename to utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.min.css diff --git a/utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.scss b/utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.scss similarity index 100% rename from utils/client-simulation/demo/Volo.ClientSimulation.Demo/Pages/ClientSimulation/SimulationArea.scss rename to utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/SimulationArea.scss diff --git a/utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/_ViewImports.cshtml b/utils/client-simulation/src/Volo.ClientSimulation.Web/Pages/ClientSimulation/_ViewImports.cshtml new file mode 100644 index 0000000000..c1da1f5f10 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/utils/client-simulation/src/Volo.ClientSimulation.Web/Properties/launchSettings.json b/utils/client-simulation/src/Volo.ClientSimulation.Web/Properties/launchSettings.json new file mode 100644 index 0000000000..2f043da627 --- /dev/null +++ b/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/" + } + } +} \ No newline at end of file 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 index f54c6394b4..753de2f80b 100644 --- a/utils/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.csproj +++ b/utils/client-simulation/src/Volo.ClientSimulation.Web/Volo.ClientSimulation.Web.csproj @@ -1,7 +1,10 @@ - + netcoreapp2.2 + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + true + Library Volo.ClientSimulation @@ -13,4 +16,17 @@ + + + + + + + + + + + + +