Browse Source

Moved Users controller to Identity area

pull/81/head
Halil İbrahim Kalkan 10 years ago
parent
commit
18c3ac98e9
  1. 4
      src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
  2. 4
      src/AbpDesk/AbpDesk.Web.Mvc/Areas/_ViewImports.cshtml
  3. 3
      src/AbpDesk/AbpDesk.Web.Mvc/Areas/_ViewStart.cshtml
  4. 2
      src/Volo.Abp.Identity.Web/AbpIdentityWebMainMenuContributor.cs
  5. 4
      src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs
  6. 4
      src/Volo.Abp.Identity.Web/Areas/Identity/Controllers/UsersController.cs
  7. 0
      src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/Index.cshtml
  8. 2
      src/Volo.Abp.Identity.Web/project.json

4
src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs

@ -60,6 +60,10 @@ namespace AbpDesk.Web.Mvc
app.UseMvc(routes => app.UseMvc(routes =>
{ {
routes.MapRoute(
name: "defaultWithArea",
template: "{area}/{controller=Home}/{action=Index}/{id?}");
routes.MapRoute( routes.MapRoute(
name: "default", name: "default",
template: "{controller=Home}/{action=Index}/{id?}"); template: "{controller=Home}/{action=Index}/{id?}");

4
src/AbpDesk/AbpDesk.Web.Mvc/Areas/_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 *, AbpDesk.Web.Mvc

3
src/AbpDesk/AbpDesk.Web.Mvc/Areas/_ViewStart.cshtml

@ -0,0 +1,3 @@
@{
Layout = "~/Views/Shared/_AppLayout.cshtml";
}

2
src/Volo.Abp.Identity.Web/AbpIdentityWebMainMenuContributor.cs

@ -15,7 +15,7 @@ namespace Volo.Abp.Identity.Web
context.Menu context.Menu
.AddItem( .AddItem(
new ApplicationMenuItem("Identity", "Identity") new ApplicationMenuItem("Identity", "Identity")
.AddItem(new ApplicationMenuItem("Users", "Users", url: "/Users")) .AddItem(new ApplicationMenuItem("Users", "Users", url: "/Identity/Users"))
); );
return Task.CompletedTask; return Task.CompletedTask;

4
src/Volo.Abp.Identity.Web/AbpIdentityWebModule.cs

@ -23,9 +23,9 @@ namespace Volo.Abp.Identity.Web
{ {
options.Sources.Add( options.Sources.Add(
new EmbeddedFileSet( new EmbeddedFileSet(
"/Views/", "/Areas/",
GetType().GetTypeInfo().Assembly, GetType().GetTypeInfo().Assembly,
"Volo.Abp.Identity.Web.Views" "Volo.Abp.Identity.Web.Areas"
) )
); );
}); });

4
src/Volo.Abp.Identity.Web/Controllers/UsersController.cs → src/Volo.Abp.Identity.Web/Areas/Identity/Controllers/UsersController.cs

@ -2,9 +2,9 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc;
namespace Volo.Abp.Identity.Web.Controllers namespace Volo.Abp.Identity.Web.Areas.Identity.Controllers
{ {
//TODO: to a seperated area, named Identity! [Area("Identity")]
public class UsersController : AbpController public class UsersController : AbpController
{ {
private readonly IUserAppService _userAppService; private readonly IUserAppService _userAppService;

0
src/Volo.Abp.Identity.Web/Views/Users/Index.cshtml → src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/Index.cshtml

2
src/Volo.Abp.Identity.Web/project.json

@ -16,7 +16,7 @@
"buildOptions": { "buildOptions": {
"embed": { "embed": {
"include": [ "include": [
"Views/**/*.*" "Areas/**/*.*"
] ]
} }
} }

Loading…
Cancel
Save