diff --git a/Volo.Abp.sln b/Volo.Abp.sln index 6cbfed4ab1..3b992ae465 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -144,7 +144,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleConsoleDemo", "test\S EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EntityFrameworkCore.Tests.SecondContext", "test\Volo.Abp.EntityFrameworkCore.Tests.SecondContext\Volo.Abp.EntityFrameworkCore.Tests.SecondContext.csproj", "{127FC2BF-DC40-4370-B845-16088328264C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.Versioning.Tests", "test\Volo.Abp.AspNetCore.Mvc.Versioning.Tests\Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj", "{A8C8B76D-0869-4C11-AC55-DB9DD115788E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Mvc.Versioning.Tests", "test\Volo.Abp.AspNetCore.Mvc.Versioning.Tests\Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj", "{A8C8B76D-0869-4C11-AC55-DB9DD115788E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp.Account", "Abp.Account", "{DB012309-74FD-4D5A-B843-DD77BF053BF4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Account.Web", "src\Volo.Abp.Account.Web\Volo.Abp.Account.Web.csproj", "{F7DDF25E-58B1-4F68-AEDA-4F2FB4F4467B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -372,6 +376,10 @@ Global {A8C8B76D-0869-4C11-AC55-DB9DD115788E}.Debug|Any CPU.Build.0 = Debug|Any CPU {A8C8B76D-0869-4C11-AC55-DB9DD115788E}.Release|Any CPU.ActiveCfg = Release|Any CPU {A8C8B76D-0869-4C11-AC55-DB9DD115788E}.Release|Any CPU.Build.0 = Release|Any CPU + {F7DDF25E-58B1-4F68-AEDA-4F2FB4F4467B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F7DDF25E-58B1-4F68-AEDA-4F2FB4F4467B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F7DDF25E-58B1-4F68-AEDA-4F2FB4F4467B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F7DDF25E-58B1-4F68-AEDA-4F2FB4F4467B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -441,6 +449,8 @@ Global {2B48CF90-DBDB-469F-941C-5B5AECEEACE0} = {37087D1B-3693-4E96-983D-A69F210BDE53} {127FC2BF-DC40-4370-B845-16088328264C} = {37087D1B-3693-4E96-983D-A69F210BDE53} {A8C8B76D-0869-4C11-AC55-DB9DD115788E} = {37087D1B-3693-4E96-983D-A69F210BDE53} + {DB012309-74FD-4D5A-B843-DD77BF053BF4} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {F7DDF25E-58B1-4F68-AEDA-4F2FB4F4467B} = {DB012309-74FD-4D5A-B843-DD77BF053BF4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj index 50640e7e03..0b36692389 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj +++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj @@ -20,6 +20,7 @@ + diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs index c1c2ad2b36..0250c8e4c6 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs @@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Volo.Abp; +using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.EmbeddedFiles; using Volo.Abp.AspNetCore.Modularity; using Volo.Abp.AspNetCore.Mvc; @@ -24,12 +25,13 @@ namespace AbpDesk.Web.Mvc { [DependsOn( typeof(AbpAspNetCoreEmbeddedFilesModule), - typeof(AbpAspNetCoreMvcUiBootstrapModule), - typeof(AbpDeskApplicationModule), + typeof(AbpAspNetCoreMvcUiBootstrapModule), + typeof(AbpDeskApplicationModule), typeof(AbpDeskEntityFrameworkCoreModule), typeof(AbpIdentityHttpApiModule), typeof(AbpIdentityEntityFrameworkCoreModule), typeof(AbpIdentityWebModule), + typeof(AbpAccountWebModule), typeof(AbpAutofacModule) )] public class AbpDeskWebMvcModule : AbpModule diff --git a/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs b/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs new file mode 100644 index 0000000000..4645d76dab --- /dev/null +++ b/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; +using Volo.Abp.EmbeddedFiles; +using Volo.Abp.Modularity; + +namespace Volo.Abp.Account.Web +{ + [DependsOn(typeof(AbpAspNetCoreMvcUiBootstrapModule))] + public class AbpAccountWebModule : AbpModule + { + public override void ConfigureServices(IServiceCollection services) + { + services.AddAssemblyOf(); + + services.Configure(options => + { + options.Sources.Add( + new EmbeddedFileSet( + "/Areas/", + GetType().GetTypeInfo().Assembly, + "Volo.Abp.Account.Web.Areas" + ) + ); + + options.Sources.Add( + new EmbeddedFileSet( + "/", + GetType().GetTypeInfo().Assembly, + "Volo.Abp.Account.Web.wwwroot" + ) + ); + }); + } + } +} diff --git a/src/Volo.Abp.Account.Web/Areas/Account/Controllers/LoginController.cs b/src/Volo.Abp.Account.Web/Areas/Account/Controllers/LoginController.cs new file mode 100644 index 0000000000..178ee4883e --- /dev/null +++ b/src/Volo.Abp.Account.Web/Areas/Account/Controllers/LoginController.cs @@ -0,0 +1,14 @@ +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc; + +namespace Volo.Abp.Account.Web.Areas.Account.Controllers +{ + [Area("Account")] + public class LoginController : AbpController + { + public IActionResult Index() + { + return View(); + } + } +} diff --git a/src/Volo.Abp.Account.Web/Areas/Account/Views/Login/Index.cshtml b/src/Volo.Abp.Account.Web/Areas/Account/Views/Login/Index.cshtml new file mode 100644 index 0000000000..395fc6568d --- /dev/null +++ b/src/Volo.Abp.Account.Web/Areas/Account/Views/Login/Index.cshtml @@ -0,0 +1,21 @@ +
+
+
+
+ + +
+
+ + +
+
+ +
+ +
+
+
\ No newline at end of file diff --git a/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.csproj b/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.csproj new file mode 100644 index 0000000000..b0fded09f3 --- /dev/null +++ b/src/Volo.Abp.Account.Web/Volo.Abp.Account.Web.csproj @@ -0,0 +1,29 @@ + + + + + + netstandard2.0 + Volo.Abp.Account.Web + Volo.Abp.Account.Web + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + Volo.Abp.Account.Web + + + + + + + + + + + + + + + + diff --git a/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs b/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs index 02dfc85976..661127fdd8 100644 --- a/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs +++ b/src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs @@ -1,6 +1,6 @@ using System.Reflection; using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap; using Volo.Abp.EmbeddedFiles; using Volo.Abp.Identity.Web.Navigation; using Volo.Abp.Modularity; @@ -8,9 +8,8 @@ using Volo.Abp.Ui.Navigation; namespace Volo.Abp.Identity.Web { - [DependsOn(typeof(AbpAspNetCoreMvcModule))] [DependsOn(typeof(AbpIdentityApplicationContractsModule))] - [DependsOn(typeof(AbpAspNetCoreMvcUiModule))] + [DependsOn(typeof(AbpAspNetCoreMvcUiBootstrapModule))] public class AbpIdentityWebModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj index 4cb0a66f59..f96478d5eb 100644 --- a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj +++ b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj @@ -15,8 +15,7 @@
- - +