diff --git a/Volo.Abp.sln b/Volo.Abp.sln index d4bc21e5fe..85d5869fdb 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -170,13 +170,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MongoDB.Tests", "t EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EntityFrameworkCore.SqlServer", "src\Volo.Abp.EntityFrameworkCore.SqlServer\Volo.Abp.EntityFrameworkCore.SqlServer.csproj", "{6EABA98D-0B71-4ED7-A939-AFDA106D1151}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.EventBus.Distributed", "src\Volo.Abp.EventBus.Distributed\Volo.Abp.EventBus.Distributed.csproj", "{CFC98B88-8CCC-469B-8D60-482D3C94A690}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EventBus.Distributed", "src\Volo.Abp.EventBus.Distributed\Volo.Abp.EventBus.Distributed.csproj", "{CFC98B88-8CCC-469B-8D60-482D3C94A690}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.EventBus.Distributed.RabbitMQ", "src\Volo.Abp.EventBus.Distributed.RabbitMQ\Volo.Abp.EventBus.Distributed.RabbitMQ.csproj", "{468C3DCB-8C00-40E7-AE51-0738EAAB312A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EventBus.Distributed.RabbitMQ", "src\Volo.Abp.EventBus.Distributed.RabbitMQ\Volo.Abp.EventBus.Distributed.RabbitMQ.csproj", "{468C3DCB-8C00-40E7-AE51-0738EAAB312A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.EventBus.Distributed.Tests", "test\Volo.Abp.EventBus.Distributed.Tests\Volo.Abp.EventBus.Distributed.Tests.csproj", "{0AE814CE-E155-4259-8746-262D174AB510}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EventBus.Distributed.Tests", "test\Volo.Abp.EventBus.Distributed.Tests\Volo.Abp.EventBus.Distributed.Tests.csproj", "{0AE814CE-E155-4259-8746-262D174AB510}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", "src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj", "{2F5EE6D9-511B-4998-BD62-0B9F03E02432}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", "src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj", "{2F5EE6D9-511B-4998-BD62-0B9F03E02432}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", "src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj", "{86A3BB43-8FA2-4CC2-BAD0-A86C6C9D9585}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -496,6 +498,10 @@ Global {2F5EE6D9-511B-4998-BD62-0B9F03E02432}.Debug|Any CPU.Build.0 = Debug|Any CPU {2F5EE6D9-511B-4998-BD62-0B9F03E02432}.Release|Any CPU.ActiveCfg = Release|Any CPU {2F5EE6D9-511B-4998-BD62-0B9F03E02432}.Release|Any CPU.Build.0 = Release|Any CPU + {86A3BB43-8FA2-4CC2-BAD0-A86C6C9D9585}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {86A3BB43-8FA2-4CC2-BAD0-A86C6C9D9585}.Debug|Any CPU.Build.0 = Debug|Any CPU + {86A3BB43-8FA2-4CC2-BAD0-A86C6C9D9585}.Release|Any CPU.ActiveCfg = Release|Any CPU + {86A3BB43-8FA2-4CC2-BAD0-A86C6C9D9585}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -581,6 +587,7 @@ Global {468C3DCB-8C00-40E7-AE51-0738EAAB312A} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {0AE814CE-E155-4259-8746-262D174AB510} = {447C8A77-E5F0-4538-8687-7383196D04EA} {2F5EE6D9-511B-4998-BD62-0B9F03E02432} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {86A3BB43-8FA2-4CC2-BAD0-A86C6C9D9585} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/npm/aspnetcore.mvc.ui.theme.shared/abp.resourcemapping.js b/npm/aspnetcore.mvc.ui.theme.shared/abp.resourcemapping.js index e95da6cd95..a299b25be2 100644 --- a/npm/aspnetcore.mvc.ui.theme.shared/abp.resourcemapping.js +++ b/npm/aspnetcore.mvc.ui.theme.shared/abp.resourcemapping.js @@ -15,8 +15,8 @@ "@node_modules/jquery-form/dist/jquery.form.min.js": "@libs/jquery-form/", //jQuery-Validation - "@node_modules/jquery-validation/dist/jquery.validate.js": "@libs/jquery-validation/dist/", //TODO: do not use dist on destination - "@node_modules/jquery-validation/dist/localization/*.*": "@libs/jquery-validation/dist/localization/", //TODO: do not use dist on destination + "@node_modules/jquery-validation/dist/jquery.validate.js": "@libs/jquery-validation/", + "@node_modules/jquery-validation/dist/localization/*.*": "@libs/jquery-validation/localization/", //jQuery-Validation-Unobtrusive "@node_modules/jquery-validation-unobtrusive/dist/jquery.validate.unobtrusive.js": "@libs/jquery-validation-unobtrusive/", diff --git a/npm/core/abp.resourcemapping.js b/npm/core/abp.resourcemapping.js index 9fb6d1443f..4fc140e583 100644 --- a/npm/core/abp.resourcemapping.js +++ b/npm/core/abp.resourcemapping.js @@ -1,6 +1,6 @@ module.exports = { mappings: { //@abp/core - "@node_modules/@abp/core/src/abp.js": "@libs/abp/core/src/" //TODO: don't use src in the destination + "@node_modules/@abp/core/src/abp.js": "@libs/abp/core/" } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs index 25605f38ad..657f983708 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs @@ -1,13 +1,12 @@ using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.AspNetCore.Mvc.Bundling; -using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; +using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic { [DependsOn( - typeof(AbpAspNetCoreMvcUiBootstrapModule) + typeof(AbpAspNetCoreMvcUiThemeSharedModule) )] public class AbpAspNetCoreMvcUiBasicThemeModule : AbpModule { @@ -18,40 +17,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic options.FileSets.AddEmbedded("Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic"); }); - services.Configure(options => - { - options.StyleBundles.Add("GlobalStyles", new[] - { - "/libs/font-awesome/css/font-awesome.css", - "/libs/bootstrap/css/bootstrap.css", - "/libs/datatables.net-bs4/css/dataTables.bootstrap4.css", - - "/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables.css" - }); - - //TODO: Handle ticks stuff for all files - options.ScriptBundles.Add("GlobalScripts", new[] - { - "/libs/jquery/jquery.js", - "/libs/bootstrap/js/bootstrap.bundle.js", - "/libs/jquery-validation/dist/jquery.validate.js", - "/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js", - "/libs/jquery-form/jquery.form.min.js", - "/libs/datatables.net/js/jquery.dataTables.js", - "/libs/datatables.net-bs4/js/dataTables.bootstrap4.js", - - "/libs/abp/core/src/abp.js", - "/libs/abp/jquery/abp.ajax.js", - "/libs/abp/jquery/abp.resource-loader.js", - "/libs/abp/aspnetcore.mvc.ui.theme.shared/jquery/jquery-extensions.js", - "/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/abp.modal-manager.js", - "/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables-extensions.js", - - "/Abp/ApplicationConfigurationScript", - "/Abp/ServiceProxyScript" - }); - }); - services.AddAssemblyOf(); } } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj index dae9864ce2..2c97dd8040 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj @@ -23,9 +23,9 @@ - + - + \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs new file mode 100644 index 0000000000..5432cb556c --- /dev/null +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs @@ -0,0 +1,57 @@ +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.AspNetCore.Mvc.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; +using Volo.Abp.Modularity; +using Volo.Abp.VirtualFileSystem; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared +{ + [DependsOn( + typeof(AbpAspNetCoreMvcUiBootstrapModule) + )] + public class AbpAspNetCoreMvcUiThemeSharedModule : AbpModule + { + public override void ConfigureServices(IServiceCollection services) + { + services.Configure(options => + { + options.FileSets.AddEmbedded("Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared"); + }); + + services.Configure(options => + { + options.StyleBundles.Add("GlobalStyles", new[] + { + "/libs/font-awesome/css/font-awesome.css", + "/libs/bootstrap/css/bootstrap.css", + "/libs/datatables.net-bs4/css/dataTables.bootstrap4.css", + + "/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables.css" + }); + + options.ScriptBundles.Add("GlobalScripts", new[] + { + "/libs/jquery/jquery.js", + "/libs/bootstrap/js/bootstrap.bundle.js", + "/libs/jquery-validation/dist/jquery.validate.js", + "/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js", + "/libs/jquery-form/jquery.form.min.js", + "/libs/datatables.net/js/jquery.dataTables.js", + "/libs/datatables.net-bs4/js/dataTables.bootstrap4.js", + + "/libs/abp/core/src/abp.js", + "/libs/abp/jquery/abp.ajax.js", + "/libs/abp/jquery/abp.resource-loader.js", + "/libs/abp/aspnetcore.mvc.ui.theme.shared/jquery/jquery-extensions.js", + "/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/abp.modal-manager.js", + "/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables-extensions.js", + + "/Abp/ApplicationConfigurationScript", + "/Abp/ServiceProxyScript" + }); + }); + + services.AddAssemblyOf(); + } + } +} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Properties/launchSettings.json b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Properties/launchSettings.json new file mode 100644 index 0000000000..f928a8ea06 --- /dev/null +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:51544/", + "sslPort": 0 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:51545/" + } + } +} \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj new file mode 100644 index 0000000000..27faf4e7cf --- /dev/null +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj @@ -0,0 +1,25 @@ + + + + + + netstandard2.0 + Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared + Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + true + Library + + + + + + + + + + + \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/abp.modal-manager.js b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/abp.modal-manager.js similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/abp.modal-manager.js rename to src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/bootstrap/abp.modal-manager.js diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables-extensions.js b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables-extensions.js similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables-extensions.js rename to src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables-extensions.js diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables.css b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables.css similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables.css rename to src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables.css diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables.min.css b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables.min.css similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables.min.css rename to src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables.min.css diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables.scss b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables.scss similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables.scss rename to src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/datatables/datatables.scss diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/jquery/jquery-extensions.js b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/jquery/jquery-extensions.js similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/jquery/jquery-extensions.js rename to src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore.mvc.ui.theme.shared/jquery/jquery-extensions.js