imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename modules.

Browse Source
pull/4774/head
Halil İbrahim Kalkan 5 years ago
parent aaf2a17525
commit 9eafb52714
24 changed files with 100 additions and 30 deletions
Show Stats Download Patch File Download Diff File

9
modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs
Unescape View File

@ -6,7 +6,6 @@ using Volo.CmsKit.EntityFrameworkCore;
using Volo.CmsKit.MultiTenancy;
using Volo.CmsKit.Web;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.Swagger;
using Volo.Abp;
using Volo.Abp.Account;
using Volo.Abp.Account.Web;
@ -34,7 +33,7 @@ using Volo.Abp.TenantManagement.EntityFrameworkCore;
using Volo.Abp.TenantManagement.Web;
using Volo.Abp.Threading;
using Volo.Abp.VirtualFileSystem;
using Volo.CmsKit.Public;
using Volo.CmsKit.Admin.Web;
namespace Volo.CmsKit
{
@ -59,9 +58,7 @@ namespace Volo.CmsKit
typeof(AbpTenantManagementApplicationModule),
typeof(AbpTenantManagementEntityFrameworkCoreModule),
typeof(AbpAspNetCoreMvcUiBasicThemeModule),
typeof(AbpAspNetCoreSerilogModule),
typeof(CmsKitPublicWebModule),
typeof(CmsKitPublicApplicationModule)
typeof(AbpAspNetCoreSerilogModule)
)]
public class CmsKitWebUnifiedModule : AbpModule
{
@ -82,7 +79,9 @@ namespace Volo.CmsKit
options.FileSets.ReplaceEmbeddedByPhysical<CmsKitDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.CmsKit.Domain.Shared", Path.DirectorySeparatorChar)));
options.FileSets.ReplaceEmbeddedByPhysical<CmsKitDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.CmsKit.Domain", Path.DirectorySeparatorChar)));
options.FileSets.ReplaceEmbeddedByPhysical<CmsKitCommonWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.CmsKit.Common.Web", Path.DirectorySeparatorChar)));
options.FileSets.ReplaceEmbeddedByPhysical<CmsKitPublicWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.CmsKit.Public.Web", Path.DirectorySeparatorChar)));
options.FileSets.ReplaceEmbeddedByPhysical<CmsKitAdminWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.CmsKit.Admin.Web", Path.DirectorySeparatorChar)));
options.FileSets.ReplaceEmbeddedByPhysical<CmsKitApplicationContractsModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.CmsKit.Application.Contracts", Path.DirectorySeparatorChar)));
options.FileSets.ReplaceEmbeddedByPhysical<CmsKitApplicationModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Volo.CmsKit.Application", Path.DirectorySeparatorChar)));

1
modules/cms-kit/host/Volo.CmsKit.Web.Unified/Pages/Index.cshtml
Unescape View File

@ -3,6 +3,7 @@
@using Microsoft.Extensions.Localization
@using Volo.CmsKit.Pages
@using Volo.CmsKit.Web.Pages.CmsKit.Shared.Components
@using Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection
@model IndexModel
@inject IStringLocalizer<AbpUiResource> Localizer
<h1>CMS Kit DEMO</h1>

3
modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj
Unescape View File

@ -37,8 +37,7 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Volo.CmsKit.Application\Volo.CmsKit.Application.csproj" />
<ProjectReference Include="..\..\src\Volo.CmsKit.EntityFrameworkCore\Volo.CmsKit.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\src\Volo.CmsKit.Public.Application\Volo.CmsKit.Public.Application.csproj" />
<ProjectReference Include="..\..\src\Volo.CmsKit.Public.Web\Volo.CmsKit.Public.Web.csproj" />
<ProjectReference Include="..\..\src\Volo.CmsKit.Application\Volo.CmsKit.Application.csproj" />
<ProjectReference Include="..\..\src\Volo.CmsKit.Web\Volo.CmsKit.Web.csproj" />
<ProjectReference Include="..\Volo.CmsKit.Host.Shared\Volo.CmsKit.Host.Shared.csproj" />
</ItemGroup>

2
modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/AdminApplicationContractsModule.cs → modules/cms-kit/src/Volo.CmsKit.Admin.Application.Contracts/Volo/CmsKit/Admin/CmsKitAdminApplicationContractsModule.cs
Unescape View File

@ -9,7 +9,7 @@ namespace Volo.CmsKit.Admin
typeof(AbpDddApplicationContractsModule),
typeof(AbpAuthorizationModule)
)]
public class AdminApplicationContractsModule : AbpModule
public class CmsKitAdminApplicationContractsModule : AbpModule
{
}

2
modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/AdminAppService.cs
Unescape View File

@ -8,7 +8,7 @@ namespace Volo.CmsKit.Admin
protected AdminAppService()
{
LocalizationResource = typeof(CmsKitResource);
ObjectMapperContext = typeof(AdminApplicationModule);
ObjectMapperContext = typeof(CmsKitAdminApplicationModule);
}
}
}

8
modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/AdminApplicationModule.cs → modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/CmsKitAdminApplicationModule.cs
Unescape View File

@ -7,18 +7,18 @@ namespace Volo.CmsKit.Admin
{
[DependsOn(
typeof(CmsKitDomainModule),
typeof(AdminApplicationContractsModule),
typeof(CmsKitAdminApplicationContractsModule),
typeof(AbpDddApplicationModule),
typeof(AbpAutoMapperModule)
)]
public class AdminApplicationModule : AbpModule
public class CmsKitAdminApplicationModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
context.Services.AddAutoMapperObjectMapper<AdminApplicationModule>();
context.Services.AddAutoMapperObjectMapper<CmsKitAdminApplicationModule>();
Configure<AbpAutoMapperOptions>(options =>
{
options.AddMaps<AdminApplicationModule>(validate: true);
options.AddMaps<CmsKitAdminApplicationModule>(validate: true);
});
}
}

4
modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi.Client/Volo/CmsKit/Admin/AdminHttpApiClientModule.cs
Unescape View File

@ -5,7 +5,7 @@ using Volo.Abp.Modularity;
namespace Volo.CmsKit.Admin
{
[DependsOn(
typeof(AdminApplicationContractsModule),
typeof(CmsKitAdminApplicationContractsModule),
typeof(AbpHttpClientModule))]
public class AdminHttpApiClientModule : AbpModule
{
@ -14,7 +14,7 @@ namespace Volo.CmsKit.Admin
public override void ConfigureServices(ServiceConfigurationContext context)
{
context.Services.AddHttpClientProxies(
typeof(AdminApplicationContractsModule).Assembly,
typeof(CmsKitAdminApplicationContractsModule).Assembly,
RemoteServiceName
);
}

2
modules/cms-kit/src/Volo.CmsKit.Admin.HttpApi/Volo/CmsKit/Admin/AdminHttpApiModule.cs
Unescape View File

@ -8,7 +8,7 @@ using Volo.CmsKit.Localization;
namespace Volo.CmsKit.Admin
{
[DependsOn(
typeof(AdminApplicationContractsModule),
typeof(CmsKitAdminApplicationContractsModule),
typeof(AbpAspNetCoreMvcModule))]
public class AdminHttpApiModule : AbpModule
{

4
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/Admin/_ViewImports.cshtml
Unescape View File

@ -1,4 +1,6 @@
@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
@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling
@addTagHelper *, Volo.CmsKit.Common.Web
@addTagHelper *, Volo.CmsKit.Admin.Web

6
modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo.CmsKit.Application.Contracts.csproj
Unescape View File

@ -9,9 +9,11 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application.Contracts\Volo.Abp.Ddd.Application.Contracts.csproj"/>
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Authorization\Volo.Abp.Authorization.csproj"/>
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application.Contracts\Volo.Abp.Ddd.Application.Contracts.csproj" />
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Authorization\Volo.Abp.Authorization.csproj" />
<ProjectReference Include="..\Volo.CmsKit.Admin.Application.Contracts\Volo.CmsKit.Admin.Application.Contracts.csproj" />
<ProjectReference Include="..\Volo.CmsKit.Domain.Shared\Volo.CmsKit.Domain.Shared.csproj" />
<ProjectReference Include="..\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj" />
</ItemGroup>
</Project>

5
modules/cms-kit/src/Volo.CmsKit.Application.Contracts/Volo/CmsKit/CmsKitApplicationContractsModule.cs
Unescape View File

@ -1,13 +1,16 @@
using Volo.Abp.Application;
using Volo.Abp.Modularity;
using Volo.Abp.Authorization;
using Volo.CmsKit.Admin;
namespace Volo.CmsKit
{
[DependsOn(
typeof(CmsKitDomainSharedModule),
typeof(AbpDddApplicationContractsModule),
typeof(AbpAuthorizationModule)
typeof(AbpAuthorizationModule),
typeof(CmsKitPublicApplicationContractsModule),
typeof(CmsKitAdminApplicationContractsModule)
)]
public class CmsKitApplicationContractsModule : AbpModule
{

2
modules/cms-kit/src/Volo.CmsKit.Application/Volo.CmsKit.Application.csproj
Unescape View File

@ -11,8 +11,10 @@
<ItemGroup>
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj" />
<ProjectReference Include="..\Volo.CmsKit.Admin.Application\Volo.CmsKit.Admin.Application.csproj" />
<ProjectReference Include="..\Volo.CmsKit.Application.Contracts\Volo.CmsKit.Application.Contracts.csproj" />
<ProjectReference Include="..\Volo.CmsKit.Domain\Volo.CmsKit.Domain.csproj" />
<ProjectReference Include="..\Volo.CmsKit.Public.Application\Volo.CmsKit.Public.Application.csproj" />
</ItemGroup>
</Project>

4
modules/cms-kit/src/Volo.CmsKit.Application/Volo/CmsKit/CmsKitApplicationModule.cs
Unescape View File

@ -2,12 +2,16 @@
using Volo.Abp.AutoMapper;
using Volo.Abp.Modularity;
using Volo.Abp.Application;
using Volo.CmsKit.Admin;
using Volo.CmsKit.Public;
namespace Volo.CmsKit
{
[DependsOn(
typeof(CmsKitDomainModule),
typeof(CmsKitApplicationContractsModule),
typeof(CmsKitPublicApplicationModule),
typeof(CmsKitAdminApplicationModule),
typeof(AbpDddApplicationModule),
typeof(AbpAutoMapperModule)
)]

16
modules/cms-kit/src/Volo.CmsKit.Common.Web/Icons/CmsIconTagHelper.cs
Unescape View File

@ -0,0 +1,16 @@
using Microsoft.AspNetCore.Razor.TagHelpers;
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
namespace Volo.CmsKit.Web.Icons
{
[HtmlTargetElement(TagStructure = TagStructure.WithoutEndTag)]
public class CmsIconTagHelper : AbpTagHelper<CmsIconTagHelper, CmsIconTagHelperService>
{
public string Name { get; set; }
public CmsIconTagHelper(CmsIconTagHelperService service)
: base(service)
{
}
}
}

28
modules/cms-kit/src/Volo.CmsKit.Common.Web/Icons/CmsIconTagHelperService.cs
Unescape View File

@ -0,0 +1,28 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Volo.Abp;
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers;
namespace Volo.CmsKit.Web.Icons
{
public class CmsIconTagHelperService : AbpTagHelperService<CmsIconTagHelper>
{
public override Task ProcessAsync(TagHelperContext context, TagHelperOutput output)
{
if (TagHelper.Name.Contains("."))
{
output.TagName = "img";
output.Attributes.Add("src", TagHelper.Name);
output.Attributes.Add("width", "20");
output.Attributes.Add("height", "20");
}
else
{
//TODO: Allow to font, svg icons.. etc.
throw new AbpException("Only file icons are allowed!");
}
return Task.CompletedTask;
}
}
}

2
modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Default.cshtml → modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml
Unescape View File

@ -1,4 +1,4 @@
@model Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelectionViewModel
@model Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection.ReactionSelectionViewModel
<p>TEST!</p>
<p>EntityType: @Model.EntityType</p>
<p>EntityId: @Model.EntityId</p>

4
modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelectionViewComponent.cs → modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionViewComponent.cs
Unescape View File

@ -5,7 +5,7 @@ using Microsoft.Extensions.Options;
using Volo.Abp.AspNetCore.Mvc;
using Volo.CmsKit.Reactions;
namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components
namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection
{
public class ReactionSelectionViewComponent : AbpViewComponent
{
@ -50,7 +50,7 @@ namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components
});
}
return View("~/Pages/CmsKit/Shared/Components/Default.cshtml", viewModel);
return View("~/Pages/CmsKit/Shared/Components/ReactionSelection/Default.cshtml", viewModel);
}
}
}

3
modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelectionViewModel.cs → modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionSelectionViewModel.cs
Unescape View File

@ -1,7 +1,6 @@
using System.Collections.Generic;
using Volo.CmsKit.Reactions;
namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components
namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection
{
public class ReactionSelectionViewModel
{

4
modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionViewModel.cs → modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/ReactionSelection/ReactionViewModel.cs
Unescape View File

@ -1,6 +1,6 @@
using JetBrains.Annotations;
namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components
namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components.ReactionSelection
{
public class ReactionViewModel
{
@ -13,4 +13,4 @@ namespace Volo.CmsKit.Web.Pages.CmsKit.Shared.Components
[NotNull]
public string Icon { get; set; }
}
}
}

4
modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/_ViewImports.cshtml
Unescape View File

@ -1,4 +1,6 @@
@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
@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling
@addTagHelper *, Volo.CmsKit.Common.Web
@addTagHelper *, Volo.CmsKit.Public.Web

4
modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj
Unescape View File

@ -30,6 +30,10 @@
<EmbeddedResource Include="Pages\**\*.js" />
<Content Remove="Pages\**\*.css" />
<Content Remove="Pages\**\*.js" />
<Content Update="Pages\CmsKit\Shared\Components\ReactionSelection\Default.cshtml">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>
</Project>

6
modules/cms-kit/src/Volo.CmsKit.Web/CmsKitWebModule.cs
Unescape View File

@ -8,6 +8,7 @@ using Volo.Abp.AutoMapper;
using Volo.Abp.Modularity;
using Volo.Abp.UI.Navigation;
using Volo.Abp.VirtualFileSystem;
using Volo.CmsKit.Admin.Web;
using Volo.CmsKit.Permissions;
namespace Volo.CmsKit.Web
@ -15,7 +16,9 @@ namespace Volo.CmsKit.Web
[DependsOn(
typeof(CmsKitHttpApiModule),
typeof(AbpAspNetCoreMvcUiThemeSharedModule),
typeof(AbpAutoMapperModule)
typeof(AbpAutoMapperModule),
typeof(CmsKitPublicWebModule),
typeof(CmsKitAdminWebModule)
)]
public class CmsKitWebModule : AbpModule
{
@ -45,6 +48,7 @@ namespace Volo.CmsKit.Web
});
context.Services.AddAutoMapperObjectMapper<CmsKitWebModule>();
Configure<AbpAutoMapperOptions>(options =>
{
options.AddMaps<CmsKitWebModule>(validate: true);

5
modules/cms-kit/src/Volo.CmsKit.Web/Pages/CmsKit/_ViewImports.cshtml
Unescape View File

@ -1,4 +1,7 @@
@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
@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling
@addTagHelper *, Volo.CmsKit.Common.Web
@addTagHelper *, Volo.CmsKit.Public.Web
@addTagHelper *, Volo.CmsKit.Admin.Web

2
modules/cms-kit/src/Volo.CmsKit.Web/Volo.CmsKit.Web.csproj
Unescape View File

@ -15,9 +15,11 @@
<ItemGroup>
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
<ProjectReference Include="..\Volo.CmsKit.Public.Web\Volo.CmsKit.Public.Web.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Volo.CmsKit.Admin.Web\Volo.CmsKit.Admin.Web.csproj" />
<ProjectReference Include="..\Volo.CmsKit.HttpApi\Volo.CmsKit.HttpApi.csproj" />
</ItemGroup>

Write Preview
Loading…
Cancel
Save