diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.xproj b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.xproj index 855c3fa090..d7fd8cb478 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.xproj +++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.xproj @@ -7,7 +7,7 @@ 12e14d95-4aba-4290-ab1d-ccf5eb158411 - AbpDesk + AbpDesk.Web.Mvc .\obj .\bin\ v4.6.1 diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs index 7cfbb093ff..a0d74bf6cd 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs @@ -12,10 +12,8 @@ using Volo.Abp.Data; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.Modularity; -namespace AbpDesk +namespace AbpDesk.Web.Mvc { - //TODO: Rename project to AbpDesk.Web.Mvc - [DependsOn(typeof(AbpAspNetCoreMvcModule), typeof(AbpDeskApplicationModule), typeof(AbpDeskEntityFrameworkCoreModule))] public class AbpDeskWebMvcModule : AbpModule { diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/HomeController.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/HomeController.cs index 8a9cd8dfb4..bdc5cef67f 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/HomeController.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/HomeController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; -namespace AbpDesk.Controllers +namespace AbpDesk.Web.Mvc.Controllers { public class HomeController : AbpController { diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/TicketsController.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/TicketsController.cs index 249313a985..fde586ecd7 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/TicketsController.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/TicketsController.cs @@ -1,11 +1,11 @@ using System.Threading.Tasks; -using AbpDesk.Models.Tickets; using AbpDesk.Tickets; using AbpDesk.Tickets.Dtos; +using AbpDesk.Web.Mvc.Models.Tickets; using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; -namespace AbpDesk.Controllers +namespace AbpDesk.Web.Mvc.Controllers { public class TicketsController : AbpController { diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Models/Tickets/IndexViewModel.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Models/Tickets/IndexViewModel.cs index f5df26bce7..24229b7d9c 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Models/Tickets/IndexViewModel.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Models/Tickets/IndexViewModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using AbpDesk.Tickets.Dtos; -namespace AbpDesk.Models.Tickets +namespace AbpDesk.Web.Mvc.Models.Tickets { public class IndexViewModel { diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Program.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Program.cs index f4eefc742e..9034b62f71 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Program.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Program.cs @@ -1,7 +1,7 @@ using System.IO; using Microsoft.AspNetCore.Hosting; -namespace AbpDesk +namespace AbpDesk.Web.Mvc { public class Program { diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs index e9351ebaff..5a06d0bb5e 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace AbpDesk +namespace AbpDesk.Web.Mvc { public class Startup { diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Tickets/Index.cshtml b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Tickets/Index.cshtml index 80fea77829..9e96963ba8 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Tickets/Index.cshtml +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Tickets/Index.cshtml @@ -1,4 +1,5 @@ -@model AbpDesk.Models.Tickets.IndexViewModel +@using AbpDesk.Web.Mvc.Models.Tickets +@model AbpDesk.Web.Mvc.Models.Tickets.IndexViewModel